Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Various small fixes from Dominique Pelle.

--HG--
branch : vim73
  • Loading branch information...
commit 011a08dc546465efb7b10691101a9a162842bebd 1 parent e2e6984
Bram Moolenaar authored
View
2  runtime/doc/indent.txt
@@ -525,7 +525,7 @@ PHP indenting can be altered in several ways by modifying the values of some
variables:
*php-comment*
-To not enable auto-formating of comments by default (if you want to use your
+To not enable auto-formatting of comments by default (if you want to use your
own 'formatoptions'): >
:let g:PHP_autoformatcomment = 0
View
1  runtime/doc/todo.txt
@@ -1099,7 +1099,6 @@ Vim 7.3:
dictionary: {'nr': 2, 'time': 1234, 'saved': 1}
Patches to include:
- Patch for Lisp support with ECL (Mikael Jansson, 2008 Oct 25)
-- Minor patches from Dominique Pelle, 2010 May 15
- Gvimext patch to support wide file names. (Szabolcs Horvat 2008 Sep 10)
- Patch to support netbeans for Mac. (Kazuki Sakamoto, 2009 Jun 25)
- Patch to support clipboard for Mac terminal. (Jjgod Jiang, 2009 Aug 1)
View
4 src/INSTALL
@@ -55,7 +55,7 @@ arguments.
GNU Autoconf and a few other tools have been used to make Vim work on many
different Unix systems. The advantage of this is that Vim should compile
-on most sytems without any adjustments. The disadvantage is that when
+on most systems without any adjustments. The disadvantage is that when
adjustments are required, it takes some time to understand what is happening.
If configure finds all library files and then complains when linking that some
@@ -138,7 +138,7 @@ work very well and there was no maintainer it was dropped.
Unix: COMPILING WITH MULTI-BYTE
When you want to compile with the multi-byte features enabled, make sure you
-compile on a machine where the locale settings actually work. otherwise the
+compile on a machine where the locale settings actually work, otherwise the
configure tests may fail. You need to compile with "big" features:
./configure --with-features=big
View
4 src/gui_gtk_x11.c
@@ -4013,7 +4013,7 @@ gui_mch_get_screen_dimensions(int *screen_w, int *screen_h)
/*
* FIXME: dirty trick: Because the gui_get_base_height() doesn't include
* the toolbar and menubar for GTK, we subtract them from the screen
- * hight, so that the window size can be made to fit on the screen.
+ * height, so that the window size can be made to fit on the screen.
* This should be completely changed later.
*/
*screen_w -= get_menu_tool_width();
@@ -4818,7 +4818,7 @@ count_cluster_cells(char_u *s, PangoItem *item,
* If ink_rect.x is negative Pango apparently has taken care of the composing
* by itself. Actually setting x_offset = 0 should be sufficient then, but due
* to problems with composing from different fonts we still need to fine-tune
- * x_offset to avoid uglyness.
+ * x_offset to avoid ugliness.
*
* If ink_rect.x is not negative, force overstriking by pointing x_offset to
* the position of the previous glyph. Apparently this happens only with old
View
6 src/gui_x11.c
@@ -1162,9 +1162,9 @@ gui_x11_mouse_cb(w, dud, event, dum)
/* ARGSUSED */
static void
gui_x11_sniff_request_cb(closure, source, id)
- XtPointer closure;
- int *source;
- XtInputId *id;
+ XtPointer closure UNUSED;
+ int *source UNUSED;
+ XtInputId *id UNUSED;
{
static char_u bytes[3] = {CSI, (int)KS_EXTRA, (int)KE_SNIFF};
View
16 src/gui_xmdlg.c
@@ -168,7 +168,7 @@ name_part(char *font, char *buf)
get_part(font, 2, buf2);
get_part(font, 1, buf3);
- if (strlen(buf3))
+ if (*buf3 != NUL)
vim_snprintf(buf, TEMP_BUF_SIZE, "%s (%s)", buf2, buf3);
else
vim_snprintf(buf, TEMP_BUF_SIZE, "%s", buf2);
@@ -225,7 +225,7 @@ size_part(char *font, char *buf, int inPixels)
if (inPixels)
{
get_part(font, 7, buf);
- if (strlen(buf) > 0)
+ if (*buf != NUL)
{
size = atoi(buf);
sprintf(buf, "%3d", size);
@@ -234,7 +234,7 @@ size_part(char *font, char *buf, int inPixels)
else
{
get_part(font, 8, buf);
- if (strlen(buf) > 0)
+ if (*buf != NUL)
{
size = atoi(buf);
temp = (float)size / 10.0;
@@ -261,7 +261,7 @@ encoding_part(char *font, char *buf)
get_part(font, 13, buf1);
get_part(font, 14, buf2);
- if (strlen(buf1) > 0 && strlen(buf2))
+ if (*buf1 != NUL && *buf2 != NUL)
vim_snprintf(buf, TEMP_BUF_SIZE, "%s-%s", buf1, buf2);
if (!strcmp(buf, " "))
strcpy(buf, "-");
@@ -1229,10 +1229,10 @@ gui_xm_select_font(char_u *current)
size_part(found, sizebuf, data->in_pixels);
encoding_part(found, encodingbuf);
- if (strlen(namebuf) > 0
- && strlen(stylebuf) > 0
- && strlen(sizebuf) > 0
- && strlen(encodingbuf) > 0)
+ if (*namebuf != NUL
+ && *stylebuf != NUL
+ && *sizebuf != NUL
+ && *encodingbuf != NUL)
{
data->sel[NAME] = XtNewString(namebuf);
data->sel[STYLE] = XtNewString(stylebuf);
View
2  src/if_cscope.c
@@ -588,7 +588,7 @@ cs_add_common(arg1, arg2, flags)
)
{
fname[strlen(fname)-1] = '\0';
- if (strlen(fname) == 0)
+ if (fname[0] == '\0')
break;
}
if (fname[0] == '\0')
View
58 src/if_mzsch.c
@@ -175,7 +175,7 @@ static int mzscheme_to_vim(Scheme_Object *obj, typval_T *tv, int depth,
#endif
#ifdef MZ_PRECISE_GC
-static int buffer_size_proc(void *obj)
+static int buffer_size_proc(void *obj UNUSED)
{
return gcBYTES_TO_WORDS(sizeof(vim_mz_buffer));
}
@@ -187,7 +187,7 @@ static int buffer_fixup_proc(void *obj)
{
return buffer_size_proc(obj);
}
-static int window_size_proc(void *obj)
+static int window_size_proc(void *obj UNUSED)
{
return gcBYTES_TO_WORDS(sizeof(vim_mz_window));
}
@@ -708,16 +708,16 @@ static void remove_timer(void);
/* timers are presented in GUI only */
# if defined(FEAT_GUI_W32)
static void CALLBACK
-timer_proc(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime)
+timer_proc(HWND hwnd UNUSED, UINT uMsg UNUSED, UINT idEvent UNUSED, DWORD dwTime UNUSED)
# elif defined(FEAT_GUI_GTK)
static gint
-timer_proc(gpointer data)
+timer_proc(gpointer data UNUSED)
# elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)
static void
-timer_proc(XtPointer timed_out, XtIntervalId *interval_id)
+timer_proc(XtPointer timed_out UNUSED, XtIntervalId *interval_id UNUSED)
# elif defined(FEAT_GUI_MAC)
pascal void
-timer_proc(EventLoopTimerRef theTimer, void *userData)
+timer_proc(EventLoopTimerRef theTimer UNUSED, void *userData UNUSED)
# endif
{
scheme_check_threads();
@@ -806,7 +806,7 @@ mzscheme_main(void)
}
static int
-mzscheme_env_main(Scheme_Env *env, int argc, char **argv)
+mzscheme_env_main(Scheme_Env *env, int argc UNUSED, char **argv UNUSED)
{
/* neither argument nor return values are used */
#ifdef MZ_PRECISE_GC
@@ -1190,7 +1190,7 @@ ex_mzscheme(exarg_T *eap)
}
static Scheme_Object *
-do_load(void *data, int noargc, Scheme_Object **noargv)
+do_load(void *data, int noargc UNUSED, Scheme_Object **noargv UNUSED)
{
Scheme_Object *expr = NULL;
Scheme_Object *result = NULL;
@@ -1306,7 +1306,7 @@ extract_exn_message(Scheme_Object *v)
}
static Scheme_Object *
-do_eval(void *s, int noargc, Scheme_Object **noargv)
+do_eval(void *s, int noargc UNUSED, Scheme_Object **noargv UNUSED)
{
return scheme_eval_string_all((char *)s, environment, TRUE);
}
@@ -1317,7 +1317,7 @@ do_eval(void *s, int noargc, Scheme_Object **noargv)
*========================================================================
*/
static void
-do_intrnl_output(char *mesg, long len, int error)
+do_intrnl_output(char *mesg, int error)
{
char *p, *prev;
@@ -1341,21 +1341,21 @@ do_intrnl_output(char *mesg, long len, int error)
}
static void
-do_output(char *mesg, long len)
+do_output(char *mesg, long len UNUSED)
{
- do_intrnl_output(mesg, len, 0);
+ do_intrnl_output(mesg, 0);
}
static void
-do_err_output(char *mesg, long len)
+do_err_output(char *mesg)
{
- do_intrnl_output(mesg, len, 1);
+ do_intrnl_output(mesg, 1);
}
static void
do_printf(char *format, ...)
{
- do_intrnl_output(format, STRLEN(format), 1);
+ do_intrnl_output(format, 1);
}
static void
@@ -1368,7 +1368,7 @@ do_flush(void)
MZ_GC_CHECK();
if (length)
{
- do_err_output(buff, length);
+ do_err_output(buff);
return;
}
@@ -1438,21 +1438,21 @@ vim_eval(void *data, int argc, Scheme_Object **argv)
/* (range-start) */
static Scheme_Object *
-get_range_start(void *data, int argc, Scheme_Object **argv)
+get_range_start(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
{
return scheme_make_integer(range_start);
}
/* (range-end) */
static Scheme_Object *
-get_range_end(void *data, int argc, Scheme_Object **argv)
+get_range_end(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
{
return scheme_make_integer(range_end);
}
/* (beep) */
static Scheme_Object *
-mzscheme_beep(void *data, int argc, Scheme_Object **argv)
+mzscheme_beep(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
{
vim_beep();
return scheme_void;
@@ -1584,14 +1584,14 @@ set_option(void *data, int argc, Scheme_Object **argv)
/* (curr-win) */
static Scheme_Object *
-get_curr_win(void *data, int argc, Scheme_Object **argv)
+get_curr_win(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
{
return (Scheme_Object *)get_vim_curr_window();
}
/* (win-count) */
static Scheme_Object *
-get_window_count(void *data, int argc, Scheme_Object **argv)
+get_window_count(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
{
win_T *w;
int n = 0;
@@ -1926,7 +1926,7 @@ get_buffer_num(void *data, int argc, Scheme_Object **argv)
/* (buff-count) */
static Scheme_Object *
-get_buffer_count(void *data, int argc, Scheme_Object **argv)
+get_buffer_count(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
{
buf_T *b;
int n = 0;
@@ -1947,7 +1947,7 @@ get_buffer_name(void *data, int argc, Scheme_Object **argv)
/* (curr-buff) */
static Scheme_Object *
-get_curr_buffer(void *data, int argc, Scheme_Object **argv)
+get_curr_buffer(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
{
return (Scheme_Object *)get_vim_curr_buffer();
}
@@ -2521,7 +2521,7 @@ insert_buffer_line_list(void *data, int argc, Scheme_Object **argv)
*/
/* (buff? obj) */
static Scheme_Object *
-vim_bufferp(void *data, int argc, Scheme_Object **argv)
+vim_bufferp(void *data UNUSED, int argc UNUSED, Scheme_Object **argv)
{
if (SCHEME_VIMBUFFERP(argv[0]))
return scheme_true;
@@ -2531,7 +2531,7 @@ vim_bufferp(void *data, int argc, Scheme_Object **argv)
/* (win? obj) */
static Scheme_Object *
-vim_windowp(void *data, int argc, Scheme_Object **argv)
+vim_windowp(void *data UNUSED, int argc UNUSED, Scheme_Object **argv)
{
if (SCHEME_VIMWINDOWP(argv[0]))
return scheme_true;
@@ -2541,7 +2541,7 @@ vim_windowp(void *data, int argc, Scheme_Object **argv)
/* (buff-valid? obj) */
static Scheme_Object *
-vim_buffer_validp(void *data, int argc, Scheme_Object **argv)
+vim_buffer_validp(void *data UNUSED, int argc UNUSED, Scheme_Object **argv)
{
if (SCHEME_VIMBUFFERP(argv[0])
&& ((vim_mz_buffer *)argv[0])->buf != INVALID_BUFFER_VALUE)
@@ -2552,7 +2552,7 @@ vim_buffer_validp(void *data, int argc, Scheme_Object **argv)
/* (win-valid? obj) */
static Scheme_Object *
-vim_window_validp(void *data, int argc, Scheme_Object **argv)
+vim_window_validp(void *data UNUSED, int argc UNUSED, Scheme_Object **argv)
{
if (SCHEME_VIMWINDOWP(argv[0])
&& ((vim_mz_window *)argv[0])->win != INVALID_WINDOW_VALUE)
@@ -3315,7 +3315,7 @@ sandbox_check(void)
/* security guards to force Vim's sandbox restrictions on MzScheme level */
static Scheme_Object *
-sandbox_file_guard(int argc, Scheme_Object **argv)
+sandbox_file_guard(int argc UNUSED, Scheme_Object **argv)
{
if (sandbox)
{
@@ -3361,7 +3361,7 @@ sandbox_file_guard(int argc, Scheme_Object **argv)
}
static Scheme_Object *
-sandbox_network_guard(int argc, Scheme_Object **argv)
+sandbox_network_guard(int argc UNUSED, Scheme_Object **argv UNUSED)
{
return scheme_void;
}
View
246 src/mbyte.c
@@ -4205,7 +4205,7 @@ iconv_end()
#if defined(FEAT_XIM) || defined(PROTO)
-# ifdef FEAT_GUI_GTK
+# if defined(FEAT_GUI_GTK) || defined(PROTO)
static int xim_has_preediting INIT(= FALSE); /* IM current status */
/*
@@ -4221,9 +4221,6 @@ init_preedit_start_col(void)
/* Prevent that preediting marks the buffer as changed. */
xim_changed_while_preediting = curbuf->b_changed;
}
-# endif
-
-# if defined(FEAT_GUI_GTK) && !defined(PROTO)
static int im_is_active = FALSE; /* IM is enabled for current mode */
static int preedit_is_active = FALSE;
@@ -5058,6 +5055,18 @@ im_get_status(void)
return im_is_active;
}
+ int
+preedit_get_status(void)
+{
+ return preedit_is_active;
+}
+
+ int
+im_is_preediting()
+{
+ return xim_has_preediting;
+}
+
# else /* !FEAT_GUI_GTK */
static int xim_is_active = FALSE; /* XIM should be active in the current
@@ -5192,111 +5201,6 @@ xim_set_preedit()
}
}
-/*
- * Set up the status area.
- *
- * This should use a separate Widget, but that seems not possible, because
- * preedit_area and status_area should be set to the same window as for the
- * text input. Unfortunately this means the status area pollutes the text
- * window...
- */
- void
-xim_set_status_area()
-{
- if (xic == NULL)
- return;
-
- XVaNestedList preedit_list = 0, status_list = 0, list = 0;
- XRectangle pre_area, status_area;
-
- if (input_style & XIMStatusArea)
- {
- if (input_style & XIMPreeditArea)
- {
- XRectangle *needed_rect;
-
- /* to get status_area width */
- status_list = XVaCreateNestedList(0, XNAreaNeeded,
- &needed_rect, NULL);
- XGetICValues(xic, XNStatusAttributes, status_list, NULL);
- XFree(status_list);
-
- status_area.width = needed_rect->width;
- }
- else
- status_area.width = gui.char_width * Columns;
-
- status_area.x = 0;
- status_area.y = gui.char_height * Rows + gui.border_offset;
- if (gui.which_scrollbars[SBAR_BOTTOM])
- status_area.y += gui.scrollbar_height;
-#ifdef FEAT_MENU
- if (gui.menu_is_active)
- status_area.y += gui.menu_height;
-#endif
- status_area.height = gui.char_height;
- status_list = XVaCreateNestedList(0, XNArea, &status_area, NULL);
- }
- else
- {
- status_area.x = 0;
- status_area.y = gui.char_height * Rows + gui.border_offset;
- if (gui.which_scrollbars[SBAR_BOTTOM])
- status_area.y += gui.scrollbar_height;
-#ifdef FEAT_MENU
- if (gui.menu_is_active)
- status_area.y += gui.menu_height;
-#endif
- status_area.width = 0;
- status_area.height = gui.char_height;
- }
-
- if (input_style & XIMPreeditArea) /* off-the-spot */
- {
- pre_area.x = status_area.x + status_area.width;
- pre_area.y = gui.char_height * Rows + gui.border_offset;
- pre_area.width = gui.char_width * Columns - pre_area.x;
- if (gui.which_scrollbars[SBAR_BOTTOM])
- pre_area.y += gui.scrollbar_height;
-#ifdef FEAT_MENU
- if (gui.menu_is_active)
- pre_area.y += gui.menu_height;
-#endif
- pre_area.height = gui.char_height;
- preedit_list = XVaCreateNestedList(0, XNArea, &pre_area, NULL);
- }
- else if (input_style & XIMPreeditPosition) /* over-the-spot */
- {
- pre_area.x = 0;
- pre_area.y = 0;
- pre_area.height = gui.char_height * Rows;
- pre_area.width = gui.char_width * Columns;
- preedit_list = XVaCreateNestedList(0, XNArea, &pre_area, NULL);
- }
-
- if (preedit_list && status_list)
- list = XVaCreateNestedList(0, XNPreeditAttributes, preedit_list,
- XNStatusAttributes, status_list, NULL);
- else if (preedit_list)
- list = XVaCreateNestedList(0, XNPreeditAttributes, preedit_list,
- NULL);
- else if (status_list)
- list = XVaCreateNestedList(0, XNStatusAttributes, status_list,
- NULL);
- else
- list = NULL;
-
- if (list)
- {
- XSetICValues(xic, XNVaNestedList, list, NULL);
- XFree(list);
- }
- if (status_list)
- XFree(status_list);
- if (preedit_list)
- XFree(preedit_list);
-}
-
#if defined(FEAT_GUI_X11)
static char e_xim[] = N_("E285: Failed to create input context");
#endif
@@ -5607,14 +5511,6 @@ xim_real_init(x11_window, x11_display)
#endif /* FEAT_GUI_X11 */
- int
-xim_get_status_area_height()
-{
- if (status_area_enabled)
- return gui.char_height;
- return 0;
-}
-
/*
* Get IM status. When IM is on, return TRUE. Else return FALSE.
* FIXME: This doesn't work correctly: Having focus doesn't always mean XIM is
@@ -5629,21 +5525,121 @@ im_get_status()
# endif /* !FEAT_GUI_GTK */
-# if defined(FEAT_GUI_GTK) || defined(PROTO)
- int
-preedit_get_status(void)
+# if !defined(FEAT_GUI_GTK) || defined(PROTO)
+/*
+ * Set up the status area.
+ *
+ * This should use a separate Widget, but that seems not possible, because
+ * preedit_area and status_area should be set to the same window as for the
+ * text input. Unfortunately this means the status area pollutes the text
+ * window...
+ */
+ void
+xim_set_status_area()
{
- return preedit_is_active;
+ if (xic == NULL)
+ return;
+
+ XVaNestedList preedit_list = 0, status_list = 0, list = 0;
+ XRectangle pre_area, status_area;
+
+ if (input_style & XIMStatusArea)
+ {
+ if (input_style & XIMPreeditArea)
+ {
+ XRectangle *needed_rect;
+
+ /* to get status_area width */
+ status_list = XVaCreateNestedList(0, XNAreaNeeded,
+ &needed_rect, NULL);
+ XGetICValues(xic, XNStatusAttributes, status_list, NULL);
+ XFree(status_list);
+
+ status_area.width = needed_rect->width;
+ }
+ else
+ status_area.width = gui.char_width * Columns;
+
+ status_area.x = 0;
+ status_area.y = gui.char_height * Rows + gui.border_offset;
+ if (gui.which_scrollbars[SBAR_BOTTOM])
+ status_area.y += gui.scrollbar_height;
+#ifdef FEAT_MENU
+ if (gui.menu_is_active)
+ status_area.y += gui.menu_height;
+#endif
+ status_area.height = gui.char_height;
+ status_list = XVaCreateNestedList(0, XNArea, &status_area, NULL);
+ }
+ else
+ {
+ status_area.x = 0;
+ status_area.y = gui.char_height * Rows + gui.border_offset;
+ if (gui.which_scrollbars[SBAR_BOTTOM])
+ status_area.y += gui.scrollbar_height;
+#ifdef FEAT_MENU
+ if (gui.menu_is_active)
+ status_area.y += gui.menu_height;
+#endif
+ status_area.width = 0;
+ status_area.height = gui.char_height;
+ }
+
+ if (input_style & XIMPreeditArea) /* off-the-spot */
+ {
+ pre_area.x = status_area.x + status_area.width;
+ pre_area.y = gui.char_height * Rows + gui.border_offset;
+ pre_area.width = gui.char_width * Columns - pre_area.x;
+ if (gui.which_scrollbars[SBAR_BOTTOM])
+ pre_area.y += gui.scrollbar_height;
+#ifdef FEAT_MENU
+ if (gui.menu_is_active)
+ pre_area.y += gui.menu_height;
+#endif
+ pre_area.height = gui.char_height;
+ preedit_list = XVaCreateNestedList(0, XNArea, &pre_area, NULL);
+ }
+ else if (input_style & XIMPreeditPosition) /* over-the-spot */
+ {
+ pre_area.x = 0;
+ pre_area.y = 0;
+ pre_area.height = gui.char_height * Rows;
+ pre_area.width = gui.char_width * Columns;
+ preedit_list = XVaCreateNestedList(0, XNArea, &pre_area, NULL);
+ }
+
+ if (preedit_list && status_list)
+ list = XVaCreateNestedList(0, XNPreeditAttributes, preedit_list,
+ XNStatusAttributes, status_list, NULL);
+ else if (preedit_list)
+ list = XVaCreateNestedList(0, XNPreeditAttributes, preedit_list,
+ NULL);
+ else if (status_list)
+ list = XVaCreateNestedList(0, XNStatusAttributes, status_list,
+ NULL);
+ else
+ list = NULL;
+
+ if (list)
+ {
+ XSetICValues(xic, XNVaNestedList, list, NULL);
+ XFree(list);
+ }
+ if (status_list)
+ XFree(status_list);
+ if (preedit_list)
+ XFree(preedit_list);
}
-# endif
-# if defined(FEAT_GUI_GTK) || defined(PROTO)
int
-im_is_preediting()
+xim_get_status_area_height()
{
- return xim_has_preediting;
+ if (status_area_enabled)
+ return gui.char_height;
+ return 0;
}
# endif
+
#endif /* FEAT_XIM */
#if defined(FEAT_MBYTE) || defined(PROTO)
View
2  src/netbeans.c
@@ -3494,7 +3494,7 @@ netbeans_draw_multisign_indicator(int row)
}
#endif /* FEAT_GUI_MOTIF */
-#ifdef FEAT_GUI_GTK
+#if defined(FEAT_GUI_GTK) && !defined(PROTO)
/*
* We have multiple signs to draw at the same location. Draw the
* multi-sign indicator instead. This is the GTK/Gnome version.
View
4 src/ops.c
@@ -5444,7 +5444,7 @@ write_viminfo_registers(fp)
int max_kbyte;
long len;
- fprintf(fp, _("\n# Registers:\n"));
+ fputs(_("\n# Registers:\n"), fp);
/* Get '<' value, use old '"' value if '<' is not found. */
max_num_lines = get_viminfo_parameter('<');
@@ -5474,7 +5474,7 @@ write_viminfo_registers(fp)
num_lines = y_regs[i].y_size;
if (num_lines == 0
|| (num_lines == 1 && y_regs[i].y_type == MCHAR
- && STRLEN(y_regs[i].y_array[0]) == 0))
+ && *y_regs[i].y_array[0] == NUL))
continue;
if (max_kbyte > 0)
View
4 src/os_vms.c
@@ -409,8 +409,7 @@ vms_wproc(char *name, int val)
int
mch_expand_wildcards(int num_pat, char_u **pat, int *num_file, char_u ***file, int flags)
{
- int i, j = 0, cnt = 0;
- char *cp;
+ int i, cnt = 0;
char_u buf[MAXPATHL];
int dir;
int files_alloced, files_free;
@@ -481,7 +480,6 @@ mch_expand_wildcards(int num_pat, char_u **pat, int *num_file, char_u ***file, i
mch_expandpath(garray_T *gap, char_u *path, int flags)
{
int i,cnt = 0;
- char *cp;
vms_match_num = 0;
cnt = decc$to_vms(decc$translate_vms(vms_fixfilename(path)), vms_wproc, 1, 0);
View
2  src/os_win16.c
@@ -193,8 +193,6 @@ mch_check_win(
int argc,
char **argv)
{
- int i;
-
return OK; /* GUI always has a tty */
}
View
1,066 src/po/uk.cp1251.po
@@ -12,16 +12,31 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: vim 7.1\n"
+"Project-Id-Version: vim 7.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-06 23:51+0200\n"
-"PO-Revision-Date: 2008-03-07 13:57+0300\n"
+"POT-Creation-Date: 2010-06-25 15:34+0300\n"
+"PO-Revision-Date: 2010-06-18 21:53+0300\n"
"Last-Translator: Àíàòîë³é Ñàõí³ê <sakhnik@gmail.com>\n"
"Language-Team: Bohdan Vlasyuk <bohdan@vstu.edu.ua>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=cp1251\n"
"Content-Transfer-Encoding: 8bit\n"
+msgid "E831: bf_key_init() called with empty password"
+msgstr "E831: Âèêëèêàíî bf_key_init() ç ïîðîæí³ì ïàðîëåì"
+
+msgid "E820: sizeof(uint32_t) != 4"
+msgstr "E820: sizeof(uint32_t) != 4"
+
+msgid "E817: Blowfish big/little endian use wrong"
+msgstr "E817: Íåïðàâèëüíå âèêîðèñòàííÿ ïîðÿäêó áàéò³â Blowfish (BE/LE)"
+
+msgid "E818: sha256 test failed"
+msgstr "E818: Íå ïðîéøëà ïåðåâ³ðêà sha256"
+
+msgid "E819: Blowfish test failed"
+msgstr "E819: Íå ïðîéøëà ïåðåâ³ðêà Blowfish"
+
msgid "E82: Cannot allocate any buffer, exiting..."
msgstr "E82: Íåìຠìîæëèâîñò³ ðîçì³ñòèòè õî÷ îäèí áóôåð, çàâåðøåííÿ ðîáîòè..."
@@ -42,7 +57,7 @@ msgstr "
#, c-format
msgid "%d buffers unloaded"
-msgstr "Âèâàíòàæåíî áóôåð³â -- %d"
+msgstr "Âèâàíòàæåíî %d áóôåðè(³â)"
msgid "1 buffer deleted"
msgstr "Çíèùåíî îäèí áóôåð"
@@ -56,7 +71,7 @@ msgstr "
#, c-format
msgid "%d buffers wiped out"
-msgstr "Âèòåðòî %d áóôåð(è)³â"
+msgstr "Âèòåðòî %d áóôåðè(³â)"
msgid "E84: No modified buffer found"
msgstr "E84: Æîäåí áóôåð íå çì³íåíî"
@@ -67,7 +82,7 @@ msgstr "E85:
#, c-format
msgid "E86: Buffer %ld does not exist"
-msgstr "E86: Áóôåðó %ld íåìàº"
+msgstr "E86: Áóôåðà %ld íåìàº"
msgid "E87: Cannot go beyond last buffer"
msgstr "E87: Öå âæå îñòàíí³é áóôåð"
@@ -114,7 +129,7 @@ msgid "[New file]"
msgstr "[Íîâèé ôàéë]"
msgid "[Read errors]"
-msgstr "[Ïîìèëêà ç÷èòóâàííÿ]"
+msgstr "[Ïîìèëêè ÷èòàííÿ]"
msgid "[readonly]"
msgstr "[ëèøå ÷èòàòè]"
@@ -187,22 +202,22 @@ msgstr "
#, c-format
msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: Íå çì³ã ïîð³âíÿòè ïîíàä %ld áóôåðè(³â) "
+msgstr "E96: Íå ìîæíà ïîð³âíþâàòè ïîíàä %ld áóôåðè(³â)"
msgid "E810: Cannot read or write temp files"
msgstr "E810: Íå ìîæíà ÷èòàòè ÷è çàïèñóâàòè òèì÷àñîâ³ ôàéëè"
msgid "E97: Cannot create diffs"
-msgstr "E97: Íå çì³ã ñòâîðèòè ïîð³âíÿííÿ"
+msgstr "E97: Íå âäàëîñÿ ñòâîðèòè ïîð³âíÿííÿ"
msgid "Patch file"
msgstr "Ëàòêà"
msgid "E816: Cannot read patch output"
-msgstr "E816: Íå çì³ã ïðî÷èòàòè ðåçóëüòàò patch"
+msgstr "E816: Íå âäàëîñÿ ïðî÷èòàòè ðåçóëüòàò patch"
msgid "E98: Cannot read diff output"
-msgstr "E98: Íå çì³ã ïðî÷èòàòè ðåçóëüòàò diff"
+msgstr "E98: Íå âäàëîñÿ ïðî÷èòàòè ðåçóëüòàò diff"
msgid "E99: Current buffer is not in diff mode"
msgstr "E99: Öåé áóôåð íå â ðåæèì³ ïîð³âíÿííÿ"
@@ -220,7 +235,7 @@ msgstr ""
#, c-format
msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: Íå çì³ã çíàéòè áóôåð \"%s\""
+msgstr "E102: Íå âäàëîñÿ çíàéòè áóôåð \"%s\""
#, c-format
msgid "E103: Buffer \"%s\" is not in diff mode"
@@ -233,7 +248,7 @@ msgid "E104: Escape not allowed in digraph"
msgstr "E104: Ó äèãðàôàõ íå ìîæå ì³ñòèòèñÿ escape"
msgid "E544: Keymap file not found"
-msgstr "E544: Íå çíàéäåíî ôàéëó ðîçêëàäêè"
+msgstr "E544: Íå çíàéäåíî ôàéë ðîçêëàäêè"
msgid "E105: Using :loadkeymap not in a sourced file"
msgstr "E105: :loadkeymap âèêîðèñòàíî íå ó ôàéë³ êîìàíä"
@@ -295,7 +310,7 @@ msgstr "
#, c-format
msgid "Scanning dictionary: %s"
-msgstr "Ñêàíóºìî ñëîâíèê: %s"
+msgstr "Ñêàíóºòüñÿ ñëîâíèê: %s"
msgid " (insert) Scroll (^E/^Y)"
msgstr " (âñòàâêà) Ïðîãîðíóòè (^E/^Y)"
@@ -311,7 +326,7 @@ msgid "Scanning tags."
msgstr "Ïîøóê ñåðåä òå´³â."
msgid " Adding"
-msgstr " Äîäàºìî"
+msgstr " Äîäàºòüñÿ"
#. showmode might reset the internal line pointers, so it must
#. * be called before line = ml_get(), or when this address is no
@@ -415,7 +430,7 @@ msgstr "
# msgstr "E235: "
#, c-format
msgid "E738: Can't list variables for %s"
-msgstr "E738: Íå ìîæíà ïåðåë³÷èòè çì³íí³ ó %s"
+msgstr "E738: Íå ìîæíà ïåðåðàõóâàòè çì³íí³ ó %s"
msgid "E689: Can only index a List or Dictionary"
msgstr "E689: ²íäåêñíèé äîñòóï ìîæå áóòè ò³ëüêè äî ñïèñêó ÷è ñëîâíèêà"
@@ -433,7 +448,7 @@ msgid "E711: List value has not enough items"
msgstr "E711: Ñïèñîê ìຠíåäîñòàòíüî åëåìåíò³â"
msgid "E690: Missing \"in\" after :for"
-msgstr "E690: ³äñóòíº \"in\" ï³ñëÿ :for"
+msgstr "E690: Ïðîïóùåíî \"in\" ï³ñëÿ :for"
#, c-format
msgid "E107: Missing parentheses: %s"
@@ -444,7 +459,7 @@ msgid "E108: No such variable: \"%s\""
msgstr "E108: Çì³ííî¿ íåìàº: \"%s\""
msgid "E743: variable nested too deep for (un)lock"
-msgstr "E743: Çì³ííà ìຠçàáàãàòî âêëàäåíü, ùîá áóòè çà-/â³äêðèòîþ."
+msgstr "E743: Çì³ííà ìຠçàáàãàòî âêëàäåíü ùîá áóòè çà-/â³äêðèòîþ."
msgid "E109: Missing ':' after '?'"
msgstr "E109: Áðàêóº ':' ï³ñëÿ '?'"
@@ -462,7 +477,7 @@ msgid "E736: Invalid operation for Dictionary"
msgstr "E736: Íåêîðåêòíà îïåðàö³ÿ íàä ñëîâíèêîì"
msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: Ôóíêö³þ ìîæíà ïîð³âíÿòè ò³ëüêè ³ç ôóíêö³ºþ"
+msgstr "E693: Ôóíêö³þ ìîæíà ïîð³âíÿòè ò³ëüêè ç ôóíêö³ºþ"
msgid "E694: Invalid operation for Funcrefs"
msgstr "E694: Íåêîðåêòíà îïåðàö³ÿ íàä ôóíêö³ºþ"
@@ -521,7 +536,7 @@ msgstr "E723:
# msgstr "E21: "
msgid "E724: variable nested too deep for displaying"
-msgstr "E724: Ó çì³íí³é çàíàäòî áàãàòî âêëàäåíü, ùîá ¿¿ ïîêàçàòè"
+msgstr "E724: Ó çì³íí³é çàáàãàòî âêëàäåíü ùîá ¿¿ ïîêàçàòè"
#, c-format
msgid "E740: Too many arguments for function %s"
@@ -610,16 +625,16 @@ msgstr "E240:
#, c-format
msgid "E241: Unable to send to %s"
-msgstr "E241: Íå çì³ã â³ä³ñëàòè äî %s"
+msgstr "E241: Íå âäàëîñÿ â³ä³ñëàòè äî %s"
msgid "E277: Unable to read a server reply"
-msgstr "E277: Íå çì³ã ïðî÷èòàòè â³äïîâ³äü ñåðâåðà"
+msgstr "E277: Íå âäàëîñÿ ïðî÷èòàòè â³äïîâ³äü ñåðâåðà"
msgid "E655: Too many symbolic links (cycle?)"
msgstr "E655: Çàáàãàòî ñèìâîëüíèõ ïîñèëàíü (öèêë?)"
msgid "E258: Unable to send to client"
-msgstr "E258: Íå çì³ã íàä³ñëàòè ê볺íòó"
+msgstr "E258: Íå âäàëîñÿ íàä³ñëàòè ê볺íòó"
# msgstr "E364: "
msgid "E702: Sort compare function failed"
@@ -685,7 +700,7 @@ msgid "E742: Cannot change value of %s"
msgstr "E742: Íå ìîæíà çì³íèòè çíà÷åííÿ %s"
msgid "E698: variable nested too deep for making a copy"
-msgstr "E698: Çì³ííà âêëàäåíà çàíàäòî ãëèáîêî, ùîá çðîáèòè ¿¿ êîï³þ"
+msgstr "E698: Çì³ííà âêëàäåíà çàíàäòî ãëèáîêî ùîá çðîáèòè ¿¿ êîï³þ"
#, c-format
msgid "E123: Undefined function: %s"
@@ -708,7 +723,7 @@ msgstr "E707:
#, c-format
msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: Íå çì³ã ïåðåâèçíà÷èòè ôóíêö³þ %s: âîíà âèêîðèñòîâóºòüñÿ"
+msgstr "E127: Íå âäàëîñÿ ïåðåâèçíà÷èòè ôóíêö³þ %s: âîíà âèêîðèñòîâóºòüñÿ"
#, c-format
msgid "E746: Function name does not match script file name: %s"
@@ -724,7 +739,7 @@ msgstr ""
#, c-format
msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: Íå çì³ã çíèùèòè ôóíêö³þ %s: Âîíà âèêîðèñòîâóºòüñÿ"
+msgstr "E131: Íå âäàëîñÿ çíèùèòè ôóíêö³þ %s: Âîíà âèêîðèñòîâóºòüñÿ"
msgid "E132: Function call depth is higher than 'maxfuncdepth'"
msgstr "E132: Ãëèáèíà âèêëèê³â ôóíêö³¿ ïåðåâèùóº 'maxfuncdepth'"
@@ -752,7 +767,6 @@ msgstr "
msgid "E133: :return not inside a function"
msgstr "E133: :return ïîçà ìåæàìè ôóíêö³¿"
-#, c-format
msgid ""
"\n"
"# global variables:\n"
@@ -770,6 +784,140 @@ msgstr ""
msgid "No old files"
msgstr "Æîäíîãî ñòàðîãî ôàéëó"
+msgid "Entering Debug mode. Type \"cont\" to continue."
+msgstr "Ðåæèì íàëàãîäæåííÿ. Ùîá ïðîäîâæèòè ââåä³òü \"cont\"."
+
+#, c-format
+msgid "line %ld: %s"
+msgstr "ðÿäîê %ld: %s"
+
+#, c-format
+msgid "cmd: %s"
+msgstr "êîìàíäà: %s"
+
+#, c-format
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "Òî÷êà çóïèíêè â \"%s%s\" ðÿäîê %ld"
+
+#, c-format
+msgid "E161: Breakpoint not found: %s"
+msgstr "E161: Òî÷êó çóïèíêè íå çíàéäåíî: %s"
+
+msgid "No breakpoints defined"
+msgstr "Íå âèçíà÷åíî æîäíî¿ òî÷êè çóïèíêè"
+
+#, c-format
+msgid "%3d %s %s line %ld"
+msgstr "%3d %s %s ðÿäîê %ld"
+
+msgid "E750: First use \":profile start {fname}\""
+msgstr "E750: Ñïî÷àòêó çðîá³òü \":profile start {ôàéë}\""
+
+msgid "Save As"
+msgstr "Çáåðåãòè ÿê"
+
+#, c-format
+msgid "Save changes to \"%s\"?"
+msgstr "Çáåðåãòè çì³íè â \"%s\"?"
+
+msgid "Untitled"
+msgstr "Íåíàçâàíèé"
+
+#, c-format
+msgid "E162: No write since last change for buffer \"%s\""
+msgstr "E162: Áóôåð \"%s\" ìຠíåçáåðåæåí³ çì³íè"
+
+msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
+msgstr ""
+"Îáåðåæíî: Íåñïîä³âàíî îïèíèëèñÿ ó ³íøîìó áóôåð³ (ïåðåâ³ðòå àâòîêîìàíäè)"
+
+msgid "E163: There is only one file to edit"
+msgstr "E163: Ðåäàãóºòüñÿ ëèøå îäèí ôàéë"
+
+msgid "E164: Cannot go before first file"
+msgstr "E164: Öå âæå íàéïåðøèé ôàéë"
+
+msgid "E165: Cannot go beyond last file"
+msgstr "E165: Öå âæå îñòàíí³é ôàéë"
+
+#, c-format
+msgid "E666: compiler not supported: %s"
+msgstr "E666: Êîìï³ëÿòîð íå ï³äòðèìóºòüñÿ: %s"
+
+# msgstr "E195: "
+#, c-format
+msgid "Searching for \"%s\" in \"%s\""
+msgstr "Ïîøóê \"%s\" â \"%s\""
+
+#, c-format
+msgid "Searching for \"%s\""
+msgstr "Ïîøóê \"%s\""
+
+#, c-format
+msgid "not found in 'runtimepath': \"%s\""
+msgstr "Â 'runtimepath' íå çíàéäåíî \"%s\""
+
+msgid "Source Vim script"
+msgstr "Ïðî÷èòàòè ñêðèïò Vim"
+
+#, c-format
+msgid "Cannot source a directory: \"%s\""
+msgstr "Íå âäàëîñÿ ïðî÷èòàòè êàòàëîã: \"%s\""
+
+#, c-format
+msgid "could not source \"%s\""
+msgstr "Íå âäàëîñÿ âèêîíàòè \"%s\""
+
+#, c-format
+msgid "line %ld: could not source \"%s\""
+msgstr "ðÿäîê %ld: íå âäàëîñÿ âèêîíàòè \"%s\""
+
+#, c-format
+msgid "sourcing \"%s\""
+msgstr "âèêîíóºòüñÿ \"%s\""
+
+#, c-format
+msgid "line %ld: sourcing \"%s\""
+msgstr "ðÿäîê %ld: âèêîíóºòüñÿ \"%s\""
+
+#, c-format
+msgid "finished sourcing %s"
+msgstr "çàê³í÷åíî âèêîíàííÿ %s"
+
+msgid "modeline"
+msgstr "modeline"
+
+# msgstr "E14: "
+msgid "--cmd argument"
+msgstr "--cmd àðãóìåíò"
+
+# msgstr "E14: "
+msgid "-c argument"
+msgstr "-c àðãóìåíò"
+
+msgid "environment variable"
+msgstr "çì³ííà îòî÷åííÿ"
+
+msgid "error handler"
+msgstr "îáðîáíèê ïîìèëêè"
+
+msgid "W15: Warning: Wrong line separator, ^M may be missing"
+msgstr "W15: Çàñòåðåæåííÿ: Íåïðàâèëüíèé ðîçä³ëüíèê ðÿäê³â, ìîæëèâî, áðàêóº ^M"
+
+msgid "E167: :scriptencoding used outside of a sourced file"
+msgstr "E167: :scriptencoding âèêîðèñòàíî ïîçà âèêîíóâàíèì ôàéëîì"
+
+msgid "E168: :finish used outside of a sourced file"
+msgstr "E168: :finish âèêîðèñòàíî ïîçà âèêîíóâàíèì ôàéëîì"
+
+#, c-format
+msgid "Current %slanguage: \"%s\""
+msgstr "Ìîâà (%s): \"%s\""
+
+#, c-format
+msgid "E197: Cannot set language to \"%s\""
+msgstr "E197: Íå âäàëîñÿ âñòàíîâèòè ìîâó \"%s\""
+
#, c-format
msgid "<%s>%s%s %d, Hex %02x, Octal %03o"
msgstr "<%s>%s%s %d, ø³ñò %02x, â³ñ %03o"
@@ -800,14 +948,14 @@ msgid "E135: *Filter* Autocommands must not change current buffer"
msgstr "E135: Àâòîêîìàíäè *Filter* íå ïîâèíí³ çì³íþâàòè ïîòî÷íèé áóôåð"
msgid "[No write since last change]\n"
-msgstr "[Íå çàïèñàíî îñòàíí³ çì³íè]\n"
+msgstr "[Çì³íè íå çàïèñàíî]\n"
#, c-format
msgid "%sviminfo: %s in line: "
msgstr "%sviminfo: %s â ðÿäêó: "
msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: Çàáàãàòî ïîìèëîê, ïðîïóñêàºìî ðåøòó ôàéëó"
+msgstr "E136: viminfo: Çàáàãàòî ïîìèëîê, ðåøòà ôàéëó áóäå ïðîïóùåíî"
#, c-format
msgid "Reading viminfo file \"%s\"%s%s%s"
@@ -832,7 +980,7 @@ msgstr "E137:
#, c-format
msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: Íå çì³ã çàïèñàòè ôàéë viminfo %s!"
+msgstr "E138: Íå âäàëîñÿ çàïèñàòè ôàéë viminfo %s!"
#, c-format
msgid "Writing viminfo file \"%s\""
@@ -858,14 +1006,11 @@ msgstr "#
msgid "Illegal starting char"
msgstr "Íåäîçâîëåíèé ñèìâîë íà ïî÷àòêó ðÿäêà"
-msgid "Save As"
-msgstr "Çáåðåãòè ÿê"
-
msgid "Write partial file?"
msgstr "Çàïèñàòè ÷àñòèíó ôàéëó?"
msgid "E140: Use ! to write partial buffer"
-msgstr "E140: Âèêîðèñòàéòå ! äëÿ çàïèñó ÷àñòèíè áóôåðó"
+msgstr "E140: Âèêîðèñòàéòå ! äëÿ çàïèñó ÷àñòèíè áóôåðà"
#, c-format
msgid "Overwrite existing file \"%s\"?"
@@ -873,7 +1018,7 @@ msgstr "
#, c-format
msgid "Swap file \"%s\" exists, overwrite anyway?"
-msgstr "Ôàéë îáì³íó \"%s\" ³ñíóº, ïåðåïèñàòè?"
+msgstr "Ôàéë îáì³íó \"%s\" ³ñíóº, ïåðåçàïèñàòè?"
#, c-format
msgid "E768: Swap file exists: %s (:silent! overrides)"
@@ -881,7 +1026,7 @@ msgstr "E768:
#, c-format
msgid "E141: No file name for buffer %ld"
-msgstr "E141: Íåìຠâõ³äíîãî ôàéëó äëÿ áóôåðó %ld"
+msgstr "E141: Íåìຠâõ³äíîãî ôàéëó äëÿ áóôåðà %ld"
msgid "E142: File not written: Writing is disabled by 'write' option"
msgstr "E142: Ôàéë íå çàïèñàíî: çàïèñ çàáîðîíåíî îïö³ºþ 'write'"
@@ -892,7 +1037,7 @@ msgid ""
"Do you wish to write anyway?"
msgstr ""
"Äëÿ \"%s\" âñòàíîâëåíî 'readonly'.\n"
-"Áàæàºòå âñå-îäíî ïðîäîâæèòè çàïèñ?"
+"Áàæàºòå âñå îäíî ïðîäîâæèòè çàïèñ?"
#, c-format
msgid ""
@@ -926,7 +1071,7 @@ msgstr "E146:
#, c-format
msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "Çàì³íèòè ó %s (y/n/a/q/l/^E/^Y)?"
+msgstr "Çàì³íèòè íà %s (y/n/a/q/l/^E/^Y)?"
msgid "(Interrupted) "
msgstr "(Ïåðåðâàíî) "
@@ -994,11 +1139,11 @@ msgstr "E150:
#, c-format
msgid "E152: Cannot open %s for writing"
-msgstr "E152: Íå çì³ã â³äêðèòè %s äëÿ çàïèñó"
+msgstr "E152: Íå âäàëîñÿ â³äêðèòè %s äëÿ çàïèñó"
#, c-format
msgid "E153: Unable to open %s for reading"
-msgstr "E153: Íå çì³ã â³äêðèòè %s äëÿ ÷èòàííÿ"
+msgstr "E153: Íå âäàëîñÿ â³äêðèòè %s äëÿ ÷èòàííÿ"
#, c-format
msgid "E670: Mix of help file encodings within a language: %s"
@@ -1031,7 +1176,7 @@ msgstr "E159:
#, c-format
msgid "E158: Invalid buffer name: %s"
-msgstr "E158: Íåêîðåêòíà íàçâà áóôåðó: %s"
+msgstr "E158: Íåêîðåêòíà íàçâà áóôåðà: %s"
#, c-format
msgid "E157: Invalid sign ID: %ld"
@@ -1046,137 +1191,6 @@ msgstr " (
msgid "[Deleted]"
msgstr "[Çíèùåíî]"
-msgid "Entering Debug mode. Type \"cont\" to continue."
-msgstr "Ðåæèì íàëàãîäæåííÿ. Ùîá ïðîäîâæèòè ââåä³òü \"cont\"."
-
-#, c-format
-msgid "line %ld: %s"
-msgstr "ðÿäîê %ld: %s"
-
-#, c-format
-msgid "cmd: %s"
-msgstr "êîìàíäà: %s"
-
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Òî÷êà çóïèíêè â \"%s%s\" ðÿäîê %ld"
-
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: Òî÷êó çóïèíêè íå çíàéäåíî: %s"
-
-msgid "No breakpoints defined"
-msgstr "Íå âèçíà÷åíî æîäíî¿ òî÷êè çóïèíêè"
-
-#, c-format
-msgid "%3d %s %s line %ld"
-msgstr "%3d %s %s ðÿäîê %ld"
-
-msgid "E750: First use \":profile start {fname}\""
-msgstr "E750: Ñïî÷àòêó çðîá³òü \":profile start {ôàéë}\""
-
-#, c-format
-msgid "Save changes to \"%s\"?"
-msgstr "Çáåðåãòè çì³íè â \"%s\"?"
-
-msgid "Untitled"
-msgstr "Íåíàçâàíèé"
-
-#, c-format
-msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: Áóôåð \"%s\" ìຠíåçáåðåæåí³ çì³íè"
-
-msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr ""
-"Îáåðåæíî: Íåñïîä³âàíî îïèíèëèñÿ ó ³íøîìó áóôåð³ (ïåðåâ³ðòå àâòîêîìàíäè)"
-
-msgid "E163: There is only one file to edit"
-msgstr "E163: Ðåäàãóºòüñÿ ëèøå îäèí ôàéë"
-
-msgid "E164: Cannot go before first file"
-msgstr "E164: Öå âæå íàéïåðøèé ôàéë"
-
-msgid "E165: Cannot go beyond last file"
-msgstr "E165: Öå âæå îñòàíí³é ôàéë"
-
-#, c-format
-msgid "E666: compiler not supported: %s"
-msgstr "E666: Êîìï³ëÿòîð íå ï³äòðèìóºòüñÿ: %s"
-
-# msgstr "E195: "
-#, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "Øóêàºìî \"%s\" â \"%s\""
-
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "Øóêàºìî \"%s\""
-
-#, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "Â 'runtimepath' íå çíàéäåíî \"%s\""
-
-msgid "Source Vim script"
-msgstr "Ïðî÷èòàòè ñêðèïò Vim"
-
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "Íå çì³ã ïðî÷èòàòè êàòàëîã: \"%s\""
-
-#, c-format
-msgid "could not source \"%s\""
-msgstr "Íå ìîæíà âèêîíàòè \"%s\""
-
-#, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "ðÿäîê %ld: íå ìîæíà âèêîíàòè \"%s\""
-
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "âèêîíóºòüñÿ \"%s\""
-
-#, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "ðÿäîê %ld: âèêîíóºòüñÿ \"%s\""
-
-#, c-format
-msgid "finished sourcing %s"
-msgstr "çàê³í÷åíî âèêîíàííÿ %s"
-
-msgid "modeline"
-msgstr "modeline"
-
-# msgstr "E14: "
-msgid "--cmd argument"
-msgstr "--cmd àðãóìåíò"
-
-# msgstr "E14: "
-msgid "-c argument"
-msgstr "-c àðãóìåíò"
-
-msgid "environment variable"
-msgstr "çì³ííà îòî÷åííÿ"
-
-msgid "error handler"
-msgstr "îáðîáíèê ïîìèëêè"
-
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: Óâàãà: Íåïðàâèëüíèé ðîçä³ëüíèê ðÿäê³â, ìîæëèâî, áðàêóº ^M"
-
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: :scriptencoding âèêîðèñòàíî ïîçà âèêîíóâàíèì ôàéëîì"
-
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: :finish âèêîðèñòàíî ïîçà âèêîíóâàíèì ôàéëîì"
-
-#, c-format
-msgid "Current %slanguage: \"%s\""
-msgstr "Ìîâà (%s): \"%s\""
-
-#, c-format
-msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: Íå çì³ã âñòàíîâèòè ìîâó \"%s\""
-
msgid "Entering Ex mode. Type \"visual\" to go to Normal mode."
msgstr "Ðåæèì Ex. Äëÿ ïîâåðíåííÿ äî íîðìàëüíîãî ðåæèìó âèêîíàéòå \"visual\""
@@ -1290,17 +1304,20 @@ msgstr "E468:
msgid "E467: Custom completion requires a function argument"
msgstr "E467: Êîðèñòóâàöüêå äîïîâíåííÿ âèìàãຠàðãóìåíò-ôóíêö³þ"
+msgid "unknown"
+msgstr "Íåâ³äîìî"
+
# msgstr "E184: "
#, c-format
msgid "E185: Cannot find color scheme %s"
-msgstr "E185: Íå çì³ã çíàéòè ñõåìó êîëüîð³â %s"
+msgstr "E185: Íå âäàëîñÿ çíàéòè ñõåìó êîëüîð³â %s"
msgid "Greetings, Vim user!"
msgstr "³òàííÿ, êîðèñòóâà÷ó Vim!"
# msgstr "E443: "
msgid "E784: Cannot close last tab page"
-msgstr "E784: Íå ìîæó çàêðèòè îñòàííþ âêëàäêó"
+msgstr "E784: Íå ìîæíà çàêðèòè îñòàííþ âêëàäêó"
# msgstr "E444: "
msgid "Already only one tab page"
@@ -1321,7 +1338,7 @@ msgid "Append File"
msgstr "Äîïèñàòè ôàéë"
msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
-msgstr "E747: Íå çì³ã çì³íèòè êàòàëîã, áóôåð ìຠçì³íè (! ùîá íå çâàæàòè)"
+msgstr "E747: Íå âäàëîñÿ çì³íèòè êàòàëîã, áóôåð ìຠçì³íè (! ùîá íå çâàæàòè)"
msgid "E186: No previous directory"
msgstr "E186: Öå âæå íàéïåðøèé êàòàëîã"
@@ -1359,7 +1376,7 @@ msgstr "
#, c-format
msgid "E739: Cannot create directory: %s"
-msgstr "E739: Íå çì³ã ñòâîðèòè êàòàëîã: %s"
+msgstr "E739: Íå âäàëîñÿ ñòâîðèòè êàòàëîã: %s"
#, c-format
msgid "E189: \"%s\" exists (add ! to override)"
@@ -1368,7 +1385,7 @@ msgstr "E189:
# msgstr "E189: "
#, c-format
msgid "E190: Cannot open \"%s\" for writing"
-msgstr "E190: Íå çì³ã â³äêðèòè \"%s\" äëÿ çàïèñó"
+msgstr "E190: Íå âäàëîñÿ â³äêðèòè \"%s\" äëÿ çàïèñó"
# msgstr "E190: "
#. set mark
@@ -1390,7 +1407,7 @@ msgid "E495: no autocommand file name to substitute for \"<afile>\""
msgstr "E495: Íåìຠíàçâè ôàéëó àâòîêîìàíäè äëÿ çàì³íè \"<afile>\""
msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "E496: Íåìຠíîìåðà áóôåðó àâòîêîìàíäè äëÿ çàì³íè \"<abuf>\""
+msgstr "E496: Íåìຠíîìåðà áóôåðà àâòîêîìàíäè äëÿ çàì³íè \"<abuf>\""
msgid "E497: no autocommand match name to substitute for \"<amatch>\""
msgstr "E497: Íåìຠíàçâè çá³ãó àâòîêîìàíäè äëÿ çàì³íè \"<amatch>\""
@@ -1406,7 +1423,7 @@ msgid "E500: Evaluates to an empty string"
msgstr "E500: Ðåçóëüòàò -- ïîðîæí³é ðÿäîê"
msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: Íå çì³ã ïðî÷èòàòè ôàéë viminfo"
+msgstr "E195: Íå âäàëîñÿ ïðî÷èòàòè ôàéë viminfo"
msgid "E196: No digraphs in this version"
msgstr "E196: Ó ö³é âåðñ³¿ íåìຠäèãðàô³â"
@@ -1523,7 +1540,7 @@ msgid "E788: Not allowed to edit another buffer now"
msgstr "E788: Çàðàç íå ìîæíà ðåäàãóâàòè ³íøèé áóôåð"
msgid "E811: Not allowed to change buffer information now"
-msgstr "E811: Çàðàç íå ìîæíà çì³íþâàòè ³íôîðìàö³þ áóôåðó"
+msgstr "E811: Çàðàç íå ìîæíà çì³íþâàòè ³íôîðìàö³þ áóôåðà"
# msgstr "E197: "
msgid "tagname"
@@ -1598,10 +1615,10 @@ msgstr "E201:
# msgstr "E201: "
msgid "Vim: Reading from stdin...\n"
-msgstr "Vim: ×èòàºìî ç stdin...\n"
+msgstr "Vim: ×èòàºòüñÿ ç stdin...\n"
msgid "Reading from stdin..."
-msgstr èòàºìî ç stdin..."
+msgstr èòàºòüñÿ ç stdin..."
#. Re-opening the original file failed!
msgid "E202: Conversion made file unreadable!"
@@ -1609,10 +1626,10 @@ msgstr "E202:
# msgstr "E202: "
msgid "[fifo/socket]"
-msgstr "[fifo/ñîêåò]"
+msgstr "[êàíàë/ñîêåò]"
msgid "[fifo]"
-msgstr "[fifo]"
+msgstr "[êàíàë]"
msgid "[socket]"
msgstr "[ñîêåò]"
@@ -1650,13 +1667,16 @@ msgid "[READ ERRORS]"
msgstr "[ÏÎÌÈËÊÀ ×ÈÒÀÍÍß]"
msgid "Can't find temp file for conversion"
-msgstr "Íå çì³ã ï³äøóêàòè òèì÷àñîâèé ôàéë äëÿ êîíâåðòàö³¿"
+msgstr "Íå âäàëîñÿ ï³äøóêàòè òèì÷àñîâèé ôàéë äëÿ êîíâåðòàö³¿"
msgid "Conversion with 'charconvert' failed"
msgstr "Êîíâåðòàö³ÿ ç 'charconvert' íå âäàëàñÿ"
msgid "can't read output of 'charconvert'"
-msgstr "íå çì³ã ïðî÷èòàòè âèâ³ä 'charconvert'"
+msgstr "íå âäàëîñÿ ïðî÷èòàòè âèâ³ä 'charconvert'"
+
+msgid "E821: File is encrypted with unknown method"
+msgstr "E821: Ôàéë çàøèôðîâàíî íåâ³äîìèì ìåòîäîì"
# msgstr "E217: "
msgid "E676: No matching autocommands for acwrite buffer"
@@ -1676,7 +1696,7 @@ msgid "Partial writes disallowed for NetBeans buffers"
msgstr "×àñòêîâ³ çàïèñè çàáîðîíåí³ äëÿ áóôåð³â NetBeans"
msgid "is not a file or writable device"
-msgstr "Íå ïðèäàòíèé äî çàïèñó"
+msgstr "Íå ïðèäàòíèé äëÿ çàïèñó"
msgid "writing to device disabled with 'opendevice' option"
msgstr "Çàïèñ äî ïðèñòðîþ çàáîðîíåíî îïö³ºþ 'opendevice'"
@@ -1685,38 +1705,39 @@ msgid "is read-only (add ! to override)"
msgstr "ëèøå äëÿ ÷èòàííÿ (! ùîá íå çâàæàòè)"
msgid "E506: Can't write to backup file (add ! to override)"
-msgstr "E506: Íå çì³ã çàïèñàòè ðåçåðâíèé ôàéë (! ùîá íå çâàæàòè)"
+msgstr "E506: Íå âäàëîñÿ çàïèñàòè ðåçåðâíèé ôàéë (! ùîá íå çâàæàòè)"
msgid "E507: Close error for backup file (add ! to override)"
msgstr "E507: Ïîìèëêà çàêðèòòÿ ðåçåðâíîãî ôàéëó (! ùîá íå çâàæàòè)"
msgid "E508: Can't read file for backup (add ! to override)"
msgstr ""
-"E508: Íå çì³ã ïðî÷èòàòè ôàéë, ùîá ñòâîðèòè ðåçåðâíó êîï³þ (! ùîá íå çâàæàòè)"
+"E508: Íå âäàëîñÿ ïðî÷èòàòè ôàéë ùîá ñòâîðèòè ðåçåðâíó êîï³þ (! ùîá íå "
+"çâàæàòè)"
msgid "E509: Cannot create backup file (add ! to override)"
-msgstr "E509: Íå çì³ã ñòâîðèòè ðåçåðâíó êîï³þ (! ùîá íå çâàæàòè)"
+msgstr "E509: Íå âäàëîñÿ ñòâîðèòè ðåçåðâíó êîï³þ (! ùîá íå çâàæàòè)"
msgid "E510: Can't make backup file (add ! to override)"
-msgstr "E510: Íå çì³ã çðîáèòè ðåçåðâíó êîï³þ (! ùîá íå çâàæàòè)"
+msgstr "E510: Íå âäàëîñÿ çðîáèòè ðåçåðâíó êîï³þ (! ùîá íå çâàæàòè)"
msgid "E460: The resource fork would be lost (add ! to override)"
msgstr "E460: óëêó ðåñóðñ³â ìîæíà âòðàòèòè (! ùîá íå çâàæàòè)"
msgid "E214: Can't find temp file for writing"
-msgstr "E214: Íå çì³ã ï³äøóêàòè òèì÷àñîâèé ôàéë äëÿ çàïèñó"
+msgstr "E214: Íå âäàëîñÿ ï³äøóêàòè òèì÷àñîâèé ôàéë äëÿ çàïèñó"
msgid "E213: Cannot convert (add ! to write without conversion)"
-msgstr "E213: Íå çì³ã ïåðåòâîðèòè (! ùîá çàïèñàòè áåç êîíâåðòàö³¿)"
+msgstr "E213: Íå âäàëîñÿ ïåðåòâîðèòè (! ùîá çàïèñàòè áåç êîíâåðòàö³¿)"
msgid "E166: Can't open linked file for writing"
-msgstr "E166: Íå çì³ã â³äêðèòè äëÿ çàïèñó çâ'ÿçàíèé ôàéë"
+msgstr "E166: Íå âäàëîñÿ â³äêðèòè äëÿ çàïèñó çâ'ÿçàíèé ôàéë"
msgid "E212: Can't open file for writing"
-msgstr "E212: Íå çì³ã â³äêðèòè ôàéë äëÿ çàïèñó"
+msgstr "E212: Íå âäàëîñÿ â³äêðèòè ôàéë äëÿ çàïèñó"
msgid "E667: Fsync failed"
-msgstr "E667: Íåâäàëèé fsync"
+msgstr "E667: Íå âäàëîñÿ âèêîíàòè fsync"
msgid "E512: Close failed"
msgstr "E512: Íå âäàëîñÿ çàêðèòè"
@@ -1760,38 +1781,38 @@ msgid " written"
msgstr " çàïèñàíèé"
msgid "E205: Patchmode: can't save original file"
-msgstr "E205: Ëàòàííÿ: íå çì³ã çáåðåãòè îðèã³íàë"
+msgstr "E205: Ëàòàííÿ: íå âäàëîñÿ çáåðåãòè îðèã³íàë"
msgid "E206: patchmode: can't touch empty original file"
-msgstr "E206: Ëàòàííÿ: íå çì³ã ñòâîðèòè îðèã³íàë"
+msgstr "E206: Ëàòàííÿ: íå âäàëîñÿ ñòâîðèòè îðèã³íàë"
msgid "E207: Can't delete backup file"
-msgstr "E207: Íå çì³ã çíèùèòè ðåçåðâíèé ôàéë"
+msgstr "E207: Íå âäàëîñÿ çíèùèòè ðåçåðâíèé ôàéë"
msgid ""
"\n"
"WARNING: Original file may be lost or damaged\n"
msgstr ""
"\n"
-"ÓÂÀÃÀ: Îðèã³íàë, ìàáóòü, âòðà÷åíèé ÷è ïîøêîäæåíèé\n"
+"ÇÀÑÒÅÐÅÆÅÍÍß: Îðèã³íàë, ìàáóòü, âòðà÷åíèé ÷è ïîøêîäæåíèé\n"
msgid "don't quit the editor until the file is successfully written!"
msgstr "Íå âèõîäüòå ç ðåäàêòîðà, äîêè ôàéë íå çàïèñàíî!"
msgid "[dos]"
-msgstr "[äîñ]"
+msgstr "[dos]"
msgid "[dos format]"
-msgstr "[ôîðìàò äîñ]"
+msgstr "[ôîðìàò dos]"
msgid "[mac]"
-msgstr "[ìàê]"
+msgstr "[mac]"
msgid "[mac format]"
-msgstr "[ôîðìàò ìàê]"
+msgstr "[ôîðìàò mac]"
msgid "[unix]"
-msgstr "[þíiêñ]"
+msgstr "[unix]"
msgid "[unix format]"
msgstr "[ôîðìàò unix]"
@@ -1807,6 +1828,11 @@ msgid "1 character"
msgstr "îäèí ñèìâîë"
#, c-format
+msgid "%lld characters"
+msgstr "%lld ñèìâîë³â"
+
+#. Explicit typecast avoids warning on Mac OS X 10.6
+#, c-format
msgid "%ld characters"
msgstr "%ld ñèìâîë³â"
@@ -1820,14 +1846,14 @@ msgstr "[
#. must give this prompt
#. don't use emsg() here, don't want to flush the buffers
msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "ÓÂÀÃÀ: Ôàéë çì³íèâñÿ ç ÷àñó îñòàííüîãî ÷èòàííÿ!!!"
+msgstr "ÇÀÑÒÅÐÅÆÅÍÍß: Ôàéë çì³íèâñÿ ç ÷àñó îñòàííüîãî ÷èòàííÿ!!!"
msgid "Do you really want to write to it"
msgstr "Âè ñïðàâä³ õî÷åòå éîãî ïåðåïèñàòè??"
#, c-format
msgid "E208: Error writing to \"%s\""
-msgstr "E208: Ïîìèëêà çàïèñó \"%s\""
+msgstr "E208: Ïîìèëêà çàïèñó ó \"%s\""
#, c-format
msgid "E209: Error closing \"%s\""
@@ -1848,31 +1874,32 @@ msgstr "E211:
msgid ""
"W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
"well"
-msgstr "W12: Óâàãà: Ôàéë \"%s\" çì³íèâñÿ, àëå é áóôåð ó Vim òàêîæ"
+msgstr "W12: Çàñòåðåæåííÿ: Ôàéë \"%s\" çì³íèâñÿ, àëå é áóôåð ó Vim òàêîæ"
msgid "See \":help W12\" for more info."
msgstr "Äèâ. \":help W12\" äëÿ óòî÷íåííÿ."
#, c-format
msgid "W11: Warning: File \"%s\" has changed since editing started"
-msgstr "W11: Óâàãà: Ôàéë \"%s\" çì³íèâñÿ ï³ñëÿ ïî÷àòêó ðåäàãóâàííÿ"
+msgstr "W11: Çàñòåðåæåííÿ: Ôàéë \"%s\" çì³íèâñÿ ï³ñëÿ ïî÷àòêó ðåäàãóâàííÿ"
msgid "See \":help W11\" for more info."
msgstr "Äèâ. \":help W11\" äëÿ óòî÷íåííÿ."
#, c-format
msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
-msgstr "W16: Óâàãà: Ðåæèì ôàéëó \"%s\" çì³íèâñÿ ï³ñëÿ ïî÷àòêó ðåäàãóâàííÿ"
+msgstr ""
+"W16: Çàñòåðåæåííÿ: Ðåæèì ôàéëó \"%s\" çì³íèâñÿ ï³ñëÿ ïî÷àòêó ðåäàãóâàííÿ"
msgid "See \":help W16\" for more info."
msgstr "Äèâ. \":help W16\" äëÿ óòî÷íåííÿ."
#, c-format
msgid "W13: Warning: File \"%s\" has been created after editing started"
-msgstr "W13: Óâàãà: Ôàéë \"%s\" áóëî ñòâîðåíî ï³ñëÿ ïî÷àòêó ðåäàãóâàííÿ"
+msgstr "W13: Çàñòåðåæåííÿ: Ôàéë \"%s\" áóëî ñòâîðåíî ï³ñëÿ ïî÷àòêó ðåäàãóâàííÿ"
msgid "Warning"
-msgstr "Óâàãà"
+msgstr "Çàñòåðåæåííÿ"
msgid ""
"&OK\n"
@@ -1883,11 +1910,11 @@ msgstr ""
#, c-format
msgid "E462: Could not prepare for reloading \"%s\""
-msgstr "E462: Íå çì³ã ï³äãîòóâàòè \"%s\" äëÿ ïåðåâàíòàæåííÿ"
+msgstr "E462: Íå âäàëîñÿ ï³äãîòóâàòè \"%s\" äëÿ ïåðå÷èòàííÿ"
#, c-format
msgid "E321: Could not reload \"%s\""
-msgstr "E321: Íå çì³ã ïåðåâàíòàæèòè \"%s\""
+msgstr "E321: Íå âäàëîñÿ ïåðå÷èòàòè \"%s\""
msgid "--Deleted--"
msgstr "--Çíèùåíî--"
@@ -1926,7 +1953,7 @@ msgstr ""
#, c-format
msgid "E680: <buffer=%d>: invalid buffer number "
-msgstr "E680: <áóôåð=%d>: íåêîðåêòíèé íîìåð áóôåðó "
+msgstr "E680: <áóôåð=%d>: íåêîðåêòíèé íîìåð áóôåðà "
msgid "E217: Can't execute autocommands for ALL events"
msgstr "E217: Íå ìîæó âèêîíóâàòè àâòîêîìàíäè äëÿ ÓÑ²Õ ïîä³é"
@@ -1960,21 +1987,21 @@ msgstr "E220:
# msgstr "E220: "
msgid "E490: No fold found"
-msgstr "E490: Íå çíàéøîâ çãîðòêó"
+msgstr "E490: Çãîðòîê íå çíàéäåíî"
# msgstr "E349: "
msgid "E350: Cannot create fold with current 'foldmethod'"
-msgstr "E350: Íå çì³ã ñòâîðèòè çãîðòêó ìåòîäîì 'foldmethod'"
+msgstr "E350: Íå âäàëîñÿ ñòâîðèòè çãîðòêó ìåòîäîì 'foldmethod'"
msgid "E351: Cannot delete fold with current 'foldmethod'"
-msgstr "E351: Íå çì³ã çíèùèòè çãîðòêó ìåòîäîì 'foldmethod'"
+msgstr "E351: Íå âäàëîñÿ çíèùèòè çãîðòêó ìåòîäîì 'foldmethod'"
#, c-format
msgid "+--%3ld lines folded "
msgstr "+-- çãîðíóòî %3ld ðÿäê³â "
msgid "E222: Add to read buffer"
-msgstr "E222: Äîäàíî äî ïðî÷èòàíîãî áóôåðó"
+msgstr "E222: Äîäàòè äî áóôåðà ÷èòàííÿ"
msgid "E223: recursive mapping"
msgstr "E223: Çàì³íà ðåêóðñèâíà"
@@ -1982,22 +2009,22 @@ msgstr "E223:
# msgstr "E223: "
#, c-format
msgid "E224: global abbreviation already exists for %s"
-msgstr "E224: Çàãàëüíå ñêîðî÷åííÿ %s âæå ³ñíóº"
+msgstr "E224: Çàãàëüíå ñêîðî÷åííÿ äëÿ %s âæå ³ñíóº"
# msgstr "E224: "
#, c-format
msgid "E225: global mapping already exists for %s"
-msgstr "E225: Çàãàëüíà çàì³íà %s âæå ³ñíóº"
+msgstr "E225: Çàãàëüíà çàì³íà äëÿ %s âæå ³ñíóº"
# msgstr "E225: "
#, c-format
msgid "E226: abbreviation already exists for %s"
-msgstr "E226: Âæå º ñêîðî÷åííÿ %s"
+msgstr "E226: Âæå º ñêîðî÷åííÿ äëÿ %s"
# msgstr "E226: "
#, c-format
msgid "E227: mapping already exists for %s"
-msgstr "E227: Âæå º çàì³íà %s"
+msgstr "E227: Âæå º çàì³íà äëÿ %s"
# msgstr "E227: "
msgid "No abbreviation found"
@@ -2009,47 +2036,21 @@ msgstr "
msgid "E228: makemap: Illegal mode"
msgstr "E228: makemap: Íåïðèïóñòèìèé ðåæèì"
-# msgstr "E228: "
-msgid "E229: Cannot start the GUI"
-msgstr "E229: Íå çì³ã çàïóñòèòè GUI"
-
-# msgstr "E229: "
-#, c-format
-msgid "E230: Cannot read from \"%s\""
-msgstr "E230: Íå çì³ã ïðî÷èòàòè ç \"%s\""
-
-msgid "E665: Cannot start GUI, no valid font found"
-msgstr "E665: Íå çì³ã çàïóñòèòè GUI, íå çíàéäåíî øðèôò"
-
-# msgstr "E230: "
-msgid "E231: 'guifontwide' invalid"
-msgstr "E231: Íåêîðåêòíèé 'guifontwide'"
-
-msgid "E599: Value of 'imactivatekey' is invalid"
-msgstr "E599: Çíà÷åííÿ 'imactivatekey' íåêîðåêòíå"
-
-#, c-format
-msgid "E254: Cannot allocate color %s"
-msgstr "E254: Íå çì³ã îòðèìàòè êîë³ð %s"
-
-msgid "No match at cursor, finding next"
-msgstr "Íåìຠíàä êóðñîðîì, øóêàºìî äàë³"
-
msgid "<cannot open> "
msgstr "<íå â³äêðèâàºòüñÿ> "
#, c-format
msgid "E616: vim_SelFile: can't get font %s"
-msgstr "E616: vim_SelFile: íå çì³ã îòðèìàòè øðèôò %s"
+msgstr "E616: vim_SelFile: íå âäàëîñÿ îòðèìàòè øðèôò %s"
msgid "E614: vim_SelFile: can't return to current directory"
-msgstr "E614: vim_SelFile: íå çì³ã ïîâåðíóòèñÿ â ïîòî÷íèé êàòàëîã"
+msgstr "E614: vim_SelFile: íå âäàëîñÿ ïîâåðíóòèñÿ â ïîòî÷íèé êàòàëîã"
msgid "Pathname:"
msgstr "Øëÿõ:"
msgid "E615: vim_SelFile: can't get current directory"
-msgstr "E615: vim_SelFile: íå çì³ã îòðèìàòè ïîòî÷íèé êàòàëîã"
+msgstr "E615: vim_SelFile: íå âäàëîñÿ îòðèìàòè ïîòî÷íèé êàòàëîã"
msgid "OK"
msgstr "Ãàðàçä"
@@ -2057,18 +2058,40 @@ msgstr "
msgid "Cancel"
msgstr "Ñêàñóâàòè"
-msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-msgstr "Scrollbar Widget: Íå çì³ã âèçíà÷èòè ðîçì³ð ñêîðî÷åíî¿ êàðòèíêè."
-
msgid "Vim dialog"
msgstr "ijàëîã Vim"
+msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
+msgstr "Scrollbar Widget: Íå âäàëîñÿ âèçíà÷èòè ðîçì³ð ñêîðî÷åíî¿ êàðòèíêè."
+
msgid "E232: Cannot create BalloonEval with both message and callback"
-msgstr "E232: Íå çì³ã ñòâîðèòè BalloonEval ç ïîâ³äîìëåííÿì ³ ôóíêö³ºþ"
+msgstr "E232: Íå âäàëîñÿ ñòâîðèòè BalloonEval ç ïîâ³äîìëåííÿì ³ ôóíêö³ºþ"
-# msgstr "E232: "
-msgid "Vim dialog..."
-msgstr "ijàëîã Vim..."
+# msgstr "E228: "
+msgid "E229: Cannot start the GUI"
+msgstr "E229: Íå âäàëîñÿ çàïóñòèòè GUI"
+
+# msgstr "E229: "
+#, c-format
+msgid "E230: Cannot read from \"%s\""
+msgstr "E230: Íå âäàëîñÿ ïðî÷èòàòè ç \"%s\""
+
+msgid "E665: Cannot start GUI, no valid font found"
+msgstr "E665: Íå âäàëîñÿ çàïóñòèòè GUI, íå çíàéäåíî øðèôò"
+
+# msgstr "E230: "
+msgid "E231: 'guifontwide' invalid"
+msgstr "E231: Íåêîðåêòíèé 'guifontwide'"
+
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: Çíà÷åííÿ 'imactivatekey' íåêîðåêòíå"
+
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: Íå âäàëîñÿ îòðèìàòè êîë³ð %s"
+
+msgid "No match at cursor, finding next"
+msgstr "Íåìຠíàä êóðñîðîì, ïîøóê òðèâàº"
msgid ""
"&Yes\n"
@@ -2112,17 +2135,20 @@ msgstr "
msgid "Down"
msgstr "Óíèç"
+#. 'Find Next' button
msgid "Find Next"
msgstr "Íàñòóïíå"
+#. 'Replace' button
msgid "Replace"
msgstr "Çàì³íèòè"
+#. 'Replace All' button
msgid "Replace All"
msgstr "Çàì³íèòè óñ³"
msgid "Vim: Received \"die\" request from session manager\n"
-msgstr "Vim: Îòðèìàâ çàïèò ïðî çàâåðøåííÿ â³ä ìåíåäæåðà ñåñ³é\n"
+msgstr "Vim: Îòðèìàâ çàïèò \"die\" â³ä ìåíåäæåðà ñåñ³é\n"
msgid "Close"
msgstr "Çàêðèòè"
@@ -2136,10 +2162,6 @@ msgstr "³
msgid "Vim: Main window unexpectedly destroyed\n"
msgstr "Vim: Íåñïîä³âàíî çíèùèëîñÿ ãîëîâíå â³êíî\n"
-# msgstr "E234: "
-msgid "Font Selection"
-msgstr "Âèáðàòè øðèôò"
-
msgid "&Filter"
msgstr "&F:Ô³ëüòðóâàòè"
@@ -2178,12 +2200,12 @@ msgstr "&U:
#, c-format
msgid "E610: Can't load Zap font '%s'"
-msgstr "E610: Íå çì³ã çàâàíòàæèòè øðèôò Zap '%s'"
+msgstr "E610: Íå âäàëîñÿ çàâàíòàæèòè øðèôò Zap '%s'"
# msgstr "E235: "
#, c-format
msgid "E611: Can't use font %s"
-msgstr "E611: Íå çì³ã âèêîðèñòàòè øðèôò %s"
+msgstr "E611: Íå âäàëîñÿ âèêîðèñòàòè øðèôò %s"
# msgstr "E242: "
msgid ""
@@ -2195,14 +2217,14 @@ msgstr ""
#, c-format
msgid "E671: Cannot find window title \"%s\""
-msgstr "E671: Íå çì³ã çíàéòè â³êíî \"%s\""
+msgstr "E671: Íå âäàëîñÿ çíàéòè â³êíî \"%s\""
#, c-format
msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
msgstr "E243: Àðãóìåíò íå ï³äòðèìóºòüñÿ: \"-%s\"; êîðèñòóéòåñü âåðñ³ºþ ç OLE."
msgid "E672: Unable to open window inside MDI application"
-msgstr "E672: Íå çì³ã â³äêðèòè â³êíî âñåðåäèí³ ïðîãðàìè MDI"
+msgstr "E672: Íå âäàëîñÿ â³äêðèòè â³êíî âñåðåäèí³ ïðîãðàìè MDI"
msgid "Close tab"
msgstr "Çàêðèòè âêëàäêó"
@@ -2340,15 +2362,15 @@ msgid "Printing aborted"
msgstr "Äðóê ïåðåðâàíî"
msgid "E455: Error writing to PostScript output file"
-msgstr "E455: Íå çì³ã çàïèñàòè âèõ³äíèé ôàéë PostScript"
+msgstr "E455: Íå âäàëîñÿ çàïèñàòè âèõ³äíèé ôàéë PostScript"
#, c-format
msgid "E624: Can't open file \"%s\""
-msgstr "E624: Íå çì³ã â³äêðèòè ôàéë \"%s\""
+msgstr "E624: Íå âäàëîñÿ â³äêðèòè ôàéë \"%s\""
#, c-format
msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: Íå çì³ã ïðî÷èòàòè ôàéë ðåñóðñ³â PostScript \"%s\""
+msgstr "E457: Íå âäàëîñÿ ïðî÷èòàòè ôàéë ðåñóðñ³â PostScript \"%s\""
#, c-format
msgid "E618: file \"%s\" is not a PostScript resource file"
@@ -2373,31 +2395,31 @@ msgid "E675: No default font specified for multi-byte printing."
msgstr "E675: Íå çàçíà÷åíî øðèôò äëÿ áàãàòîáàéòîâîãî äðóêó."
msgid "E324: Can't open PostScript output file"
-msgstr "E324: Íå çì³ã â³äêðèòè ôàéë PostScript äëÿ âèâîäó"
+msgstr "E324: Íå âäàëîñÿ â³äêðèòè ôàéë PostScript äëÿ âèâîäó"
#, c-format
msgid "E456: Can't open file \"%s\""
-msgstr "E456: Íå çì³ã â³äêðèòè ôàéë \"%s\""
+msgstr "E456: Íå âäàëîñÿ â³äêðèòè ôàéë \"%s\""
msgid "E456: Can't find PostScript resource file \"prolog.ps\""
-msgstr "E456: Íå çì³ã çíàéòè ôàéë ðåñóðñ³â PostScript \"prolog.ps\""
+msgstr "E456: Íå âäàëîñÿ çíàéòè ôàéë ðåñóðñ³â PostScript \"prolog.ps\""
msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
-msgstr "E456: Íå çì³ã çíàéòè ôàéë ðåñóðñ³â PostScript \"cidfont.ps\""
+msgstr "E456: Íå âäàëîñÿ çíàéòè ôàéë ðåñóðñ³â PostScript \"cidfont.ps\""
#, c-format
msgid "E456: Can't find PostScript resource file \"%s.ps\""
-msgstr "E456: Íå çì³ã çíàéòè ôàéë ðåñóðñ³â PostScript \"%s.ps\""
+msgstr "E456: Íå âäàëîñÿ çíàéòè ôàéë ðåñóðñ³â PostScript \"%s.ps\""
#, c-format
msgid "E620: Unable to convert to print encoding \"%s\""
-msgstr "E620: Íå çì³ã ïåðåòâîðèòè äî êîäóâàííÿ äðóêó \"%s\""
+msgstr "E620: Íå âäàëîñÿ ïåðåòâîðèòè äî êîäóâàííÿ äðóêó \"%s\""
msgid "Sending to printer..."
-msgstr "³äñèëàºìî íà ïðèíòåð..."
+msgstr "³äñèëàºòüñÿ íà ïðèíòåð..."
msgid "E365: Failed to print PostScript file"
-msgstr "E365: Íå çì³ã íàäðóêóâàòè ôàéë PostScript"
+msgstr "E365: Íå âäàëîñÿ íàäðóêóâàòè ôàéë PostScript"
msgid "Print job sent."
msgstr "Çàâäàííÿ äðóêó â³ä³ñëàíî."
@@ -2458,10 +2480,10 @@ msgid "E561: unknown cscope search type"
msgstr "E561: Íåâ³äîìèé òèï ïîøóêó cscope"
msgid "E566: Could not create cscope pipes"
-msgstr "E566: Íå çì³ã ñòâîðèòè êàíàëè äî cscope"
+msgstr "E566: Íå âäàëîñÿ ñòâîðèòè êàíàëè äî cscope"
msgid "E622: Could not fork for cscope"
-msgstr "E622: Íå çì³ã ðîçä³ëèòè ïðîöåñ äëÿ cscope"
+msgstr "E622: Íå âäàëîñÿ ðîçä³ëèòè ïðîöåñ äëÿ cscope"
msgid "cs_create_connection exec failed"
msgstr "cs_create_connection: ïîìèëêà ï³ä ÷àñ âèêîíàííÿ"
@@ -2473,20 +2495,20 @@ msgid "cs_create_connection: fdopen for fr_fp failed"
msgstr "cs_create_connection: fdopen äëÿ fr_fp íå âäàâñÿ"
msgid "E623: Could not spawn cscope process"
-msgstr "E623: Íå çì³ã ñòâîðèòè ïðîöåñ cscope"
+msgstr "E623: Íå âäàëîñÿ ñòâîðèòè ïðîöåñ cscope"
msgid "E567: no cscope connections"
msgstr "E567: æîäíîãî ç'ºäíàííÿ ³ç cscope"
+#, c-format
+msgid "E469: invalid cscopequickfix flag %c for %c"
+msgstr "E469: Íåêîðåêòíèé ïðàïîðåöü cscopequickfix %c äëÿ %c"
+
# msgstr "E258: "
#, c-format
msgid "E259: no matches found for cscope query %s of %s"
msgstr "E259: Äëÿ çàïèòó cscope %s ç %s í³÷îãî íå çíàéäåíî"
-#, c-format
-msgid "E469: invalid cscopequickfix flag %c for %c"
-msgstr "E469: Íåêîðåêòíèé ïðàïîðåöü cscopequickfix %c äëÿ %c"
-
# msgstr "E259: "
msgid "cscope commands:\n"
msgstr "Êîìàíäè cscope:\n"
@@ -2518,10 +2540,10 @@ msgstr ""
#, c-format
msgid "E625: cannot open cscope database: %s"
-msgstr "E625: Íå çì³ã â³äêðèòè áàçó äàíèõ cscope: %s"
+msgstr "E625: Íå âäàëîñÿ â³äêðèòè áàçó äàíèõ cscope: %s"
msgid "E626: cannot get cscope database information"
-msgstr "E626: Íå çì³ã îòðèìàòè ³íôîðìàö³þ ç áàçè äàíèõ cscope"
+msgstr "E626: Íå âäàëîñÿ îòðèìàòè ³íôîðìàö³þ ç áàçè äàíèõ cscope"
msgid "E568: duplicate cscope database not added"
msgstr "E568: Ïîâòîðíà áàçà äàíèõ cscope íå äîäàíà"
@@ -2589,10 +2611,10 @@ msgid "window index is out of range"
msgstr "íåêîðåêòíèé íîìåð â³êíà"
msgid "couldn't open buffer"
-msgstr "íå çì³ã â³äêðèòè áóôåð"
+msgstr "íå âäàëîñÿ â³äêðèòè áóôåð"
msgid "cannot save undo information"
-msgstr "íå çì³ã çáåðåãòè ³íôîðìàö³þ äëÿ ñêàñóâàííÿ"
+msgstr "íå âäàëîñÿ çáåðåãòè ³íôîðìàö³þ äëÿ ñêàñóâàííÿ"
msgid "cannot delete line"
msgstr "íåìîæëèâî çíèùèòè ðÿäîê"
@@ -2601,7 +2623,7 @@ msgid "cannot replace line"
msgstr "íåìîæëèâî çàì³íèòè ðÿäîê"
msgid "cannot insert line"
-msgstr "íå çì³ã âñòàâèòè ðÿäîê"
+msgstr "íå âäàëîñÿ âñòàâèòè ðÿäîê"
msgid "string cannot contain newlines"
msgstr "á³ëüøå í³æ îäèí ðÿäîê"
@@ -2635,7 +2657,7 @@ msgid "E659: Cannot invoke Python recursively"
msgstr "E659: Íå ìîæíà ðåêóðñèâíî âèêëèêàòè Python"
msgid "can't delete OutputObject attributes"
-msgstr "íå çì³ã çíèùèòè àòðèáóòè OutputObject"
+msgstr "íå âäàëîñÿ çíèùèòè àòðèáóòè OutputObject"
msgid "softspace must be an integer"
msgstr "softspace ìຠáóòè ö³ëèì"
@@ -2651,20 +2673,20 @@ msgid "E264: Python: Error initialising I/O objects"
msgstr "E264: Python: Ïîìèëêà ³í³ö³àë³çàö³¿ îá'ºêò³â ââîäó/âèâîäó"
msgid "attempt to refer to deleted buffer"
-msgstr "ñïðîáà çâåðíåííÿ äî çíèùåíîãî áóôåðó"
+msgstr "ñïðîáà çâåðíåííÿ äî çíèùåíîãî áóôåðà"
msgid "line number out of range"
msgstr "íîìåð ðÿäêà çà ìåæàìè ôàéëó"
#, c-format
msgid "<buffer object (deleted) at %p>"
-msgstr "<îá'ºêò áóôåðó (çíèùåíî) çà àäðåñîþ %p>"
+msgstr "<îá'ºêò áóôåðà (çíèùåíî) çà àäðåñîþ %p>"
msgid "invalid mark name"
msgstr "íåïðàâèëüíà íàçâà ïîçíà÷êè"
msgid "no such buffer"
-msgstr "òàêîãî áóôåðó íåìàº"
+msgstr "òàêîãî áóôåðà íåìàº"
msgid "attempt to refer to deleted window"
msgstr "ñïðîáà çâåðíóòèñÿ äî çíèùåíîãî â³êíà"
@@ -2673,7 +2695,7 @@ msgid "readonly attribute"
msgstr "ëèøå äëÿ ÷èòàííÿ"
msgid "cursor position outside buffer"
-msgstr "êóðñîð çà ìåæàìè áóôåðó"
+msgstr "êóðñîð çà ìåæàìè áóôåðà"
#, c-format
msgid "<window object (deleted) at %p>"
@@ -2780,14 +2802,14 @@ msgid ""
"Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
"$PATH).\n"
msgstr ""
-"Íå çì³ã ç'ºäíàòèñÿ ç SNiFF+. Ïåðåâ³ðòå îòî÷åííÿ (sniffemacs ìຠáóòè ó "
+"Íå âäàëîñÿ ç'ºäíàòèñÿ ç³ SNiFF+. Ïåðåâ³ðòå îòî÷åííÿ (sniffemacs ìຠáóòè ó "
"$PATH).\n"
msgid "E274: Sniff: Error during read. Disconnected"
msgstr "E274: Sniff: Ïîìèëêà ï³ä ÷àñ ÷èòàííÿ. ³ä'ºäíàíî"
msgid "SNiFF+ is currently "
-msgstr "Çàðàç SNiFF+"
+msgstr "SNiFF+ çàðàç "
msgid "not "
msgstr "íå "
@@ -2812,14 +2834,14 @@ msgid "Sniff: Error during write. Disconnected"
msgstr "Sniff: Ïîìèëêà çàïèñó. ³ä'ºäíàíî"
msgid "invalid buffer number"
-msgstr "íåïðàâèëüíà íàçâà áóôåðó"
+msgstr "íåïðàâèëüíà íàçâà áóôåðà"
msgid "not implemented yet"
msgstr "ùå íå ðåàë³çîâàíî"
#. ???
msgid "cannot set line(s)"
-msgstr "íå çì³ã âñòàíîâèòè ðÿäêè"
+msgstr "íå âäàëîñÿ âñòàíîâèòè ðÿäêè"
# msgstr "E19: "
msgid "mark not set"
@@ -2830,13 +2852,13 @@ msgid "row %d column %d"
msgstr "ðÿäîê %d êîëîíêà %d"
msgid "cannot insert/append line"
-msgstr "Íå çì³ã âñòàâèòè/äîäàòè ðÿäîê"
+msgstr "Íå âäàëîñÿ âñòàâèòè/äîäàòè ðÿäîê"
msgid "unknown flag: "
msgstr "íåâ³äîìèé ïðàïîðåöü: "
msgid "unknown vimOption"
-msgstr "Íåâ³äîìà îïö³ÿ Vim"
+msgstr "Íåâ³äîìà vimOption"
msgid "keyboard interrupt"
msgstr "ïåðåðâàíî ç êëàâ³àòóðè"
@@ -2845,11 +2867,11 @@ msgid "vim error"
msgstr "ïîìèëêà Vim"
msgid "cannot create buffer/window command: object is being deleted"
-msgstr "íå çì³ã ñòâîðèòè êîìàíäó â³êíà/áóôåðó: îá'ºêò çíèùóºòüñÿ"
+msgstr "íå âäàëîñÿ ñòâîðèòè êîìàíäó â³êíà/áóôåðà: îá'ºêò çíèùóºòüñÿ"
msgid ""
"cannot register callback command: buffer/window is already being deleted"
-msgstr "Íå çì³ã çàðåºñòðóâàòè ïîä³þ: áóôåð/â³êíî óæå çíèùóºòüñÿ"
+msgstr "Íå âäàëîñÿ çàðåºñòðóâàòè ïîä³þ: áóôåð/â³êíî óæå çíèùóºòüñÿ"
#. This should never happen. Famous last word?
msgid ""
@@ -2861,7 +2883,7 @@ msgstr ""
msgid "cannot register callback command: buffer/window reference not found"
msgstr ""
-"Íå çì³ã çàðåºñòðóâàòè êîìàíäó ïî䳿: ïîñèëàííÿ íà áóôåð/â³êíî íå çíàéäåíî"
+"Íå âäàëîñÿ çàðåºñòðóâàòè êîìàíäó ïî䳿: ïîñèëàííÿ íà áóôåð/â³êíî íå çíàéäåíî"
msgid ""
"E571: Sorry, this command is disabled: the Tcl library could not be loaded."
@@ -2879,10 +2901,10 @@ msgid "E572: exit code %d"
msgstr "E572: Êîä âèõîäó %d"
msgid "cannot get line"
-msgstr "íå çì³ã ä³ñòàòè ðÿäîê"
+msgstr "íå âäàëîñÿ ä³ñòàòè ðÿäîê"
msgid "Unable to register a command server name"
-msgstr "Íå çì³ã çàðåºñòðóâàòè íàçâó ñåðâåðà êîìàíä"
+msgstr "Íå âäàëîñÿ çàðåºñòðóâàòè íàçâó ñåðâåðà êîìàíä"
msgid "E248: Failed to send command to the destination program"
msgstr "E248: Íå âäàëîñÿ â³ä³ñëàòè êîìàíäó äî ïðîãðàìè-ïðèçíà÷åííÿ"
@@ -2918,6 +2940,9 @@ msgstr "
msgid "%d files to edit\n"
msgstr "%d ôàéëè(³â)\n"
+msgid "netbeans is not supported with this GUI\n"
+msgstr "netbeans íå ï³äòðèìóºòüñÿ ç öèì GUI\n"
+
msgid "This Vim was not compiled with the diff feature."
msgstr "Öÿ âåðñ³ÿ Vim íå áóëà ñêîìï³ëüîâàíà ç ï³äòðèìêîþ ïîð³âíÿííÿ."
@@ -2928,19 +2953,19 @@ msgid "Attempt to open script file again: \""
msgstr "Ñïðîáà ïîâòîðíî â³äêðèòè ñêðèïò: \""
msgid "Cannot open for reading: \""
-msgstr "Íå çì³ã ïðî÷èòàòè: \""
+msgstr "Íå âäàëîñÿ ïðî÷èòàòè: \""
msgid "Cannot open for script output: \""
-msgstr "Íå çì³ã â³äêðèòè ÿê âèõ³äíèé ôàéë: \""
+msgstr "Íå âäàëîñÿ â³äêðèòè ÿê âèõ³äíèé ôàéë: \""
msgid "Vim: Error: Failure to start gvim from NetBeans\n"
msgstr "Vim: Ïîìèëêà: Íå âäàëîñÿ çàïóñòèòè gvim äëÿ NetBeans\n"
msgid "Vim: Warning: Output is not to a terminal\n"
-msgstr "Vim: Óâàãà: Âèâ³ä íå íà òåðì³íàë\n"
+msgstr "Vim: Çàñòåðåæåííÿ: Âèâ³ä íå ó òåðì³íàë\n"
msgid "Vim: Warning: Input is not from a terminal\n"
-msgstr "Vim: Óâàãà: Óâåäåííÿ íå ç òåðì³íàëó\n"
+msgstr "Vim: Çàñòåðåæåííÿ: Óâåäåííÿ íå ç òåðì³íàëó\n"
#. just in case..
msgid "pre-vimrc command line"
@@ -2948,7 +2973,7 @@ msgstr "
#, c-format
msgid "E282: Cannot read from \"%s\""
-msgstr "E282: Íå çì³ã ïðî÷èòàòè \"%s\""
+msgstr "E282: Íå âäàëîñÿ ïðî÷èòàòè ç \"%s\""
# msgstr "E282: "
msgid ""
@@ -2987,14 +3012,14 @@ msgid ""
" or:"
msgstr ""
"\n"
-" àáî:"
+" àáî:"
msgid ""
"\n"
"Where case is ignored prepend / to make flag upper case"
msgstr ""
"\n"
-"ßêùî ðåã³ñòð ³ãíîðóºòüñÿ, äîäàéòå / ñïåðåäó, ùîá ïðàïîðåöü áóâ ó âåðõíüîìó "
+"ßêùî ðåã³ñòð ³ãíîðóºòüñÿ, äîäàéòå / ñïåðåäó ùîá ïðàïîðåöü áóâ ó âåðõíüîìó "
"ðåã³ñòð³."
msgid ""
@@ -3189,7 +3214,9 @@ msgid "-