diff options
Diffstat (limited to 'src')
64 files changed, 992 insertions, 553 deletions
diff --git a/src/GvimExt/GvimExt.reg b/src/GvimExt/GvimExt.reg index 02b174774..7b7480eae 100644 --- a/src/GvimExt/GvimExt.reg +++ b/src/GvimExt/GvimExt.reg @@ -15,6 +15,6 @@ REGEDIT4 [HKEY_LOCAL_MACHINE\Software\Vim\Gvim] "path"="gvim.exe" -[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 7.2a] - "DisplayName"="Vim 7.2a: Edit with Vim popup menu entry" +[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 7.2b] + "DisplayName"="Vim 7.2b: Edit with Vim popup menu entry" "UninstallString"="uninstal.exe" diff --git a/src/INSTALL b/src/INSTALL index 210d773a9..a4a992529 100644 --- a/src/INSTALL +++ b/src/INSTALL @@ -163,6 +163,16 @@ Add the "-posix" argument to the compiler by using one of these commands: export CC='cc -posix' (sh) And run configure with "--disable-motif-check". +Unix: LOCAL HEADERS AND LIBRARIES NOT IN /usr/local + +Sometimes it is necessary to search different path than /usr/local for locally +installed headers (/usr/local/include) and libraries (/usr/local/lib). +To search /stranger/include and /stranger/lib for locally installed +headers and libraries, use: + ./configure --with-local-dir=/stranger +And to not search for locally installed headers and libraries at all, use: + ./configure --without-local-dir + 3. RISC OS ============= diff --git a/src/INSTALLpc.txt b/src/INSTALLpc.txt index a2ee9545f..755ea3b50 100644 --- a/src/INSTALLpc.txt +++ b/src/INSTALLpc.txt @@ -27,7 +27,9 @@ Contents: 8. Windows 3.1 9. MS-DOS -The currently preferred method is using the free Visual C++ Toolkit 2003. +The currently preferred method is using the free Visual C++ Toolkit 2008 +|msvc-2008-express|. If you need the executable to run on Windows 98 or ME, +use the 2003 one |msvc-2003-toolkit|. 1. Microsoft Visual C++ @@ -71,11 +73,16 @@ These files have been supplied by George V. Reilly, Ben Singer, Ken Scott and Ron Aaron; they have been tested. -Visual C++ Toolkit 2003 +Visual C++ Toolkit 2003 *msvc-2003-toolkit* ----------------------- -You can download the Microsoft Visual C++ Toolkit 2003 from +You could download the Microsoft Visual C++ Toolkit 2003 from http://msdn.microsoft.com/visualc/vctoolkit2003/ +Unfortunately this URL is no longer valid. Inofficial downloads appear to be +available from links mentioned on these pages (use at your own risk): + http://www.filewatcher.com/m/VCToolkitSetup.exe.32952488.0.0.html + http://feargame.net/wiki/index.php?title=Building_Source_with_the_VC2003_Toolkit + This contains the command-line tools (compiler, linker, CRT headers, and libraries) for Visual Studio .NET 2003, but not the Visual Studio IDE. To compile and debug Vim with the VC2003 Toolkit, you will also need diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 18fd327b8..c2567d7c3 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -193,10 +193,6 @@ CPU = i386 CPU = i386 !endif # !PROCESSOR_ARCHITECTURE -!if ("$(CPU)" == "AMD64") || ("$(CPU)" == "IA64") -DEFINES=$(DEFINES) /Wp64 -!endif - # Build a retail version by default !if "$(DEBUG)" != "yes" @@ -211,6 +207,11 @@ MAKEFLAGS_GVIMEXT = DEBUG=yes !include <Win32.mak> +# Turn on Win64 compatibility warnings for 32-bit compiler in VC8. (/Wp64 is +# deprecated in VC9.) +!if ("$(MSVCVER)" == "8.0") +DEFINES=$(DEFINES) /Wp64 +!endif #>>>>> path of the compiler and linker; name of include and lib directories # PATH = c:\msvc20\bin;$(PATH) diff --git a/src/Makefile b/src/Makefile index cca2eef9f..69f091b93 100644 --- a/src/Makefile +++ b/src/Makefile @@ -310,6 +310,8 @@ CClink = $(CC) #CONF_ARGS = --exec-prefix=/usr #CONF_ARGS = --with-vim-name=vim7 --with-ex-name=ex7 --with-view-name=view7 #CONF_ARGS = --with-global-runtime=/etc/vim +#CONF_ARGS = --with-local-dir=/usr/share +#CONF_ARGS = --without-local-dir # Use this one if you distribute a modified version of Vim. #CONF_ARGS = --with-modified-by="John Doe" @@ -899,7 +901,7 @@ MAN1DIR = /man1 ### Vim version (adjusted by a script) VIMMAJOR = 7 -VIMMINOR = 2a +VIMMINOR = 2b ### Location of Vim files (should not need to be changed, and {{{1 ### some things might not work when they are changed!) @@ -1742,7 +1744,7 @@ test check: -if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \ cd $(PODIR); $(MAKE) -f Makefile check VIM=../$(VIMTARGET); \ fi - -if test $(VIMTARGET) != vim -a ! -e vim; then \ + -if test $(VIMTARGET) != vim -a ! -r vim; then \ ln -s $(VIMTARGET) vim; \ fi cd testdir; $(MAKE) -f Makefile $(GUI_TESTTARGET) VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) diff --git a/src/auto/configure b/src/auto/configure index cc9016381..ba65612ba 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -772,6 +772,7 @@ ac_user_opts=' enable_option_checking enable_darwin with_mac_arch +with_local_dir with_vim_name with_ex_name with_view_name @@ -1488,6 +1489,8 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-mac-arch=ARCH current, intel, ppc or both + --with-local-dir=PATH search PATH instead of /usr/local for local libraries. + --without-local-dir do not search /usr/local for local libraries. --with-vim-name=NAME what to call the Vim executable --with-ex-name=NAME what to call the Ex executable --with-view-name=NAME what to call the View executable @@ -4176,24 +4179,53 @@ fi if test "$cross_compiling" = no; then + { $as_echo "$as_me:$LINENO: checking --with-local-dir argument" >&5 +$as_echo_n "checking --with-local-dir argument... " >&6; } have_local_include='' have_local_lib='' - if test "$GCC" = yes; then + +# Check whether --with-local-dir was given. +if test "${with_local_dir+set}" = set; then + withval=$with_local_dir; + local_dir="$withval" + case "$withval" in + */*) ;; + no) + # avoid adding local dir to LDFLAGS and CPPFLAGS + have_local_dir=yes + have_local_lib=yes + ;; + *) { { $as_echo "$as_me:$LINENO: error: must pass path argument to --with-local-dir" >&5 +$as_echo "$as_me: error: must pass path argument to --with-local-dir" >&2;} + { (exit 1); exit 1; }; } ;; + esac + { $as_echo "$as_me:$LINENO: result: $local_dir" >&5 +$as_echo "$local_dir" >&6; } + +else + + local_dir=/usr/local + { $as_echo "$as_me:$LINENO: result: Defaulting to $local_dir" >&5 +$as_echo "Defaulting to $local_dir" >&6; } + +fi + + if test "$GCC" = yes -a "$local_dir" != no; then echo 'void f(){}' > conftest.c - have_local_include=`${CC-cc} -no-cpp-precomp -c -v conftest.c 2>&1 | grep '/usr/local/include'` - have_local_lib=`${CC-cc} -c -v conftest.c 2>&1 | grep '/usr/local/lib'` + have_local_include=`${CC-cc} -no-cpp-precomp -c -v conftest.c 2>&1 | grep "${local_dir}/include"` + have_local_lib=`${CC-cc} -c -v conftest.c 2>&1 | grep "${local_dir}/lib"` rm -f conftest.c conftest.o fi - if test -z "$have_local_lib" -a -d /usr/local/lib; then - tt=`echo "$LDFLAGS" | sed -e 's+-L/usr/local/lib ++g' -e 's+-L/usr/local/lib$++g'` + if test -z "$have_local_lib" -a -d "${local_dir}/lib"; then + tt=`echo "$LDFLAGS" | sed -e "s+-L${local_dir}/lib ++g" -e "s+-L${local_dir}/lib$++g"` if test "$tt" = "$LDFLAGS"; then - LDFLAGS="$LDFLAGS -L/usr/local/lib" + LDFLAGS="$LDFLAGS -L${local_dir}/lib" fi fi - if test -z "$have_local_include" -a -d /usr/local/include; then - tt=`echo "$CPPFLAGS" | sed -e 's+-I/usr/local/include ++g' -e 's+-I/usr/local/include$++g'` + if test -z "$have_local_include" -a -d "${local_dir}/include"; then + tt=`echo "$CPPFLAGS" | sed -e "s+-I${local_dir}/include ++g" -e "s+-I${local_dir}/include$++g"` if test "$tt" = "$CPPFLAGS"; then - CPPFLAGS="$CPPFLAGS -I/usr/local/include" + CPPFLAGS="$CPPFLAGS -I${local_dir}/include" fi fi fi diff --git a/src/configure.in b/src/configure.in index 35dce7f2b..7c65fab62 100644 --- a/src/configure.in +++ b/src/configure.in @@ -192,25 +192,43 @@ dnl Only when the directory exists and it wasn't there yet. dnl For gcc don't do this when it is already in the default search path. dnl Skip all of this when cross-compiling. if test "$cross_compiling" = no; then + AC_MSG_CHECKING(--with-local-dir argument) have_local_include='' have_local_lib='' - if test "$GCC" = yes; then + AC_ARG_WITH([local-dir], [ --with-local-dir=PATH search PATH instead of /usr/local for local libraries. + --without-local-dir do not search /usr/local for local libraries.], [ + local_dir="$withval" + case "$withval" in + */*) ;; + no) + # avoid adding local dir to LDFLAGS and CPPFLAGS + have_local_dir=yes + have_local_lib=yes + ;; + *) AC_MSG_ERROR(must pass path argument to --with-local-dir) ;; + esac + AC_MSG_RESULT($local_dir) + ], [ + local_dir=/usr/local + AC_MSG_RESULT(Defaulting to $local_dir) + ]) + if test "$GCC" = yes -a "$local_dir" != no; then echo 'void f(){}' > conftest.c dnl -no-cpp-precomp is needed for OS X 10.2 (Ben Fowler) - have_local_include=`${CC-cc} -no-cpp-precomp -c -v conftest.c 2>&1 | grep '/usr/local/include'` - have_local_lib=`${CC-cc} -c -v conftest.c 2>&1 | grep '/usr/local/lib'` + have_local_include=`${CC-cc} -no-cpp-precomp -c -v conftest.c 2>&1 | grep "${local_dir}/include"` + have_local_lib=`${CC-cc} -c -v conftest.c 2>&1 | grep "${local_dir}/lib"` rm -f conftest.c conftest.o fi - if test -z "$have_local_lib" -a -d /usr/local/lib; then - tt=`echo "$LDFLAGS" | sed -e 's+-L/usr/local/lib ++g' -e 's+-L/usr/local/lib$++g'` + if test -z "$have_local_lib" -a -d "${local_dir}/lib"; then + tt=`echo "$LDFLAGS" | sed -e "s+-L${local_dir}/lib ++g" -e "s+-L${local_dir}/lib$++g"` if test "$tt" = "$LDFLAGS"; then - LDFLAGS="$LDFLAGS -L/usr/local/lib" + LDFLAGS="$LDFLAGS -L${local_dir}/lib" fi fi - if test -z "$have_local_include" -a -d /usr/local/include; then - tt=`echo "$CPPFLAGS" | sed -e 's+-I/usr/local/include ++g' -e 's+-I/usr/local/include$++g'` + if test -z "$have_local_include" -a -d "${local_dir}/include"; then + tt=`echo "$CPPFLAGS" | sed -e "s+-I${local_dir}/include ++g" -e "s+-I${local_dir}/include$++g"` if test "$tt" = "$CPPFLAGS"; then - CPPFLAGS="$CPPFLAGS -I/usr/local/include" + CPPFLAGS="$CPPFLAGS -I${local_dir}/include" fi fi fi diff --git a/src/eval.c b/src/eval.c index 7ebaa08f1..18c8329df 100644 --- a/src/eval.c +++ b/src/eval.c @@ -10,7 +10,7 @@ /* * eval.c: Expression evaluation. */ -#if defined(MSDOS) || defined(MSWIN) +#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64) # include "vimio.h" /* for mch_open(), must be before vim.h */ #endif @@ -9697,15 +9697,19 @@ f_filereadable(argvars, rettv) typval_T *argvars; typval_T *rettv; { - FILE *fd; + int fd; char_u *p; int n; +#ifndef O_NONBLOCK +# define O_NONBLOCK 0 +#endif p = get_tv_string(&argvars[0]); - if (*p && !mch_isdir(p) && (fd = mch_fopen((char *)p, "r")) != NULL) + if (*p && !mch_isdir(p) && (fd = mch_open((char *)p, + O_RDONLY | O_NONBLOCK, 0)) >= 0) { n = TRUE; - fclose(fd); + close(fd); } else n = FALSE; @@ -21975,7 +21979,7 @@ shortpath_for_invalid_fname(fname, bufp, fnamelen) ch = *endp; *endp = 0; short_fname = save_fname; - len = STRLEN(short_fname) + 1; + len = (int)STRLEN(short_fname) + 1; if (get_short_pathname(&short_fname, &pbuf_unused, &len) == FAIL) { retval = FAIL; diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 6425ac043..760533d7a 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -11,7 +11,7 @@ * ex_cmds.c: some functions for command line commands */ -#if defined(MSDOS) || defined(MSWIN) +#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64) # include "vimio.h" /* for mch_open(), must be before vim.h */ #endif @@ -5892,7 +5892,7 @@ find_help_tags(arg, num_matches, matches, keep_lang) flags = TAG_HELP | TAG_REGEXP | TAG_NAMES | TAG_VERBOSE; if (keep_lang) flags |= TAG_KEEP_LANG; - if (find_tags(IObuff, num_matches, matches, flags, (int)MAXCOL, NULL) == OK + if (find_tags(IObuff, num_matches, matches, flags, TAG_MANY, NULL) == OK && *num_matches > 0) /* Sort the matches found on the heuristic number that is after the * tag name. */ diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index 582613e12..f86e6ee6a 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -11,7 +11,7 @@ * ex_cmds2.c: some more functions for command line commands */ -#if defined(WIN32) && defined(FEAT_CSCOPE) +#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64) # include "vimio.h" /* for mch_open(), must be before vim.h */ #endif diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 83cffc1fc..246c4c0b2 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -6728,6 +6728,10 @@ handle_drop(filec, filev, split) if (curbuf_locked()) return; #endif + /* When the screen is being updated we should not change buffers and + * windows structures, it may cause freed memory to be used. */ + if (updating_screen) + return; /* Check whether the current buffer is changed. If so, we will need * to split the current window or data could be lost. @@ -958,7 +958,13 @@ gui_update_cursor(force, clear_selection) static int iid; guicolor_T fg, bg; - if (im_get_status()) + if ( +# ifdef HAVE_GTK2 + preedit_get_status() +# else + im_get_status() +# endif + ) { iid = syn_name2id((char_u *)"CursorIM"); if (iid > 0) @@ -5124,6 +5130,16 @@ gui_handle_drop(x, y, modifiers, fnames, count) { int i; char_u *p; + static int entered = FALSE; + + /* + * This function is called by event handlers. Just in case we get a + * second event before the first one is handled, ignore the second one. + * Not sure if this can ever happen, just in case. + */ + if (entered) + return; + entered = TRUE; /* * When the cursor is at the command line, add the file names to the @@ -5207,5 +5223,7 @@ gui_handle_drop(x, y, modifiers, fnames, count) gui_update_cursor(FALSE, FALSE); gui_mch_flush(); } + + entered = FALSE; } #endif diff --git a/src/gui_mac.c b/src/gui_mac.c index 1ef582053..77cd5cad2 100644 --- a/src/gui_mac.c +++ b/src/gui_mac.c @@ -2543,7 +2543,6 @@ gui_mac_doMouseUpEvent(EventRecord *theEvent) gui_mac_mouse_wheel(EventHandlerCallRef nextHandler, EventRef theEvent, void *data) { - EventRef bogusEvent; Point point; Rect bounds; UInt32 mod; @@ -2574,16 +2573,6 @@ gui_mac_mouse_wheel(EventHandlerCallRef nextHandler, EventRef theEvent, if (mod & optionKey) vim_mod |= MOUSE_ALT; - /* post a bogus event to wake up WaitNextEvent */ - if (noErr != CreateEvent(NULL, kEventClassMouse, kEventMouseMoved, 0, - kEventAttributeNone, &bogusEvent)) - goto bail; - if (noErr != PostEventToQueue(GetMainEventQueue(), bogusEvent, - kEventPriorityLow)) - goto bail; - - ReleaseEvent(bogusEvent); - if (noErr == GetWindowBounds(gui.VimWindow, kWindowContentRgn, &bounds)) { point.h -= bounds.left; @@ -2593,6 +2582,9 @@ gui_mac_mouse_wheel(EventHandlerCallRef nextHandler, EventRef theEvent, gui_send_mouse_event((delta > 0) ? MOUSE_4 : MOUSE_5, point.h, point.v, FALSE, vim_mod); + /* post a bogus event to wake up WaitNextEvent */ + PostEvent(keyUp, 0); + return noErr; bail: diff --git a/src/if_perl.xs b/src/if_perl.xs index acf7f86d8..a6994f694 100644 --- a/src/if_perl.xs +++ b/src/if_perl.xs @@ -163,6 +163,23 @@ EXTERN_C void boot_DynaLoader __ARGS((pTHX_ CV*)); # define Perl_Isv_yes_ptr dll_Perl_Isv_yes_ptr # define boot_DynaLoader dll_boot_DynaLoader +# define Perl_sys_init3 dll_Perl_sys_init3 +# define Perl_sys_term dll_Perl_sys_term +# define Perl_ISv_ptr dll_Perl_ISv_ptr +# define Perl_Istack_max_ptr dll_Perl_Istack_max_ptr +# define Perl_Istack_base_ptr dll_Perl_Istack_base_ptr +# define Perl_Itmps_ix_ptr dll_Perl_Itmps_ix_ptr +# define Perl_Itmps_floor_ptr dll_Perl_Itmps_floor_ptr +# define Perl_IXpv_ptr dll_Perl_IXpv_ptr +# define Perl_Ina_ptr dll_Perl_Ina_ptr +# define Perl_Imarkstack_ptr_ptr dll_Perl_Imarkstack_ptr_ptr +# define Perl_Imarkstack_max_ptr dll_Perl_Imarkstack_max_ptr +# define Perl_Istack_sp_ptr dll_Perl_Istack_sp_ptr +# define Perl_Iop_ptr dll_Perl_Iop_ptr +# define Perl_call_list dll_Perl_call_list +# define Perl_Iscopestack_ix_ptr dll_Perl_Iscopestack_ix_ptr +# define Perl_Iunitcheckav_ptr dll_Perl_Iunitcheckav_ptr + #ifndef DYNAMIC_PERL /* just generating prototypes */ typedef int HANDLE; typedef int XSINIT_t; @@ -250,6 +267,24 @@ static GV** (*Perl_Ierrgv_ptr)(register PerlInterpreter*); static SV* (*Perl_Isv_yes_ptr)(register PerlInterpreter*); static void (*boot_DynaLoader)_((pTHX_ CV*)); +#if (PERL_REVISION == 5) && (PERL_VERSION >= 10) +static void (*Perl_sys_init3)(int* argc, char*** argv, char*** env); +static void (*Perl_sys_term)(void); +static SV** (*Perl_ISv_ptr)(register PerlInterpreter*); +static SV*** (*Perl_Istack_max_ptr)(register PerlInterpreter*); +static SV*** (*Perl_Istack_base_ptr)(register PerlInterpreter*); +static XPV** (*Perl_IXpv_ptr)(register PerlInterpreter*); +static I32* (*Perl_Itmps_ix_ptr)(register PerlInterpreter*); +static I32* (*Perl_Itmps_floor_ptr)(register PerlInterpreter*); +static STRLEN* (*Perl_Ina_ptr)(register PerlInterpreter*); +static I32** (*Perl_Imarkstack_ptr_ptr)(register PerlInterpreter*); +static I32** (*Perl_Imarkstack_max_ptr)(register PerlInterpreter*); +static SV*** (*Perl_Istack_sp_ptr)(register PerlInterpreter*); +static OP** (*Perl_Iop_ptr)(register PerlInterpreter*); +static void (*Perl_call_list)(pTHX_ I32, AV*); +static I32* (*Perl_Iscopestack_ix_ptr)(register PerlInterpreter*); +static AV** (*Perl_Iunitcheckav_ptr)(register PerlInterpreter*); +#endif /* * Table of name to function pointer of perl. @@ -319,6 +354,7 @@ static struct { {"Perl_sv_setsv", (PERL_PROC*)&Perl_sv_setsv}, #endif {"Perl_sv_upgrade", (PERL_PROC*)&Perl_sv_upgrade}, +#if (PERL_REVISION == 5) && (PERL_VERSION < 10) {"Perl_Tstack_sp_ptr", (PERL_PROC*)&Perl_Tstack_sp_ptr}, {"Perl_Top_ptr", (PERL_PROC*)&Perl_Top_ptr}, {"Perl_Tstack_base_ptr", (PERL_PROC*)&Perl_Tstack_base_ptr}, @@ -330,6 +366,25 @@ static struct { {"Perl_TSv_ptr", (PERL_PROC*)&Perl_TSv_ptr}, {"Perl_TXpv_ptr", (PERL_PROC*)&Perl_TXpv_ptr}, {"Perl_Tna_ptr", (PERL_PROC*)&Perl_Tna_ptr}, +#else + {"Perl_sys_init3", (PERL_PROC*)&Perl_sys_init3}, + {"Perl_sys_term", (PERL_PROC*)&Perl_sys_term}, + {"Perl_ISv_ptr", (PERL_PROC*)&Perl_ISv_ptr}, + {"Perl_Istack_sp_ptr", (PERL_PROC*)&Perl_Istack_sp_ptr}, + {"Perl_Iop_ptr", (PERL_PROC*)&Perl_Iop_ptr}, + {"Perl_Istack_base_ptr", (PERL_PROC*)&Perl_Istack_base_ptr}, + {"Perl_Istack_max_ptr", (PERL_PROC*)&Perl_Istack_max_ptr}, + {"Perl_Itmps_ix_ptr", (PERL_PROC*)&Perl_Itmps_ix_ptr}, + {"Perl_Itmps_floor_ptr", (PERL_PROC*)&Perl_Itmps_floor_ptr}, + {"Perl_Imarkstack_ptr_ptr", (PERL_PROC*)&Perl_Imarkstack_ptr_ptr}, + {"Perl_Imarkstack_max_ptr", (PERL_PROC*)&Perl_Imarkstack_max_ptr}, + {"Perl_ISv_ptr", (PERL_PROC*)&Perl_ISv_ptr}, + {"Perl_IXpv_ptr", (PERL_PROC*)&Perl_IXpv_ptr}, + {"Perl_Ina_ptr", (PERL_PROC*)&Perl_Ina_ptr}, + {"Perl_call_list", (PERL_PROC*)&Perl_call_list}, + {"Perl_Iscopestack_ix_ptr", (PERL_PROC*)&Perl_Iscopestack_ix_ptr}, + {"Perl_Iunitcheckav_ptr", (PERL_PROC*)&Perl_Iunitcheckav_ptr}, +#endif {"Perl_Idefgv_ptr", (PERL_PROC*)&Perl_Idefgv_ptr}, {"Perl_Ierrgv_ptr", (PERL_PROC*)&Perl_Ierrgv_ptr}, {"Perl_Isv_yes_ptr", (PERL_PROC*)&Perl_Isv_yes_ptr}, @@ -395,12 +450,16 @@ perl_enabled(verbose) static void perl_init() { - char *bootargs[] = { "VI", NULL }; - static char *args[] = { "", "-e", "" }; + char *bootargs[] = { "VI", NULL }; + int argc = 3; + static char *argv[] = { "", "-e", "" }; +#if (PERL_REVISION == 5) && (PERL_VERSION >= 10) + Perl_sys_init3(&argc, (char***)&argv, NULL); +#endif perl_interp = perl_alloc(); perl_construct(perl_interp); - perl_parse(perl_interp, xs_init, 3, args, 0); + perl_parse(perl_interp, xs_init, argc, argv, 0); perl_call_argv("VIM::bootstrap", (long)G_DISCARD, bootargs); VIM_init(); #ifdef USE_SFIO @@ -423,6 +482,9 @@ perl_end() perl_destruct(perl_interp); perl_free(perl_interp); perl_interp = NULL; +#if (PERL_REVISION == 5) && (PERL_VERSION >= 10) + Perl_sys_term(); +#endif } #ifdef DYNAMIC_PERL if (hPerlLib) diff --git a/src/if_python.c b/src/if_python.c index 8fcb10930..66e792bec 100644 --- a/src/if_python.c +++ b/src/if_python.c @@ -1764,7 +1764,7 @@ RangeRepr(PyObject *self) if (name == NULL) name = ""; - len = strlen(name); + len = (int)strlen(name); if (len > 45) name = name + (45 - len); diff --git a/src/main.c b/src/main.c index 53d184879..587081bda 100644 --- a/src/main.c +++ b/src/main.c @@ -7,7 +7,7 @@ * See README.txt for an overview of the Vim source code. */ -#if defined(MSDOS) || defined(WIN32) || defined(_WIN64) +#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64) # include "vimio.h" /* for close() and dup() */ #endif diff --git a/src/mbyte.c b/src/mbyte.c index d6edf201e..38bec9d8b 100644 --- a/src/mbyte.c +++ b/src/mbyte.c @@ -3454,6 +3454,7 @@ init_preedit_start_col(void) # if defined(HAVE_GTK2) && !defined(PROTO) static int im_is_active = FALSE; /* IM is enabled for current mode */ +static int preedit_is_active = FALSE; static int im_preedit_cursor = 0; /* cursor offset in characters */ static int im_preedit_trailing = 0; /* number of characters after cursor */ @@ -3686,7 +3687,9 @@ im_preedit_start_cb(GtkIMContext *context, gpointer data) #endif im_is_active = TRUE; + preedit_is_active = TRUE; gui_update_cursor(TRUE, FALSE); + im_show_info(); } /* @@ -3707,9 +3710,11 @@ im_preedit_end_cb(GtkIMContext *context, gpointer data) #if 0 /* Removal of this line suggested by Takuhiro Nishioka. Fixes that IM was - * switched off unintentionally. */ + * switched off unintentionally. We now use preedit_is_active (added by + * SungHyun Nam). */ im_is_active = FALSE; #endif + preedit_is_active = FALSE; gui_update_cursor(TRUE, FALSE); im_show_info(); } @@ -5723,6 +5728,14 @@ im_get_status() # endif /* !HAVE_GTK2 */ +# if defined(HAVE_GTK2) || defined(PROTO) + int +preedit_get_status(void) +{ + return preedit_is_active; +} +# endif + # if defined(FEAT_GUI_GTK) || defined(PROTO) int im_is_preediting() diff --git a/src/memfile.c b/src/memfile.c index dd8dc13d4..0b3cdd9be 100644 --- a/src/memfile.c +++ b/src/memfile.c @@ -32,7 +32,7 @@ * file is opened. */ -#if defined MSDOS || defined(WIN32) || defined(_WIN64) +#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64) # include "vimio.h" /* for lseek(), must be before vim.h */ #endif diff --git a/src/memline.c b/src/memline.c index 99293803a..f5a68b19f 100644 --- a/src/memline.c +++ b/src/memline.c @@ -42,7 +42,7 @@ * mf_get(). */ -#if defined(MSDOS) || defined(WIN32) || defined(_WIN64) +#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64) # include "vimio.h" /* for mch_open(), must be before vim.h */ #endif diff --git a/src/message.c b/src/message.c index 41dfffbae..bf340d04d 100644 --- a/src/message.c +++ b/src/message.c @@ -1390,7 +1390,7 @@ msg_outtrans_len_attr(msgstr, len, attr) attr); plain_start = str + 1; msg_puts_attr(s, attr == 0 ? hl_attr(HLF_8) : attr); - retval += STRLEN(s); + retval += (int)STRLEN(s); } else ++retval; diff --git a/src/move.c b/src/move.c index f21f5e9f6..c547d9b0e 100644 --- a/src/move.c +++ b/src/move.c @@ -876,7 +876,7 @@ validate_cheight() } /* - * validate w_wcol and w_virtcol only. Only correct when 'wrap' on! + * Validate w_wcol and w_virtcol only. */ void validate_cursor_col() @@ -892,13 +892,19 @@ validate_cursor_col() col += off; /* long line wrapping, adjust curwin->w_wrow */ - if (curwin->w_p_wrap && col >= (colnr_T)W_WIDTH(curwin) + if (curwin->w_p_wrap + && col >= (colnr_T)W_WIDTH(curwin) && W_WIDTH(curwin) - off + curwin_col_off2() > 0) { col -= W_WIDTH(curwin); col = col % (W_WIDTH(curwin) - off + curwin_col_off2()); } + if (col > (int)curwin->w_leftcol) + col -= curwin->w_leftcol; + else + col = 0; curwin->w_wcol = col; + curwin->w_valid |= VALID_WCOL; } } diff --git a/src/netbeans.c b/src/netbeans.c index d3fa4b0df..80a1b4375 100644 --- a/src/netbeans.c +++ b/src/netbeans.c @@ -16,7 +16,7 @@ * See ":help netbeans-protocol" for explanation. */ -#if defined(MSDOS) || defined(MSWIN) +#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64) # include "vimio.h" /* for mch_open(), must be before vim.h */ #endif @@ -29,7 +29,6 @@ # ifdef DEBUG # include <tchar.h> /* for _T definition for TRACEn macros */ # endif -# include "vimio.h" /* WinSock API is separated from C API, thus we can't use read(), write(), * errno... */ # define sock_errno WSAGetLastError() diff --git a/src/po/af.po b/src/po/af.po index c41225deb..0ace71dcb 100644 --- a/src/po/af.po +++ b/src/po/af.po @@ -1337,7 +1337,7 @@ msgstr "E203: Outobevele het die skryfbuffer geskrap of uitgelaai" msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: Outobevel het etlike rels op onverwagse wyse verander " -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans laat nie skryf toe van onveranderde buffers nie" msgid "Partial writes disallowed for NetBeans buffers" @@ -4485,14 +4485,14 @@ msgstr "E440: herstelrel ontbreek" #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" "MS-Windows 16/32-bis GUI weergawe" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "MS-Windows 32-bis GUI version" @@ -4505,28 +4505,28 @@ msgstr " met OLE ondersteuning" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 32-bit console version" msgstr "" "\n" "MS-Windows 32-bis konsole weergawe" msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "MS-Windows 16-bis weergawe" msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "32-bis MS-DOS weergawe" msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "16-bis MS-DOS weergawe" diff --git a/src/po/ca.po b/src/po/ca.po index 54623b2e5..441d858eb 100644 --- a/src/po/ca.po +++ b/src/po/ca.po @@ -608,13 +608,13 @@ msgstr "(No vlid)" msgid "E677: Error writing temp file" msgstr "E677: Error en escriure el fitxer temporal" -msgid "E703: Using a Funcref as a number" +msgid "E703: Using a Funcref as a Number" msgstr "E703: s d'una referncia de funci com a nmero" -msgid "E745: Using a List as a number" +msgid "E745: Using a List as a Number" msgstr "E745: s d'una llista com a nmero" -msgid "E728: Using a Dictionary as a number" +msgid "E728: Using a Dictionary as a Number" msgstr "E728: s d'un diccionari com a nmero" msgid "E729: using Funcref as a String" @@ -1592,7 +1592,7 @@ msgstr "E203: Auto-ordres han eliminat o alliberat el buffer a escriure" msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: Una auto-ordre ha canviat el nombre de lnies de forma inesperada" -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans no permet escriure buffers no modificats" msgid "Partial writes disallowed for NetBeans buffers" @@ -5433,21 +5433,21 @@ msgstr "E440: Falta una lnia de desfer" #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" "Versi GUI per MS-Windows 16/32 bits" msgid "" "\n" -"MS-Windows 64 bit GUI version" +"MS-Windows 64-bit GUI version" msgstr "" "\n" "Versi GUI per a MS-Windows 64 bits" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "Versi GUI per MS-Windows 32 bits" @@ -5460,28 +5460,28 @@ msgstr " amb suport per OLE" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 32-bit console version" msgstr "" "\n" "Versi consola per MS-Windows 32 bits" msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "Versi per MS-Windows 16 bits" msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "Versi per MS-DOS 32 bits" msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "Versi per MS-DOS 16 bits" diff --git a/src/po/cs.cp1250.po b/src/po/cs.cp1250.po index a0650cfc2..238022121 100644 --- a/src/po/cs.cp1250.po +++ b/src/po/cs.cp1250.po @@ -4121,14 +4121,14 @@ msgstr "E440: chyb undo dek" #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" "16/32 bitov GUI verze pro MS Windows" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "32 bitov GUI verze pro MS Windows" @@ -4141,28 +4141,28 @@ msgstr " s OLE podporou" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 32-bit console version" msgstr "" "\n" "32 bitov verze pro MS Windows konzolu" msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "16 bitov verze pro MS Windows" msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "32 bitov verze pro MS Windows" msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "16 bitov MS-DOS verze" diff --git a/src/po/cs.po b/src/po/cs.po index 04632fc24..5c232f6a3 100644 --- a/src/po/cs.po +++ b/src/po/cs.po @@ -4121,14 +4121,14 @@ msgstr "E440: chyb undo dek" #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" "16/32 bitov GUI verze pro MS Windows" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "32 bitov GUI verze pro MS Windows" @@ -4141,28 +4141,28 @@ msgstr " s OLE podporou" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 32-bit console version" msgstr "" "\n" "32 bitov verze pro MS Windows konzolu" msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "16 bitov verze pro MS Windows" msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "32 bitov verze pro MS Windows" msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "16 bitov MS-DOS verze" diff --git a/src/po/de.po b/src/po/de.po index 3a897f2d7..602e3ea7a 100644 --- a/src/po/de.po +++ b/src/po/de.po @@ -566,13 +566,13 @@ msgstr "(Ungltig)" msgid "E677: Error writing temp file" msgstr "E677: Fehler beim Schreiben einer temporren Datei" -msgid "E703: Using a Funcref as a number" +msgid "E703: Using a Funcref as a Number" msgstr "E703: Funktionsreferenz als Zahl verwendet" -msgid "E745: Using a List as a number" +msgid "E745: Using a List as a Number" msgstr "E745: Liste als Zahl verwendet" -msgid "E728: Using a Dictionary as a number" +msgid "E728: Using a Dictionary as a Number" msgstr "E728: Wrterbuch als Zahl verwendet" msgid "E729: using Funcref as a String" @@ -1509,7 +1509,7 @@ msgstr "E203: Autokommandos haben den zu schreibenden Puffer gelscht oder entla msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: Autokommandos haben die Anzahl der Zeilen in unerwarteter Weise verndert" -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans verweigert das Schreiben von unvernderten Puffern" msgid "Partial writes disallowed for NetBeans buffers" @@ -5290,14 +5290,14 @@ msgstr "E440: Wiederherstellungszeile fehlt" #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" "MS-Windows 16/32 Bit GUI Version" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "MS-Windows 32 Bit GUI Version" @@ -5310,28 +5310,28 @@ msgstr " mit OLE-Untersttzung" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 32-bit console version" msgstr "" "\n" "MS-Windows 32 Bit Konsolen-Version" msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "MS-Windows 16 Bit Version" msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "32 Bit MS-DOS Version" msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "16 Bit MS-DOS Version" diff --git a/src/po/eo.po b/src/po/eo.po index 3aa1ba3a5..fc89706bf 100644 --- a/src/po/eo.po +++ b/src/po/eo.po @@ -8,8 +8,6 @@ # Antono MECHELYNCK <antoine.mechelynck ĉe skynet.be> # Yves NEVELSTEEN # -# Lasta ŝanĝo: 26 Apr 2008 -# # Uzitaj vortaroj kaj fakvortaroj: # Revo: http://www.reta-vortaro.de/revo/ # Komputeko: http://komputeko.net/index_eo.php @@ -25,8 +23,8 @@ msgid "" msgstr "" "Project-Id-Version: Vim(Esperanto)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-12 18:05+0100\n" -"PO-Revision-Date: 2008-04-26 18:14+0100\n" +"POT-Creation-Date: 2008-06-27 22:52+0200\n" +"PO-Revision-Date: 2008-06-27 23:01+0200\n" "Last-Translator: Dominique PELLÉ <dominique.pelle@gmail.com>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -470,6 +468,9 @@ msgstr "E693: Eblas nur kompari Funcref kun Funcref" msgid "E694: Invalid operation for Funcrefs" msgstr "E694: Nevalida operacio de Funcref-oj" +msgid "E804: Cannot use '%' with Float" +msgstr "E804: Ne eblas uzi '%' kun glitpunktnombro" + msgid "E110: Missing ')'" msgstr "E110: Mankas ')'" @@ -535,6 +536,9 @@ msgstr "E120: <SID> estas uzata ekster kunteksto de skripto: %s" msgid "E725: Calling dict function without Dictionary: %s" msgstr "E725: Alvoko de funkcio dict sen Vortaro: %s" +msgid "E808: Number or Float required" +msgstr "E808: Nombro aŭ Glitpunktnombro bezonata" + msgid "E699: Too many arguments" msgstr "E699: Tro da argumentoj" @@ -611,17 +615,20 @@ msgstr "(Nevalida)" msgid "E677: Error writing temp file" msgstr "E677: Eraro dum skribo de provizora dosiero" -msgid "E703: Using a Funcref as a number" -msgstr "E703: Uzo de Funcref kiel nombro" +msgid "E805: Using a Float as a Number" +msgstr "E805: Uzo de Glitpunktnombro kiel Nombro" -msgid "E745: Using a List as a number" -msgstr "E745: Uzo de Listo kiel nombro" +msgid "E703: Using a Funcref as a Number" +msgstr "E703: Uzo de Funcref kiel Nombro" -msgid "E728: Using a Dictionary as a number" -msgstr "E728: Uzo de Vortaro kiel nombro" +msgid "E745: Using a List as a Number" +msgstr "E745: Uzo de Listo kiel Nombro" + +msgid "E728: Using a Dictionary as a Number" +msgstr "E728: Uzo de Vortaro kiel Nombro" msgid "E729: using Funcref as a String" -msgstr "E729: uzo de Funcref kiel ĉeno" +msgstr "E729: uzo de Funcref kiel Ĉeno" msgid "E730: using List as a String" msgstr "E730: uzo de Listo kiel Ĉeno" @@ -629,6 +636,9 @@ msgstr "E730: uzo de Listo kiel Ĉeno" msgid "E731: using Dictionary as a String" msgstr "E731: uzo de Vortaro kiel Ĉeno" +msgid "E806: using Float as a String" +msgstr "E806: uzo de Glitpunktnumbro kiel Ĉeno" + #, c-format msgid "E704: Funcref variable name must start with a capital: %s" msgstr "E704: Nomo de variablo Funcref ekendas per majusklo: %s" @@ -1328,7 +1338,8 @@ msgstr "E495: neniu dosiernomo de aŭtokomando por anstataŭigi al \"<afile>\"" # DP: mi ne certas, ĉu <abuf> tradukeblas # AM: laŭ mi ne msgid "E496: no autocommand buffer number to substitute for \"<abuf>\"" -msgstr "E496: neniu numero de bufro de aŭtokomando por anstataŭigi al \"<abuf>\"" +msgstr "" +"E496: neniu numero de bufro de aŭtokomando por anstataŭigi al \"<abuf>\"" # DP: mi ne certas, ĉu <amatch> tradukeblas # AM: laŭ mi ne @@ -1604,7 +1615,7 @@ msgstr "E203: Aŭtokomandoj forviŝis aŭ malŝargis la skribendan bufron" msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: Aŭtokomando ŝanĝis la nombron de linioj neatendite" -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans malpermesas skribojn de neŝanĝitaj bufroj" msgid "Partial writes disallowed for NetBeans buffers" @@ -2539,8 +2550,8 @@ msgid "line number out of range" msgstr "numero de linio ekster limoj" #, c-format -msgid "<buffer object (deleted) at %8lX>" -msgstr "<bufra objekto (forviŝita) ĉe %8lX>" +msgid "<buffer object (deleted) at %p>" +msgstr "<bufra objekto (forviŝita) ĉe %p>" msgid "invalid mark name" msgstr "nevalida nomo de marko" @@ -2558,12 +2569,12 @@ msgid "cursor position outside buffer" msgstr "kursoro poziciita ekster bufro" #, c-format -msgid "<window object (deleted) at %.8lX>" -msgstr "<fenestra objekto (forviŝita) ĉe %.8lX>" +msgid "<window object (deleted) at %p>" +msgstr "<fenestra objekto (forviŝita) ĉe %p>" #, c-format -msgid "<window object (unknown) at %.8lX>" -msgstr "<objekta fenestro (nekonata) ĉe %.8lX>" +msgid "<window object (unknown) at %p>" +msgstr "<objekta fenestro (nekonata) ĉe %p>" #, c-format msgid "<window %d>" @@ -2903,7 +2914,7 @@ msgid "-g\t\t\tRun using GUI (like \"gvim\")" msgstr "-g\t\t\tRuli per grafika interfaco (kiel \"gvim\")" msgid "-f or --nofork\tForeground: Don't fork when starting GUI" -msgstr "-f, --nofork\tMalfono: ne forki kiam lanĉas grafikan interfacon" +msgstr "-f aŭ --nofork\tMalfono: ne forki kiam lanĉas grafikan interfacon" msgid "-v\t\t\tVi mode (like \"vi\")" msgstr "-v\t\t\tReĝimo Vi (kiel \"vi\")" @@ -3057,7 +3068,8 @@ msgstr "" msgid "" "--remote-tab[-wait][-silent] <files> As --remote but use tab page per file" msgstr "" -"--remote-tab[-wait][-silent] <dosieroj> Kiel --remote sed uzi langeton por ĉiu dosiero" +"--remote-tab[-wait][-silent] <dosieroj> Kiel --remote sed uzi langeton por " +"ĉiu dosiero" msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit" msgstr "--remote-send <klavoj> Sendi <klavoj>-n al Vim-servilo kaj eliri" @@ -3147,7 +3159,7 @@ msgid "-reverse\t\tUse reverse video (also: -rv)" msgstr "-reverse\t\tUzi inversan videon (ankaŭ: -rv)" msgid "+reverse\t\tDon't use reverse video (also: +rv)" -msgstr "+reverse\t\t\t Ne uzi inversan videon (ankaŭ: +rv)" +msgstr "+reverse\t\tNe uzi inversan videon (ankaŭ: +rv)" msgid "-xrm <resource>\tSet the specified resource" msgstr "-xrm <rimedo>\tAgordi la specifitan <rimedo>-n" @@ -3334,7 +3346,8 @@ msgstr "E302: Ne eblis renomi la permutodosieron .swp" #, c-format msgid "E303: Unable to open swap file for \"%s\", recovery impossible" -msgstr "E303: Ne eblas malfermi permutodosieron .swp de \"%s\", restaŭro neeblas" +msgstr "" +"E303: Ne eblas malfermi permutodosieron .swp de \"%s\", restaŭro neeblas" msgid "E304: ml_upd_block0(): Didn't get block 0??" msgstr "E304: ml_upd_block0(): Ne akiris blokon 0??" @@ -3842,6 +3855,9 @@ msgstr "E338: Bedaŭrinde ne estas dosierfoliumilo en konzola reĝimo" msgid "E766: Insufficient arguments for printf()" msgstr "E766: Ne sufiĉaj argumentoj por printf()" +msgid "E807: Expected Float argument for printf()" +msgstr "E807: Atendis Glitpunktnombron kiel argumento de printf()" + msgid "E767: Too many arguments to printf()" msgstr "E767: Tro da argumentoj al printf()" @@ -3965,7 +3981,6 @@ msgstr "E346: Ne plu trovis dosierujon \"%s\" en cdpath" msgid "E347: No more file \"%s\" found in path" msgstr "E347: Ne plu trovis dosieron \"%s\" en serĉvojo" -#. Get here when the server can't be found. msgid "Cannot connect to Netbeans #2" msgstr "Ne eblas konekti al Netbeans n-ro 2" @@ -3974,7 +3989,8 @@ msgstr "Ne eblas konekti al Netbeans" #, c-format msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\"" -msgstr "E668: Nevalida permeso de dosiero de informo de konekto NetBeans: \"%s\"" +msgstr "" +"E668: Nevalida permeso de dosiero de informo de konekto NetBeans: \"%s\"" msgid "read from Netbeans socket" msgstr "lego el kontaktoskatolo de Netbeans" @@ -4411,6 +4427,20 @@ msgstr "Tempolimo okazis dum malfermo de vidigo X" msgid "" "\n" +"Could not get security context for " +msgstr "" +"\n" +"Ne povis akiri kuntekston de sekureco por " + +msgid "" +"\n" +"Could not set security context for " +msgstr "" +"\n" +"Ne povis ŝalti kuntekston de sekureco por " + +msgid "" +"\n" "Cannot execute shell " msgstr "" "\n" @@ -5534,24 +5564,24 @@ msgstr "E440: linio de malfaro mankas" #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" -"Grafika versio MS-Vindozo 16/32 bitoj" +"Grafika versio MS-Vindozo 16/32-bitoj" msgid "" "\n" -"MS-Windows 64 bit GUI version" +"MS-Windows 64-bit GUI version" msgstr "" "\n" -"Grafika versio MS-Vindozo 64 bitoj" +"Grafika versio MS-Vindozo 64-bitoj" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" -"Grafika versio MS-Vindozo 32 bitoj" +"Grafika versio MS-Vindozo 32-bitoj" msgid " in Win32s mode" msgstr " en reĝimo Win32s" @@ -5561,31 +5591,38 @@ msgstr " kun subteno de OLE" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 64-bit console version" +msgstr "" +"\n" +"Versio konzola MS-Vindozo 64-bitoj" + +msgid "" +"\n" +"MS-Windows 32-bit console version" msgstr "" "\n" -"Versio konzola MS-Vindozo 32 bitoj" +"Versio konzola MS-Vindozo 32-bitoj" msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" -"Versio MS-Vindozo 16 bitoj" +"Versio MS-Vindozo 16-bitoj" msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" -"Versio MS-DOS 32 bitoj" +"Versio MS-DOS 32-bitoj" msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" -"Versio MS-DOS 16 bitoj" +"Versio MS-DOS 16-bitoj" msgid "" "\n" diff --git a/src/po/es.po b/src/po/es.po index 3f362eb3c..4f200bc94 100644 --- a/src/po/es.po +++ b/src/po/es.po @@ -1423,7 +1423,7 @@ msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "" "E204: El autocomando ha cambiado el nmero de lneas en forma inesperada." -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans no permite que se escriba sobre buffers sin modificar." msgid "Partial writes disallowed for NetBeans buffers" @@ -4761,14 +4761,14 @@ msgstr "E440: falta la lnea deshacer." #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" "Versin GUI de 16/32 bits para MS-Windows" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "Versin GUI de 32 bits para MS-Windows" @@ -4781,28 +4781,28 @@ msgstr " con soporte para OLE" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 32-bit console version" msgstr "" "\n" "Versin de 32 bits para consola de MS-Windows" msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "Versin de 16 bits para MS-Windows" msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "Versin de 32 bits para MS-DOS" msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "Versin de 16 bits para MS-DOS" diff --git a/src/po/fi.po b/src/po/fi.po index ef167246f..6ec46350e 100644 --- a/src/po/fi.po +++ b/src/po/fi.po @@ -606,13 +606,13 @@ msgstr "(Virheellinen)" msgid "E677: Error writing temp file" msgstr "E677: Vliaikaistiedostoon kirjoittaminen ei onnistunut" -msgid "E703: Using a Funcref as a number" +msgid "E703: Using a Funcref as a Number" msgstr "E703: Funcref ei ky numerosta" -msgid "E745: Using a List as a number" +msgid "E745: Using a List as a Number" msgstr "E745: Lista ei ky numerosta" -msgid "E728: Using a Dictionary as a number" +msgid "E728: Using a Dictionary as a Number" msgstr "E728: Sanakirja ei ky numerosta" msgid "E729: using Funcref as a String" @@ -1591,7 +1591,7 @@ msgstr "" msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: Autocommand-komento muutti rivien mr odottamatta" -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans ei salli kirjoittaa muokkaamattomiin puskureihin" msgid "Partial writes disallowed for NetBeans buffers" @@ -5499,21 +5499,21 @@ msgstr "E440: kumousrivi puuttuu" #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" "MS-Windows 16- t. 32-bittinen GUI-versio" msgid "" "\n" -"MS-Windows 64 bit GUI version" +"MS-Windows 64-bit GUI version" msgstr "" "\n" "MS-Windows 64-bittinen GUI-versio" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "MS-Windows 32-bitars GUI-version" @@ -5526,28 +5526,28 @@ msgstr " OLE-tuella" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 32-bit console version" msgstr "" "\n" "MS-Windows 32-bitars konsollversion" msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "MS-Windows 16-bitars version" msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "32-bitars MS-DOS-version" msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "16-bitars MS-DOS-version" diff --git a/src/po/fr.po b/src/po/fr.po index 5e4e86681..7971dbf84 100644 --- a/src/po/fr.po +++ b/src/po/fr.po @@ -87,19 +87,17 @@ # - 14 new messages. # - Fixed error number mistakes (Dominique Pelle) # - Fixed spelling mistakes (Patrick Texier) +# 2008-07-01 DB VIM 7.2a +# - Updated messages. +# - 6 new messages. # -# Translated: 1708/1708 (100.00%) -# -# Notations used in the comments of the unpolished part of this file: -# TODO There's work to do there, and it's important -# todo There's work to do there, but it's less important -# (no comment) Perhaps there's work to do there? +# Translated: 1714/1714 (100.00%) # msgid "" msgstr "" "Project-Id-Version: Vim(Franais)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-28 23:07+0200\n" +"POT-Creation-Date: 2008-07-01 22:08+0200\n" "PO-Revision-Date: 2006-05-02 14:15+0200\n" "Last-Translator: David Blanchet <david.blanchet@free.fr>\n" "Language-Team: Adrien Beau <version.francaise@free.fr>\n" @@ -617,6 +615,9 @@ msgstr "E693: Une Funcref ne peut tre compare qu' une Funcref" msgid "E694: Invalid operation for Funcrefs" msgstr "E694: Opration invalide avec les Funcrefs" +msgid "E804: Cannot use '%' with Float" +msgstr "E804: Impossible d'utiliser '%' avec un Flottant" + msgid "E110: Missing ')'" msgstr "E110: ')' manquant" @@ -687,6 +688,9 @@ msgstr "E120: <SID> utilis en dehors d'un script : %s" msgid "E725: Calling dict function without Dictionary: %s" msgstr "E725: Appel d'une fonction dict sans Dictionnaire : %s" +msgid "E808: Number or Float required" +msgstr "E808: Nombre ou Flottant requis" + msgid "E699: Too many arguments" msgstr "E699: Trop d'arguments" @@ -771,13 +775,16 @@ msgstr "(Invalide)" msgid "E677: Error writing temp file" msgstr "E677: Erreur lors de l'criture du fichier temporaire" -msgid "E703: Using a Funcref as a number" +msgid "E805: Using a Float as a Number" +msgstr "E805: Utilisation d'un Flottant comme un Nombre" + +msgid "E703: Using a Funcref as a Number" msgstr "E703: Utilisation d'une Funcref comme un Nombre" -msgid "E745: Using a List as a number" +msgid "E745: Using a List as a Number" msgstr "E745: Utilisation d'une Liste comme un Nombre" -msgid "E728: Using a Dictionary as a number" +msgid "E728: Using a Dictionary as a Number" msgstr "E728: Utilisation d'un Dictionnaire comme un Nombre" msgid "E729: using Funcref as a String" @@ -789,6 +796,9 @@ msgstr "E730: Utilisation d'une Liste comme une Chane" msgid "E731: using Dictionary as a String" msgstr "E731: Utilisation d'un Dictionnaire comme une Chane" +msgid "E806: using Float as a String" +msgstr "E806: Utilisation d'un Flottant comme une Chane" + #, c-format msgid "E704: Funcref variable name must start with a capital: %s" msgstr "E704: Le nom d'une Funcref doit commencer par une majuscule : %s" @@ -1877,7 +1887,7 @@ msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "" "E204: L'autocommande a modifi le nombre de lignes de manire inattendue" -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans interdit l'criture des tampons non modifis" msgid "Partial writes disallowed for NetBeans buffers" @@ -2848,8 +2858,8 @@ msgid "line number out of range" msgstr "numro de ligne hors limites" #, c-format -msgid "<buffer object (deleted) at %8lX>" -msgstr "<objet tampon (effac) %8lX>" +msgid "<buffer object (deleted) at %p>" +msgstr "<objet tampon (effac) %p>" msgid "invalid mark name" msgstr "nom de marque invalide" @@ -2867,12 +2877,12 @@ msgid "cursor position outside buffer" msgstr "curseur positionn en dehors du tampon" #, c-format -msgid "<window object (deleted) at %.8lX>" -msgstr "<objet fentre (effac) %.8lX>" +msgid "<window object (deleted) at %p>" +msgstr "<objet fentre (effac) %p>" #, c-format -msgid "<window object (unknown) at %.8lX>" -msgstr "<objet fentre (inconnu) %.8lX>" +msgid "<window object (unknown) at %p>" +msgstr "<objet fentre (inconnu) %p>" #, c-format msgid "<window %d>" @@ -3363,7 +3373,8 @@ msgstr "" msgid "" "--remote-tab[-wait][-silent] <files> As --remote but use tab page per file" msgstr "" -"--remote-tab[-wait][-silent] <fich>\tComme --remote mais ouvrir un onglet pour chaque fichier" +"--remote-tab[-wait][-silent] <fich>\tComme --remote mais ouvrir un onglet " +"pour chaque fichier" msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit" msgstr "--remote-send <tche>\tEnvoyer <touches> un serveur Vim puis quitter" @@ -4161,6 +4172,9 @@ msgstr "E338: Dsol, pas de slecteur de fichiers en mode console" msgid "E766: Insufficient arguments for printf()" msgstr "E766: Pas assez d'arguments pour printf()" +msgid "E807: Expected Float argument for printf()" +msgstr "E807: printf() attend un argument de type Flottant" + msgid "E767: Too many arguments to printf()" msgstr "E767: Trop d'arguments pour printf()" @@ -4283,7 +4297,6 @@ msgstr "E346: Plus de rpertoire \"%s\" dans 'cdpath'" msgid "E347: No more file \"%s\" found in path" msgstr "E347: Plus de fichier \"%s\" dans 'path'" -#. Get here when the server can't be found. msgid "Cannot connect to Netbeans #2" msgstr "Impossible de se connecter Netbeans n2" @@ -4439,8 +4452,8 @@ msgid "" "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld " "Bytes" msgstr "" -"%s%ld sur %ld Lignes ; %ld sur %ld Mots ; %ld sur %ld Caractres ; %ld sur " -"%ld octets slectionns" +"%s%ld sur %ld Lignes ; %ld sur %ld Mots ; %ld sur %ld Caractres ; %ld sur %" +"ld octets slectionns" #, c-format msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld" @@ -4452,8 +4465,8 @@ msgid "" "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of " "%ld" msgstr "" -"Colonne %s sur %s ; Ligne %ld sur %ld ; Mot %ld sur %ld ; Caractre %ld sur " -"%ld ; Octet %ld sur %ld" +"Colonne %s sur %s ; Ligne %ld sur %ld ; Mot %ld sur %ld ; Caractre %ld sur %" +"ld ; Octet %ld sur %ld" #, c-format msgid "(+%ld for BOM)" @@ -5889,21 +5902,21 @@ msgstr "E440: ligne d'annulation manquante" #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" "Version graphique MS-Windows 16/32 bits" msgid "" "\n" -"MS-Windows 64 bit GUI version" +"MS-Windows 64-bit GUI version" msgstr "" "\n" "Version graphique MS-Windows 64 bits" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "Version graphique MS-Windows 32 bits" @@ -5916,28 +5929,35 @@ msgstr " supportant l'OLE" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 64-bit console version" +msgstr "" +"\n" +"Version console MS-Windows 64 bits" + +msgid "" +"\n" +"MS-Windows 32-bit console version" msgstr "" "\n" "Version console MS-Windows 32 bits" msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "Version MS-Windows 16 bits" msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "Version MS-DOS 32 bits" msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "Version MS-DOS 16 bits" diff --git a/src/po/ga.po b/src/po/ga.po index 62ae76f95..cce008724 100644 --- a/src/po/ga.po +++ b/src/po/ga.po @@ -591,13 +591,13 @@ msgstr "(Neamhbhail)" msgid "E677: Error writing temp file" msgstr "E677: Earrid agus comhad sealadach scrobh" -msgid "E703: Using a Funcref as a number" +msgid "E703: Using a Funcref as a Number" msgstr "E703: Funcref sid mar uimhir" -msgid "E745: Using a List as a number" +msgid "E745: Using a List as a Number" msgstr "E745: Liosta sid mar uimhir" -msgid "E728: Using a Dictionary as a number" +msgid "E728: Using a Dictionary as a Number" msgstr "E728: Foclir sid mar uimhir" msgid "E729: using Funcref as a String" @@ -1585,7 +1585,7 @@ msgstr "E203: Scrios n dhluchtaigh uathorduithe an maoln le scrobh" msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: D'athraigh uathord lon na lnte gan choinne" -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "N cheadaonn NetBeans maolin gan athr a bheith scrofa" msgid "Partial writes disallowed for NetBeans buffers" @@ -5559,21 +5559,21 @@ msgstr "E440: lne chealaithe ar iarraidh" #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" "Leagan GUI 16/32 giotn MS-Windows" msgid "" "\n" -"MS-Windows 64 bit GUI version" +"MS-Windows 64-bit GUI version" msgstr "" "\n" "Leagan GUI 64 giotn MS-Windows" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "Leagan GUI 32 giotn MS-Windows" @@ -5586,28 +5586,28 @@ msgstr " le tacaocht OLE" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 32-bit console version" msgstr "" "\n" "Leagan consil 32 giotn MS-Windows" msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "Leagan 16 giotn MS-Windows" msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "Leagan 32 giotn MS-DOS" msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "Leagan 16 giotn MS-DOS" diff --git a/src/po/it.po b/src/po/it.po index c04383c1f..d977b945e 100644 --- a/src/po/it.po +++ b/src/po/it.po @@ -11,9 +11,9 @@ # msgid "" msgstr "" -"Project-Id-Version: vim 7.1\n" -"POT-Creation-Date: 2008-06-20 23:58+0200\n" -"PO-Revision-Date: 2008-06-21 06:00+0200\n" +"Project-Id-Version: vim 7.2\n" +"POT-Creation-Date: 2008-06-25 09:10+0200\n" +"PO-Revision-Date: 2008-06-27 23:00+0200\n" "Last-Translator: Vlad Sandrini <vlad.gently@gmail.com>\n" "Language-Team: Italian" " Antonio Colombo <azc100@gmail.com>" @@ -452,6 +452,9 @@ msgstr "E693: Posso confrontare un Funcref solo con un Funcref" msgid "E694: Invalid operation for Funcrefs" msgstr "E694: Operazione non valida per Funcref" +msgid "E804: Cannot use '%' with Float" +msgstr "E804: Non si pu usare '%' con un numero con virgola" + msgid "E110: Missing ')'" msgstr "E110: Manca ')'" @@ -517,6 +520,9 @@ msgstr "E120: Uso di <SID> fuori dal contesto di uno script: %s" msgid "E725: Calling dict function without Dictionary: %s" msgstr "E725: Chiamata di funzione dict in assenza di Dizionario: %s" +msgid "E808: Number or Float required" +msgstr "E808: Ci vuole un numero intero o con virgola" + msgid "E699: Too many arguments" msgstr "E699: Troppi argomenti" @@ -593,6 +599,9 @@ msgstr "(Non valido)" msgid "E677: Error writing temp file" msgstr "E677: Errore in scrittura su file temporaneo" +msgid "E805: Using a Float as a number" +msgstr "E805: Uso di un numero con virgola come intero" + msgid "E703: Using a Funcref as a number" msgstr "E703: Uso di Funcref come numero" @@ -611,6 +620,9 @@ msgstr "E730: uso di Lista come Stringa" msgid "E731: using Dictionary as a String" msgstr "E731: uso di Dizionario come Stringa" +msgid "E806: using Float as a String" +msgstr "E806: uso di un numero con virgola come stringa" + #, c-format msgid "E704: Funcref variable name must start with a capital: %s" msgstr "" @@ -1580,7 +1592,7 @@ msgstr "E203: Buffer in scrittura cancellato o scaricato dagli autocomandi" msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: L'autocomando ha modificato numero linee in maniera imprevista" -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans non permette la scrittura di un buffer non modificato" msgid "Partial writes disallowed for NetBeans buffers" @@ -2490,19 +2502,6 @@ msgstr "numero linea non nell'intervallo" msgid "not allowed in the Vim sandbox" msgstr "non ammesso in ambiente protetto" -#, c-format -msgid "E370: Could not load library %s" -msgstr "E370: Non posso caricare la libreria %s" - -msgid "Sorry, this command is disabled: the Perl library could not be loaded." -msgstr "" -"Spiacente, comando non disponibile, non riesco a caricare libreria programmi " -"Perl." - -msgid "E299: Perl evaluation forbidden in sandbox without the Safe module" -msgstr "" -"E299: Valorizzazione Perl vietata in ambiente protetto senza il modulo Safe" - msgid "" "E263: Sorry, this command is disabled, the Python library could not be " "loaded." @@ -3829,6 +3828,9 @@ msgstr "E338: Spiacente, niente esplorazione file in modalit console" msgid "E766: Insufficient arguments for printf()" msgstr "E766: Argomenti non sufficienti per printf()" +msgid "E807: Expected Float argument for printf()" +msgstr "E807: Numero con virgola atteso come argomento per printf()" + msgid "E767: Too many arguments to printf()" msgstr "E767: Troppi argomenti per printf()" @@ -3950,7 +3952,6 @@ msgstr "E346: Nessun altra directory \"%s\" trovata nel 'cdpath'" msgid "E347: No more file \"%s\" found in path" msgstr "E347: Nessun altro file \"%s\" trovato nel percorso" -#. Get here when the server can't be found. msgid "Cannot connect to Netbeans #2" msgstr "Non posso connettermi a Netbeans #2" @@ -5850,6 +5851,19 @@ msgstr "E446: Nessun nome file sotto il cursore" msgid "E447: Can't find file \"%s\" in path" msgstr "E447: Non riesco a trovare il file \"%s\" nel percorso" +#, c-format +msgid "E370: Could not load library %s" +msgstr "E370: Non posso caricare la libreria %s" + +msgid "Sorry, this command is disabled: the Perl library could not be loaded." +msgstr "" +"Spiacente, comando non disponibile, non riesco a caricare libreria programmi " +"Perl." + +msgid "E299: Perl evaluation forbidden in sandbox without the Safe module" +msgstr "" +"E299: Valorizzazione Perl vietata in ambiente protetto senza il modulo Safe" + msgid "Edit with &multiple Vims" msgstr "Apri con &molti Vim" diff --git a/src/po/ja.po b/src/po/ja.po index 05389403b..769a2ecf1 100644 --- a/src/po/ja.po +++ b/src/po/ja.po @@ -594,13 +594,13 @@ msgstr "(̵)" msgid "E677: Error writing temp file" msgstr "E677: ե˥顼ȯޤ" -msgid "E703: Using a Funcref as a number" +msgid "E703: Using a Funcref as a Number" msgstr "E703: ؿȷͤȤưäƤޤ" -msgid "E745: Using a List as a number" +msgid "E745: Using a List as a Number" msgstr "E745: ꥹȷͤȤưäƤޤ" -msgid "E728: Using a Dictionary as a number" +msgid "E728: Using a Dictionary as a Number" msgstr "E728: ͤȤưäƤޤ" msgid "E729: using Funcref as a String" @@ -1575,7 +1575,7 @@ msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: autocommandͽˡǹԿѹޤ" # Added at 19-Jan-2004. -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans̤ѹΥХåե뤳ȤϵĤƤޤ" msgid "Partial writes disallowed for NetBeans buffers" @@ -5500,21 +5500,21 @@ msgstr "E440: ɥԤޤ" #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" "MS-Windows 16/32 ӥå GUI " msgid "" "\n" -"MS-Windows 64 bit GUI version" +"MS-Windows 64-bit GUI version" msgstr "" "\n" "MS-Windows 64 ӥå GUI " msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "MS-Windows 32 ӥå GUI " @@ -5527,28 +5527,28 @@ msgstr " with OLE ݡ" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 32-bit console version" msgstr "" "\n" "MS-Windows 32 ӥå " msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "MS-Windows 16 ӥå " msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "32 ӥå MS-DOS " msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "16 ӥå MS-DOS " diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po index 9b9ea2343..90a37313e 100644 --- a/src/po/ja.sjis.po +++ b/src/po/ja.sjis.po @@ -594,13 +594,13 @@ msgstr "()" msgid "E677: Error writing temp file" msgstr "E677: ꎞt@CɃG[܂" -msgid "E703: Using a Funcref as a number" +msgid "E703: Using a Funcref as a Number" msgstr "E703: Qƌ^𐔒lƂĈĂ܂B" -msgid "E745: Using a List as a number" +msgid "E745: Using a List as a Number" msgstr "E745: Xg^𐔒lƂĈĂ܂" -msgid "E728: Using a Dictionary as a number" +msgid "E728: Using a Dictionary as a Number" msgstr "E728: ^𐔒lƂĈĂ܂" msgid "E729: using Funcref as a String" @@ -1575,7 +1575,7 @@ msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: autocommand\\ʕ@ōsύX܂" # Added at 19-Jan-2004. -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans͖ύX̃obt@㏑邱Ƃ͋Ă܂" msgid "Partial writes disallowed for NetBeans buffers" @@ -5500,21 +5500,21 @@ msgstr "E440: AhDs܂" #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" "MS-Windows 16/32 rbg GUI " msgid "" "\n" -"MS-Windows 64 bit GUI version" +"MS-Windows 64-bit GUI version" msgstr "" "\n" "MS-Windows 64 rbg GUI " msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "MS-Windows 32 rbg GUI " @@ -5527,28 +5527,28 @@ msgstr " with OLE T|[g" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 32-bit console version" msgstr "" "\n" "MS-Windows 32 rbg R\\[ " msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "MS-Windows 16 rbg " msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "32 rbg MS-DOS " msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "16 rbg MS-DOS " diff --git a/src/po/ko.po b/src/po/ko.po index e7cdf36dd..5a514f5c0 100644 --- a/src/po/ko.po +++ b/src/po/ko.po @@ -1339,7 +1339,7 @@ msgstr "E203: ۸ ڵ ų ݾҽϴ" msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: Autocommand ߸ ٲپϴ" -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans ٲ ۸ ϴ" msgid "Partial writes disallowed for NetBeans buffers" @@ -4488,14 +4488,14 @@ msgstr "E440: undo ϴ" #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" "MS-Windows 16/32 Ʈ GUI " msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "MS-Windows 32 Ʈ GUI " @@ -4508,28 +4508,28 @@ msgstr " OLE " msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 32-bit console version" msgstr "" "\n" "MS-Windows 32 Ʈ ܼ " msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "MS-Windows 16 Ʈ " msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "32 Ʈ MS-DOS " msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "16 Ʈ MS-DOS " diff --git a/src/po/no.po b/src/po/no.po index d01dc937b..c141c3fe9 100644 --- a/src/po/no.po +++ b/src/po/no.po @@ -612,13 +612,13 @@ msgstr "(Ugyldig)" msgid "E677: Error writing temp file" msgstr "E677: Feil under skriving til midlertidig fil" -msgid "E703: Using a Funcref as a number" +msgid "E703: Using a Funcref as a Number" msgstr "E703: Bruker en funksjonsreferanse som et nummer" -msgid "E745: Using a List as a number" +msgid "E745: Using a List as a Number" msgstr "E745: Bruker en liste som et nummer" -msgid "E728: Using a Dictionary as a number" +msgid "E728: Using a Dictionary as a Number" msgstr "E728: Bruker en ordliste som et nummer" msgid "E729: using Funcref as a String" @@ -1582,7 +1582,7 @@ msgstr "E203: Autokommandoer slettet eller lastet ut buffer som skulle lagres" msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: Autokommando forandret linjeantall p en uventet mte" -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans forbyr lagring av buffere som ikke er forandret" msgid "Partial writes disallowed for NetBeans buffers" @@ -5473,21 +5473,21 @@ msgstr "E440: Angrelisten mangler" #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" "MS Windows 16/32-bits grafisk versjon" msgid "" "\n" -"MS-Windows 64 bit GUI version" +"MS-Windows 64-bit GUI version" msgstr "" "\n" "MS Windows 64-bits grafisk versjon" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "MS-Windows 32-bits GUI-versjon" @@ -5500,28 +5500,28 @@ msgstr " med OLE-sttte" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 32-bit console version" msgstr "" "\n" "MS-Windows 32-bits konsollversjon" msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "MS-Windows 16-bits versjon" msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "32-bits MS-DOS-versjon" msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "16-bits MS-DOS-versjon" diff --git a/src/po/pl.UTF-8.po b/src/po/pl.UTF-8.po index e13c85595..0161f5cbf 100644 --- a/src/po/pl.UTF-8.po +++ b/src/po/pl.UTF-8.po @@ -1,18 +1,18 @@ # translation of pl.po to Polish # Polish Translation for Vim # -# updated 2007 for vim-7.0 +# updated 2008 for vim-7.2 # # FIRST AUTHOR Marcin Dalecki <martin@dalecki.de>, 2000. -# Mikolaj Machowski <mikmach@wp.pl>, 2004, 2005, 2006, 2007. +# Mikolaj Machowski <mikmach@wp.pl>, 2004, 2005, 2006, 2007, 2008. msgid "" msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-04-30 20:03+0200\n" -"PO-Revision-Date: 2007-04-30 20:07+0200\n" +"POT-Creation-Date: 2008-06-25 19:40+0200\n" +"PO-Revision-Date: 2008-06-25 19:55+0200\n" "Last-Translator: Mikolaj Machowski <mikmach@wp.pl>\n" -"Language-Team: Polish <kde-transl@mer.chemia.polsl.gliwice.pl>\n" +"Language-Team: Polish <mikmach@wp.pl>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -450,6 +450,9 @@ msgstr "E693: Funcref mogę porównać tylko z Funcref" msgid "E694: Invalid operation for Funcrefs" msgstr "E694: Nieprawidłowa operacja dla Funcref" +msgid "E804: Cannot use '%' with Float" +msgstr "E804: Nie mogę użyć '%' w Zmiennoprzecinkowej" + msgid "E110: Missing ')'" msgstr "E110: Brak ')'" @@ -515,6 +518,9 @@ msgstr "E120: Użycie <SID> poza kontekstem skryptu: %s" msgid "E725: Calling dict function without Dictionary: %s" msgstr "E725: Wywołanie funkcji \"dict\" bez Słownika: %s" +msgid "E808: Number or Float required" +msgstr "E808: Wymagana Liczba lub Zmiennoprzecinkowa" + msgid "E699: Too many arguments" msgstr "E699: Za dużo argumentów" @@ -591,23 +597,29 @@ msgstr "(Niewłaściwe)" msgid "E677: Error writing temp file" msgstr "E677: Błąd zapisywania pliku tymczasowego" +msgid "E805: Using a Float as a Number" +msgstr "E805: Użycie Zmiennoprzecinkowej jako Liczby" + msgid "E703: Using a Funcref as a number" msgstr "E703: Użycie Funcref jako liczby" -msgid "E745: Using a List as a number" -msgstr "E745: Użycie Listy jako liczby" +msgid "E745: Using a List as a Number" +msgstr "E745: Użycie Listy jako Liczby" -msgid "E728: Using a Dictionary as a number" -msgstr "E728: Użycie Słownika jako liczby" +msgid "E728: Using a Dictionary as a Number" +msgstr "E728: Użycie Słownika jako Liczby" msgid "E729: using Funcref as a String" -msgstr "E729: Użycie Funcref jako łańcucha" +msgstr "E729: Użycie Funcref jako Łańcucha" msgid "E730: using List as a String" -msgstr "E730: Użycie Listy jako łańcucha" +msgstr "E730: Użycie Listy jako Łańcucha" msgid "E731: using Dictionary as a String" -msgstr "E731: Użycie Słownika jako łańcucha" +msgstr "E731: Użycie Słownika jako Łańcucha" + +msgid "E806: using Float as a String" +msgstr "E806: Użycie Zmiennoprzecinkowej jako Łańcucha" #, c-format msgid "E704: Funcref variable name must start with a capital: %s" @@ -956,6 +968,20 @@ msgstr "" "opcja 'readonly' nastawiona dla \"%s\".\n" "Czy chcesz go pomimo tego zapisać?" +#, c-format +msgid "" +"File permissions of \"%s\" are read-only.\n" +"It may still be possible to write it.\n" +"Do you wish to try?" +msgstr "" +"Prawa pliku \"%s\" są tylko do odczytu.\n" +"Mimo to być może uda się zmienić ten plik.\n" +"Chcesz spróbować?" + +#, c-format +msgid "E505: \"%s\" is read-only (add ! to override)" +msgstr "E505: \"%s\" jest tylko do odczytu (dodaj ! aby wymusić)" + msgid "Edit File" msgstr "Edytuj Plik" @@ -1505,6 +1531,9 @@ msgstr "[fifo]" msgid "[socket]" msgstr "[socket]" +msgid "[character special]" +msgstr "[specjalny znak]" + msgid "[RO]" msgstr "[RO]" @@ -1555,7 +1584,7 @@ msgstr "E203: Autokomendy skasowały lub wyładowały bufor przeznaczony do zapi msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: Autokomenda zmieniła liczbę wierszy w nieoczekiwany sposób" -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans nie pozwala na zapis niezmodyfikowanych buforów" msgid "Partial writes disallowed for NetBeans buffers" @@ -2317,15 +2346,15 @@ msgstr "E622: Nie mogłem utworzyć rozwidlenia dla cscope" msgid "cs_create_connection exec failed" msgstr "wykonanie cs_create_connection nie powiodło się" -msgid "E623: Could not spawn cscope process" -msgstr "E623: Nie mogłem stworzyć procesu cscope" - msgid "cs_create_connection: fdopen for to_fp failed" msgstr "cs_create_connection: fdopen dla to_fp nie powiodło się" msgid "cs_create_connection: fdopen for fr_fp failed" msgstr "cs_create_connection: fdopen dla fr_fp nie powiodło się" +msgid "E623: Could not spawn cscope process" +msgstr "E623: Nie mogłem stworzyć procesu cscope" + msgid "E567: no cscope connections" msgstr "E567: brak połączenia z cscope" @@ -2486,8 +2515,8 @@ msgid "line number out of range" msgstr "numer wiersza poza zakresem" #, c-format -msgid "<buffer object (deleted) at %8lX>" -msgstr "<obiekt bufora (skasowany) w %8lX>" +msgid "<buffer object (deleted) at %p>" +msgstr "<obiekt bufora (skasowany) w %p>" msgid "invalid mark name" msgstr "niepoprawna nazwa zakładki" @@ -2505,12 +2534,12 @@ msgid "cursor position outside buffer" msgstr "pozycja kursora poza buforem" #, c-format -msgid "<window object (deleted) at %.8lX>" -msgstr "<obiekt okna (skasowany) w %.8lX>" +msgid "<window object (deleted) at %p>" +msgstr "<obiekt okna (skasowany) w %p>" #, c-format -msgid "<window object (unknown) at %.8lX>" -msgstr "<obiekt okna (nieznany) w %.8lX>" +msgid "<window object (unknown) at %p>" +msgstr "<obiekt okna (nieznany) w %p>" #, c-format msgid "<window %d>" @@ -2523,7 +2552,8 @@ msgid "E265: $_ must be an instance of String" msgstr "E265: $_ musi być reprezentacją Łańcucha" msgid "E266: Sorry, this command is disabled, the Ruby library could not be loaded." -msgstr "E266: Przykro mi, ta komenda jest wyłączona, bo nie można załadować " +msgstr "" +"E266: Przykro mi, ta komenda jest wyłączona, bo nie można załadować " "biblioteki Ruby." msgid "E267: unexpected return" @@ -2691,7 +2721,9 @@ msgstr "" "bufora/okna" msgid "E571: Sorry, this command is disabled: the Tcl library could not be loaded." -msgstr "E571: Przykro mi, ta komenda jest wyłączona, bo nie można załadować biblioteki Tcl." +msgstr "" +"E571: Przykro mi, ta komenda jest wyłączona, bo nie można załadować " +"biblioteki Tcl." msgid "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org" msgstr "" @@ -2807,8 +2839,11 @@ msgstr "" "\n" " lub:" -msgid "where case is ignored prepend / to make flag upper case" +msgid "" +"\n" +"Where case is ignored prepend / to make flag upper case" msgstr "" +"\n" "gdzie wielkość znaków jest ignorowana dodaj na początku / by flaga była " "wielką literą" @@ -2878,8 +2913,8 @@ msgstr "-C\t\t\tBądź zgodny z Vi: 'compatible'" msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'" msgstr "-N\t\t\tBądź niezupełnie zgodny z Vi: 'nocompatible'" -msgid "-V[N]\t\tVerbose level" -msgstr "-V[N]\t\tStopień gadatliwości" +msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]" +msgstr "-V[N][nazwap]\t\tGadatliwy [poziom N] [zapisuj wiadomości do nazwap]" msgid "-D\t\t\tDebugging mode" msgstr "-D\t\t\tTryb odpluskwiania" @@ -2979,10 +3014,8 @@ msgstr "--remote-wait <pliki>\tTak jak --remote, lecz czekaj na pliki przed edyc msgid "--remote-wait-silent <files> Same, don't complain if there is no server" msgstr "--remote-wait-silent <pliki> To samo, nie narzekaj jeśli nie ma serwera" -msgid "--remote-tab <files> As --remote but open tab page for each file" -msgstr "" -"--remote-tab <pliki>\tTak jak --remote ale otwórz jedną kartę dla każdego " -"pliku" +msgid "--remote-tab[-wait][-silent] <files> As --remote but use tab page per file" +msgstr "--remote-tab[-wait][-silent] <pliki> tak jak --remote ale używa jednej karty na plik" msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit" msgstr "--remote-send <klawisze>\tWyślij <klawisze> do serwera Vima i zakończ" @@ -3106,6 +3139,9 @@ msgstr "--socketid <xid>\tOtwórz Vim wewnątrz innego widgetu GTK" msgid "-P <parent title>\tOpen Vim inside parent application" msgstr "-P <tytuł rodzica>\tOtwórz Vima wewnątrz rodzicielskiej aplikacji" +msgid "--windowid <HWND>\tOpen Vim inside another win32 widget" +msgstr "--windowid <HWND>\tOtwórz Vima wewnątrz innego elementu win32" + msgid "No display" msgstr "Brak display" @@ -3754,6 +3790,9 @@ msgstr "E338: Przykro mi, nie ma przeglądarki plików w trybie konsoli" msgid "E766: Insufficient arguments for printf()" msgstr "E766: Za mało argumentów dla printf()" +msgid "E807: Expected Float argument for printf()" +msgstr "E807: Spodziewany argument Zmiennoprzecinkowy w printf()" + msgid "E767: Too many arguments to printf()" msgstr "E767: Za dużo argumentów dla printf()" @@ -3877,7 +3916,6 @@ msgstr "E346: Katalogu \"%s\" nie ma więcej w cdpath" msgid "E347: No more file \"%s\" found in path" msgstr "E347: Pliku \"%s\" nie ma więcej w tropie" -#. Get here when the server can't be found. msgid "Cannot connect to Netbeans #2" msgstr "Nie można połączyć z Netbeans #2" @@ -4161,6 +4199,13 @@ msgstr "E594: Potrzebuję przynajmniej %d kolumn" msgid "E355: Unknown option: %s" msgstr "E355: Nieznana opcja: %s" +#. There's another character after zeros or the string +#. * is empty. In both cases, we are trying to set a +#. * num option using a string. +#, c-format +msgid "E521: Number required: &%s = '%s'" +msgstr "E521: Wymagana Liczba: &%s = '%s'" + msgid "" "\n" "--- Terminal codes ---" @@ -4314,6 +4359,20 @@ msgstr "Próba otwarcia ekranu X trwała zbyt długo" msgid "" "\n" +"Could not get security context for " +msgstr "" +"\n" +"Nie mogę uzyskać kontekstu bezpieczeństwa dla" + +msgid "" +"\n" +"Could not set security context for " +msgstr "" +"\n" +"Nie można uzyskać kontekstu bezpieczeństwa dla" + +msgid "" +"\n" "Cannot execute shell " msgstr "" "\n" @@ -5437,21 +5496,21 @@ msgstr "E440: brak wiersza cofania" #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" -"16/32 bitowa wersja GUI dla MS-Windows" +"16/32-bit wersja GUI dla MS-Windows" msgid "" "\n" -"MS-Windows 64 bit GUI version" +"MS-Windows 64-bit GUI version" msgstr "" "\n" "64 bitowa wersja GUI dla MS-Windows" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "32 bitowa wersja GUI dla MS-Windows" @@ -5464,28 +5523,35 @@ msgstr " ze wspomaganiem OLE" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 64-bit console version" +msgstr "" +"\n" +"32 bitowa wersja na konsolę dla MS-Windows" + +msgid "" +"\n" +"MS-Windows 32-bit console version" msgstr "" "\n" "32 bitowa wersja na konsolę dla MS-Windows" msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "16 bitowa wersja dla MS-Windows" msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "32 bitowa wersja dla MS-DOS" msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "16 bitowa wersja dla MS-DOS" @@ -5703,7 +5769,7 @@ msgid "type :help cp-default<Enter> for info on this" msgstr "wprowadź :help cp-default<Enter> dla informacji to tym " msgid "menu Help->Orphans for information " -msgstr "wprowadź :help iccf<Enter> dla informacji to tym " +msgstr "menu Pomoc->Sieroty dla informacji to tym " msgid "Running modeless, typed text is inserted" msgstr "Uruchomiony bez trybów, wpisany tekst jest wprowadzany" diff --git a/src/po/pl.cp1250.po b/src/po/pl.cp1250.po index 1bbc7fcd0..31d084ffa 100644 --- a/src/po/pl.cp1250.po +++ b/src/po/pl.cp1250.po @@ -1,18 +1,18 @@ # translation of pl.po to Polish # Polish Translation for Vim # -# updated 2007 for vim-7.0 +# updated 2008 for vim-7.2 # # FIRST AUTHOR Marcin Dalecki <martin@dalecki.de>, 2000. -# Mikolaj Machowski <mikmach@wp.pl>, 2004, 2005, 2006, 2007. +# Mikolaj Machowski <mikmach@wp.pl>, 2004, 2005, 2006, 2007, 2008. msgid "" msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-04-30 20:03+0200\n" -"PO-Revision-Date: 2007-04-30 20:07+0200\n" +"POT-Creation-Date: 2008-06-25 19:40+0200\n" +"PO-Revision-Date: 2008-06-25 19:55+0200\n" "Last-Translator: Mikolaj Machowski <mikmach@wp.pl>\n" -"Language-Team: Polish <kde-transl@mer.chemia.polsl.gliwice.pl>\n" +"Language-Team: Polish <mikmach@wp.pl>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=cp1250\n" "Content-Transfer-Encoding: 8bit\n" @@ -450,6 +450,9 @@ msgstr "E693: Funcref mog porwna tylko z Funcref" msgid "E694: Invalid operation for Funcrefs" msgstr "E694: Nieprawidowa operacja dla Funcref" +msgid "E804: Cannot use '%' with Float" +msgstr "E804: Nie mog uy '%' w Zmiennoprzecinkowej" + msgid "E110: Missing ')'" msgstr "E110: Brak ')'" @@ -515,6 +518,9 @@ msgstr "E120: Uycie <SID> poza kontekstem skryptu: %s" msgid "E725: Calling dict function without Dictionary: %s" msgstr "E725: Wywoanie funkcji \"dict\" bez Sownika: %s" +msgid "E808: Number or Float required" +msgstr "E808: Wymagana Liczba lub Zmiennoprzecinkowa" + msgid "E699: Too many arguments" msgstr "E699: Za duo argumentw" @@ -591,23 +597,29 @@ msgstr "(Niewaciwe)" msgid "E677: Error writing temp file" msgstr "E677: Bd zapisywania pliku tymczasowego" +msgid "E805: Using a Float as a Number" +msgstr "E805: Uycie Zmiennoprzecinkowej jako Liczby" + msgid "E703: Using a Funcref as a number" msgstr "E703: Uycie Funcref jako liczby" -msgid "E745: Using a List as a number" -msgstr "E745: Uycie Listy jako liczby" +msgid "E745: Using a List as a Number" +msgstr "E745: Uycie Listy jako Liczby" -msgid "E728: Using a Dictionary as a number" -msgstr "E728: Uycie Sownika jako liczby" +msgid "E728: Using a Dictionary as a Number" +msgstr "E728: Uycie Sownika jako Liczby" msgid "E729: using Funcref as a String" -msgstr "E729: Uycie Funcref jako acucha" +msgstr "E729: Uycie Funcref jako acucha" msgid "E730: using List as a String" -msgstr "E730: Uycie Listy jako acucha" +msgstr "E730: Uycie Listy jako acucha" msgid "E731: using Dictionary as a String" -msgstr "E731: Uycie Sownika jako acucha" +msgstr "E731: Uycie Sownika jako acucha" + +msgid "E806: using Float as a String" +msgstr "E806: Uycie Zmiennoprzecinkowej jako acucha" #, c-format msgid "E704: Funcref variable name must start with a capital: %s" @@ -956,6 +968,20 @@ msgstr "" "opcja 'readonly' nastawiona dla \"%s\".\n" "Czy chcesz go pomimo tego zapisa?" +#, c-format +msgid "" +"File permissions of \"%s\" are read-only.\n" +"It may still be possible to write it.\n" +"Do you wish to try?" +msgstr "" +"Prawa pliku \"%s\" s tylko do odczytu.\n" +"Mimo to by moe uda si zmieni ten plik.\n" +"Chcesz sprbowa?" + +#, c-format +msgid "E505: \"%s\" is read-only (add ! to override)" +msgstr "E505: \"%s\" jest tylko do odczytu (dodaj ! aby wymusi)" + msgid "Edit File" msgstr "Edytuj Plik" @@ -1505,6 +1531,9 @@ msgstr "[fifo]" msgid "[socket]" msgstr "[socket]" +msgid "[character special]" +msgstr "[specjalny znak]" + msgid "[RO]" msgstr "[RO]" @@ -1555,7 +1584,7 @@ msgstr "E203: Autokomendy skasoway lub wyadoway bufor przeznaczony do zapisu" msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: Autokomenda zmienia liczb wierszy w nieoczekiwany sposb" -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans nie pozwala na zapis niezmodyfikowanych buforw" msgid "Partial writes disallowed for NetBeans buffers" @@ -2317,15 +2346,15 @@ msgstr "E622: Nie mogem utworzy rozwidlenia dla cscope" msgid "cs_create_connection exec failed" msgstr "wykonanie cs_create_connection nie powiodo si" -msgid "E623: Could not spawn cscope process" -msgstr "E623: Nie mogem stworzy procesu cscope" - msgid "cs_create_connection: fdopen for to_fp failed" msgstr "cs_create_connection: fdopen dla to_fp nie powiodo si" msgid "cs_create_connection: fdopen for fr_fp failed" msgstr "cs_create_connection: fdopen dla fr_fp nie powiodo si" +msgid "E623: Could not spawn cscope process" +msgstr "E623: Nie mogem stworzy procesu cscope" + msgid "E567: no cscope connections" msgstr "E567: brak poczenia z cscope" @@ -2486,8 +2515,8 @@ msgid "line number out of range" msgstr "numer wiersza poza zakresem" #, c-format -msgid "<buffer object (deleted) at %8lX>" -msgstr "<obiekt bufora (skasowany) w %8lX>" +msgid "<buffer object (deleted) at %p>" +msgstr "<obiekt bufora (skasowany) w %p>" msgid "invalid mark name" msgstr "niepoprawna nazwa zakadki" @@ -2505,12 +2534,12 @@ msgid "cursor position outside buffer" msgstr "pozycja kursora poza buforem" #, c-format -msgid "<window object (deleted) at %.8lX>" -msgstr "<obiekt okna (skasowany) w %.8lX>" +msgid "<window object (deleted) at %p>" +msgstr "<obiekt okna (skasowany) w %p>" #, c-format -msgid "<window object (unknown) at %.8lX>" -msgstr "<obiekt okna (nieznany) w %.8lX>" +msgid "<window object (unknown) at %p>" +msgstr "<obiekt okna (nieznany) w %p>" #, c-format msgid "<window %d>" @@ -2523,7 +2552,8 @@ msgid "E265: $_ must be an instance of String" msgstr "E265: $_ musi by reprezentacj acucha" msgid "E266: Sorry, this command is disabled, the Ruby library could not be loaded." -msgstr "E266: Przykro mi, ta komenda jest wyczona, bo nie mona zaadowa " +msgstr "" +"E266: Przykro mi, ta komenda jest wyczona, bo nie mona zaadowa " "biblioteki Ruby." msgid "E267: unexpected return" @@ -2691,7 +2721,9 @@ msgstr "" "bufora/okna" msgid "E571: Sorry, this command is disabled: the Tcl library could not be loaded." -msgstr "E571: Przykro mi, ta komenda jest wyczona, bo nie mona zaadowa biblioteki Tcl." +msgstr "" +"E571: Przykro mi, ta komenda jest wyczona, bo nie mona zaadowa " +"biblioteki Tcl." msgid "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org" msgstr "" @@ -2807,8 +2839,11 @@ msgstr "" "\n" " lub:" -msgid "where case is ignored prepend / to make flag upper case" +msgid "" +"\n" +"Where case is ignored prepend / to make flag upper case" msgstr "" +"\n" "gdzie wielko znakw jest ignorowana dodaj na pocztku / by flaga bya " "wielk liter" @@ -2878,8 +2913,8 @@ msgstr "-C\t\t\tBd zgodny z Vi: 'compatible'" msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'" msgstr "-N\t\t\tBd niezupenie zgodny z Vi: 'nocompatible'" -msgid "-V[N]\t\tVerbose level" -msgstr "-V[N]\t\tStopie gadatliwoci" +msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]" +msgstr "-V[N][nazwap]\t\tGadatliwy [poziom N] [zapisuj wiadomoci do nazwap]" msgid "-D\t\t\tDebugging mode" msgstr "-D\t\t\tTryb odpluskwiania" @@ -2979,10 +3014,8 @@ msgstr "--remote-wait <pliki>\tTak jak --remote, lecz czekaj na pliki przed edyc msgid "--remote-wait-silent <files> Same, don't complain if there is no server" msgstr "--remote-wait-silent <pliki> To samo, nie narzekaj jeli nie ma serwera" -msgid "--remote-tab <files> As --remote but open tab page for each file" -msgstr "" -"--remote-tab <pliki>\tTak jak --remote ale otwrz jedn kart dla kadego " -"pliku" +msgid "--remote-tab[-wait][-silent] <files> As --remote but use tab page per file" +msgstr "--remote-tab[-wait][-silent] <pliki> tak jak --remote ale uywa jednej karty na plik" msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit" msgstr "--remote-send <klawisze>\tWylij <klawisze> do serwera Vima i zakocz" @@ -3106,6 +3139,9 @@ msgstr "--socketid <xid>\tOtwrz Vim wewntrz innego widgetu GTK" msgid "-P <parent title>\tOpen Vim inside parent application" msgstr "-P <tytu rodzica>\tOtwrz Vima wewntrz rodzicielskiej aplikacji" +msgid "--windowid <HWND>\tOpen Vim inside another win32 widget" +msgstr "--windowid <HWND>\tOtwrz Vima wewntrz innego elementu win32" + msgid "No display" msgstr "Brak display" @@ -3754,6 +3790,9 @@ msgstr "E338: Przykro mi, nie ma przegldarki plikw w trybie konsoli" msgid "E766: Insufficient arguments for printf()" msgstr "E766: Za mao argumentw dla printf()" +msgid "E807: Expected Float argument for printf()" +msgstr "E807: Spodziewany argument Zmiennoprzecinkowy w printf()" + msgid "E767: Too many arguments to printf()" msgstr "E767: Za duo argumentw dla printf()" @@ -3877,7 +3916,6 @@ msgstr "E346: Katalogu \"%s\" nie ma wicej w cdpath" msgid "E347: No more file \"%s\" found in path" msgstr "E347: Pliku \"%s\" nie ma wicej w tropie" -#. Get here when the server can't be found. msgid "Cannot connect to Netbeans #2" msgstr "Nie mona poczy z Netbeans #2" @@ -4161,6 +4199,13 @@ msgstr "E594: Potrzebuj przynajmniej %d kolumn" msgid "E355: Unknown option: %s" msgstr "E355: Nieznana opcja: %s" +#. There's another character after zeros or the string +#. * is empty. In both cases, we are trying to set a +#. * num option using a string. +#, c-format +msgid "E521: Number required: &%s = '%s'" +msgstr "E521: Wymagana Liczba: &%s = '%s'" + msgid "" "\n" "--- Terminal codes ---" @@ -4314,6 +4359,20 @@ msgstr "Prba otwarcia ekranu X trwaa zbyt dugo" msgid "" "\n" +"Could not get security context for " +msgstr "" +"\n" +"Nie mog uzyska kontekstu bezpieczestwa dla" + +msgid "" +"\n" +"Could not set security context for " +msgstr "" +"\n" +"Nie mona uzyska kontekstu bezpieczestwa dla" + +msgid "" +"\n" "Cannot execute shell " msgstr "" "\n" @@ -5437,21 +5496,21 @@ msgstr "E440: brak wiersza cofania" #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" -"16/32 bitowa wersja GUI dla MS-Windows" +"16/32-bit wersja GUI dla MS-Windows" msgid "" "\n" -"MS-Windows 64 bit GUI version" +"MS-Windows 64-bit GUI version" msgstr "" "\n" "64 bitowa wersja GUI dla MS-Windows" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "32 bitowa wersja GUI dla MS-Windows" @@ -5464,28 +5523,35 @@ msgstr " ze wspomaganiem OLE" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 64-bit console version" +msgstr "" +"\n" +"32 bitowa wersja na konsol dla MS-Windows" + +msgid "" +"\n" +"MS-Windows 32-bit console version" msgstr "" "\n" "32 bitowa wersja na konsol dla MS-Windows" msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "16 bitowa wersja dla MS-Windows" msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "32 bitowa wersja dla MS-DOS" msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "16 bitowa wersja dla MS-DOS" @@ -5703,7 +5769,7 @@ msgid "type :help cp-default<Enter> for info on this" msgstr "wprowad :help cp-default<Enter> dla informacji to tym " msgid "menu Help->Orphans for information " -msgstr "wprowad :help iccf<Enter> dla informacji to tym " +msgstr "menu Pomoc->Sieroty dla informacji to tym " msgid "Running modeless, typed text is inserted" msgstr "Uruchomiony bez trybw, wpisany tekst jest wprowadzany" diff --git a/src/po/pl.po b/src/po/pl.po index 696355d32..0e4522ded 100644 --- a/src/po/pl.po +++ b/src/po/pl.po @@ -1,18 +1,18 @@ # translation of pl.po to Polish # Polish Translation for Vim # -# updated 2007 for vim-7.0 +# updated 2008 for vim-7.2 # # FIRST AUTHOR Marcin Dalecki <martin@dalecki.de>, 2000. -# Mikolaj Machowski <mikmach@wp.pl>, 2004, 2005, 2006, 2007. +# Mikolaj Machowski <mikmach@wp.pl>, 2004, 2005, 2006, 2007, 2008. msgid "" msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-04-30 20:03+0200\n" -"PO-Revision-Date: 2007-04-30 20:07+0200\n" +"POT-Creation-Date: 2008-06-25 19:40+0200\n" +"PO-Revision-Date: 2008-06-25 19:55+0200\n" "Last-Translator: Mikolaj Machowski <mikmach@wp.pl>\n" -"Language-Team: Polish <kde-transl@mer.chemia.polsl.gliwice.pl>\n" +"Language-Team: Polish <mikmach@wp.pl>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" @@ -450,6 +450,9 @@ msgstr "E693: Funcref mog porwna tylko z Funcref" msgid "E694: Invalid operation for Funcrefs" msgstr "E694: Nieprawidowa operacja dla Funcref" +msgid "E804: Cannot use '%' with Float" +msgstr "E804: Nie mog uy '%' w Zmiennoprzecinkowej" + msgid "E110: Missing ')'" msgstr "E110: Brak ')'" @@ -515,6 +518,9 @@ msgstr "E120: Uycie <SID> poza kontekstem skryptu: %s" msgid "E725: Calling dict function without Dictionary: %s" msgstr "E725: Wywoanie funkcji \"dict\" bez Sownika: %s" +msgid "E808: Number or Float required" +msgstr "E808: Wymagana Liczba lub Zmiennoprzecinkowa" + msgid "E699: Too many arguments" msgstr "E699: Za duo argumentw" @@ -591,23 +597,29 @@ msgstr "(Niewaciwe)" msgid "E677: Error writing temp file" msgstr "E677: Bd zapisywania pliku tymczasowego" +msgid "E805: Using a Float as a Number" +msgstr "E805: Uycie Zmiennoprzecinkowej jako Liczby" + msgid "E703: Using a Funcref as a number" msgstr "E703: Uycie Funcref jako liczby" -msgid "E745: Using a List as a number" -msgstr "E745: Uycie Listy jako liczby" +msgid "E745: Using a List as a Number" +msgstr "E745: Uycie Listy jako Liczby" -msgid "E728: Using a Dictionary as a number" -msgstr "E728: Uycie Sownika jako liczby" +msgid "E728: Using a Dictionary as a Number" +msgstr "E728: Uycie Sownika jako Liczby" msgid "E729: using Funcref as a String" -msgstr "E729: Uycie Funcref jako acucha" +msgstr "E729: Uycie Funcref jako acucha" msgid "E730: using List as a String" -msgstr "E730: Uycie Listy jako acucha" +msgstr "E730: Uycie Listy jako acucha" msgid "E731: using Dictionary as a String" -msgstr "E731: Uycie Sownika jako acucha" +msgstr "E731: Uycie Sownika jako acucha" + +msgid "E806: using Float as a String" +msgstr "E806: Uycie Zmiennoprzecinkowej jako acucha" #, c-format msgid "E704: Funcref variable name must start with a capital: %s" @@ -956,6 +968,20 @@ msgstr "" "opcja 'readonly' nastawiona dla \"%s\".\n" "Czy chcesz go pomimo tego zapisa?" +#, c-format +msgid "" +"File permissions of \"%s\" are read-only.\n" +"It may still be possible to write it.\n" +"Do you wish to try?" +msgstr "" +"Prawa pliku \"%s\" s tylko do odczytu.\n" +"Mimo to by moe uda si zmieni ten plik.\n" +"Chcesz sprbowa?" + +#, c-format +msgid "E505: \"%s\" is read-only (add ! to override)" +msgstr "E505: \"%s\" jest tylko do odczytu (dodaj ! aby wymusi)" + msgid "Edit File" msgstr "Edytuj Plik" @@ -1505,6 +1531,9 @@ msgstr "[fifo]" msgid "[socket]" msgstr "[socket]" +msgid "[character special]" +msgstr "[specjalny znak]" + msgid "[RO]" msgstr "[RO]" @@ -1555,7 +1584,7 @@ msgstr "E203: Autokomendy skasoway lub wyadoway bufor przeznaczony do zapisu" msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: Autokomenda zmienia liczb wierszy w nieoczekiwany sposb" -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans nie pozwala na zapis niezmodyfikowanych buforw" msgid "Partial writes disallowed for NetBeans buffers" @@ -2317,15 +2346,15 @@ msgstr "E622: Nie mogem utworzy rozwidlenia dla cscope" msgid "cs_create_connection exec failed" msgstr "wykonanie cs_create_connection nie powiodo si" -msgid "E623: Could not spawn cscope process" -msgstr "E623: Nie mogem stworzy procesu cscope" - msgid "cs_create_connection: fdopen for to_fp failed" msgstr "cs_create_connection: fdopen dla to_fp nie powiodo si" msgid "cs_create_connection: fdopen for fr_fp failed" msgstr "cs_create_connection: fdopen dla fr_fp nie powiodo si" +msgid "E623: Could not spawn cscope process" +msgstr "E623: Nie mogem stworzy procesu cscope" + msgid "E567: no cscope connections" msgstr "E567: brak poczenia z cscope" @@ -2486,8 +2515,8 @@ msgid "line number out of range" msgstr "numer wiersza poza zakresem" #, c-format -msgid "<buffer object (deleted) at %8lX>" -msgstr "<obiekt bufora (skasowany) w %8lX>" +msgid "<buffer object (deleted) at %p>" +msgstr "<obiekt bufora (skasowany) w %p>" msgid "invalid mark name" msgstr "niepoprawna nazwa zakadki" @@ -2505,12 +2534,12 @@ msgid "cursor position outside buffer" msgstr "pozycja kursora poza buforem" #, c-format -msgid "<window object (deleted) at %.8lX>" -msgstr "<obiekt okna (skasowany) w %.8lX>" +msgid "<window object (deleted) at %p>" +msgstr "<obiekt okna (skasowany) w %p>" #, c-format -msgid "<window object (unknown) at %.8lX>" -msgstr "<obiekt okna (nieznany) w %.8lX>" +msgid "<window object (unknown) at %p>" +msgstr "<obiekt okna (nieznany) w %p>" #, c-format msgid "<window %d>" @@ -2523,7 +2552,8 @@ msgid "E265: $_ must be an instance of String" msgstr "E265: $_ musi by reprezentacj acucha" msgid "E266: Sorry, this command is disabled, the Ruby library could not be loaded." -msgstr "E266: Przykro mi, ta komenda jest wyczona, bo nie mona zaadowa " +msgstr "" +"E266: Przykro mi, ta komenda jest wyczona, bo nie mona zaadowa " "biblioteki Ruby." msgid "E267: unexpected return" @@ -2691,7 +2721,9 @@ msgstr "" "bufora/okna" msgid "E571: Sorry, this command is disabled: the Tcl library could not be loaded." -msgstr "E571: Przykro mi, ta komenda jest wyczona, bo nie mona zaadowa biblioteki Tcl." +msgstr "" +"E571: Przykro mi, ta komenda jest wyczona, bo nie mona zaadowa " +"biblioteki Tcl." msgid "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org" msgstr "" @@ -2807,8 +2839,11 @@ msgstr "" "\n" " lub:" -msgid "where case is ignored prepend / to make flag upper case" +msgid "" +"\n" +"Where case is ignored prepend / to make flag upper case" msgstr "" +"\n" "gdzie wielko znakw jest ignorowana dodaj na pocztku / by flaga bya " "wielk liter" @@ -2878,8 +2913,8 @@ msgstr "-C\t\t\tBd zgodny z Vi: 'compatible'" msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'" msgstr "-N\t\t\tBd niezupenie zgodny z Vi: 'nocompatible'" -msgid "-V[N]\t\tVerbose level" -msgstr "-V[N]\t\tStopie gadatliwoci" +msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]" +msgstr "-V[N][nazwap]\t\tGadatliwy [poziom N] [zapisuj wiadomoci do nazwap]" msgid "-D\t\t\tDebugging mode" msgstr "-D\t\t\tTryb odpluskwiania" @@ -2979,10 +3014,8 @@ msgstr "--remote-wait <pliki>\tTak jak --remote, lecz czekaj na pliki przed edyc msgid "--remote-wait-silent <files> Same, don't complain if there is no server" msgstr "--remote-wait-silent <pliki> To samo, nie narzekaj jeli nie ma serwera" -msgid "--remote-tab <files> As --remote but open tab page for each file" -msgstr "" -"--remote-tab <pliki>\tTak jak --remote ale otwrz jedn kart dla kadego " -"pliku" +msgid "--remote-tab[-wait][-silent] <files> As --remote but use tab page per file" +msgstr "--remote-tab[-wait][-silent] <pliki> tak jak --remote ale uywa jednej karty na plik" msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit" msgstr "--remote-send <klawisze>\tWylij <klawisze> do serwera Vima i zakocz" @@ -3106,6 +3139,9 @@ msgstr "--socketid <xid>\tOtwrz Vim wewntrz innego widgetu GTK" msgid "-P <parent title>\tOpen Vim inside parent application" msgstr "-P <tytu rodzica>\tOtwrz Vima wewntrz rodzicielskiej aplikacji" +msgid "--windowid <HWND>\tOpen Vim inside another win32 widget" +msgstr "--windowid <HWND>\tOtwrz Vima wewntrz innego elementu win32" + msgid "No display" msgstr "Brak display" @@ -3754,6 +3790,9 @@ msgstr "E338: Przykro mi, nie ma przegldarki plikw w trybie konsoli" msgid "E766: Insufficient arguments for printf()" msgstr "E766: Za mao argumentw dla printf()" +msgid "E807: Expected Float argument for printf()" +msgstr "E807: Spodziewany argument Zmiennoprzecinkowy w printf()" + msgid "E767: Too many arguments to printf()" msgstr "E767: Za duo argumentw dla printf()" @@ -3877,7 +3916,6 @@ msgstr "E346: Katalogu \"%s\" nie ma wicej w cdpath" msgid "E347: No more file \"%s\" found in path" msgstr "E347: Pliku \"%s\" nie ma wicej w tropie" -#. Get here when the server can't be found. msgid "Cannot connect to Netbeans #2" msgstr "Nie mona poczy z Netbeans #2" @@ -4161,6 +4199,13 @@ msgstr "E594: Potrzebuj przynajmniej %d kolumn" msgid "E355: Unknown option: %s" msgstr "E355: Nieznana opcja: %s" +#. There's another character after zeros or the string +#. * is empty. In both cases, we are trying to set a +#. * num option using a string. +#, c-format +msgid "E521: Number required: &%s = '%s'" +msgstr "E521: Wymagana Liczba: &%s = '%s'" + msgid "" "\n" "--- Terminal codes ---" @@ -4314,6 +4359,20 @@ msgstr "Prba otwarcia ekranu X trwaa zbyt dugo" msgid "" "\n" +"Could not get security context for " +msgstr "" +"\n" +"Nie mog uzyska kontekstu bezpieczestwa dla" + +msgid "" +"\n" +"Could not set security context for " +msgstr "" +"\n" +"Nie mona uzyska kontekstu bezpieczestwa dla" + +msgid "" +"\n" "Cannot execute shell " msgstr "" "\n" @@ -5437,21 +5496,21 @@ msgstr "E440: brak wiersza cofania" #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" -"16/32 bitowa wersja GUI dla MS-Windows" +"16/32-bit wersja GUI dla MS-Windows" msgid "" "\n" -"MS-Windows 64 bit GUI version" +"MS-Windows 64-bit GUI version" msgstr "" "\n" "64 bitowa wersja GUI dla MS-Windows" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "32 bitowa wersja GUI dla MS-Windows" @@ -5464,28 +5523,35 @@ msgstr " ze wspomaganiem OLE" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 64-bit console version" +msgstr "" +"\n" +"32 bitowa wersja na konsol dla MS-Windows" + +msgid "" +"\n" +"MS-Windows 32-bit console version" msgstr "" "\n" "32 bitowa wersja na konsol dla MS-Windows" msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "16 bitowa wersja dla MS-Windows" msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "32 bitowa wersja dla MS-DOS" msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "16 bitowa wersja dla MS-DOS" @@ -5703,7 +5769,7 @@ msgid "type :help cp-default<Enter> for info on this" msgstr "wprowad :help cp-default<Enter> dla informacji to tym " msgid "menu Help->Orphans for information " -msgstr "wprowad :help iccf<Enter> dla informacji to tym " +msgstr "menu Pomoc->Sieroty dla informacji to tym " msgid "Running modeless, typed text is inserted" msgstr "Uruchomiony bez trybw, wpisany tekst jest wprowadzany" diff --git a/src/po/ru.cp1251.po b/src/po/ru.cp1251.po index 3415cad8f..efbe0601a 100644 --- a/src/po/ru.cp1251.po +++ b/src/po/ru.cp1251.po @@ -1348,7 +1348,7 @@ msgstr "" msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: " -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans " msgid "Partial writes disallowed for NetBeans buffers" @@ -4563,14 +4563,14 @@ msgstr "E440: " #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" " MS-Windows 16/32 " msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" " MS-Windows 32 " @@ -4583,28 +4583,28 @@ msgstr " OLE" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 32-bit console version" msgstr "" "\n" " MS-Windows 32 " msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" " MS-Windows 16 " msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" " MS-DOS 32 " msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" " MS-DOS 16 " diff --git a/src/po/ru.po b/src/po/ru.po index 9a6310750..797852bfa 100644 --- a/src/po/ru.po +++ b/src/po/ru.po @@ -1348,7 +1348,7 @@ msgstr "" msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: Количество строк изменено автокомандой неожиданным образом" -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans не позволяет выполнять запись неизменённых буферов" msgid "Partial writes disallowed for NetBeans buffers" @@ -4563,14 +4563,14 @@ msgstr "E440: потеряна строка отмены" #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" "Версия с графическим интерфейсом для MS-Windows 16/32 бит" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "Версия с графическим интерфейсом для MS-Windows 32 бит" @@ -4583,28 +4583,28 @@ msgstr " с поддержкой OLE" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 32-bit console version" msgstr "" "\n" "Консольная версия для MS-Windows 32 бит" msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "Версия для MS-Windows 16 бит" msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "Версия для MS-DOS 32 бит" msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "Версия для MS-DOS 16 бит" diff --git a/src/po/sk.cp1250.po b/src/po/sk.cp1250.po index eb4e3b0e5..262a96301 100644 --- a/src/po/sk.cp1250.po +++ b/src/po/sk.cp1250.po @@ -544,13 +544,13 @@ msgstr "(Chybn)" msgid "E677: Error writing temp file" msgstr "E677: Chyba pri zpise doasnho sboru" -msgid "E703: Using a Funcref as a number" +msgid "E703: Using a Funcref as a Number" msgstr "E703: Pouit odkaz na Funkciu (Funcref) ako slo" -msgid "E745: Using a List as a number" +msgid "E745: Using a List as a Number" msgstr "E745: Zoznam (List) pouit ako slo" -msgid "E728: Using a Dictionary as a number" +msgid "E728: Using a Dictionary as a Number" msgstr "E728: Slovnk (Dictionary) pouit ako slo" msgid "E729: using Funcref as a String" @@ -1439,7 +1439,7 @@ msgstr "" msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: Automatick prkaz neoakvanm spsobom zmenil poet riadkov" -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans rozhranie nedovolilo zapsa nemodifikovan buffre" msgid "Partial writes disallowed for NetBeans buffers" @@ -5126,14 +5126,14 @@ msgstr "E440: chba opravn riadok" #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" "16/32 bitov GUI verzia pre MS Windows" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "32 bitov GUI verzia pre MS Windows" @@ -5146,28 +5146,28 @@ msgstr " s OLE podporou" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 32-bit console version" msgstr "" "\n" "32 bitov verzia pre MS Windows konzolu" msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "16 bitov verzia pre MS Windows" msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "32 bitov verzia pre MS-DOS" msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "16 bitov MS-DOS verzia" diff --git a/src/po/sk.po b/src/po/sk.po index 8d62d3bb9..9bc2b9499 100644 --- a/src/po/sk.po +++ b/src/po/sk.po @@ -544,13 +544,13 @@ msgstr "(Chybn)" msgid "E677: Error writing temp file" msgstr "E677: Chyba pri zpise doasnho sboru" -msgid "E703: Using a Funcref as a number" +msgid "E703: Using a Funcref as a Number" msgstr "E703: Pouit odkaz na Funkciu (Funcref) ako slo" -msgid "E745: Using a List as a number" +msgid "E745: Using a List as a Number" msgstr "E745: Zoznam (List) pouit ako slo" -msgid "E728: Using a Dictionary as a number" +msgid "E728: Using a Dictionary as a Number" msgstr "E728: Slovnk (Dictionary) pouit ako slo" msgid "E729: using Funcref as a String" @@ -1439,7 +1439,7 @@ msgstr "" msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: Automatick prkaz neoakvanm spsobom zmenil poet riadkov" -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans rozhranie nedovolilo zapsa nemodifikovan buffre" msgid "Partial writes disallowed for NetBeans buffers" @@ -5126,14 +5126,14 @@ msgstr "E440: chba opravn riadok" #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" "16/32 bitov GUI verzia pre MS Windows" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "32 bitov GUI verzia pre MS Windows" @@ -5146,28 +5146,28 @@ msgstr " s OLE podporou" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 32-bit console version" msgstr "" "\n" "32 bitov verzia pre MS Windows konzolu" msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "16 bitov verzia pre MS Windows" msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "32 bitov verzia pre MS-DOS" msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "16 bitov MS-DOS verzia" diff --git a/src/po/sv.po b/src/po/sv.po index 7a61e402d..cdcf60757 100644 --- a/src/po/sv.po +++ b/src/po/sv.po @@ -589,13 +589,13 @@ msgstr "(Ogiltig)" msgid "E677: Error writing temp file" msgstr "E677: Fel vid skrivning av temporr fil" -msgid "E703: Using a Funcref as a number" +msgid "E703: Using a Funcref as a Number" msgstr "E703: Anvnder en Funcref som en siffra" -msgid "E745: Using a List as a number" +msgid "E745: Using a List as a Number" msgstr "E745: Anvnder en Lista som en siffra" -msgid "E728: Using a Dictionary as a number" +msgid "E728: Using a Dictionary as a Number" msgstr "E728: Anvnder en Tabell som en siffra" msgid "E729: using Funcref as a String" @@ -1551,7 +1551,7 @@ msgstr "" msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: Autokommado ndrade antal rader p ett ovntat stt" -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans tillter inte skrivning av omodifierade buffertar" msgid "Partial writes disallowed for NetBeans buffers" @@ -5454,21 +5454,21 @@ msgstr "E440: ngra-rad saknas" #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" "MS-Windows 16/32-bitars GUI-version" msgid "" "\n" -"MS-Windows 64 bit GUI version" +"MS-Windows 64-bit GUI version" msgstr "" "\n" "MS-Windows 64-bitars GUI-version" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "MS-Windows 32-bitars GUI-version" @@ -5481,28 +5481,28 @@ msgstr " med OLE-std" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 32-bit console version" msgstr "" "\n" "MS-Windows 32-bitars konsollversion" msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "MS-Windows 16-bitars version" msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "32-bitars MS-DOS-version" msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "16-bitars MS-DOS-version" diff --git a/src/po/uk.cp1251.po b/src/po/uk.cp1251.po index e77f930cf..723072caa 100644 --- a/src/po/uk.cp1251.po +++ b/src/po/uk.cp1251.po @@ -607,13 +607,13 @@ msgstr "()" msgid "E677: Error writing temp file" msgstr "E677: " -msgid "E703: Using a Funcref as a number" +msgid "E703: Using a Funcref as a Number" msgstr "E703: " -msgid "E745: Using a List as a number" +msgid "E745: Using a List as a Number" msgstr "E745: " -msgid "E728: Using a Dictionary as a number" +msgid "E728: Using a Dictionary as a Number" msgstr "E728: " msgid "E729: using Funcref as a String" @@ -1611,7 +1611,7 @@ msgstr "E203: , " msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: " -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans " # msgstr "E391: " @@ -5601,21 +5601,21 @@ msgstr "E440: ³ " #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" " 16/32- Windows GUI" msgid "" "\n" -"MS-Windows 64 bit GUI version" +"MS-Windows 64-bit GUI version" msgstr "" "\n" " GUI 64- MS-Windows" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" " 32- Windows GUI" @@ -5628,28 +5628,28 @@ msgstr " OLE" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 32-bit console version" msgstr "" "\n" " 32- Windows" msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" " 16- Windows" msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" " 32- MS-DOS" msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" " 16- MS-DOS" diff --git a/src/po/uk.po b/src/po/uk.po index d369c8e65..e43153f08 100644 --- a/src/po/uk.po +++ b/src/po/uk.po @@ -607,13 +607,13 @@ msgstr "(Неможливо)" msgid "E677: Error writing temp file" msgstr "E677: Не вдалося записати тимчасовий файл" -msgid "E703: Using a Funcref as a number" +msgid "E703: Using a Funcref as a Number" msgstr "E703: Функцію вжито як число" -msgid "E745: Using a List as a number" +msgid "E745: Using a List as a Number" msgstr "E745: Список вжито як число" -msgid "E728: Using a Dictionary as a number" +msgid "E728: Using a Dictionary as a Number" msgstr "E728: Словник вжито як число" msgid "E729: using Funcref as a String" @@ -1611,7 +1611,7 @@ msgstr "E203: Автокоманда знищила або вивантажил msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: Автокоманда несподіваним чином змінила кількість рядків" -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans не дозволяє записувати у незмінені буфери" # msgstr "E391: " @@ -5601,21 +5601,21 @@ msgstr "E440: Відсутній рядок скасування" #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" "Версія для 16/32-розрядної Windows з GUI" msgid "" "\n" -"MS-Windows 64 bit GUI version" +"MS-Windows 64-bit GUI version" msgstr "" "\n" "Версія з GUI для 64-розрядної MS-Windows" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "Версія для 32-розрядної Windows з GUI" @@ -5628,28 +5628,28 @@ msgstr " з підтримкою OLE" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 32-bit console version" msgstr "" "\n" "Консольна версія для 32-розрядної Windows" msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "Версія для 16-розрядної Windows" msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "Версія для 32-розрядної MS-DOS" msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "Версія для 16-розрядної MS-DOS" diff --git a/src/po/vi.po b/src/po/vi.po index f1bfb31f5..d5ea6e161 100644 --- a/src/po/vi.po +++ b/src/po/vi.po @@ -1337,7 +1337,7 @@ msgstr "E203: Câu lệnh tự động đã xóa hoặc bỏ nạp bộ đệm c msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: Câu lệnh tự động đã thay đổ số dòng theo cách không mong muốn" -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans không cho phép ghi nhớ bộ đệm chưa có thay đổi nào" msgid "Partial writes disallowed for NetBeans buffers" @@ -4543,14 +4543,14 @@ msgstr "E440: bị mất dòng hủy thao tác" #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" "Phiên bản với giao diện đồ họa GUI cho MS-Windows 16/32 bit" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "Phiên bản với giao diện đồ họa GUI cho MS-Windows 32 bit" @@ -4563,28 +4563,28 @@ msgstr " với hỗ trợ OLE" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 32-bit console version" msgstr "" "\n" "Phiên bản console cho MS-Windows 32 bit" msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "Phiên bản cho MS-Windows 16 bit" msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "Phiên bản cho MS-DOS 32 bit" msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "Phiên bản cho MS-DOS 16 bit" diff --git a/src/po/zh_CN.UTF-8.po b/src/po/zh_CN.UTF-8.po index 018231874..80eb06ae4 100644 --- a/src/po/zh_CN.UTF-8.po +++ b/src/po/zh_CN.UTF-8.po @@ -575,13 +575,13 @@ msgstr "(无效)" msgid "E677: Error writing temp file" msgstr "E677: 写临时文件出错" -msgid "E703: Using a Funcref as a number" +msgid "E703: Using a Funcref as a Number" msgstr "E703: 将 Funcref 作数字使用" -msgid "E745: Using a List as a number" +msgid "E745: Using a List as a Number" msgstr "E745: 将 List 作数字使用" -msgid "E728: Using a Dictionary as a number" +msgid "E728: Using a Dictionary as a Number" msgstr "E728: 将 Dictionary 作数字使用" msgid "E729: using Funcref as a String" @@ -1538,7 +1538,7 @@ msgstr "E203: 自动命令删除或释放了要写入的缓冲区" msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: 自动命令意外地改变了行数" -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans 不允许未修改的缓冲区写入" msgid "Partial writes disallowed for NetBeans buffers" @@ -5360,14 +5360,14 @@ msgstr "E440: 找不到要撤销的行" #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" "MS-Windows 16/32 位图形界面版本" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "MS-Windows 32 位图形界面版本" @@ -5380,28 +5380,28 @@ msgstr " 带 OLE 支持" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 32-bit console version" msgstr "" "\n" "MS-Windows 32 位控制台版本" msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "MS-Windows 16 位控制台版本" msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "32 位 MS-DOS 版本" msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "16 位 MS-DOS 版本" diff --git a/src/po/zh_CN.cp936.po b/src/po/zh_CN.cp936.po index 96b25276f..a17d31ab0 100644 --- a/src/po/zh_CN.cp936.po +++ b/src/po/zh_CN.cp936.po @@ -575,13 +575,13 @@ msgstr "(Ч)" msgid "E677: Error writing temp file" msgstr "E677: дʱļ" -msgid "E703: Using a Funcref as a number" +msgid "E703: Using a Funcref as a Number" msgstr "E703: Funcref ʹ" -msgid "E745: Using a List as a number" +msgid "E745: Using a List as a Number" msgstr "E745: List ʹ" -msgid "E728: Using a Dictionary as a number" +msgid "E728: Using a Dictionary as a Number" msgstr "E728: Dictionary ʹ" msgid "E729: using Funcref as a String" @@ -1538,7 +1538,7 @@ msgstr "E203: ԶɾͷҪдĻ" msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: Զظı" -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans δĵĻд" msgid "Partial writes disallowed for NetBeans buffers" @@ -5360,14 +5360,14 @@ msgstr "E440: ҲҪ" #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" "MS-Windows 16/32 λͼν汾" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "MS-Windows 32 λͼν汾" @@ -5380,28 +5380,28 @@ msgstr " OLE ֧" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 32-bit console version" msgstr "" "\n" "MS-Windows 32 λ̨汾" msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "MS-Windows 16 λ̨汾" msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "32 λ MS-DOS 汾" msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "16 λ MS-DOS 汾" diff --git a/src/po/zh_CN.po b/src/po/zh_CN.po index 5d9aceb5f..114840e6e 100644 --- a/src/po/zh_CN.po +++ b/src/po/zh_CN.po @@ -575,13 +575,13 @@ msgstr "(Ч)" msgid "E677: Error writing temp file" msgstr "E677: дʱļ" -msgid "E703: Using a Funcref as a number" +msgid "E703: Using a Funcref as a Number" msgstr "E703: Funcref ʹ" -msgid "E745: Using a List as a number" +msgid "E745: Using a List as a Number" msgstr "E745: List ʹ" -msgid "E728: Using a Dictionary as a number" +msgid "E728: Using a Dictionary as a Number" msgstr "E728: Dictionary ʹ" msgid "E729: using Funcref as a String" @@ -1538,7 +1538,7 @@ msgstr "E203: ԶɾͷҪдĻ" msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: Զظı" -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans δĵĻд" msgid "Partial writes disallowed for NetBeans buffers" @@ -5360,14 +5360,14 @@ msgstr "E440: ҲҪ" #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" "MS-Windows 16/32 λͼν汾" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "MS-Windows 32 λͼν汾" @@ -5380,28 +5380,28 @@ msgstr " OLE ֧" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 32-bit console version" msgstr "" "\n" "MS-Windows 32 λ̨汾" msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "MS-Windows 16 λ̨汾" msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "32 λ MS-DOS 汾" msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "16 λ MS-DOS 汾" diff --git a/src/po/zh_TW.UTF-8.po b/src/po/zh_TW.UTF-8.po index 3ef058ddd..a046816a6 100644 --- a/src/po/zh_TW.UTF-8.po +++ b/src/po/zh_TW.UTF-8.po @@ -1374,7 +1374,7 @@ msgstr "E203: Autocommand 刪除或釋放了要寫入的緩衝區" msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: Autocommand 意外地改變了行號" -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans 不能寫出未修改的緩衝區" msgid "Partial writes disallowed for NetBeans buffers" @@ -4528,14 +4528,14 @@ msgstr "E440: 找不到要 undo 的行 " #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" "MS-Windows 16/32 Bit 圖型界面版本" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "MS-Windows 32 Bit 圖型界面版本" @@ -4548,28 +4548,28 @@ msgstr "支援 OLE" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 32-bit console version" msgstr "" "\n" "MS-Windows 32 Bit console 版本" msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "MS-Windows 32 Bit console 版本" msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "32 Bit MS-DOS 版本" msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "16 Bit MS-DOS 版本" diff --git a/src/po/zh_TW.po b/src/po/zh_TW.po index 6dba3a2f6..b3af29a2b 100644 --- a/src/po/zh_TW.po +++ b/src/po/zh_TW.po @@ -1367,7 +1367,7 @@ msgstr "E203: Autocommand RFngJwİ" msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: Autocommand N~aܤF渹" -msgid "NetBeans dissallows writes of unmodified buffers" +msgid "NetBeans disallows writes of unmodified buffers" msgstr "NetBeans gXק諸wİ" msgid "Partial writes disallowed for NetBeans buffers" @@ -4521,14 +4521,14 @@ msgstr "E440: 䤣n undo " #. Only MS VC 4.1 and earlier can do Win32s msgid "" "\n" -"MS-Windows 16/32 bit GUI version" +"MS-Windows 16/32-bit GUI version" msgstr "" "\n" "MS-Windows 16/32 Bit ϫɭ" msgid "" "\n" -"MS-Windows 32 bit GUI version" +"MS-Windows 32-bit GUI version" msgstr "" "\n" "MS-Windows 32 Bit ϫɭ" @@ -4541,28 +4541,28 @@ msgstr "䴩 OLE" msgid "" "\n" -"MS-Windows 32 bit console version" +"MS-Windows 32-bit console version" msgstr "" "\n" "MS-Windows 32 Bit console " msgid "" "\n" -"MS-Windows 16 bit version" +"MS-Windows 16-bit version" msgstr "" "\n" "MS-Windows 32 Bit console " msgid "" "\n" -"32 bit MS-DOS version" +"32-bit MS-DOS version" msgstr "" "\n" "32 Bit MS-DOS " msgid "" "\n" -"16 bit MS-DOS version" +"16-bit MS-DOS version" msgstr "" "\n" "16 Bit MS-DOS " diff --git a/src/popupmnu.c b/src/popupmnu.c index fcc7d851e..10a5edf27 100644 --- a/src/popupmnu.c +++ b/src/popupmnu.c @@ -183,11 +183,10 @@ redo: /* Calculate column */ #ifdef FEAT_RIGHTLEFT if (curwin->w_p_rl) - col = W_WINCOL(curwin) + W_WIDTH(curwin) - curwin->w_wcol - - curwin->w_leftcol - 1; + col = W_WINCOL(curwin) + W_WIDTH(curwin) - curwin->w_wcol - 1; else #endif - col = W_WINCOL(curwin) + curwin->w_wcol - curwin->w_leftcol; + col = W_WINCOL(curwin) + curwin->w_wcol; /* if there are more items than room we need a scrollbar */ if (pum_height < size) diff --git a/src/proto/mbyte.pro b/src/proto/mbyte.pro index ef11dc7e4..cac9ba805 100644 --- a/src/proto/mbyte.pro +++ b/src/proto/mbyte.pro @@ -82,6 +82,7 @@ void xim_init __ARGS((void)); void im_shutdown __ARGS((void)); int xim_get_status_area_height __ARGS((void)); int im_get_status __ARGS((void)); +int preedit_get_status __ARGS((void)); int im_is_preediting __ARGS((void)); int convert_setup __ARGS((vimconv_T *vcp, char_u *from, char_u *to)); int convert_input __ARGS((char_u *ptr, int len, int maxlen)); diff --git a/src/quickfix.c b/src/quickfix.c index 8840dd5f4..6d67dd734 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -774,7 +774,7 @@ restofline: *namebuf = NUL; if (tail && *tail) { - STRCPY(IObuff, skipwhite(tail)); + STRMOVE(IObuff, skipwhite(tail)); multiscan = TRUE; goto restofline; } diff --git a/src/screen.c b/src/screen.c index 78dd27787..ec4077f05 100644 --- a/src/screen.c +++ b/src/screen.c @@ -6261,6 +6261,17 @@ screen_puts_len(text, len, row, col, attr) if (ScreenLines == NULL || row >= screen_Rows) /* safety check */ return; +#ifdef FEAT_MBYTE + /* When drawing over the right halve of a double-wide char clear out the + * left halve. Only needed in a terminal. */ + if (has_mbyte +# ifdef FEAT_GUI + && !gui.in_use +# endif + && mb_fix_col(col, row) != col) + screen_puts_len(" ", 1, row, col - 1, 0); +#endif + off = LineOffset[row] + col; #ifdef FEAT_MBYTE max_off = LineOffset[row] + screen_Columns; @@ -7116,6 +7127,23 @@ screen_fill(start_row, end_row, start_col, end_col, c1, c2, attr) t_colors <= 1); for (row = start_row; row < end_row; ++row) { +#ifdef FEAT_MBYTE + if (has_mbyte +# ifdef FEAT_GUI + && !gui.in_use +# endif + ) + { + /* When drawing over the right halve of a double-wide char clear + * out the left halve. When drawing over the left halve of a + * double wide-char clear out the right halve. Only needed in a + * terminal. */ + if (mb_fix_col(start_col, row) != start_col) + screen_puts_len(" ", 1, row, start_col - 1, 0); + if (mb_fix_col(end_col, row) != end_col) + screen_puts_len(" ", 1, row, end_col, 0); + } +#endif /* * Try to use delete-line termcap code, when no attributes or in a * "normal" terminal, where a bold/italic space is just a @@ -8855,8 +8883,18 @@ showmode() { MSG_PUTS_ATTR("--", attr); #if defined(FEAT_XIM) +# if 0 /* old version, changed by SungHyun Nam July 2008 */ if (xic != NULL && im_get_status() && !p_imdisable && curbuf->b_p_iminsert == B_IMODE_IM) +# else + if ( +# ifdef HAVE_GTK2 + preedit_get_status() +# else + im_get_status() +# endif + ) +# endif # ifdef HAVE_GTK2 /* most of the time, it's not XIM being used */ MSG_PUTS_ATTR(" IM", attr); # else @@ -11,7 +11,7 @@ * Code to handle tags and the tag stack */ -#if defined MSDOS || defined WIN32 || defined(_WIN64) +#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64) # include "vimio.h" /* for lseek(), must be before vim.h */ #endif diff --git a/src/testdir/test30.in b/src/testdir/test30.in index 9d9b89b3c..2815c1a3c 100644 --- a/src/testdir/test30.in +++ b/src/testdir/test30.in @@ -1,5 +1,7 @@ Test for a lot of variations of the 'fileformats' option +Note: This test will fail if "cat" is not available. + STARTTEST :so small.vim :" first write three test files, one in each format diff --git a/src/version.c b/src/version.c index d44083afb..21d7b143c 100644 --- a/src/version.c +++ b/src/version.c @@ -677,44 +677,6 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ - 19, -/**/ - 18, -/**/ - 17, -/**/ - 16, -/**/ - 15, -/**/ - 14, -/**/ - 13, -/**/ - 12, -/**/ - 11, -/**/ - 10, -/**/ - 9, -/**/ - 8, -/**/ - 7, -/**/ - 6, -/**/ - 5, -/**/ - 4, -/**/ - 3, -/**/ - 2, -/**/ - 1, -/**/ 0 }; diff --git a/src/version.h b/src/version.h index 28af85a0e..9f1042966 100644 --- a/src/version.h +++ b/src/version.h @@ -19,9 +19,9 @@ #define VIM_VERSION_MINOR_STR "2" #define VIM_VERSION_100 (VIM_VERSION_MAJOR * 100 + VIM_VERSION_MINOR) -#define VIM_VERSION_BUILD 266 -#define VIM_VERSION_BUILD_BCD 0x10a -#define VIM_VERSION_BUILD_STR "266" +#define VIM_VERSION_BUILD 267 +#define VIM_VERSION_BUILD_BCD 0x10b +#define VIM_VERSION_BUILD_STR "267" #define VIM_VERSION_PATCHLEVEL 0 #define VIM_VERSION_PATCHLEVEL_STR "0" /* Used by MacOS port should be one of: development, alpha, beta, final */ @@ -33,8 +33,8 @@ * VIM_VERSION_MEDIUM is used for the startup-screen. * VIM_VERSION_LONG is used for the ":version" command and "Vim -h". */ -#define VIM_VERSION_NODOT "vim72a" -#define VIM_VERSION_SHORT "7.2a" -#define VIM_VERSION_MEDIUM "7.2a BETA" -#define VIM_VERSION_LONG "VIM - Vi IMproved 7.2a BETA (2008 Jun 24)" -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.2a BETA (2008 Jun 24, compiled " +#define VIM_VERSION_NODOT "vim72b" +#define VIM_VERSION_SHORT "7.2b" +#define VIM_VERSION_MEDIUM "7.2b BETA" +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.2b BETA (2008 Jul 13)" +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.2b BETA (2008 Jul 13, compiled " diff --git a/src/vim.def b/src/vim.def index aeea667d5..2d3087ab5 100644 --- a/src/vim.def +++ b/src/vim.def @@ -1,4 +1,4 @@ CODE PRELOAD EXECUTEONLY DATA MULTIPLE SHARED -DESCRIPTION 'Vim 7.2a' +DESCRIPTION 'Vim 7.2b' HEAPSIZE 0,0 @@ -1008,7 +1008,7 @@ extern char *(*dyn_libintl_textdomain)(const char *domainname); #define TAG_INS_COMP 64 /* Currently doing insert completion */ #define TAG_KEEP_LANG 128 /* keep current language */ -#define TAG_MANY 200 /* When finding many tags (for completion), +#define TAG_MANY 300 /* When finding many tags (for completion), find up to this many tags */ /* diff --git a/src/vim16.def b/src/vim16.def index 223ddaf07..beaaaa72a 100644 --- a/src/vim16.def +++ b/src/vim16.def @@ -1,5 +1,5 @@ CODE PRELOAD EXECUTEONLY DATA MULTIPLE SHARED -DESCRIPTION 'Vim 7.2a' +DESCRIPTION 'Vim 7.2b' STACKSIZE 16000 HEAPSIZE 10000 |