To: vim-dev@vim.org Subject: Patch 6.0.001 Fcc: outbox From: Bram Moolenaar ------------ Patch 6.0.001 Problem: Loading the sh.vim syntax file causes error messages . (Corinna Vinschen) Solution: Add an "if". (Charles Campbell) Files: runtime/syntax/sh.vim *** ../vim60/runtime/syntax/sh.vim Thu Sep 20 17:29:50 2001 --- runtime/syntax/sh.vim Thu Sep 27 22:00:30 2001 *************** *** 2,9 **** " Language: shell (sh) Korn shell (ksh) bash (sh) " Maintainer: Dr. Charles E. Campbell, Jr. " Previous Maintainer: Lennart Schultz ! " Last Change: September 18, 2001 ! " Version: 26 " " Using the following VIM variables: " b:is_kornshell if defined, enhance with kornshell syntax --- 2,9 ---- " Language: shell (sh) Korn shell (ksh) bash (sh) " Maintainer: Dr. Charles E. Campbell, Jr. " Previous Maintainer: Lennart Schultz ! " Last Change: September 26, 2001 ! " Version: 27 " " Using the following VIM variables: " b:is_kornshell if defined, enhance with kornshell syntax *************** *** 318,325 **** syn sync match shForSync groupthere shFor "\" syn sync match shIfSync grouphere shIf "\" syn sync match shIfSync groupthere shIf "\" ! syn sync match shUntilSync grouphere shRepeat "\" ! syn sync match shWhileSync grouphere shRepeat "\" " The default highlighting. hi def link shArithRegion shShellVariables --- 318,327 ---- syn sync match shForSync groupthere shFor "\" syn sync match shIfSync grouphere shIf "\" syn sync match shIfSync groupthere shIf "\" ! if exists("b:is_kornshell") || exists("b:is_bash") ! syn sync match shUntilSync grouphere shRepeat "\" ! syn sync match shWhileSync grouphere shRepeat "\" ! endif " The default highlighting. hi def link shArithRegion shShellVariables *************** *** 382,388 **** hi def link shFunctionName Function hi def link shNumber Number hi def link shOperator Operator ! hi def link shRepeat Repeat hi def link shSetList Identifier hi def link shShellVariables PreProc hi def link shSpecial Special --- 384,392 ---- hi def link shFunctionName Function hi def link shNumber Number hi def link shOperator Operator ! if exists("b:is_kornshell") || exists("b:is_bash") ! hi def link shRepeat Repeat ! endif hi def link shSetList Identifier hi def link shShellVariables PreProc hi def link shSpecial Special *** ../vim60/src/version.c Tue Sep 25 21:43:37 2001 --- src/version.c Thu Sep 27 22:07:59 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 1, /**/ -- This planet has -- or rather had -- a problem, which was this: most of the people living on it were unhappy for pretty much of the time. Many solutions were suggested for this problem, but most of these were largely concerned with the movements of small green pieces of paper, which is odd because on the whole it wasn't the small green pieces of paper that were unhappy. -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.002 Fcc: outbox From: Bram Moolenaar ------------ Patch 6.0.002 Problem: Using a '@' item in 'viminfo' doesn't work. (Marko Leipert) Solution: Add '@' to the list of accepted items. Files: src/option.c *** ../vim60.1/src/option.c Wed Sep 26 16:25:52 2001 --- src/option.c Thu Sep 27 09:44:40 2001 *************** *** 4626,4632 **** for (s = p_viminfo; *s;) { /* Check it's a valid character */ ! if (vim_strchr((char_u *)"!\"%'/:cfhnr", *s) == NULL) { errmsg = illegal_char(errbuf, *s); break; --- 4626,4632 ---- for (s = p_viminfo; *s;) { /* Check it's a valid character */ ! if (vim_strchr((char_u *)"!\"%'/:@cfhnr", *s) == NULL) { errmsg = illegal_char(errbuf, *s); break; *** ../vim60.1/src/version.c Thu Sep 27 22:11:50 2001 --- src/version.c Thu Sep 27 22:15:47 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 2, /**/ -- Time is an illusion. Lunchtime doubly so. -- Ford Prefect, in Douglas Adams' "The Hitchhiker's Guide to the Galaxy" /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.003 Fcc: outbox From: Bram Moolenaar ------------ Patch 6.0.003 Problem: The configure check for ACLs on AIX doesn't work. Solution: Fix the test program so that it compiles. (Tomas Ogren) Files: src/configure.in, src/auto/configure *** ../vim60.1/src/configure.in Mon Sep 10 11:39:13 2001 --- src/configure.in Thu Sep 27 22:19:52 2001 *************** *** 1760,1771 **** # include #endif #define _ALL_SOURCE ! #ifdef HAVE_SYS_STAT_H ! # include ! #endif int aclsize; struct acl *aclent;], [aclsize = sizeof(struct acl); ! aclent = malloc(aclsize); statacl("foo", STX_NORMAL, aclent, aclsize); ], AC_MSG_RESULT(yes); AC_DEFINE(HAVE_AIX_ACL), --- 1760,1771 ---- # include #endif #define _ALL_SOURCE ! ! #include ! int aclsize; struct acl *aclent;], [aclsize = sizeof(struct acl); ! aclent = (void *)malloc(aclsize); statacl("foo", STX_NORMAL, aclent, aclsize); ], AC_MSG_RESULT(yes); AC_DEFINE(HAVE_AIX_ACL), *** ../vim60.1/src/auto/configure Mon Sep 10 11:39:17 2001 --- src/auto/configure Thu Sep 27 22:20:19 2001 *************** *** 6085,6098 **** # include #endif #define _ALL_SOURCE ! #ifdef HAVE_SYS_STAT_H ! # include ! #endif int aclsize; struct acl *aclent; int main() { aclsize = sizeof(struct acl); ! aclent = malloc(aclsize); statacl("foo", STX_NORMAL, aclent, aclsize); ; return 0; } --- 6085,6098 ---- # include #endif #define _ALL_SOURCE ! ! #include ! int aclsize; struct acl *aclent; int main() { aclsize = sizeof(struct acl); ! aclent = (void *)malloc(aclsize); statacl("foo", STX_NORMAL, aclent, aclsize); ; return 0; } *** ../vim60.1/src/version.c Thu Sep 27 22:16:49 2001 --- src/version.c Thu Sep 27 22:17:59 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 3, /**/ -- Tips for aliens in New York: Land anywhere. Central Park, anywhere. No one will care or indeed even notice. -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.004 Fcc: outbox From: Bram Moolenaar ------------ Patch 6.0.004 Problem: The find/replace dialog doesn't reuse a previous argument properly. Solution: After removing a "\V" terminate the string. (Zwane Mwaikambo) Files: src/gui.c *** ../vim60.3/src/gui.c Tue Sep 25 11:38:35 2001 --- src/gui.c Fri Sep 28 17:29:55 2001 *************** *** 3993,3999 **** /* Remove "\V" */ if (len >= 2 && STRNCMP(text, "\\V", 2) == 0) ! mch_memmove(text, text + 2, (size_t)(len - 2)); /* Recognize "\" and remove. */ if (len >= 4 --- 3993,3999 ---- /* Remove "\V" */ if (len >= 2 && STRNCMP(text, "\\V", 2) == 0) ! mch_memmove(text, text + 2, (size_t)(len - 1)); /* Recognize "\" and remove. */ if (len >= 4 *** ../vim60.3/src/version.c Fri Sep 28 17:39:10 2001 --- src/version.c Fri Sep 28 17:35:47 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 4, /**/ -- Latest survey shows that 3 out of 4 people make up 75% of the world's population. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.005 Fcc: outbox From: Bram Moolenaar ------------ Patch 6.0.005 Problem: In Insert mode, "CTRL-O :ls" has a delay before redrawing. Solution: Don't delay just after wait_return() was called. Added the did_wait_return flag. Files: src/globals.h, src/messsage.c, src/normal.c, src/screen.c *** ../vim60.4/src/globals.h Sun Sep 16 17:25:35 2001 --- src/globals.h Fri Sep 28 21:55:27 2001 *************** *** 149,154 **** --- 149,156 ---- EXTERN int no_wait_return INIT(= 0); /* don't wait for return for now */ EXTERN int need_wait_return INIT(= 0); /* need to wait for return later */ + EXTERN int did_wait_return INIT(= FALSE); /* wait_return() was used and + nothing written since then */ #ifdef FEAT_TITLE EXTERN int need_maketitle INIT(= TRUE); /* call maketitle() soon */ #endif *** ../vim60.4/src/message.c Tue Aug 28 20:04:53 2001 --- src/message.c Fri Sep 28 21:51:05 2001 *************** *** 846,851 **** --- 846,852 ---- #endif need_wait_return = FALSE; + did_wait_return = TRUE; emsg_on_display = FALSE; /* can delete error message now */ lines_left = -1; /* reset lines_left at next msg_start() */ reset_last_sourcing(); *************** *** 1564,1569 **** --- 1565,1571 ---- } msg_didany = TRUE; /* remember that something was outputted */ + did_wait_return = FALSE; while (*s) { /* *** ../vim60.4/src/normal.c Wed Sep 26 16:21:24 2001 --- src/normal.c Fri Sep 28 21:59:34 2001 *************** *** 1086,1091 **** --- 1086,1092 ---- && stuff_empty() && typebuf_typed() && emsg_silent == 0 + && !did_wait_return && oap->op_type == OP_NOP) { int save_State = State; *** ../vim60.4/src/screen.c Wed Sep 26 09:57:36 2001 --- src/screen.c Fri Sep 28 21:50:43 2001 *************** *** 5851,5856 **** --- 5851,5857 ---- int check_msg_scroll; { if ((emsg_on_display || (check_msg_scroll && msg_scroll)) + && !did_wait_return && emsg_silent == 0) { out_flush(); *** ../vim60.4/src/version.c Fri Sep 28 17:48:07 2001 --- src/version.c Fri Sep 28 22:06:12 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 5, /**/ -- hundred-and-one symptoms of being an internet addict: 40. You tell the cab driver you live at http://123.elm.street/house/bluetrim.html 41. You actually try that 123.elm.street address. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.006 Fcc: outbox From: Bram Moolenaar ------------ Patch 6.0.006 Problem: With a vertical split, 'number' set and 'scrolloff' non-zero, making the window width very small causes a crash. (Niklas Lindstrom) Solution: Check for a zero width. Files: src/move.c *** ../vim60.5/src/move.c Tue Sep 25 11:23:37 2001 --- src/move.c Sat Sep 29 09:41:40 2001 *************** *** 1085,1090 **** --- 1085,1091 ---- - 1 >= curwin->w_height)) && curwin->w_height != 0 && curwin->w_cursor.lnum == curwin->w_topline + && width > 0 #ifdef FEAT_VERTSPLIT && curwin->w_width != 0 #endif *** ../vim60.5/src/version.c Fri Sep 28 22:19:57 2001 --- src/version.c Sat Sep 29 09:47:34 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 6, /**/ -- hundred-and-one symptoms of being an internet addict: 47. You are so familiar with the WWW that you find the search engines useless. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.007 Fcc: outbox From: Bram Moolenaar ------------ Patch 6.0.007 Problem: When setting 'filetype' while there is no FileType autocommand, a following ":setfiletype" would set 'filetype' again. (Kobus Retief) Solution: Set did_filetype always when 'filetype' has been set. Files: src/option.c *** ../vim60.6/src/option.c Thu Sep 27 22:16:49 2001 --- src/option.c Sat Sep 29 10:16:11 2001 *************** *** 4920,4925 **** --- 4920,4926 ---- /* When 'filetype' is set, trigger the FileType autocommands of that name */ else if (varp == &(curbuf->b_p_ft)) { + did_filetype = TRUE; apply_autocmds(EVENT_FILETYPE, curbuf->b_p_ft, curbuf->b_fname, TRUE, curbuf); } *** ../vim60.6/src/version.c Sat Sep 29 10:11:29 2001 --- src/version.c Sat Sep 29 10:11:04 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 7, /**/ -- hundred-and-one symptoms of being an internet addict: 49. You never have to deal with busy signals when calling your ISP...because you never log off. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.008 Fcc: outbox From: Bram Moolenaar ------------ Patch 6.0.008 Problem: 'imdisable' is missing from the options window. (Michael Naumann) Solution: Add an entry for it. Files: runtime/optwin.vim *** ../vim60.7/runtime/optwin.vim Sun Sep 2 14:36:59 2001 --- runtime/optwin.vim Sat Sep 29 15:19:31 2001 *************** *** 1,7 **** " These commands create the option window. " " Maintainer: Bram Moolenaar ! " Last Change: 2001 Sep 02 " If there already is an option window, jump to that one. if bufwinnr("option-window") > 0 --- 1,7 ---- " These commands create the option window. " " Maintainer: Bram Moolenaar ! " Last Change: 2001 Sep 29 " If there already is an option window, jump to that one. if bufwinnr("option-window") > 0 *************** *** 1003,1008 **** --- 1003,1012 ---- if has("langmap") call append("$", "langmap\ttranslate characters for Normal mode") call OptionG("lmap", &lmap) + endif + if has("xim") + call append("$", "imdisable\twhen set never use IM; overrules following IM options") + call BinOptionG("imd", &imd) endif call append("$", "iminsert\tin Insert mode: 1: use :lmap; 2: use IM; 0: neither") call append("$", "\t(local to window)") *** ../vim60.7/src/version.c Sat Sep 29 10:20:07 2001 --- src/version.c Sat Sep 29 15:22:54 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 8, /**/ -- Never go to the toilet in a paperless office. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.009 Fcc: outbox From: Bram Moolenaar ------------ Patch 6.0.009 Problem: Nextstep doesn't have S_ISBLK. (John Beppu) Solution: Define S_ISBLK using S_IFBLK. Files: src/os_unix.h *** ../vim60.8/src/os_unix.h Mon Aug 27 17:29:01 2001 --- src/os_unix.h Fri Sep 28 20:21:12 2001 *************** *** 486,491 **** --- 486,494 ---- #if !defined(S_ISREG) && defined(S_IFREG) # define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) #endif + #if !defined(S_ISBLK) && defined(S_IFBLK) + # define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK) + #endif #if !defined(S_ISSOCK) && defined(S_IFSOCK) # define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK) #endif *** ../vim60.8/src/version.c Sat Sep 29 18:26:29 2001 --- src/version.c Sat Sep 29 18:25:22 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 9, /**/ -- Q: What is a patch 22? A: A patch you need to include to make it possible to include patches. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.010 Fcc: outbox From: Bram Moolenaar ------------ Patch 6.0.010 Problem: Using "gf" on a file name starting with "./" or "../" in a buffer without a name causes a crash. (Roy Lewis) Solution: Check for a NULL file name. Files: src/misc2.c *** ../vim60.9/src/misc2.c Wed Sep 26 16:20:26 2001 --- src/misc2.c Sun Sep 30 10:47:02 2001 *************** *** 4805,4812 **** for (run = 1; run <= 2; ++run) { l = (int)STRLEN(file_to_find); ! if (run == 1 && rel_to_curdir && (options & FNAME_REL) ! && STRLEN(rel_fname) + l < MAXPATHL) { STRCPY(NameBuff, rel_fname); STRCPY(gettail(NameBuff), file_to_find); --- 4805,4815 ---- for (run = 1; run <= 2; ++run) { l = (int)STRLEN(file_to_find); ! if (run == 1 ! && rel_to_curdir ! && (options & FNAME_REL) ! && rel_fname != NULL ! && STRLEN(rel_fname) + l < MAXPATHL) { STRCPY(NameBuff, rel_fname); STRCPY(gettail(NameBuff), file_to_find); *** ../vim60.9/src/version.c Sun Sep 30 10:50:44 2001 --- src/version.c Sun Sep 30 10:49:23 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 10, /**/ -- Q: How to decide if I should clean my house or work on improving Vim? A: Depends on which has more bugs. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.011 Fcc: outbox From: Bram Moolenaar ------------ Patch 6.0.011 Problem: Python: After replacing or deleting lines get an ml_get error. (Leo Lipelis) Solution: Adjust the cursor position for deleted or added lines. Files: src/if_python.c *** ../vim60.10/src/if_python.c Fri Aug 24 21:30:54 2001 --- src/if_python.c Sat Sep 29 20:40:30 2001 *************** *** 2116,2121 **** --- 2116,2148 ---- return list; } + /* + * Check if deleting lines made the cursor position invalid. + * Changed the lines from "lo" to "hi" and added "extra" lines (negative if + * deleted). + */ + static void + py_fix_cursor(int lo, int hi, int extra) + { + if (curwin->w_cursor.lnum >= lo) + { + /* Adjust the cursor position if it's in/after the changed + * lines. */ + if (curwin->w_cursor.lnum >= hi) + { + curwin->w_cursor.lnum += extra; + check_cursor_col(); + } + else if (extra < 0) + { + curwin->w_cursor.lnum = lo; + check_cursor(); + } + changed_cline_bef_curs(); + } + invalidate_botline(); + } + /* Replace a line in the specified buffer. The line number is * in Vim format (1-based). The replacement line is given as * a Python string object. The object is checked for validity *************** *** 2145,2151 **** --- 2172,2182 ---- else if (ml_delete((linenr_T)n, FALSE) == FAIL) PyErr_SetVim(_("cannot delete line")); else + { deleted_lines_mark((linenr_T)n, 1L); + if (buf == curwin->w_buffer) + py_fix_cursor(n, n + 1, -1); + } curbuf = savebuf; *************** *** 2234,2239 **** --- 2265,2273 ---- } } deleted_lines_mark((linenr_T)lo, (long)i); + + if (buf == curwin->w_buffer) + py_fix_cursor(lo, hi, -n); } curbuf = savebuf; *************** *** 2353,2358 **** --- 2387,2395 ---- mark_adjust((linenr_T)lo, (linenr_T)(hi - 1), (long)MAXLNUM, (long)extra); changed_lines((linenr_T)lo, 0, (linenr_T)hi, (long)extra); + + if (buf == curwin->w_buffer) + py_fix_cursor(lo, hi, extra); curbuf = savebuf; *** ../vim60.10/src/version.c Sun Sep 30 10:53:07 2001 --- src/version.c Sun Sep 30 10:54:20 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 11, /**/ -- Time is money. Especially if you make clocks. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.012 Fcc: outbox From: Bram Moolenaar ------------ Patch 6.0.012 Problem: Polish translations contain printf format errors, this can result in a crash when using one of them. Solution: Fix for translated messages. (Michal Politowski) Files: src/po/pl.po *** ../vim60.11/src/po/pl.po Sat Sep 15 14:57:02 2001 --- src/po/pl.po Thu Oct 18 13:26:10 2001 *************** *** 221,227 **** #: diff.c:133 #, c-format msgid "E96: Can not diff more than %ld buffers" ! msgstr "E96: Nie mogę zróżnicować więcej niż %ls buforów" #: diff.c:641 msgid "E97: Cannot create diffs" --- 221,227 ---- #: diff.c:133 #, c-format msgid "E96: Can not diff more than %ld buffers" ! msgstr "E96: Nie mogę zróżnicować więcej niż %ld buforów" #: diff.c:641 msgid "E97: Cannot create diffs" *************** *** 383,389 **** #: edit.c:3355 #, c-format msgid "match %d" ! msgstr "pasuje %s" #: eval.c:693 #, c-format --- 383,389 ---- #: edit.c:3355 #, c-format msgid "match %d" ! msgstr "pasuje %d" #: eval.c:693 #, c-format *************** *** 571,577 **** #: eval.c:8143 #, c-format msgid "%s returning #%ld" ! msgstr "%s zwraca #%d" #: eval.c:8146 #, c-format --- 571,577 ---- #: eval.c:8143 #, c-format msgid "%s returning #%ld" ! msgstr "%s zwraca #%ld" #: eval.c:8146 #, c-format *************** *** 2178,2184 **** #: if_cscope.c:407 if_cscope.c:451 #, c-format msgid "stat(%s) error: %d" ! msgstr "stat(%s) błąd: %s" #: if_cscope.c:460 if_cscope.c:467 #, c-format --- 2178,2184 ---- #: if_cscope.c:407 if_cscope.c:451 #, c-format msgid "stat(%s) error: %d" ! msgstr "stat(%s) błąd: %d" #: if_cscope.c:460 if_cscope.c:467 #, c-format *** ../vim60.11/src/version.c Thu Oct 18 13:28:47 2001 --- src/version.c Thu Oct 18 13:26:33 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 12, /**/ -- hundred-and-one symptoms of being an internet addict: 88. Every single time you press the 'Get mail' button...it does get new mail. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.013 Fcc: outbox From: Bram Moolenaar ------------ Patch 6.0.013 Problem: Using ":silent! cmd" still gives some error messages, like for an invalid range. (Salman Halim) Solution: Reset emsg_silent after calling emsg() in do_one_cmd(). Files: src/ex_docmd.c *** ../vim60.12/src/ex_docmd.c Fri Sep 14 21:48:28 2001 --- src/ex_docmd.c Thu Oct 18 17:53:53 2001 *************** *** 1880,1885 **** --- 1880,1900 ---- if (curwin->w_cursor.lnum == 0) /* can happen with zero line number */ curwin->w_cursor.lnum = 1; + if (errormsg != NULL && *errormsg != NUL && !did_emsg) + { + if (sourcing) + { + if (errormsg != IObuff) + { + STRCPY(IObuff, errormsg); + errormsg = IObuff; + } + STRCAT(errormsg, ": "); + STRNCAT(errormsg, *cmdlinep, IOSIZE - STRLEN(IObuff)); + } + emsg(errormsg); + } + if (verbose_save >= 0) p_verbose = verbose_save; *************** *** 1900,1919 **** msg_scroll = save_msg_scroll; } - if (errormsg != NULL && *errormsg != NUL && !did_emsg) - { - if (sourcing) - { - if (errormsg != IObuff) - { - STRCPY(IObuff, errormsg); - errormsg = IObuff; - } - STRCAT(errormsg, ": "); - STRNCAT(errormsg, *cmdlinep, IOSIZE - STRLEN(IObuff)); - } - emsg(errormsg); - } if (ea.nextcmd && *ea.nextcmd == NUL) /* not really a next command */ ea.nextcmd = NULL; --- 1915,1920 ---- *** ../vim60.12/src/version.c Thu Oct 18 18:02:49 2001 --- src/version.c Thu Oct 18 17:54:02 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 13, /**/ -- From "know your smileys": ~#:-( I just washed my hair, and I can't do nuthin' with it. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.014 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.014 Problem: When 'modifiable' is off and 'virtualedit' is "all", "rx" on a TAB still changes the buffer. (Muraoka Taro) Solution: Check if saving the line for undo fails. Files: src/normal.c *** ../vim60.13/src/normal.c Fri Sep 28 22:19:57 2001 --- src/normal.c Fri Oct 19 11:18:05 2001 *************** *** 5764,5770 **** /* Break tabs, etc. */ if (virtual_active()) { ! u_save_cursor(); if (gchar_cursor() == NUL) { /* Add extra space and put the cursor on the first one. */ --- 5764,5771 ---- /* Break tabs, etc. */ if (virtual_active()) { ! if (u_save_cursor() == FAIL) ! return; if (gchar_cursor() == NUL) { /* Add extra space and put the cursor on the first one. */ *** ../vim60.13/src/version.c Fri Oct 19 11:18:45 2001 --- src/version.c Fri Oct 19 11:17:35 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 14, /**/ -- From "know your smileys": % Bike accident (a bit far-fetched, I suppose) /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.015 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.015 Problem: When 'cpoptions' includes "S" and "filetype plugin on" has been used, can get an error for deleting the b:did_ftplugin variable. (Ralph Henderson) Solution: Only delete the variable when it exists. Files: runtime/ftplugin.vim *** ../vim60.14/runtime/ftplugin.vim Tue Sep 18 18:35:13 2001 --- runtime/ftplugin.vim Fri Oct 19 15:21:05 2001 *************** *** 1,7 **** " Vim support file to switch on loading plugins for file types " " Maintainer: Bram Moolenaar ! " Last change: 2001 Sep 18 if exists("did_load_ftplugin") finish --- 1,7 ---- " Vim support file to switch on loading plugins for file types " " Maintainer: Bram Moolenaar ! " Last change: 2001 Oct 19 if exists("did_load_ftplugin") finish *************** *** 12,18 **** au FileType * call s:LoadFTPlugin() func! s:LoadFTPlugin() if expand("") != "" ! if &cpo =~# "S" " In compatible mode options are reset to the global values, need to " set the local values also when a plugin was already used. unlet b:did_ftplugin --- 12,18 ---- au FileType * call s:LoadFTPlugin() func! s:LoadFTPlugin() if expand("") != "" ! if &cpo =~# "S" && exists("b:did_ftplugin") " In compatible mode options are reset to the global values, need to " set the local values also when a plugin was already used. unlet b:did_ftplugin *** ../vim60.14/src/version.c Fri Oct 19 15:24:44 2001 --- src/version.c Fri Oct 19 15:24:33 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 15, /**/ -- hundred-and-one symptoms of being an internet addict: 97. Your mother tells you to remember something, and you look for a File/Save command. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.016 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.016 Problem: bufnr(), bufname() and bufwinnr() don't find unlisted buffers when the argument is a string. (Hari Krishna Dara) Also for setbufvar() and getbufvar(). Solution: Also find unlisted buffers. Files: src/eval.c *** ../vim60.15/src/eval.c Mon Sep 24 20:56:45 2001 --- src/eval.c Fri Oct 19 17:20:49 2001 *************** *** 2908,2914 **** p_cpo = (char_u *)""; buf = buflist_findnr(buflist_findpat(name, name + STRLEN(name), ! FALSE, FALSE)); p_magic = save_magic; p_cpo = save_cpo; --- 2908,2914 ---- p_cpo = (char_u *)""; buf = buflist_findnr(buflist_findpat(name, name + STRLEN(name), ! TRUE, FALSE)); p_magic = save_magic; p_cpo = save_cpo; *** ../vim60.15/src/version.c Fri Oct 19 17:27:43 2001 --- src/version.c Fri Oct 19 17:23:09 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 16, /**/ -- hundred-and-one symptoms of being an internet addict: 104. When people ask about the Presidential Election you ask "Which country?" /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.017 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.017 Problem: When 'ttybuiltin' is set and a builtin termcap entry defines t_Co and the external one doesn't, it gets reset to empty. (David Harrison) Solution: Only set t_Co when it wasn't set yet. Files: src/term.c *** ../vim60.16/src/term.c Thu Sep 20 21:31:38 2001 --- src/term.c Fri Oct 19 19:38:08 2001 *************** *** 1665,1673 **** width = tgetnum("co"); /* ! * Get number of colors. */ ! set_color_count(tgetnum("Co")); # ifndef hpux BC = (char *)TGETSTR("bc", &tp); --- 1665,1675 ---- width = tgetnum("co"); /* ! * Get number of colors (if not done already). */ ! if (term_str(KS_CCO) == NULL ! || term_str(KS_CCO) == empty_option) ! set_color_count(tgetnum("Co")); # ifndef hpux BC = (char *)TGETSTR("bc", &tp); *** ../vim60.16/src/version.c Fri Oct 19 19:36:36 2001 --- src/version.c Fri Oct 19 19:35:14 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 17, /**/ -- hundred-and-one symptoms of being an internet addict: 106. When told to "go to your room" you inform your parents that you can't...because you were kicked out and banned. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.018 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.018 Problem: Initializing 'encoding' may cause a crash when setlocale() is not used. (Dany St-Amant) Solution: Check for a NULL pointer. Files: src/mbyte.c *** ../vim60.17/src/mbyte.c Wed Sep 26 16:18:24 2001 --- src/mbyte.c Sun Oct 21 12:39:21 2001 *************** *** 2317,2324 **** #endif /* ! * Return the default value for 'encoding' in an allocated string. ! * Returns NULL when out of memory or no usable default could be found. */ int enc_default() --- 2317,2324 ---- #endif /* ! * Set the default value for 'encoding' (p_enc). ! * Returns OK when successful, FAIL when not. */ int enc_default() *************** *** 2349,2354 **** --- 2349,2357 ---- if ((s = getenv("LC_ALL")) == NULL || *s == NUL) if ((s = getenv("LC_CTYPE")) == NULL || *s == NUL) s = getenv("LANG"); + + if (s == NULL || *s == NUL) + return FAIL; /* The most generic locale format is: * language[_territory][.codeset][@modifier][+special][,[sponsor][_revision]] *** ../vim60.17/src/version.c Sun Oct 21 12:38:02 2001 --- src/version.c Sun Oct 21 12:35:28 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 18, /**/ -- hundred-and-one symptoms of being an internet addict: 139. You down your lunch in five minutes, at your desk, so you can spend the rest of the hour surfing the Net. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.019 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.019 Problem: Converting a string with multi-byte characters to a printable string, e.g., with strtrans(), may cause a crash. (Tomas Zellerin) Solution: Correctly compute the length of the result in transstr(). Files: src/charset.c *** ../vim60.18/src/charset.c Wed Sep 19 17:28:08 2001 --- src/charset.c Mon Oct 22 12:43:03 2001 *************** *** 327,351 **** char_u *s; { char_u *res; #ifdef FEAT_MBYTE ! int l; #endif ! res = alloc((unsigned)(vim_strsize(s) + 1)); if (res != NULL) { *res = NUL; ! while (*s != NUL) { #ifdef FEAT_MBYTE ! if (has_mbyte && (l = (*mb_ptr2len_check)(s)) > 1) { ! STRNCAT(res, s, l); ! s += l; } else #endif ! STRCAT(res, transchar(*s++)); } } return res; --- 327,374 ---- char_u *s; { char_u *res; + char_u *p; #ifdef FEAT_MBYTE ! int l, len; #endif ! #ifdef FEAT_MBYTE ! if (has_mbyte) ! { ! /* Compute the length of the result, taking into account that ! * multi-byte characters are copied unchanged. */ ! len = 0; ! p = s; ! while (*p != NUL) ! { ! if ((l = (*mb_ptr2len_check)(p)) > 1) ! { ! len += l; ! p += l; ! } ! else ! len += byte2cells(*p++); ! } ! res = alloc((unsigned)(len + 1)); ! } ! else ! #endif ! res = alloc((unsigned)(vim_strsize(s) + 1)); if (res != NULL) { *res = NUL; ! p = s; ! while (*p != NUL) { #ifdef FEAT_MBYTE ! if (has_mbyte && (l = (*mb_ptr2len_check)(p)) > 1) { ! STRNCAT(res, p, l); ! p += l; } else #endif ! STRCAT(res, transchar(*p++)); } } return res; *** ../vim60.18/src/version.c Mon Oct 22 12:47:09 2001 --- src/version.c Mon Oct 22 12:46:56 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 19, /**/ -- "Hit any key to continue" is very confusing when you have two keyboards. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.020 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.020 Problem: When obtaining the value of a global variable internally, could get the function-local value instead. Applies to using and and resetting highlighting in a function. Solution: Prepend "g:" to the variable name. (Aric Blumer) Files: src/syntax.c, src/term.c *** ../vim60.19/src/syntax.c Wed Sep 26 16:12:52 2001 --- src/syntax.c Mon Oct 22 18:36:33 2001 *************** *** 5871,5877 **** * Try finding the color scheme file. Used when a color file was loaded * and 'background' or 't_Co' is changed. */ ! p = get_var_value((char_u *)"colors_name"); if (p != NULL && load_colors(p) == OK) return; #endif --- 5871,5877 ---- * Try finding the color scheme file. Used when a color file was loaded * and 'background' or 't_Co' is changed. */ ! p = get_var_value((char_u *)"g:colors_name"); if (p != NULL && load_colors(p) == OK) return; #endif *************** *** 5903,5909 **** /* * If syntax highlighting is enabled load the highlighting for it. */ ! if (get_var_value((char_u *)"syntax_on") != NULL) (void)cmd_runtime((char_u *)"syntax/syncolor.vim", TRUE); #endif } --- 5903,5909 ---- /* * If syntax highlighting is enabled load the highlighting for it. */ ! if (get_var_value((char_u *)"g:syntax_on") != NULL) (void)cmd_runtime((char_u *)"syntax/syncolor.vim", TRUE); #endif } *** ../vim60.19/src/term.c Sun Oct 21 12:38:02 2001 --- src/term.c Mon Oct 22 18:37:53 2001 *************** *** 4714,4725 **** if (STRNICMP(src, "", 8) == 0) { len = 8; ! p = get_var_value((char_u *)"mapleader"); } else if (STRNICMP(src, "", 13) == 0) { len = 13; ! p = get_var_value((char_u *)"maplocalleader"); } else { --- 4714,4725 ---- if (STRNICMP(src, "", 8) == 0) { len = 8; ! p = get_var_value((char_u *)"g:mapleader"); } else if (STRNICMP(src, "", 13) == 0) { len = 13; ! p = get_var_value((char_u *)"g:maplocalleader"); } else { *** ../vim60.19/src/version.c Mon Oct 22 12:52:35 2001 --- src/version.c Mon Oct 22 18:38:09 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 20, /**/ -- Rule #1: Don't give somebody a tool that he's going to hurt himself with. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.021 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.021 Problem: The 'cscopepathcomp' option didn't work. Solution: Change USE_CSCOPE to FEAT_CSCOPE. (Mark Feng) Files: src/option.c *** ../vim60.20/src/option.c Sat Sep 29 10:20:07 2001 --- src/option.c Mon Oct 22 21:15:50 2001 *************** *** 589,595 **** (char_u *)&p_cpo, PV_NONE, {(char_u *)CPO_ALL, (char_u *)CPO_DEFAULT}}, {"cscopepathcomp", "cspc", P_NUM|P_VI_DEF|P_VIM, ! #ifdef USE_CSCOPE (char_u *)&p_cspc, PV_NONE, #else (char_u *)NULL, PV_NONE, --- 589,595 ---- (char_u *)&p_cpo, PV_NONE, {(char_u *)CPO_ALL, (char_u *)CPO_DEFAULT}}, {"cscopepathcomp", "cspc", P_NUM|P_VI_DEF|P_VIM, ! #ifdef FEAT_CSCOPE (char_u *)&p_cspc, PV_NONE, #else (char_u *)NULL, PV_NONE, *** ../vim60.20/src/version.c Mon Oct 22 18:52:01 2001 --- src/version.c Mon Oct 22 21:17:35 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 21, /**/ -- hundred-and-one symptoms of being an internet addict: 189. You put your e-mail address in the upper left-hand corner of envelopes. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.022 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.022 Problem: When using the 'langmap' option, the second character of a command starting with "g" isn't adjusted. Solution: Apply 'langmap' to the second character. (Alex Kapranoff) Files: src/normal.c *** ../vim60.21/src/normal.c Fri Oct 19 15:24:44 2001 --- src/normal.c Tue Oct 23 16:50:50 2001 *************** *** 842,847 **** --- 842,850 ---- * "gr", "g'" and "g`". */ ca.nchar = safe_vgetc(); + #ifdef FEAT_LANGMAP + LANGMAP_ADJUST(ca.nchar, TRUE); + #endif #ifdef FEAT_CMDL_INFO need_flushbuf |= add_to_showcmd(ca.nchar); #endif *** ../vim60.21/src/version.c Mon Oct 22 21:19:00 2001 --- src/version.c Tue Oct 23 16:53:44 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 22, /**/ -- hundred-and-one symptoms of being an internet addict: 221. Your wife melts your keyboard in the oven. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.023 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.023 Problem: Loading the lhaskell syntax doesn't work. (Thore B. Karlsen) Solution: Use ":runtime" instead of "source" to load haskell.vim. Files: runtime/syntax/lhaskell.vim *** ../vim60.22/runtime/syntax/lhaskell.vim Wed May 9 20:19:38 2001 --- runtime/syntax/lhaskell.vim Tue Oct 23 20:54:06 2001 *************** *** 1,7 **** " Vim syntax file " Language: Haskell with literate comments " Maintainer: John Williams ! " Last Change: 2001 May 09 " Enable literate comments let b:hs_literate_comments=1 --- 1,7 ---- " Vim syntax file " Language: Haskell with literate comments " Maintainer: John Williams ! " Last Change: 2001 Oct 23 " Enable literate comments let b:hs_literate_comments=1 *************** *** 10,16 **** if version < 600 source :p:h/haskell.vim else ! source syntax/haskell.vim endif " vim: ts=8 --- 10,16 ---- if version < 600 source :p:h/haskell.vim else ! runtime! syntax/haskell.vim endif " vim: ts=8 *** ../vim60.22/src/version.c Tue Oct 23 16:54:23 2001 --- src/version.c Tue Oct 23 20:56:16 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 23, /**/ -- hundred-and-one symptoms of being an internet addict: 232. You start conversations with, "Have you gotten an ISDN line?" /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.024 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.024 Problem: Using "CTRL-V u 9900" in Insert mode may cause a crash. (Noah Levitt) Solution: Don't insert a NUL byte in the text, use a newline. Files: src/misc1.c *** ../vim60.23/src/misc1.c Wed Sep 26 16:19:00 2001 --- src/misc1.c Wed Oct 24 13:15:20 2001 *************** *** 1536,1541 **** --- 1536,1547 ---- int n; n = (*mb_char2bytes)(c, buf); + + /* When "c" is 0x100, 0x200, etc. we don't want to insert a NUL byte. + * Happens for CTRL-Vu9900. */ + if (buf[0] == 0) + buf[0] = '\n'; + ins_char_bytes(buf, n); } *** ../vim60.23/src/version.c Tue Oct 23 20:57:50 2001 --- src/version.c Wed Oct 24 13:19:45 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 24, /**/ -- Women are probably the main cause of free software starvation. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.025 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.025 Problem: The pattern "\vx(.|$)" doesn't match "x" at the end of a line. (Preben Peppe Guldberg) Solution: Always see a "$" as end-of-line after "\v". Do the same for "^". Files: src/regexp.c *** ../vim60.24/src/regexp.c Fri Sep 7 13:19:00 2001 --- src/regexp.c Wed Oct 24 19:33:23 2001 *************** *** 2262,2267 **** --- 2262,2268 ---- * "\(", "\|", "\&' or "\n" */ if (reg_magic >= MAGIC_OFF && (at_start + || reg_magic == MAGIC_ALL || prevchr == Magic('(') || prevchr == Magic('|') || prevchr == Magic('&') *************** *** 2288,2294 **** if (p[0] == NUL || (p[0] == '\\' && (p[1] == '|' || p[1] == '&' || p[1] == ')' ! || p[1] == 'n'))) curchr = Magic('$'); } break; --- 2289,2296 ---- if (p[0] == NUL || (p[0] == '\\' && (p[1] == '|' || p[1] == '&' || p[1] == ')' ! || p[1] == 'n')) ! || reg_magic == MAGIC_ALL) curchr = Magic('$'); } break; *** ../vim60.24/src/version.c Wed Oct 24 13:22:11 2001 --- src/version.c Wed Oct 24 19:40:42 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 25, /**/ -- He was not in the least bit scared to be mashed into a pulp Or to have his eyes gouged out and his elbows broken; To have his kneecaps split and his body burned away And his limbs all hacked and mangled, brave Sir Robin. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.026 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.026 Problem: GTK: When using arrow keys to navigate through the menus, the separators are selected. Solution: Set the separators "insensitive". (Pavel Kankovsky) Files: src/gui_gtk.c, src/gui_gtk_x11.c *** ../vim60.25/src/gui_gtk.c Sat Sep 15 18:30:39 2001 --- src/gui_gtk.c Thu Oct 25 10:15:55 2001 *************** *** 453,458 **** --- 453,459 ---- { /* Separator: Just add it */ menu->id = gtk_menu_item_new(); + gtk_widget_set_sensitive(menu->id, FALSE); gtk_widget_show(menu->id); gtk_menu_insert(GTK_MENU(parent->submenu_id), menu->id, idx); *** ../vim60.25/src/gui_gtk_x11.c Wed Sep 19 16:28:57 2001 --- src/gui_gtk_x11.c Thu Oct 25 10:16:39 2001 *************** *** 3571,3576 **** --- 3571,3579 ---- if (menu->id == 0) return; + if (menu_is_separator(menu->name)) + grey = 1; + gui_mch_menu_hidden(menu, FALSE); /* Be clever about bitfields versus true booleans here! */ if (!GTK_WIDGET_SENSITIVE(menu->id) == !grey) *** ../vim60.25/src/version.c Wed Oct 24 19:41:55 2001 --- src/version.c Thu Oct 25 10:19:40 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 26, /**/ -- Eight Megabytes And Continually Swapping. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.027 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.027 Problem: VMS: Printing doesn't work, the file is deleted too quickly. No longer need the VMS specific printing menu. gethostname() is not available with VAXC. The makefile was lacking selection of the tiny-huge feature set. Solution: Adjust the 'printexpr' option default. Fix the other problems and update the documentation. (Zoltan Arpadffy) Files: runtime/doc/os_vms.txt, runtime/menu.vim, src/INSTALLvms.txt, src/Make_vms.mms, src/option.c, src/os_unix.c, src/os_vms_conf.h *** ../vim60.26/runtime/doc/os_vms.txt Tue Sep 25 21:40:37 2001 --- runtime/doc/os_vms.txt Thu Oct 25 16:16:53 2001 *************** *** 1,4 **** ! *os_vms.txt* For Vim version 6.0. Last change: 2001 Sep 03 VIM REFERENCE MANUAL --- 1,4 ---- ! *os_vms.txt* For Vim version 6.0. Last change: 2001 Oct 23 VIM REFERENCE MANUAL *************** *** 43,54 **** You can download precompiled executables from: http://www.polarfox.com/vim/ ============================================================================== 3. Compiling *vms-compiling* ! See the file src/INSTALLvms.txt. ============================================================================== --- 43,55 ---- You can download precompiled executables from: http://www.polarfox.com/vim/ + ftp://ftp.polarhome.com/pub/vim/ ============================================================================== 3. Compiling *vms-compiling* ! See the file [.SRC]INSTALLVMS.TXT. ============================================================================== *************** *** 57,63 **** The code has been tested under Open VMS 6.2 - 7.2 on Alpha and VAX platforms with the DECC compiler. It should work without bigger problems. If it happened that your system does not have some include libraries you can ! tune up in OS_VMS_CONF.H or GUI_VMS_CONF.H files. If you decided to build Vim with +perl, +python, etc. options, first you need to download OpenVMS distributions of Perl and Python. Build and deploy the --- 58,64 ---- The code has been tested under Open VMS 6.2 - 7.2 on Alpha and VAX platforms with the DECC compiler. It should work without bigger problems. If it happened that your system does not have some include libraries you can ! tune up in OS_VMS_CONF.H file. If you decided to build Vim with +perl, +python, etc. options, first you need to download OpenVMS distributions of Perl and Python. Build and deploy the *************** *** 74,79 **** --- 75,83 ---- separately. You have to be prepared that the CTAGS and XXD make files are not always up to date. + CTAGS is not part of Vim source distribution any more, however the OpenVMS + specific source might contain CTAGS source files as it is described above. + Advanced users may try some acrobatics in FEATURE.H file also. It is possible to compile with +xfontset +xim options too, but then you have *************** *** 189,195 **** VMS is not a native X window environment, so you can not start Vim in GUI mode "just like that". But anyhow it is not too complicate to get a running Vim. ! 1) If you are working on the VMS X console: Start Vim with the command: > $ mc device:VIM.EXE -g --- 193,199 ---- VMS is not a native X window environment, so you can not start Vim in GUI mode "just like that". But anyhow it is not too complicate to get a running Vim. ! 1) If you are working on the VMS X/Motif console: Start Vim with the command: > $ mc device:VIM.EXE -g *************** *** 425,430 **** --- 429,435 ---- $define SYS$PRINT HP5ANSI You can print out whole buffer or just the marked area. + More info under :help hardcopy (Zoltan Arpadffy, Vim 6.0c) *************** *** 441,471 **** Without the -GEOMETRY, the GVIM window size will be minimal and the menu will be confused after a window-resize. ! (Coen Engelbarts, <@hotmail.com> Vim 6.0ac) ============================================================================== 9. VMS related changes *vms-changes* ! Version 6.0 (2001 May 29) ! - Unix and VMS code has been merged ! - separated "really" VMS related code ! - included all possible Unix functionality ! - simplified or deleted the configuration files ! - makefile MAKE_VMS.MMS reviewed ! - menu changes (fixed printing, CTAGS and XXD usage) ! - created OS_VMS_FILTER.COM - DECC->VAXC pre-processor directive convert ! script. ! - changed quickfix parameters: ! - errormessage format to suite DECC ! - search, make and other commands to suite VMS system ! - updated and renamed MMS make files for Vim and CTAGS. ! - CTAGS has been removed from source distribution of Vim but it will remain ! in OpenVMS binary distributions. ! - created INSTALLvms.txt - detailed compiling instructions under VMS. ! - updated test scrips. ! - OS_VMS.TXT updated with new features. ! - other minor fixes. Version 5.7 (2000 Jun 24) --- 446,488 ---- Without the -GEOMETRY, the GVIM window size will be minimal and the menu will be confused after a window-resize. ! (Carlo Mekenkamp, Coen Engelbarts, Vim 6.0ac) ============================================================================== 9. VMS related changes *vms-changes* ! Version 6.0 (2001 Sep 28) ! - Unix and VMS code has been merged ! - separated "really" VMS related code ! - included all possible Unix functionality ! - simplified or deleted the configuration files ! - makefile MAKE_VMS.MMS reviewed ! - menu changes (fixed printing, CTAGS and XXD usage) ! - fixed variable RMS record format handling anomaly ! - corrected syntax, ftplugin etc files load ! - changed expand_wildcards and expandpath functions to work more general ! - created OS_VMS_FILTER.COM - DECC->VAXC pre-processor directive convert ! script. ! - Improved code's VAXC and new DECC compilers compatibility ! - changed quickfix parameters: ! - errormessage format to suite DECC ! - search, make and other commands to suite VMS system ! - updated and renamed MMS make files for Vim and CTAGS. ! - CTAGS has been removed from source distribution of Vim but it will remain ! in OpenVMS binary distributions. ! - simplified build/configuration procedure ! - created INSTALLvms.txt - detailed compiling instructions under VMS. ! - updated test scrips. ! - OS_VMS.TXT updated with new features. ! - other minor fixes. ! - documentation updated ! - this version had been tested much more than any other OpenVMS version ! earlier ! ! Version 5.8 (2001 Jun 1) ! - New CTAGS v5.0 in disribution ! - Documentation updated Version 5.7 (2000 Jun 24) *** ../vim60.26/runtime/menu.vim Wed Sep 26 15:24:36 2001 --- runtime/menu.vim Thu Oct 25 16:06:26 2001 *************** *** 2,8 **** " Note that ":amenu" is often used to make a menu work in all modes. " " Maintainer: Bram Moolenaar ! " Last Change: 2001 Sep 21 " Make sure the '<' and 'C' flags are not included in 'cpoptions', otherwise " would not be recognized. See ":help 'cpoptions'". --- 2,8 ---- " Note that ":amenu" is often used to make a menu work in all modes. " " Maintainer: Bram Moolenaar ! " Last Change: 2001 Oct 25 " Make sure the '<' and 'C' flags are not included in 'cpoptions', otherwise " would not be recognized. See ":help 'cpoptions'". *************** *** 106,133 **** amenu 10.510 &File.&Print :w !lpr vunmenu &File.&Print vmenu &File.&Print :w !lpr - elseif has("vms") - amenu 10.500 &File.-SEP3- : - amenu 10.510 &File.&Print :call VMSPrint(":") - vunmenu &File.&Print - vmenu &File.&Print :call VMSPrint(":'<,'>") endif amenu 10.600 &File.-SEP4- : amenu 10.610 &File.Sa&ve-Exit:wqa :confirm wqa amenu 10.620 &File.E&xit:qa :confirm qa - if has("vms") - if !exists("*VMSPrint") - fun VMSPrint(range) - let mod_save = &mod - let ttt = tempname() - exec a:range . "w! " . ttt - let &mod = mod_save - exec "!print/delete " . ttt - endfun - endif - endif - " Tricky stuff to make pasting work as expected. nnoremap Paste "=@+.'xy'gPFx"_2x:echo --- 106,116 ---- *************** *** 730,739 **** amenu 1.40 ToolBar.Print :w !lpr vunmenu ToolBar.Print vmenu ToolBar.Print :w !lpr - elseif has("vms") - amenu 1.40 ToolBar.Print :call VMSPrint(":") - vunmenu ToolBar.Print - vmenu ToolBar.Print :call VMSPrint(":'<,'>") endif amenu 1.45 ToolBar.-sep1- --- 713,718 ---- *** ../vim60.26/src/INSTALLvms.txt Sat Jul 28 14:07:56 2001 --- src/INSTALLvms.txt Thu Oct 25 12:26:38 2001 *************** *** 1,5 **** INSTALLvms.txt - Installation of Vim on OpenVMS ! Last change: 2001 Jul 28 This file contains instructions for compiling Vim. If you already have an executable version of Vim, you don't need this. --- 1,5 ---- INSTALLvms.txt - Installation of Vim on OpenVMS ! Last change: 2001 Oct 12 This file contains instructions for compiling Vim. If you already have an executable version of Vim, you don't need this. *************** *** 45,50 **** --- 45,54 ---- 1.5. If you want to have Perl, Python or Tcl support in Vim you will need VMS distributions for them as well. + NOTE: procedure in chapter 1 describes source code preparation from multi OS code, + however it is available OpenVMS oprimized (and tested) source code from: + ftp://ftp.polarhome.com/pub/vim/source/vms/ + 2. Configuration 2.1. Edit vim-X.X/src/feature.h for your preference. (You can skip *************** *** 56,61 **** --- 60,75 ---- 2.2 Edit vim-X.X/src/Make_vms.mms to customise your Vim. Options are: + Parameter name : MODEL + Description : Build model selection + Options: : TINY - Almost no features enabled, not even multiple windows + SMALL - Few features enabled, as basic as possible + NORMAL - A default selection of features enabled + BIG - Many features enabled, as rich as possible. (OpenVMS default) + HUGE - All possible featues enabled. + Uncommented - will default to BIG + Default : MODEL = BIG + Parameter name : GUI Description : GUI or terminal mode executable Options: : YES - GUI executable *************** *** 98,103 **** --- 112,139 ---- Uncommented - build without support. Default : Uncommented + + Parameter name : VIM_XIM + Description : X Input Method. For entering special languages like chinese and + Japanese. Please define just one: VIM_XIM or VIM_HANGULIN + Options: : YES - Build with support + Uncommented - build without support. + Default : Uncommented + + Parameter name : VIM_HANGULIN + Description : Internal Hangul input method. GUI only. + Please define just one: VIM_XIM or VIM_HANGULIN + Options: : YES - Build with support + Uncommented - build without support. + Default : Uncommented + + Parameter name : VIM_TAG_ANYWHITE + Description : Allow any white space to separate the fields in a tags file + When not defined, only a TAB is allowed. + Options: : YES - Build with support + Uncommented - build without support. + Default : Uncommented + You can edit the *_INC and *_LIB qualifiers, but it is really not recommended for beginners. *************** *** 128,133 **** --- 164,173 ---- @os_vms_fix.com *.c *.h <.proto>*.pro more information can be found in os_vms_fix.com file itself. + + NOTE: even if os_vms_fix.com will fix all pre-processor directives it will + leave singe (long) line directives. You have to fix them manually. + Known problematic files are option.h and option.c 4.2. After the conversion you can continue building as it has been described above. *** ../vim60.26/src/Make_vms.mms Sun Sep 16 16:18:13 2001 --- src/Make_vms.mms Wed Oct 24 17:06:38 2001 *************** *** 2,8 **** # Makefile for Vim on OpenVMS # # Maintainer: Zoltan Arpadffy ! # Last change: 2001 Sep 16 # # This has script been tested on VMS 6.2 to 7.2 on DEC Alpha and VAX # with MMS and MMK --- 2,8 ---- # Makefile for Vim on OpenVMS # # Maintainer: Zoltan Arpadffy ! # Last change: 2001 Oct 12 # # This has script been tested on VMS 6.2 to 7.2 on DEC Alpha and VAX # with MMS and MMK *************** *** 16,25 **** --- 16,36 ---- # To build: mms/descrip=Make_vms.mms # To clean up: mms/descrip=Make_vms.mms clean # + # Hints and detailed description could be found in INSTALLVMS.TXT file. + # ###################################################################### # Configuration section. ###################################################################### + # Build model selection + # TINY - Almost no features enabled, not even multiple windows + # SMALL - Few features enabled, as basic as possible + # NORMAL - A default selection of features enabled + # BIG - Many features enabled, as rich as possible. (default) + # HUGE - All possible featues enabled. + # Please select one of these alternatives above. + MODEL = BIG + # GUI or terminal mode executable. # Comment out if you want just the character terminal mode only. GUI = YES *************** *** 56,61 **** --- 67,76 ---- # If you don't need it really, leave it behind the comment. # VIM_HANGULIN = YES + # Allow any white space to separate the fields in a tags file + # When not defined, only a TAB is allowed. + # VIM_TAG_ANYWHITE = YES + ###################################################################### # Directory, library and include files configuration section. # Normally you need not to change anything below. ! *************** *** 145,150 **** --- 160,170 ---- .ENDIF .ENDIF + .IFDEF VIM_TAG_ANYWHITE + # TAG_ANYWHITE related setup. + TAG_DEF = ,"FEAT_TAG_ANYWHITE" + .ENDIF + ###################################################################### # End of configuration section. # Please, do not change anything below without programming experience. *************** *** 174,186 **** LDFLAGS = .ENDIF # These go into pathdef.c VIMUSER = "''f$extract(f$locate(",",f$user())+1,f$length(f$user())-f$locate(",",f$user())-2,f$user())'" VIMHOST = "''f$trnlnm("sys$node")'''f$trnlnm("ucx$inet_host")'.''f$trnlnm("ucx$inet_domain")'" .SUFFIXES : .obj .c ! ALL_CFLAGS = /def=($(DEFS) $(DEBUG_DEF) $(PERL_DEF) $(PYTHON_DEF) $(TCL_DEF) $(SNIFF_DEF) $(RUBY_DEF) $(XIM_DEF) $(HANGULIN_DEF)) $(CFLAGS) ALL_LIBS = $(LIBS) $(GUI_LIB_DIR) $(X_LIB_DIR) $(GUI_LIB) $(X_LIB) $(EXTRA_LIB)\ $(PERL_LIB) $(PYTHON_LIB) $(TCL_LIB) $(SNIFF_LIB) $(RUBY_LIB) --- 194,208 ---- LDFLAGS = .ENDIF + MODEL_DEF = "FEAT_$(MODEL)", + # These go into pathdef.c VIMUSER = "''f$extract(f$locate(",",f$user())+1,f$length(f$user())-f$locate(",",f$user())-2,f$user())'" VIMHOST = "''f$trnlnm("sys$node")'''f$trnlnm("ucx$inet_host")'.''f$trnlnm("ucx$inet_domain")'" .SUFFIXES : .obj .c ! ALL_CFLAGS = /def=($(MODEL_DEF)$(DEFS)$(DEBUG_DEF)$(PERL_DEF)$(PYTHON_DEF)$(TCL_DEF)$(SNIFF_DEF)$(RUBY_DEF)$(XIM_DEF)$(HANGULIN_DEF)$(TAG_DEF)) $(CFLAGS) ALL_LIBS = $(LIBS) $(GUI_LIB_DIR) $(X_LIB_DIR) $(GUI_LIB) $(X_LIB) $(EXTRA_LIB)\ $(PERL_LIB) $(PYTHON_LIB) $(TCL_LIB) $(SNIFF_LIB) $(RUBY_LIB) *** ../vim60.26/src/option.c Mon Oct 22 21:19:00 2001 --- src/option.c Thu Oct 25 15:59:13 2001 *************** *** 2515,2521 **** (char_u *)"system('copy' . ' ' . v:fname_in . ' ' . &printdevice) . delete(v:fname_in)" # else # ifdef VMS ! (char_u *)"system('print' . (&printdevice == '' ? '' : ' /queue=' . &printdevice) . ' ' . v:fname_in) . delete(v:fname_in)" # else (char_u *)"system('lpr' . (&printdevice == '' ? '' : ' -P' . &printdevice) . ' ' . v:fname_in) . delete(v:fname_in) + v:shell_error" --- 2515,2521 ---- (char_u *)"system('copy' . ' ' . v:fname_in . ' ' . &printdevice) . delete(v:fname_in)" # else # ifdef VMS ! (char_u *)"system('print/delete' . (&printdevice == '' ? '' : ' /queue=' . &printdevice) . ' ' . v:fname_in)" # else (char_u *)"system('lpr' . (&printdevice == '' ? '' : ' -P' . &printdevice) . ' ' . v:fname_in) . delete(v:fname_in) + v:shell_error" *** ../vim60.26/src/os_unix.c Fri Sep 21 20:08:36 2001 --- src/os_unix.c Thu Oct 25 16:09:46 2001 *************** *** 1793,1799 **** --- 1793,1803 ---- char_u *s; int len; { + # ifdef VAXC + vaxc$gethostname((char *)s, len); + # else gethostname((char *)s, len); + # endif } #endif /* HAVE_SYS_UTSNAME_H */ *** ../vim60.26/src/os_vms_conf.h Mon Aug 27 17:29:49 2001 --- src/os_vms_conf.h Thu Oct 25 11:43:42 2001 *************** *** 86,93 **** /* Define if struct sigcontext is present */ #define HAVE_SIGCONTEXT ! /* Define if touuper/tolower only work on lower/upercase characters */ ! /* #undef BROKEN_TOUPPER */ /* Define if tgetstr() has a second argument that is (char *) */ /* #undef TGETSTR_CHAR_P */ --- 86,93 ---- /* Define if struct sigcontext is present */ #define HAVE_SIGCONTEXT ! /* Define if toupper/tolower only work on lower/upercase characters */ ! /* #define BROKEN_TOUPPER */ /* Define if tgetstr() has a second argument that is (char *) */ /* #undef TGETSTR_CHAR_P */ *************** *** 105,111 **** /* #undef HAVE_SIGSET */ #define HAVE_GETCWD - #define HAVE_SELECT #define HAVE_STRCSPN #define HAVE_STRTOL #define HAVE_TGETENT --- 105,110 ---- *************** *** 118,124 **** #define HAVE_FSYNC #define HAVE_GETPWUID #define HAVE_GETPWNAM - #define HAVE_SELECT #define HAVE_STDLIB_H #define HAVE_STRING_H #define HAVE_ERRNO_H --- 117,122 ---- *************** *** 134,146 **** #undef HAVE_UNION_WAIT #undef HAVE_SYS_SELECT_H #undef HAVE_SYS_UTSNAME_H #undef HAVE_TERMCAP_H #undef HAVE_SGTTY_H #undef HAVE_SYS_IOCTL_H #undef HAVE_TERMIO_H #undef HAVE_STROPTS_H - #undef HAVE_STRINGS_H - #undef HAVE_SYS_SYSTEMINFO_H #undef HAVE_SYS_STREAM_H #undef HAVE_SYS_PTEM_H #undef HAVE_TERMIOS_H --- 132,143 ---- #undef HAVE_UNION_WAIT #undef HAVE_SYS_SELECT_H #undef HAVE_SYS_UTSNAME_H + #undef HAVE_SYS_SYSTEMINFO_H #undef HAVE_TERMCAP_H #undef HAVE_SGTTY_H #undef HAVE_SYS_IOCTL_H #undef HAVE_TERMIO_H #undef HAVE_STROPTS_H #undef HAVE_SYS_STREAM_H #undef HAVE_SYS_PTEM_H #undef HAVE_TERMIOS_H *************** *** 150,185 **** #undef HAVE_PWD_H #undef HAVE_FCHDIR ! #ifdef VAX #undef HAVE_GETTIMEOFDAY #undef HAVE_USLEEP #undef HAVE_STRCASECMP #else #define HAVE_GETTIMEOFDAY #define HAVE_USLEEP ! #undef HAVE_STRCASECMP #endif #ifdef VAXC #undef HAVE_FCNTL_H #undef HAVE_UNISTD_H #undef HAVE_SYS_TIME_H #undef HAVE_LOCALE_H #define BROKEN_LOCALE #else #define HAVE_FCNTL_H #define HAVE_UNISTD_H 1 #define HAVE_SYS_TIME_H #define HAVE_LOCALE_H #endif ! #ifdef FEAT_GUI_MOTIF ! /* Define unless no X support found */ #define HAVE_X11 - - /* Define if you want to include fontset support. */ #define USE_FONTSET ! ! /* Define if your X has own locale library */ ! /* #undef X_LOCALE */ #endif --- 147,191 ---- #undef HAVE_PWD_H #undef HAVE_FCHDIR ! /* Hardware specific */ ! #ifdef VAX #undef HAVE_GETTIMEOFDAY #undef HAVE_USLEEP #undef HAVE_STRCASECMP + #undef HAVE_STRINGS_H #else #define HAVE_GETTIMEOFDAY #define HAVE_USLEEP ! #define HAVE_STRCASECMP ! #define HAVE_STRINGS_H #endif + /* Compiler specific */ #ifdef VAXC + #undef HAVE_SELECT #undef HAVE_FCNTL_H #undef HAVE_UNISTD_H #undef HAVE_SYS_TIME_H #undef HAVE_LOCALE_H #define BROKEN_LOCALE + #undef HAVE_ICONV_H + #undef HAVE_ICONV + #undef DYNAMIC_ICONV #else + #define HAVE_SELECT #define HAVE_FCNTL_H #define HAVE_UNISTD_H 1 #define HAVE_SYS_TIME_H #define HAVE_LOCALE_H + #define BROKEN_LOCALE + #undef HAVE_ICONV_H + #undef HAVE_ICONV + #undef DYNAMIC_ICONV #endif ! /* GUI support defines */ ! #ifdef FEAT_GUI_MOTIF #define HAVE_X11 #define USE_FONTSET ! #undef X_LOCALE #endif *** ../vim60.26/src/version.c Thu Oct 25 10:20:46 2001 --- src/version.c Thu Oct 25 16:30:38 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 27, /**/ -- Just think of all the things we haven't thought of yet. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.028 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.028 Problem: Can't compile without +virtualedit and with +visualextra. (Geza Lakner) Solution: Add an #ifdef for +virtualedit. Files: src/ops.c *** ../vim60.27/src/ops.c Wed Sep 19 12:39:06 2001 --- src/ops.c Sun Oct 28 16:38:35 2001 *************** *** 2134,2140 **** if (oap->op_type == OP_APPEND) { ! if (oap->block_mode && curwin->w_cursor.coladd == 0) { /* this lil bit if code adapted from nv_append() */ curwin->w_set_curswant = TRUE; --- 2135,2145 ---- if (oap->op_type == OP_APPEND) { ! if (oap->block_mode ! #ifdef FEAT_VIRTUALEDIT ! && curwin->w_cursor.coladd == 0 ! #endif ! ) { /* this lil bit if code adapted from nv_append() */ curwin->w_set_curswant = TRUE; *** ../vim60.27/src/version.c Thu Oct 25 16:34:24 2001 --- src/version.c Sun Oct 28 16:40:22 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 28, /**/ -- ARTHUR: You fight with the strength of many men, Sir knight. I am Arthur, King of the Britons. [pause] I seek the finest and the bravest knights in the land to join me in my Court of Camelot. [pause] You have proved yourself worthy; will you join me? [pause] You make me sad. So be it. Come, Patsy. BLACK KNIGHT: None shall pass. The Quest for the Holy Grail (Monty Python) /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.029 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.029 Problem: When making a change in line 1, then in line 2 and then deleting line 1, undo info could be wrong. Only when the changes are undone at once. (Gerhard Hochholzer) Solution: When not saving a line for undo because it was already done before, remember for which entry the last line must be computed. Added ue_getbot_entry pointer for this. When the number of lines changes, adjust the position of newer undo entries. Files: src/structs.h, src/undo.c *** ../vim60.28/src/structs.h Sun Sep 16 14:45:18 2001 --- src/structs.h Sun Oct 28 20:08:24 2001 *************** *** 232,237 **** --- 232,238 ---- u_header_T *uh_next; /* pointer to next header in list */ u_header_T *uh_prev; /* pointer to previous header in list */ u_entry_T *uh_entry; /* pointer to first entry */ + u_entry_T *uh_getbot_entry; /* pointer to where ue_bot must be set */ pos_T uh_cursor; /* cursor position before saving */ #ifdef FEAT_VIRTUALEDIT long uh_cursor_vcol; *** ../vim60.28/src/undo.c Fri Aug 24 09:57:23 2001 --- src/undo.c Sun Oct 28 21:03:26 2001 *************** *** 224,229 **** --- 224,230 ---- if (curbuf->b_u_newhead != NULL) curbuf->b_u_newhead->uh_prev = uhp; uhp->uh_entry = NULL; + uhp->uh_getbot_entry = NULL; uhp->uh_cursor = curwin->w_cursor; /* save cursor pos. for undo */ #ifdef FEAT_VIRTUALEDIT if (virtual_active() && curwin->w_cursor.coladd > 0) *************** *** 263,269 **** break; /* If lines have been inserted/deleted we give up. */ ! if (uep->ue_lcount == 0 ? (uep->ue_top + uep->ue_size + 1 != (uep->ue_bot == 0 ? curbuf->b_ml.ml_line_count + 1 --- 264,270 ---- break; /* If lines have been inserted/deleted we give up. */ ! if (curbuf->b_u_newhead->uh_getbot_entry != uep ? (uep->ue_top + uep->ue_size + 1 != (uep->ue_bot == 0 ? curbuf->b_ml.ml_line_count + 1 *************** *** 274,287 **** /* If it's the same line we can skip saving it again. */ if (uep->ue_size == 1 && uep->ue_top == top) { ! /* The line count might change. */ ! uep->ue_lcount = 0; if (newbot != 0) uep->ue_bot = newbot; else if (bot > curbuf->b_ml.ml_line_count) uep->ue_bot = 0; else uep->ue_lcount = curbuf->b_ml.ml_line_count; return OK; } uep = uep->ue_next; --- 275,313 ---- /* If it's the same line we can skip saving it again. */ if (uep->ue_size == 1 && uep->ue_top == top) { ! /* If it's not the last entry, get ue_bot for the last ! * entry now. Following deleted/inserted lines go to the ! * re-used entry. */ ! if (i > 0) ! u_getbot(); ! ! /* The line count might change afterwards. */ if (newbot != 0) + { + /* When changing the line count and it's not the + * newest entry, must adjust the line numbers of older + * entries. */ + if (uep != curbuf->b_u_newhead->uh_entry + && uep->ue_bot != newbot) + { + u_entry_T *p; + + for (p = curbuf->b_u_newhead->uh_entry; + p != uep; p = p->ue_next) + { + p->ue_bot -= uep->ue_bot - newbot; + p->ue_top -= uep->ue_bot - newbot; + } + } uep->ue_bot = newbot; + } else if (bot > curbuf->b_ml.ml_line_count) uep->ue_bot = 0; else + { uep->ue_lcount = curbuf->b_ml.ml_line_count; + curbuf->b_u_newhead->uh_getbot_entry = uep; + } return OK; } uep = uep->ue_next; *************** *** 310,316 **** uep->ue_size = size; uep->ue_top = top; - uep->ue_lcount = 0; if (newbot) uep->ue_bot = newbot; /* --- 336,341 ---- *************** *** 320,326 **** --- 345,354 ---- else if (bot > curbuf->b_ml.ml_line_count) uep->ue_bot = 0; else + { uep->ue_lcount = curbuf->b_ml.ml_line_count; + curbuf->b_u_newhead->uh_getbot_entry = uep; + } if (size) { *************** *** 732,751 **** u_getbot() { u_entry_T *uep; ! uep = u_get_headentry(); if (uep == NULL) return; ! if (uep->ue_lcount != 0) { /* * the new ue_bot is computed from the number of lines that has been * inserted (0 - deleted) since calling u_save. This is equal to the old * line count subtracted from the current line count. */ ! uep->ue_bot = uep->ue_top + uep->ue_size + 1 + ! (curbuf->b_ml.ml_line_count - uep->ue_lcount); if (uep->ue_bot < 1 || uep->ue_bot > curbuf->b_ml.ml_line_count) { EMSG(_("E440: undo line missing")); --- 760,781 ---- u_getbot() { u_entry_T *uep; + linenr_T extra; ! uep = u_get_headentry(); /* check for corrupt undo list */ if (uep == NULL) return; ! uep = curbuf->b_u_newhead->uh_getbot_entry; ! if (uep != NULL) { /* * the new ue_bot is computed from the number of lines that has been * inserted (0 - deleted) since calling u_save. This is equal to the old * line count subtracted from the current line count. */ ! extra = curbuf->b_ml.ml_line_count - uep->ue_lcount; ! uep->ue_bot = uep->ue_top + uep->ue_size + 1 + extra; if (uep->ue_bot < 1 || uep->ue_bot > curbuf->b_ml.ml_line_count) { EMSG(_("E440: undo line missing")); *************** *** 754,760 **** * without deleting the current * ones */ } ! uep->ue_lcount = 0; } curbuf->b_u_synced = TRUE; --- 784,802 ---- * without deleting the current * ones */ } ! ! /* If not the newest entry and lines have been inserted or deleted, ! * newer entries must have their line numbers adjusted. */ ! if (extra != 0) ! for (uep = curbuf->b_u_newhead->uh_entry; ! uep != curbuf->b_u_newhead->uh_getbot_entry; ! uep = uep->ue_next) ! { ! uep->ue_bot -= extra; ! uep->ue_top -= extra; ! } ! ! curbuf->b_u_newhead->uh_getbot_entry = NULL; } curbuf->b_u_synced = TRUE; *** ../vim60.28/src/version.c Sun Oct 28 16:41:29 2001 --- src/version.c Sun Oct 28 21:11:52 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 29, /**/ -- f y cn rd ths thn y cn hv grt jb n cmptr prgrmmng /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.030 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.030 Problem: Using ":source! file" doesn't work inside a loop or after ":argdo". (Pavol Juhas) Solution: Execute the commands in the file right away, do not let the main loop do it. Files: src/ex_cmds2.c, src/ex_docmd.c, src/getchar.c, src/globals.h, src/proto/ex_docmd.pro, src/proto/getchar.pro *** ../vim60.29/src/ex_cmds2.c Tue Sep 25 14:18:04 2001 --- src/ex_cmds2.c Thu Oct 25 10:08:24 2001 *************** *** 14,20 **** #include "vim.h" #include "version.h" ! static void cmd_source __ARGS((char_u *fname, int forceit)); #if defined(FEAT_EVAL) || defined(PROTO) --- 14,20 ---- #include "vim.h" #include "version.h" ! static void cmd_source __ARGS((char_u *fname, exarg_T *eap)); #if defined(FEAT_EVAL) || defined(PROTO) *************** *** 1454,1461 **** --- 1454,1463 ---- #endif /* execute the command */ + listcmd_busy = TRUE; do_cmdline(eap->arg, eap->getline, eap->cookie, DOCMD_VERBOSE + DOCMD_NOWAIT); + listcmd_busy = FALSE; if (eap->cmdidx == CMD_bufdo) { *************** *** 1693,1699 **** ex_options(eap) exarg_T *eap; { ! cmd_source((char_u *)SYS_OPTWIN_FILE, FALSE); } #endif --- 1695,1701 ---- ex_options(eap) exarg_T *eap; { ! cmd_source((char_u *)SYS_OPTWIN_FILE, NULL); } #endif *************** *** 1713,1737 **** NULL, NULL, eap->arg, BROWSE_FILTER_MACROS, curbuf); if (fname != NULL) { ! cmd_source(fname, eap->forceit); vim_free(fname); } } else #endif ! cmd_source(eap->arg, eap->forceit); } static void ! cmd_source(fname, forceit) char_u *fname; ! int forceit; { if (*fname == NUL) EMSG(_(e_argreq)); ! else if (forceit) /* :so! read vi commands */ ! (void)openscript(fname); ! /* :so read ex commands */ else if (do_source(fname, FALSE, FALSE) == FAIL) EMSG2(_(e_notopen), fname); } --- 1715,1752 ---- NULL, NULL, eap->arg, BROWSE_FILTER_MACROS, curbuf); if (fname != NULL) { ! cmd_source(fname, eap); vim_free(fname); } } else #endif ! cmd_source(eap->arg, eap); } static void ! cmd_source(fname, eap) char_u *fname; ! exarg_T *eap; { if (*fname == NUL) EMSG(_(e_argreq)); ! ! /* ":source!" read vi commands */ ! else if (eap != NULL && eap->forceit) ! /* Need to execute the commands directly when: ! * - ":g" command busy ! * - after ":argdo", ":windo" or ":bufdo" ! * - another command follows ! * - inside a loop ! */ ! openscript(fname, global_busy || listcmd_busy || eap->nextcmd != NULL ! #ifdef FEAT_EVAL ! || eap->cstack->cs_idx >= 0 ! #endif ! ); ! ! /* ":source" read ex commands */ else if (do_source(fname, FALSE, FALSE) == FAIL) EMSG2(_(e_notopen), fname); } *** ../vim60.29/src/ex_docmd.c Fri Oct 19 11:18:45 2001 --- src/ex_docmd.c Sat Oct 20 16:53:27 2001 *************** *** 276,282 **** #endif #ifdef FEAT_EX_EXTRA static void ex_normal __ARGS((exarg_T *eap)); - static void update_topline_cursor __ARGS((void)); static void ex_startinsert __ARGS((exarg_T *eap)); #else # define ex_normal ex_ni --- 276,281 ---- *************** *** 6777,6782 **** --- 6776,6794 ---- } } + /* + * Update w_topline, w_leftcol and the cursor position. + */ + void + update_topline_cursor() + { + check_cursor(); /* put cursor on valid line */ + update_topline(); + if (!curwin->w_p_wrap) + validate_cursor(); + update_curswant(); + } + #ifdef FEAT_EX_EXTRA /* * ":normal[!] {commands}": Execute normal mode commands. *************** *** 6937,6955 **** #ifdef FEAT_MBYTE vim_free(arg); #endif - } - - /* - * Update w_topline, w_leftcol and the cursor position. - */ - static void - update_topline_cursor() - { - check_cursor(); /* put cursor on valid line */ - update_topline(); - if (!curwin->w_p_wrap) - validate_cursor(); - update_curswant(); } /* --- 6949,6954 ---- *** ../vim60.29/src/getchar.c Sun Sep 16 14:38:55 2001 --- src/getchar.c Sat Oct 20 18:07:04 2001 *************** *** 1224,1244 **** } /* ! * open new script file for ":so!" command ! * return OK on success, FAIL on error */ ! int ! openscript(name) ! char_u *name; { - int oldcurscript; - oparg_T oa; - int save_State; - if (curscript + 1 == NSCRIPT) { EMSG(_(e_nesting)); ! return FAIL; } if (scriptin[curscript] != NULL) /* already reading script */ --- 1224,1240 ---- } /* ! * Open a new script file for the ":source!" command. */ ! void ! openscript(name, directly) ! char_u *name; ! int directly; /* when TRUE execute directly */ { if (curscript + 1 == NSCRIPT) { EMSG(_(e_nesting)); ! return; } if (scriptin[curscript] != NULL) /* already reading script */ *************** *** 1250,1281 **** EMSG2(_(e_notopen), name); if (curscript) --curscript; ! return FAIL; } if (save_typebuf() == FAIL) ! return FAIL; /* ! * With command ":g/pat/so! file" we have to execute the ! * commands from the file now. */ ! if (global_busy) { ! clear_oparg(&oa); ! save_State = State; State = NORMAL; oldcurscript = curscript; do { ! check_cursor(); /* put cursor on an existing line */ ! normal_cmd(&oa, FALSE); ! vpeekc(); /* check for end of file */ } while (scriptin[oldcurscript] != NULL); State = save_State; } - - return OK; } /* --- 1246,1294 ---- EMSG2(_(e_notopen), name); if (curscript) --curscript; ! return; } if (save_typebuf() == FAIL) ! return; /* ! * Execute the commands from the file right now when using ":source!" ! * after ":global" or ":argdo" or in a loop. Also when another command ! * follows. This means the display won't be updated. Don't do this ! * always, "make test" would fail. */ ! if (directly) { ! oparg_T oa; ! int oldcurscript; ! int save_State = State; ! int save_restart_edit = restart_edit; ! int save_insertmode = p_im; ! int save_finish_op = finish_op; ! int save_msg_scroll = msg_scroll; ! State = NORMAL; + msg_scroll = FALSE; /* no msg scrolling in Normal mode */ + restart_edit = 0; /* don't go to Insert mode */ + p_im = FALSE; /* don't use 'insertmode' */ + clear_oparg(&oa); + finish_op = FALSE; + oldcurscript = curscript; do { ! update_topline_cursor(); /* update cursor position and topline */ ! normal_cmd(&oa, FALSE); /* execute one command */ ! vpeekc(); /* check for end of file */ } while (scriptin[oldcurscript] != NULL); + State = save_State; + msg_scroll = save_msg_scroll; + restart_edit = save_restart_edit; + p_im = save_insertmode; + finish_op = save_finish_op; } } /* *** ../vim60.29/src/globals.h Fri Sep 28 22:19:57 2001 --- src/globals.h Sat Oct 20 17:49:38 2001 *************** *** 752,757 **** --- 752,759 ---- /* set after swap write error msg */ EXTERN int undo_off INIT(= FALSE); /* undo switched off for now */ EXTERN int global_busy INIT(= 0); /* set when :global is executing */ + EXTERN int listcmd_busy INIT(= FALSE); /* set when :argdo, :windo or + :bufdo is executing */ EXTERN int need_start_insertmode INIT(= FALSE); /* start insert mode soon */ EXTERN char_u *last_cmdline INIT(= NULL); /* last command line (for ":) */ *** ../vim60.29/src/proto/ex_docmd.pro Tue Sep 25 21:49:13 2001 --- src/proto/ex_docmd.pro Sat Oct 20 16:55:04 2001 *************** *** 29,34 **** --- 29,35 ---- void do_exedit __ARGS((exarg_T *eap, win_T *old_curwin)); void do_sleep __ARGS((long msec)); FILE *open_exfile __ARGS((char_u *fname, int forceit, char *mode)); + void update_topline_cursor __ARGS((void)); char_u *eval_vars __ARGS((char_u *src, int *usedlen, linenr_T *lnump, char_u **errormsg, char_u *srcstart)); char_u *expand_sfile __ARGS((char_u *arg)); int put_eol __ARGS((FILE *fd)); *** ../vim60.29/src/proto/getchar.pro Tue Sep 25 21:49:15 2001 --- src/proto/getchar.pro Sat Oct 20 17:23:58 2001 *************** *** 26,32 **** int alloc_typebuf __ARGS((void)); void free_typebuf __ARGS((void)); int save_typebuf __ARGS((void)); ! int openscript __ARGS((char_u *name)); int using_script __ARGS((void)); void updatescript __ARGS((int c)); int vgetc __ARGS((void)); --- 26,32 ---- int alloc_typebuf __ARGS((void)); void free_typebuf __ARGS((void)); int save_typebuf __ARGS((void)); ! void openscript __ARGS((char_u *name, int directly)); int using_script __ARGS((void)); void updatescript __ARGS((int c)); int vgetc __ARGS((void)); *** ../vim60.29/src/version.c Sun Oct 28 21:15:32 2001 --- src/version.c Sun Oct 28 21:17:56 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 30, /**/ -- BLACK KNIGHT: I move for no man. ARTHUR: So be it! [hah] [parry thrust] [ARTHUR chops the BLACK KNIGHT's left arm off] ARTHUR: Now stand aside, worthy adversary. BLACK KNIGHT: 'Tis but a scratch. The Quest for the Holy Grail (Monty Python) /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.031 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.031 Problem: Nextstep doesn't have setenv() or putenv(). (John Beppu) Solution: Move putenv() from pty.c to misc2.c Files: src/misc2.c, src/pty.c *** ../vim60.30/src/misc2.c Sun Sep 30 10:53:07 2001 --- src/misc2.c Sun Oct 28 21:49:00 2001 *************** *** 5186,5188 **** --- 5187,5364 ---- #endif /*FEAT_PRINTER*/ + + /* + * The putenv() implementation below comes from the "screen" program. + * Included with permission from Juergen Weigert. + * See pty.c for the copyright notice. + */ + + /* + * putenv -- put value into environment + * + * Usage: i = putenv (string) + * int i; + * char *string; + * + * where string is of the form =. + * Putenv returns 0 normally, -1 on error (not enough core for malloc). + * + * Putenv may need to add a new name into the environment, or to + * associate a value longer than the current value with a particular + * name. So, to make life simpler, putenv() copies your entire + * environment into the heap (i.e. malloc()) from the stack + * (i.e. where it resides when your process is initiated) the first + * time you call it. + * + * (history removed, not very interesting. See the "screen" sources.) + */ + + #if !defined(HAVE_SETENV) && !defined(HAVE_PUTENV) + + #define EXTRASIZE 5 /* increment to add to env. size */ + + static int envsize = -1; /* current size of environment */ + #ifndef MACOS + extern + #endif + char **environ; /* the global which is your env. */ + + static int findenv __ARGS((char *name)); /* look for a name in the env. */ + static int newenv __ARGS((void)); /* copy env. from stack to heap */ + static int moreenv __ARGS((void)); /* incr. size of env. */ + + int + putenv(string) + const char *string; + { + int i; + char *p; + + if (envsize < 0) + { /* first time putenv called */ + if (newenv() < 0) /* copy env. to heap */ + return -1; + } + + i = findenv((char *)string); /* look for name in environment */ + + if (i < 0) + { /* name must be added */ + for (i = 0; environ[i]; i++); + if (i >= (envsize - 1)) + { /* need new slot */ + if (moreenv() < 0) + return -1; + } + p = (char *)alloc((unsigned)(strlen(string) + 1)); + if (p == NULL) /* not enough core */ + return -1; + environ[i + 1] = 0; /* new end of env. */ + } + else + { /* name already in env. */ + p = vim_realloc(environ[i], strlen(string) + 1); + if (p == NULL) + return -1; + } + sprintf(p, "%s", string); /* copy into env. */ + environ[i] = p; + + return 0; + } + + static int + findenv(name) + char *name; + { + char *namechar, *envchar; + int i, found; + + found = 0; + for (i = 0; environ[i] && !found; i++) + { + envchar = environ[i]; + namechar = name; + while (*namechar && *namechar != '=' && (*namechar == *envchar)) + { + namechar++; + envchar++; + } + found = ((*namechar == '\0' || *namechar == '=') && *envchar == '='); + } + return found ? i - 1 : -1; + } + + static int + newenv() + { + char **env, *elem; + int i, esize; + + #ifdef MACOS + /* for Mac a new, empty environment is created */ + i = 0; + #else + for (i = 0; environ[i]; i++) + ; + #endif + esize = i + EXTRASIZE + 1; + env = (char **)alloc((unsigned)(esize * sizeof (elem))); + if (env == NULL) + return -1; + + #ifndef MACOS + for (i = 0; environ[i]; i++) + { + elem = (char *)alloc((unsigned)(strlen(environ[i]) + 1)); + if (elem == NULL) + return -1; + env[i] = elem; + strcpy(elem, environ[i]); + } + #endif + + env[i] = 0; + environ = env; + envsize = esize; + return 0; + } + + static int + moreenv() + { + int esize; + char **env; + + esize = envsize + EXTRASIZE; + env = (char **)vim_realloc((char *)environ, esize * sizeof (*env)); + if (env == 0) + return -1; + environ = env; + envsize = esize; + return 0; + } + + # ifdef USE_VIMPTY_GETENV + char_u * + vimpty_getenv(string) + const char_u *string; + { + int i; + char_u *p; + + if (envsize < 0) + return NULL; + + i = findenv((char *)string); + + if (i < 0) + return NULL; + + p = vim_strchr((char_u *)environ[i], '='); + return (p + 1); + } + # endif + + #endif /* !defined(HAVE_SETENV) && !defined(HAVE_PUTENV) */ *** ../vim60.30/src/pty.c Sat Jul 28 12:34:41 2001 --- src/pty.c Sun Oct 28 21:46:44 2001 *************** *** 9,15 **** /* * The stuff in this file mostly comes from the "screen" program. * Included with permission from Juergen Weigert. ! * Copied from "pty.c" and "putenv.c". * * It has been modified to work better with Vim. * The parts that are not used in Vim have been deleted. --- 9,15 ---- /* * The stuff in this file mostly comes from the "screen" program. * Included with permission from Juergen Weigert. ! * Copied from "pty.c". "putenv.c" was used for putenv() in misc2.c. * * It has been modified to work better with Vim. * The parts that are not used in Vim have been deleted. *************** *** 423,597 **** return -1; } #endif - - /* putenv.c */ - - /* - * putenv -- put value into environment - * - * Usage: i = putenv (string) - * int i; - * char *string; - * - * where string is of the form =. - * Putenv returns 0 normally, -1 on error (not enough core for malloc). - * - * Putenv may need to add a new name into the environment, or to - * associate a value longer than the current value with a particular - * name. So, to make life simpler, putenv() copies your entire - * environment into the heap (i.e. malloc()) from the stack - * (i.e. where it resides when your process is initiated) the first - * time you call it. - * - * (history removed, not very interesting. See the "screen" sources.) - */ - /* RCS_ID("$Id: pty.c,v 1.2 1999/09/19 19:50:51 mool Exp $ FAU") */ - - #if !defined(HAVE_SETENV) && !defined(HAVE_PUTENV) - - #define EXTRASIZE 5 /* increment to add to env. size */ - - static int envsize = -1; /* current size of environment */ - #ifndef MACOS - extern - #endif - char **environ; /* the global which is your env. */ - - static int findenv __ARGS((char *name)); /* look for a name in the env. */ - static int newenv __ARGS((void)); /* copy env. from stack to heap */ - static int moreenv __ARGS((void)); /* incr. size of env. */ - - int - putenv(string) - const char *string; - { - int i; - char *p; - - if (envsize < 0) - { /* first time putenv called */ - if (newenv() < 0) /* copy env. to heap */ - return -1; - } - - i = findenv((char *)string); /* look for name in environment */ - - if (i < 0) - { /* name must be added */ - for (i = 0; environ[i]; i++); - if (i >= (envsize - 1)) - { /* need new slot */ - if (moreenv() < 0) - return -1; - } - p = (char *)alloc((unsigned)(strlen(string) + 1)); - if (p == NULL) /* not enough core */ - return -1; - environ[i + 1] = 0; /* new end of env. */ - } - else - { /* name already in env. */ - p = vim_realloc(environ[i], strlen(string) + 1); - if (p == NULL) - return -1; - } - sprintf(p, "%s", string); /* copy into env. */ - environ[i] = p; - - return 0; - } - - static int - findenv(name) - char *name; - { - char *namechar, *envchar; - int i, found; - - found = 0; - for (i = 0; environ[i] && !found; i++) - { - envchar = environ[i]; - namechar = name; - while (*namechar && *namechar != '=' && (*namechar == *envchar)) - { - namechar++; - envchar++; - } - found = ((*namechar == '\0' || *namechar == '=') && *envchar == '='); - } - return found ? i - 1 : -1; - } - - static int - newenv() - { - char **env, *elem; - int i, esize; - - #ifdef MACOS - /* for Mac a new, empty environment is created */ - i = 0; - #else - for (i = 0; environ[i]; i++) - ; - #endif - esize = i + EXTRASIZE + 1; - env = (char **)alloc((unsigned)(esize * sizeof (elem))); - if (env == NULL) - return -1; - - #ifndef MACOS - for (i = 0; environ[i]; i++) - { - elem = (char *)alloc((unsigned)(strlen(environ[i]) + 1)); - if (elem == NULL) - return -1; - env[i] = elem; - strcpy(elem, environ[i]); - } - #endif - - env[i] = 0; - environ = env; - envsize = esize; - return 0; - } - - static int - moreenv() - { - int esize; - char **env; - - esize = envsize + EXTRASIZE; - env = (char **)vim_realloc((char *)environ, esize * sizeof (*env)); - if (env == 0) - return -1; - environ = env; - envsize = esize; - return 0; - } - - # ifdef USE_VIMPTY_GETENV - char_u * - vimpty_getenv(string) - const char_u *string; - { - int i; - char_u *p; - - if (envsize < 0) - return NULL; - - i = findenv((char *)string); - - if (i < 0) - return NULL; - - p = vim_strchr((char_u *)environ[i], '='); - return (p + 1); - } - # endif - - #endif /* !defined(HAVE_SETENV) && !defined(HAVE_PUTENV) */ --- 423,425 ---- *** ../vim60.30/src/version.c Sun Oct 28 21:23:45 2001 --- src/version.c Sun Oct 28 21:51:26 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 31, /**/ -- -rwxr-xr-x 1 root 24 Oct 29 1929 /bin/ed -rwxr-xr-t 4 root 131720 Jan 1 1970 /usr/ucb/vi -rwxr-xr-x 1 root 5.89824e37 Oct 22 1990 /usr/bin/emacs /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.032 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.032 Problem: When changing a setting that affects all folds, they are not displayed immediately. Solution: Set the redraw flag in foldUpdateAll(). Files: src/fold.c *** ../vim60.31/src/fold.c Wed Sep 26 12:36:14 2001 --- src/fold.c Mon Oct 29 09:27:51 2001 *************** *** 836,841 **** --- 836,842 ---- win_T *win; { win->w_foldinvalid = TRUE; + redraw_later(NOT_VALID); } /* foldMoveTo() {{{2 */ *** ../vim60.31/src/version.c Sun Oct 28 21:57:01 2001 --- src/version.c Mon Oct 29 09:32:32 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 32, /**/ -- FATHER: You only killed the bride's father - that's all - LAUNCELOT: Oh dear, I didn't really mean to... FATHER: Didn't mean to? You put your sword right through his head! LAUNCELOT: Gosh - Is he all right? "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.033 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.033 Problem: Using 'wildmenu' on MS-Windows, file names that include a space are only displayed starting with that space. (Xie Yuheng) Solution: Don't recognize a backslash before a space as a path separator. Files: src/screen.c *** ../vim60.32/src/screen.c Fri Sep 28 22:19:57 2001 --- src/screen.c Mon Oct 29 14:36:57 2001 *************** *** 4324,4330 **** for (p = s; *p != NUL; ) { ! if (vim_ispathsep(*p)) had_sep = TRUE; else if (had_sep) { --- 4329,4339 ---- for (p = s; *p != NUL; ) { ! if (vim_ispathsep(*p) ! #ifdef BACKSLASH_IN_FILENAME ! && !rem_backslash(p) ! #endif ! ) had_sep = TRUE; else if (had_sep) { *** ../vim60.32/src/version.c Mon Oct 29 09:34:01 2001 --- src/version.c Mon Oct 29 14:39:33 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 33, /**/ -- CRONE: Who sent you? ARTHUR: The Knights Who Say Ni! CRONE: Aaaagh! (she looks around in rear) No! We have no shrubberies here. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.034 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.034 Problem: Calling searchpair() with three arguments could result in a crash or strange error message. (Kalle Bjorklid) Solution: Don't use the fifth argument when there is no fourth argument. Files: src/eval.c *** ../vim60.33/src/eval.c Fri Oct 19 19:36:36 2001 --- src/eval.c Mon Oct 29 15:09:18 2001 *************** *** 5201,5207 **** dir = get_search_arg(&argvars[3], &flags); /* may set p_ws */ /* Optional fifth argument: skip expresion */ ! if (argvars[4].var_type == VAR_UNKNOWN) skip = (char_u *)""; else skip = get_var_string_buf(&argvars[4], nbuf3); --- 5201,5208 ---- dir = get_search_arg(&argvars[3], &flags); /* may set p_ws */ /* Optional fifth argument: skip expresion */ ! if (argvars[3].var_type == VAR_UNKNOWN ! || argvars[4].var_type == VAR_UNKNOWN) skip = (char_u *)""; else skip = get_var_string_buf(&argvars[4], nbuf3); *** ../vim60.33/src/version.c Mon Oct 29 14:40:42 2001 --- src/version.c Mon Oct 29 15:10:33 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 34, /**/ -- There are three kinds of people: Those who can count & those who can't. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.035 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.035 Problem: The menu item Edit/Global_Settings/Toggle_Toolbar doesn't work when 'ignorecase' is set. (Allen Castaban) Solution: Always match case when checking if a flag is already present in 'guioptions'. Files: runtime/menu.vim *** ../vim60.34/runtime/menu.vim Thu Oct 25 16:34:24 2001 --- runtime/menu.vim Mon Oct 29 15:20:33 2001 *************** *** 203,209 **** fun! s:ToggleGuiOption(option) " If a:option is already set in guioptions, then we want to remove it ! if match(&guioptions, a:option) > -1 exec "set go-=" . a:option else exec "set go+=" . a:option --- 203,209 ---- fun! s:ToggleGuiOption(option) " If a:option is already set in guioptions, then we want to remove it ! if match(&guioptions, "\\C" . a:option) > -1 exec "set go-=" . a:option else exec "set go+=" . a:option *** ../vim60.34/src/version.c Mon Oct 29 15:15:20 2001 --- src/version.c Mon Oct 29 15:23:31 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 35, /**/ -- Mental Floss prevents moral decay! /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.036 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.036 Problem: OS/2, MS-DOS and MS-Windows: Using a path that starts with a slash in 'tags' doesn't work as expected. (Mathias Koehrer Solution: Only use the drive, not the whole path to the current directory. Also make it work for "c:dir/file". Files: src/misc2.c *** ../vim60.35/src/misc2.c Sun Oct 28 21:57:01 2001 --- src/misc2.c Mon Oct 29 17:14:44 2001 *************** *** 3532,3542 **** } else if (*path == NUL || !vim_isAbsName(path)) { ! if (mch_dirname(ff_expand_buffer, MAXPATHL) == OK) ! ff_search_ctx->ffsc_start_dir = vim_strsave(ff_expand_buffer); if (ff_search_ctx->ffsc_start_dir == NULL) goto error_return; } #ifdef FEAT_PATH_EXTRA --- 3533,3568 ---- } else if (*path == NUL || !vim_isAbsName(path)) { ! #ifdef BACKSLASH_IN_FILENAME ! /* "c:dir" needs "c:" to be expanded, otherwise use current dir */ ! if (path[1] == ':') ! { ! char_u drive[3]; ! ! drive[0] = path[0]; ! drive[1] = ':'; ! drive[2] = NUL; ! if (vim_FullName(drive, ff_expand_buffer, MAXPATHL, TRUE) == FAIL) ! goto error_return; ! path += 2; ! } ! else ! #endif ! if (mch_dirname(ff_expand_buffer, MAXPATHL) == FAIL) ! goto error_return; + ff_search_ctx->ffsc_start_dir = vim_strsave(ff_expand_buffer); if (ff_search_ctx->ffsc_start_dir == NULL) goto error_return; + + #ifdef BACKSLASH_IN_FILENAME + /* A path that starts with "/dir" is relative to the drive, not to the + * directory (but not for "//machine/dir"). Only use the drive name. */ + if ((*path == '/' || *path == '\\') + && path[1] != path[0] + && ff_search_ctx->ffsc_start_dir[1] == ':') + ff_search_ctx->ffsc_start_dir[2] = NUL; + #endif } #ifdef FEAT_PATH_EXTRA *** ../vim60.35/src/version.c Mon Oct 29 15:24:28 2001 --- src/version.c Mon Oct 29 16:38:23 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 36, /**/ -- Did you ever stop to think... and forget to start again? -- Steven Wright /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.037 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.037 Problem: When the user has set "did_install_syntax_menu" to avoid the default Syntax menu it still appears. (Virgilio) Solution: Don't add the three default items when "did_install_syntax_menu" is set. Files: runtime/menu.vim *** ../vim60.36/runtime/menu.vim Mon Oct 29 15:24:28 2001 --- runtime/menu.vim Mon Oct 29 21:06:23 2001 *************** *** 831,850 **** endif " !exists("did_install_default_menus") " Define these items always, so that syntax can be switched on when it wasn't. ! am 50.212 &Syntax.&Manual :syn manual ! am 50.214 &Syntax.A&utomatic :syn on ! am 50.216 &Syntax.on/off\ for\ &This\ file :call SynOnOff() ! if !exists("*s:SynOnOff") ! fun s:SynOnOff() ! if has("syntax_items") ! syn clear ! else ! if !exists("g:syntax_on") ! syn manual endif ! set syn=ON ! endif ! endfun endif --- 831,853 ---- endif " !exists("did_install_default_menus") " Define these items always, so that syntax can be switched on when it wasn't. ! " But skip them when the Syntax menu was disabled by the user. ! if !exists("did_install_syntax_menu") ! am 50.212 &Syntax.&Manual :syn manual ! am 50.214 &Syntax.A&utomatic :syn on ! am 50.216 &Syntax.on/off\ for\ &This\ file :call SynOnOff() ! if !exists("*s:SynOnOff") ! fun s:SynOnOff() ! if has("syntax_items") ! syn clear ! else ! if !exists("g:syntax_on") ! syn manual ! endif ! set syn=ON endif ! endfun ! endif endif *** ../vim60.36/src/version.c Mon Oct 29 17:19:02 2001 --- src/version.c Mon Oct 29 21:10:10 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 37, /**/ -- [Autumn changed into Winter ... Winter changed into Spring ... Spring changed back into Autumn and Autumn gave Winter and Spring a miss and went straight on into Summer ... Until one day ...] "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.038 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.038 Problem: When 'selection' is "exclusive", deleting a block of text at the end of a line can leave the cursor beyond the end of the line. Solution: Correct the cursor position. Files: src/ops.c *** ../vim60.37/src/ops.c Sun Oct 28 16:41:29 2001 --- src/ops.c Tue Oct 30 11:14:22 2001 *************** *** 1575,1581 **** ml_replace(lnum, newp, FALSE); } ! /* Put cursor back at start of changed block */ changed_lines(curwin->w_cursor.lnum, curwin->w_cursor.col, oap->end.lnum + 1, 0L); oap->line_count = 0; /* no lines deleted */ --- 1575,1581 ---- ml_replace(lnum, newp, FALSE); } ! check_cursor_col(); changed_lines(curwin->w_cursor.lnum, curwin->w_cursor.col, oap->end.lnum + 1, 0L); oap->line_count = 0; /* no lines deleted */ *** ../vim60.37/src/version.c Tue Oct 30 11:17:56 2001 --- src/version.c Tue Oct 30 11:17:22 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 38, /**/ -- ROBIN: The what? ARTHUR: The Holy Hand Grenade of Antioch. 'Tis one of the sacred relics Brother Maynard always carries with him. ALL: Yes. Of course. ARTHUR: (shouting) Bring up the Holy Hand Grenade! "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.039 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.039 Problem: "gP" leaves the cursor in the wrong position when 'virtualedit' is used. Using "c" in blockwise Visual mode leaves the cursor in a strange position. Solution: For "gP" reset the "coladd" field for the '] mark. For "c" leave the cursor on the last inserted character. Files: src/ops.c *** ../vim60.38/src/ops.c Tue Oct 30 11:19:49 2001 --- src/ops.c Tue Oct 30 14:33:31 2001 *************** *** 2304,2314 **** */ if ((ins_len = (long)STRLEN(firstline) - pre_textlen) > 0) { ! if ((ins_text = alloc_check((unsigned)(ins_len + 1))) != 0) { - /* put cursor at end of changed text */ - curwin->w_cursor = oap->end; - STRNCPY(ins_text, firstline + bd.textcol, ins_len); *(ins_text + ins_len) = NUL; for (linenr = oap->start.lnum + 1; linenr <= oap->end.lnum; --- 2305,2312 ---- */ if ((ins_len = (long)STRLEN(firstline) - pre_textlen) > 0) { ! if ((ins_text = alloc_check((unsigned)(ins_len + 1))) != NULL) { STRNCPY(ins_text, firstline + bd.textcol, ins_len); *(ins_text + ins_len) = NUL; for (linenr = oap->start.lnum + 1; linenr <= oap->end.lnum; *************** *** 2331,2341 **** mch_memmove(newp + bd.textcol + offset, oldp, STRLEN(oldp) + 1); ml_replace(linenr, newp, FALSE); - if (linenr == oap->end.lnum) - curwin->w_cursor.col = bd.textcol + ins_len - 1; } } - curwin->w_cursor.col = oap->start.col; check_cursor(); changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); --- 2329,2336 ---- *************** *** 3135,3140 **** --- 3130,3138 ---- /* adjust '] mark */ curbuf->b_op_end.lnum = curwin->w_cursor.lnum - 1; curbuf->b_op_end.col = bd.textcol + totlen - 1; + #ifdef FEAT_VIRTUALEDIT + curbuf->b_op_end.coladd = 0; + #endif if (flags & PUT_CURSEND) { curwin->w_cursor = curbuf->b_op_end; *************** *** 3375,3381 **** --- 3373,3385 ---- && gchar_cursor() == NUL && curwin->w_cursor.col && !(restart_edit || (State & INSERT))) + { --curwin->w_cursor.col; + #ifdef FEAT_VIRTUALEDIT + if (ve_flags == VE_ALL) + ++curwin->w_cursor.coladd; + #endif + } } #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) || defined(PROTO) *** ../vim60.38/src/version.c Tue Oct 30 11:19:49 2001 --- src/version.c Tue Oct 30 14:43:04 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 39, /**/ -- BROTHER MAYNARD: Armaments Chapter Two Verses Nine to Twenty One. ANOTHER MONK: And St. Attila raised his hand grenade up on high saying "O Lord bless this thy hand grenade that with it thou mayest blow thine enemies to tiny bits, in thy mercy. "and the Lord did grin and people did feast upon the lambs and sloths and carp and anchovies and orang-utans and breakfast cereals and fruit bats and... BROTHER MAYNARD: Skip a bit brother ... "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.040 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.040 Problem: When 'fileencoding' is invalid and writing fails because of this, the original file is gone. (Eric Carlier) Solution: Restore the original file from the backup. Files: src/fileio.c *** ../vim60.39/src/fileio.c Thu Sep 20 18:09:15 2001 --- src/fileio.c Tue Oct 30 19:59:18 2001 *************** *** 2183,2189 **** int backup_copy = FALSE; /* copy the original file? */ int dobackup; char_u *ffname; ! char_u *wfname; /* name of file to write to */ char_u *s; char_u *ptr; char_u c; --- 2183,2189 ---- int backup_copy = FALSE; /* copy the original file? */ int dobackup; char_u *ffname; ! char_u *wfname = NULL; /* name of file to write to */ char_u *s; char_u *ptr; char_u c; *************** *** 3016,3022 **** if (got_int) { errmsg = (char_u *)_(e_interr); ! goto fail; } } --- 3016,3022 ---- if (got_int) { errmsg = (char_u *)_(e_interr); ! goto restore_backup; } } *************** *** 3030,3036 **** if (mch_has_resource_fork(fname)) { errmsg = (char_u *)_("The resource fork will be lost (use ! to override)"); ! goto fail; } #endif --- 3030,3036 ---- if (mch_has_resource_fork(fname)) { errmsg = (char_u *)_("The resource fork will be lost (use ! to override)"); ! goto restore_backup; } #endif *************** *** 3119,3125 **** if (wfname == NULL) /* Can't write without a tempfile! */ { errmsg = (char_u *)_("E214: Can't find temp file for writing"); ! goto fail; } } # endif --- 3119,3125 ---- if (wfname == NULL) /* Can't write without a tempfile! */ { errmsg = (char_u *)_("E214: Can't find temp file for writing"); ! goto restore_backup; } } # endif *************** *** 3137,3143 **** if (!forceit) { errmsg = (char_u *)_("E213: Cannot convert (use ! to write without conversion)"); ! goto fail; } notconverted = TRUE; } --- 3137,3143 ---- if (!forceit) { errmsg = (char_u *)_("E213: Cannot convert (use ! to write without conversion)"); ! goto restore_backup; } notconverted = TRUE; } *************** *** 3156,3163 **** : (O_CREAT | O_TRUNC)) , 0666)) < 0) { - struct stat st; - /* * A forced write will try to create a new file if the old one is * still readonly. This may also happen when the directory is --- 3156,3161 ---- *************** *** 3196,3233 **** } } } ! /* ! * If we failed to open the file, we don't need a backup. Throw it ! * away. If we moved or removed the original file try to put the ! * backup in its place. ! */ ! if (backup != NULL && wfname == fname) { ! if (backup_copy) { ! /* ! * There is a small chance that we removed the original, try ! * to move the copy in its place. ! * This may not work if the vim_rename() fails. ! * In that case we leave the copy around. ! */ ! /* If file does not exist, put the copy in its place */ ! if (mch_stat((char *)fname, &st) < 0) vim_rename(backup, fname); ! /* if original file does exist throw away the copy */ ! if (mch_stat((char *)fname, &st) >= 0) ! mch_remove(backup); ! } ! else ! { ! /* try to put the original file back */ ! vim_rename(backup, fname); } - } ! /* if original file no longer exists give an extra warning */ ! if (!newfile && mch_stat((char *)fname, &st) < 0) ! end = 0; #ifdef FEAT_MBYTE if (wfname != fname) --- 3194,3237 ---- } } } ! ! restore_backup: { ! struct stat st; ! ! /* ! * If we failed to open the file, we don't need a backup. Throw it ! * away. If we moved or removed the original file try to put the ! * backup in its place. ! */ ! if (backup != NULL && wfname == fname) { ! if (backup_copy) ! { ! /* ! * There is a small chance that we removed the original, ! * try to move the copy in its place. ! * This may not work if the vim_rename() fails. ! * In that case we leave the copy around. ! */ ! /* If file does not exist, put the copy in its place */ ! if (mch_stat((char *)fname, &st) < 0) ! vim_rename(backup, fname); ! /* if original file does exist throw away the copy */ ! if (mch_stat((char *)fname, &st) >= 0) ! mch_remove(backup); ! } ! else ! { ! /* try to put the original file back */ vim_rename(backup, fname); ! } } ! /* if original file no longer exists give an extra warning */ ! if (!newfile && mch_stat((char *)fname, &st) < 0) ! end = 0; ! } #ifdef FEAT_MBYTE if (wfname != fname) *** ../vim60.39/src/version.c Tue Oct 30 14:52:27 2001 --- src/version.c Tue Oct 30 20:01:33 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 40, /**/ -- VOICE OVER: As the horrendous Black Beast lunged forward, escape for Arthur and his knights seemed hopeless, when, suddenly ... the animator suffered a fatal heart attack. ANIMATOR: Aaaaagh! VOICE OVER: The cartoon peril was no more ... The Quest for Holy Grail could continue. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.041 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.041 Problem: Using ":language messages en" when LC_MESSAGES is undefined results in setting LC_CTYPE. (Eric Carlier) Solution: Set $LC_MESSAGES instead. Files: src/ex_cmds2.c *** ../vim60.40/src/ex_cmds2.c Sun Oct 28 21:23:45 2001 --- src/ex_cmds2.c Tue Oct 30 20:32:04 2001 *************** *** 4628,4633 **** --- 4628,4638 ---- char_u *name; int what = LC_ALL; char *whatstr = ""; + #ifdef LC_MESSAGES + # define VIM_LC_MESSAGES LC_MESSAGES + #else + # define VIM_LC_MESSAGES 6789 + #endif name = eap->arg; *************** *** 4639,4649 **** { if (STRNICMP(eap->arg, "messages", p - eap->arg) == 0) { ! #ifdef LC_MESSAGES ! what = LC_MESSAGES; ! #else ! what = LC_CTYPE; ! #endif name = skipwhite(p); whatstr = "messages "; } --- 4644,4650 ---- { if (STRNICMP(eap->arg, "messages", p - eap->arg) == 0) { ! what = VIM_LC_MESSAGES; name = skipwhite(p); whatstr = "messages "; } *************** *** 4663,4674 **** if (*name == NUL) { ! smsg((char_u *)_("Current %slanguage: \"%s\""), ! whatstr, setlocale(what, NULL)); } else { ! loc = setlocale(what, (char *)name); if (loc == NULL) EMSG2(_("E197: Cannot set language to \"%s\""), name); else --- 4664,4695 ---- if (*name == NUL) { ! #ifndef LC_MESSAGES ! if (what == VIM_LC_MESSAGES) ! { ! p = vim_getenv("LC_ALL"); ! if (p == NULL || *p == NUL) ! { ! p = vim_getenv("LC_MESSAGES"); ! if (p == NULL || *p == NUL) ! p = vim_getenv("LANG"); ! } ! } ! else ! #endif ! p = setlocale(what, NULL); ! if (p == NULL || *p == NUL) ! p = "Unknown"; ! smsg((char_u *)_("Current %slanguage: \"%s\""), whatstr, p); } else { ! #ifndef LC_MESSAGES ! if (what == VIM_LC_MESSAGES) ! loc = ""; ! else ! #endif ! loc = setlocale(what, (char *)name); if (loc == NULL) EMSG2(_("E197: Cannot set language to \"%s\""), name); else *************** *** 4697,4705 **** /* Set $LC_CTYPE, because it overrules $LANG, and * gtk_set_locale() calls setlocale() again. gnome_init() * sets $LC_CTYPE to "en_US" (that's a bug!). */ ! #ifdef LC_MESSAGES ! if (what != LC_MESSAGES) ! #endif vim_setenv((char_u *)"LC_CTYPE", name); # ifdef FEAT_GUI_GTK /* Let GTK know what locale we're using. Not sure this is --- 4718,4724 ---- /* Set $LC_CTYPE, because it overrules $LANG, and * gtk_set_locale() calls setlocale() again. gnome_init() * sets $LC_CTYPE to "en_US" (that's a bug!). */ ! if (what != VIM_LC_MESSAGES) vim_setenv((char_u *)"LC_CTYPE", name); # ifdef FEAT_GUI_GTK /* Let GTK know what locale we're using. Not sure this is *** ../vim60.40/src/version.c Tue Oct 30 20:35:08 2001 --- src/version.c Tue Oct 30 20:34:45 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 41, /**/ -- BEDEVERE: Look! It's the old man from scene 24 - what's he Doing here? ARTHUR: He is the keeper of the Bridge. He asks each traveler five questions ... GALAHAD: Three questions. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.042 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.042 Problem: ":mksession" can't handle file names with a space. Solution: Escape special characters in file names with a backslash. Files: src/ex_docmd.c *** ../vim60.41/src/ex_docmd.c Sun Oct 28 21:23:45 2001 --- src/ex_docmd.c Tue Oct 30 21:16:12 2001 *************** *** 8417,8423 **** /* * Write a file name to the session file. ! * Takes care of the "slash" option in 'sessionoptions'. * Returns FAIL if writing fails. */ static int --- 8417,8424 ---- /* * Write a file name to the session file. ! * Takes care of the "slash" option in 'sessionoptions' and escapes special ! * characters. * Returns FAIL if writing fails. */ static int *************** *** 8433,8451 **** sname = home_replace_save(NULL, name); if (sname != NULL) name = sname; ! if (*flagp & SSOP_SLASH) { ! while (*name) { ! c = *name++; ! if (c == '\\') ! c = '/'; ! if (putc(c, fd) != c) retval = FAIL; } } - else if (fputs((char *)name, fd) < 0) - retval = FAIL; vim_free(sname); return retval; } --- 8434,8475 ---- sname = home_replace_save(NULL, name); if (sname != NULL) name = sname; ! while (*name != NUL) { ! #ifdef FEAT_MBYTE { ! int l; ! ! if (has_mbyte && (l = (*mb_ptr2len_check)(name)) > 1) ! { ! /* copy a multibyte char */ ! while (--l >= 0) ! { ! if (putc(*name, fd) != *name) ! retval = FAIL; ! ++name; ! } ! continue; ! } ! } ! #endif ! c = *name++; ! if (c == '\\' && (*flagp & SSOP_SLASH)) ! /* change a backslash to a forward slash */ ! c = '/'; ! else if (vim_strchr(escape_chars, c) != NULL ! #ifdef BACKSLASH_IN_FILENAME ! && c != '\\' ! #endif ! ) ! { ! /* escape a special character with a backslash */ ! if (putc('\\', fd) != '\\') retval = FAIL; } + if (putc(c, fd) != c) + retval = FAIL; } vim_free(sname); return retval; } *** ../vim60.41/src/version.c Tue Oct 30 20:43:43 2001 --- src/version.c Tue Oct 30 20:59:56 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 42, /**/ -- ARTHUR: No, hang on! Just answer the five questions ... GALAHAD: Three questions ... ARTHUR: Three questions ... And we shall watch ... and pray. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.043 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.043 Problem: Patch 6.0.041 was wrong. Solution: Use mch_getenv() instead of vim_getenv(). Files: src/ex_cmds2.c *** ../vim60.42/src/ex_cmds2.c Tue Oct 30 20:43:43 2001 --- src/ex_cmds2.c Wed Oct 31 10:10:45 2001 *************** *** 4667,4685 **** #ifndef LC_MESSAGES if (what == VIM_LC_MESSAGES) { ! p = vim_getenv("LC_ALL"); if (p == NULL || *p == NUL) { ! p = vim_getenv("LC_MESSAGES"); if (p == NULL || *p == NUL) ! p = vim_getenv("LANG"); } } else #endif ! p = setlocale(what, NULL); if (p == NULL || *p == NUL) ! p = "Unknown"; smsg((char_u *)_("Current %slanguage: \"%s\""), whatstr, p); } else --- 4667,4685 ---- #ifndef LC_MESSAGES if (what == VIM_LC_MESSAGES) { ! p = mch_getenv((char_u *)"LC_ALL"); if (p == NULL || *p == NUL) { ! p = mch_getenv((char_u *)"LC_MESSAGES"); if (p == NULL || *p == NUL) ! p = mch_getenv((char_u *)"LANG"); } } else #endif ! p = (char_u *)setlocale(what, NULL); if (p == NULL || *p == NUL) ! p = (char_u *)"Unknown"; smsg((char_u *)_("Current %slanguage: \"%s\""), whatstr, p); } else *** ../vim60.42/src/version.c Tue Oct 30 21:18:36 2001 --- src/version.c Wed Oct 31 10:08:33 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 43, /**/ -- It is illegal for anyone to give lighted cigars to dogs, cats, and other domesticated animal kept as pets. [real standing law in Illinois, United States of America] /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.044 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.044 Problem: Using a "containedin" list for a syntax item doesn't work for an item that doesn't have a "contains" argument. Also, "containedin" doesn't ignore a transparent item. (Timo Frenay) Solution: When there is a "containedin" argument somewhere, always check for contained items. Don't check for the transparent item but the item it's contained in. Files: src/structs.h, src/syntax.c *** ../vim60.43/src/structs.h Sun Oct 28 21:15:32 2001 --- src/structs.h Wed Oct 31 10:34:45 2001 *************** *** 1018,1023 **** --- 1018,1025 ---- int b_syn_ic; /* ignore case for :syn cmds */ garray_T b_syn_patterns; /* table for syntax patterns */ garray_T b_syn_clusters; /* table for syntax clusters */ + int b_syn_containedin; /* TRUE when there is an item with a + "containedin" argument */ int b_syn_sync_flags; /* flags about how to sync */ short b_syn_sync_id; /* group to sync on */ long b_syn_sync_minlines; /* minimal sync lines offset */ *** ../vim60.43/src/syntax.c Mon Oct 22 18:52:01 2001 --- src/syntax.c Wed Oct 31 11:11:24 2001 *************** *** 174,179 **** --- 174,180 ---- #define HL_FOLD 0x2000 /* define fold */ #define HL_EXTEND 0x4000 /* ignore a keepend */ #define HL_MATCHCONT 0x8000 /* match continued from previous line */ + #define HL_TRANS_CONT 0x10000 /* transparent item without contains arg */ #define SYN_ITEMS(buf) ((synpat_T *)((buf)->b_syn_patterns.ga_data)) *************** *** 1772,1784 **** * 1. Check for a current state. * Only when there is no current state, or if the current state may * contain other things, we need to check for keywords and patterns. */ if (current_state.ga_len) cur_si = &CUR_STATE(current_state.ga_len - 1); else cur_si = NULL; ! if (cur_si == NULL || cur_si->si_cont_list != NULL) { /* * 2. Check for keywords, if on a keyword char after a non-keyword --- 1773,1788 ---- * 1. Check for a current state. * Only when there is no current state, or if the current state may * contain other things, we need to check for keywords and patterns. + * Always need to check for contained items if some item has the + * "containedin" argument (takes extra time!). */ if (current_state.ga_len) cur_si = &CUR_STATE(current_state.ga_len - 1); else cur_si = NULL; ! if (curbuf->b_syn_containedin || cur_si == NULL ! || cur_si->si_cont_list != NULL) { /* * 2. Check for keywords, if on a keyword char after a non-keyword *************** *** 2387,2393 **** --- 2391,2400 ---- sip->si_attr = CUR_STATE(idx - 1).si_attr; sip->si_trans_id = CUR_STATE(idx - 1).si_trans_id; if (sip->si_cont_list == NULL) + { + sip->si_flags |= HL_TRANS_CONT; sip->si_cont_list = CUR_STATE(idx - 1).si_cont_list; + } } } } *************** *** 3001,3006 **** --- 3008,3014 ---- int i; curbuf->b_syn_ic = FALSE; /* Use case, by default */ + curbuf->b_syn_containedin = FALSE; /* free the keywords */ free_keywtab(buf->b_keywtab); *************** *** 3884,3889 **** --- 3892,3899 ---- ktab->k_syn.inc_tag = current_syn_inc_tag; ktab->flags = flags; ktab->k_syn.cont_in_list = copy_id_list(cont_in_list); + if (cont_in_list != NULL) + curbuf->b_syn_containedin = TRUE; ktab->next_list = copy_id_list(next_list); if (curbuf->b_syn_ic) *************** *** 4397,4402 **** --- 4407,4414 ---- SYN_ITEMS(curbuf)[idx].sp_sync_idx = sync_idx; SYN_ITEMS(curbuf)[idx].sp_cont_list = cont_list; SYN_ITEMS(curbuf)[idx].sp_syn.cont_in_list = cont_in_list; + if (cont_in_list != NULL) + curbuf->b_syn_containedin = TRUE; SYN_ITEMS(curbuf)[idx].sp_next_list = next_list; ++curbuf->b_syn_patterns.ga_len; --curbuf->b_syn_patterns.ga_room; *************** *** 4637,4642 **** --- 4649,4656 ---- SYN_ITEMS(curbuf)[idx].sp_cont_list = cont_list; SYN_ITEMS(curbuf)[idx].sp_syn.cont_in_list = cont_in_list; + if (cont_in_list != NULL) + curbuf->b_syn_containedin = TRUE; SYN_ITEMS(curbuf)[idx].sp_next_list = next_list; } ++curbuf->b_syn_patterns.ga_len; *************** *** 5516,5527 **** int r; /* If spp has a "containedin" list and "cur_si" is in it, return TRUE. */ ! if (cur_si != NULL ! && ssp->cont_in_list != NULL ! && in_id_list(NULL, ssp->cont_in_list, &(SYN_ITEMS(syn_buf)[cur_si->si_idx].sp_syn), SYN_ITEMS(syn_buf)[cur_si->si_idx].sp_flags & HL_CONTAINED)) return TRUE; /* * If list is ID_LIST_ALL, we are in a transparent item that isn't --- 5530,5548 ---- int r; /* If spp has a "containedin" list and "cur_si" is in it, return TRUE. */ ! if (cur_si != NULL && ssp->cont_in_list != NULL) ! { ! /* Ignore transparent items without a contains argument. */ ! while (cur_si->si_flags & HL_TRANS_CONT) ! --cur_si; ! if (in_id_list(NULL, ssp->cont_in_list, &(SYN_ITEMS(syn_buf)[cur_si->si_idx].sp_syn), SYN_ITEMS(syn_buf)[cur_si->si_idx].sp_flags & HL_CONTAINED)) return TRUE; + } + + if (list == NULL) + return FALSE; /* * If list is ID_LIST_ALL, we are in a transparent item that isn't *** ../vim60.43/src/version.c Wed Oct 31 10:12:03 2001 --- src/version.c Wed Oct 31 11:14:14 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 44, /**/ -- Citizens are not allowed to attend a movie house or theater nor ride in a public streetcar within at least four hours after eating garlic. [real standing law in Indiana, United States of America] /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.045 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.045 Problem: After creating a fold with a Visual selection, another window with the same buffer still has inverted text. (Sami Salonen) Solution: Redraw the inverted text. Files: src/normal.c *** ../vim60.44/src/normal.c Tue Oct 23 16:54:23 2001 --- src/normal.c Wed Oct 31 11:51:54 2001 *************** *** 1633,1641 **** && vim_strchr(p_cpo, CPO_EMPTYREGION) != NULL); #ifdef FEAT_VISUAL ! /* Force a redraw when operating on an empty Visual region or when ! * 'modifiable is off. */ ! if (oap->is_VIsual && (oap->empty || !curbuf->b_p_ma)) redraw_curbuf_later(INVERTED); #endif --- 1632,1644 ---- && vim_strchr(p_cpo, CPO_EMPTYREGION) != NULL); #ifdef FEAT_VISUAL ! /* Force a redraw when operating on an empty Visual region, when ! * 'modifiable is off or creating a fold. */ ! if (oap->is_VIsual && (oap->empty || !curbuf->b_p_ma ! # ifdef FEAT_FOLDING ! || oap->op_type == OP_FOLD ! # endif ! )) redraw_curbuf_later(INVERTED); #endif *** ../vim60.44/src/version.c Wed Oct 31 11:17:27 2001 --- src/version.c Wed Oct 31 11:54:20 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 45, /**/ -- Why don't cannibals eat clowns? Because they taste funny. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.046 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.046 Problem: When getrlimit() returns an 8 byte number the check for running out of stack may fail. (Anthony Meijer) Solution: Skip the stack check if the limit doesn't fit in a long. Files: src/auto/configure, src/config.h.in, src/configure.in, src/os_unix.c *** ../vim60.45/src/auto/configure Fri Sep 28 17:39:10 2001 --- src/auto/configure Wed Oct 31 13:52:02 2001 *************** *** 5145,5158 **** fi echo $ac_n "checking for stack_t""... $ac_c" 1>&6 ! echo "configure:5151: checking for stack_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_stack_t'+set}'`\" = set"; then echo "$ac_t""(cached) $ac_cv_type_stack_t" 1>&6 else cat > conftest.$ac_ext <&6 + echo "configure:5150: checking for rlim_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_rlim_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS + #include + #include + #endif + EOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "(^|[^a-zA-Z_0-9])rlim_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_type_rlim_t=yes + else + rm -rf conftest* + ac_cv_type_rlim_t=no + fi + rm -f conftest* + + fi + echo "$ac_t""$ac_cv_type_rlim_t" 1>&6 + if test $ac_cv_type_rlim_t = no; then + cat >> confdefs.h <<\EOF + #define rlim_t unsigned long + EOF + + fi + echo $ac_n "checking for stack_t""... $ac_c" 1>&6 ! echo "configure:5184: checking for stack_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_stack_t'+set}'`\" = set"; then echo "$ac_t""(cached) $ac_cv_type_stack_t" 1>&6 else cat > conftest.$ac_ext < doesn't define. */ #undef dev_t + /* Define to `unsigned long' if doesn't define. */ + #undef rlim_t + /* Define to `struct sigaltstack' if doesn't define. */ #undef stack_t *** ../vim60.45/src/configure.in Fri Sep 28 17:39:10 2001 --- src/configure.in Wed Oct 31 13:49:25 2001 *************** *** 1405,1410 **** --- 1405,1411 ---- AC_HEADER_TIME AC_CHECK_TYPE(ino_t, long) AC_CHECK_TYPE(dev_t, unsigned) + AC_CHECK_TYPE(rlim_t, unsigned long) AC_MSG_CHECKING(for stack_t) if eval "test \"`echo '$''{'ac_cv_type_stack_t'+set}'`\" = set"; then *** ../vim60.45/src/os_unix.c Thu Oct 25 16:34:24 2001 --- src/os_unix.c Wed Oct 31 13:46:36 2001 *************** *** 428,433 **** --- 428,434 ---- struct rlimit rlp; if (getrlimit(RLIMIT_DATA, &rlp) == 0 + && rlp.rlim_cur < ((rlim_t)1 << (sizeof(long_u) * 8 - 1)) # ifdef RLIM_INFINITY && rlp.rlim_cur != RLIM_INFINITY # endif *************** *** 544,551 **** struct rlimit rlp; int i; ! /* Set the stack limit to 15/16 of the allowable size. */ if (getrlimit(RLIMIT_STACK, &rlp) == 0 # ifdef RLIM_INFINITY && rlp.rlim_cur != RLIM_INFINITY # endif --- 545,554 ---- struct rlimit rlp; int i; ! /* Set the stack limit to 15/16 of the allowable size. Skip this when the ! * limit doesn't fit in a long (rlim_cur might be "long long"). */ if (getrlimit(RLIMIT_STACK, &rlp) == 0 + && rlp.rlim_cur < ((rlim_t)1 << (sizeof(long_u) * 8 - 1)) # ifdef RLIM_INFINITY && rlp.rlim_cur != RLIM_INFINITY # endif *** ../vim60.45/src/version.c Wed Oct 31 11:56:35 2001 --- src/version.c Wed Oct 31 14:12:00 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 46, /**/ -- No man may purchase alcohol without written consent from his wife. [real standing law in Pennsylvania, United States of America] /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.047 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.047 Problem: Using a regexp with "\(\)" inside a "\%[]" item causes a crash. (Samuel Lacas) Solution: Don't allow nested atoms inside "\%[]". Files: src/regexp.c *** ../vim60.46/src/regexp.c Wed Oct 24 19:41:55 2001 --- src/regexp.c Wed Oct 31 14:49:48 2001 *************** *** 316,321 **** --- 316,322 ---- #define EMSG_RET_NULL(m) { EMSG(_(m)); rc_did_emsg = TRUE; return NULL; } #define EMSG_M_RET_NULL(m, c) { EMSG2(_(m), c ? "" : "\\"); rc_did_emsg = TRUE; return NULL; } #define EMSG_RET_FAIL(m) { EMSG(_(m)); rc_did_emsg = TRUE; return FAIL; } + #define EMSG_ONE_RET_NULL EMSG_M_RET_NULL("E369: invalid item in %s%%[]", reg_magic == MAGIC_ALL) #define MAX_LIMIT (32767L << 16L) *************** *** 1444,1449 **** --- 1445,1452 ---- break; case Magic('('): + if (one_exactly) + EMSG_ONE_RET_NULL; ret = reg(REG_PAREN, &flags); if (ret == NULL) return NULL; *************** *** 1526,1531 **** --- 1529,1536 ---- { case '(': if (reg_do_extmatch != REX_SET) EMSG_RET_NULL("E66: \\z( not allowed here"); + if (one_exactly) + EMSG_ONE_RET_NULL; ret = reg(REG_ZPAREN, &flags); if (ret == NULL) return NULL; *************** *** 1565,1570 **** --- 1570,1577 ---- { /* () without a back reference */ case '(': + if (one_exactly) + EMSG_ONE_RET_NULL; ret = reg(REG_NPAREN, &flags); if (ret == NULL) return NULL; *************** *** 1588,1593 **** --- 1595,1602 ---- /* \%[abc]: Emit as a list of branches, all ending at the last * branch which matches nothing. */ case '[': + if (one_exactly) /* doesn't nest */ + EMSG_ONE_RET_NULL; { char_u *lastbranch; char_u *lastnode = NULL; *** ../vim60.46/src/version.c Wed Oct 31 14:21:02 2001 --- src/version.c Wed Oct 31 14:52:47 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 47, /**/ -- It is illegal to take more than three sips of beer at a time while standing. [real standing law in Texas, United States of America] /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.048 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.048 Problem: Win32: In the console the mouse doesn't always work correctly. Sometimes after getting focus a mouse movement is interpreted like a button click. Solution: Use a different function to obtain the number of mouse buttons. Avoid recognizing a button press from undefined bits. (Vince Negri) Files: src/os_win32.c *** ../vim60.47/src/os_win32.c Fri Sep 21 11:46:49 2001 --- src/os_win32.c Wed Oct 31 15:19:44 2001 *************** *** 768,773 **** --- 768,775 ---- static s_dwLastClickTime = 0; static BOOL s_fNextIsMiddle = FALSE; + static int cButtons = 0; /* number of buttons supported */ + const DWORD LEFT = FROM_LEFT_1ST_BUTTON_PRESSED; const DWORD MIDDLE = FROM_LEFT_2ND_BUTTON_PRESSED; const DWORD RIGHT = RIGHTMOST_BUTTON_PRESSED; *************** *** 775,780 **** --- 777,785 ---- int nButton; + if (cButtons == 0 && !GetNumberOfConsoleMouseButtons(&cButtons)) + cButtons = 2; + if (!g_fMouseAvail || !g_fMouseActive) { g_nMouseClick = -1; *************** *** 805,811 **** } /* If no buttons are pressed... */ ! if (pmer->dwButtonState == 0) { /* If the last thing returned was MOUSE_RELEASE, ignore this */ if (s_fReleased) --- 810,816 ---- } /* If no buttons are pressed... */ ! if ((pmer->dwButtonState & ((1 << cButtons) - 1)) == 0) { /* If the last thing returned was MOUSE_RELEASE, ignore this */ if (s_fReleased) *************** *** 816,823 **** } else /* one or more buttons pressed */ { - const int cButtons = GetSystemMetrics(SM_CMOUSEBUTTONS); - /* on a 2-button mouse, hold down left and right buttons * simultaneously to get MIDDLE. */ --- 821,826 ---- *************** *** 1198,1204 **** #ifdef FEAT_CLIENTSERVER (void)WaitForChar(-1L); ! if (!vim_is_input_buf_empty()) return 0; #endif if (ReadConsoleInput(g_hConIn, &ir, 1, &cRecords) == 0) --- 1201,1207 ---- #ifdef FEAT_CLIENTSERVER (void)WaitForChar(-1L); ! if (!vim_is_input_buf_empty() || g_nMouseClick != -1) return 0; #endif if (ReadConsoleInput(g_hConIn, &ir, 1, &cRecords) == 0) *************** *** 1266,1272 **** want_sniff_request = 0; return len; } ! else if(time < 0 || time > 250) { /* don't wait too long, a request might be pending */ time = 250; --- 1269,1275 ---- want_sniff_request = 0; return len; } ! else if (time < 0 || time > 250) { /* don't wait too long, a request might be pending */ time = 250; *** ../vim60.47/src/version.c Wed Oct 31 15:17:54 2001 --- src/version.c Wed Oct 31 15:17:29 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 48, /**/ -- A law to reduce crime states: "It is mandatory for a motorist with criminal intentions to stop at the city limits and telephone the chief of police as he is entering the town. [real standing law in Washington, United States of America] /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.049 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.049 Problem: When using evim the intro screen is misleading. (Adrian Nagle) Solution: Mention whether 'insertmode' is set and the menus to be used. Files: runtime/menu.vim, src/version.c *** ../vim60.48/runtime/menu.vim Tue Oct 30 21:41:46 2001 --- runtime/menu.vim Wed Oct 31 16:47:20 2001 *************** *** 54,64 **** amenu 9999.10 &Help.&Overview :help amenu 9999.20 &Help.&User\ Manual :help usr_toc amenu 9999.30 &Help.&How-to\ links :help how-to ! amenu 9999.40 &Help.&GUI :help gui amenu 9999.50 &Help.&Credits :help credits ! amenu 9999.60 &Help.Co&pying :help uganda ! amenu 9999.70 &Help.&Find\.\.\. :call Helpfind() ! amenu 9999.75 &Help.-sep- amenu 9999.80 &Help.&Version :version amenu 9999.90 &Help.&About :intro --- 54,65 ---- amenu 9999.10 &Help.&Overview :help amenu 9999.20 &Help.&User\ Manual :help usr_toc amenu 9999.30 &Help.&How-to\ links :help how-to ! amenu 9999.40 &Help.&Find\.\.\. :call Helpfind() ! amenu 9999.45 &Help.-sep1- amenu 9999.50 &Help.&Credits :help credits ! amenu 9999.60 &Help.Co&pying :help copying ! amenu 9999.70 &Help.O&rphans :help iccf ! amenu 9999.75 &Help.-sep2- amenu 9999.80 &Help.&Version :version amenu 9999.90 &Help.&About :intro *************** *** 171,176 **** --- 189,195 ---- amenu 20.440.130.70 &Edit.&Global\ Settings.&Virtual\ Edit.Block\ and\ Insert :set ve=block,insert amenu 20.440.130.80 &Edit.&Global\ Settings.&Virtual\ Edit.Always :set ve=all amenu 20.440.140 &Edit.&Global\ Settings.Toggle\ Insert\ &Mode:set\ im! :set im! + amenu 20.440.145 &Edit.&Global\ Settings.Toggle\ Vi\ C&ompatible:set\ cp! :set cp! amenu 20.440.150 &Edit.&Global\ Settings.Search\ &Path\.\.\. :call SearchP() amenu 20.440.160 &Edit.&Global\ Settings.Ta&g\ Files\.\.\. :call TagFiles() " *** ../vim60.48/src/version.c Wed Oct 31 15:20:56 2001 --- src/version.c Wed Oct 31 17:43:13 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 49, /**/ *************** *** 1025,1030 **** --- 1027,1033 ---- int i; int row; int blanklines; + char_u *p; static char *(lines[]) = { N_("VIM - Vi IMproved"), *************** *** 1045,1050 **** --- 1048,1075 ---- N_("type :set nocp for Vim defaults"), N_("type :help cp-default for info on this"), }; + #ifdef FEAT_GUI + static char *(gui_lines[]) = + { + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + N_("menu Help->Orphans for information "), + NULL, + N_("Running modeless, typed text is inserted"), + N_("menu Edit->Global Settings->Toggle Insert Mode "), + N_(" for two modes "), + NULL, + NULL, + NULL, + N_("menu Edit->Global Settings->Toggle Vi Compatible"), + N_(" for Vim defaults "), + }; + #endif /* blanklines = screen height - # message lines */ blanklines = (int)Rows - ((sizeof(lines) / sizeof(char *)) - 1); *************** *** 1069,1082 **** { for (i = 0; i < (int)(sizeof(lines) / sizeof(char *)); ++i) { ! if (lines[i] == NULL) { if (!p_cp) break; continue; } ! if (*lines[i] != NUL) ! do_intro_line(row, (char_u *)_(lines[i]), i == 2, 0); ++row; } #if defined(WIN3264) && !defined(FEAT_GUI_W32) --- 1094,1112 ---- { for (i = 0; i < (int)(sizeof(lines) / sizeof(char *)); ++i) { ! p = lines[i]; ! #ifdef FEAT_GUI ! if (p_im && gui.in_use && gui_lines[i] != NULL) ! p = gui_lines[i]; ! #endif ! if (p == NULL) { if (!p_cp) break; continue; } ! if (*p != NUL) ! do_intro_line(row, (char_u *)_(p), i == 2, 0); ++row; } #if defined(WIN3264) && !defined(FEAT_GUI_W32) -- Living on Earth includes an annual free trip around the Sun. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.050 (corrected version) Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.050 Problem: UTF-8: "viw" doesn't include non-ASCII characters before the cursor. (Bertilo Wennergren) Solution: Use dec_cursor() instead of decrementing the column number. Files: src/search.c *** ../vim60.49/src/search.c Fri Sep 14 22:26:10 2001 --- src/search.c Wed Oct 31 20:13:15 2001 *************** *** 2604,2613 **** { if (curwin->w_cursor.col == 0) /* stop at start of line */ break; ! --curwin->w_cursor.col; if (cls() != sclass) /* stop at start of word */ { ! ++curwin->w_cursor.col; break; } } --- 2604,2613 ---- { if (curwin->w_cursor.col == 0) /* stop at start of line */ break; ! dec_cursor(); if (cls() != sclass) /* stop at start of word */ { ! inc_cursor(); break; } } *** ../vim60.49/src/version.c Wed Oct 31 17:50:48 2001 --- src/version.c Wed Oct 31 20:14:29 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 50, /**/ -- Why is "abbreviation" such a long word? /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.051 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.051 Problem: UTF-8: Using CTRL-R on the command line doesn't insert composing characters. (Ron Aaron) Solution: Also include the composing characters and fix redrawing them. Files: src/ex_getln.c, src/ops.c *** ../vim60.50/src/ex_getln.c Wed Sep 19 20:02:13 2001 --- src/ex_getln.c Wed Oct 31 20:41:56 2001 *************** *** 2003,2009 **** if (c != 0) { /* Also backup the cursor position. */ ! c -= ptr2cells(ccline.cmdbuff + ccline.cmdpos); ccline.cmdspos -= c; msg_col -= c; if (msg_col < 0) --- 2003,2009 ---- if (c != 0) { /* Also backup the cursor position. */ ! c = ptr2cells(ccline.cmdbuff + ccline.cmdpos); ccline.cmdspos -= c; msg_col -= c; if (msg_col < 0) *** ../vim60.50/src/ops.c Tue Oct 30 14:52:27 2001 --- src/ops.c Wed Oct 31 20:25:02 2001 *************** *** 1372,1378 **** ++s; #ifdef FEAT_MBYTE if (has_mbyte) ! c = mb_ptr2char_adv(&s); else #endif c = *s++; --- 1372,1381 ---- ++s; #ifdef FEAT_MBYTE if (has_mbyte) ! { ! c = mb_ptr2char(s); ! s += mb_char2len(c); ! } else #endif c = *s++; *** ../vim60.50/src/version.c Wed Oct 31 20:19:20 2001 --- src/version.c Wed Oct 31 20:28:54 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 51, /**/ -- ARTHUR: CHARGE! [The mighty ARMY charges. Thundering noise of feet. Clatter of coconuts. Shouts etc. Suddenly there is a wail of a siren and a couple of police cars roar round in front of the charging ARMY and the POLICE leap out and stop them. TWO POLICEMAN and the HISTORIAN'S WIFE. Black Marias skid up behind them.] HISTORIAN'S WIFE: They're the ones, I'm sure. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.052 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.052 Problem: The check for rlim_t in patch 6.0.046 does not work on some systems. (Zdenek Sekera) Solution: Also look in sys/resource.h for rlim_t. Files: src/auto/configure, src/configure.in *** ../vim60.51/src/auto/configure Wed Oct 31 14:21:02 2001 --- src/auto/configure Wed Oct 31 21:57:52 2001 *************** *** 5145,5163 **** fi echo $ac_n "checking for rlim_t""... $ac_c" 1>&6 ! echo "configure:5150: checking for rlim_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_rlim_t'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS #include #include #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "(^|[^a-zA-Z_0-9])rlim_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then --- 5145,5169 ---- fi + echo $ac_n "checking for rlim_t""... $ac_c" 1>&6 ! echo "configure:5151: checking for rlim_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_rlim_t'+set}'`\" = set"; then ! echo "$ac_t""(cached) $ac_cv_type_rlim_t" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS #include #include #endif + #ifdef HAVE_SYS_RESOURCE_H + #include + #endif + EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "(^|[^a-zA-Z_0-9])rlim_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then *************** *** 5169,5194 **** fi rm -f conftest* fi - echo "$ac_t""$ac_cv_type_rlim_t" 1>&6 if test $ac_cv_type_rlim_t = no; then cat >> confdefs.h <<\EOF #define rlim_t unsigned long EOF - fi - echo $ac_n "checking for stack_t""... $ac_c" 1>&6 ! echo "configure:5184: checking for stack_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_stack_t'+set}'`\" = set"; then echo "$ac_t""(cached) $ac_cv_type_stack_t" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS #include --- 5175,5197 ---- fi rm -f conftest* + echo "$ac_t""$ac_cv_type_rlim_t" 1>&6 fi if test $ac_cv_type_rlim_t = no; then cat >> confdefs.h <<\EOF #define rlim_t unsigned long EOF fi echo $ac_n "checking for stack_t""... $ac_c" 1>&6 ! echo "configure:5188: checking for stack_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_stack_t'+set}'`\" = set"; then echo "$ac_t""(cached) $ac_cv_type_stack_t" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS #include *** ../vim60.51/src/configure.in Wed Oct 31 14:21:02 2001 --- src/configure.in Wed Oct 31 21:57:50 2001 *************** *** 1405,1411 **** AC_HEADER_TIME AC_CHECK_TYPE(ino_t, long) AC_CHECK_TYPE(dev_t, unsigned) ! AC_CHECK_TYPE(rlim_t, unsigned long) AC_MSG_CHECKING(for stack_t) if eval "test \"`echo '$''{'ac_cv_type_stack_t'+set}'`\" = set"; then --- 1405,1436 ---- AC_HEADER_TIME AC_CHECK_TYPE(ino_t, long) AC_CHECK_TYPE(dev_t, unsigned) ! ! AC_MSG_CHECKING(for rlim_t) ! if eval "test \"`echo '$''{'ac_cv_type_rlim_t'+set}'`\" = set"; then ! AC_MSG_RESULT([(cached) $ac_cv_type_rlim_t]) ! else ! AC_EGREP_CPP(dnl ! changequote(<<,>>)dnl ! <<(^|[^a-zA-Z_0-9])rlim_t[^a-zA-Z_0-9]>>dnl ! changequote([,]), ! [ ! #include ! #if STDC_HEADERS ! #include ! #include ! #endif ! #ifdef HAVE_SYS_RESOURCE_H ! #include ! #endif ! ], ac_cv_type_rlim_t=yes, ac_cv_type_rlim_t=no) ! AC_MSG_RESULT($ac_cv_type_rlim_t) ! fi ! if test $ac_cv_type_rlim_t = no; then ! cat >> confdefs.h <<\EOF ! #define rlim_t unsigned long ! EOF ! fi AC_MSG_CHECKING(for stack_t) if eval "test \"`echo '$''{'ac_cv_type_stack_t'+set}'`\" = set"; then *************** *** 1413,1419 **** else AC_EGREP_CPP(stack_t, [ - #include "confdefs.h" #include #if STDC_HEADERS #include --- 1438,1443 ---- *** ../vim60.51/src/version.c Wed Oct 31 20:51:33 2001 --- src/version.c Thu Nov 1 12:02:13 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 52, /**/ -- Mushrooms always grow in damp places and so they look like umbrellas. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.053 (extra) Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.053 (extra) Problem: Various problems with QNX. Solution: Minor fix for configure. Switch on terminal clipboard support in main.c. Fix "pterm" mouse support. os_qnx.c didn't build without photon. (Julian Kinraid) Files: src/auto/configure, src/configure.in, src/gui_photon.c, src/main.c, src/misc2.c, src/option.h, src/os_qnx.c, src/os_qnx.h, src/syntax.c *** ../vim60.52/src/auto/configure Thu Nov 1 12:04:29 2001 --- src/auto/configure Wed Oct 31 21:57:52 2001 *************** *** 3241,3247 **** case "$enable_gui" in no|No|NO) echo "$ac_t""no GUI support" 1>&6 ! SKIP_QNX=YES ;; yes|Yes|YES|"") echo "$ac_t""yes - automatic GUI support" 1>&6 ;; auto|Auto|AUTO|"") echo "$ac_t""auto - automatic GUI support" 1>&6 ;; photon|Photon|PHOTON) echo "$ac_t""Photon GUI support" 1>&6 ;; --- 3241,3247 ---- case "$enable_gui" in no|No|NO) echo "$ac_t""no GUI support" 1>&6 ! SKIP_PHOTON=YES ;; yes|Yes|YES|"") echo "$ac_t""yes - automatic GUI support" 1>&6 ;; auto|Auto|AUTO|"") echo "$ac_t""auto - automatic GUI support" 1>&6 ;; photon|Photon|PHOTON) echo "$ac_t""Photon GUI support" 1>&6 ;; *** ../vim60.52/src/configure.in Thu Nov 1 12:04:29 2001 --- src/configure.in Wed Oct 31 21:57:50 2001 *************** *** 738,744 **** case "$enable_gui" in no|No|NO) AC_MSG_RESULT(no GUI support) ! SKIP_QNX=YES ;; yes|Yes|YES|"") AC_MSG_RESULT(yes - automatic GUI support) ;; auto|Auto|AUTO|"") AC_MSG_RESULT(auto - automatic GUI support) ;; photon|Photon|PHOTON) AC_MSG_RESULT(Photon GUI support) ;; --- 738,744 ---- case "$enable_gui" in no|No|NO) AC_MSG_RESULT(no GUI support) ! SKIP_PHOTON=YES ;; yes|Yes|YES|"") AC_MSG_RESULT(yes - automatic GUI support) ;; auto|Auto|AUTO|"") AC_MSG_RESULT(auto - automatic GUI support) ;; photon|Photon|PHOTON) AC_MSG_RESULT(Photon GUI support) ;; *** ../vim60.52/src/gui_photon.c Sun Sep 2 14:29:10 2001 --- src/gui_photon.c Tue Oct 23 17:30:22 2001 *************** *** 137,145 **** {Pk_F30, 'F', 'K'}, {Pk_F31, 'F', 'L'}, {Pk_F32, 'F', 'M'}, ! {Pk_F33, 'F', 'O'}, ! {Pk_F34, 'F', 'P'}, ! {Pk_F35, 'F', 'Q'}, {Pk_Help, '%', '1'}, {Pk_BackSpace, 'k', 'b'}, --- 137,145 ---- {Pk_F30, 'F', 'K'}, {Pk_F31, 'F', 'L'}, {Pk_F32, 'F', 'M'}, ! {Pk_F33, 'F', 'N'}, ! {Pk_F34, 'F', 'O'}, ! {Pk_F35, 'F', 'P'}, {Pk_Help, '%', '1'}, {Pk_BackSpace, 'k', 'b'}, *************** *** 488,497 **** { /* Detect if a keypad number key has been pressed * and change the key if Num Lock is on */ ! if( key->key_cap >= Pk_KP_0 && key->key_cap <= Pk_KP_9 && ( key->key_mods & Pk_KM_Num_Lock ) ) { ! ch = TO_SPECIAL( 'K', key->key_cap - Pk_KP_0 + 'C' ); } else ch = TO_SPECIAL( special_keys[i].vim_code0, --- 488,499 ---- { /* Detect if a keypad number key has been pressed * and change the key if Num Lock is on */ ! if( key->key_cap >= Pk_KP_Enter && key->key_cap <= Pk_KP_9 && ( key->key_mods & Pk_KM_Num_Lock ) ) { ! /* FIXME: For now, just map the key to a ascii value ! * (see ) */ ! ch = key->key_cap - 0xf080; } else ch = TO_SPECIAL( special_keys[i].vim_code0, *************** *** 924,933 **** } static void ! gui_ph_get_panelgroup_margins( short *top, short *bottom, short *left, short *right ) { unsigned short abs_raw_x, abs_raw_y, abs_panel_x, abs_panel_y; ! const unsigned short *margin_top, *margin_bottom, *margin_left, *margin_right; PtGetAbsPosition( gui.vimTextArea, &abs_raw_x, &abs_raw_y ); PtGetAbsPosition( gui.vimPanelGroup, &abs_panel_x, &abs_panel_y ); --- 926,940 ---- } static void ! gui_ph_get_panelgroup_margins( ! short *top, ! short *bottom, ! short *left, ! short *right ) { unsigned short abs_raw_x, abs_raw_y, abs_panel_x, abs_panel_y; ! const unsigned short *margin_top, *margin_bottom; ! const unsigned short *margin_left, *margin_right; PtGetAbsPosition( gui.vimTextArea, &abs_raw_x, &abs_raw_y ); PtGetAbsPosition( gui.vimPanelGroup, &abs_panel_x, &abs_panel_y ); *************** *** 1318,1349 **** /****************************************************************************/ /* events */ void gui_mch_update(void) { ! int working = -1; ! while( working && !vim_is_input_buf_full()) { ! switch( PhEventPeek( gui.event_buffer, EVENT_BUFFER_SIZE ) ) ! { ! case 0: /* No messages */ ! working = 0; ! break; ! ! case Ph_EVENT_MSG: ! PtEventHandler( gui.event_buffer ); ! break; ! ! case -1: ! perror( "gui_mch_update: PhEventPeek failed" ); ! working = 0; ! break; ! default: ! perror( "PhEventPeek default reached" ); ! working = 0; ! break; ! } } } --- 1325,1348 ---- /****************************************************************************/ /* events */ + /* When no events are available, photon will call this function, working is + * set to FALSE, and the gui_mch_update loop will exit. */ + static int + exit_gui_mch_update( void *data ) + { + *(int *)data = FALSE; + return( Pt_END ); + } + void gui_mch_update(void) { ! int working = TRUE; ! PtAppAddWorkProc( NULL, exit_gui_mch_update, &working ); ! while( ( working == TRUE ) && !vim_is_input_buf_full()) { ! PtProcessEvent(); } } *************** *** 1357,1385 **** while( 1 ) { ! switch( PhEventNext( gui.event_buffer, EVENT_BUFFER_SIZE ) ) { ! case Ph_EVENT_MSG: ! PtEventHandler( gui.event_buffer ); ! if( !vim_is_input_buf_empty() ) ! { ! PtSetResource( gui_ph_timer_timeout, Pt_ARG_TIMER_INITIAL, 0, 0 ); ! return( OK ); ! } ! else if( is_timeout == TRUE ) ! return( FAIL ); ! ! break; ! ! case Ph_RESIZE_MSG: ! /* FIXME */ ! return( FAIL ); ! break; ! ! case -1: ! perror( "PhEventNext" ); ! return( FAIL ); } } } --- 1356,1369 ---- while( 1 ) { ! PtProcessEvent(); ! if( !vim_is_input_buf_empty() ) { ! PtSetResource( gui_ph_timer_timeout, Pt_ARG_TIMER_INITIAL, 0, 0 ); ! return( OK ); } + else if( is_timeout == TRUE ) + return( FAIL ); } } *************** *** 1577,1585 **** button_count, (const char **) button_array, NULL, default_button, 0, Pt_MODAL ); #else ! /* PtPrompt doesn't work if you're not using PtMainLoop(), so create the dialog directly. ! * It does give us the option ofadding extra features, like trapping the escape key and ! * returning 0 to vim */ { int n; PtArg_t args[5]; --- 1561,1568 ---- button_count, (const char **) button_array, NULL, default_button, 0, Pt_MODAL ); #else ! /* Writing the dialog ourselves lets us add extra features, like ! * trapping the escape key and returning 0 to vim */ { int n; PtArg_t args[5]; *************** *** 2384,2390 **** /* Only turn on the timer on if none of the times are zero */ if( blink_waittime && blink_ontime && blink_offtime && gui.in_focus) { ! PtSetResource( gui_ph_timer_cursor, Pt_ARG_TIMER_INITIAL, blink_waittime, 0 ); blink_state = BLINK_ON; gui_update_cursor(TRUE, FALSE); } --- 2367,2374 ---- /* Only turn on the timer on if none of the times are zero */ if( blink_waittime && blink_ontime && blink_offtime && gui.in_focus) { ! PtSetResource( gui_ph_timer_cursor, Pt_ARG_TIMER_INITIAL, ! blink_waittime, 0 ); blink_state = BLINK_ON; gui_update_cursor(TRUE, FALSE); } *************** *** 2792,2798 **** PtWidgetIsClass( PtWidgetParent( menu->id ), PtMenu ) ) { fields = Pt_FALSE; ! mask = Pt_SELECTABLE; } else { --- 2776,2782 ---- PtWidgetIsClass( PtWidgetParent( menu->id ), PtMenu ) ) { fields = Pt_FALSE; ! mask = Pt_SELECTABLE | Pt_HIGHLIGHTED; } else { *** ../vim60.52/src/main.c Fri Sep 21 20:27:36 2001 --- src/main.c Tue Oct 23 17:30:22 2001 *************** *** 167,174 **** (void)mb_init(); /* init mb_bytelen_tab[] to ones */ #endif ! #ifdef __QNX__ ! qnx_init(); /* PhAttach() for clipboard, mouse (and gui) */ #endif #ifdef FEAT_GUI_MAC --- 167,174 ---- (void)mb_init(); /* init mb_bytelen_tab[] to ones */ #endif ! #ifdef __QNXNTO__ ! qnx_init(); /* PhAttach() for clipboard, (and gui) */ #endif #ifdef FEAT_GUI_MAC *************** *** 1424,1429 **** --- 1424,1433 ---- gui_wait_for_chars(50L); TIME_MSG("GUI delay"); } + #endif + + #if defined(FEAT_GUI_PHOTON) && defined(FEAT_CLIPBOARD) + qnx_clip_init(); #endif #ifdef FEAT_XCLIPBOARD *** ../vim60.52/src/misc2.c Mon Oct 29 17:19:02 2001 --- src/misc2.c Mon Oct 29 17:14:44 2001 *************** *** 1829,1834 **** --- 1829,1835 ---- {K_NETTERM_MOUSE, (char_u *)"NetMouse"}, {K_DEC_MOUSE, (char_u *)"DecMouse"}, {K_JSBTERM_MOUSE, (char_u *)"JsbMouse"}, + {K_PTERM_MOUSE, (char_u *)"PtermMouse"}, {K_LEFTMOUSE, (char_u *)"LeftMouse"}, {K_LEFTMOUSE_NM, (char_u *)"LeftMouseNM"}, {K_LEFTDRAG, (char_u *)"LeftDrag"}, *** ../vim60.52/src/option.h Sun Sep 16 15:03:16 2001 --- src/option.h Tue Oct 23 17:30:22 2001 *************** *** 661,667 **** EXTERN char_u *p_ttym; /* 'ttymouse' */ EXTERN unsigned ttym_flags; # ifdef IN_OPTION_C ! static char *(p_ttym_values[]) = {"xterm", "xterm2", "dec", "netterm", "jsbterm", NULL}; # endif # define TTYM_XTERM 0x01 # define TTYM_XTERM2 0x02 --- 661,667 ---- EXTERN char_u *p_ttym; /* 'ttymouse' */ EXTERN unsigned ttym_flags; # ifdef IN_OPTION_C ! static char *(p_ttym_values[]) = {"xterm", "xterm2", "dec", "netterm", "jsbterm", "pterm", NULL}; # endif # define TTYM_XTERM 0x01 # define TTYM_XTERM2 0x02 *** ../vim60.52/src/os_qnx.c Thu Apr 5 12:13:43 2001 --- src/os_qnx.c Tue Oct 23 17:30:22 2001 *************** *** 15,41 **** #include "vim.h" int is_photon_available; ! void qnx_init() { ! #if defined(FEAT_CLIPBOARD) || defined(FEAT_GUI) ! is_photon_available = (PhAttach( NULL, NULL ) != NULL) ? TRUE : FALSE; #endif } ! #if defined(FEAT_CLIPBOARD) || defined(PROTO) ! #define CLIP_TYPE_VIM "TEXTVIM" #define CLIP_TYPE_TEXT "TEXT" void qnx_clip_init() { ! if( is_photon_available == TRUE ) ! { clip_init( TRUE ); - } } /*****************************************************************************/ --- 15,46 ---- #include "vim.h" + #if defined(FEAT_GUI_PHOTON) int is_photon_available; ! #endif void qnx_init() { ! #if defined(FEAT_GUI_PHOTON) ! PhChannelParms_t parms; ! ! memset( &parms, 0, sizeof( parms ) ); ! parms.flags = Ph_DYNAMIC_BUFFER; ! ! is_photon_available = (PhAttach( NULL, &parms ) != NULL) ? TRUE : FALSE; #endif } ! #if (defined(FEAT_GUI_PHOTON) && defined(FEAT_CLIPBOARD)) || defined(PROTO) ! #define CLIP_TYPE_VIM "VIMTYPE" #define CLIP_TYPE_TEXT "TEXT" + /* Turn on the clipboard for a console vim when photon is running */ void qnx_clip_init() { ! if( is_photon_available == TRUE && !gui.in_use) clip_init( TRUE ); } /*****************************************************************************/ *************** *** 56,62 **** void clip_mch_request_selection( VimClipboard *cbd ) { ! int type = MLINE, clip_length = 0; void *cbdata; PhClipHeader *clip_header; char_u *clip_text = NULL; --- 61,67 ---- void clip_mch_request_selection( VimClipboard *cbd ) { ! int type = MLINE, clip_length = 0, is_type_set = FALSE; void *cbdata; PhClipHeader *clip_header; char_u *clip_text = NULL; *************** *** 66,101 **** { /* Look for the vim specific clip first */ clip_header = PhClipboardPasteType( cbdata, CLIP_TYPE_VIM ); ! if( clip_header != NULL ) { ! clip_text = clip_header->data; ! /* Skip past the initial type specifier */ ! /* clip_header->length also includes the trailing NUL */ ! clip_length = clip_header->length - 2; ! ! if( clip_text != NULL ) { ! switch( *clip_text++ ) ! { ! default: /* fallthrough to line type */ ! case 'L': type = MLINE; break; ! case 'C': type = MCHAR; break; ! case 'B': type = MBLOCK; break; ! } } } ! else { ! /* Try for just normal text */ ! clip_header = PhClipboardPasteType( cbdata, CLIP_TYPE_TEXT ); ! if( clip_header != NULL ) ! { ! clip_text = clip_header->data; ! clip_length = clip_header->length - 1; ! if( clip_text != NULL ) ! type = (strchr( clip_text, '\r' ) != NULL) ? MLINE : MCHAR; ! } } if( (clip_text != NULL) && (clip_length > 0) ) --- 71,97 ---- { /* Look for the vim specific clip first */ clip_header = PhClipboardPasteType( cbdata, CLIP_TYPE_VIM ); ! if( clip_header != NULL && clip_header->data != NULL ) { ! switch( *(char *) clip_header->data ) { ! default: /* fallthrough to line type */ ! case 'L': type = MLINE; break; ! case 'C': type = MCHAR; break; ! case 'B': type = MBLOCK; break; } + is_type_set = TRUE; } ! ! /* Try for just normal text */ ! clip_header = PhClipboardPasteType( cbdata, CLIP_TYPE_TEXT ); ! if( clip_header != NULL ) { ! clip_text = clip_header->data; ! clip_length = clip_header->length - 1; ! if( clip_text != NULL && is_type_set == FALSE ) ! type = (strchr( clip_text, '\r' ) != NULL) ? MLINE : MCHAR; } if( (clip_text != NULL) && (clip_length > 0) ) *************** *** 112,118 **** { int type; long_u len; ! char_u *text_clip, *vim_clip, *str = NULL; cbd->owned = TRUE; clip_get_selection( cbd ); --- 108,119 ---- { int type; long_u len; ! char_u *text_clip, vim_clip[2], *str = NULL; ! PhClipHeader clip_header[2]; ! ! /* Prevent recursion from clip_get_selection() */ ! if( cbd->owned == TRUE ) ! return; cbd->owned = TRUE; clip_get_selection( cbd ); *************** *** 122,135 **** if( type >= 0 ) { text_clip = lalloc( len + 1, TRUE ); /* Normal text */ - vim_clip = lalloc( len + 2, TRUE ); /* vim specific info + text */ if( text_clip && vim_clip ) { ! PhClipHeader clip_header[2]; STRNCPY( clip_header[0].type, CLIP_TYPE_VIM, 8 ); ! clip_header[0].length = len + 2; clip_header[0].data = vim_clip; STRNCPY( clip_header[1].type, CLIP_TYPE_TEXT, 8 ); --- 123,135 ---- if( type >= 0 ) { text_clip = lalloc( len + 1, TRUE ); /* Normal text */ if( text_clip && vim_clip ) { ! memset( clip_header, 0, sizeof( clip_header ) ); STRNCPY( clip_header[0].type, CLIP_TYPE_VIM, 8 ); ! clip_header[0].length = sizeof( vim_clip ); clip_header[0].data = vim_clip; STRNCPY( clip_header[1].type, CLIP_TYPE_TEXT, 8 ); *************** *** 147,159 **** STRNCPY( text_clip, str, len ); text_clip[ len ] = NUL; ! STRNCPY( vim_clip + 1, str, len ); ! vim_clip[ len + 1 ] = NUL; PhClipboardCopy( PhInputGroup( NULL ), 2, clip_header); } vim_free( text_clip ); - vim_free( vim_clip ); } vim_free( str ); } --- 147,157 ---- STRNCPY( text_clip, str, len ); text_clip[ len ] = NUL; ! vim_clip[ 1 ] = NUL; PhClipboardCopy( PhInputGroup( NULL ), 2, clip_header); } vim_free( text_clip ); } vim_free( str ); } *** ../vim60.52/src/os_qnx.h Tue Aug 28 17:42:00 2001 --- src/os_qnx.h Tue Oct 23 17:30:22 2001 *************** *** 14,19 **** #define POSIX /* Used by pty.c */ ! #if defined(FEAT_CLIPBOARD) || defined(FEAT_GUI) extern int is_photon_available; #endif --- 14,19 ---- #define POSIX /* Used by pty.c */ ! #if defined(FEAT_GUI_PHOTON) extern int is_photon_available; #endif *** ../vim60.52/src/syntax.c Wed Oct 31 11:17:27 2001 --- src/syntax.c Wed Oct 31 11:11:24 2001 *************** *** 6493,6498 **** --- 6493,6504 ---- 4+8, 4+8, 2+8, 2+8, 6+8, 6+8, 1+8, 1+8, 5+8, 5+8, 3+8, 3+8, 7+8, -1}; + #if defined(__QNXNTO__) + static int *color_numbers_8_qansi = color_numbers_8; + /* On qnx, the 8 & 16 color arrays are the same */ + if (STRNCMP(T_NAME, "qansi", 5) == 0) + color_numbers_8_qansi = color_numbers_16; + #endif /* reduce calls to STRICMP a bit, it can be slow */ off = TO_UPPER(*arg); *************** *** 6514,6520 **** --- 6520,6530 ---- if (t_colors == 8) { /* t_Co is 8: use the 8 colors table */ + #if defined(__QNXNTO__) + color = color_numbers_8_qansi[i]; + #else color = color_numbers_8[i]; + #endif if (key[5] == 'F') { /* set/reset bold attribute to get light foreground *** ../vim60.52/src/version.c Thu Nov 1 12:04:29 2001 --- src/version.c Thu Nov 1 12:18:27 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 53, /**/ -- A M00se once bit my sister ... "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.054 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.054 Problem: When using mswin.vim, CTRL-V pastes a block of text like it is normal text. Using CTRL-V in blockwise Visual mode leaves "x" characters behind. Solution: Make CTRL-V work as it should. Do the same for the Paste menu entries. Files: runtime/menu.vim, runtime/mswin.vim *** ../vim60.53/runtime/menu.vim Wed Oct 31 17:50:48 2001 --- runtime/menu.vim Wed Oct 31 16:47:20 2001 *************** *** 112,119 **** amenu 10.610 &File.Sa&ve-Exit:wqa :confirm wqa amenu 10.620 &File.E&xit:qa :confirm qa ! " Tricky stuff to make pasting work as expected. ! nnoremap Paste "=@+.'xy'gPFx"_2x:echo " Edit menu amenu 20.310 &Edit.&Undou u --- 112,131 ---- amenu 10.610 &File.Sa&ve-Exit:wqa :confirm wqa amenu 10.620 &File.E&xit:qa :confirm qa ! " Pasting blockwise and linewise selections is not possible in Insert and ! " Visual mode without the +virtualedit feature. They are pasted as if they ! " were characterwise instead. ! if has("virtualedit") ! nnoremap Paste :call Paste() ! func! Paste() ! let ove = &ve ! set ve=all ! normal `^"+gPi ! let &ve = ove ! endfunc ! else ! nnoremap Paste "=@+.'xy'gPFx"_2x ! endif " Edit menu amenu 20.310 &Edit.&Undou u *************** *** 123,132 **** vmenu 20.340 &Edit.Cu&t"+x "+x vmenu 20.350 &Edit.&Copy"+y "+y cmenu 20.350 &Edit.&Copy"+y ! nmenu 20.360 &Edit.&Paste"+P Paste ! vmenu &Edit.&Paste"+P "-cxPaste"_x ! imenu &Edit.&Paste"+P xPaste"_s cmenu &Edit.&Paste"+P + nmenu 20.370 &Edit.Put\ &Before[p [p imenu &Edit.Put\ &Before[p [p nmenu 20.380 &Edit.Put\ &After]p ]p --- 135,149 ---- vmenu 20.340 &Edit.Cu&t"+x "+x vmenu 20.350 &Edit.&Copy"+y "+y cmenu 20.350 &Edit.&Copy"+y ! nmenu 20.360 &Edit.&Paste"+P "+gP cmenu &Edit.&Paste"+P + + if has("virtualedit") + vmenu &Edit.&Paste"+P "-cPaste + imenu &Edit.&Paste"+P Pastegi + else + vmenu &Edit.&Paste"+P "-cgixPaste"_x + imenu &Edit.&Paste"+P xPaste"_s + endif nmenu 20.370 &Edit.Put\ &Before[p [p imenu &Edit.Put\ &Before[p [p nmenu 20.380 &Edit.Put\ &After]p ]p *************** *** 689,704 **** vmenu 1.20 PopUp.Cu&t "+x vmenu 1.30 PopUp.&Copy "+y cmenu 1.30 PopUp.&Copy ! nmenu 1.40 PopUp.&Paste Paste ! vmenu 1.40 PopUp.&Paste "-cxPaste"_x ! imenu 1.40 PopUp.&Paste xPaste"_s cmenu 1.40 PopUp.&Paste + vmenu 1.50 PopUp.&Delete x amenu 1.55 PopUp.-SEP2- : ! vnoremenu 1.60 PopUp.Select\ Blockwise anoremenu 1.70 PopUp.Select\ &Word vaw anoremenu 1.80 PopUp.Select\ &Line V ! anoremenu 1.90 PopUp.Select\ &Block anoremenu 1.100 PopUp.Select\ &All ggVG " The GUI toolbar (for MS-Windows and GTK) --- 706,726 ---- vmenu 1.20 PopUp.Cu&t "+x vmenu 1.30 PopUp.&Copy "+y cmenu 1.30 PopUp.&Copy ! nmenu 1.40 PopUp.&Paste "+gP cmenu 1.40 PopUp.&Paste + + if has("virtualedit") + vmenu 1.40 PopUp.&Paste "-cPaste + imenu 1.40 PopUp.&Paste Pastegi + else + vmenu 1.40 PopUp.&Paste "-cgixPaste"_x + imenu 1.40 PopUp.&Paste xPaste"_s + endif vmenu 1.50 PopUp.&Delete x amenu 1.55 PopUp.-SEP2- : ! vnoremenu 1.60 PopUp.Select\ Blockwise anoremenu 1.70 PopUp.Select\ &Word vaw anoremenu 1.80 PopUp.Select\ &Line V ! anoremenu 1.90 PopUp.Select\ &Block anoremenu 1.100 PopUp.Select\ &All ggVG " The GUI toolbar (for MS-Windows and GTK) *************** *** 725,734 **** vmenu 1.70 ToolBar.Cut "+x vmenu 1.80 ToolBar.Copy "+y cmenu 1.80 ToolBar.Copy ! nmenu 1.90 ToolBar.Paste Paste ! vmenu ToolBar.Paste "-cxPaste"_x ! imenu ToolBar.Paste xPaste"_s cmenu ToolBar.Paste + if !has("gui_athena") amenu 1.95 ToolBar.-sep3- --- 747,761 ---- vmenu 1.70 ToolBar.Cut "+x vmenu 1.80 ToolBar.Copy "+y cmenu 1.80 ToolBar.Copy ! nmenu 1.90 ToolBar.Paste "+gP cmenu ToolBar.Paste + + if has("virtualedit") + vmenu ToolBar.Paste "-cPaste + imenu ToolBar.Paste Pastegi + else + vmenu ToolBar.Paste "-cgixPaste"_x + imenu ToolBar.Paste xPaste"_s + endif if !has("gui_athena") amenu 1.95 ToolBar.-sep3- *** ../vim60.53/runtime/mswin.vim Thu Aug 23 13:50:05 2001 --- runtime/mswin.vim Tue Oct 30 14:41:41 2001 *************** *** 1,7 **** " Set options and add mapping such that Vim behaves a lot like MS-Windows " " Maintainer: Bram Moolenaar ! " Last change: 2001 Aug 23 " set the 'cpoptions' to its Vim default if 1 " only do this when compiled with expression evaluation --- 1,7 ---- " Set options and add mapping such that Vim behaves a lot like MS-Windows " " Maintainer: Bram Moolenaar ! " Last change: 2001 Oct 30 " set the 'cpoptions' to its Vim default if 1 " only do this when compiled with expression evaluation *************** *** 27,44 **** vnoremap "+y " CTRL-V and SHIFT-Insert are Paste ! nnoremap Paste "=@+.'xy'gPFx"_2x ! map Paste ! map Paste ! ! imap xPaste"_s ! imap xPaste"_s cmap + cmap + ! vmap "-cxPaste"_x ! vmap "-cxPaste"_x " Use CTRL-Q to do what CTRL-V used to do noremap --- 27,58 ---- vnoremap "+y " CTRL-V and SHIFT-Insert are Paste ! map "+gP ! map "+gP cmap + cmap + ! " Pasting blockwise and linewise selections is not possible in Insert and ! " Visual mode without the +virtualedit feature. They are pasted as if they ! " were characterwise instead. ! if has("virtualedit") ! nnoremap Paste :call Paste() ! func! Paste() ! let ove = &ve ! set ve=all ! normal `^"+gPi ! let &ve = ove ! endfunc ! imap Pastegi ! vmap "-cPaste ! else ! nnoremap Paste "=@+.'xy'gPFx"_2x ! imap xPaste"_s ! vmap "-cgixPaste"_x ! endif ! imap ! vmap " Use CTRL-Q to do what CTRL-V used to do noremap *** ../vim60.53/src/version.c Thu Nov 1 12:22:41 2001 --- src/version.c Thu Nov 1 14:29:48 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 54, /**/ -- SUPERIMPOSE "England AD 787". After a few more seconds we hear hoofbeats in the distance. They come slowly closer. Then out of the mist comes KING ARTHUR followed by a SERVANT who is banging two half coconuts together. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.055 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.055 Problem: GTK: The selection isn't copied the first time. Solution: Own the selection at the right moment. Files: src/gui_gtk_x11.c *** ../vim60.54/src/gui_gtk_x11.c Thu Oct 25 10:20:46 2001 --- src/gui_gtk_x11.c Thu Nov 1 14:14:30 2001 *************** *** 871,877 **** * Selection handlers: */ - /*ARGSUSED*/ static gint selection_clear_event(GtkWidget * widget, GdkEventSelection * event) --- 871,876 ---- *************** *** 3521,3563 **** } } void clip_mch_lose_selection(cbd) VimClipboard *cbd; { ! gtk_selection_owner_set(gui.drawarea, cbd->gtk_sel_atom, ! (guint32)GDK_CURRENT_TIME); gui_mch_update(); } /* ! * Check whatever we allready own the selection. */ int clip_mch_own_selection(cbd) VimClipboard *cbd; { ! if (cbd == &clip_star) ! { ! /* At this point we always already own the selection - apparently */ return OK; ! } ! else ! { ! return gdk_selection_owner_get(clip_plus.gtk_sel_atom) == gui.drawarea->window; ! } } /* ! * Send the current selection to the clipboard. */ void clip_mch_set_selection(cbd) VimClipboard* cbd; { - gtk_selection_owner_set(gui.drawarea, cbd->gtk_sel_atom, - (guint32)GDK_CURRENT_TIME); - gui_mch_update(); } --- 3520,3565 ---- } } + /* + * Disown the selection. + */ void clip_mch_lose_selection(cbd) VimClipboard *cbd; { ! /* WEIRD: when using NULL to actually disown the selection, we lose the ! * selection the first time we own it. */ ! /* ! gtk_selection_owner_set(NULL, cbd->gtk_sel_atom, (guint32)GDK_CURRENT_TIME); gui_mch_update(); + */ } /* ! * Own the selection and return OK if it worked. */ int clip_mch_own_selection(cbd) VimClipboard *cbd; { ! int r; ! ! r = gtk_selection_owner_set(gui.drawarea, cbd->gtk_sel_atom, ! (guint32)GDK_CURRENT_TIME); ! gui_mch_update(); ! if (r) return OK; ! return FAIL; } /* ! * Send the current selection to the clipboard. Do nothing for X because we ! * will fill in the selection only when requested by another app. */ void clip_mch_set_selection(cbd) VimClipboard* cbd; { } *** ../vim60.54/src/version.c Thu Nov 1 14:37:02 2001 --- src/version.c Thu Nov 1 14:38:27 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 55, /**/ -- ARTHUR: It is I, Arthur, son of Uther Pendragon, from the castle of Camelot. King of all Britons, defeator of the Saxons, sovereign of all England! [Pause] SOLDIER: Get away! "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.056 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.056 Problem: Using "CTRL-O cw" in Insert mode results in a nested Insert mode. doesn't leave Insert mode then. Solution: Only use nested Insert mode when 'insertmode' is set or when a mapping is used. Files: src/normal.c *** ../vim60.55/src/normal.c Wed Oct 31 11:56:35 2001 --- src/normal.c Wed Oct 31 11:51:54 2001 *************** *** 1730,1737 **** { /* This is a new edit command, not a restart. Need to * remember it to make 'insertmode' work with mappings for ! * Visual mode. But do this only once. */ ! restart_edit_save = restart_edit; restart_edit = 0; if (op_change(oap)) /* will call edit() */ cap->retval |= CA_COMMAND_BUSY; --- 1729,1740 ---- { /* This is a new edit command, not a restart. Need to * remember it to make 'insertmode' work with mappings for ! * Visual mode. But do this only once and not when typed and ! * 'insertmode' isn't set. */ ! if (p_im || !KeyTyped) ! restart_edit_save = restart_edit; ! else ! restart_edit_save = 0; restart_edit = 0; if (op_change(oap)) /* will call edit() */ cap->retval |= CA_COMMAND_BUSY; *** ../vim60.55/src/version.c Thu Nov 1 14:41:29 2001 --- src/version.c Thu Nov 1 14:43:11 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 56, /**/ -- The problem with political jokes is that they get elected. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.057 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.057 Problem: Using ":wincmd g}" in a function doesn't work. (Gary Holloway) Solution: Execute the command directly, instead of putting it in the typeahead buffer. Files: src/normal.c, src/proto/normal.pro, src/window.c *** ../vim60.56/src/normal.c Thu Nov 1 14:44:27 2001 --- src/normal.c Wed Oct 31 11:51:54 2001 *************** *** 80,86 **** static void nv_ctrlo __ARGS((cmdarg_T *cap)); static void nv_hat __ARGS((cmdarg_T *cap)); static void nv_Zet __ARGS((cmdarg_T *cap)); - static void nv_ident __ARGS((cmdarg_T *cap)); #ifdef FEAT_VISUAL static int get_visual_text __ARGS((cmdarg_T *cap, char_u **pp, int *lenp)); #endif --- 80,85 ---- *************** *** 4546,4552 **** * [g] '#' ? to current identifier or string * g ']' :tselect for current identifier */ ! static void nv_ident(cap) cmdarg_T *cap; { --- 4545,4551 ---- * [g] '#' ? to current identifier or string * g ']' :tselect for current identifier */ ! void nv_ident(cap) cmdarg_T *cap; { *** ../vim60.56/src/proto/normal.pro Tue Sep 25 21:49:21 2001 --- src/proto/normal.pro Tue Oct 23 21:19:27 2001 *************** *** 16,21 **** --- 16,22 ---- void do_check_scrollbind __ARGS((int check)); void check_scrollbind __ARGS((linenr_T topline_diff, long leftcol_diff)); void scroll_redraw __ARGS((int up, long count)); + void nv_ident __ARGS((cmdarg_T *cap)); void start_selection __ARGS((void)); void may_start_select __ARGS((int c)); /* vim: set ft=c : */ *** ../vim60.56/src/window.c Fri Sep 14 21:55:06 2001 --- src/window.c Tue Oct 23 21:17:35 2001 *************** *** 526,533 **** postponed_split = Prenum; else postponed_split = -1; ! stuffcharReadbuff('g'); ! stuffcharReadbuff(xchar); break; default: --- 526,545 ---- postponed_split = Prenum; else postponed_split = -1; ! ! /* Execute the command right here, required when ! * "wincmd g}" was used in a function. */ ! { ! oparg_T oa; ! cmdarg_T ca; ! ! clear_oparg(&oa); ! vim_memset(&ca, 0, sizeof(ca)); ! ca.oap = &oa; ! ca.cmdchar = 'g'; ! ca.nchar = xchar; ! nv_ident(&ca); ! } break; default: *** ../vim60.56/src/version.c Thu Nov 1 14:44:27 2001 --- src/version.c Thu Nov 1 14:49:56 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 57, /**/ -- SOLDIER: What? Ridden on a horse? ARTHUR: Yes! SOLDIER: You're using coconuts! "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.058 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.058 Problem: When a Cursorhold autocommand moved the cursor, the ruler wasn't updated. (Bohdan Vlasyuk) Solution: Update the ruler after executing the autocommands. Files: src/gui.c *** ../vim60.57/src/gui.c Fri Sep 28 17:48:07 2001 --- src/gui.c Sat Sep 29 17:17:40 2001 *************** *** 2374,2379 **** --- 2374,2381 ---- { apply_autocmds(EVENT_CURSORHOLD, NULL, NULL, FALSE, curbuf); update_screen(VALID); + showruler(FALSE); + setcursor(); once_already = 1; retval = 0; *** ../vim60.57/src/version.c Thu Nov 1 14:51:27 2001 --- src/version.c Thu Nov 1 14:55:18 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 58, /**/ -- SOLDIER: Where did you get the coconuts? ARTHUR: Through ... We found them. SOLDIER: Found them? In Mercea. The coconut's tropical! "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.059 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.059 Problem: Highlighting for 'hlsearch' isn't visible in lines that are highlighted for diff highlighting. (Gary Holloway) Solution: Let 'hlsearch' highlighting overrule diff highlighting. Files: src/screen.c *** ../vim60.58/src/screen.c Mon Oct 29 14:40:42 2001 --- src/screen.c Mon Oct 29 14:36:57 2001 *************** *** 3072,3078 **** if (attr == 0 || area_attr != attr) area_attr = diff_attr; if (attr == 0 || char_attr != attr) ! char_attr = diff_attr; } #endif } --- 3072,3083 ---- if (attr == 0 || area_attr != attr) area_attr = diff_attr; if (attr == 0 || char_attr != attr) ! { ! if (search_attr != 0) ! char_attr = search_attr; ! else ! char_attr = diff_attr; ! } } #endif } *** ../vim60.58/src/version.c Thu Nov 1 14:56:27 2001 --- src/version.c Thu Nov 1 14:58:21 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 59, /**/ -- ARTHUR: The swallow may fly south with the sun, or the house martin or the plover seek warmer hot lands in winter, yet these are not strangers to our land. SOLDIER: Are you suggesting coconuts migrate? "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.060 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.060 Problem: Motif: When the tooltip is to be popped up, Vim crashes. (Gary Holloway) Solution: Check for a NULL return value from gui_motif_fontset2fontlist(). Files: src/gui_beval.c *** ../vim60.59/src/gui_beval.c Thu Sep 13 21:09:25 2001 --- src/gui_beval.c Wed Oct 24 14:12:09 2001 *************** *** 148,154 **** { win_T *wp; int row, col; - int i; char_u *lbuf; linenr_T lnum; --- 148,153 ---- *************** *** 431,438 **** XmFontList fl; fl = gui_motif_fontset2fontlist(&gui.tooltip_fontset); ! XmStringExtent(fl, s, &w, &h); ! XmFontListFree(fl); } w += gui.border_offset << 1; h += gui.border_offset << 1; --- 430,440 ---- XmFontList fl; fl = gui_motif_fontset2fontlist(&gui.tooltip_fontset); ! if (fl != NULL) ! { ! XmStringExtent(fl, s, &w, &h); ! XmFontListFree(fl); ! } } w += gui.border_offset << 1; h += gui.border_offset << 1; *** ../vim60.59/src/version.c Thu Nov 1 14:59:19 2001 --- src/version.c Thu Nov 1 15:02:52 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 60, /**/ -- SOLDIER: What? A swallow carrying a coconut? ARTHUR: It could grip it by the husk ... "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.061 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.061 Problem: The toolbar buttons to load and save a session do not correctly use v:this_session. Solution: Check for v:this_session to be empty instead of existing. Files: runtime/menu.vim *** ../vim60.60/runtime/menu.vim Thu Nov 1 14:37:02 2001 --- runtime/menu.vim Wed Oct 31 16:47:20 2001 *************** *** 839,858 **** " Select a session to load; default to current session name if present fun! s:LoadVimSesn() ! if exists("this_session") ! let name = this_session else ! let name = "session.vim" endif execute "browse so " . name endfun " Select a session to save; default to current session name if present fun! s:SaveVimSesn() ! if !exists("this_session") ! let this_session = "session.vim" endif ! execute "browse mksession! " . this_session endfun endif --- 839,858 ---- " Select a session to load; default to current session name if present fun! s:LoadVimSesn() ! if strlen(v:this_session) > 0 ! let name = v:this_session else ! let name = "Session.vim" endif execute "browse so " . name endfun " Select a session to save; default to current session name if present fun! s:SaveVimSesn() ! if strlen(v:this_session) == 0 ! let v:this_session = "Session.vim" endif ! execute "browse mksession! " . v:this_session endfun endif *** ../vim60.60/src/version.c Thu Nov 1 15:03:42 2001 --- src/version.c Thu Nov 1 15:21:01 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 61, /**/ -- SECOND SOLDIER: It could be carried by an African swallow! FIRST SOLDIER: Oh yes! An African swallow maybe ... but not a European swallow. that's my point. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.062 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.062 Problem: Crash when 'verbose' is > 3 and using ":shell". (Yegappan Lakshmanan) Solution: Avoid giving a NULL pointer to printf(). Also output a newline and switch the cursor on. Files: src/misc2.c *** ../vim60.61/src/misc2.c Thu Nov 1 12:22:41 2001 --- src/misc2.c Thu Nov 1 20:22:01 2001 *************** *** 2509,2515 **** int retval; if (p_verbose > 3) ! smsg((char_u *)_("Calling shell to execute: \"%s\""), cmd); if (*p_sh == NUL) { --- 2509,2520 ---- int retval; if (p_verbose > 3) ! { ! smsg((char_u *)_("Calling shell to execute: \"%s\""), ! cmd == NULL ? p_sh : cmd); ! out_char('\n'); ! cursor_on(); ! } if (*p_sh == NUL) { *** ../vim60.61/src/version.c Thu Nov 1 15:22:32 2001 --- src/version.c Thu Nov 1 20:24:23 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 62, /**/ -- ARTHUR: I've said I'm sorry about the old woman, but from the behind you looked ... DENNIS: What I object to is that you automatically treat me like an inferior... ARTHUR: Well ... I AM king. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.063 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.063 Problem: When 'cpoptions' includes "$", using "cw" to type a ')' on top of the "$" doesn't update syntax highlighting after it. Solution: Stop displaying the "$" when typing a ')' in its position. Files: src/search.c *** ../vim60.62/src/search.c Wed Oct 31 20:17:35 2001 --- src/search.c Thu Nov 1 21:20:39 2001 *************** *** 1987,1994 **** mpos = *lpos; /* save the pos, update_screen() may change it */ save_cursor = curwin->w_cursor; save_so = p_so; ! ++curwin->w_virtcol; /* for when 'cpo' contains '$': do ! redraw the ')' */ update_screen(VALID); /* show the new char first */ #ifdef CURSOR_SHAPE --- 1987,1997 ---- mpos = *lpos; /* save the pos, update_screen() may change it */ save_cursor = curwin->w_cursor; save_so = p_so; ! /* Handle "$" in 'cpo': If the ')' is typed on top of the "$", ! * stop displaying the "$". */ ! if (dollar_vcol > 0 && dollar_vcol == curwin->w_virtcol) ! dollar_vcol = 0; ! ++curwin->w_virtcol; /* do display ')' just before "$" */ update_screen(VALID); /* show the new char first */ #ifdef CURSOR_SHAPE *** ../vim60.62/src/version.c Thu Nov 1 21:25:14 2001 --- src/version.c Thu Nov 1 21:23:28 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 63, /**/ -- OLD WOMAN: King of the WHO? ARTHUR: The Britons. OLD WOMAN: Who are the Britons? "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.064 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.064 (extra) Problem: The NSIS install script doesn't work with newer versions of NSIS. The diff feature doesn't work when there isn't a good diff.exe on the system. Solution: Replace the GetParentDir instruction by a user function. Fix a few cosmetic problems. Use defined constants for the version number, so that it's defined in one place only. Only accept the install directory when it ends in "vim". (Eduardo Fernandez) Add a diff.exe and use it from the default _vimrc. Files: nsis/gvim.nsi, nsis/README.txt, src/dosinst.c *** ../vim60.63/nsis/gvim.nsi Tue Sep 25 21:40:44 2001 --- nsis/gvim.nsi Thu Nov 1 22:20:59 2001 *************** *** 1,5 **** # NSIS file to create a self-installing exe for Vim. ! # Last modification: 2001 Jul 21 # WARNING: if you make changes to this script, look out for $0 to be valid, # because this line is very dangerous: RMDir /r $0 --- 1,6 ---- # NSIS file to create a self-installing exe for Vim. ! # It needs NSIS version 1.59 or later. ! # Last modification: 2001 Oct 31 # WARNING: if you make changes to this script, look out for $0 to be valid, # because this line is very dangerous: RMDir /r $0 *************** *** 11,25 **** # comment the next line if you do not want to add Native Language Support !define HAVE_NLS ! Name "Vim 6.0" ! OutFile gVim60.exe CRCCheck on ! ComponentText "This will install Vim 6.0 on your computer." ! DirText "Choose a directory to install Vim (should end in 'vim')" SetDatablockOptimize on Icon icons\vim_16c.ico ! UninstallText "This will uninstall Vim 6.0 from your system." ! UninstallExeName vim60\uninstall-gui.exe UninstallIcon icons\vim_uninst_16c.ico BGGradient 004000 008200 ffffff LicenseText "You should read the following before installing:" --- 12,29 ---- # comment the next line if you do not want to add Native Language Support !define HAVE_NLS ! !define VER_MINOR 0 ! !define VER_MAJOR 6 ! ! Name "Vim ${VER_MAJOR}.${VER_MINOR}" ! OutFile gvim${VER_MAJOR}${VER_MINOR}.exe CRCCheck on ! ComponentText "This will install Vim ${VER_MAJOR}.${VER_MINOR} on your computer." ! DirText "Choose a directory to install Vim (must end in 'vim')" SetDatablockOptimize on Icon icons\vim_16c.ico ! UninstallText "This will uninstall Vim ${VER_MAJOR}.${VER_MINOR} from your system." ! UninstallExeName vim${VER_MAJOR}${VER_MINOR}\uninstall-gui.exe UninstallIcon icons\vim_uninst_16c.ico BGGradient 004000 008200 ffffff LicenseText "You should read the following before installing:" *************** *** 28,33 **** --- 32,39 ---- !ifdef HAVE_UPX !packhdr temp.dat "upx --best --compress-icons=1 temp.dat" !endif + # This add '\vim' to the user choice automagically. + InstallDir "C:\vim" # Types of installs we can perform: InstType Typical *************** *** 41,47 **** Function .onInit MessageBox MB_YESNO|MB_ICONQUESTION \ ! "This will install Vim 6.0 on your computer.$\n Continue?" IDYES NoAbort Abort ; causes installer to quit. NoAbort: --- 47,54 ---- Function .onInit MessageBox MB_YESNO|MB_ICONQUESTION \ ! "This will install Vim ${VER_MAJOR}.${VER_MINOR} on your computer.$\n Continue?" \ ! IDYES NoAbort Abort ; causes installer to quit. NoAbort: *************** *** 77,83 **** # $1 - holds the parameters to be passed to install.exe. Starts with OLE # registration (since a non-OLE gvim will not complain, and we want to # always register an OLE gvim). ! StrCpy $0 "$INSTDIR\vim60" StrCpy $1 "-register-OLE" FunctionEnd --- 84,90 ---- # $1 - holds the parameters to be passed to install.exe. Starts with OLE # registration (since a non-OLE gvim will not complain, and we want to # always register an OLE gvim). ! StrCpy $0 "$INSTDIR\vim${VER_MAJOR}${VER_MINOR}" StrCpy $1 "-register-OLE" FunctionEnd *************** *** 88,98 **** NoCancelAbort: FunctionEnd ! # Only enable the "Next" button if the install directory is OK. Function .onVerifyInstDir ! StrCmp $INSTDIR $PROGRAMFILES PathBad 0 ! StrCmp $INSTDIR $WINDIR PathBad PathGood ! PathBad: Abort PathGood: --- 95,104 ---- NoCancelAbort: FunctionEnd ! # Only enable the "Install" button if the install directory ends in "vim". Function .onVerifyInstDir ! StrCpy $0 $INSTDIR 3 -3 ! StrCmp $0 "vim" PathGood Abort PathGood: *************** *** 111,117 **** FunctionEnd Function un.onUnInstSuccess ! MessageBox MB_OK|MB_ICONINFORMATION "Vim 6.0 has been (partly) removed from your system" FunctionEnd ########################################################## --- 117,142 ---- FunctionEnd Function un.onUnInstSuccess ! MessageBox MB_OK|MB_ICONINFORMATION \ ! "Vim ${VER_MAJOR}.${VER_MINOR} has been (partly) removed from your system" ! FunctionEnd ! ! Function un.GetParent ! Exch $0 ; old $0 is on top of stack ! Push $1 ! Push $2 ! StrCpy $1 -1 ! loop: ! StrCpy $2 $0 1 $1 ! StrCmp $2 "" exit ! StrCmp $2 "\" exit ! IntOp $1 $1 - 1 ! Goto loop ! exit: ! StrCpy $0 $0 $1 ! Pop $2 ! Pop $1 ! Exch $0 ; put $0 on top of stack, restore $0 to original value FunctionEnd ########################################################## *************** *** 119,125 **** SectionIn 1,2,3 # we need also this here if the user changes the instdir ! StrCpy $0 "$INSTDIR\vim60" SetOutPath $0 File ..\src\gvim.exe --- 144,150 ---- SectionIn 1,2,3 # we need also this here if the user changes the instdir ! StrCpy $0 "$INSTDIR\vim${VER_MAJOR}${VER_MINOR}" SetOutPath $0 File ..\src\gvim.exe *************** *** 127,132 **** --- 152,158 ---- File ..\src\uninstal.exe File ..\src\vimrun.exe File ..\src\xxd\xxd.exe + File ..\..\diff.exe File ..\vimtutor.bat File ..\README.txt File ..\uninstal.txt *************** *** 295,313 **** IfErrors ErrorMess NoErrorMess ErrorMess: MessageBox MB_OK|MB_ICONEXCLAMATION \ ! "Some files in $0 have not been deleted! You must do it manually." NoErrorMess: NoRemoveExes: ! GetParentDir $0 $INSTDIR # if a plugin dir was created at installation ask the user to remove it ! IfFileExists $0\vimfiles 0 NoRemove MessageBox MB_YESNO|MB_ICONQUESTION \ ! "Remove all files in your $0\vimfiles directory? \ $\nIf you have created something there that you want to keep, click No" IDNO Fin ! RMDir /r $0\vimfiles NoRemove: # ask the user if the Vim root dir must be removed --- 321,351 ---- IfErrors ErrorMess NoErrorMess ErrorMess: MessageBox MB_OK|MB_ICONEXCLAMATION \ ! "Some files in $0 have not been deleted!$\nYou must do it manually." NoErrorMess: NoRemoveExes: ! # get the parent dir of the installation ! Push $INSTDIR ! Call un.GetParent ! Pop $0 ! ! StrCpy $1 $0 # if a plugin dir was created at installation ask the user to remove it ! # first look in the root of the installation then in HOME ! IfFileExists $1\vimfiles AskRemove 0 ! ReadEnvStr $1 "HOME" ! StrCmp $1 "" NoRemove 0 ! ! IfFileExists $1\vimfiles 0 NoRemove ! ! AskRemove: MessageBox MB_YESNO|MB_ICONQUESTION \ ! "Remove all files in your $1\vimfiles directory? \ $\nIf you have created something there that you want to keep, click No" IDNO Fin ! RMDir /r $1\vimfiles NoRemove: # ask the user if the Vim root dir must be removed *** ../vim60.63/nsis/README.txt Sat Sep 15 23:34:07 2001 --- nsis/README.txt Thu Nov 1 22:23:45 2001 *************** *** 26,32 **** 5. Go to the OleVim directory and build OpenWithVim.exe and SendToVim.exe (or get them from a binary archive). ! 6. Do "make uganda.nsis.txt" in runtime/doc. This requires sed, you may have to do this on Unix. Make sure the file is in DOS file format! Install NSIS if you didn't do that already. --- 26,37 ---- 5. Go to the OleVim directory and build OpenWithVim.exe and SendToVim.exe (or get them from a binary archive). ! 6. Get a "diff.exe" program and put it in the "../.." directory (above the ! "vim60" directory, it's the same for all Vim versions). ! You can find one in previous Vim versions or in this archive: ! http://www.mossbayeng.com/~ron/vim/diffutils.tar.gz ! ! 7. Do "make uganda.nsis.txt" in runtime/doc. This requires sed, you may have to do this on Unix. Make sure the file is in DOS file format! Install NSIS if you didn't do that already. *** ../vim60.63/src/dosinst.c Mon Aug 27 17:16:45 2001 --- src/dosinst.c Thu Nov 1 22:41:43 2001 *************** *** 1047,1053 **** static void install_vimrc(int idx) { ! FILE *fd; char *fname; /* If an old vimrc file exists, overwrite it. --- 1047,1053 ---- static void install_vimrc(int idx) { ! FILE *fd, *tfd; char *fname; /* If an old vimrc file exists, overwrite it. *************** *** 1092,1097 **** --- 1092,1111 ---- case mouse_mswin: fprintf(fd, "behave mswin\n"); break; + } + if ((tfd = fopen("diff.exe", "r")) != NULL) + { + /* Use the diff.exe that comes with the self-extracting gvim.exe. */ + fclose(tfd); + fprintf(fd, "\n"); + fprintf(fd, "set diffexpr=MyDiff()\n"); + fprintf(fd, "function MyDiff()\n"); + fprintf(fd, " let opt = ''\n"); + fprintf(fd, " if &diffopt =~ 'icase' | let opt = opt . '-i ' | endif\n"); + fprintf(fd, " if &diffopt =~ 'iwhite' | let opt = opt . '-b ' | endif\n"); + fprintf(fd, " silent execute '!%s\\diff -a ' . opt . v:fname_in . ' ' . v:fname_new . ' > ' . v:fname_out\n", installdir); + fprintf(fd, "endfunction\n"); + fprintf(fd, "\n"); } fclose(fd); printf("%s has been written\n", fname); *** ../vim60.63/src/version.c Thu Nov 1 21:26:45 2001 --- src/version.c Thu Nov 1 22:47:02 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 64, /**/ -- OLD WOMAN: Well, how did you become king, then? ARTHUR: The Lady of the Lake, her arm clad in the purest shimmering samite, held Excalibur aloft from the bosom of the water to signify by Divine Providence ... that I, Arthur, was to carry Excalibur ... That is why I am your king! "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.065 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.065 Problem: When using ":normal" in 'indentexpr' it may use redo characters before its argument. (Neil Bird) Solution: Save and restore the stuff buffer in ex_normal(). Files: src/ex_docmd.c, src/getchar.c, src/globals.h, src/structs.h *** ../vim60.64/src/ex_docmd.c Tue Oct 30 21:18:36 2001 --- src/ex_docmd.c Fri Nov 2 16:14:07 2001 *************** *** 6805,6810 **** --- 6805,6811 ---- typebuf_T saved_typebuf; int save_insertmode = p_im; int save_finish_op = finish_op; + struct buffheader save_stuffbuff; #ifdef FEAT_MBYTE char_u *arg = NULL; int l; *************** *** 6894,6899 **** --- 6895,6904 ---- saved_typebuf = typebuf; if (alloc_typebuf() == OK) { + /* Also save the stuff buffer and make it empty. */ + save_stuffbuff = stuffbuff; + stuffbuff.bh_first.b_next = NULL; + /* * Repeat the :normal command for each line in the range. When no * range given, execute it just once, without positioning the cursor *************** *** 6927,6932 **** --- 6932,6939 ---- } } while (eap->addr_count > 0 && eap->line1 <= eap->line2 && !got_int); + + stuffbuff = save_stuffbuff; } /* Might not return to the main loop when in an event handler. */ *** ../vim60.64/src/getchar.c Sun Oct 28 21:23:45 2001 --- src/getchar.c Fri Nov 2 16:23:29 2001 *************** *** 38,66 **** * Un-escaping is done by vgetc(). */ - /* - * structure used to store one block of the stuff/redo/recording buffers - */ - struct buffblock - { - struct buffblock *b_next; /* pointer to next buffblock */ - char_u b_str[1]; /* contents (actually longer) */ - }; - #define MINIMAL_SIZE 20 /* minimal size for b_str */ - /* - * header used for the stuff buffer and the redo buffer - */ - struct buffheader - { - struct buffblock bh_first; /* first (dummy) block of list */ - struct buffblock *bh_curr; /* buffblock for appending */ - int bh_index; /* index for reading */ - int bh_space; /* space in bh_curr for appending */ - }; - - static struct buffheader stuffbuff = {{NULL, {NUL}}, NULL, 0, 0}; static struct buffheader redobuff = {{NULL, {NUL}}, NULL, 0, 0}; static struct buffheader old_redobuff = {{NULL, {NUL}}, NULL, 0, 0}; #if defined(FEAT_AUTOCMD) || defined(FEAT_EVAL) || defined(PROTO) --- 38,45 ---- *** ../vim60.64/src/globals.h Sun Oct 28 21:23:45 2001 --- src/globals.h Fri Nov 2 16:07:27 2001 *************** *** 693,702 **** EXTERN int readonlymode INIT(= FALSE); /* Set to TRUE for "view" */ EXTERN int recoverymode INIT(= FALSE); /* Set to TRUE for "-r" option */ EXTERN typebuf_T typebuf /* typeahead buffer */ ! # ifdef DO_INIT = {NULL, NULL} ! # endif ; #ifdef FEAT_EX_EXTRA EXTERN int ex_normal_busy INIT(= 0); /* recursivenes of ex_normal() */ --- 693,707 ---- EXTERN int readonlymode INIT(= FALSE); /* Set to TRUE for "view" */ EXTERN int recoverymode INIT(= FALSE); /* Set to TRUE for "-r" option */ + EXTERN struct buffheader stuffbuff /* stuff buffer */ + #ifdef DO_INIT + = {{NULL, {NUL}}, NULL, 0, 0} + #endif + ; EXTERN typebuf_T typebuf /* typeahead buffer */ ! #ifdef DO_INIT = {NULL, NULL} ! #endif ; #ifdef FEAT_EX_EXTRA EXTERN int ex_normal_busy INIT(= 0); /* recursivenes of ex_normal() */ *** ../vim60.64/src/structs.h Wed Oct 31 11:17:27 2001 --- src/structs.h Fri Nov 2 16:23:11 2001 *************** *** 338,343 **** --- 338,363 ---- }; /* + * structure used to store one block of the stuff/redo/recording buffers + */ + struct buffblock + { + struct buffblock *b_next; /* pointer to next buffblock */ + char_u b_str[1]; /* contents (actually longer) */ + }; + + /* + * header used for the stuff buffer and the redo buffer + */ + struct buffheader + { + struct buffblock bh_first; /* first (dummy) block of list */ + struct buffblock *bh_curr; /* buffblock for appending */ + int bh_index; /* index for reading */ + int bh_space; /* space in bh_curr for appending */ + }; + + /* * used for completion on the command line */ typedef struct expand *** ../vim60.64/src/version.c Fri Nov 2 16:20:26 2001 --- src/version.c Fri Nov 2 16:19:23 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 65, /**/ -- FIRST VILLAGER: We have found a witch. May we burn her? "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.066 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.066 Problem: Sometimes undo for one command is split into two undo actions. (Halim Salman) Solution: Don't set the undo-synced flag when reusing a line that was already saved for undo. Files: src/undo.c *** ../vim60.65/src/undo.c Sun Oct 28 21:15:32 2001 --- src/undo.c Sat Nov 3 13:37:08 2001 *************** *** 279,285 **** --- 279,288 ---- * entry now. Following deleted/inserted lines go to the * re-used entry. */ if (i > 0) + { u_getbot(); + curbuf->b_u_synced = FALSE; + } /* The line count might change afterwards. */ if (newbot != 0) *** ../vim60.65/src/version.c Fri Nov 2 16:29:44 2001 --- src/version.c Sat Nov 3 13:40:49 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 66, /**/ -- The acknowledged parents of reengineering are Michael Hammer and James Champy. When I say they're the "parents" I don't mean they had sex - and I apologize for making you think about it. I mean they wrote the best-selling business book _Reengineering the Corporation_, which was published in 1993. Businesses flocked to reengineering like frat boys to a drunken cheerleader. (This analogy wasn't necessary, but I'm trying to get my mind off that Hammer and Champy thing.) (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.067 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.067 Problem: if_xcmdsrv.c doesn't compile on systems where fd_set isn't defined in the usual header file (e.g., AIX). (Mark Waggoner) Solution: Include sys/select.h in if_xcmdsrv.c for systems that have it. Files: src/if_xcmdsrv.c *** ../vim60.66/src/if_xcmdsrv.c Mon Sep 24 12:02:29 2001 --- src/if_xcmdsrv.c Sat Nov 3 13:56:56 2001 *************** *** 21,26 **** --- 21,31 ---- # include # endif + # if defined(HAVE_SYS_SELECT_H) && \ + (!defined(HAVE_SYS_TIME_H) || defined(SYS_SELECT_WITH_SYS_TIME)) + # include + # endif + /* * This file provides procedures that implement the command server functionality * of Vim when in contact with an X11 server. *** ../vim60.66/src/version.c Sat Nov 3 14:01:26 2001 --- src/version.c Sat Nov 3 14:01:06 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 67, /**/ -- An easy way to determine if you have enough teamwork to be doomed is simply to measure how long it takes from the time you decide to go to lunch together until the time you actually eat. (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.068 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.068 Problem: When formatting a Visually selected area with "gq" and the number of lines increases the last line may not be redrawn correctly. (Yegappan Lakshmanan) Solution: Correct the area to be redrawn for inserted/deleted lines. Files: src/ops.c *** ../vim60.67/src/ops.c Wed Oct 31 20:51:33 2001 --- src/ops.c Sat Nov 3 21:25:47 2001 *************** *** 4034,4043 **** if (oap->end_adjusted && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) ++curwin->w_cursor.lnum; beginline(BL_WHITE | BL_FIX); ! msgmore(curbuf->b_ml.ml_line_count - old_line_count); /* put '] mark on the end of the formatted area */ curbuf->b_op_end = curwin->w_cursor; } /* --- 4035,4065 ---- if (oap->end_adjusted && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) ++curwin->w_cursor.lnum; beginline(BL_WHITE | BL_FIX); ! old_line_count = curbuf->b_ml.ml_line_count - old_line_count; ! msgmore(old_line_count); /* put '] mark on the end of the formatted area */ curbuf->b_op_end = curwin->w_cursor; + + #ifdef FEAT_VISUAL + if (oap->is_VIsual) + { + win_T *wp; + + FOR_ALL_WINDOWS(wp) + { + if (wp->w_old_cursor_lnum != 0) + { + /* When lines have been inserted or deleted, adjust the end of + * the Visual area to be redrawn. */ + if (wp->w_old_cursor_lnum > wp->w_old_visual_lnum) + wp->w_old_cursor_lnum += old_line_count; + else + wp->w_old_visual_lnum += old_line_count; + } + } + } + #endif } /* *** ../vim60.67/src/version.c Sat Nov 3 14:16:30 2001 --- src/version.c Sat Nov 3 21:28:49 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 68, /**/ -- At some point in the project somebody will start whining about the need to determine the project "requirements". This involves interviewing people who don't know what they want but, curiously, know exactly when they need it. (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.069 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.069 Problem: Using "K" on a word that includes a "!" causes a "No previous command" error, because the "!" is expanded. (Craig Jeffries) Solution: Put a backslash before the "!". Files: src/normal.c *** ../vim60.68/src/normal.c Thu Nov 1 14:51:27 2001 --- src/normal.c Sun Nov 4 13:07:22 2001 *************** *** 4669,4675 **** if (cmdchar == '*' || cmdchar == '#') aux_ptr = (char_u *)(p_magic ? "/?.*~[^$\\" : "/?^$\\"); else if (cmdchar == 'K' && *p_kp != NUL) ! aux_ptr = escape_chars; else /* Don't escape spaces and Tabs in a tag with a backslash */ aux_ptr = (char_u *)"\\|\""; --- 4669,4675 ---- if (cmdchar == '*' || cmdchar == '#') aux_ptr = (char_u *)(p_magic ? "/?.*~[^$\\" : "/?^$\\"); else if (cmdchar == 'K' && *p_kp != NUL) ! aux_ptr = (char_u *)" \t\\\"|!"; else /* Don't escape spaces and Tabs in a tag with a backslash */ aux_ptr = (char_u *)"\\|\""; *** ../vim60.68/src/version.c Sun Nov 4 13:15:58 2001 --- src/version.c Sun Nov 4 13:13:41 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 69, /**/ -- The budget process was invented by an alien race of sadistic beings who resemble large cats. (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.070 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.070 Problem: Win32: The error message for a failed dynamic linking of a Perl, Ruby, Tcl and Python library is unclear about what went wrong. Solution: Give the name of the library or function that could not be loaded. Also for the iconv and gettext libraries when 'verbose' is set. Files: src/eval.c, src/if_perl.xs, src/if_python.c, src/if_ruby.c, src/if_tcl.c, src/mbyte.c, src/os_win32.c, src/proto/if_perl.pro, src/proto/if_python.pro, src/proto/if_ruby.pro, src/proto/if_tcl.pro, src/proto/mbyte.pro *** ../vim60.69/src/eval.c Mon Oct 29 15:15:20 2001 --- src/eval.c Sun Nov 4 13:57:39 2001 *************** *** 4337,4359 **** n = (starting != 0); #ifdef DYNAMIC_TCL else if (STRICMP(name, "tcl") == 0) ! n = tcl_enabled() ? TRUE : FALSE; #endif #if defined(USE_ICONV) && defined(DYNAMIC_ICONV) else if (STRICMP(name, "iconv") == 0) ! n = iconv_enabled(); #endif #ifdef DYNAMIC_RUBY else if (STRICMP(name, "ruby") == 0) ! n = ruby_enabled() ? TRUE : FALSE; #endif #ifdef DYNAMIC_PYTHON else if (STRICMP(name, "python") == 0) ! n = python_enabled() ? TRUE : FALSE; #endif #ifdef DYNAMIC_PERL else if (STRICMP(name, "perl") == 0) ! n = perl_enabled() ? TRUE : FALSE; #endif #ifdef FEAT_GUI else if (STRICMP(name, "gui_running") == 0) --- 4337,4359 ---- n = (starting != 0); #ifdef DYNAMIC_TCL else if (STRICMP(name, "tcl") == 0) ! n = tcl_enabled(FALSE); #endif #if defined(USE_ICONV) && defined(DYNAMIC_ICONV) else if (STRICMP(name, "iconv") == 0) ! n = iconv_enabled(FALSE); #endif #ifdef DYNAMIC_RUBY else if (STRICMP(name, "ruby") == 0) ! n = ruby_enabled(FALSE); #endif #ifdef DYNAMIC_PYTHON else if (STRICMP(name, "python") == 0) ! n = python_enabled(FALSE); #endif #ifdef DYNAMIC_PERL else if (STRICMP(name, "perl") == 0) ! n = perl_enabled(FALSE); #endif #ifdef FEAT_GUI else if (STRICMP(name, "gui_running") == 0) *** ../vim60.69/src/if_perl.xs Sun Jul 29 14:47:04 2001 --- src/if_perl.xs Sun Nov 4 13:40:40 2001 *************** *** 307,323 **** * 3. Repeat 2, until get all functions will be used. * * Parameter 'libname' provides name of DLL. ! * Succeeded in load, return 1. Failed, return zero. */ static int ! perl_runtime_link_init(char *libname) { int i; ! if (hPerlLib) ! return 1; if (!(hPerlLib = LoadLibraryEx(libname, NULL, 0))) ! return 0; for (i = 0; perl_funcname_table[i].ptr; ++i) { if (!(*perl_funcname_table[i].ptr = GetProcAddress(hPerlLib, --- 307,327 ---- * 3. Repeat 2, until get all functions will be used. * * Parameter 'libname' provides name of DLL. ! * Return OK or FAIL. */ static int ! perl_runtime_link_init(char *libname, int verbose) { int i; ! if (hPerlLib != NULL) ! return OK; if (!(hPerlLib = LoadLibraryEx(libname, NULL, 0))) ! { ! if (verbose) ! EMSG2(_("E370: Could not load library %s"), libname); ! return FAIL; ! } for (i = 0; perl_funcname_table[i].ptr; ++i) { if (!(*perl_funcname_table[i].ptr = GetProcAddress(hPerlLib, *************** *** 325,344 **** { FreeLibrary(hPerlLib); hPerlLib = NULL; ! return 0; } } ! return 1; } /* ! * If runtime-link-perl(DLL) was loaded successfully, return 1. ! * There were no DLL loaded, return 0. */ int ! perl_enabled() { ! return perl_runtime_link_init(DYNAMIC_PERL_DLL); } #endif /* DYNAMIC_PERL */ --- 329,352 ---- { FreeLibrary(hPerlLib); hPerlLib = NULL; ! if (verbose) ! EMSG2(_("E448: Could not load library function %s"), ! perl_funcname_table[i].name); ! return FAIL; } } ! return OK; } /* ! * If runtime-link-perl(DLL) was loaded successfully, return TRUE. ! * There were no DLL loaded, return FALSE. */ int ! perl_enabled(verbose) ! int verbose; { ! return perl_runtime_link_init(DYNAMIC_PERL_DLL, verbose) == OK; } #endif /* DYNAMIC_PERL */ *************** *** 548,557 **** SV *sv; SV *safe; ! if (!perl_interp) { #ifdef DYNAMIC_PERL ! if (!perl_enabled()) { EMSG(_(e_noperl)); return; --- 556,565 ---- SV *sv; SV *safe; ! if (perl_interp == NULL) { #ifdef DYNAMIC_PERL ! if (!perl_enabled(TRUE)) { EMSG(_(e_noperl)); return; *************** *** 644,653 **** if (bufempty()) return; ! if (!perl_interp) { #ifdef DYNAMIC_PERL ! if (!perl_enabled()) { EMSG(_(e_noperl)); return; --- 652,661 ---- if (bufempty()) return; ! if (perl_interp == NULL) { #ifdef DYNAMIC_PERL ! if (!perl_enabled(TRUE)) { EMSG(_(e_noperl)); return; *** ../vim60.69/src/if_python.c Thu Oct 18 13:28:47 2001 --- src/if_python.c Sun Nov 4 13:41:47 2001 *************** *** 228,248 **** } /* ! * Load library and get all pointers. If failed, function returns 0. ! * Succeeded 1. ! * * Parameter 'libname' provides name of DLL. */ static int ! python_runtime_link_init(char* libname) { int i; if (hinstPython) ! return 1; hinstPython = LoadLibrary(libname); if (!hinstPython) ! return 0; for (i = 0; python_funcname_table[i].ptr; ++i) { --- 228,251 ---- } /* ! * Load library and get all pointers. * Parameter 'libname' provides name of DLL. + * Return OK or FAIL. */ static int ! python_runtime_link_init(char *libname, int verbose) { int i; if (hinstPython) ! return OK; hinstPython = LoadLibrary(libname); if (!hinstPython) ! { ! if (verbose) ! EMSG2(_("E370: Could not load library %s"), libname); ! return FAIL; ! } for (i = 0; python_funcname_table[i].ptr; ++i) { *************** *** 251,270 **** { FreeLibrary(hinstPython); hinstPython = 0; ! return 0; } } ! return 1; } /* * If python is enabled (there is installed python on Windows system) return ! * 1, else 0. */ int ! python_enabled() { ! return python_runtime_link_init(DYNAMIC_PYTHON_DLL); } /* Load the standard Python exceptions - don't import the symbols from the --- 254,277 ---- { FreeLibrary(hinstPython); hinstPython = 0; ! if (verbose) ! EMSG2(_("E448: Could not load library function %s"), ! python_funcname_table[i].name); ! return FAIL; } } ! return OK; } /* * If python is enabled (there is installed python on Windows system) return ! * TRUE, else FALSE. */ int ! python_enabled(verbose) ! int verbose; { ! return python_runtime_link_init(DYNAMIC_PYTHON_DLL, verbose) == OK; } /* Load the standard Python exceptions - don't import the symbols from the *************** *** 371,377 **** if (!initialised) { #ifdef DYNAMIC_PYTHON ! if (!python_enabled()) { EMSG(_("E263: Sorry, this command is disabled, the Python library could not be loaded.")); goto fail; --- 378,384 ---- if (!initialised) { #ifdef DYNAMIC_PYTHON ! if (!python_enabled(TRUE)) { EMSG(_("E263: Sorry, this command is disabled, the Python library could not be loaded.")); goto fail; *** ../vim60.69/src/if_ruby.c Thu Aug 16 18:45:32 2001 --- src/if_ruby.c Sun Nov 4 13:44:01 2001 *************** *** 242,262 **** } /* ! * Load library and get all pointers. If failed, function returns 0. ! * Succeeded 1. ! * * Parameter 'libname' provides name of DLL. */ static int ! ruby_runtime_link_init(char* libname) { int i; if (hinstRuby) ! return 1; hinstRuby = LoadLibrary(libname); if (!hinstRuby) ! return 0; for (i = 0; ruby_funcname_table[i].ptr; ++i) { --- 242,265 ---- } /* ! * Load library and get all pointers. * Parameter 'libname' provides name of DLL. + * Return OK or FAIL. */ static int ! ruby_runtime_link_init(char *libname, int verbose) { int i; if (hinstRuby) ! return OK; hinstRuby = LoadLibrary(libname); if (!hinstRuby) ! { ! if (verbose) ! EMSG2(_("E370: Could not load library %s"), libname); ! return FAIL; ! } for (i = 0; ruby_funcname_table[i].ptr; ++i) { *************** *** 265,284 **** { FreeLibrary(hinstRuby); hinstRuby = 0; ! return 0; } } ! return 1; } /* ! * If ruby is enabled (there is installed ruby on Windows system) return 1, ! * else 0. */ int ! ruby_enabled() { ! return ruby_runtime_link_init(DYNAMIC_RUBY_DLL); } #endif /* defined(DYNAMIC_RUBY) || defined(PROTO) */ --- 268,291 ---- { FreeLibrary(hinstRuby); hinstRuby = 0; ! if (verbose) ! EMSG2(_("E448: Could not load library function %s"), ! ruby_funcname_table[i].name); ! return FAIL; } } ! return OK; } /* ! * If ruby is enabled (there is installed ruby on Windows system) return TRUE, ! * else FALSE. */ int ! ruby_enabled(verbose) ! int verbose; { ! return ruby_runtime_link_init(DYNAMIC_RUBY_DLL, verbose) == OK; } #endif /* defined(DYNAMIC_RUBY) || defined(PROTO) */ *************** *** 379,385 **** if (!ruby_initialized) { #ifdef DYNAMIC_RUBY ! if (ruby_enabled()) { #endif ruby_init(); --- 386,392 ---- if (!ruby_initialized) { #ifdef DYNAMIC_RUBY ! if (ruby_enabled(TRUE)) { #endif ruby_init(); *** ../vim60.69/src/if_tcl.c Thu Aug 16 18:46:10 2001 --- src/if_tcl.c Sun Nov 4 13:55:02 2001 *************** *** 180,196 **** * 3. Repeat 2, until get all functions will be used. * * Parameter 'libname' provides name of DLL. ! * Succeeded in load, return 1. Failed, return zero. */ static int ! tcl_runtime_link_init(char *libname) { int i; if (hTclLib) ! return 1; if (!(hTclLib = LoadLibraryEx(libname, NULL, 0))) ! return 0; for (i = 0; tcl_funcname_table[i].ptr; ++i) { if (!(*tcl_funcname_table[i].ptr = GetProcAddress(hTclLib, --- 180,200 ---- * 3. Repeat 2, until get all functions will be used. * * Parameter 'libname' provides name of DLL. ! * Return OK or FAIL. */ static int ! tcl_runtime_link_init(char *libname, int verbose) { int i; if (hTclLib) ! return OK; if (!(hTclLib = LoadLibraryEx(libname, NULL, 0))) ! { ! if (verbose) ! EMSG2(_("E370: Could not load library %s"), libname); ! return FAIL; ! } for (i = 0; tcl_funcname_table[i].ptr; ++i) { if (!(*tcl_funcname_table[i].ptr = GetProcAddress(hTclLib, *************** *** 198,207 **** { FreeLibrary(hTclLib); hTclLib = NULL; ! return 0; } } ! return 1; } #endif /* defined(DYNAMIC_TCL) || defined(PROTO) */ --- 202,214 ---- { FreeLibrary(hTclLib); hTclLib = NULL; ! if (verbose) ! EMSG2(_("E448: Could not load library function %s"), ! tcl_funcname_table[i].name); ! return FAIL; } } ! return OK; } #endif /* defined(DYNAMIC_TCL) || defined(PROTO) */ *************** *** 221,233 **** } #if defined(DYNAMIC_TCL) || defined(PROTO) int ! tcl_enabled() { ! static int stubs_initialized = 0; ! if (!stubs_initialized && find_executable_arg ! && tcl_runtime_link_init(DYNAMIC_TCL_DLL)) { Tcl_Interp *interp; --- 228,244 ---- } #if defined(DYNAMIC_TCL) || defined(PROTO) + /* + * Return TRUE if the TCL interface can be used. + */ int ! tcl_enabled(verbose) ! int verbose; { ! static int stubs_initialized = FALSE; ! if (!stubs_initialized && find_executable_arg != NULL ! && tcl_runtime_link_init(DYNAMIC_TCL_DLL, verbose) == OK) { Tcl_Interp *interp; *************** *** 237,243 **** { Tcl_FindExecutable(find_executable_arg); Tcl_DeleteInterp(interp); ! stubs_initialized = 1; } /* FIXME: When Tcl_InitStubs() was failed, how delete interp? */ } --- 248,254 ---- { Tcl_FindExecutable(find_executable_arg); Tcl_DeleteInterp(interp); ! stubs_initialized = TRUE; } /* FIXME: When Tcl_InitStubs() was failed, how delete interp? */ } *************** *** 1708,1714 **** char *name; #ifdef DYNAMIC_TCL ! if (!tcl_enabled()) { EMSG(_("Sorry, this command is disabled: the Tcl library could not be loaded.")); return FAIL; --- 1719,1725 ---- char *name; #ifdef DYNAMIC_TCL ! if (!tcl_enabled(TRUE)) { EMSG(_("Sorry, this command is disabled: the Tcl library could not be loaded.")); return FAIL; *************** *** 2068,2074 **** struct ref *reflist; #ifdef DYNAMIC_TCL ! if (!tcl_enabled()) return; #endif --- 2079,2085 ---- struct ref *reflist; #ifdef DYNAMIC_TCL ! if (!tcl_enabled(TRUE)) return; #endif *************** *** 2089,2095 **** struct ref *reflist; #ifdef DYNAMIC_TCL ! if (!tcl_enabled()) return; #endif --- 2100,2106 ---- struct ref *reflist; #ifdef DYNAMIC_TCL ! if (!tcl_enabled(TRUE)) return; #endif *** ../vim60.69/src/mbyte.c Mon Oct 22 12:47:09 2001 --- src/mbyte.c Sun Nov 4 14:07:01 2001 *************** *** 2429,2435 **** #ifdef DYNAMIC_ICONV /* Check if the iconv.dll can be found. */ ! if (!iconv_enabled()) return (void *)-1; #endif --- 2429,2435 ---- #ifdef DYNAMIC_ICONV /* Check if the iconv.dll can be found. */ ! if (!iconv_enabled(TRUE)) return (void *)-1; #endif *************** *** 2553,2559 **** * Try opening the iconv.dll and return TRUE if iconv() can be used. */ int ! iconv_enabled() { if (hIconvDLL != 0 && hMsvcrtDLL != 0) return TRUE; --- 2553,2560 ---- * Try opening the iconv.dll and return TRUE if iconv() can be used. */ int ! iconv_enabled(verbose) ! int verbose; { if (hIconvDLL != 0 && hMsvcrtDLL != 0) return TRUE; *************** *** 2561,2566 **** --- 2562,2572 ---- hMsvcrtDLL = LoadLibrary(DYNAMIC_MSVCRT_DLL); if (hIconvDLL == 0 || hMsvcrtDLL == 0) { + /* Only give the message when 'verbose' is set, otherwise it might be + * done whenever a conversion is attempted. */ + if (verbose && p_verbose > 0) + EMSG2(_("E370: Could not load library %s"), + hIconvDLL == 0 ? DYNAMIC_ICONV_DLL : DYNAMIC_MSVCRT_DLL); iconv_end(); return FALSE; } *************** *** 2574,2579 **** --- 2580,2588 ---- || iconvctl == NULL || iconv_errno == NULL) { iconv_end(); + if (verbose && p_verbose > 0) + EMSG2(_("E448: Could not load library function %s"), + "for libiconv"); return FALSE; } return TRUE; *************** *** 2607,2612 **** --- 2616,2624 ---- #if defined(FEAT_GUI_GTK) || defined(PROTO) static int xim_preediting INIT(= FALSE); /* XIM in showmode() */ static int xim_input_style; + #ifndef FEAT_GUI_GTK + # define gboolean int + #endif static gboolean use_status_area = 0; static int im_xim_str2keycode __ARGS((unsigned int *code, unsigned int *state)); *** ../vim60.69/src/os_win32.c Wed Oct 31 15:20:56 2001 --- src/os_win32.c Sun Nov 4 14:17:10 2001 *************** *** 255,261 **** --- 255,265 ---- STRCPY(gettail(dirname), GETTEXT_DLL); hLibintlDLL = LoadLibrary((char *)dirname); if (!hLibintlDLL) + { + if (p_verbose > 0) + EMSG2(_("E370: Could not load library %s"), GETTEXT_DLL); return 0; + } } for (i = 0; libintl_entry[i].name != NULL && libintl_entry[i].ptr != NULL; ++i) *************** *** 264,269 **** --- 268,276 ---- libintl_entry[i].name))) { dyn_libintl_end(); + if (p_verbose > 0) + EMSG2(_("E448: Could not load library function %s"), + libintl_entry[i].name); return 0; } } *** ../vim60.69/src/proto/if_perl.pro Tue Sep 25 21:49:36 2001 --- src/proto/if_perl.pro Sun Nov 4 13:32:23 2001 *************** *** 1,5 **** /* auto/if_perl.c */ ! int perl_enabled __ARGS((void)); void perl_end __ARGS((void)); void msg_split __ARGS((char_u *s, int attr)); void perl_win_free __ARGS((win_T *wp)); --- 1,5 ---- /* auto/if_perl.c */ ! int perl_enabled __ARGS((int verbose)); void perl_end __ARGS((void)); void msg_split __ARGS((char_u *s, int attr)); void perl_win_free __ARGS((win_T *wp)); *** ../vim60.69/src/proto/if_python.pro Tue Sep 25 21:49:16 2001 --- src/proto/if_python.pro Sun Nov 4 13:56:44 2001 *************** *** 1,5 **** /* if_python.c */ ! int python_enabled __ARGS((void)); void python_end __ARGS((void)); void ex_python __ARGS((exarg_T *eap)); void ex_pyfile __ARGS((exarg_T *eap)); --- 1,5 ---- /* if_python.c */ ! int python_enabled __ARGS((int verbose)); void python_end __ARGS((void)); void ex_python __ARGS((exarg_T *eap)); void ex_pyfile __ARGS((exarg_T *eap)); *** ../vim60.69/src/proto/if_ruby.pro Tue Sep 25 21:49:17 2001 --- src/proto/if_ruby.pro Sun Nov 4 13:56:49 2001 *************** *** 1,5 **** /* if_ruby.c */ ! int ruby_enabled __ARGS((void)); void ruby_end __ARGS((void)); void ex_ruby __ARGS((exarg_T *eap)); void ex_rubydo __ARGS((exarg_T *eap)); --- 1,5 ---- /* if_ruby.c */ ! int ruby_enabled __ARGS((int verbose)); void ruby_end __ARGS((void)); void ex_ruby __ARGS((exarg_T *eap)); void ex_rubydo __ARGS((exarg_T *eap)); *** ../vim60.69/src/proto/if_tcl.pro Tue Sep 25 21:49:33 2001 --- src/proto/if_tcl.pro Sun Nov 4 13:56:40 2001 *************** *** 1,6 **** /* if_tcl.c */ void tcl_init __ARGS((char *arg)); ! int tcl_enabled __ARGS((void)); void tcl_end __ARGS((void)); void ex_tcl __ARGS((exarg_T *eap)); void ex_tclfile __ARGS((exarg_T *eap)); --- 1,6 ---- /* if_tcl.c */ void tcl_init __ARGS((char *arg)); ! int tcl_enabled __ARGS((int verbose)); void tcl_end __ARGS((void)); void ex_tcl __ARGS((exarg_T *eap)); void ex_tclfile __ARGS((exarg_T *eap)); *** ../vim60.69/src/proto/mbyte.pro Tue Sep 25 21:49:21 2001 --- src/proto/mbyte.pro Sun Nov 4 14:07:02 2001 *************** *** 55,61 **** char_u *enc_canonize __ARGS((char_u *enc)); int enc_default __ARGS((void)); void *my_iconv_open __ARGS((char_u *to, char_u *from)); ! int iconv_enabled __ARGS((void)); void iconv_end __ARGS((void)); int im_xim_isvalid_imactivate __ARGS((void)); void im_set_active __ARGS((int active)); --- 55,61 ---- char_u *enc_canonize __ARGS((char_u *enc)); int enc_default __ARGS((void)); void *my_iconv_open __ARGS((char_u *to, char_u *from)); ! int iconv_enabled __ARGS((int verbose)); void iconv_end __ARGS((void)); int im_xim_isvalid_imactivate __ARGS((void)); void im_set_active __ARGS((int active)); *** ../vim60.69/src/version.c Sun Nov 4 13:19:04 2001 --- src/version.c Sun Nov 4 14:22:24 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 70, /**/ -- Engineers will go without food and hygiene for days to solve a problem. (Other times just because they forgot.) (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.071 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.071 Problem: The "iris-ansi" builtin termcap isn't very good. Solution: Fix the wrong entries. (David Harrison) Files: src/term.c *** ../vim60.70/src/term.c Mon Oct 22 18:52:01 2001 --- src/term.c Sun Nov 4 18:42:53 2001 *************** *** 1074,1098 **** # endif #endif {(int)KS_CL, "\033[H\033[2J"}, ! {(int)KS_VE, "\033[9/y\033[12/y"}, ! {(int)KS_VS, "\033[10/y\033[=1h\033[=2l"}, {(int)KS_TI, "\033[=6h"}, {(int)KS_TE, "\033[=6l"}, ! {(int)KS_SE, "\033[m"}, {(int)KS_SO, "\033[1;7m"}, {(int)KS_ME, "\033[m"}, {(int)KS_MR, "\033[7m"}, {(int)KS_MD, "\033[1m"}, - {(int)KS_UE, "\033[m"}, {(int)KS_CCO, "8"}, /* allow 8 colors */ # ifdef TERMINFO ! {(int)KS_CAB, "\033[4%p1%dm"}, /* set background color */ ! {(int)KS_CAF, "\033[3%p1%dm"}, /* set foreground color */ # else ! {(int)KS_CAB, "\033[4%dm"}, /* set background color */ ! {(int)KS_CAF, "\033[3%dm"}, /* set foreground color */ # endif - {(int)KS_US, "\033[4m"}, {(int)KS_MS, "y"}, /* guessed */ {(int)KS_UT, "y"}, /* guessed */ {(int)KS_LE, "\010"}, --- 1074,1104 ---- # endif #endif {(int)KS_CL, "\033[H\033[2J"}, ! {(int)KS_VE, "\033[9/y\033[12/y"}, /* These aren't documented */ ! {(int)KS_VS, "\033[10/y\033[=1h\033[=2l"}, /* These aren't documented */ {(int)KS_TI, "\033[=6h"}, {(int)KS_TE, "\033[=6l"}, ! {(int)KS_SE, "\033[21;27m"}, {(int)KS_SO, "\033[1;7m"}, {(int)KS_ME, "\033[m"}, {(int)KS_MR, "\033[7m"}, {(int)KS_MD, "\033[1m"}, {(int)KS_CCO, "8"}, /* allow 8 colors */ + {(int)KS_CZH, "\033[3m"}, /* italic mode on */ + {(int)KS_CZR, "\033[23m"}, /* italic mode off */ + {(int)KS_US, "\033[4m"}, /* underline on */ + {(int)KS_UE, "\033[24m"}, /* underline off */ # ifdef TERMINFO ! {(int)KS_CAB, "\033[4%p1%dm"}, /* set background color (ANSI) */ ! {(int)KS_CAF, "\033[3%p1%dm"}, /* set foreground color (ANSI) */ ! {(int)KS_CSB, "\033[102;%p1%dm"}, /* set screen background color */ ! {(int)KS_CSF, "\033[101;%p1%dm"}, /* set screen foreground color */ # else ! {(int)KS_CAB, "\033[4%dm"}, /* set background color (ANSI) */ ! {(int)KS_CAF, "\033[3%dm"}, /* set foreground color (ANSI) */ ! {(int)KS_CSB, "\033[102;%dm"}, /* set screen background color */ ! {(int)KS_CSF, "\033[101;%dm"}, /* set screen foreground color */ # endif {(int)KS_MS, "y"}, /* guessed */ {(int)KS_UT, "y"}, /* guessed */ {(int)KS_LE, "\010"}, *************** *** 1108,1120 **** {(int)KS_CRI, "\033[%dC"}, # endif {(int)KS_CIS, "\033P3.y"}, ! {(int)KS_CIE, "\234"}, {(int)KS_TS, "\033P1.y"}, ! {(int)KS_FS, "\234"}, # ifdef TERMINFO {(int)KS_CWS, "\033[203;%p1%d;%p2%d/y"}, # else {(int)KS_CWS, "\033[203;%d;%d/y"}, # endif {K_UP, "\033[A"}, {K_DOWN, "\033[B"}, --- 1114,1128 ---- {(int)KS_CRI, "\033[%dC"}, # endif {(int)KS_CIS, "\033P3.y"}, ! {(int)KS_CIE, "\234"}, /* ST "String Terminator" */ {(int)KS_TS, "\033P1.y"}, ! {(int)KS_FS, "\234"}, /* ST "String Terminator" */ # ifdef TERMINFO {(int)KS_CWS, "\033[203;%p1%d;%p2%d/y"}, + {(int)KS_CWP, "\033[205;%p1%d;%p2%d/y"}, # else {(int)KS_CWS, "\033[203;%d;%d/y"}, + {(int)KS_CWP, "\033[205;%d;%d/y"}, # endif {K_UP, "\033[A"}, {K_DOWN, "\033[B"}, *** ../vim60.70/src/version.c Sun Nov 4 14:31:23 2001 --- src/version.c Sun Nov 4 18:44:46 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 71, /**/ -- Engineers are always delighted to share wisdom, even in areas in which they have no experience whatsoever. Their logic provides them with inherent insight into any field of expertise. This can be a problem when dealing with the illogical people who believe that knowledge can only be derived through experience. (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.072 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.072 Problem: When 'lazyredraw' is set, a mapping that stops Visual mode, moves the cursor and starts Visual mode again causes a redraw problem. (Brian Silverman) Solution: Redraw both the old and the new Visual area when necessary. Files: src/normal.c, src/screen.c *** ../vim60.71/src/normal.c Sun Nov 4 13:19:04 2001 --- src/normal.c Sun Nov 4 19:03:27 2001 *************** *** 6491,6499 **** clip_star.vmode = NUL; #endif ! /* Only need to redraw this line. */ ! curwin->w_old_cursor_lnum = curwin->w_cursor.lnum; ! curwin->w_old_visual_lnum = curwin->w_cursor.lnum; } #endif /* FEAT_VISUAL */ --- 6491,6503 ---- clip_star.vmode = NUL; #endif ! /* Only need to redraw this line, unless still need to redraw an old ! * Visual area (when 'lazyredraw' is set). */ ! if (curwin->w_redr_type < INVERTED) ! { ! curwin->w_old_cursor_lnum = curwin->w_cursor.lnum; ! curwin->w_old_visual_lnum = curwin->w_cursor.lnum; ! } } #endif /* FEAT_VISUAL */ *** ../vim60.71/src/screen.c Thu Nov 1 14:59:19 2001 --- src/screen.c Sun Nov 4 19:06:14 2001 *************** *** 1171,1176 **** --- 1171,1180 ---- from = wp->w_old_cursor_lnum; if (wp->w_old_cursor_lnum > to) to = wp->w_old_cursor_lnum; + if (wp->w_old_visual_lnum < from) + from = wp->w_old_visual_lnum; + if (wp->w_old_visual_lnum > to) + to = wp->w_old_visual_lnum; } else { *** ../vim60.71/src/version.c Sun Nov 4 18:45:17 2001 --- src/version.c Sun Nov 4 19:08:13 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 72, /**/ -- For humans, honesty is a matter of degree. Engineers are always honest in matters of technology and human relationships. That's why it's a good idea to keep engineers away from customers, romantic interests, and other people who can't handle the thruth. (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.073 (extra) Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.073 (extra) Problem: DJGPP: When using CTRL-Z to start a shell, the prompt is halfway the text. (Volker Kiefel) Solution: Position the system cursor before starting the shell. Files: src/os_msdos.c *** ../vim60.72/src/os_msdos.c Sun Sep 16 17:17:36 2001 --- src/os_msdos.c Sun Nov 4 19:28:43 2001 *************** *** 115,126 **** --- 115,148 ---- int S_iBufferColumn; static void + myflush(void) + { + if (S_linebufferpos != S_linebuffer) + { + _dosmemputw(S_linebuffer, (S_linebufferpos - S_linebuffer), + S_ulScreenBase + + S_iBufferRow * (Columns << 1) + (S_iBufferColumn << 1)); + S_linebufferpos = S_linebuffer; + } + } + + static void mygotoxy(int x, int y) { S_iCurrentRow = y - 1; S_iCurrentColumn = x - 1; } + /* + * Set the system cursor to our cursor position. + */ + static void + set_sys_cursor(void) + { + myflush(); + gotoxy(S_iCurrentColumn + 1, S_iCurrentRow + 1); + } + static void setblankbuffer(unsigned short uiValue) { *************** *** 222,239 **** + (S_iBottom - 1) * (Columns << 1) + iColumn); } - static void - myflush(void) - { - if (S_linebufferpos != S_linebuffer) - { - _dosmemputw(S_linebuffer, (S_linebufferpos - S_linebuffer), - S_ulScreenBase - + S_iBufferRow * (Columns << 1) + (S_iBufferColumn << 1)); - S_linebufferpos = S_linebuffer; - } - } - static int myputch(int iChar) { --- 244,249 ---- *************** *** 1007,1014 **** show_mouse(TRUE); #endif #ifdef DJGPP ! myflush(); ! gotoxy(S_iCurrentColumn + 1, S_iCurrentRow + 1); #endif if (time >= 0) { --- 1017,1023 ---- show_mouse(TRUE); #endif #ifdef DJGPP ! set_sys_cursor(); #endif if (time >= 0) { *************** *** 1895,1903 **** stoptermcap(); set_interrupts(FALSE); /* restore interrupts */ #ifdef DJGPP ! /* Let the system know where our cursor is. */ ! myflush(); ! gotoxy(S_iCurrentColumn + 1, S_iCurrentRow + 1); #endif /* Somehow outputting CR-NL causes the original colors to be restored */ out_char('\r'); --- 1904,1910 ---- stoptermcap(); set_interrupts(FALSE); /* restore interrupts */ #ifdef DJGPP ! set_sys_cursor(); #endif /* Somehow outputting CR-NL causes the original colors to be restored */ out_char('\r'); *************** *** 2102,2107 **** --- 2109,2117 ---- #endif out_flush(); + #ifdef DJGPP + set_sys_cursor(); + #endif if (options & SHELL_COOKED) settmode(TMODE_COOK); /* set to normal mode */ *** ../vim60.72/src/version.c Sun Nov 4 19:10:16 2001 --- src/version.c Sun Nov 4 19:32:16 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 73, /**/ -- Engineers are widely recognized as superior marriage material: intelligent, dependable, employed, honest, and handy around the house. (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.074 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.074 Problem: When using "&" in a substitute string a multi-byte character with a trailbyte 0x5c is not handled correctly. Solution: Recognize multi-byte characters inside the "&" part. (Muraoka Taro) Files: src/regexp.c *** ../vim60.73/src/regexp.c Wed Oct 31 15:17:54 2001 --- src/regexp.c Mon Nov 5 08:46:11 2001 *************** *** 5403,5408 **** --- 5403,5412 ---- #ifdef FEAT_EVAL static char_u *eval_result = NULL; #endif + #ifdef FEAT_MBYTE + int l; + #endif + /* Be paranoid... */ if (source == NULL || dest == NULL) *************** *** 5482,5491 **** } if (no < 0) /* Ordinary character. */ { - #ifdef FEAT_MBYTE - int l; - #endif - if (c == '\\' && *src != NUL) { /* Check for abbreviations -- webb */ --- 5486,5491 ---- *************** *** 5606,5611 **** --- 5606,5622 ---- } dst += 2; } + #ifdef FEAT_MBYTE + else if (has_mbyte && (l = (*mb_ptr2len_check)(s)) > 1) + { + /* TODO: should use "func" here. */ + if (copy) + mch_memmove(dst, s, l); + dst += l; + s += l - 1; + len -= l - 1; + } + #endif else { if (copy) *** ../vim60.73/src/version.c Mon Nov 5 08:51:05 2001 --- src/version.c Mon Nov 5 08:50:40 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 74, /**/ -- Engineers understand that their appearance only bothers other people and therefore it is not worth optimizing. (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.075 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.075 Problem: When closing a horizontally split window while 'eadirection' is "hor" another horizontally split window is still resized. (Aron Griffis) Solution: Only resize windows in the same top frame as the window that is split or closed. Files: src/main.c, src/proto/window.pro, src/window.c *** ../vim60.74/src/main.c Thu Nov 1 12:22:41 2001 --- src/main.c Mon Nov 5 09:29:34 2001 *************** *** 1716,1722 **** # endif TIME_MSG("editing files in windows"); if (window_count > 1) ! win_equal(curwin, 'b'); /* adjust heights */ #endif /* FEAT_WINDOWS */ #ifdef FEAT_DIFF --- 1716,1722 ---- # endif TIME_MSG("editing files in windows"); if (window_count > 1) ! win_equal(curwin, FALSE, 'b'); /* adjust heights */ #endif /* FEAT_WINDOWS */ #ifdef FEAT_DIFF *** ../vim60.74/src/proto/window.pro Tue Sep 25 21:49:27 2001 --- src/proto/window.pro Mon Nov 5 09:29:09 2001 *************** *** 5,11 **** int win_count __ARGS((void)); int make_windows __ARGS((int count, int vertical)); void win_move_after __ARGS((win_T *win1, win_T *win2)); ! void win_equal __ARGS((win_T *next_curwin, int dir)); void close_windows __ARGS((buf_T *buf)); void win_close __ARGS((win_T *win, int free_buf)); void close_others __ARGS((int message, int forceit)); --- 5,11 ---- int win_count __ARGS((void)); int make_windows __ARGS((int count, int vertical)); void win_move_after __ARGS((win_T *win1, win_T *win2)); ! void win_equal __ARGS((win_T *next_curwin, int current, int dir)); void close_windows __ARGS((buf_T *buf)); void win_close __ARGS((win_T *win, int free_buf)); void close_others __ARGS((int message, int forceit)); *** ../vim60.74/src/window.c Thu Nov 1 14:51:27 2001 --- src/window.c Mon Nov 5 09:49:44 2001 *************** *** 25,31 **** static void win_exchange __ARGS((long)); static void win_rotate __ARGS((int, int)); static void win_totop __ARGS((int size, int flags)); ! static void win_equal_rec __ARGS((win_T *next_curwin, frame_T *topfr, int dir, int col, int row, int width, int height)); static win_T *winframe_remove __ARGS((win_T *win, int *dirp)); static frame_T *win_altframe __ARGS((win_T *win)); static win_T *frame2win __ARGS((frame_T *frp)); --- 25,31 ---- static void win_exchange __ARGS((long)); static void win_rotate __ARGS((int, int)); static void win_totop __ARGS((int size, int flags)); ! static void win_equal_rec __ARGS((win_T *next_curwin, int current, frame_T *topfr, int dir, int col, int row, int width, int height)); static win_T *winframe_remove __ARGS((win_T *win, int *dirp)); static frame_T *win_altframe __ARGS((win_T *win)); static win_T *frame2win __ARGS((frame_T *frp)); *************** *** 367,373 **** #ifdef FEAT_GUI need_mouse_correct = TRUE; #endif ! win_equal(NULL, 0); break; /* increase current window height */ --- 367,373 ---- #ifdef FEAT_GUI need_mouse_correct = TRUE; #endif ! win_equal(NULL, FALSE, 0); break; /* increase current window height */ *************** *** 1015,1021 **** * make the new window the current window and redraw */ if (do_equal || dir != 0) ! win_equal(wp, #ifdef FEAT_VERTSPLIT (flags & WSP_VERT) ? (dir == 'v' ? 'b' : 'h') : dir == 'h' ? 'b' : --- 1015,1021 ---- * make the new window the current window and redraw */ if (do_equal || dir != 0) ! win_equal(wp, TRUE, #ifdef FEAT_VERTSPLIT (flags & WSP_VERT) ? (dir == 'v' ? 'b' : 'h') : dir == 'h' ? 'b' : *************** *** 1485,1492 **** * rows. */ void ! win_equal(next_curwin, dir) win_T *next_curwin; /* pointer to current window to be or NULL */ int dir; /* 'v' for vertically, 'h' for horizontally, 'b' for both, 0 for using p_ead */ { --- 1485,1493 ---- * rows. */ void ! win_equal(next_curwin, current, dir) win_T *next_curwin; /* pointer to current window to be or NULL */ + int current; /* do only frame with current window */ int dir; /* 'v' for vertically, 'h' for horizontally, 'b' for both, 0 for using p_ead */ { *************** *** 1496,1503 **** #else dir = 'b'; #endif ! win_equal_rec(next_curwin == NULL ? curwin : next_curwin, topframe, dir, ! 0, 0, (int)Columns, topframe->fr_height); } /* --- 1497,1504 ---- #else dir = 'b'; #endif ! win_equal_rec(next_curwin == NULL ? curwin : next_curwin, current, ! topframe, dir, 0, 0, (int)Columns, topframe->fr_height); } /* *************** *** 1507,1514 **** * 'winheight' and 'winwidth' if possible. */ static void ! win_equal_rec(next_curwin, topfr, dir, col, row, width, height) win_T *next_curwin; /* pointer to current window to be or NULL */ frame_T *topfr; /* frame to set size off */ int dir; /* 'v', 'h' or 'b', see win_equal() */ int col; /* horizontal position for frame */ --- 1508,1516 ---- * 'winheight' and 'winwidth' if possible. */ static void ! win_equal_rec(next_curwin, current, topfr, dir, col, row, width, height) win_T *next_curwin; /* pointer to current window to be or NULL */ + int current; /* do only frame with current window */ frame_T *topfr; /* frame to set size off */ int dir; /* 'v', 'h' or 'b', see win_equal() */ int col; /* horizontal position for frame */ *************** *** 1616,1622 **** new_size += next_curwin_size; } } ! win_equal_rec(next_curwin, fr, dir, col, row, new_size + n, height); col += new_size + n; width -= new_size + n; if (n != m) /* contains curwin */ --- 1618,1631 ---- new_size += next_curwin_size; } } ! ! /* Skip frame that is full height when splitting or closing a ! * window, unless equalizing all frames. */ ! if (!current || dir != 'v' || topfr->fr_parent != NULL ! || (new_size != fr->fr_width) ! || frame_has_win(fr, next_curwin)) ! win_equal_rec(next_curwin, current, fr, dir, col, row, ! new_size + n, height); col += new_size + n; width -= new_size + n; if (n != m) /* contains curwin */ *************** *** 1766,1772 **** room -= new_size; new_size += n; } ! win_equal_rec(next_curwin, fr, dir, col, row, width, new_size); row += new_size; height -= new_size; totwincount -= wincount; --- 1775,1787 ---- room -= new_size; new_size += n; } ! /* Skip frame that is full width when splitting or closing a ! * window, unless equalizing all frames. */ ! if (!current || dir != 'h' || topfr->fr_parent != NULL ! || (new_size != fr->fr_height) ! || frame_has_win(fr, next_curwin)) ! win_equal_rec(next_curwin, current, fr, dir, col, row, ! width, new_size); row += new_size; height -= new_size; totwincount -= wincount; *************** *** 1906,1912 **** close_curwin = TRUE; } if (p_ea) ! win_equal(curwin, #ifdef FEAT_VERTSPLIT dir #else --- 1921,1927 ---- close_curwin = TRUE; } if (p_ea) ! win_equal(curwin, TRUE, #ifdef FEAT_VERTSPLIT dir #else *************** *** 3199,3205 **** #if 0 /* Disabled: don't want making the screen smaller make a window larger. */ if (p_ea) ! win_equal(curwin, 'v'); #endif } --- 3214,3220 ---- #if 0 /* Disabled: don't want making the screen smaller make a window larger. */ if (p_ea) ! win_equal(curwin, FALSE, 'v'); #endif } *************** *** 3217,3223 **** #if 0 /* Disabled: don't want making the screen smaller make a window larger. */ if (p_ea) ! win_equal(curwin, 'h'); #endif } #endif --- 3232,3238 ---- #if 0 /* Disabled: don't want making the screen smaller make a window larger. */ if (p_ea) ! win_equal(curwin, FALSE, 'h'); #endif } #endif *** ../vim60.74/src/version.c Mon Nov 5 09:00:25 2001 --- src/version.c Mon Nov 5 09:41:37 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 75, /**/ -- Imagine a world without hypothetical situations. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.076 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.076 Problem: Warning for wrong pointer type when compiling. Solution: Use char instead of char_u pointer. Files: src/version.c *** ../vim60.75/src/version.c Mon Nov 5 09:52:01 2001 --- src/version.c Mon Nov 5 11:14:45 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 76, /**/ *************** *** 1080,1084 **** int row; int blanklines; ! char_u *p; static char *(lines[]) = { --- 1082,1086 ---- int row; int blanklines; ! char *p; static char *(lines[]) = { -- It doesn't really matter what you can do if you don't do it. (Bram Moolenaar) /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.077 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.077 Problem: Patch 6.0.075 was incomplete. Solution: Fix another call to win_equal(). Files: src/option.c *** ../vim60.76/src/option.c Thu Oct 25 16:34:24 2001 --- src/option.c Mon Nov 5 09:29:47 2001 *************** *** 5709,5715 **** else if ((int *)varp == &p_ea) { if (p_ea && !old_value) ! win_equal(curwin, 0); } #endif --- 5709,5715 ---- else if ((int *)varp == &p_ea) { if (p_ea && !old_value) ! win_equal(curwin, FALSE, 0); } #endif *** ../vim60.76/src/version.c Mon Nov 5 11:15:34 2001 --- src/version.c Mon Nov 5 12:50:14 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 77, /**/ -- No engineer can take a shower without wondering if some sort of Teflon coating would make showering unnecessary. (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.078 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.078 Problem: Using "daw" at the end of a line on a single-character word didn't include the white space before it. At the end of the file it didn't work at all. (Gavin Sinclair) Solution: Include the white space before the word. Files: src/search.c *** ../vim60.77/src/search.c Thu Nov 1 21:26:45 2001 --- src/search.c Mon Nov 5 12:48:43 2001 *************** *** 2703,2718 **** * If the start is not on white space, and white space should be * included ("word "), or start is on white space and white * space should not be included (" "), find start of word. */ ! if (fwd_word(1L, bigword, TRUE) == FAIL) ! return FAIL; ! /* ! * If end is just past a new-line, we don't want to include the ! * first character on the line ! */ ! if (oneleft() == FAIL) /* put cursor on last char of area */ ! inclusive = FALSE; ! else if (include) { /* * If we don't include white space at the end, move the start --- 2703,2718 ---- * If the start is not on white space, and white space should be * included ("word "), or start is on white space and white * space should not be included (" "), find start of word. + * If we end up in the first column of the next line (single char + * word) back up to end of the line. */ ! fwd_word(1L, bigword, TRUE); ! if (curwin->w_cursor.col == 0) ! decl(&curwin->w_cursor); ! else ! oneleft(); ! ! if (include) { /* * If we don't include white space at the end, move the start *** ../vim60.77/src/version.c Mon Nov 5 12:51:06 2001 --- src/version.c Mon Nov 5 13:11:50 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 78, /**/ -- The process for understanding customers primarily involves sitting around with other marketing people and talking about what you would to if you were dumb enough to be a customer. (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.079 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.079 Problem: When "W" is in 'cpoptions' and 'backupcopy' is "no" or "auto", can still overwrite a read-only file, because it's renamed. (Gary Holloway) Solution: Add a check for a read-only file before renaming the file to become the backup. Files: src/fileio.c *** ../vim60.78/src/fileio.c Tue Oct 30 20:35:08 2001 --- src/fileio.c Mon Nov 5 19:37:58 2001 *************** *** 2204,2209 **** --- 2204,2211 ---- int device = FALSE; /* writing to a device */ struct stat st_old; int prev_got_int = got_int; + int file_readonly = FALSE; /* overwritten file is read-only */ + static char *err_readonly = "is read-only (cannot override: \"W\" in 'cpoptions')"; #if defined(UNIX) || defined(__EMX__XX) /*XXX fix me sometime? */ int made_writable = FALSE; /* 'w' bit has been set */ #endif *************** *** 2540,2546 **** * Check if the file is really writable (when renaming the file to * make a backup we won't discover it later). */ ! if (!forceit && ( # ifdef USE_MCH_ACCESS # ifdef UNIX (perm & 0222) == 0 || --- 2542,2548 ---- * Check if the file is really writable (when renaming the file to * make a backup we won't discover it later). */ ! file_readonly = ( # ifdef USE_MCH_ACCESS # ifdef UNIX (perm & 0222) == 0 || *************** *** 2548,2558 **** mch_access((char *)fname, W_OK) # else (fd = mch_open((char *)fname, O_RDWR | O_EXTRA, 0)) < 0 ! ? TRUE : (close(fd), FALSE) # endif ! )) { ! errmsg = (char_u *)_("is read-only (use ! to override)"); goto fail; } --- 2550,2564 ---- mch_access((char *)fname, W_OK) # else (fd = mch_open((char *)fname, O_RDWR | O_EXTRA, 0)) < 0 ! ? TRUE : (close(fd), FALSE) # endif ! ); ! if (!forceit && file_readonly) { ! if (vim_strchr(p_cpo, CPO_FWRITE) != NULL) ! errmsg = (char_u *)_(err_readonly); ! else ! errmsg = (char_u *)_("is read-only (use ! to override)"); goto fail; } *************** *** 2895,2900 **** --- 2901,2919 ---- /* * Make a backup by renaming the original file. + */ + /* + * If 'cpoptions' includes the "W" flag, we don't want to + * overwrite a read-only file. But rename may be possible + * anyway, thus we need an extra check here. + */ + if (file_readonly && vim_strchr(p_cpo, CPO_FWRITE) != NULL) + { + errmsg = (char_u *)_(err_readonly); + goto fail; + } + + /* * * Form the backup file name - change path/fo.o.h to * path/fo.o.h.bak Try all directories in 'backupdir', first one *** ../vim60.78/src/version.c Mon Nov 5 13:16:21 2001 --- src/version.c Mon Nov 5 20:31:42 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 79, /**/ -- hundred-and-one symptoms of being an internet addict: 1. You actually wore a blue ribbon to protest the Communications Decency Act. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.080 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.080 Problem: When using a session file that has the same file in two windows, the fileinfo() call in do_ecmd() causes a scroll and a hit-enter prompt. (Robert Webb) Solution: Don't scroll this message when 'shortmess' contains 'O'. Files: src/ex_cmds.c *** ../vim60.79/src/ex_cmds.c Fri Sep 21 20:05:35 2001 --- src/ex_cmds.c Mon Nov 5 20:55:36 2001 *************** *** 2972,2978 **** --- 2972,2994 ---- && !auto_buf #endif ) + { + int msg_scroll_save = msg_scroll; + + /* Obey the 'O' flag in 'cpoptions': overwrite any previous file + * message. */ + if (shortmess(SHM_OVERALL) && !exiting && p_verbose == 0) + msg_scroll = FALSE; + if (!msg_scroll) /* wait a bit when overwriting an error msg */ + check_for_delay(FALSE); + msg_start(); + msg_scroll = msg_scroll_save; + msg_scrolled_ign = TRUE; + fileinfo(FALSE, TRUE, FALSE); + + msg_scrolled_ign = FALSE; + } if (command != NULL) do_cmdline(command, NULL, NULL, DOCMD_VERBOSE); *** ../vim60.79/src/version.c Mon Nov 5 21:01:58 2001 --- src/version.c Mon Nov 5 20:57:03 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 80, /**/ -- hundred-and-one symptoms of being an internet addict: 4. Your eyeglasses have a web site burned in on them. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.081 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.081 Problem: After using ":saveas" the new buffer name is added to the Buffers menu with a wrong number. (Chauk-Mean Proum) Solution: Trigger BufFilePre and BufFilePost events for the renamed buffer and BufAdd for the old name (which is with a new buffer). Files: src/ex_cmds.c *** ../vim60.80/src/ex_cmds.c Mon Nov 5 21:04:40 2001 --- src/ex_cmds.c Mon Nov 5 21:16:41 2001 *************** *** 2142,2147 **** --- 2142,2158 ---- if (eap->cmdidx == CMD_saveas && alt_buf != NULL) { + #ifdef FEAT_AUTOCMD + buf_T *was_curbuf = curbuf; + + apply_autocmds(EVENT_BUFFILEPRE, NULL, NULL, FALSE, curbuf); + if (curbuf != was_curbuf) + { + /* buffer changed, don't change name now */ + retval = FAIL; + goto theend; + } + #endif /* Exchange the file names for the current and the alternate buffer. * This makes it look like we are now editing the buffer under the new * name. Must be done before buf_write(), because if there is no file *************** *** 2157,2166 **** curbuf->b_sfname = fname; buf_name_changed(); #ifdef FEAT_AUTOCMD if (!alt_buf->b_p_bl) { alt_buf->b_p_bl = TRUE; ! apply_autocmds(EVENT_BUFADD, NULL, NULL, FALSE, curbuf); } #endif } --- 2168,2184 ---- curbuf->b_sfname = fname; buf_name_changed(); #ifdef FEAT_AUTOCMD + apply_autocmds(EVENT_BUFFILEPOST, NULL, NULL, FALSE, curbuf); if (!alt_buf->b_p_bl) { alt_buf->b_p_bl = TRUE; ! apply_autocmds(EVENT_BUFADD, NULL, NULL, FALSE, alt_buf); ! } ! if (curbuf != was_curbuf) ! { ! /* buffer changed, don't write the file */ ! retval = FAIL; ! goto theend; } #endif } *** ../vim60.80/src/version.c Mon Nov 5 21:04:40 2001 --- src/version.c Mon Nov 5 21:23:51 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 81, /**/ -- hundred-and-one symptoms of being an internet addict: 5. You find yourself brainstorming for new subjects to search. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.082 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.082 Problem: When swapping screens in an xterm and there is an (error) message from the vimrc script, the shell prompt is after the message. Solution: Output a newline when there was output on the alternate screen. Also when starting the GUI. Files: src/main.c *** ../vim60.81/src/main.c Mon Nov 5 09:52:01 2001 --- src/main.c Mon Nov 5 22:04:39 2001 *************** *** 1362,1367 **** --- 1362,1374 ---- #ifdef FEAT_GUI if (gui.starting) { + #if defined(UNIX) || defined(VMS) + /* When something caused a message from a vimrc script, need to output + * an extra newline before the shell prompt. */ + if (did_emsg || msg_didout) + putchar('\n'); + #endif + gui_start(); /* will set full_screen to TRUE */ TIME_MSG("starting GUI"); } *************** *** 1502,1507 **** --- 1509,1521 ---- dup(2); #endif } + + #if defined(UNIX) || defined(VMS) + /* When switching screens and something caused a message from a vimrc + * script, need to output an extra newline on exit. */ + if ((did_emsg || msg_didout) && *T_TI != NUL) + newline_on_exit = TRUE; + #endif /* * When done something that is not allowed or error message call *** ../vim60.81/src/version.c Mon Nov 5 21:24:46 2001 --- src/version.c Mon Nov 5 22:06:01 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 82, /**/ -- hundred-and-one symptoms of being an internet addict: 6. You refuse to go to a vacation spot with no electricity and no phone lines. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.083 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.083 Problem: GTK: When compiled without menu support the buttons in a dialog don't have any text. (Erik Edelmann) Solution: Add the text also when GTK_USE_ACCEL isn't defined. And define GTK_USE_ACCEL also when not using menus. Files: src/gui_gtk.c *** ../vim60.82/src/gui_gtk.c Thu Oct 25 10:20:46 2001 --- src/gui_gtk.c Tue Nov 6 11:52:21 2001 *************** *** 119,126 **** static void exact_match_cb(GtkWidget *widget, gpointer data); static void repl_dir_cb(GtkWidget * widget, gpointer data); - #if defined(FEAT_MENU) || defined(PROTO) - /* * Only use accelerators when gtk_menu_ensure_uline_accel_group() is * available, which is in version 1.2.1. That was the first version where --- 119,124 ---- *************** *** 132,137 **** --- 130,137 ---- # endif #endif + #if defined(FEAT_MENU) || defined(PROTO) + /* * Create a highly customized menu item by hand instead of by using: * *************** *** 1337,1342 **** --- 1337,1344 ---- accel_key, 0, 0); } + # else + (void)gtk_label_parse_uline(GTK_LABEL(label), (const gchar *)p); # endif gtk_container_add(GTK_CONTAINER(button[butcount]), label); *** ../vim60.82/src/version.c Mon Nov 5 22:06:57 2001 --- src/version.c Tue Nov 6 11:56:49 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 83, /**/ -- hundred-and-one symptoms of being an internet addict: 22. You've already visited all the links at Yahoo and you're halfway through Lycos. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.084 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.084 Problem: UTF-8: a "r" command with an argument that is a keymap for a character with a composing character can't be repeated with ".". (Raphael Finkel) Solution: Add the composing characters to the redo buffer. Files: src/normal.c *** ../vim60.83/src/normal.c Sun Nov 4 19:10:16 2001 --- src/normal.c Tue Nov 6 14:19:12 2001 *************** *** 5854,5859 **** --- 5854,5864 ---- { int old_State = State; + if (cap->ncharC1 != 0) + AppendCharToRedobuff(cap->ncharC1); + if (cap->ncharC2 != 0) + AppendCharToRedobuff(cap->ncharC2); + /* This is slow, but it handles replacing a single-byte with a * multi-byte and the other way around. Also handles adding * composing characters for utf-8. */ *** ../vim60.83/src/version.c Tue Nov 6 11:58:54 2001 --- src/version.c Tue Nov 6 14:24:11 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 84, /**/ -- Q: What is the difference betwee open-source and commercial software? A: If you have a problem with commercial software you can call a phone number and they will tell you it might be solved in a future version. For open-source sofware there isn't a phone number to call, but you get the solution within a day. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.085 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.085 Problem: When 'mousefocus' is set, using "s" to go to Insert mode and then moving the mouse pointer to another window stops Insert mode, while this doesn't happen with "a" or "i". (Robert Webb) Solution: Reset finish_op before calling edit(). Files: src/normal.c *** ../vim60.84/src/normal.c Tue Nov 6 14:25:46 2001 --- src/normal.c Tue Nov 6 14:34:26 2001 *************** *** 1736,1741 **** --- 1736,1743 ---- else restart_edit_save = 0; restart_edit = 0; + /* Reset finish_op now, don't want it set inside edit(). */ + finish_op = FALSE; if (op_change(oap)) /* will call edit() */ cap->retval |= CA_COMMAND_BUSY; if (restart_edit == 0) *** ../vim60.84/src/version.c Tue Nov 6 14:25:46 2001 --- src/version.c Tue Nov 6 14:38:23 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 85, /**/ -- If all you have is a hammer, everything looks like a nail. When your hammer is C++, everything begins to look like a thumb. -- Steve Hoflich, comp.lang.c++ /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.086 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.086 Problem: When using "gu" the message says "~ed". Solution: Make the message say "changed". Files: src/ops.c *** ../vim60.85/src/ops.c Sun Nov 4 13:15:58 2001 --- src/ops.c Sat Nov 3 21:25:47 2001 *************** *** 1948,1954 **** #endif /* ! * Handle the (non-standard vi) tilde operator. Also for "gu" and "gU". */ void op_tilde(oap) --- 1948,1954 ---- #endif /* ! * Handle the (non-standard vi) tilde operator. Also for "gu", "gU" and "g?". */ void op_tilde(oap) *************** *** 2018,2032 **** if (oap->line_count > p_report) { if (oap->line_count == 1) ! MSG(_("1 line ~ed")); else ! smsg((char_u *)_("%ld lines ~ed"), oap->line_count); } } /* * If op_type == OP_UPPER: make uppercase, * if op_type == OP_LOWER: make lowercase, * else swap case of character at 'pos' * returns TRUE when something actually changed. */ --- 2018,2033 ---- if (oap->line_count > p_report) { if (oap->line_count == 1) ! MSG(_("1 line changed")); else ! smsg((char_u *)_("%ld lines changed"), oap->line_count); } } /* * If op_type == OP_UPPER: make uppercase, * if op_type == OP_LOWER: make lowercase, + * if op_type == OP_ROT13: do rot13 encoding, * else swap case of character at 'pos' * returns TRUE when something actually changed. */ *** ../vim60.85/src/version.c Tue Nov 6 14:39:24 2001 --- src/version.c Tue Nov 6 15:51:38 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 86, /**/ -- Anyone who is capable of getting themselves made President should on no account be allowed to do the job. -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.087 (lang, big!) Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.087 (lang) Problem: Message translations are incorrect, which may cause a crash. (Peter Figura) The Turkish translations needed more work and the maintainer didn't have time. Solution: Fix order of printf arguments. Remove %2$d constructs. Add "-v" to msgfmt to get a warning for wrong translations. Don't install the Turkish translations for now. Update a few more translations. Files: src/po/Makefile, src/po/af.po, src/po/cs.po, src/po/cs.cp1250.po, src/po/de.po, src/po/es.po, src/po/fr.po, src/po/it.po, src/po/ja.po, src/po/ja.sjis.po, src/po/ko.po, src/po/pl.po, src/po/sk.po, src/po/uk.po, src/po/zh_CN.UTF-8.po, src/po/zh_CN.cp936.po, src/po/zh_CN.po, src/po/zh_TW.po diff -rc -C 1 ../vim60.86//src/po/Makefile src/po/Makefile *** ../vim60.86//src/po/Makefile Tue Sep 18 15:29:32 2001 --- src/po/Makefile Fri Oct 26 10:09:01 2001 *************** *** 6,10 **** ! LANGUAGES = af cs de es fr it ja ko pl sk tr uk zh_TW zh_CN zh_CN.UTF-8 MOFILES = af.mo cs.mo de.mo es.mo fr.mo it.mo ja.mo \ ! ko.mo pl.mo sk.mo tr.mo uk.mo zh_TW.mo zh_CN.mo zh_CN.UTF-8.mo --- 6,10 ---- ! LANGUAGES = af cs de es fr it ja ko pl sk uk zh_TW zh_CN zh_CN.UTF-8 MOFILES = af.mo cs.mo de.mo es.mo fr.mo it.mo ja.mo \ ! ko.mo pl.mo sk.mo uk.mo zh_TW.mo zh_CN.mo zh_CN.UTF-8.mo *************** *** 17,19 **** # set. gettext 0.10.36 will not work! ! MSGFMT = OLD_PO_FILE_INPUT=yes msgfmt XGETTEXT = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes xgettext --- 17,19 ---- # set. gettext 0.10.36 will not work! ! MSGFMT = OLD_PO_FILE_INPUT=yes msgfmt -v XGETTEXT = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes xgettext diff -rc -C 1 ../vim60.86//src/po/af.po src/po/af.po *** ../vim60.86//src/po/af.po Fri Aug 31 20:02:04 2001 --- src/po/af.po Tue Nov 6 16:00:56 2001 *************** *** 4,6 **** # Danie Roux , 2001 ! # Edited: Jean Jordaan (njj) , 2001/03/09 # njj: Save == Stoor. Write == Skryf. --- 4,8 ---- # Danie Roux , 2001 ! # Edited: Jean Jordaan (njj) , 10/01/2001 ! # Edited by Danie on 10/31/2001 ! # # njj: Save == Stoor. Write == Skryf. *************** *** 8,16 **** # njj: "source" == "uitvoer", want "sourced" lęers word uitgevoer msgid "" msgstr "" ! "Project-Id-Version: Vim 6.0y\n" ! "POT-Creation-Date: 2001-03-27 11:49+0200\n" ! "PO-Revision-Date: Tue Mar 27 14:19:08 SAST 2001 +0200\n" "Last-Translator: Danie Roux \n" ! "Language-Team: Afrikaans \n" "MIME-Version: 1.0\n" --- 10,28 ---- # njj: "source" == "uitvoer", want "sourced" lęers word uitgevoer + # njj: "abort" == "staak" + # close == sluit + # Onseker: + # X Display - vertoonskerm? (njj: ek dink dis reg.) + # open vim in another GTK Widget - het vertaal as element (njj: OK, maar + # 'n element is algemener as 'n widget: mens kry byvoorbeeld HTML + # en XML elemente. Maar ek kan nie nou aan 'n spesifieker woord dink + # nie.) + # Printing aborted - drukkery gestaak? (njj: ek dink dis reg.) + msgid "" msgstr "" ! "Project-Id-Version: Vim 6.0\n" ! "POT-Creation-Date: 2001-10-31 12:43+0200\n" ! "PO-Revision-Date: Wed Oct 31 13:41 SAST 2001\n" "Last-Translator: Danie Roux \n" ! "Language-Team: Danie Roux \n" "MIME-Version: 1.0\n" *************** *** 19,29 **** ! #: buffer.c:92 ! msgid "Cannot allocate buffer, exiting..." ! msgstr "Kan nie buffer toeken nie, program sluit..." ! ! #: buffer.c:95 ! msgid "Cannot allocate buffer, using other one..." ! msgstr "Kan nie buffer toeken nie, gaan ander een gebruik..." ! #: buffer.c:683 msgid "No buffers were unloaded" --- 31,41 ---- ! #: buffer.c:97 ! msgid "E82: Cannot allocate any buffer, exiting..." ! msgstr "E82: Kan nie buffer toeken nie, program sluit..." ! ! #: buffer.c:100 ! msgid "E83: Cannot allocate buffer, using other one..." ! msgstr "E83: Kan nie buffer toeken nie, gaan ander een gebruik..." ! #: buffer.c:698 msgid "No buffers were unloaded" *************** *** 66,114 **** ! #: buffer.c:768 ! msgid "No modified buffer found" ! msgstr "Geen veranderde buffer gevind nie" ! #: buffer.c:813 #, c-format ! msgid "Cannot go to buffer %ld" ! msgstr "Kan nie na buffer %ld gaan nie" ! #: buffer.c:816 ! msgid "Cannot go beyond last buffer" ! msgstr "Kan nie verby laaste buffer gaan nie" ! #: buffer.c:818 ! msgid "Cannot go before first buffer" ! msgstr "Kan nie vóór eerste buffer gaan nie" ! #: buffer.c:842 #, c-format ! msgid "No write since last change for buffer %ld (use ! to override)" msgstr "" ! "Buffer %ld nog ongestoor sedert vorige wysiging (gebruik ! om te dwing)" ! #: buffer.c:858 ! msgid "Cannot unload last buffer" ! msgstr "Kan nie laaste buffer uitlaai nie" ! #: buffer.c:1267 ! msgid "Warning: List of file names overflow" ! msgstr "Waarskuwing: Lęerlys loop oor" ! #: buffer.c:1425 #, c-format ! msgid "buffer %ld not found" ! msgstr "buffer %ld kon nie gevind word nie" ! #: buffer.c:1629 #, c-format ! msgid "More than one match for %s" ! msgstr "Meer as een treffer vir %s" ! #: buffer.c:1631 #, c-format ! msgid "No matching buffer for %s" ! msgstr "Geen buffer wat by %s pas nie" ! #: buffer.c:2020 ex_docmd.c:5850 #, c-format --- 78,131 ---- ! #: buffer.c:783 ! msgid "E84: No modified buffer found" ! msgstr "E84: Geen veranderde buffer gevind nie" ! #. back where we started, didn't find anything. ! #: buffer.c:822 ! msgid "E85: There is no listed buffer" ! msgstr "E85: Daar is geen gelyste buffer nie" ! ! #: buffer.c:834 #, c-format ! msgid "E86: Cannot go to buffer %ld" ! msgstr "E86: Kan nie na buffer %ld gaan nie" ! #: buffer.c:837 ! msgid "E87: Cannot go beyond last buffer" ! msgstr "E87: Kan nie verby laaste buffer gaan nie" ! #: buffer.c:839 ! msgid "E88: Cannot go before first buffer" ! msgstr "E88: Kan nie vóór eerste buffer gaan nie" ! #: buffer.c:863 #, c-format ! msgid "E89: No write since last change for buffer %ld (use ! to override)" msgstr "" ! "E89: Buffer %ld nog ongestoor sedert vorige wysiging (gebruik ! om te dwing)" ! #: buffer.c:879 ! msgid "E90: Cannot unload last buffer" ! msgstr "E90: Kan nie laaste buffer uitlaai nie" ! #: buffer.c:1314 ! msgid "W14: Warning: List of file names overflow" ! msgstr "W14: Waarskuwing: Lęerlys loop oor" ! #: buffer.c:1480 #, c-format ! msgid "E92: Buffer %ld not found" ! msgstr "E92: buffer %ld kon nie gevind word nie" ! #: buffer.c:1700 #, c-format ! msgid "E93: More than one match for %s" ! msgstr "E93: Meer as een treffer vir %s" ! #: buffer.c:1702 #, c-format ! msgid "E94: No matching buffer for %s" ! msgstr "E94: Geen buffer wat by %s pas nie" ! #: buffer.c:2105 ex_docmd.c:6065 #, c-format *************** *** 117,123 **** ! #: buffer.c:2103 ! msgid "Buffer with this name already exists" ! msgstr "Buffer met hierdie naam bestaan alreeds" ! #: buffer.c:2383 msgid " [Modified]" --- 134,140 ---- ! #: buffer.c:2188 ! msgid "E95: Buffer with this name already exists" ! msgstr "E95: Buffer met hierdie naam bestaan alreeds" ! #: buffer.c:2481 msgid " [Modified]" *************** *** 141,143 **** ! #: buffer.c:2412 msgid "1 line --%d%%--" --- 158,161 ---- ! #: buffer.c:2510 ! #, c-format msgid "1 line --%d%%--" *************** *** 145,147 **** ! #: buffer.c:2412 msgid "%ld lines --%d%%--" --- 163,166 ---- ! #: buffer.c:2510 ! #, c-format msgid "%ld lines --%d%%--" *************** *** 149,151 **** ! #: buffer.c:2420 msgid "line %ld of %ld --%d%%-- col " --- 168,171 ---- ! #: buffer.c:2518 ! #, c-format msgid "line %ld of %ld --%d%%-- col " *************** *** 170,176 **** ! #: buffer.c:3275 msgid "All" ! msgstr "ALLES" ! #: buffer.c:3275 msgid "Bot" --- 190,196 ---- ! #: buffer.c:3389 msgid "All" ! msgstr "Alles" ! #: buffer.c:3389 msgid "Bot" *************** *** 198,202 **** ! #: digraph.c:2161 ! msgid "Escape not allowed in digraph" ! msgstr "Escape nie toegelaat in digraaf nie" --- 218,289 ---- ! #: buffer.c:4393 ! msgid "" ! "\n" ! "--- Signs ---" ! msgstr "" ! "\n" ! "--- Tekens ---" ! ! #: buffer.c:4403 ! #, c-format ! msgid "Signs for %s:" ! msgstr "Tekens vir %s:" ! ! #: buffer.c:4409 ! #, c-format ! msgid " line=%ld id=%d name=%s" ! msgstr " reël=%ld id=%d naam=%s" ! ! #: diff.c:133 ! #, c-format ! msgid "E96: Can not diff more than %ld buffers" ! msgstr "E96: Kan nie meer as %ld buffers 'diff' nie" ! ! #: diff.c:648 ! msgid "E97: Cannot create diffs" ! msgstr "E97: Kan nie 'diffs' skep nie " ! ! #: diff.c:747 ! msgid "Patch file" ! msgstr "Laslap lęer" ! ! #: diff.c:991 ! msgid "E98: Cannot read diff output" ! msgstr "E98: Kan nie 'diff' afvoer lees nie" ! ! #: diff.c:1704 ! msgid "E99: Current buffer is not in diff mode" ! msgstr "E99: Huidige buffer is nie in 'diff' modus nie" ! ! #: diff.c:1716 ! msgid "E100: No other buffer in diff mode" ! msgstr "E100: Geen ander buffer in 'diff' modus nie" ! ! #: diff.c:1724 ! msgid "E101: More than two buffers in diff mode, don't know which one to use" ! msgstr "" ! "E101: Meer as twee buffers in 'diff' modus, weet nie watter een om te " ! "gebruik nie" ! ! #: diff.c:1747 ! #, c-format ! msgid "E102: Can't find buffer \"%s\"" ! msgstr "E102: Kan buffer %s nie vind nie" ! ! #: diff.c:1753 ! #, c-format ! msgid "E103: Buffer \"%s\" is not in diff mode" ! msgstr "E103: Buffer \"%s\" is nie in 'diff' modus nie" ! ! #: digraph.c:2168 ! msgid "E104: Escape not allowed in digraph" ! msgstr "E104: 'Escape' nie toegelaat in digraaf nie" ! ! #: digraph.c:2340 ! msgid "Keymap file not found" ! msgstr "Sleutelbindinglęer nie gevind nie" ! ! #: digraph.c:2367 ! msgid "E105: Using :loadkeymap not in a sourced file" ! msgstr "E105: :loadkeymap word buite 'n uitvoerlęer gebruik" *************** *** 219,221 **** msgid " Whole line completion (^L/^N/^P)" ! msgstr " Hele reël voltooiing (^L/^N/^P)" --- 306,308 ---- msgid " Whole line completion (^L/^N/^P)" ! msgstr " Hele-reël voltooiing (^L/^N/^P)" *************** *** 274,287 **** ! #: edit.c:2380 #, c-format msgid "Scanning: %s" ! msgstr "Besig om te soek vir: %s" ! #: edit.c:2413 msgid "Scanning tags." ! msgstr "Besig om etikette deur te soek." ! #: edit.c:3072 msgid " Adding" ! msgstr "Word bygevoeg" --- 361,374 ---- ! #: edit.c:2496 #, c-format msgid "Scanning: %s" ! msgstr "Soek vir: %s" ! #: edit.c:2531 msgid "Scanning tags." ! msgstr "Deursoek etikette." ! #: edit.c:3189 msgid " Adding" ! msgstr " Word bygevoeg" *************** *** 317,437 **** ! #: eval.c:671 #, c-format ! msgid "Unknown variable: \"%s\"" ! msgstr "Onbekende veranderlike \"%s\"" ! #: eval.c:950 #, c-format ! msgid "Missing braces: %s" ! msgstr "Ontbrekende hakies: %s" ! #: eval.c:1018 #, c-format ! msgid "No such variable: \"%s\"" ! msgstr "Geen veranderlike: \"%s\"" ! #: eval.c:1242 ! msgid "Missing ':' after '?'" ! msgstr "Ontbrekende ':' na '?'" ! #: eval.c:1847 ! msgid "Missing ')'" ! msgstr "Ontbrekende ')'" ! #: eval.c:1897 ! msgid "Missing ']'" ! msgstr "Ontbrekende ']'" ! #: eval.c:1972 #, c-format ! msgid "Option name missing: %s" ! msgstr "Opsienaam ontbreek: %s" ! #: eval.c:1990 option.c:5897 #, c-format ! msgid "Unknown option: %s" ! msgstr "Onbekende opsie: %s" ! #: eval.c:2047 eval.c:2164 #, c-format ! msgid "Missing quote: %s" ! msgstr "Ontbrekende aanhalingsteken: %s" ! #: eval.c:2462 #, c-format ! msgid "Invalid arguments for function %s" ! msgstr "Ongeldige parameters vir funksie %s" ! #: eval.c:2463 #, c-format ! msgid "Unknown function: %s" ! msgstr "Onbekende funksie: %s" ! #: eval.c:2464 #, c-format ! msgid "Too many arguments for function: %s" ! msgstr "Te veel parameters vir funksie: %s" ! #: eval.c:2465 #, c-format ! msgid "Not enough arguments for function: %s" ! msgstr "Te min parameters vir funksie: %s" ! #: eval.c:2466 #, c-format ! msgid "Using not in a script context: %s" ! msgstr " word nie in skripkonteks gebruik nie: %s" ! #: eval.c:5211 ! msgid "(Invalid)" ! msgstr "(Ongeldig)" ! #: eval.c:6152 #, c-format ! msgid "Undefined variable: %s" ! msgstr "Ongedefinieerde veranderlike: %s" ! #: eval.c:6890 eval.c:7355 #, c-format ! msgid "Undefined function: %s" ! msgstr "Ongedefinieerde funksie: %s" ! #: eval.c:6903 #, c-format ! msgid "Missing '(': %s" ! msgstr "Ontbrekende '(': %s" ! #: eval.c:6933 syntax.c:2923 syntax.c:6430 #, c-format ! msgid "Illegal argument: %s" ! msgstr "Ongeldige parameter: %s" ! #: eval.c:7009 ! msgid "Missing :endfunction" ! msgstr "Ontbrekende ':endfunction'" ! #: eval.c:7083 #, c-format ! msgid "Function %s already exists, use ! to replace" ! msgstr "Funksie %s bestaan alreeds, gebruik ! om te vervang" ! #: eval.c:7088 #, c-format ! msgid "Cannot redefine function %s: It is in use" ! msgstr "Kan funksie %s nie herdefinieer nie: Dit is in gebruik" ! #: eval.c:7145 #, c-format ! msgid "Function name must start with a capital: %s" ! msgstr "Funksienaam moet met 'n hoofletter begin: %s" ! #: eval.c:7151 ! msgid "Function name required" ! msgstr "Funksienaam vereis" ! #: eval.c:7178 term.c:4481 ! msgid "Using not in a script context" ! msgstr "Gebruik van buite skripkonteks" ! #: eval.c:7244 msgid "function " --- 404,555 ---- ! #: eval.c:696 #, c-format ! msgid "E106: Unknown variable: \"%s\"" ! msgstr "E106: Onbekende veranderlike: \"%s\"" ! #: eval.c:975 #, c-format ! msgid "E107: Missing braces: %s" ! msgstr "E107: Ontbrekende hakies: %s" ! #: eval.c:1043 #, c-format ! msgid "E108: No such variable: \"%s\"" ! msgstr "E108: Geen veranderlike: \"%s\"" ! #: eval.c:1284 ! msgid "E109: Missing ':' after '?'" ! msgstr "E109: Ontbrekende ':' na '?'" ! #: eval.c:1898 ! msgid "E110: Missing ')'" ! msgstr "E110: Ontbrekende ')'" ! #: eval.c:1948 ! msgid "E111: Missing ']'" ! msgstr "E111: Ontbrekende ']'" ! #: eval.c:2023 #, c-format ! msgid "E112: Option name missing: %s" ! msgstr "E112: Opsienaam ontbreek: %s" ! #: eval.c:2041 #, c-format ! msgid "E113: Unknown option: %s" ! msgstr "E113: Onbekende opsie: %s" ! #: eval.c:2103 #, c-format ! msgid "E114: Missing quote: %s" ! msgstr "E114: Ontbrekende aanhalingsteken: %s" ! #: eval.c:2220 #, c-format ! msgid "E115: Missing quote: %s" ! msgstr "E115: Ontbrekende aanhalingsteken: %s" ! #: eval.c:2537 #, c-format ! msgid "E116: Invalid arguments for function %s" ! msgstr "E116: Ongeldige parameters vir funksie %s" ! #: eval.c:2538 #, c-format ! msgid "E117: Unknown function: %s" ! msgstr "E117: Onbekende funksie: %s" ! #: eval.c:2539 #, c-format ! msgid "E118: Too many arguments for function: %s" ! msgstr "E118: Te veel parameters vir funksie: %s" ! #: eval.c:2540 #, c-format ! msgid "E119: Not enough arguments for function: %s" ! msgstr "E119: Te min parameters vir funksie: %s" ! #: eval.c:2541 ! #, c-format ! msgid "E120: Using not in a script context: %s" ! msgstr "E120: word buite skripkonteks gebruik: %s" ! #: eval.c:3575 #, c-format ! msgid "+-%s%3ld lines: " ! msgstr "+-%s%3ld reëls: " ! ! #: eval.c:4690 ! msgid "" ! "&OK\n" ! "&Cancel" ! msgstr "" ! "&OK\n" ! "&Kanselleer" ! ! #: eval.c:5513 ! msgid "E240: No connection to Vim server" ! msgstr "E240: Geen verbinding met Vim bediener" ! ! #: eval.c:5603 ! msgid "E277: Unable to read a server reply" ! msgstr "E277: Kon bediener-terugvoer nie lees nie" ! #: eval.c:5628 ! msgid "E258: Unable to send to client" ! msgstr "E258: Kan nie na kliënt stuur nie" ! ! #: eval.c:5669 #, c-format ! msgid "E241: Unable to send to %s" ! msgstr "E241: Kan nie na %s stuur nie" ! ! #: eval.c:5767 ! msgid "(Invalid)" ! msgstr "(Ongeldig)" ! #: eval.c:6770 #, c-format ! msgid "E121: Undefined variable: %s" ! msgstr "E121: Ongedefinieerde veranderlike: %s" ! #: eval.c:7468 #, c-format ! msgid "E122: Function %s already exists, use ! to replace" ! msgstr "E122: Funksie %s bestaan alreeds, gebruik ! om te vervang" ! #: eval.c:7510 ! #, c-format ! msgid "E123: Undefined function: %s" ! msgstr "E123: Ongedefinieerde funksie: %s" ! #: eval.c:7523 #, c-format ! msgid "E124: Missing '(': %s" ! msgstr "E124: Ontbrekende '(': %s" ! #: eval.c:7555 #, c-format ! msgid "E125: Illegal argument: %s" ! msgstr "E125: Ongeldige parameter: %s" ! ! #: eval.c:7641 ! msgid "E126: Missing :endfunction" ! msgstr "E126: Ontbrekende ':endfunction'" ! #: eval.c:7720 #, c-format ! msgid "E127: Cannot redefine function %s: It is in use" ! msgstr "E127: Kan funksie %s nie herdefinieer nie: Dit is in gebruik" ! #: eval.c:7777 ! #, c-format ! msgid "E128: Function name must start with a capital: %s" ! msgstr "E128: Funksienaam moet met 'n hoofletter begin: %s" ! #: eval.c:7783 ! msgid "E129: Function name required" ! msgstr "E129: Funksienaam vereis" ! #: eval.c:7876 msgid "function " *************** *** 439,451 **** ! #: eval.c:7360 #, c-format ! msgid "Cannot delete function %s: It is in use" ! msgstr "Kan funksie %s nie verwyder nie: Dit is in gebruik" ! #: eval.c:7407 ! msgid "Function call depth is higher than 'maxfuncdepth'" ! msgstr "Funksie roepdiepte is hoër as 'maxfuncdepth'" #. always scroll up, don't overwrite ! #: eval.c:7458 #, c-format --- 557,574 ---- ! #: eval.c:7991 ! #, c-format ! msgid "E130: Undefined function: %s" ! msgstr "E130: Ongedefinieerde funksie: %s" ! ! #: eval.c:7996 #, c-format ! msgid "E131: Cannot delete function %s: It is in use" ! msgstr "E131: Kan funksie %s nie verwyder nie: Dit is in gebruik" ! #: eval.c:8043 ! msgid "E132: Function call depth is higher than 'maxfuncdepth'" ! msgstr "E132: Funksieroepdiepte is groter as 'maxfuncdepth'" #. always scroll up, don't overwrite ! #: eval.c:8094 #, c-format *************** *** 460,466 **** ! #: eval.c:7537 ! msgid ":return not inside a function" ! msgstr "':return' buite funksie" ! #: eval.c:7615 #, c-format --- 583,589 ---- ! #: eval.c:8173 ! msgid "E133: :return not inside a function" ! msgstr "E133: ':return' buite funksie" ! #: eval.c:8251 #, c-format *************** *** 469,476 **** ! #: eval.c:7618 #, c-format msgid "%s returning \"%s\"" ! msgstr "%s gee \"%s\" terug" ! #: eval.c:7759 msgid "" --- 592,599 ---- ! #: eval.c:8254 #, c-format msgid "%s returning \"%s\"" ! msgstr "%s lewer \"%s\" op" ! #: eval.c:8395 msgid "" *************** *** 487,493 **** ! #: ex_cmds.c:427 ! msgid "Move lines into themselves" ! msgstr "Skuif reëls in hulself in" ! #: ex_cmds.c:496 msgid "1 line moved" --- 610,616 ---- ! #: ex_cmds.c:428 ! msgid "E134: Move lines into themselves" ! msgstr "E134: Skuif reëls in hulself in" ! #: ex_cmds.c:497 msgid "1 line moved" *************** *** 505,511 **** ! #: ex_cmds.c:915 ! msgid "*Filter* Autocommands must not change current buffer" ! msgstr "*Filter* Outobevele mag nie die huidige buffer verander nie" ! #: ex_cmds.c:1000 msgid "[No write since last change]\n" --- 628,634 ---- ! #: ex_cmds.c:918 ! msgid "E135: *Filter* Autocommands must not change current buffer" ! msgstr "E135: *Filter* Outobevele mag nie die huidige buffer verander nie" ! #: ex_cmds.c:1003 msgid "[No write since last change]\n" *************** *** 518,524 **** ! #: ex_cmds.c:1216 ! msgid "viminfo: Too many errors, skipping rest of file" ! msgstr "viminfo: Te veel foute, slaan die res van die lęer oor" ! #: ex_cmds.c:1245 #, c-format --- 641,647 ---- ! #: ex_cmds.c:1253 ! msgid "E136: viminfo: Too many errors, skipping rest of file" ! msgstr "E136: viminfo: Te veel foute, slaan die res van die lęer oor" ! #: ex_cmds.c:1282 #, c-format *************** *** 539,551 **** ! #: ex_cmds.c:1339 #, c-format ! msgid "Viminfo file is not writable: %s" ! msgstr "Viminfo lęer kan nie geskryf word nie: %s" ! #: ex_cmds.c:1464 #, c-format ! msgid "Can't write viminfo file %s!" ! msgstr "Kan nie viminfo lęer %s stoor nie!" ! #: ex_cmds.c:1472 #, c-format --- 662,674 ---- ! #: ex_cmds.c:1376 #, c-format ! msgid "E137: Viminfo file is not writable: %s" ! msgstr "E137: Viminfo lęer is nie skryfbaar nie: %s" ! #: ex_cmds.c:1501 #, c-format ! msgid "E138: Can't write viminfo file %s!" ! msgstr "E138: Kan nie viminfo lęer %s stoor nie!" ! #: ex_cmds.c:1509 #, c-format *************** *** 555,561 **** #. Write the info: ! #: ex_cmds.c:1573 msgid "# This viminfo file was generated by Vim %s.\n" ! msgstr "# Die viminfo lęer is gegenereer deur Vim %s.\n" ! #: ex_cmds.c:1574 msgid "" --- 678,685 ---- #. Write the info: ! #: ex_cmds.c:1610 ! #, c-format msgid "# This viminfo file was generated by Vim %s.\n" ! msgstr "# Hierdie viminfo lęer is gegenereer deur Vim %s.\n" ! #: ex_cmds.c:1612 msgid "" *************** *** 567,573 **** ! #: ex_cmds.c:1576 msgid "# Value of 'encoding' when this file was written\n" ! msgstr "# Waarde van 'encoding' toe die lęer gestoor is\n" ! #: ex_cmds.c:1675 msgid "Illegal starting char" --- 691,697 ---- ! #: ex_cmds.c:1614 msgid "# Value of 'encoding' when this file was written\n" ! msgstr "# Waarde van 'encoding' toe hierdie lęer gestoor is\n" ! #: ex_cmds.c:1713 msgid "Illegal starting char" *************** *** 579,581 **** ! #: ex_cmds.c:2071 msgid "Write partial file?" --- 703,711 ---- ! #. Overwriting a file that is loaded in another buffer is not a ! #. * good idea. ! #: ex_cmds.c:2096 ! msgid "E139: File is loaded in another buffer" ! msgstr "E139: Lęer is gelaai in ander buffer" ! ! #: ex_cmds.c:2130 msgid "Write partial file?" *************** *** 583,594 **** ! #: ex_cmds.c:2078 ! msgid "Use ! to write partial buffer" ! msgstr "Gebruik ! om gedeeltelike buffer te skryf" ! #: ex_cmds.c:2130 ex_docmd.c:6499 ! #, c-format ! msgid "\"%s\" is a directory" ! msgstr "\"%s\" is 'n gids" ! ! #: ex_cmds.c:2139 #, c-format --- 713,719 ---- ! #: ex_cmds.c:2137 ! msgid "E140: Use ! to write partial buffer" ! msgstr "E140: Gebruik ! om gedeeltelike buffer te skryf" ! #: ex_cmds.c:2223 #, c-format *************** *** 597,608 **** ! #: ex_cmds.c:2210 #, c-format ! msgid "No file name for buffer %ld" ! msgstr "Geen lęernaam vir buffer %ld nie" ! #: ex_cmds.c:2248 ! msgid "File not written: Writing is disabled by 'write' option" ! msgstr "Lęer nie gestoor nie: Stoor is afgeskakel deur die 'write' opsie" ! #: ex_cmds.c:2268 #, c-format --- 722,733 ---- ! #: ex_cmds.c:2294 #, c-format ! msgid "E141: No file name for buffer %ld" ! msgstr "E141: Geen lęernaam vir buffer %ld nie" ! #: ex_cmds.c:2332 ! msgid "E142: File not written: Writing is disabled by 'write' option" ! msgstr "E142: Lęer nie gestoor nie: Stoor is afgeskakel deur die 'write' opsie" ! #: ex_cmds.c:2352 #, c-format *************** *** 610,612 **** "'readonly' option is set for \"%.*s\".\n" ! "Do you wish to override it?" msgstr "" --- 735,737 ---- "'readonly' option is set for \"%.*s\".\n" ! "Do you wish to write anyway?" msgstr "" *************** *** 619,638 **** ! #: ex_cmds.c:2916 #, c-format ! msgid "Autocommands unexpectedly deleted new buffer %s" ! msgstr "Outobevele het nuwe buffer %s onverwags geskrap" ! #: ex_cmds.c:3037 ! msgid "non-numeric argument to :z" ! msgstr "nie-numeriese parameter vir :z" ! #: ex_cmds.c:3126 ! msgid "Shell commands not allowed in rvim" ! msgstr "Dop bevele nie toegelaat in rvim" ! #: ex_cmds.c:3233 ! msgid "Regular expressions can't be delimited by letters" ! msgstr "Patrone kan nie deur letters afgebaken word nie" ! #: ex_cmds.c:3558 #, c-format --- 744,763 ---- ! #: ex_cmds.c:3024 #, c-format ! msgid "E143: Autocommands unexpectedly deleted new buffer %s" ! msgstr "E143: Outobevele het nuwe buffer %s onverwags geskrap" ! #: ex_cmds.c:3156 ! msgid "E144: non-numeric argument to :z" ! msgstr "E144: nie-numeriese parameter vir :z" ! #: ex_cmds.c:3241 ! msgid "E145: Shell commands not allowed in rvim" ! msgstr "E145: Dop bevele nie toegelaat in rvim" ! #: ex_cmds.c:3348 ! msgid "E146: Regular expressions can't be delimited by letters" ! msgstr "E146: Patrone kan nie deur letters afgebaken word nie" ! #: ex_cmds.c:3686 #, c-format *************** *** 663,673 **** ! #: ex_cmds.c:3967 ! msgid "Cannot do :global recursive" ! msgstr "Kan nie :global rekursief doen nie " ! ! #: ex_cmds.c:4002 ! msgid "Regular expression missing from global" ! msgstr "Patroon ontbreek uit globaal" ! #: ex_cmds.c:4127 msgid "" --- 788,803 ---- ! #: ex_cmds.c:4112 ! msgid "E147: Cannot do :global recursive" ! msgstr "E147: Kan nie :global rekursief doen nie " ! ! #: ex_cmds.c:4147 ! msgid "E148: Regular expression missing from global" ! msgstr "E148: Patroon ontbreek uit globaal" ! #: ex_cmds.c:4196 ! #, c-format ! msgid "Pattern found in every line: %s" ! msgstr "Patroon gevind in elke reël: %s" ! ! #: ex_cmds.c:4277 msgid "" *************** *** 681,754 **** ! #: ex_cmds.c:4226 #, c-format ! msgid "Sorry, no help for %s" ! msgstr "Jammer, geen hulp vir %s nie" ! #: ex_cmds.c:4260 #, c-format msgid "Sorry, help file \"%s\" not found" ! msgstr "Jammer, hulplęer \"%\" kan nie gevind word nie" ! #: ex_cmds.c:4692 #, c-format ! msgid "Not a directory: %s" ! msgstr "Nie 'n gids nie: %s" ! #: ex_cmds.c:4720 #, c-format ! msgid "Cannot open %s for writing" ! msgstr "Kan nie %s oopmaak om te skryf nie" ! #: ex_cmds.c:4734 #, c-format ! msgid "Unable to open %s for reading" ! msgstr "Kan nie %s oop maak om te lees nie" ! #: ex_cmds.c:4813 #, c-format ! msgid "Duplicate tag \"%s\" in file %s" ! msgstr "Duplikaat etiket \"%s\" in lęer %s" ! #: ex_cmds.c:4905 ex_cmds.c:5009 ! msgid "Missing sign ID" ! msgstr "Ontbrekende teken ID" ! #: ex_cmds.c:4938 ! msgid "Missing filename" ! msgstr "Ontbrekende lęernaam" ! #: ex_cmds.c:4970 ! #, c-format ! msgid "Invalid line number: %ld" ! msgstr "Ongeldige reëlnommer: %ld" ! #: ex_cmds.c:4973 #, c-format ! msgid "Invalid buffer name: %s" ! msgstr "Ongeldige buffernaam: %s" ! #: ex_cmds.c:5030 #, c-format ! msgid "Cannot find buffer: %s" ! msgstr "Kan buffer %s nie vind nie" ! #: ex_cmds.c:5041 ! #, c-format ! msgid " line %ld, id %d, type %d" ! msgstr " reël %ld, id %d tipe %d" ! #: ex_cmds.c:5055 ! msgid "" ! "\n" ! "--- Signs ---" ! msgstr "" ! "\n" ! "--- Tekens ---" ! #: ex_cmds.c:5061 #, c-format ! msgid "Signs for %s:" ! msgstr "Tekens vir %s:" ! #: ex_cmds2.c:62 msgid "Entering Debug mode. Type \"cont\" to leave." --- 811,884 ---- ! #: ex_cmds.c:4376 #, c-format ! msgid "E149: Sorry, no help for %s" ! msgstr "E149: Jammer, geen hulp vir %s nie" ! #: ex_cmds.c:4410 #, c-format msgid "Sorry, help file \"%s\" not found" ! msgstr "Jammer, hulplęer \"%s\" kan nie gevind word nie" ! #: ex_cmds.c:4856 #, c-format ! msgid "E150: Not a directory: %s" ! msgstr "E150: Nie 'n gids nie: %s" ! #: ex_cmds.c:4884 #, c-format ! msgid "E152: Cannot open %s for writing" ! msgstr "E152: Kan nie %s oopmaak om te skryf nie" ! #: ex_cmds.c:4898 #, c-format ! msgid "E153: Unable to open %s for reading" ! msgstr "E153: Kan nie %s oop maak om te lees nie" ! #: ex_cmds.c:4977 #, c-format ! msgid "E154: Duplicate tag \"%s\" in file %s" ! msgstr "E154: Duplikaat etiket \"%s\" in lęer %s" ! #: ex_cmds.c:5078 ! #, c-format ! msgid "E160: Unknown sign command: %s" ! msgstr "E160: Onbekende funksie: %s" ! #: ex_cmds.c:5098 ! msgid "E156: Missing sign name" ! msgstr "E156: Ontbrekende tekennaam" ! #: ex_cmds.c:5144 ! msgid "E255: Too many signs defined" ! msgstr "E77: Te veel tekens gedefinieer" ! #: ex_cmds.c:5186 #, c-format ! msgid "E239: Invalid sign text: %s" ! msgstr "E239: Ongeldige tekenteks: %s" ! #: ex_cmds.c:5210 ex_cmds.c:5396 #, c-format ! msgid "E155: Unknown sign: %s" ! msgstr "E155: Onbekende opsie: %s" ! #: ex_cmds.c:5256 ! msgid "E159: Missing sign number" ! msgstr "E159: Ontbrekende tekennommer" ! #: ex_cmds.c:5336 ! #, c-format ! msgid "E158: Invalid buffer name: %s" ! msgstr "E158: Ongeldige buffernaam: %s" ! #: ex_cmds.c:5375 #, c-format ! msgid "E157: Invalid sign ID: %ld" ! msgstr "E157: Ongeldige teken ID: %ld" ! #: ex_cmds.c:5546 ! msgid "[Deleted]" ! msgstr "[Geskrap]" ! ! #: ex_cmds2.c:70 msgid "Entering Debug mode. Type \"cont\" to leave." *************** *** 771,778 **** ! #: ex_cmds2.c:371 #, c-format ! msgid "Breakpoint not found: %s" ! msgstr "Inspeksiepunt kon nie gevind word nie: %s" ! #: ex_cmds2.c:397 msgid "No breakpoints defined" --- 901,908 ---- ! #: ex_cmds2.c:388 #, c-format ! msgid "E161: Breakpoint not found: %s" ! msgstr "E161: Inspeksiepunt kon nie gevind word nie: %s" ! #: ex_cmds2.c:414 msgid "No breakpoints defined" *************** *** 785,797 **** ! #: ex_cmds2.c:605 #, c-format msgid "Save changes to \"%.*s\"?" ! msgstr "Stoor veranderinge na \"%.*\"?" ! #: ex_cmds2.c:743 #, c-format ! msgid "No write since last change for buffer \"%s\"" ! msgstr "Ongeskryf sedert vorige wysiging vir buffer \"%s\"" ! #: ex_cmds2.c:812 msgid "Warning: Entered other buffer unexpectedly (check autocommands)" --- 915,931 ---- ! #: ex_cmds2.c:625 #, c-format msgid "Save changes to \"%.*s\"?" ! msgstr "Stoor veranderinge na \"%.*s\"?" ! ! #: ex_cmds2.c:627 ex_docmd.c:8612 ! msgid "Untitled" ! msgstr "Ongetiteld" ! #: ex_cmds2.c:763 #, c-format ! msgid "E162: No write since last change for buffer \"%s\"" ! msgstr "E162: Buffer \"%s\" is nie geskryf sedert vorige wysiging nie" ! #: ex_cmds2.c:832 msgid "Warning: Entered other buffer unexpectedly (check autocommands)" *************** *** 799,813 **** ! #: ex_cmds2.c:1188 ! msgid "There is only one file to edit" ! msgstr "Daar is net een lęer om te bewerk" ! ! #: ex_cmds2.c:1190 ! msgid "Cannot go before first file" ! msgstr "Kan nie vóór die eerste lęer gaan nie" ! ! #: ex_cmds2.c:1192 ! msgid "Cannot go beyond last file" ! msgstr "Kan nie verby die laaste lęer gaan nie" ! #: ex_cmds2.c:1598 #, c-format --- 933,971 ---- ! #: ex_cmds2.c:1208 ! msgid "E163: There is only one file to edit" ! msgstr "E163: Daar is net een lęer om te bewerk" ! ! #: ex_cmds2.c:1210 ! msgid "E164: Cannot go before first file" ! msgstr "E164: Kan nie vóór die eerste lęer gaan nie" ! ! #: ex_cmds2.c:1212 ! msgid "E165: Cannot go beyond last file" ! msgstr "E165: Kan nie verby die laaste lęer gaan nie" ! ! #: ex_cmds2.c:1632 ! #, c-format ! msgid "Searching for \"%s\" in \"%s\"" ! msgstr "Besig om te soek vir \"%s\" in \"%s\"" ! ! #: ex_cmds2.c:1654 ! #, c-format ! msgid "Searching for \"%s\"" ! msgstr "Besig om te soek vir \"%s\"" ! ! #: ex_cmds2.c:1678 ! #, c-format ! msgid "not found in 'runtimepath': \"%s\"" ! msgstr "kon nie in 'runtimepath' gevind word nie: \"%s\"" ! ! #: ex_cmds2.c:1712 ! msgid "Run Macro" ! msgstr "Voer Makro uit" ! #: ex_cmds2.c:1817 ! #, c-format ! msgid "Cannot source a directory: \"%s\"" ! msgstr "Kan nie gids uitvoer nie: \"%s\"" ! ! #: ex_cmds2.c:1847 #, c-format *************** *** 816,818 **** ! #: ex_cmds2.c:1608 #, c-format --- 974,981 ---- ! #: ex_cmds2.c:1849 ! #, c-format ! msgid "line %ld: could not source \"%s\"" ! msgstr "reël %ld: kon nie \"%s\" uitvoer nie" ! ! #: ex_cmds2.c:1863 #, c-format *************** *** 821,823 **** ! #: ex_cmds2.c:1708 #, c-format --- 984,991 ---- ! #: ex_cmds2.c:1865 ! #, c-format ! msgid "line %ld: sourcing \"%s\"" ! msgstr "reël %ld: voer nou \"%s\" uit" ! ! #: ex_cmds2.c:1971 #, c-format *************** *** 826,840 **** ! #: ex_cmds2.c:2004 ! msgid "Warning: Wrong line separator, ^M may be missing" ! msgstr "Waarskuwing: Verkeerde reëlskeiding, ^M ontbreek dalk" ! ! #: ex_cmds2.c:2053 ! msgid ":scriptencoding used outside of a sourced file" ! msgstr "':scriptencoding' buite 'n uitvoerlęer gebruik" ! ! #: ex_cmds2.c:2086 ! msgid ":finish used outside of a sourced file" ! msgstr "':finish' buite 'n uitvoerlęer gebruik" ! #: ex_docmd.c:476 msgid "Entering Ex mode. Type \"visual\" to go to Normal mode." --- 994,1071 ---- ! #: ex_cmds2.c:2272 ! msgid "W15: Warning: Wrong line separator, ^M may be missing" ! msgstr "W15: Waarskuwing: Verkeerde reëlskeiding, ^M ontbreek dalk" ! ! #: ex_cmds2.c:2321 ! msgid "E167: :scriptencoding used outside of a sourced file" ! msgstr "E167: ':scriptencoding' buite 'n uitvoerlęer gebruik" ! ! #: ex_cmds2.c:2354 ! msgid "E168: :finish used outside of a sourced file" ! msgstr "E168: ':finish' buite 'n uitvoerlęer gebruik" ! ! #: ex_cmds2.c:2820 ! msgid "No text to be printed" ! msgstr "Geen teks om te druk nie" ! ! #: ex_cmds2.c:2898 ! #, c-format ! msgid "Printing page %d (%d%%)" ! msgstr "Druk nou bladsy %d (%d%%)" ! ! #: ex_cmds2.c:2907 ! #, c-format ! msgid " Copy %d of %d" ! msgstr " Kopie %d van %d" ! ! #: ex_cmds2.c:2959 ! #, c-format ! msgid "Printed: %s" ! msgstr "Gedruk: %s" ! ! #: ex_cmds2.c:2966 ! msgid "Printing aborted" ! msgstr "Drukkery gestaak" ! ! #: ex_cmds2.c:3344 ! msgid "E455: Error writing to PostScript output file" ! msgstr "E455: Kan nie na 'PostScript' afvoerlęer skryf nie" ! ! #: ex_cmds2.c:4019 ! msgid "E324: Can't open PostScript output file" ! msgstr "E324: Kan nie 'PostScript' afvoerlęer oopmaak nie" ! ! #: ex_cmds2.c:4057 ! #, c-format ! msgid "E456: Can't open file \"%s\"" ! msgstr "E456: Kan nie lęer %s oopmaak nie" ! ! #: ex_cmds2.c:4068 ! #, c-format ! msgid "E457: Can't read PostScript resource file \"%s\"" ! msgstr "E457: Kan nie 'PostScript' hulpbron-lęer \"%s\" lees nie" ! ! #: ex_cmds2.c:4266 ! msgid "Sending to printer..." ! msgstr "Besig om te stuur na drukker..." ! ! #: ex_cmds2.c:4270 ! msgid "E365: Failed to print PostScript file" ! msgstr "E365: Kon nie 'PostScript' lęer druk nie" ! ! #: ex_cmds2.c:4272 ! msgid "Print job sent." ! msgstr "Druktaak gestuur." ! ! #: ex_cmds2.c:4651 ! #, c-format ! msgid "Current %slanguage: \"%s\"" ! msgstr "Huidige %staal: \"%s\"" ! ! #: ex_cmds2.c:4658 ! #, c-format ! msgid "E197: Cannot set language to \"%s\"" ! msgstr "E197: Kan nie taal na \"%s\" verander nie" ! #: ex_docmd.c:491 msgid "Entering Ex mode. Type \"visual\" to go to Normal mode." *************** *** 843,861 **** #. must be at EOF ! #: ex_docmd.c:512 msgid "At end-of-file" ! msgstr "By lęereinde " ! #: ex_docmd.c:588 ! msgid "Command too recursive" ! msgstr "Bevel te rekursief" ! #: ex_docmd.c:904 ! msgid "Missing :endwhile" ! msgstr "Ontbrekende ':endwhile'" ! #: ex_docmd.c:906 ! msgid "Missing :endif" ! msgstr "Ontbrekende ':endif'" ! #: ex_docmd.c:916 msgid "End of sourced file" --- 1074,1092 ---- #. must be at EOF ! #: ex_docmd.c:527 msgid "At end-of-file" ! msgstr "By lęereinde" ! #: ex_docmd.c:602 ! msgid "E169: Command too recursive" ! msgstr "E169: Bevel te rekursief" ! #: ex_docmd.c:911 ! msgid "E170: Missing :endwhile" ! msgstr "E170: Ontbrekende ':endwhile'" ! #: ex_docmd.c:913 ! msgid "E171: Missing :endif" ! msgstr "E171: Ontbrekende ':endif'" ! #: ex_docmd.c:923 msgid "End of sourced file" *************** *** 891,901 **** ! #: ex_docmd.c:2815 ! msgid "Sorry, this command is not implemented" ! msgstr "Jammer, die bevel is nie geďmplementeer nie" ! ! #: ex_docmd.c:2981 ! msgid "Only one file name allowed" ! msgstr "Slegs een lęernaam toegelaat" ! #: ex_docmd.c:3528 #, c-format --- 1122,1132 ---- ! #: ex_docmd.c:3086 ! msgid "E319: Sorry, the command is not available in this version" ! msgstr "E319: Jammer, die bevel is nie geďmplementeer nie" ! ! #: ex_docmd.c:3256 ! msgid "E172: Only one file name allowed" ! msgstr "E172: Slegs een lęernaam toegelaat" ! #: ex_docmd.c:3810 #, c-format *************** *** 904,915 **** ! #: ex_docmd.c:3535 #, c-format ! msgid "%ld more files to edit" ! msgstr "Nog %ld lęers om te bewerk" ! #: ex_docmd.c:3629 ! msgid "Command already exists: use ! to redefine" ! msgstr "Bevel bestaan alreeds: gebruik ! om te herdefinieer" ! #: ex_docmd.c:3732 msgid "" --- 1135,1146 ---- ! #: ex_docmd.c:3817 #, c-format ! msgid "E173: %ld more files to edit" ! msgstr "E173: Nog %ld lęers om te bewerk" ! #: ex_docmd.c:3911 ! msgid "E174: Command already exists: use ! to redefine" ! msgstr "E174: Bevel bestaan alreeds: gebruik ! om te herdefinieer" ! #: ex_docmd.c:4016 msgid "" *************** *** 925,970 **** ! #: ex_docmd.c:3852 ! msgid "No attribute specified" ! msgstr "Geen eienskappe gespesifiseer nie" ! #: ex_docmd.c:3904 ! msgid "Invalid number of arguments" ! msgstr "Ongeldige aantal parameters" ! #: ex_docmd.c:3919 ! msgid "Count cannot be specified twice" ! msgstr "Telling kan nie twee keer gespesifiseer word nie" ! #: ex_docmd.c:3929 ! msgid "Invalid default value for count" ! msgstr "Ongeldige verstekwaarde vir telling" ! #: ex_docmd.c:3957 ! msgid "argument required for complete" ! msgstr "parameter nodig vir voltooiing" ! #: ex_docmd.c:3976 #, c-format ! msgid "Invalid complete value: %s" ! msgstr "Ongeldige voltooiing waarde: %s" ! #: ex_docmd.c:3984 #, c-format ! msgid "Invalid attribute: %s" ! msgstr "Ongeldige eienskap: %s" ! #: ex_docmd.c:4025 ! msgid "Invalid command name" ! msgstr "Ongeldige bevelnaam" ! #: ex_docmd.c:4040 ! msgid "User defined commands must start with an uppercase letter" ! msgstr "Gebruiker-gedefinieerde bevele moet met 'n hoofletter begin" ! #: ex_docmd.c:4111 #, c-format ! msgid "No such user-defined command: %s" ! msgstr "Geen gebruiker-gedefinieerde bevel nie: %s" ! #: ex_docmd.c:5349 msgid "Edit File in new window" --- 1156,1210 ---- ! #: ex_docmd.c:4136 ! msgid "E175: No attribute specified" ! msgstr "E175: Geen eienskappe gespesifiseer nie" ! #: ex_docmd.c:4188 ! msgid "E176: Invalid number of arguments" ! msgstr "E176: Ongeldige aantal parameters" ! #: ex_docmd.c:4203 ! msgid "E177: Count cannot be specified twice" ! msgstr "E177: Telling kan nie twee keer gespesifiseer word nie" ! #: ex_docmd.c:4213 ! msgid "E178: Invalid default value for count" ! msgstr "E178: Ongeldige verstekwaarde vir telling" ! #: ex_docmd.c:4241 ! msgid "E179: argument required for complete" ! msgstr "E179: parameter nodig vir voltooiing" ! #: ex_docmd.c:4260 #, c-format ! msgid "E180: Invalid complete value: %s" ! msgstr "E180: Ongeldige voltooiingswaarde: %s" ! #: ex_docmd.c:4268 #, c-format ! msgid "E181: Invalid attribute: %s" ! msgstr "E181: Ongeldige eienskap: %s" ! #: ex_docmd.c:4309 ! msgid "E182: Invalid command name" ! msgstr "E182: Ongeldige bevelnaam" ! #: ex_docmd.c:4324 ! msgid "E183: User defined commands must start with an uppercase letter" ! msgstr "E183: Gebruiker-gedefinieerde bevele moet met 'n hoofletter begin" ! #: ex_docmd.c:4393 #, c-format ! msgid "E184: No such user-defined command: %s" ! msgstr "E184: Geen gebruiker-gedefinieerde bevel nie: %s" ! ! #: ex_docmd.c:4844 ! #, c-format ! msgid "E185: Cannot find color scheme %s" ! msgstr "E185: Kan nie kleurskema %s vind nie" ! ! #: ex_docmd.c:4852 ! msgid "Greetings, Vim user!" ! msgstr "Goeiedag, Vim gebruiker!" ! #: ex_docmd.c:5549 msgid "Edit File in new window" *************** *** 980,1000 **** ! #: ex_docmd.c:5767 ! msgid "No previous directory" ! msgstr "Geen vorige gids nie" ! #: ex_docmd.c:5958 #, c-format msgid "Window position: X %d, Y %d" ! msgstr "Vensterposisie: X %s, Y %d" ! #: ex_docmd.c:5963 ! msgid "Obtaining window position not implemented for this platform" msgstr "" ! "Verkryging van vensterposisie is nie vir hierdie platform geďmplementeer nie" ! #: ex_docmd.c:6223 msgid "Save Redirection" ! msgstr "Stoor herversturing" ! #: ex_docmd.c:6353 msgid "Save View" --- 1220,1245 ---- ! #: ex_docmd.c:5978 ! msgid "E186: No previous directory" ! msgstr "E186: Geen vorige gids nie" ! ! #: ex_docmd.c:6055 ! msgid "E187: Unknown" ! msgstr "E187: Onbekend" ! #: ex_docmd.c:6173 #, c-format msgid "Window position: X %d, Y %d" ! msgstr "Vensterposisie: X %d, Y %d" ! #: ex_docmd.c:6178 ! msgid "E188: Obtaining window position not implemented for this platform" msgstr "" ! "E188: Verkryging van vensterposisie is nie vir hierdie platform " ! "geďmplementeer nie" ! #: ex_docmd.c:6444 msgid "Save Redirection" ! msgstr "Stoor Herversturing" ! #: ex_docmd.c:6593 msgid "Save View" *************** *** 1010,1035 **** ! #: ex_docmd.c:6505 #, c-format ! msgid "\"%s\" exists (use ! to override)" ! msgstr "\"%s\" bestaan (gebruik ! om te dwing)" ! #: ex_docmd.c:6510 #, c-format ! msgid "Cannot open \"%s\" for writing" ! msgstr "Kan \"%s\" nie oopmaak vir skryf nie" #. set mark ! #: ex_docmd.c:6534 ! msgid "Argument must be a letter or forward/backward quote" ! msgstr "Parameter moet 'n letter of 'n terug/vorentoe aanhalingsteken wees" ! ! #: ex_docmd.c:6562 ! msgid "Recursive use of :normal too deep" ! msgstr "Rekursiewe gebruik van ':normal' te diep" ! ! #: ex_docmd.c:6569 ! msgid "Cannot use :normal from event handler" ! msgstr "Kan ':normal' nie vanuit gebeurtenishanteerder gebruik nie" ! #: ex_docmd.c:6908 msgid ":if nesting too deep" --- 1255,1277 ---- ! #: ex_docmd.c:6745 #, c-format ! msgid "E189: \"%s\" exists (use ! to override)" ! msgstr "E189: \"%s\" bestaan (gebruik ! om te dwing)" ! #: ex_docmd.c:6750 #, c-format ! msgid "E190: Cannot open \"%s\" for writing" ! msgstr "E190: Kan \"%s\" nie oopmaak vir skryf nie" #. set mark ! #: ex_docmd.c:6774 ! msgid "E191: Argument must be a letter or forward/backward quote" ! msgstr "" ! "E191: Parameter moet 'n letter of 'n terug/vorentoe aanhalingsteken wees" ! ! #: ex_docmd.c:6803 ! msgid "E192: Recursive use of :normal too deep" ! msgstr "E192: Rekursiewe gebruik van ':normal' te diep" ! #: ex_docmd.c:7171 msgid ":if nesting too deep" *************** *** 1065,1075 **** ! #: ex_docmd.c:7139 ! msgid ":endfunction not inside a function" ! msgstr "':endfunction' nie binne 'n funksie nie" ! ! #: ex_docmd.c:7315 ! msgid "No alternate file name to substitute for '#'" ! msgstr "Geen alternatiewe lęernaam vir '#' nie" ! #: ex_docmd.c:7346 msgid "no autocommand file name to substitute for \"\"" --- 1307,1317 ---- ! #: ex_docmd.c:7402 ! msgid "E193: :endfunction not inside a function" ! msgstr "E193: ':endfunction' nie in 'n funksie nie" ! ! #: ex_docmd.c:7582 ! msgid "E194: No alternate file name to substitute for '#'" ! msgstr "E194: Geen alternatiewe lęernaam vir '#' nie" ! #: ex_docmd.c:7613 msgid "no autocommand file name to substitute for \"\"" *************** *** 1089,1092 **** ! #: ex_docmd.c:7409 ! #, c-format msgid "Empty file name for '%' or '#', only works with \":p:h\"" --- 1331,1334 ---- ! #: ex_docmd.c:7683 ! #, no-c-format msgid "Empty file name for '%' or '#', only works with \":p:h\"" *************** *** 1098,1141 **** ! #: ex_docmd.c:8207 globals.h:954 ! msgid "E32: No file name" ! msgstr "E32: Geen lęernaam" ! ! #: ex_docmd.c:8317 ! msgid "Cannot open viminfo file for reading" ! msgstr "Kan 'viminfo' lęer nie oopmaak om te lees nie" ! ! #: ex_docmd.c:8366 ! #, c-format ! msgid "Searching for \"%s\" in \"%s\"" ! msgstr "Besig om te soek vir \"%s\" in \"%s\"" ! ! #: ex_docmd.c:8388 ! #, c-format ! msgid "Searching for \"%s\"" ! msgstr "Besig om te soek vir \"%s\"" ! ! #: ex_docmd.c:8408 ! #, c-format ! msgid "not found in 'runtimepath': \"%s\"" ! msgstr "kon nie in 'runtimepath' gevind word nie: \"%s\"" ! ! #: ex_docmd.c:8429 ! msgid "Run Macro" ! msgstr "Voer Makro uit" ! ! #: ex_docmd.c:8613 ! msgid "No digraphs in this version" ! msgstr "Geen digrawe in hierdie weergawe nie" ! ! #: ex_docmd.c:8761 ! #, c-format ! msgid "Current language: %s" ! msgstr "Huidige taal: %s" #: ex_docmd.c:8767 ! #, c-format ! msgid "Cannot set language to \"%s\"" ! msgstr "Kan nie taal verander na \"%s\" nie" ! #: ex_getln.c:2596 msgid "tagname" --- 1340,1350 ---- ! #: ex_docmd.c:8594 ! msgid "E195: Cannot open viminfo file for reading" ! msgstr "E195: Kan 'viminfo' lęer nie oopmaak om te lees nie" #: ex_docmd.c:8767 ! msgid "E196: No digraphs in this version" ! msgstr "E196: Geen digrawe in hierdie weergawe nie" ! #: ex_getln.c:2785 msgid "tagname" *************** *** 1158,1162 **** "\n" ! "# %s Geskiedenis (nuutste na oudste):\n" ! #: ex_getln.c:3916 msgid "Command Line" --- 1367,1371 ---- "\n" ! "# %s Geskiedenis (van nuutste na oudste):\n" ! #: ex_getln.c:4238 msgid "Command Line" *************** *** 1176,1186 **** ! #: ex_getln.c:3949 ! msgid "cmd_pchar beyond the command length" ! msgstr "'cmd_pchar' verby die einde van opdrag lengte" ! ! #: ex_getln.c:4113 ! msgid "Active window or buffer deleted" ! msgstr "Aktiewe venster of buffer geskrap" ! #: fileio.c:341 msgid "Illegal file name" --- 1385,1395 ---- ! #: ex_getln.c:4271 ! msgid "E198: cmd_pchar beyond the command length" ! msgstr "E198: 'cmd_pchar' verby die einde van opdraglengte" ! ! #: ex_getln.c:4435 ! msgid "E199: Active window or buffer deleted" ! msgstr "E199: Aktiewe venster of buffer geskrap" ! #: fileio.c:347 msgid "Illegal file name" *************** *** 1204,1214 **** ! #: fileio.c:612 ! msgid "*ReadPre autocommands made the file unreadable" ! msgstr "'*ReadPre' outobevele het die lęer onleesbaar gemaak" ! ! #: fileio.c:614 ! msgid "*ReadPre autocommands must not change current buffer" ! msgstr "'*ReadPre' outobevele moet nie die huidige buffer verander nie" ! #: fileio.c:634 msgid "Vim: Reading from stdin...\n" --- 1413,1423 ---- ! #: fileio.c:624 ! msgid "E200: *ReadPre autocommands made the file unreadable" ! msgstr "E200: '*ReadPre' outobevele het die lęer onleesbaar gemaak" ! ! #: fileio.c:626 ! msgid "E201: *ReadPre autocommands must not change current buffer" ! msgstr "E201: '*ReadPre' outobevele mag nie die huidige buffer verander nie" ! #: fileio.c:646 msgid "Vim: Reading from stdin...\n" *************** *** 1221,1227 **** #. Re-opening the original file failed! ! #: fileio.c:847 ! msgid "Conversion made file unreadable!" ! msgstr "Omsetting het lęer onleesbaar gemaak!" ! #: fileio.c:1687 msgid "[fifo/socket]" --- 1430,1436 ---- #. Re-opening the original file failed! ! #: fileio.c:876 ! msgid "E202: Conversion made file unreadable!" ! msgstr "E202: Omsetting het lęer onleesbaar gemaak!" ! #: fileio.c:1732 msgid "[fifo/socket]" *************** *** 1237,1243 **** ! #: fileio.c:1709 msgid "[RO]" ! msgstr "[LA]" ! #: fileio.c:1719 msgid "[CR missing]" --- 1446,1452 ---- ! #: fileio.c:1754 msgid "[RO]" ! msgstr "[RO]" ! #: fileio.c:1764 msgid "[CR missing]" *************** *** 1285,1295 **** ! #: fileio.c:2333 ! msgid "Autocommands deleted or unloaded buffer to be written" ! msgstr "Outobevele het die skryfbuffer geskrap of uitgelaai" ! ! #: fileio.c:2356 ! msgid "Autocommand changed number of lines in unexpected way" ! msgstr "Outobevel het etlike reëls op onverwagse wyse verander " ! #: fileio.c:2422 fileio.c:2445 msgid "is not a file or writable device" --- 1494,1504 ---- ! #: fileio.c:2407 ! msgid "E203: Autocommands deleted or unloaded buffer to be written" ! msgstr "E203: Outobevele het die skryfbuffer geskrap of uitgelaai" ! ! #: fileio.c:2430 ! msgid "E204: Autocommand changed number of lines in unexpected way" ! msgstr "E204: Outobevel het etlike reëls op onverwagse wyse verander " ! #: fileio.c:2496 fileio.c:2513 msgid "is not a file or writable device" *************** *** 1325,1343 **** ! #: fileio.c:3018 ! msgid "Can't find temp file for writing" ! msgstr "Kan nie tydelike lęer vind vir skryf nie" ! ! #: fileio.c:3036 ! msgid "Cannot convert (use ! to write without conversion)" ! msgstr "Kan nie omsit nie (gebruik ! om te skryf sonder omsetting)" ! ! #: fileio.c:3066 ! msgid "Can't open file for writing" ! msgstr "Kan lęer nie oopmaak vir skryf nie" ! #: fileio.c:3289 msgid "Close failed" ! msgstr "Toemaak gefaal" ! #: fileio.c:3344 msgid "write error, conversion failed" --- 1534,1556 ---- ! #: fileio.c:3121 ! msgid "E214: Can't find temp file for writing" ! msgstr "E214: Kan nie tydelike lęer vind vir skryf nie" ! ! #: fileio.c:3139 ! msgid "E213: Cannot convert (use ! to write without conversion)" ! msgstr "E213: Kan nie omsit nie (gebruik ! om te skryf sonder omsetting)" ! ! #: fileio.c:3176 ! msgid "E166: Can't open linked file for writing" ! msgstr "E166: Kan lęer nie oopmaak vir skryf nie" ! ! #: fileio.c:3180 ! msgid "E212: Can't open file for writing" ! msgstr "E212: Kan lęer nie oopmaak vir skryf nie" ! #: fileio.c:3423 msgid "Close failed" ! msgstr "Sluiting gefaal" ! #: fileio.c:3481 msgid "write error, conversion failed" *************** *** 1377,1391 **** ! #: fileio.c:3508 ! msgid "patchmode: can't save original file" ! msgstr "patchmode: kan oorspronklike lęer nie stoor nie" ! ! #: fileio.c:3529 ! msgid "patchmode: can't touch empty original file" ! msgstr "patchmode: kan leë oorspronglęer nie 'touch' nie" ! ! #: fileio.c:3544 ! msgid "Can't delete backup file" ! msgstr "Kan rugsteunlęer nie verwyder nie" ! #: fileio.c:3596 msgid "" --- 1590,1604 ---- ! #: fileio.c:3655 ! msgid "E205: Patchmode: can't save original file" ! msgstr "E205: patchmode: kan oorspronklike lęer nie stoor nie" ! ! #: fileio.c:3677 ! msgid "E206: patchmode: can't touch empty original file" ! msgstr "E206: patchmode: kan leë oorspronglęer nie 'touch' nie" ! ! #: fileio.c:3692 ! msgid "E207: Can't delete backup file" ! msgstr "E207: Kan rugsteunlęer nie verwyder nie" ! #: fileio.c:3744 msgid "" *************** *** 1425,1432 **** ! #: fileio.c:3703 ! #, c-format ! msgid "%ldL, %ldC" ! msgstr "%ldR, %ldK" ! ! #: fileio.c:3707 msgid "1 line, " --- 1638,1640 ---- ! #: fileio.c:3867 msgid "1 line, " *************** *** 1434,1436 **** ! #: fileio.c:3709 msgid "%ld lines, " --- 1642,1645 ---- ! #: fileio.c:3869 ! #, c-format msgid "%ld lines, " *************** *** 1442,1444 **** ! #: fileio.c:3714 msgid "%ld characters" --- 1651,1654 ---- ! #: fileio.c:3874 ! #, c-format msgid "%ld characters" *************** *** 1455,1458 **** #. don't overwrite messages here #. don't use emsg() here, don't want to flush the buffers ! #: fileio.c:3740 msgid "WARNING: The file has been changed since reading it!!!" --- 1665,1669 ---- #. don't overwrite messages here + #. must give this prompt #. don't use emsg() here, don't want to flush the buffers ! #: fileio.c:3903 msgid "WARNING: The file has been changed since reading it!!!" *************** *** 1464,1507 **** ! #: fileio.c:4695 #, c-format ! msgid "Error writing to \"%s\"" ! msgstr "Kan nie skryf na \"%s\"" ! #: fileio.c:4702 #, c-format ! msgid "Error closing \"%s\"" ! msgstr "Kan \"%s\" nie toemaak nie" ! #: fileio.c:4705 #, c-format ! msgid "Error reading \"%s\"" ! msgstr "Kan \"%s\" nie lees nie" ! #: fileio.c:4825 #, c-format ! msgid "Warning: File \"%s\" no longer available" ! msgstr "Waarskuwing: lęer \"%s\" is nie meer beskikbaar nie" ! #: fileio.c:4827 #, c-format ! msgid "Warning: File \"%s\" has changed since editing started" ! msgstr "Waarskuwing: Lęer \"%s\" het verander sedert bewerking begin het" ! #: fileio.c:4834 #, c-format ! msgid "Warning: File \"%s\" has been created after editing started" ! msgstr "Waarskuwing: Lęer \"%s\" is geskep sedert bewerking begin het" ! #: fileio.c:5576 #, c-format ! msgid "Illegal character after *: %s" ! msgstr "Ongeldige karakter na *: %s" ! #: fileio.c:5587 #, c-format ! msgid "No such event: %s" ! msgstr "Geen sodanige gebeurtenis: %s" #. Highlight title ! #: fileio.c:5736 msgid "" --- 1675,1765 ---- ! #: fileio.c:4861 ! #, c-format ! msgid "E208: Error writing to \"%s\"" ! msgstr "E208: Kan nie skryf na \"%s\"" ! ! #: fileio.c:4868 ! #, c-format ! msgid "E209: Error closing \"%s\"" ! msgstr "E209: Kan \"%s\" nie sluit nie" ! ! #: fileio.c:4871 ! #, c-format ! msgid "E210: Error reading \"%s\"" ! msgstr "E210: Kan \"%s\" nie lees nie" ! ! #: fileio.c:5035 ! msgid "E246: FileChangedShell autocommand deleted buffer" ! msgstr "E246: 'FileChangedShell' outobevel het buffer verwyder" ! ! #: fileio.c:5043 ! #, c-format ! msgid "E211: Warning: File \"%s\" no longer available" ! msgstr "E211: Waarskuwing: Lęer \"%s\" is nie meer beskikbaar nie" ! ! #: fileio.c:5056 #, c-format ! msgid "" ! "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as " ! "well" ! msgstr "" ! "W12: Waarskuwing: Lęer \"%s\" het verander sedert bewerking begin het en die " ! "buffer in Vim het ook verander" ! #: fileio.c:5059 #, c-format ! msgid "W11: Warning: File \"%s\" has changed since editing started" ! msgstr "W11: Waarskuwing: Lęer \"%s\" het verander sedert bewerking begin het" ! #: fileio.c:5061 #, c-format ! msgid "W16: Warning: Mode of file \"%s\" has changed since editing started" ! msgstr "" ! "W16: Waarskuwing: Modus van lęer \"%s\" het verander sedert bewerking begin " ! "het" ! #: fileio.c:5071 #, c-format ! msgid "W13: Warning: File \"%s\" has been created after editing started" ! msgstr "W13: Waarskuwing: Lęer \"%s\" is geskep sedert bewerking begin het" ! ! #: fileio.c:5088 ! msgid "Warning" ! msgstr "Waarskuwing" ! #: fileio.c:5089 ! msgid "" ! "&OK\n" ! "&Load File" ! msgstr "" ! "&OK\n" ! "&Laai Lęer" ! ! #: fileio.c:5165 #, c-format ! msgid "E321: Could not reload \"%s\"" ! msgstr "E321: Kon nie \"%s\" herlaai nie" ! #: fileio.c:5670 ! msgid "--Deleted--" ! msgstr "--Geskrap--" ! ! #. the group doesn't exist ! #: fileio.c:5830 #, c-format ! msgid "E367: No such group: \"%s\"" ! msgstr "E367: Geen sodanige groep nie: \"%s\"" ! #: fileio.c:5955 #, c-format ! msgid "E215: Illegal character after *: %s" ! msgstr "E215: Ongeldige karakter na *: %s" ! #: fileio.c:5966 #, c-format ! msgid "E216: No such event: %s" ! msgstr "E216: Geen sodanige gebeurtenis nie: %s" #. Highlight title ! #: fileio.c:6115 msgid "" *************** *** 1513,1519 **** ! #: fileio.c:6000 ! msgid "Can't execute autocommands for ALL events" ! msgstr "Kan nie outobevele uitvoer vir 'ALL' gebeurtenisse nie" ! #: fileio.c:6023 msgid "No matching autocommands" --- 1771,1777 ---- ! #: fileio.c:6386 ! msgid "E217: Can't execute autocommands for ALL events" ! msgstr "E217: Kan nie outobevele uitvoer vir 'ALL' gebeurtenisse nie" ! #: fileio.c:6409 msgid "No matching autocommands" *************** *** 1521,1527 **** ! #: fileio.c:6281 ! msgid "autocommand nesting too deep" ! msgstr "outobevele te diep genes" ! #: fileio.c:6550 #, c-format --- 1779,1785 ---- ! #: fileio.c:6681 ! msgid "E218: autocommand nesting too deep" ! msgstr "E218: outobevele te diep genes" ! #: fileio.c:6968 #, c-format *************** *** 1541,1549 **** ! #: fileio.c:7136 ! msgid "Missing {." ! msgstr "Ontbrekende {." ! ! #: fileio.c:7138 ! msgid "Missing }." ! msgstr "Ontbrekende }." --- 1799,1807 ---- ! #: fileio.c:7566 ! msgid "E219: Missing {." ! msgstr "E219: Ontbrekende {." ! ! #: fileio.c:7568 ! msgid "E220: Missing }." ! msgstr "E220: Ontbrekende }." *************** *** 1553,1587 **** ! #: fold.c:1662 ! msgid "'commentstring' is empty" ! msgstr "'commentstring' opsie is leeg" #: getchar.c:268 ! msgid "Add to read buffer" ! msgstr "Voeg by leesbuffer" ! #: getchar.c:1989 ! msgid "recursive mapping" ! msgstr "rekursiewe binding" ! #: getchar.c:2719 #, c-format ! msgid "global abbreviation already exists for %s" ! msgstr "globale afkorting bestaan alreeds vir %s" ! #: getchar.c:2722 #, c-format ! msgid "global mapping already exists for %s" ! msgstr "globale binding bestaan alreeds vir %s" ! #: getchar.c:2849 #, c-format ! msgid "abbreviation already exists for %s" ! msgstr "afkorting bestaan already vir %s" ! #: getchar.c:2852 #, c-format ! msgid "mapping already exists for %s" ! msgstr "binding bestaan alreeds vir %s" ! #: getchar.c:2915 msgid "No abbreviation found" --- 1811,1853 ---- ! #: fold.c:554 ! msgid "E350: Cannot create fold with current 'foldmethod'" ! msgstr "E350: Kan nie vou skep met huidige 'foldmethod' nie" ! ! #: fold.c:556 ! msgid "E351: Cannot delete fold with current 'foldmethod'" ! msgstr "E351: Kan nie vou skrap met huidige 'foldmethod' nie" ! ! #: fold.c:1700 ! msgid "E221: 'commentstring' is empty" ! msgstr "E221: 'commentstring' opsie is leeg" #: getchar.c:268 ! msgid "E222: Add to read buffer" ! msgstr "E222: Voeg by leesbuffer" ! #: getchar.c:2114 ! msgid "E223: recursive mapping" ! msgstr "E223: rekursiewe binding" ! #: getchar.c:2966 #, c-format ! msgid "E224: global abbreviation already exists for %s" ! msgstr "E224: globale afkorting bestaan alreeds vir %s" ! #: getchar.c:2969 #, c-format ! msgid "E225: global mapping already exists for %s" ! msgstr "E225: globale binding bestaan alreeds vir %s" ! #: getchar.c:3096 #, c-format ! msgid "E226: abbreviation already exists for %s" ! msgstr "E226: afkorting bestaan already vir %s" ! #: getchar.c:3099 #, c-format ! msgid "E227: mapping already exists for %s" ! msgstr "E227: binding bestaan alreeds vir %s" ! #: getchar.c:3163 msgid "No abbreviation found" *************** *** 1593,1612 **** ! #: getchar.c:3721 ! msgid "makemap: Illegal mode" ! msgstr "makemap: Ongeldige modus" ! #: gui.c:172 ! msgid "Cannot start the GUI" ! msgstr "Kan nie die GUI begin nie" ! #: gui.c:287 main.c:1059 #, c-format ! msgid "Cannot read from \"%s\"" ! msgstr "Kan nie lees uit \"%s\" nie" ! #: gui.c:404 ! msgid "'guifontwide' invalid" ! msgstr "'guifontwide' ongeldig" ! #: gui_at_fs.c:288 msgid " " --- 1859,1886 ---- ! #: getchar.c:3990 ! msgid "E228: makemap: Illegal mode" ! msgstr "E228: makemap: Ongeldige modus" ! #: gui.c:181 ! msgid "E229: Cannot start the GUI" ! msgstr "E229: Kan nie die GUI begin nie" ! #: gui.c:306 #, c-format ! msgid "E230: Cannot read from \"%s\"" ! msgstr "E230: Kan nie lees uit \"%s\" nie" ! ! #: gui.c:431 ! msgid "E231: 'guifontwide' invalid" ! msgstr "E231: 'guifontwide' ongeldig" ! #: gui.c:3926 ! msgid "Error" ! msgstr "Fout" ! #: gui.c:3927 ! msgid "&Ok" ! msgstr "&Ok" ! ! #: gui_at_fs.c:290 msgid " " *************** *** 1627,1629 **** ! #: gui_at_fs.c:2560 gui_gtk.c:2275 msgid "OK" --- 1901,1907 ---- ! #: gui_at_fs.c:2563 ! msgid "vim_SelFile: can't get current directory" ! msgstr "vim_SelFile: Kan nie huidige gids verkry nie" ! ! #: gui_at_fs.c:2571 gui_motif.c:1607 msgid "OK" *************** *** 1636,1647 **** ! #: gui_at_fs.c:2569 ! msgid "vim_SelFile: can't get current directory" ! msgstr "vim_SelFile: Kan nie huidige gids verkry nie" ! ! #: gui_at_sb.c:488 msgid "Scrollbar Widget: Could not get geometry of thumb pixmap." ! msgstr "" ! "Rolstaafelement: Kon nie pikselmatriks-duimnael se geoemetrie verwerk nie" ! #: gui_athena.c:945 gui_motif.c:1471 msgid "Vim dialog" --- 1914,1920 ---- ! #: gui_at_sb.c:486 msgid "Scrollbar Widget: Could not get geometry of thumb pixmap." ! msgstr "Rolstaafelement: Kon nie pikselmatriks-duimnael se geometrie kry nie" ! #: gui_athena.c:1928 gui_motif.c:1855 msgid "Vim dialog" *************** *** 1649,1655 **** ! #: gui_beval.c:65 ! msgid "Cannot create BalloonEval with both message and callback" ! msgstr "Kan nie BalloonEval skep met beide boodskap en terugroep nie" ! #: gui_gtk.c:1184 msgid "Vim dialog..." --- 1922,1928 ---- ! #: gui_beval.c:68 ! msgid "E232: Cannot create BalloonEval with both message and callback" ! msgstr "E232: Kan nie BalloonEval skep met beide boodskap en terugroep nie" ! #: gui_gtk.c:1144 msgid "Vim dialog..." *************** *** 1706,1725 **** ! #: gui_gtk.c:2230 ! msgid "VIM - Help on..." ! msgstr "VIM - Hulp met.." ! ! #: gui_gtk.c:2252 ! msgid "Topic:" ! msgstr "Onderwerp:" ! ! #: gui_gtk_x11.c:1025 gui_x11.c:1143 ! msgid "cannot open display" ! msgstr "kan nie vertoonskerm oopmaak nie" ! #: gui_gtk_x11.c:2312 gui_x11.c:1788 #, c-format ! msgid "Unknown fontset: %s" ! msgstr "Onbekende fontstel: %s" ! #: gui_gtk_x11.c:2338 msgid "Font Selection" --- 1979,1990 ---- ! #: gui_gtk_x11.c:1076 gui_x11.c:1199 ! msgid "E233: cannot open display" ! msgstr "E233: kan nie vertoonskerm oopmaak nie" ! #: gui_gtk_x11.c:2433 gui_x11.c:2002 #, c-format ! msgid "E234: Unknown fontset: %s" ! msgstr "E234: Onbekende fontstel: %s" ! #: gui_gtk_x11.c:2460 msgid "Font Selection" *************** *** 1727,1763 **** ! #: gui_gtk_x11.c:2580 gui_mac.c:951 gui_w48.c:1484 gui_x11.c:1624 #, c-format ! msgid "Unknown font: %s" ! msgstr "Onbekende font: %s" ! #: gui_gtk_x11.c:2591 gui_x11.c:1648 #, c-format ! msgid "Font \"%s\" is not fixed-width" ! msgstr "Font \"%s\" is nie 'n vaste-wydte font nie" ! #: gui_gtk_x11.c:2720 #, c-format ! msgid "Color name not recognized: %s" ! msgstr "Kleurnaam is onbekend: %s" ! #: gui_gtk_x11.c:3433 ui.c:1781 msgid "Used CUT_BUFFER0 instead of empty selection" ! msgstr "CUT_BUFFER0 is gebruik in plaas van leë seleksie" ! #: gui_riscos.c:948 #, c-format ! msgid "Can't load Zap font '%s'" ! msgstr "Kan nie Zap font '%s' laai nie" ! #: gui_riscos.c:1044 #, c-format ! msgid "Can't use font %s" ! msgstr "Kan nie font %s gebruik nie" ! #: gui_riscos.c:1163 #, c-format ! msgid "Missing colour : %s" ! msgstr "Ontbrekende kleur: %s" ! #: gui_riscos.c:3316 msgid "" --- 1992,2052 ---- ! #: gui_gtk_x11.c:2702 gui_mac.c:2780 gui_w48.c:1197 gui_x11.c:1838 #, c-format ! msgid "E235: Unknown font: %s" ! msgstr "E235: Onbekende font: %s" ! #: gui_gtk_x11.c:2713 gui_x11.c:1862 #, c-format ! msgid "E236: Font \"%s\" is not fixed-width" ! msgstr "E236: Font \"%s\" is nie 'n vaste-wydte font nie" ! #: gui_gtk_x11.c:2843 #, c-format ! msgid "E242: Color name not recognized: %s" ! msgstr "E242: Kleurnaam is onbekend: %s" ! #: gui_gtk_x11.c:3519 ui.c:1929 msgid "Used CUT_BUFFER0 instead of empty selection" ! msgstr "'CUT_BUFFER0' is gebruik in plaas van leë seleksie" ! #: gui_motif.c:1601 gui_motif.c:1604 ! msgid "Filter" ! msgstr "Filter" ! ! #: gui_motif.c:1603 ! msgid "Directories" ! msgstr "Gidse" ! ! #: gui_motif.c:1605 ! msgid "Help" ! msgstr "Hulp" ! ! #: gui_motif.c:1606 ! msgid "Files" ! msgstr "Lęers" ! ! #: gui_motif.c:1608 ! msgid "Selection" ! msgstr "Seleksie" ! ! #: gui_motif.c:2809 ! msgid "Undo" ! msgstr "Herroep" ! ! #: gui_riscos.c:951 #, c-format ! msgid "E235: Can't load Zap font '%s'" ! msgstr "E235: Kan nie Zap font '%s' laai nie" ! #: gui_riscos.c:1047 #, c-format ! msgid "E235: Can't use font %s" ! msgstr "E235: Kan nie font %s gebruik nie" ! #: gui_riscos.c:1167 #, c-format ! msgid "E242: Missing color: %s" ! msgstr "E242: Ontbrekende kleur: %s" ! #: gui_riscos.c:3269 msgid "" *************** *** 1769,1840 **** ! #: gui_w32.c:1040 #, c-format ! msgid "Argument not supported: \"-%s\"; Use the OLE version." ! msgstr "Parameter onbekend: \"-%s\"; Gebruik die OLE weergawe." ! #: gui_w48.c:1447 ! #, c-format ! msgid "Illegal charset name \"%s\" in font name \"%s\"" ! msgstr "Ongeldige karakterstelnaam \"%s\" in fontnaam \"%s\"" ! #: gui_w48.c:1455 ! #, c-format ! msgid "Illegal char '%c' in font name \"%s\"" ! msgstr "Ongeldige karakter '%c' in fontnaam \"%s\"" ! #: gui_x11.c:1293 ! msgid "Vim: Cannot allocate colormap entry, some colors may be incorrect" msgstr "" ! "Vim: Kan nie kleurkaart inskrywing toeken nie, sommige kleure mag verkeerd " ! "wees" ! ! #: gui_x11.c:1777 ! #, c-format ! msgid "Error: During loading fontset %s" ! msgstr "Fout: Gedurende die laai van fontstel %s" ! ! #: gui_x11.c:1778 ! msgid "Font(s) for the following character sets are missing:" ! msgstr "Font(e) vir die volgende karakterstelle ontbreek:" ! ! #: gui_x11.c:1821 ! msgid "locale is not set correctly" ! msgstr "lokaal is nie korrek gestel nie" ! ! #: gui_x11.c:1822 ! msgid "Set LANG environment variable to your locale" ! msgstr "Stel die 'LANG' omgewingsveranderlike na jou lokaal toe" ! ! #: gui_x11.c:1823 ! msgid "For korean:" ! msgstr "Vir Afrikaans:" ! ! #: gui_x11.c:1824 ! msgid " csh: setenv LANG ko" ! msgstr " csh: setenv LANG af" ! ! #: gui_x11.c:1825 ! msgid " sh : export LANG=ko" ! msgstr " sh: export LANG=af" ! ! #: gui_x11.c:1827 ! #, c-format ! msgid "fontset name: %s" ! msgstr "fontstel naam: %s" ! ! #: gui_x11.c:1828 ! msgid "Your language Font missing" ! msgstr "Jou taal Font ontbreek" ! #: gui_x11.c:1829 #, c-format ! msgid "loaded fontname: %s" ! msgstr "gelaaide fontnaam: %s" ! #: gui_x11.c:1837 #, c-format ! msgid "Fontset name: %s" ! msgstr "Fontstel naam: %s" ! #: gui_x11.c:1838 #, c-format --- 2058,2090 ---- ! #: gui_w32.c:823 #, c-format ! msgid "E243: Argument not supported: \"-%s\"; Use the OLE version." ! msgstr "E243: Parameter nie bekend: \"-%s\"; Gebruik die OLE weergawe." ! #: gui_w48.c:2068 ! msgid "Find string (use '\\\\' to find a '\\')" ! msgstr "Vind string (gebruik '\\\\' om 'n '\\' te vind" ! #: gui_w48.c:2093 ! msgid "Find & Replace (use '\\\\' to find a '\\')" ! msgstr "Vind & vervang string (gebruik '\\\\' om 'n '\\' te vind" ! #: gui_x11.c:1419 ! msgid "Vim: (ec1) Cannot allocate colormap entry, some colors may be incorrect" msgstr "" ! "Vim: (ec1) Kan nie kleurkaart-inskrywing toeken nie, sommige kleure mag " ! "verkeerd wees" ! #: gui_x11.c:1992 #, c-format ! msgid "E250: Fonts for the following charsets are missing in fontset %s:" ! msgstr "" ! "E250: Fonte vir die volgende karakterstelle ontbreek in fontversameling %s:" ! #: gui_x11.c:2035 #, c-format ! msgid "E252: Fontset name: %s" ! msgstr "E252: Fontstel naam: %s" ! #: gui_x11.c:2036 #, c-format *************** *** 1843,1850 **** ! #: gui_x11.c:1857 #, c-format ! msgid "Fontset name: %s\n" ! msgstr "Fonstel naam: %s\n" ! #: gui_x11.c:1858 #, c-format --- 2093,2100 ---- ! #: gui_x11.c:2055 #, c-format ! msgid "E253: Fontset name: %s\n" ! msgstr "E253: Fonstel naam: %s\n" ! #: gui_x11.c:2056 #, c-format *************** *** 1877,1896 **** ! #: gui_x11.c:1966 #, c-format ! msgid "Cannot allocate color %s" ! msgstr "Kan nie kleur %s toeken nie" ! #: gui_x11.c:3033 ! msgid "Cannot allocate memory for debugger sign" ! msgstr "Kan nie geheue toeken vir ontfouterteken nie" ! #: gui_x11.c:3058 ! msgid "Error -- couldn't read in sign data!" ! msgstr "Fout -- kon nie teken data lees nie!" ! #: hangulin.c:604 ! msgid "automata ERROR: internal" ! msgstr "automata FOUT: intern" ! #: if_cscope.c:66 msgid "Add a new database" --- 2127,2147 ---- ! #: gui_x11.c:2206 #, c-format ! msgid "E254: Cannot allocate color %s" ! msgstr "E254: Kan nie kleur %s toeken nie" ! #: gui_x11.c:3256 ! msgid "E255: Couldn't read in sign data!" ! msgstr "E255: Fout -- kon nie tekendata lees nie!" ! #: hangulin.c:610 ! msgid "E256: Hangul automata ERROR" ! msgstr "E256: Hangul outomatiserings FOUT" ! #: if_cscope.c:26 ! #, c-format ! msgid "Usage: cs[cope] %s" ! msgstr "Gebruik: cs[cope] %s" ! #: if_cscope.c:67 msgid "Add a new database" *************** *** 1906,1920 **** ! #: if_cscope.c:72 msgid "Kill a connection" ! msgstr "Maak 'n konneksie dood" ! #: if_cscope.c:74 msgid "Reinit all connections" ! msgstr "Herstel alle konneksies" ! #: if_cscope.c:76 msgid "Show connections" ! msgstr "Wys konneksies" ! #: if_cscope.c:123 msgid "Usage: cstag " --- 2157,2176 ---- ! #: if_cscope.c:73 msgid "Kill a connection" ! msgstr "Sluit 'n verbinding" ! #: if_cscope.c:75 msgid "Reinit all connections" ! msgstr "Herstel alle verbindings" ! #: if_cscope.c:77 msgid "Show connections" ! msgstr "Wys verbindings" ! #: if_cscope.c:108 ! msgid "This cscope command does not support splitting the window.\n" ! msgstr "" ! "Hierdie 'cscope' bevel ondersteun nie die splitsing van die venster nie.\n" ! ! #: if_cscope.c:143 msgid "Usage: cstag " *************** *** 1922,1936 **** ! #: if_cscope.c:179 ! msgid "cstag: tag not found" ! msgstr "'cstag': etiket nie gevind nie" ! ! #: if_cscope.c:375 ! msgid "cs_add_common: alloc fail #1" ! msgstr "'cs_add_common': toeken onsuksesvol #1" ! ! #: if_cscope.c:382 ! msgid "cs_add_common: alloc fail #2" ! msgstr "'cs_add_common': toeken onsuksesvol #2" ! #: if_cscope.c:392 if_cscope.c:415 if_cscope.c:449 #, c-format --- 2178,2184 ---- ! #: if_cscope.c:199 ! msgid "E257: cstag: tag not found" ! msgstr "E257: 'cstag': etiket nie gevind nie" ! #: if_cscope.c:407 if_cscope.c:451 #, c-format *************** *** 1939,1976 **** ! #: if_cscope.c:405 ! msgid "cs_add_common: alloc fail #3" ! msgstr "'cs_add_common': toeken onsuksesvol #3" ! ! #: if_cscope.c:429 ! msgid "cs_add_common: alloc fail #4" ! msgstr "'cs_add_common': toeken onsuksesvol #4" ! ! #: if_cscope.c:458 if_cscope.c:465 #, c-format msgid "Added cscope database %s" ! msgstr "cscope databasis %s bygevoeg" ! #: if_cscope.c:472 #, c-format msgid "%s is not a directory or a valid cscope database" ! msgstr "%s is nie 'n gids of 'n geldige cscope databasis nie" ! #: if_cscope.c:555 if_cscope.c:1340 #, c-format msgid "error reading cscope connection %d" ! msgstr "cscope konneksie %d kon nie gelees word nie" ! #: if_cscope.c:631 msgid "unknown cscope search type" ! msgstr "onbekende cscope soektipe" ! #: if_cscope.c:678 msgid "Could not create cscope pipes" ! msgstr "Kon nie cscope pype skep nie" ! #: if_cscope.c:743 msgid "cs_create_connection exec failed" ! msgstr "'cs_create_connection' uitvoering het nie gewerk nie" ! #: if_cscope.c:753 msgid "cs_create_connection: fdopen for to_fp failed" --- 2187,2216 ---- ! #: if_cscope.c:460 if_cscope.c:467 #, c-format msgid "Added cscope database %s" ! msgstr "'cscope' databasis %s bygevoeg" ! #: if_cscope.c:474 #, c-format msgid "%s is not a directory or a valid cscope database" ! msgstr "%s is nie 'n gids of 'n geldige 'cscope' databasis nie" ! #: if_cscope.c:557 #, c-format msgid "error reading cscope connection %d" ! msgstr "'cscope' verbinding %d kon nie gelees word nie" ! #: if_cscope.c:633 msgid "unknown cscope search type" ! msgstr "onbekende 'cscope' soektipe" ! #: if_cscope.c:680 msgid "Could not create cscope pipes" ! msgstr "Kon nie 'cscope' pype skep nie" ! #: if_cscope.c:745 msgid "cs_create_connection exec failed" ! msgstr "'cs_create_connection' uitvoering het misluk" ! #: if_cscope.c:755 msgid "cs_create_connection: fdopen for to_fp failed" *************** *** 1982,2001 **** ! #: if_cscope.c:783 msgid "no cscope connections" ! msgstr "geen cscope konneksies nie" ! ! #: if_cscope.c:853 ! msgid "no matches found in cscope connections" ! msgstr "geen treffers gevind in 'cscope' konneksies nie" ! #: if_cscope.c:864 #, c-format ! msgid "no matches found for cscope query %s of %s" ! msgstr "geen treffers gevind vir 'cscope' versoek %s van %s nie" ! #: if_cscope.c:898 msgid "cscope commands:\n" ! msgstr "cscope bevele:\n" ! #: if_cscope.c:901 #, c-format --- 2222,2237 ---- ! #: if_cscope.c:785 msgid "no cscope connections" ! msgstr "geen 'cscope' verbindings nie" ! #: if_cscope.c:855 #, c-format ! msgid "E259: no matches found for cscope query %s of %s" ! msgstr "E259: geen treffers gevind vir 'cscope' versoek %s van %s nie" ! #: if_cscope.c:899 msgid "cscope commands:\n" ! msgstr "'cscope' bevele:\n" ! #: if_cscope.c:902 #, c-format *************** *** 2008,2033 **** ! #: if_cscope.c:980 msgid "maximum number of cscope connections reached" ! msgstr "maksimum aantal 'cscope' konneksies bereik" ! #: if_cscope.c:1101 ! msgid "cscope connection not found" ! msgstr "'cscope' konneksie nie gevind nie" ! #: if_cscope.c:1104 #, c-format ! msgid "cscope connection %s not found" ! msgstr "'cscope' konneksie %s nie gevind nie" ! #: if_cscope.c:1140 msgid "cscope connection closed" ! msgstr "'cscope' konneksie gesluit" ! #: if_cscope.c:1148 #, c-format msgid "cscope connection %s closed\n" ! msgstr "'cscope' konneksie %s gesluit\n" #. should not reach here ! #: if_cscope.c:1289 msgid "fatal error in cs_manage_matches" --- 2244,2269 ---- ! #: if_cscope.c:981 msgid "maximum number of cscope connections reached" ! msgstr "maksimum aantal 'cscope' verbindings bereik" ! #: if_cscope.c:1102 ! msgid "E260: cscope connection not found" ! msgstr "E260: 'cscope' verbinding nie gevind nie" ! #: if_cscope.c:1105 #, c-format ! msgid "E261: cscope connection %s not found" ! msgstr "E261: 'cscope' verbinding %s nie gevind nie" ! #: if_cscope.c:1141 msgid "cscope connection closed" ! msgstr "'cscope' verbinding gesluit" ! #: if_cscope.c:1149 #, c-format msgid "cscope connection %s closed\n" ! msgstr "'cscope' verbinding %s gesluit\n" #. should not reach here ! #: if_cscope.c:1290 msgid "fatal error in cs_manage_matches" *************** *** 2035,2037 **** ! #: if_cscope.c:1428 msgid "couldn't malloc\n" --- 2271,2279 ---- ! #: if_cscope.c:1341 ! #, c-format ! msgid "E262: error reading cscope connection %d" ! msgstr "E262: 'cscope' verbinding %d kon nie gelees word nie" ! ! # njj: dalk 'verbinding' ipv 'verbinding' orals? ! #: if_cscope.c:1449 msgid "couldn't malloc\n" *************** *** 2056,2062 **** ! #: if_cscope.c:1764 msgid "no cscope connections\n" ! msgstr "geen 'cscope' konneksies nie\n" ! #: if_cscope.c:1768 msgid " # pid database name prepend path\n" --- 2298,2304 ---- ! #: if_cscope.c:1785 msgid "no cscope connections\n" ! msgstr "geen 'cscope' verbindings nie\n" ! #: if_cscope.c:1789 msgid " # pid database name prepend path\n" *************** *** 2069,2071 **** ! #: if_python.c:559 msgid "can't delete OutputObject attributes" --- 2311,2321 ---- ! #: if_python.c:376 ! msgid "" ! "E263: Sorry, this command is disabled, the Python library could not be " ! "loaded." ! msgstr "" ! "E263: Jammer, hierdie bevel is afgeskakel, die Python biblioteek lęer kon " ! "nie gelaai word nie." ! ! #: if_python.c:576 msgid "can't delete OutputObject attributes" *************** *** 2085,2095 **** ! #: globals.h:974 if_python.c:672 ! msgid "E41: Out of memory!" ! msgstr "E41: Geheue op!" ! ! #: if_python.c:757 ! msgid "Python: Error initialising I/O objects" ! msgstr "Python: Kon nie I/O objekte inisialiseer nie" ! #: if_python.c:942 if_tcl.c:1265 msgid "invalid expression" --- 2335,2342 ---- ! #: if_python.c:770 ! msgid "E264: Python: Error initialising I/O objects" ! msgstr "E264: Python: Kon nie I/O objekte inwy nie" ! # njj: net 'n voorstel .. ! #: if_python.c:955 if_tcl.c:1391 msgid "invalid expression" *************** *** 2109,2116 **** ! #: if_python.c:1222 #, c-format msgid "" ! msgstr "" ! msgstr "" ! #: if_python.c:1326 if_tcl.c:825 msgid "invalid mark name" *************** *** 2134,2146 **** ! #: if_python.c:1811 #, c-format msgid "" ! msgstr "" ! #: if_python.c:1823 #, c-format msgid "" ! msgstr "" ! #: if_python.c:1825 #, c-format --- 2381,2393 ---- ! #: if_python.c:1824 #, c-format msgid "" ! msgstr "" ! #: if_python.c:1836 #, c-format msgid "" ! msgstr "" ! #: if_python.c:1838 #, c-format *************** *** 2153,2157 **** ! #: if_python.c:2131 if_python.c:2162 if_python.c:2212 if_python.c:2272 ! #: if_python.c:2389 if_python.c:2441 if_tcl.c:549 if_tcl.c:594 if_tcl.c:668 ! #: if_tcl.c:738 if_tcl.c:1846 msgid "cannot save undo information" --- 2400,2404 ---- ! #: if_python.c:2144 if_python.c:2175 if_python.c:2225 if_python.c:2285 ! #: if_python.c:2402 if_python.c:2454 if_tcl.c:673 if_tcl.c:718 if_tcl.c:792 ! #: if_tcl.c:862 if_tcl.c:1987 msgid "cannot save undo information" *************** *** 2175,2177 **** ! #: if_sniff.c:60 msgid "Toggle implementation/definition" --- 2422,2436 ---- ! #: if_ruby.c:394 ! msgid "" ! "E266: Sorry, this command is disabled, the Ruby library could not be loaded." ! msgstr "" ! "E266: Jammer, hierdie bevel is afgeskakel, die Ruby biblioteeklęer kon nie " ! "gelaai word nie." ! ! #: if_ruby.c:457 ! #, c-format ! msgid "E273: unknown longjmp status %d" ! msgstr "E273: Onbekende 'longjmp' status %d" ! ! #: if_sniff.c:67 msgid "Toggle implementation/definition" *************** *** 2183,2205 **** ! #: if_sniff.c:62 msgid "Show overridden member function" ! msgstr "Wys oorskryfte lidfunksie" ! #: if_sniff.c:63 msgid "Retrieve from file" ! msgstr "Kry uit lęer" ! #: if_sniff.c:64 msgid "Retrieve from project" ! msgstr "Kry uit projek" ! #: if_sniff.c:66 msgid "Retrieve from all projects" ! msgstr "Kry uit alle projekte" ! #: if_sniff.c:67 ! msgid "Retrieve next symbol" ! msgstr "Kry volgende simbool" ! #: if_sniff.c:68 msgid "Show source of" --- 2442,2464 ---- ! #: if_sniff.c:69 msgid "Show overridden member function" ! msgstr "Wys vervangde lidfunksie" ! #: if_sniff.c:70 msgid "Retrieve from file" ! msgstr "Gaan haal uit lęer" ! #: if_sniff.c:71 msgid "Retrieve from project" ! msgstr "Gaan haal uit projek" ! #: if_sniff.c:73 msgid "Retrieve from all projects" ! msgstr "Gaan haal uit alle projekte" ! #: if_sniff.c:74 ! msgid "Retrieve" ! msgstr "Gaan haal" ! #: if_sniff.c:75 msgid "Show source of" *************** *** 2252,2269 **** msgstr "" ! "Kan nie 'n konneksie met SNiFF+ maak nie. Kyk of die omgewing reg is " ! "(sniffemacs moet in $PATH gevind word).\n" #: if_sniff.c:425 ! msgid "Sniff: Error during read. Disconnected" ! msgstr "Sniff: Fout gedurende lees. Konneksie gebreek" ! ! #: if_sniff.c:459 ! msgid "-- SNiFF+ commands --" ! msgstr "-- SNiFF+ bevele --" ! #: if_sniff.c:488 msgid "SNiFF+ is currently " ! msgstr "SNiFF is tans" ! #: if_sniff.c:490 msgid "not " --- 2511,2524 ---- msgstr "" ! "Kan nie 'n verbinding met 'SNiFF+' maak nie. Kyk of die omgewing reg is " ! "('sniffemacs' moet in '$PATH' gevind word).\n" #: if_sniff.c:425 ! msgid "E274: Sniff: Error during read. Disconnected" ! msgstr "E274: Sniff: Fout gedurende lees. Verbinding gebreek" ! #: if_sniff.c:553 msgid "SNiFF+ is currently " ! msgstr "SNiFF+ is tans" ! #: if_sniff.c:555 msgid "not " *************** *** 2275,2303 **** ! #: if_sniff.c:498 #, c-format ! msgid "Unknown SNiFF+ request: %s" ! msgstr "Onbekende SNiFF+ versoek: %s" ! #: if_sniff.c:509 ! msgid "Error connecting to SNiFF+" ! msgstr "Fout in konnekteer met SNiFF+" ! #: if_sniff.c:788 ! #, c-format ! msgid "Unrecognized sniff request [%s]" ! msgstr "Onbekende sniff versoek [%s]" ! #: if_sniff.c:874 ! msgid "SNiFF+ not connected" ! msgstr "SNiFF+ is nie gekonnekteer nie" ! #: if_sniff.c:883 ! msgid "Not a SNiFF+ buffer" ! msgstr "Nie 'n SNiFF+ buffer nie" ! ! #: if_sniff.c:942 msgid "Sniff: Error during write. Disconnected" ! msgstr "Sniff: Fout gedurende stoor. Konneksie gebreek" ! #: if_tcl.c:283 msgid "invalid buffer number" --- 2530,2553 ---- ! #: if_sniff.c:592 #, c-format ! msgid "E275: Unknown SNiFF+ request: %s" ! msgstr "E275: Onbekende SNiFF+ versoek: %s" ! #: if_sniff.c:605 ! msgid "E276: Error connecting to SNiFF+" ! msgstr "E276: Fout in konnekteer met SNiFF+" ! #: if_sniff.c:1010 ! msgid "E278: SNiFF+ not connected" ! msgstr "E278: SNiFF+ is nie gekonnekteer nie" ! #: if_sniff.c:1019 ! msgid "E279: Not a SNiFF+ buffer" ! msgstr "E279: Nie 'n SNiFF+ buffer nie" ! #: if_sniff.c:1084 msgid "Sniff: Error during write. Disconnected" ! msgstr "Sniff: Fout gedurende stoor. Verbinding gebreek" ! #: if_tcl.c:407 msgid "invalid buffer number" *************** *** 2358,2366 **** #. This should never happen. Famous last word? ! #: if_tcl.c:1425 msgid "" ! "TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim.org" msgstr "" ! "TCL FATAL FOUT: reflys korrup!? Rapporteer dit asb. aan " ! #: if_tcl.c:1426 msgid "cannot register callback command: buffer/window reference not found" --- 2608,2618 ---- #. This should never happen. Famous last word? ! #: if_tcl.c:1551 msgid "" ! "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim." ! "org" msgstr "" ! "E280: TCL FATALE FOUT: verwlys korrup!? Rapporteer dit asb. aan " ! #: if_tcl.c:1552 msgid "cannot register callback command: buffer/window reference not found" *************** *** 2369,2377 **** ! #: if_tcl.c:1741 ! msgid "TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org" msgstr "" ! "TCL FOUT: verlaatkode is nie 'n 'int'!? Rapporteer dit asb. aan " ! "" ! #: if_tcl.c:1854 msgid "cannot get line" --- 2621,2636 ---- ! #: if_tcl.c:1713 ! msgid "Sorry, this command is disabled: the Tcl library could not be loaded." msgstr "" ! "Jammer, hierdie bevel is afgeskakel, die Tcl biblioteek kon nie gelaai " ! "wordnie." ! #: if_tcl.c:1875 ! msgid "" ! "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org" ! msgstr "" ! "E281: TCL FOUT: verlaatkode is nie 'n 'int'!? Rapporteer dit asb. aan " ! ! #: if_tcl.c:1995 msgid "cannot get line" *************** *** 2379,2381 **** ! #: main.c:51 option.c:2920 option.c:3027 msgid "Unknown option" --- 2638,2666 ---- ! #: if_xcmdsrv.c:204 ! msgid "Unable to register a command server name" ! msgstr "Kon nie bevelbediener naam registreer nie" ! ! #: if_xcmdsrv.c:417 ! #, c-format ! msgid "E247: no registered server named \"%s\"" ! msgstr "E247: geen geregistreerde bediener genaamd \"%s\"" ! ! #: if_xcmdsrv.c:446 ! msgid "E248: Failed to send command to the destination program" ! msgstr "E248: Het gefaal om bevel na doel program te stuur" ! ! #: if_xcmdsrv.c:714 ! #, c-format ! msgid "Invalid server id used: %s" ! msgstr "Ongeldige bediener-id gebruik: %s" ! ! #: if_xcmdsrv.c:1061 ! msgid "E249: couldn't read VIM instance registry property" ! msgstr "E249: kon nie VIM instansie register-kenmerk lees nie" ! ! #: if_xcmdsrv.c:1072 ! msgid "E251: VIM instance registry property is badly formed. Deleted!" ! msgstr "E251: VIM instansie register-kenmerk is swak gevorm. Geskrap!" ! ! #: main.c:53 option.c:3162 option.c:3269 msgid "Unknown option" *************** *** 2399,2401 **** ! #: main.c:71 msgid "" --- 2684,2736 ---- ! #: main.c:63 ! msgid "Invalid argument for" ! msgstr "Ongeldige parameter vir" ! ! #: main.c:436 ! msgid "This Vim was not compiled with the diff feature." ! msgstr "Hierdie Vim is nie gekompileer met 'diff' funksionaliteit nie." ! ! #: main.c:858 ! msgid "Attempt to open script file again: \"" ! msgstr "Probeer weer om skriplęer oop te maak: \"" ! ! #: main.c:862 main.c:869 main.c:913 memline.c:3673 memline.c:3677 ! #: version.c:816 version.c:821 version.c:826 version.c:831 version.c:836 ! #: version.c:841 version.c:847 version.c:851 version.c:855 version.c:860 ! #: version.c:867 version.c:875 version.c:881 ! msgid "\"\n" ! msgstr "\"\n" ! ! #: main.c:867 ! msgid "Cannot open for reading: \"" ! msgstr "Kan nie oopmaak om te lees nie: \"" ! ! #: main.c:911 ! msgid "Cannot open for script output: \"" ! msgstr "Kan nie oopmaak vir skrip-afvoer nie: \"" ! ! #: main.c:1020 ! #, c-format ! msgid "%d files to edit\n" ! msgstr "%d lęers om te bewerk\n" ! ! #: main.c:1094 ! msgid "Vim: Warning: Output is not to a terminal\n" ! msgstr "Vim: Waarskuwing: Afvoer gaan nie na 'n terminaal nie\n" ! ! #: main.c:1096 ! msgid "Vim: Warning: Input is not from a terminal\n" ! msgstr "Vim: Waarskuwing: Invoer kom nie vanaf 'n terminaal nie\n" ! ! #. just in case.. ! #: main.c:1171 ! msgid "pre-vimrc command line" ! msgstr "vóór-'vimrc' bevelreël" ! ! #: main.c:1206 ! #, c-format ! msgid "E282: Cannot read from \"%s\"" ! msgstr "E282: Kan nie lees uit \"%s\" nie" ! ! #: main.c:2157 msgid "" *************** *** 2487,2489 **** ! #: main.c:130 msgid "-R\t\t\tReadonly mode (like \"view\")" --- 2822,2832 ---- ! #: main.c:2227 ! msgid "-d\t\t\tDiff mode (like \"vimdiff\")" ! msgstr "-d\t\t\tDiff modus (soos \"vimdiff\")" ! ! #: main.c:2229 ! msgid "-y\t\t\tEasy mode (like \"evim\", modeless)" ! msgstr "-y\t\t\tEasy modus (soos \"evim\", modusloos)" ! ! #: main.c:2230 msgid "-R\t\t\tReadonly mode (like \"view\")" *************** *** 2499,2501 **** ! #: main.c:133 msgid "-b\t\t\tBinary mode" --- 2842,2848 ---- ! #: main.c:2233 ! msgid "-M\t\t\tModifications in text not allowed" ! msgstr "-M\t\t\tVeranderings aan teks nie toegelaat nie" ! ! #: main.c:2234 msgid "-b\t\t\tBinary mode" *************** *** 2543,2549 **** ! #: main.c:147 ! msgid "-d \t\tUse for I/O" ! msgstr "-d \t\tGebruik vir I/O" ! #: main.c:150 msgid "-H\t\t\tstart in Hebrew mode" --- 2890,2896 ---- ! #: main.c:2248 ! msgid "-dev \t\tUse for I/O" ! msgstr "-dev \t\tGebruik vir I/O" ! #: main.c:2251 msgid "-H\t\t\tstart in Hebrew mode" *************** *** 2555,2561 **** ! #: main.c:155 msgid "-T \tSet terminal type to " ! msgstr "-T \tStel terminaaltipe na " ! #: main.c:156 msgid "-u \t\tUse instead of any .vimrc" --- 2902,2908 ---- ! #: main.c:2256 msgid "-T \tSet terminal type to " ! msgstr "-T \tStel terminaaltipe na " ! #: main.c:2257 msgid "-u \t\tUse instead of any .vimrc" *************** *** 2575,2577 **** ! #: main.c:162 msgid "+\t\t\tStart at end of file" --- 2922,2928 ---- ! #: main.c:2263 ! msgid "-O[N]\t\tlike -o but split vertically" ! msgstr "-O[N]\t\tsoos -o maar verdeel vertikaal" ! ! #: main.c:2264 msgid "+\t\t\tStart at end of file" *************** *** 2583,2585 **** ! #: main.c:164 msgid "-c \t\tExecute after loading the first file" --- 2934,2940 ---- ! #: main.c:2267 ! msgid "--cmd \tExecute before loading any vimrc file" ! msgstr "--cmd \tVoer uit voor enige .vimrc-lęer gelaai word" ! ! #: main.c:2269 msgid "-c \t\tExecute after loading the first file" *************** *** 2587,2591 **** ! #: main.c:165 ! msgid "" ! "-S \tExecute commands in file after loading the first file" msgstr "" --- 2942,2945 ---- ! #: main.c:2270 ! msgid "-S \t\tSource file after loading the first file" msgstr "" *************** *** 2601,2615 **** ! #: main.c:168 ! msgid "-W \tWrite all typed commands to file " ! msgstr "-W \tSkryf alle getikte bevele na lęer " ! #: main.c:170 ! msgid "-x\t\t\tEdit encrypted files" ! msgstr "-x\t\t\tBewerk geënkripteerde lęers" ! #: main.c:173 ! msgid "-X\t\t\tDo not connect to X server" ! msgstr "-X\t\t\tMoet nie konneksie met X-bediener maak nie" ! #: main.c:176 msgid "-i \t\tUse instead of .viminfo" --- 2955,3005 ---- ! #: main.c:2273 ! msgid "-W \tWrite all typed commands to file " ! msgstr "-W \tSkryf alle getikte bevele na lęer " ! ! #: main.c:2275 ! msgid "-x\t\t\tEdit encrypted files" ! msgstr "-x\t\t\tBewerk geënkripteerde lęers" ! ! #: main.c:2279 ! msgid "-display \tConnect vim to this particular X-server" ! msgstr "-display \tKoppel vim aan hierdie X-bediener" ! ! #: main.c:2281 ! msgid "-X\t\t\tDo not connect to X server" ! msgstr "-X\t\t\tMoet nie verbinding met X-bediener maak nie" ! ! #: main.c:2283 ! msgid "--socketid \tOpen Vim inside another GTK widget" ! msgstr "--socketid \tMaak Vim in 'n ander GTK element oop" ! ! #: main.c:2287 ! msgid "--remote \tEdit in a Vim server and exit" ! msgstr "--remote \tWysig die in a Vim bediener en verlaat" ! ! #: main.c:2288 ! msgid "" ! "--remote-wait As --remote but wait for files to have been edited" ! msgstr "" ! "--remote-wait Soos '--remote', maar wag vir lęers om gewysigte word" ! ! #: main.c:2289 ! msgid "--remote-send \tSend to a Vim server and exit" ! msgstr "" ! "--remote-send \tStuur na 'n Vim-bediener en verlaat" ! ! #: main.c:2290 ! msgid "--remote-expr \tEvaluate in a Vim server and print result" ! msgstr "" ! "--remote-expr \tEvalueer in 'n Vim-bediener en druk resultaat" ! #: main.c:2291 ! msgid "--serverlist\t\tList available Vim server names and exit" ! msgstr "--serverlist\t\tLys beskikbare Vim-bediener name en verlaat" ! #: main.c:2292 ! msgid "--servername \tSend to/become the Vim server " ! msgstr "--servername \tStuur na/word die Vim-bediener " ! #: main.c:2295 msgid "-i \t\tUse instead of .viminfo" *************** *** 2685,2692 **** ! #: main.c:202 msgid "-scrollbarwidth Use a scrollbar width of (also: -sw)" msgstr "" ! "-scrollbarwidth Gebruik 'n rolstaafwydte van (ook: -ws>" ! #: main.c:203 msgid "-menuheight \tUse a menu bar height of (also: -mh)" --- 3075,3082 ---- ! #: main.c:2321 msgid "-scrollbarwidth Use a scrollbar width of (also: -sw)" msgstr "" ! "-scrollbarwidth \tGebruik 'n rolstaafwydte van (ook: -sw>" ! #: main.c:2323 msgid "-menuheight \tUse a menu bar height of (also: -mh)" *************** *** 2715,2725 **** ! #: main.c:210 msgid "--columns \tInitial width of window in columns" ! msgstr "--columns \tAanvanklike wydte van venster in kolomme" ! #: main.c:211 msgid "--rows \tInitial height of window in rows" ! msgstr "--rows \tAanvanklike hoogte van venster in rye" ! #: main.c:214 msgid "" --- 3105,3115 ---- ! #: main.c:2331 msgid "--columns \tInitial width of window in columns" ! msgstr "--columns \tAanvanklike wydte van venster in kolomme" ! #: main.c:2332 msgid "--rows \tInitial height of window in rows" ! msgstr "--rows \tAanvanklike hoogte van venster in rye" ! #: main.c:2335 msgid "" *************** *** 2739,2773 **** ! #: main.c:799 ! msgid "Attempt to open script file again: \"" ! msgstr "Probeer weer om skriplęer oop te maak: \"" ! ! #: main.c:803 main.c:810 main.c:854 memline.c:3609 memline.c:3613 ! #: version.c:720 version.c:725 version.c:730 version.c:735 version.c:740 ! #: version.c:745 version.c:751 version.c:755 version.c:759 version.c:764 ! #: version.c:771 version.c:779 version.c:785 ! msgid "\"\n" ! msgstr "\"\n" ! ! #: main.c:808 ! msgid "Cannot open for reading: \"" ! msgstr "Kan nie oopmaak om te lees nie: \"" ! #: main.c:852 ! msgid "Cannot open for script output: \"" ! msgstr "Kan nie oopmaak vir skrip afvoer nie: \"" ! #: main.c:929 #, c-format ! msgid "%d files to edit\n" ! msgstr "%d lęers om te bewerk\n" ! ! #: main.c:987 ! msgid "Vim: Warning: Output is not to a terminal\n" ! msgstr "Vim: Waarskuwing: Afvoer gaan nie na 'n terminaal nie\n" ! #: main.c:989 ! msgid "Vim: Warning: Input is not from a terminal\n" ! msgstr "Vim: Waarskuwing: Invoer kom nie vanaf 'n terminaal nie\n" ! #: mark.c:701 msgid "No marks set" --- 3129,3158 ---- ! #. Failed to send, abort. ! #: main.c:2566 ! msgid "" ! "\n" ! "Send failed.\n" ! msgstr "" ! "\n" ! "Stuur het gefaal.\n" ! #. Let vim start normally. ! #: main.c:2571 ! msgid "" ! "\n" ! "Send failed. Trying to execute locally\n" ! msgstr "" ! "\n" ! "Stuur het gefaal. Probeer om lokaal uit te voer\n" ! #: main.c:2604 main.c:2625 #, c-format ! msgid "%d of %d edited" ! msgstr "%d van %d lęers bewerk" ! #: main.c:2648 ! msgid "Send expression failed.\n" ! msgstr "Stuur van uitdrukking het gefaal.\n" ! #: mark.c:660 msgid "No marks set" *************** *** 2775,2783 **** ! #: mark.c:703 #, c-format ! msgid "No marks matching \"%s\"" ! msgstr "Geen merkers pas op \"%s\" nie" #. Highlight title ! #: mark.c:714 msgid "" --- 3160,3168 ---- ! #: mark.c:662 #, c-format ! msgid "E283: No marks matching \"%s\"" ! msgstr "E283: Geen merkers pas op \"%s\" nie" #. Highlight title ! #: mark.c:673 msgid "" *************** *** 2831,2916 **** ! #: mbyte.c:2333 ! msgid "Cannot set IC values" ! msgstr "Kan nie IC waardes stel nie" ! ! #: mbyte.c:2624 ! msgid "Failed to open input method" ! msgstr "Gefaal om invoermetode oop te maak" ! ! #: mbyte.c:2635 ! msgid "Warning: Could not set destroy callback to IM" ! msgstr "Waarskuwing: Kon nie uitwis-terugroep na IM stel nie" ! ! #: mbyte.c:2641 ! msgid "input method doesn't support any style" ! msgstr "invoermetode ondersteun geen styl nie" ! ! #: mbyte.c:2695 ! msgid "input method doesn't support my preedit type" ! msgstr "invoermetode ondersteun nie my voor-bewerking tipe nie" ! ! #: mbyte.c:2743 ! msgid "Failed to create input context" ! msgstr "Gefaal met die skep van invoerkonteks" ! ! #: mbyte.c:2779 ! msgid "Your GTK+ is older than 1.2.3. Status area disabled" ! msgstr "Jou GTK+ is ouer as 1.2.3. Statusarea afgeskakel" ! ! #: mbyte.c:3001 ! msgid "Input Method Server is not running" ! msgstr "Invoermetodebediener voer nie uit nie" ! ! #: mbyte.c:3036 mbyte.c:3059 ! msgid "over-the-spot style requires fontset" ! msgstr "oor-die-plek styl vereis fontstel" ! ! #: mbyte.c:3082 ! msgid "Can't create input context." ! msgstr "Kan nie invoerkonteks skep nie." ! ! #: mbyte.c:3335 ! msgid "Keymap file not found" ! msgstr "Sleutelbindinglęer nie gevind nie" ! ! #: mbyte.c:3361 ! msgid "Using :loadkeymap not in a sourced file" ! msgstr ":loadkeymap word buiten 'n uitvoerlęer gebruik" ! ! #. close the file ! #: memfile.c:240 memfile.c:290 ! msgid "Close error on swap file" ! msgstr "Sluitfout met ruillęer" #: memfile.c:473 ! msgid "block was not locked" ! msgstr "blok was nie gesluit nie" ! #: memfile.c:958 ! msgid "Seek error in swap file read" ! msgstr "Soekfout in ruillęer-lees" ! ! #: memfile.c:963 ! msgid "Read error in swap file" ! msgstr "Leesfout in ruillęer" ! ! #: memfile.c:1015 ! msgid "Seek error in swap file write" ! msgstr "Soekfout in ruillęer skryf" ! ! #: memfile.c:1033 ! msgid "Write error in swap file" ! msgstr "Skryffout in ruillęer" #: memline.c:275 ! msgid "didn't get block nr 0?" ! msgstr "het nie blok no 0 gekry nie?" #: memline.c:315 ! msgid "didn't get block nr 1?" ! msgstr "het nie blok no 1 gekry nie?" #: memline.c:333 ! msgid "didn't get block nr 2?" ! msgstr "het nie blok no 2 gekry nie?" --- 3216,3288 ---- ! #: mbyte.c:3014 ! msgid "E284: Cannot set IC values" ! msgstr "E284: Kan nie IC waardes stel nie" ! ! #: mbyte.c:3166 ! msgid "E285: Failed to create input context" ! msgstr "E285: Gefaal met die skep van invoerkonteks" ! ! #: mbyte.c:3313 ! msgid "E286: Failed to open input method" ! msgstr "E286: Gefaal om invoermetode oop te maak" ! ! #: mbyte.c:3324 ! msgid "E287: Warning: Could not set destroy callback to IM" ! msgstr "E287: Waarskuwing: Kon nie uitwis-terugroep na IM stel nie" ! ! #: mbyte.c:3330 ! msgid "E288: input method doesn't support any style" ! msgstr "E288: invoermetode ondersteun geen styl nie" ! ! #: mbyte.c:3387 ! msgid "E289: input method doesn't support my preedit type" ! msgstr "E289: invoermetode ondersteun nie my voor-bewerking tipe nie" ! ! #: mbyte.c:3461 ! msgid "E290: over-the-spot style requires fontset" ! msgstr "E290: oor-die-plek styl vereis fontstel" ! ! #: mbyte.c:3489 ! msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled" ! msgstr "E291: Jou GTK+ is ouer as 1.2.3. Statusarea afgeskakel" ! ! #: mbyte.c:3726 ! msgid "E292: Input Method Server is not running" ! msgstr "E292: Invoermetodebediener voer nie uit nie" #: memfile.c:473 ! msgid "E293: block was not locked" ! msgstr "E293: blok was nie gesluit nie" ! #: memfile.c:972 ! msgid "E294: Seek error in swap file read" ! msgstr "E294: Soekfout in lees van ruillęer" ! ! #: memfile.c:977 ! msgid "E295: Read error in swap file" ! msgstr "E295: Leesfout in ruillęer" ! ! #: memfile.c:1029 ! msgid "E296: Seek error in swap file write" ! msgstr "E296: Soekfout in skryf van ruillęer" ! ! #: memfile.c:1047 ! msgid "E297: Write error in swap file" ! msgstr "E297: Skryffout in ruillęer" ! ! #: memfile.c:1244 ! msgid "E300: Swap file already exists (symlink attack?)" ! msgstr "E300: Ruillęer bestaan alreeds! ('symlink' probleem?)" #: memline.c:275 ! msgid "E298: Didn't get block nr 0?" ! msgstr "E298: Het nie blok no 0 gekry nie?" #: memline.c:315 ! msgid "E298: Didn't get block nr 1?" ! msgstr "E298: Het nie blok no 1 gekry nie?" #: memline.c:333 ! msgid "E298: Didn't get block nr 2?" ! msgstr "E298: Het nie blok no 2 gekry nie?" *************** *** 2918,2941 **** #: memline.c:443 ! msgid "Oops, lost the swap file!!!" ! msgstr "Hiert, die ruillęer is weg!!!" #: memline.c:448 ! msgid "Could not rename swap file" ! msgstr "Kon nie ruillęer hernoem nie" ! #: memline.c:515 #, c-format ! msgid "Unable to open swap file for \"%s\", recovery impossible" ! msgstr "Kon nie ruillęer oopmaak vir \"%s\" nie, herwinning onmoontlik" ! #: memline.c:614 ! msgid "ml_timestamp: Didn't get block 0??" ! msgstr "'ml_timestamp': Het nie blok 0 gekry nie??" ! #: memline.c:752 #, c-format ! msgid "No swap file found for %s" ! msgstr "Geen ruillęer gevind vir %s nie" ! #: memline.c:762 msgid "Enter number of swap file to use (0 to quit): " --- 3290,3313 ---- #: memline.c:443 ! msgid "E301: Oops, lost the swap file!!!" ! msgstr "E301: Hiert, die ruillęer is weg!!!" #: memline.c:448 ! msgid "E302: Could not rename swap file" ! msgstr "E302: Kon nie ruillęer vernoem nie" ! #: memline.c:518 #, c-format ! msgid "E303: Unable to open swap file for \"%s\", recovery impossible" ! msgstr "E303: Kon nie ruillęer oopmaak vir \"%s\" nie, herwinning onmoontlik" ! #: memline.c:617 ! msgid "E304: ml_timestamp: Didn't get block 0??" ! msgstr "E304: 'ml_timestamp': Het nie blok 0 gekry nie??" ! #: memline.c:757 #, c-format ! msgid "E305: No swap file found for %s" ! msgstr "E305: Geen ruillęer gevind vir %s nie" ! #: memline.c:767 msgid "Enter number of swap file to use (0 to quit): " *************** *** 2943,2950 **** ! #: memline.c:806 #, c-format ! msgid "Cannot open %s" ! msgstr "Kan %s nie oopmaak nie" ! #: memline.c:828 msgid "Unable to read block 0 from " --- 3315,3322 ---- ! #: memline.c:812 #, c-format ! msgid "E306: Cannot open %s" ! msgstr "E306: Kan %s nie oopmaak nie" ! #: memline.c:834 msgid "Unable to read block 0 from " *************** *** 2958,2962 **** "\n" ! "Vim het die ruillęer nie opgedateer nie. Dalk is niks verander nie." ! #: memline.c:841 memline.c:857 msgid " cannot be used with this version of Vim.\n" --- 3330,3334 ---- "\n" ! "Vim het die ruillęer nie opgedateer nie. Dalk was niks verander nie." ! #: memline.c:847 memline.c:864 msgid " cannot be used with this version of Vim.\n" *************** *** 2968,2979 **** ! #: memline.c:848 #, c-format ! msgid "%s does not look like a Vim swap file" ! msgstr "%s lyk nie soos 'n Vim ruillęer nie" ! #: memline.c:861 msgid " cannot be used on this computer.\n" ! msgstr " kan nie gebruik word op die rekenaar nie.\n" ! #: memline.c:863 msgid "The file was created on " --- 3340,3351 ---- ! #: memline.c:855 #, c-format ! msgid "E307: %s does not look like a Vim swap file" ! msgstr "E307: %s lyk nie soos 'n Vim ruillęer nie" ! #: memline.c:868 msgid " cannot be used on this computer.\n" ! msgstr " kan nie gebruik word op hierdie rekenaar nie.\n" ! #: memline.c:870 msgid "The file was created on " *************** *** 2999,3010 **** ! #: memline.c:927 ! msgid "Warning: Original file may have been changed" ! msgstr "Waarskuwing: Oorspronklike lęer is dalk gewysig" ! #: memline.c:968 #, c-format ! msgid "Unable to read block 1 from %s" ! msgstr "Kan nie block 1 lees van %s" ! #: memline.c:972 msgid "???MANY LINES MISSING" --- 3371,3382 ---- ! #: memline.c:934 ! msgid "E308: Warning: Original file may have been changed" ! msgstr "E308: Waarskuwing: Oorspronklike lęer is dalk gewysig" ! #: memline.c:975 #, c-format ! msgid "E309: Unable to read block 1 from %s" ! msgstr "E309: Kan nie block 1 lees van %s" ! #: memline.c:979 msgid "???MANY LINES MISSING" *************** *** 3024,3031 **** ! #: memline.c:1053 #, c-format ! msgid "Block 1 ID wrong (%s not a .swp file?)" ! msgstr "Blok 1 se ID is foutief (%s nie 'n .swp lęer nie?)" ! #: memline.c:1058 msgid "???BLOCK MISSING" --- 3396,3403 ---- ! #: memline.c:1060 #, c-format ! msgid "E310: Block 1 ID wrong (%s not a .swp file?)" ! msgstr "E310: Blok 1 se ID is foutief (%s nie 'n .swp lęer nie?)" ! #: memline.c:1065 msgid "???BLOCK MISSING" *************** *** 3045,3056 **** ! #: memline.c:1136 ! msgid "Recovery Interrupted" ! msgstr "Herwinning onderbreek" ! #: memline.c:1138 ! msgid "Errors detected while recovering; look for lines starting with ???" msgstr "" ! "Foute raakgesien gedurende herwinning; soek vir reëls wat begin met ???" ! #: memline.c:1141 msgid "Recovery completed. You should check if everything is OK." --- 3417,3429 ---- ! #: memline.c:1143 ! msgid "E311: Recovery Interrupted" ! msgstr "E311: Herwinning onderbreek" ! #: memline.c:1145 ! msgid "" ! "E312: Errors detected while recovering; look for lines starting with ???" msgstr "" ! "E312: Foute raakgesien gedurende herwinning; soek vir reëls wat begin met ???" ! #: memline.c:1148 msgid "Recovery completed. You should check if everything is OK." *************** *** 3075,3077 **** msgstr "" ! "Verwyder die .swp lęer na die tyd.\n" "\n" --- 3448,3450 ---- msgstr "" ! "Verwyder die .swp-lęer na die tyd.\n" "\n" *************** *** 3099,3105 **** ! #: memline.c:1466 memline.c:3616 ! msgid " dated: " ! msgstr " gedateer: " ! ! #: memline.c:1477 msgid " owned by: " --- 3472,3474 ---- ! #: memline.c:1481 msgid " owned by: " *************** *** 3107,3109 **** ! #: memline.c:1495 msgid " [from Vim version 3.0]" --- 3476,3486 ---- ! #: memline.c:1483 ! msgid " dated: " ! msgstr " gedateer: " ! ! #: memline.c:1487 memline.c:3680 ! msgid " dated: " ! msgstr " gedateer: " ! ! #: memline.c:1503 msgid " [from Vim version 3.0]" *************** *** 3135,3153 **** ! #: memline.c:1520 msgid "" "\n" ! " host name: " msgstr "" "\n" ! " gasheernaam: " ! #: memline.c:1526 msgid "" "\n" ! " user name: " msgstr "" "\n" ! " gebruikersnaam: " ! #: memline.c:1532 msgid "" --- 3512,3534 ---- ! #: memline.c:1528 msgid "" "\n" ! " user name: " msgstr "" "\n" ! " gebruikersnaam: " ! ! #: memline.c:1535 ! msgid " host name: " ! msgstr " gasheernaam: " ! #: memline.c:1537 msgid "" "\n" ! " host name: " msgstr "" "\n" ! " gasheernaam: " ! #: memline.c:1543 msgid "" *************** *** 3187,3193 **** ! #: memline.c:1747 ! msgid "Cannot preserve, there is no swap file" ! msgstr "Kan nie bewaar nie, daar is geen ruillęer nie" ! #: memline.c:1794 msgid "File preserved" --- 3568,3574 ---- ! #: memline.c:1763 ! msgid "E313: Cannot preserve, there is no swap file" ! msgstr "E313: Kan nie bewaar nie, daar is geen ruillęer nie" ! #: memline.c:1816 msgid "File preserved" *************** *** 3195,3215 **** ! #: memline.c:1796 ! msgid "Preserve failed" ! msgstr "Kon nie bewaar nie" ! #: memline.c:1860 #, c-format ! msgid "ml_get: invalid lnum: %ld" ! msgstr "'ml_get': ongeldige 'lnum': %ld" ! #: memline.c:1886 #, c-format ! msgid "ml_get: cannot find line %ld" ! msgstr "'ml_get': kan reël %ld nie vind nie" ! #: memline.c:2274 ! msgid "pointer block id wrong 3" ! msgstr "wyser blok id verkeerd 3" ! #: memline.c:2354 msgid "stack_idx should be 0" --- 3576,3596 ---- ! #: memline.c:1818 ! msgid "E314: Preserve failed" ! msgstr "E314: Kon nie bewaar nie" ! #: memline.c:1889 #, c-format ! msgid "E315: ml_get: invalid lnum: %ld" ! msgstr "E315: 'ml_get': ongeldige 'lnum': %ld" ! #: memline.c:1915 #, c-format ! msgid "E316: ml_get: cannot find line %ld" ! msgstr "E316: 'ml_get': kan reël %ld nie vind nie" ! #: memline.c:2303 ! msgid "E317: pointer block id wrong 3" ! msgstr "E317: wyser blok id verkeerd 3" ! #: memline.c:2383 msgid "stack_idx should be 0" *************** *** 3217,3227 **** ! #: memline.c:2416 ! msgid "Updated too many blocks?" ! msgstr "Te veel blokke opgedateer?" ! ! #: memline.c:2573 ! msgid "pointer block id wrong 4" ! msgstr "wyser blok id verkeerd 4" ! #: memline.c:2600 msgid "deleted block 1?" --- 3598,3608 ---- ! #: memline.c:2445 ! msgid "E318: Updated too many blocks?" ! msgstr "E318: Te veel blokke opgedateer?" ! ! #: memline.c:2602 ! msgid "E317: pointer block id wrong 4" ! msgstr "E317: wyser blok id verkeerd 4" ! #: memline.c:2629 msgid "deleted block 1?" *************** *** 3229,3240 **** ! #: memline.c:2800 #, c-format ! msgid "Cannot find line %ld" ! msgstr "Kan nie reël %ld vind nie" ! #: memline.c:3043 ! msgid "pointer block id wrong" ! msgstr "wyser blok id verkeerd" ! #: memline.c:3059 msgid "pe_line_count is zero" --- 3610,3621 ---- ! #: memline.c:2829 #, c-format ! msgid "E320: Cannot find line %ld" ! msgstr "E320: Kan nie reël %ld vind nie" ! #: memline.c:3072 ! msgid "E317: pointer block id wrong" ! msgstr "E317: wyser blok id verkeerd" ! #: memline.c:3088 msgid "pe_line_count is zero" *************** *** 3242,3254 **** ! #: memline.c:3088 #, c-format ! msgid "line number out of range: %ld past the end" ! msgstr "reëlnommer buite perke: %ld verby die einde" ! #: memline.c:3092 #, c-format ! msgid "line count wrong in block %ld" ! msgstr "reëltelling mag verkeerd wees in blok %ld" ! #: memline.c:3141 msgid "Stack size increases" --- 3623,3635 ---- ! #: memline.c:3117 #, c-format ! msgid "E322: line number out of range: %ld past the end" ! msgstr "E322: reëlnommer buite perke: %ld verby die einde" ! #: memline.c:3121 #, c-format ! msgid "E323: line count wrong in block %ld" ! msgstr "E323: reëltelling mag verkeerd wees in blok %ld" ! #: memline.c:3170 msgid "Stack size increases" *************** *** 3256,3266 **** ! #: memline.c:3187 ! msgid "pointer block id wrong 2" ! msgstr "wyser blok id verkeerd 2" ! ! #: memline.c:3606 ! msgid "ATTENTION" ! msgstr "LET OP" ! #: memline.c:3607 msgid "" --- 3637,3647 ---- ! #: memline.c:3216 ! msgid "E317: pointer block id wrong 2" ! msgstr "E317: wyser blok id verkeerd 2" ! ! #: memline.c:3670 ! msgid "E325: ATTENTION" ! msgstr "E325: LET OP" ! #: memline.c:3671 msgid "" *************** *** 3276,3280 **** #. Some of these messages are long to allow translation to #. * other languages. ! #: memline.c:3622 msgid "" --- 3657,3665 ---- + #: memline.c:3684 + msgid " NEWER than swap file!\n" + msgstr " NUWER as die ruillęer!\n" + #. Some of these messages are long to allow translation to #. * other languages. ! #: memline.c:3688 msgid "" *************** *** 3306,3320 **** ! #: memline.c:3627 msgid "" "\"\n" ! " to recover the changes (see \":help recovery)\".\n" msgstr "" "\"\n" ! " om die veranderinge te herwin (sien \":help recovery\".\n" ! #: memline.c:3628 msgid " If you did this already, delete the swap file \"" ! msgstr " As jy dit alreeds gedoen het, verwyder die ruillęer \"" ! #: memline.c:3630 msgid "" --- 3691,3705 ---- ! #: memline.c:3693 msgid "" "\"\n" ! " to recover the changes (see \":help recovery\").\n" msgstr "" "\"\n" ! " om die veranderinge te herwin (sien \":help recovery\").\n" ! #: memline.c:3694 msgid " If you did this already, delete the swap file \"" ! msgstr " Indien jy dit alreeds gedoen het, verwyder die ruillęer \"" ! #: memline.c:3696 msgid "" *************** *** 3322,3324 **** " to avoid this message.\n" - "\n" msgstr "" --- 3707,3708 ---- *************** *** 3369,3406 **** ! #: memline.c:3706 ! msgid "Too many swap files found" ! msgstr "Te veel ruillęers gevind" ! ! #: globals.h:1005 menu.c:221 ! msgid "Trailing characters" ! msgstr "Oorbodige karakters" ! ! #: menu.c:406 ! msgid "Menu path must not lead to a sub-menu" ! msgstr "Kieslyspad moenie lei na 'n sub-kieslys nie" ! ! #: menu.c:416 menu.c:660 menu.c:726 menu.c:901 menu.c:1899 menu.c:2021 ! msgid "Part of menu-item path is not sub-menu" ! msgstr "Deel van kieslys-item pad is nie 'n sub-kieslys nie" ! ! #: menu.c:445 ! msgid "Must not add menu items directly to menu bar" ! msgstr "Moenie kieslysitems direk by kieslysstaaf voeg nie" ! ! #: menu.c:451 ! msgid "Separator cannot be part of a menu path" ! msgstr "Verdeler kan nie deel wees van kieslyspad nie" ! ! #: menu.c:685 menu.c:786 menu.c:917 ! msgid "No menu of that name" ! msgstr "Geen kieslys met daardie naam nie" ! ! #: menu.c:748 menu.c:907 ! msgid "Menu only exists in another mode" ! msgstr "Kieslys bestaan slegs in 'n ander modus" ! ! #: menu.c:763 ! msgid "Sorry, deleting a menu is not possible in the Athena version" ! msgstr "" ! "Jammer, in die Athena weergawe is dit onmoontlik om 'n kieslys te skrap" --- 3753,3781 ---- ! #: memline.c:3781 ! msgid "E326: Too many swap files found" ! msgstr "E326: Te veel ruillęers gevind" ! ! #: menu.c:64 ! msgid "E327: Part of menu-item path is not sub-menu" ! msgstr "E327: Deel van kieslys-item pad is nie 'n sub-kieslys nie" ! ! #: menu.c:65 ! msgid "E328: Menu only exists in another mode" ! msgstr "E328: Kieslys bestaan slegs in 'n ander modus" ! ! #: menu.c:66 ! msgid "E329: No menu of that name" ! msgstr "E329: Geen kieslys met daardie naam nie" ! ! #: menu.c:503 ! msgid "E330: Menu path must not lead to a sub-menu" ! msgstr "E330: Kieslyspad moenie lei na 'n sub-kieslys nie" ! ! #: menu.c:542 ! msgid "E331: Must not add menu items directly to menu bar" ! msgstr "E331: Moenie kieslysitems direk by kieslysstaaf voeg nie" ! ! #: menu.c:548 ! msgid "E332: Separator cannot be part of a menu path" ! msgstr "E332: Verdeler kan nie deel wees van kieslyspad nie" *************** *** 3420,3444 **** ! #: menu.c:1894 ! msgid "Menu path must lead to a menu item" ! msgstr "Kieslyspad moet lei na 'n kieslysitem" ! #: menu.c:1914 #, c-format ! msgid "Menu not found: %s" ! msgstr "Kieslys nie gevind nie: %s" ! #: menu.c:1983 #, c-format ! msgid "Menu not defined for %s mode" ! msgstr "Kieslys nie gedefinieer vir %s modus nie" ! #: menu.c:2019 ! msgid "Menu path must lead to a sub-menu" ! msgstr "Kieslyspad moet lei na 'n sub-kieslys" ! #: menu.c:2040 ! msgid "Menu not found - check menu names" ! msgstr "Kieslys nie gevind nie - maak seker oor die kieslys name" ! #: message.c:425 #, c-format --- 3795,3819 ---- ! #: menu.c:2054 ! msgid "E333: Menu path must lead to a menu item" ! msgstr "E333: Kieslyspad moet lei na 'n kieslysitem" ! #: menu.c:2074 #, c-format ! msgid "E334: Menu not found: %s" ! msgstr "E334: Kieslys nie gevind nie: %s" ! #: menu.c:2143 #, c-format ! msgid "E335: Menu not defined for %s mode" ! msgstr "E335: Kieslys nie gedefinieer vir %s modus nie" ! #: menu.c:2181 ! msgid "E336: Menu path must lead to a sub-menu" ! msgstr "E336: Kieslyspad moet lei na 'n sub-kieslys" ! #: menu.c:2202 ! msgid "E337: Menu not found - check menu names" ! msgstr "E337: Kieslys nie gevind nie - maak seker oor die kieslys name" ! #: message.c:467 #, c-format *************** *** 3456,3462 **** ! #: message.c:611 msgid "Messages maintainer: Bram Moolenaar " ! msgstr "Boodskappe onderhouers: Danie Roux en Jean Jordaan " ! #: message.c:812 msgid "Interrupt: " --- 3831,3837 ---- ! #: message.c:669 msgid "Messages maintainer: Bram Moolenaar " ! msgstr "Boodskappe onderhouers: Danie Roux en Jean Jordaan " ! #: message.c:881 msgid "Interrupt: " *************** *** 3529,3539 **** #. TODO: non-GUI file selector here ! #: message.c:2347 ! msgid "Sorry, no file browser in console mode" ! msgstr "Jammer, lęerblaaier nie beskikbaar in konsole-modus nie" ! ! #: misc1.c:2406 ! msgid "Warning: Changing a readonly file" ! msgstr "Waarskuwing: Jy wysig aan 'n leesalleen lęer" ! #: misc1.c:2621 msgid "1 more line" --- 3904,3914 ---- #. TODO: non-GUI file selector here ! #: message.c:2547 ! msgid "E338: Sorry, no file browser in console mode" ! msgstr "E338: Jammer, lęerblaaier nie beskikbaar in konsole-modus nie" ! ! #: misc1.c:2449 ! msgid "W10: Warning: Changing a readonly file" ! msgstr "W10: Waarskuwing: Jy wysig aan 'n leesalleen lęer" ! #: misc1.c:2678 msgid "1 more line" *************** *** 3590,3601 **** ! #: misc2.c:683 ! msgid "Line is becoming too long" ! msgstr "Rëel word te lank" ! #: misc2.c:728 #, c-format ! msgid "Internal error: lalloc(%ld, )" ! msgstr "Interne fout: 'lalloc(%ld, )'" ! #: misc2.c:2630 option.c:4282 msgid "Missing colon" --- 3965,3986 ---- ! #: misc2.c:724 ! msgid "E340: Line is becoming too long" ! msgstr "E340: Rëel word te lank" ! ! #: misc2.c:768 ! #, c-format ! msgid "E341: Internal error: lalloc(%ld, )" ! msgstr "E341: Interne fout: 'lalloc(%ld, )'" ! ! #: misc2.c:876 ! #, c-format ! msgid "E342: Out of memory! (allocating %lu bytes)" ! msgstr "E342: Geheue is op! (ken %lu grepe toe)" ! #: misc2.c:2511 #, c-format ! msgid "Calling shell to execute: \"%s\"" ! msgstr "Roep dop om uit te voer: \"%s\"" ! #: misc2.c:2706 misc2.c:5148 option.c:4584 msgid "Missing colon" *************** *** 3631,3662 **** ! #: misc2.c:3521 #, c-format msgid "" ! "Invalid path: '**[number]' must be at the end of the path or be followed by " ! "'%s'. See :help path." msgstr "" ! "Ongeldige pad: '**[nommer]' moet aan die einde van 'n pad wees of gevolg " ! "wees deur %s'. Sien :help path." ! #: misc2.c:4748 #, c-format ! msgid "Can't find directory \"%s\" in cdpath" ! msgstr "Kan nie gids \"%s\" in 'cdpath' vind nie" ! #: misc2.c:4750 window.c:4140 #, c-format ! msgid "Can't find file \"%s\" in path" ! msgstr "Kan lęer \"%s\" nie vind in pad nie" ! #: misc2.c:4755 #, c-format ! msgid "No more directory \"%s\" found in cdpath" ! msgstr "Geen gids \"%s\" meer gevind in 'cdpath'" ! #: misc2.c:4758 #, c-format ! msgid "No more file \"%s\" found in path" ! msgstr "Geen lęer \"%s\" meer gevind in pad" ! #: normal.c:2754 msgid "Warning: terminal cannot highlight" --- 4016,4051 ---- ! #: misc2.c:3648 #, c-format msgid "" ! "E343: Invalid path: '**[number]' must be at the end of the path or be " ! "followed by '%s'." msgstr "" ! "E343: Ongeldige pad: '**[nommer]' moet aan die einde van 'n pad wees of " ! "gevolg wees deur %s'." ! #: misc2.c:4905 #, c-format ! msgid "E344: Can't find directory \"%s\" in cdpath" ! msgstr "E344: Kan nie gids \"%s\" in 'cdpath' vind nie" ! #: misc2.c:4908 #, c-format ! msgid "E345: Can't find file \"%s\" in path" ! msgstr "E345: Kan lęer \"%s\" nie vind in pad nie" ! #: misc2.c:4914 #, c-format ! msgid "E346: No more directory \"%s\" found in cdpath" ! msgstr "E346: Geen gids \"%s\" meer gevind in 'cdpath' nie" ! #: misc2.c:4917 #, c-format ! msgid "E347: No more file \"%s\" found in path" ! msgstr "E347: Geen lęer \"%s\" meer gevind in pad nie" ! #: misc2.c:5160 ! msgid "Illegal component" ! msgstr "Ongeldige komponent" ! ! #: normal.c:2813 msgid "Warning: terminal cannot highlight" *************** *** 3664,3687 **** ! #: normal.c:2948 ! msgid "No string under cursor" ! msgstr "Geen string onder loper nie" ! ! #: normal.c:2950 ! msgid "No identifier under cursor" ! msgstr "Geen identifiseerder onder loper nie" ! ! #: normal.c:4052 ! msgid "Cannot create fold with current 'foldmethod'" ! msgstr "Kan nie vou skep met huidige 'foldmethod' nie" ! ! #: normal.c:4070 ! msgid "Cannot delete fold with current 'foldmethod'" ! msgstr "Kan nie vou skrap met huidige 'foldmethod' nie" ! ! #: normal.c:4083 ! msgid "Cannot erase folds with current 'foldmethod'" ! msgstr "Kan nie voue verwyder met huidige 'foldmethod' nie" # Het te doen met < en > ! #: ops.c:269 #, c-format --- 4053,4068 ---- ! #: normal.c:3008 ! msgid "E348: No string under cursor" ! msgstr "E348: Geen string onder loper nie" ! ! #: normal.c:3010 ! msgid "E349: No identifier under cursor" ! msgstr "E349: Geen identifiseerder onder loper nie" ! ! #: normal.c:4175 ! msgid "E352: Cannot erase folds with current 'foldmethod'" ! msgstr "E352: Kan nie voue verwyder met huidige 'foldmethod' nie" # Het te doen met < en > ! #: ops.c:271 #, c-format *************** *** 3690,3697 **** ! #: ops.c:271 #, c-format msgid "1 line %sed %d times" ! msgstr "1 reël %d keer ge-%s" ! #: ops.c:276 #, c-format --- 4071,4078 ---- ! #: ops.c:273 #, c-format msgid "1 line %sed %d times" ! msgstr "1 reël ge-%s %d keer" ! #: ops.c:278 #, c-format *************** *** 3700,3707 **** ! #: ops.c:279 #, c-format msgid "%ld lines %sed %d times" ! msgstr "%ld reëls %d keer ge-%s" ! #: ops.c:631 #, c-format --- 4081,4088 ---- ! #: ops.c:281 #, c-format msgid "%ld lines %sed %d times" ! msgstr "%ld reëls ge-%s %d keer" ! #: ops.c:638 #, c-format *************** *** 3719,3721 **** ! #: ops.c:1485 msgid "cannot yank; delete anyway" --- 4100,4103 ---- ! #. must display the prompt ! #: ops.c:1528 msgid "cannot yank; delete anyway" *************** *** 3746,3754 **** ! #: ops.c:2732 #, c-format ! msgid "Nothing in register %s" ! msgstr "Niks in register %s nie" #. Highlight title ! #: ops.c:3260 msgid "" --- 4128,4136 ---- ! #: ops.c:2916 #, c-format ! msgid "E353: Nothing in register %s" ! msgstr "E353: Niks in register %s nie" #. Highlight title ! #: ops.c:3454 msgid "" *************** *** 3777,3784 **** ! #: ops.c:4835 #, c-format ! msgid "Invalid register name: '%s'" ! msgstr "Ongeldige registernaam: '%s'" ! #: ops.c:5174 #, c-format --- 4159,4166 ---- ! #: ops.c:5052 #, c-format ! msgid "E354: Invalid register name: '%s'" ! msgstr "E354: Ongeldige registernaam: '%s'" ! #: ops.c:5393 #, c-format *************** *** 3787,3805 **** ! #: ops.c:5181 #, c-format ! msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars" ! msgstr "%s%ld van %ld Reëls gekies; %ld van %ld Woorde; %ld van %ld Karakters" ! #: ops.c:5197 #, c-format ! msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld" ! msgstr "" ! "Kol %s van %s; Reël %ld van %ld; Woord %ld van %ld; Karakter %ld van %ld" ! #: ops.c:5208 #, c-format msgid "(+%ld for BOM)" ! msgstr "(+%ld vir BOM)" ! #: option.c:1832 msgid "Thanks for flying Vim" --- 4169,4187 ---- ! #: ops.c:5400 #, c-format ! msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes" ! msgstr "%s%ld van %ld reëls gekies; %ld van %ld Woorde; %ld van %ld Grepe" ! # njj: Karakters kan meerdere grepe wees, sien ':h multibyte' ! #: ops.c:5416 #, c-format ! msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld" ! msgstr "Kol %s van %s; Reël %ld van %ld; Woord %ld van %ld; Greep %ld van %ld" ! #: ops.c:5427 #, c-format msgid "(+%ld for BOM)" ! msgstr "(+%ld vir 'BOM')" ! #: option.c:1989 msgid "Thanks for flying Vim" *************** *** 3827,3833 **** ! #: option.c:3417 option.c:4015 msgid "Not found in termcap" ! msgstr "Nie gevind in termcap" ! #: option.c:3483 #, c-format --- 4209,4215 ---- ! #: option.c:3702 option.c:4309 msgid "Not found in termcap" ! msgstr "Nie gevind in 'termcap' nie" ! #: option.c:3768 #, c-format *************** *** 3927,3933 **** ! #: option.c:5216 msgid "A preview window already exists" ! msgstr "A voorskouvenster bestaan alreeds" ! #: option.c:5437 option.c:5467 msgid "'winheight' cannot be smaller than 'winminheight'" --- 4309,4315 ---- ! #: option.c:5620 msgid "A preview window already exists" ! msgstr "Daar bestaan reeds 'n voorskouvenster" ! #: option.c:5881 option.c:5910 msgid "'winheight' cannot be smaller than 'winminheight'" *************** *** 3949,3951 **** ! #: option.c:6006 msgid "" --- 4331,4338 ---- ! #: option.c:6391 ! #, c-format ! msgid "E355: Unknown option: %s" ! msgstr "E355: Onbekende opsie: %s" ! ! #: option.c:6500 msgid "" *************** *** 3981,3995 **** ! #: option.c:6667 ! msgid "get_varp ERROR" ! msgstr "'get_varp' FOUT" ! #: option.c:7528 #, c-format ! msgid "'langmap': Matching character missing for %s" ! msgstr "'langmap': Passende karakter ontbreek vir %s" ! #: option.c:7562 #, c-format ! msgid "'langmap': Extra characters after semicolon: %s" ! msgstr "'langmap: Ekstra karakters na kommapunt: %s" --- 4368,4382 ---- ! #: option.c:7196 ! msgid "E356: get_varp ERROR" ! msgstr "E356: 'get_varp' FOUT" ! #: option.c:8112 #, c-format ! msgid "E357: 'langmap': Matching character missing for %s" ! msgstr "E357: 'langmap': Passende karakter ontbreek vir %s" ! #: option.c:8146 #, c-format ! msgid "E358: 'langmap': Extra characters after semicolon: %s" ! msgstr "E358: 'langmap: Ekstra karakters na kommapunt: %s" *************** *** 4016,4022 **** ! #: os_amiga.c:411 msgid "Cannot create " ! msgstr "Kan nie skep nie " ! #: os_amiga.c:882 #, c-format --- 4403,4409 ---- ! #: os_amiga.c:418 msgid "Cannot create " ! msgstr "Kan nie skep nie: " ! #: os_amiga.c:896 #, c-format *************** *** 4029,4036 **** ! #: os_amiga.c:924 os_mac.c:950 os_mswin.c:589 os_riscos.c:728 os_unix.c:2390 ! #: os_vms.c:1634 ! msgid "Screen mode setting not supported" ! msgstr "Skermmodus instelling nie ondersteun nie" ! #: os_amiga.c:980 msgid "mch_get_shellsize: not a console??\n" --- 4416,4422 ---- ! #: os_amiga.c:938 os_mac.c:1168 os_mswin.c:619 os_riscos.c:728 os_unix.c:2726 ! msgid "E359: Screen mode setting not supported" ! msgstr "E359: Skermmodus instelling nie ondersteun nie" ! #: os_amiga.c:994 msgid "mch_get_shellsize: not a console??\n" *************** *** 4039,4045 **** #. if Vim opened a window: Executing a shell may cause crashes ! #: os_amiga.c:1128 ! msgid "Cannot execute shell with -f option" ! msgstr "Kan nie dop met -f opsie uitvoer nie" ! #: os_amiga.c:1169 os_amiga.c:1259 msgid "Cannot execute " --- 4425,4431 ---- #. if Vim opened a window: Executing a shell may cause crashes ! #: os_amiga.c:1142 ! msgid "E360: Cannot execute shell with -f option" ! msgstr "E360: Kan nie dop met -f opsie uitvoer nie" ! #: os_amiga.c:1183 os_amiga.c:1273 msgid "Cannot execute " *************** *** 4055,4065 **** ! #: os_amiga.c:1381 ! msgid "Out of memory" ! msgstr "Geheue op" ! ! #: os_amiga.c:1437 msgid "ANCHOR_BUF_SIZE too small." ! msgstr "ANCHOR_BUF_SIZE is te klein" ! #: os_amiga.c:1441 msgid "I/O ERROR" --- 4441,4447 ---- ! #: os_amiga.c:1448 msgid "ANCHOR_BUF_SIZE too small." ! msgstr "'ANCHOR_BUF_SIZE' is te klein" ! #: os_amiga.c:1452 msgid "I/O ERROR" *************** *** 4067,4089 **** ! #: os_msdos.c:1450 ! msgid "PC (32 bits Vim)" ! msgstr "PC (32 bisse Vim)" ! ! #: os_msdos.c:1452 ! msgid "PC (16 bits Vim)" ! msgstr "PC (16 bisse Vim)" ! ! #: os_msdos.c:1845 ! msgid "Unsupported screen mode" ! msgstr "Ongesteunde skermmodus" ! ! #: os_msdos.c:2039 os_unix.c:2586 os_unix.c:3125 os_vms.c:1717 ! msgid "" ! "\n" ! "shell returned " ! msgstr "" ! "\n" ! "dop lewer " ! #: os_mswin.c:564 msgid "'columns' is not 80, cannot execute external commands" --- 4449,4455 ---- ! #: os_mswin.c:503 ! msgid "...(truncated)" ! msgstr "...(afgekap)" ! #: os_mswin.c:594 msgid "'columns' is not 80, cannot execute external commands" *************** *** 4091,4102 **** ! #: os_mswin.c:676 #, c-format ! msgid "Library call failed for \"%s\"()" ! msgstr "Biblioteekroep het gefaal vir \"%s\"()" ! #: os_riscos.c:1213 ! msgid "Invalid 'filetype' option - using Text" ! msgstr "Ongeldige 'filetype' opsie - gaan Text gebruik" ! #: os_unix.c:737 os_vms.c:398 msgid "Vim: Double signal, exiting\n" --- 4457,4501 ---- ! #: os_mswin.c:706 os_unix.c:4945 ! #, c-format ! msgid "E364: Library call failed for \"%s()\"" ! msgstr "E364: Biblioteekroep het gefaal vir \"%s\"()" ! ! #: os_mswin.c:1340 ! msgid "E237: Printer selection failed" ! msgstr "E237: Drukker-seleksie het gefaal" ! ! #: os_mswin.c:1388 ! #, c-format ! msgid "to %s on %s" ! msgstr "na %s op %s" ! ! #: os_mswin.c:1449 os_mswin.c:1459 ! #, c-format ! msgid "E238: Print error: %s" ! msgstr "E238: Drukfout: %s" ! ! #: os_mswin.c:1460 ! msgid "Unknown" ! msgstr "Onbekend" ! ! #: os_mswin.c:1487 #, c-format ! msgid "Printing '%s'" ! msgstr "Druk nou '%s'" ! #: os_mswin.c:2551 ! #, c-format ! msgid "E244: Illegal charset name \"%s\" in font name \"%s\"" ! msgstr "E244: Ongeldige karakterstelnaam \"%s\" in fontnaam \"%s\"" ! ! #: os_mswin.c:2559 ! #, c-format ! msgid "E245: Illegal char '%c' in font name \"%s\"" ! msgstr "E245: Ongeldige karakter '%c' in fontnaam \"%s\"" ! ! #: os_riscos.c:1227 ! msgid "E366: Invalid 'osfiletype' option - using Text" ! msgstr "E366: Ongeldige 'osfiletype' opsie - gaan Text gebruik" ! #: os_unix.c:800 msgid "Vim: Double signal, exiting\n" *************** *** 4104,4121 **** ! # Gaan nie vertaal nie. ! # Die formaat is gewoonlik: "Caught Interrupt Exiting ! #: os_unix.c:743 os_vms.c:404 ! #, c-format ! msgid "Vim: Caught %s %s\n" ! msgstr "Vim: Het %s %s gevang\n" ! ! #: os_unix.c:745 os_unix.c:747 os_vms.c:406 os_vms.c:408 ! msgid "deadly signal" ! msgstr "dodelike sein" ! ! #: os_unix.c:747 os_vms.c:408 ! msgid "some" ! msgstr "sommige" ! #: os_unix.c:994 os_vms.c:620 msgid "" --- 4503,4519 ---- ! #: os_unix.c:806 ! #, c-format ! msgid "Vim: Caught deadly signal %s\n" ! msgstr "Vim: Het dodelike sein %s gevang\n" ! ! #: os_unix.c:809 ! msgid "Vim: Caught deadly signal\n" ! msgstr "Vim: Het dodelike sein gevang\n" ! ! #: os_unix.c:1063 ! #, c-format ! msgid "Opening the X display took %ld msec" ! msgstr "Om die X-vertoonskerm oop te maak het %ld msek gevat" ! #: os_unix.c:1090 msgid "" *************** *** 4127,4129 **** ! #: os_unix.c:2555 os_unix.c:3119 msgid "" --- 4525,4535 ---- ! #: os_unix.c:1157 ! msgid "Testing the X display failed" ! msgstr "Toetsing van die X-vertoonskerm het gefaal" ! ! #: os_unix.c:1301 ! msgid "Opening the X display timed out" ! msgstr "Oopmaak van die X-vertoonskerm het uitgetel" ! ! #: os_unix.c:2899 os_unix.c:3483 msgid "" *************** *** 4143,4145 **** ! #: os_unix.c:2720 msgid "" --- 4549,4559 ---- ! #: os_unix.c:2948 os_unix.c:3489 ! msgid "" ! "\n" ! "shell returned " ! msgstr "" ! "\n" ! "dop lewer " ! ! #: os_unix.c:3082 msgid "" *************** *** 4167,4184 **** ! #: os_unix.c:4529 ! msgid "Library call failed" ! msgstr "Biblioteekfunksieroep het gefaal" ! ! #: os_vms.c:476 ! msgid "" ! "\n" ! "Detach failed" ! msgstr "" ! "\n" ! "Losmaak het gefaal" ! ! #: os_vms.c:1098 ! #, c-format ! msgid "Error %d" ! msgstr "Fout %d" --- 4581,4585 ---- ! #: os_unix.c:4993 ! msgid "Opening the X display failed" ! msgstr "Oopmaak van die X vertoonskerm het gefaal" *************** *** 4188,4194 **** ! #: os_w32exe.c:166 msgid "Could not load vim32.dll!" ! msgstr "Kon nie vim32.dll laai nie!" ! #: os_w32exe.c:166 os_w32exe.c:176 msgid "VIM Error" --- 4589,4595 ---- ! #: os_w32exe.c:169 msgid "Could not load vim32.dll!" ! msgstr "Kon nie 'vim32.dll' laai nie!" ! #: os_w32exe.c:169 os_w32exe.c:179 msgid "VIM Error" *************** *** 4205,4207 **** ! #: os_win32.c:1300 msgid "" --- 4606,4629 ---- ! #: os_win32.c:2489 ! #, c-format ! msgid "Vim: Caught %s event\n" ! msgstr "Vim: Het %s gebeurtenis gevang\n" ! ! #: os_win32.c:2491 ! msgid "close" ! msgstr "maak toe" ! ! #: os_win32.c:2493 ! msgid "logoff" ! msgstr "teken uit" ! ! #: os_win32.c:2494 ! msgid "shutdown" ! msgstr "sit af" ! ! #: os_win32.c:2975 ! msgid "E371: Command not found" ! msgstr "E371: Bevel nie gevind nie" ! ! #: os_win32.c:2988 msgid "" *************** *** 4211,4217 **** msgstr "" ! "VIMRUN.EXE nie gevind in $PATH nie.\n" "Eksterne opdragte sal nie wag na voltooiing nie\n" ! "Sien :help win32-vimrun vir meer inligting." ! #: os_win32.c:1303 msgid "Vim Warning" --- 4633,4639 ---- msgstr "" ! "'VIMRUN.EXE' nie gevind in '$PATH' nie.\n" "Eksterne opdragte sal nie wag na voltooiing nie\n" ! "Sien ':help win32-vimrun' vir meer inligting." ! #: os_win32.c:2991 msgid "Vim Warning" *************** *** 4219,4274 **** ! #: os_win32.c:2269 #, c-format ! msgid "Vim: Caught %s event\n" ! msgstr "Vim: Het %s gebeurtenis gevang\n" ! #: os_win32.c:2271 ! msgid "close" ! msgstr "maak toe" ! #: os_win32.c:2273 ! msgid "logoff" ! msgstr "teken uit" ! #: os_win32.c:2274 ! msgid "shutdown" ! msgstr "sit af" ! #: os_win32.c:2737 ! msgid "Command not found" ! msgstr "Bevel nie gevind nie" ! ! #: quickfix.c:261 ! msgid "Too many %%%c in format string" ! msgstr "Te veel %%%c in formaatstring" ! ! #: quickfix.c:274 ! msgid "Unexpected %%%c in format string" ! msgstr "Onverwagte %%%c in formaatstring" ! ! #: quickfix.c:328 ! msgid "Missing ] in format string" ! msgstr "Ontbrekende ] in formaatstring" ! ! #: quickfix.c:342 ! msgid "Unsupported %%%c in format string" ! msgstr "Ongesteunde %%%c in formaatstring" ! ! #: quickfix.c:360 ! msgid "Invalid %%%c in format string prefix" ! msgstr "Ongeldige %%%c in formaatstringvoorvoegsel" ! ! #: quickfix.c:368 ! msgid "Invalid %%%c in format string" ! msgstr "Ongeldige %%%%c in formaatstring" ! ! #: quickfix.c:394 ! msgid "'errorformat' contains no pattern" ! msgstr "'errorformat' bevat geen patroon nie" ! ! #: quickfix.c:494 ! msgid "Missing or empty directory name" ! msgstr "Ontbrekende of leë gidsnaam" ! #: quickfix.c:894 msgid "No more items" --- 4641,4680 ---- ! #: quickfix.c:281 #, c-format ! msgid "E372: Too many %%%c in format string" ! msgstr "E372: Te veel %%%c in formaatstring" ! #: quickfix.c:294 ! #, c-format ! msgid "E373: Unexpected %%%c in format string" ! msgstr "E373: Onverwagte %%%c in formaatstring" ! #: quickfix.c:348 ! msgid "E374: Missing ] in format string" ! msgstr "E374: Ontbrekende ] in formaatstring" ! #: quickfix.c:362 ! #, c-format ! msgid "E375: Unsupported %%%c in format string" ! msgstr "E375: Ongesteunde %%%c in formaatstring" ! ! #: quickfix.c:380 ! #, c-format ! msgid "E376: Invalid %%%c in format string prefix" ! msgstr "E376: Ongeldige %%%c in formaatstringvoorvoegsel" ! ! #: quickfix.c:388 ! #, c-format ! msgid "E377: Invalid %%%c in format string" ! msgstr "E377: Ongeldige %%%c in formaatstring" ! ! #: quickfix.c:414 ! msgid "E378: 'errorformat' contains no pattern" ! msgstr "E378: 'errorformat' bevat geen patroon nie" ! #: quickfix.c:520 ! msgid "E379: Missing or empty directory name" ! msgstr "E379: Ontbrekende of leë gidsnaam" ! #: quickfix.c:931 msgid "No more items" *************** *** 4285,4295 **** ! #: quickfix.c:1335 ! msgid "At bottom of quickfix stack" ! msgstr "Onder aan 'quickfix' stapel" ! ! #: quickfix.c:1344 ! msgid "At top of quickfix stack" ! msgstr "Bo aan 'quickfix' stapel" ! #: quickfix.c:1356 #, c-format --- 4691,4701 ---- ! #: quickfix.c:1360 ! msgid "E380: At bottom of quickfix stack" ! msgstr "E380: Onder aan 'quickfix' stapel" ! ! #: quickfix.c:1369 ! msgid "E381: At top of quickfix stack" ! msgstr "E381: Bo aan 'quickfix' stapel" ! #: quickfix.c:1381 #, c-format *************** *** 4298,4319 **** ! #: quickfix.c:1703 ! msgid "Cannot write, 'buftype' option is set" ! msgstr "Kan nie skryf nie, 'buftype' opsie is aan" ! #: regexp.c:1363 #, c-format ! msgid "Nested %s*" ! msgstr "Geneste %s*" ! #: regexp.c:1366 #, c-format ! msgid "Nested %s%c" ! msgstr "Geneste %s%c" ! #: regexp.c:1515 #, c-format ! msgid "%s%c follows nothing" ! msgstr "%s%c volg niks" ! #: regexp.c:2433 #, c-format --- 4704,4729 ---- ! #: quickfix.c:1842 ! msgid "E382: Cannot write, 'buftype' option is set" ! msgstr "E382: Kan nie skryf nie, 'buftype' opsie is aan" ! #: regexp.c:801 ! msgid "E339: Pattern too long" ! msgstr "E339: Patroon te lank" ! ! #: regexp.c:1315 #, c-format ! msgid "E61: Nested %s*" ! msgstr "E61: Geneste %s*" ! #: regexp.c:1318 #, c-format ! msgid "E62: Nested %s%c" ! msgstr "E62: Geneste %s%c" ! #: regexp.c:1467 #, c-format ! msgid "E64: %s%c follows nothing" ! msgstr "E64: %s%c volg niks" ! #: regexp.c:2469 #, c-format *************** *** 4322,4332 **** ! #: regexp.c:2678 ! msgid "Crash intercepted; regexp too complex?" ! msgstr "Ineenstorting onderskep. Patroon te kompleks?" ! ! #: regexp.c:2812 ! msgid "pattern caused out-of-stack error" ! msgstr "patroon het lëe-stapel fout veroorsaak" ! #: regexp.c:3059 msgid "External submatches:\n" --- 4732,4742 ---- ! #: regexp.c:2716 ! msgid "E361: Crash intercepted; regexp too complex?" ! msgstr "E361: Ineenstorting onderskep. Patroon te kompleks?" ! ! #: regexp.c:2851 ! msgid "E363: pattern caused out-of-stack error" ! msgstr "E363: patroon het lëe-stapel fout veroorsaak" ! #: regexp.c:3087 msgid "External submatches:\n" *************** *** 4334,4336 **** ! #: screen.c:6515 msgid " VREPLACE" --- 4744,4751 ---- ! #: screen.c:2054 ! #, c-format ! msgid "+--%3ld lines folded " ! msgstr "+--%3ld reëls gevou " ! ! #: screen.c:7426 msgid " VREPLACE" *************** *** 4366,4368 **** ! #: screen.c:6541 msgid " (paste)" --- 4781,4787 ---- ! #: screen.c:7455 ! msgid " (lang)" ! msgstr " (taal)" ! ! #: screen.c:7458 msgid " (paste)" *************** *** 4392,4394 **** msgid "search hit TOP, continuing at BOTTOM" ! msgstr "soek het BO getref, gaan voort van ONDER af" --- 4811,4813 ---- msgid "search hit TOP, continuing at BOTTOM" ! msgstr "soektog het BO getref, gaan voort van ONDER af" *************** *** 4396,4419 **** msgid "search hit BOTTOM, continuing at TOP" ! msgstr "soek het ONDER getref, gaan voort van BO af" ! #: search.c:433 #, c-format ! msgid "Invalid search string: %s" ! msgstr "Ongeldige soekstring: %s" ! #: search.c:738 #, c-format ! msgid "search hit TOP without match for: %s" ! msgstr "soek het BO getref sonder treffer vir: %s" ! #: search.c:740 #, c-format ! msgid "search hit BOTTOM without match for: %s" ! msgstr "soek het ONDER getref sonder treffer vir: %s" ! #: search.c:1098 ! msgid "Expected '?' or '/' after ';'" ! msgstr "Verwag '?' of '/' na ';'" ! #: search.c:3445 msgid " (includes previously listed match)" --- 4815,4838 ---- msgid "search hit BOTTOM, continuing at TOP" ! msgstr "soektog het ONDER getref, gaan voort van BO af" ! #: search.c:440 #, c-format ! msgid "E383: Invalid search string: %s" ! msgstr "E383: Ongeldige soekstring: %s" ! #: search.c:747 #, c-format ! msgid "E384: search hit TOP without match for: %s" ! msgstr "E384: soektog het BO getref sonder treffer vir: %s" ! #: search.c:749 #, c-format ! msgid "E385: search hit BOTTOM without match for: %s" ! msgstr "E385: soektog het ONDER getref sonder treffer vir: %s" ! #: search.c:1107 ! msgid "E386: Expected '?' or '/' after ';'" ! msgstr "E386: Verwag '?' of '/' na ';'" ! #: search.c:3476 msgid " (includes previously listed match)" *************** *** 4447,4453 **** ! #: search.c:3784 ! msgid "Match is on current line" ! msgstr "Treffer is op huidige reël" ! #: search.c:3924 msgid "All included files were found" --- 4866,4872 ---- ! #: search.c:3810 ! msgid "E387: Match is on current line" ! msgstr "E387: Treffer is op huidige reël" ! #: search.c:3950 msgid "All included files were found" *************** *** 4459,4483 **** ! #: search.c:3942 ! msgid "Couldn't find definition" ! msgstr "Kon definisie nie vind nie" ! #: search.c:3944 ! msgid "Couldn't find pattern" ! msgstr "Kon patroon nie vind nie" ! #: syntax.c:3100 syntax.c:3316 #, c-format ! msgid "No such syntax cluster: %s" ! msgstr "Geen sodanige sintakskluster nie: %s" ! #: syntax.c:3121 syntax.c:3324 #, c-format ! msgid "E28: No such highlight group name: %s" ! msgstr "E28: Geen sodanige uitliggroepnaam nie: %s" ! #: syntax.c:3260 msgid "No Syntax items defined for this buffer" ! msgstr "Geen Sintaks items gedefinieer vir hierdie buffer nie" ! #: syntax.c:3268 msgid "syncing on C-style comments" --- 4878,4902 ---- ! #: search.c:3968 ! msgid "E388: Couldn't find definition" ! msgstr "E388: Kon definisie nie vind nie" ! #: search.c:3970 ! msgid "E389: Couldn't find pattern" ! msgstr "E389: Kon patroon nie vind nie" ! #: syntax.c:2991 #, c-format ! msgid "E390: Illegal argument: %s" ! msgstr "E390: Ongeldige parameter: %s" ! #: syntax.c:3168 #, c-format ! msgid "E391: No such syntax cluster: %s" ! msgstr "E391: Geen sodanige sintakskluster nie: %s" ! #: syntax.c:3332 msgid "No Syntax items defined for this buffer" ! msgstr "Geen Sintaks-items gedefinieer vir hierdie buffer nie" ! #: syntax.c:3340 msgid "syncing on C-style comments" *************** *** 4521,4523 **** ! #: syntax.c:3340 msgid "minimal " --- 4940,4947 ---- ! #: syntax.c:3388 ! #, c-format ! msgid "E392: No such syntax cluster: %s" ! msgstr "E392: Geen sodanige sintakskluster nie: %s" ! ! #: syntax.c:3412 msgid "minimal " *************** *** 4529,4679 **** ! #: syntax.c:3964 ! msgid "group[t]here not accepted here" ! msgstr "'group[t]here' nie hier aanvaar nie" ! #: syntax.c:3988 #, c-format ! msgid "Didn't find region item for %s" ! msgstr "Kon nie omgewingsitem vind vir %s nie" ! #: syntax.c:4016 ! msgid "contains argument not accepted here" ! msgstr "bevat parameters nie hier aanvaar nie" ! #: syntax.c:4027 ! msgid "containedin argument not accepted here" ! msgstr "'containedin' parameter nie hier aanvaar nie" ! #: syntax.c:4104 ! msgid "Filename required" ! msgstr "Lęernaam benodig" ! #: syntax.c:4419 #, c-format ! msgid "Missing '=': %s" ! msgstr "Ontbrekende '=': %s" ! #: syntax.c:4575 #, c-format ! msgid "Not enough arguments: syntax region %s" ! msgstr "Nie genoeg parameters nie: sintaksomgewing %s" ! #: syntax.c:4906 ! msgid "No cluster specified" ! msgstr "Geen kluster gespesifiseer nie" ! #: syntax.c:4943 #, c-format ! msgid "Pattern delimiter not found: %s" ! msgstr "Patroonbegrenser nie gevind nie: %s" ! #: syntax.c:5018 #, c-format ! msgid "Garbage after pattern: %s" ! msgstr "Gemors na patroon: %s" ! #: syntax.c:5100 ! msgid "syntax sync: line continuations pattern specified twice" ! msgstr "sintaks sync: reëlvoortgaanpatroon twee keer gespesifiseer" ! #: syntax.c:5157 #, c-format ! msgid "Illegal arguments: %s" ! msgstr "Ongeldige parameters: %s" ! #: syntax.c:5207 #, c-format ! msgid "Missing equal sign: %s" ! msgstr "Ontbrekende gelykaanteken: %s" ! #: syntax.c:5213 #, c-format ! msgid "Empty argument: %s" ! msgstr "Leë parameter: %s" ! #: syntax.c:5240 #, c-format ! msgid "%s not allowed here" ! msgstr "%s nie toegelaat hier nie" ! #: syntax.c:5247 #, c-format ! msgid "%s must be first in contains list" ! msgstr "%s moet vóór in 'contains' lys wees" ! #: syntax.c:5317 #, c-format ! msgid "Unknown group name: %s" ! msgstr "Onbekende groepnaam: %s" ! #: syntax.c:5530 #, c-format ! msgid "Invalid :syntax subcommand: %s" ! msgstr "Ongeldige :syntax subbevel %s" ! #: syntax.c:5843 #, c-format ! msgid "highlight group not found: %s" ! msgstr "uitliggroep nie gevind nie: %s" ! #: syntax.c:5867 #, c-format ! msgid "Not enough arguments: \":highlight link %s\"" ! msgstr "Te min parameters: \":highlight link %s\"" ! #: syntax.c:5874 #, c-format ! msgid "Too many arguments: \":highlight link %s\"" ! msgstr "Te veel parameters: \":highlight link %s\"" ! #: syntax.c:5894 ! msgid "group has settings, highlight link ignored" ! msgstr "groep het instellings, uitligskakel ('highlight link') geďgnoreer" ! ! #: syntax.c:5916 ! msgid "Cannot clear all highlight groups" ! msgstr "Kan nie alle uitliggroepe leegmaak nie" ! #: syntax.c:5952 #, c-format ! msgid "unexpected equal sign: %s" ! msgstr "onverwagte gelykaanteken: %s" ! #: syntax.c:5988 #, c-format ! msgid "missing equal sign: %s" ! msgstr "ontbrekende gelykaanteken: %s" ! #: syntax.c:6010 #, c-format ! msgid "missing argument: %s" ! msgstr "ontbrekende parameter: %s" ! #: syntax.c:6047 #, c-format ! msgid "Illegal value: %s" ! msgstr "Ongeldige waarde: %s" ! #: syntax.c:6124 ! msgid "FG color unknown" ! msgstr "FG kleur onbekend" ! #: syntax.c:6135 ! msgid "BG color unknown" ! msgstr "BG kleur onbekend" ! #: syntax.c:6185 #, c-format ! msgid "Color name or number not recognized: %s" ! msgstr "Kleurnaam of -nommer nie herken nie: %s" ! #: syntax.c:6363 #, c-format ! msgid "terminal code too long: %s" ! msgstr "terminaalkode te lank: %s" ! #: syntax.c:6895 ! msgid "Too many different highlighting attributes in use" ! msgstr "Te veel verskillende uitlig eienskappe in gebruik" #: tag.c:90 --- 4953,5106 ---- ! #: syntax.c:4047 ! msgid "E393: group[t]here not accepted here" ! msgstr "E393: 'group[t]here' nie hier aanvaar nie" ! #: syntax.c:4071 #, c-format ! msgid "E394: Didn't find region item for %s" ! msgstr "E394: Kon nie omgewingsitem vind vir %s nie" ! #: syntax.c:4099 ! msgid "E395: contains argument not accepted here" ! msgstr "E395: bevat parameters nie hier aanvaar nie" ! #: syntax.c:4110 ! msgid "E396: containedin argument not accepted here" ! msgstr "E396: 'containedin' parameter nie hier aanvaar nie" ! #: syntax.c:4188 ! msgid "E397: Filename required" ! msgstr "E397: Lęernaam benodig" ! #: syntax.c:4524 #, c-format ! msgid "E398: Missing '=': %s" ! msgstr "E398: Ontbrekende '=': %s" ! #: syntax.c:4680 #, c-format ! msgid "E399: Not enough arguments: syntax region %s" ! msgstr "E399: Nie genoeg parameters nie: sintaksomgewing %s" ! #: syntax.c:5011 ! msgid "E400: No cluster specified" ! msgstr "E400: Geen kluster gespesifiseer nie" ! #: syntax.c:5048 #, c-format ! msgid "E401: Pattern delimiter not found: %s" ! msgstr "E401: Patroonbegrenser nie gevind nie: %s" ! #: syntax.c:5123 #, c-format ! msgid "E402: Garbage after pattern: %s" ! msgstr "E402: Gemors na patroon: %s" ! #: syntax.c:5205 ! msgid "E403: syntax sync: line continuations pattern specified twice" ! msgstr "E403: sintaks sync: reëlvoortgaanpatroon twee keer gespesifiseer" ! #: syntax.c:5262 #, c-format ! msgid "E404: Illegal arguments: %s" ! msgstr "E404: Ongeldige parameters: %s" ! #: syntax.c:5312 #, c-format ! msgid "E405: Missing equal sign: %s" ! msgstr "E405: Ontbrekende gelykaanteken: %s" ! #: syntax.c:5318 #, c-format ! msgid "E406: Empty argument: %s" ! msgstr "E406: Leë parameter: %s" ! #: syntax.c:5345 #, c-format ! msgid "E407: %s not allowed here" ! msgstr "E407: %s nie toegelaat hier nie" ! #: syntax.c:5352 #, c-format ! msgid "E408: %s must be first in contains list" ! msgstr "E408: %s moet vóór in 'contains' lys wees" ! #: syntax.c:5422 #, c-format ! msgid "E409: Unknown group name: %s" ! msgstr "E409: Onbekende groepnaam: %s" ! #: syntax.c:5645 #, c-format ! msgid "E410: Invalid :syntax subcommand: %s" ! msgstr "E410: Ongeldige :syntax subbevel %s" ! #: syntax.c:6024 #, c-format ! msgid "E411: highlight group not found: %s" ! msgstr "E411: uitliggroep nie gevind nie: %s" ! #: syntax.c:6048 #, c-format ! msgid "E412: Not enough arguments: \":highlight link %s\"" ! msgstr "E412: Te min parameters: \":highlight link %s\"" ! #: syntax.c:6055 #, c-format ! msgid "E413: Too many arguments: \":highlight link %s\"" ! msgstr "E413: Te veel parameters: \":highlight link %s\"" ! #: syntax.c:6075 ! msgid "E414: group has settings, highlight link ignored" ! msgstr "" ! "E414: groep het instellings, uitligskakel ('highlight link') geďgnoreer" ! #: syntax.c:6204 #, c-format ! msgid "E415: unexpected equal sign: %s" ! msgstr "E415: onverwagte gelykaanteken: %s" ! #: syntax.c:6240 #, c-format ! msgid "E416: missing equal sign: %s" ! msgstr "E416: ontbrekende gelykaanteken: %s" ! #: syntax.c:6262 #, c-format ! msgid "E417: missing argument: %s" ! msgstr "E417: ontbrekende parameter: %s" ! #: syntax.c:6299 #, c-format ! msgid "E418: Illegal value: %s" ! msgstr "E418: Ongeldige waarde: %s" ! #: syntax.c:6418 ! msgid "E419: FG color unknown" ! msgstr "E419: FG kleur onbekend" ! #: syntax.c:6429 ! msgid "E420: BG color unknown" ! msgstr "E420: BG kleur onbekend" ! #: syntax.c:6484 #, c-format ! msgid "E421: Color name or number not recognized: %s" ! msgstr "E421: Kleurnaam of -nommer nie herken nie: %s" ! #: syntax.c:6688 #, c-format ! msgid "E422: terminal code too long: %s" ! msgstr "E422: terminaalkode te lank: %s" ! #: syntax.c:6735 ! #, c-format ! msgid "E423: Illegal argument: %s" ! msgstr "E423: Ongeldige parameter: %s" ! ! #: syntax.c:7264 ! msgid "E424: Too many different highlighting attributes in use" ! msgstr "E424: Te veel verskillende uitlig-eienskappe in gebruik" + # njj: 'inkleur' vir 'uitlig'? net 'n idee .. #: tag.c:90 *************** *** 4686,4697 **** ! #: tag.c:389 ! msgid "Cannot go before first matching tag" ! msgstr "Kan nie vóór eerste etiket-treffer gaan nie" ! #: tag.c:509 #, c-format ! msgid "tag not found: %s" ! msgstr "etiket nie gevind nie: %s" ! #: tag.c:541 msgid " # pri kind tag" --- 5113,5124 ---- ! #: tag.c:392 ! msgid "E425: Cannot go before first matching tag" ! msgstr "E425: Kan nie vóór eerste etiket-treffer gaan nie" ! #: tag.c:512 #, c-format ! msgid "E426: tag not found: %s" ! msgstr "E426: etiket nie gevind nie: %s" ! #: tag.c:545 msgid " # pri kind tag" *************** *** 4705,4708 **** #. * Ask to select a tag from the list. #. ! #: tag.c:701 msgid "Enter nr of choice ( to abort): " --- 5132,5136 ---- #. * Ask to select a tag from the list. + #. * When using ":silent" assume that was entered. #. ! #: tag.c:706 msgid "Enter nr of choice ( to abort): " *************** *** 4710,4720 **** ! #: tag.c:741 ! msgid "There is only one matching tag" ! msgstr "Daar is slegs een etiket-treffer" ! ! #: tag.c:743 ! msgid "Cannot go beyond last matching tag" ! msgstr "Kan nie verby laaste etiket-treffer gaan nie" ! #: tag.c:763 tag.c:823 #, c-format --- 5138,5148 ---- ! #: tag.c:746 ! msgid "E427: There is only one matching tag" ! msgstr "E427: Daar is slegs een etiket-treffer" ! ! #: tag.c:748 ! msgid "E428: Cannot go beyond last matching tag" ! msgstr "E428: Kan nie verby laaste etiket-treffer gaan nie" ! #: tag.c:768 #, c-format *************** *** 4737,4740 **** #. Highlight title ! #: tag.c:892 msgid "" --- 5165,5173 ---- + #: tag.c:828 + #, c-format + msgid "E429: File \"%s\" does not exist" + msgstr "E429: Lęer \"%s\" bestaan nie" + #. Highlight title ! #: tag.c:897 msgid "" *************** *** 4759,4771 **** ! #: tag.c:1343 #, c-format ! msgid "Tag file path truncated for %s\n" ! msgstr "Etiketlęergids afgekap vir %s\n" ! #: tag.c:1834 #, c-format ! msgid "Format error in tags file \"%s\"" ! msgstr "Formaatfout in etiketlęer \"%s\"" ! #: tag.c:1838 #, c-format --- 5192,5204 ---- ! #: tag.c:1356 #, c-format ! msgid "E430: Tag file path truncated for %s\n" ! msgstr "E430: Etiketlęergids afgekap vir %s\n" ! #: tag.c:1847 #, c-format ! msgid "E431: Format error in tags file \"%s\"" ! msgstr "E431: Formaatfout in etiketlęer \"%s\"" ! #: tag.c:1851 #, c-format *************** *** 4774,4794 **** ! #: tag.c:1859 #, c-format ! msgid "Tags file not sorted: %s" ! msgstr "Etiketlęer ongesorteer: %s" #. never opened any tags file ! #: tag.c:1898 ! msgid "No tags file" ! msgstr "Geen etiketlęer nie" ! ! #: tag.c:2565 ! msgid "Can't find tag pattern" ! msgstr "Kan nie etiketpatroon vind nie" ! ! #: tag.c:2576 ! msgid "Couldn't find tag, just guessing!" ! msgstr "Kon nie etiket vind nie, ek raai maar!" ! #: term.c:1690 msgid "' not known. Available builtin terminals are:" --- 5207,5227 ---- ! #: tag.c:1872 #, c-format ! msgid "E432: Tags file not sorted: %s" ! msgstr "E432: Etiketlęer ongesorteer: %s" #. never opened any tags file ! #: tag.c:1911 ! msgid "E433: No tags file" ! msgstr "E433: Geen etiketlęer nie" ! ! #: tag.c:2583 ! msgid "E434: Can't find tag pattern" ! msgstr "E434: Kan nie etiketpatroon vind nie" ! ! #: tag.c:2594 ! msgid "E435: Couldn't find tag, just guessing!" ! msgstr "E435: Kon nie etiket vind nie, ek raai maar!" ! #: term.c:1723 msgid "' not known. Available builtin terminals are:" *************** *** 4812,4824 **** ! #: term.c:2205 #, c-format ! msgid "No \"%s\" entry in termcap" ! msgstr "Geen \"%s\" inskrywing in termcap nie" ! #: term.c:2664 ! msgid "terminal capability \"cm\" required" ! msgstr "terminaalvermoë \"cm\" vereis" #. Highlight title ! #: term.c:4700 msgid "" --- 5245,5257 ---- ! #: term.c:2264 #, c-format ! msgid "E436: No \"%s\" entry in termcap" ! msgstr "E436: Geen \"%s\" inskrywing in termcap nie" ! #: term.c:2738 ! msgid "E437: terminal capability \"cm\" required" ! msgstr "E437: terminaalvermoë \"cm\" vereis" #. Highlight title ! #: term.c:4878 msgid "" *************** *** 4838,4840 **** ! #: undo.c:333 msgid "No undo possible; continue anyway" --- 5271,5274 ---- ! #. must display the prompt ! #: undo.c:351 msgid "No undo possible; continue anyway" *************** *** 4842,4848 **** ! #: undo.c:487 ! msgid "u_undo: line numbers wrong" ! msgstr "u_undo: reëlnommers foutief" ! #: undo.c:645 msgid "1 change" --- 5276,5282 ---- ! #: undo.c:506 ! msgid "E438: u_undo: line numbers wrong" ! msgstr "E438: u_undo: reëlnommers foutief" ! #: undo.c:675 msgid "1 change" *************** *** 4855,4865 **** ! #: undo.c:687 ! msgid "undo list corrupt" ! msgstr "herstellys korrup" ! ! #: undo.c:717 ! msgid "undo line missing" ! msgstr "herstelreël ontbreek" ! #: version.c:584 msgid "" --- 5289,5300 ---- ! #: undo.c:721 ! msgid "E439: undo list corrupt" ! msgstr "E439: herstellys korrup" ! ! #: undo.c:751 ! msgid "E440: undo line missing" ! msgstr "E440: herstelreël ontbreek" ! #. Only MS VC 4.1 and earlier can do Win32s ! #: version.c:655 msgid "" *************** *** 4869,4873 **** "\n" ! "MS-Windows 16/32 bis GUI weergawe" ! #: version.c:586 msgid "" --- 5304,5308 ---- "\n" ! "MS-Windows 16/32-bis GUI weergawe" ! #: version.c:657 msgid "" *************** *** 4877,4881 **** "\n" ! "MS-Windows 32 bis GUI version" ! #: version.c:589 msgid " in Win32s mode" --- 5312,5316 ---- "\n" ! "MS-Windows 32-bis GUI version" ! #: version.c:660 msgid " in Win32s mode" *************** *** 4893,4897 **** "\n" ! "MS-Windows 32 bis konsole weergawe" ! #: version.c:598 msgid "" --- 5328,5332 ---- "\n" ! "MS-Windows 32-bis konsole weergawe" ! #: version.c:669 msgid "" *************** *** 4901,4905 **** "\n" ! "MS-Windows 16 bis weergawe" ! #: version.c:602 msgid "" --- 5336,5340 ---- "\n" ! "MS-Windows 16-bis weergawe" ! #: version.c:673 msgid "" *************** *** 4909,4913 **** "\n" ! "32 bis MS-DOS weergawe" ! #: version.c:604 msgid "" --- 5344,5348 ---- "\n" ! "32-bis MS-DOS weergawe" ! #: version.c:675 msgid "" *************** *** 4917,4921 **** "\n" ! "16 bis MS-DOS weergawe" ! #: version.c:608 msgid "" --- 5352,5372 ---- "\n" ! "16-bis MS-DOS weergawe" ! ! #: version.c:681 ! msgid "" ! "\n" ! "MacOS X (unix) version" ! msgstr "" ! "\n" ! "MacOS X (unix) weergawe" ! ! #: version.c:683 ! msgid "" ! "\n" ! "MacOS X version" ! msgstr "" ! "\n" ! "MacOS X weergawe" ! #: version.c:686 msgid "" *************** *** 5019,5021 **** ! #: version.c:699 msgid "with GUI." --- 5470,5476 ---- ! #: version.c:779 ! msgid "with Photon GUI." ! msgstr "met Photon GUI." ! ! #: version.c:782 msgid "with GUI." *************** *** 5023,5025 **** ! #: version.c:706 msgid " Features included (+) or not (-):\n" --- 5478,5492 ---- ! #: version.c:785 ! msgid "with Carbon GUI." ! msgstr "met Carbon GUI." ! ! #: version.c:788 ! msgid "with Cocoa GUI." ! msgstr "met Cocoa GUI." ! ! #: version.c:791 ! msgid "with (classic) GUI." ! msgstr "met (klassieke) GUI." ! ! #: version.c:802 msgid " Features included (+) or not (-):\n" *************** *** 5099,5101 **** ! #: version.c:839 msgid "version " --- 5566,5569 ---- ! # njj: :)) ! #: version.c:936 msgid "version " *************** *** 5151,5169 **** ! #: window.c:189 ! msgid "There is no preview window" ! msgstr "Daar is nie 'n voorskou venster nie" ! ! #: window.c:555 ! msgid "Can't split topleft and botright at the same time" ! msgstr "Kan nie bo-links en onder-regs terselfdertyd verdeel nie" ! ! #: window.c:1222 ! msgid "Cannot rotate when another window is split" ! msgstr "Kan nie roteer terwyl 'n ander venster verdeel is nie" ! ! #: window.c:1659 ! msgid "Cannot close last window" ! msgstr "Kan nie laaste venster toemaak nie" ! #: window.c:2239 msgid "Already only one window" --- 5619,5637 ---- ! #: window.c:201 ! msgid "E441: There is no preview window" ! msgstr "E441: Daar is nie 'n voorskou-venster nie" ! ! #: window.c:568 ! msgid "E442: Can't split topleft and botright at the same time" ! msgstr "E442: Kan nie bo-links en onder-regs terselfdertyd verdeel nie" ! ! #: window.c:1327 ! msgid "E443: Cannot rotate when another window is split" ! msgstr "E443: Kan nie roteer terwyl 'n ander venster verdeel is nie" ! ! #: window.c:1810 ! msgid "E444: Cannot close last window" ! msgstr "E444: Kan nie laaste venster toemaak nie" ! #: window.c:2474 msgid "Already only one window" *************** *** 5171,5181 **** ! #: window.c:2269 ! msgid "Other window contains changes" ! msgstr "Die ander venster bevat veranderinge" ! ! #: window.c:4032 ! msgid "No file name under cursor" ! msgstr "Geen lęernaam onder loper" ! #: globals.h:842 msgid "--No lines in buffer--" --- 5639,5688 ---- ! #: window.c:2521 ! msgid "E445: Other window contains changes" ! msgstr "E445: Die ander venster bevat veranderinge" ! ! #: window.c:4341 ! msgid "E446: No file name under cursor" ! msgstr "E446: Geen lęernaam onder loper" ! ! #: window.c:4460 ! #, c-format ! msgid "E447: Can't find file \"%s\" in path" ! msgstr "E447: Kan lęer \"%s\" nie vind in pad nie" ! ! #: ../GvimExt/gvimext.cpp:586 ! msgid "Edit with &multiple Vims" ! msgstr "Wysig met &meer as een Vim" ! ! #: ../GvimExt/gvimext.cpp:592 ! msgid "Edit with single &Vim" ! msgstr "Wysig met 'n enkel &Vim" ! ! #: ../GvimExt/gvimext.cpp:604 ! msgid "Edit with &Vim" ! msgstr "Wysig met &Vim" ! ! #. Now concatenate ! #: ../GvimExt/gvimext.cpp:628 ! msgid "Edit with existing Vim - &" ! msgstr "Wysig met bestaande Vim - &" ! ! #: ../GvimExt/gvimext.cpp:752 ! msgid "Edits the selected file(s) with Vim" ! msgstr "Wysig die gekose lęer(s) met Vim" ! ! #: ../GvimExt/gvimext.cpp:891 ../GvimExt/gvimext.cpp:969 ! msgid "Error creating process: Check if gvim is in your path!" ! msgstr "FOut met die skep van proses: Kyk of gvim in jou pad is!" ! ! #: ../GvimExt/gvimext.cpp:892 ../GvimExt/gvimext.cpp:906 ! #: ../GvimExt/gvimext.cpp:970 ! msgid "gvimext.dll error" ! msgstr "'gvimext.dll' fout" ! ! #: ../GvimExt/gvimext.cpp:905 ! msgid "Path length too long!" ! msgstr "Pad-lengte te lank" ! #: globals.h:878 msgid "--No lines in buffer--" *************** *** 5203,5210 **** ! #: globals.h:914 msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search" ! msgstr "E12: " ! "Bevel uit exrc/vimrc nie toegelaat in huidige gids- of etiketsoektog nie" ! #: globals.h:915 msgid "E13: File exists (use ! to override)" --- 5710,5717 ---- ! #: globals.h:1025 msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search" ! msgstr "" ! "E12: Bevel uit exrc/vimrc nie toegelaat in huidige gids- of etiketsoektog nie" ! #: globals.h:1026 msgid "E13: File exists (use ! to override)" *************** *** 5250,5252 **** ! #: globals.h:928 msgid "E18: Unexpected characters before '='" --- 5757,5764 ---- ! #: globals.h:1039 ! #, c-format ! msgid "E17: \"%s\" is a directory" ! msgstr "E17: \"%s\" is 'n gids" ! ! #: globals.h:1042 msgid "E18: Unexpected characters before '='" *************** *** 5266,5272 **** ! #: globals.h:934 ! msgid "GUI is not running" ! msgstr "GUI voer nie uit nie" ! ! #: globals.h:936 msgid "E22: Scripts nested too deep" --- 5778,5780 ---- ! #: globals.h:1047 msgid "E22: Scripts nested too deep" *************** *** 5278,5284 **** ! #: globals.h:938 ! msgid "E12: No such abbreviation" ! msgstr "E12: Afkorting bestaan nie" ! #: globals.h:939 msgid "No ! allowed" --- 5786,5792 ---- ! #: globals.h:1049 ! msgid "E24: No such abbreviation" ! msgstr "E24: Afkorting bestaan nie" ! #: globals.h:1050 msgid "No ! allowed" *************** *** 5290,5300 **** ! #: globals.h:944 msgid "E26: Hebrew cannot be used: Not enabled at compile time\n" ! msgstr "E26: Hebreeus kan nie gebruik word nie: Nie tydens kompilering gekies nie\n" ! #: globals.h:947 msgid "E27: Farsi cannot be used: Not enabled at compile time\n" ! msgstr "E27: Farsi kan nie gebruik word nie: Nie tydens kompilering gekies nie\n" ! #: globals.h:949 msgid "E29: No inserted text yet" --- 5798,5815 ---- ! #: globals.h:1055 msgid "E26: Hebrew cannot be used: Not enabled at compile time\n" ! msgstr "" ! "E26: Hebreeus kan nie gebruik word nie: Nie tydens kompilering gekies nie\n" ! #: globals.h:1058 msgid "E27: Farsi cannot be used: Not enabled at compile time\n" ! msgstr "" ! "E27: Farsi kan nie gebruik word nie: Nie tydens kompilering gekies nie\n" ! ! #: globals.h:1061 ! #, c-format ! msgid "E28: No such highlight group name: %s" ! msgstr "E28: Geen sodanige uitliggroepnaam nie: %s" ! #: globals.h:1063 msgid "E29: No inserted text yet" *************** *** 5319,5321 **** ! #: globals.h:955 msgid "E33: No previous substitute regular expression" --- 5834,5840 ---- ! #: globals.h:1068 ! msgid "E32: No file name" ! msgstr "E32: Geen lęernaam" ! ! #: globals.h:1069 msgid "E33: No previous substitute regular expression" *************** *** 5366,5372 **** ! #: globals.h:969 ! msgid "E104: Number expected" ! msgstr "E104: Nommer verwag" ! #: globals.h:972 #, c-format --- 5885,5893 ---- ! # njj: hmm, hoe hanteer mens die onderskeid tussen 'Null' (afwesig) en ! # njj: 'Zero' (die nommer)? ! #: globals.h:1083 ! msgid "E39: Number expected" ! msgstr "E39: Nommer verwag" ! #: globals.h:1086 #, c-format *************** *** 5375,5377 **** ! #: globals.h:976 msgid "Pattern not found" --- 5896,5902 ---- ! #: globals.h:1089 ! msgid "E41: Out of memory!" ! msgstr "E41: Geheue op!" ! ! #: globals.h:1092 msgid "Pattern not found" *************** *** 5396,5402 **** ! #: globals.h:984 ! msgid "E43: Corrupted regexp program" ! msgstr "E43: Korrupte patroonprogram" ! #: globals.h:985 msgid "E45: 'readonly' option is set (use ! to override)" --- 5921,5927 ---- ! #: globals.h:1100 ! msgid "E44: Corrupted regexp program" ! msgstr "E44: Korrupte patroonprogram" ! #: globals.h:1101 msgid "E45: 'readonly' option is set (use ! to override)" *************** *** 5421,5427 **** ! #: globals.h:996 ! msgid "E71: 'shell' option is empty" ! msgstr "E71: 'shell' (dop) opsie is leeg" ! #: globals.h:997 msgid "E73: tag stack empty" --- 5946,5956 ---- ! #: globals.h:1112 ! msgid "E91: 'shell' option is empty" ! msgstr "E91: 'shell' (dop) opsie is leeg" ! ! #: globals.h:1113 ! msgid "E72: Close error on swap file" ! msgstr "E72: Sluitfout met ruillęer" ! #: globals.h:1114 msgid "E73: tag stack empty" *************** *** 5441,5447 **** ! #: globals.h:1002 ! msgid "Command too long" ! msgstr "Bevel te lank" ! ! #: globals.h:1004 msgid "E77: Too many file names" --- 5970,5972 ---- ! #: globals.h:1118 msgid "E77: Too many file names" *************** *** 5449,5451 **** ! #: globals.h:1006 msgid "E78: Unknown mark" --- 5974,5980 ---- ! #: globals.h:1119 ! msgid "Trailing characters" ! msgstr "Oorbodige karakters" ! ! #: globals.h:1120 msgid "E78: Unknown mark" *************** *** 5453,5459 **** ! #: globals.h:1007 ! msgid "Unknown" ! msgstr "Onbekend" ! ! #: globals.h:1008 msgid "E79: Cannot expand wildcards" --- 5982,5984 ---- ! #: globals.h:1121 msgid "E79: Cannot expand wildcards" *************** *** 5469,5470 **** --- 5994,6114 ---- + #: globals.h:1125 + msgid "E81: Using not in a script context" + msgstr "E81: Gebruik van '' buite skripkonteks" + + #~ msgid "E258: no matches found in cscope connections" + #~ msgstr "E258: geen treffers gevind in 'cscope' verbindings nie" + + #~ msgid "No servers found for this display" + #~ msgstr "Geen bedieners gevind vir die 'display' nie" + + #~ msgid "Missing filename" + #~ msgstr "Ontbrekende lęernaam" + + #~ msgid "Invalid line number: %ld" + #~ msgstr "Ongeldige reëlnommer: %ld" + + #~ msgid "Cannot use :normal from event handler" + #~ msgstr "Kan ':normal' nie vanuit gebeurtenishanteerder gebruik nie" + + #~ msgid "%ldL, %ldC" + #~ msgstr "%ldR, %ldK" + + #~ msgid "VIM - Help on..." + #~ msgstr "VIM - Hulp met.." + + #~ msgid "Topic:" + #~ msgstr "Onderwerp:" + + #~ msgid "Error: During loading fontset %s" + #~ msgstr "Fout: Gedurende die laai van fontstel %s" + + #~ msgid "locale is not set correctly" + #~ msgstr "lokaal is nie korrek gestel nie" + + #~ msgid "Set LANG environment variable to your locale" + #~ msgstr "Stel die 'LANG' omgewingsveranderlike na jou lokaal toe" + + #~ msgid "For korean:" + #~ msgstr "Vir Afrikaans:" + + #~ msgid " csh: setenv LANG ko" + #~ msgstr " csh: setenv LANG af" + + #~ msgid " sh : export LANG=ko" + #~ msgstr " sh: export LANG=af" + + #~ msgid "fontset name: %s" + #~ msgstr "fontstel naam: %s" + + #~ msgid "Your language Font missing" + #~ msgstr "Jou taal Font ontbreek" + + #~ msgid "loaded fontname: %s" + #~ msgstr "gelaaide fontnaam: %s" + + #~ msgid "Cannot allocate memory for debugger sign" + #~ msgstr "Kan nie geheue toeken vir ontfouterteken nie" + + #~ msgid "automata ERROR: internal" + #~ msgstr "automata FOUT: intern" + + #~ msgid "cs_add_common: alloc fail #1" + #~ msgstr "'cs_add_common': toeken onsuksesvol #1" + + #~ msgid "cs_add_common: alloc fail #2" + #~ msgstr "'cs_add_common': toeken onsuksesvol #2" + + #~ msgid "cs_add_common: alloc fail #3" + #~ msgstr "'cs_add_common': toeken onsuksesvol #3" + + #~ msgid "cs_add_common: alloc fail #4" + #~ msgstr "'cs_add_common': toeken onsuksesvol #4" + + #~ msgid "Retrieve next symbol" + #~ msgstr "Kry volgende simbool" + + #~ msgid "-- SNiFF+ commands --" + #~ msgstr "-- SNiFF+ bevele --" + + #~ msgid "Unrecognized sniff request [%s]" + #~ msgstr "Onbekende sniff versoek [%s]" + + #~ msgid "Can't create input context." + #~ msgstr "Kan nie invoerkonteks skep nie." + + #~ msgid "Sorry, deleting a menu is not possible in the Athena version" + #~ msgstr "" + #~ "Jammer, in die Athena weergawe is dit onmoontlik om 'n kieslys te skrap" + + #~ msgid "Out of memory" + #~ msgstr "Geheue op" + + #~ msgid "PC (32 bits Vim)" + #~ msgstr "PC (32 bisse Vim)" + + #~ msgid "PC (16 bits Vim)" + #~ msgstr "PC (16 bisse Vim)" + + #~ msgid "Unsupported screen mode" + #~ msgstr "Ongesteunde skermmodus" + + #~ msgid "deadly signal" + #~ msgstr "dodelike sein" + + #~ msgid "some" + #~ msgstr "sommige" + + #~ msgid "Library call failed" + #~ msgstr "Biblioteekfunksieroep het gefaal" + + #~ msgid "Cannot clear all highlight groups" + #~ msgstr "Kan nie alle uitliggroepe leegmaak nie" + + #~ msgid "GUI is not running" + #~ msgstr "GUI voer nie uit nie" + + #~ msgid "Command too long" + #~ msgstr "Bevel te lank" + #~ msgid "Ambiguous mapping" *************** *** 5475,5479 **** - #~ msgid "XIM requires VIM compiled with +xfontset feature." - #~ msgstr "XIM vereis dat VIM met '+xfontset' kenmerk gekompileer word." - #~ msgid "Too many \\z(" --- 6119,6120 ---- *************** *** 5597,5601 **** #~ msgstr "lęernaam '%s is ongeldig" - - #~ msgid "Enter: %s" - #~ msgstr "Voer in: %s" --- 6238,6239 ---- diff -rc -C 1 ../vim60.86//src/po/cs.cp1250.po src/po/cs.cp1250.po *** ../vim60.86//src/po/cs.cp1250.po Wed Sep 26 18:07:46 2001 --- src/po/cs.cp1250.po Wed Oct 31 09:48:31 2001 *************** *** 8,12 **** msgstr "" ! "Project-Id-Version: vim-6.0au\n" ! "POT-Creation-Date: 2001-09-05 10:47-0700\n" ! "PO-Revision-Date: 2001-09-05 15:00+0200\n" "Last-Translator: Jiri Brezina \n" --- 8,12 ---- msgstr "" ! "Project-Id-Version: vim-6.0\n" ! "POT-Creation-Date: 2001-10-08 08:27-0700\n" ! "PO-Revision-Date: 2001-10-30 09:00+0200\n" "Last-Translator: Jiri Brezina \n" *************** *** 37,66 **** ! #: buffer.c:709 msgid "1 buffer unloaded" ! msgstr "počet deaktivovaných bufferů: 1" ! #: buffer.c:711 #, c-format msgid "%d buffers unloaded" ! msgstr "počet deaktivovaných bufferů: %d" ! #: buffer.c:716 msgid "1 buffer deleted" ! msgstr "počet smazaných bufferů: 1" ! #: buffer.c:718 #, c-format msgid "%d buffers deleted" ! msgstr "počet smazaných bufferů: %d" ! #: buffer.c:723 msgid "1 buffer wiped out" ! msgstr "počet zahozených bufferů: 1" ! #: buffer.c:725 #, c-format msgid "%d buffers wiped out" ! msgstr "počet zahozených bufferů: %d" ! #: buffer.c:782 msgid "E84: No modified buffer found" --- 37,66 ---- ! #: buffer.c:710 msgid "1 buffer unloaded" ! msgstr "Počet deaktivovaných bufferů: 1" ! #: buffer.c:712 #, c-format msgid "%d buffers unloaded" ! msgstr "Počet deaktivovaných bufferů: %d" ! #: buffer.c:717 msgid "1 buffer deleted" ! msgstr "Počet smazaných bufferů: 1" ! #: buffer.c:719 #, c-format msgid "%d buffers deleted" ! msgstr "Počet smazaných bufferů: %d" ! #: buffer.c:724 msgid "1 buffer wiped out" ! msgstr "Počet zahozených bufferů: 1" ! #: buffer.c:726 #, c-format msgid "%d buffers wiped out" ! msgstr "Počet zahozených bufferů: %d" ! #: buffer.c:783 msgid "E84: No modified buffer found" *************** *** 155,162 **** ! #: buffer.c:2593 msgid "[No file]" ! msgstr "[žádný soubor]" #. must be a help buffer ! #: buffer.c:2633 msgid "help" --- 155,162 ---- ! #: buffer.c:2606 msgid "[No file]" ! msgstr "[Žádný soubor]" #. must be a help buffer ! #: buffer.c:2646 msgid "help" *************** *** 190,194 **** "\n" ! "# seznam bufferů:\n" ! #: buffer.c:4138 msgid "[Error List]" --- 190,194 ---- "\n" ! "# Seznam bufferů:\n" ! #: buffer.c:4160 msgid "[Error List]" *************** *** 213,215 **** ! #: buffer.c:4387 msgid " line=%ld id=%d name=%s" --- 213,216 ---- ! #: buffer.c:4409 ! #, c-format msgid " line=%ld id=%d name=%s" *************** *** 220,224 **** msgid "E96: Can not diff more than %ld buffers" ! msgstr "E96: Nelze překročit maximální počet (%ld) diff bufferů" ! #: diff.c:641 msgid "E97: Cannot create diffs" --- 221,225 ---- msgid "E96: Can not diff more than %ld buffers" ! msgstr "E96: Nelze překročit maximální počet %ld diff bufferů" ! #: diff.c:648 msgid "E97: Cannot create diffs" *************** *** 242,249 **** ! #: diff.c:1693 msgid "E101: More than two buffers in diff mode, don't know which one to use" ! msgstr "" ! "E101: V diff režimu jsou více než dva buffery. Nevím, který mám použít." ! #: diff.c:1716 #, c-format --- 243,249 ---- ! #: diff.c:1724 msgid "E101: More than two buffers in diff mode, don't know which one to use" ! msgstr "E101: V diff režimu jsou více než dva buffery. Nevím, který mám použít." ! #: diff.c:1747 #, c-format *************** *** 259,261 **** msgid "E104: Escape not allowed in digraph" ! msgstr "E104: spřežka nesmí obsahovat Escape" --- 259,261 ---- msgid "E104: Escape not allowed in digraph" ! msgstr "E104: digraph nesmí obsahovat Escape" *************** *** 282,284 **** msgid " Keyword Local completion (^N/^P)" ! msgstr " Místní doplňování klíčových slov (^N/^P)" --- 282,284 ---- msgid " Keyword Local completion (^N/^P)" ! msgstr " Lokální doplňování klíčových slov (^N/^P)" *************** *** 328,335 **** ! #: edit.c:1982 #, c-format msgid "Scanning dictionary: %s" ! msgstr "prohledávám slovník %s" ! #: edit.c:2173 msgid " (insert) Scroll (^E/^Y)" --- 328,335 ---- ! #: edit.c:1992 #, c-format msgid "Scanning dictionary: %s" ! msgstr "Prohledávám slovník %s" ! #: edit.c:2183 msgid " (insert) Scroll (^E/^Y)" *************** *** 341,352 **** ! #: edit.c:2485 #, c-format msgid "Scanning: %s" ! msgstr "prohledávám %s" ! #: edit.c:2520 msgid "Scanning tags." ! msgstr "prohledávám tagy" ! #: edit.c:3178 msgid " Adding" --- 341,352 ---- ! #: edit.c:2496 #, c-format msgid "Scanning: %s" ! msgstr "Prohledávám %s" ! #: edit.c:2531 msgid "Scanning tags." ! msgstr "Prohledávám tagy" ! #: edit.c:3189 msgid " Adding" *************** *** 358,364 **** #. ! #: edit.c:3227 msgid "-- Searching..." ! msgstr "-- hledám..." ! #: edit.c:3283 msgid "Back at original" --- 358,364 ---- #. ! #: edit.c:3238 msgid "-- Searching..." ! msgstr "-- Hledám..." ! #: edit.c:3294 msgid "Back at original" *************** *** 370,376 **** ! #: edit.c:3293 msgid "The only match" ! msgstr "jediná shoda" ! #: edit.c:3352 #, c-format --- 370,376 ---- ! #: edit.c:3304 msgid "The only match" ! msgstr "Jediná shoda" ! #: edit.c:3363 #, c-format *************** *** 384,391 **** ! #: eval.c:693 #, c-format msgid "E106: Unknown variable: \"%s\"" ! msgstr "E106: neznámá proměnná: \"%s\"" ! #: eval.c:972 #, c-format --- 384,391 ---- ! #: eval.c:696 #, c-format msgid "E106: Unknown variable: \"%s\"" ! msgstr "E106: Neznámá proměnná: \"%s\"" ! #: eval.c:975 #, c-format *************** *** 399,405 **** ! #: eval.c:1281 msgid "E109: Missing ':' after '?'" ! msgstr "E109: po '?' chybí ':'" ! #: eval.c:1895 msgid "E110: Missing ')'" --- 399,405 ---- ! #: eval.c:1284 msgid "E109: Missing ':' after '?'" ! msgstr "E109: Po '?' chybí ':'" ! #: eval.c:1898 msgid "E110: Missing ')'" *************** *** 510,517 **** ! #: eval.c:7447 #, c-format msgid "E125: Illegal argument: %s" ! msgstr "E125: nepřípustný argument: %s" ! #: eval.c:7533 msgid "E126: Missing :endfunction" --- 510,517 ---- ! #: eval.c:7555 #, c-format msgid "E125: Illegal argument: %s" ! msgstr "E125: Nepřípustný argument: %s" ! #: eval.c:7641 msgid "E126: Missing :endfunction" *************** *** 567,574 **** ! #: eval.c:8143 #, c-format msgid "%s returning #%ld" ! msgstr "dokončeno provádění %s. Návratová hodnota %ld" ! #: eval.c:8146 #, c-format --- 567,574 ---- ! #: eval.c:8251 #, c-format msgid "%s returning #%ld" ! msgstr "dokončeno provádění %s. Návratová hodnota #%ld" ! #: eval.c:8254 #, c-format *************** *** 598,610 **** ! #: ex_cmds.c:498 #, c-format msgid "%ld lines moved" ! msgstr "počet přesunutých řádků: %ld" ! #: ex_cmds.c:888 #, c-format msgid "%ld lines filtered" ! msgstr "počet filtrovaných řádků: %ld" ! #: ex_cmds.c:916 msgid "E135: *Filter* Autocommands must not change current buffer" --- 598,610 ---- ! #: ex_cmds.c:499 #, c-format msgid "%ld lines moved" ! msgstr "Počet přesunutých řádků: %ld" ! #: ex_cmds.c:890 #, c-format msgid "%ld lines filtered" ! msgstr "Počet filtrovaných řádků: %ld" ! #: ex_cmds.c:918 msgid "E135: *Filter* Autocommands must not change current buffer" *************** *** 658,664 **** #. Write the info: ! #: ex_cmds.c:1607 ! msgid "# This viminfo file was generated by vim\n" ! msgstr "# Tento viminfo soubor byl vytvořen editorem Vim\n" ! #: ex_cmds.c:1608 msgid "" --- 658,664 ---- #. Write the info: ! #: ex_cmds.c:1610 ! msgid "# This viminfo file was generated by Vim %s.\n" ! msgstr "# Tento viminfo soubor byl vytvořen editorem Vim %s.\n" ! #: ex_cmds.c:1612 msgid "" *************** *** 692,698 **** ! #: ex_cmds.c:2133 msgid "E140: Use ! to write partial buffer" ! msgstr "E140: Použijte 1 pro uložení neúplného bufferu" ! #: ex_cmds.c:2212 #, c-format --- 692,698 ---- ! #: ex_cmds.c:2137 msgid "E140: Use ! to write partial buffer" ! msgstr "E140: Použijte ! pro uložení neúplného bufferu" ! #: ex_cmds.c:2223 #, c-format *************** *** 706,712 **** ! #: ex_cmds.c:2321 msgid "E142: File not written: Writing is disabled by 'write' option" ! msgstr "E142: Soubor nebyl uložen: ukládání je zakázáno volbou 'write'" ! #: ex_cmds.c:2341 #, c-format --- 706,712 ---- ! #: ex_cmds.c:2332 msgid "E142: File not written: Writing is disabled by 'write' option" ! msgstr "E142: Soubor nebyl uložen: Ukládání je zakázáno volbou 'write'" ! #: ex_cmds.c:2352 #, c-format *************** *** 740,773 **** ! #: ex_cmds.c:3664 #, c-format msgid "replace with %s (y/n/a/q/l/^E/^Y)?" ! msgstr "nahradit za %s (y/n/a/q/^E/^Y)?" ! #: ex_cmds.c:4028 msgid "(Interrupted) " ! msgstr "(přerušeno) " ! #: ex_cmds.c:4032 msgid "1 substitution" ! msgstr "počet nahrazení na řádek: 1" ! #: ex_cmds.c:4034 #, c-format msgid "%ld substitutions" ! msgstr "počet nahrazení na řádek: %ld" ! #: ex_cmds.c:4037 msgid " on 1 line" ! msgstr "/1" ! #: ex_cmds.c:4039 #, c-format msgid " on %ld lines" ! msgstr "/%ld" ! #: ex_cmds.c:4090 msgid "E147: Cannot do :global recursive" ! msgstr "E147: global nelze volat rekurzivně" ! #: ex_cmds.c:4125 msgid "E148: Regular expression missing from global" --- 740,773 ---- ! #: ex_cmds.c:3686 #, c-format msgid "replace with %s (y/n/a/q/l/^E/^Y)?" ! msgstr "nahradit za %s (y/n/a/q/l/^E/^Y)?" ! #: ex_cmds.c:4050 msgid "(Interrupted) " ! msgstr "(Přerušeno) " ! #: ex_cmds.c:4054 msgid "1 substitution" ! msgstr "1 nahrazení" ! #: ex_cmds.c:4056 #, c-format msgid "%ld substitutions" ! msgstr "%ld nahrazení" ! #: ex_cmds.c:4059 msgid " on 1 line" ! msgstr " na jednom řádku" ! #: ex_cmds.c:4061 #, c-format msgid " on %ld lines" ! msgstr " na %ld řádcích" ! #: ex_cmds.c:4112 msgid "E147: Cannot do :global recursive" ! msgstr "E147: :global nelze volat rekurzivně" ! #: ex_cmds.c:4147 msgid "E148: Regular expression missing from global" *************** *** 775,782 **** ! #: ex_cmds.c:4174 #, c-format msgid "Pattern found in every line: %s" ! msgstr "Pattern Vzor nalezen na každém řádku: %s" ! #: ex_cmds.c:4255 msgid "" --- 775,782 ---- ! #: ex_cmds.c:4196 #, c-format msgid "Pattern found in every line: %s" ! msgstr "Vzor nalezen na každém řádku: %s" ! #: ex_cmds.c:4277 msgid "" *************** *** 787,792 **** "\n" ! "# Last Substitute String:\n" "$" ! #: ex_cmds.c:4354 #, c-format --- 787,792 ---- "\n" ! "# Poslední nahrazující řetězec:\n" "$" ! #: ex_cmds.c:4376 #, c-format *************** *** 829,835 **** ! #: ex_cmds.c:5122 msgid "E255: Too many signs defined" ! msgstr "E255: Nastaveno příliš mnoho voleb" ! #: ex_cmds.c:5164 #, c-format --- 829,835 ---- ! #: ex_cmds.c:5144 msgid "E255: Too many signs defined" ! msgstr "E255: Nastaveno příliš mnoho voleb" ! #: ex_cmds.c:5186 #, c-format *************** *** 838,840 **** ! #: ex_cmds.c:5188 ex_cmds.c:5368 msgid "E155: Unknown sign: %s" --- 838,841 ---- ! #: ex_cmds.c:5210 ex_cmds.c:5396 ! #, c-format msgid "E155: Unknown sign: %s" *************** *** 902,909 **** ! #: ex_cmds2.c:759 #, c-format msgid "E162: No write since last change for buffer \"%s\"" ! msgstr "E162: Buffer %s obsahuje neuložené změny" ! #: ex_cmds2.c:828 msgid "Warning: Entered other buffer unexpectedly (check autocommands)" --- 903,910 ---- ! #: ex_cmds2.c:763 #, c-format msgid "E162: No write since last change for buffer \"%s\"" ! msgstr "E162: Buffer \"%s\" obsahuje neuložené změny" ! #: ex_cmds2.c:832 msgid "Warning: Entered other buffer unexpectedly (check autocommands)" *************** *** 1003,1005 **** ! #: ex_cmds2.c:3351 msgid "E324: Can't open PostScript output file" --- 1004,1014 ---- ! #: ex_cmds2.c:2966 ! msgid "Printing aborted" ! msgstr "Tisk zrušen" ! ! #: ex_cmds2.c:3344 ! msgid "E455: Error writing to PostScript output file" ! msgstr "E455: Nelze zapisovat do výstupního PostScriptového souboru" ! ! #: ex_cmds2.c:4019 msgid "E324: Can't open PostScript output file" *************** *** 1007,1017 **** ! #: ex_cmds2.c:3398 msgid "Sending to printer..." ! msgstr "Odesílám na tiskárnu..." ! #: ex_cmds2.c:3402 msgid "E365: Failed to print PostScript file" ! msgstr "E365: Selhal tisk PostScriptového souboru" ! #: ex_cmds2.c:3404 msgid "Print job sent." --- 1016,1034 ---- ! #: ex_cmds2.c:4057 ! msgid "E456: Can't open file \"%s\"" ! msgstr "E456: Nelze otevřít soubor \"%s\"" ! ! #: ex_cmds2.c:4068 ! msgid "E457: Can't read PostScript resource file \"%s\"" ! msgstr "E457: Nelze číst zdrojový PostScriptový soubor \"%s\"" ! ! #: ex_cmds2.c:4266 msgid "Sending to printer..." ! msgstr "Odesílám na tiskárnu..." ! #: ex_cmds2.c:4270 msgid "E365: Failed to print PostScript file" ! msgstr "E365: Selhal tisk PostScriptového souboru" ! #: ex_cmds2.c:4272 msgid "Print job sent." *************** *** 1046,1060 **** ! #: ex_docmd.c:928 msgid "E171: Missing :endif" ! msgstr "E171: chybné :endif" ! #: ex_docmd.c:938 msgid "End of sourced file" ! msgstr "konec interpretovaného souboru" ! #: ex_docmd.c:939 msgid "End of function" ! msgstr "konec funkce" ! #: ex_docmd.c:1235 msgid "Ambiguous use of user-defined command" --- 1063,1077 ---- ! #: ex_docmd.c:913 msgid "E171: Missing :endif" ! msgstr "E171: Chybí :endif" ! #: ex_docmd.c:923 msgid "End of sourced file" ! msgstr "Konec interpretovaného souboru" ! #: ex_docmd.c:924 msgid "End of function" ! msgstr "Konec funkce" ! #: ex_docmd.c:1344 msgid "Ambiguous use of user-defined command" *************** *** 1062,1068 **** ! #: ex_docmd.c:1249 msgid "Not an editor command" ! msgstr "není příkazem editoru" ! #: ex_docmd.c:1332 msgid "Don't panic!" --- 1079,1085 ---- ! #: ex_docmd.c:1358 msgid "Not an editor command" ! msgstr "Není příkazem editoru" ! #: ex_docmd.c:1441 msgid "Don't panic!" *************** *** 1124,1130 **** ! #: ex_docmd.c:4027 msgid "E177: Count cannot be specified twice" ! msgstr "E177: opakování nemůže být zadáno dvakrát" ! #: ex_docmd.c:4037 msgid "E178: Invalid default value for count" --- 1141,1147 ---- ! #: ex_docmd.c:4203 msgid "E177: Count cannot be specified twice" ! msgstr "E177: Opakování nemůže být zadáno dvakrát" ! #: ex_docmd.c:4213 msgid "E178: Invalid default value for count" *************** *** 1172,1178 **** ! #: ex_docmd.c:5763 msgid "No swap file" ! msgstr "žádný odkládací soubor" ! #: ex_docmd.c:5867 msgid "Append File" --- 1189,1195 ---- ! #: ex_docmd.c:5815 msgid "No swap file" ! msgstr "Žádný odkládací soubor" ! #: ex_docmd.c:5919 msgid "Append File" *************** *** 1228,1234 **** ! #: ex_docmd.c:6751 msgid "E192: Recursive use of :normal too deep" ! msgstr "E192: vnoření :normal je příliš hluboké" ! #: ex_docmd.c:7119 msgid ":if nesting too deep" --- 1245,1251 ---- ! #: ex_docmd.c:6803 msgid "E192: Recursive use of :normal too deep" ! msgstr "E192: Vnoření :normal je příliš hluboké" ! #: ex_docmd.c:7171 msgid ":if nesting too deep" *************** *** 1380,1391 **** ! #: fileio.c:650 msgid "Vim: Reading from stdin...\n" ! msgstr "Vim: čtu ze standardního vstupu...\n" ! #: fileio.c:656 msgid "Reading from stdin..." ! msgstr "čtu ze standardního vstupu..." #. Re-opening the original file failed! ! #: fileio.c:880 msgid "E202: Conversion made file unreadable!" --- 1397,1408 ---- ! #: fileio.c:646 msgid "Vim: Reading from stdin...\n" ! msgstr "Vim: Čtu ze standardního vstupu...\n" ! #: fileio.c:652 msgid "Reading from stdin..." ! msgstr "Čtu ze standardního vstupu..." #. Re-opening the original file failed! ! #: fileio.c:876 msgid "E202: Conversion made file unreadable!" *************** *** 1492,1494 **** # resource fork ?! ! #: fileio.c:3012 msgid "The resource fork will be lost (use ! to override)" --- 1509,1511 ---- # resource fork ?! ! #: fileio.c:3032 msgid "The resource fork will be lost (use ! to override)" *************** *** 1508,1514 **** ! #: fileio.c:3160 msgid "E212: Can't open file for writing" ! msgstr "E212: Nelze otevřít soubor pro zápis" ! #: fileio.c:3396 msgid "Close failed" --- 1525,1531 ---- ! #: fileio.c:3180 msgid "E212: Can't open file for writing" ! msgstr "E212: Nelze otevřít soubor pro zápis" ! #: fileio.c:3423 msgid "Close failed" *************** *** 1627,1630 **** #. don't overwrite messages here #. don't use emsg() here, don't want to flush the buffers ! #: fileio.c:3850 msgid "WARNING: The file has been changed since reading it!!!" --- 1644,1648 ---- #. don't overwrite messages here + #. must give this prompt #. don't use emsg() here, don't want to flush the buffers ! #: fileio.c:3903 msgid "WARNING: The file has been changed since reading it!!!" *************** *** 1701,1703 **** ! #: fileio.c:5835 #, c-format --- 1719,1731 ---- ! #: fileio.c:5670 ! msgid "--Deleted--" ! msgstr "--Vymazáno--" ! ! #. the group doesn't exist ! #: fileio.c:5830 ! #, c-format ! msgid "E367: No such group: \"%s\"" ! msgstr "E367: Skupina \"%s\" neexistuje" ! ! #: fileio.c:5955 #, c-format *************** *** 2299,2301 **** msgid "" ! msgstr "(buffer objekt (smazán) na %8lX)" --- 2327,2329 ---- msgid "" ! msgstr "" *************** *** 2324,2326 **** msgid "" ! msgstr "(objekt okna (smazán) na %8lX)" --- 2352,2354 ---- msgid "" ! msgstr "" *************** *** 2329,2331 **** msgid "" ! msgstr "(objekt okna (neznámý) na %8lX)" --- 2357,2359 ---- msgid "" ! msgstr "" *************** *** 2334,2336 **** msgid "" ! msgstr "(okno %d)" --- 2362,2364 ---- msgid "" ! msgstr "" *************** *** 2344,2346 **** msgid "cannot save undo information" ! msgstr "nelze uložit zpětné informace" --- 2372,2374 ---- msgid "cannot save undo information" ! msgstr "nelze uložit informace pro příkaz undo" *************** *** 2451,2454 **** msgstr "" ! "Nelze se připojit k SNiFF+. Zkontrolujte proměnné (sniffemacs musí být)" ! "uvedena v $PATH.\n" --- 2479,2482 ---- msgstr "" ! "Nelze se připojit k SNiFF+. Zkontrolujte proměnné (sniffemacs musí " ! "být)uvedena v $PATH.\n" *************** *** 2564,2567 **** msgstr "" ! "Lituji, ale tento příkaz je deaktivován; knihovnu jazyka Tcl nelze " ! "nahrát." --- 2592,2594 ---- msgstr "" ! "Lituji, ale tento příkaz je deaktivován; knihovnu jazyka Tcl nelze nahrát." *************** *** 2591,2593 **** ! #: if_xcmdsrv.c:622 msgid "E249: couldn't read VIM instance registry property" --- 2618,2625 ---- ! #: if_xcmdsrv.c:714 ! #, c-format ! msgid "Invalid server id used: %s" ! msgstr "Použit chybný id serveru: %s" ! ! #: if_xcmdsrv.c:1061 msgid "E249: couldn't read VIM instance registry property" *************** *** 2595,2607 **** ! #: if_xcmdsrv.c:635 msgid "E251: VIM instance registry property is badly formed. Deleted!" ! msgstr "E251: VIM instance registry property byla špatně vytvořena" ! "a byla smazána!" ! ! #: if_xcmdsrv.c:723 ! #, c-format ! msgid "Invalid server id used: %s" ! msgstr "Použit chybný id serveru: %s" ! #: main.c:52 option.c:3102 option.c:3209 msgid "Unknown option" --- 2627,2634 ---- ! #: if_xcmdsrv.c:1072 msgid "E251: VIM instance registry property is badly formed. Deleted!" ! msgstr "" ! "E251: VIM instance registry property byla špatně vytvořenaa byla smazána!" ! #: main.c:53 option.c:3162 option.c:3269 msgid "Unknown option" *************** *** 2637,2642 **** ! #: main.c:846 main.c:853 main.c:897 memline.c:3645 memline.c:3649 ! #: version.c:808 version.c:813 version.c:818 version.c:823 version.c:828 ! #: version.c:833 version.c:839 version.c:843 version.c:847 version.c:852 ! #: version.c:859 version.c:867 version.c:873 msgid "\"\n" --- 2664,2669 ---- ! #: main.c:862 main.c:869 main.c:913 memline.c:3673 memline.c:3677 ! #: version.c:816 version.c:821 version.c:826 version.c:831 version.c:836 ! #: version.c:841 version.c:847 version.c:851 version.c:855 version.c:860 ! #: version.c:867 version.c:875 version.c:881 msgid "\"\n" *************** *** 2665,2667 **** ! #: main.c:1176 #, c-format --- 2692,2699 ---- ! #. just in case.. ! #: main.c:1171 ! msgid "pre-vimrc command line" ! msgstr "pre-vimrc příkazový řádek" ! ! #: main.c:1206 #, c-format *************** *** 2907,2918 **** ! #: main.c:2246 ! msgid "--remote \tEdit in a Vim server" ! msgstr "--remote \tEdituje na Vim serveru" ! #: main.c:2247 ! msgid "--remote-wait \tAs --remote but wait for files to end edit" ! msgstr "--remote-wait \tJako --remote, ale čeká na soubory" ! "na konci editace." ! #: main.c:2248 msgid "--remote-send \tSend to a Vim server and exit" --- 2939,2955 ---- ! #: main.c:2283 ! msgid "--socketid \tOpen Vim inside another GTK widget" ! msgstr "--socketid \tOtevře Vim uvnitř jiného GTK widgetu" ! #: main.c:2287 ! msgid "--remote \tEdit in a Vim server and exit" ! msgstr "--remote \tEdituje na Vim serveru a skončí" ! #: main.c:2288 ! msgid "" ! "--remote-wait As --remote but wait for files to have been edited" ! msgstr "" ! "--remote-wait Jako --remote, ale čeká na soubory k editaci" ! ! #: main.c:2289 msgid "--remote-send \tSend to a Vim server and exit" *************** *** 2920,2926 **** ! #: main.c:2249 ! msgid "--remote-expr \tExecute in server and print result" msgstr "--remote-expr \tProvede na serveru a zobrazí výsledek" ! #: main.c:2250 msgid "--serverlist\t\tList available Vim server names and exit" --- 2957,2963 ---- ! #: main.c:2290 ! msgid "--remote-expr \tEvaluate in a Vim server and print result" msgstr "--remote-expr \tProvede na serveru a zobrazí výsledek" ! #: main.c:2291 msgid "--serverlist\t\tList available Vim server names and exit" *************** *** 2928,2939 **** ! #: main.c:2251 msgid "--servername \tSend to/become the Vim server " ! msgstr "--servername \tZašle serveru /" ! "stane se Vim serverem " ! ! #: main.c:2254 ! msgid "--socketid \tOpen Vim inside another GTK widget" ! msgstr "--socketid \tOtevře Vim uvnitř jiného GTK widgetu" ! #: main.c:2258 msgid "-i \t\tUse instead of .viminfo" --- 2965,2972 ---- ! #: main.c:2292 msgid "--servername \tSend to/become the Vim server " ! msgstr "" ! "--servername \tZašle serveru /stane se Vim serverem " ! #: main.c:2295 msgid "-i \t\tUse instead of .viminfo" *************** *** 3009,3015 **** ! #: main.c:2284 ! msgid "-scrollbarwidth \tUse a scrollbar width of (also: -sw)" ! msgstr "-scrollbarwidth <šířku>\tNastaví <šířku> posunovací lišty (také: -sw)" ! #: main.c:2285 msgid "-menuheight \tUse a menu bar height of (also: -mh)" --- 3042,3048 ---- ! #: main.c:2321 ! msgid "-scrollbarwidth Use a scrollbar width of (also: -sw)" ! msgstr "-scrollbarwidth <šířku> Nastaví <šířku> posunovací lišty (také: -sw)" ! #: main.c:2323 msgid "-menuheight \tUse a menu bar height of (also: -mh)" *************** *** 3053,3059 **** ! #: main.c:2300 msgid "-display \tRun vim on (also: --display)" ! msgstr "-display \tspustí vim na (také --display)" ! #: main.c:2302 msgid "--help\t\tShow Gnome arguments" --- 3086,3092 ---- ! #: main.c:2339 msgid "-display \tRun vim on (also: --display)" ! msgstr "-display \tSpustí vim na (také --display)" ! #: main.c:2341 msgid "--help\t\tShow Gnome arguments" *************** *** 3061,3067 **** ! #: main.c:2494 ! msgid "\nSend failed. Trying to execute locally\n" ! msgstr "\nPředání selhalo. Zkouším provést lokálně\n" ! #: main.c:2563 msgid "Send expression failed.\n" --- 3094,3119 ---- ! #. Failed to send, abort. ! #: main.c:2566 ! msgid "" ! "\n" ! "Send failed.\n" ! msgstr "" ! "\n" ! "Předání výrazu selhalo.\n" ! #. Let vim start normally. ! #: main.c:2571 ! msgid "" ! "\n" ! "Send failed. Trying to execute locally\n" ! msgstr "" ! "\n" ! "Předání selhalo. Zkouším provést lokálně\n" ! ! #: main.c:2604 main.c:2625 ! #, c-format ! msgid "%d of %d edited" ! msgstr "%d z %d editováno" ! ! #: main.c:2648 msgid "Send expression failed.\n" *************** *** 3169,3190 **** ! #: memfile.c:958 msgid "E294: Seek error in swap file read" ! msgstr "E294: chyba posunu ukazovátka při čtení odkládacího souboru" ! #: memfile.c:963 msgid "E295: Read error in swap file" ! msgstr "E295: chyba při čtení odkládacího souboru" ! #: memfile.c:1015 msgid "E296: Seek error in swap file write" ! msgstr "E296: chyba posunu ukazovátka při ukládání do odkládacího souboru" ! #: memfile.c:1033 msgid "E297: Write error in swap file" ! msgstr "E297: chyba při ukládání do odkládacího souboru" ! #: memfile.c:1230 msgid "E300: Swap file already exists (symlink attack?)" ! msgstr "E300: Odkládací soubor již existuje! (Někdo hackuje" ! "přes nastražený symlink?)" --- 3221,3242 ---- ! #: memfile.c:972 msgid "E294: Seek error in swap file read" ! msgstr "E294: Chyba posunu ukazovátka při čtení odkládacího souboru" ! #: memfile.c:977 msgid "E295: Read error in swap file" ! msgstr "E295: Chyba při čtení odkládacího souboru" ! #: memfile.c:1029 msgid "E296: Seek error in swap file write" ! msgstr "E296: Chyba posunu ukazovátka při ukládání do odkládacího souboru" ! #: memfile.c:1047 msgid "E297: Write error in swap file" ! msgstr "E297: Chyba při ukládání do odkládacího souboru" ! #: memfile.c:1244 msgid "E300: Swap file already exists (symlink attack?)" ! msgstr "" ! "E300: Odkládací soubor již existuje! (Někdo hackujepřes nastražený symlink?)" *************** *** 3192,3194 **** msgid "E298: Didn't get block nr 0?" ! msgstr "E298: nelze získat blok 0?" --- 3244,3246 ---- msgid "E298: Didn't get block nr 0?" ! msgstr "E298: Nelze získat blok 0?" *************** *** 3196,3198 **** msgid "E298: Didn't get block nr 1?" ! msgstr "E298: nelze získat blok 1?" --- 3248,3250 ---- msgid "E298: Didn't get block nr 1?" ! msgstr "E298: Nelze získat blok 1?" *************** *** 3984,4001 **** ! #: ops.c:274 #, c-format msgid "1 line %sed %d times" ! msgstr "počet řádků posunutých %2$dkrát pomocí %1$s : 1" ! #: ops.c:279 #, c-format msgid "%ld lines %sed 1 time" ! msgstr "počet řádků posunutých jednou pomocí %2$s : %1$ld" ! #: ops.c:282 #, c-format msgid "%ld lines %sed %d times" ! msgstr "počet řádků posunutých %3$dkrát pomocí %2$s : %1$ld" ! #: ops.c:640 #, c-format --- 4036,4053 ---- ! #: ops.c:273 #, c-format msgid "1 line %sed %d times" ! msgstr "Počet řádků posunutých pomocí %s %d-krát : 1" ! #: ops.c:278 #, c-format msgid "%ld lines %sed 1 time" ! msgstr "Počet řádků: %ld (posunutých jednou pomocí %s)" ! #: ops.c:281 #, c-format msgid "%ld lines %sed %d times" ! msgstr "Počet řádků: %ld (posunutých pomocí %s %d-krát)" ! #: ops.c:638 #, c-format *************** *** 4013,4015 **** ! #: ops.c:1529 msgid "cannot yank; delete anyway" --- 4065,4068 ---- ! #. must display the prompt ! #: ops.c:1528 msgid "cannot yank; delete anyway" *************** *** 4018,4020 **** #: ops.c:2018 ! msgid "1 line ~ed" msgstr "počet řádek se změněnou velikostí písmen: 1" --- 4071,4073 ---- #: ops.c:2018 ! msgid "1 line changed" msgstr "počet řádek se změněnou velikostí písmen: 1" *************** *** 4023,4028 **** #, c-format ! msgid "%ld lines ~ed" msgstr "počet řádek se změněnou velikostí písmen: %ld" ! #: ops.c:2366 #, c-format --- 4076,4081 ---- #, c-format ! msgid "%ld lines changed" msgstr "počet řádek se změněnou velikostí písmen: %ld" ! #: ops.c:2381 #, c-format *************** *** 4519,4534 **** ! #: os_win32.c:1449 ! 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 se nevyskytuje ve Vaší $PATH.\n" ! "Externí příkazy nebudou " ! ! #: os_win32.c:1452 ! msgid "Vim Warning" ! msgstr "Varování" ! ! #: os_win32.c:2438 #, c-format --- 4572,4574 ---- ! #: os_win32.c:2489 #, c-format *************** *** 4553,4554 **** --- 4593,4607 ---- + #: os_win32.c:2988 + 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 se nevyskytuje ve Vaší $PATH.\n" + "Externí příkazy nebudou " + + #: os_win32.c:2991 + msgid "Vim Warning" + msgstr "Varování" + #: quickfix.c:281 *************** *** 5038,5041 **** #. * Ask to select a tag from the list. #. ! #: tag.c:705 msgid "Enter nr of choice ( to abort): " --- 5091,5095 ---- #. * Ask to select a tag from the list. + #. * When using ":silent" assume that was entered. #. ! #: tag.c:706 msgid "Enter nr of choice ( to abort): " *************** *** 5176,5178 **** ! #: undo.c:350 msgid "No undo possible; continue anyway" --- 5230,5233 ---- ! #. must display the prompt ! #: undo.c:351 msgid "No undo possible; continue anyway" *************** *** 5498,5504 **** ! #: version.c:937 msgid "type :help version6 for version info" ! msgstr "zadejte :help version6 pro informace verzi" ! #: version.c:940 msgid "Running in Vi compatible mode" --- 5553,5559 ---- ! #: version.c:945 msgid "type :help version6 for version info" ! msgstr "zadejte :help version6 pro informace o verzi" ! #: version.c:948 msgid "Running in Vi compatible mode" *************** *** 5579,5582 **** ! #: ../GvimExt/gvimext.cpp:874 ../GvimExt/gvimext.cpp:888 ! #: ../GvimExt/gvimext.cpp:952 msgid "gvimext.dll error" --- 5634,5637 ---- ! #: ../GvimExt/gvimext.cpp:892 ../GvimExt/gvimext.cpp:906 ! #: ../GvimExt/gvimext.cpp:970 msgid "gvimext.dll error" *************** *** 5907 **** --- 5962,5964 ---- #~ msgstr "E258: v cscope nebyla nalezena žádná shoda" + + diff -rc -C 1 ../vim60.86//src/po/cs.po src/po/cs.po *** ../vim60.86//src/po/cs.po Sat Sep 15 14:56:25 2001 --- src/po/cs.po Wed Oct 31 09:37:50 2001 *************** *** 8,12 **** msgstr "" ! "Project-Id-Version: vim-6.0au\n" ! "POT-Creation-Date: 2001-09-05 10:47-0700\n" ! "PO-Revision-Date: 2001-09-05 15:00+0200\n" "Last-Translator: Jiri Brezina \n" --- 8,12 ---- msgstr "" ! "Project-Id-Version: vim-6.0\n" ! "POT-Creation-Date: 2001-10-08 08:27-0700\n" ! "PO-Revision-Date: 2001-10-30 09:00+0200\n" "Last-Translator: Jiri Brezina \n" *************** *** 14,19 **** "MIME-Version: 1.0\n" ! "Content-Type: text/plain; charset=cp1250\n" "Content-Transfer-Encoding: 8bit\n" ! #: buffer.c:98 msgid "E82: Cannot allocate any buffer, exiting..." --- 14,19 ---- "MIME-Version: 1.0\n" ! "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" ! #: buffer.c:97 msgid "E82: Cannot allocate any buffer, exiting..." *************** *** 37,66 **** ! #: buffer.c:709 msgid "1 buffer unloaded" ! msgstr "počet deaktivovaných bufferů: 1" ! #: buffer.c:711 #, c-format msgid "%d buffers unloaded" ! msgstr "počet deaktivovaných bufferů: %d" ! #: buffer.c:716 msgid "1 buffer deleted" ! msgstr "počet smazaných bufferů: 1" ! #: buffer.c:718 #, c-format msgid "%d buffers deleted" ! msgstr "počet smazaných bufferů: %d" ! #: buffer.c:723 msgid "1 buffer wiped out" ! msgstr "počet zahozených bufferů: 1" ! #: buffer.c:725 #, c-format msgid "%d buffers wiped out" ! msgstr "počet zahozených bufferů: %d" ! #: buffer.c:782 msgid "E84: No modified buffer found" --- 37,66 ---- ! #: buffer.c:710 msgid "1 buffer unloaded" ! msgstr "Počet deaktivovaných bufferů: 1" ! #: buffer.c:712 #, c-format msgid "%d buffers unloaded" ! msgstr "Počet deaktivovaných bufferů: %d" ! #: buffer.c:717 msgid "1 buffer deleted" ! msgstr "Počet smazaných bufferů: 1" ! #: buffer.c:719 #, c-format msgid "%d buffers deleted" ! msgstr "Počet smazaných bufferů: %d" ! #: buffer.c:724 msgid "1 buffer wiped out" ! msgstr "Počet zahozených bufferů: 1" ! #: buffer.c:726 #, c-format msgid "%d buffers wiped out" ! msgstr "Počet zahozených bufferů: %d" ! #: buffer.c:783 msgid "E84: No modified buffer found" *************** *** 155,162 **** ! #: buffer.c:2593 msgid "[No file]" ! msgstr "[žádný soubor]" #. must be a help buffer ! #: buffer.c:2633 msgid "help" --- 155,162 ---- ! #: buffer.c:2606 msgid "[No file]" ! msgstr "[Žádný soubor]" #. must be a help buffer ! #: buffer.c:2646 msgid "help" *************** *** 190,194 **** "\n" ! "# seznam bufferů:\n" ! #: buffer.c:4138 msgid "[Error List]" --- 190,194 ---- "\n" ! "# Seznam bufferů:\n" ! #: buffer.c:4160 msgid "[Error List]" *************** *** 213,215 **** ! #: buffer.c:4387 msgid " line=%ld id=%d name=%s" --- 213,216 ---- ! #: buffer.c:4409 ! #, c-format msgid " line=%ld id=%d name=%s" *************** *** 220,224 **** msgid "E96: Can not diff more than %ld buffers" ! msgstr "E96: Nelze překročit maximální počet (%ld) diff bufferů" ! #: diff.c:641 msgid "E97: Cannot create diffs" --- 221,225 ---- msgid "E96: Can not diff more than %ld buffers" ! msgstr "E96: Nelze překročit maximální počet %ld diff bufferů" ! #: diff.c:648 msgid "E97: Cannot create diffs" *************** *** 242,249 **** ! #: diff.c:1693 msgid "E101: More than two buffers in diff mode, don't know which one to use" ! msgstr "" ! "E101: V diff režimu jsou více než dva buffery. Nevím, který mám použít." ! #: diff.c:1716 #, c-format --- 243,249 ---- ! #: diff.c:1724 msgid "E101: More than two buffers in diff mode, don't know which one to use" ! msgstr "E101: V diff režimu jsou více než dva buffery. Nevím, který mám použít." ! #: diff.c:1747 #, c-format *************** *** 259,261 **** msgid "E104: Escape not allowed in digraph" ! msgstr "E104: spřežka nesmí obsahovat Escape" --- 259,261 ---- msgid "E104: Escape not allowed in digraph" ! msgstr "E104: digraph nesmí obsahovat Escape" *************** *** 282,284 **** msgid " Keyword Local completion (^N/^P)" ! msgstr " Místní doplňování klíčových slov (^N/^P)" --- 282,284 ---- msgid " Keyword Local completion (^N/^P)" ! msgstr " Lokální doplňování klíčových slov (^N/^P)" *************** *** 328,335 **** ! #: edit.c:1982 #, c-format msgid "Scanning dictionary: %s" ! msgstr "prohledávám slovník %s" ! #: edit.c:2173 msgid " (insert) Scroll (^E/^Y)" --- 328,335 ---- ! #: edit.c:1992 #, c-format msgid "Scanning dictionary: %s" ! msgstr "Prohledávám slovník %s" ! #: edit.c:2183 msgid " (insert) Scroll (^E/^Y)" *************** *** 341,352 **** ! #: edit.c:2485 #, c-format msgid "Scanning: %s" ! msgstr "prohledávám %s" ! #: edit.c:2520 msgid "Scanning tags." ! msgstr "prohledávám tagy" ! #: edit.c:3178 msgid " Adding" --- 341,352 ---- ! #: edit.c:2496 #, c-format msgid "Scanning: %s" ! msgstr "Prohledávám %s" ! #: edit.c:2531 msgid "Scanning tags." ! msgstr "Prohledávám tagy" ! #: edit.c:3189 msgid " Adding" *************** *** 358,364 **** #. ! #: edit.c:3227 msgid "-- Searching..." ! msgstr "-- hledám..." ! #: edit.c:3283 msgid "Back at original" --- 358,364 ---- #. ! #: edit.c:3238 msgid "-- Searching..." ! msgstr "-- Hledám..." ! #: edit.c:3294 msgid "Back at original" *************** *** 370,376 **** ! #: edit.c:3293 msgid "The only match" ! msgstr "jediná shoda" ! #: edit.c:3352 #, c-format --- 370,376 ---- ! #: edit.c:3304 msgid "The only match" ! msgstr "Jediná shoda" ! #: edit.c:3363 #, c-format *************** *** 384,391 **** ! #: eval.c:693 #, c-format msgid "E106: Unknown variable: \"%s\"" ! msgstr "E106: neznámá proměnná: \"%s\"" ! #: eval.c:972 #, c-format --- 384,391 ---- ! #: eval.c:696 #, c-format msgid "E106: Unknown variable: \"%s\"" ! msgstr "E106: Neznámá proměnná: \"%s\"" ! #: eval.c:975 #, c-format *************** *** 399,405 **** ! #: eval.c:1281 msgid "E109: Missing ':' after '?'" ! msgstr "E109: po '?' chybí ':'" ! #: eval.c:1895 msgid "E110: Missing ')'" --- 399,405 ---- ! #: eval.c:1284 msgid "E109: Missing ':' after '?'" ! msgstr "E109: Po '?' chybí ':'" ! #: eval.c:1898 msgid "E110: Missing ')'" *************** *** 510,517 **** ! #: eval.c:7447 #, c-format msgid "E125: Illegal argument: %s" ! msgstr "E125: nepřípustný argument: %s" ! #: eval.c:7533 msgid "E126: Missing :endfunction" --- 510,517 ---- ! #: eval.c:7555 #, c-format msgid "E125: Illegal argument: %s" ! msgstr "E125: Nepřípustný argument: %s" ! #: eval.c:7641 msgid "E126: Missing :endfunction" *************** *** 567,574 **** ! #: eval.c:8143 #, c-format msgid "%s returning #%ld" ! msgstr "dokončeno provádění %s. Návratová hodnota %ld" ! #: eval.c:8146 #, c-format --- 567,574 ---- ! #: eval.c:8251 #, c-format msgid "%s returning #%ld" ! msgstr "dokončeno provádění %s. Návratová hodnota #%ld" ! #: eval.c:8254 #, c-format *************** *** 598,610 **** ! #: ex_cmds.c:498 #, c-format msgid "%ld lines moved" ! msgstr "počet přesunutých řádků: %ld" ! #: ex_cmds.c:888 #, c-format msgid "%ld lines filtered" ! msgstr "počet filtrovaných řádků: %ld" ! #: ex_cmds.c:916 msgid "E135: *Filter* Autocommands must not change current buffer" --- 598,610 ---- ! #: ex_cmds.c:499 #, c-format msgid "%ld lines moved" ! msgstr "Počet přesunutých řádků: %ld" ! #: ex_cmds.c:890 #, c-format msgid "%ld lines filtered" ! msgstr "Počet filtrovaných řádků: %ld" ! #: ex_cmds.c:918 msgid "E135: *Filter* Autocommands must not change current buffer" *************** *** 658,664 **** #. Write the info: ! #: ex_cmds.c:1607 ! msgid "# This viminfo file was generated by vim\n" ! msgstr "# Tento viminfo soubor byl vytvořen editorem Vim\n" ! #: ex_cmds.c:1608 msgid "" --- 658,664 ---- #. Write the info: ! #: ex_cmds.c:1610 ! msgid "# This viminfo file was generated by Vim %s.\n" ! msgstr "# Tento viminfo soubor byl vytvořen editorem Vim %s.\n" ! #: ex_cmds.c:1612 msgid "" *************** *** 692,698 **** ! #: ex_cmds.c:2133 msgid "E140: Use ! to write partial buffer" ! msgstr "E140: Použijte 1 pro uložení neúplného bufferu" ! #: ex_cmds.c:2212 #, c-format --- 692,698 ---- ! #: ex_cmds.c:2137 msgid "E140: Use ! to write partial buffer" ! msgstr "E140: Použijte ! pro uložení neúplného bufferu" ! #: ex_cmds.c:2223 #, c-format *************** *** 706,712 **** ! #: ex_cmds.c:2321 msgid "E142: File not written: Writing is disabled by 'write' option" ! msgstr "E142: Soubor nebyl uložen: ukládání je zakázáno volbou 'write'" ! #: ex_cmds.c:2341 #, c-format --- 706,712 ---- ! #: ex_cmds.c:2332 msgid "E142: File not written: Writing is disabled by 'write' option" ! msgstr "E142: Soubor nebyl uložen: Ukládání je zakázáno volbou 'write'" ! #: ex_cmds.c:2352 #, c-format *************** *** 740,773 **** ! #: ex_cmds.c:3664 #, c-format msgid "replace with %s (y/n/a/q/l/^E/^Y)?" ! msgstr "nahradit za %s (y/n/a/q/^E/^Y)?" ! #: ex_cmds.c:4028 msgid "(Interrupted) " ! msgstr "(přerušeno) " ! #: ex_cmds.c:4032 msgid "1 substitution" ! msgstr "počet nahrazení na řádek: 1" ! #: ex_cmds.c:4034 #, c-format msgid "%ld substitutions" ! msgstr "počet nahrazení na řádek: %ld" ! #: ex_cmds.c:4037 msgid " on 1 line" ! msgstr "/1" ! #: ex_cmds.c:4039 #, c-format msgid " on %ld lines" ! msgstr "/%ld" ! #: ex_cmds.c:4090 msgid "E147: Cannot do :global recursive" ! msgstr "E147: global nelze volat rekurzivně" ! #: ex_cmds.c:4125 msgid "E148: Regular expression missing from global" --- 740,773 ---- ! #: ex_cmds.c:3686 #, c-format msgid "replace with %s (y/n/a/q/l/^E/^Y)?" ! msgstr "nahradit za %s (y/n/a/q/l/^E/^Y)?" ! #: ex_cmds.c:4050 msgid "(Interrupted) " ! msgstr "(Přerušeno) " ! #: ex_cmds.c:4054 msgid "1 substitution" ! msgstr "1 nahrazení" ! #: ex_cmds.c:4056 #, c-format msgid "%ld substitutions" ! msgstr "%ld nahrazení" ! #: ex_cmds.c:4059 msgid " on 1 line" ! msgstr " na jednom řádku" ! #: ex_cmds.c:4061 #, c-format msgid " on %ld lines" ! msgstr " na %ld řádcích" ! #: ex_cmds.c:4112 msgid "E147: Cannot do :global recursive" ! msgstr "E147: :global nelze volat rekurzivně" ! #: ex_cmds.c:4147 msgid "E148: Regular expression missing from global" *************** *** 775,782 **** ! #: ex_cmds.c:4174 #, c-format msgid "Pattern found in every line: %s" ! msgstr "Pattern Vzor nalezen na každém řádku: %s" ! #: ex_cmds.c:4255 msgid "" --- 775,782 ---- ! #: ex_cmds.c:4196 #, c-format msgid "Pattern found in every line: %s" ! msgstr "Vzor nalezen na každém řádku: %s" ! #: ex_cmds.c:4277 msgid "" *************** *** 787,792 **** "\n" ! "# Last Substitute String:\n" "$" ! #: ex_cmds.c:4354 #, c-format --- 787,792 ---- "\n" ! "# Poslední nahrazující řetězec:\n" "$" ! #: ex_cmds.c:4376 #, c-format *************** *** 829,835 **** ! #: ex_cmds.c:5122 msgid "E255: Too many signs defined" ! msgstr "E255: Nastaveno příliš mnoho voleb" ! #: ex_cmds.c:5164 #, c-format --- 829,835 ---- ! #: ex_cmds.c:5144 msgid "E255: Too many signs defined" ! msgstr "E255: Nastaveno příliš mnoho voleb" ! #: ex_cmds.c:5186 #, c-format *************** *** 838,840 **** ! #: ex_cmds.c:5188 ex_cmds.c:5368 msgid "E155: Unknown sign: %s" --- 838,841 ---- ! #: ex_cmds.c:5210 ex_cmds.c:5396 ! #, c-format msgid "E155: Unknown sign: %s" *************** *** 902,909 **** ! #: ex_cmds2.c:759 #, c-format msgid "E162: No write since last change for buffer \"%s\"" ! msgstr "E162: Buffer %s obsahuje neuložené změny" ! #: ex_cmds2.c:828 msgid "Warning: Entered other buffer unexpectedly (check autocommands)" --- 903,910 ---- ! #: ex_cmds2.c:763 #, c-format msgid "E162: No write since last change for buffer \"%s\"" ! msgstr "E162: Buffer \"%s\" obsahuje neuložené změny" ! #: ex_cmds2.c:832 msgid "Warning: Entered other buffer unexpectedly (check autocommands)" *************** *** 1003,1005 **** ! #: ex_cmds2.c:3351 msgid "E324: Can't open PostScript output file" --- 1004,1014 ---- ! #: ex_cmds2.c:2966 ! msgid "Printing aborted" ! msgstr "Tisk zrušen" ! ! #: ex_cmds2.c:3344 ! msgid "E455: Error writing to PostScript output file" ! msgstr "E455: Nelze zapisovat do výstupního PostScriptového souboru" ! ! #: ex_cmds2.c:4019 msgid "E324: Can't open PostScript output file" *************** *** 1007,1017 **** ! #: ex_cmds2.c:3398 msgid "Sending to printer..." ! msgstr "Odesílám na tiskárnu..." ! #: ex_cmds2.c:3402 msgid "E365: Failed to print PostScript file" ! msgstr "E365: Selhal tisk PostScriptového souboru" ! #: ex_cmds2.c:3404 msgid "Print job sent." --- 1016,1034 ---- ! #: ex_cmds2.c:4057 ! msgid "E456: Can't open file \"%s\"" ! msgstr "E456: Nelze otevřít soubor \"%s\"" ! ! #: ex_cmds2.c:4068 ! msgid "E457: Can't read PostScript resource file \"%s\"" ! msgstr "E457: Nelze číst zdrojový PostScriptový soubor \"%s\"" ! ! #: ex_cmds2.c:4266 msgid "Sending to printer..." ! msgstr "Odesílám na tiskárnu..." ! #: ex_cmds2.c:4270 msgid "E365: Failed to print PostScript file" ! msgstr "E365: Selhal tisk PostScriptového souboru" ! #: ex_cmds2.c:4272 msgid "Print job sent." *************** *** 1046,1060 **** ! #: ex_docmd.c:928 msgid "E171: Missing :endif" ! msgstr "E171: chybné :endif" ! #: ex_docmd.c:938 msgid "End of sourced file" ! msgstr "konec interpretovaného souboru" ! #: ex_docmd.c:939 msgid "End of function" ! msgstr "konec funkce" ! #: ex_docmd.c:1235 msgid "Ambiguous use of user-defined command" --- 1063,1077 ---- ! #: ex_docmd.c:913 msgid "E171: Missing :endif" ! msgstr "E171: Chybí :endif" ! #: ex_docmd.c:923 msgid "End of sourced file" ! msgstr "Konec interpretovaného souboru" ! #: ex_docmd.c:924 msgid "End of function" ! msgstr "Konec funkce" ! #: ex_docmd.c:1344 msgid "Ambiguous use of user-defined command" *************** *** 1062,1068 **** ! #: ex_docmd.c:1249 msgid "Not an editor command" ! msgstr "není příkazem editoru" ! #: ex_docmd.c:1332 msgid "Don't panic!" --- 1079,1085 ---- ! #: ex_docmd.c:1358 msgid "Not an editor command" ! msgstr "Není příkazem editoru" ! #: ex_docmd.c:1441 msgid "Don't panic!" *************** *** 1124,1130 **** ! #: ex_docmd.c:4027 msgid "E177: Count cannot be specified twice" ! msgstr "E177: opakování nemůže být zadáno dvakrát" ! #: ex_docmd.c:4037 msgid "E178: Invalid default value for count" --- 1141,1147 ---- ! #: ex_docmd.c:4203 msgid "E177: Count cannot be specified twice" ! msgstr "E177: Opakování nemůže být zadáno dvakrát" ! #: ex_docmd.c:4213 msgid "E178: Invalid default value for count" *************** *** 1172,1178 **** ! #: ex_docmd.c:5763 msgid "No swap file" ! msgstr "žádný odkládací soubor" ! #: ex_docmd.c:5867 msgid "Append File" --- 1189,1195 ---- ! #: ex_docmd.c:5815 msgid "No swap file" ! msgstr "Žádný odkládací soubor" ! #: ex_docmd.c:5919 msgid "Append File" *************** *** 1228,1234 **** ! #: ex_docmd.c:6751 msgid "E192: Recursive use of :normal too deep" ! msgstr "E192: vnoření :normal je příliš hluboké" ! #: ex_docmd.c:7119 msgid ":if nesting too deep" --- 1245,1251 ---- ! #: ex_docmd.c:6803 msgid "E192: Recursive use of :normal too deep" ! msgstr "E192: Vnoření :normal je příliš hluboké" ! #: ex_docmd.c:7171 msgid ":if nesting too deep" *************** *** 1380,1391 **** ! #: fileio.c:650 msgid "Vim: Reading from stdin...\n" ! msgstr "Vim: čtu ze standardního vstupu...\n" ! #: fileio.c:656 msgid "Reading from stdin..." ! msgstr "čtu ze standardního vstupu..." #. Re-opening the original file failed! ! #: fileio.c:880 msgid "E202: Conversion made file unreadable!" --- 1397,1408 ---- ! #: fileio.c:646 msgid "Vim: Reading from stdin...\n" ! msgstr "Vim: Čtu ze standardního vstupu...\n" ! #: fileio.c:652 msgid "Reading from stdin..." ! msgstr "Čtu ze standardního vstupu..." #. Re-opening the original file failed! ! #: fileio.c:876 msgid "E202: Conversion made file unreadable!" *************** *** 1492,1494 **** # resource fork ?! ! #: fileio.c:3012 msgid "The resource fork will be lost (use ! to override)" --- 1509,1511 ---- # resource fork ?! ! #: fileio.c:3032 msgid "The resource fork will be lost (use ! to override)" *************** *** 1508,1514 **** ! #: fileio.c:3160 msgid "E212: Can't open file for writing" ! msgstr "E212: Nelze otevřít soubor pro zápis" ! #: fileio.c:3396 msgid "Close failed" --- 1525,1531 ---- ! #: fileio.c:3180 msgid "E212: Can't open file for writing" ! msgstr "E212: Nelze otevřít soubor pro zápis" ! #: fileio.c:3423 msgid "Close failed" *************** *** 1627,1630 **** #. don't overwrite messages here #. don't use emsg() here, don't want to flush the buffers ! #: fileio.c:3850 msgid "WARNING: The file has been changed since reading it!!!" --- 1644,1648 ---- #. don't overwrite messages here + #. must give this prompt #. don't use emsg() here, don't want to flush the buffers ! #: fileio.c:3903 msgid "WARNING: The file has been changed since reading it!!!" *************** *** 1701,1703 **** ! #: fileio.c:5835 #, c-format --- 1719,1731 ---- ! #: fileio.c:5670 ! msgid "--Deleted--" ! msgstr "--Vymazáno--" ! ! #. the group doesn't exist ! #: fileio.c:5830 ! #, c-format ! msgid "E367: No such group: \"%s\"" ! msgstr "E367: Skupina \"%s\" neexistuje" ! ! #: fileio.c:5955 #, c-format *************** *** 2299,2301 **** msgid "" ! msgstr "(buffer objekt (smazán) na %8lX)" --- 2327,2329 ---- msgid "" ! msgstr "" *************** *** 2324,2326 **** msgid "" ! msgstr "(objekt okna (smazán) na %8lX)" --- 2352,2354 ---- msgid "" ! msgstr "" *************** *** 2329,2331 **** msgid "" ! msgstr "(objekt okna (neznámý) na %8lX)" --- 2357,2359 ---- msgid "" ! msgstr "" *************** *** 2334,2336 **** msgid "" ! msgstr "(okno %d)" --- 2362,2364 ---- msgid "" ! msgstr "" *************** *** 2344,2346 **** msgid "cannot save undo information" ! msgstr "nelze uložit zpětné informace" --- 2372,2374 ---- msgid "cannot save undo information" ! msgstr "nelze uložit informace pro příkaz undo" *************** *** 2451,2454 **** msgstr "" ! "Nelze se připojit k SNiFF+. Zkontrolujte proměnné (sniffemacs musí být)" ! "uvedena v $PATH.\n" --- 2479,2482 ---- msgstr "" ! "Nelze se připojit k SNiFF+. Zkontrolujte proměnné (sniffemacs musí " ! "být)uvedena v $PATH.\n" *************** *** 2564,2567 **** msgstr "" ! "Lituji, ale tento příkaz je deaktivován; knihovnu jazyka Tcl nelze " ! "nahrát." --- 2592,2594 ---- msgstr "" ! "Lituji, ale tento příkaz je deaktivován; knihovnu jazyka Tcl nelze nahrát." *************** *** 2591,2593 **** ! #: if_xcmdsrv.c:622 msgid "E249: couldn't read VIM instance registry property" --- 2618,2625 ---- ! #: if_xcmdsrv.c:714 ! #, c-format ! msgid "Invalid server id used: %s" ! msgstr "Použit chybný id serveru: %s" ! ! #: if_xcmdsrv.c:1061 msgid "E249: couldn't read VIM instance registry property" *************** *** 2595,2607 **** ! #: if_xcmdsrv.c:635 msgid "E251: VIM instance registry property is badly formed. Deleted!" ! msgstr "E251: VIM instance registry property byla špatně vytvořena" ! "a byla smazána!" ! ! #: if_xcmdsrv.c:723 ! #, c-format ! msgid "Invalid server id used: %s" ! msgstr "Použit chybný id serveru: %s" ! #: main.c:52 option.c:3102 option.c:3209 msgid "Unknown option" --- 2627,2634 ---- ! #: if_xcmdsrv.c:1072 msgid "E251: VIM instance registry property is badly formed. Deleted!" ! msgstr "" ! "E251: VIM instance registry property byla špatně vytvořenaa byla smazána!" ! #: main.c:53 option.c:3162 option.c:3269 msgid "Unknown option" *************** *** 2637,2642 **** ! #: main.c:846 main.c:853 main.c:897 memline.c:3645 memline.c:3649 ! #: version.c:808 version.c:813 version.c:818 version.c:823 version.c:828 ! #: version.c:833 version.c:839 version.c:843 version.c:847 version.c:852 ! #: version.c:859 version.c:867 version.c:873 msgid "\"\n" --- 2664,2669 ---- ! #: main.c:862 main.c:869 main.c:913 memline.c:3673 memline.c:3677 ! #: version.c:816 version.c:821 version.c:826 version.c:831 version.c:836 ! #: version.c:841 version.c:847 version.c:851 version.c:855 version.c:860 ! #: version.c:867 version.c:875 version.c:881 msgid "\"\n" *************** *** 2665,2667 **** ! #: main.c:1176 #, c-format --- 2692,2699 ---- ! #. just in case.. ! #: main.c:1171 ! msgid "pre-vimrc command line" ! msgstr "pre-vimrc příkazový řádek" ! ! #: main.c:1206 #, c-format *************** *** 2907,2918 **** ! #: main.c:2246 ! msgid "--remote \tEdit in a Vim server" ! msgstr "--remote \tEdituje na Vim serveru" ! #: main.c:2247 ! msgid "--remote-wait \tAs --remote but wait for files to end edit" ! msgstr "--remote-wait \tJako --remote, ale čeká na soubory" ! "na konci editace." ! #: main.c:2248 msgid "--remote-send \tSend to a Vim server and exit" --- 2939,2955 ---- ! #: main.c:2283 ! msgid "--socketid \tOpen Vim inside another GTK widget" ! msgstr "--socketid \tOtevře Vim uvnitř jiného GTK widgetu" ! #: main.c:2287 ! msgid "--remote \tEdit in a Vim server and exit" ! msgstr "--remote \tEdituje na Vim serveru a skončí" ! #: main.c:2288 ! msgid "" ! "--remote-wait As --remote but wait for files to have been edited" ! msgstr "" ! "--remote-wait Jako --remote, ale čeká na soubory k editaci" ! ! #: main.c:2289 msgid "--remote-send \tSend to a Vim server and exit" *************** *** 2920,2926 **** ! #: main.c:2249 ! msgid "--remote-expr \tExecute in server and print result" msgstr "--remote-expr \tProvede na serveru a zobrazí výsledek" ! #: main.c:2250 msgid "--serverlist\t\tList available Vim server names and exit" --- 2957,2963 ---- ! #: main.c:2290 ! msgid "--remote-expr \tEvaluate in a Vim server and print result" msgstr "--remote-expr \tProvede na serveru a zobrazí výsledek" ! #: main.c:2291 msgid "--serverlist\t\tList available Vim server names and exit" *************** *** 2928,2939 **** ! #: main.c:2251 msgid "--servername \tSend to/become the Vim server " ! msgstr "--servername \tZašle serveru /" ! "stane se Vim serverem " ! ! #: main.c:2254 ! msgid "--socketid \tOpen Vim inside another GTK widget" ! msgstr "--socketid \tOtevře Vim uvnitř jiného GTK widgetu" ! #: main.c:2258 msgid "-i \t\tUse instead of .viminfo" --- 2965,2972 ---- ! #: main.c:2292 msgid "--servername \tSend to/become the Vim server " ! msgstr "" ! "--servername \tZašle serveru /stane se Vim serverem " ! #: main.c:2295 msgid "-i \t\tUse instead of .viminfo" *************** *** 3009,3015 **** ! #: main.c:2284 ! msgid "-scrollbarwidth \tUse a scrollbar width of (also: -sw)" ! msgstr "-scrollbarwidth <šířku>\tNastaví <šířku> posunovací lišty (také: -sw)" ! #: main.c:2285 msgid "-menuheight \tUse a menu bar height of (also: -mh)" --- 3042,3048 ---- ! #: main.c:2321 ! msgid "-scrollbarwidth Use a scrollbar width of (also: -sw)" ! msgstr "-scrollbarwidth <šířku> Nastaví <šířku> posunovací lišty (také: -sw)" ! #: main.c:2323 msgid "-menuheight \tUse a menu bar height of (also: -mh)" *************** *** 3053,3059 **** ! #: main.c:2300 msgid "-display \tRun vim on (also: --display)" ! msgstr "-display \tspustí vim na (také --display)" ! #: main.c:2302 msgid "--help\t\tShow Gnome arguments" --- 3086,3092 ---- ! #: main.c:2339 msgid "-display \tRun vim on (also: --display)" ! msgstr "-display \tSpustí vim na (také --display)" ! #: main.c:2341 msgid "--help\t\tShow Gnome arguments" *************** *** 3061,3067 **** ! #: main.c:2494 ! msgid "\nSend failed. Trying to execute locally\n" ! msgstr "\nPředání selhalo. Zkouším provést lokálně\n" ! #: main.c:2563 msgid "Send expression failed.\n" --- 3094,3119 ---- ! #. Failed to send, abort. ! #: main.c:2566 ! msgid "" ! "\n" ! "Send failed.\n" ! msgstr "" ! "\n" ! "Předání výrazu selhalo.\n" ! #. Let vim start normally. ! #: main.c:2571 ! msgid "" ! "\n" ! "Send failed. Trying to execute locally\n" ! msgstr "" ! "\n" ! "Předání selhalo. Zkouším provést lokálně\n" ! ! #: main.c:2604 main.c:2625 ! #, c-format ! msgid "%d of %d edited" ! msgstr "%d z %d editováno" ! ! #: main.c:2648 msgid "Send expression failed.\n" *************** *** 3169,3190 **** ! #: memfile.c:958 msgid "E294: Seek error in swap file read" ! msgstr "E294: chyba posunu ukazovátka při čtení odkládacího souboru" ! #: memfile.c:963 msgid "E295: Read error in swap file" ! msgstr "E295: chyba při čtení odkládacího souboru" ! #: memfile.c:1015 msgid "E296: Seek error in swap file write" ! msgstr "E296: chyba posunu ukazovátka při ukládání do odkládacího souboru" ! #: memfile.c:1033 msgid "E297: Write error in swap file" ! msgstr "E297: chyba při ukládání do odkládacího souboru" ! #: memfile.c:1230 msgid "E300: Swap file already exists (symlink attack?)" ! msgstr "E300: Odkládací soubor již existuje! (Někdo hackuje" ! "přes nastražený symlink?)" --- 3221,3242 ---- ! #: memfile.c:972 msgid "E294: Seek error in swap file read" ! msgstr "E294: Chyba posunu ukazovátka při čtení odkládacího souboru" ! #: memfile.c:977 msgid "E295: Read error in swap file" ! msgstr "E295: Chyba při čtení odkládacího souboru" ! #: memfile.c:1029 msgid "E296: Seek error in swap file write" ! msgstr "E296: Chyba posunu ukazovátka při ukládání do odkládacího souboru" ! #: memfile.c:1047 msgid "E297: Write error in swap file" ! msgstr "E297: Chyba při ukládání do odkládacího souboru" ! #: memfile.c:1244 msgid "E300: Swap file already exists (symlink attack?)" ! msgstr "" ! "E300: Odkládací soubor již existuje! (Někdo hackujepřes nastražený symlink?)" *************** *** 3192,3194 **** msgid "E298: Didn't get block nr 0?" ! msgstr "E298: nelze získat blok 0?" --- 3244,3246 ---- msgid "E298: Didn't get block nr 0?" ! msgstr "E298: Nelze získat blok 0?" *************** *** 3196,3198 **** msgid "E298: Didn't get block nr 1?" ! msgstr "E298: nelze získat blok 1?" --- 3248,3250 ---- msgid "E298: Didn't get block nr 1?" ! msgstr "E298: Nelze získat blok 1?" *************** *** 3984,4001 **** ! #: ops.c:274 #, c-format msgid "1 line %sed %d times" ! msgstr "počet řádků posunutých %2$dkrát pomocí %1$s : 1" ! #: ops.c:279 #, c-format msgid "%ld lines %sed 1 time" ! msgstr "počet řádků posunutých jednou pomocí %2$s : %1$ld" ! #: ops.c:282 #, c-format msgid "%ld lines %sed %d times" ! msgstr "počet řádků posunutých %3$dkrát pomocí %2$s : %1$ld" ! #: ops.c:640 #, c-format --- 4036,4053 ---- ! #: ops.c:273 #, c-format msgid "1 line %sed %d times" ! msgstr "Počet řádků posunutých pomocí %s %d-krát : 1" ! #: ops.c:278 #, c-format msgid "%ld lines %sed 1 time" ! msgstr "Počet řádků: %ld (posunutých jednou pomocí %s)" ! #: ops.c:281 #, c-format msgid "%ld lines %sed %d times" ! msgstr "Počet řádků: %ld (posunutých pomocí %s %d-krát)" ! #: ops.c:638 #, c-format *************** *** 4013,4015 **** ! #: ops.c:1529 msgid "cannot yank; delete anyway" --- 4065,4068 ---- ! #. must display the prompt ! #: ops.c:1528 msgid "cannot yank; delete anyway" *************** *** 4018,4020 **** #: ops.c:2018 ! msgid "1 line ~ed" msgstr "počet řádek se změněnou velikostí písmen: 1" --- 4071,4073 ---- #: ops.c:2018 ! msgid "1 line changed" msgstr "počet řádek se změněnou velikostí písmen: 1" *************** *** 4023,4028 **** #, c-format ! msgid "%ld lines ~ed" msgstr "počet řádek se změněnou velikostí písmen: %ld" ! #: ops.c:2366 #, c-format --- 4076,4081 ---- #, c-format ! msgid "%ld lines changed" msgstr "počet řádek se změněnou velikostí písmen: %ld" ! #: ops.c:2381 #, c-format *************** *** 4519,4534 **** ! #: os_win32.c:1449 ! 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 se nevyskytuje ve Vaší $PATH.\n" ! "Externí příkazy nebudou " ! ! #: os_win32.c:1452 ! msgid "Vim Warning" ! msgstr "Varování" ! ! #: os_win32.c:2438 #, c-format --- 4572,4574 ---- ! #: os_win32.c:2489 #, c-format *************** *** 4553,4554 **** --- 4593,4607 ---- + #: os_win32.c:2988 + 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 se nevyskytuje ve Vaší $PATH.\n" + "Externí příkazy nebudou " + + #: os_win32.c:2991 + msgid "Vim Warning" + msgstr "Varování" + #: quickfix.c:281 *************** *** 5038,5041 **** #. * Ask to select a tag from the list. #. ! #: tag.c:705 msgid "Enter nr of choice ( to abort): " --- 5091,5095 ---- #. * Ask to select a tag from the list. + #. * When using ":silent" assume that was entered. #. ! #: tag.c:706 msgid "Enter nr of choice ( to abort): " *************** *** 5176,5178 **** ! #: undo.c:350 msgid "No undo possible; continue anyway" --- 5230,5233 ---- ! #. must display the prompt ! #: undo.c:351 msgid "No undo possible; continue anyway" *************** *** 5498,5504 **** ! #: version.c:937 msgid "type :help version6 for version info" ! msgstr "zadejte :help version6 pro informace verzi" ! #: version.c:940 msgid "Running in Vi compatible mode" --- 5553,5559 ---- ! #: version.c:945 msgid "type :help version6 for version info" ! msgstr "zadejte :help version6 pro informace o verzi" ! #: version.c:948 msgid "Running in Vi compatible mode" *************** *** 5579,5582 **** ! #: ../GvimExt/gvimext.cpp:874 ../GvimExt/gvimext.cpp:888 ! #: ../GvimExt/gvimext.cpp:952 msgid "gvimext.dll error" --- 5634,5637 ---- ! #: ../GvimExt/gvimext.cpp:892 ../GvimExt/gvimext.cpp:906 ! #: ../GvimExt/gvimext.cpp:970 msgid "gvimext.dll error" *************** *** 5907 **** --- 5962,5964 ---- #~ msgstr "E258: v cscope nebyla nalezena žádná shoda" + + diff -rc -C 1 ../vim60.86//src/po/de.po src/po/de.po *** ../vim60.86//src/po/de.po Sun Sep 16 20:50:40 2001 --- src/po/de.po Fri Oct 26 10:01:40 2001 *************** *** 15,18 **** "Project-Id-Version: Vim(deutsch)\n" ! "POT-Creation-Date: 2001-09-16 17:23+0200\n" ! "PO-Revision-Date: Sun, 16 Sep 2001 17:25:07 +0200\n" "Last-Translator: Johannes Zellner \n" --- 15,18 ---- "Project-Id-Version: Vim(deutsch)\n" ! "POT-Creation-Date: 2001-10-20 17:45+0200\n" ! "PO-Revision-Date: Tue, 23 Oct 2001 22:15:24 +0200\n" "Last-Translator: Johannes Zellner \n" *************** *** 188,190 **** # Ende sounds better than "Unten" ! #: buffer.c:3380 msgid "Bot" --- 188,190 ---- # Ende sounds better than "Unten" ! #: buffer.c:3389 msgid "Bot" *************** *** 193,195 **** # Anfang sounds better than "Oben" ! #: buffer.c:3382 msgid "Top" --- 193,195 ---- # Anfang sounds better than "Oben" ! #: buffer.c:3391 msgid "Top" *************** *** 205,211 **** ! #: buffer.c:4146 msgid "[Error List]" ! msgstr "[Fehler Liste]" ! #: buffer.c:4159 memline.c:1513 msgid "[No File]" --- 205,211 ---- ! #: buffer.c:4160 msgid "[Error List]" ! msgstr "[Fehlerliste]" ! #: buffer.c:4173 memline.c:1513 msgid "[No File]" *************** *** 240,250 **** ! #: diff.c:740 msgid "Patch file" ! msgstr "\"patch\" Datei" ! #: diff.c:983 msgid "E98: Cannot read diff output" ! msgstr "E98: \"diff\" Ausgabe kann nicht gelesen werden" ! #: diff.c:1696 msgid "E99: Current buffer is not in diff mode" --- 240,250 ---- ! #: diff.c:747 msgid "Patch file" ! msgstr "\"patch\"-Datei" ! #: diff.c:991 msgid "E98: Cannot read diff output" ! msgstr "E98: \"diff\"-Ausgabe kann nicht gelesen werden" ! #: diff.c:1704 msgid "E99: Current buffer is not in diff mode" *************** *** 280,282 **** msgid "E105: Using :loadkeymap not in a sourced file" ! msgstr "E105: :loadkeymap außerhalb einer eingelsenen Datei" --- 280,282 ---- msgid "E105: Using :loadkeymap not in a sourced file" ! msgstr "E105: :loadkeymap außerhalb einer eingelesenen Datei" *************** *** 623,625 **** msgid "E135: *Filter* Autocommands must not change current buffer" ! msgstr "E135: *Filter* Auto-Kommandos dürfen den aktuellen Puffer nicht ändern" --- 623,625 ---- msgid "E135: *Filter* Autocommands must not change current buffer" ! msgstr "E135: *Filter*-Auto-Kommandos dürfen den aktuellen Puffer nicht ändern" *************** *** 641,643 **** msgid "Reading viminfo file \"%s\"%s%s%s" ! msgstr "Lesen der viminfo Datei \"%s\"%s%s%s" --- 641,643 ---- msgid "Reading viminfo file \"%s\"%s%s%s" ! msgstr "Lesen der viminfo-Datei \"%s\"%s%s%s" *************** *** 658,660 **** msgid "E137: Viminfo file is not writable: %s" ! msgstr "E137: Viminfo Datei ist nicht schreibbar: %s" --- 658,660 ---- msgid "E137: Viminfo file is not writable: %s" ! msgstr "E137: Viminfo-Datei ist nicht schreibbar: %s" *************** *** 663,665 **** msgid "E138: Can't write viminfo file %s!" ! msgstr "E138: Schreiben in die viminfo Datei %s ist nicht möglich!" --- 663,665 ---- msgid "E138: Can't write viminfo file %s!" ! msgstr "E138: Schreiben in die viminfo-Datei %s ist nicht möglich!" *************** *** 668,670 **** msgid "Writing viminfo file \"%s\"" ! msgstr "Schreiben der viminfo Datei \"%s\"" --- 668,670 ---- msgid "Writing viminfo file \"%s\"" ! msgstr "Schreiben der viminfo-Datei \"%s\"" *************** *** 674,676 **** msgid "# This viminfo file was generated by Vim %s.\n" ! msgstr "# Diese viminfo Datei wurde von Vim %s generiert.\n" --- 674,676 ---- msgid "# This viminfo file was generated by Vim %s.\n" ! msgstr "# Diese viminfo-Datei wurde von Vim %s generiert.\n" *************** *** 724,726 **** msgstr "" ! "E142: Datei wurde nicht geschrieben: Schreiben ist durch die 'write' Option " "ausgeschaltet" --- 724,726 ---- msgstr "" ! "E142: Datei wurde nicht geschrieben: Schreiben ist durch die 'write'-Option " "ausgeschaltet" *************** *** 733,735 **** msgstr "" ! "'readonly' Option ist gesetzt für \"%.*s\".\n" "Möchten Sie trotzdem schreiben?" --- 733,735 ---- msgstr "" ! "'readonly'-Option ist gesetzt für \"%.*s\".\n" "Möchten Sie trotzdem schreiben?" *************** *** 1040,1047 **** ! #: ex_cmds2.c:4013 #, c-format msgid "E457: Can't read PostScript resource file \"%s\"" ! msgstr "E457: PostScript 'resource' Datei kann nicht gelesen werden" ! #: ex_cmds2.c:4211 msgid "Sending to printer..." --- 1040,1047 ---- ! #: ex_cmds2.c:4068 #, c-format msgid "E457: Can't read PostScript resource file \"%s\"" ! msgstr "E457: PostScript 'resource' Datei \"%s\" kann nicht gelesen werden" ! #: ex_cmds2.c:4266 msgid "Sending to printer..." *************** *** 1198,1205 **** ! #: ex_docmd.c:4844 #, c-format msgid "E185: Cannot find color scheme %s" ! msgstr "E185: Zeile %ld kann nicht gefunden werden" ! #: ex_docmd.c:4852 msgid "Greetings, Vim user!" --- 1198,1205 ---- ! #: ex_docmd.c:4845 #, c-format msgid "E185: Cannot find color scheme %s" ! msgstr "E185: Zeile %s kann nicht gefunden werden" ! #: ex_docmd.c:4853 msgid "Greetings, Vim user!" *************** *** 1356,1362 **** ! #: ex_getln.c:3989 msgid "'history' option is zero" ! msgstr "'history' Option ist Null" ! #: ex_getln.c:4229 #, c-format --- 1356,1362 ---- ! #: ex_getln.c:3997 msgid "'history' option is zero" ! msgstr "'history'-Option ist Null" ! #: ex_getln.c:4237 #, c-format *************** *** 1485,1487 **** msgid "Can't find temp file for conversion" ! msgstr "temporäre Datei kann nicht zum umwandeln geöffnet werden" --- 1485,1487 ---- msgid "Can't find temp file for conversion" ! msgstr "temporäre Datei kann nicht zum Umwandeln geöffnet werden" *************** *** 1521,1523 **** msgid "Close error for backup file (use ! to override)" ! msgstr "Fehler beim Schließen der Sicherungs Datei (erzwinge mit !)" --- 1521,1523 ---- msgid "Close error for backup file (use ! to override)" ! msgstr "Fehler beim Schließen der Sicherungs-Datei (erzwinge mit !)" *************** *** 1597,1599 **** msgid "E205: Patchmode: can't save original file" ! msgstr "E205: patchmode: Original Datei kann nicht gespeichert werden" --- 1597,1599 ---- msgid "E205: Patchmode: can't save original file" ! msgstr "E205: patchmode: Original-Datei kann nicht gespeichert werden" *************** *** 1717,1722 **** msgstr "" ! "W11: Achtung: Datei \"%s\" wurde verändert seit mit dem Editieren angefangen " ! "wurde" ! #: fileio.c:5051 #, c-format --- 1717,1722 ---- msgstr "" ! "W11: Achtung: Datei \"%s\" wurde verändert, seit mit dem Editieren " ! "angefangen wurde" ! #: fileio.c:5061 #, c-format *************** *** 2412,2415 **** ! #: if_python.c:2144 if_python.c:2175 if_python.c:2225 if_python.c:2285 ! #: if_python.c:2402 if_python.c:2454 if_tcl.c:673 if_tcl.c:718 if_tcl.c:792 #: if_tcl.c:862 if_tcl.c:1987 --- 2412,2415 ---- ! #: if_python.c:2171 if_python.c:2206 if_python.c:2256 if_python.c:2319 ! #: if_python.c:2439 if_python.c:2491 if_tcl.c:673 if_tcl.c:718 if_tcl.c:792 #: if_tcl.c:862 if_tcl.c:1987 *************** *** 2711,2715 **** #: main.c:862 main.c:869 main.c:913 memline.c:3673 memline.c:3677 ! #: version.c:816 version.c:821 version.c:826 version.c:831 version.c:836 ! #: version.c:841 version.c:847 version.c:851 version.c:855 version.c:860 ! #: version.c:867 version.c:875 version.c:881 msgid "\"\n" --- 2711,2715 ---- #: main.c:862 main.c:869 main.c:913 memline.c:3673 memline.c:3677 ! #: version.c:846 version.c:851 version.c:856 version.c:861 version.c:866 ! #: version.c:871 version.c:877 version.c:881 version.c:885 version.c:890 ! #: version.c:897 version.c:905 version.c:911 msgid "\"\n" *************** *** 2932,2938 **** ! #: main.c:2257 msgid "-o[N]\t\tOpen N windows (default: one for each file)" ! msgstr "-o[N]\t\tOffne N Fenster (Vorgabe: einzeln für jede Datei)" ! #: main.c:2258 msgid "-O[N]\t\tlike -o but split vertically" --- 2932,2938 ---- ! #: main.c:2262 msgid "-o[N]\t\tOpen N windows (default: one for each file)" ! msgstr "-o[N]\t\tÖffne N Fenster (Vorgabe: einzeln für jede Datei)" ! #: main.c:2263 msgid "-O[N]\t\tlike -o but split vertically" *************** *** 3152,3158 **** ! #: main.c:2558 ! msgid "Send failed. Trying to execute locally\n" ! msgstr "Schicken schlug fehl. Versuche lokal auszuführen\n" ! #: main.c:2591 main.c:2612 #, c-format --- 3152,3168 ---- ! #. Failed to send, abort. ! #: main.c:2566 ! msgid "" ! "\n" ! "Send failed.\n" ! msgstr "\nSchicken des Ausdrucks schlug fehl.\n" ! #. Let vim start normally. ! #: main.c:2571 ! msgid "" ! "\n" ! "Send failed. Trying to execute locally\n" ! msgstr "\nSchicken schlug fehl. Versuche lokal auszuführen\n" ! ! #: main.c:2604 main.c:2625 #, c-format *************** *** 3414,3416 **** msgid "E310: Block 1 ID wrong (%s not a .swp file?)" ! msgstr "E310: Block 1 ID falsch (ist %s keine .swp Datei?)" --- 3424,3426 ---- msgid "E310: Block 1 ID wrong (%s not a .swp file?)" ! msgstr "E310: Block 1 ID falsch (ist %s keine .swp-Datei?)" *************** *** 3464,3466 **** msgstr "" ! "Löschen Sie die .swp Datei danach.\n" "\n" --- 3474,3476 ---- msgstr "" ! "Löschen Sie die .swp-Datei danach.\n" "\n" *************** *** 3586,3588 **** msgid "E313: Cannot preserve, there is no swap file" ! msgstr "E313: Kann nicht absichern, es gibt keine Auslagerungs Datei" --- 3596,3598 ---- msgid "E313: Cannot preserve, there is no swap file" ! msgstr "E313: Kann nicht absichern, es gibt keine Auslagerungs-Datei" *************** *** 4078,4080 **** # Identifizierungszeichen/merkmal, Bezeichner ! #: normal.c:2995 msgid "E349: No identifier under cursor" --- 4088,4090 ---- # Identifizierungszeichen/merkmal, Bezeichner ! #: normal.c:3011 msgid "E349: No identifier under cursor" *************** *** 4127,4135 **** ! #: ops.c:2019 ! msgid "1 line ~ed" msgstr "1 Zeile ~" ! #: ops.c:2021 #, c-format ! msgid "%ld lines ~ed" msgstr "%ld Zeilen ~" --- 4137,4145 ---- ! #: ops.c:2018 ! msgid "1 line changed" msgstr "1 Zeile ~" ! #: ops.c:2020 #, c-format ! msgid "%ld lines changed" msgstr "%ld Zeilen ~" *************** *** 4143,4145 **** msgid "1 line yanked" ! msgstr "%ld Zeile kopiert" --- 4153,4155 ---- msgid "1 line yanked" ! msgstr "Eine Zeile kopiert" *************** *** 4206,4212 **** ! #: option.c:1978 msgid "Thanks for flying Vim" ! msgstr "Dankte für die Benutzung von Vim" ! #: option.c:3161 msgid "Option not supported" --- 4216,4222 ---- ! #: option.c:1989 msgid "Thanks for flying Vim" ! msgstr "Danke für die Benutzung von Vim" ! #: option.c:3175 msgid "Option not supported" *************** *** 4285,4287 **** # what's the difference ? ! #: option.c:4720 msgid "can't select fontset" --- 4295,4297 ---- # what's the difference ? ! #: option.c:4734 msgid "can't select fontset" *************** *** 4320,4322 **** # XXX ! #: option.c:5385 msgid "Unclosed expression sequence" --- 4330,4332 ---- # XXX ! #: option.c:5400 msgid "Unclosed expression sequence" *************** *** 4520,4522 **** msgid "E366: Invalid 'osfiletype' option - using Text" ! msgstr "E366: Unzulässige 'filetype' Option - verwende Text" --- 4530,4532 ---- msgid "E366: Invalid 'osfiletype' option - using Text" ! msgstr "E366: Unzulässige 'filetype'-Option - verwende Text" *************** *** 4629,4645 **** ! #: os_win32.c:1473 ! 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 wurde im Pfad $PATH nicht gefunden.\n" ! "Externe Befehle werden nach Ausführung nicht anhalten.\n" ! "Siehe :help win32-vimrun für mehr Information." ! ! #: os_win32.c:1476 ! msgid "Vim Warning" ! msgstr "Vim Warnung" ! ! #: os_win32.c:2457 #, c-format --- 4639,4641 ---- ! #: os_win32.c:2489 #, c-format *************** *** 4664,4665 **** --- 4660,4675 ---- + #: os_win32.c:2988 + 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 wurde im Pfad $PATH nicht gefunden.\n" + "Externe Befehle werden nach Ausführung nicht anhalten.\n" + "Siehe :help win32-vimrun für mehr Information." + + #: os_win32.c:2991 + msgid "Vim Warning" + msgstr "Vim Warnung" + #: quickfix.c:281 *************** *** 4729,4731 **** msgid "E382: Cannot write, 'buftype' option is set" ! msgstr "E382: Kann nicht schreiben, 'buftype' Option ist gesetzt" --- 4739,4741 ---- msgid "E382: Cannot write, 'buftype' option is set" ! msgstr "E382: Kann nicht schreiben, 'buftype'-Option ist gesetzt" *************** *** 4810,4812 **** # gibts schon ... ! #: screen.c:7418 msgid " (paste)" --- 4820,4822 ---- # gibts schon ... ! #: screen.c:7459 msgid " (paste)" *************** *** 5520,5566 **** ! #: version.c:814 msgid " system vimrc file: \"" ! msgstr " System vimrc Datei: \"" ! #: version.c:819 msgid " user vimrc file: \"" ! msgstr " System vimrc Datei: \"" ! #: version.c:824 msgid " 2nd user vimrc file: \"" ! msgstr " zweite Nutzer vimrc Datei: \"" ! #: version.c:829 msgid " 3rd user vimrc file: \"" ! msgstr " dritte Nutzer vimrc Datei: \"" ! #: version.c:834 msgid " user exrc file: \"" ! msgstr " Nutzer exrc Datei: \"" ! #: version.c:839 msgid " 2nd user exrc file: \"" ! msgstr " zweite Nutzer vimrc Datei: \"" ! #: version.c:845 msgid " system gvimrc file: \"" ! msgstr " System gvimrc Datei: \"" ! #: version.c:849 msgid " user gvimrc file: \"" ! msgstr " Nutzer gvimrc Datei: \"" ! #: version.c:853 msgid "2nd user gvimrc file: \"" ! msgstr "zweite Nutzer gvimrc Datei: \"" ! #: version.c:858 msgid "3rd user gvimrc file: \"" ! msgstr "dritte Nutzer vimrc Datei: \"" ! #: version.c:865 msgid " system menu file: \"" ! msgstr " System Menü-Datei: \"" ! #: version.c:873 msgid " fall-back for $VIM: \"" --- 5530,5576 ---- ! #: version.c:844 msgid " system vimrc file: \"" ! msgstr " System-vimrc-Datei: \"" ! #: version.c:849 msgid " user vimrc file: \"" ! msgstr " System-vimrc-Datei: \"" ! #: version.c:854 msgid " 2nd user vimrc file: \"" ! msgstr " zweite Nutzer-vimrc-Datei: \"" ! #: version.c:859 msgid " 3rd user vimrc file: \"" ! msgstr " dritte Nutzer-vimrc-Datei: \"" ! #: version.c:864 msgid " user exrc file: \"" ! msgstr " Nutzer-exrc-Datei: \"" ! #: version.c:869 msgid " 2nd user exrc file: \"" ! msgstr " zweite Nutzer-vimrc-Datei: \"" ! #: version.c:875 msgid " system gvimrc file: \"" ! msgstr " System-gvimrc-Datei: \"" ! #: version.c:879 msgid " user gvimrc file: \"" ! msgstr " Nutzer-gvimrc-Datei: \"" ! #: version.c:883 msgid "2nd user gvimrc file: \"" ! msgstr "zweite Nutzer-gvimrc-Datei: \"" ! #: version.c:888 msgid "3rd user gvimrc file: \"" ! msgstr "dritte Nutzer-vimrc-Datei: \"" ! #: version.c:895 msgid " system menu file: \"" ! msgstr " System-Menü-Datei: \"" ! #: version.c:903 msgid " fall-back for $VIM: \"" *************** *** 5584,5590 **** ! #: version.c:899 msgid " DEBUG BUILD" ! msgstr " DEBUG VERSION" ! #: version.c:934 msgid "VIM - Vi IMproved" --- 5594,5600 ---- ! #: version.c:929 msgid " DEBUG BUILD" ! msgstr " DEBUG-VERSION" ! #: version.c:964 msgid "VIM - Vi IMproved" *************** *** 5670,5672 **** # Cursor: Schreibmarke Positionsmarke ! #: window.c:4340 msgid "E446: No file name under cursor" --- 5680,5682 ---- # Cursor: Schreibmarke Positionsmarke ! #: window.c:4341 msgid "E446: No file name under cursor" *************** *** 5704,5707 **** ! #: ../GvimExt/gvimext.cpp:874 ../GvimExt/gvimext.cpp:888 ! #: ../GvimExt/gvimext.cpp:952 msgid "gvimext.dll error" --- 5714,5717 ---- ! #: ../GvimExt/gvimext.cpp:892 ../GvimExt/gvimext.cpp:906 ! #: ../GvimExt/gvimext.cpp:970 msgid "gvimext.dll error" *************** *** 5811,5817 **** ! #: globals.h:1048 msgid "E23: No alternate file" ! msgstr "E23: Keine Alternative Datei" ! #: globals.h:1049 msgid "E24: No such abbreviation" --- 5821,5827 ---- ! #: globals.h:1050 msgid "E23: No alternate file" ! msgstr "E23: Keine alternative Datei" ! #: globals.h:1051 msgid "E24: No such abbreviation" *************** *** 5896,5902 **** ! #: globals.h:1077 msgid "Can't get temp file name" ! msgstr "temp Datei kann nicht erzeugt werden" ! #: globals.h:1078 #, c-format --- 5906,5912 ---- ! #: globals.h:1079 msgid "Can't get temp file name" ! msgstr "temp-Datei kann nicht erzeugt werden" ! #: globals.h:1080 #, c-format *************** *** 5983,5989 **** ! #: globals.h:1113 msgid "E72: Close error on swap file" ! msgstr "E72: Fehler bin Schließen der Auslagerungs-Datei" ! #: globals.h:1114 msgid "E73: tag stack empty" --- 5993,5999 ---- ! #: globals.h:1115 msgid "E72: Close error on swap file" ! msgstr "E72: Fehler beim Schließen der Auslagerungs-Datei" ! #: globals.h:1116 msgid "E73: tag stack empty" *************** *** 6027,6031 **** ! #: globals.h:1125 msgid "E81: Using not in a script context" ! msgstr "E81: wurde nicht in einer Skript-Umbebung benutzt" --- 6037,6041 ---- ! #: globals.h:1127 msgid "E81: Using not in a script context" ! msgstr "E81: wurde nicht in einer Skript-Umgebung benutzt" *************** *** 6507,6511 **** #~ msgstr "1 Zeile zum Einrücken... " - - #~ msgid "%ld line ~ed" - #~ msgstr "%ld Zeile ~ed" --- 6517,6518 ---- diff -rc -C 1 ../vim60.86//src/po/es.po src/po/es.po *** ../vim60.86//src/po/es.po Wed Sep 19 17:11:20 2001 --- src/po/es.po Sun Nov 4 18:31:22 2001 *************** *** 11,14 **** "Project-Id-Version: Vim 6.0 (Espańol)\n" ! "POT-Creation-Date: 2001-09-18 20:27+0200\n" ! "PO-Revision-Date: 2001-09-18 20:34:11+CEST\n" "Last-Translator: Eduardo F. Amatria \n" --- 11,14 ---- "Project-Id-Version: Vim 6.0 (Espańol)\n" ! "POT-Creation-Date: 2001-11-04 17:17+0100\n" ! "PO-Revision-Date: 2001-11-04 17:33:55+CEST\n" "Last-Translator: Eduardo F. Amatria \n" *************** *** 139,145 **** ! #: buffer.c:2484 msgid "[Read errors]" ! msgstr "[Error de lectura]" ! #: buffer.c:2486 fileio.c:1754 msgid "[readonly]" --- 139,145 ---- ! #: buffer.c:2492 msgid "[Read errors]" ! msgstr "[Errores de lectura]" ! #: buffer.c:2494 fileio.c:1754 msgid "[readonly]" *************** *** 162,169 **** ! #: buffer.c:2598 msgid "[No file]" ! msgstr "[Sin título]" #. must be a help buffer ! #: buffer.c:2638 msgid "help" --- 162,169 ---- ! #: buffer.c:2606 msgid "[No file]" ! msgstr "[Sin fichero]" #. must be a help buffer ! #: buffer.c:2646 msgid "help" *************** *** 203,209 **** ! #: buffer.c:4165 memline.c:1513 msgid "[No File]" ! msgstr "[Sin título]" ! #: buffer.c:4385 msgid "" --- 203,213 ---- ! #: buffer.c:4169 ! msgid "[Scratch]" ! msgstr "[Borrador]" ! ! #: buffer.c:4173 memline.c:1513 msgid "[No File]" ! msgstr "[Sin fichero]" ! #: buffer.c:4393 msgid "" *************** *** 273,276 **** #: digraph.c:2367 ! #~ msgid "E105: Using :loadkeymap not in a sourced file" ! #~ msgstr "" --- 277,280 ---- #: digraph.c:2367 ! msgid "E105: Using :loadkeymap not in a sourced file" ! msgstr "E105: Usando :loadkeymap en un fichero que no es Ťsourceť" *************** *** 512,519 **** ! #: eval.c:7519 #, c-format msgid "E124: Missing '(': %s" ! msgstr "E124: Falta Ť(ť: %S" ! #: eval.c:7551 #, c-format --- 516,523 ---- ! #: eval.c:7524 #, c-format msgid "E124: Missing '(': %s" ! msgstr "E124: Falta Ť(ť: %s" ! #: eval.c:7556 #, c-format *************** *** 2135,2139 **** ! #: gui_x11.c:3250 msgid "E255: Couldn't read in sign data!" ! msgstr "E255: Ąno se pudo leer el signo de los datos!" --- 2139,2143 ---- ! #: gui_x11.c:3256 msgid "E255: Couldn't read in sign data!" ! msgstr "E255: Ąno se pudo leer el signo de los datos!" *************** *** 2400,2403 **** ! #: if_python.c:2144 if_python.c:2175 if_python.c:2225 if_python.c:2285 ! #: if_python.c:2402 if_python.c:2454 if_tcl.c:673 if_tcl.c:718 if_tcl.c:792 #: if_tcl.c:862 if_tcl.c:1987 --- 2404,2407 ---- ! #: if_python.c:2171 if_python.c:2206 if_python.c:2256 if_python.c:2319 ! #: if_python.c:2439 if_python.c:2491 if_tcl.c:673 if_tcl.c:718 if_tcl.c:792 #: if_tcl.c:862 if_tcl.c:1987 *************** *** 2696,2700 **** #: main.c:862 main.c:869 main.c:913 memline.c:3673 memline.c:3677 ! #: version.c:816 version.c:821 version.c:826 version.c:831 version.c:836 ! #: version.c:841 version.c:847 version.c:851 version.c:855 version.c:860 ! #: version.c:867 version.c:875 version.c:881 msgid "\"\n" --- 2700,2704 ---- #: main.c:862 main.c:869 main.c:913 memline.c:3673 memline.c:3677 ! #: version.c:922 version.c:927 version.c:932 version.c:937 version.c:942 ! #: version.c:947 version.c:953 version.c:957 version.c:961 version.c:966 ! #: version.c:973 version.c:981 version.c:987 msgid "\"\n" *************** *** 2725,2727 **** #: main.c:1171 - #, fuzzy #~ msgid "pre-vimrc command line" --- 2729,2730 ---- *************** *** 4407,4409 **** msgid "Need %s version %ld\n" ! msgstr "Se necesita la versión %ld\n" --- 4410,4412 ---- msgid "Need %s version %ld\n" ! msgstr "Se necesita %s versión %ld\n" *************** *** 4714,4716 **** msgid "error list %d of %d; %d errors" ! msgstr "lista de errores %d de %d: % errores" --- 4717,4719 ---- msgid "error list %d of %d; %d errors" ! msgstr "lista de errores %d de %d: %d errores" *************** *** 4898,4905 **** ! #: syntax.c:2986 #, c-format msgid "E390: Illegal argument: %s" ! msgstr "E390: Argumento ilegal" ! #: syntax.c:3163 #, c-format --- 4901,4908 ---- ! #: syntax.c:2998 #, c-format msgid "E390: Illegal argument: %s" ! msgstr "E390: Argumento ilegal: %s" ! #: syntax.c:3176 #, c-format *************** *** 5102,5109 **** ! #: syntax.c:6728 #, c-format msgid "E423: Illegal argument: %s" ! msgstr "E423: Argumento ilegal" ! #: syntax.c:7257 msgid "E424: Too many different highlighting attributes in use" --- 5105,5112 ---- ! #: syntax.c:6766 #, c-format msgid "E423: Illegal argument: %s" ! msgstr "E423: Argumento ilegal: %s" ! #: syntax.c:7295 msgid "E424: Too many different highlighting attributes in use" *************** *** 5126,5128 **** msgid "E426: tag not found: %s" ! msgstr "E426: Ťtagť no encontrado" --- 5129,5131 ---- msgid "E426: tag not found: %s" ! msgstr "E426: Ťtagť no encontrado: %s" *************** *** 5231,5237 **** ! #: term.c:1723 msgid "' not known. Available builtin terminals are:" ! msgstr "' desconocido. Los terminales incorporadas disponibles son:" ! #: term.c:1747 #~ msgid "defaulting to '" --- 5234,5240 ---- ! #: term.c:1725 msgid "' not known. Available builtin terminals are:" ! msgstr "' desconocido. Los terminales incorporados disponibles son:" ! #: term.c:1749 #~ msgid "defaulting to '" *************** *** 5398,5402 **** "\n" ! "Remiendos incluidos: " ! #: version.c:728 msgid "" --- 5401,5405 ---- "\n" ! "Parches incluidos: " ! #: version.c:834 msgid "" *************** *** 5616,5618 **** ! #: version.c:990 msgid "WARNING: Windows 95/98/ME detected" --- 5619,5647 ---- ! #: version.c:1069 ! msgid "menu Help->Orphans for information " ! msgstr "menú Ayuda->Huérfanos para más información " ! ! #: version.c:1071 ! msgid "Running modeless, typed text is inserted" ! msgstr "Ejecutándose sin modo, el texto escrito se inserta" ! ! #: version.c:1072 ! msgid "menu Edit->Global Settings->Toggle Insert Mode " ! msgstr "menu Editar->Opciones globales->Activar/Desactivar modo de inserción" ! ! #: version.c:1073 ! msgid " for two modes " ! msgstr " para dos modos " ! ! #: version.c:1077 ! msgid "menu Edit->Global Settings->Toggle Vi Compatible" ! msgstr "" ! "menu Editar->Opciones globales->Activar/Desactivar compatibilidad con Vi" ! ! #: version.c:1078 ! msgid " for Vim defaults " ! msgstr "" ! " para los valores predeterminados de Vim" ! ! #: version.c:1124 msgid "WARNING: Windows 95/98/ME detected" *************** *** 5999,6001 **** ! #: globals.h:1125 msgid "E81: Using not in a script context" --- 6028,6030 ---- ! #: globals.h:1129 msgid "E81: Using not in a script context" diff -rc -C 1 ../vim60.86//src/po/fr.po src/po/fr.po *** ../vim60.86//src/po/fr.po Fri Aug 31 20:02:44 2001 --- src/po/fr.po Fri Oct 26 10:01:41 2001 *************** *** 12,15 **** "PO-Revision-Date: Sun, 25 Mar 2001 05:22:44 +0200\n" "Last-Translator: DindinX \n" ! "Language-Team: MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO_8859-1\n" --- 12,16 ---- "PO-Revision-Date: Sun, 25 Mar 2001 05:22:44 +0200\n" + "Language-Team: DindinX \n" "Last-Translator: DindinX \n" ! "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO_8859-1\n" *************** *** 848,850 **** msgid "E157: Invalid sign ID: %ld" ! msgstr "E157 : ID de signature invalide : %s" --- 849,851 ---- msgid "E157: Invalid sign ID: %ld" ! msgstr "E157 : ID de signature invalide : %ld" *************** *** 3906,3908 **** #: ops.c:1923 ! msgid "1 line ~ed" msgstr "1 ligne ~" --- 3907,3909 ---- #: ops.c:1923 ! msgid "1 line changed" msgstr "1 ligne ~" *************** *** 3911,3913 **** #, c-format ! msgid "%ld lines ~ed" msgstr "%ld lignes ~" --- 3912,3914 ---- #, c-format ! msgid "%ld lines changed" msgstr "%ld lignes ~" diff -rc -C 1 ../vim60.86//src/po/it.po src/po/it.po *** ../vim60.86//src/po/it.po Mon Sep 17 11:05:37 2001 --- src/po/it.po Sun Oct 28 16:32:17 2001 *************** *** 14,17 **** "Project-Id-Version: vim 6.0\n" ! "POT-Creation-Date: 2001-09-17 11:11+0200\n" ! "PO-Revision-Date: 2001-09-17 22:22+0200\n" "Last-Translator: Antonio Colombo \n" --- 14,17 ---- "Project-Id-Version: vim 6.0\n" ! "POT-Creation-Date: 2001-09-29 15:28+0200\n" ! "PO-Revision-Date: 2001-10-29 22:22+0200\n" "Last-Translator: Antonio Colombo \n" *************** *** 222,227 **** ! #: buffer.c:4401 #, c-format msgid " line=%ld id=%d name=%s" ! msgstr " linea=%ld id=%d, nome=%d" --- 222,227 ---- ! #: buffer.c:4409 #, c-format msgid " line=%ld id=%d name=%s" ! msgstr " linea=%ld id=%d, nome=%s" *************** *** 230,234 **** msgid "E96: Can not diff more than %ld buffers" ! msgstr "E96: Non riesco a trovare differenze fra piů di %ld buffer" ! #: diff.c:641 msgid "E97: Cannot create diffs" --- 230,234 ---- msgid "E96: Can not diff more than %ld buffers" ! msgstr "E96: Non supporto differenze fra piů di %ld buffer" ! #: diff.c:648 msgid "E97: Cannot create diffs" *************** *** 2067,2079 **** ! #: gui_x11.c:1987 #, c-format msgid "E250: Fonts for the following charsets are missing in fontset %s:" ! msgstr "E250: Mancano Font per i seguenti set di caratteri:" ! #: gui_x11.c:2030 #, c-format msgid "E252: Fontset name: %s" ! msgstr "E252: Nome del fontset: %s" ! #: gui_x11.c:2031 #, c-format --- 2067,2079 ---- ! #: gui_x11.c:1992 #, c-format msgid "E250: Fonts for the following charsets are missing in fontset %s:" ! msgstr "E250: Mancano descrizioni per i seguenti caratteri nel font: %s" ! #: gui_x11.c:2035 #, c-format msgid "E252: Fontset name: %s" ! msgstr "E252: Nome fontset: %s" ! #: gui_x11.c:2036 #, c-format *************** *** 3116,3119 **** #. Failed to send, abort. ! #: main.c:2561 ! #, fuzzy msgid "" --- 3116,3118 ---- #. Failed to send, abort. ! #: main.c:2566 msgid "" *************** *** 3121,3123 **** "Send failed.\n" ! msgstr "" "\n" --- 3120,3122 ---- "Send failed.\n" ! msgstr "" "\n" *************** *** 4097,4099 **** #: ops.c:2018 ! msgid "1 line ~ed" msgstr "1 linea ~a" --- 4096,4098 ---- #: ops.c:2018 ! msgid "1 line changed" msgstr "1 linea ~a" *************** *** 4102,4104 **** #, c-format ! msgid "%ld lines ~ed" msgstr "%ld linee ~e" --- 4101,4103 ---- #, c-format ! msgid "%ld lines changed" msgstr "%ld linee ~e" *************** *** 4456,4468 **** ! #: os_mswin.c:1381 #, c-format msgid "to %s on %s" ! msgstr "a %d su %s" ! #: os_mswin.c:1442 os_mswin.c:1452 #, c-format msgid "E238: Print error: %s" ! msgstr "E238: Errore in stampa: %s" ! #: os_mswin.c:1452 msgid "Unknown" --- 4455,4467 ---- ! #: os_mswin.c:1388 #, c-format msgid "to %s on %s" ! msgstr "a %s su %s" ! #: os_mswin.c:1449 os_mswin.c:1459 #, c-format msgid "E238: Print error: %s" ! msgstr "E238: Errore durante stampa: %s" ! #: os_mswin.c:1460 msgid "Unknown" *************** *** 5244,5246 **** #. Highlight title ! #: term.c:4872 msgid "" --- 5243,5245 ---- #. Highlight title ! #: term.c:4878 msgid "" diff -rc -C 1 ../vim60.86//src/po/ja.po src/po/ja.po *** ../vim60.86//src/po/ja.po Mon Sep 17 02:45:20 2001 --- src/po/ja.po Fri Oct 26 14:21:11 2001 *************** *** 6,8 **** # Muraoka Taro , 2001. ! # Last Change: 17-Sep-2001. # --- 6,8 ---- # Muraoka Taro , 2001. ! # Last Change: 26-Oct-2001. # *************** *** 12,14 **** "POT-Creation-Date: 2001-09-17 09:41+0900\n" ! "PO-Revision-Date: 2001-09-17 10:00+0900\n" "Last-Translator: Muraoka Taro \n" --- 12,14 ---- "POT-Creation-Date: 2001-09-17 09:41+0900\n" ! "PO-Revision-Date: 2001-10-26 19:00+0900\n" "Last-Translator: Muraoka Taro \n" *************** *** 630,632 **** msgid "Reading viminfo file \"%s\"%s%s%s" ! msgstr "viminfoĽŐĽĄĽ¤Ľë \"%s\"%s%s ¤ňĆɤߚţ¤ßĂć " --- 630,632 ---- msgid "Reading viminfo file \"%s\"%s%s%s" ! msgstr "viminfoĽŐĽĄĽ¤Ľë \"%s\"%s%s%s ¤ňĆɤߚţ¤ßĂć " *************** *** 2053,2055 **** msgid "E250: Fonts for the following charsets are missing in fontset %s:" ! msgstr "E250: °Ę˛ź¤ÎʸťúĽťĽĂĽČ¤ÎĽŐĽŠĽóĽČ¤Ź¤˘¤ę¤Ţ¤ť¤ó" --- 2053,2055 ---- msgid "E250: Fonts for the following charsets are missing in fontset %s:" ! msgstr "E250: °Ę˛ź¤ÎʸťúĽťĽĂĽČ¤ÎĽŐĽŠĽóĽČ¤Ź¤˘¤ę¤Ţ¤ť¤ó %s:" *************** *** 4070,4072 **** #: ops.c:2018 ! msgid "1 line ~ed" msgstr "1 šÔ¤ň ~ ¤Ç˝čÍý¤ˇ¤Ţ¤ˇ¤ż" --- 4070,4072 ---- #: ops.c:2018 ! msgid "1 line changed" msgstr "1 šÔ¤ň ~ ¤Ç˝čÍý¤ˇ¤Ţ¤ˇ¤ż" *************** *** 4075,4077 **** #, c-format ! msgid "%ld lines ~ed" msgstr "%ld šÔ¤ň ~ ¤Ç˝čÍý¤ˇ¤Ţ¤ˇ¤ż" --- 4075,4077 ---- #, c-format ! msgid "%ld lines changed" msgstr "%ld šÔ¤ň ~ ¤Ç˝čÍý¤ˇ¤Ţ¤ˇ¤ż" diff -rc -C 1 ../vim60.86//src/po/ja.sjis.po src/po/ja.sjis.po *** ../vim60.86//src/po/ja.sjis.po Wed Sep 26 18:07:46 2001 --- src/po/ja.sjis.po Fri Oct 26 14:21:15 2001 *************** *** 6,8 **** # Muraoka Taro , 2001. ! # Last Change: 17-Sep-2001. # --- 6,8 ---- # Muraoka Taro , 2001. ! # Last Change: 26-Oct-2001. # *************** *** 12,14 **** "POT-Creation-Date: 2001-09-17 09:41+0900\n" ! "PO-Revision-Date: 2001-09-17 10:00+0900\n" "Last-Translator: Muraoka Taro \n" --- 12,14 ---- "POT-Creation-Date: 2001-09-17 09:41+0900\n" ! "PO-Revision-Date: 2001-10-26 19:00+0900\n" "Last-Translator: Muraoka Taro \n" *************** *** 630,632 **** msgid "Reading viminfo file \"%s\"%s%s%s" ! msgstr "viminfoƒtƒ@ƒCƒ‹ \"%s\"%s%s ‚đ“ǂݍž‚Ý’† " --- 630,632 ---- msgid "Reading viminfo file \"%s\"%s%s%s" ! msgstr "viminfoƒtƒ@ƒCƒ‹ \"%s\"%s%s%s ‚đ“ǂݍž‚Ý’† " *************** *** 2053,2055 **** msgid "E250: Fonts for the following charsets are missing in fontset %s:" ! msgstr "E250: ˆČ‰ş‚Ě•śŽšƒZƒbƒg‚ĚƒtƒHƒ“ƒg‚Ş‚ ‚č‚Ü‚š‚ń" --- 2053,2055 ---- msgid "E250: Fonts for the following charsets are missing in fontset %s:" ! msgstr "E250: ˆČ‰ş‚Ě•śŽšƒZƒbƒg‚ĚƒtƒHƒ“ƒg‚Ş‚ ‚č‚Ü‚š‚ń %s:" *************** *** 4070,4072 **** #: ops.c:2018 ! msgid "1 line ~ed" msgstr "1 s‚đ ~ ‚ŏˆ—‚ľ‚Ü‚ľ‚˝" --- 4070,4072 ---- #: ops.c:2018 ! msgid "1 line changed" msgstr "1 s‚đ ~ ‚ŏˆ—‚ľ‚Ü‚ľ‚˝" *************** *** 4075,4077 **** #, c-format ! msgid "%ld lines ~ed" msgstr "%ld s‚đ ~ ‚ŏˆ—‚ľ‚Ü‚ľ‚˝" --- 4075,4077 ---- #, c-format ! msgid "%ld lines changed" msgstr "%ld s‚đ ~ ‚ŏˆ—‚ľ‚Ü‚ľ‚˝" diff -rc -C 1 ../vim60.86//src/po/ko.po src/po/ko.po *** ../vim60.86//src/po/ko.po Sat Sep 15 14:58:09 2001 --- src/po/ko.po Thu Nov 1 11:57:35 2001 *************** *** 7,10 **** "Project-Id-Version: vim 6.0\n" ! "POT-Creation-Date: 2001-08-06 11:39+0900\n" ! "PO-Revision-Date: 2001-08-06 02:43+0900\n" "Last-Translator: Nam SungHyun \n" --- 7,10 ---- "Project-Id-Version: vim 6.0\n" ! "POT-Creation-Date: 2001-11-01 19:30+0900\n" ! "PO-Revision-Date: 2001-11-01 10:45+0900\n" "Last-Translator: Nam SungHyun \n" *************** *** 15,21 **** ! #: buffer.c:98 msgid "E82: Cannot allocate any buffer, exiting..." ! msgstr "E82: šöĆ۸Ś ÇŇ´çÇŇ źö žřžîź­ ÁžˇáÇŐ´Ď´Ů..." ! #: buffer.c:101 msgid "E83: Cannot allocate buffer, using other one..." --- 15,21 ---- ! #: buffer.c:97 msgid "E82: Cannot allocate any buffer, exiting..." ! msgstr "E82: šöĆ۸Ś ÇŇ´çÇŇ źö žřžîź­ łĄłŔ´Ď´Ů..." ! #: buffer.c:100 msgid "E83: Cannot allocate buffer, using other one..." *************** *** 27,64 **** ! #: buffer.c:699 msgid "No buffers were deleted" ! msgstr "ťčÁŚľČ šöĆŰ°Ą žř˝Ŕ´Ď´Ů" ! #: buffer.c:701 msgid "No buffers were wiped out" ! msgstr "żĎŔüČ÷ ťčÁŚľČ šöĆŰ°Ą žř˝Ŕ´Ď´Ů" ! #: buffer.c:709 msgid "1 buffer unloaded" ! msgstr "1 šöĆŰ°Ą łťˇÁÁł˝Ŕ´Ď´Ů" ! #: buffer.c:711 #, c-format msgid "%d buffers unloaded" ! msgstr "%d šöĆŰľéŔĚ łťˇÁÁł˝Ŕ´Ď´Ů" ! #: buffer.c:716 msgid "1 buffer deleted" ! msgstr "1 šöĆŰ°Ą ťčÁŚľÇžú˝Ŕ´Ď´Ů" ! #: buffer.c:718 #, c-format msgid "%d buffers deleted" ! msgstr "%d šöĆŰľéŔĚ ťčÁŚľÇžú˝Ŕ´Ď´Ů" ! #: buffer.c:723 msgid "1 buffer wiped out" ! msgstr "1 šöĆŰ°Ą żĎŔüČ÷ ťčÁŚľÇžú˝Ŕ´Ď´Ů" ! #: buffer.c:725 #, c-format msgid "%d buffers wiped out" ! msgstr "%d šöĆŰľéŔĚ żĎŔüČ÷ ťčÁŚľÇžú˝Ŕ´Ď´Ů" ! #: buffer.c:782 msgid "E84: No modified buffer found" --- 27,64 ---- ! #: buffer.c:700 msgid "No buffers were deleted" ! msgstr "ÁöżöÁř šöĆŰ°Ą žř˝Ŕ´Ď´Ů" ! #: buffer.c:702 msgid "No buffers were wiped out" ! msgstr "żĎŔüČ÷ ÁöżöÁř šöĆŰ°Ą žř˝Ŕ´Ď´Ů" ! #: buffer.c:710 msgid "1 buffer unloaded" ! msgstr "šöĆŰ ÇŃ °ł°Ą łťˇÁÁł˝Ŕ´Ď´Ů" ! #: buffer.c:712 #, c-format msgid "%d buffers unloaded" ! msgstr "šöĆŰ %d °ł°Ą łťˇÁÁł˝Ŕ´Ď´Ů" ! #: buffer.c:717 msgid "1 buffer deleted" ! msgstr "šöĆŰ ÇŃ °ł°Ą ÁöżöÁł˝Ŕ´Ď´Ů" ! #: buffer.c:719 #, c-format msgid "%d buffers deleted" ! msgstr "šöĆŰ %d °ł°Ą ÁöżöÁł˝Ŕ´Ď´Ů" ! #: buffer.c:724 msgid "1 buffer wiped out" ! msgstr "šöĆŰ ÇŃ °ł°Ą żĎŔüČ÷ ÁöżöÁł˝Ŕ´Ď´Ů" ! #: buffer.c:726 #, c-format msgid "%d buffers wiped out" ! msgstr "šöĆŰ %d°ł°Ą żĎŔüČ÷ ÁöżöÁł˝Ŕ´Ď´Ů" ! #: buffer.c:783 msgid "E84: No modified buffer found" *************** *** 80,86 **** ! #: buffer.c:838 msgid "E88: Cannot go before first buffer" ! msgstr "E88: Ăššř° šöĆŰŔÔ´Ď´Ů" ! #: buffer.c:862 #, c-format --- 80,86 ---- ! #: buffer.c:839 msgid "E88: Cannot go before first buffer" ! msgstr "E88: Ăš šř° šöĆŰŔÔ´Ď´Ů" ! #: buffer.c:863 #, c-format *************** *** 88,92 **** msgstr "" ! "E89: šöĆŰ %ld¸Ś ¸śÁö¸ˇ źöÁ¤ČÄ ŔúŔĺÇĎÁö žĘžŇ˝Ŕ´Ď´Ů (šŤ˝ĂÇϡÁ¸é !Ŕť ťçżë)" ! #: buffer.c:878 msgid "E90: Cannot unload last buffer" --- 88,92 ---- msgstr "" ! "E89: šöĆŰ %ld¸Ś ¸śÁö¸ˇŔ¸ˇÎ °íÄŁ ľÚ ŔúŔĺÇĎÁö žĘžŇ˝Ŕ´Ď´Ů (šŤ˝ĂÇϡÁ¸é !Ŕť ťçżë)" ! #: buffer.c:879 msgid "E90: Cannot unload last buffer" *************** *** 94,100 **** ! #: buffer.c:1313 msgid "W14: Warning: List of file names overflow" ! msgstr "W14: °ć°í: ĆÄŔĎ¸í ¸ńˇĎŔĚ łŃĂĆ˝Ŕ´Ď´Ů" ! #: buffer.c:1479 #, c-format --- 94,100 ---- ! #: buffer.c:1314 msgid "W14: Warning: List of file names overflow" ! msgstr "W14: °ć°í: ĆÄŔĎ Ŕ̸§ ¸ńˇĎŔĚ łŃĂĆ˝Ŕ´Ď´Ů" ! #: buffer.c:1480 #, c-format *************** *** 113,120 **** ! #: buffer.c:2095 ex_docmd.c:6012 #, c-format msgid "line %ld" ! msgstr "śóŔÎ %ld" ! #: buffer.c:2178 msgid "E95: Buffer with this name already exists" --- 113,120 ---- ! #: buffer.c:2105 ex_docmd.c:6065 #, c-format msgid "line %ld" ! msgstr "%ld ÁŮ" ! #: buffer.c:2188 msgid "E95: Buffer with this name already exists" *************** *** 126,132 **** ! #: buffer.c:2475 msgid "[Not edited]" ! msgstr "[ĆíÁý žĘľĘ]" ! #: buffer.c:2480 msgid "[New file]" --- 126,132 ---- ! #: buffer.c:2486 msgid "[Not edited]" ! msgstr "[°íÄĄÁö žĘžŇŔ˝]" ! #: buffer.c:2491 msgid "[New file]" *************** *** 138,159 **** ! #: buffer.c:2483 fileio.c:1765 msgid "[readonly]" ! msgstr "[ŔĐąâŔüżë]" ! #: buffer.c:2499 #, c-format msgid "1 line --%d%%--" ! msgstr "1 śóŔÎ --%d%%--" ! #: buffer.c:2499 #, c-format msgid "%ld lines --%d%%--" ! msgstr "%ld śóŔÎ --%d%%--" ! #: buffer.c:2507 #, c-format msgid "line %ld of %ld --%d%%-- col " ! msgstr "śóŔÎ %ld / %ld --%d%%-- ż­ " ! #: buffer.c:2593 msgid "[No file]" --- 138,159 ---- ! #: buffer.c:2494 fileio.c:1754 msgid "[readonly]" ! msgstr "[ŔĐąâ Ŕüżë]" ! #: buffer.c:2510 #, c-format msgid "1 line --%d%%--" ! msgstr "1 ÁŮ --%d%%--" ! #: buffer.c:2510 #, c-format msgid "%ld lines --%d%%--" ! msgstr "%ld ÁŮ --%d%%--" ! #: buffer.c:2518 #, c-format msgid "line %ld of %ld --%d%%-- col " ! msgstr "%ld / %ld ÁŮ --%d%%-- Ä­ " ! #: buffer.c:2606 msgid "[No file]" *************** *** 170,176 **** ! #: buffer.c:3161 screen.c:4602 msgid "[Preview]" ! msgstr "[šĚ¸Žş¸ąâ]" ! #: buffer.c:3367 msgid "All" --- 170,176 ---- ! #: buffer.c:3183 screen.c:4681 msgid "[Preview]" ! msgstr "[šĚ¸Ž ş¸ąâ]" ! #: buffer.c:3389 msgid "All" *************** *** 215,222 **** ! #: buffer.c:4379 #, c-format msgid " line=%ld id=%d name=%s" ! msgstr " śóŔÎ %ld id %d Ŕ̸§=%s" ! #: diff.c:132 #, c-format --- 215,222 ---- ! #: buffer.c:4409 #, c-format msgid " line=%ld id=%d name=%s" ! msgstr " ÁŮ=%ld id=%d Ŕ̸§=%s" ! #: diff.c:133 #, c-format *************** *** 225,231 **** ! #: diff.c:619 msgid "E97: Cannot create diffs" ! msgstr "E97: diff¸Ś ťýźşÇŇ źö žř˝Ŕ´Ď´Ů" ! #: diff.c:717 msgid "Patch file" --- 225,231 ---- ! #: diff.c:648 msgid "E97: Cannot create diffs" ! msgstr "E97: diff¸Ś ¸¸ľé źö žř˝Ŕ´Ď´Ů" ! #: diff.c:747 msgid "Patch file" *************** *** 237,252 **** ! #: diff.c:1644 msgid "E99: Current buffer is not in diff mode" ! msgstr "E99: ÇöŔç šöĆŰ´Â diff ¸đľĺ°Ą žĆ´Ő´Ď´Ů" ! #: diff.c:1656 msgid "E100: No other buffer in diff mode" ! msgstr "E100: ´Ů¸Ľ šöĆŰÁßżĄ diff ¸đľĺŔÎ °Ô žř˝Ŕ´Ď´Ů" ! #: diff.c:1664 msgid "E101: More than two buffers in diff mode, don't know which one to use" msgstr "" ! "E101: ľÎ°ł ŔĚťóŔÇ šöĆŰ°Ą diff ¸đľĺŔĚžîź­ žîś˛ °Í ťçżëÇŇ Áö žË źö žřł×żä" ! #: diff.c:1687 #, c-format --- 237,252 ---- ! #: diff.c:1704 msgid "E99: Current buffer is not in diff mode" ! msgstr "E99: ÇöŔç šöĆŰ´Â diff ťóĹ°Ą žĆ´Ő´Ď´Ů" ! #: diff.c:1716 msgid "E100: No other buffer in diff mode" ! msgstr "E100: ´Ů¸Ľ šöĆŰÁßżĄ diff ťóĹÂŔÎ °Ô žř˝Ŕ´Ď´Ů" ! #: diff.c:1724 msgid "E101: More than two buffers in diff mode, don't know which one to use" msgstr "" ! "E101: ľÎ°ł ŔĚťóŔÇ šöĆŰ°Ą diff ťóĹÂżŠź­ žîś˛ °ÍŔť ˝ážßÇŇ Áö žË źö žř˝Ŕ´Ď´Ů" ! #: diff.c:1747 #, c-format *************** *** 255,260 **** ! #: diff.c:1693 #, c-format msgid "E103: Buffer \"%s\" is not in diff mode" ! msgstr "E103: \"%s\" šöĆŰ´Â diff ¸đľĺ°Ą žĆ´Ő´Ď´Ů" --- 255,260 ---- ! #: diff.c:1753 #, c-format msgid "E103: Buffer \"%s\" is not in diff mode" ! msgstr "E103: \"%s\" šöĆŰ´Â diff ťóĹ°Ą žĆ´Ő´Ď´Ů" *************** *** 274,276 **** msgid " Keyword completion (^N/^P)" ! msgstr " ´Üžî żĎźş (^N/^P)" --- 274,276 ---- msgid " Keyword completion (^N/^P)" ! msgstr " łš¸ť żĎźş (^N/^P)" *************** *** 279,281 **** 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)" --- 279,281 ---- 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)" *************** *** 285,287 **** msgid " Keyword Local completion (^N/^P)" ! msgstr " ´Üžî ˇÎÄĂ żĎźş (^N/^P)" --- 285,287 ---- msgid " Keyword Local completion (^N/^P)" ! msgstr " łš¸ť ˇÎÄĂ żĎźş (^N/^P)" *************** *** 289,291 **** msgid " Whole line completion (^L/^N/^P)" ! msgstr " ŔüĂź śóŔÎ żĎźş (^L/^N/^P)" --- 289,291 ---- msgid " Whole line completion (^L/^N/^P)" ! msgstr " ŔüĂź ÁŮ żĎźş (^L/^N/^P)" *************** *** 309,311 **** msgid " Dictionary completion (^K/^N/^P)" ! msgstr " ľđˇşĹ与 żĎźş (^K/^N/^P)" --- 309,311 ---- msgid " Dictionary completion (^K/^N/^P)" ! msgstr " ŔÚˇášć żĎźş (^K/^N/^P)" *************** *** 331,342 **** ! #: edit.c:1982 #, c-format msgid "Scanning dictionary: %s" ! msgstr "ťçŔü °ËťöÁß: %s" ! #: edit.c:2173 msgid " (insert) Scroll (^E/^Y)" ! msgstr " (ťđŔÔ) ˝şĹŠˇŃ (^E/^Y)" ! #: edit.c:2175 msgid " (replace) Scroll (^E/^Y)" --- 331,342 ---- ! #: edit.c:1992 #, c-format msgid "Scanning dictionary: %s" ! msgstr "ťçŔü ĂŁ´Â Áß: %s" ! #: edit.c:2183 msgid " (insert) Scroll (^E/^Y)" ! msgstr " (ł˘żöłÖąâ) ˝şĹŠˇŃ (^E/^Y)" ! #: edit.c:2185 msgid " (replace) Scroll (^E/^Y)" *************** *** 344,355 **** ! #: edit.c:2485 #, c-format msgid "Scanning: %s" ! msgstr "°Ëťö Áß: %s" ! #: edit.c:2520 msgid "Scanning tags." ! msgstr "ĹÂą× °Ëťö Áß." ! #: edit.c:3178 msgid " Adding" --- 344,355 ---- ! #: edit.c:2496 #, c-format msgid "Scanning: %s" ! msgstr "ĂŁ´Â Áß: %s" ! #: edit.c:2531 msgid "Scanning tags." ! msgstr "ĹÂą× ĂŁ´Â Áß." ! #: edit.c:3189 msgid " Adding" *************** *** 369,375 **** ! #: edit.c:3288 msgid "Word from other line" ! msgstr "´Ů¸Ľ ÁŮżĄź­ŔÇ ´Üžî" ! #: edit.c:3293 msgid "The only match" --- 369,375 ---- ! #: edit.c:3299 msgid "Word from other line" ! msgstr "´Ů¸Ľ ÁŮżĄ łš¸ť" ! #: edit.c:3304 msgid "The only match" *************** *** 434,441 **** ! #: eval.c:2527 #, c-format msgid "E116: Invalid arguments for function %s" ! msgstr "E116: ÇÔźö %sˇÎ Ŕ߸řľČ ŔÎŔÚ łŃ°ÜÁü" ! #: eval.c:2528 #, c-format --- 434,441 ---- ! #: eval.c:2537 #, c-format msgid "E116: Invalid arguments for function %s" ! msgstr "E116: ÇÔźö %sˇÎ Ŕ߸řľČ ŔÎŔÚ°Ą łŃ°ÜÁł˝Ŕ´Ď´Ů" ! #: eval.c:2538 #, c-format *************** *** 459,466 **** ! #: eval.c:3540 #, c-format msgid "+-%s%3ld lines: " ! msgstr "+-%s%3ld śóŔÎ: " ! #: eval.c:4630 msgid "" --- 459,466 ---- ! #: eval.c:3575 #, c-format msgid "+-%s%3ld lines: " ! msgstr "+-%s%3ld ÁŮ: " ! #: eval.c:4690 msgid "" *************** *** 476,486 **** ! #: eval.c:5496 ! msgid "Unable to read a server reply" ! msgstr "ź­šöŔÇ ŔŔ´äŔť ŔĐŔť źö žř˝Ŕ´Ď´Ů" ! ! #: eval.c:5518 ! msgid "Unable to send reply" ! msgstr "ŔŔ´äŔť ş¸łž źö žř˝Ŕ´Ď´Ů" ! #: eval.c:5550 #, c-format --- 476,486 ---- ! #: eval.c:5604 ! msgid "E277: Unable to read a server reply" ! msgstr "E277: ź­šöŔÇ ŔŔ´äŔť ŔĐŔť źö žř˝Ŕ´Ď´Ů" ! ! #: eval.c:5629 ! msgid "E258: Unable to send to client" ! msgstr "E258: ĹŹśóŔĚžđĆŽˇÎ ş¸łž źö žř˝Ŕ´Ď´Ů" ! #: eval.c:5670 #, c-format *************** *** 489,510 **** ! #: eval.c:5590 msgid "(Invalid)" ! msgstr "(Ŕ߸řľĘ)" ! #: eval.c:6593 #, c-format msgid "E121: Undefined variable: %s" ! msgstr "E121: Á¤ŔÇžĘľČ şŻźö: %s" ! #: eval.c:7291 #, c-format msgid "E122: Function %s already exists, use ! to replace" ! msgstr "E122: ÇÔźö %s°Ą ŔĚšĚ ŔÖ˝Ŕ´Ď´Ů, šŮ˛ŮˇÁ¸é !Ŕť ťçżëÇĎźźżä" ! #: eval.c:7333 #, c-format msgid "E123: Undefined function: %s" ! msgstr "E123: Á¤ŔÇžĘľČ ÇÔźö: %s" ! #: eval.c:7346 #, c-format --- 489,510 ---- ! #: eval.c:5768 msgid "(Invalid)" ! msgstr "(Ŕ߸řľÇžú˝Ŕ´Ď´Ů)" ! #: eval.c:6771 #, c-format msgid "E121: Undefined variable: %s" ! msgstr "E121: Á¤ŔÇ žČ ľČ şŻźö: %s" ! #: eval.c:7469 #, c-format msgid "E122: Function %s already exists, use ! to replace" ! msgstr "E122: ÇÔźö %s°Ą ŔĚšĚ ŔÖ˝Ŕ´Ď´Ů, šŮ˛ŮˇÁ¸é !Ŕť ťçżëÇϽʽÿŔ" ! #: eval.c:7511 #, c-format msgid "E123: Undefined function: %s" ! msgstr "E123: Á¤ŔÇ žČ ľČ ÇÔźö: %s" ! #: eval.c:7524 #, c-format *************** *** 540,552 **** ! #: eval.c:7814 #, c-format msgid "E130: Undefined function: %s" ! msgstr "E130: Á¤ŔÇžĘľČ ÇÔźö: %s" ! #: eval.c:7819 #, c-format msgid "E131: Cannot delete function %s: It is in use" ! msgstr "E131: ÇÔźö %s¸Ś ťčÁŚÇŇ źö žř˝Ŕ´Ď´Ů: ťçżëÁßŔÔ´Ď´Ů" ! #: eval.c:7866 msgid "E132: Function call depth is higher than 'maxfuncdepth'" --- 540,552 ---- ! #: eval.c:7992 #, c-format msgid "E130: Undefined function: %s" ! msgstr "E130: Á¤ŔÇ žČ ľČ ÇÔźö: %s" ! #: eval.c:7997 #, c-format msgid "E131: Cannot delete function %s: It is in use" ! msgstr "E131: ÇÔźö %s¸Ś Áöżď źö žř˝Ŕ´Ď´Ů: ťçżëÁßŔÔ´Ď´Ů" ! #: eval.c:8044 msgid "E132: Function call depth is higher than 'maxfuncdepth'" *************** *** 593,626 **** ! #: ex_cmds.c:427 msgid "E134: Move lines into themselves" ! msgstr "E134: śóŔÎŔť ą× ŔÚ˝ĹŔ¸ˇÎ ŔĚľżÇϡÁ°í Çß˝Ŕ´Ď´Ů" ! #: ex_cmds.c:496 msgid "1 line moved" ! msgstr "1 śóŔÎ ŔĚľżľĘ" ! #: ex_cmds.c:498 #, c-format msgid "%ld lines moved" ! msgstr "%ld śóŔÎ ŔĚľżľĘ" ! #: ex_cmds.c:888 #, c-format msgid "%ld lines filtered" ! msgstr "%ld śóŔÎŔĚ ÇĘĹ͸ľľĘ" ! #: ex_cmds.c:916 msgid "E135: *Filter* Autocommands must not change current buffer" ! msgstr "E135: *Filter* ŔÚľż¸íˇÉŔş ÇöŔç šöĆ۸Ś šŮ˛Ůžîź­´Â žĘľË´Ď´Ů" ! #: ex_cmds.c:1001 msgid "[No write since last change]\n" ! msgstr "[¸śÁö¸ˇ źöÁ¤ ČÄ ŔúŔĺ žĘÇÔ]\n" ! #: ex_cmds.c:1237 #, c-format msgid "viminfo: %s in line: " ! msgstr "viminfo: śóŔÎżĄ %s: " ! #: ex_cmds.c:1242 msgid "E136: viminfo: Too many errors, skipping rest of file" --- 593,626 ---- ! #: ex_cmds.c:428 msgid "E134: Move lines into themselves" ! msgstr "E134: ÁŮŔť ą× ŔÚ˝ĹŔ¸ˇÎ ŔĚľżÇϡÁ°í Çß˝Ŕ´Ď´Ů" ! #: ex_cmds.c:497 msgid "1 line moved" ! msgstr "1 ÁŮ żĹ°ÜÁł˝Ŕ´Ď´Ů" ! #: ex_cmds.c:499 #, c-format msgid "%ld lines moved" ! msgstr "%ld ÁŮ żĹ°ÜÁł˝Ŕ´Ď´Ů" ! #: ex_cmds.c:890 #, c-format msgid "%ld lines filtered" ! msgstr "%ld ÁŮŔť °Éˇś˝Ŕ´Ď´Ů" ! #: ex_cmds.c:918 msgid "E135: *Filter* Autocommands must not change current buffer" ! msgstr "E135: *Filter* ŔÚľż¸íˇÉŔş ÇöŔç šöĆ۸Ś šŮ˛Ůžîź­´Â žČ ľË´Ď´Ů" ! #: ex_cmds.c:1003 msgid "[No write since last change]\n" ! msgstr "[¸śÁö¸ˇŔ¸ˇÎ °íÄŁ ľÚ ŔúŔĺ žČ ÇÔ]\n" ! #: ex_cmds.c:1248 #, c-format msgid "viminfo: %s in line: " ! msgstr "viminfo: ÁŮżĄ %s: " ! #: ex_cmds.c:1253 msgid "E136: viminfo: Too many errors, skipping rest of file" *************** *** 645,652 **** ! #: ex_cmds.c:1365 #, c-format msgid "E137: Viminfo file is not writable: %s" ! msgstr "E137: Viminfo ĆÄŔĎŔÇ ž˛ąâąÇÇŃŔĚ žř˝Ŕ´Ď´Ů: %s" ! #: ex_cmds.c:1490 #, c-format --- 645,652 ---- ! #: ex_cmds.c:1376 #, c-format msgid "E137: Viminfo file is not writable: %s" ! msgstr "E137: Viminfo ĆÄŔĎŔÇ ž˛ąâ ąÇÇŃŔĚ žř˝Ŕ´Ď´Ů: %s" ! #: ex_cmds.c:1501 #, c-format *************** *** 661,667 **** #. Write the info: ! #: ex_cmds.c:1599 msgid "# This viminfo file was generated by Vim %s.\n" ! msgstr "# ŔĚ viminfo ĆÄŔĎŔş şöŔĚ ťýźşÇŃ °ÍŔÔ´Ď´Ů Vim %s.\n" ! #: ex_cmds.c:1600 msgid "" --- 661,668 ---- #. Write the info: ! #: ex_cmds.c:1610 ! #, c-format msgid "# This viminfo file was generated by Vim %s.\n" ! msgstr "# ŔĚ viminfo ĆÄŔĎŔş şöŔĚ ¸¸ľç °ÍŔÔ´Ď´Ů Vim %s.\n" ! #: ex_cmds.c:1612 msgid "" *************** *** 670,675 **** msgstr "" ! "# Áś˝É¸¸ ÇŃ´Ů¸é źöÁ¤ÇĎ˝Ç źöľľ ŔÖ˝Ŕ´Ď´Ů!\n" "\n" ! #: ex_cmds.c:1602 msgid "# Value of 'encoding' when this file was written\n" --- 671,676 ---- msgstr "" ! "# Áś˝É¸¸ ÇŃ´Ů¸é °íÄĽ źöľľ ŔÖ˝Ŕ´Ď´Ů!\n" "\n" ! #: ex_cmds.c:1614 msgid "# Value of 'encoding' when this file was written\n" *************** *** 677,683 **** ! #: ex_cmds.c:1701 msgid "Illegal starting char" ! msgstr "ŔĚťóÇŃ ˝ĂŔŰ šŽŔÚ" ! #: ex_cmds.c:2041 ex_cmds.c:2270 ex_cmds2.c:590 msgid "Save As" --- 678,684 ---- ! #: ex_cmds.c:1713 msgid "Illegal starting char" ! msgstr "ŔĚťóÇŃ ˝ĂŔŰ ąŰŔÚ" ! #: ex_cmds.c:2053 ex_cmds.c:2289 ex_cmds2.c:602 msgid "Save As" *************** *** 695,701 **** ! #: ex_cmds.c:2125 msgid "E140: Use ! to write partial buffer" ! msgstr "E140: šöĆŰ ŔϺθ¸ ž˛ˇÁ¸é !Ŕť ťçżëÇĎźźżä" ! #: ex_cmds.c:2204 #, c-format --- 696,702 ---- ! #: ex_cmds.c:2137 msgid "E140: Use ! to write partial buffer" ! msgstr "E140: šöĆŰ ŔϺθ¸ ž˛ˇÁ¸é !Ŕť ťçżëÇϽʽÿŔ" ! #: ex_cmds.c:2223 #, c-format *************** *** 722,737 **** ! #: ex_cmds.c:2498 msgid "Edit File" ! msgstr "ĆÄŔĎ ĆíÁý" ! #: ex_cmds.c:2996 #, c-format msgid "E143: Autocommands unexpectedly deleted new buffer %s" ! msgstr "E143: Autocommand°Ą śćšŰżĄ ťő šöĆŰ %s¸Ś ťčÁŚÇß˝Ŕ´Ď´Ů" ! #: ex_cmds.c:3126 msgid "E144: non-numeric argument to :z" ! msgstr "E144: źýŔÚžĆ´Ń ŔÎŔÚ°Ą :zżĄ ÁÖžîÁł˝Ŕ´Ď´Ů" ! #: ex_cmds.c:3211 msgid "E145: Shell commands not allowed in rvim" --- 723,738 ---- ! #: ex_cmds.c:2517 msgid "Edit File" ! msgstr "ĆÄŔĎ °íÄĄąâ" ! #: ex_cmds.c:3024 #, c-format msgid "E143: Autocommands unexpectedly deleted new buffer %s" ! msgstr "E143: Autocommand°Ą ść šŰżĄ ťő šöĆŰ %s¸Ś Áöżü˝Ŕ´Ď´Ů" ! #: ex_cmds.c:3156 msgid "E144: non-numeric argument to :z" ! msgstr "E144: źýŔÚ°Ą žĆ´Ń ŔÎŔÚ°Ą :zżĄ ÁÖžîÁł˝Ŕ´Ď´Ů" ! #: ex_cmds.c:3241 msgid "E145: Shell commands not allowed in rvim" *************** *** 739,745 **** ! #: ex_cmds.c:3318 msgid "E146: Regular expressions can't be delimited by letters" ! msgstr "E146: Á¤ąÔÇĽÇö˝ÄŔş šŽŔڡΠą¸şĐľÉ źö žř˝Ŕ´Ď´Ů" ! #: ex_cmds.c:3656 #, c-format --- 740,746 ---- ! #: ex_cmds.c:3348 msgid "E146: Regular expressions can't be delimited by letters" ! msgstr "E146: Á¤ąÔÇĽÇö˝ÄŔş ąŰŔڡΠą¸şĐľÉ źö žř˝Ŕ´Ď´Ů" ! #: ex_cmds.c:3686 #, c-format *************** *** 748,776 **** ! #: ex_cmds.c:4020 msgid "(Interrupted) " ! msgstr "(Áß´ÜľĘ) " ! #: ex_cmds.c:4024 msgid "1 substitution" ! msgstr "1 ÄĄČŻ" ! #: ex_cmds.c:4026 #, c-format msgid "%ld substitutions" ! msgstr "%ld ÄĄČŻ" ! #: ex_cmds.c:4029 msgid " on 1 line" ! msgstr " on 1 line" ! #: ex_cmds.c:4031 #, c-format msgid " on %ld lines" ! msgstr " on %ld lines" ! #: ex_cmds.c:4082 msgid "E147: Cannot do :global recursive" ! msgstr "E147: :globalŔş ŔçąÍČŁĂâľÉ źö žř˝Ŕ´Ď´Ů" ! #: ex_cmds.c:4117 msgid "E148: Regular expression missing from global" --- 749,777 ---- ! #: ex_cmds.c:4050 msgid "(Interrupted) " ! msgstr "(ÁߴܾǞú˝Ŕ´Ď´Ů) " ! #: ex_cmds.c:4054 msgid "1 substitution" ! msgstr "1 °ł šŮ˛ĺŔ˝" ! #: ex_cmds.c:4056 #, c-format msgid "%ld substitutions" ! msgstr "%ld °ł šŮ˛ĺŔ˝" ! #: ex_cmds.c:4059 msgid " on 1 line" ! msgstr " ÇŃ ÁŮżĄź­" ! #: ex_cmds.c:4061 #, c-format msgid " on %ld lines" ! msgstr " %ld ÁŮżĄź­" ! #: ex_cmds.c:4112 msgid "E147: Cannot do :global recursive" ! msgstr "E147: :globalŔş ŔçąÍ ČŁĂâ ľÉ źö žř˝Ŕ´Ď´Ů" ! #: ex_cmds.c:4147 msgid "E148: Regular expression missing from global" *************** *** 778,785 **** ! #: ex_cmds.c:4166 #, c-format msgid "Pattern found in every line: %s" ! msgstr "żŠˇŻ śóŔÎżĄź­ ĆĐĹĎŔĚ ĂŁžĆÁł˝Ŕ´Ď´Ů: %s" ! #: ex_cmds.c:4247 msgid "" --- 779,786 ---- ! #: ex_cmds.c:4196 #, c-format msgid "Pattern found in every line: %s" ! msgstr "żŠˇŻ ÁŮżĄź­ ĆĐĹĎŔť ĂŁžŇ˝Ŕ´Ď´Ů: %s" ! #: ex_cmds.c:4277 msgid "" *************** *** 790,810 **** "\n" ! "# ¸śÁö¸ˇ ÄĄČŻ šŽŔÚż­:\n" "$" ! #: ex_cmds.c:4346 #, c-format msgid "E149: Sorry, no help for %s" ! msgstr "E149: ÁËźŰ, %sżĄ ´ëÇŃ ľľżň¸ťŔĚ žř˝Ŕ´Ď´Ů" ! #: ex_cmds.c:4380 #, c-format msgid "Sorry, help file \"%s\" not found" ! msgstr "ÁËźŰ, ľľżň¸ť ĆÄŔĎ \"%s\"Ŕť ĂŁŔť źö žř˝Ŕ´Ď´Ů" ! #: ex_cmds.c:4826 #, c-format msgid "E150: Not a directory: %s" ! msgstr "E150: ľđˇşĹ与°Ą žĆ´Ô: %s" ! #: ex_cmds.c:4854 #, c-format --- 791,811 ---- "\n" ! "# ¸śÁö¸ˇŔ¸ˇÎ šŮ˛Ű šŽŔÚż­:\n" "$" ! #: ex_cmds.c:4376 #, c-format msgid "E149: Sorry, no help for %s" ! msgstr "E149: šĚžČÇŐ´Ď´Ů, %sżĄ ´ëÇŃ ľľżň¸ťŔĚ žř˝Ŕ´Ď´Ů" ! #: ex_cmds.c:4410 #, c-format msgid "Sorry, help file \"%s\" not found" ! msgstr "šĚžČÇŐ´Ď´Ů, ľľżň¸ť ĆÄŔĎ \"%s\"Ŕť ĂŁŔť źö žř˝Ŕ´Ď´Ů" ! #: ex_cmds.c:4856 #, c-format msgid "E150: Not a directory: %s" ! msgstr "E150: ŔÚˇášćŔĚ žĆ´Ô: %s" ! #: ex_cmds.c:4884 #, c-format *************** *** 860,875 **** ! #: ex_cmds.c:5510 msgid "[Deleted]" ! msgstr "[ťčÁŚľĘ]" ! #: ex_cmds2.c:66 msgid "Entering Debug mode. Type \"cont\" to leave." ! msgstr "ľđšöą× ¸đľĺˇÎ ľéžî°¨. şüÁŽłŞ°ĄˇÁ¸é \"cont\"¸Ś ŔÔˇÂÇĎźźżä." ! #: ex_cmds2.c:70 ex_docmd.c:791 #, c-format msgid "line %ld: %s" ! msgstr "śóŔÎ %ld: %s" ! #: ex_cmds2.c:72 #, c-format --- 861,876 ---- ! #: ex_cmds.c:5546 msgid "[Deleted]" ! msgstr "[ÁöżöÁł˝Ŕ´Ď´Ů]" ! #: ex_cmds2.c:70 msgid "Entering Debug mode. Type \"cont\" to leave." ! msgstr "ľđšöą× ťóĹ¡Πľéžî°¨. şüÁŽłŞ°ĄˇÁ¸é \"cont\"¸Ś ŔÔˇÂÇϽʽÿŔ." ! #: ex_cmds2.c:74 ex_docmd.c:770 #, c-format msgid "line %ld: %s" ! msgstr "%ld ÁŮ: %s" ! #: ex_cmds2.c:76 #, c-format *************** *** 878,885 **** ! #: ex_cmds2.c:212 #, c-format msgid "Breakpoint in \"%s%s\" line %ld" ! msgstr "ÁßÁöÁĄ: \"%s%s\" śóŔÎ %ld" ! #: ex_cmds2.c:376 #, c-format --- 879,886 ---- ! #: ex_cmds2.c:224 #, c-format msgid "Breakpoint in \"%s%s\" line %ld" ! msgstr "ÁßÁöÁĄ: \"%s%s\" %ld ÁŮ" ! #: ex_cmds2.c:388 #, c-format *************** *** 892,899 **** ! #: ex_cmds2.c:407 #, c-format msgid "%3d %s %s line %ld" ! msgstr "%3d %s %s śóŔÎ %ld" ! #: ex_cmds2.c:613 #, c-format --- 893,900 ---- ! #: ex_cmds2.c:419 #, c-format msgid "%3d %s %s line %ld" ! msgstr "%3d %s %s %ld ÁŮ" ! #: ex_cmds2.c:625 #, c-format *************** *** 902,908 **** ! #: ex_cmds2.c:615 ex_docmd.c:8557 msgid "Untitled" ! msgstr "ÁŚ¸ńžřŔ˝" ! #: ex_cmds2.c:751 #, c-format --- 903,909 ---- ! #: ex_cmds2.c:627 ex_docmd.c:8636 msgid "Untitled" ! msgstr "ÁŚ¸ń žřŔ˝" ! #: ex_cmds2.c:763 #, c-format *************** *** 911,929 **** ! #: ex_cmds2.c:820 msgid "Warning: Entered other buffer unexpectedly (check autocommands)" ! msgstr "°ć°í: śćšŰżĄ ´Ů¸Ľ šöĆۡΠľéžî°Ź˝Ŕ´Ď´Ů (autocommand¸Ś ČŽŔÎÇĎźźżä)" ! #: ex_cmds2.c:1196 msgid "E163: There is only one file to edit" ! msgstr "E163: ĆíÁýÇŇ ĆÄŔĎŔĚ ÇĎłŞ šŰżĄ žř˝Ŕ´Ď´Ů" ! #: ex_cmds2.c:1198 msgid "E164: Cannot go before first file" ! msgstr "E164: Ăššř° ĆÄŔĎ ŔĚŔüŔ¸ˇÎ´Â °Ľ źö žř˝Ŕ´Ď´Ů" ! #: ex_cmds2.c:1200 msgid "E165: Cannot go beyond last file" ! msgstr "E165: ¸śÁö¸ˇ ĆÄŔĎ ŔĚČġδ °Ľ źö žř˝Ŕ´Ď´Ů" ! #: ex_cmds2.c:1605 #, c-format --- 912,930 ---- ! #: ex_cmds2.c:832 msgid "Warning: Entered other buffer unexpectedly (check autocommands)" ! msgstr "°ć°í: ść šŰżĄ ´Ů¸Ľ šöĆۡΠľéžî°Ź˝Ŕ´Ď´Ů (autocommand¸Ś ČŽŔÎÇϽʽÿŔ)" ! #: ex_cmds2.c:1208 msgid "E163: There is only one file to edit" ! msgstr "E163: °íÄĽ ĆÄŔĎŔĚ ÇĎłŞ šŰżĄ žř˝Ŕ´Ď´Ů" ! #: ex_cmds2.c:1210 msgid "E164: Cannot go before first file" ! msgstr "E164: Ăš šř° ĆÄŔĎ ŔĚŔüŔ¸ˇÎ´Â °Ľ źö žř˝Ŕ´Ď´Ů" ! #: ex_cmds2.c:1212 msgid "E165: Cannot go beyond last file" ! msgstr "E165: ¸śÁö¸ˇ ĆÄŔĎ ľÚˇÎ´Â °Ľ źö žř˝Ŕ´Ď´Ů" ! #: ex_cmds2.c:1634 #, c-format *************** *** 946,963 **** ! #: ex_cmds2.c:1790 #, c-format msgid "Cannot source a directory: \"%s\"" ! msgstr "ľđˇşĹ与´Â şŇˇŻľéŔĎ źö žřŔ˝: \"%s\"" ! #: ex_cmds2.c:1820 #, c-format msgid "could not source \"%s\"" ! msgstr "\"%s\"¸Ś şŇˇŻľéŔĎ źö žř˝Ŕ´Ď´Ů" ! #: ex_cmds2.c:1822 #, c-format msgid "line %ld: could not source \"%s\"" ! msgstr "śóŔÎ %ld: \"%s\"¸Ś şŇˇŻľéŔĎ źö žř˝Ŕ´Ď´Ů" ! #: ex_cmds2.c:1836 #, c-format --- 947,964 ---- ! #: ex_cmds2.c:1832 #, c-format msgid "Cannot source a directory: \"%s\"" ! msgstr "ŔÚˇášćŔş şŇˇŻ ľéŔĎ źö žřŔ˝: \"%s\"" ! #: ex_cmds2.c:1862 #, c-format msgid "could not source \"%s\"" ! msgstr "\"%s\"¸Ś şŇˇŻ ľéŔĎ źö žř˝Ŕ´Ď´Ů" ! #: ex_cmds2.c:1864 #, c-format msgid "line %ld: could not source \"%s\"" ! msgstr "%ld ÁŮ: \"%s\"¸Ś şŇˇŻ ľéŔĎ źö žř˝Ŕ´Ď´Ů" ! #: ex_cmds2.c:1878 #, c-format *************** *** 966,973 **** ! #: ex_cmds2.c:1838 #, c-format msgid "line %ld: sourcing \"%s\"" ! msgstr "śóŔÎ %ld: \"%s\" şŇˇŻľéŔĚ´Â Áß" ! #: ex_cmds2.c:1944 #, c-format --- 967,974 ---- ! #: ex_cmds2.c:1880 #, c-format msgid "line %ld: sourcing \"%s\"" ! msgstr "%ld ÁŮ: \"%s\" şŇˇŻľéŔĚ´Â Áß" ! #: ex_cmds2.c:1986 #, c-format *************** *** 976,982 **** ! #: ex_cmds2.c:2245 msgid "W15: Warning: Wrong line separator, ^M may be missing" ! msgstr "W15: °ć°í: Ŕ߸řľČ śóŔÎ ą¸şĐŔÚ. ^MŔĚ žř´Â °Í °°˝Ŕ´Ď´Ů" ! #: ex_cmds2.c:2294 msgid "E167: :scriptencoding used outside of a sourced file" --- 977,983 ---- ! #: ex_cmds2.c:2287 msgid "W15: Warning: Wrong line separator, ^M may be missing" ! msgstr "W15: °ć°í: Ŕ߸řľČ ÁŮ ą¸şĐŔÚ. ^MŔĚ žř´Â °Í °°˝Ŕ´Ď´Ů" ! #: ex_cmds2.c:2336 msgid "E167: :scriptencoding used outside of a sourced file" *************** *** 1007,1009 **** ! #: ex_cmds2.c:3131 msgid "E324: Can't open PostScript output file" --- 1008,1018 ---- ! #: ex_cmds2.c:2981 ! msgid "Printing aborted" ! msgstr "ŔÎźâ°Ą ĂëźŇľÇžú˝Ŕ´Ď´Ů." ! ! #: ex_cmds2.c:3359 ! msgid "E455: Error writing to PostScript output file" ! msgstr "E455: Ć÷˝şĆŽ˝şĹŠ¸łĆŽ ĂâˇÂĆÄŔĎżĄ žľ źö žř˝Ŕ´Ď´Ů." ! ! #: ex_cmds2.c:4034 msgid "E324: Can't open PostScript output file" *************** *** 1011,1013 **** ! #: ex_cmds2.c:3381 #, c-format --- 1020,1044 ---- ! #: ex_cmds2.c:4072 ! #, c-format ! msgid "E456: Can't open file \"%s\"" ! msgstr "E456: \"%s\" ĆÄŔĎŔť ż­ źö žř˝Ŕ´Ď´Ů" ! ! #: ex_cmds2.c:4083 ! #, c-format ! msgid "E457: Can't read PostScript resource file \"%s\"" ! msgstr "E457: Ć÷˝şĆŽ˝şĹŠ¸łĆŽ ¸ŽźŇ˝ş ĆÄŔĎ \"%s\"Ŕť ŔĐŔť źö žř˝Ŕ´Ď´Ů" ! ! #: ex_cmds2.c:4281 ! msgid "Sending to printer..." ! msgstr "ÇÁ¸°Ĺ͡Πş¸łť´Â Áß..." ! ! #: ex_cmds2.c:4285 ! msgid "E365: Failed to print PostScript file" ! msgstr "E365: Ć÷˝şĆŽ˝şĹŠ¸łĆŽ ĆÄŔĎŔť ŔÎźâÇŇ źö žř˝Ŕ´Ď´Ů" ! ! #: ex_cmds2.c:4287 ! #~ msgid "Print job sent." ! #~ msgstr "" ! ! #: ex_cmds2.c:4683 #, c-format *************** *** 1021,1028 **** ! #: ex_docmd.c:503 msgid "Entering Ex mode. Type \"visual\" to go to Normal mode." ! msgstr "Ex ¸đľĺˇÎ ŔüČŻ. Normal ¸đľĺˇÎ °ĄˇÁ¸é \"visual\"Ŕť ŔÔˇÂÇĎźźżä." #. must be at EOF ! #: ex_docmd.c:539 msgid "At end-of-file" --- 1052,1059 ---- ! #: ex_docmd.c:490 msgid "Entering Ex mode. Type \"visual\" to go to Normal mode." ! msgstr "Ex ťóĹ¡ΠŔüČŻ. Normal ťóĹ¡Π°ĄˇÁ¸é \"visual\"Ŕť ŔÔˇÂÇϽʽÿŔ." #. must be at EOF ! #: ex_docmd.c:526 msgid "At end-of-file" *************** *** 1030,1036 **** ! #: ex_docmd.c:615 msgid "E169: Command too recursive" ! msgstr "E169: ¸íˇÉŔĚ łĘšŤ ¸šŔĚ ŔçšÝşšľÇžú˝Ŕ´Ď´Ů" ! #: ex_docmd.c:931 msgid "E170: Missing :endwhile" --- 1061,1067 ---- ! #: ex_docmd.c:601 msgid "E169: Command too recursive" ! msgstr "E169: ¸íˇÉŔĚ łĘšŤ ¸šŔĚ ´Ů˝Ă šÝşšľÇžú˝Ŕ´Ď´Ů" ! #: ex_docmd.c:910 msgid "E170: Missing :endwhile" *************** *** 1058,1064 **** ! #: ex_docmd.c:1337 msgid "Don't panic!" ! msgstr "Á×Áö ¸śźźżä!" ! #: ex_docmd.c:1356 #~ msgid "Backwards range given" --- 1089,1095 ---- ! #: ex_docmd.c:1440 msgid "Don't panic!" ! msgstr "´çȲÇĎÁö ¸ś˝Ę˝ĂżŔ!" ! #: ex_docmd.c:1459 #~ msgid "Backwards range given" *************** *** 1070,1080 **** ! #: ex_docmd.c:1469 msgid "Use w or w>>" ! msgstr "w łŞ w>>¸Ś ťçżëÇĎźźżä" ! #: ex_docmd.c:2909 msgid "E319: Sorry, the command is not available in this version" ! msgstr "E319: ÁËźŰ, ą× ¸íˇÉŔş ÇöŔç šöŔüżĄź­ ťçżëÇŇ źö žř˝Ŕ´Ď´Ů" ! #: ex_docmd.c:3079 msgid "E172: Only one file name allowed" --- 1101,1111 ---- ! #: ex_docmd.c:1579 msgid "Use w or w>>" ! msgstr "w łŞ w>>¸Ś ťçżëÇϽʽÿŔ" ! #: ex_docmd.c:3086 msgid "E319: Sorry, the command is not available in this version" ! msgstr "E319: šĚžČÇŐ´Ď´Ů, ą× ¸íˇÉŔş ÇöŔç ĆÇżĄź­ ťçżëÇŇ źö žř˝Ŕ´Ď´Ů" ! #: ex_docmd.c:3256 msgid "E172: Only one file name allowed" *************** *** 1082,1098 **** ! #: ex_docmd.c:3633 #, c-format msgid "%d more files to edit. Quit anyway?" ! msgstr "ĆíÁýÇŇ ĆÄŔĎľéŔĚ %d°ł°Ą ´ő ŔÖ˝Ŕ´Ď´Ů. ą×ˇĄľľ ÁžˇáÇŇąîżä?" ! #: ex_docmd.c:3640 #, c-format msgid "E173: %ld more files to edit" ! msgstr "E173: ĆíÁýÇŇ ĆÄŔĎľéŔĚ %ld°ł ´ő" ! #: ex_docmd.c:3734 msgid "E174: Command already exists: use ! to redefine" ! msgstr "E174: ¸íˇÉŔĚ ŔĚšĚ Á¸ŔçÇŐ´Ď´Ů: ´Ů˝Ă Á¤ŔÇÇϡÁ¸é !Ŕť ťçżëÇĎźźżä" ! #: ex_docmd.c:3839 msgid "" --- 1113,1129 ---- ! #: ex_docmd.c:3810 #, c-format msgid "%d more files to edit. Quit anyway?" ! msgstr "°íÄĽ ĆÄŔĎŔĚ %d °ł ´ő ŔÖ˝Ŕ´Ď´Ů. ą×ˇĄľľ łĄłžąîżä?" ! #: ex_docmd.c:3817 #, c-format msgid "E173: %ld more files to edit" ! msgstr "E173: °íÄĽ ĆÄŔĎŔĚ %ld °ł ´ő ŔÖ˝Ŕ´Ď´Ů" ! #: ex_docmd.c:3911 msgid "E174: Command already exists: use ! to redefine" ! msgstr "E174: ¸íˇÉŔĚ ŔĚšĚ Á¸ŔçÇŐ´Ď´Ů: ´Ů˝Ă Á¤ŔÇÇϡÁ¸é !Ŕť ťçżëÇϽʽÿŔ" ! #: ex_docmd.c:4016 msgid "" *************** *** 1116,1122 **** ! #: ex_docmd.c:4026 msgid "E177: Count cannot be specified twice" ! msgstr "E177: ÄŤżîĆŽ´Â ľÎšř ŔĚťó ¸í˝ĂľÉ źö žř˝Ŕ´Ď´Ů" ! #: ex_docmd.c:4036 msgid "E178: Invalid default value for count" --- 1147,1153 ---- ! #: ex_docmd.c:4203 msgid "E177: Count cannot be specified twice" ! msgstr "E177: ÄŤżîĆŽ´Â ľÎ šř ŔĚťó ¸í˝ĂľÉ źö žř˝Ŕ´Ď´Ů" ! #: ex_docmd.c:4213 msgid "E178: Invalid default value for count" *************** *** 1160,1166 **** ! #: ex_docmd.c:5497 msgid "Edit File in new window" ! msgstr "ťő ⿥ź­ ĆÄŔĎ ĆíÁý" ! #: ex_docmd.c:5762 msgid "No swap file" --- 1191,1197 ---- ! #: ex_docmd.c:5549 msgid "Edit File in new window" ! msgstr "ťő ⿥ź­ ĆÄŔĎ °íÄĄąâ" ! #: ex_docmd.c:5815 msgid "No swap file" *************** *** 1172,1178 **** ! #: ex_docmd.c:5925 msgid "E186: No previous directory" ! msgstr "E186: ŔĚŔü ľđˇşĹ与°Ą žř˝Ŕ´Ď´Ů" ! #: ex_docmd.c:6002 msgid "E187: Unknown" --- 1203,1209 ---- ! #: ex_docmd.c:5978 msgid "E186: No previous directory" ! msgstr "E186: ŔĚŔü ŔÚˇášćŔĚ žř˝Ŕ´Ď´Ů" ! #: ex_docmd.c:6055 msgid "E187: Unknown" *************** *** 1216,1226 **** #. set mark ! #: ex_docmd.c:6721 msgid "E191: Argument must be a letter or forward/backward quote" ! msgstr "E191: ŔÎŔÚ´Â šŽŔÚŔĚ°ĹłŞ Ŕü/ČÄ ŔÎżëşÎČŁżŠžß ÇŐ´Ď´Ů" ! #: ex_docmd.c:6750 msgid "E192: Recursive use of :normal too deep" ! msgstr "E192: :normalŔÇ ŔçąÍČŁĂâŔĚ łĘšŤ ¸šŔĚ šßťýÇß˝Ŕ´Ď´Ů" ! #: ex_docmd.c:7118 msgid ":if nesting too deep" --- 1247,1257 ---- #. set mark ! #: ex_docmd.c:6774 msgid "E191: Argument must be a letter or forward/backward quote" ! msgstr "E191: ŔÎŔÚ´Â ąŰŔÚłŞ žŐ/ľÚ ŔÎżë şÎČŁżŠžß ÇŐ´Ď´Ů" ! #: ex_docmd.c:6816 msgid "E192: Recursive use of :normal too deep" ! msgstr "E192: :normalŔÇ ŔçąÍ ČŁĂâŔĚ łĘšŤ ¸šŔĚ ťý°ĺ˝Ŕ´Ď´Ů" ! #: ex_docmd.c:7171 msgid ":if nesting too deep" *************** *** 1293,1299 **** ! #: ex_docmd.c:8712 msgid "E196: No digraphs in this version" ! msgstr "E196: ŔĚ šöŔüżĄ´Â digraph°Ą žř˝Ŕ´Ď´Ů" ! #: ex_getln.c:2778 msgid "tagname" --- 1324,1330 ---- ! #: ex_docmd.c:8791 msgid "E196: No digraphs in this version" ! msgstr "E196: ŔĚ ĆÇżĄ´Â digraph°Ą žř˝Ŕ´Ď´Ů" ! #: ex_getln.c:2785 msgid "tagname" *************** *** 1318,1328 **** ! #: ex_getln.c:4224 msgid "Command Line" ! msgstr "¸íˇÉ śóŔÎ" ! #: ex_getln.c:4225 msgid "Search String" ! msgstr "ĂŁąâ šŽŔÚż­" ! #: ex_getln.c:4226 msgid "Expression" --- 1349,1359 ---- ! #: ex_getln.c:4238 msgid "Command Line" ! msgstr "¸íˇÉ ÁŮ" ! #: ex_getln.c:4239 msgid "Search String" ! msgstr "ĂŁŔť šŽŔÚż­" ! #: ex_getln.c:4240 msgid "Expression" *************** *** 1330,1336 **** ! #: ex_getln.c:4227 msgid "Input Line" ! msgstr "Ŕԡ śóŔÎ" ! #: ex_getln.c:4257 msgid "E198: cmd_pchar beyond the command length" --- 1361,1367 ---- ! #: ex_getln.c:4241 msgid "Input Line" ! msgstr "Ŕԡ ÁŮ" ! #: ex_getln.c:4271 msgid "E198: cmd_pchar beyond the command length" *************** *** 1338,1344 **** ! #: ex_getln.c:4421 msgid "E199: Active window or buffer deleted" ! msgstr "E199: Č°źşľČ âŔĚłŞ šöĆŰ°Ą ťčÁŚľÇžú˝Ŕ´Ď´Ů" ! #: fileio.c:354 msgid "Illegal file name" --- 1369,1375 ---- ! #: ex_getln.c:4435 msgid "E199: Active window or buffer deleted" ! msgstr "E199: Č°źşľČ âŔĚłŞ šöĆŰ°Ą ÁöżöÁł˝Ŕ´Ď´Ů" ! #: fileio.c:347 msgid "Illegal file name" *************** *** 1346,1352 **** ! #: fileio.c:378 fileio.c:506 fileio.c:2501 fileio.c:2539 msgid "is a directory" ! msgstr "´Â ľđˇşĹ与ŔÔ´Ď´Ů" ! #: fileio.c:380 msgid "is not a file" --- 1377,1383 ---- ! #: fileio.c:371 fileio.c:495 fileio.c:2491 fileio.c:2529 msgid "is a directory" ! msgstr "´Â ŔÚˇášćŔÔ´Ď´Ů" ! #: fileio.c:373 msgid "is not a file" *************** *** 1358,1364 **** ! #: fileio.c:543 msgid "[Permission Denied]" ! msgstr "[Çăżë žĘľĘ]" ! #: fileio.c:635 msgid "E200: *ReadPre autocommands made the file unreadable" --- 1389,1395 ---- ! #: fileio.c:532 msgid "[Permission Denied]" ! msgstr "[Çăżë žČ ľË´Ď´Ů]" ! #: fileio.c:624 msgid "E200: *ReadPre autocommands made the file unreadable" *************** *** 1366,1372 **** ! #: fileio.c:637 msgid "E201: *ReadPre autocommands must not change current buffer" ! msgstr "E201: *ReadPre ŔÚľż¸íˇÉŔş ÇöŔç šöĆ۸Ś šŮ˛Ů¸é žĘľË´Ď´Ů" ! #: fileio.c:657 msgid "Vim: Reading from stdin...\n" --- 1397,1403 ---- ! #: fileio.c:626 msgid "E201: *ReadPre autocommands must not change current buffer" ! msgstr "E201: *ReadPre ŔÚľż¸íˇÉŔş ÇöŔç šöĆ۸Ś šŮ˛Ů¸é žČ ľË´Ď´Ů" ! #: fileio.c:646 msgid "Vim: Reading from stdin...\n" *************** *** 1379,1385 **** #. Re-opening the original file failed! ! #: fileio.c:887 msgid "E202: Conversion made file unreadable!" ! msgstr "E202: şŻČŻľČ ĆÄŔĎŔť ŔĐŔť źö°Ą žřžîżä!" ! #: fileio.c:1743 msgid "[fifo/socket]" --- 1410,1416 ---- #. Re-opening the original file failed! ! #: fileio.c:876 msgid "E202: Conversion made file unreadable!" ! msgstr "E202: şŻČŻľČ ĆÄŔĎŔť ŔĐŔť źö°Ą žř˝Ŕ´Ď´Ů!" ! #: fileio.c:1732 msgid "[fifo/socket]" *************** *** 1395,1401 **** ! #: fileio.c:1765 msgid "[RO]" ! msgstr "[ŔĐąâŔüżë]" ! #: fileio.c:1775 msgid "[CR missing]" --- 1426,1432 ---- ! #: fileio.c:1754 msgid "[RO]" ! msgstr "[ŔĐąâ Ŕüżë]" ! #: fileio.c:1764 msgid "[CR missing]" *************** *** 1411,1425 **** ! #: fileio.c:1791 fileio.c:3528 msgid "[NOT converted]" ! msgstr "[şŻČŻžĘľĘ]" ! #: fileio.c:1796 fileio.c:3533 msgid "[converted]" ! msgstr "[şŻČŻľĘ]" ! #: fileio.c:1803 fileio.c:3558 msgid "[crypted]" ! msgstr "[žĎČŁČ­ľĘ]" ! #: fileio.c:1810 msgid "[CONVERSION ERROR]" --- 1442,1456 ---- ! #: fileio.c:1780 fileio.c:3569 msgid "[NOT converted]" ! msgstr "[şŻČŻ žČ ľË´Ď´Ů]" ! #: fileio.c:1785 fileio.c:3574 msgid "[converted]" ! msgstr "[şŻČŻ ľÇžú˝Ŕ´Ď´Ů]" ! #: fileio.c:1792 fileio.c:3599 msgid "[crypted]" ! msgstr "[žĎČŁČ­ ľÇžú˝Ŕ´Ď´Ů]" ! #: fileio.c:1799 msgid "[CONVERSION ERROR]" *************** *** 1443,1453 **** ! #: fileio.c:2417 msgid "E203: Autocommands deleted or unloaded buffer to be written" ! msgstr "E203: žľ šöĆ۸Ś ŔÚľż¸íˇÉŔĚ ťčÁŚÇĎ°ĹłŞ ´ÝžŇ˝Ŕ´Ď´Ů" ! #: fileio.c:2440 msgid "E204: Autocommand changed number of lines in unexpected way" ! msgstr "E204: Autocommand°Ą Ŕ߸řľČ šćšýŔ¸ˇÎ śóŔÎľéŔť šŮ˛Ůžú˝Ŕ´Ď´Ů" ! #: fileio.c:2506 fileio.c:2523 msgid "is not a file or writable device" --- 1474,1484 ---- ! #: fileio.c:2407 msgid "E203: Autocommands deleted or unloaded buffer to be written" ! msgstr "E203: žľ šöĆ۸Ś ŔÚľż¸íˇÉŔĚ Áöżě°ĹłŞ ´ÝžŇ˝Ŕ´Ď´Ů" ! #: fileio.c:2430 msgid "E204: Autocommand changed number of lines in unexpected way" ! msgstr "E204: Autocommand°Ą Ŕ߸řľČ šćšýŔ¸ˇÎ ÁŮŔť šŮ˛Ůžú˝Ŕ´Ď´Ů" ! #: fileio.c:2496 fileio.c:2513 msgid "is not a file or writable device" *************** *** 1455,1459 **** ! #: fileio.c:2565 msgid "is read-only (use ! to override)" ! msgstr "ŔĐąâŔüżëŔÔ´Ď´Ů (šŤ˝ĂÇϡÁ¸é ! ťçżë)" --- 1486,1490 ---- ! #: fileio.c:2555 msgid "is read-only (use ! to override)" ! msgstr "ŔĐąâ ŔüżëŔÔ´Ď´Ů (šŤ˝ĂÇϡÁ¸é ! ťçżë)" *************** *** 1471,1477 **** ! #: fileio.c:2875 msgid "Cannot create backup file (use ! to override)" ! msgstr "šéž÷ĆÄŔĎŔť ťýźşÇŇ źö žř˝Ŕ´Ď´Ů (šŤ˝ĂÇϡÁ¸é ! ťçżë)" ! #: fileio.c:2964 msgid "Can't make backup file (use ! to override)" --- 1502,1508 ---- ! #: fileio.c:2881 msgid "Cannot create backup file (use ! to override)" ! msgstr "šéž÷ĆÄŔĎŔť ¸¸ľé źö žř˝Ŕ´Ď´Ů (šŤ˝ĂÇϡÁ¸é ! ťçżë)" ! #: fileio.c:2970 msgid "Can't make backup file (use ! to override)" *************** *** 1487,1493 **** ! #: fileio.c:3126 msgid "E213: Cannot convert (use ! to write without conversion)" ! msgstr "E213: şŻČŻÇŇ źö žř˝Ŕ´Ď´Ů (şŻČŻžřŔĚ ŔúŔĺÇϡÁ¸é ! ťçżë)" ! #: fileio.c:3161 msgid "E166: Can't open linked file for writing" --- 1518,1524 ---- ! #: fileio.c:3139 msgid "E213: Cannot convert (use ! to write without conversion)" ! msgstr "E213: şŻČŻÇŇ źö žř˝Ŕ´Ď´Ů (şŻČŻ žřŔĚ ŔúŔĺÇϡÁ¸é ! ťçżë)" ! #: fileio.c:3174 msgid "E166: Can't open linked file for writing" *************** *** 1507,1513 **** ! #: fileio.c:3457 msgid "write error (file system full?)" ! msgstr "ž˛ąâ żĄˇŻ (ĆÄŔĎ ˝Ă˝şĹŰŔĚ ˛ËĂŁłŞ?)" ! #: fileio.c:3523 msgid " CONVERSION ERROR" --- 1538,1544 ---- ! #: fileio.c:3491 msgid "write error (file system full?)" ! msgstr "ž˛ąâ żĄˇŻ (ĆÄŔĎ ˝Ă˝şĹŰŔĚ ˛ËĂĄłŞżä?)" ! #: fileio.c:3564 msgid " CONVERSION ERROR" *************** *** 1527,1533 **** ! #: fileio.c:3566 msgid " appended" ! msgstr " Ăß°ĄľĘ" ! #: fileio.c:3568 msgid " [w]" --- 1558,1564 ---- ! #: fileio.c:3607 msgid " appended" ! msgstr " ´őÇß˝Ŕ´Ď´Ů" ! #: fileio.c:3609 msgid " [w]" *************** *** 1535,1553 **** ! #: fileio.c:3568 msgid " written" ! msgstr " ŔúŔĺľĘ" ! #: fileio.c:3618 msgid "E205: Patchmode: can't save original file" ! msgstr "E205: ĆĐÄĄ¸đľĺ: żřˇĄ ĆÄŔĎŔť ŔúŔĺÇŇ źö žř˝Ŕ´Ď´Ů" ! #: fileio.c:3640 msgid "E206: patchmode: can't touch empty original file" ! msgstr "E206: ĆĐÄĄ¸đľĺ: şó żřˇĄ ĆÄŔĎŔť ťýźşÇŇ źö žř˝Ŕ´Ď´Ů" ! #: fileio.c:3655 msgid "E207: Can't delete backup file" ! msgstr "E207: šéž÷ ĆÄŔĎŔť ťčÁŚÇŇ źö žř˝Ŕ´Ď´Ů" ! #: fileio.c:3707 msgid "" --- 1566,1584 ---- ! #: fileio.c:3609 msgid " written" ! msgstr " ŔúŔĺ Çß˝Ŕ´Ď´Ů" ! #: fileio.c:3659 msgid "E205: Patchmode: can't save original file" ! msgstr "E205: ĆĐÄĄ ťóĹÂ: żřˇĄ ĆÄŔĎŔť ŔúŔĺÇŇ źö žř˝Ŕ´Ď´Ů" ! #: fileio.c:3681 msgid "E206: patchmode: can't touch empty original file" ! msgstr "E206: ĆĐÄĄ ťóĹÂ: şó żřˇĄ ĆÄŔĎŔť ¸¸ľé źö žř˝Ŕ´Ď´Ů" ! #: fileio.c:3696 msgid "E207: Can't delete backup file" ! msgstr "E207: šéž÷ ĆÄŔĎŔť Áöżď źö žř˝Ŕ´Ď´Ů" ! #: fileio.c:3748 msgid "" *************** *** 1559,1565 **** ! #: fileio.c:3709 msgid "don't quit the editor until the file is successfully written!" ! msgstr "ĆÄŔĎŔĚ źş°řŔűŔ¸ˇÎ ŔúŔĺľÉ ś§ąîÁö ĆíÁýąâ¸Ś ÁžˇáÇĎÁö ¸śźźżä!" ! #: fileio.c:3777 msgid "[dos]" --- 1590,1596 ---- ! #: fileio.c:3750 msgid "don't quit the editor until the file is successfully written!" ! msgstr "ĆÄŔĎŔĚ źş°řŔűŔ¸ˇÎ ŔúŔĺľÉ ś§ąîÁö ĆíÁýąâ¸Ś łĄłťÁö ¸ś˝Ę˝ĂżŔ!" ! #: fileio.c:3830 msgid "[dos]" *************** *** 1587,1607 **** ! #: fileio.c:3818 msgid "1 line, " ! msgstr "1 śóŔÎ, " ! #: fileio.c:3820 #, c-format msgid "%ld lines, " ! msgstr "%ld śóŔÎ, " ! #: fileio.c:3823 msgid "1 character" ! msgstr "1 šŽŔÚ" ! #: fileio.c:3825 #, c-format msgid "%ld characters" ! msgstr "%ld šŽŔÚ" ! #: fileio.c:3835 msgid "[noeol]" --- 1618,1638 ---- ! #: fileio.c:3871 msgid "1 line, " ! msgstr "1 ÁŮ, " ! #: fileio.c:3873 #, c-format msgid "%ld lines, " ! msgstr "%ld ÁŮ, " ! #: fileio.c:3876 msgid "1 character" ! msgstr "1 ąŰŔÚ" ! #: fileio.c:3878 #, c-format msgid "%ld characters" ! msgstr "%ld ąŰŔÚ" ! #: fileio.c:3888 msgid "[noeol]" *************** *** 1609,1621 **** ! #: fileio.c:3835 msgid "[Incomplete last line]" ! msgstr "[şŇżĎŔüÇŃ ¸śÁö¸ˇ śóŔÎ]" #. don't overwrite messages here #. don't use emsg() here, don't want to flush the buffers ! #: fileio.c:3853 msgid "WARNING: The file has been changed since reading it!!!" ! msgstr "°ć°í: ĆÄŔĎŔĚ ŔĐŔş ČÄżĄ šŮ˛îžú˝Ŕ´Ď´Ů!!!" ! #: fileio.c:3855 msgid "Do you really want to write to it" --- 1640,1653 ---- ! #: fileio.c:3888 msgid "[Incomplete last line]" ! msgstr "[şŇżĎŔüÇŃ ¸śÁö¸ˇ ÁŮ]" #. don't overwrite messages here + #. must give this prompt #. don't use emsg() here, don't want to flush the buffers ! #: fileio.c:3907 msgid "WARNING: The file has been changed since reading it!!!" ! msgstr "°ć°í: ĆÄŔĎŔĚ ŔĐŔş ľÚżĄ šŮ˛îžú˝Ŕ´Ď´Ů!!!" ! #: fileio.c:3909 msgid "Do you really want to write to it" *************** *** 1642,1649 **** ! #: fileio.c:4985 #, c-format msgid "E211: Warning: File \"%s\" no longer available" ! msgstr "E211: °ć°í: ĆÄŔĎ \"%s\"¸Ś ´őŔĚťó ťçżëÇŇ źö žř˝Ŕ´Ď´Ů" ! #: fileio.c:4998 #, c-format --- 1674,1681 ---- ! #: fileio.c:5047 #, c-format msgid "E211: Warning: File \"%s\" no longer available" ! msgstr "E211: °ć°í: ĆÄŔĎ \"%s\"¸Ś ´ő ŔĚťó ťçżëÇŇ źö žř˝Ŕ´Ď´Ů" ! #: fileio.c:5060 #, c-format *************** *** 1654,1671 **** ! #: fileio.c:5001 #, c-format msgid "W11: Warning: File \"%s\" has changed since editing started" ! msgstr "W11: °ć°í: ĆÄŔĎ \"%s\"°Ą ĆíÁýŔť ˝ĂŔŰÇŃ ČÄżĄ šŮ˛îžú˝Ŕ´Ď´Ů" ! #: fileio.c:5003 #, c-format msgid "W16: Warning: Mode of file \"%s\" has changed since editing started" ! msgstr "W16: °ć°í: ĆÄŔĎ \"%s\"ŔÇ ¸đľĺ°Ą ĆíÁýŔť ˝ĂŔŰÇŃ ČÄżĄ šŮ˛îžú˝Ŕ´Ď´Ů" ! #: fileio.c:5013 #, c-format msgid "W13: Warning: File \"%s\" has been created after editing started" ! msgstr "W13: °ć°í: ĆÄŔĎ \"%s\"°Ą ĆíÁýŔť ˝ĂŔŰÇŃ ČÄżĄ ťýźşľÇžú˝Ŕ´Ď´Ů" ! #: fileio.c:5030 msgid "Warning" --- 1686,1703 ---- ! #: fileio.c:5063 #, c-format msgid "W11: Warning: File \"%s\" has changed since editing started" ! msgstr "W11: °ć°í: ĆÄŔĎ \"%s\"°Ą °íÄĄąâ ˝ĂŔŰÇŃ ľÚżĄ šŮ˛îžú˝Ŕ´Ď´Ů" ! #: fileio.c:5065 #, c-format msgid "W16: Warning: Mode of file \"%s\" has changed since editing started" ! msgstr "W16: °ć°í: ĆÄŔĎ \"%s\"ŔÇ ťóĹ°Ą °íÄĄąâ ˝ĂŔŰÇŃ ľÚżĄ šŮ˛îžú˝Ŕ´Ď´Ů" ! #: fileio.c:5075 #, c-format msgid "W13: Warning: File \"%s\" has been created after editing started" ! msgstr "W13: °ć°í: ĆÄŔĎ \"%s\"°Ą °íÄĄąâ ˝ĂŔŰÇŃ ľÚżĄ ¸¸ľéžú˝Ŕ´Ď´Ů" ! #: fileio.c:5092 msgid "Warning" *************** *** 1681,1693 **** ! #: fileio.c:5102 #, c-format msgid "E321: Could not reload \"%s\"" ! msgstr "E321: \"%s\"¸Ś ŔçˇÎľĺÇŇ źö žř˝Ŕ´Ď´Ů" ! #: fileio.c:5832 #, c-format msgid "E215: Illegal character after *: %s" ! msgstr "E215: * ľÚżĄ ŔĚťóÇŃ šŽŔÚ: %s" ! #: fileio.c:5843 #, c-format --- 1713,1735 ---- ! #: fileio.c:5169 #, c-format msgid "E321: Could not reload \"%s\"" ! msgstr "E321: \"%s\"¸Ś ´Ů˝Ă ˇÎľĺÇŇ źö žř˝Ŕ´Ď´Ů" ! #: fileio.c:5674 ! msgid "--Deleted--" ! msgstr "--ÁöżöÁü--" ! ! #. the group doesn't exist ! #: fileio.c:5834 ! #, c-format ! msgid "E367: No such group: \"%s\"" ! msgstr "E367: Ŕ̡ą ą×ˇě žřŔ˝: \"%s\"" ! ! #: fileio.c:5959 #, c-format msgid "E215: Illegal character after *: %s" ! msgstr "E215: * ľÚżĄ ŔĚťóÇŃ ąŰŔÚ: %s" ! #: fileio.c:5970 #, c-format *************** *** 1747,1749 **** msgid "E350: Cannot create fold with current 'foldmethod'" ! msgstr "E350: ÇöŔçŔÇ 'foldmethod'Ŕ¸ˇÎ Ćúľĺ¸Ś ťýźşÇŇ źö žř˝Ŕ´Ď´Ů" --- 1789,1791 ---- msgid "E350: Cannot create fold with current 'foldmethod'" ! msgstr "E350: ÇöŔçŔÇ 'foldmethod'Ŕ¸ˇÎ Á˘ąâ¸Ś ¸¸ľé źö žř˝Ŕ´Ď´Ů" *************** *** 1751,1755 **** msgid "E351: Cannot delete fold with current 'foldmethod'" ! msgstr "E351: ÇöŔçŔÇ 'foldmethod'Ŕ¸ˇÎ Ćúľĺ¸Ś ťčÁŚÇŇ źö žř˝Ŕ´Ď´Ů" ! #: fold.c:1700 msgid "E221: 'commentstring' is empty" --- 1793,1797 ---- msgid "E351: Cannot delete fold with current 'foldmethod'" ! msgstr "E351: ÇöŔçŔÇ 'foldmethod'Ŕ¸ˇÎ Á˘ąâ¸Ś Áöżď źö žř˝Ŕ´Ď´Ů" ! #: fold.c:1701 msgid "E221: 'commentstring' is empty" *************** *** 1793,1799 **** ! #: getchar.c:3941 msgid "E228: makemap: Illegal mode" ! msgstr "E228: makemap: ŔĚťóÇŃ ¸đľĺ" ! #: gui.c:179 msgid "E229: Cannot start the GUI" --- 1835,1841 ---- ! #: getchar.c:4003 msgid "E228: makemap: Illegal mode" ! msgstr "E228: makemap: ŔĚťóÇŃ ťóĹÂ" ! #: gui.c:181 msgid "E229: Cannot start the GUI" *************** *** 1820,1822 **** msgid " " ! msgstr "<ż­źö žřŔ˝> " --- 1862,1864 ---- msgid " " ! msgstr "<ż­ źö žřŔ˝> " *************** *** 1827,1841 **** ! #: gui_at_fs.c:2534 msgid "vim_SelFile: can't return to current directory" ! msgstr "vim_SelFile: ÇöŔç ľđˇşĹ与¸Ś ľšžĆ°Ľ źö žř˝Ŕ´Ď´Ů" ! #: gui_at_fs.c:2553 msgid "Pathname:" ! msgstr "°ćˇÎ¸í:" ! #: gui_at_fs.c:2559 msgid "vim_SelFile: can't get current directory" ! msgstr "vim_SelFile: ÇöŔç ľđˇşĹ与¸Ś žňŔť źö žř˝Ŕ´Ď´Ů" ! #: gui_at_fs.c:2567 gui_motif.c:1619 msgid "OK" --- 1869,1883 ---- ! #: gui_at_fs.c:2538 msgid "vim_SelFile: can't return to current directory" ! msgstr "vim_SelFile: ÇöŔç ŔÚˇášćżĄ ľšžĆ°Ľ źö žř˝Ŕ´Ď´Ů" ! #: gui_at_fs.c:2557 msgid "Pathname:" ! msgstr "°ćˇÎ Ŕ̸§:" ! #: gui_at_fs.c:2563 msgid "vim_SelFile: can't get current directory" ! msgstr "vim_SelFile: ÇöŔç ŔÚˇášćŔť žňŔť źö žř˝Ŕ´Ď´Ů" ! #: gui_at_fs.c:2571 gui_motif.c:1607 msgid "OK" *************** *** 1856,1862 **** ! #: gui_beval.c:69 msgid "E232: Cannot create BalloonEval with both message and callback" ! msgstr "E232: ¸Ţ˝ĂÁöżÍ ÄÝšé ¸đľÎ¸Ś ťçżëÇŘź­´Â BalloonEvalŔť ťýźşÇŇ źö žř˝Ŕ´Ď´Ů" ! #: gui_gtk.c:1120 msgid "Vim dialog..." --- 1898,1904 ---- ! #: gui_beval.c:68 msgid "E232: Cannot create BalloonEval with both message and callback" ! msgstr "E232: ¸Ţ˝ĂÁöżÍ ÄÝšé ¸đľÎ¸Ś ťçżëÇŘź­´Â BalloonEvalŔť ¸¸ľé źö žř˝Ŕ´Ď´Ů" ! #: gui_gtk.c:1145 msgid "Vim dialog..." *************** *** 1881,1887 **** #. exact match only button ! #: gui_gtk.c:1597 gui_motif.c:3113 msgid "Match exact word only" ! msgstr "śČ°°Ŕş ´Üžî¸¸" ! #: gui_gtk.c:1608 gui_motif.c:3081 msgid "Direction" --- 1923,1929 ---- #. exact match only button ! #: gui_gtk.c:1598 gui_motif.c:2996 msgid "Match exact word only" ! msgstr "śČ°°Ŕş łš¸ť¸¸" ! #: gui_gtk.c:1610 gui_motif.c:2964 msgid "Direction" *************** *** 1922,1928 **** ! #: gui_gtk_x11.c:2436 msgid "Font Selection" ! msgstr "ąŰ˛Ă źąĹĂ" ! #: gui_gtk_x11.c:2678 gui_mac.c:2778 gui_w48.c:1495 gui_x11.c:1781 #, c-format --- 1964,1970 ---- ! #: gui_gtk_x11.c:2460 msgid "Font Selection" ! msgstr "ąŰ˛Ă °í¸Łąâ" ! #: gui_gtk_x11.c:2702 gui_mac.c:2780 gui_w48.c:1197 gui_x11.c:1838 #, c-format *************** *** 1941,1955 **** ! #: gui_gtk_x11.c:3484 ui.c:1918 msgid "Used CUT_BUFFER0 instead of empty selection" ! msgstr "şó źąĹĂ ´ë˝Ĺ CUT_BUFFER0¸Ś ťçżëÇß˝Ŕ´Ď´Ů" ! #: gui_motif.c:1613 gui_motif.c:1616 msgid "Filter" ! msgstr "ÇĘĹÍ" ! #: gui_motif.c:1615 msgid "Directories" ! msgstr "ľđˇşĹ与" ! #: gui_motif.c:1617 msgid "Help" --- 1983,1997 ---- ! #: gui_gtk_x11.c:3519 ui.c:1929 msgid "Used CUT_BUFFER0 instead of empty selection" ! msgstr "şó °í¸Łąâ ´ë˝Ĺ CUT_BUFFER0Ŕť ťçżëÇß˝Ŕ´Ď´Ů" ! #: gui_motif.c:1601 gui_motif.c:1604 msgid "Filter" ! msgstr "°Ĺ¸Ł°ł" ! #: gui_motif.c:1603 msgid "Directories" ! msgstr "ŔÚˇášć" ! #: gui_motif.c:1605 msgid "Help" *************** *** 1961,1965 **** ! #: gui_motif.c:1620 msgid "Selection" ! msgstr "źąĹĂ" --- 2003,2011 ---- ! #: gui_motif.c:1608 msgid "Selection" ! msgstr "°í¸Łąâ" ! ! #: gui_motif.c:2809 ! msgid "Undo" ! msgstr "ĂëźŇ" *************** *** 1968,1970 **** msgid "E235: Can't load Zap font '%s'" ! msgstr "E235: Zap ąŰ˛Ă '%s'¸Ś ŔĐžîľéŔĎ źö žř˝Ŕ´Ď´Ů" --- 2014,2016 ---- msgid "E235: Can't load Zap font '%s'" ! msgstr "E235: Zap ąŰ˛Ă '%s'¸Ś ŔĐžî ľéŔĎ źö žř˝Ŕ´Ď´Ů" *************** *** 1988,2005 **** ! #: gui_w32.c:914 #, c-format msgid "E243: Argument not supported: \"-%s\"; Use the OLE version." ! msgstr "E243: ÁöżřľÇÁö žĘ´Â ŔÎŔÚ: \"-%s\": OLE šöŔüŔť ťçżëÇĎźźżä." ! #: gui_w48.c:1458 ! #, c-format ! msgid "E244: Illegal charset name \"%s\" in font name \"%s\"" ! msgstr "E244: Ŕ߸řľČ šŽŔڟ Ŕ̸§ \"%s\"ŔĚ ąŰ˛Ă Ŕ̸§ \"%s\"żĄ ŔÖ˝Ŕ´Ď´Ů" ! ! #: gui_w48.c:1466 ! #, c-format ! msgid "E245: Illegal char '%c' in font name \"%s\"" ! msgstr "E245: Ŕ߸řľČ šŽŔÚ '%c'°Ą ąŰ˛Ă Ŕ̸§ \"%s\"żĄ ŔÖ˝Ŕ´Ď´Ů" ! ! #: gui_w48.c:2391 msgid "Find string (use '\\\\' to find a '\\')" --- 2034,2041 ---- ! #: gui_w32.c:823 #, c-format msgid "E243: Argument not supported: \"-%s\"; Use the OLE version." ! msgstr "E243: ÁöżřľÇÁö žĘ´Â ŔÎŔÚ: \"-%s\": OLE ĆÇŔť ťçżëÇϽʽÿŔ." ! #: gui_w48.c:2068 msgid "Find string (use '\\\\' to find a '\\')" *************** *** 2016,2023 **** ! #: gui_x11.c:1934 #, c-format msgid "E250: Fonts for the following charsets are missing in fontset %s:" ! msgstr "E250: ´ŮŔ˝ šŽŔÚźÂŔÇ ąŰ˛ĂľéŔĚ ąŰ˛ĂźÂ %sżĄ žř˝Ŕ´Ď´Ů:" ! #: gui_x11.c:1974 #, c-format --- 2052,2059 ---- ! #: gui_x11.c:1992 #, c-format msgid "E250: Fonts for the following charsets are missing in fontset %s:" ! msgstr "E250: ´ŮŔ˝ ąŰŔÚźÂŔÇ ąŰ˛ĂŔĚ ąŰ˛ĂźÂ %sżĄ žř˝Ŕ´Ď´Ů:" ! #: gui_x11.c:2035 #, c-format *************** *** 2070,2074 **** ! #: gui_x11.c:3245 msgid "E255: Couldn't read in sign data!" ! msgstr "E255: sign ľĽŔĚŸ¸Ś ŔĐŔť źö žř˝Ŕ´Ď´Ů" --- 2106,2110 ---- ! #: gui_x11.c:3256 msgid "E255: Couldn't read in sign data!" ! msgstr "E255: sign ŔڡḌ ŔĐŔť źö žř˝Ŕ´Ď´Ů" *************** *** 2085,2087 **** msgid "Add a new database" ! msgstr "ťő ľĽŔĚŸşŁŔĚ˝ş Ăß°Ą" --- 2121,2123 ---- msgid "Add a new database" ! msgstr "ťő ľĽŔĚĹÍşŁŔĚ˝ş Ăß°Ą" *************** *** 2101,2103 **** msgid "Reinit all connections" ! msgstr "¸đľç żŹ°á ŔçĂĘąâČ­" --- 2137,2139 ---- msgid "Reinit all connections" ! msgstr "¸đľç żŹ°á ´Ů˝Ă ĂĘąâČ­" *************** *** 2109,2111 **** msgid "This cscope command does not support splitting the window.\n" ! msgstr "ŔĚ cscope ¸íˇÉŔş â şĐÇŇŔş ÁöżřÇĎÁö žĘ˝Ŕ´Ď´Ů.\n" --- 2145,2147 ---- msgid "This cscope command does not support splitting the window.\n" ! msgstr "ŔĚ cscope ¸íˇÉŔş â łŞ´Šąâ¸Ś ÁöżřÇĎÁö žĘ˝Ŕ´Ď´Ů.\n" *************** *** 2127,2129 **** msgid "Added cscope database %s" ! msgstr "cscope ľĽŔĚŸşŁŔĚ˝ş %sżĄ Ăß°ĄÇĎż´˝Ŕ´Ď´Ů." --- 2163,2165 ---- msgid "Added cscope database %s" ! msgstr "cscope ľĽŔĚĹÍşŁŔĚ˝ş %sżĄ Ăß°ĄÇĎż´˝Ŕ´Ď´Ů." *************** *** 2132,2134 **** msgid "%s is not a directory or a valid cscope database" ! msgstr "%s´Â ľđˇşĹ与ľľ žĆ´Ď°í cscope ľĽŔĚŸşŁŔĚ˝şľľ žĆ´Ő´Ď´Ů" --- 2168,2170 ---- msgid "%s is not a directory or a valid cscope database" ! msgstr "%s´Â ŔÚˇášćľľ žĆ´Ď°í cscope ľĽŔĚĹÍşŁŔĚ˝şľľ žĆ´Ő´Ď´Ů" *************** *** 2145,2147 **** msgid "Could not create cscope pipes" ! msgstr "cscope ĆÄŔĚÇÁ¸Ś ťýźşÇŇ źö žř˝Ŕ´Ď´Ů" --- 2181,2183 ---- msgid "Could not create cscope pipes" ! msgstr "cscope ĆÄŔĚÇÁ¸Ś ¸¸ľé źö žř˝Ŕ´Ď´Ů" *************** *** 2179,2181 **** msgid "duplicate cscope database not added" ! msgstr "ÁßşšľČ cscope ľĽŔĚŸşŁŔĚ˝ş´Â Ăß°ĄľÇÁö žĘžŇ˝Ŕ´Ď´Ů" --- 2215,2217 ---- msgid "duplicate cscope database not added" ! msgstr "ÁßşšľČ cscope ľĽŔĚĹÍşŁŔĚ˝ş´Â Ăß°ĄľÇÁö žĘžŇ˝Ŕ´Ď´Ů" *************** *** 2183,2185 **** msgid "maximum number of cscope connections reached" ! msgstr "cscope żŹ°á ÇăżëÄĄŔÇ ĂÖ´ë°ŞżĄ ľľ´ŢÇß˝Ŕ´Ď´Ů" --- 2219,2221 ---- msgid "maximum number of cscope connections reached" ! msgstr "cscope żŹ°á ÇăżëÄĄŔÇ ĂÖ´ë °ŞżĄ ľľ´ŢÇß˝Ŕ´Ď´Ů" *************** *** 2224,2226 **** msgid " # line" ! msgstr " # śóŔÎ" --- 2260,2262 ---- msgid " # line" ! msgstr " # ÁŮ" *************** *** 2228,2230 **** msgid "filename / context / line\n" ! msgstr "ĆÄŔϸí / ÄÜĹŘ˝şĆŽ / śóŔÎ\n" --- 2264,2266 ---- msgid "filename / context / line\n" ! msgstr "ĆÄŔĎ Ŕ̸§ / ÄÜĹŘ˝şĆŽ / ÁŮ\n" *************** *** 2232,2234 **** msgid "All cscope databases reset" ! msgstr "¸đľç cscope ľĽŔĚŸşŁŔĚ˝ş ¸ŽźÂ" --- 2268,2270 ---- msgid "All cscope databases reset" ! msgstr "¸đľç cscope ľĽŔĚĹÍşŁŔĚ˝ş ¸ŽźÂ" *************** *** 2240,2242 **** msgid " # pid database name prepend path\n" ! msgstr " # pid ľĽŔĚŸşŁŔĚ˝ş Ŕ̸§ prepend path\n" --- 2276,2278 ---- msgid " # pid database name prepend path\n" ! msgstr " # pid ľĽŔĚĹÍşŁŔĚ˝ş Ŕ̸§ prepend path\n" *************** *** 2252,2261 **** msgstr "" ! "E263: ÁËźŰ, ŔĚ ¸íˇÉŔş ťçżëÇŇ źö žřžîżä, ĆÄŔĚźŐ śóŔ̺ꡯ¸Ž¸Ś ˇÎľůÇŇ źö žř˝Ŕ´Ď" ! "´Ů." ! #: if_python.c:580 msgid "can't delete OutputObject attributes" ! msgstr "OutputObject źÓźşŔť ťčÁŚÇŇ źö žř˝Ŕ´Ď´Ů" ! #: if_python.c:587 msgid "softspace must be an integer" --- 2288,2297 ---- msgstr "" ! "E263: šĚžČÇŐ´Ď´Ů, ŔĚ ¸íˇÉŔş ťçżëÇŇ źö žř˝Ŕ´Ď´Ů, ĆÄŔ̽㠜óŔ̺ꡯ¸Ž¸Ś ˇÎľůÇŇ " ! "źö žř˝Ŕ´Ď´Ů." ! #: if_python.c:576 msgid "can't delete OutputObject attributes" ! msgstr "OutputObject źÓźşŔť Áöżď źö žř˝Ŕ´Ď´Ů" ! #: if_python.c:583 msgid "softspace must be an integer" *************** *** 2267,2277 **** ! #: if_python.c:634 if_python.c:648 msgid "writelines() requires list of strings" ! msgstr "writelines()Ŕş šŽŔÚż­ ¸ńˇĎŔĚ ÇĘżäÇŐ´Ď´Ů" ! #: if_python.c:774 msgid "E264: Python: Error initialising I/O objects" ! msgstr "E264: ĆÄŔĚźŐ: I/O °´Ăź ĂĘąâČ­Áß żĄˇŻ°Ą šßťýÇß˝Ŕ´Ď´Ů" ! #: if_python.c:959 if_tcl.c:1393 msgid "invalid expression" --- 2303,2313 ---- ! #: if_python.c:630 if_python.c:644 msgid "writelines() requires list of strings" ! msgstr "writelines()´Â šŽŔÚż­ ¸ńˇĎŔĚ ÇĘżäÇŐ´Ď´Ů" ! #: if_python.c:770 msgid "E264: Python: Error initialising I/O objects" ! msgstr "E264: ĆÄŔĚ˝ă: I/O °´Ăź ĂĘąâČ­Áß żĄˇŻ°Ą ťý°ĺ˝Ŕ´Ď´Ů" ! #: if_python.c:955 if_tcl.c:1391 msgid "invalid expression" *************** *** 2279,2298 **** ! #: if_python.c:973 if_tcl.c:1398 msgid "expressions disabled at compile time" ! msgstr "ÇĽÇö˝ÄŔť ÁöżřÇĎÁö žĘľľˇĎ ÄÄĆÄŔϾǞú˝Ŕ´Ď´Ů" ! #: if_python.c:986 msgid "attempt to refer to deleted buffer" ! msgstr "ťčÁŚľČ šöĆ۸Ś ÂüÁśÇϡÁ°í ÇĎż´˝Ŕ´Ď´Ů" ! #: if_python.c:1001 if_python.c:1042 if_python.c:1106 if_tcl.c:1205 msgid "line number out of range" ! msgstr "śóŔÎ šřČŁ°Ą šüŔ§¸Ś šţžîłľ˝Ŕ´Ď´Ů" ! #: if_python.c:1239 #, c-format msgid "" ! msgstr "<%8lXżĄ šöĆŰ °´Ăź (ťčÁŚľĘ)>" ! #: if_python.c:1330 if_tcl.c:827 msgid "invalid mark name" --- 2315,2334 ---- ! #: if_python.c:969 if_tcl.c:1396 msgid "expressions disabled at compile time" ! msgstr "ÇĽÇö˝ÄŔť ÁöżřÇĎÁö žĘľľˇĎ ÄÄĆÄŔĎ ľÇžú˝Ŕ´Ď´Ů" ! #: if_python.c:982 msgid "attempt to refer to deleted buffer" ! msgstr "ÁöżöÁř šöĆ۸Ś ÂüÁśÇϡÁ°í ÇĎż´˝Ŕ´Ď´Ů" ! #: if_python.c:997 if_python.c:1038 if_python.c:1102 if_tcl.c:1203 msgid "line number out of range" ! msgstr "ÁŮ šřČŁ°Ą šüŔ§¸Ś šţžîłľ˝Ŕ´Ď´Ů" ! #: if_python.c:1235 #, c-format msgid "" ! msgstr "<%8lXżĄ šöĆŰ °´Ăź (ÁöżöÁł˝Ŕ´Ď´Ů)>" ! #: if_python.c:1326 if_tcl.c:825 msgid "invalid mark name" *************** *** 2304,2314 **** ! #: if_python.c:1693 msgid "attempt to refer to deleted window" ! msgstr "ťčÁŚľČ âŔť ÂüÁśÇϡÁ°í ÇĎż´˝Ŕ´Ď´Ů" ! #: if_python.c:1738 msgid "readonly attribute" ! msgstr "ŔĐąâŔüżë źÓźş" ! #: if_python.c:1751 msgid "cursor position outside buffer" --- 2340,2350 ---- ! #: if_python.c:1689 msgid "attempt to refer to deleted window" ! msgstr "ÁöżöÁř âŔť ÂüÁśÇϡÁ°í ÇĎż´˝Ŕ´Ď´Ů" ! #: if_python.c:1734 msgid "readonly attribute" ! msgstr "ŔĐąâ Ŕüżë źÓźş" ! #: if_python.c:1747 msgid "cursor position outside buffer" *************** *** 2316,2323 **** ! #: if_python.c:1828 #, c-format msgid "" ! msgstr "<%.8lXżĄ â °´Ăź (ťčÁŚľĘ)>" ! #: if_python.c:1840 #, c-format --- 2352,2359 ---- ! #: if_python.c:1824 #, c-format msgid "" ! msgstr "<%.8lXżĄ â °´Ăź (ÁöżöÁł˝Ŕ´Ď´Ů)>" ! #: if_python.c:1836 #, c-format *************** *** 2335,2339 **** ! #: if_python.c:2148 if_python.c:2179 if_python.c:2229 if_python.c:2289 ! #: if_python.c:2406 if_python.c:2458 if_tcl.c:675 if_tcl.c:720 if_tcl.c:794 ! #: if_tcl.c:864 if_tcl.c:1989 msgid "cannot save undo information" --- 2371,2375 ---- ! #: if_python.c:2171 if_python.c:2206 if_python.c:2256 if_python.c:2319 ! #: if_python.c:2439 if_python.c:2491 if_tcl.c:673 if_tcl.c:718 if_tcl.c:792 ! #: if_tcl.c:862 if_tcl.c:1987 msgid "cannot save undo information" *************** *** 2341,2355 **** ! #: if_python.c:2150 if_python.c:2236 if_python.c:2300 msgid "cannot delete line" ! msgstr "śóŔÎŔť ťčÁŚÇŇ źö žř˝Ŕ´Ď´Ů" ! #: if_python.c:2181 if_python.c:2316 if_tcl.c:681 if_tcl.c:2011 msgid "cannot replace line" ! msgstr "śóŔÎŔť ÄĄČŻÇŇ źö žř˝Ŕ´Ď´Ů" ! #: if_python.c:2332 if_python.c:2408 if_python.c:2466 msgid "cannot insert line" ! msgstr "śóŔÎŔť ťđŔÔÇŇ źö žř˝Ŕ´Ď´Ů" ! #: if_python.c:2570 msgid "string cannot contain newlines" --- 2377,2391 ---- ! #: if_python.c:2173 if_python.c:2263 if_python.c:2330 msgid "cannot delete line" ! msgstr "ÁŮŔť Áöżď źö žř˝Ŕ´Ď´Ů" ! #: if_python.c:2208 if_python.c:2346 if_tcl.c:679 if_tcl.c:2009 msgid "cannot replace line" ! msgstr "ÁŮŔť šŮ˛Ü źö žř˝Ŕ´Ď´Ů" ! #: if_python.c:2362 if_python.c:2441 if_python.c:2499 msgid "cannot insert line" ! msgstr "ÁŮŔť ł˘żöłÖŔť źö žř˝Ŕ´Ď´Ů" ! #: if_python.c:2603 msgid "string cannot contain newlines" *************** *** 2361,2365 **** msgstr "" ! "E266: ÁËźŰ, ŔĚ ¸íˇÉŔş ťçżëÇŇ źö žřžîżä, ˇçşń śóŔ̺ꡯ¸Ž¸Ś ˇÎľůÇŇ źö žřžîżä." ! #: if_ruby.c:461 #, c-format --- 2397,2402 ---- msgstr "" ! "E266: šĚžČÇŐ´Ď´Ů, ŔĚ ¸íˇÉŔş ťçżëÇŇ źö žř˝Ŕ´Ď´Ů, ˇçşń śóŔ̺ꡯ¸Ž¸Ś ˇÎľůÇŇ źö " ! "žř˝Ŕ´Ď´Ů." ! #: if_ruby.c:457 #, c-format *************** *** 2445,2450 **** msgstr "" ! "SNiFF+ˇÎ żŹ°áÇŇ źö žř˝Ŕ´Ď´Ů. ČŻ°ćŔť ČŽŔÎÇĎźźżä (sniffemacs°Ą $PATHżĄź­ ĂŁžĆÁŽ" ! "žß ÇŐ´Ď´Ů).\n" ! #: if_sniff.c:429 msgid "E274: Sniff: Error during read. Disconnected" --- 2482,2487 ---- msgstr "" ! "SNiFF+ˇÎ żŹ°áÇŇ źö žř˝Ŕ´Ď´Ů. ČŻ°ćŔť ČŽŔÎÇϽʽÿŔ (sniffemacs°Ą $PATHżĄź­ ĂŁžĆ" ! "ÁŽžß ÇŐ´Ď´Ů).\n" ! #: if_sniff.c:425 msgid "E274: Sniff: Error during read. Disconnected" *************** *** 2498,2504 **** #. ??? ! #: if_tcl.c:765 msgid "cannot set line(s)" ! msgstr "śóŔÎŔť źłÁ¤ÇŇ źö žř˝Ŕ´Ď´Ů" ! #: if_tcl.c:836 msgid "mark not set" --- 2535,2541 ---- #. ??? ! #: if_tcl.c:763 msgid "cannot set line(s)" ! msgstr "ÁŮŔť źłÁ¤ÇŇ źö žř˝Ŕ´Ď´Ů" ! #: if_tcl.c:834 msgid "mark not set" *************** *** 2511,2517 **** ! #: if_tcl.c:872 msgid "cannot insert/append line" ! msgstr "śóŔÎŔť ťđŔÔ/Ăß°ĄÇŇ źö žř˝Ŕ´Ď´Ů" ! #: if_tcl.c:1259 msgid "unknown flag: " --- 2548,2554 ---- ! #: if_tcl.c:870 msgid "cannot insert/append line" ! msgstr "ÁŮŔť ł˘żöłÖ°ĹłŞ ´őÇŇ źö žř˝Ŕ´Ď´Ů" ! #: if_tcl.c:1257 msgid "unknown flag: " *************** *** 2531,2543 **** ! #: if_tcl.c:1462 msgid "cannot create buffer/window command: object is being deleted" ! msgstr "šöĆŰ/â ¸íˇÉŔť ťýźşÇŇ źö žř˝Ŕ´Ď´Ů: °´Ăź°Ą ťčÁŚľË´Ď´Ů" ! #: if_tcl.c:1536 msgid "" "cannot register callback command: buffer/window is already being deleted" ! msgstr "ÄÝšé ¸íˇÉŔť ľîˇĎÇŇ źö žř˝Ŕ´Ď´Ů: šöĆŰ/âŔĚ ŔĚšĚ ťčÁŚľÇžú˝Ŕ´Ď´Ů" #. This should never happen. Famous last word? ! #: if_tcl.c:1553 msgid "" --- 2568,2580 ---- ! #: if_tcl.c:1460 msgid "cannot create buffer/window command: object is being deleted" ! msgstr "šöĆŰ/â ¸íˇÉŔť ¸¸ľé źö žř˝Ŕ´Ď´Ů: °´Ăź°Ą ÁöżöÁý´Ď´Ů" ! #: if_tcl.c:1534 msgid "" "cannot register callback command: buffer/window is already being deleted" ! msgstr "ÄÝšé ¸íˇÉŔť ľîˇĎÇŇ źö žř˝Ŕ´Ď´Ů: šöĆŰ/âŔĚ ŔĚšĚ ÁöżöÁł˝Ŕ´Ď´Ů" #. This should never happen. Famous last word? ! #: if_tcl.c:1551 msgid "" *************** *** 2547,2551 **** "E280: TCL ˝É°˘ÇŃ żĄˇŻ: reflist°Ą ąúÁłłŞ!? ŔĚ šŽÁŚ¸Ś vim-dev@vim.orgˇÎ žËˇÁÁÖ" ! "źźżä" ! #: if_tcl.c:1554 msgid "cannot register callback command: buffer/window reference not found" --- 2584,2588 ---- "E280: TCL ˝É°˘ÇŃ żĄˇŻ: reflist°Ą ąúÁłłŞ!? ŔĚ šŽÁŚ¸Ś vim-dev@vim.orgˇÎ žËˇÁÁÖ" ! "˝Ę˝ĂżŔ" ! #: if_tcl.c:1552 msgid "cannot register callback command: buffer/window reference not found" *************** *** 2553,2559 **** ! #: if_tcl.c:1715 msgid "Sorry, this command is disabled: the Tcl library could not be loaded." ! msgstr "ÁËźŰ, ŔĚ ¸íˇÉŔş ťçżëÇŇ źö žřžîżä, Tcl śóŔ̺ꡯ¸Ž¸Ś ˇÎľůÇŇ źö žřžîżä." ! #: if_tcl.c:1877 msgid "" --- 2590,2598 ---- ! #: if_tcl.c:1713 msgid "Sorry, this command is disabled: the Tcl library could not be loaded." ! msgstr "" ! "šĚžČÇŐ´Ď´Ů, ŔĚ ¸íˇÉŔş ťçżëÇŇ źö žř˝Ŕ´Ď´Ů, Tcl śóŔ̺ꡯ¸Ž¸Ś ˇÎľůÇŇ źö žř˝Ŕ´Ď" ! "´Ů." ! #: if_tcl.c:1875 msgid "" *************** *** 2561,2570 **** msgstr "" ! "E281: TCL żĄˇŻ: ÁžˇáÄÚľĺ°Ą Á¤źö°Ą žĆ´Ń°Ą!? ŔĚ šŽÁŚ¸Ś vim-dev@vim.orgˇÎ žËˇÁÁÖ" ! "źźżä" ! #: if_tcl.c:1997 msgid "cannot get line" ! msgstr "śóŔÎŔť žňŔť źö žř˝Ŕ´Ď´Ů" ! #: if_xcmdsrv.c:215 msgid "Unable to register a command server name" --- 2600,2609 ---- msgstr "" ! "E281: TCL żĄˇŻ: łĄłťąâ ÄÚľĺ°Ą Á¤źö°Ą žĆ´Ń°Ą!? ŔĚ šŽÁŚ¸Ś vim-dev@vim.orgˇÎ žË" ! "ˇÁÁֽʽÿŔ" ! #: if_tcl.c:1995 msgid "cannot get line" ! msgstr "ÁŮŔť žňŔť źö žř˝Ŕ´Ď´Ů" ! #: if_xcmdsrv.c:204 msgid "Unable to register a command server name" *************** *** 2581,2591 **** ! #: if_xcmdsrv.c:637 ! msgid "E249: couldn't read VIM instance registry property" ! msgstr "E249: şö ŔνşĹĎ˝ş ˇšÁö˝şĆŽ¸Ž źÓźşŔť ŔĐŔť źö žř˝Ŕ´Ď´Ů" ! ! #: if_xcmdsrv.c:650 ! msgid "E251: VIM instance registry property is badly formed. Deleted!" ! msgstr "E251: şö ŔνşĹĎ˝ş ˇšÁö˝şĆŽ¸Ž źÓźşŔĚ Ŕ߸řľÇžî ŔÖ˝Ŕ´Ď´Ů. ťčÁŚ!" ! ! #: if_xcmdsrv.c:739 #, c-format --- 2620,2622 ---- ! #: if_xcmdsrv.c:714 #, c-format *************** *** 2594,2612 **** ! #: if_xcmdsrv.c:1506 ! msgid "" ! "\n" ! "Send failed. No command server present ?\n" ! msgstr "" ! "\n" ! "ş¸łťąâ ˝ÇĆĐ. ¸íˇÉ ź­šö°Ą žřłŞżä?\n" ! ! #: if_xcmdsrv.c:1511 ! msgid "\nSend failed. Trying to execute locally\n" ! msgstr "\nş¸łťąâ ˝ÇĆĐ. ˇÎÄĂżĄź­ ˝ÇÇŕľË´Ď´Ů\n" ! #: if_xcmdsrv.c:1543 ! msgid "Send expression failed.\n" ! msgstr "ÇĽÇö˝Ä ş¸łťąâ°Ą ˝ÇĆĐÇß˝Ŕ´Ď´Ů.\n" ! #: main.c:48 option.c:3062 option.c:3169 msgid "Unknown option" --- 2625,2635 ---- ! #: if_xcmdsrv.c:1061 ! msgid "E249: couldn't read VIM instance registry property" ! msgstr "E249: şö ŔνşĹĎ˝ş ˇšÁö˝şĆŽ¸Ž źÓźşŔť ŔĐŔť źö žř˝Ŕ´Ď´Ů" ! #: if_xcmdsrv.c:1072 ! msgid "E251: VIM instance registry property is badly formed. Deleted!" ! msgstr "E251: şö ŔνşĹĎ˝ş ˇšÁö˝şĆŽ¸Ž źÓźşŔĚ Ŕ߸řľÇžî ŔÖ˝Ŕ´Ď´Ů. Áöżü˝Ŕ´Ď´Ů!" ! #: main.c:53 option.c:3162 option.c:3269 msgid "Unknown option" *************** *** 2622,2628 **** ! #: main.c:54 msgid "Garbage after option" ! msgstr "żÉźÇ ľÚżĄ ž˛ˇšąâ°Ş" ! #: main.c:56 msgid "Too many \"+command\" or \"-c command\" arguments" --- 2645,2651 ---- ! #: main.c:59 msgid "Garbage after option" ! msgstr "żÉźÇ ľÚżĄ ž˛ˇšąâ °Ş" ! #: main.c:61 msgid "Too many \"+command\" or \"-c command\" arguments" *************** *** 2634,2640 **** ! #: main.c:386 msgid "This Vim was not compiled with the diff feature." ! msgstr "ŔĚ şöŔş diff ąâ´ÉžřŔĚ ÄÄĆÄŔϾǞú˝Ŕ´Ď´Ů" ! #: main.c:795 msgid "Attempt to open script file again: \"" --- 2657,2663 ---- ! #: main.c:436 msgid "This Vim was not compiled with the diff feature." ! msgstr "ŔĚ şöŔş diff ąâ´É žřŔĚ ÄÄĆÄŔĎ ľÇžú˝Ŕ´Ď´Ů" ! #: main.c:858 msgid "Attempt to open script file again: \"" *************** *** 2642,2647 **** ! #: main.c:799 main.c:806 main.c:850 memline.c:3645 memline.c:3649 ! #: version.c:788 version.c:793 version.c:798 version.c:803 version.c:808 ! #: version.c:813 version.c:819 version.c:823 version.c:827 version.c:832 ! #: version.c:839 version.c:847 version.c:853 msgid "\"\n" --- 2665,2670 ---- ! #: main.c:862 main.c:869 main.c:913 memline.c:3673 memline.c:3677 ! #: version.c:918 version.c:923 version.c:928 version.c:933 version.c:938 ! #: version.c:943 version.c:949 version.c:953 version.c:957 version.c:962 ! #: version.c:969 version.c:977 version.c:983 msgid "\"\n" *************** *** 2657,2664 **** ! #: main.c:942 #, c-format msgid "%d files to edit\n" ! msgstr "%d ĆÄŔĎŔť ĆíÁý\n" ! #: main.c:1016 msgid "Vim: Warning: Output is not to a terminal\n" --- 2680,2687 ---- ! #: main.c:1020 #, c-format msgid "%d files to edit\n" ! msgstr "%d ĆÄŔĎŔť °íÄĄąâ\n" ! #: main.c:1094 msgid "Vim: Warning: Output is not to a terminal\n" *************** *** 2670,2672 **** ! #: main.c:1128 #, c-format --- 2693,2700 ---- ! #. just in case.. ! #: main.c:1171 ! #~ msgid "pre-vimrc command line" ! #~ msgstr "" ! ! #: main.c:1206 #, c-format *************** *** 2683,2689 **** ! #: main.c:2102 msgid "[file ..] edit specified file(s)" ! msgstr "[ĆÄŔĎ ..] ÁÖžîÁř ĆÄŔĎ ĆíÁý" ! #: main.c:2103 msgid "- read text from stdin" --- 2711,2717 ---- ! #: main.c:2190 msgid "[file ..] edit specified file(s)" ! msgstr "[ĆÄŔĎ ..] ÁÖžîÁř ĆÄŔĎ °íÄĄąâ" ! #: main.c:2191 msgid "- read text from stdin" *************** *** 2691,2701 **** ! #: main.c:2104 msgid "-t tag edit file where tag is defined" ! msgstr "-t tag ĹÂą×°Ą Á¤ŔÇľČ Ŕ§ÄĄżĄź­ ĆÄŔĎ ĆíÁý" ! #: main.c:2106 msgid "-q [errorfile] edit file with first error" ! msgstr "-q [żĄˇŻĆÄŔĎ] Ăššř° żĄˇŻ°Ą ł­ ĆÄŔĎ ĆíÁý" ! #: main.c:2115 msgid "" --- 2719,2729 ---- ! #: main.c:2192 msgid "-t tag edit file where tag is defined" ! msgstr "-t tag ĹÂą×°Ą Á¤ŔÇľČ Ŕ§ÄĄżĄź­ ĆÄŔĎ °íÄĄąâ" ! #: main.c:2194 msgid "-q [errorfile] edit file with first error" ! msgstr "-q [żĄˇŻĆÄŔĎ] Ăš šř° żĄˇŻ°Ą ł­ ĆÄŔĎ °íÄĄąâ" ! #: main.c:2203 msgid "" *************** *** 2731,2737 **** ! #: main.c:2126 msgid "--\t\t\tOnly file names after this" ! msgstr "--\t\t\tŔĚ ČÄżĄ´Â ĆÄŔĎ Ŕ̸§¸¸" ! #: main.c:2128 msgid "-register\t\tRegister this gvim for OLE" --- 2759,2765 ---- ! #: main.c:2214 msgid "--\t\t\tOnly file names after this" ! msgstr "--\t\t\tŔĚ ľÚżĄ´Â ĆÄŔĎ Ŕ̸§¸¸" ! #: main.c:2216 msgid "-register\t\tRegister this gvim for OLE" *************** *** 2747,2781 **** ! #: main.c:2133 msgid "-f\t\t\tForeground: Don't fork when starting GUI" ! msgstr "-f\t\t\tĆ÷ą×śóżîľĺ: GUIˇÎ ˝ĂŔ۽ÿĄ Ć÷ĹŠÇĎÁö ¸ť °Í" ! #: main.c:2135 msgid "-v\t\t\tVi mode (like \"vi\")" ! msgstr "-v\t\t\tVi ¸đľĺ (\"vi\"żÍ °°Ŕ˝)" ! #: main.c:2136 msgid "-e\t\t\tEx mode (like \"ex\")" ! msgstr "-e\t\t\tEx ¸đľĺ (\"ex\"żÍ °°Ŕ˝)" ! #: main.c:2137 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")" ! msgstr "-s\t\t\tÁśżëÇŃ (ščÄĄ) ¸đľĺ (\"ex\"¸¸)" ! #: main.c:2138 msgid "-d\t\t\tDiff mode (like \"vimdiff\")" ! msgstr "-d\t\t\tDiff ¸đľĺ (\"vimdiff\"żÍ °°Ŕ˝)" ! #: main.c:2139 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)" ! msgstr "-y\t\t\t˝Źżî ¸đľĺ (\"evim\"°ú °°Ŕ˝, modeless)" ! #: main.c:2140 msgid "-R\t\t\tReadonly mode (like \"view\")" ! msgstr "-R\t\t\tŔĐąâŔüżë ¸đľĺ (\"view\"żÍ °°Ŕ˝)" ! #: main.c:2141 msgid "-Z\t\t\tRestricted mode (like \"rvim\")" ! msgstr "-Z\t\t\tÁŚÇŃľČ ¸đľĺ (\"rvim\"°ú °°Ŕ˝)" ! #: main.c:2142 msgid "-m\t\t\tModifications (writing files) not allowed" --- 2775,2809 ---- ! #: main.c:2221 msgid "-f\t\t\tForeground: Don't fork when starting GUI" ! msgstr "-f\t\t\tĆ÷ą×śóżîľĺ: GUIˇÎ ˝ĂŔŰÇŇ ś§ Ć÷ĹŠÇĎÁö ¸ť °Í" ! #: main.c:2223 msgid "-v\t\t\tVi mode (like \"vi\")" ! msgstr "-v\t\t\tVi ťóĹ (\"vi\"żÍ °°Ŕ˝)" ! #: main.c:2224 msgid "-e\t\t\tEx mode (like \"ex\")" ! msgstr "-e\t\t\tEx ťóĹ (\"ex\"żÍ °°Ŕ˝)" ! #: main.c:2225 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")" ! msgstr "-s\t\t\tÁśżëÇŃ (ščÄĄ) ťóĹ (\"ex\"¸¸)" ! #: main.c:2227 msgid "-d\t\t\tDiff mode (like \"vimdiff\")" ! msgstr "-d\t\t\tDiff ťóĹ (\"vimdiff\"żÍ °°Ŕ˝)" ! #: main.c:2229 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)" ! msgstr "-y\t\t\t˝Źżî ťóĹ (\"evim\"°ú °°Ŕ˝, modeless)" ! #: main.c:2230 msgid "-R\t\t\tReadonly mode (like \"view\")" ! msgstr "-R\t\t\tŔĐąâ Ŕüżë ťóĹ (\"view\"żÍ °°Ŕ˝)" ! #: main.c:2231 msgid "-Z\t\t\tRestricted mode (like \"rvim\")" ! msgstr "-Z\t\t\tÁŚÇŃľČ ťóĹ (\"rvim\"°ú °°Ŕ˝)" ! #: main.c:2232 msgid "-m\t\t\tModifications (writing files) not allowed" *************** *** 2787,2797 **** ! #: main.c:2144 msgid "-b\t\t\tBinary mode" ! msgstr "-b\t\t\tŔĚÁř ¸đľĺ" ! #: main.c:2146 msgid "-l\t\t\tLisp mode" ! msgstr "-l\t\t\t¸Ž˝şÇÁ ¸đľĺ" ! #: main.c:2148 msgid "-C\t\t\tCompatible with Vi: 'compatible'" --- 2815,2825 ---- ! #: main.c:2234 msgid "-b\t\t\tBinary mode" ! msgstr "-b\t\t\tŔĚÁř ťóĹÂ" ! #: main.c:2236 msgid "-l\t\t\tLisp mode" ! msgstr "-l\t\t\t¸Ž˝şÇÁ ťóĹÂ" ! #: main.c:2238 msgid "-C\t\t\tCompatible with Vi: 'compatible'" *************** *** 2807,2813 **** ! #: main.c:2151 msgid "-D\t\t\tDebugging mode" ! msgstr "-D\t\t\tľđšöąë ¸đľĺ" ! #: main.c:2152 msgid "-n\t\t\tNo swap file, use memory only" --- 2835,2841 ---- ! #: main.c:2241 msgid "-D\t\t\tDebugging mode" ! msgstr "-D\t\t\tľđšöąë ťóĹÂ" ! #: main.c:2242 msgid "-n\t\t\tNo swap file, use memory only" *************** *** 2815,2825 **** ! #: main.c:2153 msgid "-r\t\t\tList swap files and exit" ! msgstr "-r\t\t\t˝şżŇ ĆÄŔĎ ¸ńˇĎ ÇĽ˝ĂČÄ Ážˇá" ! #: main.c:2154 msgid "-r (with file name)\tRecover crashed session" ! msgstr "-r (ĆÄŔϸí°ú ÇÔ˛˛)\tĆğվǞú´ř źźźÇ şšą¸" ! #: main.c:2155 msgid "-L\t\t\tSame as -r" --- 2843,2853 ---- ! #: main.c:2243 msgid "-r\t\t\tList swap files and exit" ! msgstr "-r\t\t\t˝şżŇ ĆÄŔĎ ¸ńˇĎŔť ÇĽ˝ĂÇŃ ľÚ łĄłťąâ" ! #: main.c:2244 msgid "-r (with file name)\tRecover crashed session" ! msgstr "-r (ĆÄŔĎ Ŕ̸§°ú ÇÔ˛˛)\tĆğվǞú´ř źźźÇ şšą¸" ! #: main.c:2245 msgid "-L\t\t\tSame as -r" *************** *** 2831,2845 **** ! #: main.c:2158 ! msgid "-d \t\tUse for I/O" ! msgstr "-d <ŔĺÄĄ>\t\tI/OżĄ <ŔĺÄĄ> ťçżë" ! #: main.c:2161 msgid "-H\t\t\tstart in Hebrew mode" ! msgstr "-H\t\t\tHebrew ¸đľĺˇÎ ˝ĂŔŰ" ! #: main.c:2164 msgid "-F\t\t\tstart in Farsi mode" ! msgstr "-F\t\t\tFarsi ¸đľĺˇÎ ˝ĂŔŰ" ! #: main.c:2166 msgid "-T \tSet terminal type to " --- 2859,2873 ---- ! #: main.c:2248 ! msgid "-dev \t\tUse for I/O" ! msgstr "-dev <ŔĺÄĄ>\t\tI/OżĄ <ŔĺÄĄ> ťçżë" ! #: main.c:2251 msgid "-H\t\t\tstart in Hebrew mode" ! msgstr "-H\t\t\tHebrew ťóĹ¡Π˝ĂŔŰ" ! #: main.c:2254 msgid "-F\t\t\tstart in Farsi mode" ! msgstr "-F\t\t\tFarsi ťóĹ¡Π˝ĂŔŰ" ! #: main.c:2256 msgid "-T \tSet terminal type to " *************** *** 2863,2869 **** ! #: main.c:2173 msgid "-O[N]\t\tlike -o but split vertically" ! msgstr "-O[N]\t\t-ożÍ °°Áö¸¸ âŔť źöÁ÷Ŕ¸ˇÎ şĐÇŇ" ! #: main.c:2174 msgid "+\t\t\tStart at end of file" --- 2891,2897 ---- ! #: main.c:2263 msgid "-O[N]\t\tlike -o but split vertically" ! msgstr "-O[N]\t\t-ożÍ °°Áö¸¸ âŔť źöÁ÷Ŕ¸ˇÎ łŞ´Šąâ" ! #: main.c:2264 msgid "+\t\t\tStart at end of file" *************** *** 2871,2877 **** ! #: main.c:2175 msgid "+\t\tStart at line " ! msgstr "+\t\tśóŔÎ żĄź­ ˝ĂŔŰ" ! #: main.c:2177 msgid "--cmd \tExecute before loading any vimrc file" --- 2899,2905 ---- ! #: main.c:2265 msgid "+\t\tStart at line " ! msgstr "+\t\t ÁŮżĄź­ ˝ĂŔŰ" ! #: main.c:2267 msgid "--cmd \tExecute before loading any vimrc file" *************** *** 2879,2893 **** ! #: main.c:2179 msgid "-c \t\tExecute after loading the first file" ! msgstr "-c <¸íˇÉ>\t\tÚ° ĆÄŔĎŔť ŔĐŔş ČÄ <¸íˇÉ>Ŕť ˝ÇÇŕ" ! #: main.c:2180 msgid "-S \t\tSource file after loading the first file" ! msgstr "-S <źźźÇ>\t\tÚ° ĆÄŔĎŔť ŔĐŔş ČÄ <źźźÇ> ĆÄŔĎ źŇ˝ş" ! #: main.c:2181 msgid "-s \tRead Normal mode commands from file " ! msgstr "-s \t ĆÄŔĎżĄź­ Normal ¸đľĺ ¸íˇÉ ŔĐąâ" ! #: main.c:2182 msgid "-w \tAppend all typed commands to file " --- 2907,2921 ---- ! #: main.c:2269 msgid "-c \t\tExecute after loading the first file" ! msgstr "-c <¸íˇÉ>\t\tÚ° ĆÄŔĎŔť ŔĐŔş ľÚ <¸íˇÉ>Ŕť ˝ÇÇŕ" ! #: main.c:2270 msgid "-S \t\tSource file after loading the first file" ! msgstr "-S <źźźÇ>\t\tÚ° ĆÄŔĎŔť ŔĐŔş ľÚ <źźźÇ> ĆÄŔĎ şŇˇŻ ľéŔĚąâ" ! #: main.c:2271 msgid "-s \tRead Normal mode commands from file " ! msgstr "-s \t ĆÄŔĎżĄź­ Normal ťóĹ ¸íˇÉ ŔĐąâ" ! #: main.c:2272 msgid "-w \tAppend all typed commands to file " *************** *** 2899,2905 **** ! #: main.c:2185 msgid "-x\t\t\tEdit encrypted files" ! msgstr "-x\t\t\tžĎČŁČ­ľČ ĆÄŔĎ ĆíÁý" ! #: main.c:2189 msgid "-display \tConnect vim to this particular X-server" --- 2927,2933 ---- ! #: main.c:2275 msgid "-x\t\t\tEdit encrypted files" ! msgstr "-x\t\t\tžĎČŁČ­ľČ ĆÄŔĎ °íÄĄąâ" ! #: main.c:2279 msgid "-display \tConnect vim to this particular X-server" *************** *** 2911,2941 **** ! #: main.c:2193 ! msgid "--serverlist\t\tList available Vim server names and exit" ! msgstr "--serverlist\t\tťçżë°Ą´ÉÇŃ şö ź­šö ¸íŔť ÇĽ˝ĂÇĎ°í Ážˇá" ! #: main.c:2194 ! msgid "--serversend \tSend to a Vim server and exit" ! msgstr "--serversend \tşö ź­šöˇÎ ¸Ś ş¸łť°í Ážˇá" ! #: main.c:2195 ! msgid "--serverexpr \tExecute in server and print result" ! msgstr "--serverexpr \tź­šöżĄź­ ˝ÇÇŕÇĎ°í °á°ú ĂâˇÂ" ! #: main.c:2196 ! #~ msgid "--servername \tSend to/become the Vim server " ! #~ msgstr "" ! #: main.c:2197 ! msgid "--remote \tEdit in a Vim server" ! msgstr "--remote \tşö ź­šöżĄź­ ĆíÁý" ! ! #: main.c:2198 ! msgid "--remote-wait \tAs --remote but wait for files to end edit" ! msgstr "--remote-wait \t--remoteżÍ °°Áö¸¸ ĆíÁýŔĚ łĄłŻ ś§ąîÁö ąâ´Ů¸˛" ! #: main.c:2201 ! msgid "--socketid \tOpen Vim inside another GTK widget" ! msgstr "--socketid \tşöŔť ´Ů¸Ľ GTK Ŕ§ÁŹ žČżĄź­ ż­Ŕ˝" ! #: main.c:2205 msgid "-i \t\tUse instead of .viminfo" --- 2939,2970 ---- ! #: main.c:2283 ! msgid "--socketid \tOpen Vim inside another GTK widget" ! msgstr "--socketid \tşöŔť ´Ů¸Ľ GTK Ŕ§ÁŹ žČżĄź­ ż­Ŕ˝" ! #: main.c:2287 ! msgid "--remote \tEdit in a Vim server and exit" ! msgstr "--remote \tşö ź­šöżĄź­ °íÄĄ°í łĄłťąâ" ! #: main.c:2288 ! msgid "" ! "--remote-wait As --remote but wait for files to have been edited" ! msgstr "--remote-wait --remoteżÍ °°Áö¸¸ ´Ů °íÄĽ ś§ąîÁö ąâ´Ů¸ł´Ď´Ů" ! #: main.c:2289 ! msgid "--remote-send \tSend to a Vim server and exit" ! msgstr "--remote-send \tşö ź­šöˇÎ ¸Ś ş¸łť°í łĄłťąâ" ! #: main.c:2290 ! msgid "--remote-expr \tEvaluate in a Vim server and print result" ! msgstr "--remote-expr \tşö ź­šöżĄź­ ˝ÇÇŕÇĎ°í °á°ú ĂâˇÂ" ! #: main.c:2291 ! msgid "--serverlist\t\tList available Vim server names and exit" ! msgstr "--serverlist\t\tťçżë °Ą´ÉÇŃ şö ź­šö Ŕ̸§Ŕť ÇĽ˝ĂÇĎ°í łĄłťąâ" ! #: main.c:2292 ! #~ msgid "--servername \tSend to/become the Vim server " ! #~ msgstr "" ! ! #: main.c:2295 msgid "-i \t\tUse instead of .viminfo" *************** *** 2943,2953 **** ! #: main.c:2207 msgid "-h\t\t\tprint Help (this message) and exit" ! msgstr "-h\t\t\tľľżň¸ť (ŔĚ ¸Ţ˝ĂÁö) ĂâˇÂČÄ Ážˇá" ! #: main.c:2208 msgid "--version\t\tprint version information and exit" ! msgstr "--version\t\tšöŔü Á¤ş¸ ĂâˇÂČÄ Ážˇá" ! #: main.c:2212 msgid "" --- 2972,2982 ---- ! #: main.c:2297 msgid "-h\t\t\tprint Help (this message) and exit" ! msgstr "-h\t\t\tľľżň¸ťŔť (ŔĚ ¸Ţ˝ĂÁö) ĂâˇÂÇŃ ľÚ łĄłťąâ" ! #: main.c:2298 msgid "--version\t\tprint version information and exit" ! msgstr "--version\t\tĆÇ Á¤ş¸¸Ś ĂâˇÂÇŃ ľÚ łĄłťąâ" ! #: main.c:2302 msgid "" *************** *** 2957,2961 **** "\n" ! "gvimŔĚ žË°í ŔÖ´Â ŔÎŔÚ (¸đĆźÇÁ šöŔü):\n" ! #: main.c:2215 msgid "" --- 2986,2990 ---- "\n" ! "gvimŔĚ žË°í ŔÖ´Â ŔÎŔÚ (¸đĆźÇÁ ĆÇ):\n" ! #: main.c:2305 msgid "" *************** *** 2965,2969 **** "\n" ! "gvimŔĚ žË°í ŔÖ´Â ŔÎŔÚ (žĆĹ×łŞ šöŔü):\n" ! #: main.c:2218 msgid "-display \tRun vim on " --- 2994,2998 ---- "\n" ! "gvimŔĚ žË°í ŔÖ´Â ŔÎŔÚ (žĆĹ×łŞ ĆÇ):\n" ! #: main.c:2308 msgid "-display \tRun vim on " *************** *** 2983,2989 **** ! #: main.c:2224 msgid "-background \tUse for the background (also: -bg)" ! msgstr "-background \tšč°ćťöŔ¸ˇÎ ťçżë (also: -bg)" ! #: main.c:2225 msgid "-foreground \tUse for normal text (also: -fg)" --- 3012,3018 ---- ! #: main.c:2314 msgid "-background \tUse for the background (also: -bg)" ! msgstr "-background \tšŮĹÁ ťöŔ¸ˇÎ ťçżë (also: -bg)" ! #: main.c:2315 msgid "-foreground \tUse for normal text (also: -fg)" *************** *** 3015,3021 **** ! #: main.c:2232 msgid "-menuheight \tUse a menu bar height of (also: -mh)" ! msgstr "-menuheight \t¸Ţ´ş šŮ łôŔĚżĄ ťçżë (also: -mh)" ! #: main.c:2233 main.c:2246 msgid "-reverse\t\tUse reverse video (also: -rv)" --- 3044,3050 ---- ! #: main.c:2323 msgid "-menuheight \tUse a menu bar height of (also: -mh)" ! msgstr "-menuheight \tÂ÷¸˛ÇĽ ¸ˇ´ë łôŔĚżĄ ťçżë (also: -mh)" ! #: main.c:2325 main.c:2338 msgid "-reverse\t\tUse reverse video (also: -rv)" *************** *** 3023,3029 **** ! #: main.c:2234 msgid "+reverse\t\tDon't use reverse video (also: +rv)" ! msgstr "+reverse\t\tšÝŔü şńľđżŔ ťçżë žĘÇÔ (also: +rv)" ! #: main.c:2235 msgid "-xrm \tSet the specified resource" --- 3052,3058 ---- ! #: main.c:2326 msgid "+reverse\t\tDon't use reverse video (also: +rv)" ! msgstr "+reverse\t\tšÝŔü şńľđżŔ ťçżë žČ ÇÔ (also: +rv)" ! #: main.c:2327 msgid "-xrm \tSet the specified resource" *************** *** 3037,3049 **** "\n" ! "gvimŔĚ žË°íŔÖ´Â ŔÎŔÚ (RISC OS šöŔü):\n" ! #: main.c:2239 msgid "--columns \tInitial width of window in columns" ! msgstr "--columns <źýŔÚ>\tÄáłżĄź­ŔÇ Ă˘ŔÇ Ăʹ⠳ʺń" ! #: main.c:2240 msgid "--rows \tInitial height of window in rows" ! msgstr "--rows <źýŔÚ>\tÇ࿥ź­ŔÇ Ă˘ŔÇ ĂĘąâ łôŔĚ" ! #: main.c:2243 msgid "" --- 3066,3078 ---- "\n" ! "gvimŔĚ žË°íŔÖ´Â ŔÎŔÚ (RISC OS ĆÇ):\n" ! #: main.c:2331 msgid "--columns \tInitial width of window in columns" ! msgstr "--columns <źýŔÚ>\tÄ­żĄź­ â Ăʹ⠳ʺń" ! #: main.c:2332 msgid "--rows \tInitial height of window in rows" ! msgstr "--rows <źýŔÚ>\tÁŮżĄź­ â ĂĘąâ łôŔĚ" ! #: main.c:2335 msgid "" *************** *** 3053,3057 **** "\n" ! "gvimŔĚ žË°íŔÖ´Â ŔÎŔÚ (GTK+ šöŔü):\n" ! #: main.c:2247 msgid "-display \tRun vim on (also: --display)" --- 3082,3086 ---- "\n" ! "gvimŔĚ žË°íŔÖ´Â ŔÎŔÚ (GTK+ ĆÇ):\n" ! #: main.c:2339 msgid "-display \tRun vim on (also: --display)" *************** *** 3063,3065 **** ! #: mark.c:711 msgid "No marks set" --- 3092,3121 ---- ! #. Failed to send, abort. ! #: main.c:2566 ! msgid "" ! "\n" ! "Send failed.\n" ! msgstr "" ! "\n" ! "ş¸łťąâ°Ą ˝ÇĆĐÇĎż´˝Ŕ´Ď´Ů.\n" ! ! #. Let vim start normally. ! #: main.c:2571 ! msgid "" ! "\n" ! "Send failed. Trying to execute locally\n" ! msgstr "" ! "\n" ! "ş¸łťąâ ˝ÇĆĐ. ˇÎÄĂżĄź­ ˝ÇÇŕľË´Ď´Ů\n" ! ! #: main.c:2604 main.c:2625 ! #, c-format ! #~ msgid "%d of %d edited" ! #~ msgstr "" ! ! #: main.c:2648 ! msgid "Send expression failed.\n" ! msgstr "ÇĽÇö˝Ä ş¸łťąâ°Ą ˝ÇĆĐÇß˝Ŕ´Ď´Ů.\n" ! ! #: mark.c:660 msgid "No marks set" *************** *** 3127,3137 **** ! #: mbyte.c:3144 msgid "E285: Failed to create input context" ! msgstr "E285: Ŕԡ ÄÜĹŘ˝şĆŽ¸Ś ťýźşÇŇ źö žř˝Ŕ´Ď´Ů" ! #: mbyte.c:3291 msgid "E286: Failed to open input method" ! msgstr "E286: Ŕԡ šć˝ÄŔť żŠ´Â ľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů" ! #: mbyte.c:3302 msgid "E287: Warning: Could not set destroy callback to IM" --- 3183,3193 ---- ! #: mbyte.c:3177 msgid "E285: Failed to create input context" ! msgstr "E285: Ŕԡ ÄÜĹŘ˝şĆŽ¸Ś ¸¸ľé źö žř˝Ŕ´Ď´Ů" ! #: mbyte.c:3324 msgid "E286: Failed to open input method" ! msgstr "E286: Ŕԡ šć˝ÄŔť ż­´Ů°Ą ˝ÇĆĐÇß˝Ŕ´Ď´Ů" ! #: mbyte.c:3335 msgid "E287: Warning: Could not set destroy callback to IM" *************** *** 3151,3157 **** ! #: mbyte.c:3467 msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled" ! msgstr "E291: GTK+°Ą 1.2.3 ŔĚŔü šöŔüŔÔ´Ď´Ů. ťóĹ żľżŞŔť ťçżëÇŇ źö žř˝Ŕ´Ď´Ů" ! #: mbyte.c:3704 msgid "E292: Input Method Server is not running" --- 3207,3213 ---- ! #: mbyte.c:3500 msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled" ! msgstr "E291: GTK+°Ą 1.2.3 ŔĚŔü ĆÇŔÔ´Ď´Ů. ťóĹ żľżŞŔť ťçżëÇŇ źö žř˝Ŕ´Ď´Ů" ! #: mbyte.c:3737 msgid "E292: Input Method Server is not running" *************** *** 3161,3165 **** msgid "E293: block was not locked" ! msgstr "E293: şíˇ°ŔĚ ŔáąĹÁöÁö žĘžŇ˝Ŕ´Ď´Ů" ! #: memfile.c:958 msgid "E294: Seek error in swap file read" --- 3217,3221 ---- msgid "E293: block was not locked" ! msgstr "E293: ą¸żŞŔĚ ŔáąĹÁöÁö žĘžŇ˝Ŕ´Ď´Ů" ! #: memfile.c:972 msgid "E294: Seek error in swap file read" *************** *** 3185,3187 **** msgid "E298: Didn't get block nr 0?" ! msgstr "E298: şíˇ° šřČŁ 0¸Ś žňÁö ¸řÇßžúłŞżä?" --- 3241,3243 ---- msgid "E298: Didn't get block nr 0?" ! msgstr "E298: ą¸żŞ šřČŁ 0Ŕť žňÁö ¸řÇßłŞżä?" *************** *** 3189,3191 **** msgid "E298: Didn't get block nr 1?" ! msgstr "E298: şíˇ° šřČŁ 1¸Ś žňÁö ¸řÇßžúłŞżä?" --- 3245,3247 ---- msgid "E298: Didn't get block nr 1?" ! msgstr "E298: ą¸żŞ šřČŁ 1Ŕť žňÁö ¸řÇßłŞżä?" *************** *** 3193,3195 **** msgid "E298: Didn't get block nr 2?" ! msgstr "E298: şíˇ° šřČŁ 2¸Ś žňÁö ¸řÇßžúłŞżä?" --- 3249,3251 ---- msgid "E298: Didn't get block nr 2?" ! msgstr "E298: ą¸żŞ šřČŁ 2¸Ś žňÁö ¸řÇßłŞżä?" *************** *** 3211,3215 **** msgid "E304: ml_timestamp: Didn't get block 0??" ! msgstr "E304: ml_timestamp: şíˇ° 0Ŕť žňÁö ¸řÇßžúłŞżä??" ! #: memline.c:762 #, c-format --- 3267,3271 ---- msgid "E304: ml_timestamp: Didn't get block 0??" ! msgstr "E304: ml_timestamp: ą¸żŞ 0Ŕť žňÁö ¸řÇßłŞżä??" ! #: memline.c:757 #, c-format *************** *** 3218,3224 **** ! #: memline.c:772 msgid "Enter number of swap file to use (0 to quit): " ! msgstr "ťçżëÇŇ ˝şżŇ ĆÄŔĎ šřČŁ¸Ś ŔÔˇÂÇĎźźżä (0Ŕş Ážˇá): " ! #: memline.c:817 #, c-format --- 3274,3280 ---- ! #: memline.c:767 msgid "Enter number of swap file to use (0 to quit): " ! msgstr "ťçżëÇŇ ˝şżŇ ĆÄŔĎ šřČŁ¸Ś ŔÔˇÂÇϽʽÿŔ (0Ŕş łĄłťąâ): " ! #: memline.c:812 #, c-format *************** *** 3243,3249 **** ! #: memline.c:853 msgid "Use Vim version 3.0.\n" ! msgstr "şö 3.0 šöŔüŔť ťçżëÇĎźźżä.\n" ! #: memline.c:859 #, c-format --- 3299,3305 ---- ! #: memline.c:849 msgid "Use Vim version 3.0.\n" ! msgstr "şö 3.0 ĆÇŔť ťçżëÇϽʽÿŔ.\n" ! #: memline.c:855 #, c-format *************** *** 3282,3322 **** ! #: memline.c:979 #, c-format msgid "E309: Unable to read block 1 from %s" ! msgstr "E309: %sŔÇ şíˇ° 1Ŕť ŔĐŔť źö žř˝Ŕ´Ď´Ů" ! #: memline.c:983 msgid "???MANY LINES MISSING" ! msgstr "???¸šŔş śóŔÎŔť ŔŇžîšö¸˛" ! #: memline.c:999 msgid "???LINE COUNT WRONG" ! msgstr "???śóŔÎ šřČŁ°Ą Ŕ߸řľĘ" ! #: memline.c:1006 msgid "???EMPTY BLOCK" ! msgstr "???şó şíˇ°" ! #: memline.c:1032 msgid "???LINES MISSING" ! msgstr "???śóŔÎŔť ŔŇžîšö¸˛" ! #: memline.c:1064 #, c-format msgid "E310: Block 1 ID wrong (%s not a .swp file?)" ! msgstr "E310: şíˇ° 1ŔÇ ID°Ą Ŕ߸řľÇžú˝Ŕ´Ď´Ů (%s°Ą .swp ĆÄŔĎŔĚ žĆ´Ń°Ą?)" ! #: memline.c:1069 msgid "???BLOCK MISSING" ! msgstr "???şíˇ° ŔŇžîšö¸˛" ! #: memline.c:1085 msgid "??? from here until ???END lines may be messed up" ! msgstr "??? żŠąâşÎĹÍ ???łĄąîÁöŔÇ śóŔÎŔĚ źŻż´˝Ŕ´Ď´Ů" ! #: memline.c:1101 msgid "??? from here until ???END lines may have been inserted/deleted" ! msgstr "??? żŠąâşÎĹÍ ???łĄąîÁöŔÇ śóŔÎŔĚ ťđŔÔ Č¤Ŕş ÁöżöÁŽ šö¸° °Í °°˝Ŕ´Ď´Ů" ! #: memline.c:1121 msgid "???END" --- 3338,3378 ---- ! #: memline.c:975 #, c-format msgid "E309: Unable to read block 1 from %s" ! msgstr "E309: %sŔÇ ą¸żŞ 1Ŕť ŔĐŔť źö žř˝Ŕ´Ď´Ů" ! #: memline.c:979 msgid "???MANY LINES MISSING" ! msgstr "???¸šŔş ÁŮŔť ŔŇžîšö¸˛" ! #: memline.c:995 msgid "???LINE COUNT WRONG" ! msgstr "???ÁŮ šřČŁ°Ą Ŕ߸řľÇžú˝Ŕ´Ď´Ů" ! #: memline.c:1002 msgid "???EMPTY BLOCK" ! msgstr "???şó ą¸żŞ" ! #: memline.c:1028 msgid "???LINES MISSING" ! msgstr "???ÁŮŔť ŔŇžîšö¸˛" ! #: memline.c:1060 #, c-format msgid "E310: Block 1 ID wrong (%s not a .swp file?)" ! msgstr "E310: ą¸żŞ 1ŔÇ ID°Ą Ŕ߸řľÇžú˝Ŕ´Ď´Ů (%s°Ą .swp ĆÄŔĎŔĚ žĆ´Ń°Ą?)" ! #: memline.c:1065 msgid "???BLOCK MISSING" ! msgstr "???ą¸żŞ ŔŇžîšö¸˛" ! #: memline.c:1081 msgid "??? from here until ???END lines may be messed up" ! msgstr "??? żŠąâşÎĹÍ ???łĄąîÁöŔÇ ÁŮŔĚ źŻż´˝Ŕ´Ď´Ů" ! #: memline.c:1097 msgid "??? from here until ???END lines may have been inserted/deleted" ! msgstr "??? żŠąâşÎĹÍ ???łĄąîÁöŔÇ ÁŮŔĚ ł˘żöÁö°ĹłŞ ÁöżöÁŽ šö¸° °Í °°˝Ŕ´Ď´Ů" ! #: memline.c:1117 msgid "???END" *************** *** 3324,3335 **** ! #: memline.c:1147 msgid "E311: Recovery Interrupted" ! msgstr "E311: şšą¸ Áß´ÜľĘ" ! #: memline.c:1149 msgid "" "E312: Errors detected while recovering; look for lines starting with ???" ! msgstr "E312: şšą¸ ľľÁß żĄˇŻ šßťý; ???ˇÎ ˝ĂŔŰÇĎ´Â śóŔÎŔť ĂŁžĆş¸źźżä" ! #: memline.c:1152 msgid "Recovery completed. You should check if everything is OK." --- 3380,3391 ---- ! #: memline.c:1143 msgid "E311: Recovery Interrupted" ! msgstr "E311: şšą¸ ÁߴܾǞú˝Ŕ´Ď´Ů" ! #: memline.c:1145 msgid "" "E312: Errors detected while recovering; look for lines starting with ???" ! msgstr "E312: şšą¸ ľľÁß żĄˇŻ ťý°ĺ˝Ŕ´Ď´Ů; ???ˇÎ ˝ĂŔŰÇĎ´Â ÁŮŔť ĂŁžĆş¸˝Ę˝ĂżŔ" ! #: memline.c:1148 msgid "Recovery completed. You should check if everything is OK." *************** *** 3345,3351 **** ! #: memline.c:1154 msgid "and run diff with the original file to check for changes)\n" ! msgstr "ą×¸Ž°í šŮ˛ď łťżëŔť ČŽŔÎÇϡÁ¸é diff¸Ś ŔĚżëÇĎźźżä)\n" ! #: memline.c:1155 msgid "" --- 3401,3407 ---- ! #: memline.c:1150 msgid "and run diff with the original file to check for changes)\n" ! msgstr "ą×¸Ž°í šŮ˛ď łťżëŔť ČŽŔÎÇϡÁ¸é diff¸Ś ŔĚżëÇϽʽÿŔ)\n" ! #: memline.c:1151 msgid "" *************** *** 3354,3356 **** msgstr "" ! "łŞÁßżĄ .swp ĆÄŔĎŔť ťčÁŚÇĎźźżä.\n" "\n" --- 3410,3412 ---- msgstr "" ! "łŞÁßżĄ .swp ĆÄŔĎŔť Áöżě˝Ę˝ĂżŔ.\n" "\n" *************** *** 3358,3368 **** #. use msg() to start the scrolling properly ! #: memline.c:1211 msgid "Swap files found:" ! msgstr "˝şżŇ ĆÄŔĎ ĂŁžĆÁü:" ! #: memline.c:1389 msgid " In current directory:\n" ! msgstr " ÇöŔç ľđˇşĹ与żĄ:\n" ! #: memline.c:1391 msgid " Using specified name:\n" --- 3414,3424 ---- #. use msg() to start the scrolling properly ! #: memline.c:1207 msgid "Swap files found:" ! msgstr "˝şżŇ ĆÄŔĎŔť ĂŁžŇŔ˝:" ! #: memline.c:1385 msgid " In current directory:\n" ! msgstr " ÇöŔç ŔÚˇášćżĄ:\n" ! #: memline.c:1387 msgid " Using specified name:\n" *************** *** 3390,3396 **** ! #: memline.c:1507 msgid " [from Vim version 3.0]" ! msgstr " [şö šöŔü 3.0ŔÇ °Í]" ! #: memline.c:1511 msgid " [does not look like a Vim swap file]" --- 3446,3452 ---- ! #: memline.c:1503 msgid " [from Vim version 3.0]" ! msgstr " [şö 3.0 ĆÇŔÇ °Í]" ! #: memline.c:1507 msgid " [does not look like a Vim swap file]" *************** *** 3456,3460 **** "\n" ! " [ŔĚ šöŔüŔÇ şöżĄź­´Â ťçżëÇŇ źö žřŔ˝]" ! #: memline.c:1568 msgid "" --- 3512,3516 ---- "\n" ! " [şö ŔĚšř ĆÇżĄź­´Â ťçżëÇŇ źö žřŔ˝]" ! #: memline.c:1564 msgid "" *************** *** 3491,3502 **** ! #: memline.c:1911 #, c-format msgid "E316: ml_get: cannot find line %ld" ! msgstr "E316: ml_get: śóŔÎ %ld¸Ś ĂŁŔť źö žř˝Ŕ´Ď´Ů" ! #: memline.c:2299 msgid "E317: pointer block id wrong 3" ! msgstr "E317: Ŕ߸řľČ Ć÷ŔÎĹÍ şíˇ° id 3" ! #: memline.c:2379 msgid "stack_idx should be 0" --- 3547,3558 ---- ! #: memline.c:1915 #, c-format msgid "E316: ml_get: cannot find line %ld" ! msgstr "E316: ml_get: %ld ÁŮŔť ĂŁŔť źö žř˝Ŕ´Ď´Ů" ! #: memline.c:2303 msgid "E317: pointer block id wrong 3" ! msgstr "E317: Ŕ߸řľČ Ć÷ŔÎĹÍ ą¸żŞ id 3" ! #: memline.c:2383 msgid "stack_idx should be 0" *************** *** 3504,3527 **** ! #: memline.c:2441 msgid "E318: Updated too many blocks?" ! msgstr "E318: łĘšŤ ¸šŔş şíˇ°ŔĚ °ť˝ĹľÇžúłŞżä?" ! #: memline.c:2598 msgid "E317: pointer block id wrong 4" ! msgstr "E317: Ŕ߸řľČ Ć÷ŔÎĹÍ şíˇ° id 4" ! #: memline.c:2625 msgid "deleted block 1?" ! msgstr "şíˇ° 1ŔĚ ťčÁŚľÇžúłŞżä?" ! #: memline.c:2825 #, c-format msgid "E320: Cannot find line %ld" ! msgstr "E320: śóŔÎ %ld¸Ś ĂŁŔť źö žř˝Ŕ´Ď´Ů" ! #: memline.c:3068 msgid "E317: pointer block id wrong" ! msgstr "E317: Ŕ߸řľČ Ć÷ŔÎĹÍ şíˇ° id" ! #: memline.c:3084 msgid "pe_line_count is zero" --- 3560,3583 ---- ! #: memline.c:2445 msgid "E318: Updated too many blocks?" ! msgstr "E318: łĘšŤ ¸šŔş ą¸żŞŔĚ °ť˝ĹľÇžúłŞżä?" ! #: memline.c:2602 msgid "E317: pointer block id wrong 4" ! msgstr "E317: Ŕ߸řľČ Ć÷ŔÎĹÍ ą¸żŞ id 4" ! #: memline.c:2629 msgid "deleted block 1?" ! msgstr "ą¸żŞ 1ŔĚ ÁöżöÁłłŞżä?" ! #: memline.c:2829 #, c-format msgid "E320: Cannot find line %ld" ! msgstr "E320: %ld ÁŮŔť ĂŁŔť źö žř˝Ŕ´Ď´Ů" ! #: memline.c:3072 msgid "E317: pointer block id wrong" ! msgstr "E317: Ŕ߸řľČ Ć÷ŔÎĹÍ ą¸żŞ id" ! #: memline.c:3088 msgid "pe_line_count is zero" *************** *** 3529,3541 **** ! #: memline.c:3113 #, c-format msgid "E322: line number out of range: %ld past the end" ! msgstr "E322: śóŔÎ šřČŁ°Ą šüŔ§¸Ś šţžîłľ˝Ŕ´Ď´Ů: ¸śÁö¸ˇżĄź­ %ld ¸¸Ĺ­" ! #: memline.c:3117 #, c-format msgid "E323: line count wrong in block %ld" ! msgstr "E323: şíˇ° %ldŔÇ śóŔÎ °šźö°Ą ƲˇČ˝Ŕ´Ď´Ů" ! #: memline.c:3166 msgid "Stack size increases" --- 3585,3597 ---- ! #: memline.c:3117 #, c-format msgid "E322: line number out of range: %ld past the end" ! msgstr "E322: ÁŮ šřČŁ°Ą šüŔ§¸Ś šţžîłľ˝Ŕ´Ď´Ů: ¸śÁö¸ˇżĄź­ %ld ¸¸Ĺ­" ! #: memline.c:3121 #, c-format msgid "E323: line count wrong in block %ld" ! msgstr "E323: ą¸żŞ %ldŔÇ ÁŮ °šźö°Ą ƲˇČ˝Ŕ´Ď´Ů" ! #: memline.c:3170 msgid "Stack size increases" *************** *** 3543,3549 **** ! #: memline.c:3212 msgid "E317: pointer block id wrong 2" ! msgstr "E317: Ŕ߸řľČ Ć÷ŔÎĹÍ şíˇ° id 2" ! #: memline.c:3642 msgid "E325: ATTENTION" --- 3599,3605 ---- ! #: memline.c:3216 msgid "E317: pointer block id wrong 2" ! msgstr "E317: Ŕ߸řľČ Ć÷ŔÎĹÍ ą¸żŞ id 2" ! #: memline.c:3670 msgid "E325: ATTENTION" *************** *** 3577,3587 **** "\n" ! "(1) ´Ů¸Ľ ÇÁˇÎą×ˇĽŔĚ °°Ŕş ĆÄŔĎŔť ĆíÁýÁßŔĎ źö ŔÖ˝Ŕ´Ď´Ů.\n" ! " ¸¸žŕ ą×ˇ¸´Ů¸é °°Ŕş ĆÄŔĎŔť ľÎ°łŔÇ ÇÁˇÎą×ˇĽżĄź­ źöÁ¤ÇĎÁö\n" " žĘľľˇĎ Áś˝ÉÇϽù⠚ٜř´Ď´Ů.\n" ! #: memline.c:3661 msgid " Quit, or continue with caution.\n" ! msgstr " ÁžˇáÇĎ°ĹłŞ Ŕ§ÇčŔť °¨źöÇϽáÁ¸é °čźÓÇĎźźżä.\n" ! #: memline.c:3662 msgid "" --- 3633,3643 ---- "\n" ! "(1) ´Ů¸Ľ ÇÁˇÎą×ˇĽŔĚ °°Ŕş ĆÄŔĎŔť °íÄĄ°í ŔÖ´ÂÁßŔĎ źö ŔÖ˝Ŕ´Ď´Ů.\n" ! " ¸¸žŕ ą×ˇ¸´Ů¸é °°Ŕş ĆÄŔĎŔť ľÎ °łŔÇ ÇÁˇÎą×ˇĽżĄź­ °íÄĄÁö\n" " žĘľľˇĎ Áś˝ÉÇϽù⠚ٜř´Ď´Ů.\n" ! #: memline.c:3689 msgid " Quit, or continue with caution.\n" ! msgstr " łĄłť°ĹłŞ Ŕ§ÇčŔť °¨źöÇϽáÁ¸é °čźÓÇϽʽÿŔ.\n" ! #: memline.c:3690 msgid "" *************** *** 3591,3595 **** "\n" ! "(2) ŔĚ ĆÄŔĎżĄ ´ëÇŃ ĆíÁýľľÁß Áמúžú˝Ŕ´Ď´Ů.\n" ! #: memline.c:3663 msgid " If this is the case, use \":recover\" or \"vim -r " --- 3647,3651 ---- "\n" ! "(2) ŔĚ ĆÄŔĎŔť °íÄĄ´Ů°Ą Áמúžú˝Ŕ´Ď´Ů.\n" ! #: memline.c:3691 msgid " If this is the case, use \":recover\" or \"vim -r " *************** *** 3603,3607 **** "\"\n" ! " Ŕť ťçżëÇĎżŠ şšą¸ÇĎźźżä (\":help recovery\" Âü°í).\n" ! #: memline.c:3666 msgid " If you did this already, delete the swap file \"" --- 3659,3663 ---- "\"\n" ! " Ŕť ťçżëÇĎżŠ şšą¸ÇϽʽÿŔ (\":help recovery\" Âü°í).\n" ! #: memline.c:3694 msgid " If you did this already, delete the swap file \"" *************** *** 3638,3645 **** msgstr "" ! "ŔĐąâŔüżëŔ¸ˇÎ ż­ąâ(&O)\n" ! "ą×łÉ ĆíÁý(&E)\n" "şšą¸(&R)\n" ! "Ážˇá(&Q)" ! #: memline.c:3700 msgid "" --- 3694,3701 ---- msgstr "" ! "ŔĐąâ ŔüżëŔ¸ˇÎ ż­ąâ(&O)\n" ! "ą×łÉ °íÄĄąâ(&E)\n" "şšą¸(&R)\n" ! "łĄłťąâ(&Q)" ! #: memline.c:3728 msgid "" *************** *** 3651,3659 **** msgstr "" ! "ŔĐąâŔüżëŔ¸ˇÎ ż­ąâ(&O)\n" ! "ą×łÉ ĆíÁý(&E)\n" "şšą¸(&R)\n" ! "Ážˇá(&Q)\n" ! "ťčÁŚ(&D)" ! #: memline.c:3747 msgid "E326: Too many swap files found" --- 3707,3715 ---- msgstr "" ! "ŔĐąâ ŔüżëŔ¸ˇÎ ż­ąâ(&O)\n" ! "ą×łÉ °íÄĄąâ(&E)\n" "şšą¸(&R)\n" ! "łĄłťąâ(&Q)\n" ! "Áöżěąâ(&D)" ! #: memline.c:3781 msgid "E326: Too many swap files found" *************** *** 3663,3665 **** msgid "E327: Part of menu-item path is not sub-menu" ! msgstr "E327: ¸Ţ´ş Ç׸ń °ćˇÎŔÇ şÎşĐŔĚ ÇĎŔ§ ¸Ţ´ş°Ą žĆ´Ő´Ď´Ů" --- 3719,3721 ---- msgid "E327: Part of menu-item path is not sub-menu" ! msgstr "E327: Â÷¸˛ÇĽ Ç׸ń °ćˇÎŔÇ şÎşĐŔĚ ÇĎŔ§ Â÷¸˛ÇĽ°Ą žĆ´Ő´Ď´Ů" *************** *** 3667,3669 **** msgid "E328: Menu only exists in another mode" ! msgstr "E328: ¸Ţ´ş´Â żŔˇÎÁö ´Ů¸Ľ ¸đľĺżĄź­¸¸ Á¸ŔçÇŐ´Ď´Ů" --- 3723,3725 ---- msgid "E328: Menu only exists in another mode" ! msgstr "E328: Â÷¸˛ÇĽ´Â żŔˇÎÁö ´Ů¸Ľ ťóĹÂżĄź­¸¸ Á¸ŔçÇŐ´Ď´Ů" *************** *** 3671,3673 **** msgid "E329: No menu of that name" ! msgstr "E329: ą×ˇą Ŕ̸§ŔÇ ¸Ţ´ş°Ą žř˝Ŕ´Ď´Ů" --- 3727,3729 ---- msgid "E329: No menu of that name" ! msgstr "E329: ą×ˇą Ŕ̸§Ŕť °ĄÁř Â÷¸˛ÇĽ°Ą žř˝Ŕ´Ď´Ů" *************** *** 3675,3677 **** msgid "E330: Menu path must not lead to a sub-menu" ! msgstr "E330: ÇĎŔ§ ¸Ţ´ş žŐżĄ´Â ¸Ţ´ş °ćˇÎ°Ą şŮŔť źö žř˝Ŕ´Ď´Ů" --- 3731,3733 ---- msgid "E330: Menu path must not lead to a sub-menu" ! msgstr "E330: ÇĎŔ§ Â÷¸˛ÇĽ žŐżĄ´Â Â÷¸˛ÇĽ °ćˇÎ°Ą şŮŔť źö žř˝Ŕ´Ď´Ů" *************** *** 3679,3681 **** msgid "E331: Must not add menu items directly to menu bar" ! msgstr "E331: ¸Ţ´şšŮżĄ °đšŮˇÎ ¸Ţ´ş Ç׸ńŔť Ăß°ĄÇŇ źö´Â žř˝Ŕ´Ď´Ů" --- 3735,3737 ---- msgid "E331: Must not add menu items directly to menu bar" ! msgstr "E331: Â÷¸˛ÇĽ ¸ˇ´ëżĄ °đšŮˇÎ Â÷¸˛ÇĽ Ç׸ńŔť Ăß°ĄÇŇ źö´Â žř˝Ŕ´Ď´Ů" *************** *** 3683,3685 **** msgid "E332: Separator cannot be part of a menu path" ! msgstr "E332: ą¸şĐŔÚ´Â ¸Ţ´ş °ćˇÎŔÇ şÎşĐŔĚ ľÉ źö žř˝Ŕ´Ď´Ů" --- 3739,3741 ---- msgid "E332: Separator cannot be part of a menu path" ! msgstr "E332: ą¸şĐŔÚ´Â Â÷¸˛ÇĽ °ćˇÎŔÇ şÎşĐŔĚ ľÉ źö žř˝Ŕ´Ď´Ů" *************** *** 3693,3723 **** "\n" ! "--- ¸Ţ´ş ---" ! #: menu.c:1973 msgid "Tear off this menu" ! msgstr "ŔĚ ¸Ţ´ş¸Ś śźžîłż" ! #: menu.c:2038 msgid "E333: Menu path must lead to a menu item" ! msgstr "E333: ¸Ţ´ş Ç׸ń žŐżĄ´Â ¸Ţ´ş °ćˇÎ°Ą ŔÖžîžß ÇŐ´Ď´Ů" ! #: menu.c:2058 #, c-format msgid "E334: Menu not found: %s" ! msgstr "E334: ¸Ţ´ş¸Ś ĂŁŔť źö žř˝Ŕ´Ď´Ů: %s" ! #: menu.c:2130 #, c-format msgid "E335: Menu not defined for %s mode" ! msgstr "E335: %s ¸đľĺżĄ ´ëÇŃ ¸Ţ´ş°Ą Á¤ŔǾǞî ŔÖÁö žĘ˝Ŕ´Ď´Ů" ! #: menu.c:2168 msgid "E336: Menu path must lead to a sub-menu" ! msgstr "E336: ÇĎŔ§ ¸Ţ´ş žŐżĄ ¸Ţ´ş °ćˇÎ°Ą ŔÖžîžß ÇŐ´Ď´Ů" ! #: menu.c:2189 msgid "E337: Menu not found - check menu names" ! msgstr "E337: ¸Ţ´ş¸Ś ĂŁŔť źö žřŔ˝ - ¸Ţ´ş Ŕ̸§Ŕť ČŽŔÎÇĎźźżä" ! #: message.c:463 #, c-format --- 3749,3779 ---- "\n" ! "--- Â÷¸˛ÇĽ ---" ! #: menu.c:1989 msgid "Tear off this menu" ! msgstr "ŔĚ Â÷¸˛ÇĽ¸Ś śźžîłż" ! #: menu.c:2054 msgid "E333: Menu path must lead to a menu item" ! msgstr "E333: Â÷¸˛ÇĽ Ç׸ń žŐżĄ´Â Â÷¸˛ÇĽ °ćˇÎ°Ą ŔÖžîžß ÇŐ´Ď´Ů" ! #: menu.c:2074 #, c-format msgid "E334: Menu not found: %s" ! msgstr "E334: Â÷¸˛ÇĽ¸Ś ĂŁŔť źö žř˝Ŕ´Ď´Ů: %s" ! #: menu.c:2143 #, c-format msgid "E335: Menu not defined for %s mode" ! msgstr "E335: %s ťóĹÂżĄ ´ëÇŃ Â÷¸˛ÇĽ°Ą Á¤ŔǾǞî ŔÖÁö žĘ˝Ŕ´Ď´Ů" ! #: menu.c:2181 msgid "E336: Menu path must lead to a sub-menu" ! msgstr "E336: ÇĎŔ§ Â÷¸˛ÇĽ žŐżĄ Â÷¸˛ÇĽ °ćˇÎ°Ą ŔÖžîžß ÇŐ´Ď´Ů" ! #: menu.c:2202 msgid "E337: Menu not found - check menu names" ! msgstr "E337: Â÷¸˛ÇĽ¸Ś ĂŁŔť źö žřŔ˝ - Â÷¸˛ÇĽ Ŕ̸§Ŕť ČŽŔÎÇϽʽÿŔ" ! #: message.c:467 #, c-format *************** *** 3726,3737 **** ! #: message.c:479 #, c-format msgid "line %4ld:" ! msgstr "śóŔÎ %4ld:" ! #: message.c:519 msgid "[string too long]" ! msgstr "[łĘšŤ ąä šŽŔÚż­" ! #: message.c:665 msgid "Messages maintainer: Bram Moolenaar " --- 3782,3793 ---- ! #: message.c:483 #, c-format msgid "line %4ld:" ! msgstr "%4ld ÁŮ:" ! #: message.c:523 msgid "[string too long]" ! msgstr "[łĘšŤ ąä šŽŔÚż­]" ! #: message.c:669 msgid "Messages maintainer: Bram Moolenaar " *************** *** 3743,3753 **** ! #: message.c:880 msgid "Hit ENTER to continue" ! msgstr "°čźÓÇϡÁ¸é żŁĹÍĹ°¸Ś ´Š¸Łźźżä" ! #: message.c:882 msgid "Hit ENTER or type command to continue" ! msgstr "°čźÓÇϡÁ¸é żŁĹÍ Č¤Ŕş ¸íˇÉŔť ŔÔˇÂÇĎźźżä" ! #: message.c:1933 msgid "-- More --" --- 3799,3809 ---- ! #: message.c:885 msgid "Hit ENTER to continue" ! msgstr "°čźÓÇϡÁ¸é żŁĹÍĹ°¸Ś ´Š¸Ł˝Ę˝ĂżŔ" ! #: message.c:887 msgid "Hit ENTER or type command to continue" ! msgstr "°čźÓÇϡÁ¸é żŁĹÍ Č¤Ŕş ¸íˇÉŔť ŔÔˇÂÇϽʽÿŔ" ! #: message.c:1942 msgid "-- More --" *************** *** 3755,3765 **** ! #: message.c:1936 msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)" ! msgstr " (RET/BS: śóŔÎ, SPACE/b: ÂĘ, d/u: šÝÂĘ, q: Ážˇá)" ! #: message.c:1937 msgid " (RET: line, SPACE: page, d: half page, q: quit)" ! msgstr " (RET: śóŔÎ, SPACE: ÂĘ, d: šÝÂĘ, q: Ážˇá)" ! #: message.c:2412 message.c:2427 msgid "Question" --- 3811,3821 ---- ! #: message.c:1945 msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)" ! msgstr " (RET/BS: ÁŮ, SPACE/b: ÂĘ, d/u: šÝÂĘ, q: łĄłťąâ)" ! #: message.c:1946 msgid " (RET: line, SPACE: page, d: half page, q: quit)" ! msgstr " (RET: ÁŮ, SPACE: ÂĘ, d: šÝÂĘ, q: łĄłťąâ)" ! #: message.c:2421 message.c:2436 msgid "Question" *************** *** 3808,3840 **** #. TODO: non-GUI file selector here ! #: message.c:2539 msgid "E338: Sorry, no file browser in console mode" ! msgstr "E338: ÁËźŰ, ÄÜźÖ ¸đľĺżĄ´Â ĆÄŔĎ şęśóżěŔú°Ą žř˝Ŕ´Ď´Ů" ! #: misc1.c:2433 msgid "W10: Warning: Changing a readonly file" ! msgstr "W10: °ć°í: ŔĐąâŔüżë ĆÄŔĎŔť °íÄĄ°í ŔÖ˝Ŕ´Ď´Ů" ! #: misc1.c:2657 msgid "1 more line" ! msgstr "ÇŃÁŮ ŔĚťó" ! #: misc1.c:2659 msgid "1 line less" ! msgstr "ÇŃÁŮ ŔĚÇĎ" ! #: misc1.c:2664 #, c-format msgid "%ld more lines" ! msgstr "%ldş¸´Ů ¸šŔş śóŔÎ" ! #: misc1.c:2666 #, c-format msgid "%ld fewer lines" ! msgstr "%ldş¸´Ů ŔűŔş śóŔÎ" ! #: misc1.c:2669 msgid " (Interrupted)" ! msgstr " (Áß´ÜľĘ)" ! #: misc1.c:6212 msgid "Vim: preserving files...\n" --- 3864,3896 ---- #. TODO: non-GUI file selector here ! #: message.c:2549 msgid "E338: Sorry, no file browser in console mode" ! msgstr "E338: šĚžČÇŐ´Ď´Ů, ÄÜźÖ ťóĹÂżĄ´Â ĆÄŔĎ şęśóżěŔú°Ą žř˝Ŕ´Ď´Ů" ! #: misc1.c:2455 msgid "W10: Warning: Changing a readonly file" ! msgstr "W10: °ć°í: ŔĐąâ Ŕüżë ĆÄŔĎŔť °íÄĄ°í ŔÖ˝Ŕ´Ď´Ů" ! #: misc1.c:2684 msgid "1 more line" ! msgstr "ÇŃ ÁŮ ŔĚťó" ! #: misc1.c:2686 msgid "1 line less" ! msgstr "ÇŃ ÁŮ ŔĚÇĎ" ! #: misc1.c:2691 #, c-format msgid "%ld more lines" ! msgstr "%ld ş¸´Ů ¸šŔş ÁŮ" ! #: misc1.c:2693 #, c-format msgid "%ld fewer lines" ! msgstr "%ld ş¸´Ů ŔűŔş ÁŮ" ! #: misc1.c:2696 msgid " (Interrupted)" ! msgstr " (ÁߴܾǞú˝Ŕ´Ď´Ů)" ! #: misc1.c:6251 msgid "Vim: preserving files...\n" *************** *** 3865,3871 **** ! #: misc2.c:720 msgid "E340: Line is becoming too long" ! msgstr "E340: śóŔÎŔĚ łĘšŤ ąćžîÁł˝Ŕ´Ď´Ů" ! #: misc2.c:764 #, c-format --- 3921,3927 ---- ! #: misc2.c:724 msgid "E340: Line is becoming too long" ! msgstr "E340: ÁŮŔĚ łĘšŤ ąćžîÁł˝Ŕ´Ď´Ů" ! #: misc2.c:768 #, c-format *************** *** 3888,3894 **** ! #: misc2.c:2726 msgid "Illegal mode" ! msgstr "ŔĚťóÇŃ ¸đľĺ" ! #: misc2.c:2765 msgid "Illegal mouseshape" --- 3944,3950 ---- ! #: misc2.c:2708 misc2.c:2735 msgid "Illegal mode" ! msgstr "ŔĚťóÇŃ ťóĹÂ" ! #: misc2.c:2774 msgid "Illegal mouseshape" *************** *** 3925,3932 **** ! #: misc2.c:4857 #, c-format msgid "E344: Can't find directory \"%s\" in cdpath" ! msgstr "E344: cdpathżĄź­ \"%s\" ľđˇşĹ与¸Ś ĂŁŔť źö žř˝Ŕ´Ď´Ů" ! #: misc2.c:4860 #, c-format --- 3981,3988 ---- ! #: misc2.c:4933 #, c-format msgid "E344: Can't find directory \"%s\" in cdpath" ! msgstr "E344: cdpathżĄź­ \"%s\" ŔÚˇášćŔť ĂŁŔť źö žř˝Ŕ´Ď´Ů" ! #: misc2.c:4936 #, c-format *************** *** 3935,3942 **** ! #: misc2.c:4866 #, c-format msgid "E346: No more directory \"%s\" found in cdpath" ! msgstr "E346: cdpathżĄź­ ´ő ŔĚťóŔÇ \"%s\" ľđˇşĹ与´Â ĂŁŔť źö žř˝Ŕ´Ď´Ů" ! #: misc2.c:4869 #, c-format --- 3991,3998 ---- ! #: misc2.c:4942 #, c-format msgid "E346: No more directory \"%s\" found in cdpath" ! msgstr "E346: cdpathżĄź­ ´ő ŔĚťóŔÇ \"%s\" ŔÚˇášćŔş ĂŁŔť źö žř˝Ŕ´Ď´Ů" ! #: misc2.c:4945 #, c-format *************** *** 3949,3955 **** ! #: normal.c:2789 msgid "Warning: terminal cannot highlight" ! msgstr "°ć°í: Ĺ͚̳ÎŔĚ şńÁęžó¸đľĺ¸Ś ÇĽ˝ĂÇŇ źö žř˝Ŕ´Ď´Ů" ! #: normal.c:2983 msgid "E348: No string under cursor" --- 4005,4011 ---- ! #: normal.c:2821 msgid "Warning: terminal cannot highlight" ! msgstr "°ć°í: Ĺ͚̳ÎŔĚ şńÁęžó ťóŸŚ ÇĽ˝ĂÇŇ źö žř˝Ŕ´Ď´Ů" ! #: normal.c:3016 msgid "E348: No string under cursor" *************** *** 3961,3967 **** ! #: normal.c:4148 msgid "E352: Cannot erase folds with current 'foldmethod'" ! msgstr "E352: ÇöŔçŔÇ 'foldmethod'Ŕ¸ˇÎ Ćúľĺ¸Ś Áöżď źö žř˝Ŕ´Ď´Ů" ! #: ops.c:272 #, c-format --- 4017,4023 ---- ! #: normal.c:4183 msgid "E352: Cannot erase folds with current 'foldmethod'" ! msgstr "E352: ÇöŔçŔÇ 'foldmethod'Ŕ¸ˇÎ Á˘ąâ¸Ś Áöżď źö žř˝Ŕ´Ď´Ů" ! #: ops.c:271 #, c-format *************** *** 3999,4001 **** ! #: ops.c:1525 msgid "cannot yank; delete anyway" --- 4055,4058 ---- ! #. must display the prompt ! #: ops.c:1528 msgid "cannot yank; delete anyway" *************** *** 4003,4014 **** ! #: ops.c:2012 ! msgid "1 line ~ed" ! msgstr "1 line ~ed" ! #: ops.c:2014 #, c-format ! msgid "%ld lines ~ed" ! msgstr "%ld lines ~ed" ! #: ops.c:2360 #, c-format --- 4060,4071 ---- ! #: ops.c:2018 ! msgid "1 line changed" ! msgstr "1 line changed" ! #: ops.c:2020 #, c-format ! msgid "%ld lines changed" ! msgstr "%ld lines changed" ! #: ops.c:2379 #, c-format *************** *** 4110,4117 **** ! #: option.c:3669 #, c-format msgid "Illegal character <%s>" ! msgstr "ŔĚťóÇŃ šŽŔÚ <%s>" ! #: option.c:4190 option.c:5370 msgid "Not allowed here" --- 4167,4174 ---- ! #: option.c:3768 #, c-format msgid "Illegal character <%s>" ! msgstr "ŔĚťóÇŃ ąŰŔÚ <%s>" ! #: option.c:4294 option.c:5498 msgid "Not allowed here" *************** *** 4127,4133 **** ! #: option.c:4202 msgid "Use \":gui\" to start the GUI" ! msgstr "GUI¸Ś ˝ĂŔŰÇϡÁ¸é \":gui\"¸Ś ťçżëÇĎźźżä" ! #: option.c:4223 msgid "'backupext' and 'patchmode' are equal" --- 4184,4190 ---- ! #: option.c:4306 msgid "Use \":gui\" to start the GUI" ! msgstr "GUI¸Ś ˝ĂŔŰÇϡÁ¸é \":gui\"¸Ś ťçżëÇϽʽÿŔ" ! #: option.c:4327 msgid "'backupext' and 'patchmode' are equal" *************** *** 4152,4158 **** ! #: option.c:4611 msgid "contains unprintable character" ! msgstr "ĂâˇÂÇŇ źö žř´Â šŽŔÚ¸Ś Ć÷ÇÔÇĎ°í ŔÖ˝Ŕ´Ď´Ů" ! #: option.c:4624 msgid "Invalid font(s)" --- 4209,4215 ---- ! #: option.c:4715 msgid "contains unprintable character" ! msgstr "ĂâˇÂÇŇ źö žř´Â ąŰŔÚ¸Ś Ć÷ÇÔÇĎ°í ŔÖ˝Ŕ´Ď´Ů" ! #: option.c:4728 msgid "Invalid font(s)" *************** *** 4160,4166 **** ! #: option.c:4630 msgid "can't select fontset" ! msgstr "ąŰ˛ĂźÂŔť źąĹĂÇŇ źö žř˝Ŕ´Ď´Ů" ! #: option.c:4632 msgid "Invalid fontset" --- 4217,4223 ---- ! #: option.c:4734 msgid "can't select fontset" ! msgstr "ąŰ˛ĂźÂŔť °í¸Ś źö žř˝Ŕ´Ď´Ů" ! #: option.c:4736 msgid "Invalid fontset" *************** *** 4168,4174 **** ! #: option.c:4639 msgid "can't select wide font" ! msgstr "łĐŔş ąŰ˛ĂŔť źąĹĂÇŇ źö žř˝Ŕ´Ď´Ů" ! #: option.c:4641 msgid "Invalid wide font" --- 4225,4231 ---- ! #: option.c:4743 msgid "can't select wide font" ! msgstr "łĐŔş ąŰ˛ĂŔť °í¸Ś źö žř˝Ŕ´Ď´Ů" ! #: option.c:4745 msgid "Invalid wide font" *************** *** 4176,4183 **** ! #: option.c:4951 #, c-format msgid "Illegal character after <%c>" ! msgstr "<%c> ľÚżĄ ŔĚťóÇŃ šŽŔÚ" ! #: option.c:5034 msgid "comma required" --- 4233,4240 ---- ! #: option.c:5015 #, c-format msgid "Illegal character after <%c>" ! msgstr "<%c> ľÚżĄ ŔĚťóÇŃ ąŰŔÚ" ! #: option.c:5098 msgid "comma required" *************** *** 4202,4212 **** ! #: option.c:5342 msgid "unbalanced groups" ! msgstr "ąŐÇüŔĚ žĘŔâČů ą×ˇě" ! #: option.c:5493 msgid "A preview window already exists" ! msgstr "šĚ¸Žş¸ąâ âŔĚ ŔĚšĚ Á¸ŔçÇŐ´Ď´Ů" ! #: option.c:5744 option.c:5773 msgid "'winheight' cannot be smaller than 'winminheight'" --- 4259,4269 ---- ! #: option.c:5406 msgid "unbalanced groups" ! msgstr "ąŐÇüŔĚ žČ ŔâČů ą×ˇě" ! #: option.c:5621 msgid "A preview window already exists" ! msgstr "šĚ¸Ž ş¸ąâ âŔĚ ŔĚšĚ Á¸ŔçÇŐ´Ď´Ů" ! #: option.c:5882 option.c:5911 msgid "'winheight' cannot be smaller than 'winminheight'" *************** *** 4218,4230 **** ! #: option.c:5948 #, c-format msgid "Need at least %d lines" ! msgstr "Ŕűžîľľ %d śóŔÎŔĚ ÇĘżäÇŐ´Ď´Ů" ! #: option.c:5957 #, c-format msgid "Need at least %d columns" ! msgstr "Ŕűžîľľ %d ÄáłŔĚ ÇĘżäÇŐ´Ď´Ů" ! #: option.c:6239 #, c-format --- 4275,4287 ---- ! #: option.c:6086 #, c-format msgid "Need at least %d lines" ! msgstr "Ŕűžîľľ %d ÁŮŔĚ ÇĘżäÇŐ´Ď´Ů" ! #: option.c:6095 #, c-format msgid "Need at least %d columns" ! msgstr "Ŕűžîľľ %d Ä­ŔĚ ÇĘżäÇŐ´Ď´Ů" ! #: option.c:6392 #, c-format *************** *** 4269,4279 **** ! #: option.c:7944 #, c-format msgid "E357: 'langmap': Matching character missing for %s" ! msgstr "E357: 'langmap': %sżĄ ´ëÇŃ ¸Â´Â šŽŔÚ°Ą žř˝Ŕ´Ď´Ů" ! #: option.c:7978 #, c-format msgid "E358: 'langmap': Extra characters after semicolon: %s" ! msgstr "E358: 'langmap': źźšĚÄݡРľÚżĄ šŽŔÚ°Ą ´ő ŔÖŔ˝: %s" --- 4326,4336 ---- ! #: option.c:8113 #, c-format msgid "E357: 'langmap': Matching character missing for %s" ! msgstr "E357: 'langmap': %sżĄ ´ëÇŃ ¸Â´Â ąŰŔÚ°Ą žř˝Ŕ´Ď´Ů" ! #: option.c:8147 #, c-format msgid "E358: 'langmap': Extra characters after semicolon: %s" ! msgstr "E358: 'langmap': źźšĚÄݡРľÚżĄ ąŰŔÚ°Ą ´ő ŔÖŔ˝: %s" *************** *** 4289,4291 **** msgid "Need Amigados version 2.04 or later\n" ! msgstr "žĆšĚ°Ąľľ˝ş 2.04łŞ ´ő łôŔş šöŔüŔĚ ÇĘżäÇŐ´Ď´Ů\n" --- 4346,4348 ---- msgid "Need Amigados version 2.04 or later\n" ! msgstr "žĆšĚ°Ąľľ˝ş 2.04łŞ ´ő łôŔş ĆÇŔĚ ÇĘżäÇŐ´Ď´Ů\n" *************** *** 4304,4319 **** ! #: os_amiga.c:889 #, c-format msgid "Vim exiting with %d\n" ! msgstr "şöŔĚ %d °ŞŔ¸ˇÎ ÁžˇáÇŐ´Ď´Ů\n" ! #: os_amiga.c:921 msgid "cannot change console mode ?!\n" ! msgstr "ÄÜźÖ ¸đľĺ¸Ś šŮ˛Ü źö žř˝Ŕ´Ď´Ů ?!\n" ! #: os_amiga.c:931 os_mac.c:1167 os_mswin.c:593 os_riscos.c:728 os_unix.c:2722 msgid "E359: Screen mode setting not supported" ! msgstr "E359: ˝şĹŠ¸° ¸đľĺ źłÁ¤Ŕş ÁöżřľÇÁö žĘ˝Ŕ´Ď´Ů" ! #: os_amiga.c:987 msgid "mch_get_shellsize: not a console??\n" --- 4361,4376 ---- ! #: os_amiga.c:896 #, c-format msgid "Vim exiting with %d\n" ! msgstr "şöŔĚ %d °ŞŔ¸ˇÎ łĄłŔ´Ď´Ů\n" ! #: os_amiga.c:928 msgid "cannot change console mode ?!\n" ! msgstr "ÄÜźÖ ťóŸŚ šŮ˛Ü źö žř˝Ŕ´Ď´Ů ?!\n" ! #: os_amiga.c:938 os_mac.c:1168 os_mswin.c:619 os_riscos.c:728 os_unix.c:2733 msgid "E359: Screen mode setting not supported" ! msgstr "E359: ˝şĹŠ¸° ťóĹ źłÁ¤Ŕş ÁöżřľÇÁö žĘ˝Ŕ´Ď´Ů" ! #: os_amiga.c:994 msgid "mch_get_shellsize: not a console??\n" *************** *** 4346,4368 **** ! #: os_msdos.c:1501 ! msgid "PC (32 bits Vim)" ! msgstr "PC (32şńĆŽ şö)" ! ! #: os_msdos.c:1503 ! msgid "PC (16 bits Vim)" ! msgstr "PC (16şńĆŽ şö)" ! ! #: os_msdos.c:1906 ! msgid "E362: Unsupported screen mode" ! msgstr "E362: ÁöżřľÇÁö žĘ´Â ˝şĹŠ¸° ¸đľĺ" ! #: os_msdos.c:2100 os_unix.c:2942 os_unix.c:3483 ! msgid "" ! "\n" ! "shell returned " ! msgstr "" ! "\n" ! "shell returned " ! ! #: os_mswin.c:568 msgid "'columns' is not 80, cannot execute external commands" --- 4403,4409 ---- ! #: os_mswin.c:503 ! msgid "...(truncated)" ! msgstr "...(Ŕ߸˛)" ! #: os_mswin.c:594 msgid "'columns' is not 80, cannot execute external commands" *************** *** 4375,4381 **** ! #: os_mswin.c:1264 msgid "E237: Printer selection failed" ! msgstr "E237: ÇÁ¸°ĹÍ źąĹĂŔĚ ˝ÇĆĐÇß˝Ŕ´Ď´Ů" ! #: os_mswin.c:1356 os_mswin.c:1366 #, c-format --- 4416,4427 ---- ! #: os_mswin.c:1340 msgid "E237: Printer selection failed" ! msgstr "E237: ÇÁ¸°Ĺ͸Ś °í¸ŁÁö ¸řÇß˝Ŕ´Ď´Ů" ! ! #: os_mswin.c:1388 ! #, c-format ! #~ msgid "to %s on %s" ! #~ msgstr "" ! #: os_mswin.c:1449 os_mswin.c:1459 #, c-format *************** *** 4388,4390 **** ! #: os_riscos.c:1213 msgid "E366: Invalid 'osfiletype' option - using Text" --- 4434,4451 ---- ! #: os_mswin.c:1487 ! #, c-format ! msgid "Printing '%s'" ! msgstr "'%s' ŔÎźâÁß" ! ! #: os_mswin.c:2551 ! #, c-format ! msgid "E244: Illegal charset name \"%s\" in font name \"%s\"" ! msgstr "E244: Ŕ߸řľČ ąŰŔڟ Ŕ̸§ \"%s\"ŔĚ ąŰ˛Ă Ŕ̸§ \"%s\"żĄ ŔÖ˝Ŕ´Ď´Ů" ! ! #: os_mswin.c:2559 ! #, c-format ! msgid "E245: Illegal char '%c' in font name \"%s\"" ! msgstr "E245: Ŕ߸řľČ ąŰŔÚ '%c'°Ą ąŰ˛Ă Ŕ̸§ \"%s\"żĄ ŔÖ˝Ŕ´Ď´Ů" ! ! #: os_riscos.c:1227 msgid "E366: Invalid 'osfiletype' option - using Text" *************** *** 4392,4398 **** ! #: os_unix.c:800 msgid "Vim: Double signal, exiting\n" ! msgstr "şö: °°Ŕş ˝Ăą×łÎ ľÎšř, ÁžˇáÇŐ´Ď´Ů\n" ! #: os_unix.c:806 #, c-format --- 4453,4459 ---- ! #: os_unix.c:803 msgid "Vim: Double signal, exiting\n" ! msgstr "şö: °°Ŕş ˝Ăą×łÎ ľÎ šř, łĄłŔ´Ď´Ů\n" ! #: os_unix.c:809 #, c-format *************** *** 4416,4420 **** "\n" ! "şö: X żĄˇŻ°Ą šßťýÇß˝Ŕ´Ď´Ů\n" ! #: os_unix.c:1156 msgid "Testing the X display failed" --- 4477,4481 ---- "\n" ! "şö: X żĄˇŻ°Ą ťý°ĺ˝Ŕ´Ď´Ů\n" ! #: os_unix.c:1160 msgid "Testing the X display failed" *************** *** 4422,4428 **** ! #: os_unix.c:1300 msgid "Opening the X display timed out" ! msgstr "X ľđ˝şÇášŔĚ´Â żŠ´Â ľĽ ˝Ă°ŁŔĚ ĂĘ°úľÇžú˝Ŕ´Ď´Ů" ! #: os_unix.c:2895 os_unix.c:3477 msgid "" --- 4483,4489 ---- ! #: os_unix.c:1304 msgid "Opening the X display timed out" ! msgstr "X ľđ˝şÇášŔ̸Ś ż­´Ů°Ą ˝Ă°ŁŔĚ ĂĘ°úľÇžú˝Ŕ´Ď´Ů" ! #: os_unix.c:2906 os_unix.c:3490 msgid "" *************** *** 4442,4444 **** ! #: os_unix.c:3076 msgid "" --- 4503,4513 ---- ! #: os_unix.c:2955 os_unix.c:3496 ! msgid "" ! "\n" ! "shell returned " ! msgstr "" ! "\n" ! "shell returned " ! ! #: os_unix.c:3089 msgid "" *************** *** 4448,4452 **** "\n" ! "ĆÄŔĚÇÁ¸Ś ťýźşÇŇ źö žř˝Ŕ´Ď´Ů\n" ! #: os_unix.c:3091 msgid "" --- 4517,4521 ---- "\n" ! "ĆÄŔĚÇÁ¸Ś ¸¸ľé źö žř˝Ŕ´Ď´Ů\n" ! #: os_unix.c:3104 msgid "" *************** *** 4464,4468 **** "\n" ! "¸íˇÉŔĚ ÁžˇáľÇžú˝Ŕ´Ď´Ů\n" ! #: os_unix.c:4956 msgid "Opening the X display failed" --- 4533,4537 ---- "\n" ! "¸íˇÉŔĚ łĄ¸śĂÄÁł˝Ŕ´Ď´Ů\n" ! #: os_unix.c:5000 msgid "Opening the X display failed" *************** *** 4474,4480 **** ! #: os_w32exe.c:174 msgid "Could not load vim32.dll!" ! msgstr "vim32.dllŔť şŇˇŻľéŔĎ źö žř˝Ŕ´Ď´Ů!" ! #: os_w32exe.c:174 os_w32exe.c:184 msgid "VIM Error" --- 4543,4549 ---- ! #: os_w32exe.c:169 msgid "Could not load vim32.dll!" ! msgstr "vim32.dllŔť şŇˇŻ ľéŔĎ źö žř˝Ŕ´Ď´Ů!" ! #: os_w32exe.c:169 os_w32exe.c:179 msgid "VIM Error" *************** *** 4491,4507 **** ! #: os_win32.c:1403 ! 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:1406 ! msgid "Vim Warning" ! msgstr "şö °ć°í" ! ! #: os_win32.c:2389 #, c-format --- 4560,4562 ---- ! #: os_win32.c:2492 #, c-format *************** *** 4526,4527 **** --- 4581,4596 ---- + #: os_win32.c:2991 + 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:2994 + msgid "Vim Warning" + msgstr "şö °ć°í" + #: quickfix.c:281 *************** *** 4561,4563 **** msgid "E379: Missing or empty directory name" ! msgstr "E379: şüÁł°ĹłŞ şó ľđˇşĹ与 Ŕ̸§" --- 4630,4632 ---- msgid "E379: Missing or empty directory name" ! msgstr "E379: şüÁł°ĹłŞ şó ŔÚˇášć Ŕ̸§" *************** *** 4574,4576 **** msgid " (line deleted)" ! msgstr " (śóŔÎ ťčÁŚľĘ)" --- 4643,4645 ---- msgid " (line deleted)" ! msgstr " (ÁŮŔť ÁöżüŔ˝)" *************** *** 4621,4627 **** ! #: regexp.c:2837 msgid "E363: pattern caused out-of-stack error" ! msgstr "E363: ĆĐĹĎżĄ ŔÇÇŘ ˝şĹĂłŃħ żĄˇŻ°Ą šßťýÇß˝Ŕ´Ď´Ů" ! #: regexp.c:3073 #~ msgid "External submatches:\n" --- 4690,4696 ---- ! #: regexp.c:2862 msgid "E363: pattern caused out-of-stack error" ! msgstr "E363: ĆĐĹĎżĄ ŔÇÇŘ ˝şĹĂłŃħ żĄˇŻ°Ą ťý°ĺ˝Ŕ´Ď´Ů" ! #: regexp.c:3098 #~ msgid "External submatches:\n" *************** *** 4629,4636 **** ! #: screen.c:2041 #, c-format msgid "+--%3ld lines folded " ! msgstr "+--%3ld śóŔÎ Á˘Čű " ! #: screen.c:7321 msgid " VREPLACE" --- 4698,4705 ---- ! #: screen.c:2054 #, c-format msgid "+--%3ld lines folded " ! msgstr "+--%3ld ÁŮ Á˘Čű " ! #: screen.c:7431 msgid " VREPLACE" *************** *** 4638,4644 **** ! #: screen.c:7325 msgid " REPLACE" ! msgstr " ÄĄČŻ" ! #: screen.c:7330 msgid " REVERSE" --- 4707,4713 ---- ! #: screen.c:7435 msgid " REPLACE" ! msgstr " šŮ˛Ůąâ" ! #: screen.c:7440 msgid " REVERSE" *************** *** 4646,4660 **** ! #: screen.c:7332 msgid " INSERT" ! msgstr " ťđŔÔ" ! #: screen.c:7335 msgid " (insert)" ! msgstr " (ťđŔÔ)" ! #: screen.c:7337 msgid " (replace)" ! msgstr " (ÄĄČŻ)" ! #: screen.c:7339 msgid " (vreplace)" --- 4715,4729 ---- ! #: screen.c:7442 msgid " INSERT" ! msgstr " ł˘żöłÖąâ" ! #: screen.c:7445 msgid " (insert)" ! msgstr " (ł˘żöłÖąâ)" ! #: screen.c:7447 msgid " (replace)" ! msgstr " (šŮ˛Ůąâ)" ! #: screen.c:7449 msgid " (vreplace)" *************** *** 4674,4680 **** ! #: screen.c:7359 msgid " SELECT" ! msgstr " źąĹĂ" ! #: screen.c:7361 msgid " VISUAL" --- 4743,4749 ---- ! #: screen.c:7469 msgid " SELECT" ! msgstr " °í¸Łąâ" ! #: screen.c:7471 msgid " VISUAL" *************** *** 4682,4692 **** ! #: screen.c:7363 msgid " BLOCK" ! msgstr " şíˇ°" ! #: screen.c:7365 msgid " LINE" ! msgstr " śóŔÎ" ! #: screen.c:7374 screen.c:7428 msgid "recording" --- 4751,4761 ---- ! #: screen.c:7473 msgid " BLOCK" ! msgstr " ą¸żŞ" ! #: screen.c:7475 msgid " LINE" ! msgstr " ÁŮ" ! #: screen.c:7488 screen.c:7542 msgid "recording" *************** *** 4696,4698 **** msgid "search hit TOP, continuing at BOTTOM" ! msgstr "ĂłŔ˝ąîÁö ĂŁžĆÁü, łĄżĄź­ °čźÓ" --- 4765,4767 ---- msgid "search hit TOP, continuing at BOTTOM" ! msgstr "ĂłŔ˝ąîÁö ĂŁžŇŔ˝, łĄżĄź­ °čźÓ" *************** *** 4700,4702 **** msgid "search hit BOTTOM, continuing at TOP" ! msgstr "łĄąîÁö ĂŁžĆÁü, ĂłŔ˝şÎĹÍ °čźÓ" --- 4769,4771 ---- msgid "search hit BOTTOM, continuing at TOP" ! msgstr "łĄąîÁö ĂŁžŇŔ˝, ĂłŔ˝şÎĹÍ °čźÓ" *************** *** 4742,4761 **** ! #: search.c:3514 msgid " NOT FOUND" ! msgstr " žĘ ĂŁžĆÁü" ! #: search.c:3566 #, c-format msgid "Scanning included file: %s" ! msgstr "Ć÷ÇÔľČ ĆÄŔĎ °ËťöÁß: %s" ! #: search.c:3784 msgid "E387: Match is on current line" ! msgstr "E387: ¸Â´Â °Ô ÇöŔç śóŔÎżĄ ŔÖ˝Ŕ´Ď´Ů" ! #: search.c:3924 msgid "All included files were found" ! msgstr "¸đľç Ć÷ÇÔľČ ĆÄŔĎľéŔĚ ĂŁžĆÁł˝Ŕ´Ď´Ů" ! #: search.c:3926 msgid "No included files" --- 4811,4830 ---- ! #: search.c:3540 msgid " NOT FOUND" ! msgstr " ¸ř ĂŁžŇŔ˝" ! #: search.c:3592 #, c-format msgid "Scanning included file: %s" ! msgstr "Ć÷ÇÔľČ ĆÄŔĎ ĂŁ´Â Áß: %s" ! #: search.c:3810 msgid "E387: Match is on current line" ! msgstr "E387: ¸Â´Â °Ô ÇöŔç ÁŮżĄ ŔÖ˝Ŕ´Ď´Ů" ! #: search.c:3950 msgid "All included files were found" ! msgstr "¸đľç Ć÷ÇÔľČ ĆÄŔĎŔť ĂŁžŇ˝Ŕ´Ď´Ů" ! #: search.c:3952 msgid "No included files" *************** *** 4879,4885 **** ! #: syntax.c:5177 msgid "E403: syntax sync: line continuations pattern specified twice" ! msgstr "E403: syntax sync: śóŔÎ żŹźÓ ĆĐĹĎŔĚ ľÎšř ťçżëľÇžú˝Ŕ´Ď´Ů" ! #: syntax.c:5234 #, c-format --- 4948,4954 ---- ! #: syntax.c:5219 msgid "E403: syntax sync: line continuations pattern specified twice" ! msgstr "E403: syntax sync: ÁŮ żŹźÓ ĆĐĹĎŔĚ ľÎ šř ťçżëľÇžú˝Ŕ´Ď´Ů" ! #: syntax.c:5276 #, c-format *************** *** 4888,4895 **** ! #: syntax.c:5284 #, c-format msgid "E405: Missing equal sign: %s" ! msgstr "E405: ŔĚÄ÷ ąâČŁ°Ą şüÁü: %s" ! #: syntax.c:5290 #, c-format --- 4957,4964 ---- ! #: syntax.c:5326 #, c-format msgid "E405: Missing equal sign: %s" ! msgstr "E405: ŔĚÄ÷ ąâČŁ°Ą şüÁłŔ˝: %s" ! #: syntax.c:5332 #, c-format *************** *** 4903,4910 **** ! #: syntax.c:5324 #, c-format msgid "E408: %s must be first in contains list" ! msgstr "E408: %s´Â contains ¸ńˇĎŔÇ Ăššř°żŠžß ÇŐ´Ď´Ů" ! #: syntax.c:5394 #, c-format --- 4972,4979 ---- ! #: syntax.c:5366 #, c-format msgid "E408: %s must be first in contains list" ! msgstr "E408: %s´Â contains ¸ńˇĎŔÇ Ăš šř°żŠžß ÇŐ´Ď´Ů" ! #: syntax.c:5436 #, c-format *************** *** 4913,4920 **** ! #: syntax.c:5617 #, c-format msgid "E410: Invalid :syntax subcommand: %s" ! msgstr "E410: Ŕ߸řľČ :syntax ÇĎŔ§¸íˇÉ: %s" ! #: syntax.c:5996 #, c-format --- 4982,4989 ---- ! #: syntax.c:5666 #, c-format msgid "E410: Invalid :syntax subcommand: %s" ! msgstr "E410: Ŕ߸řľČ :syntax ÇĎŔ§ ¸íˇÉ: %s" ! #: syntax.c:6045 #, c-format *************** *** 4942,4954 **** ! #: syntax.c:6176 #, c-format msgid "E416: missing equal sign: %s" ! msgstr "E416: ŔĚÄ÷ ąâČŁ°Ą şüÁü: %s" ! #: syntax.c:6198 #, c-format msgid "E417: missing argument: %s" ! msgstr "E417: ŔÎŔÚ°Ą şüÁü: %s" ! #: syntax.c:6235 #, c-format --- 5011,5023 ---- ! #: syntax.c:6261 #, c-format msgid "E416: missing equal sign: %s" ! msgstr "E416: ŔĚÄ÷ ąâČŁ°Ą şüÁłŔ˝: %s" ! #: syntax.c:6283 #, c-format msgid "E417: missing argument: %s" ! msgstr "E417: ŔÎŔÚ°Ą şüÁłŔ˝: %s" ! #: syntax.c:6320 #, c-format *************** *** 4994,4996 **** msgid "E425: Cannot go before first matching tag" ! msgstr "E425: Ăššř° ¸Â´Â ĹÂą× ŔĚŔüŔ¸ˇÎ´Â °Ľ źö žř˝Ŕ´Ď´Ů" --- 5063,5065 ---- msgid "E425: Cannot go before first matching tag" ! msgstr "E425: Ăš šř° ¸Â´Â ĹÂą× ŔĚŔüŔ¸ˇÎ´Â °Ľ źö žř˝Ŕ´Ď´Ů" *************** *** 5011,5018 **** #. * Ask to select a tag from the list. #. ! #: tag.c:705 msgid "Enter nr of choice ( to abort): " ! msgstr "źąĹĂÇŇ źýŔÚ Ŕԡ (Ŕş ÁßÁö):" ! #: tag.c:745 msgid "E427: There is only one matching tag" --- 5080,5088 ---- #. * Ask to select a tag from the list. + #. * When using ":silent" assume that was entered. #. ! #: tag.c:706 msgid "Enter nr of choice ( to abort): " ! msgstr "°í¸Ś źýŔÚ Ŕԡ (Ŕş ÁßÁö):" ! #: tag.c:746 msgid "E427: There is only one matching tag" *************** *** 5020,5026 **** ! #: tag.c:747 msgid "E428: Cannot go beyond last matching tag" ! msgstr "E428: ¸śÁö¸ˇ ¸Â´Â ĹÂą× ŔĚČġδ °Ľ źö žř˝Ŕ´Ď´Ů" ! #: tag.c:767 #, c-format --- 5090,5096 ---- ! #: tag.c:748 msgid "E428: Cannot go beyond last matching tag" ! msgstr "E428: ¸śÁö¸ˇ ¸Â´Â ĹÂą× ľÚˇÎ´Â °Ľ źö žř˝Ŕ´Ď´Ů" ! #: tag.c:768 #, c-format *************** *** 5070,5077 **** ! #: tag.c:1355 #, c-format msgid "E430: Tag file path truncated for %s\n" ! msgstr "E430: %sżĄ ´ëÇŃ ĹÂą×ĆÄŔĎ °ćˇÎ°Ą ŔߡÁÁł˝Ŕ´Ď´Ů\n" ! #: tag.c:1846 #, c-format --- 5140,5147 ---- ! #: tag.c:1356 #, c-format msgid "E430: Tag file path truncated for %s\n" ! msgstr "E430: %sżĄ ´ëÇŃ ĹÂą× ĆÄŔĎ °ćˇÎ°Ą ŔߡȽŔ´Ď´Ů\n" ! #: tag.c:1847 #, c-format *************** *** 5099,5105 **** ! #: tag.c:2592 msgid "E435: Couldn't find tag, just guessing!" ! msgstr "E435: Ĺ¹׸Ś ĂŁŔť źö žřÁö¸¸ ŔĚ°Ĺ °°ł×żä!" ! #: term.c:1723 msgid "' not known. Available builtin terminals are:" --- 5169,5175 ---- ! #: tag.c:2594 msgid "E435: Couldn't find tag, just guessing!" ! msgstr "E435: Ĺ¹׸Ś ĂŁŔť źö žřÁö¸¸ ŔĚ°Ĺ °°˝Ŕ´Ď´Ů!" ! #: term.c:1725 msgid "' not known. Available builtin terminals are:" *************** *** 5145,5151 **** ! #: ui.c:1694 msgid "Vim: Error reading input, exiting...\n" ! msgstr "şö: Ŕԡ ŔĐ´Â Áß żĄˇŻ, ÁžˇáÁß...\n" ! #: undo.c:350 msgid "No undo possible; continue anyway" --- 5215,5222 ---- ! #: ui.c:1705 msgid "Vim: Error reading input, exiting...\n" ! msgstr "şö: Ŕԡ ŔĐ´Â Áß żĄˇŻ, łĄłť´ÂÁß...\n" ! #. must display the prompt ! #: undo.c:379 msgid "No undo possible; continue anyway" *************** *** 5153,5159 **** ! #: undo.c:505 msgid "E438: u_undo: line numbers wrong" ! msgstr "E438: u_undo: Ŕ߸řľČ śóŔÎ šřČŁ" ! #: undo.c:674 msgid "1 change" --- 5224,5230 ---- ! #: undo.c:534 msgid "E438: u_undo: line numbers wrong" ! msgstr "E438: u_undo: Ŕ߸řľČ ÁŮ šřČŁ" ! #: undo.c:703 msgid "1 change" *************** *** 5170,5177 **** ! #: undo.c:750 msgid "E440: undo line missing" ! msgstr "E440: undo śóŔÎŔĚ žř˝Ŕ´Ď´Ů" #. Only MS VC 4.1 and earlier can do Win32s ! #: version.c:627 msgid "" --- 5241,5248 ---- ! #: undo.c:781 msgid "E440: undo line missing" ! msgstr "E440: undo ÁŮŔĚ žř˝Ŕ´Ď´Ů" #. Only MS VC 4.1 and earlier can do Win32s ! #: version.c:757 msgid "" *************** *** 5181,5185 **** "\n" ! "MS-Windows 16/32 şńĆŽ GUI šöŔü" ! #: version.c:629 msgid "" --- 5252,5256 ---- "\n" ! "MS-Windows 16/32 şńĆŽ GUI ĆÇ" ! #: version.c:759 msgid "" *************** *** 5189,5197 **** "\n" ! "MS-Windows 32 şńĆŽ GUI šöŔü" ! #: version.c:632 msgid " in Win32s mode" ! msgstr " Win32s ¸đľĺ" ! #: version.c:634 msgid " with OLE support" --- 5260,5268 ---- "\n" ! "MS-Windows 32 şńĆŽ GUI ĆÇ" ! #: version.c:762 msgid " in Win32s mode" ! msgstr " Win32s ťóĹÂ" ! #: version.c:764 msgid " with OLE support" *************** *** 5205,5209 **** "\n" ! "MS-Windows 32 şńĆŽ ÄÜźÖ šöŔü" ! #: version.c:641 msgid "" --- 5276,5280 ---- "\n" ! "MS-Windows 32 şńĆŽ ÄÜźÖ ĆÇ" ! #: version.c:771 msgid "" *************** *** 5213,5217 **** "\n" ! "MS-Windows 16 şńĆŽ šöŔü" ! #: version.c:645 msgid "" --- 5284,5288 ---- "\n" ! "MS-Windows 16 şńĆŽ ĆÇ" ! #: version.c:775 msgid "" *************** *** 5221,5225 **** "\n" ! "32 şńĆŽ MS-DOS šöŔü" ! #: version.c:647 msgid "" --- 5292,5296 ---- "\n" ! "32 şńĆŽ MS-DOS ĆÇ" ! #: version.c:777 msgid "" *************** *** 5229,5233 **** "\n" ! "16 şńĆŽ MS-DOS šöŔü" ! #: version.c:653 msgid "" --- 5300,5304 ---- "\n" ! "16 şńĆŽ MS-DOS ĆÇ" ! #: version.c:783 msgid "" *************** *** 5237,5241 **** "\n" ! "MacOS X (ŔŻ´Đ˝ş) šöŔü" ! #: version.c:655 msgid "" --- 5308,5312 ---- "\n" ! "MacOS X (ŔŻ´Đ˝ş) ĆÇ" ! #: version.c:785 msgid "" *************** *** 5245,5249 **** "\n" ! "MacOS X šöŔü" ! #: version.c:658 msgid "" --- 5316,5320 ---- "\n" ! "MacOS X ĆÇ" ! #: version.c:788 msgid "" *************** *** 5253,5257 **** "\n" ! "MacOS šöŔü" ! #: version.c:663 msgid "" --- 5324,5328 ---- "\n" ! "MacOS ĆÇ" ! #: version.c:793 msgid "" *************** *** 5261,5265 **** "\n" ! "RISC OS šöŔü" ! #: version.c:673 msgid "" --- 5332,5336 ---- "\n" ! "RISC OS ĆÇ" ! #: version.c:803 msgid "" *************** *** 5269,5273 **** "\n" ! "Ć÷ÇÔľČ ĆĐÄĄľé: " ! #: version.c:700 msgid "" --- 5340,5344 ---- "\n" ! "Ć÷ÇÔľČ ĆĐÄĄ: " ! #: version.c:830 msgid "" *************** *** 5289,5293 **** "\n" ! "°Ĺ´ëÇŃ šöŔü " ! #: version.c:718 msgid "" --- 5360,5364 ---- "\n" ! "°Ĺ´ëÇŃ ĆÇ " ! #: version.c:848 msgid "" *************** *** 5297,5301 **** "\n" ! "ĹŤ šöŔü " ! #: version.c:721 msgid "" --- 5368,5372 ---- "\n" ! "ĹŤ ĆÇ " ! #: version.c:851 msgid "" *************** *** 5305,5309 **** "\n" ! "ş¸Ĺë šöŔü " ! #: version.c:724 msgid "" --- 5376,5380 ---- "\n" ! "ş¸Ĺë ĆÇ " ! #: version.c:854 msgid "" *************** *** 5313,5317 **** "\n" ! "ŔŰŔş šöŔü " ! #: version.c:726 msgid "" --- 5384,5388 ---- "\n" ! "ŔŰŔş ĆÇ " ! #: version.c:856 msgid "" *************** *** 5321,5325 **** "\n" ! "žĆÁÖ ŔŰŔş šöŔü " ! #: version.c:732 msgid "without GUI." --- 5392,5396 ---- "\n" ! "žĆÁÖ ŔŰŔş ĆÇ " ! #: version.c:862 msgid "without GUI." *************** *** 5367,5373 **** ! #: version.c:774 msgid " Features included (+) or not (-):\n" ! msgstr " ąâ´Éľé (+: Ć÷ÇÔľĘ, -: Ć÷ÇԞʾĘ):\n" ! #: version.c:786 msgid " system vimrc file: \"" --- 5438,5444 ---- ! #: version.c:904 msgid " Features included (+) or not (-):\n" ! msgstr " ąâ´É (+: Ć÷ÇÔľĘ, -: Ć÷ÇÔ žČ ľĘ):\n" ! #: version.c:916 msgid " system vimrc file: \"" *************** *** 5379,5389 **** ! #: version.c:796 msgid " 2nd user vimrc file: \"" ! msgstr " ťçżëŔÚ ľÎšř° vimrc ĆÄŔĎ: \"" ! #: version.c:801 msgid " 3rd user vimrc file: \"" ! msgstr " ťçżëŔÚ źźšř° vimrc ĆÄŔĎ: \"" ! #: version.c:806 msgid " user exrc file: \"" --- 5450,5460 ---- ! #: version.c:926 msgid " 2nd user vimrc file: \"" ! msgstr " ťçżëŔÚ ľÎ šř° vimrc ĆÄŔĎ: \"" ! #: version.c:931 msgid " 3rd user vimrc file: \"" ! msgstr " ťçżëŔÚ źź šř° vimrc ĆÄŔĎ: \"" ! #: version.c:936 msgid " user exrc file: \"" *************** *** 5391,5397 **** ! #: version.c:811 msgid " 2nd user exrc file: \"" ! msgstr " ťçżëŔÚ ľÎšř° exrc ĆÄŔĎ: \"" ! #: version.c:817 msgid " system gvimrc file: \"" --- 5462,5468 ---- ! #: version.c:941 msgid " 2nd user exrc file: \"" ! msgstr " ťçżëŔÚ ľÎ šř° exrc ĆÄŔĎ: \"" ! #: version.c:947 msgid " system gvimrc file: \"" *************** *** 5403,5417 **** ! #: version.c:825 msgid "2nd user gvimrc file: \"" ! msgstr "ťçżëŔÚ ľÎšř° gvimrc ĆÄŔĎ: \"" ! #: version.c:830 msgid "3rd user gvimrc file: \"" ! msgstr "ťçżëŔÚ źźšř° gvimrc ĆÄŔĎ: \"" ! #: version.c:837 msgid " system menu file: \"" ! msgstr " ˝Ă˝şĹŰ ¸Ţ´ş ĆÄŔĎ: \"" ! #: version.c:845 msgid " fall-back for $VIM: \"" --- 5474,5488 ---- ! #: version.c:955 msgid "2nd user gvimrc file: \"" ! msgstr "ťçżëŔÚ ľÎ šř° gvimrc ĆÄŔĎ: \"" ! #: version.c:960 msgid "3rd user gvimrc file: \"" ! msgstr "ťçżëŔÚ źź šř° gvimrc ĆÄŔĎ: \"" ! #: version.c:967 msgid " system menu file: \"" ! msgstr " ˝Ă˝şĹŰ Â÷¸˛ÇĽ ĆÄŔĎ: \"" ! #: version.c:975 msgid " fall-back for $VIM: \"" *************** *** 5443,5449 **** ! #: version.c:908 msgid "version " ! msgstr "šöŔü " ! #: version.c:909 msgid "by Bram Moolenaar et al." --- 5514,5520 ---- ! #: version.c:1039 msgid "version " ! msgstr "ĆÇ " ! #: version.c:1040 msgid "by Bram Moolenaar et al." *************** *** 5451,5461 **** ! #: version.c:910 msgid "Vim is open source and freely distributable" ! msgstr "şöŔş źŇ˝ş°Ą °ř°łľÇžî ŔÖ°í °řÂĽˇÎ ščĆ÷ľË´Ď´Ů" ! #: version.c:912 msgid "Help poor children in Uganda!" ! msgstr "żě°Ł´ŮŔÇ °Ął­ÇŃ žĆŔĚľéŔť ľľżÍÁÖźźżä!" ! #: version.c:913 msgid "type :help iccf for information " --- 5522,5532 ---- ! #: version.c:1041 msgid "Vim is open source and freely distributable" ! msgstr "şöŔş źŇ˝ş°Ą ż­ˇÁ ŔÖ°í °řÂĽˇÎ ščĆ÷ľË´Ď´Ů" ! #: version.c:1043 msgid "Help poor children in Uganda!" ! msgstr "żě°Ł´ŮżĄ ťç´Â °Ął­ÇŃ žĆŔ̸Ś ľľżÍÁÖźźżä!" ! #: version.c:1044 msgid "type :help iccf for information " *************** *** 5463,5481 **** ! #: version.c:915 msgid "type :q to exit " ! msgstr "ÁžˇáÇϡÁ¸é :q<żŁĹÍ> ŔÔˇÂ" ! #: version.c:916 msgid "type :help or for on-line help" ! msgstr "żÂśóŔÎ ľľżň¸ťŔť ş¸ˇÁ¸é :help<żŁĹÍ> ȤŔş ŔÔˇÂ" ! #: version.c:917 msgid "type :help version6 for version info" ! msgstr "šöŔü Á¤ş¸¸Ś ş¸ˇÁ¸é :help version6<żŁĹÍ> ŔÔˇÂ" ! #: version.c:920 msgid "Running in Vi compatible mode" ! msgstr "Vi ČŁČŻ¸đľĺˇÎ ˝ÇÇŕÁßŔÔ´Ď´Ů" ! #: version.c:921 msgid "type :set nocp for Vim defaults" --- 5534,5552 ---- ! #: version.c:1046 msgid "type :q to exit " ! msgstr "łĄłťˇÁ¸é :q<żŁĹÍ> ŔÔˇÂ" ! #: version.c:1047 msgid "type :help or for on-line help" ! msgstr "żÂśóŔÎ ľľżň¸ťŔť ş¸ˇÁ¸é :help<żŁĹÍ> śÇ´Â ŔÔˇÂ" ! #: version.c:1048 msgid "type :help version6 for version info" ! msgstr "ĆÇ Á¤ş¸¸Ś ş¸ˇÁ¸é :help version6<żŁĹÍ> ŔÔˇÂ" ! #: version.c:1051 msgid "Running in Vi compatible mode" ! msgstr "Vi ČŁČŻ ťóĹ¡Π˝ÇÇŕÁßŔÔ´Ď´Ů" ! #: version.c:1052 msgid "type :set nocp for Vim defaults" *************** *** 5487,5493 **** ! #: version.c:962 msgid "WARNING: Windows 95/98/ME detected" ! msgstr "°ć°í: ŔŠľľżěÁî 95/98/ME ĂŁžĆÁü" ! #: version.c:965 msgid "type :help windows95 for info on this" --- 5558,5588 ---- ! #: version.c:1065 ! msgid "menu Help->Orphans for information " ! msgstr "ŔĚżĄ ´ëÇŃ Á¤ş¸¸Ś ş¸ˇÁ¸é ¸Ţ´şżĄź­ ľľżň¸ť->°ížĆ źąĹĂ" ! ! #: version.c:1067 ! msgid "Running modeless, typed text is inserted" ! msgstr "¸đľĺžřŔĚ źöÇŕÁßŔ̸ç, ŔÔˇÂľČ šŽŔÚ´Â ťđŔԾ˴ϴŮ" ! ! #: version.c:1068 ! msgid "menu Edit->Global Settings->Toggle Insert Mode " ! msgstr "¸Ţ´şżĄź­ ĆíÁý->ŔüżŞ źłÁ¤->ťđŔÔ ¸đľĺ ĹäąŰŔť źąĹĂÇϽøé " ! ! #: version.c:1069 ! msgid " for two modes " ! msgstr " ľÎ ¸đľĺ¸Ś ťçżëÇŇ źö ŔÖ˝Ŕ´Ď´Ů " ! ! #: version.c:1073 ! msgid "menu Edit->Global Settings->Toggle Vi Compatible" ! msgstr "¸Ţ´şżĄź­ ĆíÁý->ŔüżŞ źłÁ¤->Vi ČŁČŻ ĹäąŰŔť źąĹĂÇϽøé " ! ! #: version.c:1074 ! msgid " for Vim defaults " ! msgstr " VimŔĚ ąâşť°ŞŔ¸ˇÎ ľżŔŰÇŐ´Ď´Ů " ! ! #: version.c:1120 msgid "WARNING: Windows 95/98/ME detected" ! msgstr "°ć°í: ŔŠľľżěÁî 95/98/ME¸Ś ĂŁžŇŔ˝" ! #: version.c:1123 msgid "type :help windows95 for info on this" *************** *** 5497,5499 **** msgid "E441: There is no preview window" ! msgstr "E441: šĚ¸Žş¸ąâ âŔĚ žř˝Ŕ´Ď´Ů" --- 5592,5594 ---- msgid "E441: There is no preview window" ! msgstr "E441: šĚ¸Ž ş¸ąâ âŔĚ žř˝Ŕ´Ď´Ů" *************** *** 5501,5503 **** msgid "E442: Can't split topleft and botright at the same time" ! msgstr "E442: Ŕ§ żŢÂĘ°ú žĆˇĄ żŔ¸ĽÂĘŔť ľż˝ĂżĄ şĐÇŇÇŇ źö žř˝Ŕ´Ď´Ů" --- 5596,5598 ---- msgid "E442: Can't split topleft and botright at the same time" ! msgstr "E442: Ŕ§ żŢÂĘ°ú žĆˇĄ żŔ¸ĽÂĘŔť ľż˝ĂżĄ łŞ´­ źö žř˝Ŕ´Ď´Ů" *************** *** 5505,5507 **** msgid "E443: Cannot rotate when another window is split" ! msgstr "E443: ´Ů¸Ľ âŔĚ şĐÇҾǞúŔť ś§´Â ȸŔüÇŇ źö žř˝Ŕ´Ď´Ů" --- 5600,5602 ---- msgid "E443: Cannot rotate when another window is split" ! msgstr "E443: ´Ů¸Ľ âŔĚ łŞ´˛ÁłŔť ś§żĄ´Â ȸŔüÇŇ źö žř˝Ŕ´Ď´Ů" *************** *** 5528,5532 **** ! #: globals.h:873 msgid "--No lines in buffer--" ! msgstr "--šöĆŰżĄ śóŔÎ žřŔ˝--" --- 5623,5661 ---- ! #: ../GvimExt/gvimext.cpp:586 ! msgid "Edit with &multiple Vims" ! msgstr "żŠˇŻ şöŔ¸ˇÎ ĆíÁý(&m)" ! ! #: ../GvimExt/gvimext.cpp:592 ! msgid "Edit with single &Vim" ! msgstr "ÇĎłŞŔÇ şöŔ¸ˇÎ¸¸ ĆíÁý(&V)" ! ! #: ../GvimExt/gvimext.cpp:604 ! msgid "Edit with &Vim" ! msgstr "şöŔ¸ˇÎ ĆíÁý(&V)" ! ! #. Now concatenate ! #: ../GvimExt/gvimext.cpp:628 ! #~ msgid "Edit with existing Vim - &" ! #~ msgstr "" ! ! #: ../GvimExt/gvimext.cpp:752 ! msgid "Edits the selected file(s) with Vim" ! msgstr "źąĹĂľČ ĆÄŔĎ(ľé)Ŕť şöŔ¸ˇÎ ĆíÁý" ! ! #: ../GvimExt/gvimext.cpp:891 ../GvimExt/gvimext.cpp:969 ! msgid "Error creating process: Check if gvim is in your path!" ! msgstr "ÇÁˇÎźź˝ş ťýźş żĄˇŻ: gvimŔĚ pathżĄ ŔÖ´Â Áö ČŽŔÎÇĎźźżä!" ! ! #: ../GvimExt/gvimext.cpp:892 ../GvimExt/gvimext.cpp:906 ! #: ../GvimExt/gvimext.cpp:970 ! msgid "gvimext.dll error" ! msgstr "gvimext.dll żĄˇŻ" ! ! #: ../GvimExt/gvimext.cpp:905 ! msgid "Path length too long!" ! msgstr "°ćˇÎ°Ą łĘšŤ ąé´Ď´Ů" ! ! #: globals.h:882 msgid "--No lines in buffer--" ! msgstr "--šöĆŰżĄ ÁŮ žřŔ˝--" *************** *** 5548,5558 **** ! #: globals.h:969 msgid "E11: Invalid in command-line window; executes, CTRL-C quits" ! msgstr "E11: ¸íˇÉśóŔΠ⿥ Ŕ߸řľĘ; ˝ÇÇŕ, CTRL-C Ážˇá" ! #: globals.h:971 msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search" ! msgstr "E12: ÇöŔç ľđˇşĹ与 ȤŔş ĹÂą× ĂŁąâżĄź­ exrc/vimrcżĄź­ŔÇ ¸íˇÉŔş ÇăżëžĘľĘ" ! #: globals.h:972 msgid "E13: File exists (use ! to override)" --- 5677,5688 ---- ! #: globals.h:1027 msgid "E11: Invalid in command-line window; executes, CTRL-C quits" ! msgstr "E11: ¸íˇÉÁ٠⿥ Ŕ߸řľĘ; ˝ÇÇŕ, CTRL-C łĄłťąâ" ! #: globals.h:1029 msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search" ! msgstr "" ! "E12: ÇöŔç ŔÚˇášć śÇŔş ĹÂą× ĂŁąâżĄź­ exrc/vimrcżĄź­ŔÇ ¸íˇÉŔş Çăżë žČ ľË´Ď´Ů" ! #: globals.h:1030 msgid "E13: File exists (use ! to override)" *************** *** 5568,5574 **** ! #: globals.h:975 msgid "Interrupted" ! msgstr "Áß´ÜľĘ" ! #: globals.h:976 msgid "E14: Invalid address" --- 5698,5704 ---- ! #: globals.h:1033 msgid "Interrupted" ! msgstr "ÁߴܾǞú˝Ŕ´Ď´Ů" ! #: globals.h:1034 msgid "E14: Invalid address" *************** *** 5598,5613 **** ! #: globals.h:985 #, c-format msgid "E17: \"%s\" is a directory" ! msgstr "E17: \"%s\"´Â ľđˇşĹ与ŔÔ´Ď´Ů" ! #: globals.h:988 msgid "E18: Unexpected characters before '='" ! msgstr "E18: '=' ŔüżĄ ťý°˘Áö ¸řÇŃ šŽŔÚ" ! #: globals.h:990 msgid "E19: Mark has invalid line number" ! msgstr "E19: ¸śĹŠ°Ą Ŕ߸řľČ śóŔÎ šřČŁ¸Ś °ĄÁö°í ŔÖ˝Ŕ´Ď´Ů" ! #: globals.h:991 msgid "E20: Mark not set" --- 5728,5743 ---- ! #: globals.h:1043 #, c-format msgid "E17: \"%s\" is a directory" ! msgstr "E17: \"%s\"´Â ŔÚˇášćŔÔ´Ď´Ů" ! #: globals.h:1046 msgid "E18: Unexpected characters before '='" ! msgstr "E18: '=' ŔüżĄ ťý°˘Áö ¸řÇŃ ąŰŔÚ" ! #: globals.h:1048 msgid "E19: Mark has invalid line number" ! msgstr "E19: ¸śĹŠ°Ą Ŕ߸řľČ ÁŮ šřČŁ¸Ś °ĄÁö°í ŔÖ˝Ŕ´Ď´Ů" ! #: globals.h:1049 msgid "E20: Mark not set" *************** *** 5656,5662 **** ! #: globals.h:1010 msgid "E30: No previous command line" ! msgstr "E30: ŔĚŔü ¸íˇÉ śóŔÎŔĚ žř˝Ŕ´Ď´Ů" ! #: globals.h:1011 msgid "E31: No such mapping" --- 5786,5792 ---- ! #: globals.h:1068 msgid "E30: No previous command line" ! msgstr "E30: ŔĚŔü ¸íˇÉ ÁŮŔĚ žř˝Ŕ´Ď´Ů" ! #: globals.h:1069 msgid "E31: No such mapping" *************** *** 5677,5683 **** ! #: globals.h:1015 msgid "E33: No previous substitute regular expression" ! msgstr "E33: ŔĚŔü ÄĄČŻ Á¤ąÔÇĽÇö˝ÄŔĚ žř˝Ŕ´Ď´Ů" ! #: globals.h:1016 msgid "E34: No previous command" --- 5807,5813 ---- ! #: globals.h:1073 msgid "E33: No previous substitute regular expression" ! msgstr "E33: ŔĚŔü šŮ˛Ůąâ Á¤ąÔ ÇĽÇö˝ÄŔĚ žř˝Ŕ´Ď´Ů" ! #: globals.h:1074 msgid "E34: No previous command" *************** *** 5697,5704 **** ! #: globals.h:1022 #, c-format msgid "Can't create file %s" ! msgstr "ĆÄŔĎ %s¸Ś ťýźşÇŇ źö žř˝Ŕ´Ď´Ů" ! #: globals.h:1023 msgid "Can't get temp file name" --- 5827,5834 ---- ! #: globals.h:1080 #, c-format msgid "Can't create file %s" ! msgstr "´ŮŔ˝ ĆÄŔĎŔť ¸¸ľé źö žř˝Ŕ´Ď´Ů: %s" ! #: globals.h:1081 msgid "Can't get temp file name" *************** *** 5706,5722 **** ! #: globals.h:1024 #, c-format msgid "Can't open file %s" ! msgstr "ĆÄŔĎ %s¸Ś ż­ źö žř˝Ŕ´Ď´Ů" ! #: globals.h:1025 #, c-format msgid "Can't read file %s" ! msgstr "ĆÄŔĎ %s¸Ś ŔĐŔť źö žř˝Ŕ´Ď´Ů" ! #: globals.h:1026 msgid "E37: No write since last change (use ! to override)" ! msgstr "E37: ¸śÁö¸ˇ źöÁ¤ČÄ ŔúŔĺľÇÁö žĘžŇ˝Ŕ´Ď´Ů (šŤ˝ĂÇϡÁ¸é !Ŕť ťçżë)" ! #: globals.h:1027 msgid "E38: Null argument" --- 5836,5852 ---- ! #: globals.h:1082 #, c-format msgid "Can't open file %s" ! msgstr "´ŮŔ˝ ĆÄŔĎŔť ż­ źö žř˝Ŕ´Ď´Ů: %s" ! #: globals.h:1083 #, c-format msgid "Can't read file %s" ! msgstr "´ŮŔ˝ ĆÄŔĎŔť ŔĐŔť źö žř˝Ŕ´Ď´Ů: %s" ! #: globals.h:1084 msgid "E37: No write since last change (use ! to override)" ! msgstr "E37: ¸śÁö¸ˇŔ¸ˇÎ °íÄŁ ľÚ ŔúŔĺľÇÁö žĘžŇ˝Ŕ´Ď´Ů (šŤ˝ĂÇϡÁ¸é !Ŕť ťçżë)" ! #: globals.h:1085 msgid "E38: Null argument" *************** *** 5807,5817 **** ! #: globals.h:1064 msgid "E77: Too many file names" ! msgstr "E77: łĘšŤ ¸šŔş ĆÄŔĎ Ŕ̸§ľé" ! #: globals.h:1065 msgid "Trailing characters" ! msgstr "łĄżĄ šŽŔÚ°Ą ´ő ŔÖ˝Ŕ´Ď´Ů" ! #: globals.h:1066 msgid "E78: Unknown mark" --- 5937,5947 ---- ! #: globals.h:1122 msgid "E77: Too many file names" ! msgstr "E77: ĆÄŔĎ Ŕ̸§ŔĚ łĘšŤ ¸š˝Ŕ´Ď´Ů" ! #: globals.h:1123 msgid "Trailing characters" ! msgstr "łĄżĄ ąŰŔÚ°Ą ´ő ŔÖ˝Ŕ´Ď´Ů" ! #: globals.h:1124 msgid "E78: Unknown mark" *************** *** 5819,5825 **** ! #: globals.h:1067 msgid "E79: Cannot expand wildcards" ! msgstr "E79: ¸¸´ÉšŽŔÚ¸Ś ČŽŔĺÇŇ źö žř˝Ŕ´Ď´Ů" ! #: globals.h:1068 msgid "E80: Error while writing" --- 5949,5955 ---- ! #: globals.h:1125 msgid "E79: Cannot expand wildcards" ! msgstr "E79: ¸¸´É ąŰŔÚ¸Ś ČŽŔĺÇŇ źö žř˝Ŕ´Ď´Ů" ! #: globals.h:1126 msgid "E80: Error while writing" *************** *** 5831,5833 **** ! #: globals.h:1071 msgid "E81: Using not in a script context" --- 5961,5963 ---- ! #: globals.h:1129 msgid "E81: Using not in a script context" diff -rc -C 1 ../vim60.86//src/po/pl.po src/po/pl.po *** ../vim60.86//src/po/pl.po Thu Oct 18 18:02:49 2001 --- src/po/pl.po Wed Oct 24 12:17:57 2001 *************** *** 4079,4081 **** #: ops.c:2018 ! msgid "1 line ~ed" msgstr "1 wiersz ~ed" --- 4079,4081 ---- #: ops.c:2018 ! msgid "1 line changed" msgstr "1 wiersz ~ed" *************** *** 4084,4086 **** #, c-format ! msgid "%ld lines ~ed" msgstr "%ld wierszy ~ed" --- 4084,4086 ---- #, c-format ! msgid "%ld lines changed" msgstr "%ld wierszy ~ed" *************** *** 6316,6320 **** #~ msgstr "jeden wiersz do wcięcia... " - - #~ msgid "%ld line ~ed" - #~ msgstr "%ld wiersz ~ed" --- 6316,6317 ---- diff -rc -C 1 ../vim60.86//src/po/sk.po src/po/sk.po *** ../vim60.86//src/po/sk.po Sat Sep 15 14:58:21 2001 --- src/po/sk.po Thu Nov 1 20:01:39 2001 *************** *** 2,4 **** # Martin Lacko , 2001. - # msgid "" --- 2,3 ---- *************** *** 6,11 **** "Project-Id-Version: vim\n" ! "POT-Creation-Date: 2001-08-01 23:25+0200\n" ! "PO-Revision-Date: 2001-08-02 09:31CEST\n" "Last-Translator: Martin Lacko \n" ! "Language-Team: Slovak \n" "MIME-Version: 1.0\n" --- 5,10 ---- "Project-Id-Version: vim\n" ! "POT-Creation-Date: 2001-09-26 08:38+0200\n" ! "PO-Revision-Date: 2001-10-07 13:12CEST\n" "Last-Translator: Martin Lacko \n" ! "Language-Team: Slovak language \n" "MIME-Version: 1.0\n" *************** *** 141,143 **** ! #: buffer.c:2499 msgid "1 line --%d%%--" --- 140,143 ---- ! #: buffer.c:2510 ! #, c-format msgid "1 line --%d%%--" *************** *** 145,147 **** ! #: buffer.c:2499 msgid "%ld lines --%d%%--" --- 145,148 ---- ! #: buffer.c:2510 ! #, c-format msgid "%ld lines --%d%%--" *************** *** 149,151 **** ! #: buffer.c:2507 msgid "line %ld of %ld --%d%%-- col " --- 150,153 ---- ! #: buffer.c:2518 ! #, c-format msgid "line %ld of %ld --%d%%-- col " *************** *** 471,481 **** ! #: eval.c:5496 ! msgid "Unable to read a server reply" ! msgstr "Nemôžem čítať odpoveď servra" ! ! #: eval.c:5518 ! msgid "Unable to send reply" ! msgstr "Nemôžem poslať na odpoveď" ! #: eval.c:5550 #, c-format --- 473,483 ---- ! #: eval.c:5603 ! msgid "E277: Unable to read a server reply" ! msgstr "E227: Nemôžem čítať odpoveď servra" ! ! #: eval.c:5628 ! msgid "E258: Unable to send to client" ! msgstr "E258: Nemôžem poslať klientovi" ! #: eval.c:5669 #, c-format *************** *** 715,717 **** ! #: ex_cmds2.c:2752 msgid "Printing page %d (%d%%)" --- 717,720 ---- ! #: ex_cmds2.c:2898 ! #, c-format msgid "Printing page %d (%d%%)" *************** *** 729,731 **** ! #: ex_cmds2.c:3161 msgid "E324: Can't open PostScript output file" --- 732,742 ---- ! #: ex_cmds2.c:2966 ! msgid "Printing aborted" ! msgstr "Tlač bola zrušená" ! ! #: ex_cmds2.c:3344 ! msgid "E455: Error writing to PostScript output file" ! msgstr "E455: Nedá sa zapisovať do výstupného PostScriptového súboru" ! ! #: ex_cmds2.c:4019 msgid "E324: Can't open PostScript output file" *************** *** 733,735 **** ! #: ex_cmds2.c:3409 #, c-format --- 744,768 ---- ! #: ex_cmds2.c:4057 ! #, c-format ! msgid "E456: Can't open file \"%s\"" ! msgstr "E456: Nedá sa otvoriť súbor \"%s\"" ! ! #: ex_cmds2.c:4068 ! #, c-format ! msgid "E457: Can't read PostScript resource file \"%s\"" ! msgstr "E457: Nedá sa čítať PostScriptový súbor \"%s\"" ! ! #: ex_cmds2.c:4266 ! msgid "Sending to printer..." ! msgstr "Posielam na tlačiareň..." ! ! #: ex_cmds2.c:4270 ! msgid "E365: Failed to print PostScript file" ! msgstr "E365: PostScriptový súbor sa nepodarilo vytlačiť" ! ! #: ex_cmds2.c:4272 ! msgid "Print job sent." ! msgstr "Tlačová úloha bola odoslaná." ! ! #: ex_cmds2.c:4651 #, c-format *************** *** 816,818 **** #. Write the info: ! #: ex_cmds.c:1599 msgid "# This viminfo file was generated by Vim %s.\n" --- 849,852 ---- #. Write the info: ! #: ex_cmds.c:1610 ! #, c-format msgid "# This viminfo file was generated by Vim %s.\n" *************** *** 1266,1274 **** ! #: ex_docmd.c:7567 msgid "no autocommand match name to substitute for \"\"" msgstr "" ! "žiadna zhoda automatických príkazov, ktorou by bolo možné nahradiť " ! "\"\"" ! #: ex_docmd.c:7577 msgid "no :source file name to substitute for \"\"" --- 1300,1308 ---- ! #: ex_docmd.c:7632 msgid "no autocommand match name to substitute for \"\"" msgstr "" ! "žiadna zhoda automatických príkazov, ktorou by bolo možné nahradiť \"" ! "\"" ! #: ex_docmd.c:7642 msgid "no :source file name to substitute for \"\"" *************** *** 1478,1480 **** # resource fork ?! ! #: fileio.c:3010 msgid "The resource fork will be lost (use ! to override)" --- 1512,1514 ---- # resource fork ?! ! #: fileio.c:3033 msgid "The resource fork will be lost (use ! to override)" *************** *** 1613,1616 **** #. don't overwrite messages here #. don't use emsg() here, don't want to flush the buffers ! #: fileio.c:3844 msgid "WARNING: The file has been changed since reading it!!!" --- 1647,1651 ---- #. don't overwrite messages here + #. must give this prompt #. don't use emsg() here, don't want to flush the buffers ! #: fileio.c:3904 msgid "WARNING: The file has been changed since reading it!!!" *************** *** 1660,1662 **** ! #: fileio.c:4995 #, c-format --- 1695,1702 ---- ! #: fileio.c:5062 ! #, c-format ! msgid "W16: Warning: Mode of file \"%s\" has changed since editing started" ! msgstr "W16: Varovanie: Režim súboru \"%s\" bol po začatí úprav zmenený" ! ! #: fileio.c:5072 #, c-format *************** *** 1677,1683 **** ! #: fileio.c:5083 ! msgid "E321: Could not reload \"\"" ! msgstr "E321: nedá sa obnoviť \"\"" ! #: fileio.c:5813 #, c-format --- 1717,1734 ---- ! #: fileio.c:5166 ! #, c-format ! msgid "E321: Could not reload \"%s\"" ! msgstr "E321: nedá sa obnoviť \"%s\"" ! ! #: fileio.c:5671 ! msgid "--Deleted--" ! msgstr "--Vymazaný--" ! #. the group doesn't exist ! #: fileio.c:5831 ! #, c-format ! msgid "E367: No such group: \"%s\"" ! msgstr "E367: Skupina \"%s\" neexistuje" ! ! #: fileio.c:5956 #, c-format *************** *** 1740,1742 **** ! #: fold.c:1681 msgid "E221: 'commentstring' is empty" --- 1791,1801 ---- ! #: fold.c:554 ! msgid "E350: Cannot create fold with current 'foldmethod'" ! msgstr "E350: Pomocou 'foldmethod' sa nedá vytvoriť záhyb" ! ! #: fold.c:556 ! msgid "E351: Cannot delete fold with current 'foldmethod'" ! msgstr "E351: Pomocou 'foldmethod' sa nedá odstrániť záhyb" ! ! #: fold.c:1700 msgid "E221: 'commentstring' is empty" *************** *** 1952,1954 **** ! #: gui_riscos.c:948 #, c-format --- 2011,2017 ---- ! #: gui_motif.c:2809 ! msgid "Undo" ! msgstr "Späť" ! ! #: gui_riscos.c:951 #, c-format *************** *** 1982,1994 **** ! #: gui_w48.c:1459 ! #, c-format ! msgid "E244: Illegal charset name \"%s\" in font name \"%s\"" ! msgstr "E244: Chybný názov znakovej sady \"%s\" v názve písma \"%s\"" ! ! #: gui_w48.c:1467 ! #, c-format ! msgid "E245: Illegal char '%c' in font name \"%s\"" ! msgstr "E245: Chybný znak '%c' v názve písma \"%s\"" ! ! #: gui_w48.c:2392 msgid "Find string (use '\\\\' to find a '\\')" --- 2045,2047 ---- ! #: gui_w48.c:2068 msgid "Find string (use '\\\\' to find a '\\')" *************** *** 2068,2069 **** --- 2121,2127 ---- + #: if_cscope.c:26 + #, c-format + msgid "Usage: cs[cope] %s" + msgstr "Použitie: cs[cope] %s" + #: if_cscope.c:67 *************** *** 2318,2322 **** ! #: if_python.c:2148 if_python.c:2179 if_python.c:2229 if_python.c:2289 ! #: if_python.c:2406 if_python.c:2458 if_tcl.c:675 if_tcl.c:720 if_tcl.c:794 ! #: if_tcl.c:864 if_tcl.c:1989 msgid "cannot save undo information" --- 2376,2380 ---- ! #: if_python.c:2144 if_python.c:2175 if_python.c:2225 if_python.c:2285 ! #: if_python.c:2402 if_python.c:2454 if_tcl.c:673 if_tcl.c:718 if_tcl.c:792 ! #: if_tcl.c:862 if_tcl.c:1987 msgid "cannot save undo information" *************** *** 2344,2346 **** ! #: if_sniff.c:68 msgid "Toggle implementation/definition" --- 2402,2409 ---- ! #: if_ruby.c:457 ! #, c-format ! msgid "E273: unknown longjmp status %d" ! msgstr "E273: Neznámy 'longjmp' stav %d" ! ! #: if_sniff.c:67 msgid "Toggle implementation/definition" *************** *** 2516,2521 **** #. This should never happen. Famous last word? ! #: if_tcl.c:1553 msgid "" ! "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to " ! "vim-dev@vim.org" msgstr "" --- 2579,2584 ---- #. This should never happen. Famous last word? ! #: if_tcl.c:1551 msgid "" ! "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim." ! "org" msgstr "" *************** *** 2555,2565 **** ! #: if_xcmdsrv.c:637 ! msgid "E249: couldn't read VIM instance registry property" ! msgstr "E249: nemôžem čítať VIM registrovú vlastnosť" ! ! #: if_xcmdsrv.c:650 ! msgid "E251: VIM instance registry property is badly formed. Deleted!" ! msgstr "E251: VIM registrová žiadosť je zle formulovaná. Vymazané!" ! ! #: if_xcmdsrv.c:739 #, c-format --- 2618,2620 ---- ! #: if_xcmdsrv.c:714 #, c-format *************** *** 2568,2586 **** ! #: if_xcmdsrv.c:1506 ! msgid "" ! "\n" ! "Send failed. No command server present ?\n" ! msgstr "" ! "\n" ! "Odoslanie zlyhalo. Je prítomný nejaký príkazový server ?\n" ! ! #: if_xcmdsrv.c:1511 ! msgid "\nSend failed. Trying to execute locally\n" ! msgstr "\nOdoslanie zlyhalo. Pokúšam sa spustiť lokálne\n" ! #: if_xcmdsrv.c:1543 ! msgid "Send expression failed.\n" ! msgstr "Odoslanie výrazu zlyhalo.\n" ! #: main.c:48 option.c:3062 option.c:3169 msgid "Unknown option" --- 2623,2633 ---- ! #: if_xcmdsrv.c:1061 ! msgid "E249: couldn't read VIM instance registry property" ! msgstr "E249: nemôžem čítať VIM registrovú vlastnosť" ! #: if_xcmdsrv.c:1072 ! msgid "E251: VIM instance registry property is badly formed. Deleted!" ! msgstr "E251: VIM registrová žiadosť je zle formulovaná. Vymazané!" ! #: main.c:53 option.c:3162 option.c:3269 msgid "Unknown option" *************** *** 2616,2621 **** ! #: main.c:799 main.c:806 main.c:850 memline.c:3639 memline.c:3643 ! #: version.c:777 version.c:782 version.c:787 version.c:792 version.c:797 ! #: version.c:802 version.c:808 version.c:812 version.c:816 version.c:821 ! #: version.c:828 version.c:836 version.c:842 msgid "\"\n" --- 2663,2668 ---- ! #: main.c:862 main.c:869 main.c:913 memline.c:3673 memline.c:3677 ! #: version.c:856 version.c:861 version.c:866 version.c:871 version.c:876 ! #: version.c:881 version.c:887 version.c:891 version.c:895 version.c:900 ! #: version.c:907 version.c:915 version.c:921 msgid "\"\n" *************** *** 2644,2646 **** ! #: main.c:1128 #, c-format --- 2691,2698 ---- ! #. just in case.. ! #: main.c:1171 ! msgid "pre-vimrc command line" ! msgstr "pre-vimrc príkazový riadok" ! ! #: main.c:1206 #, c-format *************** *** 2757,2759 **** ! #: main.c:2143 msgid "-b\t\t\tBinary mode" --- 2809,2815 ---- ! #: main.c:2233 ! msgid "-M\t\t\tModifications in text not allowed" ! msgstr "-M\t\t\tZmeny v texte nie sú povolené" ! ! #: main.c:2234 msgid "-b\t\t\tBinary mode" *************** *** 2801,2807 **** ! #: main.c:2157 ! msgid "-d \t\tUse for I/O" ! msgstr "-d \t\tPoužiť pre I/O" ! #: main.c:2160 msgid "-H\t\t\tstart in Hebrew mode" --- 2857,2863 ---- ! #: main.c:2248 ! msgid "-dev \t\tUse for I/O" ! msgstr "-dev \t\tPoužiť pre I/O" ! #: main.c:2251 msgid "-H\t\t\tstart in Hebrew mode" *************** *** 2881,2911 **** ! #: main.c:2192 ! msgid "--serverlist\t\tList available Vim server names and exit" ! msgstr "--serverlist\t\tVypíše zoznam mien dostupných Vim servrov a skončí" ! ! #: main.c:2193 ! msgid "--serversend \tSend to a Vim server and exit" ! msgstr "--serversend \tOdošle na Vim server a skončí" ! #: main.c:2194 ! msgid "--serverexpr \tExecute in server and print result" ! msgstr "--serverexpr \tSpustite na servri a vytlačíte výsledok" ! #: main.c:2195 ! msgid "--servername \tSend to/become the Vim server " ! msgstr "--servername \tOdošle na Vim server " ! #: main.c:2196 ! msgid "--remote \tEdit in a Vim server" ! msgstr "--remote \t\tUpraviť na Vim servri" ! #: main.c:2197 ! msgid "--remote-wait \tAs --remote but wait for files to end edit" ! msgstr "--remote-wait \tAko --remote ale čaká na súbory pre ukončenie úprav" ! #: main.c:2200 ! msgid "--socketid \tOpen Vim inside another GTK widget" ! msgstr "--socketid \tOtvorí Vim vnútri iného GTK programu." ! #: main.c:2204 msgid "-i \t\tUse instead of .viminfo" --- 2937,2967 ---- ! #: main.c:2283 ! msgid "--socketid \tOpen Vim inside another GTK widget" ! msgstr "--socketid \tOtvorí Vim vnútri iného GTK programu." ! #: main.c:2287 ! msgid "--remote \tEdit in a Vim server and exit" ! msgstr "--remote \tUpraviť na Vim servri a skončiť" ! #: main.c:2288 ! msgid "--remote-wait As --remote but wait for files to have been edited" ! msgstr "--remote-wait \tAko --remote ale čaká na súbory pre ukončenie úprav" ! #: main.c:2289 ! msgid "--remote-send \tSend to a Vim server and exit" ! msgstr "--remote-send \tOdošle na Vim server a skončí" ! ! #: main.c:2290 ! msgid "--remote-expr \tEvaluate in a Vim server and print result" ! msgstr "--remote-expr \tSpusti na servri a vytlačí výsledok" ! #: main.c:2291 ! msgid "--serverlist\t\tList available Vim server names and exit" ! msgstr "--serverlist\t\tVypíše zoznam mien dostupných Vim servrov a skončí" ! #: main.c:2292 ! msgid "--servername \tSend to/become the Vim server " ! msgstr "--servername \tOdošle na Vim server " ! #: main.c:2295 msgid "-i \t\tUse instead of .viminfo" *************** *** 3033,3035 **** ! #: mark.c:711 msgid "No marks set" --- 3089,3118 ---- ! #. Failed to send, abort. ! #: main.c:2566 ! msgid "" ! "\n" ! "Send failed.\n" ! msgstr "" ! "\n" ! "Odoslanie zlyhalo.\n" ! ! #. Let vim start normally. ! #: main.c:2571 ! msgid "" ! "\n" ! "Send failed. Trying to execute locally\n" ! msgstr "" ! "\n" ! "Odoslanie zlyhalo. Pokúšam sa spustiť lokálne\n" ! ! #: main.c:2604 main.c:2625 ! #, c-format ! msgid "%d of %d edited" ! msgstr "%d upravených súborov z %d" ! ! #: main.c:2648 ! msgid "Send expression failed.\n" ! msgstr "Odoslanie výrazu zlyhalo.\n" ! ! #: mark.c:655 msgid "No marks set" *************** *** 3827,3832 **** "\n" ! "[bajtov] celkom uvolnené-alokované %lu-%lu, využité %lu, maximálne využitie " ! "%lu\n" ! #: misc2.c:665 #, c-format --- 3910,3915 ---- "\n" ! "[bajtov] celkom uvolnené-alokované %lu-%lu, využité %lu, maximálne využitie %" ! "lu\n" ! #: misc2.c:666 #, c-format *************** *** 3935,3945 **** ! #: normal.c:4138 ! msgid "E350: Cannot create fold with current 'foldmethod'" ! msgstr "E350: Pomocou 'foldmethod' sa nedá vytvoriť záhyb" ! ! #: normal.c:4156 ! msgid "E351: Cannot delete fold with current 'foldmethod'" ! msgstr "E351: Pomocou 'foldmethod' sa nedá odstrániť záhyb" ! ! #: normal.c:4169 msgid "E352: Cannot erase folds with current 'foldmethod'" --- 4018,4020 ---- ! #: normal.c:4171 msgid "E352: Cannot erase folds with current 'foldmethod'" *************** *** 3957,3969 **** ! #: ops.c:279 #, c-format msgid "%ld lines %sed 1 time" ! msgstr "počet riadkov posunutých naraz pomocou %s : %ld" ! #: ops.c:282 #, c-format msgid "%ld lines %sed %d times" ! msgstr "počet riadkov posunutých %d krát pomocou %s : %ld" ! #: ops.c:639 #, c-format --- 4032,4044 ---- ! #: ops.c:278 #, c-format msgid "%ld lines %sed 1 time" ! msgstr "%ld riadkov posunutých naraz pomocou %s" ! #: ops.c:281 #, c-format msgid "%ld lines %sed %d times" ! msgstr "%ld riadkov posunutých pomocou %s %d krát" ! #: ops.c:638 #, c-format *************** *** 3981,3983 **** ! #: ops.c:1504 msgid "cannot yank; delete anyway" --- 4056,4059 ---- ! #. must display the prompt ! #: ops.c:1528 msgid "cannot yank; delete anyway" *************** *** 4328,4350 **** ! #: os_msdos.c:1460 ! msgid "PC (32 bits Vim)" ! msgstr "PC (32 bitový Vim)" ! ! #: os_msdos.c:1462 ! msgid "PC (16 bits Vim)" ! msgstr "PC (16 bitový Vim)" ! ! #: os_msdos.c:1865 ! msgid "E362: Unsupported screen mode" ! msgstr "E362: Nepodporovaný zobrazovací mód" ! #: os_msdos.c:2059 os_unix.c:2942 os_unix.c:3483 ! msgid "" ! "\n" ! "shell returned " ! msgstr "" ! "\n" ! " návratová hodnota shellu " ! ! #: os_mswin.c:563 msgid "'columns' is not 80, cannot execute external commands" --- 4404,4410 ---- ! #: os_mswin.c:503 ! msgid "...(truncated)" ! msgstr "...(skrátené)" ! #: os_mswin.c:594 msgid "'columns' is not 80, cannot execute external commands" *************** *** 4361,4363 **** ! #: os_mswin.c:1302 os_mswin.c:1312 #, c-format --- 4421,4428 ---- ! #: os_mswin.c:1388 ! #, c-format ! msgid "to %s on %s" ! msgstr "%s na %s" ! ! #: os_mswin.c:1449 os_mswin.c:1459 #, c-format *************** *** 4370,4372 **** ! #: os_riscos.c:1213 msgid "E366: Invalid 'osfiletype' option - using Text" --- 4435,4452 ---- ! #: os_mswin.c:1486 ! #, c-format ! msgid "Printing '%s'" ! msgstr "Tlačím '%s'" ! ! #: os_mswin.c:2550 ! #, c-format ! msgid "E244: Illegal charset name \"%s\" in font name \"%s\"" ! msgstr "E244: Chybný názov znakovej sady \"%s\" v názve písma \"%s\"" ! ! #: os_mswin.c:2558 ! #, c-format ! msgid "E245: Illegal char '%c' in font name \"%s\"" ! msgstr "E245: Chybný znak '%c' v názve písma \"%s\"" ! ! #: os_riscos.c:1227 msgid "E366: Invalid 'osfiletype' option - using Text" *************** *** 4424,4426 **** ! #: os_unix.c:3076 msgid "" --- 4504,4514 ---- ! #: os_unix.c:2948 os_unix.c:3489 ! msgid "" ! "\n" ! "shell returned " ! msgstr "" ! "\n" ! " návratová hodnota shellu " ! ! #: os_unix.c:3082 msgid "" *************** *** 4473,4489 **** ! #: os_win32.c:1403 ! 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 nenájdený v $PATH.\n" ! "Po dokončení externých príkazov nebude výstup pozastavený.\n" ! "Pozrite :help win32-vimrun pre viac informácií." ! ! #: os_win32.c:1406 ! msgid "Vim Warning" ! msgstr "Vim Varovanie" ! ! #: os_win32.c:2383 #, c-format --- 4561,4563 ---- ! #: os_win32.c:2489 #, c-format *************** *** 4508,4510 **** --- 4582,4599 ---- + #: os_win32.c:2988 + 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 nenájdený v $PATH.\n" + "Po dokončení externých príkazov nebude výstup pozastavený.\n" + "Pozrite :help win32-vimrun pre viac informácií." + + #: os_win32.c:2991 + msgid "Vim Warning" + msgstr "Vim Varovanie" + #: quickfix.c:281 + #, c-format msgid "E372: Too many %%%c in format string" *************** *** 4513,4514 **** --- 4602,4604 ---- #: quickfix.c:294 + #, c-format msgid "E373: Unexpected %%%c in format string" *************** *** 4521,4522 **** --- 4611,4613 ---- #: quickfix.c:362 + #, c-format msgid "E375: Unsupported %%%c in format string" *************** *** 4525,4526 **** --- 4616,4618 ---- #: quickfix.c:380 + #, c-format msgid "E376: Invalid %%%c in format string prefix" *************** *** 4529,4530 **** --- 4621,4623 ---- #: quickfix.c:388 + #, c-format msgid "E377: Invalid %%%c in format string" *************** *** 4992,4995 **** #. * Ask to select a tag from the list. #. ! #: tag.c:705 msgid "Enter nr of choice ( to abort): " --- 5085,5089 ---- #. * Ask to select a tag from the list. + #. * When using ":silent" assume that was entered. #. ! #: tag.c:706 msgid "Enter nr of choice ( to abort): " *************** *** 5130,5132 **** ! #: undo.c:350 msgid "No undo possible; continue anyway" --- 5224,5227 ---- ! #. must display the prompt ! #: undo.c:351 msgid "No undo possible; continue anyway" *************** *** 5155,5157 **** ! #: version.c:616 msgid "" --- 5250,5253 ---- ! #. Only MS VC 4.1 and earlier can do Win32s ! #: version.c:695 msgid "" *************** *** 5508,5510 **** ! #: globals.h:869 msgid "--No lines in buffer--" --- 5604,5640 ---- ! #: ../GvimExt/gvimext.cpp:586 ! msgid "Edit with &multiple Vims" ! msgstr "Upraviť s viacnásobný&m Vimom" ! ! #: ../GvimExt/gvimext.cpp:592 ! msgid "Edit with single &Vim" ! msgstr "Upraviť s jedným &Vimom" ! ! #: ../GvimExt/gvimext.cpp:604 ! msgid "Edit with &Vim" ! msgstr "Upraviť s &Vimom" ! ! #. Now concatenate ! #: ../GvimExt/gvimext.cpp:628 ! msgid "Edit with existing Vim - &" ! msgstr "Upraviť s existujúcim Vimom - &" ! ! #: ../GvimExt/gvimext.cpp:752 ! msgid "Edits the selected file(s) with Vim" ! msgstr "Upraviť vybrané súbory s Vimom" ! ! #: ../GvimExt/gvimext.cpp:891 ../GvimExt/gvimext.cpp:969 ! msgid "Error creating process: Check if gvim is in your path!" ! msgstr "Chyba vytváracieho procesu: Skontrolujte, či je gvim vo vašej ceste!" ! ! #: ../GvimExt/gvimext.cpp:892 ../GvimExt/gvimext.cpp:906 ! #: ../GvimExt/gvimext.cpp:970 ! msgid "gvimext.dll error" ! msgstr "chyba gvimext.dll" ! ! #: ../GvimExt/gvimext.cpp:905 ! msgid "Path length too long!" ! msgstr "Príliš dlhá cesta!" ! ! #: globals.h:878 msgid "--No lines in buffer--" *************** *** 5815,5817 **** ! #: globals.h:1067 msgid "E81: Using not in a script context" --- 5945,5947 ---- ! #: globals.h:1125 msgid "E81: Using not in a script context" diff -rc -C 1 ../vim60.86//src/po/uk.po src/po/uk.po *** ../vim60.86//src/po/uk.po Tue Sep 18 21:03:45 2001 --- src/po/uk.po Fri Oct 26 10:07:04 2001 *************** *** 3,5 **** # ! # Copyright (C) 2001 Bohdan Vlasyuk # --- 3,5 ---- # ! # Copyright (C) 2001 Bohdan Vlasyuk # *************** *** 8,11 **** # ! # Please, read README.uk before any complains, and even if you won't ! # complain, read it anyway. # --- 8,11 ---- # ! # Please, see readme at htpp://www.vstu.edu.ua/~bohdan/vim before any ! # complains, and even if you won't complain, read it anyway. # *************** *** 15,19 **** "POT-Creation-Date: 2001-09-18 19:24+0300\n" ! "PO-Revision-Date: 2001-09-18 19:29+0300\n" ! "Last-Translator: Bohdan Vlasyuk \n" ! "Language-Team: Bohdan Vlasyuk \n" "MIME-Version: 1.0\n" --- 15,19 ---- "POT-Creation-Date: 2001-09-18 19:24+0300\n" ! "PO-Revision-Date: 2001-10-16 13:34+0300\n" ! "Last-Translator: Bohdan Vlasyuk \n" ! "Language-Team: Bohdan Vlasyuk \n" "MIME-Version: 1.0\n" *************** *** 24,26 **** msgid "E82: Cannot allocate any buffer, exiting..." ! msgstr "E82: îĹÍÁ¤ ÍĎÖĚÉ×ĎÓÔŚ ŇĎÚÍŚÓÔÉÔÉ ČĎŢ ĎÄÉÎ ÂŐĆĹŇ, ÚÁ×ĹŇŰĹÎÎŃ ŇĎÂĎÔÉ..." --- 24,26 ---- msgid "E82: Cannot allocate any buffer, exiting..." ! msgstr "E82: Ďĺî⤠îđăíęţđőćŚ ôđ˙îŚőćęćę éđŕ đäęď ÷čöĺô, ˙âţĺôůĺďďó ôđ÷đćę..." *************** *** 28,30 **** msgid "E83: Cannot allocate buffer, using other one..." ! msgstr "E83: îĹÍÁ¤ ÍĎÖĚÉ×ĎÓÔŚ ŇĎÚÍŚÓÔÉÔÉ ÂŐĆĹŇ, ÂŐÄĹ ×ÉËĎŇÉÓÔÁÎĎ ŚÎŰÉĘ..." --- 28,30 ---- msgid "E83: Cannot allocate buffer, using other one..." ! msgstr "E83: Ďĺî⤠îđăíęţđőćŚ ôđ˙îŚőćęćę ÷čöĺô, ÷čäĺ ţęěđôęőćâďđ Śďůęë..." *************** *** 32,34 **** msgid "No buffers were unloaded" ! msgstr "öĎÄĹÎ Ú ÂŐĆĹŇŚ× ÎĹ ÂŐ× ×É×ÁÎÔÁÖĹÎÉĘ" --- 32,34 ---- msgid "No buffers were unloaded" ! msgstr "Ăđäĺď ˙ ÷čöĺôŚţ ďĺ ÷čţ ţęţâďćâăĺďęë" *************** *** 36,38 **** msgid "No buffers were deleted" ! msgstr "öĎÄĹÎ Ú ÂŐĆĹŇŚ× ÎĹ ÂŐ× ×ÉÄÁĚĹÎÉĘ" --- 36,38 ---- msgid "No buffers were deleted" ! msgstr "Ăđäĺď ˙ ÷čöĺôŚţ ďĺ ÷čţ ţęäâíĺďęë" *************** *** 40,42 **** msgid "No buffers were wiped out" ! msgstr "öĎÄĹÎ Ú ÂŐĆĹŇŚ× ÎĹ ÂŐ× ×ÉÔĹŇÔÉĘ" --- 40,42 ---- msgid "No buffers were wiped out" ! msgstr "Ăđäĺď ˙ ÷čöĺôŚţ ďĺ ÷čţ ţęćĺôćęë" *************** *** 44,46 **** msgid "1 buffer unloaded" ! msgstr "÷É×ÁÎÔÁÖĹÎĎ ĎÄÉÎ ÂŐĆĹŇ" --- 44,46 ---- msgid "1 buffer unloaded" ! msgstr "Ţęţâďćâăĺďđ đäęď ÷čöĺô" *************** *** 49,51 **** msgid "%d buffers unloaded" ! msgstr "÷É×ÁÎÔÁÖĹÎĎ ÂŐĆĹŇŚ× -- %d" --- 49,51 ---- msgid "%d buffers unloaded" ! msgstr "Ţęţâďćâăĺďđ ÷čöĺôŚţ -- %d" *************** *** 53,55 **** msgid "1 buffer deleted" ! msgstr "÷ÉÄÁĚĹÎĎ ĎÄÉÎ ÂŐĆĹŇ" --- 53,55 ---- msgid "1 buffer deleted" ! msgstr "Ţęäâíĺďđ đäęď ÷čöĺô" *************** *** 58,60 **** msgid "%d buffers deleted" ! msgstr "÷ÉÄÁĚĹÎĎ ÂŐĆĹŇŚ× -- %d" --- 58,60 ---- msgid "%d buffers deleted" ! msgstr "Ţęäâíĺďđ ÷čöĺôŚţ -- %d" *************** *** 62,64 **** msgid "1 buffer wiped out" ! msgstr "÷ÉÔĹŇÔĎ ĎÄÉÎ ÂŐĆĹŇ" --- 62,64 ---- msgid "1 buffer wiped out" ! msgstr "Ţęćĺôćđ đäęď ÷čöĺô" *************** *** 67,69 **** msgid "%d buffers wiped out" ! msgstr "÷ÉÔĹŇÔĎ ÂŐĆĹŇŚ× -- %d" --- 67,69 ---- msgid "%d buffers wiped out" ! msgstr "Ţęćĺôćđ ÷čöĺôŚţ -- %d" *************** *** 71,73 **** msgid "E84: No modified buffer found" ! msgstr "E84: öĎÄĹÎ ÂŐĆĹŇ ÎĹ ÚÍŚÎĹÎĎ" --- 71,73 ---- msgid "E84: No modified buffer found" ! msgstr "E84: Ăđäĺď ÷čöĺô ďĺ ˙îŚďĺďđ" *************** *** 76,78 **** msgid "E85: There is no listed buffer" ! msgstr "E85: ő ÓĐÉÓËŐ ÎĹÍÁ¤ ÂŐĆĹŇŚ×" --- 76,78 ---- msgid "E85: There is no listed buffer" ! msgstr "E85: Č őňęőěč ďĺî⤠÷čöĺôŚţ" *************** *** 81,83 **** msgid "E86: Cannot go to buffer %ld" ! msgstr "E86: îĹÍĎÖĚÉ×Ď ĐĹŇĹĘÔÉ × ÂŐĆĹŇ %ld" --- 81,83 ---- msgid "E86: Cannot go to buffer %ld" ! msgstr "E86: Ďĺ îđăč ňĺôĺëćę ţ ÷čöĺô %ld" *************** *** 85,87 **** msgid "E87: Cannot go beyond last buffer" ! msgstr "E87: îĹÍĎÖĚÉ×Ď ĐĹŇĹĘÔÉ Ő ÎÁÓÔŐĐÎÉĘ ÂŐĆĹŇ Ú ĎÓÔÁÎÎŘĎÇĎ" --- 85,87 ---- msgid "E87: Cannot go beyond last buffer" ! msgstr "E87: Ďĺ îđăč ňĺôĺëćę č ďâőćčňďęë ÷čöĺô ˙ đőćâďďűđúđ" *************** *** 89,91 **** msgid "E88: Cannot go before first buffer" ! msgstr "E88: îĹÍĎÖĚÉ×Ď ĐĹŇĹĘÔÉ Ő ĐĎĐĹŇĹÄÎŚĘ ÂŐĆĹŇ Ú ĐĹŇŰĎÇĎ" --- 89,91 ---- msgid "E88: Cannot go before first buffer" ! msgstr "E88: Ďĺ îđăč ňĺôĺëćę č ňđňĺôĺäďŚë ÷čöĺô ˙ ňĺôůđúđ" *************** *** 95,98 **** msgstr "" ! "E89: âŐĆĹŇ %ld ÎĹ ÚÁĐÉÓÁÎÉĘ ĐŚÓĚŃ ĎÓÔÁÎÎŘϧ ÚÍŚÎÉ (×ÉËĎŇÉÓÔÁĘÔĹ ! ÝĎ ÎĹ " ! "Ú×ÁÖÁÔÉ)" --- 95,98 ---- msgstr "" ! "E89: ×čöĺô %ld ďĺ ˙âňęőâďęë ňŚőíó đőćâďďűđ§ ˙îŚďę (ţęěđôęőćâëćĺ ! üđ÷ ďĺ " ! "˙ţâăâćę)" *************** *** 100,102 **** msgid "E90: Cannot unload last buffer" ! msgstr "E90: îĹÍĎÖĚÉ×Ď ×É×ÁÎÔÁÖÉÔÉ ĎÓÔÁÎÎŚĘ ÂŐĆĹŇ" --- 100,102 ---- msgid "E90: Cannot unload last buffer" ! msgstr "E90: Ďĺ îđăč ţęţâďćâăęćę đőćâďďŚë ÷čöĺô" *************** *** 104,106 **** msgid "W14: Warning: List of file names overflow" ! msgstr "W14: ďÂĹŇĹÖÎĎ: óĐÉÓĎË ŚÍĹÎ ĆÁĘĚŚ× ĐĹŇĹĐĎ×ÎĹÎĎ" --- 104,106 ---- msgid "W14: Warning: List of file names overflow" ! msgstr "W14: Đ÷ĺôĺăďđ: Őňęőđě Śîĺď öâëíŚţ ňĺôĺňđţďĺďđ" *************** *** 109,111 **** msgid "E92: Buffer %ld not found" ! msgstr "E92: âŐĆĹŇ %ld ÎĹ ÚÎÁĘÄĹÎĎ" --- 109,111 ---- msgid "E92: Buffer %ld not found" ! msgstr "E92: ×čöĺô %ld ďĺ ˙ďâëäĺďđ" *************** *** 114,116 **** msgid "E93: More than one match for %s" ! msgstr "E93: úÎÁĘÄĹÎĎ ÂŚĚŘŰĹ ÎŚÖ ĎÄÉÎ ×ÁŇŚÁÎÔ ÄĚŃ %s" --- 114,116 ---- msgid "E93: More than one match for %s" ! msgstr "E93: ßďâëäĺďđ ÷Śíűůĺ ďŚă đäęď ţâôŚâďć äíó %s" *************** *** 119,121 **** msgid "E94: No matching buffer for %s" ! msgstr "E94: îĹ ÚÎÁĘÄĹÎĎ ×ÁŇŚÁÎÔŚ× ÄĚŃ %s" --- 119,121 ---- msgid "E94: No matching buffer for %s" ! msgstr "E94: Ďĺ ˙ďâëäĺďđ ţâôŚâďćŚţ äíó %s" *************** *** 124,126 **** msgid "line %ld" ! msgstr "ŇŃÄĎË %ld" --- 124,126 ---- msgid "line %ld" ! msgstr "ôóäđě %ld" *************** *** 128,130 **** msgid "E95: Buffer with this name already exists" ! msgstr "E95: âŐĆĹŇ Ú ÔÁËĎŔ ÎÁÚ×ĎŔ ŐÖĹ ŚÓÎŐ¤" --- 128,130 ---- msgid "E95: Buffer with this name already exists" ! msgstr "E95: ×čöĺô ˙ ćâěđá ďâ˙ţđá čăĺ Śőďč¤" *************** *** 132,134 **** msgid " [Modified]" ! msgstr "[úÍŚÎĹÎĎ]" --- 132,134 ---- msgid " [Modified]" ! msgstr "[ßîŚďĺďđ]" *************** *** 136,138 **** msgid "[Not edited]" ! msgstr "[îĹ ÂŐĚĎ ŇĹÄÁÇĎ×ÁÎĎ]" --- 136,138 ---- msgid "[Not edited]" ! msgstr "[Ďĺ ÷číđ ôĺäâúđţâďđ]" *************** *** 140,142 **** msgid "[New file]" ! msgstr "[îĎ×ÉĘ ĆÁĘĚ]" --- 140,142 ---- msgid "[New file]" ! msgstr "[Ďđţęë öâëí]" *************** *** 144,146 **** msgid "[Read errors]" ! msgstr "[đĎÍÉĚËÁ ÚŢÉÔŐ×ÁÎÎŃ]" --- 144,146 ---- msgid "[Read errors]" ! msgstr "[Ňđîęíěâ ˙ŕęćčţâďďó]" *************** *** 148,150 **** msgid "[readonly]" ! msgstr "[ĚÉŰĹ ŢÉÔÁÔÉ]" --- 148,150 ---- msgid "[readonly]" ! msgstr "[íęůĺ ŕęćâćę]" *************** *** 152,154 **** msgid "1 line --%d%%--" ! msgstr "ĎÄÉÎ ŇŃÄĎË --%d%%--" --- 152,154 ---- msgid "1 line --%d%%--" ! msgstr "đäęď ôóäđě --%d%%--" *************** *** 156,158 **** msgid "%ld lines --%d%%--" ! msgstr "(ŇŃÄËŚ×: %ld) --%d%%--" --- 156,158 ---- msgid "%ld lines --%d%%--" ! msgstr "(ôóäěŚţ: %ld) --%d%%--" *************** *** 160,162 **** msgid "line %ld of %ld --%d%%-- col " ! msgstr "ŇŃÄĎË %ld Ú %ld --%d%%-- ËĎĚĎÎËÁ" --- 160,162 ---- msgid "line %ld of %ld --%d%%-- col " ! msgstr "ôóäđě %ld ˙ %ld --%d%%-- ěđíđďěâ" *************** *** 164,166 **** msgid "[No file]" ! msgstr "[îĎ×ÉĘ ĆÁĘĚ]" --- 164,166 ---- msgid "[No file]" ! msgstr "[Ďđţęë öâëí]" *************** *** 169,171 **** msgid "help" ! msgstr "ÄĎĐĎÍĎÇÁ" --- 169,171 ---- msgid "help" ! msgstr "äđňđîđúâ" *************** *** 173,175 **** msgid "[help]" ! msgstr "[ÄĎĐĎÍĎÇÁ]" --- 173,175 ---- msgid "[help]" ! msgstr "[äđňđîđúâ]" *************** *** 177,179 **** msgid "[Preview]" ! msgstr "[ĐĹŇĹÇĚŃÄ]" --- 177,179 ---- msgid "[Preview]" ! msgstr "[ňĺôĺúíóä]" *************** *** 181,183 **** msgid "All" ! msgstr "őÓĹ" --- 181,183 ---- msgid "All" ! msgstr "Čőĺ" *************** *** 185,187 **** msgid "Bot" ! msgstr "őÎÉÚŐ" --- 185,187 ---- msgid "Bot" ! msgstr "Čďę˙č" *************** *** 189,191 **** msgid "Top" ! msgstr "÷ÇĎŇŚ" --- 189,191 ---- msgid "Top" ! msgstr "ŢúđôŚ" *************** *** 197,199 **** "\n" ! "óĐÉÓĎË ÂŐĆĹŇŚ×:\n" --- 197,199 ---- "\n" ! "Őňęőđě ÷čöĺôŚţ:\n" *************** *** 201,203 **** msgid "[Error List]" ! msgstr "[óĐÉÓĎË ĐĎÍÉĚĎË]" --- 201,203 ---- msgid "[Error List]" ! msgstr "[Őňęőđě ňđîęíđě]" *************** *** 205,207 **** msgid "[No File]" ! msgstr "[îĎ×ÉĘ ĆÁĘĚ]" --- 205,207 ---- msgid "[No File]" ! msgstr "[Ďđţęë öâëí]" *************** *** 213,215 **** "\n" ! "--- úÎÁËÉ ---" --- 213,215 ---- "\n" ! "--- ßďâěę ---" *************** *** 218,220 **** msgid "Signs for %s:" ! msgstr "úÎÁËÉ ÄĚŃ %s:" --- 218,220 ---- msgid "Signs for %s:" ! msgstr "ßďâěę äíó %s:" *************** *** 223,225 **** msgid " line=%ld id=%d name=%s" ! msgstr " ŇŃÄĎË=%ld id=%ld ŚÍ'Ń=%s" --- 223,225 ---- msgid " line=%ld id=%d name=%s" ! msgstr " ôóäđě=%ld id=%d Śî'ó=%s" *************** *** 228,230 **** msgid "E96: Can not diff more than %ld buffers" ! msgstr "E96: îĹÍĎÖĚÉ×Ď ĐĎŇŚ×ÎŔ×ÁÔÉ ĐĎÎÁÄ %ld ÂŐĆĹŇŚ× " --- 228,230 ---- msgid "E96: Can not diff more than %ld buffers" ! msgstr "E96: Ďĺ îđăč ňđôŚţďáţâćę ňđďâä %ld ÷čöĺôŚţ " *************** *** 232,234 **** msgid "E97: Cannot create diffs" ! msgstr "E97: îĹÍĎÖÎÁ ÓÔ×ĎŇÉÔÉ diff'É" --- 232,234 ---- msgid "E97: Cannot create diffs" ! msgstr "E97: Ďĺîđăďâ őćţđôęćę diff'ę" *************** *** 236,238 **** msgid "Patch file" ! msgstr "patch-ĆÁĘĚ" --- 236,238 ---- msgid "Patch file" ! msgstr "patch-öâëí" *************** *** 240,242 **** msgid "E98: Cannot read diff output" ! msgstr "E98: îĹÍĎÖĚÉ×Ď ÚŢÉÔÁÔÉ ŇĹÚŐĚŘÔÁÔ diff'Ő" --- 240,242 ---- msgid "E98: Cannot read diff output" ! msgstr "E98: Ďĺ îđăč ˙ŕęćâćę ôĺ˙číűćâć diff'č" *************** *** 244,246 **** msgid "E99: Current buffer is not in diff mode" ! msgstr "E99: ăĹĘ ÂŐĆĹŇ ÎĹ × ŇĹÖÉÍŚ diff" --- 244,246 ---- msgid "E99: Current buffer is not in diff mode" ! msgstr "E99: Çĺë ÷čöĺô ďĺ ţ ôĺăęîŚ diff" *************** *** 248,250 **** msgid "E100: No other buffer in diff mode" ! msgstr "E100: îĹÍÁĹ ŚÎŰÉČ ÂŐĆĹŇŚ× × ŇĹÖÉÍŚ diff" --- 248,250 ---- msgid "E100: No other buffer in diff mode" ! msgstr "E100: Ďĺîâĺ Śďůęé ÷čöĺôŚţ ţ ôĺăęîŚ diff" *************** *** 253,256 **** msgstr "" ! "E101: đĎÎÁÄ Ä×Á ÂŐĆĹŇÁ ÚÎÁČĎÄŃÔŘÓŃ × ŇĹÖÉÍŚ diff, ÎĹ ÚŇĎÚŐÍŚĚĎ ŃËÉĘ Ú ÎÉČ " ! "×ÉËĎŇÉÓÔÁÔÉ" --- 253,256 ---- msgstr "" ! "E101: Ňđďâä äţâ ÷čöĺôâ ˙ďâéđäóćűőó ţ ôĺăęîŚ diff, ďĺ ˙ôđ˙čîŚíđ óěęë ˙ ďęé " ! "ţęěđôęőćâćę" *************** *** 259,261 **** msgid "E102: Can't find buffer \"%s\"" ! msgstr "E102: âŐĆĹŇ \"%s\" ÎĹ ÚÎÁĘÄĹÎĎ" --- 259,261 ---- msgid "E102: Can't find buffer \"%s\"" ! msgstr "E102: ×čöĺô \"%s\" ďĺ ˙ďâëäĺďđ" *************** *** 264,266 **** msgid "E103: Buffer \"%s\" is not in diff mode" ! msgstr "E103: âŐĆĹŇ \"%s\" ÎĹ × ŇĹÖÉÍŚ diff" --- 264,266 ---- msgid "E103: Buffer \"%s\" is not in diff mode" ! msgstr "E103: ×čöĺô \"%s\" ďĺ ţ ôĺăęîŚ diff" *************** *** 268,270 **** msgid "E104: Escape not allowed in digraph" ! msgstr "E104: ő ÄÉÇŇÁĆÁČ ÎĹ ÍĎÖĹ ÍŚÓÔÉÔÉÓŃ Escape" --- 268,270 ---- msgid "E104: Escape not allowed in digraph" ! msgstr "E104: Č äęúôâöâé ďĺ îđăĺ îŚőćęćęőó Escape" *************** *** 272,274 **** msgid "Keymap file not found" ! msgstr "ćÁĘĚ ŇĎÚËĚÁÄËÉ ËĚÁ׌ÁÔŐŇÉ ÎĹ ÚÎÁĘÄĹÎĎ" --- 272,274 ---- msgid "Keymap file not found" ! msgstr "Öâëí ôđ˙ěíâäěę ěíâţŚâćčôę ďĺ ˙ďâëäĺďđ" *************** *** 276,278 **** msgid "E105: Using :loadkeymap not in a sourced file" ! msgstr "E105: ÷ÉËĎŇÉÓÔÁÎÎŃ :loadkeymap ÎĹ × ĆÁĘĚŚ ËĎÍÁÎÄ" --- 276,278 ---- msgid "E105: Using :loadkeymap not in a sourced file" ! msgstr "E105: Ţęěđôęőćâďďó :loadkeymap ďĺ ţ öâëíŚ ěđîâďä" *************** *** 280,282 **** msgid " Keyword completion (^N/^P)" ! msgstr " äĎĐĎ×ÎĹÎÎŃ ËĚŔŢĎ×ÉČ ÓĚŚ× (^N/^P)" --- 280,282 ---- msgid " Keyword completion (^N/^P)" ! msgstr " Äđňđţďĺďďó ěíáŕđţęé őíŚţ (^N/^P)" *************** *** 285,287 **** 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)" --- 285,287 ---- 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)" *************** *** 291,293 **** msgid " Keyword Local completion (^N/^P)" ! msgstr " äĎ×ĹŇŰĹÎÎŃ ÍŚÓĂĹ×ÉČ ËĚŔŢĎ×ÉČ ÓĚŚ× (^N/^P)" --- 291,293 ---- msgid " Keyword Local completion (^N/^P)" ! msgstr " Äđţĺôůĺďďó îŚőçĺţęé ěíáŕđţęé őíŚţ (^N/^P)" *************** *** 295,297 **** msgid " Whole line completion (^L/^N/^P)" ! msgstr " äĎ×ĹŇŰĹÎÎŃ ŐÓŘĎÇĎ ŇŃÄËÁ (^L/^N/^P)" --- 295,297 ---- msgid " Whole line completion (^L/^N/^P)" ! msgstr " Äđţĺôůĺďďó čőűđúđ ôóäěâ (^L/^N/^P)" *************** *** 299,301 **** msgid " File name completion (^F/^N/^P)" ! msgstr " äĎ×ĹŇŰĹÎÎŃ ŚÍĹÎŚ ĆÁĘĚÁ (^F/^N/^P)" --- 299,301 ---- msgid " File name completion (^F/^N/^P)" ! msgstr " Äđţĺôůĺďďó ŚîĺďŚ öâëíâ (^F/^N/^P)" *************** *** 303,305 **** msgid " Tag completion (^]/^N/^P)" ! msgstr " äĎ×ĹŇŰĹÎÎŃ ĐĎÍŚÔĎË (^]/^N/^P)" --- 303,305 ---- msgid " Tag completion (^]/^N/^P)" ! msgstr " Äđţĺôůĺďďó ňđîŚćđě (^]/^N/^P)" *************** *** 307,309 **** msgid " Path pattern completion (^N/^P)" ! msgstr " äĎ×ĹŇŰĹÎÎŃ ŰĚŃČŐ ÚÁ ÚŇÁÚËĎÍ (^N/^P)" --- 307,309 ---- msgid " Path pattern completion (^N/^P)" ! msgstr " Äđţĺôůĺďďó ůíóéč ˙â ˙ôâ˙ěđî (^N/^P)" *************** *** 311,313 **** msgid " Definition completion (^D/^N/^P)" ! msgstr " äĎ×ĹŇŰĹÎÎŃ ×ÉÚÎÁŢĹÎÎŃ (^D/^N/^P)" --- 311,313 ---- msgid " Definition completion (^D/^N/^P)" ! msgstr " Äđţĺôůĺďďó ţę˙ďâŕĺďďó (^D/^N/^P)" *************** *** 315,317 **** msgid " Dictionary completion (^K/^N/^P)" ! msgstr " äĎ×ĹŇŰĹÎÎŃ Ú ÓĚĎ×ÎÉËÁ (^K/^N/^P)" --- 315,317 ---- msgid " Dictionary completion (^K/^N/^P)" ! msgstr " Äđţĺôůĺďďó ˙ őíđţďęěâ (^K/^N/^P)" *************** *** 319,321 **** msgid " Thesaurus completion (^T/^N/^P)" ! msgstr " äĎ×ĹŇŰĹÎÎŃ Ú ŚÄĹĎÇŇÁÍÁÔÉŢÎĎÇĎ ÓĚĎ×ÎÉËÁ (^T/^N/^P)" --- 319,321 ---- msgid " Thesaurus completion (^T/^N/^P)" ! msgstr " Äđţĺôůĺďďó ˙ Śäĺđúôâîâćęŕďđúđ őíđţďęěâ (^T/^N/^P)" *************** *** 323,325 **** msgid " Command-line completion (^V/^N/^P)" ! msgstr " äĎ×ĹŇŰĹÎÎŃ ËĎÍÁÎÄ (^V/^N/^P)" --- 323,325 ---- msgid " Command-line completion (^V/^N/^P)" ! msgstr " Äđţĺôůĺďďó ěđîâďä (^V/^N/^P)" *************** *** 327,329 **** msgid "Hit end of paragraph" ! msgstr "äĎÓŃÇÎŐÔĎ ËŚÎĹĂŘ ĐÁŇÁÇŇÁĆÁ" --- 327,329 ---- msgid "Hit end of paragraph" ! msgstr "Äđőóúďčćđ ěŚďĺçű ňâôâúôâöâ" *************** *** 331,333 **** msgid "'thesaurus' option is empty" ! msgstr "ĎĐĂŚŃ 'thesaurus' ĐŐÓÔÁ" --- 331,333 ---- msgid "'thesaurus' option is empty" ! msgstr "đňçŚó 'thesaurus' ňčőćâ" *************** *** 335,337 **** msgid "'dictionary' option is empty" ! msgstr "ĎĐĂŚŃ 'dictionary' ĐŐÓÔÁ" --- 335,337 ---- msgid "'dictionary' option is empty" ! msgstr "đňçŚó 'dictionary' ňčőćâ" *************** *** 340,342 **** msgid "Scanning dictionary: %s" ! msgstr "ÚŢÉÔŐĹÍĎ ÄÉŇĹËÔĎŇŚŔ: %s" --- 340,342 ---- msgid "Scanning dictionary: %s" ! msgstr "˙ŕęćčĺîđ äęôĺěćđôŚá: %s" *************** *** 344,346 **** msgid " (insert) Scroll (^E/^Y)" ! msgstr " (×ÓÔÁ×ËÁ) úÓŐ× (^E/^Y)" --- 344,346 ---- msgid " (insert) Scroll (^E/^Y)" ! msgstr " (ţőćâţěâ) ßőčţ (^E/^Y)" *************** *** 348,350 **** msgid " (replace) Scroll (^E/^Y)" ! msgstr " (ÚÁÍŚÎÁ) úÓŐ× (^E/^Y)" --- 348,350 ---- msgid " (replace) Scroll (^E/^Y)" ! msgstr " (˙âîŚďâ) ßőčţ (^E/^Y)" *************** *** 353,355 **** msgid "Scanning: %s" ! msgstr "đĎŰŐË Ő: %s" --- 353,355 ---- msgid "Scanning: %s" ! msgstr "Ňđůčě č: %s" *************** *** 357,359 **** msgid "Scanning tags." ! msgstr "đĎŰŐË ÓĹŇĹÄ ĐĎÍŚÔĎË." --- 357,359 ---- msgid "Scanning tags." ! msgstr "Ňđůčě őĺôĺä ňđîŚćđě." *************** *** 361,363 **** msgid " Adding" ! msgstr " äĎÄÁ¤ÍĎ" --- 361,363 ---- msgid " Adding" ! msgstr " Äđäâ¤îđ" *************** *** 369,371 **** msgid "-- Searching..." ! msgstr "-- đĎŰŐË..." --- 369,371 ---- msgid "-- Searching..." ! msgstr "-- Ňđůčě..." *************** *** 373,375 **** msgid "Back at original" ! msgstr "îÁÚÁÄ ÄĎ ĐĎŢÁÔËĎ×ĎÇĎ ×ÁŇŚÁÎÔŐ" --- 373,375 ---- msgid "Back at original" ! msgstr "Ďâ˙âä äđ ňđŕâćěđţđúđ ţâôŚâďćč" *************** *** 377,379 **** msgid "Word from other line" ! msgstr "óĚĎ×Ď Ú ŚÎŰĎÇĎ ŇŃÄËÁ" --- 377,379 ---- msgid "Word from other line" ! msgstr "Őíđţđ ˙ Śďůđúđ ôóäěâ" *************** *** 381,383 **** msgid "The only match" ! msgstr "ĺÄÉÎÉĘ ×ÁŇŚÁÎÔ" --- 381,383 ---- msgid "The only match" ! msgstr "Ĺäęďęë ţâôŚâďć" *************** *** 386,388 **** msgid "match %d of %d" ! msgstr " ×ÁŇŚÁÎÔ %d Ú %d" --- 386,388 ---- msgid "match %d of %d" ! msgstr " ţâôŚâďć %d ˙ %d" *************** *** 391,393 **** msgid "match %d" ! msgstr "×ÁŇŚÁÎÔ %d" --- 391,393 ---- msgid "match %d" ! msgstr "ţâôŚâďć %d" *************** *** 396,398 **** msgid "E106: Unknown variable: \"%s\"" ! msgstr "E106: îĹ׌ÄĎÍÁ ÚÍŚÎÎÁ: \"\"" --- 396,398 ---- msgid "E106: Unknown variable: \"%s\"" ! msgstr "E106: ĎĺţŚäđîâ ˙îŚďďâ: \"%s\"" *************** *** 401,403 **** msgid "E107: Missing braces: %s" ! msgstr "E107: îĹÍÁĹ ÄŐÖĎË: %s" --- 401,403 ---- msgid "E107: Missing braces: %s" ! msgstr "E107: Ďĺîâĺ äčăđě: %s" *************** *** 406,408 **** msgid "E108: No such variable: \"%s\"" ! msgstr "E108: úÍŚÎÎÁ ÎĹ ŚÓÎŐ¤: \"%s\"" --- 406,408 ---- msgid "E108: No such variable: \"%s\"" ! msgstr "E108: ßîŚďďâ ďĺ Śőďč¤: \"%s\"" *************** *** 410,412 **** msgid "E109: Missing ':' after '?'" ! msgstr "E109: îĹÍÁĹ ':' ĐŚÓĚŃ '?'" --- 410,412 ---- msgid "E109: Missing ':' after '?'" ! msgstr "E109: Ďĺîâĺ ':' ňŚőíó '?'" *************** *** 414,416 **** msgid "E110: Missing ')'" ! msgstr "E110: îĹÍÁ¤ ')'" --- 414,416 ---- msgid "E110: Missing ')'" ! msgstr "E110: Ďĺî⤠')'" *************** *** 418,420 **** msgid "E111: Missing ']'" ! msgstr "E111: îĹÍÁ¤ ']'" --- 418,420 ---- msgid "E111: Missing ']'" ! msgstr "E111: Ďĺî⤠']'" *************** *** 423,425 **** msgid "E112: Option name missing: %s" ! msgstr "E112: îĹÍÁ¤ ÎÁÚ×É ĎĐĂŚ§: %s" --- 423,425 ---- msgid "E112: Option name missing: %s" ! msgstr "E112: Ďĺî⤠ďâ˙ţę đň猧: %s" *************** *** 428,430 **** msgid "E113: Unknown option: %s" ! msgstr "E113: îĹ׌ÄĎÍÁ ĎĐĂŚŃ: %s" --- 428,430 ---- msgid "E113: Unknown option: %s" ! msgstr "E113: ĎĺţŚäđîâ đňçŚó: %s" *************** *** 433,435 **** msgid "E114: Missing quote: %s" ! msgstr "E114: îĹ ×ÉÓÔÁŢÁ¤ ĚÁĐËÉ: %s" --- 433,435 ---- msgid "E114: Missing quote: %s" ! msgstr "E114: Ďĺ ţęőćâŕ⤠íâňěę: %s" *************** *** 438,440 **** msgid "E115: Missing quote: %s" ! msgstr "E115: ÷ÔŇÁŢĹÎÉĘ ÓÉÍ×ĎĚ '\"': %s" --- 438,440 ---- msgid "E115: Missing quote: %s" ! msgstr "E115: Ţćôâŕĺďęë őęîţđí '\"': %s" *************** *** 443,445 **** msgid "E116: Invalid arguments for function %s" ! msgstr "E116: îĹ׌ŇÎŚ ÁŇÇŐÍĹÎÔÉ ÄĚŃ ĆŐÎËĂŚ§ %s" --- 443,445 ---- msgid "E116: Invalid arguments for function %s" ! msgstr "E116: ĎĺţŚôďŚ âôúčîĺďćę äíó öčďě猧 %s" *************** *** 448,450 **** msgid "E117: Unknown function: %s" ! msgstr "E117: îĹ׌ÄĎÍÁ ĆŐÎËĂŚŃ: %s" --- 448,450 ---- msgid "E117: Unknown function: %s" ! msgstr "E117: ĎĺţŚäđîâ öčďěçŚó: %s" *************** *** 453,455 **** msgid "E118: Too many arguments for function: %s" ! msgstr "E118: úÁÂÁÇÁÔĎ ÁŇÇŐÍĹÎÔŚ× ÄĚŃ ĆŐÎËĂŚ§ %s" --- 453,455 ---- msgid "E118: Too many arguments for function: %s" ! msgstr "E118: ßâ÷âúâćđ âôúčîĺďćŚţ äíó öčďě猧 %s" *************** *** 458,460 **** msgid "E119: Not enough arguments for function: %s" ! msgstr "E119: úÁÍÁĚĎ ÁŇÇŐÍĹÎÔŚ× ÄĚŃ ĆŐÎËĂŚ§ %s" --- 458,460 ---- msgid "E119: Not enough arguments for function: %s" ! msgstr "E119: ßâîâíđ âôúčîĺďćŚţ äíó öčďě猧 %s" *************** *** 463,465 **** msgid "E120: Using not in a script context: %s" ! msgstr "E120: ×ÉËĎŇÉÓÔĎ×Ő¤ÔŘÓŃ ÎĹ Ő ĆÁĘĚŚ ËĎÍÁÎÄ" --- 463,465 ---- msgid "E120: Using not in a script context: %s" ! msgstr "E120: ţęěđôęőćđţč¤ćűőó ďĺ č öâëíŚ ěđîâďä: %s" *************** *** 475,478 **** msgstr "" ! "&O:çÁŇÁÚÄ\n" ! "&C:÷ŚÄÍŚÎÁ" --- 475,478 ---- msgstr "" ! "&O:Úâôâ˙ä\n" ! "&C:ŢŚäîŚďâ" *************** *** 480,482 **** msgid "E240: No connection to Vim server" ! msgstr "E240: îĹÍÁ¤ Ú'¤ÄÎÁÎÎŃ Ú Vim-ÓĹŇ×ĹŇĎÍ" --- 480,482 ---- msgid "E240: No connection to Vim server" ! msgstr "E240: Ďĺî⤠˙'¤äďâďďó ˙ Vim-őĺôţĺôđî" *************** *** 484,486 **** msgid "E277: Unable to read a server reply" ! msgstr "E277: îĹ ÍĎÖŐ ÚŢÉÔÁÔÉ ×ŚÄĐĎ׌ÄŘ ÓĹŇ×ĹŇÁ" --- 484,486 ---- msgid "E277: Unable to read a server reply" ! msgstr "E277: Ďĺ îđăč ˙ŕęćâćę ţŚäňđţŚäű őĺôţĺôâ" *************** *** 488,490 **** msgid "E258: Unable to send to client" ! msgstr "E258: îĹ ÍĎÖŐ ÓĐŚĚËŐ×ÁÔÉÓŃ ËĚŚ¤ÎÔĎÍ" --- 488,490 ---- msgid "E258: Unable to send to client" ! msgstr "E258: Ďĺ îđăč őňŚíěčţâćęőó ě팤ďćđî" *************** *** 493,495 **** msgid "E241: Unable to send to %s" ! msgstr "E241: îĹ ÍĎÖŐ ÓĐŚĚËŐ×ÁÔÉÓŃ Ú %s" --- 493,495 ---- msgid "E241: Unable to send to %s" ! msgstr "E241: Ďĺ îđăč őňŚíěčţâćęőó ˙ %s" *************** *** 497,499 **** msgid "(Invalid)" ! msgstr "(îĹÍĎÖĚÉ×Ď)" --- 497,499 ---- msgid "(Invalid)" ! msgstr "(Ďĺîđăíęţđ)" *************** *** 502,504 **** msgid "E121: Undefined variable: %s" ! msgstr "E121: îĹ×ÉÚÎÁŢĹÎÁ ÚÍŚÎÎÁ" --- 502,504 ---- msgid "E121: Undefined variable: %s" ! msgstr "E121: Ďĺţę˙ďâŕĺďâ ˙îŚďďâ: %s" *************** *** 507,509 **** msgid "E122: Function %s already exists, use ! to replace" ! msgstr "E122: ćŐÎËĂŚŃ %s ŐÖĹ ŚÓÎŐ¤ (×ÉËĎŇÉÓÔÁĘÔĹ ! ÝĎ ÚÁÍŚÎÉÔÉ)" --- 507,509 ---- msgid "E122: Function %s already exists, use ! to replace" ! msgstr "E122: ÖčďěçŚó %s čăĺ Śőďč¤ (ţęěđôęőćâëćĺ ! üđ÷ ˙âîŚďęćę)" *************** *** 512,514 **** msgid "E123: Undefined function: %s" ! msgstr "E123: îĹ×ÉÚÎÁŢĹÎÁ ĆŐÎËĂŚŃ: %s" --- 512,514 ---- msgid "E123: Undefined function: %s" ! msgstr "E123: Ďĺţę˙ďâŕĺďâ öčďěçŚó: %s" *************** *** 517,519 **** msgid "E124: Missing '(': %s" ! msgstr "E124: âŇÁËŐ¤ '(': %s" --- 517,519 ---- msgid "E124: Missing '(': %s" ! msgstr "E124: ×ôâěč¤ '(': %s" *************** *** 522,524 **** msgid "E125: Illegal argument: %s" ! msgstr "E125: îĹÄĎÚ×ĎĚĹÎÉĘ ÁŇÇŐÍĹÎÔ: %s" --- 522,524 ---- msgid "E125: Illegal argument: %s" ! msgstr "E125: Ďĺäđ˙ţđíĺďęë âôúčîĺďć: %s" *************** *** 526,528 **** msgid "E126: Missing :endfunction" ! msgstr "E126: âŇÁËŐ¤ :endfunction" --- 526,528 ---- msgid "E126: Missing :endfunction" ! msgstr "E126: ×ôâěč¤ :endfunction" *************** *** 531,533 **** msgid "E127: Cannot redefine function %s: It is in use" ! msgstr "E127: îĹÍĎÖĚÉ×Ď ÚÁÍŚÎÉÔÉ ĆŐÎËĂŚŔ %s: ÷ĎÎÁ ×ÉËĎŇÉÓÔĎ×Ő¤ÔŘÓŃ" --- 531,533 ---- msgid "E127: Cannot redefine function %s: It is in use" ! msgstr "E127: Ďĺ îđăč ˙âîŚďęćę öčďěçŚá %s: Ţđďâ ţęěđôęőćđţč¤ćűőó" *************** *** 536,538 **** msgid "E128: Function name must start with a capital: %s" ! msgstr "E128: îÁÚ×Á ĆŐÎËĂŚ§ ÍÁ¤ ĐĎŢÉÎÁÔÉŃ Ú ×ĹĚÉËϧ ĚŚÔĹŇÉ: %s" --- 536,538 ---- msgid "E128: Function name must start with a capital: %s" ! msgstr "E128: Ďâ˙ţâ öčďě猧 î⤠ňđŕęďâćęó ˙ ţĺíęěđ§ íŚćĺôę: %s" *************** *** 540,542 **** msgid "E129: Function name required" ! msgstr "E129: îĹ ×ËÁÚÁÎÁ ÎÁÚ×Á ĆŐÎËĂŚ§" --- 540,542 ---- msgid "E129: Function name required" ! msgstr "E129: Ďĺ ţěâ˙âďâ ďâ˙ţâ öčďě猧" *************** *** 544,546 **** msgid "function " ! msgstr "ĆŐÎËĂŚŃ " --- 544,546 ---- msgid "function " ! msgstr "öčďěçŚó " *************** *** 549,551 **** msgid "E130: Undefined function: %s" ! msgstr "E130: îĹ×ÉÚÎÁŢĹÎÁ ĆŐÎËĂŚŃ: %s" --- 549,551 ---- msgid "E130: Undefined function: %s" ! msgstr "E130: Ďĺţę˙ďâŕĺďâ öčďěçŚó: %s" *************** *** 554,556 **** msgid "E131: Cannot delete function %s: It is in use" ! msgstr "E131: îĹÍĎÖĚÉ×Ď ×ÉÄÁĚÉÔÉ ĆŐÎËĂŚŔ %s: ÷ĎÎÁ ×ÉËĎŇÉÓÔĎ×Ő¤ÔŘÓŃ" --- 554,556 ---- msgid "E131: Cannot delete function %s: It is in use" ! msgstr "E131: Ďĺ îđăč ţęäâíęćę öčďěçŚá %s: Ţđďâ ţęěđôęőćđţč¤ćűőó" *************** *** 558,560 **** msgid "E132: Function call depth is higher than 'maxfuncdepth'" ! msgstr "E132: çĚÉÂÉÎÁ ×ÉËĚÉËŚ× ĆŐÎËĂŚ§ ĐĹŇĹ×ÉÝŐ¤ 'maxfuncdepth'" --- 558,560 ---- msgid "E132: Function call depth is higher than 'maxfuncdepth'" ! msgstr "E132: Úíę÷ęďâ ţęěíęěŚţ öčďě猧 ňĺôĺţęüč¤ 'maxfuncdepth'" *************** *** 564,566 **** msgid "calling %s" ! msgstr "×ÉËĚÉËÁ¤ÔŘÓŃ %s" --- 564,566 ---- msgid "calling %s" ! msgstr "ţęěíęěâ¤ćűőó %s" *************** *** 570,572 **** msgid "continuing in %s" ! msgstr "ĐŇĎÄĎ×ÖĹÎÎŃ × %s" --- 570,572 ---- msgid "continuing in %s" ! msgstr "ňôđäđţăĺďďó ţ %s" *************** *** 574,576 **** msgid "E133: :return not inside a function" ! msgstr "E133: :return ĐĎÚÁ ÍĹÖÁÍÉ ĆŐÎËĂŚ§" --- 574,576 ---- msgid "E133: :return not inside a function" ! msgstr "E133: :return ňđ˙â îĺăâîę öčďě猧" *************** *** 579,581 **** msgid "%s returning #%ld" ! msgstr "%s ĐĎ×ĹŇÔÁ¤ #%ld" --- 579,581 ---- msgid "%s returning #%ld" ! msgstr "%s ňđţĺôć⤠#%ld" *************** *** 584,586 **** msgid "%s returning \"%s\"" ! msgstr "%s ĐĎ×ĹŇÔÁ¤ \"%s\"" --- 584,586 ---- msgid "%s returning \"%s\"" ! msgstr "%s ňđţĺôć⤠\"%s\"" *************** *** 592,594 **** "\n" ! "# ÚÁÇÁĚŘÎŚ ÚÍŚÎÎŚ:\n" --- 592,594 ---- "\n" ! "# ˙âúâíűďŚ ˙îŚďďŚ:\n" *************** *** 596,598 **** msgid "Entering Debug mode. Type \"cont\" to leave." ! msgstr "đĎŢÁÔĎË ŇĹÖÉÍŐ ÎÁĚÁÇĎÄÖŐ×ÁÎÎŃ. ÷ÉËĎŇÉÓÔĎ×ŐĘÔĹ \"cont\" ÄĚŃ ×ÉČĎÄŐ." --- 596,598 ---- msgid "Entering Debug mode. Type \"cont\" to leave." ! msgstr "Ňđŕâćđě ôĺăęîč ďâíâúđäăčţâďďó. Ţęěđôęőćđţčëćĺ \"cont\" äíó ţęéđäč." *************** *** 601,603 **** msgid "line %ld: %s" ! msgstr "ŇŃÄĎË %ld: %s" --- 601,603 ---- msgid "line %ld: %s" ! msgstr "ôóäđě %ld: %s" *************** *** 606,608 **** msgid "cmd: %s" ! msgstr "ËĎÍÁÎÄÁ: %s" --- 606,608 ---- msgid "cmd: %s" ! msgstr "ěđîâďäâ: %s" *************** *** 611,613 **** msgid "Breakpoint in \"%s%s\" line %ld" ! msgstr "úŐĐÉÎËÁ × \"%s\" ŇŃÄĎË %ld" --- 611,613 ---- msgid "Breakpoint in \"%s%s\" line %ld" ! msgstr "ßčňęďěâ ţ \"%s%s\" ôóäđě %ld" *************** *** 616,618 **** msgid "E161: Breakpoint not found: %s" ! msgstr "E161: ôĎŢËŐ ÚŐĐÉÎËÉ ÎĹ ÚÎÁĘÄĹÎĎ: %s" --- 616,618 ---- msgid "E161: Breakpoint not found: %s" ! msgstr "E161: Ćđŕěč ˙čňęďěę ďĺ ˙ďâëäĺďđ: %s" *************** *** 620,622 **** msgid "No breakpoints defined" ! msgstr "öĎÄÎϧ ÔĎŢËÉ ÚŐĐÉÎËÉ ÎĹ ÂŐĚĎ ×ÉÚÎÁŢĹÎĎ" --- 620,622 ---- msgid "No breakpoints defined" ! msgstr "Ăđäďđ§ ćđŕěę ˙čňęďěę ďĺ ÷číđ ţę˙ďâŕĺďđ" *************** *** 625,627 **** msgid "%3d %s %s line %ld" ! msgstr "%3d %s %s ŇŃÄĎË %ld" --- 625,627 ---- msgid "%3d %s %s line %ld" ! msgstr "%3d %s %s ôóäđě %ld" *************** *** 629,631 **** msgid "Save As" ! msgstr "úÁĐÁÍ'ŃÔÁÔÉ ŃË" --- 629,631 ---- msgid "Save As" ! msgstr "ßâňâî'óćâćę óě" *************** *** 634,636 **** msgid "Save changes to \"%.*s\"?" ! msgstr "úÁĐÁÍ'ŃÔÁÔÉ ÚÍŚÎÉ × \".*s\"?" --- 634,636 ---- msgid "Save changes to \"%.*s\"?" ! msgstr "ßâňâî'óćâćę ˙îŚďę ţ \"%.*s\"?" *************** *** 638,640 **** msgid "Untitled" ! msgstr "îĹÎÁÚ×ÁÎÉĘ" --- 638,640 ---- msgid "Untitled" ! msgstr "Ďĺďâ˙ţâďęë" *************** *** 643,645 **** msgid "E162: No write since last change for buffer \"%s\"" ! msgstr "E162: öĎÄÎĎÇĎ ÚÁĐÉÓŐ ĐŚÓĚŃ ĎÓÔÁÎÎŘϧ ÚÍŚÎÉ ÄĚŃ ÂŐĆĹŇÁ \"%s\"" --- 643,645 ---- msgid "E162: No write since last change for buffer \"%s\"" ! msgstr "E162: Ăđäďđúđ ˙âňęőč ňŚőíó đőćâďďűđ§ ˙îŚďę äíó ÷čöĺôâ \"%s\"" *************** *** 648,650 **** msgstr "" ! "ďÂĹŇĹÖÎĎ: îĹÓĐĎÄŚ×ÁÎĎ ĐĎÔŇÁĐÔĚĹÎĎ × ŚÎŰÉĘ ÂŐĆĹŇ (ĐĹŇĹ׌ŇÔĹ Á×ÔĎËĎÍÁÎÄÉ)" --- 648,650 ---- msgstr "" ! "Đ÷ĺôĺăďđ: ĎĺőňđäŚţâďđ ňđćôâňćíĺďđ ţ Śďůęë ÷čöĺô (ňĺôĺţŚôćĺ âţćđěđîâďäę)" *************** *** 652,654 **** msgid "E163: There is only one file to edit" ! msgstr "E163: ěÉŰĹ ĎÄÉÎ ĆÁĘĚ ŇĹÄÁÇŐ¤ÔŘÓŃ" --- 652,654 ---- msgid "E163: There is only one file to edit" ! msgstr "E163: Íęůĺ đäęď öâëí ôĺäâúč¤ćűőó" *************** *** 656,658 **** msgid "E164: Cannot go before first file" ! msgstr "E164: îĹÍĎÖĚÉ×Ď ĐĹŇĹĘÔÉ Ő ĐĎĐĹŇĹÄÎŚĘ ĆÁĘĚ Ú ĐĹŇŰĎÇĎ" --- 656,658 ---- msgid "E164: Cannot go before first file" ! msgstr "E164: Ďĺ îđăč ňĺôĺëćę č ňđňĺôĺäďŚë öâëí ˙ ňĺôůđúđ" *************** *** 660,662 **** msgid "E165: Cannot go beyond last file" ! msgstr "E165: îĹÍĎÖĚÉ×Ď ĐĹŇĹĘÔÉ Ő ÎÁÓÔŐĐÎÉĘ ĆÁĘĚ Ú ĎÓÔÁÎÎŘĎÇĎ" --- 660,662 ---- msgid "E165: Cannot go beyond last file" ! msgstr "E165: Ďĺ îđăč ňĺôĺëćę č ďâőćčňďęë öâëí ˙ đőćâďďűđúđ" *************** *** 666,668 **** msgid "Searching for \"%s\" in \"%s\"" ! msgstr "đĎŰŐË \"%s\" × \"%s\"" --- 666,668 ---- msgid "Searching for \"%s\" in \"%s\"" ! msgstr "Ňđůčě \"%s\" ţ \"%s\"" *************** *** 671,673 **** msgid "Searching for \"%s\"" ! msgstr "đĎŰŐË \"%s\"" --- 671,673 ---- msgid "Searching for \"%s\"" ! msgstr "Ňđůčě \"%s\"" *************** *** 676,678 **** msgid "not found in 'runtimepath': \"%s\"" ! msgstr "\"%s\" ÎĹ ÚÎÁĘÄĹÎĎ × 'runtimepath'" --- 676,678 ---- msgid "not found in 'runtimepath': \"%s\"" ! msgstr "\"%s\" ďĺ ˙ďâëäĺďđ ţ 'runtimepath'" *************** *** 680,682 **** msgid "Run Macro" ! msgstr "÷ÉËĎÎÁÔÉ ĆÁĘĚ ËĎÍÁÎÄ" --- 680,682 ---- msgid "Run Macro" ! msgstr "Ţęěđďâćę öâëí ěđîâďä" *************** *** 685,687 **** msgid "Cannot source a directory: \"%s\"" ! msgstr "îĹÍĎÖĚÉ×Ď ×ÉËĎÎÁÔÉ ÄÉŇĹËÔĎŇŚŔ: \"%s\"" --- 685,687 ---- msgid "Cannot source a directory: \"%s\"" ! msgstr "Ďĺ îđăč ţęěđďâćę äęôĺěćđôŚá: \"%s\"" *************** *** 690,692 **** msgid "could not source \"%s\"" ! msgstr "ÎĹÍĎÖĚÉ×Ď ×ÉËĎÎÁÔÉ \"%s\"" --- 690,692 ---- msgid "could not source \"%s\"" ! msgstr "ďĺîđăíęţđ ţęěđďâćę \"%s\"" *************** *** 695,697 **** msgid "line %ld: could not source \"%s\"" ! msgstr "ŇŃÄĎË %ld: ÎĹÍĎÖĚÉ×Ď ×ÉËĎÎÁÔÉ \"%s\"" --- 695,697 ---- msgid "line %ld: could not source \"%s\"" ! msgstr "ôóäđě %ld: ďĺîđăíęţđ ţęěđďâćę \"%s\"" *************** *** 700,702 **** msgid "sourcing \"%s\"" ! msgstr "×ÉËĎÎŐĹÔŘÓŃ \"%s\"" --- 700,702 ---- msgid "sourcing \"%s\"" ! msgstr "ţęěđďčĺćűőó \"%s\"" *************** *** 705,707 **** msgid "line %ld: sourcing \"%s\"" ! msgstr "ŇŃÄĎË %ld: ×ÉËĎÎŐ¤ÔŘÓŃ \"%s\"" --- 705,707 ---- msgid "line %ld: sourcing \"%s\"" ! msgstr "ôóäđě %ld: ţęěđďč¤ćűőó \"%s\"" *************** *** 710,712 **** msgid "finished sourcing %s" ! msgstr "×ÉËĎÎÁÎÎŃ %s ÚÁËŚÎŢĹÎĎ" --- 710,712 ---- msgid "finished sourcing %s" ! msgstr "ţęěđďâďďó %s ˙âěŚďŕĺďđ" *************** *** 714,716 **** msgid "W15: Warning: Wrong line separator, ^M may be missing" ! msgstr "W15: îĹ׌ŇÎÉĘ ŇĎÚÄŚĚŘÎÉË ŇŃÄËŚ×, ÍĎÖĚÉ×Ď ÂŇÁËŐ¤ ^M" --- 714,716 ---- msgid "W15: Warning: Wrong line separator, ^M may be missing" ! msgstr "W15: ĎĺţŚôďęë ôđ˙äŚíűďęě ôóäěŚţ, îđăíęţđ ÷ôâěč¤ ^M" *************** *** 718,720 **** msgid "E167: :scriptencoding used outside of a sourced file" ! msgstr "E167: :scriptencoding ×ÉËĎŇÉÓÔÁÎĎ ĐĎÚÁ ×ÉËĎÎŐ×ÁÎÉÍ ĆÁĘĚĎÍ" --- 718,720 ---- msgid "E167: :scriptencoding used outside of a sourced file" ! msgstr "E167: :scriptencoding ţęěđôęőćâďđ ňđ˙â ţęěđďčţâďęî öâëíđî" *************** *** 722,724 **** msgid "E168: :finish used outside of a sourced file" ! msgstr "E168: :finish ×ÉËĎŇÉÓÔÁÎĎ ĐĎÚÁ ×ÉËĎÎŐ×ÁÎÉÍ ĆÁĘĚĎÍ" --- 722,724 ---- msgid "E168: :finish used outside of a sourced file" ! msgstr "E168: :finish ţęěđôęőćâďđ ňđ˙â ţęěđďčţâďęî öâëíđî" *************** *** 726,728 **** msgid "No text to be printed" ! msgstr "îŚŢĎÇĎ ÄŇŐËŐ×ÁÔÉ" --- 726,728 ---- msgid "No text to be printed" ! msgstr "ĎŚŕđúđ äôčěčţâćę" *************** *** 730,732 **** msgid "Printing page %d (%d%%)" ! msgstr "äŇŐËŐ¤ÔŘÓŃ ÓÔĎŇŚÎËÁ %d (%d)" --- 730,732 ---- msgid "Printing page %d (%d%%)" ! msgstr "Äôčěč¤ćűőó őćđôŚďěâ %d (%d)" *************** *** 735,737 **** msgid " Copy %d of %d" ! msgstr " ëĎĐŚŃ %d, ŐÓŘĎÇĎ %d" --- 735,737 ---- msgid " Copy %d of %d" ! msgstr " ĚđňŚó %d, čőűđúđ %d" *************** *** 740,742 **** msgid "Printed: %s" ! msgstr "îÁÄŇŐËĎ×ÁÎĎ: %s" --- 740,742 ---- msgid "Printed: %s" ! msgstr "Ďâäôčěđţâďđ: %s" *************** *** 744,746 **** msgid "Printing aborted" ! msgstr "äŇŐË ĐĹŇĹŇ×ÁÎĎ" --- 744,746 ---- msgid "Printing aborted" ! msgstr "Äôčě ňĺôĺôţâďđ" *************** *** 748,750 **** msgid "E455: Error writing to PostScript output file" ! msgstr "E455: îĹ ÍĎÖŐ ĐÉÓÁÔÉ × ×ÉČŚÄÎÉĘ ĆÁĘĚ PostScrip" --- 748,750 ---- msgid "E455: Error writing to PostScript output file" ! msgstr "E455: Ďĺ îđăč ňęőâćę ţ ţęéŚäďęë öâëí PostScrip" *************** *** 752,754 **** msgid "E324: Can't open PostScript output file" ! msgstr "E324: îĹ ÍĎÖŐ ×ŚÄËŇÉÔÉ ŃË ×ČŚÄÎÉĘ ĆÁĘĚ PostScrip" --- 752,754 ---- msgid "E324: Can't open PostScript output file" ! msgstr "E324: Ďĺ îđăč ţŚäěôęćę óě ţéŚäďęë öâëí PostScrip" *************** *** 757,759 **** msgid "E456: Can't open file \"%s\"" ! msgstr "E456: îĹ ÍĎÖŐ ×ŚÄËŇÉÔÉ ĆÁĘĚ \"%s\"" --- 757,759 ---- msgid "E456: Can't open file \"%s\"" ! msgstr "E456: Ďĺ îđăč ţŚäěôęćę öâëí \"%s\"" *************** *** 762,764 **** msgid "E457: Can't read PostScript resource file \"%s\"" ! msgstr "E457: îĹ ÍĎÖŐ ÚŢÉÔÁÔÉ ĆÁĘĚ ŇĹÓŐŇÓŚ× PostScrip \"%s\"" --- 762,764 ---- msgid "E457: Can't read PostScript resource file \"%s\"" ! msgstr "E457: Ďĺ îđăč ˙ŕęćâćę öâëí ôĺőčôőŚţ PostScrip \"%s\"" *************** *** 766,768 **** msgid "Sending to printer..." ! msgstr "÷ŚÄÓÉĚÁ¤ÍĎ ÎÁ ÄŇŐËŚ×ÎÉË..." --- 766,768 ---- msgid "Sending to printer..." ! msgstr "ŢŚäőęíâ¤îđ ďâ äôčěŚţďęě..." *************** *** 770,772 **** msgid "E365: Failed to print PostScript file" ! msgstr "E324: îĹ ÍĎÖŐ ÎÁÄŇŐËŐ×ÁÔÉ ĆÁĘĚ PostScrip" --- 770,772 ---- msgid "E365: Failed to print PostScript file" ! msgstr "E324: Ďĺ îđăč ďâäôčěčţâćę öâëí PostScrip" *************** *** 774,776 **** msgid "Print job sent." ! msgstr "úÁ×ÄÁÎÎŃ ÄŇŐËŐ ×ŚÄŚÓĚÁÎĎ." --- 774,776 ---- msgid "Print job sent." ! msgstr "ßâţäâďďó äôčěč ţŚäŚőíâďđ." *************** *** 779,781 **** msgid "Current %slanguage: \"%s\"" ! msgstr "íĎ×Á (%s): \"%s\"" --- 779,781 ---- msgid "Current %slanguage: \"%s\"" ! msgstr "Îđţâ (%s): \"%s\"" *************** *** 784,786 **** msgid "E197: Cannot set language to \"%s\"" ! msgstr "E197: îĹ ÍĎÖŐ ×ÓÔÁÎĎ×ÉÔÉ ÍĎ×Ő \"%s\"" --- 784,786 ---- msgid "E197: Cannot set language to \"%s\"" ! msgstr "E197: Ďĺ îđăč ţőćâďđţęćę îđţč \"%s\"" *************** *** 789,791 **** msgid "<%s>%s%s %d, Hex %02x, Octal %03o" ! msgstr "<%s>%s%S %d, ŰŚÓ %02x, ×ŚÓ %03o" --- 789,791 ---- msgid "<%s>%s%s %d, Hex %02x, Octal %03o" ! msgstr "<%s>%s%s %d, ůŚő %02x, ţŚő %03o" *************** *** 793,795 **** msgid "E134: Move lines into themselves" ! msgstr "E134: îĹÍĎÖĚÉ×Ď ÚÍŚÓÔÉÔÉ ŇŃÄËÉ ÓÁÍŚ Ő ÓĹÂĹ" --- 793,795 ---- msgid "E134: Move lines into themselves" ! msgstr "E134: Ďĺîđăíęţđ ˙îŚőćęćę ôóäěę őâîŚ č őĺ÷ĺ" *************** *** 797,799 **** msgid "1 line moved" ! msgstr "1 ŇŃÄĎË ÚÍŚÝĹÎĎ" --- 797,799 ---- msgid "1 line moved" ! msgstr "1 ôóäđě ˙îŚüĺďđ" *************** *** 802,804 **** msgid "%ld lines moved" ! msgstr "%ld ŇŃÄËŚ× ÚÍŚÝĹÎĎ" --- 802,804 ---- msgid "%ld lines moved" ! msgstr "%ld ôóäěŚţ ˙îŚüĺďđ" *************** *** 807,809 **** msgid "%ld lines filtered" ! msgstr "%ld ŇŃÄËŚ× ×ŚÄĆŚĚŘÔŇĎ×ÁÎĎ" --- 807,809 ---- msgid "%ld lines filtered" ! msgstr "%ld ôóäěŚţ ţŚäöŚíűćôđţâďđ" *************** *** 811,813 **** msgid "E135: *Filter* Autocommands must not change current buffer" ! msgstr "E135: á×ÔĎËĎÍÁÎÄÉ *Filter* ÎĹ ĐĎ×ÉÎÎŘ ÚÍŚÎŔ×ÁÔÉ ÂŐĆĹŇ" --- 811,813 ---- msgid "E135: *Filter* Autocommands must not change current buffer" ! msgstr "E135: Âţćđěđîâďäę *Filter* ďĺ ňđţęďďű ˙îŚďáţâćę ÷čöĺô" *************** *** 815,817 **** msgid "[No write since last change]\n" ! msgstr "[îĹ ÚÁĐÉÓÁÎĎ ĐŚÓĚŃ ĎÓÔÁÎÎŘϧ ÚÍŚÎÉ]\n" --- 815,817 ---- msgid "[No write since last change]\n" ! msgstr "[Ďĺ ˙âňęőâďđ ňŚőíó đőćâďďűđ§ ˙îŚďę]\n" *************** *** 820,822 **** msgid "viminfo: %s in line: " ! msgstr "viminfo: %s × ŇŃÄËŐ" --- 820,822 ---- msgid "viminfo: %s in line: " ! msgstr "viminfo: %s ţ ôóäěč" *************** *** 824,826 **** msgid "E136: viminfo: Too many errors, skipping rest of file" ! msgstr "E136: viminfo: ÚÁÂÁÇÁÔĎ ĐĎÍÉĚĎË, ŇĹŰÔÁ ĆÁĘĚÁ ĎĐŐÝĹÎĎ" --- 824,826 ---- msgid "E136: viminfo: Too many errors, skipping rest of file" ! msgstr "E136: viminfo: ˙â÷âúâćđ ňđîęíđě, ôĺůćâ öâëíâ đňčüĺďđ" *************** *** 829,831 **** msgid "Reading viminfo file \"%s\"%s%s%s" ! msgstr "úŢÉÔŐ¤ÔŘÓŃ ĆÁĘĚ viminfo: \"%s\"%s%s%s" --- 829,831 ---- msgid "Reading viminfo file \"%s\"%s%s%s" ! msgstr "ßŕęćč¤ćűőó öâëí viminfo: \"%s\"%s%s%s" *************** *** 833,835 **** msgid " info" ! msgstr " ŚÎĆĎŇÍÁĂŚŃ" --- 833,835 ---- msgid " info" ! msgstr " ŚďöđôîâçŚó" *************** *** 837,839 **** msgid " marks" ! msgstr " ĐĎÚÎÁŢËÉ" --- 837,839 ---- msgid " marks" ! msgstr " ňđ˙ďâŕěę" *************** *** 841,843 **** msgid " FAILED" ! msgstr " îĺ ÷äáěďóń" --- 841,843 ---- msgid " FAILED" ! msgstr " ĎĹ ŢÄÂÍĐŐÓ" *************** *** 846,848 **** msgid "E137: Viminfo file is not writable: %s" ! msgstr "E137: ő ĆÁĘĚ viminfo (\"%s\") ÚÁĐÉÓ ÎĹ ÄĎÚ×ĎĚĹÎĎ" --- 846,848 ---- msgid "E137: Viminfo file is not writable: %s" ! msgstr "E137: Č öâëí viminfo (\"%s\") ˙âňęő ďĺ äđ˙ţđíĺďđ" *************** *** 851,853 **** msgid "E138: Can't write viminfo file %s!" ! msgstr "E138: îĹ ÍĎÖŐ ÚÁĐÉÓÁÔÉ viminfo ĆÁĘĚ %s!" --- 851,853 ---- msgid "E138: Can't write viminfo file %s!" ! msgstr "E138: Ďĺ îđăč ˙âňęőâćę viminfo öâëí %s!" *************** *** 856,858 **** msgid "Writing viminfo file \"%s\"" ! msgstr "úÁĐÉÓŐ¤ÔŘÓŃ viminfo ĆÁĘĚ \"%s\"" --- 856,858 ---- msgid "Writing viminfo file \"%s\"" ! msgstr "ßâňęőč¤ćűőó viminfo öâëí \"%s\"" *************** *** 862,864 **** msgid "# This viminfo file was generated by Vim %s.\n" ! msgstr "# ăĹĘ ĆÁĘĚ Á×ÔĎÍÁÔÉŢÎĎ ÓÔ×ĎŇÉ× Vim %s.\n" --- 862,864 ---- msgid "# This viminfo file was generated by Vim %s.\n" ! msgstr "# Çĺë öâëí âţćđîâćęŕďđ őćţđôęţ Vim %s.\n" *************** *** 868,870 **** "\n" ! msgstr "# íĎÖĹÔĹ ŇĹÄÁÇŐ×ÁÔÉ, ÁĚĹ ďâĺňĺöîď!\n" --- 868,870 ---- "\n" ! msgstr "# Îđăĺćĺ ôĺäâúčţâćę, âíĺ Đ×ĹÔĹĂĎĐ!\n" *************** *** 872,874 **** msgid "# Value of 'encoding' when this file was written\n" ! msgstr "# úÎÁŢĹÎÎŃ 'encoding' ËĎĚÉ ĂĹĘ ĆÁĘĚ ÂŐĚĎ ÚÁĐÉÓÁÎĎ\n" --- 872,874 ---- msgid "# Value of 'encoding' when this file was written\n" ! msgstr "# ßďâŕĺďďó 'encoding' ěđíę çĺë öâëí ÷číđ ˙âňęőâďđ\n" *************** *** 876,878 **** msgid "Illegal starting char" ! msgstr "îĹÄĎÚ×ĎĚĹÎÉĘ ÓÉÍ×ĎĚ ÎÁ ĐĎŢÁÔËŐ ŇŃÄËÁ" --- 876,878 ---- msgid "Illegal starting char" ! msgstr "Ďĺäđ˙ţđíĺďęë őęîţđí ďâ ňđŕâćěč ôóäěâ" *************** *** 882,884 **** msgid "E139: File is loaded in another buffer" ! msgstr "E139: ćÁĘĚ ŐÖĹ ÚÁ×ÁÎÔÁÖĹÎĎ Ő ŚÎŰĎÍŐ ÂŐĆĹŇŚ" --- 882,884 ---- msgid "E139: File is loaded in another buffer" ! msgstr "E139: Öâëí čăĺ ˙âţâďćâăĺďđ č Śďůđîč ÷čöĺôŚ" *************** *** 886,888 **** msgid "Write partial file?" ! msgstr "úÁĐÉÓÁÔÉ ŢÁÓÔÉÎŐ ĆÁĘĚÁ?" --- 886,888 ---- msgid "Write partial file?" ! msgstr "ßâňęőâćę ŕâőćęďč öâëíâ?" *************** *** 890,892 **** msgid "E140: Use ! to write partial buffer" ! msgstr "E140: ÷ÉËĎŇÉÓÔĎ×ŐĘÔĹ ! ÄĚŃ ÚÁĐÉÓŐ ŢÁÓÔÉÎÉ ÂŐĆĹŇÁ" --- 890,892 ---- msgid "E140: Use ! to write partial buffer" ! msgstr "E140: Ţęěđôęőćđţčëćĺ ! äíó ˙âňęőč ŕâőćęďę ÷čöĺôâ" *************** *** 895,897 **** msgid "Overwrite existing file \"%.*s\"?" ! msgstr "đĹŇĹÚÁĐÉÓÁÔÉ ŚÓÎŐŔŢÉĘ ĆÁĘĚ \"%.s\"?" --- 895,897 ---- msgid "Overwrite existing file \"%.*s\"?" ! msgstr "Ňĺôĺ˙âňęőâćę Śőďčáŕęë öâëí \"%.*s\"?" *************** *** 900,902 **** msgid "E141: No file name for buffer %ld" ! msgstr "E141: îĹÍÁ¤ ×ČŚÄÎĎÇĎ ĆÁĘĚÁ ÄĚŃ ÂŐĆĹŇÁ %ld" --- 900,902 ---- msgid "E141: No file name for buffer %ld" ! msgstr "E141: Ďĺî⤠ţéŚäďđúđ öâëíâ äíó ÷čöĺôâ %ld" *************** *** 904,906 **** msgid "E142: File not written: Writing is disabled by 'write' option" ! msgstr "E142: ćÁĘĚ ÎĹ ÚÁĐÉÓÁÎĎ: ÚÁĐÉÓ ÚÁÂĎŇĎÎĹÎĎ ĎĐĂŚ¤Ŕ 'write'" --- 904,906 ---- msgid "E142: File not written: Writing is disabled by 'write' option" ! msgstr "E142: Öâëí ďĺ ˙âňęőâďđ: ˙âňęő ˙â÷đôđďĺďđ đň猤á 'write'" *************** *** 912,915 **** msgstr "" ! "äĚŃ \"%.*s\" ×ËÁÚÁÎĎ ĎĐĂŚŔ 'readonly'.\n" ! "÷É ×ÓĹ ÝĹ ÂÁÖÁ¤ÔĹ ĐŇĎÄĎ×ÖÉÔÉ ÚÁĐÉÓ?" --- 912,915 ---- msgstr "" ! "Äíó \"%.*s\" ţěâ˙âďđ đňçŚá 'readonly'.\n" ! "Ţę ţőĺ üĺ ÷âăâ¤ćĺ ňôđäđţăęćę ˙âňęő?" *************** *** 917,919 **** msgid "Edit File" ! msgstr "ňĹÄÁÇŐ×ÁÔÉ ćÁĘĚ" --- 917,919 ---- msgid "Edit File" ! msgstr "Ôĺäâúčţâćę Öâëí" *************** *** 922,924 **** msgid "E143: Autocommands unexpectedly deleted new buffer %s" ! msgstr "E143: á×ÔĎËĎÍÁÎÄÁ ÎĹÓĐĎÄŚ×ÁÎĎ ×ÉÄÁĚÉĚÁ ÎĎ×ÉĘ ÂŐĆĹŇ %s" --- 922,924 ---- msgid "E143: Autocommands unexpectedly deleted new buffer %s" ! msgstr "E143: Âţćđěđîâďäâ ďĺőňđäŚţâďđ ţęäâíęíâ ďđţęë ÷čöĺô %s" *************** *** 926,928 **** msgid "E144: non-numeric argument to :z" ! msgstr "E144: ÎĹŢÉÓĚĎ×ÉĘ ÁŇÇŐÍĹÎÔ ÄĚŃ :z" --- 926,928 ---- msgid "E144: non-numeric argument to :z" ! msgstr "E144: ďĺŕęőíđţęë âôúčîĺďć äíó :z" *************** *** 930,932 **** msgid "E145: Shell commands not allowed in rvim" ! msgstr "E145: ő rvim ÎĹ ÄĎÚ×ĎĚĹÎŚ ËĎÍÁÎÄÉ shell" --- 930,932 ---- msgid "E145: Shell commands not allowed in rvim" ! msgstr "E145: Č rvim ďĺ äđ˙ţđíĺďŚ ěđîâďäę shell" *************** *** 934,936 **** msgid "E146: Regular expressions can't be delimited by letters" ! msgstr "E146: ÚŇÁÚËÉ ÎĹ ÍĎÖŐÔŘ ÂŐÔÉ ŇĎÚÄŚĚĹÎŚ ĚŚÔĹŇÁÍÉ" --- 934,936 ---- msgid "E146: Regular expressions can't be delimited by letters" ! msgstr "E146: ˙ôâ˙ěę ďĺ îđăčćű ÷čćę ôđ˙äŚíĺďŚ íŚćĺôâîę" *************** *** 939,941 **** msgid "replace with %s (y/n/a/q/l/^E/^Y)?" ! msgstr "úÁÍŚÎÉÔÉ ÎÁ %s (y/n/a/q/l/^E/^Y)?" --- 939,941 ---- msgid "replace with %s (y/n/a/q/l/^E/^Y)?" ! msgstr "ßâîŚďęćę ďâ %s (y/n/a/q/l/^E/^Y)?" *************** *** 943,945 **** msgid "(Interrupted) " ! msgstr "(đĹŇĹŇ×ÁÎĎ) " --- 943,945 ---- msgid "(Interrupted) " ! msgstr "(Ňĺôĺôţâďđ) " *************** *** 947,949 **** msgid "1 substitution" ! msgstr "ďÄÎÁ ÚÁÍŚÎÁ" --- 947,949 ---- msgid "1 substitution" ! msgstr "Đäďâ ˙âîŚďâ" *************** *** 952,954 **** msgid "%ld substitutions" ! msgstr "úÁÍŚÎĹÎĎ -- %ld" --- 952,954 ---- msgid "%ld substitutions" ! msgstr "ßâîŚďĺďđ -- %ld" *************** *** 956,958 **** msgid " on 1 line" ! msgstr " × ĎÄÎĎÍŐ ŇŃÄËŐ" --- 956,958 ---- msgid " on 1 line" ! msgstr " ţ đäďđîč ôóäěč" *************** *** 961,963 **** msgid " on %ld lines" ! msgstr " × %ld ŇŃÄËÁČ" --- 961,963 ---- msgid " on %ld lines" ! msgstr " ţ %ld ôóäěâé" *************** *** 965,967 **** msgid "E147: Cannot do :global recursive" ! msgstr "E147: :global ÎĹ ÍĎÖĹ ×ÉËĎŇÉÓÔĎ×Ő×ÁÔÉÓŘ ŇĹËŐŇÓÉ×ÎĎ" --- 965,967 ---- msgid "E147: Cannot do :global recursive" ! msgstr "E147: :global ďĺ îđăĺ ţęěđôęőćđţčţâćęőű ôĺěčôőęţďđ" *************** *** 969,971 **** msgid "E148: Regular expression missing from global" ! msgstr "E148: âŇÁËŐ¤ ÚŇÁÚËÁ ÄĚŃ global" --- 969,971 ---- msgid "E148: Regular expression missing from global" ! msgstr "E148: ×ôâěč¤ ˙ôâ˙ěâ äíó global" *************** *** 974,976 **** msgid "Pattern found in every line: %s" ! msgstr "úŇÁÚĎË ÎĹ ÚÎÁĘÄĹÎĎ: %s" --- 974,976 ---- msgid "Pattern found in every line: %s" ! msgstr "ßôâ˙đě ďĺ ˙ďâëäĺďđ: %s" *************** *** 983,985 **** "\n" ! "# ďÓÔÁÎÎŚĘ ÚŇÁÚĎË ÄĚŃ ÚÁÍŚÎÉ:\n" "$" --- 983,985 ---- "\n" ! "# ĐőćâďďŚë ˙ôâ˙đě äíó ˙âîŚďę:\n" "$" *************** *** 989,991 **** msgid "E149: Sorry, no help for %s" ! msgstr "E149: ÷ÉÂÁŢÔĹ, ÄĚŃ %s ÎĹÍÁ¤ ÄĎĐĎÍĎÇÉ" --- 989,991 ---- msgid "E149: Sorry, no help for %s" ! msgstr "E149: Ţę÷âŕćĺ, äíó %s ďĺî⤠äđňđîđúę" *************** *** 994,996 **** msgid "Sorry, help file \"%s\" not found" ! msgstr "÷ÉÂÁŢÔĹ, ĆÁĘĚ ÄĎĐĎÍĎÇÉ \"%s\" ÎĹ ÚÎÁĘÄĹÎĎ" --- 994,996 ---- msgid "Sorry, help file \"%s\" not found" ! msgstr "Ţę÷âŕćĺ, öâëí äđňđîđúę \"%s\" ďĺ ˙ďâëäĺďđ" *************** *** 999,1001 **** msgid "E150: Not a directory: %s" ! msgstr "E150: %s: îĹ ¤ ÄÉŇĹËÔĎŇŚ¤Ŕ" --- 999,1001 ---- msgid "E150: Not a directory: %s" ! msgstr "E150: %s: Ďĺ ¤ äęôĺěćđôŚ¤á" *************** *** 1004,1006 **** msgid "E152: Cannot open %s for writing" ! msgstr "E152: îĹÍĎÖĚÉ×Ď ×ŚÄËŇÉÔÉ %s ÄĚŃ ÚÁĐÉÓŐ" --- 1004,1006 ---- msgid "E152: Cannot open %s for writing" ! msgstr "E152: Ďĺ îđăč ţŚäěôęćę %s äíó ˙âňęőč" *************** *** 1009,1011 **** msgid "E153: Unable to open %s for reading" ! msgstr "E153: îĹÍĎÖĚÉ×Ď ×ŚÄËŇÉÔÉ %s ÄĚŃ ŢÉÔÁÎÎŃ" --- 1009,1011 ---- msgid "E153: Unable to open %s for reading" ! msgstr "E153: Ďĺ îđăč ţŚäěôęćę %s äíó ŕęćâďďó" *************** *** 1014,1016 **** msgid "E154: Duplicate tag \"%s\" in file %s" ! msgstr "E154: đĎÄ׌ĘÎÁ ĐĎÚÎÁŢËÁ \"%s\" × ĆÁĘĚŚ %s" --- 1014,1016 ---- msgid "E154: Duplicate tag \"%s\" in file %s" ! msgstr "E154: ŇđäţŚëďâ ňđ˙ďâŕěâ \"%s\" ţ öâëíŚ %s" *************** *** 1019,1021 **** msgid "E160: Unknown sign command: %s" ! msgstr "E160: îĹ׌ÄĎÍÁ ËĎÍÁÎÄÁ sign: %s" --- 1019,1021 ---- msgid "E160: Unknown sign command: %s" ! msgstr "E160: ĎĺţŚäđîâ ěđîâďäâ sign: %s" *************** *** 1023,1025 **** msgid "E156: Missing sign name" ! msgstr "E156: âŇÁËŐ¤ ÎÁÚ×É ÎÁĐÉÓŐ" --- 1023,1025 ---- msgid "E156: Missing sign name" ! msgstr "E156: ×ôâěč¤ ďâ˙ţę ďâňęőč" *************** *** 1027,1029 **** msgid "E255: Too many signs defined" ! msgstr "E255: ÷ÉÚÎÁŢĹÎĎ ÚÁÂÁÇÁÔĎ ÎÁĐÉÓŚ×" --- 1027,1029 ---- msgid "E255: Too many signs defined" ! msgstr "E255: Ţę˙ďâŕĺďđ ˙â÷âúâćđ ďâňęőŚţ" *************** *** 1032,1034 **** msgid "E239: Invalid sign text: %s" ! msgstr "E239: îĹ׌ŇÎÉĘ ÎÁĐÉÓ: %s" --- 1032,1034 ---- msgid "E239: Invalid sign text: %s" ! msgstr "E239: ĎĺţŚôďęë ďâňęő: %s" *************** *** 1037,1039 **** msgid "E155: Unknown sign: %s" ! msgstr "E155: îĹ׌ÄĎÍÉĘ ÎÁĐÉÓ: %s" --- 1037,1039 ---- msgid "E155: Unknown sign: %s" ! msgstr "E155: ĎĺţŚäđîęë ďâňęő: %s" *************** *** 1041,1043 **** msgid "E159: Missing sign number" ! msgstr "E159: âŇÁËŐ¤ ÁŇÇŐÍĹÎÔŐ ÎÁĐÉÓŐ" --- 1041,1043 ---- msgid "E159: Missing sign number" ! msgstr "E159: ×ôâěč¤ âôúčîĺďćč ďâňęőč" *************** *** 1046,1048 **** msgid "E158: Invalid buffer name: %s" ! msgstr "E158: îĹ׌ŇÎÁ ÎÁÚ×Á ÂŐĆĹŇÁ: %s" --- 1046,1048 ---- msgid "E158: Invalid buffer name: %s" ! msgstr "E158: ĎĺţŚôďâ ďâ˙ţâ ÷čöĺôâ: %s" *************** *** 1051,1053 **** msgid "E157: Invalid sign ID: %ld" ! msgstr "E157: îĹ׌ŇÎÉĘ ID ÎÁĐÉÓŐ: %ld" --- 1051,1053 ---- msgid "E157: Invalid sign ID: %ld" ! msgstr "E157: ĎĺţŚôďęë ID ďâňęőč: %ld" *************** *** 1055,1057 **** msgid "[Deleted]" ! msgstr "[÷ÉÄÁĚĹÎĎ]" --- 1055,1057 ---- msgid "[Deleted]" ! msgstr "[Ţęäâíĺďđ]" *************** *** 1060,1063 **** msgstr "" ! "đĎŢÁÔĎË ŇĹÖÉÍŐ Ex. ÷ÉËĎŇÉÓÔĎ×ŐĘÔĹ \"visual\" ÄĚŃ ĐĎ×ĹŇÎĹÎÎŃ × ÎĎŇÍÁĚŘÎÉĘ " ! "ŇĹČÉÍ" --- 1060,1063 ---- msgstr "" ! "Ňđŕâćđě ôĺăęîč Ex. Ţęěđôęőćđţčëćĺ \"visual\" äíó ňđţĺôďĺďďó ţ ďđôîâíűďęë " ! "ôĺéęî" *************** *** 1066,1068 **** msgid "At end-of-file" ! msgstr "âŚĚŃ ËŚÎĂŃ ĆÁĘĚÁ" --- 1066,1068 ---- msgid "At end-of-file" ! msgstr "׌íó ěŚďçó öâëíâ" *************** *** 1070,1072 **** msgid "E169: Command too recursive" ! msgstr "E169: ëĎÍÁÎÄÁ ÚÁÎÁÄÔĎ ŇĹËŐŇÓÉ×ÎÁ" --- 1070,1072 ---- msgid "E169: Command too recursive" ! msgstr "E169: Ěđîâďäâ ˙âďâäćđ ôĺěčôőęţďâ" *************** *** 1074,1076 **** msgid "E170: Missing :endwhile" ! msgstr "E170: âŇÁËŐ¤ :endwhile" --- 1074,1076 ---- msgid "E170: Missing :endwhile" ! msgstr "E170: ×ôâěč¤ :endwhile" *************** *** 1078,1080 **** msgid "E171: Missing :endif" ! msgstr "E171: âŇÁËŐ¤ :endif" --- 1078,1080 ---- msgid "E171: Missing :endif" ! msgstr "E171: ×ôâěč¤ :endif" *************** *** 1082,1084 **** msgid "End of sourced file" ! msgstr "ëŚÎĹĂŘ ×ÉËĎÎŐ×ÁÎĎÇĎ ĆÁĘĚÁ" --- 1082,1084 ---- msgid "End of sourced file" ! msgstr "ĚŚďĺçű ţęěđďčţâďđúđ öâëíâ" *************** *** 1086,1088 **** msgid "End of function" ! msgstr "ëŚÎĹĂŘ ĆŐÎËĂŚ§" --- 1086,1088 ---- msgid "End of function" ! msgstr "ĚŚďĺçű öčďě猧" *************** *** 1090,1092 **** msgid "Ambiguous use of user-defined command" ! msgstr "ä×ĎÚÎÁŢÎÉĘ ×ÖÉÔĎË ËĎÍÁÎÄÉ ËĎŇÉÓÔŐ×ÁŢÁ" --- 1090,1092 ---- msgid "Ambiguous use of user-defined command" ! msgstr "Äţđ˙ďâŕďęë ţăęćđě ěđîâďäę ěđôęőćčţâŕâ" *************** *** 1094,1096 **** msgid "Not an editor command" ! msgstr "îĹ ¤ ËĎÍÁÎÄĎŔ ŇĹÄÁËÔĎŇÁ" --- 1094,1096 ---- msgid "Not an editor command" ! msgstr "Ďĺ ¤ ěđîâďäđá ôĺäâěćđôâ" *************** *** 1098,1100 **** msgid "Don't panic!" ! msgstr "îĹ ÎĹŇ×ŐĘÔĹ!" --- 1098,1100 ---- msgid "Don't panic!" ! msgstr "Ďĺ ďĺôţčëćĺ!" *************** *** 1102,1104 **** msgid "Backwards range given" ! msgstr "îĹ ÂŐÄŐ ÚÁÄËŐ×ÁÔÉ!" --- 1102,1104 ---- msgid "Backwards range given" ! msgstr "Ďĺ ÷čäč ˙âäěčţâćę!" *************** *** 1106,1108 **** msgid "Backwards range given, OK to swap" ! msgstr "îĹ ÂŐÄŐ ÚÁÄËŐ×ÁÔÉ, ÁĚĹ ÍĎÖŐ ĎÂĹŇÎŐÔÉÓŃ..." --- 1106,1108 ---- msgid "Backwards range given, OK to swap" ! msgstr "Ďĺ ÷čäč ˙âäěčţâćę, âíĺ îđăč đ÷ĺôďčćęőó..." *************** *** 1110,1112 **** msgid "Use w or w>>" ! msgstr "÷ÉËĎŇÉÓÔĎ×ŐĘÔĹ :w ÁÂĎ :w>>" --- 1110,1112 ---- msgid "Use w or w>>" ! msgstr "Ţęěđôęőćđţčëćĺ :w â÷đ :w>>" *************** *** 1114,1116 **** msgid "E319: Sorry, the command is not available in this version" ! msgstr "E319: ÷ÉÂÁĘÔĹ, ĂŃ ËĎÍÁÎÄÁ ÎĹ ÄŚ¤" --- 1114,1116 ---- msgid "E319: Sorry, the command is not available in this version" ! msgstr "E319: Ţę÷âëćĺ, çó ěđîâďäâ ďĺ 䌤" *************** *** 1118,1120 **** msgid "E172: Only one file name allowed" ! msgstr "E172: ôŚĚŘËÉ ĎÄÎĹ ŚÍ'Ń ĆÁĘĚÁ ÄĎÚ×ĎĚĹÎĎ" --- 1118,1120 ---- msgid "E172: Only one file name allowed" ! msgstr "E172: ĆŚíűěę đäďĺ Śî'ó öâëíâ äđ˙ţđíĺďđ" *************** *** 1123,1125 **** msgid "%d more files to edit. Quit anyway?" ! msgstr "ýĹ ¤ %d ÎĹŇĹÄÁÇĎ×ÁÎÉČ ĆÁĘĚŚ×. ÷ÉĘÔÉ?" --- 1123,1125 ---- msgid "%d more files to edit. Quit anyway?" ! msgstr "Üĺ ¤ %d ďĺôĺäâúđţâďęé öâëíŚţ. Ţęëćę?" *************** *** 1128,1130 **** msgid "E173: %ld more files to edit" ! msgstr "E173: úÁĚÉŰÉĚĎÓŃ %ld ÎĹŇĹÄÁÇĎ×ÁÎÉČ ĆÁĘĚŚ×" --- 1128,1130 ---- msgid "E173: %ld more files to edit" ! msgstr "E173: ßâíęůęíđőó %ld ďĺôĺäâúđţâďęé öâëíŚţ" *************** *** 1132,1134 **** msgid "E174: Command already exists: use ! to redefine" ! msgstr "E174: ëĎÍÁÎÄÁ ×ÖĹ ŚÓÎŐ¤, ×ÉËĎŇÉÓÔÁĘÔĹ ! ÝĎ ÎĹ Ú×ÁÖÁÔÉ" --- 1132,1134 ---- msgid "E174: Command already exists: use ! to redefine" ! msgstr "E174: Ěđîâďäâ ţăĺ Śőďč¤, ţęěđôęőćâëćĺ ! üđ÷ ďĺ ˙ţâăâćę" *************** *** 1140,1142 **** "\n" ! " îÁÚ×Á áŇÇ. íĹÖÁ äĎĐĎ×ÎĹÎŃ ÷ÉÚÎÁŢĹÎÎŃ" --- 1140,1142 ---- "\n" ! " Ďâ˙ţâ Âôú. Îĺăâ Äđňđţďĺďó Ţę˙ďâŕĺďďó" *************** *** 1144,1146 **** msgid "No user-defined commands found" ! msgstr "îĹ ÚÎÁĘÄĹÎĎ ËĎÍÁÎÄ ËĎŇÉÓÔŐ×ÁŢÁ" --- 1144,1146 ---- msgid "No user-defined commands found" ! msgstr "Ďĺ ˙ďâëäĺďđ ěđîâďä ěđôęőćčţâŕâ" *************** *** 1148,1150 **** msgid "E175: No attribute specified" ! msgstr "E175: îĹ ×ËÁÚÁÎĎ ÁÔŇÉÂŐÔ" --- 1148,1150 ---- msgid "E175: No attribute specified" ! msgstr "E175: Ďĺ ţěâ˙âďđ âćôę÷čć" *************** *** 1152,1154 **** msgid "E176: Invalid number of arguments" ! msgstr "E176: îĹ׌ŇÎÁ ËŚĚŘËŚÓÔŘ ÁŇÇŐÍĹÎÔŚ×" --- 1152,1154 ---- msgid "E176: Invalid number of arguments" ! msgstr "E176: ĎĺţŚôďâ ěŚíűěŚőćű âôúčîĺďćŚţ" *************** *** 1156,1158 **** msgid "E177: Count cannot be specified twice" ! msgstr "E177: ěŚŢÉĚŘÎÉË ÎĹ ÍĎÖĹ ÂŐÔÉ ×ËÁÚÁÎĎ Ä׌ތ" --- 1156,1158 ---- msgid "E177: Count cannot be specified twice" ! msgstr "E177: ÍŚŕęíűďęě ďĺ îđăĺ ÷čćę ţěâ˙âďđ äţŚŕŚ" *************** *** 1161,1163 **** msgid "E178: Invalid default value for count" ! msgstr "E178: îĹ׌ŇÎĹ ĐĎŢÁÔËĎ×Ĺ ÚÎÁŢĹÎÎŃ ÄĚŃ count" --- 1161,1163 ---- msgid "E178: Invalid default value for count" ! msgstr "E178: ĎĺţŚôďĺ ňđŕâćěđţĺ ˙ďâŕĺďďó äíó count" *************** *** 1166,1168 **** msgid "E179: argument required for complete" ! msgstr "E179: äĚŃ ÄĎĐĎ×ÎĹÎÎŃ ÎĹĎÂČŚÄĹÎ ÁŇÇŐÍĹÎÔ" --- 1166,1168 ---- msgid "E179: argument required for complete" ! msgstr "E179: Äíó äđňđţďĺďďó ďĺđ÷éŚäĺď âôúčîĺďć" *************** *** 1172,1174 **** msgid "E180: Invalid complete value: %s" ! msgstr "E180: îĹ׌ŇÎÁ ×ËÁÚŚ×ËÁ ÄĚŃ ÄĎĐĎ×ÎĹÎÎŃ: %s" --- 1172,1174 ---- msgid "E180: Invalid complete value: %s" ! msgstr "E180: ĎĺţŚôďâ ţěâ˙Śţěâ äíó äđňđţďĺďďó: %s" *************** *** 1178,1180 **** msgid "E181: Invalid attribute: %s" ! msgstr "E181: îĹ׌ŇÎÉĘ ÁÔŇÉÂŐÔ: %s" --- 1178,1180 ---- msgid "E181: Invalid attribute: %s" ! msgstr "E181: ĎĺţŚôďęë âćôę÷čć: %s" *************** *** 1183,1185 **** msgid "E182: Invalid command name" ! msgstr "E182: îĹ׌ŇÎÁ ÎÁÚ×Á ËĎÍÁÎÄÉ" --- 1183,1185 ---- msgid "E182: Invalid command name" ! msgstr "E182: ĎĺţŚôďâ ďâ˙ţâ ěđîâďäę" *************** *** 1188,1190 **** msgid "E183: User defined commands must start with an uppercase letter" ! msgstr "E183: ëĎÍÁÎÄÉ ËĎŇÉÓÔŐ×ÁŢÁ ĐĎ׌ÎÎÉ ĐĎŢÉÎÁÔÉÓŃ Ú ×ĹĚÉËϧ ĚŚÔĹŇÉ" --- 1188,1190 ---- msgid "E183: User defined commands must start with an uppercase letter" ! msgstr "E183: Ěđîâďäę ěđôęőćčţâŕâ ňđţŚďďę ňđŕęďâćęőó ˙ ţĺíęěđ§ íŚćĺôę" *************** *** 1194,1196 **** msgid "E184: No such user-defined command: %s" ! msgstr "E184: ëĎÍÁÎÄŐ ËĎŇÉÓÔŐ×ÁŢÁ ÎĹ ÚÎÁĘÄĹÎĎ: %s" --- 1194,1196 ---- msgid "E184: No such user-defined command: %s" ! msgstr "E184: Ěđîâďäč ěđôęőćčţâŕâ ďĺ ˙ďâëäĺďđ: %s" *************** *** 1200,1202 **** msgid "E185: Cannot find color scheme %s" ! msgstr "E185: îĹ ÍĎÖÎÁ ÚÎÁĘÔÉ ÓČĹÍŐ ËĎĚŘĎŇŚ× %s" --- 1200,1202 ---- msgid "E185: Cannot find color scheme %s" ! msgstr "E185: Ďĺ îđăďâ ˙ďâëćę őéĺîč ěđíűđôŚţ %s" *************** *** 1204,1206 **** msgid "Greetings, Vim user!" ! msgstr "ńË ÖÉ×ĹÔŘÓŃ, ËĎŇÉÓÔŐ×ÁŢ Vim ?" --- 1204,1206 ---- msgid "Greetings, Vim user!" ! msgstr "Óě ăęţĺćűőó, ěđôęőćčţâŕ Vim ?" *************** *** 1209,1211 **** msgid "Edit File in new window" ! msgstr "ňĹÄÁÇŐ×ÁÔÉ ĆÁĘĚ Ő ÎĎ×ĎÍŐ ×ŚËÎŚ" --- 1209,1211 ---- msgid "Edit File in new window" ! msgstr "Ôĺäâúčţâćę öâëí č ďđţđîč ţŚěďŚ" *************** *** 1213,1215 **** msgid "No swap file" ! msgstr "îĹÍÁ¤ ĆÁĘĚÁ ĎÂÍŚÎŐ" --- 1213,1215 ---- msgid "No swap file" ! msgstr "Ďĺî⤠öâëíâ đ÷îŚďč" *************** *** 1217,1219 **** msgid "Append File" ! msgstr "äĎĐÉÓÁÔÉ ĆÁĘĚ" --- 1217,1219 ---- msgid "Append File" ! msgstr "Äđňęőâćę öâëí" *************** *** 1221,1223 **** msgid "E186: No previous directory" ! msgstr "E186: öĎÄÎϧ ĐĎĐĹŇĹÄÎŘϧ ÄÉŇĹËÔĎŇŚ§" --- 1221,1223 ---- msgid "E186: No previous directory" ! msgstr "E186: Ăđäďđ§ ňđňĺôĺäďűđ§ äęôĺěćđôŚ§" *************** *** 1226,1228 **** msgid "E187: Unknown" ! msgstr "E187: îĹ׌ÄĎÍÁ ÄÉŇĹËÔĎŇŚŃ" --- 1226,1228 ---- msgid "E187: Unknown" ! msgstr "E187: ĎĺţŚäđîâ äęôĺěćđôŚó" *************** *** 1232,1234 **** msgid "Window position: X %d, Y %d" ! msgstr "đĎÚÉĂŚŃ ×ŚËÎÁ: X %d, Y %d" --- 1232,1234 ---- msgid "Window position: X %d, Y %d" ! msgstr "Ňđ˙ęçŚó ţŚěďâ: X %d, Y %d" *************** *** 1236,1238 **** msgid "E188: Obtaining window position not implemented for this platform" ! msgstr "E188: ćŐÎËĂŚŃ ĎÂŇÁČŐ×ÁÎÎŃ ĐĎÚÉĂŚ§ ׌ËÎÁ ÎĹ ÄŚ¤ ÄĚŃ ×ÁŰϧ ĐĚÁÔĆĎŇÍÉ" --- 1236,1238 ---- msgid "E188: Obtaining window position not implemented for this platform" ! msgstr "E188: ÖčďěçŚó đ÷ôâéčţâďďó ňđ˙ę猧 ţŚěďâ ďĺ 䌤 äíó ţâůđ§ ňíâćöđôîę" *************** *** 1241,1243 **** msgid "Save Redirection" ! msgstr "úÁĐÁÍ'ŃÔÁÔÉ ĐĹŇĹÁÄŇĹÓĎ×ÁÎÉĘ ×É׌Ä" --- 1241,1243 ---- msgid "Save Redirection" ! msgstr "ßâňâî'óćâćę ňĺôĺâäôĺőđţâďęë ţęţŚä" *************** *** 1245,1247 **** msgid "Save View" ! msgstr "úÁĐÁÍ'ŃÔÁÔÉ ×ÉÇĚŃÄ" --- 1245,1247 ---- msgid "Save View" ! msgstr "ßâňâî'óćâćę ţęúíóä" *************** *** 1249,1251 **** msgid "Save Session" ! msgstr "úÁĐÁÍ'ŃÔÁÔÉ ÓĹÁÎÓ" --- 1249,1251 ---- msgid "Save Session" ! msgstr "ßâňâî'óćâćę őĺâďő" *************** *** 1253,1255 **** msgid "Save Setup" ! msgstr "úÁĐÁÍ'ŃÔÁÔÉ ÎÁĚÁŰÔŐ×ÁÎÎŃ" --- 1253,1255 ---- msgid "Save Setup" ! msgstr "ßâňâî'óćâćę ďâíâůćčţâďďó" *************** *** 1258,1260 **** msgid "E189: \"%s\" exists (use ! to override)" ! msgstr "E189: ćÁĘĚ \"%s\" ŚÓÎŐ¤, (×ÉËĎŇÉÓÔÁĘÔĹ ! ÝĎ ÎĹ Ú×ÁÖÁÔÉ)" --- 1258,1260 ---- msgid "E189: \"%s\" exists (use ! to override)" ! msgstr "E189: Öâëí \"%s\" Śőďč¤, (ţęěđôęőćâëćĺ ! üđ÷ ďĺ ˙ţâăâćę)" *************** *** 1264,1266 **** msgid "E190: Cannot open \"%s\" for writing" ! msgstr "E190: îĹ ÍĎÖŐ ×ŚÄËŇÉÔÉ \"%s\" ÄĚŃ ŢÉÔÁÎÎŃ" --- 1264,1266 ---- msgid "E190: Cannot open \"%s\" for writing" ! msgstr "E190: Ďĺ îđăč ţŚäěôęćę \"%s\" äíó ŕęćâďďó" *************** *** 1270,1272 **** msgid "E191: Argument must be a letter or forward/backward quote" ! msgstr "E191: áŇÇŐÍĹÎÔ ÍÁ¤ ÂŐÔÉ ĚŚÔĹŇĎŔ, ` ÁÂĎ '" --- 1270,1272 ---- msgid "E191: Argument must be a letter or forward/backward quote" ! msgstr "E191: Âôúčîĺďć î⤠÷čćę íŚćĺôđá, ` â÷đ '" *************** *** 1275,1277 **** msgid "E192: Recursive use of :normal too deep" ! msgstr "E192: ňĹËŐŇÓÉ×ÎÁ ÇĚÉÂÉÎÁ ×ĹËĎŇÉÓÔÁÎÎŃ :normal ÚÁÎÁÄŇĎ ×ĹĚÉËÁ" --- 1275,1277 ---- msgid "E192: Recursive use of :normal too deep" ! msgstr "E192: Ôĺěčôőęţďâ úíę÷ęďâ ţĺěđôęőćâďďó :normal ˙âďâäôđ ţĺíęěâ" *************** *** 1279,1281 **** msgid ":if nesting too deep" ! msgstr "úÁÎÁÄÔĎ ×ĹĚÉËÁ ËŚĚŘËŚÓÔŘ ×ËĚÁÄĹÎÉČ :if" --- 1279,1281 ---- msgid ":if nesting too deep" ! msgstr "ßâďâäćđ ţĺíęěâ ěŚíűěŚőćű ţěíâäĺďęé :if" *************** *** 1283,1285 **** msgid ":endif without :if" ! msgstr "âŇÁËŐ¤ ׌ÄĐĎ׌ÄÎĎÇĎ :if ÄĚŃ :endif" --- 1283,1285 ---- msgid ":endif without :if" ! msgstr "×ôâěč¤ ţŚäňđţŚäďđúđ :if äíó :endif" *************** *** 1287,1289 **** msgid ":else without :if" ! msgstr "âŇÁËŐ¤ ׌ÄĐĎ׌ÄÎĎÇĎ :if ÄĚŃ :else" --- 1287,1289 ---- msgid ":else without :if" ! msgstr "×ôâěč¤ ţŚäňđţŚäďđúđ :if äíó :else" *************** *** 1291,1293 **** msgid ":elseif without :if" ! msgstr "âŇÁËŐ¤ ׌ÄĐĎ׌ÄÎĎÇĎ :if ÄĚŃ :elseif" --- 1291,1293 ---- msgid ":elseif without :if" ! msgstr "×ôâěč¤ ţŚäňđţŚäďđúđ :if äíó :elseif" *************** *** 1295,1297 **** msgid ":while nesting too deep" ! msgstr "úÁÎÁÄÔĎ ×ĹĚÉËÁ ËŚĚŘËŚÓÔŘ ×ËĚÁÄĹÎÉČ :while" --- 1295,1297 ---- msgid ":while nesting too deep" ! msgstr "ßâďâäćđ ţĺíęěâ ěŚíűěŚőćű ţěíâäĺďęé :while" *************** *** 1299,1301 **** msgid ":continue without :while" ! msgstr "âŇÁËŐ¤ ׌ÄĐĎ׌ÄÎĎÇĎ :while ÄĚŃ :continue" --- 1299,1301 ---- msgid ":continue without :while" ! msgstr "×ôâěč¤ ţŚäňđţŚäďđúđ :while äíó :continue" *************** *** 1303,1305 **** msgid ":break without :while" ! msgstr "âŇÁËŐ¤ ׌ÄĐĎ׌ÄÎĎÇĎ :while ÄĚŃ :break" --- 1303,1305 ---- msgid ":break without :while" ! msgstr "×ôâěč¤ ţŚäňđţŚäďđúđ :while äíó :break" *************** *** 1307,1309 **** msgid ":endwhile without :while" ! msgstr "âŇÁËŐ¤ ׌ÄĐĎ׌ÄÎĎÇĎ :while ÄĚŃ :endwhile" --- 1307,1309 ---- msgid ":endwhile without :while" ! msgstr "×ôâěč¤ ţŚäňđţŚäďđúđ :while äíó :endwhile" *************** *** 1311,1313 **** msgid "E193: :endfunction not inside a function" ! msgstr "E133: :endfunction ĐĎÚÁ ÍĹÖÁÍÉ ĆŐÎËĂŚ§" --- 1311,1313 ---- msgid "E193: :endfunction not inside a function" ! msgstr "E133: :endfunction ňđ˙â îĺăâîę öčďě猧" *************** *** 1316,1318 **** msgid "E194: No alternate file name to substitute for '#'" ! msgstr "E194: îĹÍÁ¤ ×ÔĎŇÉÎÎĎÇĎ ĆÁĘĚÁ ÄĚŃ ÚÁÍŚÎÉ '#'" --- 1316,1318 ---- msgid "E194: No alternate file name to substitute for '#'" ! msgstr "E194: Ďĺî⤠ţćđôęďďđúđ öâëíâ äíó ˙âîŚďę '#'" *************** *** 1320,1322 **** msgid "no autocommand file name to substitute for \"\"" ! msgstr "îĹ ÍĎÖÎÁ ÚÁÍŚÎÉÔÉ \"\" × Á×ÔĎËĎÍÁÎÄŚ, ŚÍ'Ń ĆÁĘĚÁ ׌ÄÓŐÔÎŚ¤" --- 1320,1322 ---- msgid "no autocommand file name to substitute for \"\"" ! msgstr "Ďĺ îđăďâ ˙âîŚďęćę \"\" ţ âţćđěđîâďäŚ, Śî'ó öâëíâ ţŚäőčć" *************** *** 1324,1326 **** msgid "no autocommand buffer number to substitute for \"\"" ! msgstr "îĹ ÍĎÖÎÁ ÚÁÍŚÎÉÔÉ \"\" × Á×ÔĎËĎÍÁÎÄŚ, ÎÁÚ×Á ÂŐĆĹŇÁ ׌ÄÓŐÔÎŃ" --- 1324,1326 ---- msgid "no autocommand buffer number to substitute for \"\"" ! msgstr "Ďĺ îđăďâ ˙âîŚďęćę \"\" ţ âţćđěđîâďäŚ, ďâ˙ţâ ÷čöĺôâ ţŚäőčćďó" *************** *** 1329,1332 **** msgstr "" ! "îĹ ÍĎÖÎÁ ÚÁÍŚÎÉÔÉ \"\" × Á×ÔĎËĎÍÁÎÄŚ, ÄĚŃ ÚÂŚÇŐ ÎĹ ×ÉËĎŇÉÓÔĎ×ÁĚĎÓŘ " ! "ŚÍ'Ń" --- 1329,1332 ---- msgstr "" ! "Ďĺ îđăďâ ˙âîŚďęćę \"\" ţ âţćđěđîâďäŚ, äíó ˙÷Śúč ďĺ ţęěđôęőćđţâíđőű " ! "Śî'ó" *************** *** 1334,1336 **** msgid "no :source file name to substitute for \"\"" ! msgstr "îĹ ÍĎÖÎÁ ÚÁÍŚÎÉÔÉ \"\" × Á×ÔĎËĎÍÁÎÄŚ, ŚÍ'Ń ĆÁĘĚÁ ׌ÄÓŐÔÎŚ¤" --- 1334,1336 ---- msgid "no :source file name to substitute for \"\"" ! msgstr "Ďĺ îđăďâ ˙âîŚďęćę \"\" ţ âţćđěđîâďäŚ, Śî'ó öâëíâ ţŚäőčć" *************** *** 1339,1341 **** msgid "Empty file name for '%' or '#', only works with \":p:h\"" ! msgstr "đĎŇĎÖÎĹ ŚÍ'Ń ĆÁĘĚÁ ÄĚŃ '%' ÔÁ '#' ĐŇÁĂŔ¤ ĚÉŰĹ Ú \":p:h\"" --- 1339,1341 ---- msgid "Empty file name for '%' or '#', only works with \":p:h\"" ! msgstr "Ňđôđăďĺ Śî'ó öâëíâ äíó '%' ćâ '#' ňôâçᤠíęůĺ ˙ \":p:h\"" *************** *** 1343,1345 **** msgid "Evaluates to an empty string" ! msgstr "ňĹÚŐĚŘÔÁÔ -- ĐĎŇĎÖÎŚĘ ŇŃÄĎË" --- 1343,1345 ---- msgid "Evaluates to an empty string" ! msgstr "Ôĺ˙číűćâć -- ňđôđăďŚë ôóäđě" *************** *** 1347,1349 **** msgid "E195: Cannot open viminfo file for reading" ! msgstr "E195: îĹ ÍĎÖŐ ×ŚÄËŇÉÔÉ ĆÁĘĚ viminfo" --- 1347,1349 ---- msgid "E195: Cannot open viminfo file for reading" ! msgstr "E195: Ďĺ îđăč ţŚäěôęćę öâëí viminfo" *************** *** 1351,1353 **** msgid "E196: No digraphs in this version" ! msgstr "E196: ő ĂŚĘ ×ĹŇÓŚ§ ÎĹÍÁ¤ ÄÉÇŇÁĆŚ×" --- 1351,1353 ---- msgid "E196: No digraphs in this version" ! msgstr "E196: Č çŚë ţĺôőŚ§ ďĺî⤠äęúôâöŚţ" *************** *** 1356,1358 **** msgid "tagname" ! msgstr "ÎÁÚ×Á ĐĎÍŚÔËÉ" --- 1356,1358 ---- msgid "tagname" ! msgstr "ďâ˙ţâ ňđîŚćěę" *************** *** 1360,1362 **** msgid " kind file\n" ! msgstr " ÔÉĐ ĆÁĘĚÁ\n" --- 1360,1362 ---- msgid " kind file\n" ! msgstr " ćęň öâëíâ\n" *************** *** 1364,1366 **** msgid "'history' option is zero" ! msgstr "ďĐĂŚŃ 'history' ĐĎŇĎÖÎŃ" --- 1364,1366 ---- msgid "'history' option is zero" ! msgstr "ĐňçŚó 'history' ňđôđăďó" *************** *** 1373,1375 **** "\n" ! "# đĎĐĹŇĹÄÎŚ %s:\n" --- 1373,1375 ---- "\n" ! "# ŇđňĺôĺäďŚ %s:\n" *************** *** 1377,1379 **** msgid "Command Line" ! msgstr "ËĎÍÁÎÄÉ" --- 1377,1379 ---- msgid "Command Line" ! msgstr "ěđîâďäę" *************** *** 1381,1383 **** msgid "Search String" ! msgstr "ÚŇÁÚËÉ ÄĚŃ ĐĎŰŐËŐ" --- 1381,1383 ---- msgid "Search String" ! msgstr "˙ôâ˙ěę äíó ňđůčěč" *************** *** 1385,1387 **** msgid "Expression" ! msgstr "×ÉŇÁÚÉ" --- 1385,1387 ---- msgid "Expression" ! msgstr "ţęôâ˙ę" *************** *** 1389,1391 **** msgid "Input Line" ! msgstr "××ĹÄĹÎŚ ŇŃÄËÉ" --- 1389,1391 ---- msgid "Input Line" ! msgstr "ţţĺäĺďŚ ôóäěę" *************** *** 1397,1399 **** msgid "E199: Active window or buffer deleted" ! msgstr "E199: áËÔÉ×Ί׌ËÎĎ ÁÂĎ ÂŐĆĹŇ ÂŐĚĎ ×ÉÄÁĚĹÎĎ" --- 1397,1399 ---- msgid "E199: Active window or buffer deleted" ! msgstr "E199: Âěćęţďĺ ţŚěďđ â÷đ ÷čöĺô ÷číđ ţęäâíĺďđ" *************** *** 1402,1404 **** msgid "Illegal file name" ! msgstr "îĹÄĎÚ×ĎĚĹÎĹ ŚÍ'Ń ĆÁĘĚÁ" --- 1402,1404 ---- msgid "Illegal file name" ! msgstr "Ďĺäđ˙ţđíĺďĺ Śî'ó öâëíâ" *************** *** 1406,1408 **** msgid "is a directory" ! msgstr "ĂĹ ÄÉŇĹËÔĎŇŚŃ" --- 1406,1408 ---- msgid "is a directory" ! msgstr "çĺ äęôĺěćđôŚó" *************** *** 1410,1412 **** msgid "is not a file" ! msgstr "ÎĹ ĆÁĘĚ" --- 1410,1412 ---- msgid "is not a file" ! msgstr "ďĺ öâëí" *************** *** 1414,1416 **** msgid "[New File]" ! msgstr "[îĎ×ÉĘ ĆÁĘĚ]" --- 1414,1416 ---- msgid "[New File]" ! msgstr "[Ďđţęë öâëí]" *************** *** 1418,1420 **** msgid "[Permission Denied]" ! msgstr "[÷ŚÄÍĎ×ĚĹÎĎ]" --- 1418,1420 ---- msgid "[Permission Denied]" ! msgstr "[ŢŚäîđţíĺďđ]" *************** *** 1422,1424 **** msgid "E200: *ReadPre autocommands made the file unreadable" ! msgstr "E200: á×ÔĎËĎÍÁÎÄÉ *ReadPre ÚŇĎÂÉĚÉ ŢÉÔÁÎÎŃ ĆÁĘĚÁ ÎĹÍĎÖĚÉ×ÉÍ" --- 1422,1424 ---- msgid "E200: *ReadPre autocommands made the file unreadable" ! msgstr "E200: Âţćđěđîâďäę *ReadPre ˙ôđ÷ęíę ŕęćâďďó öâëíâ ďĺîđăíęţęî" *************** *** 1427,1429 **** msgid "E201: *ReadPre autocommands must not change current buffer" ! msgstr "E201: á×ÔĎËĎÍÁÎÄÉ *ReadPre ÎĹ ÍÁ¤ÔŘ ĐŇÁ×Á ÚÍŚÎŔ×ÁÔÉ ÂŐĆĹŇ" --- 1427,1429 ---- msgid "E201: *ReadPre autocommands must not change current buffer" ! msgstr "E201: Âţćđěđîâďäę *ReadPre ďĺ îâ¤ćű ňôâţâ ˙îŚďáţâćę ÷čöĺô" *************** *** 1432,1434 **** msgid "Vim: Reading from stdin...\n" ! msgstr "Vim: ţÉÔÁĹÍĎ Ú stdin...\n" --- 1432,1434 ---- msgid "Vim: Reading from stdin...\n" ! msgstr "Vim: Ŕęćâĺîđ ˙ stdin...\n" *************** *** 1436,1438 **** msgid "Reading from stdin..." ! msgstr "ţÉÔÁĹÍĎ Ú stdin..." --- 1436,1438 ---- msgid "Reading from stdin..." ! msgstr "Ŕęćâĺîđ ˙ stdin..." *************** *** 1441,1443 **** msgid "E202: Conversion made file unreadable!" ! msgstr "E202: ëĎÎ×ĹŇÔŐ×ÁÎÎŃ ÚŇĎÂÉĚĎ ŢÉÔÁÎÎŃ ĆÁĘĚÁ ÎĹÍĎÖĚÉ×ÉÍ!" --- 1441,1443 ---- msgid "E202: Conversion made file unreadable!" ! msgstr "E202: Ěđďţĺôćčţâďďó ˙ôđ÷ęíđ ŕęćâďďó öâëíâ ďĺîđăíęţęî!" *************** *** 1446,1448 **** msgid "[fifo/socket]" ! msgstr "[fifo/ÓĎËĹÔ]" --- 1446,1448 ---- msgid "[fifo/socket]" ! msgstr "[fifo/őđěĺć]" *************** *** 1454,1456 **** msgid "[socket]" ! msgstr "[ÓĎËĹÔ]" --- 1454,1456 ---- msgid "[socket]" ! msgstr "[őđěĺć]" *************** *** 1462,1464 **** msgid "[CR missing]" ! msgstr "[÷ÔŇÁŢĹÎĎ CR]" --- 1462,1464 ---- msgid "[CR missing]" ! msgstr "[Ţćôâŕĺďđ CR]" *************** *** 1466,1468 **** msgid "[NL found]" ! msgstr "[úÎÁĘÄĹÎĎ NL]" --- 1466,1468 ---- msgid "[NL found]" ! msgstr "[ßďâëäĺďđ NL]" *************** *** 1470,1472 **** msgid "[long lines split]" ! msgstr "[äĎ×ÇŚ ŇŃÄËÉ ĐĎÄŇŚÂÎĹÎĎ]" --- 1470,1472 ---- msgid "[long lines split]" ! msgstr "[ÄđţúŚ ôóäěę ňđäôŚ÷ďĺďđ]" *************** *** 1474,1476 **** msgid "[NOT converted]" ! msgstr "[îĺ ËĎÎ×ĹŇÔĎ×ÁÎĎ]" --- 1474,1476 ---- msgid "[NOT converted]" ! msgstr "[ĎĹ ěđďţĺôćđţâďđ]" *************** *** 1478,1480 **** msgid "[converted]" ! msgstr "[ËĎÎ×ĹŇÔĎ×ÁÎĎ]" --- 1478,1480 ---- msgid "[converted]" ! msgstr "[ěđďţĺôćđţâďđ]" *************** *** 1482,1484 **** msgid "[crypted]" ! msgstr "[ÚÁŰÉĆŇĎ×ÁÎĎ]" --- 1482,1484 ---- msgid "[crypted]" ! msgstr "[˙âůęöôđţâďđ]" *************** *** 1486,1488 **** msgid "[CONVERSION ERROR]" ! msgstr "[đďíéěëá ëďî÷ĺňôő÷áîîń]" --- 1486,1488 ---- msgid "[CONVERSION ERROR]" ! msgstr "[ŇĐÎĘÍĚ ĚĐĎŢĹÔĆČŢÂĎĎÓ]" *************** *** 1490,1492 **** msgid "[READ ERRORS]" ! msgstr "[đďíéěëá úţéôő÷áîîń]" --- 1490,1492 ---- msgid "[READ ERRORS]" ! msgstr "[ŇĐÎĘÍĚ ßŔĘĆČŢÂĎĎÓ]" *************** *** 1494,1496 **** msgid "Can't find temp file for conversion" ! msgstr "îĹ ÍĎÖŐ ĐŚÄŰŐËÁÔÉ ÔÉÍŢÁÓĎ×ÉĘ ĆÁĘĚ ÄĚŃ ËĎÎ×ĹŇÔŐ×ÁÎÎŃ" --- 1494,1496 ---- msgid "Can't find temp file for conversion" ! msgstr "Ďĺ îđăč ňŚäůčěâćę ćęîŕâőđţęë öâëí äíó ěđďţĺôćčţâďďó" *************** *** 1498,1500 **** msgid "Conversion with 'charconvert' failed" ! msgstr "ëĎ×ÎĹŇÔŐ×ÁÎÎŃ Ú 'charconvert' ÎĹ ×ÄÁĚĎÓŃ" --- 1498,1500 ---- msgid "Conversion with 'charconvert' failed" ! msgstr "Ěđţďĺôćčţâďďó ˙ 'charconvert' ďĺ ţäâíđőó" *************** *** 1502,1504 **** msgid "can't read output of 'charconvert'" ! msgstr "ÎĹ ÍĎÖŐ ÚŢÉÔÁÔÉ ×É×ŚÄ 'charconvert'" --- 1502,1504 ---- msgid "can't read output of 'charconvert'" ! msgstr "ďĺ îđăč ˙ŕęćâćę ţęţŚä 'charconvert'" *************** *** 1506,1508 **** msgid "E203: Autocommands deleted or unloaded buffer to be written" ! msgstr "E203: á×ÔĎËĎÍÁÎÄÁ ×ÉÄÁĚÉĚÁ ÁÂĎ ×É×ÁÎÔÁÖÉĚÁ ÂŐĆĹŇ ÝĎ ÍÁ¤ ÂŐÔÉ ÚÁĐÉÓÁÎÉĘ" --- 1506,1508 ---- msgid "E203: Autocommands deleted or unloaded buffer to be written" ! msgstr "E203: Âţćđěđîâďäâ ţęäâíęíâ â÷đ ţęţâďćâăęíâ ÷čöĺô üđ î⤠÷čćę ˙âňęőâďęë" *************** *** 1510,1512 **** msgid "E204: Autocommand changed number of lines in unexpected way" ! msgstr "E204: á×ÔĎËĎÍÁÎÄÁ ÚÍŚÎÉĚÁ ËŚĚŘËŘÓÔŘ ŇŃÄËŚ× ÎĹÓĐĎÄŚ×ÁÎÉÍ ŢÉÎĎÍ" --- 1510,1512 ---- msgid "E204: Autocommand changed number of lines in unexpected way" ! msgstr "E204: Âţćđěđîâďäâ ˙îŚďęíâ ěŚíűěűőćű ôóäěŚţ ďĺőňđäŚţâďęî ŕęďđî" *************** *** 1514,1516 **** msgid "is not a file or writable device" ! msgstr "ÎĹ ¤ ĆÁĘĚĎÍ ŢÉ ĐŇÉÓÔŇĎ¤Í Ú ÍĎÖĚÉ׌ÓÔŔ ÚÁĐÉÓŐ" --- 1514,1516 ---- msgid "is not a file or writable device" ! msgstr "ďĺ ¤ öâëíđî ŕę ňôęőćôđ¤î ˙ îđăíęţŚőćá ˙âňęőč" *************** *** 1518,1520 **** msgid "is read-only (use ! to override)" ! msgstr "ÍĎÖÎÁ ĚÉŰĹ ŢÉÔÁÔÉ (×ÉËĎŇÉÓÔÁĘÔĹ ! ÝĎ ÎĹ Ú×ÁÖÁÔÉ)" --- 1518,1520 ---- msgid "is read-only (use ! to override)" ! msgstr "îđăďâ íęůĺ ŕęćâćę (ţęěđôęőćâëćĺ ! üđ÷ ďĺ ˙ţâăâćę)" *************** *** 1522,1524 **** msgid "Can't write to backup file (use ! to override)" ! msgstr "îĹ ÍĎÖŐ ÚÁĐÉÓÁÔÉ ŇĹÚĹŇ×ÎÉĘ ĆÁĘĚ (×ÉËĎŇÉÓÔÁĘÔĹ ! ÝĎ ÎĹ Ú×ÁÖÁÔÉ)" --- 1522,1524 ---- msgid "Can't write to backup file (use ! to override)" ! msgstr "Ďĺ îđăč ˙âňęőâćę ôĺ˙ĺôţďęë öâëí (ţęěđôęőćâëćĺ ! üđ÷ ďĺ ˙ţâăâćę)" *************** *** 1526,1528 **** msgid "Close error for backup file (use ! to override)" ! msgstr "đĎÍÉĚËÁ ĐŚÄ ŢÁÓ ÓĐŇĎÂÉ ÚÁËŇÉÔÉ ŇĹÚĹŇ×ÎÉĘ ĆÁĘĚ" --- 1526,1528 ---- msgid "Close error for backup file (use ! to override)" ! msgstr "Ňđîęíěâ ňŚä ŕâő őňôđ÷ę ˙âěôęćę ôĺ˙ĺôţďęë öâëí" *************** *** 1531,1533 **** msgstr "" ! "îĹÍÁ¤ ÚÍĎÇÉ ÓÔ×ĎŇÉÔÉ ĆÁĘĚ ÄĚŃ ŇĹÚĹŇ×Îϧ ËĎĐŚ§ (×ÉËĎŇÉÓÔÁĘÔĹ ! ÝĎ ÎĹ Ú×ÁÖÁÔÉ)" --- 1531,1533 ---- msgstr "" ! "Ďĺî⤠˙îđúę őćţđôęćę öâëí äíó ôĺ˙ĺôţďđ§ ěđňŚ§ (ţęěđôęőćâëćĺ ! üđ÷ ďĺ ˙ţâăâćę)" *************** *** 1535,1537 **** msgid "Cannot create backup file (use ! to override)" ! msgstr "îĹÍÁ¤ ÚÍĎÇÉ ÓÔ×ĎŇÉÔÉ ŇĹÚĹŇ×ÎŐ ËĎĐŚŔ (×ÉËĎŇÉÓÔÁĘÔĹ ! ÝĎ ÎĹ Ú×ÁÖÁÔÉ)" --- 1535,1537 ---- msgid "Cannot create backup file (use ! to override)" ! msgstr "Ďĺî⤠˙îđúę őćţđôęćę ôĺ˙ĺôţďč ěđňŚá (ţęěđôęőćâëćĺ ! üđ÷ ďĺ ˙ţâăâćę)" *************** *** 1539,1541 **** msgid "Can't make backup file (use ! to override)" ! msgstr "îĹÍÁ¤ ÚÍĎÇÉ ÓÔ×ĎŇÉÔÉ ŇĹÚĹŇ×ÎŐ ËĎĐŚŔ (×ÉËĎŇÉÓÔÁĘÔĹ ! ÝĎ ÎĹ Ú×ÁÖÁÔÉ)" --- 1539,1541 ---- msgid "Can't make backup file (use ! to override)" ! msgstr "Ďĺî⤠˙îđúę őćţđôęćę ôĺ˙ĺôţďč ěđňŚá (ţęěđôęőćâëćĺ ! üđ÷ ďĺ ˙ţâăâćę)" *************** *** 1543,1545 **** msgid "The resource fork will be lost (use ! to override)" ! msgstr "ňĹÓŐŇÓÎŐ ÇŚĚËŐ ĆÁĘĚÁ ÂŐÄĹ ×ÔŇÁŢĹÎĎ (! ÝĎ ÎĹ Ú×ÁÖÁÔÉ)" --- 1543,1545 ---- msgid "The resource fork will be lost (use ! to override)" ! msgstr "Ôĺőčôőďč úŚíěč öâëíâ ÷čäĺ ţćôâŕĺďđ (! üđ÷ ďĺ ˙ţâăâćę)" *************** *** 1547,1549 **** msgid "E214: Can't find temp file for writing" ! msgstr "E214: îĹ ÍĎÖŐ ĐŚÄŰŐËÁÔÉ ÔÉÍŢÁÓĎ×ÉĘ ĆÁĘĚ ÄĚŃ ÚÁĐÉÓŐ" --- 1547,1549 ---- msgid "E214: Can't find temp file for writing" ! msgstr "E214: Ďĺ îđăč ňŚäůčěâćę ćęîŕâőđţęë öâëí äíó ˙âňęőč" *************** *** 1552,1554 **** msgstr "" ! "E213: îĹ ÍĎÖŐ ËĎÎ×ĹŇÔŐ×ÁÔÉ (×ÉËĎŇÉÓÔÁĘÔĹ ! ÝĎ ÚÁĐÉÓÁÔÉ ÂĹÚ ËĎÎ×ĹŇÔŐ×ÁÎÎŃ)" --- 1552,1554 ---- msgstr "" ! "E213: Ďĺ îđăč ěđďţĺôćčţâćę (ţęěđôęőćâëćĺ ! üđ÷ ˙âňęőâćę ÷ĺ˙ ěđďţĺôćčţâďďó)" *************** *** 1556,1558 **** msgid "E166: Can't open linked file for writing" ! msgstr "E166: îĹ ÍĎÖŐ ×ŚÄËŇÉÔÉ ÄĚŃ ÚÁĐÉÓŐ ĆÁĘĚ ÎÁ ŃËÉĘ ×ËÁÚŐ¤ ĐĎÓÉĚÁÎÎŃ" --- 1556,1558 ---- msgid "E166: Can't open linked file for writing" ! msgstr "E166: Ďĺ îđăč ţŚäěôęćę äíó ˙âňęőč öâëí ďâ óěęë ţěâ˙č¤ ňđőęíâďďó" *************** *** 1560,1562 **** msgid "E212: Can't open file for writing" ! msgstr "E212: îĹ ÍĎÖŐ ×ŚÄËŇÉÔÉ ĆÁĘĚ ÄĚŃ ÚÁĐÉÓŐ" --- 1560,1562 ---- msgid "E212: Can't open file for writing" ! msgstr "E212: Ďĺ îđăč ţŚäěôęćę öâëí äíó ˙âňęőč" *************** *** 1564,1566 **** msgid "Close failed" ! msgstr "îĹ ×ÄÁĚĎÓŃ ÚÁËŇÉÔÉ ĆÁĘĚ" --- 1564,1566 ---- msgid "Close failed" ! msgstr "Ďĺ ţäâíđőó ˙âěôęćę öâëí" *************** *** 1568,1570 **** msgid "write error, conversion failed" ! msgstr "ĐĎÍÉĚËÁ ÚÁĐÉÓŐ, ËĎÎ×ĹŇÔŐ×ÁÎÎŃ ÎĹ ×ÄÁĚĎÓŃ" --- 1568,1570 ---- msgid "write error, conversion failed" ! msgstr "ňđîęíěâ ˙âňęőč, ěđďţĺôćčţâďďó ďĺ ţäâíđőó" *************** *** 1572,1574 **** msgid "write error (file system full?)" ! msgstr "ĐĎÍÉĚËÁ ÚÁĐÉÓŐ (ÓËŚÎŢÉĚĎÓŘ ×ŚĚŘÎĹ ÍŚÓĂĹ??)" --- 1572,1574 ---- msgid "write error (file system full?)" ! msgstr "ňđîęíěâ ˙âňęőč (őěŚďŕęíđőű ţŚíűďĺ îŚőçĺ??)" *************** *** 1576,1578 **** msgid " CONVERSION ERROR" ! msgstr " đďíéěëá ëďî÷ĺňôő÷áîîń" --- 1576,1578 ---- msgid " CONVERSION ERROR" ! msgstr " ŇĐÎĘÍĚ ĚĐĎŢĹÔĆČŢÂĎĎÓ" *************** *** 1580,1582 **** msgid "[Device]" ! msgstr "[đŇÉÓÔŇŚĘ]" --- 1580,1582 ---- msgid "[Device]" ! msgstr "[ŇôęőćôŚë]" *************** *** 1584,1586 **** msgid "[New]" ! msgstr "[îĎ×ÉĘ]" --- 1584,1586 ---- msgid "[New]" ! msgstr "[Ďđţęë]" *************** *** 1588,1590 **** msgid " [a]" ! msgstr "[Ä]" --- 1588,1590 ---- msgid " [a]" ! msgstr "[ä]" *************** *** 1592,1594 **** msgid " appended" ! msgstr " ÄĎĐÉÓÁÎÉĘ" --- 1592,1594 ---- msgid " appended" ! msgstr " äđňęőâďęë" *************** *** 1596,1598 **** msgid " [w]" ! msgstr "[Ú]" --- 1596,1598 ---- msgid " [w]" ! msgstr "[˙]" *************** *** 1600,1602 **** msgid " written" ! msgstr " ÚÁĐÉÓÁÎÉĘ" --- 1600,1602 ---- msgid " written" ! msgstr " ˙âňęőâďęë" *************** *** 1604,1606 **** msgid "E205: Patchmode: can't save original file" ! msgstr "E205: ňĹÖÉÍ patch: ÎĹ ÍĎÖŐ ÚÁĐÉÓÁÔÉ ĐĹŇ×ÉÎÎÉĘ ĆÁĘĚ" --- 1604,1606 ---- msgid "E205: Patchmode: can't save original file" ! msgstr "E205: Ôĺăęî patch: ďĺ îđăč ˙âňęőâćę ňĺôţęďďęë öâëí" *************** *** 1608,1610 **** msgid "E206: patchmode: can't touch empty original file" ! msgstr "E206: ňĹÖÉÍ patch: ÎĹ ÍĎÖŐ ÓÔ×ĎŇÉÔÉ ĐŐÓÔÉĘ ĐĹŇ×ÉÎÎÉĘ ĆÁĘĚ" --- 1608,1610 ---- msgid "E206: patchmode: can't touch empty original file" ! msgstr "E206: Ôĺăęî patch: ďĺ îđăč őćţđôęćę ňčőćęë ňĺôţęďďęë öâëí" *************** *** 1612,1614 **** msgid "E207: Can't delete backup file" ! msgstr "E207: îĹ ÍĎÖŐ ×ÉÄÁĚÉĚÁ ŇĹÚĹŇ×ÎÉĘ ĆÁĘĚ" --- 1612,1614 ---- msgid "E207: Can't delete backup file" ! msgstr "E207: Ďĺ îđăč ţęäâíęíâ ôĺ˙ĺôţďęë öâëí" *************** *** 1620,1622 **** "\n" ! "ő÷áçá: đĎŢÁÔËĎ×ÉĘ ĆÁĘĚ ÍĎÖĹ ÂŐÔÉ ×ÔŇÁŢĹÎÉĘ ÁÂĎ ×ÉÄÁĚĹÎÉĘ\n" --- 1620,1622 ---- "\n" ! "ČŢÂÚÂ: Ňđŕâćěđţęë öâëí îđăĺ ÷čćę ţćôâŕĺďęë â÷đ ţęäâíĺďęë\n" *************** *** 1624,1626 **** msgid "don't quit the editor until the file is successfully written!" ! msgstr "îĹ ×ÉČĎÄŘÔĹ Ú ŇĹÄÁËÔĎŇÁ ÄĎĐĎËÉ ĆÁĘĚ ÎĹ ÂŐÄĹ ÚÁĐÉÓÁÎĎ" --- 1624,1626 ---- msgid "don't quit the editor until the file is successfully written!" ! msgstr "Ďĺ ţęéđäűćĺ ˙ ôĺäâěćđôâ äđňđěę öâëí ďĺ ÷čäĺ ˙âňęőâďđ" *************** *** 1628,1630 **** msgid "[dos]" ! msgstr "[ÄĎÓ]" --- 1628,1630 ---- msgid "[dos]" ! msgstr "[äđő]" *************** *** 1632,1634 **** msgid "[dos format]" ! msgstr "[ĆĎŇÍÁÔ dos]" --- 1632,1634 ---- msgid "[dos format]" ! msgstr "[öđôîâć dos]" *************** *** 1640,1642 **** msgid "[mac format]" ! msgstr "[ĆĎŇÍÁÔ mac]" --- 1640,1642 ---- msgid "[mac format]" ! msgstr "[öđôîâć mac]" *************** *** 1648,1650 **** msgid "[unix format]" ! msgstr "[unix ĆĎŇÍÁÔ]" --- 1648,1650 ---- msgid "[unix format]" ! msgstr "[unix öđôîâć]" *************** *** 1652,1654 **** msgid "1 line, " ! msgstr "ĎÄÉÎ ŇŃÄĎË, " --- 1652,1654 ---- msgid "1 line, " ! msgstr "đäęď ôóäđě, " *************** *** 1657,1659 **** msgid "%ld lines, " ! msgstr "%ld ŇŃÄËŚ×, " --- 1657,1659 ---- msgid "%ld lines, " ! msgstr "%ld ôóäěŚţ, " *************** *** 1661,1663 **** msgid "1 character" ! msgstr "ĎÄÉÎ ÓÉÍ×ĎĚ" --- 1661,1663 ---- msgid "1 character" ! msgstr "đäęď őęîţđí" *************** *** 1666,1668 **** msgid "%ld characters" ! msgstr "%ld ÓÉÍ×ĎĚŚ×" --- 1666,1668 ---- msgid "%ld characters" ! msgstr "%ld őęîţđíŚţ" *************** *** 1674,1676 **** msgid "[Incomplete last line]" ! msgstr "[ÎĹĐĎ×ÎÉĘ ĎÓÔÁÎŚĘ ŇŃÄĎË]" --- 1674,1676 ---- msgid "[Incomplete last line]" ! msgstr "[ďĺňđţďęë đőćâďŚë ôóäđě]" *************** *** 1681,1683 **** msgid "WARNING: The file has been changed since reading it!!!" ! msgstr "ő÷áçá: ćÁĘĚ ÂŐĚĎ ÚÍŚÎĹÎĎ ĐŚÓĚŃ ÚŢÉÔÁÎÎŃ!!!" --- 1681,1683 ---- msgid "WARNING: The file has been changed since reading it!!!" ! msgstr "ČŢÂÚÂ: Öâëí ÷číđ ˙îŚďĺďđ ňŚőíó ˙ŕęćâďďó!!!" *************** *** 1685,1687 **** msgid "Do you really want to write to it" ! msgstr "÷É ÄŚĘÓÎĎ ČĎŢĹÔĹ ĘĎÇĎ ĐĹŇĹÚÁĐÉÓÁÔÉ ??" --- 1685,1687 ---- msgid "Do you really want to write to it" ! msgstr "Ţę äŚëőďđ éđŕĺćĺ ëđúđ ňĺôĺ˙âňęőâćę ??" *************** *** 1690,1692 **** msgid "E208: Error writing to \"%s\"" ! msgstr "E208: đĎÍÉĚËÁ ÚÁĐÉÓŐ × \"%s\"" --- 1690,1692 ---- msgid "E208: Error writing to \"%s\"" ! msgstr "E208: Ňđîęíěâ ˙âňęőč ţ \"%s\"" *************** *** 1695,1697 **** msgid "E209: Error closing \"%s\"" ! msgstr "E209: đĎÍÉĚËÁ ĐŚÄ ŢÁÓ ÚÁËŇÉÔÔŃ \"%s\"" --- 1695,1697 ---- msgid "E209: Error closing \"%s\"" ! msgstr "E209: Ňđîęíěâ ňŚä ŕâő ˙âěôęććó \"%s\"" *************** *** 1700,1702 **** msgid "E210: Error reading \"%s\"" ! msgstr "E210: đĎÍÉĚËÁ ĐŚÄ ŢÁÓ ÚŢÉÔŐ×ÁÎÎŃ \"%s\"" --- 1700,1702 ---- msgid "E210: Error reading \"%s\"" ! msgstr "E210: Ňđîęíěâ ňŚä ŕâő ˙ŕęćčţâďďó \"%s\"" *************** *** 1704,1706 **** msgid "E246: FileChangedShell autocommand deleted buffer" ! msgstr "E246: á×ÔĎËĎÍÁÎÄÁ FileChangedShell ×ÉÄÁĚÉĚÁ ÂŐĆĹŇ" --- 1704,1706 ---- msgid "E246: FileChangedShell autocommand deleted buffer" ! msgstr "E246: Âţćđěđîâďäâ FileChangedShell ţęäâíęíâ ÷čöĺô" *************** *** 1709,1711 **** msgid "E211: Warning: File \"%s\" no longer available" ! msgstr "E211: ő×ÁÇÁ: ćÁĘĚ \"%s\" ÎĹÄĎÓŃÖÎÉĘ" --- 1709,1711 ---- msgid "E211: Warning: File \"%s\" no longer available" ! msgstr "E211: Čţâúâ: Öâëí \"%s\" ďĺäđőóăďęë" *************** *** 1717,1719 **** msgstr "" ! "W12: ő×ÁÇÁ: ćÁĘĚ \"%s\" ÂŐĚĎ ÚÍŚÎĹÎĎ, ÁĚĹ Ę ÂŐĆĹŇ Ő Vim ÔĹÖ ÂŐĚĎ ÚÍŚÎĹÎĎ" --- 1717,1719 ---- msgstr "" ! "W12: Čţâúâ: Öâëí \"%s\" ÷číđ ˙îŚďĺďđ, âíĺ ë ÷čöĺô č Vim ćĺă ÷číđ ˙îŚďĺďđ" *************** *** 1722,1724 **** msgid "W11: Warning: File \"%s\" has changed since editing started" ! msgstr "W11: ő×ÁÇÁ: ćÁĘĚ \"%s\" ÂŐĚĎ ÚÍŚÎĹÎĎ ĐŚÓĚŃ ĐĎŢÁÔËŐ ŇĹÄÁÇŐ×ÁÎÎŃ" --- 1722,1724 ---- msgid "W11: Warning: File \"%s\" has changed since editing started" ! msgstr "W11: Čţâúâ: Öâëí \"%s\" ÷číđ ˙îŚďĺďđ ňŚőíó ňđŕâćěč ôĺäâúčţâďďó" *************** *** 1727,1729 **** msgid "W16: Warning: Mode of file \"%s\" has changed since editing started" ! msgstr "W16: ő×ÁÇÁ: ňĹÖÉÍ ĆÁĘĚÁ \"%s\" ÂŐĚĎ ÚÍŚÎĹÎĎ ĐŚÓĚŃ ĐĎŢÁÔËŐ ŇĹÄÁÇŐ×ÁÎÎŃ" --- 1727,1729 ---- msgid "W16: Warning: Mode of file \"%s\" has changed since editing started" ! msgstr "W16: Čţâúâ: Ôĺăęî öâëíâ \"%s\" ÷číđ ˙îŚďĺďđ ňŚőíó ňđŕâćěč ôĺäâúčţâďďó" *************** *** 1732,1734 **** msgid "W13: Warning: File \"%s\" has been created after editing started" ! msgstr "W13: ő×ÁÇÁ: ćÁĘĚ \"%s\" ÂŐĚĎ ÓÔ×ĎŇĹÎĎ ĐŚÓĚŃ ĐĎŢĹÔËŐ ŇĹÄÁÇŐ×ÁÎÎŃ" --- 1732,1734 ---- msgid "W13: Warning: File \"%s\" has been created after editing started" ! msgstr "W13: Čţâúâ: Öâëí \"%s\" ÷číđ őćţđôĺďđ ňŚőíó ňđŕĺćěč ôĺäâúčţâďďó" *************** *** 1736,1738 **** msgid "Warning" ! msgstr "ő×ÁÇÁ" --- 1736,1738 ---- msgid "Warning" ! msgstr "Čţâúâ" *************** *** 1743,1746 **** msgstr "" ! "&O:çÁŇÁÚÄ\n" ! "&L:úÁ×ÁÎÔÁÖÉÔÉ ĆÁĘĚ" --- 1743,1746 ---- msgstr "" ! "&O:Úâôâ˙ä\n" ! "&L:ßâţâďćâăęćę öâëí" *************** *** 1749,1751 **** msgid "E321: Could not reload \"%s\"" ! msgstr "E321: îĹ ÍĎÖŐ ĐĹŇĹ×ÁÎÔÁÖÉÔÉ \"%s\"" --- 1749,1751 ---- msgid "E321: Could not reload \"%s\"" ! msgstr "E321: Ďĺ îđăč ňĺôĺţâďćâăęćę \"%s\"" *************** *** 1753,1755 **** msgid "--Deleted--" ! msgstr "--÷ÉÄÁĚĹÎĎ--" --- 1753,1755 ---- msgid "--Deleted--" ! msgstr "--Ţęäâíĺďđ--" *************** *** 1759,1761 **** msgid "E367: No such group: \"%s\"" ! msgstr "E367: çŇŐĐÁ ÎĹ ŚÓÎŐ¤: \"%s\"" --- 1759,1761 ---- msgid "E367: No such group: \"%s\"" ! msgstr "E367: Úôčňâ ďĺ Śőďč¤: \"%s\"" *************** *** 1764,1766 **** msgid "E215: Illegal character after *: %s" ! msgstr "E215: îĹÄĎÚ×ĎĚĹÎÉĘ ÓÉÍ×ĎĚ ĐŚÓĚŃ *: %s" --- 1764,1766 ---- msgid "E215: Illegal character after *: %s" ! msgstr "E215: Ďĺäđ˙ţđíĺďęë őęîţđí ňŚőíó *: %s" *************** *** 1770,1772 **** msgid "E216: No such event: %s" ! msgstr "E216: đĎÄŚŃ ÎĹ ŚÓÎŐ¤: %s" --- 1770,1772 ---- msgid "E216: No such event: %s" ! msgstr "E216: ŇđäŚó ďĺ Śőďč¤: %s" *************** *** 1780,1782 **** "\n" ! "--- á×ÔĎËĎÍÁÎÄÉ ---" --- 1780,1782 ---- "\n" ! "--- Âţćđěđîâďäę ---" *************** *** 1784,1786 **** msgid "E217: Can't execute autocommands for ALL events" ! msgstr "E217: îĹ ÍĎÖŐ ×ÉËĎÎŐ×ÁÔÉ Á×ÔĎËĎÍÁÎÄÉ ÄĚŃ őóśč ĐĎÄŚĘ" --- 1784,1786 ---- msgid "E217: Can't execute autocommands for ALL events" ! msgstr "E217: Ďĺ îđăč ţęěđďčţâćę âţćđěđîâďäę äíó ČŐśÉ ňđäŚë" *************** *** 1789,1791 **** msgid "No matching autocommands" ! msgstr "îĹ ŚÓÎŐ¤ ׌ÄĐĎ׌ÄÎÉČ Á×ÔĎËĎÍÁÎÄ" --- 1789,1791 ---- msgid "No matching autocommands" ! msgstr "Ďĺ Śőďč¤ ţŚäňđţŚäďęé âţćđěđîâďä" *************** *** 1793,1795 **** msgid "E218: autocommand nesting too deep" ! msgstr "úÁÎÁÄÔĎ ×ĹĚÉËÁ ËŚĚŘËŚÓÔŘ ×ËĚÁÄĹÎÉČ Á×ÔĎËĎÍÁÎÄ" --- 1793,1795 ---- msgid "E218: autocommand nesting too deep" ! msgstr "ßâďâäćđ ţĺíęěâ ěŚíűěŚőćű ţěíâäĺďęé âţćđěđîâďä" *************** *** 1799,1801 **** msgid "%s Auto commands for \"%s\"" ! msgstr "%s á×ÔĎËĎÍÁÎÄÉ ÄĚŃ \"%s\"" --- 1799,1801 ---- msgid "%s Auto commands for \"%s\"" ! msgstr "%s Âţćđěđîâďäę äíó \"%s\"" *************** *** 1804,1806 **** msgid "Executing %s" ! msgstr "÷ÉËĎÎŐĹÔŘÓŃ %s" --- 1804,1806 ---- msgid "Executing %s" ! msgstr "Ţęěđďčĺćűőó %s" *************** *** 1810,1812 **** msgid "autocommand %s" ! msgstr "Á×ÔĎËĎÍÁÎÄÁ %s" --- 1810,1812 ---- msgid "autocommand %s" ! msgstr "âţćđěđîâďäâ %s" *************** *** 1814,1816 **** msgid "E219: Missing {." ! msgstr "÷ÔŇÁŢĹÎĎ {." --- 1814,1816 ---- msgid "E219: Missing {." ! msgstr "Ţćôâŕĺďđ {." *************** *** 1819,1821 **** msgid "E220: Missing }." ! msgstr "÷ÔŇÁŢĹÎĎ }." --- 1819,1821 ---- msgid "E220: Missing }." ! msgstr "Ţćôâŕĺďđ }." *************** *** 1824,1826 **** msgid "No fold found" ! msgstr "úÇĎŇÔĎË ÎĹ ÚÎÁĘÄĹÎĎ" --- 1824,1826 ---- msgid "No fold found" ! msgstr "ßúđôćđě ďĺ ˙ďâëäĺďđ" *************** *** 1829,1831 **** msgid "E350: Cannot create fold with current 'foldmethod'" ! msgstr "E350: îĹ ÍĎÖŐ ÓÔ×ĎŇÉÔÉ ÚÇĎŇÔĎË (Ú×ÁÖÁŔŢÉ ÎÁ 'foldmethod')" --- 1829,1831 ---- msgid "E350: Cannot create fold with current 'foldmethod'" ! msgstr "E350: Ďĺ îđăč őćţđôęćę ˙úđôćđě (˙ţâăâáŕę ďâ 'foldmethod')" *************** *** 1833,1835 **** msgid "E351: Cannot delete fold with current 'foldmethod'" ! msgstr "E351: îĹ ÍĎÖŐ ×ÉÄÁĚÉÔÉ ÚÇĎŇÔĎË (Ú×ÁÖÁŔŢÉ ÎÁ 'foldmethod')" --- 1833,1835 ---- msgid "E351: Cannot delete fold with current 'foldmethod'" ! msgstr "E351: Ďĺ îđăč ţęäâíęćę ˙úđôćđě (˙ţâăâáŕę ďâ 'foldmethod')" *************** *** 1837,1839 **** msgid "E221: 'commentstring' is empty" ! msgstr "E221: ĎĐĂŚŃ 'commentstring' ĐĎŇĎÖÎŃ" --- 1837,1839 ---- msgid "E221: 'commentstring' is empty" ! msgstr "E221: đňçŚó 'commentstring' ňđôđăďó" *************** *** 1841,1843 **** msgid "E222: Add to read buffer" ! msgstr "E222: âŐĆĹŇ ŐÖĹ ÂŐĚĎ ÚŢÉÔÁÎĎ [ĐĎÍÉĚËÁ ĐŇĎÇŇÁÍÉ]" --- 1841,1843 ---- msgid "E222: Add to read buffer" ! msgstr "E222: ×čöĺô čăĺ ÷číđ ˙ŕęćâďđ [ňđîęíěâ ňôđúôâîę]" *************** *** 1845,1847 **** msgid "E223: recursive mapping" ! msgstr "E332: úÁÍŚÎÁ ÚÁĂÉËĚĹÎÁ" --- 1845,1847 ---- msgid "E223: recursive mapping" ! msgstr "E332: ßâîŚďâ ˙âçęěíĺďâ" *************** *** 1851,1853 **** msgid "E224: global abbreviation already exists for %s" ! msgstr "úÁÇÁĚŘÎĹ ÓËĎŇĎŢĹÎÎŃ ÄĚŃ %s ×ÖĹ ŚÓÎŐ¤" --- 1851,1853 ---- msgid "E224: global abbreviation already exists for %s" ! msgstr "ßâúâíűďĺ őěđôđŕĺďďó äíó %s ţăĺ Śőďč¤" *************** *** 1857,1859 **** msgid "E225: global mapping already exists for %s" ! msgstr "úÁÇÁĚŘÎÁ ÚÁÍŚÎÁ ÄĚŃ %s ×ÖĹ ŚÓÎŐ¤" --- 1857,1859 ---- msgid "E225: global mapping already exists for %s" ! msgstr "ßâúâíűďâ ˙âîŚďâ äíó %s ţăĺ Śőďč¤" *************** *** 1863,1865 **** msgid "E226: abbreviation already exists for %s" ! msgstr "óËĎŇĎŢĹÎÎŃ ÄĚŃ %s ×ÓĹ ŚÓÎŐ¤" --- 1863,1865 ---- msgid "E226: abbreviation already exists for %s" ! msgstr "Őěđôđŕĺďďó äíó %s ţőĺ Śőďč¤" *************** *** 1869,1871 **** msgid "E227: mapping already exists for %s" ! msgstr "úÁÍŚÎÁ ÄĚŃ %s ×ÖĹ ŚÓÎŐ¤" --- 1869,1871 ---- msgid "E227: mapping already exists for %s" ! msgstr "ßâîŚďâ äíó %s ţăĺ Śőďč¤" *************** *** 1874,1876 **** msgid "No abbreviation found" ! msgstr "óËĎŇĎŢĹÎÎŃ ÎĹ ÚÎÁĘÄĹÎĎ" --- 1874,1876 ---- msgid "No abbreviation found" ! msgstr "Őěđôđŕĺďďó ďĺ ˙ďâëäĺďđ" *************** *** 1878,1880 **** msgid "No mapping found" ! msgstr "úÁÍŚÎÉ ÎĹ ÚÎÁĘÄĹÎĎ" --- 1878,1880 ---- msgid "No mapping found" ! msgstr "ßâîŚďę ďĺ ˙ďâëäĺďđ" *************** *** 1882,1884 **** msgid "E228: makemap: Illegal mode" ! msgstr "E228: makemap: ÷ÎŐÔŇŚŰÎŃ ĐĎÍÉĚËÁ" --- 1882,1884 ---- msgid "E228: makemap: Illegal mode" ! msgstr "E228: makemap: ŢďčćôŚůďó ňđîęíěâ" *************** *** 1886,1888 **** msgid " " ! msgstr "<ÎĹÍĎÖĚÉ×Ď ×ŚÄËŇÉÔÉ> " --- 1886,1888 ---- msgid " " ! msgstr "<ďĺîđăíęţđ ţŚäěôęćę> " *************** *** 1891,1893 **** msgid "vim_SelFile: can't get font %s" ! msgstr "vim_SelFile: ÎĹ ÍĎÖŐ ĎÔŇÉÍÁÔÉ ŰŇÉĆÔ %s" --- 1891,1893 ---- msgid "vim_SelFile: can't get font %s" ! msgstr "vim_SelFile: ďĺ îđăč đćôęîâćę ůôęöć %s" *************** *** 1895,1897 **** msgid "vim_SelFile: can't return to current directory" ! msgstr "vim_SelFile: ÎĹ ÍĎÖŐ ĐĎ×ĹŇÎÉÔŐÓŃ × ĐĎÔĎŢÎŐ ÄÉŇĹËÔĎŇŚŔ" --- 1895,1897 ---- msgid "vim_SelFile: can't return to current directory" ! msgstr "vim_SelFile: ďĺ îđăč ňđţĺôďęćčőó ţ ňđćđŕďč äęôĺěćđôŚá" *************** *** 1899,1901 **** msgid "Pathname:" ! msgstr "űĚŃČ:" --- 1899,1901 ---- msgid "Pathname:" ! msgstr "Ůíóé:" *************** *** 1903,1905 **** msgid "vim_SelFile: can't get current directory" ! msgstr "vim_SelFile: ÎĹ ÍĎÖŐ ÄŚÓÔÁÔÉ ĐĎÔĎŢÎŐ ÄÉŇĹËÔĎŇŚŔ" --- 1903,1905 ---- msgid "vim_SelFile: can't get current directory" ! msgstr "vim_SelFile: ďĺ îđăč äŚőćâćę ňđćđŕďč äęôĺěćđôŚá" *************** *** 1916,1918 **** msgid "Vim dialog" ! msgstr "äŚÁĚĎÇ Vim" --- 1916,1918 ---- msgid "Vim dialog" ! msgstr "ÄŚâíđú Vim" *************** *** 1920,1922 **** msgid "Scrollbar Widget: Could not get geometry of thumb pixmap." ! msgstr "Scrollbar Widget: ÎĹ ÍĎÖŐ ×ÚÎÁÔÉ ŇĎÚÍŚŇ ÓËĎŇĎŢĹÎϧ ËÁŇÔÉÎËÉ." --- 1920,1922 ---- msgid "Scrollbar Widget: Could not get geometry of thumb pixmap." ! msgstr "Scrollbar Widget: ďĺ îđăč ţ˙ďâćę ôđ˙îŚô őěđôđŕĺďđ§ ěâôćęďěę." *************** *** 1925,1927 **** msgstr "" ! "E232: îĹ ÍĎÖŐ ÓÔ×ĎŇÉÔÉ BalloonEval Ú ĐĎ׌ÄĎÍĚĹÎÎŃÍ Ś ĆŐÎËĂŚ¤Ŕ ĎÄÎĎŢÁÓÎĎ" --- 1925,1927 ---- msgstr "" ! "E232: Ďĺ îđăč őćţđôęćę BalloonEval ˙ ňđţŚäđîíĺďďóî Ś öčďě猤á đäďđŕâőďđ" *************** *** 1930,1932 **** msgid "E229: Cannot start the GUI" ! msgstr "E229: îĹ ÍĎÖŐ ŇĎÚĐĎŢÁÔÉ GUI" --- 1930,1932 ---- msgid "E229: Cannot start the GUI" ! msgstr "E229: Ďĺ îđăč ôđ˙ňđŕâćę GUI" *************** *** 1936,1938 **** msgid "E230: Cannot read from \"%s\"" ! msgstr "E230: îĹ ÍĎÖŐ ŢÉÔÁÔÉ Ú \"%s\"" --- 1936,1938 ---- msgid "E230: Cannot read from \"%s\"" ! msgstr "E230: Ďĺ îđăč ŕęćâćę ˙ \"%s\"" *************** *** 1941,1943 **** msgid "E231: 'guifontwide' invalid" ! msgstr "E231: 'guifontwide' ×ÉÚÎÁŢĹÎĎ ÎĹ׌ŇÎĎ" --- 1941,1943 ---- msgid "E231: 'guifontwide' invalid" ! msgstr "E231: 'guifontwide' ţę˙ďâŕĺďđ ďĺţŚôďđ" *************** *** 1946,1948 **** msgid "Error" ! msgstr "đĎÍÉĚËÁ" --- 1946,1948 ---- msgid "Error" ! msgstr "Ňđîęíěâ" *************** *** 1955,1957 **** msgid "Vim dialog..." ! msgstr "äŚÁĚĎÇ Vim..." --- 1955,1957 ---- msgid "Vim dialog..." ! msgstr "ÄŚâíđú Vim..." *************** *** 1959,1961 **** msgid "VIM - Search and Replace..." ! msgstr "VIM - úÎÁĘÔÉ Ś ÚÁÍŚÎÉÔÉ..." --- 1959,1961 ---- msgid "VIM - Search and Replace..." ! msgstr "VIM - ßďâëćę Ś ˙âîŚďęćę..." *************** *** 1963,1965 **** msgid "VIM - Search..." ! msgstr "VIM - đĎŰŐË" --- 1963,1965 ---- msgid "VIM - Search..." ! msgstr "VIM - Ňđůčě" *************** *** 1967,1969 **** msgid "Find what:" ! msgstr "úÎÁĘÔÉ:" --- 1967,1969 ---- msgid "Find what:" ! msgstr "ßďâëćę:" *************** *** 1971,1973 **** msgid "Replace with:" ! msgstr "úÁÍŚÎÁ:" --- 1971,1973 ---- msgid "Replace with:" ! msgstr "ßâîŚďâ:" *************** *** 1976,1978 **** msgid "Match exact word only" ! msgstr "÷×ÁÖÁÔÉ ÚÁ ÚÂŚÇ ĚÉŰĹ ĐĎ×ÎĹ ÓĚĎ×Ď" --- 1976,1978 ---- msgid "Match exact word only" ! msgstr "Ţţâăâćę ˙â ˙÷Śú íęůĺ ňđţďĺ őíđţđ" *************** *** 1980,1982 **** msgid "Direction" ! msgstr "îÁĐŇŃÍ" --- 1980,1982 ---- msgid "Direction" ! msgstr "Ďâňôóî" *************** *** 1985,1987 **** msgid "Up" ! msgstr "äĎÇĎŇÉ" --- 1985,1987 ---- msgid "Up" ! msgstr "Äđúđôę" *************** *** 1989,1991 **** msgid "Down" ! msgstr "őÎÉÚ" --- 1989,1991 ---- msgid "Down" ! msgstr "Čďę˙" *************** *** 1994,1996 **** msgid "Find Next" ! msgstr "úÎÁĘÔÉ ÎÁÓÔŐĐÎÉĘ ×ÁŇŚÁÎÔ" --- 1994,1996 ---- msgid "Find Next" ! msgstr "ßďâëćę ďâőćčňďęë ţâôŚâďć" *************** *** 1999,2001 **** msgid "Replace" ! msgstr "úÁÍŚÎÉÔÉ" --- 1999,2001 ---- msgid "Replace" ! msgstr "ßâîŚďęćę" *************** *** 2004,2006 **** msgid "Replace All" ! msgstr "úÁÍŚÎÉÔÉ ŐÓŚ" --- 2004,2006 ---- msgid "Replace All" ! msgstr "ßâîŚďęćę čőŚ" *************** *** 2008,2010 **** msgid "E233: cannot open display" ! msgstr "E233: îĹ ÍĎÖŐ ×ŚÄËŇÉÔÉ ÄÉÓĐĚĹĘ" --- 2008,2010 ---- msgid "E233: cannot open display" ! msgstr "E233: Ďĺ îđăč ţŚäěôęćę äęőňíĺë" *************** *** 2014,2016 **** msgid "E234: Unknown fontset: %s" ! msgstr "E234: îĹ׌ÄĎÍÉĘ fontset: %s" --- 2014,2016 ---- msgid "E234: Unknown fontset: %s" ! msgstr "E234: ĎĺţŚäđîęë fontset: %s" *************** *** 2019,2021 **** msgid "Font Selection" ! msgstr "÷ÉÄŚĚĹÎÎŃ" --- 2019,2021 ---- msgid "Font Selection" ! msgstr "ŢęäŚíĺďďó" *************** *** 2024,2026 **** msgid "E235: Unknown font: %s" ! msgstr "îĹ׌ÄĎÍÉĘ ŰŇÉĆÔ: %s" --- 2024,2026 ---- msgid "E235: Unknown font: %s" ! msgstr "ĎĺţŚäđîęë ůôęöć: %s" *************** *** 2030,2032 **** msgid "E236: Font \"%s\" is not fixed-width" ! msgstr "E236: űŇÉĆÔ \"%s\" ÎĹ ÍĎÎĎŰÉŇÉÎÎÉĘ" --- 2030,2032 ---- msgid "E236: Font \"%s\" is not fixed-width" ! msgstr "E236: Ůôęöć \"%s\" ďĺ îđďđůęôęďďęë" *************** *** 2036,2038 **** msgid "E242: Color name not recognized: %s" ! msgstr "E242: îĹÚŇĎÚŐÍŚĚÁ ÎÁÚ×Á ËĎĚŘĎŇŐ: %s" --- 2036,2038 ---- msgid "E242: Color name not recognized: %s" ! msgstr "E242: Ďĺ˙ôđ˙čîŚíâ ďâ˙ţâ ěđíűđôč: %s" *************** *** 2041,2043 **** msgid "Used CUT_BUFFER0 instead of empty selection" ! msgstr "÷ÉËĎŇÉÓÔÁÎĎ CUT_BUFFER0 ÚÁÍŚÓÔŘ ĐĎŇĎÖÎŘĎÇĎ ×ÉÄŚĚĹÎÎŃ" --- 2041,2043 ---- msgid "Used CUT_BUFFER0 instead of empty selection" ! msgstr "Ţęěđôęőćâďđ CUT_BUFFER0 ˙âîŚőćű ňđôđăďűđúđ ţęäŚíĺďďó" *************** *** 2045,2047 **** msgid "Filter" ! msgstr "ćŚĚŘÔŇ" --- 2045,2047 ---- msgid "Filter" ! msgstr "ÖŚíűćô" *************** *** 2049,2051 **** msgid "Directories" ! msgstr "ÄÉŇĹËÔĎŇŚ§" --- 2049,2051 ---- msgid "Directories" ! msgstr "äęôĺěćđôŚ§" *************** *** 2053,2055 **** msgid "Help" ! msgstr "äĎĐĎÍĎÇÁ" --- 2053,2055 ---- msgid "Help" ! msgstr "Äđňđîđúâ" *************** *** 2057,2059 **** msgid "Files" ! msgstr "ćÁĘĚÉ" --- 2057,2059 ---- msgid "Files" ! msgstr "Öâëíę" *************** *** 2061,2063 **** msgid "Selection" ! msgstr "÷ÉÂŚŇ ŰŇÉĆÔÁ" --- 2061,2063 ---- msgid "Selection" ! msgstr "Ţę÷Śô ůôęöćâ" *************** *** 2065,2067 **** msgid "Undo" ! msgstr "÷ŚÄÍŚÎÁ" --- 2065,2067 ---- msgid "Undo" ! msgstr "ŢŚäîŚďâ" *************** *** 2071,2074 **** msgstr "" ! "E235: ń ÎĹ ÚÎÁŔ ÝĎ ÔÁËĹ riscos, × őËŇÁ§ÎŚ ÔÁËĎÇĎ ÎĹÍÁ¤.. (Á ÔŐÔ ÝĹ Ę ŃËÉĘÓŘ " ! "ŰŇÉĆÔ ÎĹ ČĎŢĹ ×ÁÎÔÁÖÉÔÉÓŃ: %s)" --- 2071,2074 ---- msgstr "" ! "E235: Ó ďĺ ˙ďâá üđ ćâěĺ riscos, ţ Čěôâ§ďŚ ćâěđúđ ďĺîâ¤.. (â ćčć üĺ ë óěęëőű " ! "ůôęöć ďĺ éđŕĺ ţâďćâăęćęőó: %s)" *************** *** 2078,2080 **** msgid "E235: Can't use font %s" ! msgstr "E235: îĹ ÍĎÖŐ ×ÉËĎŇÉÓÔÁÔÉ ŰŇÉĆÔ %s" --- 2078,2080 ---- msgid "E235: Can't use font %s" ! msgstr "E235: Ďĺ îđăč ţęěđôęőćâćę ůôęöć %s" *************** *** 2084,2086 **** msgid "E242: Missing color: %s" ! msgstr "E242: ÷ÔŇÁŢĹÎĎ ËĎĚŚŇ: %s" --- 2084,2086 ---- msgid "E242: Missing color: %s" ! msgstr "E242: Ţćôâŕĺďđ ěđíŚô: %s" *************** *** 2093,2095 **** "\n" ! "ěŃËÁ¤ÍĎ ÄŚÔĹĘ ÍŚĚŚĂŚĎÎĹŇĎÍ. :-)\n" --- 2093,2095 ---- "\n" ! "Íóěâ¤îđ äŚćĺë îŚíŚçŚđďĺôđî. :-)\n" *************** *** 2099,2101 **** msgstr "" ! "E243: áŇÇŐÍĹÎÔ ÎĹ ĐŚÄÔŇÉÍŐ¤ŘÔŘÓŃ: \"-%s\", ×ÉËŐŇÉÓÔĎ×ŐĘÔĹ ×ĹŇÓŚŔ Ú OLE." --- 2099,2101 ---- msgstr "" ! "E243: Âôúčîĺďć ďĺ ňŚäćôęîč¤űćűőó: \"-%s\", ţęěčôęőćđţčëćĺ ţĺôőŚá ˙ OLE." *************** *** 2104,2106 **** msgid "Find string (use '\\\\' to find a '\\')" ! msgstr "VIM - đĎŰŐË" --- 2104,2106 ---- msgid "Find string (use '\\\\' to find a '\\')" ! msgstr "VIM - Ňđůčě" *************** *** 2108,2110 **** msgid "Find & Replace (use '\\\\' to find a '\\')" ! msgstr "VIM - úÎÁĘÔÉ Ś ÚÁÍŚÎÉÔÉ..." --- 2108,2110 ---- msgid "Find & Replace (use '\\\\' to find a '\\')" ! msgstr "VIM - ßďâëćę Ś ˙âîŚďęćę..." *************** *** 2113,2116 **** msgstr "" ! "Vim: (ec1) îĹÍÁ¤ ׌ĚŘÎÉČ ÓĹËĂŚĘ Ő ÔÁÂĚÉĂŚ ËĎĚŘĎŇŚ×. äĹŃËŚ ËĎĚŘĎŇÉ ÍĎÖŐÔŘ " ! "ÂŐÔÉ ×ÔŇÁŢĹÎŚ" --- 2113,2116 ---- msgstr "" ! "Vim: (ec1) Ďĺî⤠ţŚíűďęé őĺěçŚë č ćâ÷íęçŚ ěđíűđôŚţ. ÄĺóěŚ ěđíűđôę îđăčćű " ! "÷čćę ţćôâŕĺďŚ" *************** *** 2119,2121 **** msgid "E250: Fonts for the following charsets are missing in fontset %s:" ! msgstr "E250: űŇÉĆÔÉ ÄĚŃ ĂŘĎÇĎ ÎÁÂĎŇŐ ÓÉÍ×ĎĚŚ× ×ŚÄÓŐÔÎŚ Ő fontset %s:" --- 2119,2121 ---- msgid "E250: Fonts for the following charsets are missing in fontset %s:" ! msgstr "E250: Ůôęöćę äíó çűđúđ ďâ÷đôč őęîţđíŚţ ţŚäőčćďŚ č fontset %s:" *************** *** 2125,2127 **** msgid "E252: Fontset name: %s" ! msgstr "E252: îÁÚ×Á fontset: %s" --- 2125,2127 ---- msgid "E252: Fontset name: %s" ! msgstr "E252: Ďâ˙ţâ fontset: %s" *************** *** 2131,2133 **** msgid "Font '%s' is not fixed-width" ! msgstr "űŇÉĆÔ '%s' ÎĹ ¤ ÍĎÎĎŰÉŇÉÎÎÉÍ" --- 2131,2133 ---- msgid "Font '%s' is not fixed-width" ! msgstr "Ůôęöć '%s' ďĺ ¤ îđďđůęôęďďęî" *************** *** 2136,2138 **** msgid "E253: Fontset name: %s\n" ! msgstr "E252: îÁÚ×Á fontset: %s\n" --- 2136,2138 ---- msgid "E253: Fontset name: %s\n" ! msgstr "E252: Ďâ˙ţâ fontset: %s\n" *************** *** 2141,2143 **** msgid "Font0: %s\n" ! msgstr "űŇÉĆÔ0: %s\n" --- 2141,2143 ---- msgid "Font0: %s\n" ! msgstr "Ůôęöć0: %s\n" *************** *** 2146,2148 **** msgid "Font1: %s\n" ! msgstr "űŇÉĆÔ1: %s\n" --- 2146,2148 ---- msgid "Font1: %s\n" ! msgstr "Ůôęöć1: %s\n" *************** *** 2151,2153 **** msgid "Font%d width is not twice that of font0\n" ! msgstr "öÉŇÎŚÓÔŘ ŰŇÉĆÔÁ %d ÍÁ¤ ÂŐÔÉ × Ä׌ތ ÂŚĚŘŰĎŔ ÚÁ ÔĎ×ÝÉÎŐ font0\n" --- 2151,2153 ---- msgid "Font%d width is not twice that of font0\n" ! msgstr "ĂęôďŚőćű ůôęöćâ %d î⤠÷čćę ţ äţŚŕŚ ÷Śíűůđá ˙â ćđţüęďč font0\n" *************** *** 2156,2158 **** msgid "Font0 width: %ld\n" ! msgstr "öÉŇÎŚÓÔŘ font0: %ld\n" --- 2156,2158 ---- msgid "Font0 width: %ld\n" ! msgstr "ĂęôďŚőćű font0: %ld\n" *************** *** 2164,2166 **** msgstr "" ! "öÉŇÎŚÓÔŘ font1: %ld\n" "\n" --- 2164,2166 ---- msgstr "" ! "ĂęôďŚőćű font1: %ld\n" "\n" *************** *** 2170,2172 **** msgid "E254: Cannot allocate color %s" ! msgstr "E254: îĹ ÍĎÖŐ ŇĎÚÍŚÓÔÉÔÉ ËĎĚŚŇ %s" --- 2170,2172 ---- msgid "E254: Cannot allocate color %s" ! msgstr "E254: Ďĺ îđăč ôđ˙îŚőćęćę ěđíŚô %s" *************** *** 2175,2177 **** msgid "E255: Couldn't read in sign data!" ! msgstr "E255: îĹ ÍĎÖÎÁ ÚŢÉÔÁÔÉ ÄÁÎŚ ÎÁĐÉÓŐ!" --- 2175,2177 ---- msgid "E255: Couldn't read in sign data!" ! msgstr "E255: Ďĺ îđăďâ ˙ŕęćâćę äâďŚ ďâňęőč!" *************** *** 2179,2181 **** msgid "E256: Hangul automata ERROR" ! msgstr "E256: đĎÍÉĚËÁ `Hangul automata' [ĐĎÍÉĚËÁ ĐŇĎÇŇÁÍÉ]" --- 2179,2181 ---- msgid "E256: Hangul automata ERROR" ! msgstr "E256: Ňđîęíěâ `Hangul automata' [ňđîęíěâ ňôđúôâîę]" *************** *** 2184,2186 **** msgid "Add a new database" ! msgstr "äĎÄÁÔÉ ÎĎ×Ő ÂÁÚŐ ÄÁÎÉČ" --- 2184,2186 ---- msgid "Add a new database" ! msgstr "Äđäâćę ďđţč ÷â˙č äâďęé" *************** *** 2188,2190 **** msgid "Query for a pattern" ! msgstr "úÁĐÉÔ ÚÁ ÚŇÁÚËĎÍ" --- 2188,2190 ---- msgid "Query for a pattern" ! msgstr "ßâňęć ˙â ˙ôâ˙ěđî" *************** *** 2192,2194 **** msgid "Show this message" ! msgstr "đĎËÁÚÁÔÉ ĂĹ ĐĎ׌ÄĎÍĚĹÎÎŃ" --- 2192,2194 ---- msgid "Show this message" ! msgstr "Ňđěâ˙âćę çĺ ňđţŚäđîíĺďďó" *************** *** 2196,2198 **** msgid "Kill a connection" ! msgstr "úÎÉÝÉÔÉ Ú'¤ÄÎÁÎÎŃ" --- 2196,2198 ---- msgid "Kill a connection" ! msgstr "ßďęüęćę ˙'¤äďâďďó" *************** *** 2200,2202 **** msgid "Reinit all connections" ! msgstr "ňĎÚĐĎŢÁÔÉ Ú ĐĎŢÁÔËŐ ŐÓŚ Ú'¤ÄÎÁÎÎŃ" --- 2200,2202 ---- msgid "Reinit all connections" ! msgstr "Ôđ˙ňđŕâćę ˙ ňđŕâćěč čőŚ ˙'¤äďâďďó" *************** *** 2204,2206 **** msgid "Show connections" ! msgstr "đĎËÁÚÁÔÉ Ú'¤ÄÎÁÎÎŃ" --- 2204,2206 ---- msgid "Show connections" ! msgstr "Ňđěâ˙âćę ˙'¤äďâďďó" *************** *** 2208,2210 **** msgid "This cscope command does not support splitting the window.\n" ! msgstr "ăŃ ËĎÍÁÎÄÁ cscope ÎĹ ŐÍŚ¤ ÄŚĚÉÔÉ ×ŚËÎĎ.\n" --- 2208,2210 ---- msgid "This cscope command does not support splitting the window.\n" ! msgstr "Çó ěđîâďäâ cscope ďĺ č äŚíęćę ţŚěďđ.\n" *************** *** 2212,2214 **** msgid "Usage: cstag " ! msgstr "÷ÉËĎŇÉÓÔĎ×ŐĘÔĹ: cstag <ĐĎÍŚÔËÁ>" --- 2212,2214 ---- msgid "Usage: cstag " ! msgstr "Ţęěđôęőćđţčëćĺ: cstag <ňđîŚćěâ>" *************** *** 2216,2218 **** msgid "E257: cstag: tag not found" ! msgstr "E257: cstag: ĐĎÍŚÔËŐ ÎĹ ÚÎÁĘÄĹÎĎ" --- 2216,2218 ---- msgid "E257: cstag: tag not found" ! msgstr "E257: cstag: ňđîŚćěč ďĺ ˙ďâëäĺďđ" *************** *** 2222,2224 **** msgid "stat(%s) error: %d" ! msgstr "stat(%s) ĐĎÍÉĚËÁ: %d" --- 2222,2224 ---- msgid "stat(%s) error: %d" ! msgstr "stat(%s) ňđîęíěâ: %d" *************** *** 2227,2229 **** msgid "Added cscope database %s" ! msgstr "äĎÄÁÎĎ ÂÁÚŐ ÄÁÎÉČ cscope %s" --- 2227,2229 ---- msgid "Added cscope database %s" ! msgstr "Äđäâďđ ÷â˙č äâďęé cscope %s" *************** *** 2232,2234 **** msgid "%s is not a directory or a valid cscope database" ! msgstr "%s ÎĹ ¤ ÎŚ ÄÉŇĹËÔĎŇŚ¤Ŕ ÎŚ ÂÁÚĎŔ ÄÁÎÉČ cscope" --- 2232,2234 ---- msgid "%s is not a directory or a valid cscope database" ! msgstr "%s ďĺ ¤ ďŚ äęôĺěćđôŚ¤á ďŚ ÷â˙đá äâďęé cscope" *************** *** 2237,2239 **** msgid "error reading cscope connection %d" ! msgstr "đĎÍÉĚËÁ ŢÉÔÁÎÎŃ Ú'¤ÄÎÁÎÎŃ cscope #%d" --- 2237,2239 ---- msgid "error reading cscope connection %d" ! msgstr "Ňđîęíěâ ŕęćâďďó ˙'¤äďâďďó cscope #%d" *************** *** 2241,2243 **** msgid "unknown cscope search type" ! msgstr "îĹ׌ÄĎÍŚĘ ÔÉĐ ĐĎŰŐËŐ cscope" --- 2241,2243 ---- msgid "unknown cscope search type" ! msgstr "ĎĺţŚäđîŚë ćęň ňđůčěč cscope" *************** *** 2245,2247 **** msgid "Could not create cscope pipes" ! msgstr "îĹ ÍĎÖŐ ÓÔ×ĎŇÉÔÉ ËÁÎÁĚ ÄĎ cscope" --- 2245,2247 ---- msgid "Could not create cscope pipes" ! msgstr "Ďĺ îđăč őćţđôęćę ěâďâí äđ cscope" *************** *** 2249,2251 **** msgid "cs_create_connection exec failed" ! msgstr "cs_create_connection: ĐĎÍÉĚËÁ ĐŚÄ ŢÁÓ ×ÉËĎÎÁÎÎŃ" --- 2249,2251 ---- msgid "cs_create_connection exec failed" ! msgstr "cs_create_connection: ňđîęíěâ ňŚä ŕâő ţęěđďâďďó" *************** *** 2253,2255 **** msgid "cs_create_connection: fdopen for to_fp failed" ! msgstr "cs_create_connection: fdopen ÄĚŃ to_fp ÎĹ ×ÄÁ×ÓŃ" --- 2253,2255 ---- msgid "cs_create_connection: fdopen for to_fp failed" ! msgstr "cs_create_connection: fdopen äíó to_fp ďĺ ţäâţőó" *************** *** 2257,2259 **** msgid "cs_create_connection: fdopen for fr_fp failed" ! msgstr "cs_create_connection: fdopen ÄĚŃ fr_fp ÎĹ ×ÄÁ×ÓŃ" --- 2257,2259 ---- msgid "cs_create_connection: fdopen for fr_fp failed" ! msgstr "cs_create_connection: fdopen äíó fr_fp ďĺ ţäâţőó" *************** *** 2261,2263 **** msgid "no cscope connections" ! msgstr "ÖĎÄÎĎÇĎ Ú'¤ÄÎÁÎŃ Ú cscope" --- 2261,2263 ---- msgid "no cscope connections" ! msgstr "ăđäďđúđ ˙'¤äďâďó ˙ cscope" *************** *** 2267,2269 **** msgid "E259: no matches found for cscope query %s of %s" ! msgstr "E259: äĚŃ %s-ÚÁĐÉÔŐ cscope ÓÔĎÓĎ×ÎĎ %s ÎĹ ÚÎÁĘÄĹÎĎ ÓŚŇÎÉËŚ×" --- 2267,2269 ---- msgid "E259: no matches found for cscope query %s of %s" ! msgstr "E259: Äíó %s-˙âňęćč cscope őćđőđţďđ %s ďĺ ˙ďâëäĺďđ őŚôďęěŚţ" *************** *** 2272,2274 **** msgid "cscope commands:\n" ! msgstr "ËĎÍÁÎÄÉ cscope:\n" --- 2272,2274 ---- msgid "cscope commands:\n" ! msgstr "ěđîâďäę cscope:\n" *************** *** 2277,2279 **** msgid "%-5s: %-30s (Usage: %s)\n" ! msgstr "%-5s: %-30s (÷ÖÉ×ÁĘÔĹ: %s)\n" --- 2277,2279 ---- msgid "%-5s: %-30s (Usage: %s)\n" ! msgstr "%-5s: %-30s (Ţăęţâëćĺ: %s)\n" *************** *** 2281,2283 **** msgid "duplicate cscope database not added" ! msgstr "ĐĎ×ÔĎŇÎÁ ÂÁÚÁ ÄÁÎÉČ cscope ÎĹ ÄĎÄÁÎÁ" --- 2281,2283 ---- msgid "duplicate cscope database not added" ! msgstr "ňđţćđôďâ ÷â˙â äâďęé cscope ďĺ äđäâďâ" *************** *** 2285,2287 **** msgid "maximum number of cscope connections reached" ! msgstr "ËŚĚŘËŚÓÔŘ Ú'¤ÄÎÁÎŘ Ú cscope ÄĎÓŃÇĚÁ ÍÁËÓÉÍŐÍŐ" --- 2285,2287 ---- msgid "maximum number of cscope connections reached" ! msgstr "ěŚíűěŚőćű ˙'¤äďâďű ˙ cscope äđőóúíâ îâěőęîčîč" *************** *** 2289,2291 **** msgid "E260: cscope connection not found" ! msgstr "E260: Ú'¤ÄÎÁÎÎŃ Ú cscope ÎĹ ÚÎÁĘÄĹÎĎ" --- 2289,2291 ---- msgid "E260: cscope connection not found" ! msgstr "E260: ˙'¤äďâďďó ˙ cscope ďĺ ˙ďâëäĺďđ" *************** *** 2295,2297 **** msgid "E261: cscope connection %s not found" ! msgstr "E261: Ú'¤ÄÎÁÎÎŃ Ú cscope %s ÎĹ ÚÎÁĘÄĹÎĎ" --- 2295,2297 ---- msgid "E261: cscope connection %s not found" ! msgstr "E261: ˙'¤äďâďďó ˙ cscope %s ďĺ ˙ďâëäĺďđ" *************** *** 2300,2302 **** msgid "cscope connection closed" ! msgstr "Ú'¤ÄÎÁÎÎŃ Ú cscope ÚÁËŚÎŢĹÎĎ" --- 2300,2302 ---- msgid "cscope connection closed" ! msgstr "˙'¤äďâďďó ˙ cscope ˙âěŚďŕĺďđ" *************** *** 2305,2307 **** msgid "cscope connection %s closed\n" ! msgstr "Ú'¤ÄÎÁÎÎŃ Ú cscope %s ÚÁËŚÎŢĹÎĎ\n" --- 2305,2307 ---- msgid "cscope connection %s closed\n" ! msgstr "˙'¤äďâďďó ˙ cscope %s ˙âěŚďŕĺďđ\n" *************** *** 2310,2312 **** msgid "fatal error in cs_manage_matches" ! msgstr "cs_manage_matches: ÓŚŇÎÉËŚ× ÂŚĚŘŰĹ ÎĹÍÁ¤ [ĐĎÍÉĚËÁ ĐŇĎÇŇÁÍÉ]" --- 2310,2312 ---- msgid "fatal error in cs_manage_matches" ! msgstr "cs_manage_matches: őŚôďęěŚţ ÷Śíűůĺ ďĺî⤠[ňđîęíěâ ňôđúôâîę]" *************** *** 2315,2317 **** msgid "E262: error reading cscope connection %d" ! msgstr "E262: ĐĎÍÉĚËÁ ŢÉÔÁÎÎŃ Ú Ú'¤ÄÎÁÎÎŃ cscope %s" --- 2315,2317 ---- msgid "E262: error reading cscope connection %d" ! msgstr "E262: ňđîęíěâ ŕęćâďďó ˙ ˙'¤äďâďďó cscope %d" *************** *** 2320,2322 **** msgid "couldn't malloc\n" ! msgstr "ÎĹ ÍĎÖŐ ×ÉÄŚĚÉÔÉ ĐÁÍ'ŃÔŘ\n" --- 2320,2322 ---- msgid "couldn't malloc\n" ! msgstr "ďĺ îđăč ţęäŚíęćę ňâî'óćű\n" *************** *** 2325,2327 **** msgid "Cscope tag: %s\n" ! msgstr "đĎÍŚÔËÁ cscope: %s\n" --- 2325,2327 ---- msgid "Cscope tag: %s\n" ! msgstr "ŇđîŚćěâ cscope: %s\n" *************** *** 2329,2331 **** msgid " # line" ! msgstr " # ŇŃÄĎË" --- 2329,2331 ---- msgid " # line" ! msgstr " # ôóäđě" *************** *** 2333,2335 **** msgid "filename / context / line\n" ! msgstr "ĆÁĘĚ / ËĎÎÔĹËÓÔ / ŇŃÄĎË\n" --- 2333,2335 ---- msgid "filename / context / line\n" ! msgstr "öâëí / ěđďćĺěőć / ôóäđě\n" *************** *** 2337,2339 **** msgid "All cscope databases reset" ! msgstr "őÓŚ Ú'¤ÄÎÁÎÎŃ Ú cscope ĐĹŇĹÚÁ×ÁÎÔÁÖĹÎĎ" --- 2337,2339 ---- msgid "All cscope databases reset" ! msgstr "ČőŚ ˙'¤äďâďďó ˙ cscope ňĺôĺ˙âţâďćâăĺďđ" *************** *** 2341,2343 **** msgid "no cscope connections\n" ! msgstr "öĎÄÎĎÇĎ Ú'¤ÄÎÁÎÎŃ Ú cscope\n" --- 2341,2343 ---- msgid "no cscope connections\n" ! msgstr "Ăđäďđúđ ˙'¤äďâďďó ˙ cscope\n" *************** *** 2345,2347 **** msgid " # pid database name prepend path\n" ! msgstr " # pid ÎÁÚ×Á ÂÁÚÉ ÄÁÎÉČ ŰĚŃČ\n" --- 2345,2347 ---- msgid " # pid database name prepend path\n" ! msgstr " # pid ďâ˙ţâ ÷â˙ę äâďęé ůíóé\n" *************** *** 2350,2352 **** msgid "%2d %-5ld %-34s \n" ! msgstr "%2d %-5ld %-34s <ÖĎÖÎĎÇĎ>\n" --- 2350,2352 ---- msgid "%2d %-5ld %-34s \n" ! msgstr "%2d %-5ld %-34s <ăđăďđúđ>\n" *************** *** 2357,2360 **** msgstr "" ! "E263: ÷ÉÂÁŢÔĹ, ĂŃ ËĎÍÁÎÄÁ ×ÉÍËÎŐÔÁ, ÂŚÂĚŚĎÔĹËÁ Python ÎĹ ÍĎÖĹ ÂŐÔÉ " ! "ÚÁ×ÁÎÔÁÖĹÎÁ." --- 2357,2360 ---- msgstr "" ! "E263: Ţę÷âŕćĺ, çó ěđîâďäâ ţęîěďčćâ, ÷Ś÷íŚđćĺěâ Python ďĺ îđăĺ ÷čćę " ! "˙âţâďćâăĺďâ." *************** *** 2362,2364 **** msgid "can't delete OutputObject attributes" ! msgstr "ÎĹ ÍĎÖŐ ×ÉÄÁĚÉÔÉ ÁÔŇÉÂŐÔÉ OutputObject" --- 2362,2364 ---- msgid "can't delete OutputObject attributes" ! msgstr "ďĺ îđăč ţęäâíęćę âćôę÷čćę OutputObject" *************** *** 2366,2368 **** msgid "softspace must be an integer" ! msgstr "softspace ÍÁ¤ ÂŐÔÉ ÎÁÔŐŇÁĚŘÎÉÍ" --- 2366,2368 ---- msgid "softspace must be an integer" ! msgstr "softspace î⤠÷čćę ďâćčôâíűďęî" *************** *** 2371,2373 **** msgid "invalid attribute" ! msgstr "ÎĹ׌ŇÎÉĘ ÁÔŇÉÂŐÔ" --- 2371,2373 ---- msgid "invalid attribute" ! msgstr "ďĺţŚôďęë âćôę÷čć" *************** *** 2375,2377 **** msgid "writelines() requires list of strings" ! msgstr "writelines() ĐĎÔŇŚÂĹÎ ÓĐÉÓĎË ŇŃÄËŚ×" --- 2375,2377 ---- msgid "writelines() requires list of strings" ! msgstr "writelines() ňđćôŚ÷ĺď őňęőđě ôóäěŚţ" *************** *** 2379,2381 **** msgid "E264: Python: Error initialising I/O objects" ! msgstr "E264: Python: đĎÍÉĚËÁ ŚÎŚĂŚŃĚŚÚÁĂŚ§ ĎÂ'¤ËÔŚ× ××ĎÄŐ/×É×ĎÄŐ" --- 2379,2381 ---- msgid "E264: Python: Error initialising I/O objects" ! msgstr "E264: Python: Ňđîęíěâ ŚďŚçŚóíŚ˙â猧 đ÷'¤ěćŚţ ţţđäč/ţęţđäč" *************** *** 2383,2385 **** msgid "invalid expression" ! msgstr "ÎĹ׌ŇÎÉĘ ×ÉŇÁÚ" --- 2383,2385 ---- msgid "invalid expression" ! msgstr "ďĺţŚôďęë ţęôâ˙" *************** *** 2387,2389 **** msgid "expressions disabled at compile time" ! msgstr "ĎÂŇĎÂËŐ ×ÉŇÁÚŚ× ÚÁÂĎŇĎÎĹÎĎ ĐĎÄ ŢÁÓ ËĎÍĐŚĚŃĂŚ§" --- 2387,2389 ---- msgid "expressions disabled at compile time" ! msgstr "đ÷ôđ÷ěč ţęôâ˙Śţ ˙â÷đôđďĺďđ ňđä ŕâő ěđîňŚíó猧" *************** *** 2391,2393 **** msgid "attempt to refer to deleted buffer" ! msgstr "ÓĐŇĎÂÁ ŢÉÔÁÔÉ ×ÉÄÁĚĹÎÉĘ ÂŐĆĹŇ" --- 2391,2393 ---- msgid "attempt to refer to deleted buffer" ! msgstr "őňôđ÷â ŕęćâćę ţęäâíĺďęë ÷čöĺô" *************** *** 2395,2397 **** msgid "line number out of range" ! msgstr "ÎĎÍĹŇ ŇŃÄËÁ ÚÁ ÍĹÖÁÍÉ ĆÁĘĚÁ" --- 2395,2397 ---- msgid "line number out of range" ! msgstr "ďđîĺô ôóäěâ ˙â îĺăâîę öâëíâ" *************** *** 2400,2402 **** msgid "" ! msgstr "<ĎÂ'¤ËÔ ÂŐĆĹŇÁ (×ÉÄÁĚĹÎĎ) × %8lX>" --- 2400,2402 ---- msgid "" ! msgstr "<đ÷'¤ěć ÷čöĺôâ (ţęäâíĺďđ) ţ %8lX>" *************** *** 2404,2406 **** msgid "invalid mark name" ! msgstr "ÎĹ׌ŇÎÁ ÎÁÚ×Á ĐĎÍŚÔËÉ" --- 2404,2406 ---- msgid "invalid mark name" ! msgstr "ďĺţŚôďâ ďâ˙ţâ ňđîŚćěę" *************** *** 2408,2410 **** msgid "no such buffer" ! msgstr "ÔÁËĎÇĎ ÂŐĆĹŇÁ ÎĹÍÁ¤" --- 2408,2410 ---- msgid "no such buffer" ! msgstr "ćâěđúđ ÷čöĺôâ ďĺîâ¤" *************** *** 2412,2414 **** msgid "attempt to refer to deleted window" ! msgstr "ÓÔŇĎÂÁ Ú×ĹŇÎŐÔÉÓŃ ÄĎ ×ÉÄÁĚĹÎĎÇĎ ×ŚËÎÁ" --- 2412,2414 ---- msgid "attempt to refer to deleted window" ! msgstr "őćôđ÷â ˙ţĺôďčćęőó äđ ţęäâíĺďđúđ ţŚěďâ" *************** *** 2416,2418 **** msgid "readonly attribute" ! msgstr "ĚÉŰĹ ÄĚŃ ŢÉÔÁÎÎŃ" --- 2416,2418 ---- msgid "readonly attribute" ! msgstr "íęůĺ äíó ŕęćâďďó" *************** *** 2420,2422 **** msgid "cursor position outside buffer" ! msgstr "ËŐŇÓĎŇ ÚÁ ÍĹÖÁÍÉ ÂŐĆĹŇÁ" --- 2420,2422 ---- msgid "cursor position outside buffer" ! msgstr "ěčôőđô ˙â îĺăâîę ÷čöĺôâ" *************** *** 2425,2427 **** msgid "" ! msgstr "<ĎÂ'¤ËÔ ×ŚËÎÁ (×ÉÄÁĚĹÎĎ) × %.8lX>" --- 2425,2427 ---- msgid "" ! msgstr "<đ÷'¤ěć ţŚěďâ (ţęäâíĺďđ) ţ %.8lX>" *************** *** 2430,2432 **** msgid "" ! msgstr "<ĎÂ'¤ËÔ ×ŚËÎÁ (ÎĹ׌ÄĎÍÉĘ) × %.8lX>" --- 2430,2432 ---- msgid "" ! msgstr "<đ÷'¤ěć ţŚěďâ (ďĺţŚäđîęë) ţ %.8lX>" *************** *** 2435,2437 **** msgid "" ! msgstr "<׌ËÎĎ %d>" --- 2435,2437 ---- msgid "" ! msgstr "<ţŚěďđ %d>" *************** *** 2439,2441 **** msgid "no such window" ! msgstr "ÔÁËĎÇĎ ×ŚËÎÁ ÎĹÍÁ¤" --- 2439,2441 ---- msgid "no such window" ! msgstr "ćâěđúđ ţŚěďâ ďĺîâ¤" *************** *** 2445,2447 **** msgid "cannot save undo information" ! msgstr "ÎĹ ÍĎÖŐ ÚÂĹŇĹÇÔÉ ŚÎĆĎŇÍÁĂŚŔ ÄĚŃ ×ŚÄÍŚÎÉ" --- 2445,2447 ---- msgid "cannot save undo information" ! msgstr "ďĺ îđăč ˙÷ĺôĺúćę ŚďöđôîâçŚá äíó ţŚäîŚďę" *************** *** 2449,2451 **** msgid "cannot delete line" ! msgstr "ÎĹÍĎÖĚÉ×Ď ×ÉÄÁĚÉÔÉ ŇŃÄĎË" --- 2449,2451 ---- msgid "cannot delete line" ! msgstr "ďĺîđăíęţđ ţęäâíęćę ôóäđě" *************** *** 2453,2455 **** msgid "cannot replace line" ! msgstr "ÎĹÍĎÖĚÉ×Ď ÚÁÍŚÎÉÔÉ ŇŃÄĎË" --- 2453,2455 ---- msgid "cannot replace line" ! msgstr "ďĺîđăíęţđ ˙âîŚďęćę ôóäđě" *************** *** 2457,2459 **** msgid "cannot insert line" ! msgstr "ÎĹ ÍĎÖŐ ×ÓÔÁ×ÉÔÉ ŇŃÄĎË" --- 2457,2459 ---- msgid "cannot insert line" ! msgstr "ďĺ îđăč ţőćâţęćę ôóäđě" *************** *** 2461,2463 **** msgid "string cannot contain newlines" ! msgstr "ÂŚĚŘŰ ÎŚÖ ĎÄÉÎ ŇŃÄĎË" --- 2461,2463 ---- msgid "string cannot contain newlines" ! msgstr "÷Śíűů ďŚă đäęď ôóäđě" *************** *** 2467,2469 **** msgstr "" ! "E266: ÷ÉÂÁŢÔĹ, ĂŃ ËĎÍÁÎÄÁ ×ÉÍËÎŐÔÁ, ÂŚÂĚŚĎÔĹËÁ Ruby ÎĹ ÍĎÖĹ ÂŐÔÉ ÚÁ×ÁÎÔÁÖĹÎÁ." --- 2467,2469 ---- msgstr "" ! "E266: Ţę÷âŕćĺ, çó ěđîâďäâ ţęîěďčćâ, ÷Ś÷íŚđćĺěâ Ruby ďĺ îđăĺ ÷čćę ˙âţâďćâăĺďâ." *************** *** 2473,2475 **** msgid "E273: unknown longjmp status %d" ! msgstr "E234: îĹ׌ÄĎÍÉĘ ÓÔÁÔŐÓ longjmp: %d" --- 2473,2475 ---- msgid "E273: unknown longjmp status %d" ! msgstr "E234: ĎĺţŚäđîęë őćâćčő longjmp: %d" *************** *** 2477,2479 **** msgid "Toggle implementation/definition" ! msgstr "đĹŇĹÍËÎŐÔÉ implementation/definition" --- 2477,2479 ---- msgid "Toggle implementation/definition" ! msgstr "Ňĺôĺîěďčćę implementation/definition" *************** *** 2481,2483 **** msgid "Show base class of" ! msgstr "úÎÁĘÔÉ ÂÁÚĎ×ÉĘ ËĚÁÓ" --- 2481,2483 ---- msgid "Show base class of" ! msgstr "ßďâëćę ÷â˙đţęë ěíâő" *************** *** 2485,2487 **** msgid "Show overridden member function" ! msgstr "đĎËÁÚÁÔÉ ÚÁÍŚÎĹÎŚ(overridden) ĆŐÎËĂŚ§-ŢĚĹÎÉ" --- 2485,2487 ---- msgid "Show overridden member function" ! msgstr "Ňđěâ˙âćę ˙âîŚďĺďŚ(overridden) öčďě猧-ŕíĺďę" *************** *** 2489,2491 **** msgid "Retrieve from file" ! msgstr "úŢÉÔÁÔÉ Ú ĆÁĘĚÁ" --- 2489,2491 ---- msgid "Retrieve from file" ! msgstr "ßŕęćâćę ˙ öâëíâ" *************** *** 2493,2495 **** msgid "Retrieve from project" ! msgstr "úŢÉÔÁÔÉ Ú ĐŇĎĹËÔŐ" --- 2493,2495 ---- msgid "Retrieve from project" ! msgstr "ßŕęćâćę ˙ ňôđĺěćč" *************** *** 2497,2499 **** msgid "Retrieve from all projects" ! msgstr "úŢÉÔÁÔÉ Ú ŐÓŚČ ĐŇĎĹËÔŚ×" --- 2497,2499 ---- msgid "Retrieve from all projects" ! msgstr "ßŕęćâćę ˙ čőŚé ňôđĺěćŚţ" *************** *** 2501,2503 **** msgid "Retrieve" ! msgstr "úŢÉÔÁÔÉ" --- 2501,2503 ---- msgid "Retrieve" ! msgstr "ßŕęćâćę" *************** *** 2505,2507 **** msgid "Show source of" ! msgstr "äÖĹŇĹĚĎ" --- 2505,2507 ---- msgid "Show source of" ! msgstr "Äăĺôĺíđ" *************** *** 2509,2511 **** msgid "Find symbol" ! msgstr "úÎÁĘÔÉ ÓÉÍ×ĎĚ" --- 2509,2511 ---- msgid "Find symbol" ! msgstr "ßďâëćę őęîţđí" *************** *** 2513,2515 **** msgid "Browse class" ! msgstr "đŇĎÄÉ×ÉÔÉÓŃ ËĚÁÓ" --- 2513,2515 ---- msgid "Browse class" ! msgstr "Ňôđäęţęćęőó ěíâő" *************** *** 2517,2519 **** msgid "Show class in hierarchy" ! msgstr "úÎÁĘÔÉ ËĚÁÓ × Ś¤ŇÁŇČŚ§" --- 2517,2519 ---- msgid "Show class in hierarchy" ! msgstr "ßďâëćę ěíâő ţ Ś¤ôâô錧" *************** *** 2521,2523 **** msgid "Show class in restricted hierarchy" ! msgstr "úÎÁĘÔÉ ËĚÁÓ × ÚÁÂĎŇĎÎĹÎŚĘ §¤ŇÁŇČŚ§" --- 2521,2523 ---- msgid "Show class in restricted hierarchy" ! msgstr "ßďâëćę ěíâő ţ ˙â÷đôđďĺďŚë §¤ôâô錧" *************** *** 2525,2527 **** msgid "Xref refers to" ! msgstr "Xref ×ËÁÚŐ¤ ÎÁ" --- 2525,2527 ---- msgid "Xref refers to" ! msgstr "Xref ţěâ˙č¤ ďâ" *************** *** 2529,2531 **** msgid "Xref referred by" ! msgstr "ÎÁ Xref ×ËÁÚÁÎĎ Ú" --- 2529,2531 ---- msgid "Xref referred by" ! msgstr "ďâ Xref ţěâ˙âďđ ˙" *************** *** 2533,2535 **** msgid "Xref has a" ! msgstr "Xref ÍÁ¤" --- 2533,2535 ---- msgid "Xref has a" ! msgstr "Xref îâ¤" *************** *** 2537,2539 **** msgid "Xref used by" ! msgstr "Xref ×ÉËĎŇÉÓÔÁÎĎ" --- 2537,2539 ---- msgid "Xref used by" ! msgstr "Xref ţęěđôęőćâďđ" *************** *** 2541,2543 **** msgid "Show docu of" ! msgstr "đĎËÁÚÁÔÉ docu" --- 2541,2543 ---- msgid "Show docu of" ! msgstr "Ňđěâ˙âćę docu" *************** *** 2545,2547 **** msgid "Generate docu for" ! msgstr "óÔ×ĎŇÉÔÉ docu ÄĚŃ" --- 2545,2547 ---- msgid "Generate docu for" ! msgstr "Őćţđôęćę docu äíó" *************** *** 2552,2555 **** msgstr "" ! "îĹ ÍĎÖŐ Ú¤ÄÎÁÔÉÓŃ Ú SNiFF+. đĹŇĹ׌ŇÔĹ ĎÔĎŢĹÎÎŃ\n" ! "(sniffemacs ÎĹ ÂŐĚĎ ÚÎÁĘÄĹÎĎ Ő ŰĚŃČŐ ĐĎŰŐËŐ).\n" --- 2552,2555 ---- msgstr "" ! "Ďĺ îđăč ˙¤äďâćęőó ˙ SNiFF+. ŇĺôĺţŚôćĺ đćđŕĺďďó\n" ! "(sniffemacs ďĺ ÷číđ ˙ďâëäĺďđ č ůíóéč ňđůčěč).\n" *************** *** 2557,2559 **** msgid "E274: Sniff: Error during read. Disconnected" ! msgstr "E274: Sniff: đĎÍÉĚËÁ ĐÁÄ ŢÁÓ ÚŢÉÔŐ×ÁÎÎŃ. ÷ŚÄ¤ÄÎÁÎĎ" --- 2557,2559 ---- msgid "E274: Sniff: Error during read. Disconnected" ! msgstr "E274: Sniff: Ňđîęíěâ ňâä ŕâő ˙ŕęćčţâďďó. ŢŚä¤äďâďđ" *************** *** 2561,2563 **** msgid "SNiFF+ is currently " ! msgstr "ÚÁŇÁÚ SNiFF" --- 2561,2563 ---- msgid "SNiFF+ is currently " ! msgstr "˙âôâ˙ SNiFF" *************** *** 2565,2567 **** msgid "not " ! msgstr "ÎĹ " --- 2565,2567 ---- msgid "not " ! msgstr "ďĺ " *************** *** 2569,2571 **** msgid "connected" ! msgstr "ЌĤÄÎÁÎÉĘ" --- 2569,2571 ---- msgid "connected" ! msgstr "ňŚä¤äďâďęë" *************** *** 2574,2576 **** msgid "E275: Unknown SNiFF+ request: %s" ! msgstr "E275: îĹ׌ÄĎÍĹ ÚÁĐÉÔÁÎÎŃ ÄĎ SNiFF+: %s" --- 2574,2576 ---- msgid "E275: Unknown SNiFF+ request: %s" ! msgstr "E275: ĎĺţŚäđîĺ ˙âňęćâďďó äđ SNiFF+: %s" *************** *** 2578,2580 **** msgid "E276: Error connecting to SNiFF+" ! msgstr "E276: đĎÍÉĚËÁ ĐŚÄ ŢÁÓ Ú¤ÄÎÁÎÎŃ Ú SNiFF+" --- 2578,2580 ---- msgid "E276: Error connecting to SNiFF+" ! msgstr "E276: Ňđîęíěâ ňŚä ŕâő ˙¤äďâďďó ˙ SNiFF+" *************** *** 2582,2584 **** msgid "E278: SNiFF+ not connected" ! msgstr "E278: SNiFF+ ΊЌĤÄÎÁÎĎ" --- 2582,2584 ---- msgid "E278: SNiFF+ not connected" ! msgstr "E278: SNiFF+ ďĺ ňŚä¤äďâďđ" *************** *** 2586,2588 **** msgid "E279: Not a SNiFF+ buffer" ! msgstr "E279: îĹ ¤ ÂŐĆĹŇĎÍ SNiFF+" --- 2586,2588 ---- msgid "E279: Not a SNiFF+ buffer" ! msgstr "E279: Ďĺ ¤ ÷čöĺôđî SNiFF+" *************** *** 2590,2592 **** msgid "Sniff: Error during write. Disconnected" ! msgstr "Sniff. ĐĎÍÉĚËÁ ÚÁĐÉÓŐ. ÷ŚÄ¤ÄÎÁÎĎ" --- 2590,2592 ---- msgid "Sniff: Error during write. Disconnected" ! msgstr "Sniff. ňđîęíěâ ˙âňęőč. ŢŚä¤äďâďđ" *************** *** 2594,2596 **** msgid "invalid buffer number" ! msgstr "ÎĹ׌ŇÎÁ ÎÁÚ×Á ÂŐĆĹŇÁ" --- 2594,2596 ---- msgid "invalid buffer number" ! msgstr "ďĺţŚôďâ ďâ˙ţâ ÷čöĺôâ" *************** *** 2598,2600 **** msgid "not implemented yet" ! msgstr "ÎĹ ÄŚ¤ (ĐĎËÉ ÝĎ)" --- 2598,2600 ---- msgid "not implemented yet" ! msgstr "ďĺ 䌤 (ňđěę üđ)" *************** *** 2602,2604 **** msgid "unknown option" ! msgstr "ÎĹ׌ÄĎÍÁ ĎĐĂŚŃ" --- 2602,2604 ---- msgid "unknown option" ! msgstr "ďĺţŚäđîâ đňçŚó" *************** *** 2607,2609 **** msgid "cannot set line(s)" ! msgstr "ÎĹ ÍĎÖŐ ÚÁÄÁÔÉ ŇŃÄËÉ" --- 2607,2609 ---- msgid "cannot set line(s)" ! msgstr "ďĺ îđăč ˙âäâćę ôóäěę" *************** *** 2612,2614 **** msgid "mark not set" ! msgstr "ĐĎÍŚÔËŐ ÎĹ ×ËÁÚÁÎĎ" --- 2612,2614 ---- msgid "mark not set" ! msgstr "ňđîŚćěč ďĺ ţěâ˙âďđ" *************** *** 2617,2619 **** msgid "row %d column %d" ! msgstr "ŇŃÄĎË %d ËĎĚĎÎËÁ %d" --- 2617,2619 ---- msgid "row %d column %d" ! msgstr "ôóäđě %d ěđíđďěâ %d" *************** *** 2621,2623 **** msgid "cannot insert/append line" ! msgstr "îĹ ÍĎÖŐ ×ÓÔÁ×ÉÔÉ/ÄĎÄÁÔÉ ŇŃÄĎË" --- 2621,2623 ---- msgid "cannot insert/append line" ! msgstr "Ďĺ îđăč ţőćâţęćę/äđäâćę ôóäđě" *************** *** 2625,2627 **** msgid "unknown flag: " ! msgstr "ÎĹ׌ÄĎÍÉĘ ĐŇÁĐĎŇĹĂŘ: " --- 2625,2627 ---- msgid "unknown flag: " ! msgstr "ďĺţŚäđîęë ňôâňđôĺçű: " *************** *** 2629,2631 **** msgid "unknown vimOption" ! msgstr "îĹ׌ÄĎÍÁ ĎĐĂŚŃ" --- 2629,2631 ---- msgid "unknown vimOption" ! msgstr "ĎĺţŚäđîâ đňçŚó" *************** *** 2633,2635 **** msgid "keyboard interrupt" ! msgstr "ĐĹŇĹŇ×ÁÎĎ ËĎŇÉÓÔŐ×ÁŢĹÍ" --- 2633,2635 ---- msgid "keyboard interrupt" ! msgstr "ňĺôĺôţâďđ ěđôęőćčţâŕĺî" *************** *** 2637,2639 **** msgid "vim error" ! msgstr "ĐĎÍÉĚËÁ Vim" --- 2637,2639 ---- msgid "vim error" ! msgstr "ňđîęíěâ Vim" *************** *** 2641,2643 **** msgid "cannot create buffer/window command: object is being deleted" ! msgstr "ÎĹ ÍĎÖŐ ÓÔ×ĎŇÉÔÉ ËĎÍÁÎÄŐ ÄĚŃ ×ŚËÎÁ/ÂŐĆĹŇÁ: ĎÂ'ĹËÔ ×ÉÄŃĚѤÔŘÓŃ" --- 2641,2643 ---- msgid "cannot create buffer/window command: object is being deleted" ! msgstr "ďĺ îđăč őćţđôęćę ěđîâďäč äíó ţŚěďâ/÷čöĺôâ: đ÷'ĺěć ţęäóíó¤ćűőó" *************** *** 2646,2648 **** "cannot register callback command: buffer/window is already being deleted" ! msgstr "îĹ ÍĎÖŐ ÚÁŇŤÓÔŇŐ×ÁÔÉ ĐĎÄŚŔ: ÂŐĆĹŇ/׌ËÎĎ ŐÖĹ ÚÎÉÝŐ¤ÔŘÓŃ" --- 2646,2648 ---- "cannot register callback command: buffer/window is already being deleted" ! msgstr "Ďĺ îđăč ˙âôĺ¤őćôčţâćę ňđäŚá: ÷čöĺô/ţŚěďđ čăĺ ˙ďęüč¤ćűőó" *************** *** 2654,2657 **** msgstr "" ! "E280: đďíéěëá × ŚÎÔĹŇĆĹĘÓŚ Ú TCL: ÍĎÖĚÉ×Ď ĐĎŰËĎÄÖĹÎĎ ÓĐÉÓĎË ĐĎÓÉĚÁÎÎŘ.. " ! "đĎ׌ÄĎÍÔĹ, ÂŐÄŘĚÁÓËÁ, ÎÁ vim-dev@vim.org" --- 2654,2657 ---- msgstr "" ! "E280: ŇĐÎĘÍĚ ţ ŚďćĺôöĺëőŚ ˙ TCL: îđăíęţđ ňđůěđäăĺďđ őňęőđě ňđőęíâďďű.. " ! "ŇđţŚäđîćĺ, ÷čäűíâőěâ, ďâ vim-dev@vim.org" *************** *** 2659,2661 **** msgid "cannot register callback command: buffer/window reference not found" ! msgstr "îĹ ÍĎÖŐ ÚÁŇŤÓÔŇŐ×ÁÔÉ ĐĎÄŚŔ: ĐĎÓÉĚÁÎÎŃ ÎÁ ÂŐĆĹŇ/׌ËÎĎ ÎĹ ÚÎÁĘÄĹÎĎ" --- 2659,2661 ---- msgid "cannot register callback command: buffer/window reference not found" ! msgstr "Ďĺ îđăč ˙âôĺ¤őćôčţâćę ňđäŚá: ňđőęíâďďó ďâ ÷čöĺô/ţŚěďđ ďĺ ˙ďâëäĺďđ" *************** *** 2663,2665 **** msgid "Sorry, this command is disabled: the Tcl library could not be loaded." ! msgstr "÷ÉÂÁŢÔĹ, ĂŃ ËĎÍÁÎÄÁ ×ÉÍËÎŐÔÁ, ÂŚÂĚŚĎÔĹËÁ Tcl ÎĹ ÍĎÖĹ ÂŐÔÉ ÚÁ×ÁÎÔÁÖĹÎÁ." --- 2663,2665 ---- msgid "Sorry, this command is disabled: the Tcl library could not be loaded." ! msgstr "Ţę÷âŕćĺ, çó ěđîâďäâ ţęîěďčćâ, ÷Ś÷íŚđćĺěâ Tcl ďĺ îđăĺ ÷čćę ˙âţâďćâăĺďâ." *************** *** 2669,2672 **** msgstr "" ! "E280: đďíéěëá × ŚÎÔĹŇĆĹĘÓŚ Ú TCL: ÍĎÖĚÉ×Ď ŇĹÚŐĚŘÔÁÔ ÎĹ int.. đĎ׌ÄĎÍÔĹ, " ! "ÂŐÄŘĚÁÓËÁ, ÎÁ vim-dev@vim.org" --- 2669,2672 ---- msgstr "" ! "E280: ŇĐÎĘÍĚ ţ ŚďćĺôöĺëőŚ ˙ TCL: îđăíęţđ ôĺ˙číűćâć ďĺ int.. ŇđţŚäđîćĺ, " ! "÷čäűíâőěâ, ďâ vim-dev@vim.org" *************** *** 2674,2676 **** msgid "cannot get line" ! msgstr "ÎĹ ÍĎÖŐ ÄŚÓÔÁÔÉ ŇŃÄĎË" --- 2674,2676 ---- msgid "cannot get line" ! msgstr "ďĺ îđăč äŚőćâćę ôóäđě" *************** *** 2678,2680 **** msgid "Unable to register a command server name" ! msgstr "îĹ ÍĎÖŐ ÚÁŇŤÓÔŇŐ×ÁÔÉ ŚÍ'Ń ÓĹŇ×ĹŇÁ" --- 2678,2680 ---- msgid "Unable to register a command server name" ! msgstr "Ďĺ îđăč ˙âôĺ¤őćôčţâćę Śî'ó őĺôţĺôâ" *************** *** 2683,2685 **** msgid "E247: no registered server named \"%s\"" ! msgstr "E354: îĹÍÁ¤ ÚÁŇĹĹÓÔŇĎ×ÁÎÉČ ÓĹŇ×ĹŇŚ× ÎÁ ŚÍ'Ń \"%s\"" --- 2683,2685 ---- msgid "E247: no registered server named \"%s\"" ! msgstr "E354: Ďĺî⤠˙âôĺĺőćôđţâďęé őĺôţĺôŚţ ďâ Śî'ó \"%s\"" *************** *** 2687,2689 **** msgid "E248: Failed to send command to the destination program" ! msgstr "E248: îĹ ×ÄÁĚĎÓŃ ×ŚÄŚÓĚÁÔÉ ËĎÍÁÎÄŐ ÄĎ ËŚÎĂĹ×ϧ ĐŇĎÇŇÁÍÉ" --- 2687,2689 ---- msgid "E248: Failed to send command to the destination program" ! msgstr "E248: Ďĺ ţäâíđőó ţŚäŚőíâćę ěđîâďäč äđ ěŚďçĺţđ§ ňôđúôâîę" *************** *** 2692,2694 **** msgid "Invalid server id used: %s" ! msgstr "÷ÉËĎŇÉÓÔÁÎĎ ÎĹ׌ŇÎŐ ÎÁÚ×Ő ÓĹŇ×ĹŇÁ :%s" --- 2692,2694 ---- msgid "Invalid server id used: %s" ! msgstr "Ţęěđôęőćâďđ ďĺţŚôďč ďâ˙ţč őĺôţĺôâ :%s" *************** *** 2696,2698 **** msgid "E249: couldn't read VIM instance registry property" ! msgstr "E249: ÎĹ ÍĎÖŐ ÚŢÉÔÁÔÉ ŢÁÓÔÉÎŐ ŇŤÓÔŇŐ ÚŇÁÚËÁ Vim" --- 2696,2698 ---- msgid "E249: couldn't read VIM instance registry property" ! msgstr "E249: ďĺ îđăč ˙ŕęćâćę ŕâőćęďč ôĺ¤őćôč ˙ôâ˙ěâ Vim" *************** *** 2700,2702 **** msgid "E251: VIM instance registry property is badly formed. Deleted!" ! msgstr "E251: ŢÁÓÔÉÎÁ ŇŤÓÔŇŐ ÚŇÁÚËÁ Vim ÎĹ׌ŇÎĎ ÚĆĎŇÍĎ×ÁÎÁ. ÷ÉÄÁĚĹÎĎ!" --- 2700,2702 ---- msgid "E251: VIM instance registry property is badly formed. Deleted!" ! msgstr "E251: ŕâőćęďâ ôĺ¤őćôč ˙ôâ˙ěâ Vim ďĺţŚôďđ ˙öđôîđţâďâ. Ţęäâíĺďđ!" *************** *** 2704,2706 **** msgid "Unknown option" ! msgstr "îĹ׌ÄĎÍÁ ĎĐĂŚŃ" --- 2704,2706 ---- msgid "Unknown option" ! msgstr "ĎĺţŚäđîâ đňçŚó" *************** *** 2708,2710 **** msgid "Too many edit arguments" ! msgstr "úÁÂÁÇÁÔĎ ÁŇÇŐÍĹÎÔŚ×" --- 2708,2710 ---- msgid "Too many edit arguments" ! msgstr "ßâ÷âúâćđ âôúčîĺďćŚţ" *************** *** 2712,2714 **** msgid "Argument missing after" ! msgstr "÷ÔŇÁŢĹÎĎ ÁŇÇŐÍĹÎÔÉ ĐŚÓĚŃ" --- 2712,2714 ---- msgid "Argument missing after" ! msgstr "Ţćôâŕĺďđ âôúčîĺďćę ňŚőíó" *************** *** 2716,2718 **** msgid "Garbage after option" ! msgstr "óÍŚÔÔŃ ĐĎÓĚŃ ĎĐĂŚ§" --- 2716,2718 ---- msgid "Garbage after option" ! msgstr "ŐîŚććó ňđőíó đň猧" *************** *** 2720,2722 **** msgid "Too many \"+command\" or \"-c command\" arguments" ! msgstr "úÁÂÁÇÁÔĎ '+' ÁÂĎ '-c' ÁŇÇŐÍĹÎÔŚ×" --- 2720,2722 ---- msgid "Too many \"+command\" or \"-c command\" arguments" ! msgstr "ßâ÷âúâćđ '+' â÷đ '-c' âôúčîĺďćŚţ" *************** *** 2725,2727 **** msgid "Invalid argument for" ! msgstr "îĹ׌ŇÎÉĘ ÁŇÇŐÍĹÎÔ ÄĚŃ" --- 2725,2727 ---- msgid "Invalid argument for" ! msgstr "ĎĺţŚôďęë âôúčîĺďć äíó" *************** *** 2729,2731 **** msgid "This Vim was not compiled with the diff feature." ! msgstr "ăŃ ×ĹŇÓŚŃ Vim ÎĹ ÂŐĚÁ ÚËĎÍĐŚĚŘĎ×ÁÎÁ Ú ĐŚÄÔŇÉÍËĎŔ diff." --- 2729,2731 ---- msgid "This Vim was not compiled with the diff feature." ! msgstr "Çó ţĺôőŚó Vim ďĺ ÷číâ ˙ěđîňŚíűđţâďâ ˙ ňŚäćôęîěđá diff." *************** *** 2733,2735 **** msgid "Attempt to open script file again: \"" ! msgstr "óĐŇĎÂÁ ׌ÄËŇÉÔÉ ÝĹ ŇÁÚ ĆÁĘĚ ËĎÍÁÎÄ \"" --- 2733,2735 ---- msgid "Attempt to open script file again: \"" ! msgstr "Őňôđ÷â ţŚäěôęćę üĺ ôâ˙ öâëí ěđîâďä \"" *************** *** 2744,2746 **** msgid "Cannot open for reading: \"" ! msgstr "îĹ ÍĎÖŐ ĐŇĎŢÉÔÁÔÉ: \"" --- 2744,2746 ---- msgid "Cannot open for reading: \"" ! msgstr "Ďĺ îđăč ňôđŕęćâćę: \"" *************** *** 2748,2750 **** msgid "Cannot open for script output: \"" ! msgstr "îĹ ÍĎÖŐ ×ŚÄËŇÉÔÉ ŃË ×ŚČŚÄÎÉĘ ĆÁĘĚ: \"" --- 2748,2750 ---- msgid "Cannot open for script output: \"" ! msgstr "Ďĺ îđăč ţŚäěôęćę óě ţŚéŚäďęë öâëí: \"" *************** *** 2753,2755 **** msgid "%d files to edit\n" ! msgstr "%d ĆÁĘĚŚ× ÚÁĚÉŰÉĚĎÓŘ\n" --- 2753,2755 ---- msgid "%d files to edit\n" ! msgstr "%d öâëíŚţ ˙âíęůęíđőű\n" *************** *** 2757,2759 **** msgid "Vim: Warning: Output is not to a terminal\n" ! msgstr "Vim: ő×ÁÇÁ: ÷ÉČŚÄ ĘÄĹ ÎĹ ÎÁ ÔĹŇÍŚÎÁĚ\n" --- 2757,2759 ---- msgid "Vim: Warning: Output is not to a terminal\n" ! msgstr "Vim: Čţâúâ: ŢęéŚä ëäĺ ďĺ ďâ ćĺôîŚďâí\n" *************** *** 2761,2763 **** msgid "Vim: Warning: Input is not from a terminal\n" ! msgstr "Vim: ő×ÁÇÁ: ÷ČŚÄÎ ĘÄĹ ÎĹ Ú ÔĹŇÍŚÎÁĚŐ\n" --- 2761,2763 ---- msgid "Vim: Warning: Input is not from a terminal\n" ! msgstr "Vim: Čţâúâ: ŢéŚäď ëäĺ ďĺ ˙ ćĺôîŚďâíč\n" *************** *** 2766,2768 **** msgid "pre-vimrc command line" ! msgstr "ËĎÍÁÎÄÉ ŃËŚ ×ÉËĎÎŐ×ÁĚÉÓŃ ÄĎ vimrc" --- 2766,2768 ---- msgid "pre-vimrc command line" ! msgstr "ěđîâďäę óěŚ ţęěđďčţâíęőó äđ vimrc" *************** *** 2771,2773 **** msgid "E282: Cannot read from \"%s\"" ! msgstr "E282: îĹ ÍĎÖŐ ĐŇĎŢÉÔÁÔÉ \"%s\"" --- 2771,2773 ---- msgid "E282: Cannot read from \"%s\"" ! msgstr "E282: Ďĺ îđăč ňôđŕęćâćę \"%s\"" *************** *** 2780,2782 **** "\n" ! "÷ÚÎÁĘÔĹ ÂŚĚŘŰĹ: vim -h\n" --- 2780,2782 ---- "\n" ! "Ţ˙ďâëćĺ ÷Śíűůĺ: vim -h\n" *************** *** 2784,2786 **** msgid "[file ..] edit specified file(s)" ! msgstr "[ĆÁĘĚ ..] ŇĹÄÁÇŐ×ÁÔÉ ×ËÁÚÁÎÉĘ ĆÁĘĚ" --- 2784,2786 ---- msgid "[file ..] edit specified file(s)" ! msgstr "[öâëí ..] ôĺäâúčţâćę ţěâ˙âďęë öâëí" *************** *** 2788,2790 **** msgid "- read text from stdin" ! msgstr "- ŢÉÔÁÔÉ ÔĹËÓÔ Ú stdin" --- 2788,2790 ---- msgid "- read text from stdin" ! msgstr "- ŕęćâćę ćĺěőć ˙ stdin" *************** *** 2792,2794 **** msgid "-t tag edit file where tag is defined" ! msgstr "-t ĐĎÍŚÔËÁ ĐĹŇĹÔÉ ÄĎ ĐĎÍŚÔËÉ" --- 2792,2794 ---- msgid "-t tag edit file where tag is defined" ! msgstr "-t ňđîŚćěâ ňĺôĺćę äđ ňđîŚćěę" *************** *** 2796,2798 **** msgid "-q [errorfile] edit file with first error" ! msgstr "-q [ĆÁĘĚ] ĐĹŇĹĘÔÉ ÄĎ ĐĹŇŰϧ ĐĎÍÉĚËÉ" --- 2796,2798 ---- msgid "-q [errorfile] edit file with first error" ! msgstr "-q [öâëí] ňĺôĺëćę äđ ňĺôůđ§ ňđîęíěę" *************** *** 2806,2808 **** "\n" ! "÷ÖÉ×ÁĘÔĹ:" --- 2806,2808 ---- "\n" ! "Ţăęţâëćĺ:" *************** *** 2810,2812 **** msgid " vim [arguments] " ! msgstr " vim [ÁŇÇŐÍĹÎÔÉ] " --- 2810,2812 ---- msgid " vim [arguments] " ! msgstr " vim [âôúčîĺďćę] " *************** *** 2818,2820 **** "\n" ! " ÁÂĎ:" --- 2818,2820 ---- "\n" ! " â÷đ:" *************** *** 2828,2830 **** "\n" ! "áŇÇŐÍĹÎÔÉ:\n" --- 2828,2830 ---- "\n" ! "Âôúčîĺďćę:\n" *************** *** 2832,2834 **** msgid "--\t\t\tOnly file names after this" ! msgstr "--\t\t\těÉŰĹ ŚÍĹÎÁ ĆÁĘĚŚ× ĐŚÓĚŃ ĂŘĎÇĎ" --- 2832,2834 ---- msgid "--\t\t\tOnly file names after this" ! msgstr "--\t\t\tÍęůĺ Śîĺďâ öâëíŚţ ňŚőíó çűđúđ" *************** *** 2836,2838 **** msgid "-register\t\tRegister this gvim for OLE" ! msgstr "-register\t\túÁŇŤÓÔŇŐ×ÁÔÉ ĂĹĘ gvim ŢĹŇĹÚ OLE" --- 2836,2838 ---- msgid "-register\t\tRegister this gvim for OLE" ! msgstr "-register\t\tßâôĺ¤őćôčţâćę çĺë gvim ŕĺôĺ˙ OLE" *************** *** 2840,2842 **** msgid "-unregister\t\tUnregister gvim for OLE" ! msgstr "-unregister\t\t÷ŚÄÍŚÎÉÔÉ ŇŤÓÔŇÁĂŚŔ ĂŘĎÇĎ gvim ŢĹŇĹÚ OLE" --- 2840,2842 ---- msgid "-unregister\t\tUnregister gvim for OLE" ! msgstr "-unregister\t\tŢŚäîŚďęćę ôĺ¤őćôâçŚá çűđúđ gvim ŕĺôĺ˙ OLE" *************** *** 2844,2846 **** msgid "-g\t\t\tRun using GUI (like \"gvim\")" ! msgstr "-g\t\t\t÷ÉËĎÎÁÔÉ ×ÉËĎŇÉÓÔĎ×ŐŔŢÉ GUI (ÎŚÂÉ \"gvim\")" --- 2844,2846 ---- msgid "-g\t\t\tRun using GUI (like \"gvim\")" ! msgstr "-g\t\t\tŢęěđďâćę ţęěđôęőćđţčáŕę GUI (ďŚ÷ę \"gvim\")" *************** *** 2848,2850 **** msgid "-f\t\t\tForeground: Don't fork when starting GUI" ! msgstr "-f\t\t\tîĹ ÚÁĚÉŰÁÔÉ ÔĹŇÍŚÎÁĚ ĐŚÓĚŃ ÚÁĐŐÓËŐ GUI" --- 2848,2850 ---- msgid "-f\t\t\tForeground: Don't fork when starting GUI" ! msgstr "-f\t\t\tĎĺ ˙âíęůâćę ćĺôîŚďâí ňŚőíó ˙âňčőěč GUI" *************** *** 2852,2854 **** msgid "-v\t\t\tVi mode (like \"vi\")" ! msgstr "-v\t\t\tňĹÖÉÍ Vi (ÎŚÂÉ \"vi\")" --- 2852,2854 ---- msgid "-v\t\t\tVi mode (like \"vi\")" ! msgstr "-v\t\t\tÔĺăęî Vi (ďŚ÷ę \"vi\")" *************** *** 2856,2858 **** msgid "-e\t\t\tEx mode (like \"ex\")" ! msgstr "-e\t\t\tňĹÖÉÍ Ex (ÎŚÂÉ \"ex\")" --- 2856,2858 ---- msgid "-e\t\t\tEx mode (like \"ex\")" ! msgstr "-e\t\t\tÔĺăęî Ex (ďŚ÷ę \"ex\")" *************** *** 2860,2862 **** msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")" ! msgstr "-s\t\t\tđŇÁĂŔ×ÁÔÉ ÍĎ×ŢËÉ (ĚÉŰĹ ÄĚŃ \"ex\")" --- 2860,2862 ---- msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")" ! msgstr "-s\t\t\tŇôâçáţâćę îđţŕěę (íęůĺ äíó \"ex\")" *************** *** 2864,2866 **** msgid "-d\t\t\tDiff mode (like \"vimdiff\")" ! msgstr "-d\t\t\tňĹÖÉÍ diff (ÎŚÂÉ \"vimdiff\")" --- 2864,2866 ---- msgid "-d\t\t\tDiff mode (like \"vimdiff\")" ! msgstr "-d\t\t\tÔĺăęî diff (ďŚ÷ę \"vimdiff\")" *************** *** 2868,2870 **** msgid "-y\t\t\tEasy mode (like \"evim\", modeless)" ! msgstr "-y\t\t\tđŇĎÓÔÉĘ ŇĹÖÉÍ (ÎŚÂÉ \"evim\")" --- 2868,2870 ---- msgid "-y\t\t\tEasy mode (like \"evim\", modeless)" ! msgstr "-y\t\t\tŇôđőćęë ôĺăęî (ďŚ÷ę \"evim\")" *************** *** 2872,2874 **** msgid "-R\t\t\tReadonly mode (like \"view\")" ! msgstr "-R\t\t\tňĹÖÉÍ ĐĹŇĹÇĚŃÄŐ (ÎŚÂÉ \"view\")" --- 2872,2874 ---- msgid "-R\t\t\tReadonly mode (like \"view\")" ! msgstr "-R\t\t\tÔĺăęî ňĺôĺúíóäč (ďŚ÷ę \"view\")" *************** *** 2876,2878 **** msgid "-Z\t\t\tRestricted mode (like \"rvim\")" ! msgstr "-Z\t\t\túÁÂĎŇĎÎĹÎÉĘ ŇĹÖÉÍ (ÎŚÂÉ \"rvim\")" --- 2876,2878 ---- msgid "-Z\t\t\tRestricted mode (like \"rvim\")" ! msgstr "-Z\t\t\tßâ÷đôđďĺďęë ôĺăęî (ďŚ÷ę \"rvim\")" *************** *** 2880,2882 **** msgid "-m\t\t\tModifications (writing files) not allowed" ! msgstr "-m\t\t\túÍŚÎÉ (ÚÁĐÉÓ ĆÁĘĚŚ×) ÎĹ ÄĎÚ×ĎĚĹÎĎ" --- 2880,2882 ---- msgid "-m\t\t\tModifications (writing files) not allowed" ! msgstr "-m\t\t\tßîŚďę (˙âňęő öâëíŚţ) ďĺ äđ˙ţđíĺďđ" *************** *** 2884,2886 **** msgid "-M\t\t\tModifications in text not allowed" ! msgstr "-M\t\t\túÍŚÎÉ × ÔĹËÓÔŚ ĆÁĘĚŚ× ÎĹ ÄĎÚ×ĎĚĹÎĎ" --- 2884,2886 ---- msgid "-M\t\t\tModifications in text not allowed" ! msgstr "-M\t\t\tßîŚďę ţ ćĺěőćŚ öâëíŚţ ďĺ äđ˙ţđíĺďđ" *************** *** 2888,2890 **** msgid "-b\t\t\tBinary mode" ! msgstr "-b\t\t\tä׌ĘËĎ×ÉĘ ŇĹÖÉÍ" --- 2888,2890 ---- msgid "-b\t\t\tBinary mode" ! msgstr "-b\t\t\tÄţŚëěđţęë ôĺăęî" *************** *** 2892,2894 **** msgid "-l\t\t\tLisp mode" ! msgstr "-l\t\t\tňĹÖÍÉ lisp" --- 2892,2894 ---- msgid "-l\t\t\tLisp mode" ! msgstr "-l\t\t\tÔĺăîę lisp" *************** *** 2896,2898 **** msgid "-C\t\t\tCompatible with Vi: 'compatible'" ! msgstr "-C\t\t\tňĹÖÉÍ, ÓŐÍŚÓÎÉĘ Ú Vi: 'compatible'" --- 2896,2898 ---- msgid "-C\t\t\tCompatible with Vi: 'compatible'" ! msgstr "-C\t\t\tÔĺăęî, őčîŚőďęë ˙ Vi: 'compatible'" *************** *** 2900,2902 **** msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'" ! msgstr "-N\t\t\tîĹ ÚĎ×ÓŚÍ ÓŐÍŚÓÎÉĘ Ú Vi ŇĹÖÉÍ: 'nocompatible'" --- 2900,2902 ---- msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'" ! msgstr "-N\t\t\tĎĺ ˙đţőŚî őčîŚőďęë ˙ Vi ôĺăęî: 'nocompatible'" *************** *** 2904,2906 **** msgid "-V[N]\t\tVerbose level" ! msgstr "-V[N]\t\tňŚ×ĹÎŘ ÇÁĚÁÓĚÉ×ĎÓÔŚ" --- 2904,2906 ---- msgid "-V[N]\t\tVerbose level" ! msgstr "-V[N]\t\tÔŚţĺďű úâíâőíęţđőćŚ" *************** *** 2908,2910 **** msgid "-D\t\t\tDebugging mode" ! msgstr "-D\t\t\tňĹÖÉÍ ÎÁĚÁÇĎÄÖŐ×ÁÎÎŃ" --- 2908,2910 ---- msgid "-D\t\t\tDebugging mode" ! msgstr "-D\t\t\tÔĺăęî ďâíâúđäăčţâďďó" *************** *** 2912,2914 **** msgid "-n\t\t\tNo swap file, use memory only" ! msgstr "-n\t\t\tîĹ ËĎŇÉÓÔŐ×ÁÔÉÓŃ ĆÁĘĚĎÍ ĎÂÍŚÎŐ, ÔŇÉÍÁÔÉ ŐÓĹ × ĐÁÍ'ŃÔŚ" --- 2912,2914 ---- msgid "-n\t\t\tNo swap file, use memory only" ! msgstr "-n\t\t\tĎĺ ěđôęőćčţâćęőó öâëíđî đ÷îŚďč, ćôęîâćę čőĺ ţ ňâî'óćŚ" *************** *** 2916,2918 **** msgid "-r\t\t\tList swap files and exit" ! msgstr "-r\t\t\tđĎËÁÚÁÔÉ ĆÁĘĚÉ ĎÂÍŚÎŐ Ś ×ÉĘÔÉ" --- 2916,2918 ---- msgid "-r\t\t\tList swap files and exit" ! msgstr "-r\t\t\tŇđěâ˙âćę öâëíę đ÷îŚďč Ś ţęëćę" *************** *** 2920,2922 **** msgid "-r (with file name)\tRecover crashed session" ! msgstr "-r (ŚÍŃ ĆÁĘĚÁ)\t÷ŚÄÎĎ×ÉÔÉ Á×ÁŇŚĘÎĎ ÚÁËŚÎŢĹÎÉĘ ÓĹÁÎÓ" --- 2920,2922 ---- msgid "-r (with file name)\tRecover crashed session" ! msgstr "-r (Śîó öâëíâ)\tŢŚäďđţęćę âţâôŚëďđ ˙âěŚďŕĺďęë őĺâďő" *************** *** 2924,2926 **** msgid "-L\t\t\tSame as -r" ! msgstr "-L\t\t\tôĹ ÓÁÍĹ ÝĎ Ę -r" --- 2924,2926 ---- msgid "-L\t\t\tSame as -r" ! msgstr "-L\t\t\tĆĺ őâîĺ üđ ë -r" *************** *** 2928,2930 **** msgid "-f\t\t\tDon't use newcli to open window" ! msgstr "-f\t\t\tń ÔÁË ŇĎÚŐÍŚŔ ĂĹ ĚÉŰĹ ÄĚŃ Amiga. ÷ÉÂÁŢ, Bram." --- 2928,2930 ---- msgid "-f\t\t\tDon't use newcli to open window" ! msgstr "-f\t\t\tÓ ćâě ôđ˙čîŚá çĺ íęůĺ äíó Amiga. Ţę÷âŕ, Bram." *************** *** 2932,2934 **** msgid "-dev \t\tUse for I/O" ! msgstr "-dev <ĐŇÉÓÔŇŚĘ>\t\t\t÷ÉËĎŇÉÓÔĎ×Ő×ÁÔÉ ĐŇÉÓÔŇŚĘ ÄĚŃ ××ĎÄŐ/×É×ĎÄŐ" --- 2932,2934 ---- msgid "-dev \t\tUse for I/O" ! msgstr "-dev <ňôęőćôŚë>\t\t\tŢęěđôęőćđţčţâćę ňôęőćôŚë äíó ţţđäč/ţęţđäč" *************** *** 2936,2938 **** msgid "-H\t\t\tstart in Hebrew mode" ! msgstr "-H\t\t\tňĎÚĐĎŢÁÔÉ ŇĹÖÉÍŚ Hebrew" --- 2936,2938 ---- msgid "-H\t\t\tstart in Hebrew mode" ! msgstr "-H\t\t\tÔđ˙ňđŕâćę ôĺăęîŚ Hebrew" *************** *** 2940,2942 **** msgid "-F\t\t\tstart in Farsi mode" ! msgstr "-F\t\t\tňĎÚĐĎŢÁÔÉ × ĐĹŇÓŘËĎÍŐ ŇĹÖÉÍŚ" --- 2940,2942 ---- msgid "-F\t\t\tstart in Farsi mode" ! msgstr "-F\t\t\tÔđ˙ňđŕâćę ţ ňĺôőűěđîč ôĺăęîŚ" *************** *** 2944,2946 **** msgid "-T \tSet terminal type to " ! msgstr "-T <ÔĹŇÍŚÎÁĚ>\t÷ÉÚÎÉŢÉÔÉ ÔÉĐ ÔĹŇÍŚÎÁĚŐ" --- 2944,2946 ---- msgid "-T \tSet terminal type to " ! msgstr "-T <ćĺôîŚďâí>\tŢę˙ďęŕęćę ćęň ćĺôîŚďâíč" *************** *** 2948,2950 **** msgid "-u \t\tUse instead of any .vimrc" ! msgstr "-u \t\t÷ÉËĎŇÉÓÔÁÔÉ ĐĎÄÁÎÉĘ ĆÁĘĚ ŃË .vimrc" --- 2948,2950 ---- msgid "-u \t\tUse instead of any .vimrc" ! msgstr "-u \t\tŢęěđôęőćâćę ňđäâďęë öâëí óě .vimrc" *************** *** 2952,2954 **** msgid "-U \t\tUse instead of any .gvimrc" ! msgstr "-u \t\t÷ÉËĎŇÉÓÔÁÔÉ ĐĎÄÁÎÉĘ ĆÁĘĚ ŃË .gvimrc" --- 2952,2954 ---- msgid "-U \t\tUse instead of any .gvimrc" ! msgstr "-u \t\tŢęěđôęőćâćę ňđäâďęë öâëí óě .gvimrc" *************** *** 2956,2958 **** msgid "--noplugin\t\tDon't load plugin scripts" ! msgstr "--noplugin\t\tîĹ ×ÁÎÔÁÖÉÔÉ ĆÁĘĚÉ-ÄĎĐĎ×ÎĹÎÎŃ" --- 2956,2958 ---- msgid "--noplugin\t\tDon't load plugin scripts" ! msgstr "--noplugin\t\tĎĺ ţâďćâăęćę öâëíę-äđňđţďĺďďó" *************** *** 2961,2964 **** msgstr "" ! "-o[N]\t\tňĎÚËŇÉÔÉ N ׌ËĎÎ (ŃËÝĎ ÎĹ ×ËÁÚÁÎĎ -- ĐĎ\n" ! "\t\t\tĎÄÎĎÍŐ ÄĚŃ ËĎÖÎĎÇĎ ĆÁĘĚÁ)" --- 2961,2964 ---- msgstr "" ! "-o[N]\t\tÔđ˙ěôęćę N ţŚěđď (óěüđ ďĺ ţěâ˙âďđ -- ňđ\n" ! "\t\t\tđäďđîč äíó ěđăďđúđ öâëíâ)" *************** *** 2966,2968 **** msgid "-O[N]\t\tlike -o but split vertically" ! msgstr "-O[N]\t\tÎŚÂÉ -o, ÁĚĹ ĐĎÄŚĚÉÔÉ ×ŚËÎÁ ×ĹŇÔÉËÁĚŘÎĎ" --- 2966,2968 ---- msgid "-O[N]\t\tlike -o but split vertically" ! msgstr "-O[N]\t\tďŚ÷ę -o, âíĺ ňđäŚíęćę ţŚěďâ ţĺôćęěâíűďđ" *************** *** 2970,2972 **** msgid "+\t\t\tStart at end of file" ! msgstr "+\t\t\tňĎÚĐĎŢÁÔÉ × ËŚÎĂŚ ĆÁĘĚÁ" --- 2970,2972 ---- msgid "+\t\t\tStart at end of file" ! msgstr "+\t\t\tÔđ˙ňđŕâćę ţ ěŚďçŚ öâëíâ" *************** *** 2974,2976 **** msgid "+\t\tStart at line " ! msgstr "+<ŇŃÄĎË>\t\tňĎÚĐĎŢÁÔÉ ÎÁ ×ËÁÚÁÎĎÍŐ ŇŃÄËŐ" --- 2974,2976 ---- msgid "+\t\tStart at line " ! msgstr "+<ôóäđě>\t\tÔđ˙ňđŕâćę ďâ ţěâ˙âďđîč ôóäěč" *************** *** 2979,2981 **** msgstr "" ! "--cmd <ËĎÍÁÎÄÁ>\t÷ÉËĎÎÁÔÉ ËĎÍÁÎÄŐ ĐĹŇĹÄ ×ÉËĎÎÁÎÎŃÍ ÂŐÄŘ-ŃËÉČ .*rc ĆÁĘĚŚ×" --- 2979,2981 ---- msgstr "" ! "--cmd <ěđîâďäâ>\tŢęěđďâćę ěđîâďäč ňĺôĺä ţęěđďâďďóî ÷čäű-óěęé .*rc öâëíŚţ" *************** *** 2983,2985 **** msgid "-c \t\tExecute after loading the first file" ! msgstr "-c <ËĎÍÁÎÄÁ>\t\t÷ÉËĎÎÁÔÉ ËĎÍÁÎÄŐ ĐŚÓĚŃ ÚÁ×ÁÎÔÁÖĹÎÎŃ ĐĹŇŰĎÇĎ ĆÁĘĚÁ" --- 2983,2985 ---- msgid "-c \t\tExecute after loading the first file" ! msgstr "-c <ěđîâďäâ>\t\tŢęěđďâćę ěđîâďäč ňŚőíó ˙âţâďćâăĺďďó ňĺôůđúđ öâëíâ" *************** *** 2987,2989 **** msgid "-S \t\tSource file after loading the first file" ! msgstr "-S <ÓĹÁÎÓ>\t\t÷ÉËĎÎÁÔÉ ĐĎÄÉÎÉĘ ĆÁĘĚ ĐŚÓĚŃ ĐĹŇŰĎÇĎ ÚÁ×ÁÎÔÁÖĹÎĎÇĎ ĆÁĘĚÁ" --- 2987,2989 ---- msgid "-S \t\tSource file after loading the first file" ! msgstr "-S <őĺâďő>\t\tŢęěđďâćę ňđäâďęë öâëí ňŚőíó ňĺôůđúđ ˙âţâďćâăĺďđúđ öâëíâ" *************** *** 2991,2993 **** msgid "-s \tRead Normal mode commands from file " ! msgstr "-s <ĆÁĘĚ>\t\túŢÉÔÁÔÉ ËĎÍÁÎÄÉ Ú ĆÁĘĚÁ " --- 2991,2993 ---- msgid "-s \tRead Normal mode commands from file " ! msgstr "-s <öâëí>\t\tßŕęćâćę ěđîâďäę ˙ öâëíâ " *************** *** 2995,2997 **** msgid "-w \tAppend all typed commands to file " ! msgstr "-w <ĆÁĘĚ>\t\täĎĐÉÓÁÔÉ ŐÓŚ ÎÁÂŇÁÎŚ ËĎÍÁÎÄÉ ÄĎ ĐĎÄÁÎĎÇĎ ĆÁĘĚÁ" --- 2995,2997 ---- msgid "-w \tAppend all typed commands to file " ! msgstr "-w <öâëí>\t\tÄđňęőâćę čőŚ ďâ÷ôâďŚ ěđîâďäę äđ ňđäâďđúđ öâëíâ" *************** *** 2999,3001 **** msgid "-W \tWrite all typed commands to file " ! msgstr "-w <ĆÁĘĚ>\t\túÁĐÉÓÁÔÉ ŐÓŚ ÎÁÂŇÁÎŚ ËĎÍÁÎÄÉ Ő ĐĎÄÁÎÉĘ ĆÁĘĚ" --- 2999,3001 ---- msgid "-W \tWrite all typed commands to file " ! msgstr "-w <öâëí>\t\tßâňęőâćę čőŚ ďâ÷ôâďŚ ěđîâďäę č ňđäâďęë öâëí" *************** *** 3003,3005 **** msgid "-x\t\t\tEdit encrypted files" ! msgstr "-x\t\t\tňĹÄÁÇŐ×ÁÔÉ ÚÁŰÉĆŇĎ×ÁÎÉĘ ĆÁĘĚ" --- 3003,3005 ---- msgid "-x\t\t\tEdit encrypted files" ! msgstr "-x\t\t\tÔĺäâúčţâćę ˙âůęöôđţâďęë öâëí" *************** *** 3007,3009 **** msgid "-display \tConnect vim to this particular X-server" ! msgstr "-display <ÄÉÓĐĚĹĘ>\t÷ÉËĎÎÁÔÉ vim ×ÉËĎŇÉÓÔĎ×ŐŔŢÉ ĐĎÄÁÎÉĘ ÄÉÓĐĚĹĘ" --- 3007,3009 ---- msgid "-display \tConnect vim to this particular X-server" ! msgstr "-display <äęőňíĺë>\tŢęěđďâćę vim ţęěđôęőćđţčáŕę ňđäâďęë äęőňíĺë" *************** *** 3011,3013 **** msgid "-X\t\t\tDo not connect to X server" ! msgstr "-X\t\t\tîĹ Ú'¤ÄÎŐ×ÁÔÉÓŃ Ú X ÓĹŇ×ĹŇĎÍ" --- 3011,3013 ---- msgid "-X\t\t\tDo not connect to X server" ! msgstr "-X\t\t\tĎĺ ˙'¤äďčţâćęőó ˙ X őĺôţĺôđî" *************** *** 3015,3017 **** msgid "--socketid \tOpen Vim inside another GTK widget" ! msgstr "--socketid \t÷ŚÄËÔÉŇÉ Vim × ŚÎŰĎÍŐ ĹĚĹÍĹÎÔŚ ŚÎÔĹŇĆĹĘÓŐ GTK" --- 3015,3017 ---- msgid "--socketid \tOpen Vim inside another GTK widget" ! msgstr "--socketid \tŢŚäěćęôę Vim ţ Śďůđîč ĺíĺîĺďćŚ Śďćĺôöĺëőč GTK" *************** *** 3019,3021 **** msgid "--remote \tEdit in a Vim server and exit" ! msgstr "--remote <ĆÁĘĚÉ>\tňĹÄÁÇŐ×ÁÔÉ ĆÁĘĚÉ ÎÁ Vim ÓĹŇ×ĹŇŚ Ś ÚÁ×ĹŇŰÉÔÉ ŇĎÂĎÔŐ" --- 3019,3021 ---- msgid "--remote \tEdit in a Vim server and exit" ! msgstr "--remote <öâëíę>\tÔĺäâúčţâćę öâëíę ďâ Vim őĺôţĺôŚ Ś ˙âţĺôůęćę ôđ÷đćč" *************** *** 3025,3027 **** msgstr "" ! "--remote-wait <ĆÁĘĚÉ> ..., ÁĚĹ ÚÁŢĹËÁÔÉ ĐĎËÉ ŐÓŚ ĆÁĘĚÉ ÂŐÄŠ׌ÄŇĹÄÁÇĎ×ÁÎĎ" --- 3025,3027 ---- msgstr "" ! "--remote-wait <öâëíę> ..., âíĺ ˙âŕĺěâćę ňđěę čőŚ öâëíę ÷čäĺ ţŚäôĺäâúđţâďđ" *************** *** 3029,3031 **** msgid "--remote-send \tSend to a Vim server and exit" ! msgstr "--remote-send <ÓÉÍ×ĎĚÉ> ÷ŚÄŚÓĚÁÔÉ <ÓÉÍ×ĎĚÉ> ÓĹŇ×ĹŇŐ Ś ÚÁ×ĹŇŰÉÔÉ ŇĎÂĎÔŐ" --- 3029,3031 ---- msgid "--remote-send \tSend to a Vim server and exit" ! msgstr "--remote-send <őęîţđíę> ŢŚäŚőíâćę <őęîţđíę> őĺôţĺôč Ś ˙âţĺôůęćę ôđ÷đćč" *************** *** 3034,3036 **** msgstr "" ! "--remote-expr <×ÉŇÁÚ> ÷ÉËĎÎÁÔÉ ×ÉŇÁÚ ÎÁ ÓĹŇ×ĹŇŚ, Ś ÎÁÄŇŐËŐ×ÁÔÉ ŇĹÚŐĚŘÔÁÔ" --- 3034,3036 ---- msgstr "" ! "--remote-expr <ţęôâ˙> Ţęěđďâćę ţęôâ˙ ďâ őĺôţĺôŚ, Ś ďâäôčěčţâćę ôĺ˙číűćâć" *************** *** 3039,3041 **** msgstr "" ! "--serverlist\t\tđĎËÁÚÁÔÉ ÓĐÉÓĎË ÎÁŃ×ÎÉČ ÓĹŇ×ĹŇŚ× Vim Ś ÚÁ×ĹŇŰÉÔÉ ŇĎÂĎÔŐ" --- 3039,3041 ---- msgstr "" ! "--serverlist\t\tŇđěâ˙âćę őňęőđě ďâóţďęé őĺôţĺôŚţ Vim Ś ˙âţĺôůęćę ôđ÷đćč" *************** *** 3043,3045 **** msgid "--servername \tSend to/become the Vim server " ! msgstr "--servername <ŚÍ'Ń>\tóĐŚĚËŐ×ÁÔÉÓŃ Ú/ÓÔÁÔÉ Vim ÓĹŇ×ĹŇĎÍ Ú ĐĎÄÁÎÉÍ ŚÍ'ŃÍ" --- 3043,3045 ---- msgid "--servername \tSend to/become the Vim server " ! msgstr "--servername <Śî'ó>\tŐňŚíěčţâćęőó ˙/őćâćę Vim őĺôţĺôđî ˙ ňđäâďęî Śî'óî" *************** *** 3047,3049 **** msgid "-i \t\tUse instead of .viminfo" ! msgstr "-i \t\t÷ÉËĎŇÉÓÔÁÔÉ ĐĎÄÁÎÉĘ ĆÁĘĚ ŃË .viminfo" --- 3047,3049 ---- msgid "-i \t\tUse instead of .viminfo" ! msgstr "-i \t\tŢęěđôęőćâćę ňđäâďęë öâëí óě .viminfo" *************** *** 3051,3053 **** msgid "-h\t\t\tprint Help (this message) and exit" ! msgstr "-h\t\t\tîÁÄŇŐËŐ×ÁÔÉ ĂĹ ĐĎ׌ÄĎÍĚĹÎÎŃ, Ś ×ÉĘÔÉ" --- 3051,3053 ---- msgid "-h\t\t\tprint Help (this message) and exit" ! msgstr "-h\t\t\tĎâäôčěčţâćę çĺ ňđţŚäđîíĺďďó, Ś ţęëćę" *************** *** 3055,3057 **** msgid "--version\t\tprint version information and exit" ! msgstr "--version\t\tÎÁÄŇŐËŐ×ÁÔÉ ŚÎĆĎŇÍÁĂŚŔ ĐŇĎ ×ĹŇÓŚŔ ĐŇĎÇŇÁÍÉ" --- 3055,3057 ---- msgid "--version\t\tprint version information and exit" ! msgstr "--version\t\tďâäôčěčţâćę ŚďöđôîâçŚá ňôđ ţĺôőŚá ňôđúôâîę" *************** *** 3063,3065 **** "\n" ! "áŇÇŐÍĹÎÔÉ ÄĚŃ gvim (×ĹŇÓŚŃ Motif)\n" --- 3063,3065 ---- "\n" ! "Âôúčîĺďćę äíó gvim (ţĺôőŚó Motif)\n" *************** *** 3071,3073 **** "\n" ! "áŇÇŐÍĹÎÔÉ ÄĚŃ gvim (×ĹŇÓŚŃ Athena)\n" --- 3071,3073 ---- "\n" ! "Âôúčîĺďćę äíó gvim (ţĺôőŚó Athena)\n" *************** *** 3075,3077 **** msgid "-display \tRun vim on " ! msgstr "-display <ÄÉÓĐĚĹĘ>\t÷ÉËĎÎÁÔÉ vim ×ÉËĎŇÉÓÔĎ×ŐŔŢÉ ĐĎÄÁÎÉĘ ÄÉÓĐĚĹĘ" --- 3075,3077 ---- msgid "-display \tRun vim on " ! msgstr "-display <äęőňíĺë>\tŢęěđďâćę vim ţęěđôęőćđţčáŕę ňđäâďęë äęőňíĺë" *************** *** 3079,3081 **** msgid "-iconic\t\tStart vim iconified" ! msgstr "-iconic\t\túÁĐÉÓÔÉÔÉ Vim" --- 3079,3081 ---- msgid "-iconic\t\tStart vim iconified" ! msgstr "-iconic\t\tßâňęőćęćę Vim" *************** *** 3083,3085 **** msgid "-name \t\tUse resource as if vim was " ! msgstr "-name <ŚÍ'Ń>\t\t÷ÉËĎŇÉÓÔÁÔÉ ŇĹÓŐŇÓÉ ÄĚŃ <ŚÍ`Ń>" --- 3083,3085 ---- msgid "-name \t\tUse resource as if vim was " ! msgstr "-name <Śî'ó>\t\tŢęěđôęőćâćę ôĺőčôőę äíó <Śî`ó>" *************** *** 3087,3089 **** msgid "\t\t\t (Unimplemented)\n" ! msgstr "\t\t\t (îĹ ÄŚ¤)\n" --- 3087,3089 ---- msgid "\t\t\t (Unimplemented)\n" ! msgstr "\t\t\t (Ďĺ 䌤)\n" *************** *** 3091,3093 **** msgid "-background \tUse for the background (also: -bg)" ! msgstr "-background <ËĎĚŚŇ>\t÷ÉËĎŇÉÓÔÁÔÉ <ËĎĚŚŇ> ÄĚŃ ĆĎÎŐ (ÔÁËĎÖ: -bg)" --- 3091,3093 ---- msgid "-background \tUse for the background (also: -bg)" ! msgstr "-background <ěđíŚô>\tŢęěđôęőćâćę <ěđíŚô> äíó öđďč (ćâěđă: -bg)" *************** *** 3096,3098 **** msgstr "" ! "-foreground <ËĎĚŚŇ>\t÷ÉËĎŇÉÓÔÁÔÉ <ËĎĚŚŇ> ÄĚŃ Ú×ÉŢÁĘÎĎÇĎ ÔĹËÓÔŐ (ÔÁËĎÖ: -fg)" --- 3096,3098 ---- msgstr "" ! "-foreground <ěđíŚô>\tŢęěđôęőćâćę <ěđíŚô> äíó ˙ţęŕâëďđúđ ćĺěőćč (ćâěđă: -fg)" *************** *** 3100,3102 **** msgid "-font \t\tUse for normal text (also: -fn)" ! msgstr "-font <ŰŇÉĆÔ>\t÷ÉËĎŇÉÓÔÁÔÉ <ŰŇÉĆÔ> ÄĚŃ Ú×ÉŢÁĘÎĎÇĎ ÔĹËÓÔŐ (ÔÁËĎÖ: -fn)" --- 3100,3102 ---- msgid "-font \t\tUse for normal text (also: -fn)" ! msgstr "-font <ůôęöć>\tŢęěđôęőćâćę <ůôęöć> äíó ˙ţęŕâëďđúđ ćĺěőćč (ćâěđă: -fn)" *************** *** 3104,3106 **** msgid "-boldfont \tUse for bold text" ! msgstr "-boldfont <ŰŇÉĆÔ>\t÷ÉËĎŇÉÓÔÁÔÉ <ŰŇÉĆÔ> ÄĚŃ ÖÉŇÎĎÇĎ ÔĹËÓÔŐ" --- 3104,3106 ---- msgid "-boldfont \tUse for bold text" ! msgstr "-boldfont <ůôęöć>\tŢęěđôęőćâćę <ůôęöć> äíó ăęôďđúđ ćĺěőćč" *************** *** 3108,3110 **** msgid "-italicfont \tUse for italic text" ! msgstr "-italicfont <ŰŇÉĆÔ>\t÷ÉËĎŇÉÓÔÁÔÉ <ŰŇÉĆÔ> ÄĚŃ ĐĎČÉĚĎÇĎ ÔĹËÓÔŐ" --- 3108,3110 ---- msgid "-italicfont \tUse for italic text" ! msgstr "-italicfont <ůôęöć>\tŢęěđôęőćâćę <ůôęöć> äíó ňđéęíđúđ ćĺěőćč" *************** *** 3112,3114 **** msgid "-geometry \tUse for initial geometry (also: -geom)" ! msgstr "-geometry <ÇĹĎÍ>\túÁÄÁÔÉ ŇĎÚÍŚÔÉ ÔÁ ĐĎĚĎÖĹÎÎŃ (ÔÁËĎÖ: -geom)" --- 3112,3114 ---- msgid "-geometry \tUse for initial geometry (also: -geom)" ! msgstr "-geometry <úĺđî>\tßâäâćę ôđ˙îŚćę ćâ ňđíđăĺďďó (ćâěđă: -geom)" *************** *** 3116,3118 **** msgid "-borderwidth \tUse a border width of (also: -bw)" ! msgstr "-borderwidth <ÔĎ×Ý>\t÷ÓÔÁÎĎ×ÉÔÉ ÔĎ×ÝÉÎŐ ÍĹÖ <ÔĎ×Ý> (ÔÁËĎÖ: -bw)" --- 3116,3118 ---- msgid "-borderwidth \tUse a border width of (also: -bw)" ! msgstr "-borderwidth <ćđţü>\tŢőćâďđţęćę ćđţüęďč îĺă <ćđţü> (ćâěđă: -bw)" *************** *** 3120,3122 **** msgid "-scrollbarwidth Use a scrollbar width of (also: -sw)" ! msgstr "-scrollbarwidth <ÔĎ×Ý> ÷ÓÔÁÎĎ×ÉÔÉ ÔĎ×ÝÉÎŐ ĚŚÎŚĘËÉ ÚÓŐ×Ő (ÔÁËĎÖ: -sw)" --- 3120,3122 ---- msgid "-scrollbarwidth Use a scrollbar width of (also: -sw)" ! msgstr "-scrollbarwidth <ćđţü> Ţőćâďđţęćę ćđţüęďč íŚďŚëěę ˙őčţč (ćâěđă: -sw)" *************** *** 3124,3126 **** msgid "-menuheight \tUse a menu bar height of (also: -mh)" ! msgstr "-menuheight <×ÉÓĎÔÁ>\t÷ÓÔÁÎĎ×ÉÔÉ ×ÉÓĎÔŐ ÍĹÎŔ <×ÉÓĎÔÁ> (ÔÁËĎÖ: -mh)" --- 3124,3126 ---- msgid "-menuheight \tUse a menu bar height of (also: -mh)" ! msgstr "-menuheight <ţęőđćâ>\tŢőćâďđţęćę ţęőđćč îĺďá <ţęőđćâ> (ćâěđă: -mh)" *************** *** 3128,3130 **** msgid "-reverse\t\tUse reverse video (also: -rv)" ! msgstr "-reverse\t\tďÂĹŇÎŐÔÉ ËĎĚŘĎŇÉ (ÔÁËĎÖ: -rv)" --- 3128,3130 ---- msgid "-reverse\t\tUse reverse video (also: -rv)" ! msgstr "-reverse\t\tĐ÷ĺôďčćę ěđíűđôę (ćâěđă: -rv)" *************** *** 3132,3134 **** msgid "+reverse\t\tDon't use reverse video (also: +rv)" ! msgstr "+reverse\t\tîĹ ĎÂĹŇÔÁÔÉ ËĎĚŘĎŇÉ (ÔÁËĎÖ: +rv)" --- 3132,3134 ---- msgid "+reverse\t\tDon't use reverse video (also: +rv)" ! msgstr "+reverse\t\tĎĺ đ÷ĺôćâćę ěđíűđôę (ćâěđă: +rv)" *************** *** 3136,3138 **** msgid "-xrm \tSet the specified resource" ! msgstr "-xrm <ŇĹÓŐŇÓ>\t÷ÓÔÁÎĎ×ÉÔÉ ×ŚÄĐĎ׌ÄÎÉĘ ŇĹÓŐŇÓ" --- 3136,3138 ---- msgid "-xrm \tSet the specified resource" ! msgstr "-xrm <ôĺőčôő>\tŢőćâďđţęćę ţŚäňđţŚäďęë ôĺőčôő" *************** *** 3144,3146 **** "\n" ! "áŇŰŐÍĹÎÔÉ ÄĎ gvim (×ĹŇÓŚŃ RISC OS):\n" --- 3144,3146 ---- "\n" ! "Âôůčîĺďćę äđ gvim (ţĺôőŚó RISC OS):\n" *************** *** 3148,3150 **** msgid "--columns \tInitial width of window in columns" ! msgstr "--columns <ËŚĚŘËŚÓÔŘ>\tđĎŢÁÔËĎ×Á ŰÉŇÉÎÁ ׌ËÎÁ × ÓÉÍ×ĎĚÁČ" --- 3148,3150 ---- msgid "--columns \tInitial width of window in columns" ! msgstr "--columns <ěŚíűěŚőćű>\tŇđŕâćěđţâ ůęôęďâ ţŚěďâ ţ őęîţđíâé" *************** *** 3152,3154 **** msgid "--rows \tInitial height of window in rows" ! msgstr "--rows <ËŚĚŘËŚÓÔŘ>\tđĎŢÁËĎ×Á ×ÉÓĎÔÁ ׌ËÎÁ × ŇŃÄËÁČ" --- 3152,3154 ---- msgid "--rows \tInitial height of window in rows" ! msgstr "--rows <ěŚíűěŚőćű>\tŇđŕâěđţâ ţęőđćâ ţŚěďâ ţ ôóäěâé" *************** *** 3160,3162 **** "\n" ! "áŇÇŐÍĹÎÔÉ ÄĚŃ gvim (×ĹŇÓŚŃ GTK+)\n" --- 3160,3162 ---- "\n" ! "Âôúčîĺďćę äíó gvim (ţĺôőŚó GTK+)\n" *************** *** 3165,3167 **** msgstr "" ! "-display <ÄÉÓĐĚĹĘ>\t÷ÉËĎÎÁÔÉ vim ÎÁ ĐĎÄÁÎĎÍŐ ÄÉÓĐĚŧ (ÔÁËĎÖ: --display)" --- 3165,3167 ---- msgstr "" ! "-display <äęőňíĺë>\tŢęěđďâćę vim ďâ ňđäâďđîč äęőňíĺ§ (ćâěđă: --display)" *************** *** 3169,3171 **** msgid "--help\t\tShow Gnome arguments" ! msgstr "--help\t\tđĎËÁÚÁÔÉ ÁŇÇŐÍĹÎÔÉ Gnome" --- 3169,3171 ---- msgid "--help\t\tShow Gnome arguments" ! msgstr "--help\t\tŇđěâ˙âćę âôúčîĺďćę Gnome" *************** *** 3178,3180 **** "\n" ! "óĐŇĎÂÁ ׌ČÓĚÁÔÉ ×ÉŇÁÚ ÎĹ ×ÄÁĚÁÓŃ.\n" --- 3178,3180 ---- "\n" ! "Őňôđ÷â ţŚäŚőíâćę ţęôâ˙ ďĺ ţäâíâőó.\n" *************** *** 3187,3189 **** "\n" ! "îĹ ×ÄÁĚĎÓŃ ×ŚÄŚÓĚÁÔÉ ÄÁÎŚ. óĐŇĎÂŐ¤ÍĎ ×ÉËĎÎÁÔÉ ÎÁ ÍŚÓĂŚ\n" --- 3187,3189 ---- "\n" ! "Ďĺ ţäâíđőó ţŚäŚőíâćę äâďŚ. Őňôđ÷č¤îđ ţęěđďâćę ďâ îŚőçŚ\n" *************** *** 3192,3194 **** msgid "%d of %d edited" ! msgstr "%d Ú %d ĆÁĘĚŚ× ×ŚÄŇĹÄÁÇĎ×ÁÎĎ" --- 3192,3194 ---- msgid "%d of %d edited" ! msgstr "%d ˙ %d öâëíŚţ ţŚäôĺäâúđţâďđ" *************** *** 3196,3198 **** msgid "Send expression failed.\n" ! msgstr "óĐŇĎÂÁ ׌ČÓĚÁÔÉ ×ÉŇÁÚ ÎĹ ×ÄÁĚÁÓŃ.\n" --- 3196,3198 ---- msgid "Send expression failed.\n" ! msgstr "Őňôđ÷â ţŚäŚőíâćę ţęôâ˙ ďĺ ţäâíâőó.\n" *************** *** 3200,3202 **** msgid "No marks set" ! msgstr "öĎÄÎÉČ ĐĎÍŚÔĎË ÎĹ ÂŐĚĎ ×ËÁÚÁÎĎ" --- 3200,3202 ---- msgid "No marks set" ! msgstr "Ăđäďęé ňđîŚćđě ďĺ ÷číđ ţěâ˙âďđ" *************** *** 3205,3207 **** msgid "E283: No marks matching \"%s\"" ! msgstr "E283: đĎÍŚÔËŐ \"%s\" ÎĹ ÚÎÁĘÄĹÎĎ" --- 3205,3207 ---- msgid "E283: No marks matching \"%s\"" ! msgstr "E283: ŇđîŚćěč \"%s\" ďĺ ˙ďâëäĺďđ" *************** *** 3215,3217 **** "\n" ! "ĐĎÍ. ŇŃÄ. ËĎĚ. ĆÁĘĚ/ÔĹËÓÔ" --- 3215,3217 ---- "\n" ! "ňđî. ôóä. ěđí. öâëí/ćĺěőć" *************** *** 3231,3233 **** "\n" ! "# đĎÍŚÔËÉ:\n" --- 3231,3233 ---- "\n" ! "# ŇđîŚćěę:\n" *************** *** 3240,3242 **** "\n" ! "# óĐÉÓĎË ĐĹŇĹČĎÄŚ×\n" --- 3240,3242 ---- "\n" ! "# Őňęőđě ňĺôĺéđäŚţ\n" *************** *** 3249,3251 **** "\n" ! "# đĎĐĹŇĹÄÎŚ ĐĎÍŚÔËÉ × ĆÁĘĚÁČ (ÓĐĎŢÁÔËŐ ÎĎ׌):\n" --- 3249,3251 ---- "\n" ! "# ŇđňĺôĺäďŚ ňđîŚćěę ţ öâëíâé (őňđŕâćěč ďđţŚ):\n" *************** *** 3253,3255 **** msgid "Missing '>'" ! msgstr "÷ÔŇÁŢĹÎĎ '>'" --- 3253,3255 ---- msgid "Missing '>'" ! msgstr "Ţćôâŕĺďđ '>'" *************** *** 3257,3259 **** msgid "Not a valid codepage" ! msgstr "ëĎÄĎ×Á ÓÔĎŇŚÎËÁ ÎĹ ŚÓÎŐ¤" --- 3257,3259 ---- msgid "Not a valid codepage" ! msgstr "Ěđäđţâ őćđôŚďěâ ďĺ Śőďč¤" *************** *** 3261,3263 **** msgid "E284: Cannot set IC values" ! msgstr "E284: îĹ ÍĎÖŐ ×ÓÔÁÎĎ×ÉÔÉ ÚÎÁŢĹÎÎŃ IC" --- 3261,3263 ---- msgid "E284: Cannot set IC values" ! msgstr "E284: Ďĺ îđăč ţőćâďđţęćę ˙ďâŕĺďďó IC" *************** *** 3265,3267 **** msgid "E285: Failed to create input context" ! msgstr "E285: đĎÍÉĚËÁ ĐŚÄ ŢÁÓ ÓÔ×ĎŇĹÎÎŃ `input context'" --- 3265,3267 ---- msgid "E285: Failed to create input context" ! msgstr "E285: Ňđîęíěâ ňŚä ŕâő őćţđôĺďďó `input context'" *************** *** 3269,3271 **** msgid "E286: Failed to open input method" ! msgstr "E286: đĎÍÉĚËÁ ĐŚÄ ŢÁÓ ÓÔ×ĎŇĹÎÎŃ `input method'" --- 3269,3271 ---- msgid "E286: Failed to open input method" ! msgstr "E286: Ňđîęíěâ ňŚä ŕâő őćţđôĺďďó `input method'" *************** *** 3274,3276 **** msgid "E287: Warning: Could not set destroy callback to IM" ! msgstr "E287: ő×ÁÇÁ: ÎĹ ÍĎÖŐ ×ÓÔÁÎĎ×ÉÔÉ ĐĎÄŚŔ ÄĚŃ ÚÎÉÝĹÎÎŃ IM" --- 3274,3276 ---- msgid "E287: Warning: Could not set destroy callback to IM" ! msgstr "E287: Čţâúâ: ďĺ îđăč ţőćâďđţęćę ňđäŚá äíó ˙ďęüĺďďó IM" *************** *** 3279,3281 **** msgid "E288: input method doesn't support any style" ! msgstr "E288: `input method' ÎĹ ĐŚÄÔŇÉÍŐ¤ ÓÔÉĚŚ" --- 3279,3281 ---- msgid "E288: input method doesn't support any style" ! msgstr "E288: `input method' ďĺ ňŚäćôęîč¤ őćęíŚ" *************** *** 3284,3286 **** msgid "E289: input method doesn't support my preedit type" ! msgstr "E289: `input method' ÎĹ ĐŚÄÔŇÉÍŐ¤ ŇĹÄÁÇĎ×ÁÎŚ ÔÉĐÉ" --- 3284,3286 ---- msgid "E289: input method doesn't support my preedit type" ! msgstr "E289: `input method' ďĺ ňŚäćôęîč¤ ôĺäâúđţâďŚ ćęňę" *************** *** 3289,3291 **** msgid "E290: over-the-spot style requires fontset" ! msgstr "E290: ÓÔÉĚŘ ×ÉÍÁÇÁ¤ fontset" --- 3289,3291 ---- msgid "E290: over-the-spot style requires fontset" ! msgstr "E290: őćęíű ţęîâú⤠fontset" *************** *** 3294,3296 **** msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled" ! msgstr "E291: ÷ĹŇÓŚŃ ÂŚÂĚŚĎÔĹËÉ GTK+ ÍĹÎŰÁ ÚÁ 1.2.3. `Status area' ×ÉÍËÎŐÔĎ" --- 3294,3296 ---- msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled" ! msgstr "E291: ŢĺôőŚó ÷Ś÷íŚđćĺěę GTK+ îĺďůâ ˙â 1.2.3. `Status area' ţęîěďčćđ" *************** *** 3299,3301 **** msgid "E292: Input Method Server is not running" ! msgstr "E292: IM ÓĹŇ×ĹŇ ÎĹ ĆŐÎËĂŚĎÎŐ¤" --- 3299,3301 ---- msgid "E292: Input Method Server is not running" ! msgstr "E292: IM őĺôţĺô ďĺ öčďěçŚđďč¤" *************** *** 3304,3306 **** msgid "E293: block was not locked" ! msgstr "E293: ÂĚĎË ÎĹ ÂŐĚĎ ÚÁĆŚËÓĎ×ÁÎĎ" --- 3304,3306 ---- msgid "E293: block was not locked" ! msgstr "E293: ÷íđě ďĺ ÷číđ ˙âöŚěőđţâďđ" *************** *** 3309,3311 **** msgid "E294: Seek error in swap file read" ! msgstr "E294: đĎÍÉĚËÁ ÚÍŚÎÉ ĐĎÚŚĂÉÉ Ő ĆÁĘĚŚ ĎÂÍŚÎŐ" --- 3309,3311 ---- msgid "E294: Seek error in swap file read" ! msgstr "E294: Ňđîęíěâ ˙îŚďę ňđ˙Śçęę č öâëíŚ đ÷îŚďč" *************** *** 3313,3315 **** msgid "E295: Read error in swap file" ! msgstr "E295: đĎÍÉĚËÁ ÚŢÉÔŐ×ÁÎÎŃ ĆÁĘĚÁ ĎÂÍŚÎŐ" --- 3313,3315 ---- msgid "E295: Read error in swap file" ! msgstr "E295: Ňđîęíěâ ˙ŕęćčţâďďó öâëíâ đ÷îŚďč" *************** *** 3317,3319 **** msgid "E296: Seek error in swap file write" ! msgstr "E296: đĎÍÉĚËÁ ÚÍŚÎÉ ĐĎÚŚĂÉÉ ĐŚÄ ŢÁÓ ÚÁĐÉÓŐ ĆÁĘĚÁ ĎÂÍŚÎŐ" --- 3317,3319 ---- msgid "E296: Seek error in swap file write" ! msgstr "E296: Ňđîęíěâ ˙îŚďę ňđ˙Śçęę ňŚä ŕâő ˙âňęőč öâëíâ đ÷îŚďč" *************** *** 3321,3323 **** msgid "E297: Write error in swap file" ! msgstr "E297: đĎÍÉĚËÁ ÚÁĐÉÓŐ ĆÁĘĚÁ ĎÂÍŚÎŐ" --- 3321,3323 ---- msgid "E297: Write error in swap file" ! msgstr "E297: Ňđîęíěâ ˙âňęőč öâëíâ đ÷îŚďč" *************** *** 3325,3327 **** msgid "E300: Swap file already exists (symlink attack?)" ! msgstr "E300: ćÁĘĚ ĎÂÍŚÎŐ ŐÖĹ ŚÓÎŐ¤! (ÚĚĎ×ÍÉÓÎÉË??)" --- 3325,3327 ---- msgid "E300: Swap file already exists (symlink attack?)" ! msgstr "E300: Öâëí đ÷îŚďč čăĺ Śőďč¤! (˙íđţîęőďęě??)" *************** *** 3329,3331 **** msgid "E298: Didn't get block nr 0?" ! msgstr "E298: îĹÍÁ¤ ÂĚĎËŐ 0? [ĐĎÍÉĚËÁ ĐŇĎÇŇÁÍÉ]" --- 3329,3331 ---- msgid "E298: Didn't get block nr 0?" ! msgstr "E298: Ďĺî⤠÷íđěč 0? [ňđîęíěâ ňôđúôâîę]" *************** *** 3333,3335 **** msgid "E298: Didn't get block nr 1?" ! msgstr "E298: îĹÍÁ¤ ÂĚĎËŐ 1? [ĐĎÍÉĚËÁ ĐŇĎÇŇÁÍÉ]" --- 3333,3335 ---- msgid "E298: Didn't get block nr 1?" ! msgstr "E298: Ďĺî⤠÷íđěč 1? [ňđîęíěâ ňôđúôâîę]" *************** *** 3338,3340 **** msgid "E298: Didn't get block nr 2?" ! msgstr "E298: îĹÍÁ¤ ÂĚĎËŐ 2? [ĐĎÍÉĚËÁ ĐŇĎÇŇÁÍÉ]" --- 3338,3340 ---- msgid "E298: Didn't get block nr 2?" ! msgstr "E298: Ďĺî⤠÷íđěč 2? [ňđîęíěâ ňôđúôâîę]" *************** *** 3343,3345 **** msgid "E301: Oops, lost the swap file!!!" ! msgstr "E301: ćÁĘĚ ĎÂÍŚÎŐ ×ÔŇÁŢĹÎĎ!!!" --- 3343,3345 ---- msgid "E301: Oops, lost the swap file!!!" ! msgstr "E301: Öâëí đ÷îŚďč ţćôâŕĺďđ!!!" *************** *** 3348,3350 **** msgid "E302: Could not rename swap file" ! msgstr "E302: îĹ ÍĎÖŐ ĐĹŇĹĘÍĹÎŐ×ÁÔÉ ĆÁĘĚÁ ĎÂÍŚÎŐ" --- 3348,3350 ---- msgid "E302: Could not rename swap file" ! msgstr "E302: Ďĺ îđăč ňĺôĺëîĺďčţâćę öâëíâ đ÷îŚďč" *************** *** 3354,3356 **** msgid "E303: Unable to open swap file for \"%s\", recovery impossible" ! msgstr "E303: ÎĹ ÍĎÖŐ ĐŇĎŢÉÔÁÔÉ ĆÁĘĚ ĎÂÍŚÎŐ ÄĚŃ \"%s\", ׌ÄÎĎ×ĚĹÎÎŃ ÎĹÍĎÖĚÉ×Ĺ" --- 3354,3356 ---- msgid "E303: Unable to open swap file for \"%s\", recovery impossible" ! msgstr "E303: ďĺ îđăč ňôđŕęćâćę öâëí đ÷îŚďč äíó \"%s\", ţŚäďđţíĺďďó ďĺîđăíęţĺ" *************** *** 3358,3360 **** msgid "E304: ml_timestamp: Didn't get block 0??" ! msgstr "E304: ml_timestamp: îĹÍÁ¤ ÂĚĎËŐ 0?? [ĐĎÍÉĚËÁ ĐŇĎÇŇÁÍÉ]" --- 3358,3360 ---- msgid "E304: ml_timestamp: Didn't get block 0??" ! msgstr "E304: ml_timestamp: Ďĺî⤠÷íđěč 0?? [ňđîęíěâ ňôđúôâîę]" *************** *** 3363,3365 **** msgid "E305: No swap file found for %s" ! msgstr "E305: îĹ ÚÎÁĘÄĹÎĎ ĆÁĘĚŐ ĎÂÍŚÎŐ ÄĚŃ %s" --- 3363,3365 ---- msgid "E305: No swap file found for %s" ! msgstr "E305: Ďĺ ˙ďâëäĺďđ öâëíč đ÷îŚďč äíó %s" *************** *** 3368,3370 **** msgid "Enter number of swap file to use (0 to quit): " ! msgstr "ńËÉĘ ÓÁÍĹ ĆÁĘĚ ĎÂÍŚÎŐ ×ÉËĎŇÉÓÔÁÔÉ (0 ÄĚŃ ×ÉČĎÄŐ):" --- 3368,3370 ---- msgid "Enter number of swap file to use (0 to quit): " ! msgstr "Óěęë őâîĺ öâëí đ÷îŚďč ţęěđôęőćâćę (0 äíó ţęéđäč):" *************** *** 3373,3375 **** msgid "E306: Cannot open %s" ! msgstr "E306: îĹ ÍĎÖŐ ×ŚÄËŇÉÔÉ %s" --- 3373,3375 ---- msgid "E306: Cannot open %s" ! msgstr "E306: Ďĺ îđăč ţŚäěôęćę %s" *************** *** 3377,3379 **** msgid "Unable to read block 0 from " ! msgstr "îĹ ÍĎÖŐ ÚŢÉÔÁÔÉ ÂĚĎË 0 Ú " --- 3377,3379 ---- msgid "Unable to read block 0 from " ! msgstr "Ďĺ îđăč ˙ŕęćâćę ÷íđě 0 ˙ " *************** *** 3385,3387 **** "\n" ! "îÁĐĹ×ÎĎ ÚÍŚÎ ÎĹ ÂŐĚĎ, ÁÂĎ Vim ÎĹ ĐĎÎĎ×É× ĆÁĘĚ ĎÂÍŚÎŐ." --- 3385,3387 ---- "\n" ! "Ďâňĺţďđ ˙îŚď ďĺ ÷číđ, â÷đ Vim ďĺ ňđďđţęţ öâëí đ÷îŚďč." *************** *** 3389,3391 **** msgid " cannot be used with this version of Vim.\n" ! msgstr " ÎĹĐŇÉÄÁÔÎÉĘ ÄĚŃ ×ÉËĎŇÉÓÔÁÎÎŃ Ú ĂŚ¤Ŕ ×ĹŇÓŚ¤Ŕ Vim.\n" --- 3389,3391 ---- msgid " cannot be used with this version of Vim.\n" ! msgstr " ďĺňôęäâćďęë äíó ţęěđôęőćâďďó ˙ 猤á ţĺôőŚ¤á Vim.\n" *************** *** 3393,3395 **** msgid "Use Vim version 3.0.\n" ! msgstr "úÎÁĘÄŚÔŘ Vim 3.0\n" --- 3393,3395 ---- msgid "Use Vim version 3.0.\n" ! msgstr "ßďâëäŚćű Vim 3.0\n" *************** *** 3398,3400 **** msgid "E307: %s does not look like a Vim swap file" ! msgstr "E307: %s ÎĹ ÓČĎÖĹ ÎÁ ĆÁĘĚ ĎÂÍŚÎŐ Vim" --- 3398,3400 ---- msgid "E307: %s does not look like a Vim swap file" ! msgstr "E307: %s ďĺ őéđăĺ ďâ öâëí đ÷îŚďč Vim" *************** *** 3402,3404 **** msgid " cannot be used on this computer.\n" ! msgstr " ÎĹĐŇÉÄÁÔÎÉĘ ÄĎ ×ÉËĎŇÉÓÔÁÎÎŃ ÎÁ ×ÁŰŚĘ ÁŇČŚÔĹËÔŐŇŚ.\n" --- 3402,3404 ---- msgid " cannot be used on this computer.\n" ! msgstr " ďĺňôęäâćďęë äđ ţęěđôęőćâďďó ďâ ţâůŚë âôéŚćĺěćčôŚ.\n" *************** *** 3406,3408 **** msgid "The file was created on " ! msgstr "ćÁĘĚ ÂŐĚĎ ÓÔ×ĎŇĹÎĎ ÎÁ " --- 3406,3408 ---- msgid "The file was created on " ! msgstr "Öâëí ÷číđ őćţđôĺďđ ďâ " *************** *** 3414,3416 **** ",\n" ! "ÁÂĎ ĆÁĘĚ ÂŐĚĎ ĐĎŰËĎÄÖĹÎĎ." --- 3414,3416 ---- ",\n" ! "â÷đ öâëí ÷číđ ňđůěđäăĺďđ." *************** *** 3419,3421 **** msgid "Using swap file \"%s\"" ! msgstr "÷ÉËŐŇĎÓÔĎ×Ŕ ĆÁĘĚ ĎÂÍŚÎŐ \"%s\"" --- 3419,3421 ---- msgid "Using swap file \"%s\"" ! msgstr "Ţęěčôđőćđţá öâëí đ÷îŚďč \"%s\"" *************** *** 3424,3426 **** msgid "Original file \"%s\"" ! msgstr "đĎŢÁÔËĎ×ÉĘ ĆÁĘĚ \"%s\"" --- 3424,3426 ---- msgid "Original file \"%s\"" ! msgstr "Ňđŕâćěđţęë öâëí \"%s\"" *************** *** 3428,3430 **** msgid "E308: Warning: Original file may have been changed" ! msgstr "E308: ő×ÁÇÁ: íĎÖĚÉ×Ď, ĐĎŢÁÔËĎ×ÉĘ ĆÁĘĚ ÂŐĚĎ ÚÍŚÎĹÎĎ" --- 3428,3430 ---- msgid "E308: Warning: Original file may have been changed" ! msgstr "E308: Čţâúâ: Îđăíęţđ, ňđŕâćěđţęë öâëí ÷číđ ˙îŚďĺďđ" *************** *** 3434,3436 **** msgid "E309: Unable to read block 1 from %s" ! msgstr "E309: îĹ ÍĎÄŐ ÚŢÉÔÁÔÉ ÂĚĎË 1 Ú %s" --- 3434,3436 ---- msgid "E309: Unable to read block 1 from %s" ! msgstr "E309: Ďĺ îđäč ˙ŕęćâćę ÷íđě 1 ˙ %s" *************** *** 3439,3441 **** msgid "???MANY LINES MISSING" ! msgstr "??? âÁÇÁÔĎ ŇŃÄËŚ× ×ÔŇÁŢĹÎĎ" --- 3439,3441 ---- msgid "???MANY LINES MISSING" ! msgstr "??? ×âúâćđ ôóäěŚţ ţćôâŕĺďđ" *************** *** 3443,3445 **** msgid "???LINE COUNT WRONG" ! msgstr "??? îĹ׌ŇÎÁ ËŚĚŘËŚÓÔŘ ŇŃÄËŚ×" --- 3443,3445 ---- msgid "???LINE COUNT WRONG" ! msgstr "??? ĎĺţŚôďâ ěŚíűěŚőćű ôóäěŚţ" *************** *** 3447,3449 **** msgid "???EMPTY BLOCK" ! msgstr "??? đĎŇĎÖÎŚĘ ÂĚĎË" --- 3447,3449 ---- msgid "???EMPTY BLOCK" ! msgstr "??? ŇđôđăďŚë ÷íđě" *************** *** 3451,3453 **** msgid "???LINES MISSING" ! msgstr "??? ňŃÄËÉ ×ÔŇÁŢĹÎĎ" --- 3451,3453 ---- msgid "???LINES MISSING" ! msgstr "??? Ôóäěę ţćôâŕĺďđ" *************** *** 3456,3458 **** msgid "E310: Block 1 ID wrong (%s not a .swp file?)" ! msgstr "E310: éÄĹÎÔÉĆŚËÁÔĎŇ ÂĚĎËŐ 1 ÎĹ׌ŇÎÉĘ (ÍĎÖĚÉ×Ď %s ÎĹ ĆÁĘĚ ĎÂÍŚÎŐ?)" --- 3456,3458 ---- msgid "E310: Block 1 ID wrong (%s not a .swp file?)" ! msgstr "E310: ĘäĺďćęöŚěâćđô ÷íđěč 1 ďĺţŚôďęë (îđăíęţđ %s ďĺ öâëí đ÷îŚďč?)" *************** *** 3461,3463 **** msgid "???BLOCK MISSING" ! msgstr "??? âĚĎË ×ÔŇÁŢĹÎĎ" --- 3461,3463 ---- msgid "???BLOCK MISSING" ! msgstr "??? ×íđě ţćôâŕĺďđ" *************** *** 3465,3467 **** msgid "??? from here until ???END lines may be messed up" ! msgstr "??? ÷ŚÄ ĂŘĎÇĎ ŇŃÄËÁ Ś ÄĎ `??? ëŚÎĹĂŘ' ŇŃÄËÉ ÍĎÖŐÔŘ ÂŐÔÉ ÓĐĚŐÔÁÎŚ" --- 3465,3467 ---- msgid "??? from here until ???END lines may be messed up" ! msgstr "??? ŢŚä çűđúđ ôóäěâ Ś äđ `??? ĚŚďĺçű' ôóäěę îđăčćű ÷čćę őňíčćâďŚ" *************** *** 3470,3472 **** msgstr "" ! "??? ÷ŚÄ ĂŘĎÇĎ ŇŃÄËÁ Ś ÄĎ `??? ëŚÎĹĂŘ' ŇŃÄËÉ ÍĎÖŐÔŘ ÂŐÔÉ ÄĎÄÁÎŚ/×ÔŇÁŢĹÎŚ" --- 3470,3472 ---- msgstr "" ! "??? ŢŚä çűđúđ ôóäěâ Ś äđ `??? ĚŚďĺçű' ôóäěę îđăčćű ÷čćę äđäâďŚ/ţćôâŕĺďŚ" *************** *** 3474,3476 **** msgid "???END" ! msgstr "??? ëŚÎĹĂŘ" --- 3474,3476 ---- msgid "???END" ! msgstr "??? ĚŚďĺçű" *************** *** 3478,3480 **** msgid "E311: Recovery Interrupted" ! msgstr "E311: ÷ŚÄÎĎ×ĚĹÎÎŃ ĐĹŇĹŇ×ÁÎĎ" --- 3478,3480 ---- msgid "E311: Recovery Interrupted" ! msgstr "E311: ŢŚäďđţíĺďďó ňĺôĺôţâďđ" *************** *** 3484,3487 **** msgstr "" ! "E312: đŚÄ ŢÁÓ ×ŚÄÎĎ×ĚĹÎÎŃ ÚÎÁĘÄĹÎ ĐĎÍÉĚËÉ.. đÉĚŘÎŐĘÔĹ ŇŃÄËÉ ÝĎ ĐĎŢÉÎÁŔÉÔŘÓŃ " ! "Ú `???'" --- 3484,3487 ---- msgstr "" ! "E312: ŇŚä ŕâő ţŚäďđţíĺďďó ˙ďâëäĺď ňđîęíěę.. Ňęíűďčëćĺ ôóäěę üđ ňđŕęďâáęćűőó " ! "˙ `???'" *************** *** 3489,3491 **** msgid "Recovery completed. You should check if everything is OK." ! msgstr "÷ŚÄÎĎ×ĚĹÎÎŃ ÚÁËŚÎŢĹÎĎ, ĐĹŇĹ׌ŇÔĹ ŢÉ ×ÓĹ ĐŇÁ×ÉĚŘÎĎ." --- 3489,3491 ---- msgid "Recovery completed. You should check if everything is OK." ! msgstr "ŢŚäďđţíĺďďó ˙âěŚďŕĺďđ, ňĺôĺţŚôćĺ ŕę ţőĺ ňôâţęíűďđ." *************** *** 3497,3499 **** "\n" ! "(ńËÝĎ ÂÁÖÁ¤ÔĹ, ÍĎÖĹÔĹ ÚÁĐÁÍ'ŃÔÁÔÉ ĂĹĘ ĆÁĘĚ Ú ŚÎŰÉÍ ŚÍĹÎĹÍ\n" --- 3497,3499 ---- "\n" ! "(Óěüđ ÷âăâ¤ćĺ, îđăĺćĺ ˙âňâî'óćâćę çĺë öâëí ˙ Śďůęî Śîĺďĺî\n" *************** *** 3501,3503 **** msgid "and run diff with the original file to check for changes)\n" ! msgstr "Ś, ĐĎŇŚ×Ń×ŰÉ Ú ĎŇÉÇŚÎÉĚĎÍ, ĐĹŇĹ׌ŇÔĹ ÚÍŚÎÉ)\n" --- 3501,3503 ---- msgid "and run diff with the original file to check for changes)\n" ! msgstr "Ś, ňđôŚţóţůę ˙ đôęúŚďęíđî, ňĺôĺţŚôćĺ ˙îŚďę)\n" *************** *** 3508,3510 **** msgstr "" ! "đŚÓĚŃ ĂŘĎÇĎ, ×ÉÄÁĚŚÔŘ ĆÁĘĚ ĎÂÍŚÎŐ.\n" "\n" --- 3508,3510 ---- msgstr "" ! "ŇŚőíó çűđúđ, ţęäâíŚćű öâëí đ÷îŚďč.\n" "\n" *************** *** 3514,3516 **** msgid "Swap files found:" ! msgstr "úÎÁĘÄĹÎĎ ĆÁĘĚÉ ĎÂÍŚÎŐ:" --- 3514,3516 ---- msgid "Swap files found:" ! msgstr "ßďâëäĺďđ öâëíę đ÷îŚďč:" *************** *** 3518,3520 **** msgid " In current directory:\n" ! msgstr " ÷ ĐĎÔĎŢÎŚĘ ÄÉŇĹËÔĎŇŚ§:\n" --- 3518,3520 ---- msgid " In current directory:\n" ! msgstr " Ţ ňđćđŕďŚë äęôĺěćđôŚ§:\n" *************** *** 3522,3524 **** msgid " Using specified name:\n" ! msgstr " ÷ÉËĎŇÉÓÔĎ×ŐŔÖÉ ×ËÁÚÁÎŐ ÎÁÚ×Ő:\n" --- 3522,3524 ---- msgid " Using specified name:\n" ! msgstr " Ţęěđôęőćđţčáăę ţěâ˙âďč ďâ˙ţč:\n" *************** *** 3526,3528 **** msgid " In directory " ! msgstr " ő ÄÉŇĹËÔĎŇŚ§ " --- 3526,3528 ---- msgid " In directory " ! msgstr " Č äęôĺěćđôŚ§ " *************** *** 3530,3532 **** msgid " -- none --\n" ! msgstr " -- ÖĎÄÎĎÇĎ --\n" --- 3530,3532 ---- msgid " -- none --\n" ! msgstr " -- ăđäďđúđ --\n" *************** *** 3534,3536 **** msgid " owned by: " ! msgstr " ×ĚÁÓÎÉË: " --- 3534,3536 ---- msgid " owned by: " ! msgstr " ţíâőďęě: " *************** *** 3538,3540 **** msgid " dated: " ! msgstr " ÄÁÔĎ×ÁÎĎ: " --- 3538,3540 ---- msgid " dated: " ! msgstr " äâćđţâďđ: " *************** *** 3542,3544 **** msgid " dated: " ! msgstr " ÄÁÔĎ×ÁÎĎ: " --- 3542,3544 ---- msgid " dated: " ! msgstr " äâćđţâďđ: " *************** *** 3546,3548 **** msgid " [from Vim version 3.0]" ! msgstr " [×ŚÄ Vim 3.0]" --- 3546,3548 ---- msgid " [from Vim version 3.0]" ! msgstr " [ţŚä Vim 3.0]" *************** *** 3550,3552 **** msgid " [does not look like a Vim swap file]" ! msgstr " [ÎĹ ÓČĎÖĹ ÎÁ ĆÁĘĚ ĎÂÍŚÎŐ]" --- 3550,3552 ---- msgid " [does not look like a Vim swap file]" ! msgstr " [ďĺ őéđăĺ ďâ öâëí đ÷îŚďč]" *************** *** 3554,3556 **** msgid " file name: " ! msgstr " ÎÁÚ×Á ĆÁĘĚÁ: " --- 3554,3556 ---- msgid " file name: " ! msgstr " ďâ˙ţâ öâëíâ: " *************** *** 3562,3564 **** "\n" ! " ÚÍŚÎĹÎĎ: " --- 3562,3564 ---- "\n" ! " ˙îŚďĺďđ: " *************** *** 3566,3568 **** msgid "YES" ! msgstr "ôáë" --- 3566,3568 ---- msgid "YES" ! msgstr "ĆÂĚ" *************** *** 3570,3572 **** msgid "no" ! msgstr "ÎŚ" --- 3570,3572 ---- msgid "no" ! msgstr "ďŚ" *************** *** 3578,3580 **** "\n" ! " ŚÍ'Ń ËĎŇÉÓÔŐ×ÁŢÁ: " --- 3578,3580 ---- "\n" ! " Śî'ó ěđôęőćčţâŕâ: " *************** *** 3582,3584 **** msgid " host name: " ! msgstr " ÎÁÚ×Á ÓÉÓÔĹÍÉ: " --- 3582,3584 ---- msgid " host name: " ! msgstr " ďâ˙ţâ őęőćĺîę: " *************** *** 3590,3592 **** "\n" ! " ÎÁÚ×Á ÓÉÓÔĹÍÉ: " --- 3590,3592 ---- "\n" ! " ďâ˙ţâ őęőćĺîę: " *************** *** 3598,3600 **** "\n" ! " ÎĎÍĹŇ ĐŇĎĂĹÓŐ: " --- 3598,3600 ---- "\n" ! " ďđîĺô ňôđçĺőč: " *************** *** 3602,3604 **** msgid " (still running)" ! msgstr " (ŐÓĹ ÝĹ ×ÉËĎÎŐ¤ÔŘÓŃ)" --- 3602,3604 ---- msgid " (still running)" ! msgstr " (čőĺ üĺ ţęěđďč¤ćűőó)" *************** *** 3610,3612 **** "\n" ! " [îĹ ÍĎÖĹ ÂŐÔÉ ×ÉËĎŇÉÓÔÁÎĎ Ú ĂŚ¤Ŕ ×ĹŇÓŚ¤Ŕ Vim]" --- 3610,3612 ---- "\n" ! " [Ďĺ îđăĺ ÷čćę ţęěđôęőćâďđ ˙ 猤á ţĺôőŚ¤á Vim]" *************** *** 3618,3620 **** "\n" ! " [ÎĹĐŇÉÄÁÔÎÉĘ ÄĎ ×ÉËĎŇÉÓÔÁÎÎŃ ÎÁ ×ÁŰŚĘ ÁŇČŚÔĹËÔŐŇŚ]" --- 3618,3620 ---- "\n" ! " [ďĺňôęäâćďęë äđ ţęěđôęőćâďďó ďâ ţâůŚë âôéŚćĺěćčôŚ]" *************** *** 3622,3624 **** msgid " [cannot be read]" ! msgstr " [ÎĹ ÍĎÖĹ ÂŚÔŘ ĐŇĎŢÉÔÁÎÉĘ]" --- 3622,3624 ---- msgid " [cannot be read]" ! msgstr " [ďĺ îđăĺ ÷Śćű ňôđŕęćâďęë]" *************** *** 3626,3628 **** msgid " [cannot be opened]" ! msgstr " [ÎĹ ÍĎÖĹ ÂŐÔÉ ×ŚÄËŇÉÔÉĘ]" --- 3626,3628 ---- msgid " [cannot be opened]" ! msgstr " [ďĺ îđăĺ ÷čćę ţŚäěôęćęë]" *************** *** 3630,3632 **** msgid "E313: Cannot preserve, there is no swap file" ! msgstr "E313: îĹ ÍĎÖŐ ÚÂĹŇŚÇÔÉ, ÎĹÍÁ¤ ĆÁĘĚÁ ĎÂÍŚÎŐ" --- 3630,3632 ---- msgid "E313: Cannot preserve, there is no swap file" ! msgstr "E313: Ďĺ îđăč ˙÷ĺôŚúćę, ďĺî⤠öâëíâ đ÷îŚďč" *************** *** 3635,3637 **** msgid "File preserved" ! msgstr "ćÁĘĚ ÚÂĹŇĹÖĹÎĎ" --- 3635,3637 ---- msgid "File preserved" ! msgstr "Öâëí ˙÷ĺôĺăĺďđ" *************** *** 3639,3641 **** msgid "E314: Preserve failed" ! msgstr "E314: úÂĹŇĹÖĹÎÎŃ ÎĹ ×ÄÁĚĎÓŃ" --- 3639,3641 ---- msgid "E314: Preserve failed" ! msgstr "E314: ß÷ĺôĺăĺďďó ďĺ ţäâíđőó" *************** *** 3645,3647 **** msgid "E315: ml_get: invalid lnum: %ld" ! msgstr "E315: ml_get: ÎĹ׌ŇÎÉĘ lnum: %ld [ĐĎÍÉĚËÁ ĐŇĎÇŇÁÍÉ]" --- 3645,3647 ---- msgid "E315: ml_get: invalid lnum: %ld" ! msgstr "E315: ml_get: ďĺţŚôďęë lnum: %ld [ňđîęíěâ ňôđúôâîę]" *************** *** 3651,3653 **** msgid "E316: ml_get: cannot find line %ld" ! msgstr "E316: ml_get: ŇŃÄĎË %ld ÎĹ ÚÎÁĘÄĹÎĎ [ĐĎÍÉĚËÁ ĐŇĎÇŇÁÍÉ]" --- 3651,3653 ---- msgid "E316: ml_get: cannot find line %ld" ! msgstr "E316: ml_get: ôóäđě %ld ďĺ ˙ďâëäĺďđ [ňđîęíěâ ňôđúôâîę]" *************** *** 3656,3658 **** msgid "E317: pointer block id wrong 3" ! msgstr "E317: ×ËÁÚŚ×ÎÉË ÂĚĎËŐ ĐĎÍÉĚËĎ×ÉĘ (3) [ĐĎÍÉĚËÁ ĐŇĎÇŇÁÍÉ]" --- 3656,3658 ---- msgid "E317: pointer block id wrong 3" ! msgstr "E317: ţěâ˙Śţďęě ÷íđěč ňđîęíěđţęë (3) [ňđîęíěâ ňôđúôâîę]" *************** *** 3661,3663 **** msgid "stack_idx should be 0" ! msgstr "stack_idx ÍÁ¤ ÂŐÔÉ ŇŚ×ÎÉÍ 0 [ĐĎÍÉĚËÁ ĐŇĎÇŇÁÍÉ]" --- 3661,3663 ---- msgid "stack_idx should be 0" ! msgstr "stack_idx î⤠÷čćę ôŚţďęî 0 [ňđîęíěâ ňôđúôâîę]" *************** *** 3665,3667 **** msgid "E318: Updated too many blocks?" ! msgstr "E318: úÁÂÁÇÁÔĎ ÂĚĎËŚ× ĐĎÎĎ×ĚĹÎĎ? [ĐĎÍÉĚËÁ ĐŇĎÇŇÁÍÉ]" --- 3665,3667 ---- msgid "E318: Updated too many blocks?" ! msgstr "E318: ßâ÷âúâćđ ÷íđěŚţ ňđďđţíĺďđ? [ňđîęíěâ ňôđúôâîę]" *************** *** 3669,3671 **** msgid "E317: pointer block id wrong 4" ! msgstr "E317: ×ËÁÚŚ×ÎÉË ÂĚĎËŐ ĐĎÍÉĚËĎ×ÉĘ (4) [ĐĎÍÉĚËÁ ĐŇĎÇŇÁÍÉ]" --- 3669,3671 ---- msgid "E317: pointer block id wrong 4" ! msgstr "E317: ţěâ˙Śţďęě ÷íđěč ňđîęíěđţęë (4) [ňđîęíěâ ňôđúôâîę]" *************** *** 3673,3675 **** msgid "deleted block 1?" ! msgstr "ÂĚĎË 1 ×ÉÄÁĚĹÎĎ? [ĐĎÍÉĚËÁ ĐŇĎÇŇÁÍÉ]" --- 3673,3675 ---- msgid "deleted block 1?" ! msgstr "÷íđě 1 ţęäâíĺďđ? [ňđîęíěâ ňôđúôâîę]" *************** *** 3678,3680 **** msgid "E320: Cannot find line %ld" ! msgstr "E320: îĹ ÍĎÖŐ ÚÎÁĘÔÉ ŇŃÄĎË %ld [ĐĎÍÉĚËÁ ĐŇĎÇŇÁÍÉ]" --- 3678,3680 ---- msgid "E320: Cannot find line %ld" ! msgstr "E320: Ďĺ îđăč ˙ďâëćę ôóäđě %ld [ňđîęíěâ ňôđúôâîę]" *************** *** 3682,3684 **** msgid "E317: pointer block id wrong" ! msgstr "E317: ×ËÁÚŚ×ÎÉË ÂĚĎËŐ ĐĎÍÉĚËĎ×ÉĘ [ĐĎÍÉĚËÁ ĐŇĎÇŇÁÍÉ]" --- 3682,3684 ---- msgid "E317: pointer block id wrong" ! msgstr "E317: ţěâ˙Śţďęě ÷íđěč ňđîęíěđţęë [ňđîęíěâ ňôđúôâîę]" *************** *** 3687,3689 **** msgid "pe_line_count is zero" ! msgstr "pe_line_count ŇŚ×ĹÎ 0 [ĐĎÍÉĚËÁ ĐŇĎÇŇÁÍÉ]" --- 3687,3689 ---- msgid "pe_line_count is zero" ! msgstr "pe_line_count ôŚţĺď 0 [ňđîęíěâ ňôđúôâîę]" *************** *** 3692,3694 **** msgid "E322: line number out of range: %ld past the end" ! msgstr "E322: ÎĎÍĹŇ ŇŃÄËÁ ×ÉĘŰĎ× ÚÁ ÍĹÖŚ: %ld [ĐĎÍÉĚËÁ ĐŇĎÇŇÁÍÉ]" --- 3692,3694 ---- msgid "E322: line number out of range: %ld past the end" ! msgstr "E322: ďđîĺô ôóäěâ ţęëůđţ ˙â îĺăŚ: %ld [ňđîęíěâ ňôđúôâîę]" *************** *** 3698,3700 **** msgid "E323: line count wrong in block %ld" ! msgstr "E323: ëŚĚŘËŚÓÔŘ ŇŃÄËŚ× Ő ÂĚĎĂŚ %ld ĐĎÍÉĚËĎ×Á" --- 3698,3700 ---- msgid "E323: line count wrong in block %ld" ! msgstr "E323: ĚŚíűěŚőćű ôóäěŚţ č ÷íđçŚ %ld ňđîęíěđţâ" *************** *** 3703,3705 **** msgid "Stack size increases" ! msgstr "ňĎÚÍŚŇ ÓÔĹËŐ ÚÂŚĚŘŰŐ¤ÔŘÓŃ" --- 3703,3705 ---- msgid "Stack size increases" ! msgstr "Ôđ˙îŚô őćĺěč ˙÷Śíűůč¤ćűőó" *************** *** 3707,3709 **** msgid "E317: pointer block id wrong 2" ! msgstr "E317: ×ËÁÚŚ×ÎÉË ÂĚĎËŐ ĐĎÍÉĚËĎ×ÉĘ (2) [ĐĎÍÉĚËÁ ĐŇĎÇŇÁÍÉ]" --- 3707,3709 ---- msgid "E317: pointer block id wrong 2" ! msgstr "E317: ţěâ˙Śţďęě ÷íđěč ňđîęíěđţęë (2) [ňđîęíěâ ňôđúôâîę]" *************** *** 3712,3714 **** msgid "E325: ATTENTION" ! msgstr "E325: ő÷áçá" --- 3712,3714 ---- msgid "E325: ATTENTION" ! msgstr "E325: ČŢÂÚÂ" *************** *** 3720,3722 **** "\n" ! "úÎÁĘÄĹÎĎ ĆÁĘĚ ĎÂÍŚÎŐ ÎÁ ŚÍ'Ń \"" --- 3720,3722 ---- "\n" ! "ßďâëäĺďđ öâëí đ÷îŚďč ďâ Śî'ó \"" *************** *** 3724,3726 **** msgid "While opening file \"" ! msgstr "îÁÍÁÇÁŔŢÉÓŘ ×ŚÄËŇÉÔÉ ĆÁĘĚ \"" --- 3724,3726 ---- msgid "While opening file \"" ! msgstr "Ďâîâúâáŕęőű ţŚäěôęćę öâëí \"" *************** *** 3728,3730 **** msgid " NEWER than swap file!\n" ! msgstr " đĎŢÁÔËĎÉĘ ĆÁĘĚ ÎĎ׌ÝÉĘ ÚÁ ĆÁĘĚ ĎÂÍŚÎŐ\n" --- 3728,3730 ---- msgid " NEWER than swap file!\n" ! msgstr " Ňđŕâćěđęë öâëí ďđţŚüęë ˙â öâëí đ÷îŚďč\n" *************** *** 3740,3743 **** "\n" ! "(1) íĎÖĚÉ×Ď, ŚÎŰÉĘ Vim ŐÖĹ ŇĹÄÁÇŐ¤ ĂĹĘ ĆÁĘĚ. âŐÄŘÔĹ ĎÂĹŇĹÖÎŚ,\n" ! " ×É ÍĎÖĹÔĹ ÚÁĚÉŰŚÔŘÓŃ Ú Ä×ĎÍÁ ŇŚÚÎÉÍÉ ×ĹŇÓŚŃÍÉ ĆÁĘĚŐ.\n" --- 3740,3743 ---- "\n" ! "(1) Îđăíęţđ, Śďůęë Vim čăĺ ôĺäâúč¤ çĺë öâëí. ×čäűćĺ đ÷ĺôĺăďŚ,\n" ! " ţę îđăĺćĺ ˙âíęůŚćűőó ˙ äţđîâ ôŚ˙ďęîę ţĺôőŚóîę öâëíč.\n" *************** *** 3745,3747 **** msgid " Quit, or continue with caution.\n" ! msgstr " ÷ÉĘÄŚÔŘ, ÁÂĎ ĐŇĎÄĎ×ÖŐĘÔĹ Ú ĎÂĹŇĹÖÎŚÓÔŔ.\n" --- 3745,3747 ---- msgid " Quit, or continue with caution.\n" ! msgstr " ŢęëäŚćű, â÷đ ňôđäđţăčëćĺ ˙ đ÷ĺôĺăďŚőćá.\n" *************** *** 3753,3755 **** "\n" ! "(2) đĎĐĹŇĹÄÎŚĘ ÓĹÁÎÓ ŇĹÄÁÇŐ×ÁÎÎŃ Á×ÁŇŚĘÎĎ ÚÁ×ĹŇŰÉ×ÓŃ.\n" --- 3753,3755 ---- "\n" ! "(2) ŇđňĺôĺäďŚë őĺâďő ôĺäâúčţâďďó âţâôŚëďđ ˙âţĺôůęţőó.\n" *************** *** 3757,3759 **** msgid " If this is the case, use \":recover\" or \"vim -r " ! msgstr " ÷ÉËĎŇÉÓÔÁĘÔĹ \":recover\" ÁÂĎ \"vim -r\" " --- 3757,3759 ---- msgid " If this is the case, use \":recover\" or \"vim -r " ! msgstr " Ţęěđôęőćâëćĺ \":recover\" â÷đ \"vim -r\" " *************** *** 3764,3767 **** msgstr "" ! "ÄĚŃ\n" ! " ׌ÄÎĎ×ĚĹÎÎŃ ÚÍŚÎ. (ÄÉ×. \":help recovery\").\n" --- 3764,3767 ---- msgstr "" ! "äíó\n" ! " ţŚäďđţíĺďďó ˙îŚď. (äęţ. \":help recovery\").\n" *************** *** 3769,3771 **** msgid " If you did this already, delete the swap file \"" ! msgstr " ńËÝĎ ×É ĂĹ ×ÖĹ ŇĎÂÉĚÉ, ×ÉÄÁĚŚÔŘ ĆÁĘĚ ĎÂÍŚÎŐ \"" --- 3769,3771 ---- msgid " If you did this already, delete the swap file \"" ! msgstr " Óěüđ ţę çĺ ţăĺ ôđ÷ęíę, ţęäâíŚćű öâëí đ÷îŚďč \"" *************** *** 3777,3779 **** "\"\n" ! " ÝĎ ĐĎÚÂÁ×ÉÔÉÓŃ ĂŘĎÇĎ ĐĎ׌ÄĎÍĚĹÎÎŃ.\n" "\n" --- 3777,3779 ---- "\"\n" ! " üđ÷ ňđ˙÷âţęćęőó çűđúđ ňđţŚäđîíĺďďó.\n" "\n" *************** *** 3782,3784 **** msgid "Swap file \"" ! msgstr "ćÁĘĚ ĎÂÍŚÎŐ \"" --- 3782,3784 ---- msgid "Swap file \"" ! msgstr "Öâëí đ÷îŚďč \"" *************** *** 3786,3788 **** msgid "\" already exists!" ! msgstr "\" ŐÖĹ ŚÓÎŐ¤!" --- 3786,3788 ---- msgid "\" already exists!" ! msgstr "\" čăĺ Śőďč¤!" *************** *** 3790,3792 **** msgid "VIM - ATTENTION" ! msgstr "Vim -- ő×ÁÇÁ" --- 3790,3792 ---- msgid "VIM - ATTENTION" ! msgstr "Vim -- Čţâúâ" *************** *** 3794,3796 **** msgid "Swap file already exists!" ! msgstr "ćÁĘĚ ĎÂÍŚÎŐ ŐÖĹ ŚÓÎŐ¤!" --- 3794,3796 ---- msgid "Swap file already exists!" ! msgstr "Öâëí đ÷îŚďč čăĺ Śőďč¤!" *************** *** 3803,3808 **** msgstr "" ! "&O:÷ŚÄËŇÉÔÉ ĚÉŰĹ ÄĚŃ ŢÉÔÁÎÎŃ\n" ! "&E:őÓĹ ĎÄÎĎ ŇĹÄÁÇŐ×ÁÔÉ\n" ! "&R:÷ŚÄÎĎ×ÉÔÉ\n" ! "&Q:÷ÉĘÔÉ" --- 3803,3808 ---- msgstr "" ! "&O:ŢŚäěôęćę íęůĺ äíó ŕęćâďďó\n" ! "&E:Čőĺ đäďđ ôĺäâúčţâćę\n" ! "&R:ŢŚäďđţęćę\n" ! "&Q:Ţęëćę" *************** *** 3816,3822 **** msgstr "" ! "&O:÷ŚÄËŇÉÔÉ ĚÉŰĹ ÄĚŃ ŢÉÔÁÎÎŃ\n" ! "&E:őÓĹ ĎÄÎĎ ŇĹÄÁÇŐ×ÁÔÉ\n" ! "&R:÷ŚÄÎĎ×ÉÔÉ\n" ! "&Q:÷ÉĘÔÉ\n" ! "&D:÷ÉÄÁĚÉÔÉ ĂĹĘ ĆÁĘĚ" --- 3816,3822 ---- msgstr "" ! "&O:ŢŚäěôęćę íęůĺ äíó ŕęćâďďó\n" ! "&E:Čőĺ đäďđ ôĺäâúčţâćę\n" ! "&R:ŢŚäďđţęćę\n" ! "&Q:Ţęëćę\n" ! "&D:Ţęäâíęćę çĺë öâëí" *************** *** 3824,3826 **** msgid "E326: Too many swap files found" ! msgstr "E326: úÁÂÁÇÁÔĎ ĆÁĘĚŚ× ĎÂÍŚÎŐ ÚÎÁĘÄĹÎĎ" --- 3824,3826 ---- msgid "E326: Too many swap files found" ! msgstr "E326: ßâ÷âúâćđ öâëíŚţ đ÷îŚďč ˙ďâëäĺďđ" *************** *** 3829,3831 **** msgid "E327: Part of menu-item path is not sub-menu" ! msgstr "E327: űĚŃČŐ ÄĎ ĹĚĹÍĹÎÔÁ ÍĹÎŃ ÍÁ¤ ÍŚÓÔÉÔÉ ĚÉŰĹ ĐŚÄÍĹÎŔ" --- 3829,3831 ---- msgid "E327: Part of menu-item path is not sub-menu" ! msgstr "E327: Ůíóéč äđ ĺíĺîĺďćâ îĺďó î⤠îŚőćęćę íęůĺ ňŚäîĺďá" *************** *** 3834,3836 **** msgid "E328: Menu only exists in another mode" ! msgstr "E328: íĹÎŔ ÎĹ ŚÓÎŐ¤ Ő ×ËÁÚÁÎÉČ ŇĹÖÉÍÁČ" --- 3834,3836 ---- msgid "E328: Menu only exists in another mode" ! msgstr "E328: Îĺďá ďĺ Śőďč¤ č ţěâ˙âďęé ôĺăęîâé" *************** *** 3839,3841 **** msgid "E329: No menu of that name" ! msgstr "E329: îĹÍÁ¤ ÍĹÎŔ Ú ÔÁËĎŔ ÎÁÚ×ĎŔ" --- 3839,3841 ---- msgid "E329: No menu of that name" ! msgstr "E329: Ďĺî⤠îĺďá ˙ ćâěđá ďâ˙ţđá" *************** *** 3844,3846 **** msgid "E330: Menu path must not lead to a sub-menu" ! msgstr "E330: űĚŃČ ÄĎ ÍĹÎŃ ÎĹ ĐĎ×ÉÎĹÎ ×ĹÓÔÉ ÄĎ ĐŚÄÍĹÎŔ" --- 3844,3846 ---- msgid "E330: Menu path must not lead to a sub-menu" ! msgstr "E330: Ůíóé äđ îĺďó ďĺ ňđţęďĺď ţĺőćę äđ ňŚäîĺďá" *************** *** 3849,3851 **** msgid "E331: Must not add menu items directly to menu bar" ! msgstr "E331: ÷ŚÄÍĎ×ĚŃŔÓŘ ÄĎÄÁ×ÁÔÉ *ĹĚĹÍĹÎÔÉ* ÍĹÎŔ ĐŇŃÍĎ ÄĎ menubar" --- 3849,3851 ---- msgid "E331: Must not add menu items directly to menu bar" ! msgstr "E331: ŢŚäîđţíóáőű äđäâţâćę *ĺíĺîĺďćę* îĺďá ňôóîđ äđ menubar" *************** *** 3854,3856 **** msgid "E332: Separator cannot be part of a menu path" ! msgstr "E332: ňĎÚÄŚĚŘÎÉË ÎĹ ÍĎÖÎÁ ÄĎÄÁ×ÁÔÉ × ŰĚŃČ ÄĎ ÍĹÎŔ" --- 3854,3856 ---- msgid "E332: Separator cannot be part of a menu path" ! msgstr "E332: Ôđ˙äŚíűďęě ďĺ îđăďâ äđäâţâćę ţ ůíóé äđ îĺďá" *************** *** 3865,3867 **** "\n" ! "--- íĹÎŔ ---" --- 3865,3867 ---- "\n" ! "--- Îĺďá ---" *************** *** 3869,3871 **** msgid "Tear off this menu" ! msgstr "÷ŚÄŚŇ×ÁÔÉ ĂĹ ÍĹÎŔ" --- 3869,3871 ---- msgid "Tear off this menu" ! msgstr "ŢŚäŚôţâćę çĺ îĺďá" *************** *** 3873,3875 **** msgid "E333: Menu path must lead to a menu item" ! msgstr "E333: űĚŃČ ĐĎ×ÉÎĹÎ ×ĹÓÔÉ ÄĎ ĹĚĹÍĹÎÔÁ ÍĹÎŔ" --- 3873,3875 ---- msgid "E333: Menu path must lead to a menu item" ! msgstr "E333: Ůíóé ňđţęďĺď ţĺőćę äđ ĺíĺîĺďćâ îĺďá" *************** *** 3879,3881 **** msgid "E334: Menu not found: %s" ! msgstr "E334: íĹÎŔ %s ÎĹ ÚÎÁĘÄĹÎĎ" --- 3879,3881 ---- msgid "E334: Menu not found: %s" ! msgstr "E334: Îĺďá %s ďĺ ˙ďâëäĺďđ" *************** *** 3885,3887 **** msgid "E335: Menu not defined for %s mode" ! msgstr "E335: ÷ ŇĹÖÉÍŚ `%s' ÍĹÎŔ ÎĹ ŚÓÎŐ¤" --- 3885,3887 ---- msgid "E335: Menu not defined for %s mode" ! msgstr "E335: Ţ ôĺăęîŚ `%s' îĺďá ďĺ Śőďč¤" *************** *** 3890,3892 **** msgid "E336: Menu path must lead to a sub-menu" ! msgstr "E336: űĚŃČ ĐĎ×ÉÎĹÎ ×ĹÓÔÉ ÄĎ ĐŚÄÍĹÎŔ" --- 3890,3892 ---- msgid "E336: Menu path must lead to a sub-menu" ! msgstr "E336: Ůíóé ňđţęďĺď ţĺőćę äđ ňŚäîĺďá" *************** *** 3895,3897 **** msgid "E337: Menu not found - check menu names" ! msgstr "E337: íĹÎŔ ÎĹ ÚÎÁĘÄĹÎĎ -- ĐĹŇĹ׌ŇÔĹ ÎÁÚ×Ő" --- 3895,3897 ---- msgid "E337: Menu not found - check menu names" ! msgstr "E337: Îĺďá ďĺ ˙ďâëäĺďđ -- ňĺôĺţŚôćĺ ďâ˙ţč" *************** *** 3901,3903 **** msgid "Error detected while processing %s:" ! msgstr "đĎÍÉĚËÁ ĐŚÄ ŢÁÓ ×ÉËĎÎÁÎÎŃ %s:" --- 3901,3903 ---- msgid "Error detected while processing %s:" ! msgstr "Ňđîęíěâ ňŚä ŕâő ţęěđďâďďó %s:" *************** *** 3906,3908 **** msgid "line %4ld:" ! msgstr "ŇŃÄĎË %4ld:" --- 3906,3908 ---- msgid "line %4ld:" ! msgstr "ôóäđě %4ld:" *************** *** 3910,3912 **** msgid "[string too long]" ! msgstr "[ŇŃÄĎË ÚÁÎÁÄÎĎ ÄĎ×ÇÉĘ]" --- 3910,3912 ---- msgid "[string too long]" ! msgstr "[ôóäđě ˙âďâäďđ äđţúęë]" *************** *** 3914,3916 **** msgid "Messages maintainer: Bram Moolenaar " ! msgstr "÷ŚÄĐĎ׌ÄÁĚŘÎÉĘ ÚÁ ĐĎ׌ÄĎÍĚĹÎÎŃ: âĎÇÄÁÎ ÷ĚÁÓŔË " --- 3914,3916 ---- msgid "Messages maintainer: Bram Moolenaar " ! msgstr "ŢŚäňđţŚäâíűďęë ˙â ňđţŚäđîíĺďďó: ×đúäâď Ţíâőáě " *************** *** 3918,3920 **** msgid "Interrupt: " ! msgstr "đĹŇĹŇ×ÁÎĎ: " --- 3918,3920 ---- msgid "Interrupt: " ! msgstr "Ňĺôĺôţâďđ: " *************** *** 3922,3924 **** msgid "Hit ENTER to continue" ! msgstr "îÁÔÉÓÎŚÔŘ ENTER ÄĚŃ ĐŇĎÄĎ×ÖĹÎÎŃ" --- 3922,3924 ---- msgid "Hit ENTER to continue" ! msgstr "ĎâćęőďŚćű ENTER äíó ňôđäđţăĺďďó" *************** *** 3926,3928 **** msgid "Hit ENTER or type command to continue" ! msgstr "îÁÔÉÓÎŚÔŘ ENTER ÁÂĎ ×ËÁÖŚÔŘ ËĎÍÁÎÄŐ ÄĚŃ ĐŇĎÄĎ×ÖĹÎÎŃ" --- 3926,3928 ---- msgid "Hit ENTER or type command to continue" ! msgstr "ĎâćęőďŚćű ENTER â÷đ ţěâăŚćű ěđîâďäč äíó ňôđäđţăĺďďó" *************** *** 3930,3932 **** msgid "-- More --" ! msgstr "-- ýĹ --" --- 3930,3932 ---- msgid "-- More --" ! msgstr "-- Üĺ --" *************** *** 3934,3936 **** msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)" ! msgstr " (RET/BS: ŇŃÄĎË, đňďâśě/b: ĚÉÓÔ, d/u: ĐŚ× ĚÉÓÔÁ, q: ×ÉČŚÄ)" --- 3934,3936 ---- msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)" ! msgstr " (RET/BS: ôóäđě, ŇÔĐלÍ/b: íęőć, d/u: ňŚţ íęőćâ, q: ţęéŚä)" *************** *** 3938,3940 **** msgid " (RET: line, SPACE: page, d: half page, q: quit)" ! msgstr " (RET: ŇŃÄĎË, đňďâśě: ĚÉÓÔ, d: ĐŚ× ĚÉÓÔÁ, q: ×ÉČŚÄ)" --- 3938,3940 ---- msgid " (RET: line, SPACE: page, d: half page, q: quit)" ! msgstr " (RET: ôóäđě, ŇÔĐלÍ: íęőć, d: ňŚţ íęőćâ, q: ţęéŚä)" *************** *** 3942,3944 **** msgid "Question" ! msgstr "úÁĐÉÔÁÎÎŃ" --- 3942,3944 ---- msgid "Question" ! msgstr "ßâňęćâďďó" *************** *** 3949,3952 **** msgstr "" ! "&Y:ôÁË\n" ! "&N:îŚ" --- 3949,3952 ---- msgstr "" ! "&Y:Ćâě\n" ! "&N:ĎŚ" *************** *** 3958,3962 **** msgstr "" ! "&Y:ôÁË\n" ! "&N:îŚ\n" ! "&C:÷ŚÄÍŚÎÉÔÉ" --- 3958,3962 ---- msgstr "" ! "&Y:Ćâě\n" ! "&N:ĎŚ\n" ! "&C:ŢŚäîŚďęćę" *************** *** 3970,3976 **** msgstr "" ! "&Y:ôÁË\n" ! "&N:îŚ\n" ! "&A:őÓŚ\n" ! "&D:öĎÄÎĎÇĎ\n" ! "&C:÷ŚÄÍŚÎÉÔÉ" --- 3970,3976 ---- msgstr "" ! "&Y:Ćâě\n" ! "&N:ĎŚ\n" ! "&A:ČőŚ\n" ! "&D:Ăđäďđúđ\n" ! "&C:ŢŚäîŚďęćę" *************** *** 3978,3980 **** msgid "Save File dialog" ! msgstr "úÁĐÁÍ'ŃÔÁÔÉ ĆÁĘĚ" --- 3978,3980 ---- msgid "Save File dialog" ! msgstr "ßâňâî'óćâćę öâëí" *************** *** 3982,3984 **** msgid "Open File dialog" ! msgstr "÷ŚÄËŇÉÔÉ ĆÁĘĚ" --- 3982,3984 ---- msgid "Open File dialog" ! msgstr "ŢŚäěôęćę öâëí" *************** *** 3987,3989 **** msgid "E338: Sorry, no file browser in console mode" ! msgstr "E338: ÷ÉÂÁŢÔĹ, ÁĚĹ × ËĎÎÓĎĚŚ ÎĹÍÁ¤ ÄŚÁĚĎÇŐ ×ÉÂĎŇŐ ĆÁĘĚÁ" --- 3987,3989 ---- msgid "E338: Sorry, no file browser in console mode" ! msgstr "E338: Ţę÷âŕćĺ, âíĺ ţ ěđďőđíŚ ďĺî⤠äŚâíđúč ţę÷đôč öâëíâ" *************** *** 3992,3994 **** msgid "W10: Warning: Changing a readonly file" ! msgstr "W10: ő×ÁÇÁ: úÍŚÎŔ¤ÔŘÓŃ ĆÁĘĚ ĐŇÉÚÎÁŢĹÎÉĘ ĚÉŰĹ ÄĚŃ ŢÉÔÁÎÎŃ" --- 3992,3994 ---- msgid "W10: Warning: Changing a readonly file" ! msgstr "W10: Čţâúâ: ßîŚďá¤ćűőó öâëí ňôę˙ďâŕĺďęë íęůĺ äíó ŕęćâďďó" *************** *** 3996,3998 **** msgid "1 more line" ! msgstr "ÚÎÉÝĹÎĎ ĎÄÉÎ ŇŃÄĎË" --- 3996,3998 ---- msgid "1 more line" ! msgstr "˙ďęüĺďđ đäęď ôóäđě" *************** *** 4000,4002 **** msgid "1 line less" ! msgstr "ÄĎÄÁÎĎ ĎÄÉÎ ŇŃÄĎË" --- 4000,4002 ---- msgid "1 line less" ! msgstr "äđäâďđ đäęď ôóäđě" *************** *** 4005,4007 **** msgid "%ld more lines" ! msgstr "ÄĎÄÁÎĎ ŇŃÄËŚ×: %ld" --- 4005,4007 ---- msgid "%ld more lines" ! msgstr "äđäâďđ ôóäěŚţ: %ld" *************** *** 4010,4012 **** msgid "%ld fewer lines" ! msgstr "ÚÎÉÝĹÎĎ ŇŃÄËŚ×: %ld" --- 4010,4012 ---- msgid "%ld fewer lines" ! msgstr "˙ďęüĺďđ ôóäěŚţ: %ld" *************** *** 4014,4016 **** msgid " (Interrupted)" ! msgstr " (đĹŇĹŇ×ÁÎĎ)" --- 4014,4016 ---- msgid " (Interrupted)" ! msgstr " (Ňĺôĺôţâďđ)" *************** *** 4018,4020 **** msgid "Vim: preserving files...\n" ! msgstr "Vim: úÁÂĹŇŚÇÁŔ ĆÁĘĚÉ...\n" --- 4018,4020 ---- msgid "Vim: preserving files...\n" ! msgstr "Vim: ßâ÷ĺôŚúâá öâëíę...\n" *************** *** 4023,4025 **** msgid "Vim: Finished.\n" ! msgstr "Vim: úÁ×ĹŇŰĹÎĎ.\n" --- 4023,4025 ---- msgid "Vim: Finished.\n" ! msgstr "Vim: ßâţĺôůĺďđ.\n" *************** *** 4027,4029 **** msgid "ERROR: " ! msgstr "đĎÍÉĚËÁ: " --- 4027,4029 ---- msgid "ERROR: " ! msgstr "Ňđîęíěâ: " *************** *** 4036,4038 **** "\n" ! "[ÂÁĘÔ] ×ÓŘĎÇĎ ŇĎÚÍ/ÚÎÉÝ. %lu/%lu, ×ÉËĎŇ. %lu, ÍÁËÓ. %lu\n" --- 4036,4038 ---- "\n" ! "[÷âëć] ţőűđúđ ôđ˙î/˙ďęü. %lu/%lu, ţęěđô. %lu, îâěő. %lu\n" *************** *** 4044,4046 **** msgstr "" ! "[×ÉËĚÉËÉ] ŐÓŘĎÇĎ re/malloc() - %lu, ŐÓŘĎÇĎ free() - %lu\n" "\n" --- 4044,4046 ---- msgstr "" ! "[ţęěíęěę] čőűđúđ re/malloc() - %lu, čőűđúđ free() - %lu\n" "\n" *************** *** 4049,4051 **** msgid "E340: Line is becoming too long" ! msgstr "E340: ňŃÄËÉ ÚÁÎÁÄÔĎ ÄĎ×ÇŚ" --- 4049,4051 ---- msgid "E340: Line is becoming too long" ! msgstr "E340: Ôóäěę ˙âďâäćđ äđţúŚ" *************** *** 4055,4057 **** msgid "E341: Internal error: lalloc(%ld, )" ! msgstr "E341: ÷ÎŐÔŇŚŰÎŃ ĐĎÍÉĚËÁ: lalloc(%ld, )" --- 4055,4057 ---- msgid "E341: Internal error: lalloc(%ld, )" ! msgstr "E341: ŢďčćôŚůďó ňđîęíěâ: lalloc(%ld, )" *************** *** 4061,4063 **** msgid "E342: Out of memory! (allocating %lu bytes)" ! msgstr "E342: úÁÂŇÁËĚĎ ĐÁÍ'ŃÔŚ (×ÉÄŚĚŃĚĎÓŃ %lu ÂÁĘÔŚ×)" --- 4061,4063 ---- msgid "E342: Out of memory! (allocating %lu bytes)" ! msgstr "E342: ßâ÷ôâěíđ ňâî'óćŚ (ţęäŚíóíđőó %lu ÷âëćŚţ)" *************** *** 4067,4069 **** msgid "Calling shell to execute: \"%s\"" ! msgstr "÷ÉËĎÎŐ¤ÍĎ ÚĎ×ÎŚŰÎŐ ËĎÍÁÎÄŐ: \"%s\"" --- 4067,4069 ---- msgid "Calling shell to execute: \"%s\"" ! msgstr "Ţęěđďč¤îđ ˙đţďŚůďč ěđîâďäč: \"%s\"" *************** *** 4071,4073 **** msgid "Missing colon" ! msgstr "÷ÔŇÁŢĹÎĎ Ä×ĎËŇÁĐËŐ" --- 4071,4073 ---- msgid "Missing colon" ! msgstr "Ţćôâŕĺďđ äţđěôâňěč" *************** *** 4075,4077 **** msgid "Illegal mode" ! msgstr "îĹĐŇÉĘÎŃÔÎÉĘ ŇĹÖÉÍ" --- 4075,4077 ---- msgid "Illegal mode" ! msgstr "Ďĺňôęëďóćďęë ôĺăęî" *************** *** 4079,4081 **** msgid "Illegal mouseshape" ! msgstr "îĹĐŇÉĘÎŃÔÎÉĘ ×ÉÇĚŃÄ ÍÉŰŚ" --- 4079,4081 ---- msgid "Illegal mouseshape" ! msgstr "Ďĺňôęëďóćďęë ţęúíóä îęůŚ" *************** *** 4083,4085 **** msgid "digit expected" ! msgstr "ĐĎÔŇŚÂÎÁ ĂÉĆŇÁ" --- 4083,4085 ---- msgid "digit expected" ! msgstr "ňđćôŚ÷ďâ çęöôâ" *************** *** 4087,4089 **** msgid "Illegal percentage" ! msgstr "îĹĐŇÁ×ÉĚŘÎÉĘ ×ŚÄÓĎÔĎË" --- 4087,4089 ---- msgid "Illegal percentage" ! msgstr "Ďĺňôâţęíűďęë ţŚäőđćđě" *************** *** 4091,4093 **** msgid "Enter encryption key: " ! msgstr "÷ËÁÖŚÔŘ ËĚŔŢ ŰÉĆŇŐ: " --- 4091,4093 ---- msgid "Enter encryption key: " ! msgstr "ŢěâăŚćű ěíáŕ ůęöôč: " *************** *** 4095,4097 **** msgid "Enter same key again: " ! msgstr "÷ËÁÖŚÔŘ ÔĎĘ ÔÁÍĘ ËĚŔŢ: " --- 4095,4097 ---- msgid "Enter same key again: " ! msgstr "ŢěâăŚćű ćđë ćâîë ěíáŕ: " *************** *** 4099,4101 **** msgid "Keys don't match!" ! msgstr "ëĚŔŢŚ ÎĹ ÓĐŚ×ĐÁÄÁŔÔŘ!" --- 4099,4101 ---- msgid "Keys don't match!" ! msgstr "Ěíáঠďĺ őňŚţňâäâáćű!" *************** *** 4107,4110 **** msgstr "" ! "E343: îĹĐŇÉĘÎŃÔÎĹ ×ÉÚÎÁŢĹÎÎŃ 'path'. `**[ĂÉĆŇÁ]' ĐĎ×ÉÎÎĎ ÚÎÁČĎÄÉÔÉÓŃ × ËŚÎĂŚ " ! "ŰĚŃČŐ, ÁÂĎ ĐĹŇĹÄ '%s'." --- 4107,4110 ---- msgstr "" ! "E343: Ďĺňôęëďóćďĺ ţę˙ďâŕĺďďó 'path'. `**[çęöôâ]' ňđţęďďđ ˙ďâéđäęćęőó ţ ěŚďçŚ " ! "ůíóéč, â÷đ ňĺôĺä '%s'." *************** *** 4114,4116 **** msgid "E344: Can't find directory \"%s\" in cdpath" ! msgstr "E344: îĹ ÍĎÖŐ ÚÎÁĘÔÉ ÄÉŇĹËÔĎŇŚŔ \"%s\" Ő 'cdpath'" --- 4114,4116 ---- msgid "E344: Can't find directory \"%s\" in cdpath" ! msgstr "E344: Ďĺ îđăč ˙ďâëćę äęôĺěćđôŚá \"%s\" č 'cdpath'" *************** *** 4120,4122 **** msgid "E345: Can't find file \"%s\" in path" ! msgstr "E345: îĹ ÍĎÖŐ ÚÎÁĘÔÉ ĆÁĘĚ \"%s\" Ő 'path'" --- 4120,4122 ---- msgid "E345: Can't find file \"%s\" in path" ! msgstr "E345: Ďĺ îđăč ˙ďâëćę öâëí \"%s\" č 'path'" *************** *** 4126,4128 **** msgid "E346: No more directory \"%s\" found in cdpath" ! msgstr "E346: ő 'cdpath' ÎĹ ÚÎÁĘÄĹÎĎ ŚÎŰÉČ ÄÉŇĹËÔĎŇŚĘ \"%s\"" --- 4126,4128 ---- msgid "E346: No more directory \"%s\" found in cdpath" ! msgstr "E346: Č 'cdpath' ďĺ ˙ďâëäĺďđ Śďůęé äęôĺěćđôŚë \"%s\"" *************** *** 4132,4134 **** msgid "E347: No more file \"%s\" found in path" ! msgstr "E347: ő ŰĚŃČŐ ĐĎŰŐËŐ ÂŚĚŘŰĹ ÎĹÍÁ¤ ĆÁĘĚŚ× \"%s\"" --- 4132,4134 ---- msgid "E347: No more file \"%s\" found in path" ! msgstr "E347: Č ůíóéč ňđůčěč ÷Śíűůĺ ďĺî⤠öâëíŚţ \"%s\"" *************** *** 4137,4139 **** msgid "Illegal component" ! msgstr "îĹÍĎÖĚÉ×ÉĘ ËĎÍĐĎÎĹÎÔ" --- 4137,4139 ---- msgid "Illegal component" ! msgstr "Ďĺîđăíęţęë ěđîňđďĺďć" *************** *** 4141,4143 **** msgid "Warning: terminal cannot highlight" ! msgstr "ő×ÁÇÁ: ÔĹŇÍŚÎÁĚ ÎĹ ĐŚÄÔŇÉÍŐ¤ ËĎĚŘĎŇÉ" --- 4141,4143 ---- msgid "Warning: terminal cannot highlight" ! msgstr "Čţâúâ: ćĺôîŚďâí ďĺ ňŚäćôęîč¤ ěđíűđôę" *************** *** 4145,4147 **** msgid "E348: No string under cursor" ! msgstr "E348: ÷É ÓÔϧÔĹ ÎÁ ĐĎŇĎÖÎŘĎÍŐ ŇŃÄËŐ" --- 4145,4147 ---- msgid "E348: No string under cursor" ! msgstr "E348: Ţę őćđ§ćĺ ďâ ňđôđăďűđîč ôóäěč" *************** *** 4150,4152 **** msgid "E349: No identifier under cursor" ! msgstr "E349: ÷É ÎĹ ÓÔĎŚÔĹ ÎÁ ÓĚĎ׌" --- 4150,4152 ---- msgid "E349: No identifier under cursor" ! msgstr "E349: Ţę ďĺ őćđŚćĺ ďâ őíđţŚ" *************** *** 4154,4156 **** msgid "E352: Cannot erase folds with current 'foldmethod'" ! msgstr "E352: îĹ ÍĎÖŐ ÚÎÉÝÉÔÉ ÚÇĎŇÔËÉ (Ú×ÁÖÁŔŢÉ ÎÁ 'foldmethod')" --- 4154,4156 ---- msgid "E352: Cannot erase folds with current 'foldmethod'" ! msgstr "E352: Ďĺ îđăč ˙ďęüęćę ˙úđôćěę (˙ţâăâáŕę ďâ 'foldmethod')" *************** *** 4159,4161 **** msgid "1 line %sed 1 time" ! msgstr "ĎÄÉÎ ŇŃÄĎË %s-ÎĎ" --- 4159,4161 ---- msgid "1 line %sed 1 time" ! msgstr "đäęď ôóäđě %s-ďđ" *************** *** 4164,4166 **** msgid "1 line %sed %d times" ! msgstr "ĎÄÉÎ ŇŃÄĎË %s-ÎĎ %d ŇÁÚŚ×" --- 4164,4166 ---- msgid "1 line %sed %d times" ! msgstr "đäęď ôóäđě %s-ďđ %d ôâ˙Śţ" *************** *** 4169,4171 **** msgid "%ld lines %sed 1 time" ! msgstr "%ld ŇŃÄËŚ× %s-ÎĎ" --- 4169,4171 ---- msgid "%ld lines %sed 1 time" ! msgstr "%ld ôóäěŚţ %s-ďđ" *************** *** 4174,4176 **** msgid "%ld lines %sed %d times" ! msgstr "%ld ŇŃÄËŚ× %s-ÎĎ %d ŇÁÚŚ×" --- 4174,4176 ---- msgid "%ld lines %sed %d times" ! msgstr "%ld ôóäěŚţ %s-ďđ %d ôâ˙Śţ" *************** *** 4179,4181 **** msgid "%ld lines to indent... " ! msgstr "úÁĚÉŰÉĚĎÓŃ ×ÉŇŚ×ÎŃÔÉ: %ld ŇŃÄËŚ×" --- 4179,4181 ---- msgid "%ld lines to indent... " ! msgstr "ßâíęůęíđőó ţęôŚţďóćę: %ld ôóäěŚţ" *************** *** 4183,4185 **** msgid "1 line indented " ! msgstr "ĎÄÉÎ ŇŃÄĎË ×ÉŇŚ×ÎŃÎĎ" --- 4183,4185 ---- msgid "1 line indented " ! msgstr "đäęď ôóäđě ţęôŚţďóďđ" *************** *** 4188,4190 **** msgid "%ld lines indented " ! msgstr "×ÉŇŚ×ÎŃÎĎ ŇŃÄËŚ×: %ld" --- 4188,4190 ---- msgid "%ld lines indented " ! msgstr "ţęôŚţďóďđ ôóäěŚţ: %ld" *************** *** 4193,4199 **** msgid "cannot yank; delete anyway" ! msgstr "ĐŇĎÂĚĹÍÉ Ú ÚÂĹŇĹÖĹÎÎŃÍ, ×ÓĹ ĎÄÎĎ ×ÉÄÁĚÉÔÉ?" #: ops.c:2018 ! msgid "1 line ~ed" ! msgstr "ňŃÄĎË ŚÎ×ĹŇÔĎ×ÁÎĎ" --- 4193,4199 ---- msgid "cannot yank; delete anyway" ! msgstr "ňôđ÷íĺîę ˙ ˙÷ĺôĺăĺďďóî, ţőĺ đäďđ ţęäâíęćę?" #: ops.c:2018 ! msgid "1 line changed" ! msgstr "Ôóäđě Śďţĺôćđţâďđ" *************** *** 4201,4204 **** #, c-format ! msgid "%ld lines ~ed" ! msgstr "śÎ×ĹŇÔĎ×ÁÎĎ ŇŃÄËŚ×: %ld" --- 4201,4204 ---- #, c-format ! msgid "%ld lines changed" ! msgstr "śďţĺôćđţâďđ ôóäěŚţ: %ld" *************** *** 4207,4209 **** msgid "freeing %ld lines" ! msgstr "Ú׌ĚŘÎĹÎĎ ŇŃÄËŚ×: %ld" --- 4207,4209 ---- msgid "freeing %ld lines" ! msgstr "˙ţŚíűďĺďđ ôóäěŚţ: %ld" *************** *** 4211,4213 **** msgid "1 line yanked" ! msgstr "ňŃÄĎË ÚÂĹŇĹÖĹÎĎ" --- 4211,4213 ---- msgid "1 line yanked" ! msgstr "Ôóäđě ˙÷ĺôĺăĺďđ" *************** *** 4216,4218 **** msgid "%ld lines yanked" ! msgstr "úÂĹŇĹÖĹÎĎ ŇŃÄËŚ×: %ld" --- 4216,4218 ---- msgid "%ld lines yanked" ! msgstr "ß÷ĺôĺăĺďđ ôóäěŚţ: %ld" *************** *** 4221,4223 **** msgid "E353: Nothing in register %s" ! msgstr "E353: ő ŇĹÇŚÓÔŇŚ %s ĐĎŇĎÖÎŘĎ" --- 4221,4223 ---- msgid "E353: Nothing in register %s" ! msgstr "E353: Č ôĺúŚőćôŚ %s ňđôđăďűđ" *************** *** 4231,4233 **** "\n" ! "--- ňĹÇŚÓÔŇÉ ---" --- 4231,4233 ---- "\n" ! "--- ÔĺúŚőćôę ---" *************** *** 4235,4237 **** msgid "Illegal register name" ! msgstr "îĹĐŇÁ×ÉĚŘÎÁ ÎÁÚ×Á ŇĹÇŚÓÔŇÁ" --- 4235,4237 ---- msgid "Illegal register name" ! msgstr "Ďĺňôâţęíűďâ ďâ˙ţâ ôĺúŚőćôâ" *************** *** 4243,4245 **** "\n" ! "# ňĹÇŚÓÔŇÉ:\n" --- 4243,4245 ---- "\n" ! "# ÔĺúŚőćôę:\n" *************** *** 4248,4250 **** msgid "Unknown register type %d" ! msgstr "îĹ׌ÄĎÍÉĘ ÔĹĐ ŇĹÇŚÓÔŇÁ: %d" --- 4248,4250 ---- msgid "Unknown register type %d" ! msgstr "ĎĺţŚäđîęë ćĺň ôĺúŚőćôâ: %d" *************** *** 4253,4255 **** msgid "E354: Invalid register name: '%s'" ! msgstr "E354: îĹĐŇÁ×ÉĚŘÎÁ ÎÁÚ×Á ŇĹÇŚÓÔŇÁ" --- 4253,4255 ---- msgid "E354: Invalid register name: '%s'" ! msgstr "E354: Ďĺňôâţęíűďâ ďâ˙ţâ ôĺúŚőćôâ: '%s'" *************** *** 4258,4260 **** msgid "%ld Cols; " ! msgstr "ÄĎ×Ö.: %ld; " --- 4258,4260 ---- msgid "%ld Cols; " ! msgstr "äđţă.: %ld; " *************** *** 4263,4265 **** msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes" ! msgstr "÷ÉÂŇÁÎĎ - %s%ld Ú %ld ňŃÄËŚ×; %ld Ú %ld óĚŚ×; %ld Ú %ld âÁĘÔŚ×" --- 4263,4265 ---- msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes" ! msgstr "Ţę÷ôâďđ - %s%ld ˙ %ld ÔóäěŚţ; %ld ˙ %ld ŐíŚţ; %ld ˙ %ld ×âëćŚţ" *************** *** 4268,4270 **** 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" --- 4268,4270 ---- 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" *************** *** 4273,4275 **** msgid "(+%ld for BOM)" ! msgstr "(+%ld ÄĚŃ BOM)" --- 4273,4275 ---- msgid "(+%ld for BOM)" ! msgstr "(+%ld äíó BOM)" *************** *** 4277,4279 **** msgid "Thanks for flying Vim" ! msgstr "äŃËŐ¤ÍĎ ÚÁ ׌Ä׌ÄÁÎÎŃ Vim" --- 4277,4279 ---- msgid "Thanks for flying Vim" ! msgstr "Äóěč¤îđ ˙â ţŚäţŚäâďďó Vim" *************** *** 4281,4283 **** msgid "Option not supported" ! msgstr "ďĐĂŚŃ ÎĹ ĐŚÄÔŇÉÍŐ¤ÔŘÓŃ" --- 4281,4283 ---- msgid "Option not supported" ! msgstr "ĐňçŚó ďĺ ňŚäćôęîč¤ćűőó" *************** *** 4285,4287 **** msgid "Not allowed in a modeline" ! msgstr "îĹ ÄĎÚ×ĎĚĹÎĎ Ő modeline" --- 4285,4287 ---- msgid "Not allowed in a modeline" ! msgstr "Ďĺ äđ˙ţđíĺďđ č modeline" *************** *** 4293,4295 **** "\n" ! "\t÷ĎÓÔÁÎÎĹ ÚÍŚÎĹÎŐ Ő " --- 4293,4295 ---- "\n" ! "\tŢđőćâďďĺ ˙îŚďĺďč č " *************** *** 4297,4299 **** msgid "Number required after =" ! msgstr "đŚÓĚŃ = ĐĎÔŇŚÂÎĎ ×ËÁÚÁÔÉ ŢÉÓĚĎ" --- 4297,4299 ---- msgid "Number required after =" ! msgstr "ŇŚőíó = ňđćôŚ÷ďđ ţěâ˙âćę ŕęőíđ" *************** *** 4301,4303 **** msgid "Not found in termcap" ! msgstr "îĹ ÚÎÁĘĚĹÎĎ ÓĹŇĹÄ ÍĎÖĚÉ×ĎÓÔĹĘ ÔĹŇÍŚÎÁĚŚ×" --- 4301,4303 ---- msgid "Not found in termcap" ! msgstr "Ďĺ ˙ďâëíĺďđ őĺôĺä îđăíęţđőćĺë ćĺôîŚďâíŚţ" *************** *** 4306,4308 **** msgid "Illegal character <%s>" ! msgstr "îĹÄĎÚ×ÁĚĹÎÉĘ ÓÉÍ×ĎĚ <%s>" --- 4306,4308 ---- msgid "Illegal character <%s>" ! msgstr "Ďĺäđ˙ţâíĺďęë őęîţđí <%s>" *************** *** 4310,4312 **** msgid "Not allowed here" ! msgstr "ôŐÔ ÔÁËĎÇĎ ÎĹ ĚŔÂĚŃÔŘ" --- 4310,4312 ---- msgid "Not allowed here" ! msgstr "Ćčć ćâěđúđ ďĺ íá÷íóćű" *************** *** 4314,4316 **** msgid "Cannot set 'term' to empty string" ! msgstr "îĹ ÍĎÖŐ ÓĐĎŇĎÖÎÉÔÉ 'term'" --- 4314,4316 ---- msgid "Cannot set 'term' to empty string" ! msgstr "Ďĺ îđăč őňđôđăďęćę 'term'" *************** *** 4318,4320 **** msgid "Cannot change term in GUI" ! msgstr "îĹ ÍĎÖŐ ÚÍŚÎÉÔÉ 'term' × GUI" --- 4318,4320 ---- msgid "Cannot change term in GUI" ! msgstr "Ďĺ îđăč ˙îŚďęćę 'term' ţ GUI" *************** *** 4322,4324 **** msgid "Use \":gui\" to start the GUI" ! msgstr "÷ÉËĎŇÉÓÔĎ×ŐĘÔĹ \":gui\" ÄĚŃ ÔĎÇĎ ÝĎ ŇĎÚĐĎŢÁÔÉ GUI" --- 4322,4324 ---- msgid "Use \":gui\" to start the GUI" ! msgstr "Ţęěđôęőćđţčëćĺ \":gui\" äíó ćđúđ üđ÷ ôđ˙ňđŕâćę GUI" *************** *** 4326,4328 **** msgid "'backupext' and 'patchmode' are equal" ! msgstr "ďĐĂŚ§ 'backupext' ÔÁ 'patchmode' ĎÄÎÁËĎ׌" --- 4326,4328 ---- msgid "'backupext' and 'patchmode' are equal" ! msgstr "Đň猧 'backupext' ćâ 'patchmode' đäďâěđţŚ" *************** *** 4330,4332 **** msgid "Zero length string" ! msgstr "ňŃÄĎË ĐĎŇĎÖÎŚĘ" --- 4330,4332 ---- msgid "Zero length string" ! msgstr "Ôóäđě ňđôđăďŚë" *************** *** 4335,4337 **** msgid "Missing number after <%s>" ! msgstr "đŚÓĚŃ <%s> ×ÔŇÁŢĹÎĎ ÎĎÍĹŇ" --- 4335,4337 ---- msgid "Missing number after <%s>" ! msgstr "ŇŚőíó <%s> ţćôâŕĺďđ ďđîĺô" *************** *** 4339,4341 **** msgid "Missing comma" ! msgstr "÷ÔŇÁŢĹÎĎ ËĎÍŐ" --- 4339,4341 ---- msgid "Missing comma" ! msgstr "Ţćôâŕĺďđ ěđîč" *************** *** 4343,4345 **** msgid "Must specify a ' value" ! msgstr "úÎÁŢĹÎÎŃ ' ÎĹ ×ËÁÚÁÎĎ" --- 4343,4345 ---- msgid "Must specify a ' value" ! msgstr "ßďâŕĺďďó ' ďĺ ţěâ˙âďđ" *************** *** 4347,4349 **** msgid "contains unprintable character" ! msgstr "ÍŚÓÔÉÔŘ ÎĹÄŇŐËĎ×ÎŚ ÓÉÍ×ĎĚÉ" --- 4347,4349 ---- msgid "contains unprintable character" ! msgstr "îŚőćęćű ďĺäôčěđţďŚ őęîţđíę" *************** *** 4351,4353 **** msgid "Invalid font(s)" ! msgstr "îĹ׌ŇÎĎ ×ËÁÚÁÎĎ ŰŇÉĆÔ(É)" --- 4351,4353 ---- msgid "Invalid font(s)" ! msgstr "ĎĺţŚôďđ ţěâ˙âďđ ůôęöć(ę)" *************** *** 4355,4357 **** msgid "can't select fontset" ! msgstr "ÎĹ ÍĎÖŐ ×ÉÂŇÁÔÉ fontset" --- 4355,4357 ---- msgid "can't select fontset" ! msgstr "ďĺ îđăč ţę÷ôâćę fontset" *************** *** 4359,4361 **** msgid "Invalid fontset" ! msgstr "îĹ׌ŇÎÉĘ fontset" --- 4359,4361 ---- msgid "Invalid fontset" ! msgstr "ĎĺţŚôďęë fontset" *************** *** 4363,4365 **** msgid "can't select wide font" ! msgstr "îĹ ÍĎÖŐ ×ÉËĎŇÉÓÔÁÔÉ ŰÉŇĎËÉĘ ŰŇÉĆÔ" --- 4363,4365 ---- msgid "can't select wide font" ! msgstr "Ďĺ îđăč ţęěđôęőćâćę ůęôđěęë ůôęöć" *************** *** 4367,4369 **** msgid "Invalid wide font" ! msgstr "îĹ׌ŇÎÉĘ ŰÉŇĎËÉĘ ŰŇÉĆÔ" --- 4367,4369 ---- msgid "Invalid wide font" ! msgstr "ĎĺţŚôďęë ůęôđěęë ůôęöć" *************** *** 4372,4374 **** msgid "Illegal character after <%c>" ! msgstr "îĹÄĎÚ×ĎĚĹÎÉĘ ÓÉÍ×ĎĚ ĐŚÓĚŃ <%c>" --- 4372,4374 ---- msgid "Illegal character after <%c>" ! msgstr "Ďĺäđ˙ţđíĺďęë őęîţđí ňŚőíó <%c>" *************** *** 4376,4378 **** msgid "comma required" ! msgstr "ĐĎÔŇŚÂÎÁ ËĎÍÁ" --- 4376,4378 ---- msgid "comma required" ! msgstr "ňđćôŚ÷ďâ ěđîâ" *************** *** 4381,4383 **** msgid "'commentstring' must be empty or contain %s" ! msgstr "'commentstring' ÍÁ¤ ÍŚÓÔÉÔÉ %s" --- 4381,4383 ---- msgid "'commentstring' must be empty or contain %s" ! msgstr "'commentstring' î⤠îŚőćęćę %s" *************** *** 4385,4387 **** msgid "No mouse support" ! msgstr "íÉŰÁ ÎĹ ĐŚÄÔŇÉÍŐŔ¤ÔŘÓŃ" --- 4385,4387 ---- msgid "No mouse support" ! msgstr "Îęůâ ďĺ ňŚäćôęîčá¤ćűőó" *************** *** 4389,4391 **** msgid "Unclosed expression sequence" ! msgstr "đĎÓĚŚÄĎ×ÎŚÓÔŘ ×ÉŇÁÚŚ× ÎĹ ÚÁ×ĹŇŰĹÎĎ" --- 4389,4391 ---- msgid "Unclosed expression sequence" ! msgstr "ŇđőíŚäđţďŚőćű ţęôâ˙Śţ ďĺ ˙âţĺôůĺďđ" *************** *** 4393,4395 **** msgid "too many items" ! msgstr "ÚÁÂÁÇÁÔĎ ŢÁÓÔÉÎ" --- 4393,4395 ---- msgid "too many items" ! msgstr "˙â÷âúâćđ ŕâőćęď" *************** *** 4397,4399 **** msgid "unbalanced groups" ! msgstr "ÇŇŐĐÉ ÎĹ ÚÂÁĚÁÎÓĎ×ÁÎĎ" --- 4397,4399 ---- msgid "unbalanced groups" ! msgstr "úôčňę ďĺ ˙÷âíâďőđţâďđ" *************** *** 4401,4403 **** msgid "A preview window already exists" ! msgstr "đĎĐĹŇĹÄΊ׌ËÎĎ ŐÖĹ ŚÓÎŐ¤" --- 4401,4403 ---- msgid "A preview window already exists" ! msgstr "Ňđňĺôĺäďĺ ţŚěďđ čăĺ Śőďč¤" *************** *** 4405,4407 **** msgid "'winheight' cannot be smaller than 'winminheight'" ! msgstr "'winheight' ÎĹ ÍĎÖĹ ÂŐÔÉ ÍĹÎŰĹ ÚÁ 'winminheight'" --- 4405,4407 ---- msgid "'winheight' cannot be smaller than 'winminheight'" ! msgstr "'winheight' ďĺ îđăĺ ÷čćę îĺďůĺ ˙â 'winminheight'" *************** *** 4409,4411 **** msgid "'winwidth' cannot be smaller than 'winminwidth'" ! msgstr "'winwidth' ÎĹ ÍĎÖĹ ÂŐÔÉ ÍĹÎŰĹ ÚÁ 'winminwidth'" --- 4409,4411 ---- msgid "'winwidth' cannot be smaller than 'winminwidth'" ! msgstr "'winwidth' ďĺ îđăĺ ÷čćę îĺďůĺ ˙â 'winminwidth'" *************** *** 4414,4416 **** msgid "Need at least %d lines" ! msgstr "đĎÔŇŚÂÎĎ ŇŃÄËŚ×: ÎĹ ÍĹÎŰĹ %d" --- 4414,4416 ---- msgid "Need at least %d lines" ! msgstr "ŇđćôŚ÷ďđ ôóäěŚţ: ďĺ îĺďůĺ %d" *************** *** 4419,4421 **** msgid "Need at least %d columns" ! msgstr "đĎÔŇŚÂÎĎ ËĎĚĎÎĎË: ÎĹ ÍĹÎŰĹ %d" --- 4419,4421 ---- msgid "Need at least %d columns" ! msgstr "ŇđćôŚ÷ďđ ěđíđďđě: ďĺ îĺďůĺ %d" *************** *** 4424,4426 **** msgid "E355: Unknown option: %s" ! msgstr "E355: îĹ׌ÄĎÍÁ ĎĐĂŚŃ: %s" --- 4424,4426 ---- msgid "E355: Unknown option: %s" ! msgstr "E355: ĎĺţŚäđîâ đňçŚó: %s" *************** *** 4433,4435 **** "\n" ! "--- ëĎÄÉ ÔĹŇÍŚÎÁĚÁ ---" --- 4433,4435 ---- "\n" ! "--- Ěđäę ćĺôîŚďâíâ ---" *************** *** 4441,4443 **** "\n" ! "--- úÁÇÁĚŘÎŚ ÚÎÁŢĹÎÎŃ ÚÍŚÎÎÉČ ---" --- 4441,4443 ---- "\n" ! "--- ßâúâíűďŚ ˙ďâŕĺďďó ˙îŚďďęé ---" *************** *** 4449,4451 **** "\n" ! "--- íŚÓĂĹ׌ ÚÎÁŢĹÎÎŃ ÚÍŚÎÎÉČ ---" --- 4449,4451 ---- "\n" ! "--- ÎŚőçĺţŚ ˙ďâŕĺďďó ˙îŚďďęé ---" *************** *** 4457,4459 **** "\n" ! "--- úÍŚÎÎŚ ---" --- 4457,4459 ---- "\n" ! "--- ßîŚďďŚ ---" *************** *** 4461,4463 **** msgid "E356: get_varp ERROR" ! msgstr "E356: đĎÍÉĚËÁ get_varp [ĐĎÍÉĚËÁ ĐŇĎÇŇÁÍÉ]" --- 4461,4463 ---- msgid "E356: get_varp ERROR" ! msgstr "E356: Ňđîęíěâ get_varp [ňđîęíěâ ňôđúôâîę]" *************** *** 4467,4469 **** msgid "E357: 'langmap': Matching character missing for %s" ! msgstr "E357: 'langmap': äĚŃ ÓÉÍ×ĎĚŐ %s ÎĹÍÁ¤ ĐÁŇÉ" --- 4467,4469 ---- msgid "E357: 'langmap': Matching character missing for %s" ! msgstr "E357: 'langmap': Äíó őęîţđíč %s ďĺî⤠ňâôę" *************** *** 4473,4475 **** msgid "E358: 'langmap': Extra characters after semicolon: %s" ! msgstr "E358: 'langmap': îÁÄĚÉŰËĎ׌ ÓÉÍ×ĎĚÉ ĐŚÓĚŃ `;': %s" --- 4473,4475 ---- msgid "E358: 'langmap': Extra characters after semicolon: %s" ! msgstr "E358: 'langmap': ĎâäíęůěđţŚ őęîţđíę ňŚőíó `;': %s" *************** *** 4478,4480 **** msgid "cannot open " ! msgstr "ÎĹ ÍĎÖŐ ×ŚÄËŇÉÔÉ " --- 4478,4480 ---- msgid "cannot open " ! msgstr "ďĺ îđăč ţŚäěôęćę " *************** *** 4482,4484 **** msgid "VIM: Can't open window!\n" ! msgstr "VIM: îĹ ÍĎÖŐ ×ŚÄËŇÉÔÉ ×ŚËÎĎ!\n" --- 4482,4484 ---- msgid "VIM: Can't open window!\n" ! msgstr "VIM: Ďĺ îđăč ţŚäěôęćę ţŚěďđ!\n" *************** *** 4486,4488 **** msgid "Need Amigados version 2.04 or later\n" ! msgstr "đĎÔŇŚÂÎĎ Amigados 2.04 ÁÂĎ ĐŚÚÎŚŰŚ ×ĹŇÓŚ§\n" --- 4486,4488 ---- msgid "Need Amigados version 2.04 or later\n" ! msgstr "ŇđćôŚ÷ďđ Amigados 2.04 â÷đ ňŚ˙ďŚůŚ ţĺôőŚ§\n" *************** *** 4491,4493 **** msgid "Need %s version %ld\n" ! msgstr "đĎÔŇŚÂÎĎ %s ×ĹŇÓŚ§ %ld\n" --- 4491,4493 ---- msgid "Need %s version %ld\n" ! msgstr "ŇđćôŚ÷ďđ %s ţĺôőŚ§ %ld\n" *************** *** 4495,4497 **** msgid "Cannot open NIL:\n" ! msgstr "îĹ ÍĎÖŐ ×ŚÄËŇÉÔÉ NIL:\n" --- 4495,4497 ---- msgid "Cannot open NIL:\n" ! msgstr "Ďĺ îđăč ţŚäěôęćę NIL:\n" *************** *** 4499,4501 **** msgid "Cannot create " ! msgstr "îĹ ÍĎÖŐ ÓÔ×ĎŇÉÔÉ " --- 4499,4501 ---- msgid "Cannot create " ! msgstr "Ďĺ îđăč őćţđôęćę " *************** *** 4504,4506 **** msgid "Vim exiting with %d\n" ! msgstr "Vim ÚÁ×ĹŇŰŐ¤ ŇĎÂĎÔŐ Ú %d\n" --- 4504,4506 ---- msgid "Vim exiting with %d\n" ! msgstr "Vim ˙âţĺôůč¤ ôđ÷đćč ˙ %d\n" *************** *** 4508,4510 **** msgid "cannot change console mode ?!\n" ! msgstr "ÎĹ ÍĎÖŐ ČÍŚÎÉÔÉ ŇĹÖÉÍ ËĎÎÓĎĚŚ ?!\n" --- 4508,4510 ---- msgid "cannot change console mode ?!\n" ! msgstr "ďĺ îđăč éîŚďęćę ôĺăęî ěđďőđíŚ ?!\n" *************** *** 4512,4514 **** msgid "E359: Screen mode setting not supported" ! msgstr "E359: ňĹÖÉÍ ĹËŇÁÎŐ ÎĹ ĐŚÄÔŇÉÍŐ¤ÔŘÓŃ" --- 4512,4514 ---- msgid "E359: Screen mode setting not supported" ! msgstr "E359: Ôĺăęî ĺěôâďč ďĺ ňŚäćôęîč¤ćűőó" *************** *** 4517,4519 **** msgid "mch_get_shellsize: not a console??\n" ! msgstr "mch_get_shellsize: ÎĹ ËĎÎÓĎĚŘ??\n" --- 4517,4519 ---- msgid "mch_get_shellsize: not a console??\n" ! msgstr "mch_get_shellsize: ďĺ ěđďőđíű??\n" *************** *** 4522,4524 **** msgid "E360: Cannot execute shell with -f option" ! msgstr "E360: îĹ ÍĎÖŐ ×ÉËĎÎÁÔÉ `shell' Ú ĎĐĂŚ¤Ŕ -f" --- 4522,4524 ---- msgid "E360: Cannot execute shell with -f option" ! msgstr "E360: Ďĺ îđăč ţęěđďâćę `shell' ˙ đň猤á -f" *************** *** 4527,4529 **** msgid "Cannot execute " ! msgstr "îĹ ÍĎÖŐ ×ÉËĎÎÁÔÉ " --- 4527,4529 ---- msgid "Cannot execute " ! msgstr "Ďĺ îđăč ţęěđďâćę " *************** *** 4531,4533 **** msgid "shell " ! msgstr "shell" --- 4531,4533 ---- msgid "shell " ! msgstr "shell " *************** *** 4535,4537 **** msgid " returned\n" ! msgstr " ĐĎ×ĹŇÎŐÔĎ\n" --- 4535,4537 ---- msgid " returned\n" ! msgstr " ňđţĺôďčćđ\n" *************** *** 4539,4541 **** msgid "ANCHOR_BUF_SIZE too small." ! msgstr "ANCHOR_BUF_SIZE ÚÁÍÁĚÉĘ" --- 4539,4541 ---- msgid "ANCHOR_BUF_SIZE too small." ! msgstr "ANCHOR_BUF_SIZE ˙âîâíęë" *************** *** 4543,4545 **** msgid "I/O ERROR" ! msgstr "đĎÍÉĚËÁ ××ĎÄŐ/×É×ĎÄŐ" --- 4543,4545 ---- msgid "I/O ERROR" ! msgstr "Ňđîęíěâ ţţđäč/ţęţđäč" *************** *** 4547,4549 **** msgid "...(truncated)" ! msgstr "...(׌ÄŇŚÚÁÎĎ)" --- 4547,4549 ---- msgid "...(truncated)" ! msgstr "...(ţŚäôŚ˙âďđ)" *************** *** 4551,4553 **** msgid "'columns' is not 80, cannot execute external commands" ! msgstr "'commands' ÎĹ 80, ÎĹ ÍĎÖŐ ×ÉËĎÎŐ×ÁÔÉ ÚĎ×ÎŚŰÎŚ ËĎÍÁÎÄÉ" --- 4551,4553 ---- msgid "'columns' is not 80, cannot execute external commands" ! msgstr "'commands' ďĺ 80, ďĺ îđăč ţęěđďčţâćę ˙đţďŚůďŚ ěđîâďäę" *************** *** 4556,4558 **** msgid "E364: Library call failed for \"%s()\"" ! msgstr "E364: ÷ÉËĚÉË Ú ÂŚÂĚŚĎÔĹËÉ ÄĚŃ \"%s()\"ÎĹ ×ÄÁ×ÓŃ" --- 4556,4558 ---- msgid "E364: Library call failed for \"%s()\"" ! msgstr "E364: Ţęěíęě ˙ ÷Ś÷íŚđćĺěę äíó \"%s()\"ďĺ ţäâţőó" *************** *** 4561,4563 **** msgid "E237: Printer selection failed" ! msgstr "E237: îĹ ×ÄÁĚĎÓŃ ×ÉÂŇÁÔÉ ÄŇŐËŚ×ÎÉË" --- 4561,4563 ---- msgid "E237: Printer selection failed" ! msgstr "E237: Ďĺ ţäâíđőó ţę÷ôâćę äôčěŚţďęě" *************** *** 4566,4568 **** msgid "to %s on %s" ! msgstr "ĐĎÍŚÔËÁ %d Ú %d%s" --- 4566,4568 ---- msgid "to %s on %s" ! msgstr "ňđîŚćěâ %s ˙ %s" *************** *** 4571,4573 **** msgid "E238: Print error: %s" ! msgstr "E238: đĎÍÉĚËÁ ÄŇŐËŐ: %s" --- 4571,4573 ---- msgid "E238: Print error: %s" ! msgstr "E238: Ňđîęíěâ äôčěč: %s" *************** *** 4575,4577 **** msgid "Unknown" ! msgstr "îĹ׌ÄĎÍĎ" --- 4575,4577 ---- msgid "Unknown" ! msgstr "ĎĺţŚäđîđ" *************** *** 4580,4582 **** msgid "Printing '%s'" ! msgstr "äŇŐËŐ¤ÍĎ '%s'" --- 4580,4582 ---- msgid "Printing '%s'" ! msgstr "Äôčěč¤îđ '%s'" *************** *** 4585,4587 **** msgid "E244: Illegal charset name \"%s\" in font name \"%s\"" ! msgstr "E244: đĎÍÉĚËĎ×Á ÎÁÚ×Á ÎÁÂĎŇŐ ÓÉÍ×ĎĚŚ× \"%s\" Ő ÎÁÚ׌ ŰŇÉĆÔÁ \"%s\"" --- 4585,4587 ---- msgid "E244: Illegal charset name \"%s\" in font name \"%s\"" ! msgstr "E244: Ňđîęíěđţâ ďâ˙ţâ ďâ÷đôč őęîţđíŚţ \"%s\" č ďâ˙ţŚ ůôęöćâ \"%s\"" *************** *** 4590,4592 **** msgid "E245: Illegal char '%c' in font name \"%s\"" ! msgstr "E245: đĎÍÉĚËĎ×ÉĘ ÓÉÍ×ĎĚ %c × ÎÁÚ׌ ŰŇÉĆÔÁ \"%s\"" --- 4590,4592 ---- msgid "E245: Illegal char '%c' in font name \"%s\"" ! msgstr "E245: Ňđîęíěđţęë őęîţđí %c ţ ďâ˙ţŚ ůôęöćâ \"%s\"" *************** *** 4594,4596 **** msgid "E366: Invalid 'osfiletype' option - using Text" ! msgstr "E366: îĹ׌ŇÎÁ ĎĐĂŚŃ 'osfiletype' -- ×ÉËĎŇÉÓÔĎ×ŐŔ `Text'" --- 4594,4596 ---- msgid "E366: Invalid 'osfiletype' option - using Text" ! msgstr "E366: ĎĺţŚôďâ đňçŚó 'osfiletype' -- ţęěđôęőćđţčá `Text'" *************** *** 4599,4601 **** msgid "Vim: Double signal, exiting\n" ! msgstr "Vim: ďÔŇÉÍÁÎĎ ÓÉÇÎÁĚ Ä׌ތ, ÚÁ×ĹŇŰŐŔ\n" --- 4599,4601 ---- msgid "Vim: Double signal, exiting\n" ! msgstr "Vim: Đćôęîâďđ őęúďâí äţŚŕŚ, ˙âţĺôůčá\n" *************** *** 4604,4606 **** msgid "Vim: Caught deadly signal %s\n" ! msgstr "Vim: ďÔŇÉÍÁÎĎ ÓÉÇÎÁĚ ÚÁËŚÎŢÉÔÉ ŇĎÂĎÔŐ (%s)\n" --- 4604,4606 ---- msgid "Vim: Caught deadly signal %s\n" ! msgstr "Vim: Đćôęîâďđ őęúďâí ˙âěŚďŕęćę ôđ÷đćč (%s)\n" *************** *** 4608,4610 **** msgid "Vim: Caught deadly signal\n" ! msgstr "Vim: ďÔŇÉÍÁÎĎ ÓÉÇÎÁĚ ÚÁËŚÎŢÉÔÉ ŇĎÂĎÔŐ\n" --- 4608,4610 ---- msgid "Vim: Caught deadly signal\n" ! msgstr "Vim: Đćôęîâďđ őęúďâí ˙âěŚďŕęćę ôđ÷đćč\n" *************** *** 4613,4615 **** msgid "Opening the X display took %ld msec" ! msgstr "îÁ ׌ÄËŇÉÔÔŃ X-ÄÁÓĐĚĹŔ ĐŚŰĚĎ %ld ÍŚĚŚÓĹËŐÎÄ" --- 4613,4615 ---- msgid "Opening the X display took %ld msec" ! msgstr "Ďâ ţŚäěôęććó X-äâőňíĺá ňŚůíđ %ld îŚíŚőĺěčďä" *************** *** 4621,4623 **** "\n" ! "Vim: ďÔŇÉÍÁÎĎ ĐĎÍÉĚËŐ X\n" --- 4621,4623 ---- "\n" ! "Vim: Đćôęîâďđ ňđîęíěč X\n" *************** *** 4625,4627 **** msgid "Testing the X display failed" ! msgstr "îĹ ×ÄÁĚĎÓŃ ĐĹŇĹ׌ŇÉÔÉ ÄÉÓĐĚĹĘ X" --- 4625,4627 ---- msgid "Testing the X display failed" ! msgstr "Ďĺ ţäâíđőó ňĺôĺţŚôęćę äęőňíĺë X" *************** *** 4629,4631 **** msgid "Opening the X display timed out" ! msgstr "äŐÖĹ ÄĎ×ÇĎ ×ŚÄËŇÉפÔŘÓŃ ÄÉÓĐĚĹĘ X, ĐĹŇĹŇ×ÁÎĎ" --- 4629,4631 ---- msgid "Opening the X display timed out" ! msgstr "Äčăĺ äđţúđ ţŚäěôęţ¤ćűőó äęőňíĺë X, ňĺôĺôţâďđ" *************** *** 4637,4639 **** "\n" ! "îĹ ÍĎÖŐ ×ÉËĎÎÁÔÉ `shell'" --- 4637,4639 ---- "\n" ! "Ďĺ îđăč ţęěđďâćę `shell'" *************** *** 4645,4647 **** "\n" ! "îĹ ÍĎÖŐ ×ÉËĎÎÁÔÉ `sh'\n" --- 4645,4647 ---- "\n" ! "Ďĺ îđăč ţęěđďâćę `sh'\n" *************** *** 4654,4656 **** "\n" ! "shell ĐĎ×ĹŇÔÁ¤: " --- 4654,4656 ---- "\n" ! "shell ňđţĺôćâ¤: " *************** *** 4662,4664 **** "\n" ! "îĹ ÍĎÖŐ ÓÔ×ĎŇÉÔÉ ËÁÎÁĚÉ\n" --- 4662,4664 ---- "\n" ! "Ďĺ îđăč őćţđôęćę ěâďâíę\n" *************** *** 4670,4672 **** "\n" ! "îĹ ÍĎÖŐ ŇĎÚÄ×ϧÔÉ ×ÉËĎÎÁÎÎŃ [fork()]\n" --- 4670,4672 ---- "\n" ! "Ďĺ îđăč ôđ˙äţđ§ćę ţęěđďâďďó [fork()]\n" *************** *** 4678,4680 **** "\n" ! "ëĎÍÁÎÄÁ ÚÁËŚÎŢÉĚÁ ×ÉËĎÎÁÎÎŃ\n" --- 4678,4680 ---- "\n" ! "Ěđîâďäâ ˙âěŚďŕęíâ ţęěđďâďďó\n" *************** *** 4682,4684 **** msgid "Opening the X display failed" ! msgstr "îĹ ×ÄÁĚĎÓŃ ×ŚÄËŇÉÔÉ ÄÉÓĐĚĹĘ X" --- 4682,4684 ---- msgid "Opening the X display failed" ! msgstr "Ďĺ ţäâíđőó ţŚäěôęćę äęőňíĺë X" *************** *** 4686,4688 **** msgid "At line" ! msgstr "ňŃÄĎË:" --- 4686,4688 ---- msgid "At line" ! msgstr "Ôóäđě:" *************** *** 4690,4692 **** msgid "Could not load vim32.dll!" ! msgstr "îĹ ×ÄÁĚĎÓŃ ÚÁ×ÁÎÔÁÖÉÔÉ vim32.dll" --- 4690,4692 ---- msgid "Could not load vim32.dll!" ! msgstr "Ďĺ ţäâíđőó ˙âţâďćâăęćę vim32.dll" *************** *** 4694,4696 **** msgid "VIM Error" ! msgstr "đĎÍÉĚËÁ Vim" --- 4694,4696 ---- msgid "VIM Error" ! msgstr "Ňđîęíěâ Vim" *************** *** 4698,4700 **** msgid "Could not fix up function pointers to the DLL!" ! msgstr "îĹ ÍĎÖŐ ×ÉĐŇÁ×ÉÔÉ ×ËÁÚŚ×ÎÉËÉ ÎÁ ĆŐÎËĂŚ§ DLL!" --- 4698,4700 ---- msgid "Could not fix up function pointers to the DLL!" ! msgstr "Ďĺ îđăč ţęňôâţęćę ţěâ˙Śţďęěę ďâ öčďě猧 DLL!" *************** *** 4703,4705 **** msgid "shell returned %d" ! msgstr "shell ĐĎ×ĹŇÔÁ¤ %d" --- 4703,4705 ---- msgid "shell returned %d" ! msgstr "shell ňđţĺôć⤠%d" *************** *** 4708,4710 **** msgid "Vim: Caught %s event\n" ! msgstr "Vim: ďÔŇÉÍÁÎĎ %s-ĐĎÄŚŔ\n" --- 4708,4710 ---- msgid "Vim: Caught %s event\n" ! msgstr "Vim: Đćôęîâďđ %s-ňđäŚá\n" *************** *** 4724,4726 **** msgid "E371: Command not found" ! msgstr "E371: ëĎÍÁÎÄŐ ÎĹ ÚÎÁĘÄĹÎĎ" --- 4724,4726 ---- msgid "E371: Command not found" ! msgstr "E371: Ěđîâďäč ďĺ ˙ďâëäĺďđ" *************** *** 4732,4736 **** msgstr "" ! "ćÁĘĚ VIMRUN.EXE ÎĹ ÚÎÁĘÄĹÎĎ Ő ×ÁŰĎÍŐ ŰĚŃČŐ ĐĎŰŐËŐ.\n" ! "úĎ×ÎŚŰÎŚ ËĎÍÁÎÄÉ ÎĹ ÂŐÄŐÔŘ ĐŇÉÚŐĐÉÎĹÎŚ ĐŚÓĚŃ ×ÉËĎÎÁÎÎŃ.\n" ! "äÉ׌ÔŘÓŃ :help win32-vimrun ÄĚŃ ĐĎÄÁĚŘŰϧ ŚÎĆĎŇÍÁĂŚ§." --- 4732,4736 ---- msgstr "" ! "Öâëí VIMRUN.EXE ďĺ ˙ďâëäĺďđ č ţâůđîč ůíóéč ňđůčěč.\n" ! "ßđţďŚůďŚ ěđîâďäę ďĺ ÷čäčćű ňôę˙čňęďĺďŚ ňŚőíó ţęěđďâďďó.\n" ! "ÄęţŚćűőó :help win32-vimrun äíó ňđäâíűů𧠌ďöđôîâ猧." *************** *** 4738,4740 **** msgid "Vim Warning" ! msgstr "đĎĐĹŇĹÄÖĹÎÎŃ Vim" --- 4738,4740 ---- msgid "Vim Warning" ! msgstr "Ňđňĺôĺäăĺďďó Vim" *************** *** 4743,4745 **** msgid "E372: Too many %%%c in format string" ! msgstr "E372: úÁÂÁÇÁÔĎ %%%c Ő ŇŃÄËŐ ĆĎŇÍÁÔÁ" --- 4743,4745 ---- msgid "E372: Too many %%%c in format string" ! msgstr "E372: ßâ÷âúâćđ %%%c č ôóäěč öđôîâćâ" *************** *** 4748,4750 **** msgid "E373: Unexpected %%%c in format string" ! msgstr "E373: îĹĎŢŚËŐ×ÁÎÉĘ `%%%c' Ő ŇŃÄËŐ ĆĎŇÍÁÔÁ" --- 4748,4750 ---- msgid "E373: Unexpected %%%c in format string" ! msgstr "E373: ĎĺđŕŚěčţâďęë `%%%c' č ôóäěč öđôîâćâ" *************** *** 4753,4755 **** msgid "E374: Missing ] in format string" ! msgstr "E374: ÷ÔŇÁŢĹÎĎ ] Ő ŇŃÄËŐ ĆĎŇÍÁÔÁ" --- 4753,4755 ---- msgid "E374: Missing ] in format string" ! msgstr "E374: Ţćôâŕĺďđ ] č ôóäěč öđôîâćâ" *************** *** 4758,4760 **** msgid "E375: Unsupported %%%c in format string" ! msgstr "E375: %%%c Ő ŇŃÄËŐ ĆĎŇÍÁÔÁ ÎĹ ĐŚÄÔŇÉÍŐ¤ÔŘÓŃ" --- 4758,4760 ---- msgid "E375: Unsupported %%%c in format string" ! msgstr "E375: %%%c č ôóäěč öđôîâćâ ďĺ ňŚäćôęîč¤ćűőó" *************** *** 4763,4765 **** msgid "E376: Invalid %%%c in format string prefix" ! msgstr "E376: đĎÍÉĚËĎ×ÉĘ `%%%c' Ő ĐŇĹĆŚËÓŚ ŇŃÄËŐ ĆĎŇÍÁÔÁ" --- 4763,4765 ---- msgid "E376: Invalid %%%c in format string prefix" ! msgstr "E376: Ňđîęíěđţęë `%%%c' č ňôĺöŚěőŚ ôóäěč öđôîâćâ" *************** *** 4768,4770 **** msgid "E377: Invalid %%%c in format string" ! msgstr "E376: đĎÍÉĚËĎ×ÉĘ `%%%c' Ő ŇŃÄËŐ ĆĎŇÍÁÔÁ" --- 4768,4770 ---- msgid "E377: Invalid %%%c in format string" ! msgstr "E376: Ňđîęíěđţęë `%%%c' č ôóäěč öđôîâćâ" *************** *** 4773,4775 **** msgid "E378: 'errorformat' contains no pattern" ! msgstr "E378: 'errorformat' ÍŚÓÔÉÔŘ ĚÉŰĹ Ú×ÉŢÁĘÎŚ ÓÉÍ×ĎĚÉ" --- 4773,4775 ---- msgid "E378: 'errorformat' contains no pattern" ! msgstr "E378: 'errorformat' îŚőćęćű íęůĺ ˙ţęŕâëďŚ őęîţđíę" *************** *** 4778,4780 **** msgid "E379: Missing or empty directory name" ! msgstr "E379: ÷ÔŇÁŢĹÎĎ ÎÁÚ×Ő ÄÉŇĹËÔĎŇŚ§" --- 4778,4780 ---- msgid "E379: Missing or empty directory name" ! msgstr "E379: Ţćôâŕĺďđ ďâ˙ţč äęôĺěćđôŚ§" *************** *** 4782,4784 **** msgid "No more items" ! msgstr "ďÓÔÁÎÎŚĘ ĹĚĹÍĹÎÔ" --- 4782,4784 ---- msgid "No more items" ! msgstr "ĐőćâďďŚë ĺíĺîĺďć" *************** *** 4787,4789 **** msgid "(%d of %d)%s%s: " ! msgstr "(%d Ú %d)%s%s: " --- 4787,4789 ---- msgid "(%d of %d)%s%s: " ! msgstr "(%d ˙ %d)%s%s: " *************** *** 4791,4793 **** msgid " (line deleted)" ! msgstr " (ŇŃÄĎË ×ÉÄÁĚĹÎĎ)" --- 4791,4793 ---- msgid " (line deleted)" ! msgstr " (ôóäđě ţęäâíĺďđ)" *************** *** 4795,4797 **** msgid "E380: At bottom of quickfix stack" ! msgstr "E380: óÔĹË quickfix ĐĎŇĎÖÎŚĘ" --- 4795,4797 ---- msgid "E380: At bottom of quickfix stack" ! msgstr "E380: Őćĺě quickfix ňđôđăďŚë" *************** *** 4799,4801 **** msgid "E381: At top of quickfix stack" ! msgstr "E381: ÷ĹŇŰÉÎÁ ÓÔĹËŐ quickfix" --- 4799,4801 ---- msgid "E381: At top of quickfix stack" ! msgstr "E381: Ţĺôůęďâ őćĺěč quickfix" *************** *** 4804,4806 **** msgid "error list %d of %d; %d errors" ! msgstr "ÓĐÉÓĎË ĐĎÍÉĚĎË %d Ú %d; %d ĐĎÍÉĚĎË" --- 4804,4806 ---- msgid "error list %d of %d; %d errors" ! msgstr "őňęőđě ňđîęíđě %d ˙ %d; %d ňđîęíđě" *************** *** 4808,4810 **** msgid "E382: Cannot write, 'buftype' option is set" ! msgstr "E382: îĹ ÍĎÖŐ ÚÁĐÉÓÁÔÉ, ×ËÁÚÁÎÁ ĎĐĂŚŃ 'buftype'" --- 4808,4810 ---- msgid "E382: Cannot write, 'buftype' option is set" ! msgstr "E382: Ďĺ îđăč ˙âňęőâćę, ţěâ˙âďâ đňçŚó 'buftype'" *************** *** 4813,4815 **** msgid "E339: Pattern too long" ! msgstr "E339: úŇÁÚĎË ÚÁÎÁÄÔĎ ÄĎ×ÇÉĘ" --- 4813,4815 ---- msgid "E339: Pattern too long" ! msgstr "E339: ßôâ˙đě ˙âďâäćđ äđţúęë" *************** *** 4819,4821 **** msgid "E61: Nested %s*" ! msgstr "E61: ÷ËĚÁÄĹÎŚ %s*" --- 4819,4821 ---- msgid "E61: Nested %s*" ! msgstr "E61: ŢěíâäĺďŚ %s*" *************** *** 4825,4827 **** msgid "E62: Nested %s%c" ! msgstr "E62: ÷ËĚÁÄĹÎŚ %s%c" --- 4825,4827 ---- msgid "E62: Nested %s%c" ! msgstr "E62: ŢěíâäĺďŚ %s%c" *************** *** 4831,4833 **** msgid "E64: %s%c follows nothing" ! msgstr "E64: đŚÓĚŃ %s%c ÎŚŢĎÇĎ ÎĹÍÁ¤" --- 4831,4833 ---- msgid "E64: %s%c follows nothing" ! msgstr "E64: ŇŚőíó %s%c ďŚŕđúđ ďĺîâ¤" *************** *** 4837,4839 **** msgid "Syntax error in %s{...}" ! msgstr "óÉÎÔÁËÓÉŢÎÁ ĐĎÍÉĚËÁ × %s{...}" --- 4837,4839 ---- msgid "Syntax error in %s{...}" ! msgstr "Őęďćâěőęŕďâ ňđîęíěâ ţ %s{...}" *************** *** 4841,4843 **** msgid "E361: Crash intercepted; regexp too complex?" ! msgstr "E361: ÷ŚÄÂŐĚÁÓŘ Á×ÁŇŚŃ; ÚÁÎÁÄÔĎ ÓËĚÁÄÎÉĘ ÚŇÁÚĎË?" --- 4841,4843 ---- msgid "E361: Crash intercepted; regexp too complex?" ! msgstr "E361: ŢŚä÷číâőű âţâôŚó; ˙âďâäćđ őěíâäďęë ˙ôâ˙đě?" *************** *** 4845,4847 **** msgid "E363: pattern caused out-of-stack error" ! msgstr "E363: úŇÁÚĎË ÚŢÉÎÉ× ĐĎÍÉĚËŐ ÓÔĹËŐ" --- 4845,4847 ---- msgid "E363: pattern caused out-of-stack error" ! msgstr "E363: ßôâ˙đě ˙ŕęďęţ ňđîęíěč őćĺěč" *************** *** 4849,4851 **** msgid "External submatches:\n" ! msgstr "úĎ×ÎŚŰÎŚ ĐŚÄÚÂŚÇÉ:\n" --- 4849,4851 ---- msgid "External submatches:\n" ! msgstr "ßđţďŚůďŚ ňŚä˙÷Śúę:\n" *************** *** 4854,4856 **** msgid "+--%3ld lines folded " ! msgstr "+--[ÚÇĎŇÔĎË](%3ld ŇŃÄËŚ×)" --- 4854,4856 ---- msgid "+--%3ld lines folded " ! msgstr "+--[˙úđôćđě](%3ld ôóäěŚţ)" *************** *** 4858,4860 **** msgid " VREPLACE" ! msgstr " V-ÚÁÍŚÎÁ" --- 4858,4860 ---- msgid " VREPLACE" ! msgstr " V-˙âîŚďâ" *************** *** 4862,4864 **** msgid " REPLACE" ! msgstr " úÁÍŚÎÁ" --- 4862,4864 ---- msgid " REPLACE" ! msgstr " ßâîŚďâ" *************** *** 4866,4868 **** msgid " REVERSE" ! msgstr " ďÂĹŇÎŐÔĎ" --- 4866,4868 ---- msgid " REVERSE" ! msgstr " Đ÷ĺôďčćđ" *************** *** 4870,4872 **** msgid " INSERT" ! msgstr " ÷ÓÔÁ×ËÁ" --- 4870,4872 ---- msgid " INSERT" ! msgstr " Ţőćâţěâ" *************** *** 4874,4876 **** msgid " (insert)" ! msgstr " (×ÓÔÁ×ËÁ)" --- 4874,4876 ---- msgid " (insert)" ! msgstr " (ţőćâţěâ)" *************** *** 4878,4880 **** msgid " (replace)" ! msgstr " (ÚÁÍŚÎÁ)" --- 4878,4880 ---- msgid " (replace)" ! msgstr " (˙âîŚďâ)" *************** *** 4882,4884 **** msgid " (vreplace)" ! msgstr " (V-ÚÁÍŚÎÁ)" --- 4882,4884 ---- msgid " (vreplace)" ! msgstr " (V-˙âîŚďâ)" *************** *** 4894,4896 **** msgid " (paste)" ! msgstr " (ÂĹÚ ÚÍŚÎ)" --- 4894,4896 ---- msgid " (paste)" ! msgstr " (÷ĺ˙ đ÷ôđ÷ěę)" *************** *** 4898,4900 **** msgid " SELECT" ! msgstr " ÷ÉÄŚĚĹÎÎŃ" --- 4898,4900 ---- msgid " SELECT" ! msgstr " ŢęäŚíĺďďó" *************** *** 4902,4904 **** msgid " VISUAL" ! msgstr " ÷ÉÂŚŇ" --- 4902,4904 ---- msgid " VISUAL" ! msgstr " Ţę÷Śô" *************** *** 4906,4908 **** msgid " BLOCK" ! msgstr " [âĚĎË]" --- 4906,4908 ---- msgid " BLOCK" ! msgstr " [×íđě]" *************** *** 4910,4912 **** msgid " LINE" ! msgstr " [ňŃÄËÉ]" --- 4910,4912 ---- msgid " LINE" ! msgstr " [Ôóäěę]" *************** *** 4914,4916 **** msgid "recording" ! msgstr "ĘÄĹ ÚÁĐÉÓ" --- 4914,4916 ---- msgid "recording" ! msgstr "ëäĺ ˙âňęő" *************** *** 4918,4920 **** msgid "search hit TOP, continuing at BOTTOM" ! msgstr "đĎŰŐË ÄŚĘŰĎ× ÄĎ ÇĎŇÉ, ĐŇĎÄĎ×ÖŐ¤ÍĎ ŐÎÉÚŐ" --- 4918,4920 ---- msgid "search hit TOP, continuing at BOTTOM" ! msgstr "Ňđůčě äŚëůđţ äđ úđôę, ňôđäđţăč¤îđ čďę˙č" *************** *** 4922,4924 **** msgid "search hit BOTTOM, continuing at TOP" ! msgstr "đĎŰŐË ÄŚĘŰĎ× ÄĎ ÎÉÚŐ, ĐŇĎÄĎ×ÖŐ¤ÍĎ Ú ÇĎŇÉ" --- 4922,4924 ---- msgid "search hit BOTTOM, continuing at TOP" ! msgstr "Ňđůčě äŚëůđţ äđ ďę˙č, ňôđäđţăč¤îđ ˙ úđôę" *************** *** 4927,4929 **** msgid "E383: Invalid search string: %s" ! msgstr "E383: îĹ׌ŇÎÉĘ ÚŇÁÚĎË ÄĚŃ ĐĎŰŐËŐ: %s" --- 4927,4929 ---- msgid "E383: Invalid search string: %s" ! msgstr "E383: ĎĺţŚôďęë ˙ôâ˙đě äíó ňđůčěč: %s" *************** *** 4932,4934 **** msgid "E384: search hit TOP without match for: %s" ! msgstr "E384: đĎŰŐË ÄŚĘŰĎ× ÄĎ ÇĎŇÉ ÂĹÚ ÚÂŚÇŚ× Ú %s" --- 4932,4934 ---- msgid "E384: search hit TOP without match for: %s" ! msgstr "E384: Ňđůčě äŚëůđţ äđ úđôę ÷ĺ˙ ˙÷ŚúŚţ ˙ %s" *************** *** 4937,4939 **** msgid "E385: search hit BOTTOM without match for: %s" ! msgstr "E385: đĎŰŐË ÄŚĘŰĎ× ÄĎ ÎÉÚŐ ÂĹÚ ÚÂŚÇŚ× Ú %s" --- 4937,4939 ---- msgid "E385: search hit BOTTOM without match for: %s" ! msgstr "E385: Ňđůčě äŚëůđţ äđ ďę˙č ÷ĺ˙ ˙÷ŚúŚţ ˙ %s" *************** *** 4941,4943 **** msgid "E386: Expected '?' or '/' after ';'" ! msgstr "E386: đŚÓĚŃ `;' ÍÁ¤ ĘÔÉ `?' ÁÂĎ `/'" --- 4941,4943 ---- msgid "E386: Expected '?' or '/' after ';'" ! msgstr "E386: ŇŚőíó `;' î⤠ëćę `?' â÷đ `/'" *************** *** 4946,4948 **** msgid " (includes previously listed match)" ! msgstr " (ŇÁÚĎÍ Ú ĐĎĐĹŇĹÄÎŚÍÉ ÚÂŚÇÁÍÉ)" --- 4946,4948 ---- msgid " (includes previously listed match)" ! msgstr " (ôâ˙đî ˙ ňđňĺôĺäďŚîę ˙÷Śúâîę)" *************** *** 4951,4953 **** msgid "--- Included files " ! msgstr "--- ÷ËĚŔŢĹÎŚ ĆÁĘĚÉ " --- 4951,4953 ---- msgid "--- Included files " ! msgstr "--- ŢěíáŕĺďŚ öâëíę " *************** *** 4955,4957 **** msgid "not found " ! msgstr "ÎĹ ÚÎÁĘÄĹÎĎ " --- 4955,4957 ---- msgid "not found " ! msgstr "ďĺ ˙ďâëäĺďđ " *************** *** 4959,4961 **** msgid "in path ---\n" ! msgstr "Ő ŰĚŃČŐ ĐĎŰŐËŐ ---\n" --- 4959,4961 ---- msgid "in path ---\n" ! msgstr "č ůíóéč ňđůčěč ---\n" *************** *** 4963,4965 **** msgid " (Already listed)" ! msgstr " (őÖĹ Ő ÓĐÉÓËŐ)" --- 4963,4965 ---- msgid " (Already listed)" ! msgstr " (Čăĺ č őňęőěč)" *************** *** 4967,4969 **** msgid " NOT FOUND" ! msgstr " îĹ ÚÎÁĘÄĹÎĎ" --- 4967,4969 ---- msgid " NOT FOUND" ! msgstr " Ďĺ ˙ďâëäĺďđ" *************** *** 4972,4974 **** msgid "Scanning included file: %s" ! msgstr "đĎŰŐË Ő ×ËĚŔŢĹÎĎÍŐ ĆÁĘĚŚ: %s" --- 4972,4974 ---- msgid "Scanning included file: %s" ! msgstr "Ňđůčě č ţěíáŕĺďđîč öâëíŚ: %s" *************** *** 4976,4978 **** msgid "E387: Match is on current line" ! msgstr "E387: úÂŚÇ Ő ĐĎÔĎŢÎĎÍŐ ŇŃÄËŐ" --- 4976,4978 ---- msgid "E387: Match is on current line" ! msgstr "E387: ß÷Śú č ňđćđŕďđîč ôóäěč" *************** *** 4980,4982 **** msgid "All included files were found" ! msgstr "őÓŚ ×ËĚŔŢĹÎŚ ĆÁĘĚÉ ÂŐĚĎ ÚÎÁĘÄĹÎĎ" --- 4980,4982 ---- msgid "All included files were found" ! msgstr "ČőŚ ţěíáŕĺďŚ öâëíę ÷číđ ˙ďâëäĺďđ" *************** *** 4984,4986 **** msgid "No included files" ! msgstr "öĎÄÎĎÇĎ ×ËĚŔŢĹÎĎÇĎ ĆÁĘĚÁ" --- 4984,4986 ---- msgid "No included files" ! msgstr "Ăđäďđúđ ţěíáŕĺďđúđ öâëíâ" *************** *** 4988,4990 **** msgid "E388: Couldn't find definition" ! msgstr "E388: ÷ÉÚÎÁŢĹÎÎŃ ÎĹ ÚÎÁĘÄĹÎĎ" --- 4988,4990 ---- msgid "E388: Couldn't find definition" ! msgstr "E388: Ţę˙ďâŕĺďďó ďĺ ˙ďâëäĺďđ" *************** *** 4992,4994 **** msgid "E389: Couldn't find pattern" ! msgstr "E389: úŇÁÚĎË ÎĹ ÚÎÁĘÄĹÎĎ" --- 4992,4994 ---- msgid "E389: Couldn't find pattern" ! msgstr "E389: ßôâ˙đě ďĺ ˙ďâëäĺďđ" *************** *** 4997,4999 **** msgid "E390: Illegal argument: %s" ! msgstr "E390: îĹ׌ŇÎÉĘ ÁŇÇŐÍĹÎÔ: %s" --- 4997,4999 ---- msgid "E390: Illegal argument: %s" ! msgstr "E390: ĎĺţŚôďęë âôúčîĺďć: %s" *************** *** 5007,5009 **** msgid "No Syntax items defined for this buffer" ! msgstr "äĚŃ ÂŐĆĹŇŐ ÎĹ ×ÉÚÎÁŢĹÎĎ ĹĚĹÍĹÎÔŚ× ÓÉÎÔÁËÓÉÓŐ" --- 5007,5009 ---- msgid "No Syntax items defined for this buffer" ! msgstr "Äíó ÷čöĺôč ďĺ ţę˙ďâŕĺďđ ĺíĺîĺďćŚţ őęďćâěőęőč" *************** *** 5011,5013 **** msgid "syncing on C-style comments" ! msgstr "ÓÉÎČŇĎÎŚÚÁĂŚŃ ÂÁÚŐ¤ÔŘÓŃ ÎÁ ó-ËĎÍĹÎÔÁŇŚŃČ" --- 5011,5013 ---- msgid "syncing on C-style comments" ! msgstr "őęďéôđďŚ˙âçŚó ÷â˙č¤ćűőó ďâ Ő-ěđîĺďćâôŚóé" *************** *** 5015,5017 **** msgid "no syncing" ! msgstr "ÓÉÎČŇĎÎŚÚÁĂŚŃ ÎĹ ×ÉËĎŇÉÓÔĎ×Ő¤ÔŘÓŃ" --- 5015,5017 ---- msgid "no syncing" ! msgstr "őęďéôđďŚ˙âçŚó ďĺ ţęěđôęőćđţč¤ćűőó" *************** *** 5019,5021 **** msgid "syncing starts " ! msgstr "ÓÉÎČŇĎÎŚÚÁĂŚŃ ĐĎŢÉÎÁ¤ÔŘÓŃ ÚÁ " --- 5019,5021 ---- msgid "syncing starts " ! msgstr "őęďéôđďŚ˙âçŚó ňđŕęďâ¤ćűőó ˙â " *************** *** 5023,5025 **** msgid " lines before top line" ! msgstr " ŇŃÄËŚ× ĐĹŇĹÄ ĐĹŇŰÉÍ ŇŃÄËĎÍ" --- 5023,5025 ---- msgid " lines before top line" ! msgstr " ôóäěŚţ ňĺôĺä ňĺôůęî ôóäěđî" *************** *** 5031,5033 **** "\n" ! "--- ĺĚĹÍĹÎÔÉ ÓÉÎČŇĎÎŚÚÁĂŚ§ ÓÉÎÔÁËÓÉÓŐ ---" --- 5031,5033 ---- "\n" ! "--- Ĺíĺîĺďćę őęďéôđďŚ˙â猧 őęďćâěőęőč ---" *************** *** 5039,5041 **** "\n" ! "ÓÉÎČŇĎÎŚÚÁĂŚ§ ÂÁÚŐ¤ÔŘÓŃ ÎÁ ĹĚĹÍĹÎÔÁČ" --- 5039,5041 ---- "\n" ! "őęďéôđďŚ˙â猧 ÷â˙č¤ćűőó ďâ ĺíĺîĺďćâé" *************** *** 5047,5049 **** "\n" ! "--- ĺĚĹÍĹÎÔÉ ÓÉÎÔÁËÓÉÓŐ ---" --- 5047,5049 ---- "\n" ! "--- Ĺíĺîĺďćę őęďćâěőęőč ---" *************** *** 5056,5058 **** msgid "minimal " ! msgstr "ÍŚÎŚÍÁĚŘÎÉĘ " --- 5056,5058 ---- msgid "minimal " ! msgstr "îŚďŚîâíűďęë " *************** *** 5060,5062 **** msgid "maximal " ! msgstr "ÍÁËÓÉÍÁĚŘÎÉĘ " --- 5060,5062 ---- msgid "maximal " ! msgstr "îâěőęîâíűďęë " *************** *** 5064,5066 **** msgid "E393: group[t]here not accepted here" ! msgstr "E393: group[t]hete ÔŐÔ ÎĹ ĐŇÁĂŔ¤" --- 5064,5066 ---- msgid "E393: group[t]here not accepted here" ! msgstr "E393: group[t]hete ćčć ďĺ ňôâçá¤" *************** *** 5082,5084 **** msgid "E397: Filename required" ! msgstr "E397: đĎÔŇŚÂÎÁ ÎÁÚ×Á ĆÁĘĚÁ" --- 5082,5084 ---- msgid "E397: Filename required" ! msgstr "E397: ŇđćôŚ÷ďâ ďâ˙ţâ öâëíâ" *************** *** 5087,5089 **** msgid "E398: Missing '=': %s" ! msgstr "E398: `=' ×ÔŇÁŢĹÎĎ: %s" --- 5087,5089 ---- msgid "E398: Missing '=': %s" ! msgstr "E398: `=' ţćôâŕĺďđ: %s" *************** *** 5093,5095 **** msgid "E399: Not enough arguments: syntax region %s" ! msgstr "E399: îĹ ÄĎÓÉÔŘ ÁŇÇŐÍĹÎÔŚ×: syntax region %s" --- 5093,5095 ---- msgid "E399: Not enough arguments: syntax region %s" ! msgstr "E399: Ďĺ äđőęćű âôúčîĺďćŚţ: syntax region %s" *************** *** 5102,5104 **** msgid "E401: Pattern delimiter not found: %s" ! msgstr "E401: ëŚÎĹĂŘ ÚŇÁÚËÁ ÎĹ ÚÎÁĘÄÎĎ: %s" --- 5102,5104 ---- msgid "E401: Pattern delimiter not found: %s" ! msgstr "E401: ĚŚďĺçű ˙ôâ˙ěâ ďĺ ˙ďâëäďđ: %s" *************** *** 5107,5109 **** msgid "E402: Garbage after pattern: %s" ! msgstr "E402: óÍŚÔÔŃ ĐŚÓĚŃ ÚŇÁÚËÁ: %s" --- 5107,5109 ---- msgid "E402: Garbage after pattern: %s" ! msgstr "E402: ŐîŚććó ňŚőíó ˙ôâ˙ěâ: %s" *************** *** 5112,5114 **** msgid "E403: syntax sync: line continuations pattern specified twice" ! msgstr "E403: syntax syntax: ÚŇÁÚĎË ÄĚŃ ĐŇĎÄĎ×ÖĹÎÎŃ ŇŃÄËÁ ×ËÁÚÁÎĎ Ä׌ތ" --- 5112,5114 ---- msgid "E403: syntax sync: line continuations pattern specified twice" ! msgstr "E403: syntax syntax: ˙ôâ˙đě äíó ňôđäđţăĺďďó ôóäěâ ţěâ˙âďđ äţŚŕŚ" *************** *** 5117,5119 **** msgid "E404: Illegal arguments: %s" ! msgstr "E404: îĹ׌ŇÎŚ ÁŇÇŐÍĹÎÔÉ: %s" --- 5117,5119 ---- msgid "E404: Illegal arguments: %s" ! msgstr "E404: ĎĺţŚôďŚ âôúčîĺďćę: %s" *************** *** 5123,5125 **** msgid "E405: Missing equal sign: %s" ! msgstr "E405: îĹÍÁ¤ `=': %s" --- 5123,5125 ---- msgid "E405: Missing equal sign: %s" ! msgstr "E405: Ďĺî⤠`=': %s" *************** *** 5129,5131 **** msgid "E406: Empty argument: %s" ! msgstr "E406: đĎŇĎÖÎŚĘ ÁŇÇŐÍĹÎÔ: %s" --- 5129,5131 ---- msgid "E406: Empty argument: %s" ! msgstr "E406: ŇđôđăďŚë âôúčîĺďć: %s" *************** *** 5135,5137 **** msgid "E407: %s not allowed here" ! msgstr "E407: %s ÔŐÔ ÎĹ ÄĎÚ×ĎĚĹÎĎ" --- 5135,5137 ---- msgid "E407: %s not allowed here" ! msgstr "E407: %s ćčć ďĺ äđ˙ţđíĺďđ" *************** *** 5145,5147 **** msgid "E409: Unknown group name: %s" ! msgstr "E409: îĹ׌ŇÎÁ ÎÁÚ×Á ÇŇŐĐÉ: %s" --- 5145,5147 ---- msgid "E409: Unknown group name: %s" ! msgstr "E409: ĎĺţŚôďâ ďâ˙ţâ úôčňę: %s" *************** *** 5151,5153 **** msgid "E410: Invalid :syntax subcommand: %s" ! msgstr "E410: îĹ׌ŇÎÁ ĐŚÄËĎÍÁÎÄÁ :syntax : %s" --- 5151,5153 ---- msgid "E410: Invalid :syntax subcommand: %s" ! msgstr "E410: ĎĺţŚôďâ ňŚäěđîâďäâ :syntax : %s" *************** *** 5157,5159 **** msgid "E411: highlight group not found: %s" ! msgstr "E411: ëĎĚŘĎŇ ÎĹ ÚÎÁĘÄĹÎĎ: %s" --- 5157,5159 ---- msgid "E411: highlight group not found: %s" ! msgstr "E411: Ěđíűđô ďĺ ˙ďâëäĺďđ: %s" *************** *** 5163,5165 **** msgid "E412: Not enough arguments: \":highlight link %s\"" ! msgstr "E412: îĹÄĎÓÔÁÔÎŘĎ ÁŇÇŐÍĹÎÔŚ×: \"highlight link %s\"" --- 5163,5165 ---- msgid "E412: Not enough arguments: \":highlight link %s\"" ! msgstr "E412: Ďĺäđőćâćďűđ âôúčîĺďćŚţ: \"highlight link %s\"" *************** *** 5169,5171 **** msgid "E413: Too many arguments: \":highlight link %s\"" ! msgstr "E413: úÁÂÁÇÁÔĎ ÁŇÇŐÍĹÎÔŚ×: \":highlight link %s\"" --- 5169,5171 ---- msgid "E413: Too many arguments: \":highlight link %s\"" ! msgstr "E413: ßâ÷âúâćđ âôúčîĺďćŚţ: \":highlight link %s\"" *************** *** 5174,5176 **** msgid "E414: group has settings, highlight link ignored" ! msgstr "E414: ëĎĚŚŇ ŐÖĹ ×ÓÔÁÎĎ×ĚĹÎĎ, \":highlight link\" ĐŇĎŚÇÎĎŇĎ×ÁÎĎ" --- 5174,5176 ---- msgid "E414: group has settings, highlight link ignored" ! msgstr "E414: ĚđíŚô čăĺ ţőćâďđţíĺďđ, \":highlight link\" ňôđŚúďđôđţâďđ" *************** *** 5180,5182 **** msgid "E415: unexpected equal sign: %s" ! msgstr "E415: úÎÁË ŇŚ×ÎĎÓÔŚ ÎĹ ĐĎÔŇŚÂĹÎ: %s" --- 5180,5182 ---- msgid "E415: unexpected equal sign: %s" ! msgstr "E415: ßďâě ôŚţďđőćŚ ďĺ ňđćôŚ÷ĺď: %s" *************** *** 5186,5188 **** msgid "E416: missing equal sign: %s" ! msgstr "E416: ÷ÔŇÁŢĹÎĎ ÚÎÁË ŇŚ×ÎĎÓÔŚ: %s" --- 5186,5188 ---- msgid "E416: missing equal sign: %s" ! msgstr "E416: Ţćôâŕĺďđ ˙ďâě ôŚţďđőćŚ: %s" *************** *** 5191,5193 **** msgid "E417: missing argument: %s" ! msgstr "E417: ÷ÔŇÁŢĹÎĎ ÁŇÇŐÍĹÎÔ: %s" --- 5191,5193 ---- msgid "E417: missing argument: %s" ! msgstr "E417: Ţćôâŕĺďđ âôúčîĺďć: %s" *************** *** 5196,5198 **** msgid "E418: Illegal value: %s" ! msgstr "E418: îĹ׌ŇÎĹ ÚÎÁŢĹÎÎŃ: %s" --- 5196,5198 ---- msgid "E418: Illegal value: %s" ! msgstr "E418: ĎĺţŚôďĺ ˙ďâŕĺďďó: %s" *************** *** 5201,5203 **** msgid "E419: FG color unknown" ! msgstr "E419: îĹ׌ÄĎÍÉĘ ËĎĚŚŇ ÔĹËÓÔŐ" --- 5201,5203 ---- msgid "E419: FG color unknown" ! msgstr "E419: ĎĺţŚäđîęë ěđíŚô ćĺěőćč" *************** *** 5206,5208 **** msgid "E420: BG color unknown" ! msgstr "E420: îĹ׌ÄĎÍÉĘ ËĎĚŚŇ ĆĎÎŐ" --- 5206,5208 ---- msgid "E420: BG color unknown" ! msgstr "E420: ĎĺţŚäđîęë ěđíŚô öđďč" *************** *** 5212,5214 **** msgid "E421: Color name or number not recognized: %s" ! msgstr "E421: îĹÚŇĎÚŐÍŚĚÁ ÎÁÚ×Á ÁÂĎ ÎĎÍĹŇ ËĎĚŘĎŇŐ: %s" --- 5212,5214 ---- msgid "E421: Color name or number not recognized: %s" ! msgstr "E421: Ďĺ˙ôđ˙čîŚíâ ďâ˙ţâ â÷đ ďđîĺô ěđíűđôč: %s" *************** *** 5218,5220 **** msgid "E422: terminal code too long: %s" ! msgstr "E422: úÁÎÁÄÔĎ ÄĎ×ÇÉĘ ËĎÄ ÔĹŇÍŚÎÁĚŐ: %s" --- 5218,5220 ---- msgid "E422: terminal code too long: %s" ! msgstr "E422: ßâďâäćđ äđţúęë ěđä ćĺôîŚďâíč: %s" *************** *** 5224,5226 **** msgid "E423: Illegal argument: %s" ! msgstr "E423: îĹ׌ŇÎÉĘ ÁŇÇŐÍĹÎÔ: %s" --- 5224,5226 ---- msgid "E423: Illegal argument: %s" ! msgstr "E423: ĎĺţŚôďęë âôúčîĺďć: %s" *************** *** 5229,5231 **** msgid "E424: Too many different highlighting attributes in use" ! msgstr "E424: úÁÂÁÇÁÔĎ ŇŚÚÎÉČ ÁÔŇÉÂŐÔ ËĎĚŘĎŇŐ" --- 5229,5231 ---- msgid "E424: Too many different highlighting attributes in use" ! msgstr "E424: ßâ÷âúâćđ ôŚ˙ďęé âćôę÷čć ěđíűđôč" *************** *** 5234,5236 **** msgid "at bottom of tag stack" ! msgstr "ÓÔĹË ĐĎÍŚÔĎË ĐĎŇĎÖÎŚĘ" --- 5234,5236 ---- msgid "at bottom of tag stack" ! msgstr "őćĺě ňđîŚćđě ňđôđăďŚë" *************** *** 5238,5240 **** msgid "at top of tag stack" ! msgstr "×ĹŇŰÉÎÁ ÓÔĹËŐ ĐĎÍŚÔĎË" --- 5238,5240 ---- msgid "at top of tag stack" ! msgstr "ţĺôůęďâ őćĺěč ňđîŚćđě" *************** *** 5242,5244 **** msgid "E425: Cannot go before first matching tag" ! msgstr "E425: îĹÍĎÖĚÉ×Ď ĐĹŇĹĘÔÉ ÄĎ ĐĎĐĹŇĹÄÎĎا ĐĎÍŚÔËÉ Ú ĐĹŇŰϧ" --- 5242,5244 ---- msgid "E425: Cannot go before first matching tag" ! msgstr "E425: Ďĺ îđăč ňĺôĺëćę äđ ňđňĺôĺäďđű§ ňđîŚćěę ˙ ňĺôůđ§" *************** *** 5248,5250 **** msgid "E426: tag not found: %s" ! msgstr "E426: ĐĎÍŚÔËŐ %s ÎĹ ÚÎÁĘÄĹÎĎ" --- 5248,5250 ---- msgid "E426: tag not found: %s" ! msgstr "E426: ňđîŚćěč %s ďĺ ˙ďâëäĺďđ" *************** *** 5257,5259 **** msgid "file\n" ! msgstr "ĆÁĘĚ\n" --- 5257,5259 ---- msgid "file\n" ! msgstr "öâëí\n" *************** *** 5265,5267 **** msgid "Enter nr of choice ( to abort): " ! msgstr "ńËŐ ÓÁÍĹ ĐĎÍŚÔËŐ ×ÉËĎŇÉÓÔÁÔÉ ( ÄĚŃ ×ŚÄÍŚÎÉ): " --- 5265,5267 ---- msgid "Enter nr of choice ( to abort): " ! msgstr "Óěč őâîĺ ňđîŚćěč ţęěđôęőćâćę ( äíó ţŚäîŚďę): " *************** *** 5269,5271 **** msgid "E427: There is only one matching tag" ! msgstr "E427: ěÉŰĹ ĎÄÎÁ ׌ÄĐĎ׌ÄÎÁ ĐĎÍŚÔËÁ" --- 5269,5271 ---- msgid "E427: There is only one matching tag" ! msgstr "E427: Íęůĺ đäďâ ţŚäňđţŚäďâ ňđîŚćěâ" *************** *** 5274,5276 **** msgid "E428: Cannot go beyond last matching tag" ! msgstr "E428: ăĹ ĎÓÔÁÎÎŃ ×ŚÄĐĎ׌ÄÎĎ ĐĎÍŚÔËÁ" --- 5274,5276 ---- msgid "E428: Cannot go beyond last matching tag" ! msgstr "E428: Çĺ đőćâďďó ţŚäňđţŚäďđ ňđîŚćěâ" *************** *** 5280,5282 **** msgid "File \"%s\" does not exist" ! msgstr "ćÁĘĚ \"%s\" ÎĹ ŚÓÎŐ¤" --- 5280,5282 ---- msgid "File \"%s\" does not exist" ! msgstr "Öâëí \"%s\" ďĺ Śőďč¤" *************** *** 5286,5288 **** msgid "tag %d of %d%s" ! msgstr "ĐĎÍŚÔËÁ %d Ú %d%s" --- 5286,5288 ---- msgid "tag %d of %d%s" ! msgstr "ňđîŚćěâ %d ˙ %d%s" *************** *** 5290,5292 **** msgid " or more" ! msgstr " ÁÂĎ ÂŚĚŘŰĹ" --- 5290,5292 ---- msgid " or more" ! msgstr " â÷đ ÷Śíűůĺ" *************** *** 5294,5296 **** msgid " Using tag with different case!" ! msgstr " ÷ÉËĎŇÉÓÔĎ×ŐŔ ĐĎÍŚÔËŐ ÎĹ ŇĎÚŇŚÚÎŃŔŢÉ ×ĹĚÉËŚ ÔÁ ÍÁĚŚ ĚŚÔĹŇÉ" --- 5294,5296 ---- msgid " Using tag with different case!" ! msgstr " Ţęěđôęőćđţčá ňđîŚćěč ďĺ ôđ˙ôŚ˙ďóáŕę ţĺíęěŚ ćâ îâíŚ íŚćĺôę" *************** *** 5299,5301 **** msgid "E429: File \"%s\" does not exist" ! msgstr "E429: ćÁĘĚ \"%s\" ÎĹ ŚÓÎŐ¤" --- 5299,5301 ---- msgid "E429: File \"%s\" does not exist" ! msgstr "E429: Öâëí \"%s\" ďĺ Śőďč¤" *************** *** 5311,5313 **** msgid "Linear tag search" ! msgstr "ěŚÎŚĘÎÉĘ ĐĎŰŐË ĐĎÍŚÔËÉ" --- 5311,5313 ---- msgid "Linear tag search" ! msgstr "ÍŚďŚëďęë ňđůčě ňđîŚćěę" *************** *** 5315,5317 **** msgid "Binary tag search" ! msgstr "ä׌ĘËĎ×ÉĘ ĐĎŰŐË ĐĎÍŚÔËÉ" --- 5315,5317 ---- msgid "Binary tag search" ! msgstr "ÄţŚëěđţęë ňđůčě ňđîŚćěę" *************** *** 5320,5322 **** msgid "Searching tags file %s" ! msgstr "űŐËÁŔ Á ĆÁĘĚŚ ĐĎÍŚÔĎË %s" --- 5320,5322 ---- msgid "Searching tags file %s" ! msgstr "Ůčěâá â öâëíŚ ňđîŚćđě %s" *************** *** 5325,5327 **** msgid "E430: Tag file path truncated for %s\n" ! msgstr "E430: űĚŃČ ÄĚŃ %s × ĆÁĘĚŚ ĐĎÍŚÔË ÚËĎŇĎŢĹÎĎ\n" --- 5325,5327 ---- msgid "E430: Tag file path truncated for %s\n" ! msgstr "E430: Ůíóé äíó %s ţ öâëíŚ ňđîŚćě ˙ěđôđŕĺďđ\n" *************** *** 5331,5333 **** msgid "E431: Format error in tags file \"%s\"" ! msgstr "E431: đĎÍÉĚËÁ ĆĎŇÍÁÔŐ Ő ĆÁĘĚŚ ĐĎÍŚÔĎË \"%s\"" --- 5331,5333 ---- msgid "E431: Format error in tags file \"%s\"" ! msgstr "E431: Ňđîęíěâ öđôîâćč č öâëíŚ ňđîŚćđě \"%s\"" *************** *** 5337,5339 **** msgid "Before byte %ld" ! msgstr "đĹŇĹÄ ÂÁĘÔĎÍ %ld" --- 5337,5339 ---- msgid "Before byte %ld" ! msgstr "Ňĺôĺä ÷âëćđî %ld" *************** *** 5342,5344 **** msgid "E432: Tags file not sorted: %s" ! msgstr "E432: ćÁĘĚ ĐĎÍŚÔĎË %s ÎĹ ×ĐĎŇŃÄËĎ×ÁÎÉĘ" --- 5342,5344 ---- msgid "E432: Tags file not sorted: %s" ! msgstr "E432: Öâëí ňđîŚćđě %s ďĺ ţňđôóäěđţâďęë" *************** *** 5348,5350 **** msgid "E433: No tags file" ! msgstr "E433: îĹÍÁ¤ ĆÁĚÁ ĐĎÍŚÔĎË" --- 5348,5350 ---- msgid "E433: No tags file" ! msgstr "E433: Ďĺî⤠öâíâ ňđîŚćđě" *************** *** 5353,5355 **** msgid "E434: Can't find tag pattern" ! msgstr "E434: îĹ ÍĎÖŐ ÚÎÁĘÔÉ ĐĎÍŚÔËŐ ÚÁ §§ ÚŇÁÚËĎÍ" --- 5353,5355 ---- msgid "E434: Can't find tag pattern" ! msgstr "E434: Ďĺ îđăč ˙ďâëćę ňđîŚćěč ˙â §§ ˙ôâ˙ěđî" *************** *** 5358,5360 **** msgid "E435: Couldn't find tag, just guessing!" ! msgstr "E435: îĹ ÍĎÖŐ ÚÎÁĘÔÉ ĐĎÍŚÔËŐ, ÚÄĎÇÁÄŐŔÓŘ!" --- 5358,5360 ---- msgid "E435: Couldn't find tag, just guessing!" ! msgstr "E435: Ďĺ îđăč ˙ďâëćę ňđîŚćěč, ˙äđúâäčáőű!" *************** *** 5363,5365 **** msgid "' not known. Available builtin terminals are:" ! msgstr "' Ί׌ÄĎÍÉĘ. ÷ÂŐÄĎ×ÁÎŚ ÔĹŇÍŚÎÁĚÉ:" --- 5363,5365 ---- msgid "' not known. Available builtin terminals are:" ! msgstr "' ďĺ ţŚäđîęë. Ţ÷čäđţâďŚ ćĺôîŚďâíę:" *************** *** 5367,5369 **** msgid "defaulting to '" ! msgstr "ÂŐÄĹÍĎ ××ÁÖÁÔÉ ÝĎ ĂĹ '" --- 5367,5369 ---- msgid "defaulting to '" ! msgstr "÷čäĺîđ ţţâăâćę üđ çĺ '" *************** *** 5371,5373 **** msgid "Cannot open termcap file" ! msgstr "îĹ ÍĎÖŐ ×ŚÄËŇÉÔÉ ŚÁĘĚ ÍĎÖĚÉ×ĎÓÔĹĘ ÔĹŇÍŚÎÁĚŚ× [termcap]" --- 5371,5373 ---- msgid "Cannot open termcap file" ! msgstr "Ďĺ îđăč ţŚäěôęćę Śâëí îđăíęţđőćĺë ćĺôîŚďâíŚţ [termcap]" *************** *** 5375,5377 **** msgid "Terminal entry not found in terminfo" ! msgstr "îĹÍÁ¤ ŚÎĆĎŇÍÁĂŚ§ ĐŇĎ ÔĹŇÍŚÎÁĚ [terminfo]" --- 5375,5377 ---- msgid "Terminal entry not found in terminfo" ! msgstr "Ďĺî⤠Śďöđôîâ猧 ňôđ ćĺôîŚďâí [terminfo]" *************** *** 5379,5381 **** msgid "Terminal entry not found in termcap" ! msgstr "îĹÍÁ¤ ŚÎĆĎŇÍÁĂŚ§ ĐŇĎ ÍĎÖĚÉ×ĎÓÔŚ ÔĹŇÍŚÎÁĚÁ [termcap]" --- 5379,5381 ---- msgid "Terminal entry not found in termcap" ! msgstr "Ďĺî⤠Śďöđôîâ猧 ňôđ îđăíęţđőćŚ ćĺôîŚďâíâ [termcap]" *************** *** 5384,5386 **** msgid "E436: No \"%s\" entry in termcap" ! msgstr "E436: îĹÍÁ¤ ŚÎĆĎŇÍÁĂŚ§ ĐŇĎ ÍĎÖĚÉ×ĎÓÔŚ ÔĹŇÍŚÎÁĚÁ \"%s\" [termcap]" --- 5384,5386 ---- msgid "E436: No \"%s\" entry in termcap" ! msgstr "E436: Ďĺî⤠Śďöđôîâ猧 ňôđ îđăíęţđőćŚ ćĺôîŚďâíâ \"%s\" [termcap]" *************** *** 5388,5390 **** msgid "E437: terminal capability \"cm\" required" ! msgstr "E437: ÍĎÖĚÉ׌ÓÔŘ ÔĹŇÍŚÎÁĚÁ \"cm\" ĎÂĎ×'ŃÚËĎ×Á" --- 5388,5390 ---- msgid "E437: terminal capability \"cm\" required" ! msgstr "E437: îđăíęţŚőćű ćĺôîŚďâíâ \"cm\" đ÷đţ'ó˙ěđţâ" *************** *** 5397,5399 **** "\n" ! "--- ëĚÁ׌ی ÔĹŇÍŚÎÁĚÁ ---" --- 5397,5399 ---- "\n" ! "--- ĚíâţŚůŚ ćĺôîŚďâíâ ---" *************** *** 5401,5403 **** msgid "new shell started\n" ! msgstr "ŇĎÚĐĎŢÁÔĎ ÎĎ×ÉĘ shell\n" --- 5401,5403 ---- msgid "new shell started\n" ! msgstr "ôđ˙ňđŕâćđ ďđţęë shell\n" *************** *** 5405,5407 **** msgid "Vim: Error reading input, exiting...\n" ! msgstr "Vim: đĎÍÉĚËÁ ŢÉÔÁÎÎŃ ××ĎÄŐ, ÚÁ×ĹŇŰŐŔ ŇĎÂĎÔŐ...\n" --- 5405,5407 ---- msgid "Vim: Error reading input, exiting...\n" ! msgstr "Vim: Ňđîęíěâ ŕęćâďďó ţţđäč, ˙âţĺôůčá ôđ÷đćč...\n" *************** *** 5410,5412 **** msgid "No undo possible; continue anyway" ! msgstr "÷ŚÄÍŚÎÁ ÎĹ ÂŐÄĹ ÍĎÖĚÉ×Á, ĐŇĎÄĎ×ÖÉÔÉ" --- 5410,5412 ---- msgid "No undo possible; continue anyway" ! msgstr "ŢŚäîŚďâ ďĺ ÷čäĺ îđăíęţâ, ňôđäđţăęćę" *************** *** 5414,5416 **** msgid "E438: u_undo: line numbers wrong" ! msgstr "E438: u_undo: ÎĹ׌ŇÎŚ ÎĎÍĹŇÉ ŇŃÄËŚ× [ĐĎÍÉĚËÁ ĐŇĎÇŇÁÍÉ]" --- 5414,5416 ---- msgid "E438: u_undo: line numbers wrong" ! msgstr "E438: u_undo: ďĺţŚôďŚ ďđîĺôę ôóäěŚţ [ňđîęíěâ ňôđúôâîę]" *************** *** 5419,5421 **** msgid "1 change" ! msgstr "ĎÄÎÁ ÚÍŚÎÁ" --- 5419,5421 ---- msgid "1 change" ! msgstr "đäďâ ˙îŚďâ" *************** *** 5424,5426 **** msgid "%ld changes" ! msgstr "ÚÍŚÎ: %ld" --- 5424,5426 ---- msgid "%ld changes" ! msgstr "˙îŚď: %ld" *************** *** 5428,5430 **** msgid "E439: undo list corrupt" ! msgstr "E439: óĐÉÓĎË ×ŚÄÍŚÎÉ ĐĎŰËĎÄÖĹÎĎ [ĐĎÍÉĚËÁ ĐŇĎÇŇÁÍÉ]" --- 5428,5430 ---- msgid "E439: undo list corrupt" ! msgstr "E439: Őňęőđě ţŚäîŚďę ňđůěđäăĺďđ [ňđîęíěâ ňôđúôâîę]" *************** *** 5433,5435 **** msgid "E440: undo line missing" ! msgstr "E440: ×ÔŇÁŢĹÎĎ ŇŃÄĎË ×ŚÄÍŚÎÉ [ĐĎÍÉĚËÁ ĐŇĎÇŇÁÍÉ]" --- 5433,5435 ---- msgid "E440: undo line missing" ! msgstr "E440: ţćôâŕĺďđ ôóäđě ţŚäîŚďę [ňđîęíěâ ňôđúôâîę]" *************** *** 5444,5446 **** "\n" ! "÷ĹŇÓŚŃ ÄĚŃ 16/32 bit Windows Ú ĐŚÄÔŇÉÍËĎŔ GUI" --- 5444,5446 ---- "\n" ! "ŢĺôőŚó äíó 16/32 bit Windows ˙ ňŚäćôęîěđá GUI" *************** *** 5452,5454 **** "\n" ! "÷ĹŇÓŚŃ ÄĚŃ 32 bit Windows Ú ĐŚÄÔŇÉÍËĎŔ GUI" --- 5452,5454 ---- "\n" ! "ŢĺôőŚó äíó 32 bit Windows ˙ ňŚäćôęîěđá GUI" *************** *** 5456,5458 **** msgid " in Win32s mode" ! msgstr " × ŇĹÖÉÍŚ Win32s" --- 5456,5458 ---- msgid " in Win32s mode" ! msgstr " ţ ôĺăęîŚ Win32s" *************** *** 5460,5462 **** msgid " with OLE support" ! msgstr " Ú ĐŚÄÔŇÉÍËĎŔ OLE" --- 5460,5462 ---- msgid " with OLE support" ! msgstr " ˙ ňŚäćôęîěđá OLE" *************** *** 5468,5470 **** "\n" ! "÷ĹŇÓŚŃ ÄĚŃ 32 bit Windows" --- 5468,5470 ---- "\n" ! "ŢĺôőŚó äíó 32 bit Windows" *************** *** 5476,5478 **** "\n" ! "÷ĹŇÓŚŃ ÄĚŃ 16 bit Windows" --- 5476,5478 ---- "\n" ! "ŢĺôőŚó äíó 16 bit Windows" *************** *** 5484,5486 **** "\n" ! "÷ĹŇÓŚŃ ÄĚŃ 32 bit MS-DOS" --- 5484,5486 ---- "\n" ! "ŢĺôőŚó äíó 32 bit MS-DOS" *************** *** 5492,5494 **** "\n" ! "÷ĹŇÓŚŃ ÄĚŃ 16 bit MS-DOS" --- 5492,5494 ---- "\n" ! "ŢĺôőŚó äíó 16 bit MS-DOS" *************** *** 5500,5502 **** "\n" ! "÷ĹŇÓŚŃ ÄĚŃ MacOS X (unix)" --- 5500,5502 ---- "\n" ! "ŢĺôőŚó äíó MacOS X (unix)" *************** *** 5508,5510 **** "\n" ! "÷ĹŇÓŚŃ ÄĚŃ MacOS X" --- 5508,5510 ---- "\n" ! "ŢĺôőŚó äíó MacOS X" *************** *** 5516,5518 **** "\n" ! "÷ĹŇÓŚŃ ÄĚŃ MacOS" --- 5516,5518 ---- "\n" ! "ŢĺôőŚó äíó MacOS" *************** *** 5524,5526 **** "\n" ! "×ĹŇÓŚŃ RISC OS" --- 5524,5526 ---- "\n" ! "ţĺôőŚó RISC OS" *************** *** 5532,5534 **** "\n" ! "÷ËĚŔŢĹÎĎ ĚÁÔËÉ: " --- 5532,5534 ---- "\n" ! "Ţěíáŕĺďđ íâćěę: " *************** *** 5540,5542 **** "\n" ! "úËĎÍĐŚĚŘĎ×ÁÎĎ " --- 5540,5542 ---- "\n" ! "ßěđîňŚíűđţâďđ " *************** *** 5552,5554 **** "\n" ! "÷ĹŇÓŚŃ `huge' " --- 5552,5554 ---- "\n" ! "ŢĺôőŚó `huge' " *************** *** 5560,5562 **** "\n" ! "÷ĹŇÓŚŃ `big' " --- 5560,5562 ---- "\n" ! "ŢĺôőŚó `big' " *************** *** 5568,5570 **** "\n" ! "÷ĹŇÓŚŃ `normal' " --- 5568,5570 ---- "\n" ! "ŢĺôőŚó `normal' " *************** *** 5576,5578 **** "\n" ! "÷ĹŇÓŚŃ `small' " --- 5576,5578 ---- "\n" ! "ŢĺôőŚó `small' " *************** *** 5584,5586 **** "\n" ! "÷ĹŇÓŚŃ `tiny' " --- 5584,5586 ---- "\n" ! "ŢĺôőŚó `tiny' " *************** *** 5588,5590 **** msgid "without GUI." ! msgstr "ÂĹÚ ĐŚÄÔŇÉÍËÉ GUI." --- 5588,5590 ---- msgid "without GUI." ! msgstr "÷ĺ˙ ňŚäćôęîěę GUI." *************** *** 5592,5594 **** msgid "with GTK-GNOME GUI." ! msgstr "Ú ĐŚÄÔŇÉÍËĎŔ GTK-GNOME GUI." --- 5592,5594 ---- msgid "with GTK-GNOME GUI." ! msgstr "˙ ňŚäćôęîěđá GTK-GNOME GUI." *************** *** 5596,5598 **** msgid "with GTK GUI." ! msgstr "Ú ĐŚÄÔŇÉÍËĎŔ GTK GUI." --- 5596,5598 ---- msgid "with GTK GUI." ! msgstr "˙ ňŚäćôęîěđá GTK GUI." *************** *** 5600,5602 **** msgid "with X11-Motif GUI." ! msgstr "Ú ĐŚÄÔŇÉÍËĎŔ X11-Motif GUI." --- 5600,5602 ---- msgid "with X11-Motif GUI." ! msgstr "˙ ňŚäćôęîěđá X11-Motif GUI." *************** *** 5604,5606 **** msgid "with X11-Athena GUI." ! msgstr "Ú ĐŚÄÔŇÉÍËĎŔ X11-Athena GUI." --- 5604,5606 ---- msgid "with X11-Athena GUI." ! msgstr "˙ ňŚäćôęîěđá X11-Athena GUI." *************** *** 5608,5610 **** msgid "with BeOS GUI." ! msgstr "Ú ĐŚÄÔŇÉÍËĎŔ BeOS GUI." --- 5608,5610 ---- msgid "with BeOS GUI." ! msgstr "˙ ňŚäćôęîěđá BeOS GUI." *************** *** 5612,5614 **** msgid "with Photon GUI." ! msgstr "Ú ĐŚÄÔŇÉÍËĎŔ Photon GUI." --- 5612,5614 ---- msgid "with Photon GUI." ! msgstr "˙ ňŚäćôęîěđá Photon GUI." *************** *** 5616,5618 **** msgid "with GUI." ! msgstr "Ú ĐŚÄÔŇÉÍËĎŔ GUI." --- 5616,5618 ---- msgid "with GUI." ! msgstr "˙ ňŚäćôęîěđá GUI." *************** *** 5620,5622 **** msgid "with Carbon GUI." ! msgstr "Ú ĐŚÄÔŇÉÍËĎŔ Carbon GUI." --- 5620,5622 ---- msgid "with Carbon GUI." ! msgstr "˙ ňŚäćôęîěđá Carbon GUI." *************** *** 5624,5626 **** msgid "with Cocoa GUI." ! msgstr "Ú ĐŚÄÔŇÉÍËĎŔ Cocoa GUI." --- 5624,5626 ---- msgid "with Cocoa GUI." ! msgstr "˙ ňŚäćôęîěđá Cocoa GUI." *************** *** 5628,5630 **** msgid "with (classic) GUI." ! msgstr "Ú (ËĚÁÓÉŢÎÉÍ) GUI." --- 5628,5630 ---- msgid "with (classic) GUI." ! msgstr "˙ (ěíâőęŕďęî) GUI." *************** *** 5634,5636 **** " \n" ! "íŚÓÔÉÔŘ (+) [ÁÂĎ ÎĹ ÍŚÓÔÉÔŘ (-)] ÔÁËŚ ËĎÍĐĎÎĹÎÔÉ:\n" --- 5634,5636 ---- " \n" ! "ÎŚőćęćű (+) [â÷đ ďĺ îŚőćęćű (-)] ćâěŚ ěđîňđďĺďćę:\n" *************** *** 5638,5640 **** msgid " system vimrc file: \"" ! msgstr " ÓÉÓÔĹÍÎÉĘ vimrc: \"" --- 5638,5640 ---- msgid " system vimrc file: \"" ! msgstr " őęőćĺîďęë vimrc: \"" *************** *** 5642,5644 **** msgid " user vimrc file: \"" ! msgstr " vimrc ËĎŇÉÓÔŐ×ÁŢÁ: \"" --- 5642,5644 ---- msgid " user vimrc file: \"" ! msgstr " vimrc ěđôęőćčţâŕâ: \"" *************** *** 5646,5648 **** msgid " 2nd user vimrc file: \"" ! msgstr " ÄŇŐÇÉĘ vimrc ËĎŇÉÓÔŐ×ÁŢÁ: \"" --- 5646,5648 ---- msgid " 2nd user vimrc file: \"" ! msgstr " äôčúęë vimrc ěđôęőćčţâŕâ: \"" *************** *** 5650,5652 **** msgid " 3rd user vimrc file: \"" ! msgstr " ÔŇĹÔŚĘ vimrc ËĎŇÉÓÔŐ×ÁŢÁ: \"" --- 5650,5652 ---- msgid " 3rd user vimrc file: \"" ! msgstr " ćôĺćŚë vimrc ěđôęőćčţâŕâ: \"" *************** *** 5654,5656 **** msgid " user exrc file: \"" ! msgstr " exrc ËĎŇÉÓÔŐ×ÁŢÁ: \"" --- 5654,5656 ---- msgid " user exrc file: \"" ! msgstr " exrc ěđôęőćčţâŕâ: \"" *************** *** 5658,5660 **** msgid " 2nd user exrc file: \"" ! msgstr " ÄŇŐÇÉĘ exrc ËĎŇÉÓÔŐ×ÁŢÁ: \"" --- 5658,5660 ---- msgid " 2nd user exrc file: \"" ! msgstr " äôčúęë exrc ěđôęőćčţâŕâ: \"" *************** *** 5662,5664 **** msgid " system gvimrc file: \"" ! msgstr " ÓÉÓÔĹÍÎÉĘ gvimrc: \"" --- 5662,5664 ---- msgid " system gvimrc file: \"" ! msgstr " őęőćĺîďęë gvimrc: \"" *************** *** 5666,5668 **** msgid " user gvimrc file: \"" ! msgstr " gvimrc ËĎŇÉÓÔŐ×ÁŢÁ: \"" --- 5666,5668 ---- msgid " user gvimrc file: \"" ! msgstr " gvimrc ěđôęőćčţâŕâ: \"" *************** *** 5670,5672 **** msgid "2nd user gvimrc file: \"" ! msgstr "ÄŇŐÇÉĘ gvimrc ËĎŇÉÓÔŐ×ÁŢÁ: \"" --- 5670,5672 ---- msgid "2nd user gvimrc file: \"" ! msgstr "äôčúęë gvimrc ěđôęőćčţâŕâ: \"" *************** *** 5674,5676 **** msgid "3rd user gvimrc file: \"" ! msgstr "ÔŇĹÔŚĘ gvimrc ËĎŇÉÓÔŐ×ÁŢÁ: \"" --- 5674,5676 ---- msgid "3rd user gvimrc file: \"" ! msgstr "ćôĺćŚë gvimrc ěđôęőćčţâŕâ: \"" *************** *** 5678,5680 **** msgid " system menu file: \"" ! msgstr " ÓÉÓÔĹÍÎĹ ÍĹÎŔ: \"" --- 5678,5680 ---- msgid " system menu file: \"" ! msgstr " őęőćĺîďĺ îĺďá: \"" *************** *** 5682,5684 **** msgid " fall-back for $VIM: \"" ! msgstr " ÚÁÍŚÎÁ ÄĚŃ $VIM: \"" --- 5682,5684 ---- msgid " fall-back for $VIM: \"" ! msgstr " ˙âîŚďâ äíó $VIM: \"" *************** *** 5686,5688 **** msgid " f-b for $VIMRUNTIME: \"" ! msgstr " ÚÁÍŚÎÁ ÄĚŃ $VIMRUNTIME: \"" --- 5686,5688 ---- msgid " f-b for $VIMRUNTIME: \"" ! msgstr " ˙âîŚďâ äíó $VIMRUNTIME: \"" *************** *** 5690,5692 **** msgid "Compilation: " ! msgstr "úËĎÍĐŚĚŘĎ×ÁÎĎ: " --- 5690,5692 ---- msgid "Compilation: " ! msgstr "ßěđîňŚíűđţâďđ: " *************** *** 5694,5696 **** msgid "Compiler: " ! msgstr "ëĎÍĐŚĚŃÔĎŇ: " --- 5694,5696 ---- msgid "Compiler: " ! msgstr "ĚđîňŚíóćđô: " *************** *** 5698,5700 **** msgid "Linking: " ! msgstr "úËĎÍĐĎÎĎ×ÁÎĎ: " --- 5698,5700 ---- msgid "Linking: " ! msgstr "ßěđîňđďđţâďđ: " *************** *** 5702,5704 **** msgid " DEBUG BUILD" ! msgstr " ÷ĺňóśń äěń îáěáçďäöĺîîń" --- 5702,5704 ---- msgid " DEBUG BUILD" ! msgstr " ŢĹÔŐśÓ ÄÍÓ ĎÂÍÂÚĐÄĂĹĎĎÓ" *************** *** 5706,5708 **** msgid "VIM - Vi IMproved" ! msgstr "Vim - đĎËŇÁÝĹÎÉĘ Vi" --- 5706,5708 ---- msgid "VIM - Vi IMproved" ! msgstr "Vim - Ňđěôâüĺďęë Vi" *************** *** 5710,5712 **** msgid "version " ! msgstr "×ĹŇÓŚŃ: " --- 5710,5712 ---- msgid "version " ! msgstr "ţĺôőŚó: " *************** *** 5714,5716 **** msgid "by Bram Moolenaar et al." ! msgstr " Á×ÔĎŇ: Bram Moolenaar ÔÁ ŚÎ." --- 5714,5716 ---- msgid "by Bram Moolenaar et al." ! msgstr " âţćđô: Bram Moolenaar ćâ Śď." *************** *** 5718,5720 **** msgid "Vim is open source and freely distributable" ! msgstr "Vim ĂŠ׌ÄËŇÉÔÁ ĐŇĎÇŇÁÍÁ, ×É ÍĎÖĹÔŠ׌ĚŘÎĎ ŇĎÚĐĎ×ÓŔÄÖŐ×ÁÔÉ §§" --- 5718,5720 ---- msgid "Vim is open source and freely distributable" ! msgstr "Vim çĺ ţŚäěôęćâ ňôđúôâîâ, ţę îđăĺćĺ ţŚíűďđ ôđ˙ňđţőáäăčţâćę §§" *************** *** 5722,5724 **** msgid "Help poor children in Uganda!" ! msgstr "äĎĐĎÍĎÖŚÔŘ ÓÉŇĎÔÁÍ Ú őÇÁÎÄÉ!" --- 5722,5724 ---- msgid "Help poor children in Uganda!" ! msgstr "ÄđňđîđăŚćű őęôđćâî ˙ Čúâďäę!" *************** *** 5726,5728 **** msgid "type :help iccf for information " ! msgstr ":help iccf ĐĎÄÁĚŘŰÁ ŚÎĆĎŇÍÁĂŚŃ " --- 5726,5728 ---- msgid "type :help iccf for information " ! msgstr ":help iccf ňđäâíűůâ ŚďöđôîâçŚó " *************** *** 5730,5732 **** msgid "type :q to exit " ! msgstr ":q ×ÉČŚÄ Ú Vim " --- 5730,5732 ---- msgid "type :q to exit " ! msgstr ":q ţęéŚä ˙ Vim " *************** *** 5734,5736 **** msgid "type :help or for on-line help" ! msgstr ":help ÁÂĎ ĐĹŇĹÇĚŃÄ ÄĎĐĎÍĎÇÉ " --- 5734,5736 ---- msgid "type :help or for on-line help" ! msgstr ":help â÷đ ňĺôĺúíóä äđňđîđúę " *************** *** 5738,5740 **** msgid "type :help version6 for version info" ! msgstr ":help version6 ŚÎĆĎŇÍÁĂŚŃ ĐŇĎ Vim 6 " --- 5738,5740 ---- msgid "type :help version6 for version info" ! msgstr ":help version6 ŚďöđôîâçŚó ňôđ Vim 6 " *************** *** 5742,5744 **** msgid "Running in Vi compatible mode" ! msgstr "÷É ĐŇÁĂŔ¤ÔĹ × ŇĹÖÉÍŚ ÓŐÍŚÓÎĎÍŐ Ú Vi" --- 5742,5744 ---- msgid "Running in Vi compatible mode" ! msgstr "Ţę ňôâçá¤ćĺ ţ ôĺăęîŚ őčîŚőďđîč ˙ Vi" *************** *** 5746,5748 **** msgid "type :set nocp for Vim defaults" ! msgstr ":set nocp ŇĹÖÉÍ ÎĹÓŐÍŚÓÎÉĘ Ú Vi " --- 5746,5748 ---- msgid "type :set nocp for Vim defaults" ! msgstr ":set nocp ôĺăęî ďĺőčîŚőďęë ˙ Vi " *************** *** 5750,5752 **** msgid "type :help cp-default for info on this" ! msgstr ":help cp-default ŚÎĆĎŇÍÁĂŚŃ ĐŇĎ ÓŐÍŚÓÎŚÓÔŘ" --- 5750,5752 ---- msgid "type :help cp-default for info on this" ! msgstr ":help cp-default ŚďöđôîâçŚó ňôđ őčîŚőďŚőćű" *************** *** 5754,5756 **** msgid "WARNING: Windows 95/98/ME detected" ! msgstr "ő÷áçá: ÷É ËĎŇÉÓÔŐ¤ÔĹÓŃ Windows 95/98/ME" --- 5754,5756 ---- msgid "WARNING: Windows 95/98/ME detected" ! msgstr "ČŢÂÚÂ: Ţę ěđôęőćč¤ćĺőó Windows 95/98/ME" *************** *** 5758,5760 **** msgid "type :help windows95 for info on this" ! msgstr ":help windows95 ŚÎĆĎŇÍÁĂŚŃ ĐŇĎ ĂĹ " --- 5758,5760 ---- msgid "type :help windows95 for info on this" ! msgstr ":help windows95 ŚďöđôîâçŚó ňôđ çĺ " *************** *** 5762,5764 **** msgid "E441: There is no preview window" ! msgstr "E441: ÷ŚËÎĎ ĐĹŇĹÇĚŃÄŐ ×ŚÄÓŐÔΤ" --- 5762,5764 ---- msgid "E441: There is no preview window" ! msgstr "E441: ŢŚěďđ ňĺôĺúíóäč ţŚäőčćď¤" *************** *** 5767,5769 **** msgid "E442: Can't split topleft and botright at the same time" ! msgstr "E442: îĹ ÍĎÖŐ ŇĎÚÍŚÓÔÉÔÉ ×ŚËÎĎ ĎÄÎĎŢÁÓÎĎ × ĎÂĎČ ËŐÔÁČ" --- 5767,5769 ---- msgid "E442: Can't split topleft and botright at the same time" ! msgstr "E442: Ďĺ îđăč ôđ˙îŚőćęćę ţŚěďđ đäďđŕâőďđ ţ đ÷đé ěčćâé" *************** *** 5772,5774 **** msgid "E443: Cannot rotate when another window is split" ! msgstr "E443: îĹ ÍĎÖŐ ÚÍŚÓÔÉÔÉ ×ŚËÎĎ -- ŚÎŰŚ ׌ËÎÁ ÚÁ×ÁÖÁŔÔŘ" --- 5772,5774 ---- msgid "E443: Cannot rotate when another window is split" ! msgstr "E443: Ďĺ îđăč ˙îŚőćęćę ţŚěďđ -- ŚďůŚ ţŚěďâ ˙âţâăâáćű" *************** *** 5777,5779 **** msgid "E444: Cannot close last window" ! msgstr "E444: îĹ ÍĎÖŐ ÚÁËŇÉÔÉ ĎÓÔÁÎΤ ׌ËÎĎ" --- 5777,5779 ---- msgid "E444: Cannot close last window" ! msgstr "E444: Ďĺ îđăč ˙âěôęćę đőćâďď¤ ţŚěďđ" *************** *** 5782,5784 **** msgid "Already only one window" ! msgstr "ěÉŰĹ ĎÄΊ׌ËÎĎ" --- 5782,5784 ---- msgid "Already only one window" ! msgstr "Íęůĺ đäďĺ ţŚěďđ" *************** *** 5786,5788 **** msgid "E445: Other window contains changes" ! msgstr "E445: śÎŰŚ ׌ËÎÁ ÍŚÓÔŃÔŘ ÚÍŚÎÉ" --- 5786,5788 ---- msgid "E445: Other window contains changes" ! msgstr "E445: śďůŚ ţŚěďâ îŚőćóćű ˙îŚďę" *************** *** 5791,5793 **** msgid "E446: No file name under cursor" ! msgstr "E446: ÷É ÎĹ ÓÔϧÔĹ ÎÁ ŚÍĹÎŚ ĆÁĘĚÁ" --- 5791,5793 ---- msgid "E446: No file name under cursor" ! msgstr "E446: Ţę ďĺ őćđ§ćĺ ďâ ŚîĺďŚ öâëíâ" *************** *** 5797,5799 **** msgid "E447: Can't find file \"%s\" in path" ! msgstr "E447: ćÁĘĚ \"%s\" ÎĹ ÚÎÁĘÄĹÎĎ Ő 'path'" --- 5797,5799 ---- msgid "E447: Can't find file \"%s\" in path" ! msgstr "E447: Öâëí \"%s\" ďĺ ˙ďâëäĺďđ č 'path'" *************** *** 5826,5828 **** msgid "gvimext.dll error" ! msgstr "ĐĎÍÉĚËÁ gvimext.dll" --- 5826,5828 ---- msgid "gvimext.dll error" ! msgstr "ňđîęíěâ gvimext.dll" *************** *** 5830,5832 **** msgid "Path length too long!" ! msgstr "űĚŃČ ÚÁÎÁÄÎĎ ÄĎ×ÇÉĘ!" --- 5830,5832 ---- msgid "Path length too long!" ! msgstr "Ůíóé ˙âďâäďđ äđţúęë!" *************** *** 5835,5837 **** msgid "--No lines in buffer--" ! msgstr "--öĎÄÎĎÇĎ ŇŃÄËÁ--" --- 5835,5837 ---- msgid "--No lines in buffer--" ! msgstr "--Ăđäďđúđ ôóäěâ--" *************** *** 5843,5845 **** msgid "Command aborted" ! msgstr "ëĎÍÁÎÄŐ ÚÁ×ĹŇŰĹÎĎ" --- 5843,5845 ---- msgid "Command aborted" ! msgstr "Ěđîâďäč ˙âţĺôůĺďđ" *************** *** 5847,5849 **** msgid "Argument required" ! msgstr "îĹĎÂČŚÄÎĎ ×ËÁÚÁÔÉ ÁŇÇŐÍĹÎÔ" --- 5847,5849 ---- msgid "Argument required" ! msgstr "Ďĺđ÷éŚäďđ ţěâ˙âćę âôúčîĺďć" *************** *** 5851,5853 **** msgid "E10: \\ should be followed by /, ? or &" ! msgstr "E10: úÁ \\ ÍÁ¤ ĘÔÉ /, ? ÁÂĎ &" --- 5851,5853 ---- msgid "E10: \\ should be followed by /, ? or &" ! msgstr "E10: ßâ \\ î⤠ëćę /, ? â÷đ &" *************** *** 5856,5858 **** msgid "E11: Invalid in command-line window; executes, CTRL-C quits" ! msgstr "E11: îĹĐŇÉĐŐÓÔÉÍĎ × ×ŚËÎŚ ËĎÍÁÎÄ, ×ÉËĎÎŐ¤, CTRL-C ×ÉČĎÄÉÔŘ" --- 5856,5858 ---- msgid "E11: Invalid in command-line window; executes, CTRL-C quits" ! msgstr "E11: Ďĺňôęňčőćęîđ ţ ţŚěďŚ ěđîâďä, ţęěđďč¤, CTRL-C ţęéđäęćű" *************** *** 5860,5862 **** msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search" ! msgstr "E12: ëĎÍÁÎÄÁ ÎĹ ÄĎÚ×ĎĚĹÎÁ Ú ÍŚŇËŐ×ÁÎŘ ÂĹÚĐĹËÉ" --- 5860,5862 ---- msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search" ! msgstr "E12: Ěđîâďäâ ďĺ äđ˙ţđíĺďâ ˙ îŚôěčţâďű ÷ĺ˙ňĺěę" *************** *** 5864,5866 **** msgid "E13: File exists (use ! to override)" ! msgstr "E13: ćÁĘĚ ŚÓÎŐ¤ (×ÉËĎŇÉÓÔÁĘÔĹ ! ÝĎ ÎĹ Ú×ÁÖÁÔÉ)" --- 5864,5866 ---- msgid "E13: File exists (use ! to override)" ! msgstr "E13: Öâëí Śőďč¤ (ţęěđôęőćâëćĺ ! üđ÷ ďĺ ˙ţâăâćę)" *************** *** 5868,5870 **** msgid "Command failed" ! msgstr "ëĎÍÁÎÄÁ ÎÁ ×ÄÁĚÁÓŘ" --- 5868,5870 ---- msgid "Command failed" ! msgstr "Ěđîâďäâ ďâ ţäâíâőű" *************** *** 5872,5874 **** msgid "Internal error" ! msgstr "÷ÎŐÔŇŚŰÎŃ ĐĎÍÉĚËÁ" --- 5872,5874 ---- msgid "Internal error" ! msgstr "ŢďčćôŚůďó ňđîęíěâ" *************** *** 5876,5878 **** msgid "Interrupted" ! msgstr "đĹŇĹŇ×ÁÎĎ" --- 5876,5878 ---- msgid "Interrupted" ! msgstr "Ňĺôĺôţâďđ" *************** *** 5880,5882 **** msgid "E14: Invalid address" ! msgstr "E14: îĹ׌ŇÎÁ ÁÄŇĹÓÁ" --- 5880,5882 ---- msgid "E14: Invalid address" ! msgstr "E14: ĎĺţŚôďâ âäôĺőâ" *************** *** 5885,5887 **** msgid "Invalid argument" ! msgstr "îĹ׌ŇÎÉĘ ÁŇÇŐÍĹÎÔ" --- 5885,5887 ---- msgid "Invalid argument" ! msgstr "ĎĺţŚôďęë âôúčîĺďć" *************** *** 5890,5892 **** msgid "Invalid argument: %s" ! msgstr "îĹ׌ŇÎÉĘ ÁŇÇŐÍĹÎÔ %s" --- 5890,5892 ---- msgid "Invalid argument: %s" ! msgstr "ĎĺţŚôďęë âôúčîĺďć %s" *************** *** 5895,5897 **** msgid "E15: Invalid expression: %s" ! msgstr "E15: îĹ׌ŇÎÉĘ ×ÉŇÁÚ: %s" --- 5895,5897 ---- msgid "E15: Invalid expression: %s" ! msgstr "E15: ĎĺţŚôďęë ţęôâ˙: %s" *************** *** 5900,5902 **** msgid "E16: Invalid range" ! msgstr "E16: îĹ׌ŇÎŚ ÍĹÖŚ" --- 5900,5902 ---- msgid "E16: Invalid range" ! msgstr "E16: ĎĺţŚôďŚ îĺăŚ" *************** *** 5905,5907 **** msgid "Invalid command" ! msgstr "îĹ׌ŇÎÁ ËĎÍÁÎÄÁ" --- 5905,5907 ---- msgid "Invalid command" ! msgstr "ĎĺţŚôďâ ěđîâďäâ" *************** *** 5910,5912 **** msgid "E17: \"%s\" is a directory" ! msgstr "E17: \"%s\" ĂĹ ÄÉŇĹËÔĎŇŚŃ" --- 5910,5912 ---- msgid "E17: \"%s\" is a directory" ! msgstr "E17: \"%s\" çĺ äęôĺěćđôŚó" *************** *** 5915,5917 **** msgid "E18: Unexpected characters before '='" ! msgstr "E18: îĹcĐĎÄŚ×ÁÎÉĘ ÓÉÍ×ĎĚ ĐĹŇĹÄ '='" --- 5915,5917 ---- msgid "E18: Unexpected characters before '='" ! msgstr "E18: ĎĺcňđäŚţâďęë őęîţđí ňĺôĺä '='" *************** *** 5920,5922 **** msgid "E19: Mark has invalid line number" ! msgstr "E19: đĎÍŚÔËŐ ×ËÁÚÁÎĎ Ú ÎĹÍĎÖĚÉ×ÉÍ ÎĎÍĹŇĎÍ ŇŃÄËÁ" --- 5920,5922 ---- msgid "E19: Mark has invalid line number" ! msgstr "E19: ŇđîŚćěč ţěâ˙âďđ ˙ ďĺîđăíęţęî ďđîĺôđî ôóäěâ" *************** *** 5925,5927 **** msgid "E20: Mark not set" ! msgstr "E20: đĎÍŚÔËŐ ÎĹ ×ËÁÚÁÎĎ" --- 5925,5927 ---- msgid "E20: Mark not set" ! msgstr "E20: ŇđîŚćěč ďĺ ţěâ˙âďđ" *************** *** 5930,5932 **** msgid "E21: Cannot make changes, 'modifiable' is off" ! msgstr "E21: úÍŚÎÉ ÎĹ ÄĎÚ×ĎĚĹÎŚ: 'modifiable' ×ÉÍËÎŐÔĎ" --- 5930,5932 ---- msgid "E21: Cannot make changes, 'modifiable' is off" ! msgstr "E21: ßîŚďę ďĺ äđ˙ţđíĺďŚ: 'modifiable' ţęîěďčćđ" *************** *** 5935,5937 **** msgid "E22: Scripts nested too deep" ! msgstr "E22: úÁÎÁÄÔĎ ×ĹĚÉËÁ ËŚĚŘËŚÓÔŘ ×ËĚÁÄĹÎÉČ ËĎÍÁÎÄÎÉČ ĆÁĘĚŚ×" --- 5935,5937 ---- msgid "E22: Scripts nested too deep" ! msgstr "E22: ßâďâäćđ ţĺíęěâ ěŚíűěŚőćű ţěíâäĺďęé ěđîâďäďęé öâëíŚţ" *************** *** 5940,5942 **** msgid "E23: No alternate file" ! msgstr "E23: îĹÍÁ¤ ×ÔĎŇÉÎÎĎÇĎ ĆÁĘĚÁ" --- 5940,5942 ---- msgid "E23: No alternate file" ! msgstr "E23: Ďĺî⤠ţćđôęďďđúđ öâëíâ" *************** *** 5945,5947 **** msgid "E24: No such abbreviation" ! msgstr "E24: ôÁËĎÇĎ ÓËĎŇĎŢĹÎÎŃ ÎĹÍÁ¤" --- 5945,5947 ---- msgid "E24: No such abbreviation" ! msgstr "E24: Ćâěđúđ őěđôđŕĺďďó ďĺîâ¤" *************** *** 5950,5952 **** msgid "No ! allowed" ! msgstr "ëĎŇÉÓÔÁÔÉÓŃ ! ÎĹ ÄĎÚ×ĎĚĹÎĎ" --- 5950,5952 ---- msgid "No ! allowed" ! msgstr "Ěđôęőćčţâćâćęőó ! ďĺ äđ˙ţđíĺďđ" *************** *** 5954,5956 **** msgid "E25: GUI cannot be used: Not enabled at compile time" ! msgstr "E25: GUI ÎĹ ÍĎÖĹ ÂŐÔÉ ×ÉËĎŇÉÓÔÁÎĎ -- ÎĹ ×׌ÍËÎĹÎĎ ĐŚÄ ŢÁÓ ËĎÍĐŚĚŃĂŚ§" --- 5954,5956 ---- msgid "E25: GUI cannot be used: Not enabled at compile time" ! msgstr "E25: GUI ďĺ îđăĺ ÷čćę ţęěđôęőćâďđ -- ďĺ ţţŚîěďĺďđ ňŚä ŕâő ěđîňŚíó猧" *************** *** 5959,5961 **** msgstr "" ! "E25: Hebrew ÎĹ ÍĎÖĹ ÂŐÔÉ ×ÉËĎŇÉÓÔÁÎĎ -- ÎĹ ×׌ÍËÎĹÎĎ ĐŚÄ ŢÁÓ ËĎÍĐŚĚŃĂŚ§\n" --- 5959,5961 ---- msgstr "" ! "E25: Hebrew ďĺ îđăĺ ÷čćę ţęěđôęőćâďđ -- ďĺ ţţŚîěďĺďđ ňŚä ŕâő ěđîňŚíó猧\n" *************** *** 5964,5966 **** msgstr "" ! "E25: Farsi ÎĹ ÍĎÖĹ ÂŐÔÉ ×ÉËĎŇÉÓÔÁÎĎ -- ÎĹ ×׌ÍËÎĹÎĎ ĐŚÄ ŢÁÓ ËĎÍĐŚĚŃĂŚ§\n" --- 5964,5966 ---- msgstr "" ! "E25: Farsi ďĺ îđăĺ ÷čćę ţęěđôęőćâďđ -- ďĺ ţţŚîěďĺďđ ňŚä ŕâő ěđîňŚíó猧\n" *************** *** 5970,5972 **** msgid "E28: No such highlight group name: %s" ! msgstr "E28: ëĎĚŘĎŇ %s ÎĹ ŚÓÎŐ¤" --- 5970,5972 ---- msgid "E28: No such highlight group name: %s" ! msgstr "E28: Ěđíűđô %s ďĺ Śőďč¤" *************** *** 5975,5977 **** msgid "E29: No inserted text yet" ! msgstr "E29: ôĹËÓÔ ĂĹ ÎĹ ŇĹÄÁÇŐ×Á×ÓŃ" --- 5975,5977 ---- msgid "E29: No inserted text yet" ! msgstr "E29: Ćĺěőć çĺ ďĺ ôĺäâúčţâţőó" *************** *** 5980,5982 **** msgid "E30: No previous command line" ! msgstr "E30: ëĎÍÁÎÄÉ ÝĹ ÎĹ ×ÉËĎŇÉÓÔĎ×Ő×ÁĚÉÓŃ" --- 5980,5982 ---- msgid "E30: No previous command line" ! msgstr "E30: Ěđîâďäę üĺ ďĺ ţęěđôęőćđţčţâíęőó" *************** *** 5985,5987 **** msgid "E31: No such mapping" ! msgstr "÷ËÁÚÁÎŚ ÚÁÍŚÎÁ ÎĹ ŚÓÎŐ¤" --- 5985,5987 ---- msgid "E31: No such mapping" ! msgstr "Ţěâ˙âďŚ ˙âîŚďâ ďĺ Śőďč¤" *************** *** 5990,5992 **** msgid "No match" ! msgstr "öĎÄÎĎÇĎ ×ÁŇŚÁÎÔŐ" --- 5990,5992 ---- msgid "No match" ! msgstr "Ăđäďđúđ ţâôŚâďćč" *************** *** 5995,5997 **** msgid "No match: %s" ! msgstr "öĎÄÎĎÇĎ ×ÁŇŚÁÎÔŐ: %s" --- 5995,5997 ---- msgid "No match: %s" ! msgstr "Ăđäďđúđ ţâôŚâďćč: %s" *************** *** 5999,6001 **** msgid "E32: No file name" ! msgstr "âŇÁËŐ¤ ŚÍĹÎŚ ĆÁĘĚÁ" --- 5999,6001 ---- msgid "E32: No file name" ! msgstr "×ôâěč¤ ŚîĺďŚ öâëíâ" *************** *** 6004,6006 **** msgid "E33: No previous substitute regular expression" ! msgstr "úÁÍŚÎÁ ÚŇÁÚËŚ× ŰĹ ÎĹ ×ÉËĎŇÉÓÔĎ×Ő×ÁĚÁÓŘ" --- 6004,6006 ---- msgid "E33: No previous substitute regular expression" ! msgstr "ßâîŚďâ ˙ôâ˙ěŚţ ůĺ ďĺ ţęěđôęőćđţčţâíâőű" *************** *** 6009,6011 **** msgid "E34: No previous command" ! msgstr "ëĎÍÁÎÄÉ ÝĹ ÎĹ ×ÉËĎŇÉÓÔĎ×Ő×ÁĚÉÓŃ" --- 6009,6011 ---- msgid "E34: No previous command" ! msgstr "Ěđîâďäę üĺ ďĺ ţęěđôęőćđţčţâíęőó" *************** *** 6014,6016 **** msgid "E35: No previous regular expression" ! msgstr "úŇÁÚËÉ ÝĹ ÎĹ ×ÉËĎŇÉÓÔĎ×Ő×ÁĚÉÓŃ" --- 6014,6016 ---- msgid "E35: No previous regular expression" ! msgstr "ßôâ˙ěę üĺ ďĺ ţęěđôęőćđţčţâíęőó" *************** *** 6019,6021 **** msgid "No range allowed" ! msgstr "îĹ ÄĎÚ×ĎĚĹÎĎ ×ËÁÚŐ×ÁÔÉ ÍĹÖŚ" --- 6019,6021 ---- msgid "No range allowed" ! msgstr "Ďĺ äđ˙ţđíĺďđ ţěâ˙čţâćę îĺăŚ" *************** *** 6023,6025 **** msgid "E36: Not enough room" ! msgstr "îĹ ÄĎÓÉÔŘ ÍŚÓĂŃ" --- 6023,6025 ---- msgid "E36: Not enough room" ! msgstr "Ďĺ äđőęćű îŚőçó" *************** *** 6029,6031 **** msgid "Can't create file %s" ! msgstr "îĹ ÍĎÖŐ ÓÔ×ĎŇÉÔÉ ĆÁĘĚ %s" --- 6029,6031 ---- msgid "Can't create file %s" ! msgstr "Ďĺ îđăč őćţđôęćę öâëí %s" *************** *** 6033,6035 **** msgid "Can't get temp file name" ! msgstr "îĹ ÍĎÖŐ ÚĆĎŇÍŐ×ÁÔÉ ŚÍ'Ń ÄĚŃ ÔÉÍŢÁÓĎ×ĎÇĎ ĆÁĘĚÁ" --- 6033,6035 ---- msgid "Can't get temp file name" ! msgstr "Ďĺ îđăč ˙öđôîčţâćę Śî'ó äíó ćęîŕâőđţđúđ öâëíâ" *************** *** 6038,6040 **** msgid "Can't open file %s" ! msgstr "îĹ ÍĎÖŐ ×ŚÄËŇÉÔÉ ĆÁĘĚ %s" --- 6038,6040 ---- msgid "Can't open file %s" ! msgstr "Ďĺ îđăč ţŚäěôęćę öâëí %s" *************** *** 6043,6045 **** msgid "Can't read file %s" ! msgstr "îĹ ÍĎÖŐ ÚŢÉÔÁÔÉ ĆÁĘĚ %s" --- 6043,6045 ---- msgid "Can't read file %s" ! msgstr "Ďĺ îđăč ˙ŕęćâćę öâëí %s" *************** *** 6048,6050 **** msgstr "" ! "E37: öĎÄÎĎÇĎ ÚÁĐÉÓŐ ĐŚÓĚŃ ĎÓÔÁÎÎŘϧ ÚÍŚÎÉ (×ÉËĎŇÉÓÔÁĘÔĹ ! ÝĎ ÎĹ Ú×ÁÖÁÔÉ)" --- 6048,6050 ---- msgstr "" ! "E37: Ăđäďđúđ ˙âňęőč ňŚőíó đőćâďďűđ§ ˙îŚďę (ţęěđôęőćâëćĺ ! üđ÷ ďĺ ˙ţâăâćę)" *************** *** 6052,6054 **** msgid "E38: Null argument" ! msgstr "E38: ÷ŚÄÓŐÔÎŚĘ ÁŇÇŐÍĹÎÔ" --- 6052,6054 ---- msgid "E38: Null argument" ! msgstr "E38: ŢŚäőčćďŚë âôúčîĺďć" *************** *** 6056,6058 **** msgid "E39: Number expected" ! msgstr "E39: ďŢŚËŐ×ÁÎĎ ŢÉÓĚĎ" --- 6056,6058 ---- msgid "E39: Number expected" ! msgstr "E39: ĐŕŚěčţâďđ ŕęőíđ" *************** *** 6061,6063 **** msgid "E40: Can't open errorfile %s" ! msgstr "E40: îĹ ÍĎÖŐ ×ŚÄËŇÉÔÉ ĆÁĘĚ ĐĎÍÉĚĎË %s" --- 6061,6063 ---- msgid "E40: Can't open errorfile %s" ! msgstr "E40: Ďĺ îđăč ţŚäěôęćę öâëí ňđîęíđě %s" *************** *** 6065,6067 **** msgid "E41: Out of memory!" ! msgstr "E41: úÁÂŇÁËĚĎ ĐÁÍ'ŃÔŚ!" --- 6065,6067 ---- msgid "E41: Out of memory!" ! msgstr "E41: ßâ÷ôâěíđ ňâî'óćŚ!" *************** *** 6069,6071 **** msgid "Pattern not found" ! msgstr "úŇÁÚĎË ÎĹ ÚÎÁĘÄĹÎĎ" --- 6069,6071 ---- msgid "Pattern not found" ! msgstr "ßôâ˙đě ďĺ ˙ďâëäĺďđ" *************** *** 6074,6076 **** msgid "Pattern not found: %s" ! msgstr "úŇÁÚĎË ÎĹ ÚÎÁĘÄĹÎĎ: %s" --- 6074,6076 ---- msgid "Pattern not found: %s" ! msgstr "ßôâ˙đě ďĺ ˙ďâëäĺďđ: %s" *************** *** 6078,6080 **** msgid "Argument must be positive" ! msgstr "áŇÇŐÍĹÎÔ ÍÁ¤ ÂŐÔÉ ÄĎÄÁÔÎŚĘ" --- 6078,6080 ---- msgid "Argument must be positive" ! msgstr "Âôúčîĺďć î⤠÷čćę äđäâćďŚë" *************** *** 6082,6084 **** msgid "E42: No Errors" ! msgstr "E42: öĎÄÎϧ ĐĎÍÉĚËÉ" --- 6082,6084 ---- msgid "E42: No Errors" ! msgstr "E42: Ăđäďđ§ ňđîęíěę" *************** *** 6086,6088 **** msgid "E43: Damaged match string" ! msgstr "E43: 'match string' ĐĎŰËĎÖĹÎÁ [ĐĎÍÉĚËÁ ĐŇĎÇŇÁÍÉ]" --- 6086,6088 ---- msgid "E43: Damaged match string" ! msgstr "E43: 'match string' ňđůěđăĺďâ [ňđîęíěâ ňôđúôâîę]" *************** *** 6090,6092 **** msgid "E44: Corrupted regexp program" ! msgstr "E44: óĐĎÔ×ĎŇĹÎÁ ĐŇĎÇŇÁÍÁ regexp [ĐĎÍÉĚËÁ ĐŇĎÇŇÁÍÉ]" --- 6090,6092 ---- msgid "E44: Corrupted regexp program" ! msgstr "E44: Őňđćţđôĺďâ ňôđúôâîâ regexp [ňđîęíěâ ňôđúôâîę]" *************** *** 6094,6096 **** msgid "E45: 'readonly' option is set (use ! to override)" ! msgstr "E45: ÷ÉÓÔÁ×ĚĹÎÁ ĎĐĂŚŃ 'readonly' (×ÉËĎŇÉÓÔÁĘÔĹ ! ÝĎ ÎĹ Ú×ÁÖÁÔÉ)" --- 6094,6096 ---- msgid "E45: 'readonly' option is set (use ! to override)" ! msgstr "E45: Ţęőćâţíĺďâ đňçŚó 'readonly' (ţęěđôęőćâëćĺ ! üđ÷ ďĺ ˙ţâăâćę)" *************** *** 6099,6101 **** msgid "E46: Cannot set read-only variable \"%s\"" ! msgstr "E46: úÍŚÎÎÁ \"%s\" ÍĎÖĹ ÂŐÔÉ ĚÉŰĹ ĐŇĎŢÉÔÁÎÁ" --- 6099,6101 ---- msgid "E46: Cannot set read-only variable \"%s\"" ! msgstr "E46: ßîŚďďâ \"%s\" îđăĺ ÷čćę íęůĺ ňôđŕęćâďâ" *************** *** 6103,6105 **** msgid "E47: Error while reading errorfile" ! msgstr "E47: đĎÍÉĚËÁ ÚŢÉÔŐ×ÁÎÎŃ ĆÁĘĚÁ ĐĎÍÉĚĎË" --- 6103,6105 ---- msgid "E47: Error while reading errorfile" ! msgstr "E47: Ňđîęíěâ ˙ŕęćčţâďďó öâëíâ ňđîęíđě" *************** *** 6107,6109 **** msgid "E48: Not allowed in sandbox" ! msgstr "E48: îÁ ÄĎÚ×ĎĚĹÎĎ Ő *******" --- 6107,6109 ---- msgid "E48: Not allowed in sandbox" ! msgstr "E48: Ďâ äđ˙ţđíĺďđ č *******" *************** *** 6111,6113 **** msgid "E49: Invalid scroll size" ! msgstr "E49: îĹÍĎÖĚÉ×ÉĘ ŇĎÚÍŚŇ ÚÓŐ×Ő" --- 6111,6113 ---- msgid "E49: Invalid scroll size" ! msgstr "E49: Ďĺîđăíęţęë ôđ˙îŚô ˙őčţč" *************** *** 6115,6117 **** msgid "E91: 'shell' option is empty" ! msgstr "E91: ĎĐĂŚŃ 'shell' ĐĎŇĎÖÎŃ" --- 6115,6117 ---- msgid "E91: 'shell' option is empty" ! msgstr "E91: đňçŚó 'shell' ňđôđăďó" *************** *** 6119,6121 **** msgid "E72: Close error on swap file" ! msgstr "E72: đĎÍÉĚËÁ ĐŚÄ ŢÁÓ ÚÁËŇÉÔÔŃ ĆÁĘĚÁ ĎÂÍŚÎŐ" --- 6119,6121 ---- msgid "E72: Close error on swap file" ! msgstr "E72: Ňđîęíěâ ňŚä ŕâő ˙âěôęććó öâëíâ đ÷îŚďč" *************** *** 6123,6125 **** msgid "E73: tag stack empty" ! msgstr "E73: óÔĹË ÔĎÍŚÔĎË ÓĐŐÓÔĎŰĹÎĎ" --- 6123,6125 ---- msgid "E73: tag stack empty" ! msgstr "E73: Őćĺě ćđîŚćđě őňčőćđůĺďđ" *************** *** 6127,6129 **** msgid "E74: Command too complex" ! msgstr "E74: úÁÎÁÄÔĎ ÓËĚÁÄÎÁ ËĎÍÁÎÄÁ" --- 6127,6129 ---- msgid "E74: Command too complex" ! msgstr "E74: ßâďâäćđ őěíâäďâ ěđîâďäâ" *************** *** 6131,6133 **** msgid "E75: Name too long" ! msgstr "E75: úÁÄĎ×ÇĹ ŚÍ'Ń" --- 6131,6133 ---- msgid "E75: Name too long" ! msgstr "E75: ßâäđţúĺ Śî'ó" *************** *** 6135,6137 **** msgid "E76: Too many [" ! msgstr "E76: úÁÂÁÇÁÔĎ '['" --- 6135,6137 ---- msgid "E76: Too many [" ! msgstr "E76: ßâ÷âúâćđ '['" *************** *** 6139,6141 **** msgid "E77: Too many file names" ! msgstr "E77: úÁÂÁÇÁÔĎ ŚÍĹÎ ĆÁĘĚŚ×" --- 6139,6141 ---- msgid "E77: Too many file names" ! msgstr "E77: ßâ÷âúâćđ Śîĺď öâëíŚţ" *************** *** 6143,6145 **** msgid "Trailing characters" ! msgstr "îÁÄĚÉŰËĎ׌ ÓÉÍ×ĎĚÉ" --- 6143,6145 ---- msgid "Trailing characters" ! msgstr "ĎâäíęůěđţŚ őęîţđíę" *************** *** 6147,6149 **** msgid "E78: Unknown mark" ! msgstr "E78: îĹ׌ÄĎÍÁ ĐĎÍŚÔËÁ" --- 6147,6149 ---- msgid "E78: Unknown mark" ! msgstr "E78: ĎĺţŚäđîâ ňđîŚćěâ" *************** *** 6151,6153 **** msgid "E79: Cannot expand wildcards" ! msgstr "E79: îĹ ÍĎÖŐ ÚŇĎÚŐÍŚÔÉ ÚŇÁÚĎË" --- 6151,6153 ---- msgid "E79: Cannot expand wildcards" ! msgstr "E79: Ďĺ îđăč ˙ôđ˙čîŚćę ˙ôâ˙đě" *************** *** 6156,6158 **** msgid "E80: Error while writing" ! msgstr "E80: đĎÍÉĚËÁ ĐŚÄ ŢÁÓ ÚÁĐÉÓŐ" --- 6156,6158 ---- msgid "E80: Error while writing" ! msgstr "E80: Ňđîęíěâ ňŚä ŕâő ˙âňęőč" *************** *** 6160,6162 **** msgid "Zero count" ! msgstr "îŐĚŘĎ×ÉĘ ĚŚŢÉĚŘÎÉË" --- 6160,6162 ---- msgid "Zero count" ! msgstr "Ďčíűđţęë íŚŕęíűďęě" *************** *** 6164,6169 **** msgid "E81: Using not in a script context" ! msgstr "E81: ×ÉËĎŇÉÓÔĎ×Ő¤ÔŘÓŃ ÎĹ Ő ĆÁĘĚŚ ËĎÍÁÎÄ" #~ msgid "Unable to send reply" ! #~ msgstr "îĹ ÍĎÖŐ ×ŚÄŚÓĚÁÔÉ ×ŚÄĐĎ׌ÄŘ" --- 6164,6169 ---- msgid "E81: Using not in a script context" ! msgstr "E81: ţęěđôęőćđţč¤ćűőó ďĺ č öâëíŚ ěđîâďä" #~ msgid "Unable to send reply" ! #~ msgstr "Ďĺ îđăč ţŚäŚőíâćę ţŚäňđţŚäű" *************** *** 6174,6178 **** #~ "\n" ! #~ "îĹ ×ÄÁĚĎÓŃ ×ŚÄŚÓĚÁÔÉ ÄÁÎŚ. íĎÖĚÉ×Ď, ÓĹŇ×ĹŇ ËĎÍÁÎÄ ×ŚÄÓŐÔÎŚĘ ?\n" #~ msgid "E258: no matches found in cscope connections" ! #~ msgstr "E258: ÎĹ ÚÎÁĘÄĹÎĎ ×ŚÄĐĎ׌ÄÎĎÇĎ Ú'¤ÄÎÁÎÎŃ Ú cscope" --- 6174,6178 ---- #~ "\n" ! #~ "Ďĺ ţäâíđőó ţŚäŚőíâćę äâďŚ. Îđăíęţđ, őĺôţĺô ěđîâďä ţŚäőčćďŚë ?\n" #~ msgid "E258: no matches found in cscope connections" ! #~ msgstr "E258: ďĺ ˙ďâëäĺďđ ţŚäňđţŚäďđúđ ˙'¤äďâďďó ˙ cscope" diff -rc -C 1 ../vim60.86//src/po/zh_CN.UTF-8.po src/po/zh_CN.UTF-8.po *** ../vim60.86//src/po/zh_CN.UTF-8.po Mon Sep 24 11:50:52 2001 --- src/po/zh_CN.UTF-8.po Wed Oct 24 12:19:08 2001 *************** *** 4055,4057 **** #: ops.c:2018 ! msgid "1 line ~ed" msgstr " 1 行 ~ed" --- 4055,4057 ---- #: ops.c:2018 ! msgid "1 line changed" msgstr " 1 行 ~ed" *************** *** 4060,4062 **** #, c-format ! msgid "%ld lines ~ed" msgstr " %ld 行 ~ed" --- 4060,4062 ---- #, c-format ! msgid "%ld lines changed" msgstr " %ld 行 ~ed" diff -rc -C 1 ../vim60.86//src/po/zh_CN.cp936.po src/po/zh_CN.cp936.po *** ../vim60.86//src/po/zh_CN.cp936.po Mon Sep 24 11:50:53 2001 --- src/po/zh_CN.cp936.po Wed Oct 24 13:15:31 2001 *************** *** 4055,4057 **** #: ops.c:2018 ! msgid "1 line ~ed" msgstr " 1 ĐĐ ~ed" --- 4055,4057 ---- #: ops.c:2018 ! msgid "1 line changed" msgstr " 1 ĐĐ ~ed" *************** *** 4060,4062 **** #, c-format ! msgid "%ld lines ~ed" msgstr " %ld ĐĐ ~ed" --- 4060,4062 ---- #, c-format ! msgid "%ld lines changed" msgstr " %ld ĐĐ ~ed" diff -rc -C 1 ../vim60.86//src/po/zh_CN.po src/po/zh_CN.po *** ../vim60.86//src/po/zh_CN.po Mon Sep 24 11:49:24 2001 --- src/po/zh_CN.po Wed Oct 24 12:19:18 2001 *************** *** 4055,4057 **** #: ops.c:2018 ! msgid "1 line ~ed" msgstr " 1 ĐĐ ~ed" --- 4055,4057 ---- #: ops.c:2018 ! msgid "1 line changed" msgstr " 1 ĐĐ ~ed" *************** *** 4060,4062 **** #, c-format ! msgid "%ld lines ~ed" msgstr " %ld ĐĐ ~ed" --- 4060,4062 ---- #, c-format ! msgid "%ld lines changed" msgstr " %ld ĐĐ ~ed" diff -rc -C 1 ../vim60.86//src/po/zh_TW.po src/po/zh_TW.po *** ../vim60.86//src/po/zh_TW.po Mon Sep 24 19:48:46 2001 --- src/po/zh_TW.po Wed Oct 24 12:19:22 2001 *************** *** 4061,4063 **** #: ops.c:2018 ! msgid "1 line ~ed" msgstr " 1 Ść ~ed" --- 4061,4063 ---- #: ops.c:2018 ! msgid "1 line changed" msgstr " 1 Ść ~ed" *************** *** 4066,4068 **** #, c-format ! msgid "%ld lines ~ed" msgstr " %ld Ść ~ed" --- 4066,4068 ---- #, c-format ! msgid "%ld lines changed" msgstr " %ld Ść ~ed" *** ../vim60.86/src/version.c Tue Nov 6 15:54:13 2001 --- src/version.c Tue Nov 6 16:29:28 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 87, /**/ -- Bypasses are devices that allow some people to dash from point A to point B very fast while other people dash from point B to point A very fast. People living at point C, being a point directly in between, are often given to wonder what's so great about point A that so many people from point B are so keen to get there and what's so great about point B that so many people from point A are so keen to get there. They often wish that people would just once and for all work out where the hell they wanted to be. -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.088 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.088 Problem: "." doesn't work after using "rx" in Visual mode. (Charles Campbell) Solution: Also store the replacement character in the redo buffer. Files: src/normal.c *** ../vim60.87/src/normal.c Tue Nov 6 14:39:24 2001 --- src/normal.c Tue Nov 6 16:47:09 2001 *************** *** 1515,1523 **** && oap->motion_force == NUL ) { ! prep_redo(oap->regname, 0L, NUL, 'v', NUL, ! get_op_char(oap->op_type), ! get_extra_op_char(oap->op_type)); redo_VIsual_mode = resel_VIsual_mode; redo_VIsual_col = resel_VIsual_col; redo_VIsual_line_count = resel_VIsual_line_count; --- 1515,1522 ---- && oap->motion_force == NUL ) { ! prep_redo(oap->regname, 0L, NUL, 'v', get_op_char(oap->op_type), ! get_extra_op_char(oap->op_type), cap->nchar); redo_VIsual_mode = resel_VIsual_mode; redo_VIsual_col = resel_VIsual_col; redo_VIsual_line_count = resel_VIsual_line_count; *** ../vim60.87/src/version.c Tue Nov 6 16:30:59 2001 --- src/version.c Tue Nov 6 16:55:15 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 88, /**/ -- Don't Panic! -- The Hitchhiker's Guide to the Galaxy /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.089 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.089 Problem: In a C file, using "==" to align a line starting with "* " after a line with "* -" indents one space too few. (Piet Delport) Solution: Align with the previous line if the comment-start-string matches there. Files: src/misc1.c *** ../vim60.88/src/misc1.c Wed Oct 24 13:22:11 2001 --- src/misc1.c Tue Nov 6 19:33:32 2001 *************** *** 4792,4797 **** --- 4792,4799 ---- && (trypos = find_start_comment(ind_maxcomment)) != NULL) /* XXX */ { int lead_start_len = 2; + int lead_middle_len = 1; + char_u lead_start[COM_MAX_LEN]; /* start-comment string */ char_u lead_middle[COM_MAX_LEN]; /* middle-comment string */ char_u lead_end[COM_MAX_LEN]; /* end-comment string */ char_u *p; *************** *** 4827,4858 **** (void)copy_option_part(&p, lead_end, COM_MAX_LEN, ","); if (what == COM_START) { ! lead_start_len = (int)STRLEN(lead_end); start_off = off; start_align = align; } else if (what == COM_MIDDLE) { STRCPY(lead_middle, lead_end); } else if (what == COM_END) { /* If our line starts with the middle comment string, line it * up with the comment opener per the 'comments' option. */ ! if (STRNCMP(theline, lead_middle, STRLEN(lead_middle)) == 0 && STRNCMP(theline, lead_end, STRLEN(lead_end)) != 0) { if (start_off != 0) amount += start_off; else if (start_align == COM_RIGHT) ! amount += lead_start_len - (int)STRLEN(lead_middle); ! done = TRUE; break; } /* If our line starts with the end comment string, line it up * with the middle comment */ ! if (STRNCMP(theline, lead_middle, STRLEN(lead_middle)) != 0 && STRNCMP(theline, lead_end, STRLEN(lead_end)) == 0) { amount = get_indent_lnum(curwin->w_cursor.lnum - 1); --- 4829,4878 ---- (void)copy_option_part(&p, lead_end, COM_MAX_LEN, ","); if (what == COM_START) { ! STRCPY(lead_start, lead_end); ! lead_start_len = (int)STRLEN(lead_start); start_off = off; start_align = align; } else if (what == COM_MIDDLE) { STRCPY(lead_middle, lead_end); + lead_middle_len = (int)STRLEN(lead_middle); } else if (what == COM_END) { /* If our line starts with the middle comment string, line it * up with the comment opener per the 'comments' option. */ ! if (STRNCMP(theline, lead_middle, lead_middle_len) == 0 && STRNCMP(theline, lead_end, STRLEN(lead_end)) != 0) { + done = TRUE; + if (curwin->w_cursor.lnum > 1) + { + /* If the start comment string matches in the previous + * line, use the indent of that line pluss offset. If + * the middle comment string matches in the previous + * line, use the indent of that line. XXX */ + look = skipwhite(ml_get(curwin->w_cursor.lnum - 1)); + if (STRNCMP(look, lead_start, lead_start_len) == 0) + amount = get_indent_lnum(curwin->w_cursor.lnum - 1); + else if (STRNCMP(look, lead_middle, + lead_middle_len) == 0) + { + amount = get_indent_lnum(curwin->w_cursor.lnum - 1); + break; + } + } if (start_off != 0) amount += start_off; else if (start_align == COM_RIGHT) ! amount += lead_start_len - lead_middle_len; break; } /* If our line starts with the end comment string, line it up * with the middle comment */ ! if (STRNCMP(theline, lead_middle, lead_middle_len) != 0 && STRNCMP(theline, lead_end, STRLEN(lead_end)) == 0) { amount = get_indent_lnum(curwin->w_cursor.lnum - 1); *************** *** 4860,4866 **** if (off != 0) amount += off; else if (align == COM_RIGHT) ! amount += lead_start_len - (int)STRLEN(lead_middle); done = TRUE; break; } --- 4880,4886 ---- if (off != 0) amount += off; else if (align == COM_RIGHT) ! amount += lead_start_len - lead_middle_len; done = TRUE; break; } *** ../vim60.88/src/version.c Tue Nov 6 19:38:36 2001 --- src/version.c Tue Nov 6 19:29:12 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 89, /**/ -- If they don't keep on exercising their lips, he thought, their brains start working. -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.090 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.090 Problem: When a wrapping line does not fit in a window and 'scrolloff' is bigger than half the window height, moving the cursor left or right causes the screen to flash badly. (Lubomir Host) Solution: When there is not enough room to show 'scrolloff' screen lines and near the end of the line, show the end of the line. Files: src/move.c *** ../vim60.89/src/move.c Sat Sep 29 10:11:29 2001 --- src/move.c Tue Nov 6 21:38:50 2001 *************** *** 931,936 **** --- 931,937 ---- int extra; /* offset for first screen line */ int off; int n; + int p_lines; int width = 0; int textwidth; int new_leftcol; *************** *** 1071,1081 **** prev_skipcol = curwin->w_skipcol; ! n = 0; if ((curwin->w_wrow >= curwin->w_height || ((prev_skipcol > 0 || curwin->w_wrow + p_so >= curwin->w_height) ! && (n = #ifdef FEAT_DIFF plines_win_nofill #else --- 1072,1082 ---- prev_skipcol = curwin->w_skipcol; ! p_lines = 0; if ((curwin->w_wrow >= curwin->w_height || ((prev_skipcol > 0 || curwin->w_wrow + p_so >= curwin->w_height) ! && (p_lines = #ifdef FEAT_DIFF plines_win_nofill #else *************** *** 1102,1116 **** extra = 1; /* Compute last display line of the buffer line that we want at the * bottom of the window. */ ! if (n == 0) ! n = plines_win(curwin, curwin->w_cursor.lnum, FALSE); ! --n; ! if (curwin->w_wrow + p_so < n) n = curwin->w_wrow + p_so; if ((colnr_T)n >= curwin->w_height + curwin->w_skipcol / width) extra += 2; ! if (extra == 3) { /* not enough room for 'scrolloff', put cursor in the middle */ n = curwin->w_virtcol / width; --- 1103,1119 ---- extra = 1; /* Compute last display line of the buffer line that we want at the * bottom of the window. */ ! if (p_lines == 0) ! p_lines = plines_win(curwin, curwin->w_cursor.lnum, FALSE); ! --p_lines; ! if (p_lines > curwin->w_wrow + p_so) n = curwin->w_wrow + p_so; + else + n = p_lines; if ((colnr_T)n >= curwin->w_height + curwin->w_skipcol / width) extra += 2; ! if (extra == 3 || p_lines < p_so * 2) { /* not enough room for 'scrolloff', put cursor in the middle */ n = curwin->w_virtcol / width; *************** *** 1118,1123 **** --- 1121,1129 ---- n -= curwin->w_height / 2; else n = 0; + /* don't skip more than necessary */ + if (n > p_lines - curwin->w_height + 1) + n = p_lines - curwin->w_height + 1; curwin->w_skipcol = n * width; } else if (extra == 1) *************** *** 1149,1160 **** curwin->w_wrow -= extra; } ! extra = (curwin->w_skipcol - prev_skipcol) / width; if (extra > 0) win_ins_lines(curwin, 0, extra, FALSE, FALSE); else if (extra < 0) win_del_lines(curwin, 0, -extra, FALSE, FALSE); - } else curwin->w_skipcol = 0; --- 1155,1165 ---- curwin->w_wrow -= extra; } ! extra = ((int)prev_skipcol - (int)curwin->w_skipcol) / width; if (extra > 0) win_ins_lines(curwin, 0, extra, FALSE, FALSE); else if (extra < 0) win_del_lines(curwin, 0, -extra, FALSE, FALSE); } else curwin->w_skipcol = 0; *** ../vim60.89/src/version.c Tue Nov 6 19:43:29 2001 --- src/version.c Tue Nov 6 21:42:02 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 90, /**/ -- How To Keep A Healthy Level Of Insanity: 2. Page yourself over the intercom. Don't disguise your voice. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.091 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.091 Problem: Using CTRL-O in Insert mode, while 'virtualedit' is "all" and the cursor is after the end-of-line, moves the cursor left. (Yegappan Lakshmanan) Solution: Keep the cursor in the same position. Files: src/edit.c *** ../vim60.90/src/edit.c Sun Sep 23 21:34:28 2001 --- src/edit.c Tue Nov 6 09:10:57 2001 *************** *** 742,748 **** else restart_edit = 'I'; o_lnum = curwin->w_cursor.lnum; ! o_eol = (gchar_cursor() == NUL); goto doESCkey; #ifdef FEAT_SNIFF --- 742,753 ---- else restart_edit = 'I'; o_lnum = curwin->w_cursor.lnum; ! #ifdef FEAT_VIRTUALEDIT ! if (virtual_active()) ! o_eol = FALSE; /* cursor always keeps its column */ ! else ! #endif ! o_eol = (gchar_cursor() == NUL); goto doESCkey; #ifdef FEAT_SNIFF *************** *** 5631,5637 **** --- 5636,5646 ---- { #ifdef FEAT_VIRTUALEDIT if (curwin->w_cursor.coladd > 0 || ve_flags == VE_ALL) + { oneleft(); + if (restart_edit != NUL) + ++curwin->w_cursor.coladd; + } else #endif --curwin->w_cursor.col; *** ../vim60.90/src/version.c Tue Nov 6 21:48:06 2001 --- src/version.c Tue Nov 6 21:54:31 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 91, /**/ -- How To Keep A Healthy Level Of Insanity: 4. Put your garbage can on your desk and label it "in". /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.092 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.092 Problem: The explorer plugin doesn't ignore case of 'suffixes' on MS-Windows. (Mike Williams) Solution: Match or ignore case as appropriate for the OS. Files: runtime/plugin/explorer.vim *** ../vim60.91/runtime/plugin/explorer.vim Wed Sep 26 10:49:58 2001 --- runtime/plugin/explorer.vim Tue Nov 6 14:08:54 2001 *************** *** 323,329 **** nnoremap i :call ToggleLongList() nnoremap s :call SortSelect() nnoremap r :call SortReverse() ! nnoremap c :exec ("cd ".b:completePathEsc) nnoremap <2-leftmouse> :call DoubleClick() let &cpo = cpo_save --- 323,329 ---- nnoremap i :call ToggleLongList() nnoremap s :call SortSelect() nnoremap r :call SortReverse() ! nnoremap c :exec "cd ".b:completePathEsc nnoremap <2-leftmouse> :call DoubleClick() let &cpo = cpo_save *************** *** 536,541 **** --- 536,548 ---- function! s:SetSuffixesLast() let b:suffixesRegexp = '\(' . substitute(escape(&suffixes,s:escregexp),',','\\|','g') . '\)$' let b:suffixesHighlight = '^[^"].*\(' . substitute(escape(&suffixes,s:escregexp),',','\\|','g') . '\)\( \|$\)' + if has("fname_case") + let b:suffixesRegexp = '\C' . b:suffixesRegexp + let b:suffixesHighlight = '\C' . b:suffixesHighlight + else + let b:suffixesRegexp = '\c' . b:suffixesRegexp + let b:suffixesHighlight = '\c' . b:suffixesHighlight + endif if g:explSuffixesLast > 0 && &suffixes != "" let b:suffixeslast=" (" . &suffixes . " at end of list)" elseif g:explSuffixesLast < 0 && &suffixes != "" *************** *** 943,951 **** function! s:GetSection() let fn=s:GetFileName() let section="file" ! if (fn =~ '/$') let section="directory" ! elseif (fn =~ b:suffixesRegexp) let section="suffixes" endif return section --- 950,958 ---- function! s:GetSection() let fn=s:GetFileName() let section="file" ! if fn =~ '/$' let section="directory" ! elseif fn =~ b:suffixesRegexp let section="suffixes" endif return section *** ../vim60.91/src/version.c Tue Nov 6 21:57:04 2001 --- src/version.c Tue Nov 6 22:00:50 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 92, /**/ -- How To Keep A Healthy Level Of Insanity: 5. Put decaf in the coffee maker for 3 weeks. Once everyone has gotten over their caffeine addictions, switch to expresso. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.093 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.093 Problem: When the Tcl library couldn't be loaded dynamically, get an error message when closing a buffer or window. (Muraoka Taro) Solution: Only free structures if already using the Tcl interpreter. Files: src/if_tcl.c *** ../vim60.92/src/if_tcl.c Sun Nov 4 14:31:23 2001 --- src/if_tcl.c Tue Nov 6 11:39:23 2001 *************** *** 228,233 **** --- 228,236 ---- } #if defined(DYNAMIC_TCL) || defined(PROTO) + + static int stubs_initialized = FALSE; + /* * Return TRUE if the TCL interface can be used. */ *************** *** 235,242 **** tcl_enabled(verbose) int verbose; { - static int stubs_initialized = FALSE; - if (!stubs_initialized && find_executable_arg != NULL && tcl_runtime_link_init(DYNAMIC_TCL_DLL, verbose) == OK) { --- 238,243 ---- *************** *** 2079,2085 **** struct ref *reflist; #ifdef DYNAMIC_TCL ! if (!tcl_enabled(TRUE)) return; #endif --- 2080,2086 ---- struct ref *reflist; #ifdef DYNAMIC_TCL ! if (!stubs_initialized) /* Not using Tcl, nothing to do. */ return; #endif *************** *** 2100,2106 **** struct ref *reflist; #ifdef DYNAMIC_TCL ! if (!tcl_enabled(TRUE)) return; #endif --- 2101,2107 ---- struct ref *reflist; #ifdef DYNAMIC_TCL ! if (!stubs_initialized) /* Not using Tcl, nothing to do. */ return; #endif *** ../vim60.92/src/version.c Tue Nov 6 22:02:12 2001 --- src/version.c Tue Nov 6 22:03:56 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 93, /**/ -- How To Keep A Healthy Level Of Insanity: 6. In the memo field of all your checks, write "for sexual favors". /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.094 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.094 Problem: Athena: When clicking in the horizontal scrollbar Vim crashes. (Paul Ackersviller) Solution: Use the thumb size instead of the window pointer of the scrollbar (which is NULL). (David Harrison) Also avoid that scolling goes the wrong way in a narrow window. Files: src/gui_athena.c *** ../vim60.93/src/gui_athena.c Tue Sep 11 20:46:25 2001 --- src/gui_athena.c Wed Dec 12 20:29:52 2001 *************** *** 148,156 **** { sb_info = sb; if (data < -1) /* page-width left */ ! data = -(W_WIDTH(sb->wp) - 5); else if (data > 1) /* page-width right */ ! data = (W_WIDTH(sb->wp) - 5); } value = sb_info->value + data; --- 148,166 ---- { sb_info = sb; if (data < -1) /* page-width left */ ! { ! if (sb->size > 8) ! data = -(sb->size - 5); ! else ! data = -sb->size; ! } else if (data > 1) /* page-width right */ ! { ! if (sb->size > 8) ! data = (sb->size - 5); ! else ! data = sb->size; ! } } value = sb_info->value + data; *** ../vim60.93/src/version.c Tue Nov 6 22:08:40 2001 --- src/version.c Wed Dec 12 20:31:57 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 94, /**/ -- hundred-and-one symptoms of being an internet addict: 44. Your friends no longer send you e-mail...they just log on to your IRC channel. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.095 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.095 Problem: Perl: Deleting lines may leave the cursor beyond the end of the file. Solution: Check the cursor position after deleting a line. (Serguei) Files: src/if_perl.xs *** ../vim60.94/src/if_perl.xs Sun Nov 4 14:31:23 2001 --- src/if_perl.xs Wed Dec 12 20:59:21 2001 *************** *** 1086,1091 **** --- 1086,1092 ---- { ml_delete(lnum, 0); deleted_lines_mark(lnum, 1L); + check_cursor(); } curbuf = savebuf; update_curbuf(VALID); *** ../vim60.94/src/version.c Wed Dec 12 20:36:34 2001 --- src/version.c Wed Dec 12 21:03:16 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 95, /**/ -- hundred-and-one symptoms of being an internet addict: 48. You get a tatoo that says "This body best viewed with Netscape 3.1 or higher." /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.096 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.096 Problem: When ":saveas fname" fails because the file already exists, the file name is changed anyway and a following ":w" will overwrite the file. (Eric Carlier) Solution: Don't change the file name if the file already exists. Files: src/ex_cmds.c *** ../vim60.95/src/ex_cmds.c Mon Nov 5 21:24:46 2001 --- src/ex_cmds.c Wed Dec 12 21:32:55 2001 *************** *** 2140,2191 **** } } ! if (eap->cmdidx == CMD_saveas && alt_buf != NULL) { #ifdef FEAT_AUTOCMD ! buf_T *was_curbuf = curbuf; ! apply_autocmds(EVENT_BUFFILEPRE, NULL, NULL, FALSE, curbuf); ! if (curbuf != was_curbuf) ! { ! /* buffer changed, don't change name now */ ! retval = FAIL; ! goto theend; ! } #endif ! /* Exchange the file names for the current and the alternate buffer. ! * This makes it look like we are now editing the buffer under the new ! * name. Must be done before buf_write(), because if there is no file ! * name and 'cpo' contains 'F', it will set the file name. */ ! fname = alt_buf->b_fname; ! alt_buf->b_fname = curbuf->b_fname; ! curbuf->b_fname = fname; ! fname = alt_buf->b_ffname; ! alt_buf->b_ffname = curbuf->b_ffname; ! curbuf->b_ffname = fname; ! fname = alt_buf->b_sfname; ! alt_buf->b_sfname = curbuf->b_sfname; ! curbuf->b_sfname = fname; ! buf_name_changed(); #ifdef FEAT_AUTOCMD ! apply_autocmds(EVENT_BUFFILEPOST, NULL, NULL, FALSE, curbuf); ! if (!alt_buf->b_p_bl) ! { ! alt_buf->b_p_bl = TRUE; ! apply_autocmds(EVENT_BUFADD, NULL, NULL, FALSE, alt_buf); ! } ! if (curbuf != was_curbuf) ! { ! /* buffer changed, don't write the file */ ! retval = FAIL; ! goto theend; ! } #endif ! } - if (check_overwrite(eap, curbuf, fname, ffname, other) == OK) retval = buf_write(curbuf, ffname, fname, eap->line1, eap->line2, eap, eap->append, eap->forceit, TRUE, FALSE); theend: #ifdef FEAT_BROWSE --- 2140,2194 ---- } } ! if (check_overwrite(eap, curbuf, fname, ffname, other) == OK) { + if (eap->cmdidx == CMD_saveas && alt_buf != NULL) + { #ifdef FEAT_AUTOCMD ! buf_T *was_curbuf = curbuf; ! apply_autocmds(EVENT_BUFFILEPRE, NULL, NULL, FALSE, curbuf); ! if (curbuf != was_curbuf) ! { ! /* buffer changed, don't change name now */ ! retval = FAIL; ! goto theend; ! } #endif ! /* Exchange the file names for the current and the alternate ! * buffer. This makes it look like we are now editing the buffer ! * under the new name. Must be done before buf_write(), because ! * if there is no file name and 'cpo' contains 'F', it will set ! * the file name. */ ! fname = alt_buf->b_fname; ! alt_buf->b_fname = curbuf->b_fname; ! curbuf->b_fname = fname; ! fname = alt_buf->b_ffname; ! alt_buf->b_ffname = curbuf->b_ffname; ! curbuf->b_ffname = fname; ! fname = alt_buf->b_sfname; ! alt_buf->b_sfname = curbuf->b_sfname; ! curbuf->b_sfname = fname; ! buf_name_changed(); #ifdef FEAT_AUTOCMD ! apply_autocmds(EVENT_BUFFILEPOST, NULL, NULL, FALSE, curbuf); ! if (!alt_buf->b_p_bl) ! { ! alt_buf->b_p_bl = TRUE; ! apply_autocmds(EVENT_BUFADD, NULL, NULL, FALSE, alt_buf); ! } ! if (curbuf != was_curbuf) ! { ! /* buffer changed, don't write the file */ ! retval = FAIL; ! goto theend; ! } #endif ! } retval = buf_write(curbuf, ffname, fname, eap->line1, eap->line2, eap, eap->append, eap->forceit, TRUE, FALSE); + } theend: #ifdef FEAT_BROWSE *** ../vim60.95/src/version.c Wed Dec 12 21:05:43 2001 --- src/version.c Wed Dec 12 21:37:50 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 96, /**/ -- hundred-and-one symptoms of being an internet addict: 51. You put a pillow case over your laptop so your lover doesn't see it while you are pretending to catch your breath. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.097 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.097 Problem: Re-indenting in Insert mode with CTRL-F may cause a crash with a multi-byte encoding. Solution: Avoid using a character before the start of a line. (Sergey Vlasov) Files: src/edit.c *** ../vim60.96/src/edit.c Tue Nov 6 21:57:04 2001 --- src/edit.c Thu Dec 13 18:51:50 2001 *************** *** 1510,1516 **** { last_vcol = vcol; #ifdef FEAT_MBYTE ! if (has_mbyte) new_cursor_col += (*mb_ptr2len_check)(ptr + new_cursor_col); else #endif --- 1510,1516 ---- { last_vcol = vcol; #ifdef FEAT_MBYTE ! if (has_mbyte && new_cursor_col >= 0) new_cursor_col += (*mb_ptr2len_check)(ptr + new_cursor_col); else #endif *** ../vim60.96/src/version.c Wed Dec 12 21:42:23 2001 --- src/version.c Thu Dec 13 19:13:10 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 97, /**/ -- hundred-and-one symptoms of being an internet addict: 78. You find yourself dialing IP numbers on the phone. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.098 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.098 Problem: GTK: When using Gnome the "Search" and "Search and Replace" dialog boxes are not translated. Solution: Define ENABLE_NLS before including gnome.h. (Eduardo Fernandez) Files: src/gui_gtk.c, src/gui_gtk_x11.c *** ../vim60.97/src/gui_gtk.c Tue Nov 6 11:58:54 2001 --- src/gui_gtk.c Fri Dec 14 20:09:40 2001 *************** *** 43,48 **** --- 43,51 ---- # ifdef bindtextdomain # undef bindtextdomain # endif + # if defined(FEAT_GETTEXT) && !defined(ENABLE_NLS) + # define ENABLE_NLS /* so the texts in the dialog boxes are translated */ + # endif # include #endif *** ../vim60.97/src/gui_gtk_x11.c Thu Nov 1 14:41:29 2001 --- src/gui_gtk_x11.c Fri Dec 14 20:10:23 2001 *************** *** 31,36 **** --- 31,39 ---- # ifdef bindtextdomain # undef bindtextdomain # endif + # if defined(FEAT_GETTEXT) && !defined(ENABLE_NLS) + # define ENABLE_NLS /* so the texts in the dialog boxes are translated */ + # endif # include # include "version.h" #endif *** ../vim60.97/src/version.c Thu Dec 13 19:15:02 2001 --- src/version.c Fri Dec 14 20:07:55 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 98, /**/ -- hundred-and-one symptoms of being an internet addict: 93. New mail alarm on your palmtop annoys other churchgoers. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.099 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.099 Problem: Cygwin: When running Vi compatible MS-DOS line endings cause trouble. Solution: Make the default for 'fileformats' "unix,dos" in Vi compatible mode. (Michael Schaap) Files: src/option.h *** ../vim60.98/src/option.h Thu Nov 1 12:22:41 2001 --- src/option.h Fri Dec 14 20:23:52 2001 *************** *** 67,74 **** # else # define DFLT_FF "unix" # define DFLT_FFS_VIM "unix,dos" ! # define DFLT_FFS_VI "" ! # define DFLT_TEXTAUTO FALSE # endif #endif --- 67,79 ---- # else # define DFLT_FF "unix" # define DFLT_FFS_VIM "unix,dos" ! # ifdef __CYGWIN__ ! # define DFLT_FFS_VI "unix,dos" /* Cygwin always needs file detection */ ! # define DFLT_TEXTAUTO TRUE ! # else ! # define DFLT_FFS_VI "" ! # define DFLT_TEXTAUTO FALSE ! # endif # endif #endif *** ../vim60.98/src/version.c Fri Dec 14 20:19:45 2001 --- src/version.c Fri Dec 14 20:27:35 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 99, /**/ -- hundred-and-one symptoms of being an internet addict: 95. Only communication in your household is through email. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.100 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.100 Problem: ":badd +0 test%file" causes a crash. Solution: Take into account that the "+0" is NUL terminated when allocating room for replacing the "%". Files: src/ex_docmd.c *** ../vim60.99/src/ex_docmd.c Fri Nov 2 16:29:44 2001 --- src/ex_docmd.c Sat Dec 15 21:34:01 2001 *************** *** 3330,3336 **** /* * Replace part of the command line, keeping eap->cmd, eap->arg and * eap->nextcmd correct. ! * "src" points to the part that is to be replaced, of lenght "srclen". * "repl" is the replacement string. * Returns a pointer to the character after the replaced string. * Returns NULL for failure. --- 3330,3336 ---- /* * Replace part of the command line, keeping eap->cmd, eap->arg and * eap->nextcmd correct. ! * "src" points to the part that is to be replaced, of length "srclen". * "repl" is the replacement string. * Returns a pointer to the character after the replaced string. * Returns NULL for failure. *************** *** 3350,3358 **** /* * The new command line is build in new_cmdline[]. * First allocate it. */ len = (int)STRLEN(repl); ! i = (int)STRLEN(*cmdlinep) + len + 3; if (eap->nextcmd) i += (int)STRLEN(eap->nextcmd);/* add space for next command */ if ((new_cmdline = alloc((unsigned)i)) == NULL) --- 3350,3359 ---- /* * The new command line is build in new_cmdline[]. * First allocate it. + * Careful: a "+cmd" argument may have been NUL terminated. */ len = (int)STRLEN(repl); ! i = (int)(src - *cmdlinep) + (int)STRLEN(src + srclen) + len + 3; if (eap->nextcmd) i += (int)STRLEN(eap->nextcmd);/* add space for next command */ if ((new_cmdline = alloc((unsigned)i)) == NULL) *** ../vim60.99/src/version.c Sat Dec 15 21:39:19 2001 --- src/version.c Sat Dec 15 21:05:08 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 100, /**/ -- hundred-and-one symptoms of being an internet addict: 116. You are living with your boyfriend who networks your respective computers so you can sit in separate rooms and email each other /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.101 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.101 Problem: ":mksession" doesn't restore editing a file that has a '#' or '%' in its name. (Wolfgang Blankenburg) Solution: Put a backslash before the '#' and '%'. Files: src/ex_docmd.c *** ../vim60.100/src/ex_docmd.c Sat Dec 15 21:40:46 2001 --- src/ex_docmd.c Sat Dec 15 21:34:01 2001 *************** *** 8469,8474 **** --- 8469,8476 ---- #ifdef BACKSLASH_IN_FILENAME && c != '\\' #endif + || c == '#' + || c == '%' ) { /* escape a special character with a backslash */ *** ../vim60.100/src/version.c Sat Dec 15 21:40:46 2001 --- src/version.c Sat Dec 15 21:41:44 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 101, /**/ -- hundred-and-one symptoms of being an internet addict: 117. You are more comfortable typing in html. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.102 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.102 Problem: When changing folds the cursor may appear halfway a closed fold. (Nam SungHyun) Solution: Set w_cline_folded correctly. (Yasuhiro Matsumoto) Files: src/move.c *** ../vim60.101/src/move.c Tue Nov 6 21:48:06 2001 --- src/move.c Thu Dec 27 17:19:17 2001 *************** *** 775,781 **** /* a line that is too long to fit on the last screen line */ wp->w_cline_height = 0; #ifdef FEAT_FOLDING ! wp->w_cline_folded = FALSE; #endif } else --- 775,782 ---- /* a line that is too long to fit on the last screen line */ wp->w_cline_height = 0; #ifdef FEAT_FOLDING ! wp->w_cline_folded = hasFoldingWin(wp, wp->w_cursor.lnum, ! NULL, NULL, TRUE, NULL); #endif } else *** ../vim60.101/src/version.c Sat Dec 15 21:56:10 2001 --- src/version.c Sun Dec 30 17:24:29 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 102, /**/ -- Women are probably the main cause of free software starvation. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.103 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.103 Problem: When using 'scrollbind' a large value of 'scrolloff' will make the scroll binding stop near the end of the file. (Coen Engelbarts) Solution: Don't use 'scrolloff' when limiting the topline for scroll binding. (Dany StAmant) Files: src/normal.c *** ../vim60.102/src/normal.c Tue Nov 6 19:38:36 2001 --- src/normal.c Thu Dec 13 10:16:13 2001 *************** *** 3497,3504 **** { curwin->w_scbind_pos += topline_diff; topline = curwin->w_scbind_pos; ! if (topline > curbuf->b_ml.ml_line_count - p_so) ! topline = curbuf->b_ml.ml_line_count - p_so; if (topline < 1) topline = 1; --- 3497,3504 ---- { curwin->w_scbind_pos += topline_diff; topline = curwin->w_scbind_pos; ! if (topline > curbuf->b_ml.ml_line_count) ! topline = curbuf->b_ml.ml_line_count; if (topline < 1) topline = 1; *** ../vim60.102/src/version.c Sun Dec 30 17:25:33 2001 --- src/version.c Sun Dec 30 17:43:11 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 103, /**/ -- This sentence is not sure that it exists, but if it does, it will certainly consider the possibility that other sentences exist. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.104 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.104 Problem: Multi-byte: When '$' is in 'cpoptions', typing a double-wide character that overwrites the left halve of an old double-wide character causes a redraw problem and the cursor stops blinking. Solution: Clear the right half of the old character. (Yasuhiro Matsumoto) Files: src/edit.c, src/screen.c *** ../vim60.103/src/edit.c Thu Dec 13 19:15:02 2001 --- src/edit.c Sun Dec 30 21:00:46 2001 *************** *** 329,334 **** --- 329,340 ---- else State = INSERT; + /* + * Need to recompute the cursor position, it might move when the cursor is + * on a TAB or special character. + */ + curs_columns(TRUE); + if (curbuf->b_p_iminsert == B_IMODE_LMAP) State |= LANGMAP; #ifdef USE_IM_CONTROL *************** *** 338,349 **** #if defined(FEAT_MBYTE) && defined(MACOS) KeyScript(previous_script); #endif - - /* - * Need to recompute the cursor position, it might move when the cursor is - * on a TAB or special character. - */ - curs_columns(TRUE); #ifdef FEAT_MOUSE setmouse(); --- 344,349 ---- *** ../vim60.103/src/screen.c Sun Nov 4 19:10:16 2001 --- src/screen.c Sun Dec 30 21:16:39 2001 *************** *** 4062,4070 **** } /* When writing a single-width character over a double-width * character and at the end of the redrawn text, need to clear out ! * the right halve of the old character. */ ! if (has_mbyte && char_cells == 1 && col + 1 == endcol ! && (*mb_off2cells)(off_to) > 1) clear_next = TRUE; #endif --- 4062,4076 ---- } /* When writing a single-width character over a double-width * character and at the end of the redrawn text, need to clear out ! * the right halve of the old character. ! * Also required when writing the right halve of a double-width ! * char over the left halve of an existing one. */ ! if (has_mbyte && col + char_cells == endcol ! && ((char_cells == 1 ! && (*mb_off2cells)(off_to) > 1) ! || (char_cells == 2 ! && (*mb_off2cells)(off_to) == 1 ! && (*mb_off2cells)(off_to + 1) > 1))) clear_next = TRUE; #endif *************** *** 4355,4361 **** } /* ! * Get the lenght of an item as it will be shown in that status line. */ static int status_match_len(xp, s) --- 4361,4367 ---- } /* ! * Get the lenght of an item as it will be shown in the status line. */ static int status_match_len(xp, s) *************** *** 5106,5114 **** #ifdef FEAT_MBYTE /* When at the end of the text and overwriting a two-cell * character with a one-cell character, need to clear the next ! * cell. */ ! if (has_mbyte && mbyte_cells == 1 && ptr[mbyte_blen] == NUL ! && (*mb_off2cells)(off) > 1) clear_next_cell = TRUE; #endif ScreenLines[off] = *ptr; --- 5112,5124 ---- #ifdef FEAT_MBYTE /* When at the end of the text and overwriting a two-cell * character with a one-cell character, need to clear the next ! * cell. Also when overwriting the left halve of a two-cell ! * char with the right halve of a two-cell char. */ ! if (has_mbyte && ptr[mbyte_blen] == NUL ! && ((mbyte_cells == 1 && (*mb_off2cells)(off) > 1) ! || (mbyte_cells == 2 ! && (*mb_off2cells)(off) == 1 ! && (*mb_off2cells)(off + 1) > 1))) clear_next_cell = TRUE; #endif ScreenLines[off] = *ptr; *** ../vim60.103/src/version.c Sun Dec 30 17:47:16 2001 --- src/version.c Sun Dec 30 21:19:40 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 104, /**/ -- GALAHAD: Camelot ... LAUNCELOT: Camelot ... GAWAIN: It's only a model. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.105 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.105 Problem: Multi-byte: In a window of one column wide, with syntax highlighting enabled a crash might happen. Solution: Skip getting the syntax attribute when the character doesn't fit anyway. (Yasuhiro Matsumoto) Files: src/screen.c *** ../vim60.104/src/screen.c Sun Dec 30 21:23:29 2001 --- src/screen.c Sun Dec 30 21:36:58 2001 *************** *** 3290,3303 **** if (extra_check) { #ifdef FEAT_SYN_HL ! if (has_syntax) { /* Get the syntax attribute for the character. If there * is an error, disable syntax highlighting. */ save_did_emsg = did_emsg; did_emsg = FALSE; - v = (long)(ptr - line); syntax_attr = get_syntax_attr((colnr_T)v - 1); if (did_emsg) --- 3290,3304 ---- if (extra_check) { #ifdef FEAT_SYN_HL ! /* Get syntax attribute, unless still at the start of the line ! * (double-wide char that doesn't fit). */ ! if (has_syntax && (v = (long)(ptr - line)) > 0) { /* Get the syntax attribute for the character. If there * is an error, disable syntax highlighting. */ save_did_emsg = did_emsg; did_emsg = FALSE; syntax_attr = get_syntax_attr((colnr_T)v - 1); if (did_emsg) *** ../vim60.104/src/version.c Sun Dec 30 21:23:29 2001 --- src/version.c Sun Dec 30 21:39:21 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 105, /**/ -- We're knights of the round table We dance whene'er we're able We do routines and chorus scenes With footwork impeccable. We dine well here in Camelot We eat ham and jam and spam a lot. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.106 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.106 (extra) Problem: Win32: When the printer font is wrong, there is no error message. Solution: Give an appropriate error message. (Yasuhiro Matsumoto) Files: src/os_mswin.c *** ../vim60.105/src/os_mswin.c Thu Sep 20 18:14:20 2001 --- src/os_mswin.c Sun Dec 30 21:47:34 2001 *************** *** 1399,1405 **** --- 1399,1409 ---- */ memset(&fLogFont, 0, sizeof(fLogFont)); if (!get_logfont(&fLogFont, p_pfn, prt_dlg.hDC)) + { + EMSG2(_("E448: Unknown font: %s"), p_pfn); + mch_print_cleanup(); return FALSE; + } for (pifBold = 0; pifBold <= 1; pifBold++) for (pifItalic = 0; pifItalic <= 1; pifItalic++) *** ../vim60.105/src/version.c Sun Dec 30 21:41:24 2001 --- src/version.c Sun Dec 30 21:49:55 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 106, /**/ -- We're knights of the Round Table Our shows are formidable But many times We're given rhymes That are quite unsingable We're opera mad in Camelot We sing from the diaphragm a lot. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.107 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.107 (extra) Problem: VisVim: When editing another file, a modified file may be written unexpectedly and without warning. Solution: Split the window if a file was modified. Files: VisVim/Commands.cpp *** ../vim60.106/VisVim/Commands.cpp Mon Jul 23 22:19:17 2001 --- VisVim/Commands.cpp Sun Dec 30 21:58:33 2001 *************** *** 521,528 **** --- 521,533 ---- VimCmd[1] = 0x0e; VimCmdStart = VimCmd + 2; + #ifdef SINGLE_WINDOW // Update the current file in Vim if it has been modified sprintf (VimCmdStart, ":up\n"); + #else + // Split the window if the current file has been modified + sprintf (VimCmdStart, ":if &mod | split | endif\n"); + #endif if (! VimOle.Method (DispatchId, "s", TO_OLE_STR_BUF (VimCmd, Buf))) goto OleError; *** ../vim60.106/src/version.c Sun Dec 30 21:52:17 2001 --- src/version.c Sun Dec 30 22:26:25 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 107, /**/ -- In war we're tough and able. Quite indefatigable Between our quests We sequin vests And impersonate Clark Gable It's a busy life in Camelot. I have to push the pram a lot. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.108 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.108 Problem: When using folding could try displaying line zero, resulting in an error for a NULL pointer. Solution: Stop decrementing w_topline when the first line of a window is in a closed fold. Files: src/window.c *** ../vim60.107/src/window.c Mon Nov 5 09:52:01 2001 --- src/window.c Sun Dec 30 22:23:22 2001 *************** *** 4072,4077 **** --- 4072,4084 ---- { #ifdef FEAT_FOLDING hasFoldingWin(wp, lnum, &lnum, NULL, TRUE, NULL); + if (lnum == 1) + { + /* first line in buffer is folded */ + line_size = 1; + --sline; + break; + } #endif --lnum; #ifdef FEAT_DIFF *** ../vim60.107/src/version.c Sun Dec 30 22:28:38 2001 --- src/version.c Sun Dec 30 22:31:03 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 108, /**/ -- GOD: That is your purpose Arthur ... the Quest for the Holy Grail ... "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.109 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.109 Problem: XIM: When the input method is enabled, repeating an insertion with "." disables it. (Marcel Svitalsky) Solution: Don't store the input method status when a command comes from the stuff buffer. Files: src/ui.c *** ../vim60.108/src/ui.c Tue Sep 25 19:25:37 2001 --- src/ui.c Mon Dec 31 14:50:37 2001 *************** *** 2753,2760 **** /* Don't save when 'imdisable' is set or "xic" is NULL, IM is always * disabled then (but might start later). * Also don't save when inside a mapping, vgetc_im_active has not been set ! * then. */ ! if (!p_imdisable && KeyTyped # ifdef FEAT_XIM && xic != NULL # endif --- 2753,2761 ---- /* Don't save when 'imdisable' is set or "xic" is NULL, IM is always * disabled then (but might start later). * Also don't save when inside a mapping, vgetc_im_active has not been set ! * then. ! * And don't save when the keys were stuffed (e.g., for a "." command). */ ! if (!p_imdisable && KeyTyped && !KeyStuffed # ifdef FEAT_XIM && xic != NULL # endif *** ../vim60.108/src/version.c Sun Dec 30 22:32:00 2001 --- src/version.c Mon Dec 31 14:54:05 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 109, /**/ -- ARTHUR: (as the MAN next to him is squashed by a sheep) Knights! Run away! Midst echoing shouts of "run away" the KNIGHTS retreat to cover with the odd cow or goose hitting them still. The KNIGHTS crouch down under cover. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.110 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.110 Problem: Using undo after executing "OxjAxkdd" from a register in an empty buffer gives an error message. (Gerhard Hochholzer) Solution: Don't adjust the bottom line number of an undo block when it's zero. Add a test for this problem. Files: src/undo.c, src/testdir/test20.in, src/testdir/test20.ok *** ../vim60.109/src/undo.c Sat Nov 3 14:01:26 2001 --- src/undo.c Mon Dec 31 15:32:57 2001 *************** *** 298,304 **** for (p = curbuf->b_u_newhead->uh_entry; p != uep; p = p->ue_next) { ! p->ue_bot -= uep->ue_bot - newbot; p->ue_top -= uep->ue_bot - newbot; } } --- 298,305 ---- for (p = curbuf->b_u_newhead->uh_entry; p != uep; p = p->ue_next) { ! if (p->ue_bot != 0) ! p->ue_bot -= uep->ue_bot - newbot; p->ue_top -= uep->ue_bot - newbot; } } *** ../vim60.109/src/testdir/test20.in Sun Dec 3 22:01:15 2000 --- src/testdir/test20.in Mon Dec 31 15:29:09 2001 *************** *** 1,9 **** Tests Blockwise Visual when there are TABs before the text. STARTTEST :so tiny.vim ! /start ! jjlld:.,$w! test.out :qa! ENDTEST --- 1,16 ---- Tests Blockwise Visual when there are TABs before the text. + First test for undo working properly when executing commands from a register. + Also test this in an empty buffer. STARTTEST :so tiny.vim ! G0"ay$k@au ! :new ! @auY:quit! ! GP ! /start here$ ! jjlld ! :/here$/,$-1w! test.out :qa! ENDTEST *************** *** 11,13 **** --- 18,22 ---- some text test text test text + + OxjAykdd *** ../vim60.109/src/testdir/test20.ok Sun Aug 1 14:01:14 1999 --- src/testdir/test20.ok Mon Dec 31 15:29:34 2001 *************** *** 2,4 **** --- 2,6 ---- somext tesext test text + + *** ../vim60.109/src/version.c Mon Dec 31 15:35:23 2001 --- src/version.c Mon Dec 31 15:34:29 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 110, /**/ -- A KNIGHT rides into shot and hacks him to the ground. He rides off. We stay for a moment on the glade. A MIDDLE-AGED LADY in a C. & A. twin-set emerges from the trees and looks in horror at the body of her HUSBAND. MRS HISTORIAN: FRANK! "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.111 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.111 Problem: The virtcol() function doesn't take care of 'virtualedit'. Solution: Add the column offset when needed. (Yegappan Lakshmanan) Files: src/eval.c *** ../vim60.110/src/eval.c Sun Nov 4 14:31:23 2001 --- src/eval.c Wed Dec 12 22:01:33 2001 *************** *** 6242,6248 **** fp = var2fpos(&argvars[0], FALSE); if (fp != NULL && fp->lnum <= curbuf->b_ml.ml_line_count) { ! getvcol(curwin, fp, NULL, NULL, &vcol); ++vcol; } --- 6242,6248 ---- fp = var2fpos(&argvars[0], FALSE); if (fp != NULL && fp->lnum <= curbuf->b_ml.ml_line_count) { ! getvvcol(curwin, fp, NULL, NULL, &vcol); ++vcol; } *** ../vim60.110/src/version.c Mon Dec 31 16:32:36 2001 --- src/version.c Mon Dec 31 16:37:06 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 111, /**/ -- Error:015 - Unable to exit Windows. Try the door. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.112 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.112 Problem: The explorer plugin doesn't sort directories with a space or special character after a directory with a shorter name. Solution: Ignore the trailing slash when comparing directory names. (Mike Williams) Files: runtime/plugin/explorer.vim *** ../vim60.111/runtime/plugin/explorer.vim Tue Nov 6 22:02:12 2001 --- runtime/plugin/explorer.vim Wed Nov 7 19:05:46 2001 *************** *** 1024,1030 **** elseif (g:explSuffixesLast != 0) && (f1 !~ b:suffixesRegexp) && (f2 =~ b:suffixesRegexp) return -g:explSuffixesLast else ! return s:StrCmp(f1,f2,a:direction) endif endfunction --- 1024,1030 ---- elseif (g:explSuffixesLast != 0) && (f1 !~ b:suffixesRegexp) && (f2 =~ b:suffixesRegexp) return -g:explSuffixesLast else ! return s:StrCmp(substitute(f1, "/$", "", ""), substitute(f2, "/$", "", ""), a:direction) endif endfunction *************** *** 1054,1060 **** elseif t1 < t2 return a:direction else ! return s:StrCmp(f1,f2,1) endif endfunction --- 1054,1060 ---- elseif t1 < t2 return a:direction else ! return s:StrCmp(substitute(f1, "/$", "", ""), substitute(f2, "/$", "", ""), 1) endif endfunction *************** *** 1082,1088 **** elseif s1 < s2 return a:direction else ! return s:StrCmp(f1,f2,1) endif endfunction --- 1082,1088 ---- elseif s1 < s2 return a:direction else ! return s:StrCmp(substitute(f1, "/$", "", ""), substitute(f2, "/$", "", ""), 1) endif endfunction *** ../vim60.111/src/version.c Mon Dec 31 16:39:26 2001 --- src/version.c Mon Dec 31 16:46:48 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 112, /**/ -- press CTRL-ALT-DEL for more information /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.113 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.113 Problem: ":edit ~/fname" doesn't work if $HOME includes a space. Also, expanding wildcards with the shell may fail. (John Daniel) Solution: Escape spaces with a backslash when needed. Files: src/ex_docmd.c, src/misc1.c, src/proto/misc1.pro, src/os_unix.c *** ../vim60.112/src/ex_docmd.c Sat Dec 15 21:56:10 2001 --- src/ex_docmd.c Mon Dec 31 17:28:09 2001 *************** *** 3297,3303 **** if (vim_strchr(eap->arg, '$') != NULL || vim_strchr(eap->arg, '~') != NULL) { ! expand_env(eap->arg, NameBuff, MAXPATHL); has_wildcards = mch_has_wildcard(NameBuff); p = NameBuff; } --- 3297,3303 ---- if (vim_strchr(eap->arg, '$') != NULL || vim_strchr(eap->arg, '~') != NULL) { ! expand_env_esc(eap->arg, NameBuff, MAXPATHL, TRUE); has_wildcards = mch_has_wildcard(NameBuff); p = NameBuff; } *** ../vim60.112/src/misc1.c Tue Nov 6 19:43:29 2001 --- src/misc1.c Mon Dec 31 17:46:07 2001 *************** *** 2834,2839 **** --- 2834,2849 ---- char_u *dst; /* where to put the result */ int dstlen; /* maximum length of the result */ { + expand_env_esc(src, dst, dstlen, FALSE); + } + + void + expand_env_esc(src, dst, dstlen, esc) + char_u *src; /* input string e.g. "$HOME/vim.hlp" */ + char_u *dst; /* where to put the result */ + int dstlen; /* maximum length of the result */ + int esc; /* escape spaces in expanded variables */ + { char_u *tail; int c; char_u *var; *************** *** 2999,3004 **** --- 3009,3029 ---- var = NULL; tail = (char_u *)""; /* for gcc */ #endif /* UNIX || VMS */ + } + + /* If "var" contains white space, escape it with a backslash. + * Required for ":e ~/tt" $HOME includes a space. */ + if (esc && var != NULL && vim_strpbrk(var, (char_u *)" \t") != NULL) + { + char_u *p = vim_strsave_escaped(var, (char_u *)" \t"); + + if (p != NULL) + { + if (mustfree) + vim_free(var); + var = p; + mustfree = TRUE; + } } if (var != NULL && *var != NUL *** ../vim60.112/src/proto/misc1.pro Tue Sep 25 21:49:20 2001 --- src/proto/misc1.pro Mon Dec 31 17:26:25 2001 *************** *** 46,51 **** --- 46,52 ---- void vim_beep __ARGS((void)); void init_homedir __ARGS((void)); void expand_env __ARGS((char_u *src, char_u *dst, int dstlen)); + void expand_env_esc __ARGS((char_u *src, char_u *dst, int dstlen, int esc)); char_u *vim_getenv __ARGS((char_u *name, int *mustfree)); char_u *expand_env_save __ARGS((char_u *src)); void vim_setenv __ARGS((char_u *name, char_u *val)); *** ../vim60.112/src/os_unix.c Wed Oct 31 14:21:02 2001 --- src/os_unix.c Mon Dec 31 17:41:29 2001 *************** *** 4277,4289 **** if (shell_style != STYLE_BT) for (i = 0; i < num_pat; ++i) { ! #ifdef USE_SYSTEM ! STRCAT(command, " \""); /* need extra quotes because we */ ! STRCAT(command, pat[i]); /* start the shell twice */ ! STRCAT(command, "\""); ! #else ! STRCAT(command, " "); ! STRCAT(command, pat[i]); #endif } if (flags & EW_SILENT) --- 4277,4299 ---- if (shell_style != STYLE_BT) for (i = 0; i < num_pat; ++i) { ! /* When using system() always add extra quotes, because the shell ! * is started twice. Otherwise it's only needed when the pattern ! * includes spaces or single quotes. */ ! #ifndef USE_SYSTEM ! if (vim_strpbrk(pat[i], " '") != NULL) ! #endif ! { ! STRCAT(command, " \""); ! STRCAT(command, pat[i]); ! STRCAT(command, "\""); ! } ! #ifndef USE_SYSTEM ! else ! { ! STRCAT(command, " "); ! STRCAT(command, pat[i]); ! } #endif } if (flags & EW_SILENT) *** ../vim60.112/src/version.c Mon Dec 31 16:49:06 2001 --- src/version.c Mon Dec 31 17:43:12 2001 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 113, /**/ -- Microsoft: "Windows NT 4.0 now has the same user-interface as Windows 95" Windows 95: "Press CTRL-ALT-DEL to reboot" Windows NT 4.0: "Press CTRL-ALT-DEL to login" /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.114 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.114 Problem: Using ":p" with fnamemodify() didn't expand "~/" or "~user/" to a full path. For Win32 the current directory was prepended. (Michael Geddes) Solution: Expand the home directory. Files: src/eval.c *** ../vim60.113/src/eval.c Mon Dec 31 16:39:26 2001 --- src/eval.c Tue Jan 1 15:09:37 2002 *************** *** 8564,8571 **** { valid |= VALID_PATH; *usedlen += 2; /* FullName_save() is slow, don't use it when not needed. */ ! if (!vim_isAbsName(*fnamep)) { *fnamep = FullName_save(*fnamep, FALSE); vim_free(*bufp); /* free any allocated file name */ --- 8564,8590 ---- { valid |= VALID_PATH; *usedlen += 2; + + /* Expand "~/path" for all systems and "~user/path" for Unix and VMS */ + if ((*fnamep)[0] == '~' + #if !defined(UNIX) && !(defined(VMS) && defined(USER_HOME)) + && ((*fnamep)[1] == '/' + # ifdef BACKSLASH_IN_FILENAME + || (*fnamep)[1] == '\\' + # endif + || (*fnamep)[1] == NUL) + + #endif + ) + { + *fnamep = expand_env_save(*fnamep); + vim_free(*bufp); /* free any allocated file name */ + *bufp = *fnamep; + if (*fnamep == NULL) + return -1; + } /* FullName_save() is slow, don't use it when not needed. */ ! else if (!vim_isAbsName(*fnamep)) { *fnamep = FullName_save(*fnamep, FALSE); vim_free(*bufp); /* free any allocated file name */ *** ../vim60.113/src/version.c Mon Dec 31 17:47:49 2001 --- src/version.c Tue Jan 1 15:14:01 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 114, /**/ -- Microsoft's definition of a boolean: TRUE, FALSE, MAYBE "Embrace and extend"...? /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.115 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.115 (extra) Problem: Win32: When using a dialog with a textfield it cannot scroll the text. Solution: Add ES_AUTOHSCROLL to the textfield style. (Pedro Gomes) Files: src/gui_w32.c *** ../vim60.114/src/gui_w32.c Wed Sep 19 14:43:49 2001 --- src/gui_w32.c Tue Jan 1 19:23:08 2002 *************** *** 2626,2632 **** /* Edit box */ if (textfield != NULL) { ! p = add_dialog_element(p, ES_LEFT | WS_TABSTOP | WS_BORDER, PixelToDialogX(2 * dlgPaddingX), PixelToDialogY(2 * dlgPaddingY + msgheight), PixelToDialogX(dlgwidth - 4 * dlgPaddingX), --- 2626,2632 ---- /* Edit box */ if (textfield != NULL) { ! p = add_dialog_element(p, ES_LEFT|ES_AUTOHSCROLL|WS_TABSTOP|WS_BORDER, PixelToDialogX(2 * dlgPaddingX), PixelToDialogY(2 * dlgPaddingY + msgheight), PixelToDialogX(dlgwidth - 4 * dlgPaddingX), *** ../vim60.114/src/version.c Tue Jan 1 15:16:42 2002 --- src/version.c Tue Jan 1 19:24:13 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 115, /**/ -- When danger reared its ugly head, He bravely turned his tail and fled Yes, Brave Sir Robin turned about And gallantly he chickened out Bravely taking to his feet He beat a very brave retreat Bravest of the brave Sir Robin Petrified of being dead Soiled his pants then brave Sir Robin Turned away and fled. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.116 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.116 (extra) Problem: MS-Windows NT/2000/XP: filewritable() doesn't work correctly for filesystems that use ACLs. Solution: Use ACL functions to check if a file is writable. (Mike Williams) Files: src/eval.c, src/macros.h, src/os_win32.c, src/proto/os_win32.pro *** ../vim60.115/src/eval.c Tue Jan 1 15:16:42 2002 --- src/eval.c Tue Jan 1 20:50:07 2002 *************** *** 3412,3432 **** #endif p = get_var_string(&argvars[0]); ! #ifndef MACOS_CLASSIC /* TODO: get either mch_writable or mch_access */ ! #ifdef WIN3264 ! if (mch_writable(p)) ! #else ! # ifdef UNIX perm = mch_getperm(p); ! # endif if ( ! # ifdef UNIX ! (perm & 0222) && # endif ! mch_access((char *)p, W_OK) == 0 ) #endif - #endif { ++retval; if (mch_isdir(p)) --- 3412,3432 ---- #endif p = get_var_string(&argvars[0]); ! #ifdef UNIX perm = mch_getperm(p); ! #endif ! #ifndef MACOS_CLASSIC /* TODO: get either mch_writable or mch_access */ if ( ! # ifdef WIN3264 ! mch_writable(p) ! # else ! # ifdef UNIX ! (perm & 0222) ! # endif # endif ! && mch_access((char *)p, W_OK) == 0 ) #endif { ++retval; if (mch_isdir(p)) *** ../vim60.115/src/macros.h Sat Jul 28 22:50:57 2001 --- src/macros.h Tue Jan 1 20:52:19 2002 *************** *** 136,142 **** /* VMS does not have lstat() */ # define mch_stat(n, p) stat(vms_fixfilename(n), (p)) #else ! # define mch_access(n, p) access((n), (p)) # define mch_fopen(n, p) fopen((n), (p)) # define mch_fstat(n, p) fstat((n), (p)) # define mch_lstat(n, p) lstat((n), (p)) --- 136,144 ---- /* VMS does not have lstat() */ # define mch_stat(n, p) stat(vms_fixfilename(n), (p)) #else ! # ifndef WIN32 ! # define mch_access(n, p) access((n), (p)) ! # endif # define mch_fopen(n, p) fopen((n), (p)) # define mch_fstat(n, p) fstat((n), (p)) # define mch_lstat(n, p) lstat((n), (p)) *** ../vim60.115/src/os_win32.c Sun Nov 4 14:31:23 2001 --- src/os_win32.c Tue Jan 1 21:06:01 2002 *************** *** 90,103 **** --- 90,109 ---- */ #ifdef PROTO # define HANDLE int + # define PHANDLE int # define SMALL_RECT int # define COORD int # define SHORT int # define WORD int # define DWORD int + # define PDWORD int # define BOOL int + # define LPBOOL int # define LPSTR int # define LPTSTR int + # define LPCTSTR int + # define LPDWORD int + # define LPVOID int # define KEY_EVENT_RECORD int # define MOUSE_EVENT_RECORD int # define WINAPI *************** *** 119,124 **** --- 125,133 ---- # define COLORREF int # define HDC int # define LOGFONT int + # define TOKEN_INFORMATION_CLASS int + # define TRUSTEE int + # define ACCESS_MASK int #endif #ifndef FEAT_GUI_W32 *************** *** 317,322 **** --- 326,332 ---- DWORD g_PlatformId; #ifdef HAVE_ACL + # include /* * These are needed to dynamically load the ADVAPI DLL, which is not * implemented under Windows 95 (and causes VIM to crash) *************** *** 326,334 **** --- 336,358 ---- typedef DWORD (WINAPI *PGNSECINFO) (LPSTR, enum SE_OBJECT_TYPE, SECURITY_INFORMATION, PSID *, PSID *, PACL *, PACL *, PSECURITY_DESCRIPTOR *); + typedef BOOL (WINAPI *PGFILESEC) (LPCTSTR, SECURITY_INFORMATION, + PSECURITY_DESCRIPTOR, DWORD, LPDWORD); + typedef BOOL (WINAPI *PGSECDESCDACL) (PSECURITY_DESCRIPTOR, + LPBOOL, PACL *, LPBOOL); + typedef BOOL (WINAPI *POPENPROCTOK) (HANDLE, DWORD, PHANDLE); + typedef BOOL (WINAPI *PGTOKINFO) (HANDLE, TOKEN_INFORMATION_CLASS, + LPVOID, DWORD, PDWORD); + typedef DWORD (WINAPI *PGEFFRIGHTACL) (PACL, TRUSTEE *, ACCESS_MASK *); + static HANDLE advapi_lib = NULL; /* Handle for ADVAPI library */ static PSNSECINFO pSetNamedSecurityInfo; static PGNSECINFO pGetNamedSecurityInfo; + static PGFILESEC pGetFileSecurity; + static PGSECDESCDACL pGetSecurityDescriptorDacl; + static POPENPROCTOK pOpenProcessToken; + static PGTOKINFO pGetTokenInformation; + static PGEFFRIGHTACL pGetEffectiveRightsFromAcl; #endif /* *************** *** 370,377 **** "SetNamedSecurityInfoA"); pGetNamedSecurityInfo = (PGNSECINFO)GetProcAddress(advapi_lib, "GetNamedSecurityInfoA"); if (pSetNamedSecurityInfo == NULL ! || pGetNamedSecurityInfo == NULL) { /* If we can't get the function addresses, set advapi_lib * to NULL so that we don't use them. */ --- 394,415 ---- "SetNamedSecurityInfoA"); pGetNamedSecurityInfo = (PGNSECINFO)GetProcAddress(advapi_lib, "GetNamedSecurityInfoA"); + pGetFileSecurity = (PGFILESEC)GetProcAddress(advapi_lib, + "GetFileSecurityA"); + pGetSecurityDescriptorDacl = (PGSECDESCDACL)GetProcAddress(advapi_lib, + "GetSecurityDescriptorDacl"); + pOpenProcessToken = (POPENPROCTOK)GetProcAddress(advapi_lib, + "OpenProcessToken"); + pGetTokenInformation = (PGTOKINFO)GetProcAddress(advapi_lib, + "GetTokenInformation"); + pGetEffectiveRightsFromAcl = (PGEFFRIGHTACL)GetProcAddress(advapi_lib, + "GetEffectiveRightsFromAclA"); if (pSetNamedSecurityInfo == NULL ! || pGetNamedSecurityInfo == NULL ! || pGetFileSecurity == NULL ! || pGetSecurityDescriptorDacl == NULL ! || pOpenProcessToken == NULL ! || pGetTokenInformation == NULL) { /* If we can't get the function addresses, set advapi_lib * to NULL so that we don't use them. */ *************** *** 2368,2375 **** } #ifdef HAVE_ACL - # include - struct my_acl { PSECURITY_DESCRIPTOR pSecurityDescriptor; --- 2406,2411 ---- *************** *** 4000,4003 **** --- 4036,4134 ---- psz = "command.com"; return psz; + } + + /* NB: Not SACL_SECURITY_INFORMATION since we don't have enough privilege */ + #define MCH_ACCESS_SEC (OWNER_SECURITY_INFORMATION \ + |GROUP_SECURITY_INFORMATION \ + |DACL_SECURITY_INFORMATION) + + /* + * mch_access() extends access() to support ACLs under Windows NT/2K/XP(?) + * Does not support ACLs on NT 3.1/5 since the key function + * GetEffectiveRightsFromAcl() does not exist and implementing its + * functionality is a pain. + * Written by Mike Williams. + * Returns 0 if file "n" has access rights according to "p", -1 otherwise. + */ + int + mch_access(char *n, int p) + { + BOOL aclpresent; + BOOL aclDefault; + HANDLE hToken; + DWORD bytes; + TRUSTEE t; + ACCESS_MASK am; + ACCESS_MASK cm; + PACL pacl; + static DWORD sd_bytes = 0; + static SECURITY_DESCRIPTOR* psd = NULL; + static DWORD tu_bytes = 0; + static TOKEN_USER* ptu = NULL; + + #ifdef HAVE_ACL + /* Only check ACLs if on WinNT 4.0 or later - GetEffectiveRightsFromAcl() + * does not exist on NT before 4.0 */ + if (!mch_windows95() + && advapi_lib != NULL + && pGetEffectiveRightsFromAcl != NULL) + { + /* Get file ACL info */ + if (!pGetFileSecurity(n, MCH_ACCESS_SEC, psd, sd_bytes, &bytes)) + { + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return -1; + vim_free(psd); + psd = (SECURITY_DESCRIPTOR *)alloc(bytes); + if (psd == NULL) + { + sd_bytes = 0; + return -1; + } + sd_bytes = bytes; + if (!pGetFileSecurity(n, MCH_ACCESS_SEC, psd, sd_bytes, &bytes)) + return -1; + } + if (!pGetSecurityDescriptorDacl(psd, &aclpresent, &pacl, &aclDefault)) + return -1; + + /* Get user security info */ + if (!pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) + return -1; + if (!pGetTokenInformation(hToken, TokenUser, ptu, tu_bytes, &bytes)) + { + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return -1; + vim_free(ptu); + ptu = (TOKEN_USER *)alloc(bytes); + if (ptu == NULL) + { + tu_bytes = 0; + return -1; + } + tu_bytes = bytes; + if (!pGetTokenInformation(hToken, TokenUser, ptu, tu_bytes, &bytes)) + return -1; + } + + /* Lets see what user can do based on ACL */ + t.pMultipleTrustee = NULL; + t.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + t.TrusteeForm = TRUSTEE_IS_SID; + t.TrusteeType = TRUSTEE_IS_USER; + t.ptstrName = ptu->User.Sid; + if (pGetEffectiveRightsFromAcl(pacl, &t, &am) != ERROR_SUCCESS) + return -1; + + cm = 0; + cm |= (p & W_OK) ? FILE_WRITE_DATA : 0; + cm |= (p & R_OK) ? FILE_READ_DATA : 0; + + /* Check access mask against modes requested */ + if ((am & cm) != cm) + return -1; + } + #endif /* HAVE_ACL */ + return access(n, p); } *** ../vim60.115/src/proto/os_win32.pro Tue Sep 25 21:49:34 2001 --- src/proto/os_win32.pro Tue Jan 1 21:03:23 2002 *************** *** 42,45 **** --- 42,46 ---- long_u mch_avail_mem __ARGS((int special)); int mch_rename __ARGS((const char *pszOldFile, const char *pszNewFile)); char *default_shell __ARGS((void)); + int mch_access __ARGS((char *n, int p)); /* vim: set ft=c : */ *** ../vim60.115/src/version.c Tue Jan 1 20:29:44 2002 --- src/version.c Tue Jan 1 21:07:53 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 116, /**/ -- ZOOT: I'm afraid our life must seem very dull and quiet compared to yours. We are but eightscore young blondes, all between sixteen and nineteen-and-a-half, cut off in this castle, with no one to protect us. Oooh. It is a lonely life ... bathing ... dressing ... undressing ... making exciting underwear.... "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.117 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.117 (extra) Problem: Win32: when disabling the menu, "set lines=999" doesn't use all the available screen space. Solution: Don't subtract the fixed caption height but the real menu height from the available screen space. Also: Avoid recursion in gui_mswin_get_menu_height(). Files: src/gui_w32.c, src/gui_w48.c *** ../vim60.116/src/gui_w32.c Tue Jan 1 20:29:44 2002 --- src/gui_w32.c Tue Jan 1 22:24:54 2002 *************** *** 330,338 **** } if (fix_window && menu_height != old_menu_height) gui_set_shellsize(FALSE, FALSE); - old_menu_height = menu_height; return menu_height; } #endif /*FEAT_MENU*/ --- 330,340 ---- } if (fix_window && menu_height != old_menu_height) + { + old_menu_height = menu_height; gui_set_shellsize(FALSE, FALSE); + } return menu_height; } #endif /*FEAT_MENU*/ *** ../vim60.116/src/gui_w48.c Wed Sep 19 19:37:40 2001 --- src/gui_w48.c Tue Jan 1 22:59:35 2002 *************** *** 2368,2376 **** *screen_w = GetSystemMetrics(SM_CXSCREEN) - GetSystemMetrics(SM_CXFRAME) * 2; *screen_h = GetSystemMetrics(SM_CYFULLSCREEN) - GetSystemMetrics(SM_CYFRAME) * 2 ! - GetSystemMetrics(SM_CYCAPTION); } void --- 2368,2382 ---- *screen_w = GetSystemMetrics(SM_CXSCREEN) - GetSystemMetrics(SM_CXFRAME) * 2; + /* FIXME: dirty trick: Because the gui_get_base_height() doesn't include + * the menubar for MSwin, we subtract it from the screen height, so that + * the window size can be made to fit on the screen. */ *screen_h = GetSystemMetrics(SM_CYFULLSCREEN) - GetSystemMetrics(SM_CYFRAME) * 2 ! #ifdef FEAT_MENU ! - gui_mswin_get_menu_height(FALSE) ! #endif ! ; } void *** ../vim60.116/src/version.c Tue Jan 1 21:13:14 2002 --- src/version.c Tue Jan 1 23:05:01 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 117, /**/ -- GALAHAD hurries to the door and pushes through it. As he leaves the room we CUT TO the reverse to show that he is now in a room full of bathing and romping GIRLIES, all innocent, wide-eyed and beautiful. They smile enchantingly at him as he tries to keep walking without being diverted by the lovely sights assaulting his eyeballs. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.118 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.118 Problem: When $TMPDIR is a relative path, the temp directory is missing a trailing slash and isn't deleted when Vim exits. (Peter Holm) Solution: Add the slash after expanding the directory to an absolute path. Files: src/fileio.c *** ../vim60.117/src/fileio.c Mon Nov 5 21:01:58 2001 --- src/fileio.c Wed Jan 2 17:03:40 2002 *************** *** 5371,5386 **** #endif if (r == 0) { ! /* Directory was created, use this name. */ # ifdef __EMX__ ! if (vim_strchr(itmp, '/') != NULL) ! STRCAT(itmp, "/"); ! else # endif ! add_pathsep(itmp); ! /* Use the full path; When using the current directory ! * a ":cd" would confuse us. */ ! vim_tempdir = FullName_save(itmp, FALSE); break; } # ifdef EEXIST --- 5371,5396 ---- #endif if (r == 0) { ! char_u *buf; ! ! /* Directory was created, use this name. ! * Expand to full path; When using the current ! * directory a ":cd" would confuse us. */ ! buf = alloc((unsigned)MAXPATHL + 1); ! if (buf != NULL) ! { ! if (vim_FullName(itmp, buf, MAXPATHL, FALSE) ! == FAIL) ! STRCPY(buf, itmp); # ifdef __EMX__ ! if (vim_strchr(buf, '/') != NULL) ! STRCAT(buf, "/"); ! else # endif ! add_pathsep(buf); ! vim_tempdir = vim_strsave(buf); ! vim_free(buf); ! } break; } # ifdef EEXIST *** ../vim60.117/src/version.c Tue Jan 1 23:08:31 2002 --- src/version.c Wed Jan 2 17:07:07 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 118, /**/ -- "My particular problem is with registry entries, which seem to just accumulate like plastic coffee cups..." -- Paul Moore /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.119 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.119 (depends on patch 6.0.116) Problem: VMS: filewritable() doesn't work properly. Solution: Use the same method as for Unix. (Zoltan Arpadffy) Files: src/eval.c *** ../vim60.118/src/eval.c Tue Jan 1 21:13:14 2002 --- src/eval.c Mon Jan 7 14:04:48 2002 *************** *** 3407,3418 **** { char_u *p; int retval = 0; ! #ifdef UNIX int perm = 0; #endif p = get_var_string(&argvars[0]); ! #ifdef UNIX perm = mch_getperm(p); #endif #ifndef MACOS_CLASSIC /* TODO: get either mch_writable or mch_access */ --- 3407,3418 ---- { char_u *p; int retval = 0; ! #if defined(UNIX) || defined(VMS) int perm = 0; #endif p = get_var_string(&argvars[0]); ! #if defined(UNIX) || defined(VMS) perm = mch_getperm(p); #endif #ifndef MACOS_CLASSIC /* TODO: get either mch_writable or mch_access */ *************** *** 3420,3426 **** # ifdef WIN3264 mch_writable(p) # else ! # ifdef UNIX (perm & 0222) # endif # endif --- 3420,3426 ---- # ifdef WIN3264 mch_writable(p) # else ! # if defined(UNIX) || defined(VMS) (perm & 0222) # endif # endif *** ../vim60.118/src/version.c Wed Jan 2 17:10:11 2002 --- src/version.c Mon Jan 7 14:04:55 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 119, /**/ -- [Autumn changed into Winter ... Winter changed into Spring ... Spring changed back into Autumn and Autumn gave Winter and Spring a miss and went straight on into Summer ... Until one day ...] "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.120 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.120 Problem: The conversion to html isn't compatible with XHTML. Solution: Quote the values. (Jess Thrysoee) Files: runtime/syntax/2html.vim *** ../vim60.119/runtime/syntax/2html.vim Sun Sep 2 14:43:04 2001 --- runtime/syntax/2html.vim Mon Jan 7 22:24:33 2002 *************** *** 1,6 **** " Vim syntax support file " Maintainer: Bram Moolenaar ! " Last Change: 2001 Sep 02 " (modified by David Ne\v{c}as (Yeti) ) " Transform a file into HTML, using the current syntax highlighting. --- 1,6 ---- " Vim syntax support file " Maintainer: Bram Moolenaar ! " Last Change: 2001 Dec 12 " (modified by David Ne\v{c}as (Yeti) ) " Transform a file into HTML, using the current syntax highlighting. *************** *** 71,77 **** let x = s:HtmlColor(synIDattr(a:id, "fg#", s:whatterm)) let a = a . '' let x = s:HtmlColor(synIDattr(a:id, "bg#", s:whatterm)) ! let a = a . '' else let x = s:HtmlColor(synIDattr(a:id, "bg#", s:whatterm)) if x != "" | let a = a . '' | endif --- 71,77 ---- let x = s:HtmlColor(synIDattr(a:id, "fg#", s:whatterm)) let a = a . '' let x = s:HtmlColor(synIDattr(a:id, "bg#", s:whatterm)) ! let a = a . '' else let x = s:HtmlColor(synIDattr(a:id, "bg#", s:whatterm)) if x != "" | let a = a . '' | endif *************** *** 184,190 **** let s:new = "" if s:numblines ! let s:new = '' . strpart(' ', 0, strlen(line("$")) - strlen(s:lnum)) . s:lnum . ' ' endif " Loop over each character in the line --- 184,190 ---- let s:new = "" if s:numblines ! let s:new = '' . strpart(' ', 0, strlen(line("$")) - strlen(s:lnum)) . s:lnum . ' ' endif " Loop over each character in the line *************** *** 199,205 **** " Output the text with the same synID, with class set to c{s:id} let s:id = synIDtrans(s:id) ! let s:new = s:new . '' . substitute(substitute(substitute(substitute(substitute(strpart(s:line, s:startcol - 1, s:col - s:startcol), '&', '\&', 'g'), '<', '\<', 'g'), '>', '\>', 'g'), '"', '\"', 'g'), "\x0c", '
', 'g') . '' " Add the class to class list if it's not there yet if stridx(s:idlist, "," . s:id . ",") == -1 let s:idlist = s:idlist . s:id . "," --- 199,205 ---- " Output the text with the same synID, with class set to c{s:id} let s:id = synIDtrans(s:id) ! let s:new = s:new . '' . substitute(substitute(substitute(substitute(substitute(strpart(s:line, s:startcol - 1, s:col - s:startcol), '&', '\&', 'g'), '<', '\<', 'g'), '>', '\>', 'g'), '"', '\"', 'g'), "\x0c", '
', 'g') . '' " Add the class to class list if it's not there yet if stridx(s:idlist, "," . s:id . ",") == -1 let s:idlist = s:idlist . s:id . "," *************** *** 252,258 **** if exists("html_use_css") execute "normal A\n.lnr { " . s:CSS1(highlightID("LineNr")) . "}\e" else ! execute '%s+\([^<]*\)+' . s:HtmlOpening(highlightID("LineNr")) . '\1' . s:HtmlClosing(highlightID("LineNr")) . '+g' endif endif --- 252,258 ---- if exists("html_use_css") execute "normal A\n.lnr { " . s:CSS1(highlightID("LineNr")) . "}\e" else ! execute '%s+\([^<]*\)+' . s:HtmlOpening(highlightID("LineNr")) . '\1' . s:HtmlClosing(highlightID("LineNr")) . '+g' endif endif *************** *** 270,279 **** if exists("html_use_css") execute "normal A\n.c" . s:id . " { " . s:attr . "}" else ! execute '%s+\([^<]*\)+' . s:HtmlOpening(s:id) . '\1' . s:HtmlClosing(s:id) . '+g' endif else ! execute '%s+\([^<]*\)+\1+g' 8 endif endwhile --- 270,279 ---- if exists("html_use_css") execute "normal A\n.c" . s:id . " { " . s:attr . "}" else ! execute '%s+\([^<]*\)+' . s:HtmlOpening(s:id) . '\1' . s:HtmlClosing(s:id) . '+g' endif else ! execute '%s+\([^<]*\)+\1+g' 8 endif endwhile *** ../vim60.119/src/version.c Mon Jan 7 14:08:11 2002 --- src/version.c Mon Jan 7 22:30:22 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 120, /**/ -- BEDEVERE: Look! It's the old man from scene 24 - what's he Doing here? ARTHUR: He is the keeper of the Bridge. He asks each traveler five questions ... GALAHAD: Three questions. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.121 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.121 (extra) (depends on patch 6.0.116) Problem: Win32: After patch 6.0.116 Vim doesn't compile with mingw32. Solution: Add an #ifdef HAVE_ACL. Files: src/os_win32.c *** ../vim60.120/src/os_win32.c Tue Jan 1 21:13:14 2002 --- src/os_win32.c Sat Jan 5 13:29:06 2002 *************** *** 4058,4064 **** --- 4058,4066 ---- BOOL aclDefault; HANDLE hToken; DWORD bytes; + #ifdef HAVE_ACL TRUSTEE t; + #endif ACCESS_MASK am; ACCESS_MASK cm; PACL pacl; *** ../vim60.120/src/version.c Mon Jan 7 22:34:19 2002 --- src/version.c Wed Jan 9 10:01:38 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 121, /**/ -- Snoring is prohibited unless all bedroom windows are closed and securely locked. [real standing law in Massachusetts, United States of America] /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.122 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.122 (extra) Problem: Win16: Same resize problems as patch 6.0.117 fixed for Win32. And dialog textfield problem from patch 6.0.115. Solution: Set old_menu_height only when used. Add ES_AUTOHSCROLL flag. (Vince Negri) Files: src/gui_w16.c *** ../vim60.121/src/gui_w16.c Wed Sep 19 14:44:12 2001 --- src/gui_w16.c Wed Jan 9 16:17:08 2002 *************** *** 123,131 **** } if (fix_window && menu_height != old_menu_height) gui_set_shellsize(FALSE, FALSE); - old_menu_height = menu_height; return menu_height; } #endif /*FEAT_MENU*/ --- 123,133 ---- } if (fix_window && menu_height != old_menu_height) + { + old_menu_height = menu_height; gui_set_shellsize(FALSE, FALSE); + } return menu_height; } #endif /*FEAT_MENU*/ *************** *** 1481,1487 **** /* Edit box */ if (textfield != NULL) { ! p = add_dialog_element(p, ES_LEFT | WS_TABSTOP | WS_BORDER, PixelToDialogX(2 * dlgPaddingX), PixelToDialogY(2 * dlgPaddingY + msgheight), PixelToDialogX(dlgwidth - 4 * dlgPaddingX), --- 1483,1489 ---- /* Edit box */ if (textfield != NULL) { ! p = add_dialog_element(p, ES_LEFT | ES_AUTOHSCROLL | WS_TABSTOP | WS_BORDER, PixelToDialogX(2 * dlgPaddingX), PixelToDialogY(2 * dlgPaddingY + msgheight), PixelToDialogX(dlgwidth - 4 * dlgPaddingX), *** ../vim60.121/src/version.c Wed Jan 9 16:08:19 2002 --- src/version.c Wed Jan 9 16:18:48 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 122, /**/ -- It is illegal to take more than three sips of beer at a time while standing. [real standing law in Texas, United States of America] /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.123 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.123 (depends on patch 6.0.119) Problem: Win16: Compilation problems. Solution: Move "&&" to other lines. (Vince Negri) Files: src/eval.c *** ../vim60.122/src/eval.c Mon Jan 7 14:08:11 2002 --- src/eval.c Wed Jan 9 16:18:38 2002 *************** *** 3418,3430 **** #ifndef MACOS_CLASSIC /* TODO: get either mch_writable or mch_access */ if ( # ifdef WIN3264 ! mch_writable(p) # else # if defined(UNIX) || defined(VMS) ! (perm & 0222) # endif # endif ! && mch_access((char *)p, W_OK) == 0 ) #endif { --- 3418,3430 ---- #ifndef MACOS_CLASSIC /* TODO: get either mch_writable or mch_access */ if ( # ifdef WIN3264 ! mch_writable(p) && # else # if defined(UNIX) || defined(VMS) ! (perm & 0222) && # endif # endif ! mch_access((char *)p, W_OK) == 0 ) #endif { *** ../vim60.122/src/version.c Wed Jan 9 16:23:13 2002 --- src/version.c Wed Jan 9 16:23:31 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 123, /**/ -- "Software is like sex... it's better when it's free." -- Linus Torvalds, initiator of the free Linux OS Makes me wonder what FSF stands for...? /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.124 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.124 Problem: When using a ":substitute" command that starts with "\=" (evaluated as an expression), "~" was still replaced with the previous substitute string. Solution: Skip the replacement when the substitute string starts with "\=". Also adjust the documentation about doubling backslashes. Files: src/ex_cmds.c, runtime/doc/change.txt *** ../vim60.123/src/ex_cmds.c Wed Dec 12 21:42:23 2001 --- src/ex_cmds.c Thu Jan 10 19:27:31 2002 *************** *** 3548,3555 **** /* * ~ in the substitute pattern is replaced with the old pattern. * We do it here once to avoid it to be replaced over and over again. */ ! sub = regtilde(sub, p_magic); /* * Check for a match on each line. --- 3548,3557 ---- /* * ~ in the substitute pattern is replaced with the old pattern. * We do it here once to avoid it to be replaced over and over again. + * But don't do it when it starts with "\=", then it's an expression. */ ! if (!(sub[0] == '\\' && sub[1] == '=')) ! sub = regtilde(sub, p_magic); /* * Check for a match on each line. *** ../vim60.123/runtime/doc/change.txt Tue Sep 25 21:40:33 2001 --- runtime/doc/change.txt Thu Jan 10 19:37:10 2002 *************** *** 1,4 **** ! *change.txt* For Vim version 6.0. Last change: 2001 Sep 11 VIM REFERENCE MANUAL by Bram Moolenaar --- 1,4 ---- ! *change.txt* For Vim version 6.0. Last change: 2002 Jan 10 VIM REFERENCE MANUAL by Bram Moolenaar *************** *** 640,651 **** *sub-replace-special* When the {string} starts with "\=" it is evaluated as an expression. The ! special meaning for characters as mentioned below does not apply then. ! The whole matched text can be accessed with "submatch(0)". The text matched ! with the first pair of () with "submatch(1)". Likewise for further sub-matches in (). ! Be careful: The separation character must not appear in the expression! ! Consider using a character like "@" or "|". Example: > :s@\n@\="\r" . expand("$HOME") . "\r"@ This replaces an end-of-line with a new line containing the value of $HOME. --- 640,655 ---- *sub-replace-special* When the {string} starts with "\=" it is evaluated as an expression. The ! special meaning for characters as mentioned below does not apply then, except ! "", "\" and "\\". Thus in the result of the expression you need to ! use two backslashes get one, put a backslash before a you want to insert ! and use a without a backslash where you want to break the line. ! The whole matched text can be accessed with "submatch(0)". The text ! matched with the first pair of () with "submatch(1)". Likewise for further sub-matches in (). ! Be careful: The separation character must not appear in the expression! ! Consider using a character like "@" or "|". There is no problem if the result ! of the expression contains the separation character. Example: > :s@\n@\="\r" . expand("$HOME") . "\r"@ This replaces an end-of-line with a new line containing the value of $HOME. *************** *** 663,671 **** ~ \~ replaced with the {string} of the previous substitute \~ ~ replaced with ~ \u next character made uppercase ! \U following characters made uppercase \l next character made lowercase ! \L following characters made lowercase \e end of \u, \U, \l and \L (NOTE: not !) \E end of \u, \U, \l and \L split line in two at this point (Type the as CTRL-V --- 667,675 ---- ~ \~ replaced with the {string} of the previous substitute \~ ~ replaced with ~ \u next character made uppercase ! \U following characters made uppercase, until \E \l next character made lowercase ! \L following characters made lowercase, until \E \e end of \u, \U, \l and \L (NOTE: not !) \E end of \u, \U, \l and \L split line in two at this point (Type the as CTRL-V *** ../vim60.123/src/version.c Wed Jan 9 16:29:27 2002 --- src/version.c Thu Jan 10 19:38:14 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 124, /**/ -- A M00se once bit my sister ... "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.125 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.125 (extra) Problem: Win32: When using the multi_byte_ime feature pressing the shift key would be handled as if a character was entered, thus mappings with a shifted key didn't work. (Charles Campbell) Solution: Ignore pressing the shift, control and alt keys. Files: src/os_win32.c *** ../vim60.124/src/os_win32.c Wed Jan 9 16:08:19 2002 --- src/os_win32.c Thu Jan 10 21:12:05 2002 *************** *** 1157,1180 **** if (cRecords > 0) { - #ifdef FEAT_MBYTE_IME - /* Windows IME sends two '\n's with only one 'ENTER'. - first, wVirtualKeyCode == 13. second, wVirtualKeyCode == 0 */ if (ir.EventType == KEY_EVENT && ir.Event.KeyEvent.bKeyDown) { if (ir.Event.KeyEvent.uChar.UnicodeChar == 0 && ir.Event.KeyEvent.wVirtualKeyCode == 13) { ReadConsoleInput(g_hConIn, &ir, 1, &cRecords); continue; } - return decode_key_event(&ir.Event.KeyEvent, &ch, &ch2, FALSE); - } - #else - if (ir.EventType == KEY_EVENT && ir.Event.KeyEvent.bKeyDown - && decode_key_event(&ir.Event.KeyEvent, &ch, &ch2, FALSE)) - return TRUE; #endif ReadConsoleInput(g_hConIn, &ir, 1, &cRecords); --- 1157,1177 ---- if (cRecords > 0) { if (ir.EventType == KEY_EVENT && ir.Event.KeyEvent.bKeyDown) { + #ifdef FEAT_MBYTE_IME + /* Windows IME sends two '\n's with only one 'ENTER'. First: + * wVirtualKeyCode == 13. second: wVirtualKeyCode == 0 */ if (ir.Event.KeyEvent.uChar.UnicodeChar == 0 && ir.Event.KeyEvent.wVirtualKeyCode == 13) { ReadConsoleInput(g_hConIn, &ir, 1, &cRecords); continue; } #endif + if (decode_key_event(&ir.Event.KeyEvent, &ch, &ch2, FALSE)) + return TRUE; + } ReadConsoleInput(g_hConIn, &ir, 1, &cRecords); *** ../vim60.124/src/version.c Thu Jan 10 20:17:24 2002 --- src/version.c Thu Jan 10 21:14:22 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 125, /**/ -- Mynd you, m00se bites Kan be pretty nasti ... "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.126 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.126 Problem: The python library was always statically linked. Solution: Link the python library dynamically. (Matthias Klose) Files: src/auto/configure, src/configure.in *** ../vim60.125/src/configure.in Thu Nov 1 12:22:41 2001 --- src/configure.in Fri Jan 11 12:39:19 2002 *************** *** 332,338 **** if test "${vi_cv_var_python_version}" = "1.4"; then vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a" else ! vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libpython${vi_cv_var_python_version}.a" fi vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS}" dnl remove -ltermcap, it can conflict with an earlier -lncurses --- 336,342 ---- if test "${vi_cv_var_python_version}" = "1.4"; then vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a" else ! vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" fi vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS}" dnl remove -ltermcap, it can conflict with an earlier -lncurses *** ../vim60.125/src/auto/configure Thu Nov 1 12:22:41 2001 --- src/auto/configure Fri Jan 11 12:39:44 2002 *************** *** 1586,1592 **** if test "${vi_cv_var_python_version}" = "1.4"; then vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a" else ! vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libpython${vi_cv_var_python_version}.a" fi vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS}" vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` --- 1590,1596 ---- if test "${vi_cv_var_python_version}" = "1.4"; then vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a" else ! vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" fi vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS}" vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` *** ../vim60.125/src/version.c Thu Jan 10 21:23:57 2002 --- src/version.c Fri Jan 11 13:00:42 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 126, /**/ -- If you don't get everything you want, think of everything you didn't get and don't want. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.127 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.127 Problem: When using a terminal that swaps screens and the Normal background color has a different background, using an external command may cause the color of the wrong screen to be changed. (Mark Waggoner) Solution: Don't call screen_stop_highlight() in stoptermcap(). Files: src/term.c *** ../vim60.126/src/term.c Sun Nov 4 18:45:17 2001 --- src/term.c Fri Jan 11 20:49:29 2002 *************** *** 3132,3138 **** void starttermcap() { - screen_stop_highlight(); if (full_screen && !termcap_active) { out_str(T_TI); /* start termcap mode */ --- 3132,3137 ---- *** ../vim60.126/src/version.c Fri Jan 11 13:03:17 2002 --- src/version.c Fri Jan 11 20:49:38 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 127, /**/ -- ARTHUR: ... and I am your king .... OLD WOMAN: Ooooh! I didn't know we had a king. I thought we were an autonomous collective ... "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.128 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.128 Problem: When moving a vertically split window to the far left or right, the scrollbars are not adjusted. (Scott E Lee) When 'mousefocus' is set the mouse pointer wasn't adjusted. Solution: Adjust the scrollbars and the mouse pointer. Files: src/window.c *** ../vim60.127/src/window.c Sun Dec 30 22:32:00 2001 --- src/window.c Sat Jan 12 16:15:08 2002 *************** *** 1422,1430 **** #if defined(FEAT_GUI) && defined(FEAT_VERTSPLIT) /* When 'guioptions' includes 'L' or 'R' may have to remove or add ! * scrollbars. */ if (gui.in_use) gui_init_which_components(NULL); #endif } --- 1422,1434 ---- #if defined(FEAT_GUI) && defined(FEAT_VERTSPLIT) /* When 'guioptions' includes 'L' or 'R' may have to remove or add ! * scrollbars. Have to update them anyway. */ if (gui.in_use) + { gui_init_which_components(NULL); + gui_update_scrollbars(TRUE); + } + need_mouse_correct = TRUE; #endif } *** ../vim60.127/src/version.c Fri Jan 11 20:54:04 2002 --- src/version.c Sat Jan 12 16:17:09 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 128, /**/ -- ARTHUR: What are you going to do. bleed on me? "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.129 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.129 Problem: When using a very long file name, ":ls" (repeated a few times) causes a crash. Test with "vim `perl -e 'print "A"x1000'`". (Tejeda) Solution: Terminate a string before getting its length in buflist_list(). Files: src/buffer.c *** ../vim60.128/src/buffer.c Wed Sep 19 12:37:17 2001 --- src/buffer.c Sat Jan 12 16:35:12 2002 *************** *** 2091,2096 **** --- 2091,2097 ---- len = (int)STRLEN(IObuff); STRNCPY(IObuff + len, NameBuff, IOSIZE - 20 - len); + IObuff[IOSIZE - 20 - len] = NUL; /* make sure it's terminated */ len = (int)STRLEN(IObuff); IObuff[len++] = '"'; *** ../vim60.128/src/version.c Sat Jan 12 16:22:05 2002 --- src/version.c Sat Jan 12 16:39:02 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 129, /**/ -- BLACK KNIGHT: I'm invincible! ARTHUR: You're a looney. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.130 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.130 Problem: When using ":cprev" while the error window is open, and the new line at the top wraps, the window isn't correctly drawn. (Yegappan Lakshmanan) Solution: When redrawing the topline don't scroll twice. Files: src/screen.c *** ../vim60.129/src/screen.c Sun Dec 30 21:41:24 2001 --- src/screen.c Sun Jan 13 20:33:11 2002 *************** *** 944,950 **** #endif ) { ! if (buf->b_mod_set && wp->w_topline == mod_top) { /* * w_topline is the first changed line, the scrolling will be done --- 944,950 ---- #endif ) { ! if (mod_top != 0 && wp->w_topline == mod_top) { /* * w_topline is the first changed line, the scrolling will be done *** ../vim60.129/src/version.c Sat Jan 12 16:39:27 2002 --- src/version.c Sun Jan 13 20:38:54 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 130, /**/ -- It is too bad that the speed of light hasn't kept pace with the changes in CPU speed and network bandwidth. -- /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.131 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.131 Problem: When using bufname() and there are two matches for listed buffers and one match for an unlisted buffer, the unlisted buffer is used. (Aric Blumer) Solution: When there is a match with a listed buffer, don't check for unlisted buffers. Files: src/buffer.c *** ../vim60.130/src/buffer.c Sat Jan 12 16:39:27 2002 --- src/buffer.c Mon Jan 14 12:43:09 2002 *************** *** 1636,1646 **** } /* ! * Try four ways of matching: * attempt == 0: without '^' or '$' (at any position) * attempt == 1: with '^' at start (only at postion 0) * attempt == 2: with '$' at end (only match at end) * attempt == 3: with '^' at start and '$' at end (only full match) */ else { --- 1636,1648 ---- } /* ! * Try four ways of matching a listed buffer: * attempt == 0: without '^' or '$' (at any position) * attempt == 1: with '^' at start (only at postion 0) * attempt == 2: with '$' at end (only match at end) * attempt == 3: with '^' at start and '$' at end (only full match) + * Repeat this for finding an unlisted buffer if there was no matching + * listed buffer. */ else { *************** *** 1650,1675 **** patend = pat + STRLEN(pat) - 1; toggledollar = (patend > pat && *patend == '$'); ! for (attempt = 0; attempt <= 3; ++attempt) { ! /* may add '^' and '$' */ ! if (toggledollar) ! *patend = (attempt < 2) ? NUL : '$'; /* add/remove '$' */ ! p = pat; ! if (*p == '^' && !(attempt & 1)) /* add/remove '^' */ ! ++p; ! prog = vim_regcomp(p, (int)p_magic); ! if (prog == NULL) { ! vim_free(pat); ! return -1; ! } - /* First try finding a listed buffer, if not found and "unlisted" - * is TRUE, try finding an unlisted buffer. */ - find_listed = TRUE; - for (;;) - { for (buf = firstbuf; buf != NULL; buf = buf->b_next) if (buf->b_p_bl == find_listed #ifdef FEAT_DIFF --- 1652,1677 ---- patend = pat + STRLEN(pat) - 1; toggledollar = (patend > pat && *patend == '$'); ! /* First try finding a listed buffer. If not found and "unlisted" ! * is TRUE, try finding an unlisted buffer. */ ! find_listed = TRUE; ! for (;;) { ! for (attempt = 0; attempt <= 3; ++attempt) { ! /* may add '^' and '$' */ ! if (toggledollar) ! *patend = (attempt < 2) ? NUL : '$'; /* add/remove '$' */ ! p = pat; ! if (*p == '^' && !(attempt & 1)) /* add/remove '^' */ ! ++p; ! prog = vim_regcomp(p, (int)p_magic); ! if (prog == NULL) ! { ! vim_free(pat); ! return -1; ! } for (buf = firstbuf; buf != NULL; buf = buf->b_next) if (buf->b_p_bl == find_listed #ifdef FEAT_DIFF *************** *** 1684,1698 **** } match = buf->b_fnum; /* remember first match */ } ! if (!unlisted || !find_listed || match >= 0) break; - find_listed = FALSE; } ! vim_free(prog); ! if (match >= 0) /* found one match */ break; } vim_free(pat); } --- 1686,1704 ---- } match = buf->b_fnum; /* remember first match */ } ! ! vim_free(prog); ! if (match >= 0) /* found one match */ break; } ! /* Only search for unlisted buffers if there was no match with ! * a listed buffer. */ ! if (!unlisted || !find_listed || match != -1) break; + find_listed = FALSE; } + vim_free(pat); } *** ../vim60.130/src/version.c Sun Jan 13 20:44:03 2002 --- src/version.c Mon Jan 14 12:46:18 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 131, /**/ -- Are leaders born or made? And if they're made, can we return them under warranty? (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.132 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.132 Problem: When setting 'iminsert' in the vimrc and using an xterm with two screens the ruler is drawn in the wrong screen. (Igor Goldenberg) Solution: Only draw the ruler when using the right screen. Files: src/option.c *** ../vim60.131/src/option.c Mon Nov 5 12:51:06 2001 --- src/option.c Tue Jan 15 13:53:02 2002 *************** *** 6021,6027 **** curbuf->b_p_iminsert = B_IMODE_NONE; } p_iminsert = curbuf->b_p_iminsert; ! showmode(); #if defined(FEAT_WINDOWS) && defined(FEAT_KEYMAP) /* Show/unshow value of 'keymap' in status lines. */ status_redraw_curbuf(); --- 6021,6028 ---- curbuf->b_p_iminsert = B_IMODE_NONE; } p_iminsert = curbuf->b_p_iminsert; ! if (termcap_active) /* don't do this in the alternate screen */ ! showmode(); #if defined(FEAT_WINDOWS) && defined(FEAT_KEYMAP) /* Show/unshow value of 'keymap' in status lines. */ status_redraw_curbuf(); *** ../vim60.131/src/version.c Mon Jan 14 12:49:05 2002 --- src/version.c Tue Jan 15 13:54:57 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 132, /**/ -- Engineers are widely recognized as superior marriage material: intelligent, dependable, employed, honest, and handy around the house. (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.133 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.133 Problem: When opening another buffer while 'keymap' is set and 'iminsert' is zero, 'iminsert' is set to one unexpectedly. (Igor Goldenberg) Solution: Don't set 'iminsert' as a side effect of defining a ":lmap" mapping. Only do that when 'keymap' is set. Files: src/getchar.c, src/option.c *** ../vim60.132/src/getchar.c Fri Nov 2 16:29:44 2001 --- src/getchar.c Tue Jan 15 14:13:21 2002 *************** *** 2916,2934 **** if (!haskey || (maptype != 1 && !hasarg)) msg_start(); - /* When definding a ":lmap" switch on using them. */ - if (hasarg && maptype != 1 && mode == LANGMAP) - { - curbuf->b_p_iminsert = B_IMODE_LMAP; - if (curbuf->b_p_imsearch != B_IMODE_USE_INSERT) - curbuf->b_p_imsearch = B_IMODE_LMAP; - set_iminsert_global(); - set_imsearch_global(); - #ifdef FEAT_WINDOWS - status_redraw_curbuf(); - #endif - } - #ifdef FEAT_LOCALMAP /* * Check if a new local mapping wasn't already defined globally. --- 2916,2921 ---- *** ../vim60.132/src/option.c Tue Jan 15 13:56:47 2002 --- src/option.c Tue Jan 15 14:24:07 2002 *************** *** 4503,4508 **** --- 4503,4521 ---- { /* load or unload key mapping tables */ errmsg = keymap_init(); + + /* When successfully installed a new keymap switch on using it. */ + if (*curbuf->b_p_keymap != NUL && errmsg == NULL) + { + curbuf->b_p_iminsert = B_IMODE_LMAP; + if (curbuf->b_p_imsearch != B_IMODE_USE_INSERT) + curbuf->b_p_imsearch = B_IMODE_LMAP; + set_iminsert_global(); + set_imsearch_global(); + # ifdef FEAT_WINDOWS + status_redraw_curbuf(); + # endif + } } #endif *** ../vim60.132/src/version.c Tue Jan 15 13:56:47 2002 --- src/version.c Tue Jan 15 14:19:25 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 133, /**/ -- An alien life briefly visits earth. Just before departing it leaves a message in the dust on the back of a white van. The world is shocked and wants to know what it means. After months of studies the worlds best linguistic scientists are able to decipher the message: "Wash me!". /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.134 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.134 Problem: When completing ":set tags=" a path with an embedded space causes the completion to stop. (Sektor van Skijlen) Solution: Escape spaces with backslashes, like for ":set path=". Also take backslashes into account when searching for the start of the path to complete (e.g., for 'backupdir' and 'cscopeprg'). Files: src/ex_docmd.c, src/ex_getln.c, src/option.c, src/structs.h *** ../vim60.133/src/ex_docmd.c Mon Dec 31 17:47:49 2001 --- src/ex_docmd.c Wed Jan 2 13:08:49 2002 *************** *** 2153,2159 **** xp->xp_pattern = buff; xp->xp_context = EXPAND_COMMANDS; /* Default until we get past command */ ! xp->xp_set_path = FALSE; /* * 2. skip comment lines and leading space, colons or bars --- 2153,2159 ---- xp->xp_pattern = buff; xp->xp_context = EXPAND_COMMANDS; /* Default until we get past command */ ! xp->xp_backslash = XP_BS_NONE; /* * 2. skip comment lines and leading space, colons or bars *** ../vim60.133/src/ex_getln.c Wed Oct 31 20:51:33 2001 --- src/ex_getln.c Wed Jan 2 13:22:16 2002 *************** *** 2605,2611 **** for (i = 0; i < numfiles; ++i) { /* for ":set path=" we need to escape spaces twice */ ! if (xp->xp_set_path) { p = vim_strsave_escaped(files[i], (char_u *)" "); if (p != NULL) --- 2605,2611 ---- for (i = 0; i < numfiles; ++i) { /* for ":set path=" we need to escape spaces twice */ ! if (xp->xp_backslash == XP_BS_THREE) { p = vim_strsave_escaped(files[i], (char_u *)" "); if (p != NULL) *************** *** 2643,2649 **** } } } ! xp->xp_set_path = FALSE; } else if (xp->xp_context == EXPAND_TAGS) { --- 2643,2649 ---- } } } ! xp->xp_backslash = XP_BS_NONE; } else if (xp->xp_context == EXPAND_TAGS) { *************** *** 3103,3138 **** if (options & WILD_SILENT) flags |= EW_SILENT; ! if (xp->xp_context == EXPAND_FILES) { /* ! * Expand file names. ! */ ! return expand_wildcards(1, &pat, num_file, file, flags|EW_FILE); ! } ! else if (xp->xp_context == EXPAND_DIRECTORIES) ! { ! /* ! * Expand directory names. */ int free_pat = FALSE; int i; ! /* for ":set path=" we need to remove backslashes for escaped space */ ! if (xp->xp_set_path) { free_pat = TRUE; pat = vim_strsave(pat); for (i = 0; pat[i]; ++i) ! if (pat[i] == '\\' ! && pat[i + 1] == '\\' ! && pat[i + 2] == '\\' ! && pat[i + 3] == ' ') ! STRCPY(pat + i, pat + i + 3); } ! ret = expand_wildcards(1, &pat, num_file, file, ! (flags | EW_DIR) & ~EW_FILE); if (free_pat) vim_free(pat); return ret; --- 3103,3141 ---- if (options & WILD_SILENT) flags |= EW_SILENT; ! if (xp->xp_context == EXPAND_FILES || xp->xp_context == EXPAND_DIRECTORIES) { /* ! * Expand file or directory names. */ int free_pat = FALSE; int i; ! /* for ":set path=" and ":set tags=" halve backslashes for escaped ! * space */ ! if (xp->xp_backslash != XP_BS_NONE) { free_pat = TRUE; pat = vim_strsave(pat); for (i = 0; pat[i]; ++i) ! if (pat[i] == '\\') ! { ! if (xp->xp_backslash == XP_BS_THREE ! && pat[i + 1] == '\\' ! && pat[i + 2] == '\\' ! && pat[i + 3] == ' ') ! STRCPY(pat + i, pat + i + 3); ! if (xp->xp_backslash == XP_BS_ONE ! && pat[i + 1] == ' ') ! STRCPY(pat + i, pat + i + 1); ! } } ! if (xp->xp_context == EXPAND_FILES) ! flags |= EW_FILE; ! else ! flags = (flags | EW_DIR) & ~EW_FILE; ! ret = expand_wildcards(1, &pat, num_file, file, flags); if (free_pat) vim_free(pat); return ret; *** ../vim60.133/src/option.c Tue Jan 15 14:28:35 2002 --- src/option.c Tue Jan 15 14:24:07 2002 *************** *** 7603,7609 **** int opt_idx = 0; /* init for GCC */ char_u *p; char_u *s; - char_u *after_blank = NULL; int is_term_option = FALSE; int key; --- 7603,7608 ---- *************** *** 7636,7646 **** ++p; break; } - /* remember possible start of file name to expand */ - if (after_blank == NULL - && ((*p == ' ' && (p - s) < 2) - || (*p == ',' && p == s))) - after_blank = p + 1; --p; } if (STRNCMP(p, "no", 2) == 0) --- 7635,7640 ---- *************** *** 7733,7742 **** xp->xp_context = EXPAND_NOTHING; if (is_term_option || (flags & P_NUM)) return; ! if (after_blank != NULL) ! xp->xp_pattern = after_blank; ! else ! xp->xp_pattern = p + 1; if (flags & P_EXPAND) { p = options[opt_idx].var; --- 7727,7735 ---- xp->xp_context = EXPAND_NOTHING; if (is_term_option || (flags & P_NUM)) return; ! ! xp->xp_pattern = p + 1; ! if (flags & P_EXPAND) { p = options[opt_idx].var; *************** *** 7758,7768 **** || p == (char_u *)&p_cdpath #endif ) ! xp->xp_set_path = TRUE; } else xp->xp_context = EXPAND_FILES; } return; } --- 7751,7790 ---- || p == (char_u *)&p_cdpath #endif ) ! xp->xp_backslash = XP_BS_THREE; ! else ! xp->xp_backslash = XP_BS_ONE; } else + { xp->xp_context = EXPAND_FILES; + /* for 'tags' need three backslashes for a space */ + if (p == (char_u *)&p_tags) + xp->xp_backslash = XP_BS_THREE; + else + xp->xp_backslash = XP_BS_ONE; + } + } + + /* For an option that is a list of file names, find the start of the + * last file name. */ + for (p = arg + STRLEN(arg) - 1; p > xp->xp_pattern; --p) + { + /* count number of backslashes before ' ' or ',' */ + if (*p == ' ' || *p == ',') + { + s = p; + while (s > xp->xp_pattern && *(s - 1) == '\\') + --s; + if ((*p == ' ' && (xp->xp_backslash == XP_BS_THREE && (p - s) < 3)) + || (*p == ',' && (flags & P_COMMA) && ((p - s) & 1) == 0)) + { + xp->xp_pattern = p + 1; + break; + } + } } + return; } *** ../vim60.133/src/structs.h Fri Nov 2 16:29:44 2001 --- src/structs.h Wed Jan 2 13:16:36 2002 *************** *** 364,371 **** { int xp_context; /* type of expansion */ char_u *xp_pattern; /* start of item to expand */ ! int xp_set_path; /* ":set path=/dir/" */ } expand_T; /* * Command modifiers ":vertical", ":browse", ":confirm" and ":hide" set a flag. --- 364,376 ---- { int xp_context; /* type of expansion */ char_u *xp_pattern; /* start of item to expand */ ! int xp_backslash; /* one of the XP_BS_ values */ } expand_T; + + /* values for xp_backslash */ + #define XP_BS_NONE 0 /* nothing special for backslashes */ + #define XP_BS_ONE 1 /* uses one backslash before a space */ + #define XP_BS_THREE 2 /* uses three backslashes before a space */ /* * Command modifiers ":vertical", ":browse", ":confirm" and ":hide" set a flag. *** ../vim60.133/src/version.c Tue Jan 15 14:28:35 2002 --- src/version.c Tue Jan 15 14:30:42 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 134, /**/ -- Every engineer dreams about saving the universe and having sex with aliens. This is much more glamorous than the real life of an engineer, which consists of hiding from the universe and having sex without the participation of other life forms. (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.135 (long) Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.135 Problem: Menus that are not supposed to do anything used "", which still produced an error beep. When CTRL-O is mapped for Insert mode, ":amenu" commands didn't work in Insert mode. Menu language falls back to English when $LANG ends in "@euro". Solution: Use "" for a menu item that doesn't do anything, just like mappings. Use ":anoremenu" instead of ":amenu". Ignore "@euro" in the locale name. Files: runtime/makemenu.vim, runtime/menu.vim, src/menu.c *** ../vim60.134/runtime/makemenu.vim Mon Sep 24 11:44:52 2001 --- runtime/makemenu.vim Tue Jan 15 15:30:35 2002 *************** *** 1,6 **** " Script to define the syntax menu in menu.vim " Maintainer: Bram Moolenaar ! " Last Change: 2001 Sep 24 " This is used by "make menu" in the src directory. edit :p:h/menu.vim --- 1,6 ---- " Script to define the syntax menu in menu.vim " Maintainer: Bram Moolenaar ! " Last Change: 2002 Jan 15 " This is used by "make menu" in the src directory. edit :p:h/menu.vim *************** *** 38,49 **** " When starting a new letter, insert a menu separator. let c = submenu_name[0] if c != s:cur_menu_char ! exe 'am 50.' . s:cur_menu_nr . '.' . s:cur_menu_item . ' &Syntax.' . menu_name . ".-" . c . '- ' let s:cur_menu_item = s:cur_menu_item + 10 let s:cur_menu_char = c endif endif ! call append(s:lnum, 'am 50.' . s:cur_menu_nr . '.' . s:cur_menu_item . ' &Syntax.' . menu_name . "." . submenu_name . ' :cal SetSyn("' . syntax_name . '")') let s:cur_menu_item = s:cur_menu_item + 10 let s:lnum = s:lnum + 1 endfun --- 38,49 ---- " When starting a new letter, insert a menu separator. let c = submenu_name[0] if c != s:cur_menu_char ! exe 'an 50.' . s:cur_menu_nr . '.' . s:cur_menu_item . ' &Syntax.' . menu_name . ".-" . c . '- ' let s:cur_menu_item = s:cur_menu_item + 10 let s:cur_menu_char = c endif endif ! call append(s:lnum, 'an 50.' . s:cur_menu_nr . '.' . s:cur_menu_item . ' &Syntax.' . menu_name . "." . submenu_name . ' :cal SetSyn("' . syntax_name . '")') let s:cur_menu_item = s:cur_menu_item + 10 let s:lnum = s:lnum + 1 endfun *************** *** 55,60 **** --- 55,61 ---- SynMenu AB.Aflex:aflex SynMenu AB.AHDL:ahdl SynMenu AB.Amiga\ DOS:amiga + SynMenu AB.Ant:ant SynMenu AB.Antlr:antlr SynMenu AB.Apache\ config:apache SynMenu AB.Apache-style\ config:apachestyle *************** *** 78,83 **** --- 79,85 ---- SynMenu AB.Awk:awk SynMenu AB.Ayacc:ayacc SynMenu AB.B:b + SynMenu AB.Baan:baan SynMenu AB.BASIC:basic SynMenu AB.BC\ calculator:bc SynMenu AB.BDF\ font:bdf *************** *** 149,156 **** SynMenu EFG.GNUplot:gnuplot SynMenu EFG.GTKrc:gtkrc ! SynMenu HIJK.Haskell:haskell ! SynMenu HIJK.Haskell-literate:lhaskell SynMenu HIJK.Hercules:hercules SynMenu HIJK.HTML:html SynMenu HIJK.HTML\ with\ M4:htmlm4 --- 151,159 ---- SynMenu EFG.GNUplot:gnuplot SynMenu EFG.GTKrc:gtkrc ! SynMenu HIJK.Haskell.Haskell:haskell ! SynMenu HIJK.Haskell.Haskell-c2hs:chaskell ! SynMenu HIJK.Haskell.Haskell-literate:lhaskell SynMenu HIJK.Hercules:hercules SynMenu HIJK.HTML:html SynMenu HIJK.HTML\ with\ M4:htmlm4 *************** *** 187,192 **** --- 190,196 ---- SynMenu L-Ma.Lisp:lisp SynMenu L-Ma.Lite:lite SynMenu L-Ma.LOTOS:lotos + SynMenu L-Ma.LotusScript:lscript SynMenu L-Ma.Lout:lout SynMenu L-Ma.Lua:lua SynMenu L-Ma.Lynx\ Style:lss *************** *** 210,215 **** --- 214,220 ---- SynMenu Me-NO.Modsim\ III:modsim3 SynMenu Me-NO.Modula\ 2:modula2 SynMenu Me-NO.Modula\ 3:modula3 + SynMenu Me-NO.MOO:moo SynMenu Me-NO.Msql:msql SynMenu Me-NO.MS-DOS.MS-DOS\ \.bat\ file:dosbatch SynMenu Me-NO.MS-DOS.4DOS\ \.bat\ file:btm *************** *** 246,251 **** --- 251,257 ---- SynMenu PQ.PO\ (GNU\ gettext):po SynMenu PQ.Postfix\ main\ config:pfmain SynMenu PQ.PostScript:postscr + SynMenu PQ.PostScript\ Printer\ Description:ppd SynMenu PQ.Povray:pov SynMenu PQ.Povray\ configuration:povini SynMenu PQ.Printcap:pcap *************** *** 306,311 **** --- 312,318 ---- SynMenu Sh-S.Specman:specman SynMenu Sh-S.Spice:spice SynMenu Sh-S.Speedup:spup + SynMenu Sh-S.Splint:splint SynMenu Sh-S.Squid:squid SynMenu Sh-S.SQL:sql SynMenu Sh-S.SQL\ Forms:sqlforms *************** *** 354,365 **** --- 361,374 ---- SynMenu WXYZ.Whitespace\ (add):whitespace SynMenu WXYZ.WinBatch/Webbatch:winbatch SynMenu WXYZ.Windows\ Scripting\ Host:wsh + SynMenu WXYZ.WvDial:wvdial SynMenu WXYZ.X\ Keyboard\ Extension:xkb SynMenu WXYZ.X\ Pixmap:xpm SynMenu WXYZ.X\ Pixmap\ (2):xpm2 SynMenu WXYZ.X\ resources:xdefaults SynMenu WXYZ.Xmath:xmath SynMenu WXYZ.XML:xml + SynMenu WXYZ.Xslt:xslt SynMenu WXYZ.XXD\ hex\ dump:xxd SynMenu WXYZ.Yacc:yacc SynMenu WXYZ.Zsh\ shell\ script:zsh *** ../vim60.134/runtime/menu.vim Thu Nov 1 15:22:32 2001 --- runtime/menu.vim Tue Jan 15 16:17:03 2002 *************** *** 1,8 **** " You can also use this as a start for your own set of menus. - " Note that ":amenu" is often used to make a menu work in all modes. " " Maintainer: Bram Moolenaar ! " Last Change: 2001 Oct 25 " Make sure the '<' and 'C' flags are not included in 'cpoptions', otherwise " would not be recognized. See ":help 'cpoptions'". --- 1,11 ---- + " Vim support file to define the default menus " You can also use this as a start for your own set of menus. " " Maintainer: Bram Moolenaar ! " Last Change: 2002 Jan 15 ! ! " Note that ":an" (short for ":anoremenu") is often used to make a menu work ! " in all modes and avoid side effects from mappings defined by the user. " Make sure the '<' and 'C' flags are not included in 'cpoptions', otherwise " would not be recognized. See ":help 'cpoptions'". *************** *** 32,37 **** --- 35,42 ---- " Change spaces to underscores. let s:lang = substitute(tolower(s:lang), "\\.iso-", "\\.iso_", "") let s:lang = substitute(s:lang, " ", "_", "g") + " Remove "@euro", otherwise "LC_ALL=de_DE@euro gvim" will show English menus + let s:lang = substitute(s:lang, "@euro", "", "") menutrans clear exe "runtime! lang/menu_" . s:lang . ".vim" *************** *** 51,67 **** " Help menu ! amenu 9999.10 &Help.&Overview :help ! amenu 9999.20 &Help.&User\ Manual :help usr_toc ! amenu 9999.30 &Help.&How-to\ links :help how-to ! amenu 9999.40 &Help.&Find\.\.\. :call Helpfind() ! amenu 9999.45 &Help.-sep1- ! amenu 9999.50 &Help.&Credits :help credits ! amenu 9999.60 &Help.Co&pying :help copying ! amenu 9999.70 &Help.O&rphans :help iccf ! amenu 9999.75 &Help.-sep2- ! amenu 9999.80 &Help.&Version :version ! amenu 9999.90 &Help.&About :intro fun! s:Helpfind() if !exists("g:menutrans_help_dialog") --- 56,72 ---- " Help menu ! an 9999.10 &Help.&Overview :help ! an 9999.20 &Help.&User\ Manual :help usr_toc ! an 9999.30 &Help.&How-to\ links :help how-to ! an 9999.40 &Help.&Find\.\.\. :call Helpfind() ! an 9999.45 &Help.-sep1- ! an 9999.50 &Help.&Credits :help credits ! an 9999.60 &Help.Co&pying :help copying ! an 9999.70 &Help.O&rphans :help kcc ! an 9999.75 &Help.-sep2- ! an 9999.80 &Help.&Version :version ! an 9999.90 &Help.&About :intro fun! s:Helpfind() if !exists("g:menutrans_help_dialog") *************** *** 78,116 **** endfun " File menu ! amenu 10.310 &File.&Open\.\.\.:e :browse confirm e ! amenu 10.320 &File.Sp&lit-Open\.\.\.:sp :browse sp ! amenu 10.325 &File.&New:enew :confirm enew ! amenu 10.330 &File.&Close:close \ :if winheight(2) < 0 \ confirm enew \ else \ confirm close \ endif ! amenu 10.335 &File.-SEP1- : ! amenu 10.340 &File.&Save:w :if expand("%") == ""browse confirm welseconfirm wendif ! amenu 10.350 &File.Save\ &As\.\.\.:sav :browse confirm saveas if has("diff") ! amenu 10.400 &File.-SEP2- : ! amenu 10.410 &File.Split\ &Diff\ with\.\.\. :browse vert diffsplit ! amenu 10.420 &File.Split\ Patched\ &By\.\.\. :browse vert diffpatch endif if has("printer") ! amenu 10.500 &File.-SEP3- : ! amenu 10.510 &File.&Print :hardcopy ! vunmenu &File.&Print ! vmenu &File.&Print :hardcopy elseif has("unix") ! amenu 10.500 &File.-SEP3- : ! amenu 10.510 &File.&Print :w !lpr ! vunmenu &File.&Print ! vmenu &File.&Print :w !lpr endif ! amenu 10.600 &File.-SEP4- : ! amenu 10.610 &File.Sa&ve-Exit:wqa :confirm wqa ! amenu 10.620 &File.E&xit:qa :confirm qa " Pasting blockwise and linewise selections is not possible in Insert and " Visual mode without the +virtualedit feature. They are pasted as if they --- 83,121 ---- endfun " File menu ! an 10.310 &File.&Open\.\.\.:e :browse confirm e ! an 10.320 &File.Sp&lit-Open\.\.\.:sp :browse sp ! an 10.325 &File.&New:enew :confirm enew ! an 10.330 &File.&Close:close \ :if winheight(2) < 0 \ confirm enew \ else \ confirm close \ endif ! an 10.335 &File.-SEP1- ! an 10.340 &File.&Save:w :if expand("%") == ""browse confirm welseconfirm wendif ! an 10.350 &File.Save\ &As\.\.\.:sav :browse confirm saveas if has("diff") ! an 10.400 &File.-SEP2- ! an 10.410 &File.Split\ &Diff\ with\.\.\. :browse vert diffsplit ! an 10.420 &File.Split\ Patched\ &By\.\.\. :browse vert diffpatch endif if has("printer") ! an 10.500 &File.-SEP3- ! an 10.510 &File.&Print :hardcopy ! vunmenu &File.&Print ! vnoremenu &File.&Print :hardcopy elseif has("unix") ! an 10.500 &File.-SEP3- ! an 10.510 &File.&Print :w !lpr ! vunmenu &File.&Print ! vnoremenu &File.&Print :w !lpr endif ! an 10.600 &File.-SEP4- ! an 10.610 &File.Sa&ve-Exit:wqa :confirm wqa ! an 10.620 &File.E&xit:qa :confirm qa " Pasting blockwise and linewise selections is not possible in Insert and " Visual mode without the +virtualedit feature. They are pasted as if they *************** *** 128,204 **** endif " Edit menu ! amenu 20.310 &Edit.&Undou u ! amenu 20.320 &Edit.&Redo^R ! amenu 20.330 &Edit.Rep&eat\. . ! amenu 20.335 &Edit.-SEP1- : ! vmenu 20.340 &Edit.Cu&t"+x "+x ! vmenu 20.350 &Edit.&Copy"+y "+y ! cmenu 20.350 &Edit.&Copy"+y ! nmenu 20.360 &Edit.&Paste"+P "+gP ! cmenu &Edit.&Paste"+P + if has("virtualedit") ! vmenu &Edit.&Paste"+P "-cPaste ! imenu &Edit.&Paste"+P Pastegi else ! vmenu &Edit.&Paste"+P "-cgixPaste"_x ! imenu &Edit.&Paste"+P xPaste"_s endif ! nmenu 20.370 &Edit.Put\ &Before[p [p ! imenu &Edit.Put\ &Before[p [p ! nmenu 20.380 &Edit.Put\ &After]p ]p ! imenu &Edit.Put\ &After]p ]p if has("win32") || has("win16") ! vmenu 20.390 &Edit.&Deletex x endif ! amenu 20.400 &Edit.&Select\ allggVG :if &slm != ""exe ":norm gggHG"elseexe ":norm ggVG"endif ! amenu 20.405 &Edit.-SEP2- : if has("win32") || has("win16") || has("gui_gtk") || has("gui_motif") ! amenu 20.410 &Edit.&Find\.\.\. :promptfind ! vunmenu &Edit.&Find\.\.\. ! vmenu &Edit.&Find\.\.\. y:promptfind " ! amenu 20.420 &Edit.Find\ and\ Rep&lace\.\.\. :promptrepl ! vunmenu &Edit.Find\ and\ Rep&lace\.\.\. ! vmenu &Edit.Find\ and\ Rep&lace\.\.\. y:promptrepl " else ! amenu 20.410 &Edit.&Find/ / ! amenu 20.420 &Edit.Find\ and\ Rep&lace:%s :%s/ ! vunmenu &Edit.Find\ and\ Rep&lace:%s ! vmenu &Edit.Find\ and\ Rep&lace:s :s/ endif ! amenu 20.425 &Edit.-SEP3- : ! amenu 20.430 &Edit.Settings\ &Window :options " Edit/Global Settings ! amenu 20.440.100 &Edit.&Global\ Settings.Toggle\ Pattern\ &Highlight:set\ hls! :set hls! hls? ! amenu 20.440.110 &Edit.&Global\ Settings.Toggle\ &Ignore-case:set\ ic! :set ic! ic? ! amenu 20.440.110 &Edit.&Global\ Settings.Toggle\ &Showmatch:set\ sm! :set sm! sm? ! ! amenu 20.440.120 &Edit.&Global\ Settings.&Context\ lines.\ 1\ :set so=1 ! amenu 20.440.120 &Edit.&Global\ Settings.&Context\ lines.\ 2\ :set so=2 ! amenu 20.440.120 &Edit.&Global\ Settings.&Context\ lines.\ 3\ :set so=3 ! amenu 20.440.120 &Edit.&Global\ Settings.&Context\ lines.\ 4\ :set so=4 ! amenu 20.440.120 &Edit.&Global\ Settings.&Context\ lines.\ 5\ :set so=5 ! amenu 20.440.120 &Edit.&Global\ Settings.&Context\ lines.\ 7\ :set so=7 ! amenu 20.440.120 &Edit.&Global\ Settings.&Context\ lines.\ 10\ :set so=10 ! amenu 20.440.120 &Edit.&Global\ Settings.&Context\ lines.\ 100\ :set so=100 ! ! amenu 20.440.130.40 &Edit.&Global\ Settings.&Virtual\ Edit.Never :set ve= ! amenu 20.440.130.50 &Edit.&Global\ Settings.&Virtual\ Edit.Block\ Selection :set ve=block ! amenu 20.440.130.60 &Edit.&Global\ Settings.&Virtual\ Edit.Insert\ mode :set ve=insert ! amenu 20.440.130.70 &Edit.&Global\ Settings.&Virtual\ Edit.Block\ and\ Insert :set ve=block,insert ! amenu 20.440.130.80 &Edit.&Global\ Settings.&Virtual\ Edit.Always :set ve=all ! amenu 20.440.140 &Edit.&Global\ Settings.Toggle\ Insert\ &Mode:set\ im! :set im! ! amenu 20.440.145 &Edit.&Global\ Settings.Toggle\ Vi\ C&ompatible:set\ cp! :set cp! ! amenu 20.440.150 &Edit.&Global\ Settings.Search\ &Path\.\.\. :call SearchP() ! amenu 20.440.160 &Edit.&Global\ Settings.Ta&g\ Files\.\.\. :call TagFiles() " " GUI options ! amenu 20.440.300 &Edit.&Global\ Settings.-SEP1- : ! amenu 20.440.310 &Edit.&Global\ Settings.Toggle\ &Toolbar :call ToggleGuiOption("T") ! amenu 20.440.320 &Edit.&Global\ Settings.Toggle\ &Bottom\ Scrollbar :call ToggleGuiOption("b") ! amenu 20.440.330 &Edit.&Global\ Settings.Toggle\ &Left\ Scrollbar :call ToggleGuiOption("l") ! amenu 20.440.340 &Edit.&Global\ Settings.Toggle\ &Right\ Scrollbar :call ToggleGuiOption("r") fun! s:SearchP() if !exists("g:menutrans_path_dialog") --- 133,212 ---- endif " Edit menu ! an 20.310 &Edit.&Undou u ! an 20.320 &Edit.&Redo^R ! an 20.330 &Edit.Rep&eat\. . ! ! an 20.335 &Edit.-SEP1- ! vnoremenu 20.340 &Edit.Cu&t"+x "+x ! vnoremenu 20.350 &Edit.&Copy"+y "+y ! cnoremenu 20.350 &Edit.&Copy"+y ! nnoremenu 20.360 &Edit.&Paste"+P "+gP ! cnoremenu &Edit.&Paste"+P + if has("virtualedit") ! vnoremenu &Edit.&Paste"+P "-cPaste ! inoremenu &Edit.&Paste"+P Pastegi else ! vnoremenu &Edit.&Paste"+P "-cgixPaste"_x ! inoremenu &Edit.&Paste"+P xPaste"_s endif ! nnoremenu 20.370 &Edit.Put\ &Before[p [p ! inoremenu &Edit.Put\ &Before[p [p ! nnoremenu 20.380 &Edit.Put\ &After]p ]p ! inoremenu &Edit.Put\ &After]p ]p if has("win32") || has("win16") ! vnoremenu 20.390 &Edit.&Deletex x endif ! an 20.400 &Edit.&Select\ allggVG :if &slm != ""exe ":norm gggHG"elseexe ":norm ggVG"endif ! ! an 20.405 &Edit.-SEP2- if has("win32") || has("win16") || has("gui_gtk") || has("gui_motif") ! an 20.410 &Edit.&Find\.\.\. :promptfind ! vunmenu &Edit.&Find\.\.\. ! vnoremenu &Edit.&Find\.\.\. y:promptfind " ! an 20.420 &Edit.Find\ and\ Rep&lace\.\.\. :promptrepl ! vunmenu &Edit.Find\ and\ Rep&lace\.\.\. ! vnoremenu &Edit.Find\ and\ Rep&lace\.\.\. y:promptrepl " else ! an 20.410 &Edit.&Find/ / ! an 20.420 &Edit.Find\ and\ Rep&lace:%s :%s/ ! vunmenu &Edit.Find\ and\ Rep&lace:%s ! vnoremenu &Edit.Find\ and\ Rep&lace:s :s/ endif ! ! an 20.425 &Edit.-SEP3- ! an 20.430 &Edit.Settings\ &Window :options " Edit/Global Settings ! an 20.440.100 &Edit.&Global\ Settings.Toggle\ Pattern\ &Highlight:set\ hls! :set hls! hls? ! an 20.440.110 &Edit.&Global\ Settings.Toggle\ &Ignore-case:set\ ic! :set ic! ic? ! an 20.440.110 &Edit.&Global\ Settings.Toggle\ &Showmatch:set\ sm! :set sm! sm? ! ! an 20.440.120 &Edit.&Global\ Settings.&Context\ lines.\ 1\ :set so=1 ! an 20.440.120 &Edit.&Global\ Settings.&Context\ lines.\ 2\ :set so=2 ! an 20.440.120 &Edit.&Global\ Settings.&Context\ lines.\ 3\ :set so=3 ! an 20.440.120 &Edit.&Global\ Settings.&Context\ lines.\ 4\ :set so=4 ! an 20.440.120 &Edit.&Global\ Settings.&Context\ lines.\ 5\ :set so=5 ! an 20.440.120 &Edit.&Global\ Settings.&Context\ lines.\ 7\ :set so=7 ! an 20.440.120 &Edit.&Global\ Settings.&Context\ lines.\ 10\ :set so=10 ! an 20.440.120 &Edit.&Global\ Settings.&Context\ lines.\ 100\ :set so=100 ! ! an 20.440.130.40 &Edit.&Global\ Settings.&Virtual\ Edit.Never :set ve= ! an 20.440.130.50 &Edit.&Global\ Settings.&Virtual\ Edit.Block\ Selection :set ve=block ! an 20.440.130.60 &Edit.&Global\ Settings.&Virtual\ Edit.Insert\ mode :set ve=insert ! an 20.440.130.70 &Edit.&Global\ Settings.&Virtual\ Edit.Block\ and\ Insert :set ve=block,insert ! an 20.440.130.80 &Edit.&Global\ Settings.&Virtual\ Edit.Always :set ve=all ! an 20.440.140 &Edit.&Global\ Settings.Toggle\ Insert\ &Mode:set\ im! :set im! ! an 20.440.145 &Edit.&Global\ Settings.Toggle\ Vi\ C&ompatible:set\ cp! :set cp! ! an 20.440.150 &Edit.&Global\ Settings.Search\ &Path\.\.\. :call SearchP() ! an 20.440.160 &Edit.&Global\ Settings.Ta&g\ Files\.\.\. :call TagFiles() " " GUI options ! an 20.440.300 &Edit.&Global\ Settings.-SEP1- ! an 20.440.310 &Edit.&Global\ Settings.Toggle\ &Toolbar :call ToggleGuiOption("T") ! an 20.440.320 &Edit.&Global\ Settings.Toggle\ &Bottom\ Scrollbar :call ToggleGuiOption("b") ! an 20.440.330 &Edit.&Global\ Settings.Toggle\ &Left\ Scrollbar :call ToggleGuiOption("l") ! an 20.440.340 &Edit.&Global\ Settings.Toggle\ &Right\ Scrollbar :call ToggleGuiOption("r") fun! s:SearchP() if !exists("g:menutrans_path_dialog") *************** *** 232,263 **** " Edit/File Settings " Boolean options ! amenu 20.440.100 &Edit.F&ile\ Settings.Toggle\ Line\ &Numbering:set\ nu! :set nu! nu? ! amenu 20.440.110 &Edit.F&ile\ Settings.Toggle\ &List\ Mode:set\ list! :set list! list? ! amenu 20.440.120 &Edit.F&ile\ Settings.Toggle\ Line\ &Wrap:set\ wrap! :set wrap! wrap? ! amenu 20.440.130 &Edit.F&ile\ Settings.Toggle\ W&rap\ at\ word:set\ lbr! :set lbr! lbr? ! amenu 20.440.160 &Edit.F&ile\ Settings.Toggle\ &expand-tab:set\ et! :set et! et? ! amenu 20.440.170 &Edit.F&ile\ Settings.Toggle\ &auto-indent:set\ ai! :set ai! ai? ! amenu 20.440.180 &Edit.F&ile\ Settings.Toggle\ &C-indenting:set\ cin! :set cin! cin? " other options ! amenu 20.440.600 &Edit.F&ile\ Settings.-SEP2- : ! amenu 20.440.610.20 &Edit.F&ile\ Settings.&Shiftwidth.2 :set sw=2 sw? ! amenu 20.440.610.30 &Edit.F&ile\ Settings.&Shiftwidth.3 :set sw=3 sw? ! amenu 20.440.610.40 &Edit.F&ile\ Settings.&Shiftwidth.4 :set sw=4 sw? ! amenu 20.440.610.50 &Edit.F&ile\ Settings.&Shiftwidth.5 :set sw=5 sw? ! amenu 20.440.610.60 &Edit.F&ile\ Settings.&Shiftwidth.6 :set sw=6 sw? ! amenu 20.440.610.80 &Edit.F&ile\ Settings.&Shiftwidth.8 :set sw=8 sw? ! ! amenu 20.440.620.20 &Edit.F&ile\ Settings.Soft\ &Tabstop.2 :set sts=2 sts? ! amenu 20.440.620.30 &Edit.F&ile\ Settings.Soft\ &Tabstop.3 :set sts=3 sts? ! amenu 20.440.620.40 &Edit.F&ile\ Settings.Soft\ &Tabstop.4 :set sts=4 sts? ! amenu 20.440.620.50 &Edit.F&ile\ Settings.Soft\ &Tabstop.5 :set sts=5 sts? ! amenu 20.440.620.60 &Edit.F&ile\ Settings.Soft\ &Tabstop.6 :set sts=6 sts? ! amenu 20.440.620.80 &Edit.F&ile\ Settings.Soft\ &Tabstop.8 :set sts=8 sts? ! amenu 20.440.630 &Edit.F&ile\ Settings.Te&xt\ Width\.\.\. :call TextWidth() ! amenu 20.440.640 &Edit.F&ile\ Settings.&File\ Format\.\.\. :call FileFormat() fun! s:TextWidth() if !exists("g:menutrans_textwidth_dialog") let g:menutrans_textwidth_dialog = "Enter new text width (0 to disable formatting): " --- 240,271 ---- " Edit/File Settings " Boolean options ! an 20.440.100 &Edit.F&ile\ Settings.Toggle\ Line\ &Numbering:set\ nu! :set nu! nu? ! an 20.440.110 &Edit.F&ile\ Settings.Toggle\ &List\ Mode:set\ list! :set list! list? ! an 20.440.120 &Edit.F&ile\ Settings.Toggle\ Line\ &Wrap:set\ wrap! :set wrap! wrap? ! an 20.440.130 &Edit.F&ile\ Settings.Toggle\ W&rap\ at\ word:set\ lbr! :set lbr! lbr? ! an 20.440.160 &Edit.F&ile\ Settings.Toggle\ &expand-tab:set\ et! :set et! et? ! an 20.440.170 &Edit.F&ile\ Settings.Toggle\ &auto-indent:set\ ai! :set ai! ai? ! an 20.440.180 &Edit.F&ile\ Settings.Toggle\ &C-indenting:set\ cin! :set cin! cin? " other options ! an 20.440.600 &Edit.F&ile\ Settings.-SEP2- ! an 20.440.610.20 &Edit.F&ile\ Settings.&Shiftwidth.2 :set sw=2 sw? ! an 20.440.610.30 &Edit.F&ile\ Settings.&Shiftwidth.3 :set sw=3 sw? ! an 20.440.610.40 &Edit.F&ile\ Settings.&Shiftwidth.4 :set sw=4 sw? ! an 20.440.610.50 &Edit.F&ile\ Settings.&Shiftwidth.5 :set sw=5 sw? ! an 20.440.610.60 &Edit.F&ile\ Settings.&Shiftwidth.6 :set sw=6 sw? ! an 20.440.610.80 &Edit.F&ile\ Settings.&Shiftwidth.8 :set sw=8 sw? ! ! an 20.440.620.20 &Edit.F&ile\ Settings.Soft\ &Tabstop.2 :set sts=2 sts? ! an 20.440.620.30 &Edit.F&ile\ Settings.Soft\ &Tabstop.3 :set sts=3 sts? ! an 20.440.620.40 &Edit.F&ile\ Settings.Soft\ &Tabstop.4 :set sts=4 sts? ! an 20.440.620.50 &Edit.F&ile\ Settings.Soft\ &Tabstop.5 :set sts=5 sts? ! an 20.440.620.60 &Edit.F&ile\ Settings.Soft\ &Tabstop.6 :set sts=6 sts? ! an 20.440.620.80 &Edit.F&ile\ Settings.Soft\ &Tabstop.8 :set sts=8 sts? ! an 20.440.630 &Edit.F&ile\ Settings.Te&xt\ Width\.\.\. :call TextWidth() ! an 20.440.640 &Edit.F&ile\ Settings.&File\ Format\.\.\. :call FileFormat() fun! s:TextWidth() if !exists("g:menutrans_textwidth_dialog") let g:menutrans_textwidth_dialog = "Enter new text width (0 to disable formatting): " *************** *** 303,309 **** let s:n = strpart(s:n, s:i + 1, 19999) endif let s:name = substitute(s:name, '.*[/\\:]\([^/\\:]*\)\.vim', '\1', '') ! exe "amenu 20.450." . s:idx . ' &Edit.C&olor\ Scheme.' . s:name . " :colors " . s:name . "" unlet s:name unlet s:i let s:idx = s:idx + 10 --- 311,317 ---- let s:n = strpart(s:n, s:i + 1, 19999) endif let s:name = substitute(s:name, '.*[/\\:]\([^/\\:]*\)\.vim', '\1', '') ! exe "an 20.450." . s:idx . ' &Edit.C&olor\ Scheme.' . s:name . " :colors " . s:name . "" unlet s:name unlet s:i let s:idx = s:idx + 10 *************** *** 316,322 **** let s:n = globpath(&runtimepath, "keymap/*.vim") if s:n != "" let s:idx = 100 ! amenu 20.460.90 &Edit.&Keymap.None :set keymap= while strlen(s:n) > 0 let s:i = stridx(s:n, "\n") if s:i < 0 --- 324,330 ---- let s:n = globpath(&runtimepath, "keymap/*.vim") if s:n != "" let s:idx = 100 ! an 20.460.90 &Edit.&Keymap.None :set keymap= while strlen(s:n) > 0 let s:i = stridx(s:n, "\n") if s:i < 0 *************** *** 327,333 **** let s:n = strpart(s:n, s:i + 1, 19999) endif let s:name = substitute(s:name, '.*[/\\:]\([^/\\:_]*\)\(_[0-9a-zA-Z-]*\)\=\.vim', '\1', '') ! exe "amenu 20.460." . s:idx . ' &Edit.&Keymap.' . s:name . " :set keymap=" . s:name . "" unlet s:name unlet s:i let s:idx = s:idx + 10 --- 335,341 ---- let s:n = strpart(s:n, s:i + 1, 19999) endif let s:name = substitute(s:name, '.*[/\\:]\([^/\\:_]*\)\(_[0-9a-zA-Z-]*\)\=\.vim', '\1', '') ! exe "an 20.460." . s:idx . ' &Edit.&Keymap.' . s:name . " :set keymap=" . s:name . "" unlet s:name unlet s:i let s:idx = s:idx + 10 *************** *** 337,416 **** unlet s:n endif if has("win32") || has("win16") || has("gui_gtk") || has("gui_photon") ! amenu 20.470 &Edit.Select\ Fo&nt\.\.\. :set guifont=* endif " Programming menu ! amenu 40.300 &Tools.&Jump\ to\ this\ tagg^] g vunmenu &Tools.&Jump\ to\ this\ tagg^] ! vmenu &Tools.&Jump\ to\ this\ tagg^] g ! amenu 40.310 &Tools.Jump\ &back^T if has("vms") ! amenu 40.320 &Tools.Build\ &Tags\ File :!mc vim:ctags . else ! amenu 40.320 &Tools.Build\ &Tags\ File :!ctags -R . endif " Tools.Fold Menu if has("folding") ! amenu 40.330 &Tools.-SEP1- : " open close folds ! amenu 40.340.110 &Tools.&Folding.&Enable/Disable\ foldszi zi ! amenu 40.340.120 &Tools.&Folding.&View\ Cursor\ Linezv zv ! amenu 40.340.120 &Tools.&Folding.Vie&w\ Cursor\ Line\ onlyzMzx zMzx ! amenu 40.340.130 &Tools.&Folding.C&lose\ more\ foldszm zm ! amenu 40.340.140 &Tools.&Folding.&Close\ all\ foldszM zM ! amenu 40.340.150 &Tools.&Folding.O&pen\ more\ foldszr zr ! amenu 40.340.160 &Tools.&Folding.&Open\ all\ foldszR zR " fold method ! amenu 40.340.200 &Tools.&Folding.-SEP1- : ! amenu 40.340.210 &Tools.&Folding.Fold\ Met&hod.M&anual :set fdm=manual ! amenu 40.340.210 &Tools.&Folding.Fold\ Met&hod.I&ndent :set fdm=indent ! amenu 40.340.210 &Tools.&Folding.Fold\ Met&hod.E&xpression :set fdm=expr ! amenu 40.340.210 &Tools.&Folding.Fold\ Met&hod.S&yntax :set fdm=syntax ! amenu 40.340.210 &Tools.&Folding.Fold\ Met&hod.&Diff :set fdm=diff ! amenu 40.340.210 &Tools.&Folding.Fold\ Met&hod.Ma&rker :set fdm=marker " create and delete folds ! vmenu 40.340.220 &Tools.&Folding.Create\ &Foldzf zf ! amenu 40.340.230 &Tools.&Folding.&Delete\ Foldzd zd ! amenu 40.340.240 &Tools.&Folding.Delete\ &All\ FoldszD zD " moving around in folds ! amenu 40.340.300 &Tools.&Folding.-SEP2- : ! amenu 40.340.310.10 &Tools.&Folding.Fold\ column\ &width.\ 0\ :set fdc=0 ! amenu 40.340.310.20 &Tools.&Folding.Fold\ column\ &width.\ 2\ :set fdc=2 ! amenu 40.340.310.30 &Tools.&Folding.Fold\ column\ &width.\ 3\ :set fdc=3 ! amenu 40.340.310.40 &Tools.&Folding.Fold\ column\ &width.\ 4\ :set fdc=4 ! amenu 40.340.310.50 &Tools.&Folding.Fold\ column\ &width.\ 5\ :set fdc=5 ! amenu 40.340.310.60 &Tools.&Folding.Fold\ column\ &width.\ 6\ :set fdc=6 ! amenu 40.340.310.70 &Tools.&Folding.Fold\ column\ &width.\ 7\ :set fdc=7 ! amenu 40.340.310.80 &Tools.&Folding.Fold\ column\ &width.\ 8\ :set fdc=8 endif " has folding if has("diff") ! amenu 40.350.100 &Tools.&Diff.&Update :diffupdate ! amenu 40.350.110 &Tools.&Diff.&Get\ Block :diffget vunmenu &Tools.&Diff.&Get\ Block ! vmenu &Tools.&Diff.&Get\ Block :diffget ! amenu 40.350.120 &Tools.&Diff.&Put\ Block :diffput vunmenu &Tools.&Diff.&Put\ Block ! vmenu &Tools.&Diff.&Put\ Block :diffput endif ! amenu 40.358 &Tools.-SEP2- : ! amenu 40.360 &Tools.&Make:make :make ! amenu 40.370 &Tools.&List\ Errors:cl :cl ! amenu 40.380 &Tools.L&ist\ Messages:cl! :cl! ! amenu 40.390 &Tools.&Next\ Error:cn :cn ! amenu 40.400 &Tools.&Previous\ Error:cp :cp ! amenu 40.410 &Tools.&Older\ List:cold :colder ! amenu 40.420 &Tools.N&ewer\ List:cnew :cnewer ! amenu 40.430.50 &Tools.Error\ &Window.&Update:cwin :cwin ! amenu 40.430.60 &Tools.Error\ &Window.&Open:copen :copen ! amenu 40.430.70 &Tools.Error\ &Window.&Close:cclose :cclose ! amenu 40.520 &Tools.-SEP3- : ! amenu 40.530 &Tools.&Convert\ to\ HEX:%!xxd \ :call XxdConv() ! amenu 40.540 &Tools.Conve&rt\ back:%!xxd\ -r \ :call XxdBack() " Use a function to do the conversion, so that it also works with 'insertmode' --- 345,425 ---- unlet s:n endif if has("win32") || has("win16") || has("gui_gtk") || has("gui_photon") ! an 20.470 &Edit.Select\ Fo&nt\.\.\. :set guifont=* endif " Programming menu ! an 40.300 &Tools.&Jump\ to\ this\ tagg^] g vunmenu &Tools.&Jump\ to\ this\ tagg^] ! vnoremenu &Tools.&Jump\ to\ this\ tagg^] g ! an 40.310 &Tools.Jump\ &back^T if has("vms") ! an 40.320 &Tools.Build\ &Tags\ File :!mc vim:ctags . else ! an 40.320 &Tools.Build\ &Tags\ File :!ctags -R . endif " Tools.Fold Menu if has("folding") ! an 40.330 &Tools.-SEP1- " open close folds ! an 40.340.110 &Tools.&Folding.&Enable/Disable\ foldszi zi ! an 40.340.120 &Tools.&Folding.&View\ Cursor\ Linezv zv ! an 40.340.120 &Tools.&Folding.Vie&w\ Cursor\ Line\ onlyzMzx zMzx ! an 40.340.130 &Tools.&Folding.C&lose\ more\ foldszm zm ! an 40.340.140 &Tools.&Folding.&Close\ all\ foldszM zM ! an 40.340.150 &Tools.&Folding.O&pen\ more\ foldszr zr ! an 40.340.160 &Tools.&Folding.&Open\ all\ foldszR zR " fold method ! an 40.340.200 &Tools.&Folding.-SEP1- ! an 40.340.210 &Tools.&Folding.Fold\ Met&hod.M&anual :set fdm=manual ! an 40.340.210 &Tools.&Folding.Fold\ Met&hod.I&ndent :set fdm=indent ! an 40.340.210 &Tools.&Folding.Fold\ Met&hod.E&xpression :set fdm=expr ! an 40.340.210 &Tools.&Folding.Fold\ Met&hod.S&yntax :set fdm=syntax ! an 40.340.210 &Tools.&Folding.Fold\ Met&hod.&Diff :set fdm=diff ! an 40.340.210 &Tools.&Folding.Fold\ Met&hod.Ma&rker :set fdm=marker " create and delete folds ! vnoremenu 40.340.220 &Tools.&Folding.Create\ &Foldzf zf ! an 40.340.230 &Tools.&Folding.&Delete\ Foldzd zd ! an 40.340.240 &Tools.&Folding.Delete\ &All\ FoldszD zD " moving around in folds ! an 40.340.300 &Tools.&Folding.-SEP2- ! an 40.340.310.10 &Tools.&Folding.Fold\ column\ &width.\ 0\ :set fdc=0 ! an 40.340.310.20 &Tools.&Folding.Fold\ column\ &width.\ 2\ :set fdc=2 ! an 40.340.310.30 &Tools.&Folding.Fold\ column\ &width.\ 3\ :set fdc=3 ! an 40.340.310.40 &Tools.&Folding.Fold\ column\ &width.\ 4\ :set fdc=4 ! an 40.340.310.50 &Tools.&Folding.Fold\ column\ &width.\ 5\ :set fdc=5 ! an 40.340.310.60 &Tools.&Folding.Fold\ column\ &width.\ 6\ :set fdc=6 ! an 40.340.310.70 &Tools.&Folding.Fold\ column\ &width.\ 7\ :set fdc=7 ! an 40.340.310.80 &Tools.&Folding.Fold\ column\ &width.\ 8\ :set fdc=8 endif " has folding if has("diff") ! an 40.350.100 &Tools.&Diff.&Update :diffupdate ! an 40.350.110 &Tools.&Diff.&Get\ Block :diffget vunmenu &Tools.&Diff.&Get\ Block ! vnoremenu &Tools.&Diff.&Get\ Block :diffget ! an 40.350.120 &Tools.&Diff.&Put\ Block :diffput vunmenu &Tools.&Diff.&Put\ Block ! vnoremenu &Tools.&Diff.&Put\ Block :diffput endif ! an 40.358 &Tools.-SEP2- ! an 40.360 &Tools.&Make:make :make ! an 40.370 &Tools.&List\ Errors:cl :cl ! an 40.380 &Tools.L&ist\ Messages:cl! :cl! ! an 40.390 &Tools.&Next\ Error:cn :cn ! an 40.400 &Tools.&Previous\ Error:cp :cp ! an 40.410 &Tools.&Older\ List:cold :colder ! an 40.420 &Tools.N&ewer\ List:cnew :cnewer ! an 40.430.50 &Tools.Error\ &Window.&Update:cwin :cwin ! an 40.430.60 &Tools.Error\ &Window.&Open:copen :copen ! an 40.430.70 &Tools.Error\ &Window.&Close:cclose :cclose ! ! an 40.520 &Tools.-SEP3- ! an 40.530 &Tools.&Convert\ to\ HEX:%!xxd \ :call XxdConv() ! an 40.540 &Tools.Conve&rt\ back:%!xxd\ -r \ :call XxdBack() " Use a function to do the conversion, so that it also works with 'insertmode' *************** *** 450,456 **** let s:n = strpart(s:n, s:i + 1, 19999) endif let s:name = substitute(s:name, '.*[/\\:]\([^/\\:]*\)\.vim', '\1', '') ! exe "amenu 30.440." . s:idx . ' &Tools.&Set\ Compiler.' . s:name . " :compiler " . s:name . "" unlet s:name unlet s:i let s:idx = s:idx + 10 --- 459,465 ---- let s:n = strpart(s:n, s:i + 1, 19999) endif let s:name = substitute(s:name, '.*[/\\:]\([^/\\:]*\)\.vim', '\1', '') ! exe "an 30.440." . s:idx . ' &Tools.&Set\ Compiler.' . s:name . " :compiler " . s:name . "" unlet s:name unlet s:i let s:idx = s:idx + 10 *************** *** 513,530 **** " remove old menu, if exists; keep one entry to avoid a torn off menu to " disappear. silent! unmenu &Buffers ! exe 'menu ' . g:bmenu_priority . ".1 &Buffers.Dummy l" silent! unmenu! &Buffers " create new menu; set 'cpo' to include the let cpo_save = &cpo set cpo&vim ! exe 'am ' . g:bmenu_priority . ".2 &Buffers.&Refresh\\ menu :call BMShow()" ! exe 'am ' . g:bmenu_priority . ".4 &Buffers.&Delete :bd" ! exe 'am ' . g:bmenu_priority . ".6 &Buffers.&Alternate :b #" ! exe 'am ' . g:bmenu_priority . ".7 &Buffers.&Next :bnext" ! exe 'am ' . g:bmenu_priority . ".8 &Buffers.&Previous :bprev" ! exe 'am ' . g:bmenu_priority . ".9 &Buffers.-SEP- :" let &cpo = cpo_save unmenu &Buffers.Dummy --- 522,539 ---- " remove old menu, if exists; keep one entry to avoid a torn off menu to " disappear. silent! unmenu &Buffers ! exe 'noremenu ' . g:bmenu_priority . ".1 &Buffers.Dummy l" silent! unmenu! &Buffers " create new menu; set 'cpo' to include the let cpo_save = &cpo set cpo&vim ! exe 'an ' . g:bmenu_priority . ".2 &Buffers.&Refresh\\ menu :call BMShow()" ! exe 'an ' . g:bmenu_priority . ".4 &Buffers.&Delete :bd" ! exe 'an ' . g:bmenu_priority . ".6 &Buffers.&Alternate :b #" ! exe 'an ' . g:bmenu_priority . ".7 &Buffers.&Next :bnext" ! exe 'an ' . g:bmenu_priority . ".8 &Buffers.&Previous :bprev" ! exe 'an ' . g:bmenu_priority . ".9 &Buffers.-SEP- :" let &cpo = cpo_save unmenu &Buffers.Dummy *************** *** 601,609 **** let munge = BMMunge(a:name, a:num) let hash = BMHash(munge) if s:bmenu_short == 0 ! let name = 'am ' . g:bmenu_priority . '.' . hash . ' &Buffers.' . munge else ! let name = 'am ' . g:bmenu_priority . '.' . hash . '.' . hash . ' &Buffers.' . BMHash2(munge) . munge endif " set 'cpo' to include the let cpo_save = &cpo --- 610,618 ---- let munge = BMMunge(a:name, a:num) let hash = BMHash(munge) if s:bmenu_short == 0 ! let name = 'an ' . g:bmenu_priority . '.' . hash . ' &Buffers.' . munge else ! let name = 'an ' . g:bmenu_priority . '.' . hash . '.' . hash . ' &Buffers.' . BMHash2(munge) . munge endif " set 'cpo' to include the let cpo_save = &cpo *************** *** 667,678 **** endif " !exists("no_buffers_menu") " Window menu ! amenu 70.300 &Window.&New^Wn n ! amenu 70.310 &Window.S&plit^Ws s ! amenu 70.320 &Window.Sp&lit\ To\ #^W^^ ! amenu 70.330 &Window.Split\ &Vertically^Wv v if has("vertsplit") ! amenu 70.332 &Window.Split\ File\ E&xplorer :call MenuExplOpen() if !exists("*MenuExplOpen") fun MenuExplOpen() if @% == "" --- 676,687 ---- endif " !exists("no_buffers_menu") " Window menu ! an 70.300 &Window.&New^Wn n ! an 70.310 &Window.S&plit^Ws s ! an 70.320 &Window.Sp&lit\ To\ #^W^^ ! an 70.330 &Window.Split\ &Vertically^Wv v if has("vertsplit") ! an 70.332 &Window.Split\ File\ E&xplorer :call MenuExplOpen() if !exists("*MenuExplOpen") fun MenuExplOpen() if @% == "" *************** *** 683,800 **** endfun endif endif ! amenu 70.335 &Window.-SEP1- : ! amenu 70.340 &Window.&Close^Wc :confirm close ! amenu 70.345 &Window.Close\ &Other(s)^Wo :confirm only ! amenu 70.350 &Window.-SEP2- : ! amenu 70.355 &Window.Move\ &To.&Top^WK K ! amenu 70.355 &Window.Move\ &To.&Bottom^WJ J ! amenu 70.355 &Window.Move\ &To.&Left\ side^WH H ! amenu 70.355 &Window.Move\ &To.&Right\ side^WL L ! amenu 70.360 &Window.Rotate\ &Up^WR R ! amenu 70.362 &Window.Rotate\ &Down^Wr r ! amenu 70.365 &Window.-SEP3- : ! amenu 70.370 &Window.&Equal\ Size^W= = ! amenu 70.380 &Window.&Max\ Height^W_ _ ! amenu 70.390 &Window.M&in\ Height^W1_ 1_ ! amenu 70.400 &Window.Max\ &Width^W\| \| ! amenu 70.410 &Window.Min\ Widt&h^W1\| 1\| " The popup menu ! amenu 1.10 PopUp.&Undo u ! amenu 1.15 PopUp.-SEP1- : ! vmenu 1.20 PopUp.Cu&t "+x ! vmenu 1.30 PopUp.&Copy "+y ! cmenu 1.30 PopUp.&Copy ! nmenu 1.40 PopUp.&Paste "+gP ! cmenu 1.40 PopUp.&Paste + if has("virtualedit") ! vmenu 1.40 PopUp.&Paste "-cPaste ! imenu 1.40 PopUp.&Paste Pastegi else ! vmenu 1.40 PopUp.&Paste "-cgixPaste"_x ! imenu 1.40 PopUp.&Paste xPaste"_s endif ! vmenu 1.50 PopUp.&Delete x ! amenu 1.55 PopUp.-SEP2- : vnoremenu 1.60 PopUp.Select\ Blockwise ! anoremenu 1.70 PopUp.Select\ &Word vaw ! anoremenu 1.80 PopUp.Select\ &Line V ! anoremenu 1.90 PopUp.Select\ &Block ! anoremenu 1.100 PopUp.Select\ &All ggVG " The GUI toolbar (for MS-Windows and GTK) if has("toolbar") ! amenu 1.10 ToolBar.Open :browse confirm e ! amenu 1.20 ToolBar.Save :if expand("%") == ""browse confirm welseconfirm wendif ! amenu 1.30 ToolBar.SaveAll :wa if has("printer") ! amenu 1.40 ToolBar.Print :hardcopy ! vunmenu ToolBar.Print ! vmenu ToolBar.Print :hardcopy elseif has("unix") ! amenu 1.40 ToolBar.Print :w !lpr ! vunmenu ToolBar.Print ! vmenu ToolBar.Print :w !lpr endif ! amenu 1.45 ToolBar.-sep1- ! amenu 1.50 ToolBar.Undo u ! amenu 1.60 ToolBar.Redo ! ! amenu 1.65 ToolBar.-sep2- ! vmenu 1.70 ToolBar.Cut "+x ! vmenu 1.80 ToolBar.Copy "+y ! cmenu 1.80 ToolBar.Copy ! nmenu 1.90 ToolBar.Paste "+gP ! cmenu ToolBar.Paste + if has("virtualedit") ! vmenu ToolBar.Paste "-cPaste ! imenu ToolBar.Paste Pastegi else ! vmenu ToolBar.Paste "-cgixPaste"_x ! imenu ToolBar.Paste xPaste"_s endif if !has("gui_athena") ! amenu 1.95 ToolBar.-sep3- ! amenu 1.100 ToolBar.Find :promptfind ! vunmenu ToolBar.Find ! vmenu ToolBar.Find y:promptfind " ! amenu 1.110 ToolBar.FindNext n ! amenu 1.120 ToolBar.FindPrev N ! amenu 1.130 ToolBar.Replace :promptrepl ! vunmenu ToolBar.Replace ! vmenu ToolBar.Replace y:promptrepl " endif if 0 " disabled; These are in the Windows menu ! amenu 1.135 ToolBar.-sep4- ! amenu 1.140 ToolBar.New n ! amenu 1.150 ToolBar.WinSplit s ! amenu 1.160 ToolBar.WinMax :resize 200 ! amenu 1.170 ToolBar.WinMin :resize 1 ! amenu 1.180 ToolBar.WinVSplit v ! amenu 1.190 ToolBar.WinMaxWidth 500> ! amenu 1.200 ToolBar.WinMinWidth 1\| ! amenu 1.210 ToolBar.WinClose :close endif ! amenu 1.215 ToolBar.-sep5- ! amenu 1.220 ToolBar.LoadSesn :call LoadVimSesn() ! amenu 1.230 ToolBar.SaveSesn :call SaveVimSesn() ! amenu 1.240 ToolBar.RunScript :browse so ! ! amenu 1.245 ToolBar.-sep6- ! amenu 1.250 ToolBar.Make :make ! amenu 1.260 ToolBar.Shell :sh ! amenu 1.270 ToolBar.RunCtags :!ctags -R . ! amenu 1.280 ToolBar.TagJump g] ! ! amenu 1.295 ToolBar.-sep7- ! amenu 1.300 ToolBar.Help :help ! amenu 1.310 ToolBar.FindHelp :call Helpfind() " Only set the tooltips here if not done in a language menu file if exists("*Do_toolbar_tmenu") --- 692,809 ---- endfun endif endif ! an 70.335 &Window.-SEP1- ! an 70.340 &Window.&Close^Wc :confirm close ! an 70.345 &Window.Close\ &Other(s)^Wo :confirm only ! an 70.350 &Window.-SEP2- ! an 70.355 &Window.Move\ &To.&Top^WK K ! an 70.355 &Window.Move\ &To.&Bottom^WJ J ! an 70.355 &Window.Move\ &To.&Left\ side^WH H ! an 70.355 &Window.Move\ &To.&Right\ side^WL L ! an 70.360 &Window.Rotate\ &Up^WR R ! an 70.362 &Window.Rotate\ &Down^Wr r ! an 70.365 &Window.-SEP3- ! an 70.370 &Window.&Equal\ Size^W= = ! an 70.380 &Window.&Max\ Height^W_ _ ! an 70.390 &Window.M&in\ Height^W1_ 1_ ! an 70.400 &Window.Max\ &Width^W\| \| ! an 70.410 &Window.Min\ Widt&h^W1\| 1\| " The popup menu ! an 1.10 PopUp.&Undo u ! an 1.15 PopUp.-SEP1- ! vnoremenu 1.20 PopUp.Cu&t "+x ! vnoremenu 1.30 PopUp.&Copy "+y ! cnoremenu 1.30 PopUp.&Copy ! nnoremenu 1.40 PopUp.&Paste "+gP ! cnoremenu 1.40 PopUp.&Paste + if has("virtualedit") ! vnoremenu 1.40 PopUp.&Paste "-cPaste ! inoremenu 1.40 PopUp.&Paste Pastegi else ! vnoremenu 1.40 PopUp.&Paste "-cgixPaste"_x ! inoremenu 1.40 PopUp.&Paste xPaste"_s endif ! vnoremenu 1.50 PopUp.&Delete x ! an 1.55 PopUp.-SEP2- vnoremenu 1.60 PopUp.Select\ Blockwise ! an 1.70 PopUp.Select\ &Word vaw ! an 1.80 PopUp.Select\ &Line V ! an 1.90 PopUp.Select\ &Block ! an 1.100 PopUp.Select\ &All ggVG " The GUI toolbar (for MS-Windows and GTK) if has("toolbar") ! an 1.10 ToolBar.Open :browse confirm e ! an 1.20 ToolBar.Save :if expand("%") == ""browse confirm welseconfirm wendif ! an 1.30 ToolBar.SaveAll :wa if has("printer") ! an 1.40 ToolBar.Print :hardcopy ! vunmenu ToolBar.Print ! vnoremenu ToolBar.Print :hardcopy elseif has("unix") ! an 1.40 ToolBar.Print :w !lpr ! vunmenu ToolBar.Print ! vnoremenu ToolBar.Print :w !lpr endif ! an 1.45 ToolBar.-sep1- ! an 1.50 ToolBar.Undo u ! an 1.60 ToolBar.Redo ! ! an 1.65 ToolBar.-sep2- ! vnoremenu 1.70 ToolBar.Cut "+x ! vnoremenu 1.80 ToolBar.Copy "+y ! cnoremenu 1.80 ToolBar.Copy ! nnoremenu 1.90 ToolBar.Paste "+gP ! cnoremenu ToolBar.Paste + if has("virtualedit") ! vnoremenu ToolBar.Paste "-cPaste ! inoremenu ToolBar.Paste Pastegi else ! vnoremenu ToolBar.Paste "-cgixPaste"_x ! inoremenu ToolBar.Paste xPaste"_s endif if !has("gui_athena") ! an 1.95 ToolBar.-sep3- ! an 1.100 ToolBar.Find :promptfind ! vunmenu ToolBar.Find ! vnoremenu ToolBar.Find y:promptfind " ! an 1.110 ToolBar.FindNext n ! an 1.120 ToolBar.FindPrev N ! an 1.130 ToolBar.Replace :promptrepl ! vunmenu ToolBar.Replace ! vnoremenu ToolBar.Replace y:promptrepl " endif if 0 " disabled; These are in the Windows menu ! an 1.135 ToolBar.-sep4- ! an 1.140 ToolBar.New n ! an 1.150 ToolBar.WinSplit s ! an 1.160 ToolBar.WinMax :resize 200 ! an 1.170 ToolBar.WinMin :resize 1 ! an 1.180 ToolBar.WinVSplit v ! an 1.190 ToolBar.WinMaxWidth 500> ! an 1.200 ToolBar.WinMinWidth 1\| ! an 1.210 ToolBar.WinClose :close endif ! an 1.215 ToolBar.-sep5- ! an 1.220 ToolBar.LoadSesn :call LoadVimSesn() ! an 1.230 ToolBar.SaveSesn :call SaveVimSesn() ! an 1.240 ToolBar.RunScript :browse so ! ! an 1.245 ToolBar.-sep6- ! an 1.250 ToolBar.Make :make ! an 1.260 ToolBar.Shell :sh ! an 1.270 ToolBar.RunCtags :!ctags -R . ! an 1.280 ToolBar.TagJump g] ! ! an 1.295 ToolBar.-sep7- ! an 1.300 ToolBar.Help :help ! an 1.310 ToolBar.FindHelp :call Helpfind() " Only set the tooltips here if not done in a language menu file if exists("*Do_toolbar_tmenu") *************** *** 862,870 **** " Define these items always, so that syntax can be switched on when it wasn't. " But skip them when the Syntax menu was disabled by the user. if !exists("did_install_syntax_menu") ! am 50.212 &Syntax.&Manual :syn manual ! am 50.214 &Syntax.A&utomatic :syn on ! am 50.216 &Syntax.on/off\ for\ &This\ file :call SynOnOff() if !exists("*s:SynOnOff") fun s:SynOnOff() if has("syntax_items") --- 871,879 ---- " Define these items always, so that syntax can be switched on when it wasn't. " But skip them when the Syntax menu was disabled by the user. if !exists("did_install_syntax_menu") ! an 50.212 &Syntax.&Manual :syn manual ! an 50.214 &Syntax.A&utomatic :syn on ! an 50.216 &Syntax.on/off\ for\ &This\ file :call SynOnOff() if !exists("*s:SynOnOff") fun s:SynOnOff() if has("syntax_items") *************** *** 914,1243 **** " The following menu items are generated by makemenu.vim. " The Start Of The Syntax Menu ! am 50.10.100 &Syntax.AB.Abaqus :cal SetSyn("abaqus") ! am 50.10.110 &Syntax.AB.ABC :cal SetSyn("abc") ! am 50.10.120 &Syntax.AB.ABEL :cal SetSyn("abel") ! am 50.10.130 &Syntax.AB.Ada :cal SetSyn("ada") ! am 50.10.140 &Syntax.AB.Aflex :cal SetSyn("aflex") ! am 50.10.150 &Syntax.AB.AHDL :cal SetSyn("ahdl") ! am 50.10.160 &Syntax.AB.Amiga\ DOS :cal SetSyn("amiga") ! am 50.10.170 &Syntax.AB.Antlr :cal SetSyn("antlr") ! am 50.10.180 &Syntax.AB.Apache\ config :cal SetSyn("apache") ! am 50.10.190 &Syntax.AB.Apache-style\ config :cal SetSyn("apachestyle") ! am 50.10.200 &Syntax.AB.Applix\ ELF :cal SetSyn("elf") ! am 50.10.210 &Syntax.AB.Arc\ Macro\ Language :cal SetSyn("aml") ! am 50.10.220 &Syntax.AB.ASP\ with\ VBSages :cal SetSyn("aspvbs") ! am 50.10.230 &Syntax.AB.ASP\ with\ Perl :cal SetSyn("aspperl") ! am 50.10.240 &Syntax.AB.Assembly.680x0 :cal SetSyn("asm68k") ! am 50.10.250 &Syntax.AB.Assembly.GNU :cal SetSyn("asm") ! am 50.10.260 &Syntax.AB.Assembly.H8300 :cal SetSyn("asmh8300") ! am 50.10.270 &Syntax.AB.Assembly.Intel\ Itanium :cal SetSyn("ia64") ! am 50.10.280 &Syntax.AB.Assembly.Microsoft :cal SetSyn("masm") ! am 50.10.290 &Syntax.AB.Assembly.Netwide :cal SetSyn("nasm") ! am 50.10.300 &Syntax.AB.Assembly.PIC :cal SetSyn("pic") ! am 50.10.310 &Syntax.AB.Assembly.Turbo :cal SetSyn("tasm") ! am 50.10.320 &Syntax.AB.Assembly.Z-80 :cal SetSyn("z8a") ! am 50.10.330 &Syntax.AB.ASN\.1 :cal SetSyn("asn") ! am 50.10.340 &Syntax.AB.Atlas :cal SetSyn("atlas") ! am 50.10.350 &Syntax.AB.Automake :cal SetSyn("automake") ! am 50.10.360 &Syntax.AB.Avenue :cal SetSyn("ave") ! am 50.10.370 &Syntax.AB.Awk :cal SetSyn("awk") ! am 50.10.380 &Syntax.AB.Ayacc :cal SetSyn("ayacc") ! am 50.10.400 &Syntax.AB.B :cal SetSyn("b") ! am 50.10.410 &Syntax.AB.BASIC :cal SetSyn("basic") ! am 50.10.420 &Syntax.AB.BC\ calculator :cal SetSyn("bc") ! am 50.10.430 &Syntax.AB.BDF\ font :cal SetSyn("bdf") ! am 50.10.440 &Syntax.AB.BibFile :cal SetSyn("bib") ! am 50.10.450 &Syntax.AB.BIND\ configuration :cal SetSyn("named") ! am 50.10.460 &Syntax.AB.BIND\ zone :cal SetSyn("bindzone") ! am 50.10.470 &Syntax.AB.Blank :cal SetSyn("blank") ! am 50.20.100 &Syntax.CD.C :cal SetSyn("c") ! am 50.20.110 &Syntax.CD.C++ :cal SetSyn("cpp") ! am 50.20.120 &Syntax.CD.Crontab :cal SetSyn("crontab") ! am 50.20.130 &Syntax.CD.Cyn++ :cal SetSyn("cynpp") ! am 50.20.140 &Syntax.CD.Cynlib :cal SetSyn("cynlib") ! am 50.20.150 &Syntax.CD.Cascading\ Style\ Sheets :cal SetSyn("css") ! am 50.20.160 &Syntax.CD.Century\ Term :cal SetSyn("cterm") ! am 50.20.170 &Syntax.CD.CFG :cal SetSyn("cfg") ! am 50.20.180 &Syntax.CD.CHILL :cal SetSyn("ch") ! am 50.20.190 &Syntax.CD.Change :cal SetSyn("change") ! am 50.20.200 &Syntax.CD.ChangeLog :cal SetSyn("changelog") ! am 50.20.210 &Syntax.CD.Clean :cal SetSyn("clean") ! am 50.20.220 &Syntax.CD.Clever :cal SetSyn("cl") ! am 50.20.230 &Syntax.CD.Clipper :cal SetSyn("clipper") ! am 50.20.240 &Syntax.CD.Cold\ Fusion :cal SetSyn("cf") ! am 50.20.250 &Syntax.CD.Configure\ script :cal SetSyn("config") ! am 50.20.260 &Syntax.CD.Csh\ shell\ script :cal SetSyn("csh") ! am 50.20.270 &Syntax.CD.Ctrl-H :cal SetSyn("ctrlh") ! am 50.20.280 &Syntax.CD.Cobol :cal SetSyn("cobol") ! am 50.20.290 &Syntax.CD.CSP :cal SetSyn("csp") ! am 50.20.300 &Syntax.CD.CUPL.CUPL :cal SetSyn("cupl") ! am 50.20.310 &Syntax.CD.CUPL.simulation :cal SetSyn("cuplsim") ! am 50.20.320 &Syntax.CD.CVS\ commit :cal SetSyn("cvs") ! am 50.20.330 &Syntax.CD.CWEB :cal SetSyn("cweb") ! am 50.20.350 &Syntax.CD.Debian.Debian\ ChangeLog :cal SetSyn("debchangelog") ! am 50.20.360 &Syntax.CD.Debian.Debian\ Control :cal SetSyn("debcontrol") ! am 50.20.370 &Syntax.CD.Diff :cal SetSyn("diff") ! am 50.20.380 &Syntax.CD.Digital\ Command\ Lang :cal SetSyn("dcl") ! am 50.20.390 &Syntax.CD.Diva\ (with\ SKILL) :cal SetSyn("diva") ! am 50.20.400 &Syntax.CD.DNS :cal SetSyn("dns") ! am 50.20.410 &Syntax.CD.DOT :cal SetSyn("dto") ! am 50.20.420 &Syntax.CD.Dracula :cal SetSyn("dracula") ! am 50.20.430 &Syntax.CD.DSSSL :cal SetSyn("dsl") ! am 50.20.440 &Syntax.CD.DTD :cal SetSyn("dtd") ! am 50.20.450 &Syntax.CD.DTML\ (Zope) :cal SetSyn("dtml") ! am 50.20.460 &Syntax.CD.Dylan.Dylan :cal SetSyn("dylan") ! am 50.20.470 &Syntax.CD.Dylan.Dylan\ intr :cal SetSyn("dylanintr") ! am 50.20.480 &Syntax.CD.Dylan.Dylan\ lid :cal SetSyn("dylanlid") ! am 50.30.100 &Syntax.EFG.Eiffel :cal SetSyn("eiffel") ! am 50.30.110 &Syntax.EFG.Elm\ Filter :cal SetSyn("elmfilt") ! am 50.30.120 &Syntax.EFG.Embedix\ Component\ Description :cal SetSyn("ecd") ! am 50.30.130 &Syntax.EFG.ERicsson\ LANGuage :cal SetSyn("erlang") ! am 50.30.140 &Syntax.EFG.ESQL-C :cal SetSyn("esqlc") ! am 50.30.150 &Syntax.EFG.Eterm\ config :cal SetSyn("eterm") ! am 50.30.160 &Syntax.EFG.Expect :cal SetSyn("expect") ! am 50.30.170 &Syntax.EFG.Exports :cal SetSyn("exports") ! am 50.30.190 &Syntax.EFG.Focus\ Executable :cal SetSyn("focexec") ! am 50.30.200 &Syntax.EFG.Focus\ Master :cal SetSyn("master") ! am 50.30.210 &Syntax.EFG.FORM :cal SetSyn("form") ! am 50.30.220 &Syntax.EFG.Forth :cal SetSyn("forth") ! am 50.30.230 &Syntax.EFG.Fortran :cal SetSyn("fortran") ! am 50.30.240 &Syntax.EFG.FoxPro :cal SetSyn("foxpro") ! am 50.30.250 &Syntax.EFG.Fvwm\ configuration :cal SetSyn("fvwm1") ! am 50.30.260 &Syntax.EFG.Fvwm2\ configuration :cal SetSyn("fvwm2") ! am 50.30.280 &Syntax.EFG.GDB\ command\ file :cal SetSyn("gdb") ! am 50.30.290 &Syntax.EFG.GDMO :cal SetSyn("gdmo") ! am 50.30.300 &Syntax.EFG.Gedcom :cal SetSyn("gedcom") ! am 50.30.310 &Syntax.EFG.GP :cal SetSyn("gp") ! am 50.30.320 &Syntax.EFG.GNU\ Server\ Pages :cal SetSyn("gsp") ! am 50.30.330 &Syntax.EFG.GNUplot :cal SetSyn("gnuplot") ! am 50.30.340 &Syntax.EFG.GTKrc :cal SetSyn("gtkrc") ! am 50.40.100 &Syntax.HIJK.Haskell :cal SetSyn("haskell") ! am 50.40.110 &Syntax.HIJK.Haskell-literate :cal SetSyn("lhaskell") ! am 50.40.120 &Syntax.HIJK.Hercules :cal SetSyn("hercules") ! am 50.40.130 &Syntax.HIJK.HTML :cal SetSyn("html") ! am 50.40.140 &Syntax.HIJK.HTML\ with\ M4 :cal SetSyn("htmlm4") ! am 50.40.150 &Syntax.HIJK.HTML/OS :cal SetSyn("htmlos") ! am 50.40.160 &Syntax.HIJK.Hyper\ Builder :cal SetSyn("hb") ! am 50.40.180 &Syntax.HIJK.Icon :cal SetSyn("icon") ! am 50.40.190 &Syntax.HIJK.IDL :cal SetSyn("idl") ! am 50.40.200 &Syntax.HIJK.Indent\ profile :cal SetSyn("indent") ! am 50.40.210 &Syntax.HIJK.Inform :cal SetSyn("inform") ! am 50.40.220 &Syntax.HIJK.Informix\ 4GL :cal SetSyn("fgl") ! am 50.40.230 &Syntax.HIJK.Inittab :cal SetSyn("inittab") ! am 50.40.240 &Syntax.HIJK.Inno\ Setup :cal SetSyn("iss") ! am 50.40.250 &Syntax.HIJK.InstallShield\ Rules :cal SetSyn("ishd") ! am 50.40.260 &Syntax.HIJK.Interactive\ Data\ Lang :cal SetSyn("idlang") ! am 50.40.280 &Syntax.HIJK.Jam :cal SetSyn("jam") ! am 50.40.290 &Syntax.HIJK.Jargon :cal SetSyn("jargon") ! am 50.40.300 &Syntax.HIJK.Java.Java :cal SetSyn("java") ! am 50.40.310 &Syntax.HIJK.Java.JavaCC :cal SetSyn("javacc") ! am 50.40.320 &Syntax.HIJK.Java.Java\ Server\ Pages :cal SetSyn("jsp") ! am 50.40.330 &Syntax.HIJK.Java.Java\ Properties :cal SetSyn("jproperties") ! am 50.40.340 &Syntax.HIJK.JavaScript :cal SetSyn("javascript") ! am 50.40.350 &Syntax.HIJK.Jess :cal SetSyn("jess") ! am 50.40.360 &Syntax.HIJK.Jgraph :cal SetSyn("jgraph") ! am 50.40.380 &Syntax.HIJK.KDE\ script :cal SetSyn("kscript") ! am 50.40.390 &Syntax.HIJK.Kimwitu :cal SetSyn("kwt") ! am 50.40.400 &Syntax.HIJK.Kixtart :cal SetSyn("kix") ! am 50.50.100 &Syntax.L-Ma.Lace :cal SetSyn("lace") ! am 50.50.110 &Syntax.L-Ma.Lamda\ Prolog :cal SetSyn("lprolog") ! am 50.50.120 &Syntax.L-Ma.Latte :cal SetSyn("latte") ! am 50.50.130 &Syntax.L-Ma.Lex :cal SetSyn("lex") ! am 50.50.140 &Syntax.L-Ma.LFTP :cal SetSyn("lftp") ! am 50.50.150 &Syntax.L-Ma.Lilo :cal SetSyn("lilo") ! am 50.50.160 &Syntax.L-Ma.Lisp :cal SetSyn("lisp") ! am 50.50.170 &Syntax.L-Ma.Lite :cal SetSyn("lite") ! am 50.50.180 &Syntax.L-Ma.LOTOS :cal SetSyn("lotos") ! am 50.50.190 &Syntax.L-Ma.Lout :cal SetSyn("lout") ! am 50.50.200 &Syntax.L-Ma.Lua :cal SetSyn("lua") ! am 50.50.210 &Syntax.L-Ma.Lynx\ Style :cal SetSyn("lss") ! am 50.50.220 &Syntax.L-Ma.Lynx\ config :cal SetSyn("lynx") ! am 50.50.240 &Syntax.L-Ma.M4 :cal SetSyn("m4") ! am 50.50.250 &Syntax.L-Ma.MaGic\ Point :cal SetSyn("mgp") ! am 50.50.260 &Syntax.L-Ma.Mail :cal SetSyn("mail") ! am 50.50.270 &Syntax.L-Ma.Makefile :cal SetSyn("make") ! am 50.50.280 &Syntax.L-Ma.MakeIndex :cal SetSyn("ist") ! am 50.50.290 &Syntax.L-Ma.Man\ page :cal SetSyn("man") ! am 50.50.300 &Syntax.L-Ma.Maple :cal SetSyn("maple") ! am 50.50.310 &Syntax.L-Ma.Mason :cal SetSyn("mason") ! am 50.50.320 &Syntax.L-Ma.Mathematica :cal SetSyn("mma") ! am 50.50.330 &Syntax.L-Ma.Matlab :cal SetSyn("matlab") ! am 50.60.100 &Syntax.Me-NO.MEL\ (for\ Maya) :cal SetSyn("mel") ! am 50.60.110 &Syntax.Me-NO.Metafont :cal SetSyn("mf") ! am 50.60.120 &Syntax.Me-NO.MetaPost :cal SetSyn("mp") ! am 50.60.130 &Syntax.Me-NO.MS\ Module\ Definition :cal SetSyn("def") ! am 50.60.140 &Syntax.Me-NO.Model :cal SetSyn("model") ! am 50.60.150 &Syntax.Me-NO.Modsim\ III :cal SetSyn("modsim3") ! am 50.60.160 &Syntax.Me-NO.Modula\ 2 :cal SetSyn("modula2") ! am 50.60.170 &Syntax.Me-NO.Modula\ 3 :cal SetSyn("modula3") ! am 50.60.180 &Syntax.Me-NO.Msql :cal SetSyn("msql") ! am 50.60.190 &Syntax.Me-NO.MS-DOS.MS-DOS\ \.bat\ file :cal SetSyn("dosbatch") ! am 50.60.200 &Syntax.Me-NO.MS-DOS.4DOS\ \.bat\ file :cal SetSyn("btm") ! am 50.60.210 &Syntax.Me-NO.MS-DOS.MS-DOS\ \.ini\ file :cal SetSyn("dosini") ! am 50.60.220 &Syntax.Me-NO.MS\ Resource\ file :cal SetSyn("rc") ! am 50.60.230 &Syntax.Me-NO.Mush :cal SetSyn("mush") ! am 50.60.240 &Syntax.Me-NO.Muttrc :cal SetSyn("muttrc") ! am 50.60.260 &Syntax.Me-NO.Nastran\ input/DMAP :cal SetSyn("nastran") ! am 50.60.270 &Syntax.Me-NO.Natural :cal SetSyn("natural") ! am 50.60.280 &Syntax.Me-NO.Novell\ batch :cal SetSyn("ncf") ! am 50.60.290 &Syntax.Me-NO.Not\ Quite\ C :cal SetSyn("nqc") ! am 50.60.300 &Syntax.Me-NO.Nroff :cal SetSyn("nroff") ! am 50.60.320 &Syntax.Me-NO.Objective\ C :cal SetSyn("objc") ! am 50.60.330 &Syntax.Me-NO.OCAML :cal SetSyn("ocaml") ! am 50.60.340 &Syntax.Me-NO.Omnimark :cal SetSyn("omnimark") ! am 50.60.350 &Syntax.Me-NO.OpenROAD :cal SetSyn("openroad") ! am 50.60.360 &Syntax.Me-NO.Open\ Psion\ Lang :cal SetSyn("opl") ! am 50.60.370 &Syntax.Me-NO.Oracle\ config :cal SetSyn("ora") ! am 50.70.100 &Syntax.PQ.Palm\ resource\ compiler :cal SetSyn("pilrc") ! am 50.70.110 &Syntax.PQ.PApp :cal SetSyn("papp") ! am 50.70.120 &Syntax.PQ.Pascal :cal SetSyn("pascal") ! am 50.70.130 &Syntax.PQ.PCCTS :cal SetSyn("pccts") ! am 50.70.140 &Syntax.PQ.PPWizard :cal SetSyn("ppwiz") ! am 50.70.150 &Syntax.PQ.Perl.Perl :cal SetSyn("perl") ! am 50.70.160 &Syntax.PQ.Perl.Perl\ POD :cal SetSyn("pod") ! am 50.70.170 &Syntax.PQ.Perl.Perl\ XS :cal SetSyn("xs") ! am 50.70.180 &Syntax.PQ.PHP\ 3-4 :cal SetSyn("php") ! am 50.70.190 &Syntax.PQ.Phtml :cal SetSyn("phtml") ! am 50.70.200 &Syntax.PQ.Pike :cal SetSyn("pike") ! am 50.70.210 &Syntax.PQ.Pine\ RC :cal SetSyn("pine") ! am 50.70.220 &Syntax.PQ.PL/M :cal SetSyn("plm") ! am 50.70.230 &Syntax.PQ.PL/SQL :cal SetSyn("plsql") ! am 50.70.240 &Syntax.PQ.PO\ (GNU\ gettext) :cal SetSyn("po") ! am 50.70.250 &Syntax.PQ.Postfix\ main\ config :cal SetSyn("pfmain") ! am 50.70.260 &Syntax.PQ.PostScript :cal SetSyn("postscr") ! am 50.70.270 &Syntax.PQ.Povray :cal SetSyn("pov") ! am 50.70.280 &Syntax.PQ.Povray\ configuration :cal SetSyn("povini") ! am 50.70.290 &Syntax.PQ.Printcap :cal SetSyn("pcap") ! am 50.70.300 &Syntax.PQ.Procmail :cal SetSyn("procmail") ! am 50.70.310 &Syntax.PQ.Product\ Spec\ File :cal SetSyn("psf") ! am 50.70.320 &Syntax.PQ.Progress :cal SetSyn("progress") ! am 50.70.330 &Syntax.PQ.Prolog :cal SetSyn("prolog") ! am 50.70.340 &Syntax.PQ.Purify\ log :cal SetSyn("purifylog") ! am 50.70.350 &Syntax.PQ.Python :cal SetSyn("python") ! am 50.80.100 &Syntax.R-Sg.R :cal SetSyn("r") ! am 50.80.110 &Syntax.R-Sg.Radiance :cal SetSyn("radiance") ! am 50.80.120 &Syntax.R-Sg.Ratpoison :cal SetSyn("ratpoison") ! am 50.80.130 &Syntax.R-Sg.Readline\ config :cal SetSyn("readline") ! am 50.80.140 &Syntax.R-Sg.RCS\ log\ output :cal SetSyn("rcslog") ! am 50.80.150 &Syntax.R-Sg.Rebol :cal SetSyn("rebol") ! am 50.80.160 &Syntax.R-Sg.Registry\ of\ MS-Windows :cal SetSyn("registry") ! am 50.80.170 &Syntax.R-Sg.Remind :cal SetSyn("remind") ! am 50.80.180 &Syntax.R-Sg.Renderman\ Shader\ Lang :cal SetSyn("sl") ! am 50.80.190 &Syntax.R-Sg.Rexx :cal SetSyn("rexx") ! am 50.80.200 &Syntax.R-Sg.Robots\.txt :cal SetSyn("robots") ! am 50.80.210 &Syntax.R-Sg.Rpcgen :cal SetSyn("rpcgen") ! am 50.80.220 &Syntax.R-Sg.RTF :cal SetSyn("rtf") ! am 50.80.230 &Syntax.R-Sg.Ruby :cal SetSyn("ruby") ! am 50.80.250 &Syntax.R-Sg.S-lang :cal SetSyn("slang") ! am 50.80.260 &Syntax.R-Sg.Samba\ config :cal SetSyn("samba") ! am 50.80.270 &Syntax.R-Sg.SAS :cal SetSyn("sas") ! am 50.80.280 &Syntax.R-Sg.Sather :cal SetSyn("sather") ! am 50.80.290 &Syntax.R-Sg.Scheme :cal SetSyn("scheme") ! am 50.80.300 &Syntax.R-Sg.Screen\ RC :cal SetSyn("screen") ! am 50.80.310 &Syntax.R-Sg.SDL :cal SetSyn("sdl") ! am 50.80.320 &Syntax.R-Sg.Sed :cal SetSyn("sed") ! am 50.80.330 &Syntax.R-Sg.Sendmail\.cf :cal SetSyn("sm") ! am 50.80.340 &Syntax.R-Sg.SGML.SGML\ catalog :cal SetSyn("catalog") ! am 50.80.350 &Syntax.R-Sg.SGML.SGML\ DTD :cal SetSyn("sgml") ! am 50.80.360 &Syntax.R-Sg.SGML.SGML\ Declarations :cal SetSyn("sgmldecl") ! am 50.80.370 &Syntax.R-Sg.SGML.SGML\ linuxdoc :cal SetSyn("sgmllnx") ! am 50.90.100 &Syntax.Sh-S.Sh\ shell\ script :cal SetSyn("sh") ! am 50.90.110 &Syntax.Sh-S.SiCAD :cal SetSyn("sicad") ! am 50.90.120 &Syntax.Sh-S.Simula :cal SetSyn("simula") ! am 50.90.130 &Syntax.Sh-S.Sinda.Sinda\ compare :cal SetSyn("sindacmp") ! am 50.90.140 &Syntax.Sh-S.Sinda.Sinda\ input :cal SetSyn("sinda") ! am 50.90.150 &Syntax.Sh-S.Sinda.Sinda\ output :cal SetSyn("sindaout") ! am 50.90.160 &Syntax.Sh-S.SKILL :cal SetSyn("skill") ! am 50.90.170 &Syntax.Sh-S.SLRN.SLRN\ rc :cal SetSyn("slrnrc") ! am 50.90.180 &Syntax.Sh-S.SLRN.SLRN\ score :cal SetSyn("slrnsc") ! am 50.90.190 &Syntax.Sh-S.SmallTalk :cal SetSyn("st") ! am 50.90.200 &Syntax.Sh-S.SMIL :cal SetSyn("smil") ! am 50.90.210 &Syntax.Sh-S.SMITH :cal SetSyn("smith") ! am 50.90.220 &Syntax.Sh-S.SNMP\ MIB :cal SetSyn("mib") ! am 50.90.230 &Syntax.Sh-S.SNNS.SNNS\ network :cal SetSyn("snnsnet") ! am 50.90.240 &Syntax.Sh-S.SNNS.SNNS\ pattern :cal SetSyn("snnspat") ! am 50.90.250 &Syntax.Sh-S.SNNS.SNNS\ result :cal SetSyn("snnsres") ! am 50.90.260 &Syntax.Sh-S.Snobol4 :cal SetSyn("snobol4") ! am 50.90.270 &Syntax.Sh-S.Snort\ Configuration :cal SetSyn("hog") ! am 50.90.280 &Syntax.Sh-S.SPEC\ (Linux\ RPM) :cal SetSyn("spec") ! am 50.90.290 &Syntax.Sh-S.Specman :cal SetSyn("specman") ! am 50.90.300 &Syntax.Sh-S.Spice :cal SetSyn("spice") ! am 50.90.310 &Syntax.Sh-S.Speedup :cal SetSyn("spup") ! am 50.90.320 &Syntax.Sh-S.Squid :cal SetSyn("squid") ! am 50.90.330 &Syntax.Sh-S.SQL :cal SetSyn("sql") ! am 50.90.340 &Syntax.Sh-S.SQL\ Forms :cal SetSyn("sqlforms") ! am 50.90.350 &Syntax.Sh-S.SQR :cal SetSyn("sqr") ! am 50.90.360 &Syntax.Sh-S.Standard\ ML :cal SetSyn("sml") ! am 50.90.370 &Syntax.Sh-S.Stored\ Procedures :cal SetSyn("stp") ! am 50.90.380 &Syntax.Sh-S.Strace :cal SetSyn("strace") ! am 50.100.100 &Syntax.TUV.Tads :cal SetSyn("tads") ! am 50.100.110 &Syntax.TUV.Tags :cal SetSyn("tags") ! am 50.100.120 &Syntax.TUV.TAK.TAK\ compare :cal SetSyn("tak") ! am 50.100.130 &Syntax.TUV.TAK.TAK\ input :cal SetSyn("tak") ! am 50.100.140 &Syntax.TUV.TAK.TAK\ output :cal SetSyn("takout") ! am 50.100.150 &Syntax.TUV.Tcl/Tk :cal SetSyn("tcl") ! am 50.100.160 &Syntax.TUV.TealInfo :cal SetSyn("tli") ! am 50.100.170 &Syntax.TUV.Telix\ Salt :cal SetSyn("tsalt") ! am 50.100.180 &Syntax.TUV.Termcap :cal SetSyn("ptcap") ! am 50.100.190 &Syntax.TUV.Terminfo :cal SetSyn("terminfo") ! am 50.100.200 &Syntax.TUV.TeX :cal SetSyn("tex") ! am 50.100.210 &Syntax.TUV.TeX\ configuration :cal SetSyn("texmf") ! am 50.100.220 &Syntax.TUV.Texinfo :cal SetSyn("texinfo") ! am 50.100.230 &Syntax.TUV.TF\ mud\ client :cal SetSyn("tf") ! am 50.100.240 &Syntax.TUV.Tidy\ configuration :cal SetSyn("tidy") ! am 50.100.250 &Syntax.TUV.Trasys\ input :cal SetSyn("trasys") ! am 50.100.260 &Syntax.TUV.TSS.Command\ Line :cal SetSyn("tsscl") ! am 50.100.270 &Syntax.TUV.TSS.Geometry :cal SetSyn("tssgm") ! am 50.100.280 &Syntax.TUV.TSS.Optics :cal SetSyn("tssop") ! am 50.100.300 &Syntax.TUV.UIT/UIL :cal SetSyn("uil") ! am 50.100.310 &Syntax.TUV.UnrealScript :cal SetSyn("uc") ! am 50.100.330 &Syntax.TUV.Verilog\ HDL :cal SetSyn("verilog") ! am 50.100.340 &Syntax.TUV.Vgrindefs :cal SetSyn("vgrindefs") ! am 50.100.350 &Syntax.TUV.VHDL :cal SetSyn("vhdl") ! am 50.100.360 &Syntax.TUV.Vim.Vim\ help\ file :cal SetSyn("help") ! am 50.100.370 &Syntax.TUV.Vim.Vim\ script :cal SetSyn("vim") ! am 50.100.380 &Syntax.TUV.Vim.Viminfo\ file :cal SetSyn("viminfo") ! am 50.100.390 &Syntax.TUV.Virata :cal SetSyn("virata") ! am 50.100.400 &Syntax.TUV.Visual\ Basic :cal SetSyn("vb") ! am 50.100.410 &Syntax.TUV.VRML :cal SetSyn("vrml") ! am 50.100.420 &Syntax.TUV.VSE\ JCL :cal SetSyn("vsejcl") ! am 50.110.100 &Syntax.WXYZ.WEB :cal SetSyn("web") ! am 50.110.110 &Syntax.WXYZ.Webmacro :cal SetSyn("webmacro") ! am 50.110.120 &Syntax.WXYZ.Website\ MetaLanguage :cal SetSyn("wml") ! am 50.110.130 &Syntax.WXYZ.Wdiff :cal SetSyn("wdiff") ! am 50.110.140 &Syntax.WXYZ.Wget\ config :cal SetSyn("wget") ! am 50.110.150 &Syntax.WXYZ.Whitespace\ (add) :cal SetSyn("whitespace") ! am 50.110.160 &Syntax.WXYZ.WinBatch/Webbatch :cal SetSyn("winbatch") ! am 50.110.170 &Syntax.WXYZ.Windows\ Scripting\ Host :cal SetSyn("wsh") ! am 50.110.190 &Syntax.WXYZ.X\ Keyboard\ Extension :cal SetSyn("xkb") ! am 50.110.200 &Syntax.WXYZ.X\ Pixmap :cal SetSyn("xpm") ! am 50.110.210 &Syntax.WXYZ.X\ Pixmap\ (2) :cal SetSyn("xpm2") ! am 50.110.220 &Syntax.WXYZ.X\ resources :cal SetSyn("xdefaults") ! am 50.110.230 &Syntax.WXYZ.Xmath :cal SetSyn("xmath") ! am 50.110.240 &Syntax.WXYZ.XML :cal SetSyn("xml") ! am 50.110.250 &Syntax.WXYZ.XXD\ hex\ dump :cal SetSyn("xxd") ! am 50.110.270 &Syntax.WXYZ.Yacc :cal SetSyn("yacc") ! am 50.110.290 &Syntax.WXYZ.Zsh\ shell\ script :cal SetSyn("zsh") " The End Of The Syntax Menu ! am 50.195 &Syntax.-SEP1- : ! am 50.200 &Syntax.Set\ '&syntax'\ only :let s:syntax_menu_synonly=1 ! am 50.202 &Syntax.Set\ '&filetype'\ too :call Nosynonly() fun! s:Nosynonly() if exists("s:syntax_menu_synonly") unlet s:syntax_menu_synonly endif endfun ! am 50.210 &Syntax.&Off :syn off ! am 50.700 &Syntax.-SEP3- : ! am 50.710 &Syntax.Co&lor\ test :sp $VIMRUNTIME/syntax/colortest.vimso % ! am 50.720 &Syntax.&Highlight\ test :so $VIMRUNTIME/syntax/hitest.vim ! am 50.730 &Syntax.&Convert\ to\ HTML :so $VIMRUNTIME/syntax/2html.vim endif " !exists("did_install_syntax_menu") --- 923,1261 ---- " The following menu items are generated by makemenu.vim. " The Start Of The Syntax Menu ! an 50.10.100 &Syntax.AB.Abaqus :cal SetSyn("abaqus") ! an 50.10.110 &Syntax.AB.ABC :cal SetSyn("abc") ! an 50.10.120 &Syntax.AB.ABEL :cal SetSyn("abel") ! an 50.10.130 &Syntax.AB.Ada :cal SetSyn("ada") ! an 50.10.140 &Syntax.AB.Aflex :cal SetSyn("aflex") ! an 50.10.150 &Syntax.AB.AHDL :cal SetSyn("ahdl") ! an 50.10.160 &Syntax.AB.Amiga\ DOS :cal SetSyn("amiga") ! an 50.10.170 &Syntax.AB.Ant :cal SetSyn("ant") ! an 50.10.180 &Syntax.AB.Antlr :cal SetSyn("antlr") ! an 50.10.190 &Syntax.AB.Apache\ config :cal SetSyn("apache") ! an 50.10.200 &Syntax.AB.Apache-style\ config :cal SetSyn("apachestyle") ! an 50.10.210 &Syntax.AB.Applix\ ELF :cal SetSyn("elf") ! an 50.10.220 &Syntax.AB.Arc\ Macro\ Language :cal SetSyn("aml") ! an 50.10.230 &Syntax.AB.ASP\ with\ VBSages :cal SetSyn("aspvbs") ! an 50.10.240 &Syntax.AB.ASP\ with\ Perl :cal SetSyn("aspperl") ! an 50.10.250 &Syntax.AB.Assembly.680x0 :cal SetSyn("asm68k") ! an 50.10.260 &Syntax.AB.Assembly.GNU :cal SetSyn("asm") ! an 50.10.270 &Syntax.AB.Assembly.H8300 :cal SetSyn("asmh8300") ! an 50.10.280 &Syntax.AB.Assembly.Intel\ Itanium :cal SetSyn("ia64") ! an 50.10.290 &Syntax.AB.Assembly.Microsoft :cal SetSyn("masm") ! an 50.10.300 &Syntax.AB.Assembly.Netwide :cal SetSyn("nasm") ! an 50.10.310 &Syntax.AB.Assembly.PIC :cal SetSyn("pic") ! an 50.10.320 &Syntax.AB.Assembly.Turbo :cal SetSyn("tasm") ! an 50.10.330 &Syntax.AB.Assembly.Z-80 :cal SetSyn("z8a") ! an 50.10.340 &Syntax.AB.ASN\.1 :cal SetSyn("asn") ! an 50.10.350 &Syntax.AB.Atlas :cal SetSyn("atlas") ! an 50.10.360 &Syntax.AB.Automake :cal SetSyn("automake") ! an 50.10.370 &Syntax.AB.Avenue :cal SetSyn("ave") ! an 50.10.380 &Syntax.AB.Awk :cal SetSyn("awk") ! an 50.10.390 &Syntax.AB.Ayacc :cal SetSyn("ayacc") ! an 50.10.410 &Syntax.AB.B :cal SetSyn("b") ! an 50.10.420 &Syntax.AB.Baan :cal SetSyn("baan") ! an 50.10.430 &Syntax.AB.BASIC :cal SetSyn("basic") ! an 50.10.440 &Syntax.AB.BC\ calculator :cal SetSyn("bc") ! an 50.10.450 &Syntax.AB.BDF\ font :cal SetSyn("bdf") ! an 50.10.460 &Syntax.AB.BibFile :cal SetSyn("bib") ! an 50.10.470 &Syntax.AB.BIND\ configuration :cal SetSyn("named") ! an 50.10.480 &Syntax.AB.BIND\ zone :cal SetSyn("bindzone") ! an 50.10.490 &Syntax.AB.Blank :cal SetSyn("blank") ! an 50.20.100 &Syntax.CD.C :cal SetSyn("c") ! an 50.20.110 &Syntax.CD.C++ :cal SetSyn("cpp") ! an 50.20.120 &Syntax.CD.Crontab :cal SetSyn("crontab") ! an 50.20.130 &Syntax.CD.Cyn++ :cal SetSyn("cynpp") ! an 50.20.140 &Syntax.CD.Cynlib :cal SetSyn("cynlib") ! an 50.20.150 &Syntax.CD.Cascading\ Style\ Sheets :cal SetSyn("css") ! an 50.20.160 &Syntax.CD.Century\ Term :cal SetSyn("cterm") ! an 50.20.170 &Syntax.CD.CFG :cal SetSyn("cfg") ! an 50.20.180 &Syntax.CD.CHILL :cal SetSyn("ch") ! an 50.20.190 &Syntax.CD.Change :cal SetSyn("change") ! an 50.20.200 &Syntax.CD.ChangeLog :cal SetSyn("changelog") ! an 50.20.210 &Syntax.CD.Clean :cal SetSyn("clean") ! an 50.20.220 &Syntax.CD.Clever :cal SetSyn("cl") ! an 50.20.230 &Syntax.CD.Clipper :cal SetSyn("clipper") ! an 50.20.240 &Syntax.CD.Cold\ Fusion :cal SetSyn("cf") ! an 50.20.250 &Syntax.CD.Configure\ script :cal SetSyn("config") ! an 50.20.260 &Syntax.CD.Csh\ shell\ script :cal SetSyn("csh") ! an 50.20.270 &Syntax.CD.Ctrl-H :cal SetSyn("ctrlh") ! an 50.20.280 &Syntax.CD.Cobol :cal SetSyn("cobol") ! an 50.20.290 &Syntax.CD.CSP :cal SetSyn("csp") ! an 50.20.300 &Syntax.CD.CUPL.CUPL :cal SetSyn("cupl") ! an 50.20.310 &Syntax.CD.CUPL.simulation :cal SetSyn("cuplsim") ! an 50.20.320 &Syntax.CD.CVS\ commit :cal SetSyn("cvs") ! an 50.20.330 &Syntax.CD.CWEB :cal SetSyn("cweb") ! an 50.20.350 &Syntax.CD.Debian.Debian\ ChangeLog :cal SetSyn("debchangelog") ! an 50.20.360 &Syntax.CD.Debian.Debian\ Control :cal SetSyn("debcontrol") ! an 50.20.370 &Syntax.CD.Diff :cal SetSyn("diff") ! an 50.20.380 &Syntax.CD.Digital\ Command\ Lang :cal SetSyn("dcl") ! an 50.20.390 &Syntax.CD.Diva\ (with\ SKILL) :cal SetSyn("diva") ! an 50.20.400 &Syntax.CD.DNS :cal SetSyn("dns") ! an 50.20.410 &Syntax.CD.DOT :cal SetSyn("dto") ! an 50.20.420 &Syntax.CD.Dracula :cal SetSyn("dracula") ! an 50.20.430 &Syntax.CD.DSSSL :cal SetSyn("dsl") ! an 50.20.440 &Syntax.CD.DTD :cal SetSyn("dtd") ! an 50.20.450 &Syntax.CD.DTML\ (Zope) :cal SetSyn("dtml") ! an 50.20.460 &Syntax.CD.Dylan.Dylan :cal SetSyn("dylan") ! an 50.20.470 &Syntax.CD.Dylan.Dylan\ intr :cal SetSyn("dylanintr") ! an 50.20.480 &Syntax.CD.Dylan.Dylan\ lid :cal SetSyn("dylanlid") ! an 50.30.100 &Syntax.EFG.Eiffel :cal SetSyn("eiffel") ! an 50.30.110 &Syntax.EFG.Elm\ Filter :cal SetSyn("elmfilt") ! an 50.30.120 &Syntax.EFG.Embedix\ Component\ Description :cal SetSyn("ecd") ! an 50.30.130 &Syntax.EFG.ERicsson\ LANGuage :cal SetSyn("erlang") ! an 50.30.140 &Syntax.EFG.ESQL-C :cal SetSyn("esqlc") ! an 50.30.150 &Syntax.EFG.Eterm\ config :cal SetSyn("eterm") ! an 50.30.160 &Syntax.EFG.Expect :cal SetSyn("expect") ! an 50.30.170 &Syntax.EFG.Exports :cal SetSyn("exports") ! an 50.30.190 &Syntax.EFG.Focus\ Executable :cal SetSyn("focexec") ! an 50.30.200 &Syntax.EFG.Focus\ Master :cal SetSyn("master") ! an 50.30.210 &Syntax.EFG.FORM :cal SetSyn("form") ! an 50.30.220 &Syntax.EFG.Forth :cal SetSyn("forth") ! an 50.30.230 &Syntax.EFG.Fortran :cal SetSyn("fortran") ! an 50.30.240 &Syntax.EFG.FoxPro :cal SetSyn("foxpro") ! an 50.30.250 &Syntax.EFG.Fvwm\ configuration :cal SetSyn("fvwm1") ! an 50.30.260 &Syntax.EFG.Fvwm2\ configuration :cal SetSyn("fvwm2") ! an 50.30.280 &Syntax.EFG.GDB\ command\ file :cal SetSyn("gdb") ! an 50.30.290 &Syntax.EFG.GDMO :cal SetSyn("gdmo") ! an 50.30.300 &Syntax.EFG.Gedcom :cal SetSyn("gedcom") ! an 50.30.310 &Syntax.EFG.GP :cal SetSyn("gp") ! an 50.30.320 &Syntax.EFG.GNU\ Server\ Pages :cal SetSyn("gsp") ! an 50.30.330 &Syntax.EFG.GNUplot :cal SetSyn("gnuplot") ! an 50.30.340 &Syntax.EFG.GTKrc :cal SetSyn("gtkrc") ! an 50.40.100 &Syntax.HIJK.Haskell.Haskell :cal SetSyn("haskell") ! an 50.40.110 &Syntax.HIJK.Haskell.Haskell-c2hs :cal SetSyn("chaskell") ! an 50.40.120 &Syntax.HIJK.Haskell.Haskell-literate :cal SetSyn("lhaskell") ! an 50.40.130 &Syntax.HIJK.Hercules :cal SetSyn("hercules") ! an 50.40.140 &Syntax.HIJK.HTML :cal SetSyn("html") ! an 50.40.150 &Syntax.HIJK.HTML\ with\ M4 :cal SetSyn("htmlm4") ! an 50.40.160 &Syntax.HIJK.HTML/OS :cal SetSyn("htmlos") ! an 50.40.170 &Syntax.HIJK.Hyper\ Builder :cal SetSyn("hb") ! an 50.40.190 &Syntax.HIJK.Icon :cal SetSyn("icon") ! an 50.40.200 &Syntax.HIJK.IDL :cal SetSyn("idl") ! an 50.40.210 &Syntax.HIJK.Indent\ profile :cal SetSyn("indent") ! an 50.40.220 &Syntax.HIJK.Inform :cal SetSyn("inform") ! an 50.40.230 &Syntax.HIJK.Informix\ 4GL :cal SetSyn("fgl") ! an 50.40.240 &Syntax.HIJK.Inittab :cal SetSyn("inittab") ! an 50.40.250 &Syntax.HIJK.Inno\ Setup :cal SetSyn("iss") ! an 50.40.260 &Syntax.HIJK.InstallShield\ Rules :cal SetSyn("ishd") ! an 50.40.270 &Syntax.HIJK.Interactive\ Data\ Lang :cal SetSyn("idlang") ! an 50.40.290 &Syntax.HIJK.Jam :cal SetSyn("jam") ! an 50.40.300 &Syntax.HIJK.Jargon :cal SetSyn("jargon") ! an 50.40.310 &Syntax.HIJK.Java.Java :cal SetSyn("java") ! an 50.40.320 &Syntax.HIJK.Java.JavaCC :cal SetSyn("javacc") ! an 50.40.330 &Syntax.HIJK.Java.Java\ Server\ Pages :cal SetSyn("jsp") ! an 50.40.340 &Syntax.HIJK.Java.Java\ Properties :cal SetSyn("jproperties") ! an 50.40.350 &Syntax.HIJK.JavaScript :cal SetSyn("javascript") ! an 50.40.360 &Syntax.HIJK.Jess :cal SetSyn("jess") ! an 50.40.370 &Syntax.HIJK.Jgraph :cal SetSyn("jgraph") ! an 50.40.390 &Syntax.HIJK.KDE\ script :cal SetSyn("kscript") ! an 50.40.400 &Syntax.HIJK.Kimwitu :cal SetSyn("kwt") ! an 50.40.410 &Syntax.HIJK.Kixtart :cal SetSyn("kix") ! an 50.50.100 &Syntax.L-Ma.Lace :cal SetSyn("lace") ! an 50.50.110 &Syntax.L-Ma.Lamda\ Prolog :cal SetSyn("lprolog") ! an 50.50.120 &Syntax.L-Ma.Latte :cal SetSyn("latte") ! an 50.50.130 &Syntax.L-Ma.Lex :cal SetSyn("lex") ! an 50.50.140 &Syntax.L-Ma.LFTP :cal SetSyn("lftp") ! an 50.50.150 &Syntax.L-Ma.Lilo :cal SetSyn("lilo") ! an 50.50.160 &Syntax.L-Ma.Lisp :cal SetSyn("lisp") ! an 50.50.170 &Syntax.L-Ma.Lite :cal SetSyn("lite") ! an 50.50.180 &Syntax.L-Ma.LOTOS :cal SetSyn("lotos") ! an 50.50.190 &Syntax.L-Ma.LotusScript :cal SetSyn("lscript") ! an 50.50.200 &Syntax.L-Ma.Lout :cal SetSyn("lout") ! an 50.50.210 &Syntax.L-Ma.Lua :cal SetSyn("lua") ! an 50.50.220 &Syntax.L-Ma.Lynx\ Style :cal SetSyn("lss") ! an 50.50.230 &Syntax.L-Ma.Lynx\ config :cal SetSyn("lynx") ! an 50.50.250 &Syntax.L-Ma.M4 :cal SetSyn("m4") ! an 50.50.260 &Syntax.L-Ma.MaGic\ Point :cal SetSyn("mgp") ! an 50.50.270 &Syntax.L-Ma.Mail :cal SetSyn("mail") ! an 50.50.280 &Syntax.L-Ma.Makefile :cal SetSyn("make") ! an 50.50.290 &Syntax.L-Ma.MakeIndex :cal SetSyn("ist") ! an 50.50.300 &Syntax.L-Ma.Man\ page :cal SetSyn("man") ! an 50.50.310 &Syntax.L-Ma.Maple :cal SetSyn("maple") ! an 50.50.320 &Syntax.L-Ma.Mason :cal SetSyn("mason") ! an 50.50.330 &Syntax.L-Ma.Mathematica :cal SetSyn("mma") ! an 50.50.340 &Syntax.L-Ma.Matlab :cal SetSyn("matlab") ! an 50.60.100 &Syntax.Me-NO.MEL\ (for\ Maya) :cal SetSyn("mel") ! an 50.60.110 &Syntax.Me-NO.Metafont :cal SetSyn("mf") ! an 50.60.120 &Syntax.Me-NO.MetaPost :cal SetSyn("mp") ! an 50.60.130 &Syntax.Me-NO.MS\ Module\ Definition :cal SetSyn("def") ! an 50.60.140 &Syntax.Me-NO.Model :cal SetSyn("model") ! an 50.60.150 &Syntax.Me-NO.Modsim\ III :cal SetSyn("modsim3") ! an 50.60.160 &Syntax.Me-NO.Modula\ 2 :cal SetSyn("modula2") ! an 50.60.170 &Syntax.Me-NO.Modula\ 3 :cal SetSyn("modula3") ! an 50.60.180 &Syntax.Me-NO.MOO :cal SetSyn("moo") ! an 50.60.190 &Syntax.Me-NO.Msql :cal SetSyn("msql") ! an 50.60.200 &Syntax.Me-NO.MS-DOS.MS-DOS\ \.bat\ file :cal SetSyn("dosbatch") ! an 50.60.210 &Syntax.Me-NO.MS-DOS.4DOS\ \.bat\ file :cal SetSyn("btm") ! an 50.60.220 &Syntax.Me-NO.MS-DOS.MS-DOS\ \.ini\ file :cal SetSyn("dosini") ! an 50.60.230 &Syntax.Me-NO.MS\ Resource\ file :cal SetSyn("rc") ! an 50.60.240 &Syntax.Me-NO.Mush :cal SetSyn("mush") ! an 50.60.250 &Syntax.Me-NO.Muttrc :cal SetSyn("muttrc") ! an 50.60.270 &Syntax.Me-NO.Nastran\ input/DMAP :cal SetSyn("nastran") ! an 50.60.280 &Syntax.Me-NO.Natural :cal SetSyn("natural") ! an 50.60.290 &Syntax.Me-NO.Novell\ batch :cal SetSyn("ncf") ! an 50.60.300 &Syntax.Me-NO.Not\ Quite\ C :cal SetSyn("nqc") ! an 50.60.310 &Syntax.Me-NO.Nroff :cal SetSyn("nroff") ! an 50.60.330 &Syntax.Me-NO.Objective\ C :cal SetSyn("objc") ! an 50.60.340 &Syntax.Me-NO.OCAML :cal SetSyn("ocaml") ! an 50.60.350 &Syntax.Me-NO.Omnimark :cal SetSyn("omnimark") ! an 50.60.360 &Syntax.Me-NO.OpenROAD :cal SetSyn("openroad") ! an 50.60.370 &Syntax.Me-NO.Open\ Psion\ Lang :cal SetSyn("opl") ! an 50.60.380 &Syntax.Me-NO.Oracle\ config :cal SetSyn("ora") ! an 50.70.100 &Syntax.PQ.Palm\ resource\ compiler :cal SetSyn("pilrc") ! an 50.70.110 &Syntax.PQ.PApp :cal SetSyn("papp") ! an 50.70.120 &Syntax.PQ.Pascal :cal SetSyn("pascal") ! an 50.70.130 &Syntax.PQ.PCCTS :cal SetSyn("pccts") ! an 50.70.140 &Syntax.PQ.PPWizard :cal SetSyn("ppwiz") ! an 50.70.150 &Syntax.PQ.Perl.Perl :cal SetSyn("perl") ! an 50.70.160 &Syntax.PQ.Perl.Perl\ POD :cal SetSyn("pod") ! an 50.70.170 &Syntax.PQ.Perl.Perl\ XS :cal SetSyn("xs") ! an 50.70.180 &Syntax.PQ.PHP\ 3-4 :cal SetSyn("php") ! an 50.70.190 &Syntax.PQ.Phtml :cal SetSyn("phtml") ! an 50.70.200 &Syntax.PQ.Pike :cal SetSyn("pike") ! an 50.70.210 &Syntax.PQ.Pine\ RC :cal SetSyn("pine") ! an 50.70.220 &Syntax.PQ.PL/M :cal SetSyn("plm") ! an 50.70.230 &Syntax.PQ.PL/SQL :cal SetSyn("plsql") ! an 50.70.240 &Syntax.PQ.PO\ (GNU\ gettext) :cal SetSyn("po") ! an 50.70.250 &Syntax.PQ.Postfix\ main\ config :cal SetSyn("pfmain") ! an 50.70.260 &Syntax.PQ.PostScript :cal SetSyn("postscr") ! an 50.70.270 &Syntax.PQ.PostScript\ Printer\ Description :cal SetSyn("ppd") ! an 50.70.280 &Syntax.PQ.Povray :cal SetSyn("pov") ! an 50.70.290 &Syntax.PQ.Povray\ configuration :cal SetSyn("povini") ! an 50.70.300 &Syntax.PQ.Printcap :cal SetSyn("pcap") ! an 50.70.310 &Syntax.PQ.Procmail :cal SetSyn("procmail") ! an 50.70.320 &Syntax.PQ.Product\ Spec\ File :cal SetSyn("psf") ! an 50.70.330 &Syntax.PQ.Progress :cal SetSyn("progress") ! an 50.70.340 &Syntax.PQ.Prolog :cal SetSyn("prolog") ! an 50.70.350 &Syntax.PQ.Purify\ log :cal SetSyn("purifylog") ! an 50.70.360 &Syntax.PQ.Python :cal SetSyn("python") ! an 50.80.100 &Syntax.R-Sg.R :cal SetSyn("r") ! an 50.80.110 &Syntax.R-Sg.Radiance :cal SetSyn("radiance") ! an 50.80.120 &Syntax.R-Sg.Ratpoison :cal SetSyn("ratpoison") ! an 50.80.130 &Syntax.R-Sg.Readline\ config :cal SetSyn("readline") ! an 50.80.140 &Syntax.R-Sg.RCS\ log\ output :cal SetSyn("rcslog") ! an 50.80.150 &Syntax.R-Sg.Rebol :cal SetSyn("rebol") ! an 50.80.160 &Syntax.R-Sg.Registry\ of\ MS-Windows :cal SetSyn("registry") ! an 50.80.170 &Syntax.R-Sg.Remind :cal SetSyn("remind") ! an 50.80.180 &Syntax.R-Sg.Renderman\ Shader\ Lang :cal SetSyn("sl") ! an 50.80.190 &Syntax.R-Sg.Rexx :cal SetSyn("rexx") ! an 50.80.200 &Syntax.R-Sg.Robots\.txt :cal SetSyn("robots") ! an 50.80.210 &Syntax.R-Sg.Rpcgen :cal SetSyn("rpcgen") ! an 50.80.220 &Syntax.R-Sg.RTF :cal SetSyn("rtf") ! an 50.80.230 &Syntax.R-Sg.Ruby :cal SetSyn("ruby") ! an 50.80.250 &Syntax.R-Sg.S-lang :cal SetSyn("slang") ! an 50.80.260 &Syntax.R-Sg.Samba\ config :cal SetSyn("samba") ! an 50.80.270 &Syntax.R-Sg.SAS :cal SetSyn("sas") ! an 50.80.280 &Syntax.R-Sg.Sather :cal SetSyn("sather") ! an 50.80.290 &Syntax.R-Sg.Scheme :cal SetSyn("scheme") ! an 50.80.300 &Syntax.R-Sg.Screen\ RC :cal SetSyn("screen") ! an 50.80.310 &Syntax.R-Sg.SDL :cal SetSyn("sdl") ! an 50.80.320 &Syntax.R-Sg.Sed :cal SetSyn("sed") ! an 50.80.330 &Syntax.R-Sg.Sendmail\.cf :cal SetSyn("sm") ! an 50.80.340 &Syntax.R-Sg.SGML.SGML\ catalog :cal SetSyn("catalog") ! an 50.80.350 &Syntax.R-Sg.SGML.SGML\ DTD :cal SetSyn("sgml") ! an 50.80.360 &Syntax.R-Sg.SGML.SGML\ Declarations :cal SetSyn("sgmldecl") ! an 50.80.370 &Syntax.R-Sg.SGML.SGML\ linuxdoc :cal SetSyn("sgmllnx") ! an 50.90.100 &Syntax.Sh-S.Sh\ shell\ script :cal SetSyn("sh") ! an 50.90.110 &Syntax.Sh-S.SiCAD :cal SetSyn("sicad") ! an 50.90.120 &Syntax.Sh-S.Simula :cal SetSyn("simula") ! an 50.90.130 &Syntax.Sh-S.Sinda.Sinda\ compare :cal SetSyn("sindacmp") ! an 50.90.140 &Syntax.Sh-S.Sinda.Sinda\ input :cal SetSyn("sinda") ! an 50.90.150 &Syntax.Sh-S.Sinda.Sinda\ output :cal SetSyn("sindaout") ! an 50.90.160 &Syntax.Sh-S.SKILL :cal SetSyn("skill") ! an 50.90.170 &Syntax.Sh-S.SLRN.SLRN\ rc :cal SetSyn("slrnrc") ! an 50.90.180 &Syntax.Sh-S.SLRN.SLRN\ score :cal SetSyn("slrnsc") ! an 50.90.190 &Syntax.Sh-S.SmallTalk :cal SetSyn("st") ! an 50.90.200 &Syntax.Sh-S.SMIL :cal SetSyn("smil") ! an 50.90.210 &Syntax.Sh-S.SMITH :cal SetSyn("smith") ! an 50.90.220 &Syntax.Sh-S.SNMP\ MIB :cal SetSyn("mib") ! an 50.90.230 &Syntax.Sh-S.SNNS.SNNS\ network :cal SetSyn("snnsnet") ! an 50.90.240 &Syntax.Sh-S.SNNS.SNNS\ pattern :cal SetSyn("snnspat") ! an 50.90.250 &Syntax.Sh-S.SNNS.SNNS\ result :cal SetSyn("snnsres") ! an 50.90.260 &Syntax.Sh-S.Snobol4 :cal SetSyn("snobol4") ! an 50.90.270 &Syntax.Sh-S.Snort\ Configuration :cal SetSyn("hog") ! an 50.90.280 &Syntax.Sh-S.SPEC\ (Linux\ RPM) :cal SetSyn("spec") ! an 50.90.290 &Syntax.Sh-S.Specman :cal SetSyn("specman") ! an 50.90.300 &Syntax.Sh-S.Spice :cal SetSyn("spice") ! an 50.90.310 &Syntax.Sh-S.Speedup :cal SetSyn("spup") ! an 50.90.320 &Syntax.Sh-S.Splint :cal SetSyn("splint") ! an 50.90.330 &Syntax.Sh-S.Squid :cal SetSyn("squid") ! an 50.90.340 &Syntax.Sh-S.SQL :cal SetSyn("sql") ! an 50.90.350 &Syntax.Sh-S.SQL\ Forms :cal SetSyn("sqlforms") ! an 50.90.360 &Syntax.Sh-S.SQR :cal SetSyn("sqr") ! an 50.90.370 &Syntax.Sh-S.Standard\ ML :cal SetSyn("sml") ! an 50.90.380 &Syntax.Sh-S.Stored\ Procedures :cal SetSyn("stp") ! an 50.90.390 &Syntax.Sh-S.Strace :cal SetSyn("strace") ! an 50.100.100 &Syntax.TUV.Tads :cal SetSyn("tads") ! an 50.100.110 &Syntax.TUV.Tags :cal SetSyn("tags") ! an 50.100.120 &Syntax.TUV.TAK.TAK\ compare :cal SetSyn("tak") ! an 50.100.130 &Syntax.TUV.TAK.TAK\ input :cal SetSyn("tak") ! an 50.100.140 &Syntax.TUV.TAK.TAK\ output :cal SetSyn("takout") ! an 50.100.150 &Syntax.TUV.Tcl/Tk :cal SetSyn("tcl") ! an 50.100.160 &Syntax.TUV.TealInfo :cal SetSyn("tli") ! an 50.100.170 &Syntax.TUV.Telix\ Salt :cal SetSyn("tsalt") ! an 50.100.180 &Syntax.TUV.Termcap :cal SetSyn("ptcap") ! an 50.100.190 &Syntax.TUV.Terminfo :cal SetSyn("terminfo") ! an 50.100.200 &Syntax.TUV.TeX :cal SetSyn("tex") ! an 50.100.210 &Syntax.TUV.TeX\ configuration :cal SetSyn("texmf") ! an 50.100.220 &Syntax.TUV.Texinfo :cal SetSyn("texinfo") ! an 50.100.230 &Syntax.TUV.TF\ mud\ client :cal SetSyn("tf") ! an 50.100.240 &Syntax.TUV.Tidy\ configuration :cal SetSyn("tidy") ! an 50.100.250 &Syntax.TUV.Trasys\ input :cal SetSyn("trasys") ! an 50.100.260 &Syntax.TUV.TSS.Command\ Line :cal SetSyn("tsscl") ! an 50.100.270 &Syntax.TUV.TSS.Geometry :cal SetSyn("tssgm") ! an 50.100.280 &Syntax.TUV.TSS.Optics :cal SetSyn("tssop") ! an 50.100.300 &Syntax.TUV.UIT/UIL :cal SetSyn("uil") ! an 50.100.310 &Syntax.TUV.UnrealScript :cal SetSyn("uc") ! an 50.100.330 &Syntax.TUV.Verilog\ HDL :cal SetSyn("verilog") ! an 50.100.340 &Syntax.TUV.Vgrindefs :cal SetSyn("vgrindefs") ! an 50.100.350 &Syntax.TUV.VHDL :cal SetSyn("vhdl") ! an 50.100.360 &Syntax.TUV.Vim.Vim\ help\ file :cal SetSyn("help") ! an 50.100.370 &Syntax.TUV.Vim.Vim\ script :cal SetSyn("vim") ! an 50.100.380 &Syntax.TUV.Vim.Viminfo\ file :cal SetSyn("viminfo") ! an 50.100.390 &Syntax.TUV.Virata :cal SetSyn("virata") ! an 50.100.400 &Syntax.TUV.Visual\ Basic :cal SetSyn("vb") ! an 50.100.410 &Syntax.TUV.VRML :cal SetSyn("vrml") ! an 50.100.420 &Syntax.TUV.VSE\ JCL :cal SetSyn("vsejcl") ! an 50.110.100 &Syntax.WXYZ.WEB :cal SetSyn("web") ! an 50.110.110 &Syntax.WXYZ.Webmacro :cal SetSyn("webmacro") ! an 50.110.120 &Syntax.WXYZ.Website\ MetaLanguage :cal SetSyn("wml") ! an 50.110.130 &Syntax.WXYZ.Wdiff :cal SetSyn("wdiff") ! an 50.110.140 &Syntax.WXYZ.Wget\ config :cal SetSyn("wget") ! an 50.110.150 &Syntax.WXYZ.Whitespace\ (add) :cal SetSyn("whitespace") ! an 50.110.160 &Syntax.WXYZ.WinBatch/Webbatch :cal SetSyn("winbatch") ! an 50.110.170 &Syntax.WXYZ.Windows\ Scripting\ Host :cal SetSyn("wsh") ! an 50.110.180 &Syntax.WXYZ.WvDial :cal SetSyn("wvdial") ! an 50.110.200 &Syntax.WXYZ.X\ Keyboard\ Extension :cal SetSyn("xkb") ! an 50.110.210 &Syntax.WXYZ.X\ Pixmap :cal SetSyn("xpm") ! an 50.110.220 &Syntax.WXYZ.X\ Pixmap\ (2) :cal SetSyn("xpm2") ! an 50.110.230 &Syntax.WXYZ.X\ resources :cal SetSyn("xdefaults") ! an 50.110.240 &Syntax.WXYZ.Xmath :cal SetSyn("xmath") ! an 50.110.250 &Syntax.WXYZ.XML :cal SetSyn("xml") ! an 50.110.260 &Syntax.WXYZ.Xslt :cal SetSyn("xslt") ! an 50.110.270 &Syntax.WXYZ.XXD\ hex\ dump :cal SetSyn("xxd") ! an 50.110.290 &Syntax.WXYZ.Yacc :cal SetSyn("yacc") ! an 50.110.310 &Syntax.WXYZ.Zsh\ shell\ script :cal SetSyn("zsh") " The End Of The Syntax Menu ! an 50.195 &Syntax.-SEP1- ! an 50.200 &Syntax.Set\ '&syntax'\ only :let s:syntax_menu_synonly=1 ! an 50.202 &Syntax.Set\ '&filetype'\ too :call Nosynonly() fun! s:Nosynonly() if exists("s:syntax_menu_synonly") unlet s:syntax_menu_synonly endif endfun ! an 50.210 &Syntax.&Off :syn off ! an 50.700 &Syntax.-SEP3- ! an 50.710 &Syntax.Co&lor\ test :sp $VIMRUNTIME/syntax/colortest.vimso % ! an 50.720 &Syntax.&Highlight\ test :so $VIMRUNTIME/syntax/hitest.vim ! an 50.730 &Syntax.&Convert\ to\ HTML :so $VIMRUNTIME/syntax/2html.vim endif " !exists("did_install_syntax_menu") *** ../vim60.134/src/menu.c Sun Sep 9 21:52:32 2001 --- src/menu.c Tue Jan 15 15:13:33 2002 *************** *** 371,377 **** * Add menu(s). * Replace special key codes. */ ! map_to = replace_termcodes(map_to, &map_buf, FALSE, TRUE); menuarg.modes = modes; #ifdef FEAT_TOOLBAR menuarg.iconfile = icon; --- 371,383 ---- * Add menu(s). * Replace special key codes. */ ! if (STRICMP(map_to, "") == 0) /* "" means nothing */ ! { ! map_to = (char_u *)""; ! map_buf = NULL; ! } ! else ! map_to = replace_termcodes(map_to, &map_buf, FALSE, TRUE); menuarg.modes = modes; #ifdef FEAT_TOOLBAR menuarg.iconfile = icon; *************** *** 711,720 **** /* free any old menu */ free_menu_string(menu, i); ! /* For "amenu", may insert an extra character */ ! /* Don't do this if adding a tearbar (addtearoff == FALSE) */ c = 0; ! if (amenu #ifdef FEAT_GUI_W32 && addtearoff #endif --- 717,727 ---- /* free any old menu */ free_menu_string(menu, i); ! /* For "amenu", may insert an extra character. ! * Don't do this if adding a tearbar (addtearoff == FALSE). ! * Don't do this for "". */ c = 0; ! if (amenu && call_data != NULL && *call_data != NUL #ifdef FEAT_GUI_W32 && addtearoff #endif *************** *** 1123,1129 **** else msg_putchar(' '); MSG_PUTS(" "); ! msg_outtrans_special(menu->strings[bit], FALSE); } } else --- 1130,1139 ---- else msg_putchar(' '); MSG_PUTS(" "); ! if (*menu->strings[bit] == NUL) ! msg_puts_attr((char_u *)"", hl_attr(HLF_8)); ! else ! msg_outtrans_special(menu->strings[bit], FALSE); } } else *** ../vim60.134/src/version.c Tue Jan 15 14:34:37 2002 --- src/version.c Tue Jan 15 16:34:51 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 135, /**/ -- For society, it's probably a good thing that engineers value function over appearance. For example, you wouldn't want engineers to build nuclear power plants that only _look_ like they would keep all the radiation inside. (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.136 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.136 Problem: When completing in Insert mode, a mapping could be unexpectedly applied. Solution: Don't use mappings when checking for a typed character. Files: src/edit.c *** ../vim60.135/src/edit.c Sun Dec 30 21:23:29 2001 --- src/edit.c Tue Jan 15 17:12:44 2002 *************** *** 2917,2923 **** --- 2917,2925 ---- return; count = 0; + ++no_mapping; c = vpeekc_any(); + --no_mapping; if (c != NUL) { if (vim_is_ctrl_x_key(c) && c != Ctrl_X && c != Ctrl_R) *** ../vim60.135/src/version.c Tue Jan 15 16:37:40 2002 --- src/version.c Tue Jan 15 19:46:15 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 136, /**/ -- A consultant is a person who takes your money and annoys your employees while tirelessly searching for the best way to extend the consulting contract. (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.137 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.137 Problem: GUI: When using the find or find/replace dialog from Insert mode, the input mode is stopped. Solution: Don't use the input method status when the main window doesn't have focus. Files: src/ui.c *** ../vim60.136/src/ui.c Mon Dec 31 15:35:23 2001 --- src/ui.c Tue Jan 15 19:42:02 2002 *************** *** 2754,2763 **** * disabled then (but might start later). * Also don't save when inside a mapping, vgetc_im_active has not been set * then. ! * And don't save when the keys were stuffed (e.g., for a "." command). */ if (!p_imdisable && KeyTyped && !KeyStuffed # ifdef FEAT_XIM && xic != NULL # endif ) { --- 2754,2768 ---- * disabled then (but might start later). * Also don't save when inside a mapping, vgetc_im_active has not been set * then. ! * And don't save when the keys were stuffed (e.g., for a "." command). ! * And don't save when the GUI is running but our window doesn't have ! * input focus (e.g., when a find dialog is open). */ if (!p_imdisable && KeyTyped && !KeyStuffed # ifdef FEAT_XIM && xic != NULL + # endif + # ifdef FEAT_GUI + && (!gui.in_use || gui.in_focus) # endif ) { *** ../vim60.136/src/version.c Tue Jan 15 19:48:49 2002 --- src/version.c Tue Jan 15 19:48:43 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 137, /**/ -- The process for understanding customers primarily involves sitting around with other marketing people and talking about what you would to if you were dumb enough to be a customer. (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.138 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.138 Problem: GUI: When using the find or find/replace dialog from Insert mode, the text is inserted when CTRL-O is mapped. (Andre Pang) When opening the dialog again, a whole word search isn't recognized. When doing "replace all" a whole word search was never done. Solution: Don't put a search or replace command in the input buffer, execute it directly. Recognize "\<" and "\>" after removing "\V". Add "\<" and "\>" also for "replace all". Files: src/gui.c *** ../vim60.137/src/gui.c Thu Nov 1 14:56:27 2001 --- src/gui.c Wed Jan 16 11:35:01 2002 *************** *** 3952,3958 **** } #endif ! #if defined(FEAT_SUN_WORKSHOP) || defined(FEAT_GUI_MOTIF) || defined(PROTO) /* * Update the current window and the screen. */ --- 3952,3959 ---- } #endif ! #if defined(FEAT_GUI_GTK) || defined(FEAT_SUN_WORKSHOP) \ ! || defined(FEAT_GUI_MOTIF) || defined(PROTO) /* * Update the current window and the screen. */ *************** *** 3995,4001 **** --- 3996,4005 ---- /* Remove "\V" */ if (len >= 2 && STRNCMP(text, "\\V", 2) == 0) + { mch_memmove(text, text + 2, (size_t)(len - 1)); + len -= 2; + } /* Recognize "\" and remove. */ if (len >= 4 *************** *** 4024,4038 **** int exact; /* Exact word match. */ { garray_T ga; ga_init2(&ga, 1, 100); - /* start stuffing in the command text */ - if (State & INSERT) - ga_append(&ga, Ctrl_O); - else if ((State | NORMAL) == 0) - ga_append(&ga, ESC); - if (flags == FR_REPLACE) { /* Do the replacement when the text under the cursor matches. */ --- 4028,4037 ---- int exact; /* Exact word match. */ { garray_T ga; + int i; ga_init2(&ga, 1, 100); if (flags == FR_REPLACE) { /* Do the replacement when the text under the cursor matches. */ *************** *** 4044,4074 **** } } else if (flags == FR_REPLACEALL) { - ga_concat(&ga, (char_u *)":%sno/"); - ga_concat(&ga, find_text); ga_concat(&ga, (char_u *)"/"); ga_concat(&ga, repl_text); ! ga_concat(&ga, (char_u *)"/g\r"); } ! ! if (flags != FR_REPLACEALL) { /* Search for the next match. */ ! if (down) ! ga_concat(&ga, (char_u *)"/\\V"); ! else ! ga_concat(&ga, (char_u *)"?\\V"); ! if (exact) ! ga_concat(&ga, (char_u *)"\\<"); ! ga_concat(&ga, find_text); ! if (exact) ! ga_concat(&ga, (char_u *)"\\>"); ! ga_concat(&ga, (char_u *)"\r"); } ! if (ga.ga_len > 0) ! add_to_input_buf((char_u *)ga.ga_data, ga.ga_len); vim_free(ga.ga_data); return (ga.ga_len > 0); --- 4043,4079 ---- } } else if (flags == FR_REPLACEALL) + ga_concat(&ga, (char_u *)"%s/"); + + ga_concat(&ga, (char_u *)"\\V"); + if (exact) + ga_concat(&ga, (char_u *)"\\<"); + ga_concat(&ga, find_text); + if (exact) + ga_concat(&ga, (char_u *)"\\>"); + + if (flags == FR_REPLACEALL) { ga_concat(&ga, (char_u *)"/"); ga_concat(&ga, repl_text); ! ga_concat(&ga, (char_u *)"/g"); ! do_cmdline_cmd(ga.ga_data); } ! else { /* Search for the next match. */ ! i = msg_scroll; ! do_search(NULL, down ? '/' : '?', ga.ga_data, 1L, ! SEARCH_MSG + SEARCH_MARK); ! msg_scroll = i; /* don't let an error message set msg_scroll */ } ! if (State & (NORMAL | INSERT)) ! { ! gui_update_screen(); /* update the screen */ ! msg_didout = 0; /* overwrite any message */ ! need_wait_return = FALSE; /* don't wait for return */ ! } vim_free(ga.ga_data); return (ga.ga_len > 0); *** ../vim60.137/src/version.c Tue Jan 15 19:50:54 2002 --- src/version.c Wed Jan 16 11:41:01 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 138, /**/ -- hundred-and-one symptoms of being an internet addict: 1. You actually wore a blue ribbon to protest the Communications Decency Act. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.139 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.139 Problem: When stopping 'wildmenu' completion, the statusline of the bottom-left vertically split window isn't redrawn. (Yegappan Lakshmanan) Solution: Redraw all the bottom statuslines. Files: src/ex_getln.c, src/proto/screen.pro, src/screen.c *** ../vim60.138/src/ex_getln.c Tue Jan 15 14:34:37 2002 --- src/ex_getln.c Wed Jan 16 12:18:03 2002 *************** *** 369,375 **** save_p_ls = -1; } else ! win_redr_status(lastwin); KeyTyped = skt; wild_menu_showing = 0; } --- 369,382 ---- save_p_ls = -1; } else ! { ! # ifdef FEAT_VERTSPLIT ! win_redraw_last_status(topframe); ! # else ! lastwin->w_redr_status = TRUE; ! # endif ! redraw_statuslines(); ! } KeyTyped = skt; wild_menu_showing = 0; } *** ../vim60.138/src/proto/screen.pro Tue Sep 25 21:49:23 2001 --- src/proto/screen.pro Wed Jan 16 12:20:07 2002 *************** *** 13,18 **** --- 13,19 ---- void status_redraw_all __ARGS((void)); void status_redraw_curbuf __ARGS((void)); void redraw_statuslines __ARGS((void)); + void win_redraw_last_status __ARGS((frame_T *frp)); void win_redr_status_matches __ARGS((expand_T *xp, int num_matches, char_u **matches, int match)); void win_redr_status __ARGS((win_T *wp)); int stl_connected __ARGS((win_T *wp)); *** ../vim60.138/src/screen.c Sun Jan 13 20:44:03 2002 --- src/screen.c Wed Jan 16 12:20:27 2002 *************** *** 140,148 **** static void screen_line __ARGS((int row, int coloff, int endcol, int clear_width)); # define SCREEN_LINE(r, o, e, c, rl) screen_line((r), (o), (e), (c)) #endif - #if defined(FEAT_WILDMENU) && defined(FEAT_VERTSPLIT) - static void win_redraw_last_status __ARGS((frame_T *frp)); - #endif #ifdef FEAT_VERTSPLIT static void draw_vsep_win __ARGS((win_T *wp, int row)); #endif --- 140,145 ---- *************** *** 4274,4284 **** } #endif ! #if defined(FEAT_WILDMENU) && defined(FEAT_VERTSPLIT) /* * Redraw all status lines at the bottom of frame "frp". */ ! static void win_redraw_last_status(frp) frame_T *frp; { --- 4271,4281 ---- } #endif ! #if (defined(FEAT_WILDMENU) && defined(FEAT_VERTSPLIT)) || defined(PROTO) /* * Redraw all status lines at the bottom of frame "frp". */ ! void win_redraw_last_status(frp) frame_T *frp; { *** ../vim60.138/src/version.c Wed Jan 16 11:42:43 2002 --- src/version.c Wed Jan 16 12:24:42 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 139, /**/ -- hundred-and-one symptoms of being an internet addict: 5. You find yourself brainstorming for new subjects to search. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.140 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.140 Problem: Memory allocated for local mappings and abbreviations is leaked when the buffer is wiped out. Solution: Clear the local mappings when deleting a buffer. Files: src/buffer.c, src/getchar.c, src/proto/getchar.pro, src/vim.h *** ../vim60.139/src/buffer.c Mon Jan 14 12:49:05 2002 --- src/buffer.c Wed Jan 16 13:05:47 2002 *************** *** 507,512 **** --- 507,516 ---- #endif #ifdef FEAT_USR_CMDS uc_clear(&buf->b_ucmds); /* clear local user commands */ + #ifdef FEAT_LOCALMAP + map_clear_int(buf, MAP_ALL_MODES, TRUE, FALSE); /* clear local mappings */ + map_clear_int(buf, MAP_ALL_MODES, TRUE, TRUE); /* clear local abbrevs */ + #endif #endif free_buf_options(buf, TRUE); #ifdef FEAT_MBYTE *** ../vim60.139/src/getchar.c Tue Jan 15 14:28:35 2002 --- src/getchar.c Wed Jan 16 12:49:18 2002 *************** *** 3278,3287 **** int forceit; int abbr; { - mapblock_T *mp, **mpp; int mode; - int hash; - int new_hash; #ifdef FEAT_LOCALMAP int local; --- 3278,3284 ---- *************** *** 3293,3301 **** } #endif - validate_maphash(); - mode = get_map_mode(&cmdp, forceit); for (hash = 0; hash < 256; ++hash) { --- 3290,3320 ---- } #endif mode = get_map_mode(&cmdp, forceit); + map_clear_int(curbuf, mode, + #ifdef FEAT_LOCALMAP + local, + #else + FALSE, + #endif + abbr); + } + + /* + * Clear all mappings in "mode". + */ + void + map_clear_int(buf, mode, local, abbr) + buf_T *buf; /* buffer for local mappings */ + int mode; /* mode in which to delete */ + int local; /* TRUE for buffer-local mappings */ + int abbr; /* TRUE for abbreviations */ + { + mapblock_T *mp, **mpp; + int hash; + int new_hash; + + validate_maphash(); for (hash = 0; hash < 256; ++hash) { *************** *** 3305,3311 **** break; #ifdef FEAT_LOCALMAP if (local) ! mpp = &curbuf->b_first_abbr; else #endif mpp = &first_abbr; --- 3324,3330 ---- break; #ifdef FEAT_LOCALMAP if (local) ! mpp = &buf->b_first_abbr; else #endif mpp = &first_abbr; *************** *** 3314,3320 **** { #ifdef FEAT_LOCALMAP if (local) ! mpp = &curbuf->b_maphash[hash]; else #endif mpp = &maphash[hash]; --- 3333,3339 ---- { #ifdef FEAT_LOCALMAP if (local) ! mpp = &buf->b_maphash[hash]; else #endif mpp = &maphash[hash]; *************** *** 3340,3347 **** #ifdef FEAT_LOCALMAP if (local) { ! mp->m_next = curbuf->b_maphash[new_hash]; ! curbuf->b_maphash[new_hash] = mp; } else #endif --- 3359,3366 ---- #ifdef FEAT_LOCALMAP if (local) { ! mp->m_next = buf->b_maphash[new_hash]; ! buf->b_maphash[new_hash] = mp; } else #endif *** ../vim60.139/src/proto/getchar.pro Sun Oct 28 21:23:45 2001 --- src/proto/getchar.pro Wed Jan 16 13:05:25 2002 *************** *** 41,46 **** --- 41,47 ---- int do_map __ARGS((int maptype, char_u *arg, int mode, int abbrev)); int get_map_mode __ARGS((char_u **cmdp, int forceit)); void map_clear __ARGS((char_u *cmdp, char_u *arg, int forceit, int abbr)); + void map_clear_int __ARGS((buf_T *buf, int mode, int local, int abbr)); int map_to_exists __ARGS((char_u *str, char_u *modechars)); int map_to_exists_mode __ARGS((char_u *rhs, int mode)); char_u *set_context_in_map_cmd __ARGS((expand_T *xp, char_u *cmd, char_u *arg, int forceit, int isabbrev, int isunmap, cmdidx_T cmdidx)); *** ../vim60.139/src/vim.h Wed Sep 19 16:57:09 2001 --- src/vim.h Wed Jan 16 13:03:57 2002 *************** *** 501,506 **** --- 501,507 ---- #define INSERT 0x10 /* Insert mode */ #define LANGMAP 0x20 /* Language mapping, can be combined with INSERT and CMDLINE */ + #define MAP_ALL_MODES 0x3f /* all mode bits used for mapping */ #define REPLACE_FLAG 0x40 /* Replace mode flag */ #define REPLACE (REPLACE_FLAG + INSERT) *** ../vim60.139/src/version.c Wed Jan 16 12:28:44 2002 --- src/version.c Wed Jan 16 13:45:27 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 140, /**/ -- hundred-and-one symptoms of being an internet addict: 6. You refuse to go to a vacation spot with no electricity and no phone lines. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.141 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.141 Problem: When using ":enew" in an empty buffer, some buffer-local things are not cleared. b:keymap_name is not set. Solution: Clear user commands and mappings local to the buffer when re-using the current buffer. Reload the keymap. Files: src/buffer.c *** ../vim60.140/src/buffer.c Thu Jan 17 11:00:13 2002 --- src/buffer.c Thu Jan 17 10:55:32 2002 *************** *** 46,52 **** static int ti_change __ARGS((char_u *str, char_u **last)); #endif static void free_buffer __ARGS((buf_T *)); ! static void free_buffer_stuff __ARGS((buf_T *)); static void clear_wininfo __ARGS((buf_T *buf)); #ifdef UNIX --- 46,52 ---- static int ti_change __ARGS((char_u *str, char_u **last)); #endif static void free_buffer __ARGS((buf_T *)); ! static void free_buffer_stuff __ARGS((buf_T *buf, int free_options)); static void clear_wininfo __ARGS((buf_T *buf)); #ifdef UNIX *************** *** 393,399 **** { /* Free all internal variables and reset option values, to make * ":bdel" compatible with Vim 5.7. */ ! free_buffer_stuff(buf); /* Make it look like a new buffer. */ buf->b_flags = BF_CHECK_RO | BF_NEVERLOADED; --- 393,399 ---- { /* Free all internal variables and reset option values, to make * ":bdel" compatible with Vim 5.7. */ ! free_buffer_stuff(buf, TRUE); /* Make it look like a new buffer. */ buf->b_flags = BF_CHECK_RO | BF_NEVERLOADED; *************** *** 481,487 **** free_buffer(buf) buf_T *buf; { ! free_buffer_stuff(buf); #ifdef FEAT_PERL perl_buf_free(buf); #endif --- 481,487 ---- free_buffer(buf) buf_T *buf; { ! free_buffer_stuff(buf, TRUE); #ifdef FEAT_PERL perl_buf_free(buf); #endif *************** *** 498,518 **** * Free stuff in the buffer for ":bdel" and when wiping out the buffer. */ static void ! free_buffer_stuff(buf) buf_T *buf; { ! clear_wininfo(buf); #ifdef FEAT_EVAL ! var_clear(&buf->b_vars); /* free all internal variables */ #endif #ifdef FEAT_USR_CMDS ! uc_clear(&buf->b_ucmds); /* clear local user commands */ #ifdef FEAT_LOCALMAP map_clear_int(buf, MAP_ALL_MODES, TRUE, FALSE); /* clear local mappings */ map_clear_int(buf, MAP_ALL_MODES, TRUE, TRUE); /* clear local abbrevs */ #endif - #endif - free_buf_options(buf, TRUE); #ifdef FEAT_MBYTE vim_free(buf->b_start_fenc); buf->b_start_fenc = NULL; --- 498,522 ---- * Free stuff in the buffer for ":bdel" and when wiping out the buffer. */ static void ! free_buffer_stuff(buf, free_options) buf_T *buf; + int free_options; /* free options as well */ { ! if (free_options) ! { ! clear_wininfo(buf); /* including window-local options */ ! free_buf_options(buf, TRUE); ! } #ifdef FEAT_EVAL ! var_clear(&buf->b_vars); /* free all internal variables */ #endif #ifdef FEAT_USR_CMDS ! uc_clear(&buf->b_ucmds); /* clear local user commands */ ! #endif #ifdef FEAT_LOCALMAP map_clear_int(buf, MAP_ALL_MODES, TRUE, FALSE); /* clear local mappings */ map_clear_int(buf, MAP_ALL_MODES, TRUE, TRUE); /* clear local abbrevs */ #endif #ifdef FEAT_MBYTE vim_free(buf->b_start_fenc); buf->b_start_fenc = NULL; *************** *** 1290,1297 **** if (buf != curbuf) /* autocommands deleted the buffer! */ return NULL; /* buf->b_nwindows = 0; why was this here? */ ! #ifdef FEAT_EVAL ! var_clear(&buf->b_vars); /* delete internal variables */ #endif } else --- 1294,1303 ---- if (buf != curbuf) /* autocommands deleted the buffer! */ return NULL; /* buf->b_nwindows = 0; why was this here? */ ! free_buffer_stuff(buf, FALSE); /* delete local variables et al. */ ! #ifdef FEAT_KEYMAP ! /* need to reload lmaps and set b:keymap_name */ ! curbuf->b_kmap_state |= KEYMAP_INIT; #endif } else *** ../vim60.140/src/version.c Thu Jan 17 11:00:13 2002 --- src/version.c Thu Jan 17 10:59:19 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 141, /**/ -- hundred-and-one symptoms of being an internet addict: 21. Your dog has its own home page. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.142 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.142 Problem: When Python is linked statically, loading dynamic extensions might fail. Solution: Add an extra linking flag when needed. (Andrew Rodionoff) Files: src/configure.in, src/auto/configure *** ../vim60.141/src/configure.in Fri Jan 11 13:03:17 2002 --- src/configure.in Thu Jan 17 12:02:23 2002 *************** *** 325,330 **** --- 329,335 ---- @echo "python_MODLIBS='$(MODLIBS)'" @echo "python_LIBS='$(LIBS)'" @echo "python_SYSLIBS='$(SYSLIBS)'" + @echo "python_LINKFORSHARED='$(LINKFORSHARED)'" eof dnl -- delete the lines from make about Entering/Leaving directory eval "`cd ${PYTHON_CONFDIR} && make -f ${tmp_mkf} __ | sed '/ directory /d'`" *************** *** 334,340 **** else vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" fi ! vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS}" dnl remove -ltermcap, it can conflict with an earlier -lncurses vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` ]) --- 339,345 ---- else vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" fi ! vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" dnl remove -ltermcap, it can conflict with an earlier -lncurses vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` ]) *** ../vim60.141/src/auto/configure Fri Jan 11 13:03:17 2002 --- src/auto/configure Thu Jan 17 12:03:36 2002 *************** *** 1580,1585 **** --- 1584,1590 ---- @echo "python_MODLIBS='$(MODLIBS)'" @echo "python_LIBS='$(LIBS)'" @echo "python_SYSLIBS='$(SYSLIBS)'" + @echo "python_LINKFORSHARED='$(LINKFORSHARED)'" eof eval "`cd ${PYTHON_CONFDIR} && make -f ${tmp_mkf} __ | sed '/ directory /d'`" rm -f ${tmp_mkf} *************** *** 1588,1594 **** else vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" fi ! vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS}" vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` fi --- 1593,1599 ---- else vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" fi ! vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` fi *** ../vim60.141/src/version.c Thu Jan 17 12:09:06 2002 --- src/version.c Thu Jan 17 12:08:51 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 142, /**/ -- hundred-and-one symptoms of being an internet addict: 23. You can't call your mother...she doesn't have a modem. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.143 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.143 Problem: When a syntax item includes a line break in a pattern, the syntax may not be updated properly when making a change. Solution: Add the "linebreaks" argument to ":syn sync". Files: runtime/doc/syntax.txt, src/screen.c, src/structs.h, src/syntax.c *** ../vim60.142/runtime/doc/syntax.txt Tue Sep 25 21:40:39 2001 --- runtime/doc/syntax.txt Thu Jan 17 15:21:41 2002 *************** *** 1895,1901 **** need to make sure syncing takes care of this. Example (match a character constant): > ! :syntax match Character /'.'/s+1e-1 < DEFINING REGIONS *:syn-region* *:syn-start* *:syn-skip* *:syn-end* --- 1962,1968 ---- need to make sure syncing takes care of this. Example (match a character constant): > ! :syntax match Character /'.'/hs=s+1,he=e-1 < DEFINING REGIONS *:syn-region* *:syn-start* *:syn-skip* *:syn-end* *************** *** 2594,2603 **** include". ============================================================================== ! 10. Synchronizing *:syn-sync* *E403* *E404* Vim wants to be able to start redrawing in any position in the document. To ! make this possible it needs to know the syntax item at the position where redrawing starts. :sy[ntax] sync [ccomment [group-name] | minlines={N} | ...] --- 2661,2670 ---- include". ============================================================================== ! 10. Synchronizing *:syn-sync* *E403* *E404* Vim wants to be able to start redrawing in any position in the document. To ! make this possible it needs to know the syntax state at the position where redrawing starts. :sy[ntax] sync [ccomment [group-name] | minlines={N} | ...] *************** *** 2626,2631 **** --- 2693,2709 ---- adding "minlines". This is useful if you have few things to sync on and a slow machine. Example: > :syntax sync ccomment maxlines=500 + < + *:syn-sync-linebreaks* + When using a pattern that matches multiple lines, a change in one line may + cause a pattern to no longer match in a previous line. This means has to + start above where the change was made. How many lines can be specified with + the "linebreaks" argument. For example, when a pattern may include one line + break use this: > + :syntax sync linebreaks=1 + The result is that redrawing always starts at least one line before where a + change was made. The default value for "linebreaks" is zero. Usually the + value for "minlines" is bigger than "linebreaks". First syncing method: *:syn-sync-first* *** ../vim60.142/src/screen.c Wed Jan 16 12:28:44 2002 --- src/screen.c Thu Jan 17 15:23:49 2002 *************** *** 823,829 **** --- 823,837 ---- if (buf->b_mod_set) { if (mod_top == 0 || mod_top > buf->b_mod_top) + { mod_top = buf->b_mod_top; + #ifdef FEAT_SYN_HL + /* Need to redraw lines above the change that may be included + * in a pattern match. */ + if (syntax_present(buf)) + mod_top -= buf->b_syn_sync_linebreaks; + #endif + } if (mod_bot == 0 || mod_bot < buf->b_mod_bot) mod_bot = buf->b_mod_bot; *** ../vim60.142/src/structs.h Tue Jan 15 14:34:37 2002 --- src/structs.h Thu Jan 17 15:22:02 2002 *************** *** 1049,1054 **** --- 1049,1055 ---- short b_syn_sync_id; /* group to sync on */ long b_syn_sync_minlines; /* minimal sync lines offset */ long b_syn_sync_maxlines; /* maximal sync lines offset */ + long b_syn_sync_linebreaks; /* offset for multi-line pattern */ char_u *b_syn_linecont_pat; /* line continuation pattern */ regprog_T *b_syn_linecont_prog; /* line continuation program */ int b_syn_linecont_ic; /* ignore-case flag for above */ *** ../vim60.142/src/syntax.c Thu Nov 1 12:22:41 2001 --- src/syntax.c Thu Jan 17 15:23:39 2002 *************** *** 383,388 **** --- 383,389 ---- static void syn_cmd_onoff __ARGS((exarg_T *eap, char *name)); static void syn_cmd_list __ARGS((exarg_T *eap, int syncing)); static void syn_lines_msg __ARGS((void)); + static void syn_match_msg __ARGS((void)); static void syn_list_one __ARGS((int id, int syncing, int link_only)); static void syn_list_cluster __ARGS((int id)); static void put_id_list __ARGS((char_u *name, short *list, int attr)); *************** *** 1149,1155 **** prev = NULL; for (p = buf->b_sst_first; p != NULL; ) { ! if (p->sst_lnum > buf->b_mod_top) { n = p->sst_lnum + buf->b_mod_xlines; if (n <= buf->b_mod_bot) --- 1150,1156 ---- prev = NULL; for (p = buf->b_sst_first; p != NULL; ) { ! if (p->sst_lnum + syn_buf->b_syn_sync_linebreaks > buf->b_mod_top) { n = p->sst_lnum + buf->b_mod_xlines; if (n <= buf->b_mod_bot) *************** *** 3029,3034 **** --- 3030,3036 ---- buf->b_syn_sync_flags = 0; buf->b_syn_sync_minlines = 0; buf->b_syn_sync_maxlines = 0; + buf->b_syn_sync_linebreaks = 0; vim_free(buf->b_syn_linecont_prog); buf->b_syn_linecont_prog = NULL; *************** *** 3059,3064 **** --- 3061,3067 ---- curbuf->b_syn_sync_flags = 0; curbuf->b_syn_sync_minlines = 0; curbuf->b_syn_sync_maxlines = 0; + curbuf->b_syn_sync_linebreaks = 0; vim_free(curbuf->b_syn_linecont_prog); curbuf->b_syn_linecont_prog = NULL; *************** *** 3346,3353 **** if (curbuf->b_syn_sync_flags & SF_CCOMMENT) { MSG_PUTS(_("syncing on C-style comments")); ! if (curbuf->b_syn_sync_minlines || curbuf->b_syn_sync_maxlines) ! syn_lines_msg(); return; } else if (!(curbuf->b_syn_sync_flags & SF_MATCH)) --- 3349,3356 ---- if (curbuf->b_syn_sync_flags & SF_CCOMMENT) { MSG_PUTS(_("syncing on C-style comments")); ! syn_lines_msg(); ! syn_match_msg(); return; } else if (!(curbuf->b_syn_sync_flags & SF_MATCH)) *************** *** 3359,3372 **** MSG_PUTS(_("syncing starts ")); msg_outnum(curbuf->b_syn_sync_minlines); MSG_PUTS(_(" lines before top line")); } return; } MSG_PUTS_TITLE(_("\n--- Syntax sync items ---")); ! if (curbuf->b_syn_sync_minlines || curbuf->b_syn_sync_maxlines) { MSG_PUTS(_("\nsyncing on items")); syn_lines_msg(); } } else --- 3362,3379 ---- MSG_PUTS(_("syncing starts ")); msg_outnum(curbuf->b_syn_sync_minlines); MSG_PUTS(_(" lines before top line")); + syn_match_msg(); } return; } MSG_PUTS_TITLE(_("\n--- Syntax sync items ---")); ! if (curbuf->b_syn_sync_minlines > 0 ! || curbuf->b_syn_sync_maxlines > 0 ! || curbuf->b_syn_sync_linebreaks > 0) { MSG_PUTS(_("\nsyncing on items")); syn_lines_msg(); + syn_match_msg(); } } else *************** *** 3414,3433 **** static void syn_lines_msg() { ! MSG_PUTS("; "); ! if (curbuf->b_syn_sync_minlines) { ! MSG_PUTS(_("minimal ")); ! msg_outnum(curbuf->b_syn_sync_minlines); ! if (curbuf->b_syn_sync_maxlines) ! MSG_PUTS(", "); } ! if (curbuf->b_syn_sync_maxlines) { ! MSG_PUTS(_("maximal ")); ! msg_outnum(curbuf->b_syn_sync_maxlines); } - MSG_PUTS(_(" lines before top line")); } static int last_matchgroup; --- 3421,3454 ---- static void syn_lines_msg() { ! if (curbuf->b_syn_sync_maxlines > 0 || curbuf->b_syn_sync_minlines > 0) { ! MSG_PUTS("; "); ! if (curbuf->b_syn_sync_minlines > 0) ! { ! MSG_PUTS(_("minimal ")); ! msg_outnum(curbuf->b_syn_sync_minlines); ! if (curbuf->b_syn_sync_maxlines) ! MSG_PUTS(", "); ! } ! if (curbuf->b_syn_sync_maxlines > 0) ! { ! MSG_PUTS(_("maximal ")); ! msg_outnum(curbuf->b_syn_sync_maxlines); ! } ! MSG_PUTS(_(" lines before top line")); } ! } ! ! static void ! syn_match_msg() ! { ! if (curbuf->b_syn_sync_linebreaks > 0) { ! MSG_PUTS(_("; match ")); ! msg_outnum(curbuf->b_syn_sync_linebreaks); ! MSG_PUTS(_(" line breaks")); } } static int last_matchgroup; *************** *** 5187,5196 **** } else if ( STRNCMP(key, "LINES", 5) == 0 || STRNCMP(key, "MINLINES", 8) == 0 ! || STRNCMP(key, "MAXLINES", 8) == 0) { ! if (key[0] == 'L') arg_end = key + 6; else arg_end = key + 9; if (arg_end[-1] != '=' || !isdigit(*arg_end)) --- 5208,5220 ---- } else if ( STRNCMP(key, "LINES", 5) == 0 || STRNCMP(key, "MINLINES", 8) == 0 ! || STRNCMP(key, "MAXLINES", 8) == 0 ! || STRNCMP(key, "LINEBREAKS", 10) == 0) { ! if (key[4] == 'S') arg_end = key + 6; + else if (key[0] == 'L') + arg_end = key + 11; else arg_end = key + 9; if (arg_end[-1] != '=' || !isdigit(*arg_end)) *************** *** 5201,5207 **** n = getdigits(&arg_end); if (!eap->skip) { ! if (key[1] == 'A') curbuf->b_syn_sync_maxlines = n; else curbuf->b_syn_sync_minlines = n; --- 5225,5233 ---- n = getdigits(&arg_end); if (!eap->skip) { ! if (key[4] == 'B') ! curbuf->b_syn_sync_linebreaks = n; ! else if (key[1] == 'A') curbuf->b_syn_sync_maxlines = n; else curbuf->b_syn_sync_minlines = n; *** ../vim60.142/src/version.c Thu Jan 17 12:12:55 2002 --- src/version.c Thu Jan 17 15:29:23 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 143, /**/ -- Q: What is the difference betwee open-source and commercial software? A: If you have a problem with commercial software you can call a phone number and they will tell you it might be solved in a future version. For open-source sofware there isn't a phone number to call, but you get the solution within a day. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.144 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.144 Problem: After patch 6.0.088 redoing "veU" doesn't work. Solution: Don't add the "U" to the redo buffer, it will be used as an undo command. Files: src/normal.c *** ../vim60.143/src/normal.c Sun Dec 30 17:47:16 2001 --- src/normal.c Mon Jan 21 12:46:56 2002 *************** *** 1515,1522 **** && oap->motion_force == NUL ) { ! prep_redo(oap->regname, 0L, NUL, 'v', get_op_char(oap->op_type), ! get_extra_op_char(oap->op_type), cap->nchar); redo_VIsual_mode = resel_VIsual_mode; redo_VIsual_col = resel_VIsual_col; redo_VIsual_line_count = resel_VIsual_line_count; --- 1515,1526 ---- && oap->motion_force == NUL ) { ! /* Prepare for redoing. Only use the nchar field for "r", ! * otherwise it might be the second char of the operator. */ ! prep_redo(oap->regname, 0L, NUL, 'v', ! get_op_char(oap->op_type), ! get_extra_op_char(oap->op_type), ! oap->op_type == OP_REPLACE ? cap->nchar : NUL); redo_VIsual_mode = resel_VIsual_mode; redo_VIsual_col = resel_VIsual_col; redo_VIsual_line_count = resel_VIsual_line_count; *** ../vim60.143/src/version.c Thu Jan 17 16:30:27 2002 --- src/version.c Mon Jan 21 12:50:36 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 144, /**/ -- 'Well, here's something to occupy you and keep your mind off things.' 'It won't work, I have an exceptionally large mind.' -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.145 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.145 Problem: When Vim can't read any input it might get stuck. When redirecting stdin and stderr Vim would not read commands from a file. (Servatius Brandt) Solution: When repeatedly trying to read a character when it's not possible, exit Vim. When stdin and stderr are not a tty, still try reading from them, but don't do a blocking wait. Files: src/ui.c *** ../vim60.144/src/ui.c Tue Jan 15 19:50:54 2002 --- src/ui.c Tue Jan 22 13:19:26 2002 *************** *** 134,142 **** #ifdef NO_CONSOLE_INPUT /* Don't wait for character input when the window hasn't been opened yet. ! * Must return something, otherwise we'll loop forever. */ if (no_console_input()) { buf[0] = CR; return 1; } --- 134,151 ---- #ifdef NO_CONSOLE_INPUT /* Don't wait for character input when the window hasn't been opened yet. ! * Do try reading, this works when redirecting stdin from a file. ! * Must return something, otherwise we'll loop forever. If we run into ! * this very often we probably got stuck, exit Vim. */ if (no_console_input()) { + static int count = 0; + + retval = mch_inchar(buf, maxlen, 10L); + if (retval > 0) + return retval; + if (wtime == -1 && ++count == 1000) + read_error_exit(); buf[0] = CR; return 1; } *** ../vim60.144/src/version.c Mon Jan 21 12:52:54 2002 --- src/version.c Tue Jan 22 13:21:08 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 145, /**/ -- Despite the cost of living, have you noticed how it remains so popular? /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.146 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.146 Problem: When 'statusline' contains "%{'-'}" this results in a zero. (Milan Vancura) Solution: Don't handle numbers with a minus as a number, they were not displayed anyway. Files: src/buffer.c *** ../vim60.145/src/buffer.c Thu Jan 17 12:09:06 2002 --- src/buffer.c Tue Jan 22 14:18:23 2002 *************** *** 3044,3054 **** if (str != NULL && *str != 0) { ! t = str; ! if (*t == '-') ! t++; ! t = skipdigits(t); ! if (*t == 0) { num = atoi((char *) str); vim_free(str); --- 3044,3050 ---- if (str != NULL && *str != 0) { ! if (*skipdigits(str) == NUL) { num = atoi((char *) str); vim_free(str); *** ../vim60.145/src/version.c Tue Jan 22 13:24:04 2002 --- src/version.c Tue Jan 22 14:20:06 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 146, /**/ -- It is hard to understand how a cemetery raised its burial cost and blamed it on the cost of living. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.147 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.147 Problem: It's not easy to mark a Vim version as being modified. The new license requires this. Solution: Add the --modified-by argument to configure and the MODIFIED_BY define. I's used in the intro screen and the ":version" output. Files: src/auto/configure, src/configure.in, src/config.h.in, src/version.c *** ../vim60.146/src/auto/configure Thu Jan 17 12:12:55 2002 --- src/auto/configure Tue Jan 22 15:34:21 2002 *************** *** 20,25 **** --- 20,27 ---- ac_help="$ac_help --with-global-runtime=DIR global runtime directory in 'runtimepath'" ac_help="$ac_help + --with-modified-by=NAME name of who modified a rlease version" + ac_help="$ac_help --with-features=TYPE tiny, small, normal, big or huge (default: normal)" ac_help="$ac_help --with-compiledby=NAME name to show in :version message" *************** *** 1207,1216 **** fi echo $ac_n "checking if character set is EBCDIC""... $ac_c" 1>&6 ! echo "configure:1212: checking if character set is EBCDIC" >&5 cat > conftest.$ac_ext <&6 + echo "configure:1221: checking --with-modified-by argument" >&5 + # Check whether --with-modified-by or --without-modified-by was given. + if test "${with_modified_by+set}" = set; then + withval="$with_modified_by" + echo "$ac_t""$withval" 1>&6; cat >> confdefs.h <&6 + fi + + echo $ac_n "checking if character set is EBCDIC""... $ac_c" 1>&6 ! echo "configure:1235: checking if character set is EBCDIC" >&5 cat > conftest.$ac_ext < MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.148 Problem: After "p" in an empty line, `[ goes to the second character. (Kontra Gergely) Solution: Don't increment the column number in an empty line. Files: src/ops.c *** ../vim60.147/src/ops.c Tue Nov 6 15:54:13 2001 --- src/ops.c Tue Jan 22 16:36:28 2002 *************** *** 2809,2828 **** orig_indent = get_indent(); curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ - if (dir == FORWARD) - { - /* move to the start of the next (multi-byte) character */ - #ifdef FEAT_MBYTE - if (has_mbyte) - { - bytelen = (*mb_ptr2len_check)(ml_get_cursor()); - curbuf->b_op_start.col += bytelen; - } - else - #endif - curbuf->b_op_start.col++; - } - curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ /* --- 2809,2814 ---- *************** *** 2834,2840 **** (void)stuff_inserted((dir == FORWARD ? (count == -1 ? 'o' : 'a') : (count == -1 ? 'O' : 'i')), count, FALSE); /* Putting the text is done later, so can't really move the cursor to ! * the nex character. Use "l" to simulate it. */ if ((flags & PUT_CURSEND) && gchar_cursor() != NUL) stuffcharReadbuff('l'); return; --- 2820,2826 ---- (void)stuff_inserted((dir == FORWARD ? (count == -1 ? 'o' : 'a') : (count == -1 ? 'O' : 'i')), count, FALSE); /* Putting the text is done later, so can't really move the cursor to ! * the next character. Use "l" to simulate it. */ if ((flags & PUT_CURSEND) && gchar_cursor() != NUL) stuffcharReadbuff('l'); return; *************** *** 3130,3135 **** --- 3116,3125 ---- changed_lines(lnum, 0, curwin->w_cursor.lnum, nr_lines); + /* Set '[ mark. */ + curbuf->b_op_start = curwin->w_cursor; + curbuf->b_op_start.lnum = lnum; + /* adjust '] mark */ curbuf->b_op_end.lnum = curwin->w_cursor.lnum - 1; curbuf->b_op_end.col = bd.textcol + totlen - 1; *************** *** 3178,3183 **** --- 3168,3174 ---- } } new_cursor = curwin->w_cursor; + curbuf->b_op_start = curwin->w_cursor; } /* * Line mode: BACKWARD is the same as FORWARD on the previous line *** ../vim60.147/src/version.c Tue Jan 22 15:38:17 2002 --- src/version.c Tue Jan 22 16:47:25 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 148, /**/ -- Latest survey shows that 3 out of 4 people make up 75% of the world's population. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.149 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.149 Problem: The pattern "\(.\{-}\)*" causes a hang. When using a search pattern that causes a stack overflow to be detected Vim could still hang. Solution: Correctly report "operand could be empty" when using "\{-}". Check for "out_of_stack" inside loops to avoid a hang. Files: src/regexp.c *** ../vim60.148/src/regexp.c Mon Nov 5 09:00:25 2001 --- src/regexp.c Tue Jan 22 17:39:43 2002 *************** *** 1305,1311 **** reginsert_limits(BRACE_LIMITS, minval, maxval, ret); ++num_complex_braces; } ! if (minval > 0) *flagp = (HASWIDTH | (flags & HASNL)); break; } --- 1305,1311 ---- reginsert_limits(BRACE_LIMITS, minval, maxval, ret); ++num_complex_braces; } ! if (minval > 0 && maxval > 0) *flagp = (HASWIDTH | (flags & HASNL)); break; } *************** *** 3083,3089 **** #endif while (scan != NULL) { ! if (got_int) return FALSE; #ifdef DEBUG if (regnarrate) --- 3083,3089 ---- #endif while (scan != NULL) { ! if (got_int || out_of_stack) return FALSE; #ifdef DEBUG if (regnarrate) *************** *** 3676,3682 **** reg_nextline(); ++clnum; ccol = 0; ! if (got_int) return FALSE; } --- 3676,3682 ---- reg_nextline(); ++clnum; ccol = 0; ! if (got_int || out_of_stack) return FALSE; } *************** *** 3906,3912 **** regline = reg_getline(reglnum); reginput = regline + STRLEN(regline); fast_breakcheck(); ! if (got_int) return FALSE; } else --- 3906,3912 ---- regline = reg_getline(reglnum); reginput = regline + STRLEN(regline); fast_breakcheck(); ! if (got_int || out_of_stack) return FALSE; } else *************** *** 3941,3947 **** || regrepeat(OPERAND(scan), 1L) == 0) break; ++count; ! if (got_int) return FALSE; } } --- 3941,3947 ---- || regrepeat(OPERAND(scan), 1L) == 0) break; ++count; ! if (got_int || out_of_stack) return FALSE; } } *** ../vim60.148/src/version.c Tue Jan 22 16:51:24 2002 --- src/version.c Tue Jan 22 17:35:49 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 149, /**/ -- A fine is a tax for doing wrong. A tax is a fine for doing well. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.150 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.150 Problem: When using a multi-byte encoding, patch 6.0.148 causes "p" to work like "P". (Sung-Hyun Nam) Solution: Compute the byte length of a multi-byte character. Files: src/ops.c *** ../vim60.149/src/ops.c Tue Jan 22 16:51:24 2002 --- src/ops.c Thu Jan 24 11:23:26 2002 *************** *** 2780,2788 **** struct block_def bd; char_u *insert_string = NULL; int allocated = FALSE; - #ifdef FEAT_MBYTE - int bytelen = 0; - #endif long cnt; #ifdef FEAT_CLIPBOARD --- 2780,2785 ---- *************** *** 2983,2989 **** #ifdef FEAT_MBYTE if (has_mbyte) /* move to start of next multi-byte character */ ! curwin->w_cursor.col += bytelen; else #endif #ifdef FEAT_VIRTUALEDIT --- 2980,2986 ---- #ifdef FEAT_MBYTE if (has_mbyte) /* move to start of next multi-byte character */ ! curwin->w_cursor.col += (*mb_ptr2len_check)(ml_get_cursor()); else #endif #ifdef FEAT_VIRTUALEDIT *************** *** 3148,3153 **** --- 3145,3152 ---- #ifdef FEAT_MBYTE if (has_mbyte) { + int bytelen = (*mb_ptr2len_check)(ml_get_cursor()); + /* put it on the next of the multi-byte character. */ col += bytelen; if (yanklen) *** ../vim60.149/src/version.c Tue Jan 22 17:42:37 2002 --- src/version.c Thu Jan 24 11:26:36 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 150, /**/ -- hundred-and-one symptoms of being an internet addict: 47. You are so familiar with the WWW that you find the search engines useless. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.151 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.151 Problem: Redrawing the status line and ruler can be wrong when it contains multi-byte characters. Solution: Use character width and byte length correctly. (Yasuhiro Matsumoto) Files: src/screen.c *** ../vim60.150/src/screen.c Thu Jan 17 16:30:27 2002 --- src/screen.c Thu Jan 24 12:23:08 2002 *************** *** 4734,4740 **** { int clen = 0, i; - p[len] = NUL; /* Count total number of display cells. */ for (i = 0; p[i] != NUL; i += (*mb_ptr2len_check)(p + i)) clen += (*mb_ptr2cells)(p + i); --- 4734,4739 ---- *************** *** 4747,4754 **** { p = p + i - 1; *p = '<'; - len = len - i + 1; } } else --- 4746,4753 ---- { p = p + i - 1; *p = '<'; } + len = clen; } else *************** *** 7799,7805 **** */ i = (int)STRLEN(buffer); get_rel_pos(wp, buffer + i + 1); ! o = (int)STRLEN(buffer + i + 1); #ifdef FEAT_WINDOWS if (wp->w_status_height == 0) /* can't use last char of screen */ #endif --- 7798,7804 ---- */ i = (int)STRLEN(buffer); get_rel_pos(wp, buffer + i + 1); ! o = vim_strsize(buffer + i + 1); #ifdef FEAT_WINDOWS if (wp->w_status_height == 0) /* can't use last char of screen */ #endif *************** *** 7820,7825 **** --- 7819,7840 ---- get_rel_pos(wp, buffer + i); } /* Truncate at window boundary. */ + #ifdef FEAT_MBYTE + if (has_mbyte) + { + o = 0; + for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len_check)(buffer + i)) + { + o += (*mb_ptr2cells)(buffer + i); + if (this_ru_col + o > WITH_WIDTH(width)) + { + buffer[i] = NUL; + break; + } + } + } + else + #endif if (this_ru_col + (int)STRLEN(buffer) > WITH_WIDTH(width)) buffer[WITH_WIDTH(width) - this_ru_col] = NUL; *** ../vim60.150/src/version.c Thu Jan 24 11:27:35 2002 --- src/version.c Thu Jan 24 13:45:14 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 151, /**/ -- Q: What is a patch 22? A: A patch you need to include to make it possible to include patches. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.152 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.152 Problem: strtrans() could hang on an illegal UTF-8 byte sequence. Solution: Skip over illegal bytes. (Yasuhiro Matsumoto) Files: src/charset.c *** ../vim60.151/src/charset.c Mon Oct 22 12:52:35 2001 --- src/charset.c Fri Jan 25 10:02:37 2002 *************** *** 347,353 **** p += l; } else ! len += byte2cells(*p++); } res = alloc((unsigned)(len + 1)); } --- 347,359 ---- p += l; } else ! { ! l = byte2cells(*p++); ! if (l > 0) ! len += l; ! else ! ++len; /* illegal byte sequence */ ! } } res = alloc((unsigned)(len + 1)); } *** ../vim60.151/src/version.c Thu Jan 24 13:47:03 2002 --- src/version.c Fri Jan 25 10:03:55 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 152, /**/ -- Time is money. Especially if you make clocks. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.153 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.153 Problem: When using (illegal) double-byte characters and Vim syntax highlighting Vim can crash. (Yasuhiro Matsumoto) Solution: Increase a pointer over a character instead of a byte. Files: src/regexp.c *** ../vim60.152/src/regexp.c Tue Jan 22 17:42:37 2002 --- src/regexp.c Mon Jan 28 14:01:09 2002 *************** *** 3904,3909 **** --- 3904,3912 ---- /* backup to last char of previous line */ --reglnum; regline = reg_getline(reglnum); + /* Just in case regrepeat() didn't count right. */ + if (regline == NULL) + return FALSE; reginput = regline + STRLEN(regline); fast_breakcheck(); if (got_int || out_of_stack) *************** *** 4158,4164 **** while (count < maxcount) { if (vim_isIDc(*scan) && (testval || !isdigit(*scan))) ! ++scan; else if (*scan == NUL) { if (!WITH_NL(OP(p)) || reglnum == reg_maxline) --- 4161,4169 ---- while (count < maxcount) { if (vim_isIDc(*scan) && (testval || !isdigit(*scan))) ! { ! ADVANCE_P(scan); ! } else if (*scan == NUL) { if (!WITH_NL(OP(p)) || reglnum == reg_maxline) *** ../vim60.152/src/version.c Fri Jan 25 10:05:09 2002 --- src/version.c Mon Jan 28 13:59:07 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 153, /**/ -- hundred-and-one symptoms of being an internet addict: 87. Everyone you know asks why your phone line is always busy ...and you tell them to send an e-mail. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.154 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.154 Problem: MS-DOS and MS-Windows: The menu entries for xxd don't work when there is no xxd in the path. When converting back from Hex the filetype may remain "xxd" if it is not detected. Solution: When xxd is not in the path use the one in the runtime directory, where the install program has put it. Clear the 'filetype' option before detecting the new value. Files: runtime/menu.vim *** ../vim60.153/runtime/menu.vim Tue Jan 15 16:37:40 2002 --- runtime/menu.vim Mon Jan 28 15:18:11 2002 *************** *** 429,435 **** if has("vms") %!mc vim:xxd else ! %!xxd endif set ft=xxd let &mod = mod --- 429,436 ---- if has("vms") %!mc vim:xxd else ! call s:XxdFind() ! exe "%!" . g:xxdprogram endif set ft=xxd let &mod = mod *************** *** 440,449 **** if has("vms") %!mc vim:xxd -r else ! %!xxd -r endif doautocmd filetypedetect BufReadPost let &mod = mod endfun " Setup the Tools.Compiler submenu --- 441,463 ---- if has("vms") %!mc vim:xxd -r else ! call s:XxdFind() ! exe "%!" . g:xxdprogram . " -r" endif + set ft= doautocmd filetypedetect BufReadPost let &mod = mod + endfun + + func! s:XxdFind() + if !exists("g:xxdprogram") + " On the PC xxd may not be in the path but in the install directory + if (has("win32") || has("dos32")) && !executable("xxd") + let g:xxdprogram = $VIMRUNTIME . (&shellslash ? '/' : '\') . "xxd.exe" + else + let g:xxdprogram = "xxd" + endif + endif endfun " Setup the Tools.Compiler submenu *** ../vim60.153/src/version.c Mon Jan 28 14:06:05 2002 --- src/version.c Mon Jan 28 15:19:25 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 154, /**/ -- hundred-and-one symptoms of being an internet addict: 91. It's Saturday afternoon in the middle of may and you are on computer. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.155 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.155 Problem: Mac: compilation problems in ui.c after patch 6.0.145. (Axel Kielhorn) Solution: Don't call mch_inchar() when NO_CONSOLE is defined. Files: src/ui.c *** ../vim60.154/src/ui.c Tue Jan 22 13:24:04 2002 --- src/ui.c Sun Jan 27 10:58:44 2002 *************** *** 141,149 **** --- 141,151 ---- { static int count = 0; + #ifndef NO_CONSOLE retval = mch_inchar(buf, maxlen, 10L); if (retval > 0) return retval; + #endif if (wtime == -1 && ++count == 1000) read_error_exit(); buf[0] = CR; *** ../vim60.154/src/version.c Mon Jan 28 16:11:30 2002 --- src/version.c Tue Jan 29 16:21:27 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 155, /**/ -- From "know your smileys": :-X My lips are sealed /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.156 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.156 Problem: Starting Vim with the -b argument and two files, ":next" doesn't set 'binary' in the second file, like Vim 5.7. (Norman Diamond) Solution: Set the global value for 'binary'. Files: src/option.c *** ../vim60.155/src/option.c Tue Jan 15 14:34:37 2002 --- src/option.c Tue Jan 29 16:32:30 2002 *************** *** 3883,3890 **** { p_tw = 0; p_wm = 0; ! p_ml = 0; ! p_et = 0; } } else if (oldval) /* switched off */ --- 3883,3891 ---- { p_tw = 0; p_wm = 0; ! p_ml = FALSE; ! p_et = FALSE; ! p_bin = TRUE; /* needed when called for the "-b" argument */ } } else if (oldval) /* switched off */ *** ../vim60.155/src/version.c Tue Jan 29 16:23:04 2002 --- src/version.c Tue Jan 29 16:34:31 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 156, /**/ -- From "know your smileys" 8<}} Glasses, big nose, beard /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.157 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.157 Problem: When defining a user command with "-complete=dir" files will also be expanded. Also, "-complete=mapping" doesn't appear to work. (Michael Naumann) Solution: Use the expansion flags defined with the user command. Handle expanding mappings specifically. Files: src/ex_docmd.c *** ../vim60.156/src/ex_docmd.c Tue Jan 15 14:34:37 2002 --- src/ex_docmd.c Wed Jan 30 16:48:00 2002 *************** *** 2770,2788 **** #ifdef FEAT_USR_CMDS case CMD_USER: case CMD_USER_BUF: ! /* XFILE: file names are handled above */ ! if (compl != EXPAND_NOTHING && !(argt & XFILE)) { # ifdef FEAT_MENU ! if (compl == EXPAND_MENUS) ! return set_context_in_menu_cmd(xp, cmd, arg, forceit); # endif ! if (compl == EXPAND_COMMANDS) ! return arg; ! while ((xp->xp_pattern = vim_strchr(arg, ' ')) != NULL) ! arg = xp->xp_pattern + 1; xp->xp_context = compl; - xp->xp_pattern = arg; } break; #endif --- 2770,2794 ---- #ifdef FEAT_USR_CMDS case CMD_USER: case CMD_USER_BUF: ! if (compl != EXPAND_NOTHING) { + /* XFILE: file names are handled above */ + if (!(argt & XFILE)) + { # ifdef FEAT_MENU ! if (compl == EXPAND_MENUS) ! return set_context_in_menu_cmd(xp, cmd, arg, forceit); # endif ! if (compl == EXPAND_COMMANDS) ! return arg; ! if (compl == EXPAND_MAPPINGS) ! return set_context_in_map_cmd(xp, (char_u *)"map", ! arg, forceit, FALSE, FALSE, CMD_map); ! while ((xp->xp_pattern = vim_strchr(arg, ' ')) != NULL) ! arg = xp->xp_pattern + 1; ! xp->xp_pattern = arg; ! } xp->xp_context = compl; } break; #endif *** ../vim60.156/src/version.c Wed Jan 30 16:50:08 2002 --- src/version.c Wed Jan 30 16:49:36 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 157, /**/ -- hundred-and-one symptoms of being an internet addict: 94. Now admit it... How many of you have made "modem noises" into the phone just to see if it was possible? :-) /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.158 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.158 Problem: When getting the warning for a file being changed outside of Vim and reloading the file, the 'readonly' option is reset, even when the permissions didn't change. (Marcel Svitalsky) Solution: Keep 'readonly' set when reloading a file and the permissions didn't change. Files: src/fileio.c *** ../vim60.157/src/fileio.c Wed Jan 2 17:10:11 2002 --- src/fileio.c Wed Jan 30 20:01:42 2002 *************** *** 5159,5164 **** --- 5167,5173 ---- linenr_T old_line_count = buf->b_ml.ml_line_count; exarg_T ea; pos_T old_cursor; + int old_ro = curbuf->b_p_ro; #ifdef FEAT_AUTOCMD aco_save_T aco; *************** *** 5205,5210 **** --- 5214,5224 ---- #ifdef FEAT_AUTOCMD keep_filetype = FALSE; #endif + /* If the mode didn't change and 'readonly' was set, keep the old + * value; the user probably used the ":view" command. But don't + * reset it, might have had a read error. */ + if (orig_mode == curbuf->b_orig_mode) + curbuf->b_p_ro |= old_ro; } #ifdef FEAT_AUTOCMD *** ../vim60.157/src/version.c Wed Jan 30 16:52:45 2002 --- src/version.c Wed Jan 30 20:08:31 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 158, /**/ -- hundred-and-one symptoms of being an internet addict: 102. When filling out your driver's license application, you give your IP address. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.159 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.159 Problem: Wildcard expansion for ":emenu" also shows separators. Solution: Skip menu separators for ":emenu", ":popup" and ":tearoff". Also, don't handle ":tmenu" as if it was ":tearoff". And leave out the alternatives with "&" included. Files: src/menu.c *** ../vim60.158/src/menu.c Tue Jan 15 16:37:40 2002 --- src/menu.c Wed Jan 30 21:43:51 2002 *************** *** 1160,1165 **** --- 1160,1166 ---- */ static vimmenu_T *expand_menu = NULL; static int expand_modes = 0x0; + static int expand_emenu; /* TRUE for ":emenu" command */ /* * Work out what to complete when doing command line completion of menu names. *************** *** 1211,1218 **** else if (*p == '.') after_dot = p + 1; } ! expand_menus = !(*cmd == 't' || *cmd == 'p'); ! if (expand_menus && vim_iswhite(*p)) return NULL; /* TODO: check for next command? */ if (*p == NUL) /* Complete the menu name */ { --- 1212,1222 ---- else if (*p == '.') after_dot = p + 1; } ! ! /* ":tearoff" and ":popup" only use menus, not entries */ ! expand_menus = !((*cmd == 't' && cmd[1] == 'e') || *cmd == 'p'); ! expand_emenu = (*cmd == 'e'); ! if (expand_menus && vim_iswhite(*p)) return NULL; /* TODO: check for next command? */ if (*p == NUL) /* Complete the menu name */ { *************** *** 1277,1283 **** } /* ! * Function given to ExpandGeneric() to obtain the list of group names. */ char_u * get_menu_name(xp, idx) --- 1281,1288 ---- } /* ! * Function given to ExpandGeneric() to obtain the list of (sub)menus (not ! * entries). */ char_u * get_menu_name(xp, idx) *************** *** 1285,1338 **** int idx; { static vimmenu_T *menu = NULL; - static int get_dname = FALSE; /* return menu->dname next time */ char_u *str; if (idx == 0) /* first call: start at first item */ - { menu = expand_menu; - get_dname = FALSE; - } /* Skip PopUp[nvoci]. */ while (menu != NULL && (menu_is_hidden(menu->dname) ! /* || menu_is_separator(menu->dname) */ || menu_is_tearoff(menu->dname) ! || (xp->xp_context == EXPAND_MENUS && menu->children == NULL))) menu = menu->next; if (menu == NULL) /* at end of linked list */ return NULL; if (menu->modes & expand_modes) ! { ! if (get_dname) ! { ! str = menu->dname; ! get_dname = FALSE; ! } ! else ! { ! str = menu->name; ! if (STRCMP(menu->name, menu->dname)) ! get_dname = TRUE; ! } ! } else - { str = (char_u *)""; - get_dname = FALSE; - } /* Advance to next menu entry. */ ! if (!get_dname) ! menu = menu->next; return str; } /* ! * Function given to ExpandGeneric() to obtain the list of group names. */ char_u * get_menu_names(xp, idx) --- 1290,1324 ---- int idx; { static vimmenu_T *menu = NULL; char_u *str; if (idx == 0) /* first call: start at first item */ menu = expand_menu; /* Skip PopUp[nvoci]. */ while (menu != NULL && (menu_is_hidden(menu->dname) ! || menu_is_separator(menu->dname) || menu_is_tearoff(menu->dname) ! || menu->children == NULL)) menu = menu->next; if (menu == NULL) /* at end of linked list */ return NULL; if (menu->modes & expand_modes) ! str = menu->dname; else str = (char_u *)""; /* Advance to next menu entry. */ ! menu = menu->next; return str; } /* ! * Function given to ExpandGeneric() to obtain the list of menus and menu ! * entries. */ char_u * get_menu_names(xp, idx) *************** *** 1348,1357 **** /* Skip Browse-style entries, popup menus and separators. */ while (menu != NULL ! && ( menu_is_hidden(menu->dname) ! /* || menu_is_separator(menu->dname) */ || menu_is_tearoff(menu->dname) - || (xp->xp_context == EXPAND_MENUS && menu->children == NULL) #ifndef FEAT_BROWSE || menu->dname[STRLEN(menu->dname) - 1] == '.' #endif --- 1334,1342 ---- /* Skip Browse-style entries, popup menus and separators. */ while (menu != NULL ! && ( menu_is_hidden(menu->dname) ! || (expand_emenu && menu_is_separator(menu->dname)) || menu_is_tearoff(menu->dname) #ifndef FEAT_BROWSE || menu->dname[STRLEN(menu->dname) - 1] == '.' #endif *** ../vim60.158/src/version.c Fri Feb 1 20:07:17 2002 --- src/version.c Fri Feb 1 20:01:23 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 159, /**/ -- hundred-and-one symptoms of being an internet addict: 149. You find your computer sexier than your girlfriend /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.160 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.160 Problem: When compiling with GCC 3.0.2 and using the "-O2" argument, the optimizer causes a problem that makes Vim crash. Solution: Add a configure check to avoid "-O2" for this version of gcc. Files: src/configure.in, src/auto/configure *** ../vim60.159/src/configure.in Tue Jan 22 15:38:17 2002 --- src/configure.in Tue Jan 22 19:46:56 2002 *************** *** 26,31 **** --- 26,38 ---- CFLAGS="-O" test "$GCC" = yes && CFLAGS="-O2 -fno-strength-reduce -Wall" fi + if test "$GCC" = yes; then + gccversion=`"$CC" --version` + if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2"; then + echo 'GCC 3.0.x has a bug in the optimizer, disabling "-O#"' + CFLAGS=`echo "$CFLAGS" | sed 's/-O[[23456789]]/-O/'` + fi + fi dnl If configure thinks we are cross compiling, there is probably something dnl wrong with the CC or CFLAGS settings, give an understandable error message *** ../vim60.159/src/auto/configure Tue Jan 22 15:38:17 2002 --- src/auto/configure Wed Jan 30 16:19:19 2002 *************** *** 1112,1117 **** --- 1112,1124 ---- CFLAGS="-O" test "$GCC" = yes && CFLAGS="-O2 -fno-strength-reduce -Wall" fi + if test "$GCC" = yes; then + gccversion=`"$CC" --version` + if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2"; then + echo 'GCC 3.0.x has a bug in the optimizer, disabling "-O#"' + CFLAGS=`echo "$CFLAGS" | sed 's/-O[23456789]/-O/'` + fi + fi if test "$cross_compiling" = yes; then { echo "configure: error: cannot compile a simple program, check CC and CFLAGS *** ../vim60.159/src/version.c Fri Feb 1 20:15:57 2002 --- src/version.c Fri Feb 1 20:16:14 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 160, /**/ -- hundred-and-one symptoms of being an internet addict: 150. You find yourself counting emoticons to get to sleep. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.161 (extra) Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.161 Problem: Win32: Bitmaps don't work with signs. Solution: Make it possible to use bitmaps with signs. (Muraoka Taro) Files: src/ex_cmds.c, src/feature.h, src/gui_w32.c, src/gui_x11.c, src/proto/gui_w32.pro, src/proto/gui_x11.pro *** ../vim60.160/src/ex_cmds.c Thu Jan 10 20:17:24 2002 --- src/ex_cmds.c Sat Feb 2 21:55:07 2002 *************** *** 5064,5070 **** char_u *sn_name; /* name of sign */ char_u *sn_icon; /* name of pixmap */ #ifdef FEAT_SIGN_ICONS ! XImage *sn_image; /* icon image */ #endif char_u *sn_text; /* text used instead of pixmap */ int sn_line_hl; /* highlight ID for line */ --- 5064,5070 ---- char_u *sn_name; /* name of sign */ char_u *sn_icon; /* name of pixmap */ #ifdef FEAT_SIGN_ICONS ! void *sn_image; /* icon image */ #endif char_u *sn_text; /* text used instead of pixmap */ int sn_line_hl; /* highlight ID for line */ *************** *** 5565,5571 **** for (sp = first_sign; sp != NULL; sp = sp->sn_next) if (sp->sn_typenr == typenr) ! return (void *)sp->sn_image; return NULL; } #endif --- 5565,5571 ---- for (sp = first_sign; sp != NULL; sp = sp->sn_next) if (sp->sn_typenr == typenr) ! return sp->sn_image; return NULL; } #endif *** ../vim60.160/src/feature.h Tue Jan 22 16:39:07 2002 --- src/feature.h Sat Feb 2 22:00:58 2002 *************** *** 1064,1071 **** */ #if defined(FEAT_BIG) || defined(FEAT_SUN_WORKSHOP) # define FEAT_SIGNS ! # if (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)) \ ! && defined(HAVE_X11_XPM_H) # define FEAT_SIGN_ICONS # endif #endif --- 1064,1072 ---- */ #if defined(FEAT_BIG) || defined(FEAT_SUN_WORKSHOP) # define FEAT_SIGNS ! # if ((defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)) \ ! && defined(HAVE_X11_XPM_H)) \ ! || (defined(WIN32) && defined(FEAT_GUI)) # define FEAT_SIGN_ICONS # endif #endif *** ../vim60.160/src/gui_w32.c Tue Jan 1 23:08:31 2002 --- src/gui_w32.c Sat Feb 2 21:59:29 2002 *************** *** 3387,3390 **** --- 3387,3513 ---- } # endif + #endif + + #if defined(FEAT_SIGN_ICONS) || defined(PROTO) + typedef struct _signicon_t + { + HANDLE hImage; + UINT uType; + } signicon_t; + + void + gui_mch_drawsign(row, col, typenr) + int row; + int col; + int typenr; + { + signicon_t *sign; + int x, y, w, h; + + if (!gui.in_use || (sign = (signicon_t *)sign_get_image(typenr)) == NULL) + return; + + x = TEXT_X(col); + y = TEXT_Y(row); + w = gui.char_width * 2; + h = gui.char_height; + switch (sign->uType) + { + case IMAGE_BITMAP: + { + HDC hdcMem; + HBITMAP hbmpOld; + + hdcMem = CreateCompatibleDC(s_hdc); + hbmpOld = (HBITMAP)SelectObject(hdcMem, sign->hImage); + BitBlt(s_hdc, x, y, w, h, hdcMem, 0, 0, SRCCOPY); + SelectObject(hdcMem, hbmpOld); + DeleteDC(hdcMem); + } + break; + case IMAGE_ICON: + case IMAGE_CURSOR: + DrawIconEx(s_hdc, x, y, (HICON)sign->hImage, w, h, 0, NULL, DI_NORMAL); + break; + } + } + + static void + close_signicon_image(signicon_t *sign) + { + if (sign) + switch (sign->uType) + { + case IMAGE_BITMAP: + DeleteObject((HGDIOBJ)sign->hImage); + break; + case IMAGE_CURSOR: + DestroyCursor((HCURSOR)sign->hImage); + break; + case IMAGE_ICON: + DestroyIcon((HICON)sign->hImage); + break; + } + } + + void * + gui_mch_register_sign(signfile) + char_u *signfile; + { + signicon_t sign, *psign; + char_u *ext; + + if (is_winnt_3()) + { + /* TODO: May be changed this message */ + EMSG(_("E255: Couldn't read in sign data!")); + return NULL; + } + + sign.hImage = NULL; + ext = signfile + STRLEN(signfile) - 4; /* get extention */ + if (ext > signfile) + { + int do_load = 1; + + if (!STRICMP(ext, ".bmp")) + sign.uType = IMAGE_BITMAP; + else if (!STRICMP(ext, ".ico")) + sign.uType = IMAGE_ICON; + else if (!STRICMP(ext, ".cur") || !STRICMP(ext, ".ani")) + sign.uType = IMAGE_CURSOR; + else + do_load = 0; + + if (do_load) + sign.hImage = (HANDLE)LoadImage(NULL, signfile, sign.uType, + gui.char_width * 2, gui.char_height, + LR_LOADFROMFILE | LR_CREATEDIBSECTION); + } + + psign = NULL; + if (sign.hImage && (psign = (signicon_t *)alloc(sizeof(signicon_t)))) + *psign = sign; + + if (!psign) + { + if (sign.hImage) + close_signicon_image(&sign); + EMSG(_("E255: Couldn't read in sign data!")); + } + return (void *)psign; + + } + + void + gui_mch_destroy_sign(sign) + void *sign; + { + if (sign) + { + close_signicon_image((signicon_t *)sign); + vim_free(sign); + } + } #endif *** ../vim60.160/src/gui_x11.c Wed Sep 26 16:15:32 2001 --- src/gui_x11.c Sat Feb 2 21:52:29 2002 *************** *** 3210,3216 **** } } ! XImage * gui_mch_register_sign(signfile) char_u *signfile; { --- 3210,3216 ---- } } ! void * gui_mch_register_sign(signfile) char_u *signfile; { *************** *** 3259,3272 **** } } ! return sign; } void gui_mch_destroy_sign(sign) ! XImage *sign; { ! XFree(sign->data); vim_free(sign); } #endif --- 3259,3272 ---- } } ! return (void *)sign; } void gui_mch_destroy_sign(sign) ! void *sign; { ! XFree(((XImage *)sign)->data); vim_free(sign); } #endif *** ../vim60.160/src/proto/gui_w32.pro Tue Sep 25 21:49:31 2001 --- src/proto/gui_w32.pro Sat Feb 2 22:11:29 2002 *************** *** 74,77 **** --- 74,80 ---- void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey)); int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield)); void gui_mch_set_foreground __ARGS((void)); + void gui_mch_drawsign __ARGS((int row, int col, int typenr)); + void *gui_mch_register_sign __ARGS((char_u *signfile)); + void gui_mch_destroy_sign __ARGS((void *sign)); /* vim: set ft=c : */ *** ../vim60.160/src/proto/gui_x11.pro Tue Sep 25 21:49:30 2001 --- src/proto/gui_x11.pro Sat Feb 2 22:06:55 2002 *************** *** 61,68 **** void gui_mch_setmouse __ARGS((int x, int y)); XButtonPressedEvent *gui_x11_get_last_mouse_event __ARGS((void)); void gui_mch_drawsign __ARGS((int row, int col, int typenr)); ! XImage *gui_mch_register_sign __ARGS((char_u *signfile)); ! void gui_mch_destroy_sign __ARGS((XImage *sign)); void gui_mch_mousehide __ARGS((int hide)); void mch_set_mouse_shape __ARGS((int shape)); void get_toolbar_pixmap __ARGS((vimmenu_T *menu, Pixmap *sen, Pixmap *insen)); --- 61,68 ---- void gui_mch_setmouse __ARGS((int x, int y)); XButtonPressedEvent *gui_x11_get_last_mouse_event __ARGS((void)); void gui_mch_drawsign __ARGS((int row, int col, int typenr)); ! void *gui_mch_register_sign __ARGS((char_u *signfile)); ! void gui_mch_destroy_sign __ARGS((void *sign)); void gui_mch_mousehide __ARGS((int hide)); void mch_set_mouse_shape __ARGS((int shape)); void get_toolbar_pixmap __ARGS((vimmenu_T *menu, Pixmap *sen, Pixmap *insen)); *** ../vim60.160/src/version.c Fri Feb 1 20:29:26 2002 --- src/version.c Sat Feb 2 22:12:13 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 161, /**/ -- hundred-and-one symptoms of being an internet addict: 164. You got out to buy software, instead of going out for a beer. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.162 (extra) Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.162 Problem: Client-server: An error message for a wrong expression appears in the server instead of the cient. Solution: Pass the error message from the server to the client. Also adjust the example code. (Flemming Madsen) Files: src/globals.h, src/if_xcmdsrv.c, src/main.c, src/os_mswin.c, src/proto/if_xcmdsrv.pro, src/proto/os_mswin.pro, runtime/doc/eval.txt, runtime/tools/xcmdsrv_client.c *** ../vim60.161/src/globals.h Fri Nov 2 16:29:44 2001 --- src/globals.h Sun Feb 3 11:57:48 2002 *************** *** 1132,1137 **** --- 1133,1141 ---- EXTERN char_u e_zerocount[] INIT(=N_("Zero count")); #ifdef FEAT_EVAL EXTERN char_u e_usingsid[] INIT(=N_("E81: Using not in a script context")); + #endif + #ifdef FEAT_CLIENTSERVER + EXTERN char_u e_invexprmsg[] INIT(=N_("E449: Invalid expression received")); #endif /* *** ../vim60.161/src/if_xcmdsrv.c Sat Nov 3 14:16:30 2001 --- src/if_xcmdsrv.c Sun Feb 3 12:18:33 2002 *************** *** 70,75 **** --- 70,76 ---- typedef struct PendingCommand { int serial; /* Serial number expected in result. */ + int code; /* Result Code. 0 is OK */ char_u *result; /* String result for command (malloc'ed). * NULL means command still pending. */ struct PendingCommand *nextPtr; *************** *** 136,141 **** --- 137,145 ---- * defaults to an empty string. * * -c code + * 0: for OK. This is the default. + * 1: for error: Result is the last error + * * -i errorInfo * -e errorCode * Not applicable for Vim *************** *** 385,393 **** ret = eval_to_string(cmd, NULL); --emsg_skip; if (result != NULL) ! *result = ret; else vim_free(ret); } else server_to_input_buf(cmd); --- 389,403 ---- ret = eval_to_string(cmd, NULL); --emsg_skip; if (result != NULL) ! { ! if (ret == NULL) ! *result = vim_strsave(_(e_invexprmsg)); ! else ! *result = ret; ! } else vim_free(ret); + return ret == NULL ? -1 : 0; } else server_to_input_buf(cmd); *************** *** 461,466 **** --- 471,477 ---- * AppendErrorProc to pass back the command's results). */ pending.serial = serial; + pending.code = 0; pending.result = NULL; pending.nextPtr = pendingCommands; pendingCommands = &pending; *************** *** 489,495 **** else vim_free(pending.result); ! return 0; } static int --- 500,506 ---- else vim_free(pending.result); ! return pending.code == 0 ? 0 : -1; } static int *************** *** 1092,1098 **** { char_u *propInfo; char_u *p; ! int result, actualFormat; long_u numItems, bytesAfter; Atom actualType; --- 1103,1109 ---- { char_u *propInfo; char_u *p; ! int result, actualFormat, code; long_u numItems, bytesAfter; Atom actualType; *************** *** 1223,1228 **** --- 1234,1245 ---- { if (res != NULL) ga_concat(&reply, res); + else if (asKeys == 0) + { + ga_concat(&reply, _(e_invexprmsg)); + ga_append(&reply, 0); + ga_concat(&reply, "-c 1"); + } ga_append(&reply, 0); (void)AppendPropCarefully(dpy, resWindow, commProperty, reply.ga_data, reply.ga_len); *************** *** 1243,1248 **** --- 1260,1266 ---- p += 2; gotSerial = 0; res = (char_u *)""; + code = 0; while ((p-propInfo) < numItems && *p == '-') { switch (p[1]) *************** *** 1255,1260 **** --- 1273,1282 ---- if (sscanf((char *)p + 2, " %d", &serial) == 1) gotSerial = 1; break; + case 'c': + if (sscanf((char *)p + 2, " %d", &code) != 1) + code = 0; + break; } while (*p != 0) p++; *************** *** 1273,1278 **** --- 1295,1301 ---- if (serial != pcPtr->serial || pcPtr->result != NULL) continue; + pcPtr->code = code; if (res != NULL) pcPtr->result = vim_strsave(res); else *** ../vim60.161/src/main.c Mon Nov 5 22:06:57 2001 --- src/main.c Sun Feb 3 11:45:33 2002 *************** *** 2628,2634 **** while (memchr(done, 0, numFiles) != NULL) { # ifdef WIN32 ! p = serverGetReply(srv, FALSE, TRUE, TRUE); if (p == NULL) break; # else --- 2628,2634 ---- while (memchr(done, 0, numFiles) != NULL) { # ifdef WIN32 ! p = serverGetReply(srv, NULL, TRUE, TRUE); if (p == NULL) break; # else *** ../vim60.161/src/os_mswin.c Sun Dec 30 21:52:17 2001 --- src/os_mswin.c Sun Feb 3 11:57:57 2002 *************** *** 1716,1725 **** /* Communication is via WM_COPYDATA messages. The message type is send in * the dwData parameter. Types are defined here. */ ! #define COPYDATA_KEYS 0 ! #define COPYDATA_REPLY 1 ! #define COPYDATA_EXPR 10 ! #define COPYDATA_RESULT 11 /* This is a structure containing a server HWND and its name. */ struct server_id --- 1716,1726 ---- /* Communication is via WM_COPYDATA messages. The message type is send in * the dwData parameter. Types are defined here. */ ! #define COPYDATA_KEYS 0 ! #define COPYDATA_REPLY 1 ! #define COPYDATA_EXPR 10 ! #define COPYDATA_RESULT 11 ! #define COPYDATA_ERROR_RESULT 12 /* This is a structure containing a server HWND and its name. */ struct server_id *************** *** 1775,1780 **** --- 1776,1784 ---- * COPYDATA_RESULT: * A reply. We are a client, and a server has sent this message * in response to a COPYDATA_EXPR. + * COPYDATA_ERROR_RESULT: + * A reply. We are a client, and a server has sent this message + * in response to a COPYDATA_EXPR that failed to evaluate. */ COPYDATASTRUCT *data = (COPYDATASTRUCT*)lParam; HWND sender = (HWND)wParam; *************** *** 1808,1815 **** res = eval_to_string(data->lpData, NULL); --emsg_skip; if (res == NULL) ! res = vim_strsave((char_u *)""); ! reply.dwData = COPYDATA_RESULT; reply.lpData = res; reply.cbData = STRLEN(res) + 1; --- 1812,1823 ---- res = eval_to_string(data->lpData, NULL); --emsg_skip; if (res == NULL) ! { ! res = vim_strsave(_(e_invexprmsg)); ! reply.dwData = COPYDATA_ERROR_RESULT; ! } ! else ! reply.dwData = COPYDATA_RESULT; reply.lpData = res; reply.cbData = STRLEN(res) + 1; *************** *** 1820,1829 **** case COPYDATA_REPLY: case COPYDATA_RESULT: if (data->lpData != NULL) { save_reply(sender, data->lpData, ! data->dwData == COPYDATA_RESULT); #ifdef FEAT_AUTOCMD if (data->dwData == COPYDATA_REPLY) { --- 1828,1840 ---- case COPYDATA_REPLY: case COPYDATA_RESULT: + case COPYDATA_ERROR_RESULT: if (data->lpData != NULL) { save_reply(sender, data->lpData, ! (data->dwData == COPYDATA_REPLY ? 0 : ! (data->dwData == COPYDATA_RESULT ? 1 : ! 2))); #ifdef FEAT_AUTOCMD if (data->dwData == COPYDATA_REPLY) { *************** *** 2071,2076 **** --- 2082,2088 ---- HWND target = findServer(name); COPYDATASTRUCT data; char_u *retval = NULL; + int retcode = 0; if (ptarget) *(HWND *)ptarget = target; *************** *** 2084,2097 **** return -1; if (asExpr) ! retval = serverGetReply(target, TRUE, TRUE, TRUE); if (result == NULL) vim_free(retval); else *result = retval; /* Caller assumes responsibility for freeing */ ! return 0; } /* --- 2096,2109 ---- return -1; if (asExpr) ! retval = serverGetReply(target, &retcode, TRUE, TRUE); if (result == NULL) vim_free(retval); else *result = retval; /* Caller assumes responsibility for freeing */ ! return retcode; } /* *************** *** 2119,2125 **** { HWND server; /* server window */ char_u *reply; /* reply string */ ! int expr_result; /* TRUE for COPYDATA_RESULT */ } reply_T; --- 2131,2137 ---- { HWND server; /* server window */ char_u *reply; /* reply string */ ! int expr_result; /* 0 for REPLY, 1 for RESULT 2 for error */ } reply_T; *************** *** 2155,2167 **** /* * Get a reply from server "server". ! * When "expr" is TRUE, get the result of an expression, otherwise a * server2client() message. * If "remove" is TRUE, consume the message, the caller must free it then. * if "wait" is TRUE block until a message arrives (or the server exits). */ char_u * ! serverGetReply(HWND server, int expr, int remove, int wait) { int i; char_u *reply; --- 2167,2180 ---- /* * Get a reply from server "server". ! * When "expr_res" is non NULL, get the result of an expression, otherwise a * server2client() message. + * When non NULL, point to return code. 0 => OK, -1 => ERROR * If "remove" is TRUE, consume the message, the caller must free it then. * if "wait" is TRUE block until a message arrives (or the server exits). */ char_u * ! serverGetReply(HWND server, int *expr_res, int remove, int wait) { int i; char_u *reply; *************** *** 2177,2186 **** for (i = 0; i < REPLY_COUNT; ++i) { rep = REPLY_ITEM(i); ! if (rep->server == server && rep->expr_result == expr) { /* Save the values we've found for later */ reply = rep->reply; if (remove) { --- 2190,2202 ---- for (i = 0; i < REPLY_COUNT; ++i) { rep = REPLY_ITEM(i); ! if (rep->server == server ! && ((rep->expr_result != 0) == (expr_res != NULL))) { /* Save the values we've found for later */ reply = rep->reply; + if (expr_res != NULL) + *expr_res = rep->expr_result == 1 ? 0 : -1; if (remove) { *** ../vim60.161/src/proto/os_mswin.pro Tue Sep 25 21:49:35 2001 --- src/proto/os_mswin.pro Sun Feb 3 11:45:33 2002 *************** *** 47,53 **** int serverSendReply __ARGS((char_u *name, char_u *reply)); int serverSendToVim __ARGS((char_u *name, char_u *cmd, char_u **result, void *ptarget, int asExpr)); void serverForeground __ARGS((char_u *name)); ! char_u *serverGetReply __ARGS((HWND server, int expr, int remove, int wait)); void serverProcessPendingMessages __ARGS((void)); char *charset_id2name __ARGS((int id)); int get_logfont __ARGS((LOGFONT *lf, char_u *name, HDC printer_dc)); --- 47,53 ---- int serverSendReply __ARGS((char_u *name, char_u *reply)); int serverSendToVim __ARGS((char_u *name, char_u *cmd, char_u **result, void *ptarget, int asExpr)); void serverForeground __ARGS((char_u *name)); ! char_u *serverGetReply __ARGS((HWND server, int *expr_res, int remove, int wait)); void serverProcessPendingMessages __ARGS((void)); char *charset_id2name __ARGS((int id)); int get_logfont __ARGS((LOGFONT *lf, char_u *name, HDC printer_dc)); *** ../vim60.161/runtime/doc/eval.txt Tue Sep 25 21:40:34 2001 --- runtime/doc/eval.txt Sun Feb 3 11:51:14 2002 *************** *** 671,676 **** --- 679,685 ---- *v:servername* *servername-variable* v:servername The resulting registered |x11-clientserver| name if any. + Read-only. *v:shell_error* *shell_error-variable* v:shell_error Result of the last shell command. When non-zero, the last *************** *** 1189,1195 **** sourced script file name word under the cursor WORD under the cursor ! The {serverid} of the las Modifiers: :p expand to full path :h head (last path component removed) --- 1205,1212 ---- sourced script file name word under the cursor WORD under the cursor ! the {clientid} of the last received ! message |server2client()| Modifiers: :p expand to full path :h head (last path component removed) *************** *** 1864,1870 **** < When {lnum} is invalid or there is no non-blank line at or above it, zero is returned. ! *remote_expr()* remote_expr({server}, {string} [, {idvar}]) Send the {string} to {server}. The string is sent as an expression and the result is returned after evaluation. --- 1874,1880 ---- < When {lnum} is invalid or there is no non-blank line at or above it, zero is returned. ! *remote_expr()* *E449* remote_expr({server}, {string} [, {idvar}]) Send the {string} to {server}. The string is sent as an expression and the result is returned after evaluation. *************** *** 1873,1883 **** remote_read() is stored there. See also |clientserver| |RemoteReply|. {only available when compiled with the |+clientserver| feature} ! Note: Any errors will be reported in the server and may mess ! up the display. Examples: > :echo remote_expr("gvim", "2+2") ! :echo remote_expr("gvim-001", "b:current_syntax") < remote_foreground({server}) *remote_foreground()* --- 1883,1893 ---- remote_read() is stored there. See also |clientserver| |RemoteReply|. {only available when compiled with the |+clientserver| feature} ! Note: Any errors will cause a local error message to be issued ! and the result will be the empty string. Examples: > :echo remote_expr("gvim", "2+2") ! :echo remote_expr("gvim1", "b:current_syntax") < remote_foreground({server}) *remote_foreground()* *** ../vim60.161/runtime/tools/xcmdsrv_client.c Sun Sep 2 14:51:52 2001 --- runtime/tools/xcmdsrv_client.c Sun Feb 3 11:45:33 2002 *************** *** 32,50 **** #define __ARGS(x) x /* Client API */ ! char * sendToVim __ARGS((Display *dpy, char *name, char *cmd, int asKeys)); #ifdef MAIN /* A sample program */ main(int argc, char **argv) { ! char *res; if (argc == 4) { ! if ((res = sendToVim(XOpenDisplay(NULL), ! argv[2], argv[3], argv[1][0] != 'e')) != NULL) puts(res); exit(0); } else --- 32,55 ---- #define __ARGS(x) x /* Client API */ ! char * sendToVim __ARGS((Display *dpy, char *name, char *cmd, int asKeys, int *code)); #ifdef MAIN /* A sample program */ main(int argc, char **argv) { ! char *res; ! int code; if (argc == 4) { ! if ((res = sendToVim(XOpenDisplay(NULL), argv[2], argv[3], ! argv[1][0] != 'e', &code)) != NULL) ! { ! if (code) ! printf("Error code returned: %d\n", code); puts(res); + } exit(0); } else *************** *** 72,78 **** int delete, char **loose)); static int SendInit __ARGS((Display *dpy)); static char *SendEventProc __ARGS((Display *dpy, XEvent *eventPtr, ! int expect)); static int IsSerialName __ARGS((char *name)); /* Private variables */ --- 77,83 ---- int delete, char **loose)); static int SendInit __ARGS((Display *dpy)); static char *SendEventProc __ARGS((Display *dpy, XEvent *eventPtr, ! int expect, int *code)); static int IsSerialName __ARGS((char *name)); /* Private variables */ *************** *** 91,101 **** */ char * ! sendToVim(dpy, name, cmd, asKeys) Display *dpy; /* Where to send. */ char *name; /* Where to send. */ char *cmd; /* What to send. */ int asKeys; /* Interpret as keystrokes or expr ? */ { Window w; Atom *plist; --- 96,107 ---- */ char * ! sendToVim(dpy, name, cmd, asKeys, code) Display *dpy; /* Where to send. */ char *name; /* Where to send. */ char *cmd; /* What to send. */ int asKeys; /* Interpret as keystrokes or expr ? */ + int *code; /* Return code. 0 => OK */ { Window w; Atom *plist; *************** *** 225,231 **** { XNextEvent(dpy, &event); if (event.type == PropertyNotify && e->window == commWindow) ! if ((result = SendEventProc(dpy, &event, serial)) != NULL) return result; } } --- 231,237 ---- { XNextEvent(dpy, &event); if (event.type == PropertyNotify && e->window == commWindow) ! if ((result = SendEventProc(dpy, &event, serial, code)) != NULL) return result; } } *************** *** 335,341 **** entry = p; while ((*p != 0) && (!isspace(*p))) p++; ! if ((*p != 0) && (strcmp(name, p + 1) == 0)) { sscanf(entry, "%x", (uint*) &returnValue); break; --- 341,347 ---- entry = p; while ((*p != 0) && (!isspace(*p))) p++; ! if ((*p != 0) && (strcasecmp(name, p + 1) == 0)) { sscanf(entry, "%x", (uint*) &returnValue); break; *************** *** 392,405 **** } static char * ! SendEventProc(dpy, eventPtr, expected) Display *dpy; XEvent *eventPtr; /* Information about event. */ int expected; /* The one were waiting for */ { unsigned char *propInfo; unsigned char *p; int result, actualFormat; unsigned long numItems, bytesAfter; Atom actualType; --- 398,413 ---- } static char * ! SendEventProc(dpy, eventPtr, expected, code) Display *dpy; XEvent *eventPtr; /* Information about event. */ int expected; /* The one were waiting for */ + int *code; /* Return code. 0 => OK */ { unsigned char *propInfo; unsigned char *p; int result, actualFormat; + int retCode; unsigned long numItems, bytesAfter; Atom actualType; *************** *** 469,474 **** --- 477,483 ---- p += 2; gotSerial = 0; res = ""; + retCode = 0; while (((p-propInfo) < numItems) && (*p == '-')) { switch (p[1]) *************** *** 481,486 **** --- 490,499 ---- if (sscanf(p + 2, " %d", &serial) == 1) gotSerial = 1; break; + case 'c': + if (sscanf(p + 2, " %d", &retCode) != 1) + retCode = 0; + break; } while (*p != 0) p++; *************** *** 490,495 **** --- 503,510 ---- if (!gotSerial) continue; + if (code != NULL) + *code = retCode; return serial == expected ? strdup(res) : NULL; } else *************** *** 556,578 **** } /* ! * Check if name looks like it had a 3 digit serial number appended */ static int IsSerialName(str) ! char *str; { ! if (strlen(str) < 5) ! return FALSE; ! str = str + strlen(str) - 4; ! if (*str++ != '-') ! return FALSE; ! if (!isdigit(*str++)) ! return FALSE; ! if (!isdigit(*str++)) ! return FALSE; ! if (!isdigit(*str++)) ! return FALSE; ! return TRUE; } --- 571,584 ---- } /* ! * Check if "str" looks like it had a serial number appended. ! * Actually just checks if the name ends in a digit. */ static int IsSerialName(str) ! char *str; { ! int len = strlen(str); ! return (len > 1 && isdigit(str[len - 1])); } *** ../vim60.161/src/version.c Sun Feb 3 12:33:39 2002 --- src/version.c Sun Feb 3 12:29:58 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 162, /**/ -- hundred-and-one symptoms of being an internet addict: 167. You have more than 100 websites in your Bookmark. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.163 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.163 Problem: When using a GUI dialog, a file name is sometimes used like it was a directory. Solution: Separate path and file name properly. For GTK, Motif and Athena concatenate directory and file name for the default selection. Files: src/diff.c, src/ex_cmds.c, src/ex_cmds2.c, src/ex_docmd.c, src/gui_athena.c, src/gui_gtk.c, src/gui_motif.c, src/message.c *** ../vim60.162/src/diff.c Wed Sep 19 18:36:35 2001 --- src/diff.c Sun Feb 3 13:43:37 2002 *************** *** 744,751 **** #ifdef FEAT_BROWSE if (cmdmod.browse) { ! browseFile = do_browse(TRUE, (char_u *)_("Patch file"), ! NULL, NULL, eap->arg, BROWSE_FILTER_ALL_FILES, curbuf); if (browseFile == NULL) return; /* operation cancelled */ eap->arg = browseFile; --- 744,751 ---- #ifdef FEAT_BROWSE if (cmdmod.browse) { ! browseFile = do_browse(FALSE, (char_u *)_("Patch file"), ! eap->arg, NULL, NULL, BROWSE_FILTER_ALL_FILES, NULL); if (browseFile == NULL) return; /* operation cancelled */ eap->arg = browseFile; *** ../vim60.162/src/ex_cmds.c Sun Feb 3 12:33:39 2002 --- src/ex_cmds.c Sun Feb 3 13:29:29 2002 *************** *** 2050,2057 **** #ifdef FEAT_BROWSE if (cmdmod.browse) { ! browse_file = do_browse(TRUE, (char_u *)_("Save As"), NULL, ! NULL, ffname, NULL, curbuf); if (browse_file == NULL) goto theend; ffname = browse_file; --- 2050,2057 ---- #ifdef FEAT_BROWSE if (cmdmod.browse) { ! browse_file = do_browse(TRUE, (char_u *)_("Save As"), ffname, ! NULL, NULL, NULL, curbuf); if (browse_file == NULL) goto theend; ffname = browse_file; *************** *** 2308,2314 **** /* ":browse wall": ask for file name if there isn't one */ if (buf->b_ffname == NULL && cmdmod.browse) buf->b_ffname = do_browse(TRUE, (char_u *)_("Save As"), NULL, ! NULL, (char_u *)"", NULL, buf); #endif if (buf->b_ffname == NULL) { --- 2308,2314 ---- /* ":browse wall": ask for file name if there isn't one */ if (buf->b_ffname == NULL && cmdmod.browse) buf->b_ffname = do_browse(TRUE, (char_u *)_("Save As"), NULL, ! NULL, NULL, NULL, buf); #endif if (buf->b_ffname == NULL) { *************** *** 2535,2542 **** #ifdef FEAT_BROWSE if (cmdmod.browse) { ! browse_file = do_browse(FALSE, (char_u *)_("Edit File"), NULL, ! NULL, ffname, NULL, curbuf); if (browse_file == NULL) goto theend; ffname = browse_file; --- 2535,2542 ---- #ifdef FEAT_BROWSE if (cmdmod.browse) { ! browse_file = do_browse(FALSE, (char_u *)_("Edit File"), ffname, ! NULL, NULL, NULL, curbuf); if (browse_file == NULL) goto theend; ffname = browse_file; *** ../vim60.162/src/ex_cmds2.c Wed Oct 31 10:12:03 2001 --- src/ex_cmds2.c Sun Feb 3 13:44:58 2002 *************** *** 1711,1718 **** { char_u *fname = NULL; ! fname = do_browse(FALSE, (char_u *)_("Run Macro"), ! NULL, NULL, eap->arg, BROWSE_FILTER_MACROS, curbuf); if (fname != NULL) { cmd_source(fname, eap); --- 1711,1718 ---- { char_u *fname = NULL; ! fname = do_browse(FALSE, (char_u *)_("Run Macro"), eap->arg, ! NULL, NULL, BROWSE_FILTER_MACROS, NULL); if (fname != NULL) { cmd_source(fname, eap); *** ../vim60.162/src/ex_docmd.c Wed Jan 30 16:52:44 2002 --- src/ex_docmd.c Sun Feb 3 13:47:11 2002 *************** *** 5554,5560 **** && eap->cmdidx != CMD_new) { fname = do_browse(FALSE, (char_u *)_("Edit File in new window"), ! NULL, NULL, eap->arg, NULL, curbuf); if (fname == NULL) goto theend; eap->arg = fname; --- 5554,5560 ---- && eap->cmdidx != CMD_new) { fname = do_browse(FALSE, (char_u *)_("Edit File in new window"), ! eap->arg, NULL, NULL, NULL, curbuf); if (fname == NULL) goto theend; eap->arg = fname; *************** *** 5923,5930 **** { char_u *browseFile; ! browseFile = do_browse(FALSE, (char_u *)_("Append File"), NULL, ! NULL, eap->arg, NULL, curbuf); if (browseFile != NULL) { i = readfile(browseFile, NULL, --- 5923,5930 ---- { char_u *browseFile; ! browseFile = do_browse(FALSE, (char_u *)_("Append File"), eap->arg, ! NULL, NULL, NULL, curbuf); if (browseFile != NULL) { i = readfile(browseFile, NULL, *************** *** 6449,6455 **** if (cmdmod.browse) { browseFile = do_browse(TRUE, (char_u *)_("Save Redirection"), ! NULL, NULL, eap->arg, BROWSE_FILTER_ALL_FILES, curbuf); if (browseFile == NULL) return; /* operation cancelled */ eap->arg = browseFile; --- 6449,6455 ---- if (cmdmod.browse) { browseFile = do_browse(TRUE, (char_u *)_("Save Redirection"), ! eap->arg, NULL, NULL, BROWSE_FILTER_ALL_FILES, curbuf); if (browseFile == NULL) return; /* operation cancelled */ eap->arg = browseFile; *************** *** 6601,6607 **** eap->cmdidx == CMD_mksession ? (char_u *)_("Save Session") : # endif (char_u *)_("Save Setup"), ! NULL, (char_u *)"vim", fname, BROWSE_FILTER_MACROS, curbuf); if (browseFile == NULL) goto theend; fname = browseFile; --- 6601,6607 ---- eap->cmdidx == CMD_mksession ? (char_u *)_("Save Session") : # endif (char_u *)_("Save Setup"), ! fname, (char_u *)"vim", NULL, BROWSE_FILTER_MACROS, NULL); if (browseFile == NULL) goto theend; fname = browseFile; *** ../vim60.162/src/gui_athena.c Wed Dec 12 20:36:34 2001 --- src/gui_athena.c Sun Feb 3 15:24:05 2002 *************** *** 1836,1841 **** --- 1836,1856 ---- char_u *filter; /* not used (file name filter) */ { Position x, y; + char_u dirbuf[MAXPATHL]; + + /* Concatenate "initdir" and "dflt". */ + if (initdir == NULL || *initdir == NUL) + mch_dirname(dirbuf, MAXPATHL); + else if (STRLEN(initdir) + 2 < MAXPATHL) + STRCPY(dirbuf, initdir); + else + dirbuf[0] = NUL; + if (dflt != NULL && *dflt != NUL + && STRLEN(dirbuf) + 2 + STRLEN(dflt) < MAXPATHL) + { + add_pathsep(dirbuf); + STRCAT(dirbuf, dflt); + } /* Position the file selector just below the menubar */ XtTranslateCoords(vimShell, (Position)0, (Position) *************** *** 1845,1851 **** 0 #endif , &x, &y); ! return (char_u *)vim_SelFile(vimShell, (char *)title, (char *)initdir, NULL, (int)x, (int)y, gui.menu_fg_pixel, gui.menu_bg_pixel); } #endif --- 1860,1866 ---- 0 #endif , &x, &y); ! return (char_u *)vim_SelFile(vimShell, (char *)title, (char *)dirbuf, NULL, (int)x, (int)y, gui.menu_fg_pixel, gui.menu_bg_pixel); } #endif *** ../vim60.162/src/gui_gtk.c Fri Dec 14 20:19:45 2001 --- src/gui_gtk.c Sun Feb 3 15:25:14 2002 *************** *** 875,890 **** /* if our pointer is currently hidden, then we should show it. */ gui_mch_mousehide(FALSE); ! if (dflt == NULL) ! dflt = (char_u *)""; if (initdir == NULL || *initdir == NUL) - { mch_dirname(dirbuf, MAXPATHL); ! strcat((char *)dirbuf, "/"); /* make sure this is a directory */ ! initdir = dirbuf; ! } gtk_file_selection_set_filename(GTK_FILE_SELECTION(gui.filedlg), ! (const gchar *)initdir); gui_gtk_position_in_parent(GTK_WIDGET(gui.mainwin), GTK_WIDGET(gui.filedlg), VW_POS_MOUSE); --- 875,895 ---- /* if our pointer is currently hidden, then we should show it. */ gui_mch_mousehide(FALSE); ! /* Concatenate "initdir" and "dflt". */ if (initdir == NULL || *initdir == NUL) mch_dirname(dirbuf, MAXPATHL); ! else if (STRLEN(initdir) + 2 < MAXPATHL) ! STRCPY(dirbuf, initdir); ! else ! dirbuf[0] = NUL; ! /* Always need a trailing slash for a directory. */ ! add_pathsep(dirbuf); ! if (dflt != NULL && *dflt != NUL ! && STRLEN(dirbuf) + 2 + STRLEN(dflt) < MAXPATHL) ! STRCAT(dirbuf, dflt); ! gtk_file_selection_set_filename(GTK_FILE_SELECTION(gui.filedlg), ! (const gchar *)dirbuf); gui_gtk_position_in_parent(GTK_WIDGET(gui.mainwin), GTK_WIDGET(gui.filedlg), VW_POS_MOUSE); *************** *** 900,906 **** #endif /* FEAT_BROWSE */ ! #ifdef FEAT_GUI_DIALOG static char_u *dialog_textfield = NULL; static GtkWidget *dialog_textentry; --- 905,911 ---- #endif /* FEAT_BROWSE */ ! #if defined(FEAT_GUI_DIALOG) || defined(PROTO) static char_u *dialog_textfield = NULL; static GtkWidget *dialog_textentry; *** ../vim60.162/src/gui_motif.c Wed Sep 26 16:47:48 2001 --- src/gui_motif.c Sun Feb 3 14:23:53 2002 *************** *** 1531,1537 **** str = XmStringCreate(new_label, STRING_TAG); ! if (str) { XtVaSetValues(w, XmNlabelString, str, NULL); XmStringFree(str); } --- 1531,1538 ---- str = XmStringCreate(new_label, STRING_TAG); ! if (str) ! { XtVaSetValues(w, XmNlabelString, str, NULL); XmStringFree(str); } *************** *** 1552,1568 **** char_u *filter; /* file name filter */ { char_u dirbuf[MAXPATHL]; char_u *pattern; char_u *tofree = NULL; dialog_wgt = XmCreateFileSelectionDialog(vimShell, (char *)title, NULL, 0); - if (dflt == NULL) - dflt = (char_u *)""; if (initdir == NULL || *initdir == NUL) { mch_dirname(dirbuf, MAXPATHL); initdir = dirbuf; } /* Can only use one pattern for a file name. Get the first pattern out of --- 1553,1580 ---- char_u *filter; /* file name filter */ { char_u dirbuf[MAXPATHL]; + char_u dfltbuf[MAXPATHL]; char_u *pattern; char_u *tofree = NULL; dialog_wgt = XmCreateFileSelectionDialog(vimShell, (char *)title, NULL, 0); if (initdir == NULL || *initdir == NUL) { mch_dirname(dirbuf, MAXPATHL); initdir = dirbuf; + } + + if (dflt == NULL) + dflt = (char_u *)""; + else if (STRLEN(initdir) + STRLEN(dflt) + 2 < MAXPATHL) + { + /* The default selection should be the full path, "dflt" is only the + * file name. */ + STRCPY(dfltbuf, initdir); + add_pathsep(dfltbuf); + STRCAT(dfltbuf, dflt); + dflt = dfltbuf; } /* Can only use one pattern for a file name. Get the first pattern out of *** ../vim60.162/src/message.c Fri Sep 28 22:19:57 2001 --- src/message.c Sun Feb 3 13:42:00 2002 *************** *** 2475,2483 **** do_browse(saving, title, dflt, ext, initdir, filter, buf) int saving; /* write action */ char_u *title; /* title for the window */ ! char_u *dflt; /* default file name */ char_u *ext; /* extension added */ ! char_u *initdir; /* initial directory, NULL for current dir */ char_u *filter; /* file name filter */ buf_T *buf; /* buffer to read/write for */ { --- 2475,2484 ---- do_browse(saving, title, dflt, ext, initdir, filter, buf) int saving; /* write action */ char_u *title; /* title for the window */ ! char_u *dflt; /* default file name (may include directory) */ char_u *ext; /* extension added */ ! char_u *initdir; /* initial directory, NULL for current dir or ! when using path from "dflt" */ char_u *filter; /* file name filter */ buf_T *buf; /* buffer to read/write for */ { *************** *** 2498,2505 **** title = (char_u *)_("Open File dialog"); } ! /* When no directory specified, use default dir, buffer dir, last dir ! * or current dir */ if (initdir == NULL || *initdir == NUL) { /* When 'browsedir' is a directory, use it */ --- 2499,2525 ---- title = (char_u *)_("Open File dialog"); } ! /* When no directory specified, use default file name, default dir, buffer ! * dir, last dir or current dir */ ! if ((initdir == NULL || *initdir == NUL) && dflt != NULL && *dflt != NUL) ! { ! if (mch_isdir(dflt)) /* default file name is a directory */ ! { ! initdir = dflt; ! dflt = NULL; ! } ! else if (gettail(dflt) != dflt) /* default file name includes a path */ ! { ! tofree = vim_strsave(dflt); ! if (tofree != NULL) ! { ! initdir = tofree; ! *gettail(initdir) = NUL; ! dflt = gettail(dflt); ! } ! } ! } ! if (initdir == NULL || *initdir == NUL) { /* When 'browsedir' is a directory, use it */ *************** *** 2509,2515 **** else if ((saving || *p_bsdir == 'b') && buf != NULL && buf->b_ffname != NULL) { ! dflt = gettail(curbuf->b_ffname); tofree = vim_strsave(curbuf->b_ffname); if (tofree != NULL) { --- 2529,2536 ---- else if ((saving || *p_bsdir == 'b') && buf != NULL && buf->b_ffname != NULL) { ! if (dflt == NULL || *dflt == NUL) ! dflt = gettail(curbuf->b_ffname); tofree = vim_strsave(curbuf->b_ffname); if (tofree != NULL) { *************** *** 2560,2566 **** *gettail(last_dir) = NUL; if (*last_dir == NUL) { ! /* filename only returned, must be in current dir*/ vim_free(last_dir); last_dir = alloc(MAXPATHL); if (last_dir != NULL) --- 2581,2587 ---- *gettail(last_dir) = NUL; if (*last_dir == NUL) { ! /* filename only returned, must be in current dir */ vim_free(last_dir); last_dir = alloc(MAXPATHL); if (last_dir != NULL) *** ../vim60.162/src/version.c Sun Feb 3 12:42:13 2002 --- src/version.c Sun Feb 3 15:16:22 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 163, /**/ -- hundred-and-one symptoms of being an internet addict: 168. You have your own domain name. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org /// To: vim-dev@vim.org Subject: Patch 6.0.164 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.164 Problem: After patch 6.0.135 the menu entries for pasting don't work in Insert and Visual mode. (Muraoka Taro) Solution: Add