updated for version 7.2b-000
diff --git a/src/GvimExt/GvimExt.reg b/src/GvimExt/GvimExt.reg
index 02b1747..7b7480e 100644
--- a/src/GvimExt/GvimExt.reg
+++ b/src/GvimExt/GvimExt.reg
@@ -15,6 +15,6 @@
[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 210d773..a4a9925 100644
--- a/src/INSTALL
+++ b/src/INSTALL
@@ -163,6 +163,16 @@
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 a2ee954..755ea3b 100644
--- a/src/INSTALLpc.txt
+++ b/src/INSTALLpc.txt
@@ -27,7 +27,9 @@
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 @@
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 18fd327..c2567d7 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -193,10 +193,6 @@
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 @@
!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 cca2eef..69f091b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -310,6 +310,8 @@
#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 @@
### 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 @@
-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 cc90163..ba65612 100755
--- a/src/auto/configure
+++ b/src/auto/configure
Binary files differ
diff --git a/src/configure.in b/src/configure.in
index 35dce7f..7c65fab 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -192,25 +192,43 @@
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 7ebaa08..18c8329 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 @@
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 @@
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 6425ac0..760533d 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 @@
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 582613e..f86e6ee 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 83cffc1..246c4c0 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -6728,6 +6728,10 @@
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.
diff --git a/src/gui.c b/src/gui.c
index 09c3027..8568d33 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -958,7 +958,13 @@
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 @@
{
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_update_cursor(FALSE, FALSE);
gui_mch_flush();
}
+
+ entered = FALSE;
}
#endif
diff --git a/src/gui_mac.c b/src/gui_mac.c
index 1ef5820..77cd5ca 100644
--- a/src/gui_mac.c
+++ b/src/gui_mac.c
@@ -2543,7 +2543,6 @@
gui_mac_mouse_wheel(EventHandlerCallRef nextHandler, EventRef theEvent,
void *data)
{
- EventRef bogusEvent;
Point point;
Rect bounds;
UInt32 mod;
@@ -2574,16 +2573,6 @@
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_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 acf7f86..a6994f6 100644
--- a/src/if_perl.xs
+++ b/src/if_perl.xs
@@ -163,6 +163,23 @@
# 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 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 @@
{"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 @@
{"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 @@
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_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 8fcb109..66e792b 100644
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -1764,7 +1764,7 @@
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 53d1848..587081b 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 d6edf20..38bec9d 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -3454,6 +3454,7 @@
# 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 @@
#endif
im_is_active = TRUE;
+ preedit_is_active = TRUE;
gui_update_cursor(TRUE, FALSE);
+ im_show_info();
}
/*
@@ -3707,9 +3710,11 @@
#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 @@
# 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 dd8dc13..0b3cdd9 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 9929380..f5a68b1 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 41dfffb..bf340d0 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1390,7 +1390,7 @@
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 f21f5e9..c547d9b 100644
--- a/src/move.c
+++ b/src/move.c
@@ -876,7 +876,7 @@
}
/*
- * 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 @@
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 d3fa4b0..80a1b43 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 c41225d..0ace71d 100644
--- a/src/po/af.po
+++ b/src/po/af.po
@@ -1337,7 +1337,7 @@
msgid "E204: Autocommand changed number of lines in unexpected way"
msgstr "E204: Outobevel het etlike reëls 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 @@
#. 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 @@
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 54623b2..441d858 100644
--- a/src/po/ca.po
+++ b/src/po/ca.po
@@ -608,13 +608,13 @@
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 referència de funció com a número"
-msgid "E745: Using a List as a number"
+msgid "E745: Using a List as a Number"
msgstr "E745: Ús d'una llista com a número"
-msgid "E728: Using a Dictionary as a number"
+msgid "E728: Using a Dictionary as a Number"
msgstr "E728: Ús d'un diccionari com a número"
msgid "E729: using Funcref as a String"
@@ -1592,7 +1592,7 @@
msgid "E204: Autocommand changed number of lines in unexpected way"
msgstr "E204: Una auto-ordre ha canviat el nombre de línies 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 @@
#. 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 @@
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 a0650cf..2380221 100644
--- a/src/po/cs.cp1250.po
+++ b/src/po/cs.cp1250.po
@@ -4121,14 +4121,14 @@
#. 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 @@
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 04632fc..5c232f6 100644
--- a/src/po/cs.po
+++ b/src/po/cs.po
@@ -4121,14 +4121,14 @@
#. 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 @@
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 3a897f2..602e3ea 100644
--- a/src/po/de.po
+++ b/src/po/de.po
@@ -566,13 +566,13 @@
msgid "E677: Error writing temp file"
msgstr "E677: Fehler beim Schreiben einer temporären 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: Wörterbuch als Zahl verwendet"
msgid "E729: using Funcref as a String"
@@ -1509,7 +1509,7 @@
msgid "E204: Autocommand changed number of lines in unexpected way"
msgstr "E204: Autokommandos haben die Anzahl der Zeilen in unerwarteter Weise verändert"
-msgid "NetBeans dissallows writes of unmodified buffers"
+msgid "NetBeans disallows writes of unmodified buffers"
msgstr "NetBeans verweigert das Schreiben von unveränderten Puffern"
msgid "Partial writes disallowed for NetBeans buffers"
@@ -5290,14 +5290,14 @@
#. 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 @@
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 3aa1ba3..fc89706 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
# 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
#, 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 @@
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 @@
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 @@
#, 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 @@
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 @@
#. 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 @@
msgid ""
"\n"
-"MS-Windows 32 bit console version"
+"MS-Windows 64-bit console version"
msgstr ""
"\n"
-"Versio konzola MS-Vindozo 32 bitoj"
+"Versio konzola MS-Vindozo 64-bitoj"
msgid ""
"\n"
-"MS-Windows 16 bit version"
+"MS-Windows 32-bit console version"
msgstr ""
"\n"
-"Versio MS-Vindozo 16 bitoj"
+"Versio konzola MS-Vindozo 32-bitoj"
msgid ""
"\n"
-"32 bit MS-DOS version"
+"MS-Windows 16-bit version"
msgstr ""
"\n"
-"Versio MS-DOS 32 bitoj"
+"Versio MS-Vindozo 16-bitoj"
msgid ""
"\n"
-"16 bit MS-DOS version"
+"32-bit MS-DOS version"
msgstr ""
"\n"
-"Versio MS-DOS 16 bitoj"
+"Versio MS-DOS 32-bitoj"
+
+msgid ""
+"\n"
+"16-bit MS-DOS version"
+msgstr ""
+"\n"
+"Versio MS-DOS 16-bitoj"
msgid ""
"\n"
diff --git a/src/po/es.po b/src/po/es.po
index 3f362eb..4f200bc 100644
--- a/src/po/es.po
+++ b/src/po/es.po
@@ -1423,7 +1423,7 @@
msgstr ""
"E204: El autocomando ha cambiado el número de líneas 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 @@
#. 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ón GUI de 16/32 bits para MS-Windows"
msgid ""
"\n"
-"MS-Windows 32 bit GUI version"
+"MS-Windows 32-bit GUI version"
msgstr ""
"\n"
"Versión GUI de 32 bits para MS-Windows"
@@ -4781,28 +4781,28 @@
msgid ""
"\n"
-"MS-Windows 32 bit console version"
+"MS-Windows 32-bit console version"
msgstr ""
"\n"
"Versión de 32 bits para consola de MS-Windows"
msgid ""
"\n"
-"MS-Windows 16 bit version"
+"MS-Windows 16-bit version"
msgstr ""
"\n"
"Versión de 16 bits para MS-Windows"
msgid ""
"\n"
-"32 bit MS-DOS version"
+"32-bit MS-DOS version"
msgstr ""
"\n"
"Versión de 32 bits para MS-DOS"
msgid ""
"\n"
-"16 bit MS-DOS version"
+"16-bit MS-DOS version"
msgstr ""
"\n"
"Versión de 16 bits para MS-DOS"
diff --git a/src/po/fi.po b/src/po/fi.po
index ef16724..6ec4635 100644
--- a/src/po/fi.po
+++ b/src/po/fi.po
@@ -606,13 +606,13 @@
msgid "E677: Error writing temp file"
msgstr "E677: Väliaikaistiedostoon kirjoittaminen ei onnistunut"
-msgid "E703: Using a Funcref as a number"
+msgid "E703: Using a Funcref as a Number"
msgstr "E703: Funcref ei käy numerosta"
-msgid "E745: Using a List as a number"
+msgid "E745: Using a List as a Number"
msgstr "E745: Lista ei käy numerosta"
-msgid "E728: Using a Dictionary as a number"
+msgid "E728: Using a Dictionary as a Number"
msgstr "E728: Sanakirja ei käy numerosta"
msgid "E729: using Funcref as a String"
@@ -1591,7 +1591,7 @@
msgid "E204: Autocommand changed number of lines in unexpected way"
msgstr "E204: Autocommand-komento muutti rivien määrä 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 @@
#. 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 @@
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 5e4e866..7971dbf 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(Français)\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 @@
msgid "E694: Invalid operation for Funcrefs"
msgstr "E694: Opération 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 @@
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 @@
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 @@
msgid "E731: using Dictionary as a String"
msgstr "E731: Utilisation d'un Dictionnaire comme une Chaîne"
+msgid "E806: using Float as a String"
+msgstr "E806: Utilisation d'un Flottant comme une Chaîne"
+
#, 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 @@
msgstr ""
"E204: L'autocommande a modifié le nombre de lignes de manière inattendue"
-msgid "NetBeans dissallows writes of unmodified buffers"
+msgid "NetBeans disallows writes of unmodified buffers"
msgstr "NetBeans interdit l'écriture des tampons non modifiés"
msgid "Partial writes disallowed for NetBeans buffers"
@@ -2848,8 +2858,8 @@
msgstr "numéro 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 @@
msgstr "curseur positionné en dehors du tampon"
#, c-format
-msgid "<window object (deleted) at %.8lX>"
-msgstr "<objet fenêtre (effacé) à %.8lX>"
+msgid "<window object (deleted) at %p>"
+msgstr "<objet fenêtre (effacé) à %p>"
#, c-format
-msgid "<window object (unknown) at %.8lX>"
-msgstr "<objet fenêtre (inconnu) à %.8lX>"
+msgid "<window object (unknown) at %p>"
+msgstr "<objet fenêtre (inconnu) à %p>"
#, c-format
msgid "<window %d>"
@@ -3363,7 +3373,8 @@
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 @@
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 @@
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 n°2"
@@ -4439,8 +4452,8 @@
"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
"Bytes"
msgstr ""
-"%s%ld sur %ld Lignes ; %ld sur %ld Mots ; %ld sur %ld Caractères ; %ld sur "
-"%ld octets sélectionnés"
+"%s%ld sur %ld Lignes ; %ld sur %ld Mots ; %ld sur %ld Caractères ; %ld sur %"
+"ld octets sélectionnés"
#, c-format
msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
@@ -4452,8 +4465,8 @@
"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
"%ld"
msgstr ""
-"Colonne %s sur %s ; Ligne %ld sur %ld ; Mot %ld sur %ld ; Caractère %ld sur "
-"%ld ; Octet %ld sur %ld"
+"Colonne %s sur %s ; Ligne %ld sur %ld ; Mot %ld sur %ld ; Caractère %ld sur %"
+"ld ; Octet %ld sur %ld"
#, c-format
msgid "(+%ld for BOM)"
@@ -5889,21 +5902,21 @@
#. 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 @@
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 62ae76f..cce0087 100644
--- a/src/po/ga.po
+++ b/src/po/ga.po
@@ -591,13 +591,13 @@
msgid "E677: Error writing temp file"
msgstr "E677: Earráid agus comhad sealadach á scríobh"
-msgid "E703: Using a Funcref as a number"
+msgid "E703: Using a Funcref as a Number"
msgstr "E703: Funcref á úsáid mar uimhir"
-msgid "E745: Using a List as a number"
+msgid "E745: Using a List as a Number"
msgstr "E745: Liosta á úsáid mar uimhir"
-msgid "E728: Using a Dictionary as a number"
+msgid "E728: Using a Dictionary as a Number"
msgstr "E728: Foclóir á úsáid mar uimhir"
msgid "E729: using Funcref as a String"
@@ -1585,7 +1585,7 @@
msgid "E204: Autocommand changed number of lines in unexpected way"
msgstr "E204: D'athraigh uathordú líon na línte gan choinne"
-msgid "NetBeans dissallows writes of unmodified buffers"
+msgid "NetBeans disallows writes of unmodified buffers"
msgstr "Ní cheadaíonn NetBeans maoláin gan athrú a bheith scríofa"
msgid "Partial writes disallowed for NetBeans buffers"
@@ -5559,21 +5559,21 @@
#. 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 giotán MS-Windows"
msgid ""
"\n"
-"MS-Windows 64 bit GUI version"
+"MS-Windows 64-bit GUI version"
msgstr ""
"\n"
"Leagan GUI 64 giotán MS-Windows"
msgid ""
"\n"
-"MS-Windows 32 bit GUI version"
+"MS-Windows 32-bit GUI version"
msgstr ""
"\n"
"Leagan GUI 32 giotán MS-Windows"
@@ -5586,28 +5586,28 @@
msgid ""
"\n"
-"MS-Windows 32 bit console version"
+"MS-Windows 32-bit console version"
msgstr ""
"\n"
"Leagan consóil 32 giotán MS-Windows"
msgid ""
"\n"
-"MS-Windows 16 bit version"
+"MS-Windows 16-bit version"
msgstr ""
"\n"
"Leagan 16 giotán MS-Windows"
msgid ""
"\n"
-"32 bit MS-DOS version"
+"32-bit MS-DOS version"
msgstr ""
"\n"
"Leagan 32 giotán MS-DOS"
msgid ""
"\n"
-"16 bit MS-DOS version"
+"16-bit MS-DOS version"
msgstr ""
"\n"
"Leagan 16 giotán MS-DOS"
diff --git a/src/po/it.po b/src/po/it.po
index c04383c..d977b94 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 0538940..769a2ec 100644
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -594,13 +594,13 @@
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 @@
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 @@
#. 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 @@
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 9b9ea23..90a3731 100644
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -594,13 +594,13 @@
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 @@
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 @@
#. 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 @@
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 e7cdf36..5a514f5 100644
--- a/src/po/ko.po
+++ b/src/po/ko.po
@@ -1339,7 +1339,7 @@
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 @@
#. 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 @@
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 d01dc93..c141c3f 100644
--- a/src/po/no.po
+++ b/src/po/no.po
@@ -612,13 +612,13 @@
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 @@
msgid "E204: Autocommand changed number of lines in unexpected way"
msgstr "E204: Autokommando forandret linjeantall på en uventet måte"
-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 @@
#. 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 @@
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 e13c855..0161f5c 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 @@
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 @@
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 @@
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 @@
"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 @@
msgid "[socket]"
msgstr "[socket]"
+msgid "[character special]"
+msgstr "[specjalny znak]"
+
msgid "[RO]"
msgstr "[RO]"
@@ -1555,7 +1584,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
"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 @@
"\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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
#. 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 @@
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 16 bit version"
+"MS-Windows 32-bit console version"
+msgstr ""
+"\n"
+"32 bitowa wersja na konsolę dla MS-Windows"
+
+msgid ""
+"\n"
+"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 @@
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 1bbc7fc..31d084f 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 @@
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 @@
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 @@
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 @@
"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 @@
msgid "[socket]"
msgstr "[socket]"
+msgid "[character special]"
+msgstr "[specjalny znak]"
+
msgid "[RO]"
msgstr "[RO]"
@@ -1555,7 +1584,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
"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 @@
"\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 @@
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ñ 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 @@
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 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>\tWylij <klawisze> do serwera Vima i zakoñcz"
@@ -3106,6 +3139,9 @@
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 @@
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 @@
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 @@
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 @@
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 @@
#. 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 @@
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 16 bit version"
+"MS-Windows 32-bit console version"
+msgstr ""
+"\n"
+"32 bitowa wersja na konsolê dla MS-Windows"
+
+msgid ""
+"\n"
+"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 @@
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.po b/src/po/pl.po
index 696355d..0e4522d 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 @@
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 @@
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 @@
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 @@
"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 @@
msgid "[socket]"
msgstr "[socket]"
+msgid "[character special]"
+msgstr "[specjalny znak]"
+
msgid "[RO]"
msgstr "[RO]"
@@ -1555,7 +1584,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
"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 @@
"\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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
#. 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 @@
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 16 bit version"
+"MS-Windows 32-bit console version"
+msgstr ""
+"\n"
+"32 bitowa wersja na konsolê dla MS-Windows"
+
+msgid ""
+"\n"
+"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 @@
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/ru.cp1251.po b/src/po/ru.cp1251.po
index 3415cad..efbe060 100644
--- a/src/po/ru.cp1251.po
+++ b/src/po/ru.cp1251.po
@@ -1348,7 +1348,7 @@
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 @@
#. 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 @@
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 9a63107..797852b 100644
--- a/src/po/ru.po
+++ b/src/po/ru.po
@@ -1348,7 +1348,7 @@
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 @@
#. 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 @@
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 eb4e3b0..262a963 100644
--- a/src/po/sk.cp1250.po
+++ b/src/po/sk.cp1250.po
@@ -544,13 +544,13 @@
msgid "E677: Error writing temp file"
msgstr "E677: Chyba pri zápise doèasného súboru"
-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: Slovník (Dictionary) pouitý ako èíslo"
msgid "E729: using Funcref as a String"
@@ -1439,7 +1439,7 @@
msgid "E204: Autocommand changed number of lines in unexpected way"
msgstr "E204: Automatický príkaz neoèakávaným spôsobom zmenil poèet riadkov"
-msgid "NetBeans dissallows writes of unmodified buffers"
+msgid "NetBeans disallows writes of unmodified buffers"
msgstr "NetBeans rozhranie nedovolilo zapísa nemodifikované buffre"
msgid "Partial writes disallowed for NetBeans buffers"
@@ -5126,14 +5126,14 @@
#. 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 @@
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 8d62d3b..9bc2b94 100644
--- a/src/po/sk.po
+++ b/src/po/sk.po
@@ -544,13 +544,13 @@
msgid "E677: Error writing temp file"
msgstr "E677: Chyba pri zápise doèasného súboru"
-msgid "E703: Using a Funcref as a number"
+msgid "E703: Using a Funcref as a Number"
msgstr "E703: Pou¾itý 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) pou¾itý ako èíslo"
-msgid "E728: Using a Dictionary as a number"
+msgid "E728: Using a Dictionary as a Number"
msgstr "E728: Slovník (Dictionary) pou¾itý ako èíslo"
msgid "E729: using Funcref as a String"
@@ -1439,7 +1439,7 @@
msgid "E204: Autocommand changed number of lines in unexpected way"
msgstr "E204: Automatický príkaz neoèakávaným spôsobom zmenil poèet riadkov"
-msgid "NetBeans dissallows writes of unmodified buffers"
+msgid "NetBeans disallows writes of unmodified buffers"
msgstr "NetBeans rozhranie nedovolilo zapísa» nemodifikované buffre"
msgid "Partial writes disallowed for NetBeans buffers"
@@ -5126,14 +5126,14 @@
#. 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 @@
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 7a61e40..cdcf607 100644
--- a/src/po/sv.po
+++ b/src/po/sv.po
@@ -589,13 +589,13 @@
msgid "E677: Error writing temp file"
msgstr "E677: Fel vid skrivning av temporär fil"
-msgid "E703: Using a Funcref as a number"
+msgid "E703: Using a Funcref as a Number"
msgstr "E703: Använder en Funcref som en siffra"
-msgid "E745: Using a List as a number"
+msgid "E745: Using a List as a Number"
msgstr "E745: Använder en Lista som en siffra"
-msgid "E728: Using a Dictionary as a number"
+msgid "E728: Using a Dictionary as a Number"
msgstr "E728: Använder en Tabell som en siffra"
msgid "E729: using Funcref as a String"
@@ -1551,7 +1551,7 @@
msgid "E204: Autocommand changed number of lines in unexpected way"
msgstr "E204: Autokommado ändrade antal rader på ett oväntat sätt"
-msgid "NetBeans dissallows writes of unmodified buffers"
+msgid "NetBeans disallows writes of unmodified buffers"
msgstr "NetBeans tillåter inte skrivning av omodifierade buffertar"
msgid "Partial writes disallowed for NetBeans buffers"
@@ -5454,21 +5454,21 @@
#. 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 @@
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 e77f930..723072c 100644
--- a/src/po/uk.cp1251.po
+++ b/src/po/uk.cp1251.po
@@ -607,13 +607,13 @@
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 @@
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 @@
#. 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 @@
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 d369c8e..e43153f 100644
--- a/src/po/uk.po
+++ b/src/po/uk.po
@@ -607,13 +607,13 @@
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 @@
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 @@
#. 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 @@
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 f1bfb31..d5ea6e1 100644
--- a/src/po/vi.po
+++ b/src/po/vi.po
@@ -1337,7 +1337,7 @@
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 @@
#. 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 @@
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 0182318..80eb06a 100644
--- a/src/po/zh_CN.UTF-8.po
+++ b/src/po/zh_CN.UTF-8.po
@@ -575,13 +575,13 @@
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 @@
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 @@
#. 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 @@
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 96b2527..a17d31a 100644
--- a/src/po/zh_CN.cp936.po
+++ b/src/po/zh_CN.cp936.po
@@ -575,13 +575,13 @@
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 @@
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 @@
#. 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 @@
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 5d9aceb..114840e 100644
--- a/src/po/zh_CN.po
+++ b/src/po/zh_CN.po
@@ -575,13 +575,13 @@
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 @@
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 @@
#. 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 @@
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 3ef058d..a046816 100644
--- a/src/po/zh_TW.UTF-8.po
+++ b/src/po/zh_TW.UTF-8.po
@@ -1374,7 +1374,7 @@
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 @@
#. 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 @@
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 6dba3a2..b3af29a 100644
--- a/src/po/zh_TW.po
+++ b/src/po/zh_TW.po
@@ -1367,7 +1367,7 @@
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 ¤£¯à¼g¥X¥¼×§ïªº½w½Ä°Ï"
msgid "Partial writes disallowed for NetBeans buffers"
@@ -4521,14 +4521,14 @@
#. 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 @@
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 fcc7d85..10a5edf 100644
--- a/src/popupmnu.c
+++ b/src/popupmnu.c
@@ -183,11 +183,10 @@
/* 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 ef11dc7..cac9ba8 100644
--- a/src/proto/mbyte.pro
+++ b/src/proto/mbyte.pro
@@ -82,6 +82,7 @@
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 8840dd5..6d67dd7 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -774,7 +774,7 @@
*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 78dd277..ec4077f 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -6261,6 +6261,17 @@
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 @@
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 @@
{
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
diff --git a/src/tag.c b/src/tag.c
index 29893de..7d79e80 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -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 9d9b89b..2815c1a 100644
--- a/src/testdir/test30.in
+++ b/src/testdir/test30.in
Binary files differ
diff --git a/src/version.c b/src/version.c
index d44083a..21d7b14 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,44 +677,6 @@
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 28af85a..9f10429 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 aeea667..2d3087a 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
diff --git a/src/vim.h b/src/vim.h
index d77d4b7..111723f 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -1008,7 +1008,7 @@
#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 223ddaf..beaaaa7 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