First step in the Vim 7.3 branch. Changed version numbers.

20 files changed, 255 insertions, 984 deletions

diff --git a/src/GvimExt/GvimExt.reg b/src/GvimExt/GvimExt.reg
index 3836284209..3887946637 100644
--- a/src/GvimExt/GvimExt.reg
+++ b/src/GvimExt/GvimExt.reg
@@ -15,6 +15,6 @@ REGEDIT4
 [HKEY_LOCAL_MACHINE\Software\Vim\Gvim]
    "path"="gvim.exe"
 
-[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 7.2]
-   "DisplayName"="Vim 7.2: Edit with Vim popup menu entry"
+[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 7.3a]
+   "DisplayName"="Vim 7.3a: Edit with Vim popup menu entry"
    "UninstallString"="uninstal.exe"
diff --git a/src/INSTALLx.txt b/src/INSTALLx.txt
index b3e9122b1f..e03f54d4a3 100644
--- a/src/INSTALLx.txt
+++ b/src/INSTALLx.txt
@@ -50,7 +50,7 @@ You need to set the following "configure" command line switches:
 	--host.
 
 --with-tlib=... :
-	Which terminal library to.
+	Which terminal library to use.
 	For example, "ncurses".
 
 
@@ -68,26 +68,26 @@ ac_cv_sizeof_int:
 	machines.
 
 vi_cv_path_python_conf:
-	If Python support is enabled, set this variables to the path for
+	If Python support is enabled, set this variable to the path for
 	Python's library implementation. This is a path like
 	"/usr/lib/pythonX.Y/config" (the directory contains a file
 	"config.c").
 
 vi_cv_var_python_epfx:
-	If Python support is enabled, set this variables to the execution
+	If Python support is enabled, set this variable to the execution
 	prefix of your Python interpreter (that is, where it thinks it is
 	running).
 	This is the output of the following Python script:
 		import sys; print sys.exec_prefix
 
 vi_cv_var_python_pfx:
-	If Python support is enabled, set this variables to the prefix of your
-	Python interpreter (that is, where was installed).
+	If Python support is enabled, set this variable to the prefix of your
+	Python interpreter (that is, where it was installed).
 	This is the output of the following Python script:
 		import sys; print sys.prefix
 
 vi_cv_var_python_version:
-	If Python support is enabled, set this variables to the version of the
+	If Python support is enabled, set this variable to the version of the
 	Python interpreter that will be used.
 	This is the output of the following Python script:
 		import sys; print sys.version[:3]
@@ -133,11 +133,11 @@ vim_cv_toupper_broken:
 
 vim_cv_tty_group:
 	The default group of pseudo terminals. Either set to the numeric value
-	of the your tty group or to "world" if they are world accessable.
+	of your tty group or to "world" if they are world accessible.
 
 vim_cv_tty_mode:
-	The default mode of pseudo terminals if they are not world accessable.
-	Most propably the value "0620".
+	The default mode of pseudo terminals if they are not world accessible.
+	Most probably the value "0620".
 
 
 4. EXAMPLE:
diff --git a/src/Makefile b/src/Makefile
index 928de57402..f6b6e6f1f6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -536,7 +536,7 @@ CClink = $(CC)
 #CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes
 
 # Use this with GCC to check for mistakes, unused arguments, etc.
-#CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code
+#CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code -D_FORTIFY_SOURCE=1
 #PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers
 #MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code -Wno-unused-parameter
 
@@ -914,7 +914,7 @@ MAN1DIR = /man1
 
 ### Vim version (adjusted by a script)
 VIMMAJOR = 7
-VIMMINOR = 2
+VIMMINOR = 3a
 
 ### Location of Vim files (should not need to be changed, and  {{{1
 ### some things might not work when they are changed!)
diff --git a/src/README.txt b/src/README.txt
index bd93652053..2fafd4f7c2 100644
--- a/src/README.txt
+++ b/src/README.txt
@@ -24,7 +24,7 @@ Most code can be found in a file with an obvious name (incomplete list):
 	fold.c		folding
 	getchar.c	getting characters and key mapping
 	mark.c		marks
-	mbyte.c		multy-byte character handling
+	mbyte.c		multi-byte character handling
 	memfile.c	storing lines for buffers in a swapfile
 	memline.c	storing lines for buffers in memory
 	menu.c		menus
diff --git a/src/dosinst.c b/src/dosinst.c
index c4ed7f6a11..35fa27e6ef 100644
--- a/src/dosinst.c
+++ b/src/dosinst.c
@@ -63,7 +63,7 @@ char	*(compat_choices[]) =
 {
     "\nChoose the default way to run Vim:",
     "Vi compatible",
-    "with some Vim ehancements",
+    "with some Vim enhancements",
     "with syntax highlighting and other features switched on",
 };
 int	compat_choice = (int)compat_all_enhancements;
@@ -554,7 +554,7 @@ uninstall_check(void)
 			}
 			run_command(temp_string_buffer);
 
-			/* Check if an unistall reg key was deleted.
+			/* Check if an uninstall reg key was deleted.
 			 * if it was, we want to decrement key_index.
 			 * if we don't do this, we will skip the key
 			 * immediately after any key that we delete.  */
@@ -1131,7 +1131,6 @@ init_bat_choices(void)
 /*
  * Install the vimrc file.
  */
-/*ARGSUSED*/
     static void
 install_vimrc(int idx)
 {
diff --git a/src/globals.h b/src/globals.h
index bfe48caf09..d2b898c8f1 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -50,6 +50,7 @@ EXTERN char_u	*LineWraps INIT(= NULL);	/* line wraps to next line */
  * ScreenLinesUC[] contains the Unicode for the character at this position, or
  * NUL when the character in ScreenLines[] is to be used (ASCII char).
  * The composing characters are to be drawn on top of the original character.
+ * ScreenLinesC[0][off] is only to be used when ScreenLinesUC[off] != 0.
  * Note: These three are only allocated when enc_utf8 is set!
  */
 EXTERN u8char_T	*ScreenLinesUC INIT(= NULL);	/* decoded UTF-8 characters */
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index f905eaf671..74b6de9440 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -4428,7 +4428,7 @@ gui_mch_set_shellsize(int width, int height,
     /* this will cause the proper resizement to happen too */
     update_window_manager_hints(0, 0);
 
-#else  /* HAVE_GTK2 */
+#else
     /* this will cause the proper resizement to happen too */
     if (gtk_socket_id == 0)
 	update_window_manager_hints(0, 0);
@@ -4444,14 +4444,14 @@ gui_mch_set_shellsize(int width, int height,
     else
 	update_window_manager_hints(width, height);
 
-#if 0
+# if 0
     if (!resize_idle_installed)
     {
 	g_idle_add_full(GDK_PRIORITY_EVENTS + 10,
 			&force_shell_resize_idle, NULL, NULL);
 	resize_idle_installed = TRUE;
     }
-#endif
+# endif
     /*
      * Wait until all events are processed to prevent a crash because the
      * real size of the drawing area doesn't reflect Vim's internal ideas.
diff --git a/src/if_sniff.c b/src/if_sniff.c
index cf38e534cb..d82f4e59b3 100644
--- a/src/if_sniff.c
+++ b/src/if_sniff.c
@@ -969,20 +969,20 @@ get_request(fd, buf, maxlen)
 #ifdef HAVE_SELECT
 	    if (select(fd + 1, &rfds, NULL, NULL, &tval) > 0)
 #else
-		if (poll(&fds, 1, 0) > 0)
+	    if (poll(&fds, 1, 0) > 0)
 #endif
-		{
-		    pos = 0;
-		    bytes = read(fd, inbuf, sizeof(inbuf));
-		    if (bytes <= 0)
-			return bytes;
-		}
-		else
-		{
-		    pos = pos-len;
-		    buf[0] = '\0';
-		    return 0;
-		}
+	    {
+		pos = 0;
+		bytes = read(fd, inbuf, sizeof(inbuf));
+		if (bytes <= 0)
+		    return bytes;
+	    }
+	    else
+	    {
+		pos = pos-len;
+		buf[0] = '\0';
+		return 0;
+	    }
 	}
 	if ((buf[len] = inbuf[pos++]) =='\n')
 	    break;
diff --git a/src/if_sniff.h b/src/if_sniff.h
index 901b06a631..16cce4109d 100644
--- a/src/if_sniff.h
+++ b/src/if_sniff.h
@@ -1,7 +1,5 @@
 /*
  * if_sniff.h Interface between Vim and SNiFF+
- *
- * $Id$
  */
 
 #ifndef __if_sniff_h__
diff --git a/src/integration.h b/src/integration.h
index d6c687d46a..e984f56cae 100644
--- a/src/integration.h
+++ b/src/integration.h
@@ -283,23 +283,26 @@ void workshop_file_opened(char *filename, int readOnly);
 void workshop_file_saved(char *filename);
 
 
+#if 0
 /* A file has been closed */
 void workshop_file_closed(char *filename);
+#endif
 
 /* Like workshop_file_closed, but also inform eserve what line the
    cursor was on when you left the file. That way eserve can put you
    back where you left off when you return to this file. */
 void workshop_file_closed_lineno(char *filename, int line);
 
+#if 0
 /* A file has been modified */
 void workshop_file_modified(char *filename);
 
-
 /*
  * A mark has been moved. Only call this as a response to
  * a workshop_moved_marks request call.
  */
 void workshop_move_mark(char *filename, int markId, int newLineno);
+#endif
 
 /* Tell the integration library about a new frame being added.
  * Supply a form for the toolbar, a label for the footer, and an
@@ -377,7 +380,9 @@ int workshop_get_balloon_text(Position x, Position y,
  */
 void workshop_frame_moved(int new_x, int new_y, int new_w, int new_h);
 Boolean workshop_get_width_height(int *, int *);
+#if 0
 Boolean workshop_get_rows_cols(int *, int *);
+#endif
 
 /* This function should be invoked when you press a hotkey
  * set up by workshop_register_hotkey. Pass the clientData
@@ -396,20 +401,23 @@ void workshop_hotkey_pressed(void *frame, void *clientData);
  *
  */
 
+#if 0
 /* Were we invoked by WorkShop? This function can be used early during startup
  * if you want to do things differently if the editor is started standalone
  * or in WorkShop mode. For example, in standalone mode you may not want to
  * add a footer/message area or a sign gutter.
  */
 int workshop_invoked(void);
+#endif
 
+#if 0
 /*
  *Set the desktop icon of the current shell to the given xpm icon.
  * Standard WorkShop desktop icons should be 48x48.
  */
-
 void workshop_set_icon(Display *display, Widget shell, char **xpmdata,
 		       int width, int height);
+#endif
 
 
 /* Minimize (iconify) the given shell */
diff --git a/src/main.aap b/src/main.aap
index 21b617446c..b36fc3662a 100644
--- a/src/main.aap
+++ b/src/main.aap
@@ -267,7 +267,8 @@ distclean: clean
 # messages.  Don't worry about that.
 # If there is a real error, there will be a difference between "test.out" and
 # a "test99.ok" file.
-# If everything is alright, the final message will be "ALL DONE".
+# If everything is alright, the final message will be "ALL DONE".  If not you
+# get "TEST FAILURE".
 #
 test check:
     VimProg = ../$Target
diff --git a/src/mbyte.c b/src/mbyte.c
index 7a3a27e06e..cf70f86562 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -1855,6 +1855,7 @@ utfc_ptr2char_len(p, pcc, maxlen)
  * Convert the character at screen position "off" to a sequence of bytes.
  * Includes the composing characters.
  * "buf" must at least have the length MB_MAXBYTES.
+ * Only to be used when ScreenLinesUC[off] != 0.
  * Returns the produced number of bytes.
  */
     int
diff --git a/src/move.c b/src/move.c
index b4818ff16a..de1a9e4de3 100644
--- a/src/move.c
+++ b/src/move.c
@@ -696,7 +696,7 @@ validate_cline_row()
 
 /*
  * Compute wp->w_cline_row and wp->w_cline_height, based on the current value
- * of wp->w_topine.
+ * of wp->w_topline.
  *
  * Returns OK when cursor is in the window, FAIL when it isn't.
  */
diff --git a/src/po/ga.po b/src/po/ga.po
index a8868afb78..ea357703e0 100644
--- a/src/po/ga.po
+++ b/src/po/ga.po
@@ -1,13 +1,13 @@
 # Irish translations for vim.
 # This file is distributed under the same license as the vim package.
-# Kevin Patrick Scannell <scannell@SLU.EDU>, 2005, 2006, 2008.
+# Kevin Patrick Scannell <kscanne@gmail.com>, 2005, 2006, 2008, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: vim 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-24 12:31-0500\n"
-"PO-Revision-Date: 2008-05-24 12:49-0500\n"
+"POT-Creation-Date: 2010-04-14 09:44-0500\n"
+"PO-Revision-Date: 2010-04-14 10:01-0500\n"
 "Last-Translator: Kevin Patrick Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -30,21 +30,21 @@ msgid "E517: No buffers were wiped out"
 msgstr "E517: Ní raibh aon mhaolán bánaithe"
 
 msgid "1 buffer unloaded"
-msgstr "Bhí 1 maolán díluchtaithe"
+msgstr "Bhí maolán amháin díluchtaithe"
 
 #, c-format
 msgid "%d buffers unloaded"
 msgstr "%d maolán folmhaithe"
 
 msgid "1 buffer deleted"
-msgstr "Bhí 1 maolán scriosta"
+msgstr "Bhí maolán amháin scriosta"
 
 #, c-format
 msgid "%d buffers deleted"
 msgstr "%d maolán scriosta"
 
 msgid "1 buffer wiped out"
-msgstr "Bhí 1 maolán bánaithe"
+msgstr "Bhí maolán amháin bánaithe"
 
 #, c-format
 msgid "%d buffers wiped out"
@@ -161,6 +161,9 @@ msgstr "[Liosta Suíomh]"
 msgid "[Quickfix List]"
 msgstr "[Liosta Ceartúchán Tapa]"
 
+msgid "[Scratch]"
+msgstr "[Sealadach]"
+
 msgid ""
 "\n"
 "--- Signs ---"
@@ -180,14 +183,20 @@ msgstr "    líne=%ld  id=%d  ainm=%s"
 msgid "E96: Can not diff more than %ld buffers"
 msgstr "E96: Ní féidir diff a dhéanamh ar níos mó ná %ld maolán"
 
+msgid "E810: Cannot read or write temp files"
+msgstr "E810: Ní féidir comhaid shealadacha a léamh nó a scríobh"
+
 msgid "E97: Cannot create diffs"
 msgstr "E97: Ní féidir diffeanna a chruthú"
 
 msgid "Patch file"
 msgstr "Comhad paiste"
 
+msgid "E816: Cannot read patch output"
+msgstr "E816: Ní féidir aschur ó 'patch' a léamh"
+
 msgid "E98: Cannot read diff output"
-msgstr "E98: Ní féidir an t-aschur diff a léamh"
+msgstr "E98: Ní féidir aschur ó 'diff' a léamh"
 
 msgid "E99: Current buffer is not in diff mode"
 msgstr "E99: Níl an maolán reatha sa mhód diff"
@@ -292,7 +301,6 @@ msgstr " (ionadaigh) Scrollaigh (^E/^Y)"
 msgid "Scanning: %s"
 msgstr "%s á scanadh"
 
-#, c-format
 msgid "Scanning tags."
 msgstr "Clibeanna á scanadh."
 
@@ -420,7 +428,7 @@ msgstr "E690: \"in\" ar iarraidh i ndiaidh :for"
 
 #, c-format
 msgid "E107: Missing parentheses: %s"
-msgstr "E107: Lúibíní slabhracha ar iarraidh: %s"
+msgstr "E107: Lúibíní ar iarraidh: %s"
 
 #, c-format
 msgid "E108: No such variable: \"%s\""
@@ -450,6 +458,9 @@ msgstr "E693: Is féidir Funcref a chur i gcomparáid le Funcref eile amháin"
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: Oibríocht neamhbhailí ar Funcref"
 
+msgid "E804: Cannot use '%' with Float"
+msgstr "E804: Ní féidir '%' a úsáid le Snámhphointe"
+
 msgid "E110: Missing ')'"
 msgstr "E110: ')' ar iarraidh"
 
@@ -500,6 +511,14 @@ msgid "E724: variable nested too deep for displaying"
 msgstr "E724: athróg neadaithe ródhomhain chun í a thaispeáint"
 
 #, c-format
+msgid "E740: Too many arguments for function %s"
+msgstr "E740: An iomarca argóintí d'fheidhm %s"
+
+#, c-format
+msgid "E116: Invalid arguments for function %s"
+msgstr "E116: Argóintí neamhbhailí d'fheidhm %s"
+
+#, c-format
 msgid "E117: Unknown function: %s"
 msgstr "E117: Feidhm anaithnid: %s"
 
@@ -515,6 +534,9 @@ msgstr "E120: <SID> á úsáid ach gan a bheith i gcomhthéacs scripte: %s"
 msgid "E725: Calling dict function without Dictionary: %s"
 msgstr "E725: Feidhm 'dict' á ghlao gan Foclóir: %s"
 
+msgid "E808: Number or Float required"
+msgstr "E808: Uimhir nó Snámhphointe de dhíth"
+
 msgid "E699: Too many arguments"
 msgstr "E699: An iomarca argóintí"
 
@@ -591,14 +613,17 @@ msgstr "(Neamhbhailí)"
 msgid "E677: Error writing temp file"
 msgstr "E677: Earráid agus comhad sealadach á scríobh"
 
+msgid "E805: Using a Float as a Number"
+msgstr "E805: Snámhphointe á úsáid mar Uimhir"
+
 msgid "E703: Using a Funcref as a Number"
-msgstr "E703: Funcref á úsáid mar uimhir"
+msgstr "E703: Funcref á úsáid mar Uimhir"
 
 msgid "E745: Using a List as a Number"
-msgstr "E745: Liosta á úsáid mar uimhir"
+msgstr "E745: Liosta á úsáid mar Uimhir"
 
 msgid "E728: Using a Dictionary as a Number"
-msgstr "E728: Foclóir á úsáid mar uimhir"
+msgstr "E728: Foclóir á úsáid mar Uimhir"
 
 msgid "E729: using Funcref as a String"
 msgstr "E729: Funcref á úsáid mar Theaghrán"
@@ -609,6 +634,9 @@ msgstr "E730: Liosta á úsáid mar Theaghrán"
 msgid "E731: using Dictionary as a String"
 msgstr "E731: Foclóir á úsáid mar Theaghrán"
 
+msgid "E806: using Float as a String"
+msgstr "E806: Snámhphointe á úsáid mar Theaghrán"
+
 #, c-format
 msgid "E704: Funcref variable name must start with a capital: %s"
 msgstr "E704: Caithfidh ceannlitir a bheith ar dtús ainm Funcref: %s"
@@ -640,6 +668,10 @@ msgid "E698: variable nested too deep for making a copy"
 msgstr "E698: athróg neadaithe ródhomhain chun í a chóipeáil"
 
 #, c-format
+msgid "E123: Undefined function: %s"
+msgstr "E123: Feidhm gan sainmhíniú: %s"
+
+#, c-format
 msgid "E124: Missing '(': %s"
 msgstr "E124: '(' ar iarraidh: %s"
 
@@ -651,6 +683,14 @@ msgid "E126: Missing :endfunction"
 msgstr "E126: :endfunction ar iarraidh"
 
 #, c-format
+msgid "E707: Function name conflicts with variable: %s"
+msgstr "E707: Tagann ainm na feidhme salach ar athróg: %s"
+
+#, c-format
+msgid "E127: Cannot redefine function %s: It is in use"
+msgstr "E127: Ní féidir sainmhíniú nua a dhéanamh ar fheidhm %s: In úsáid cheana"
+
+#, c-format
 msgid "E746: Function name does not match script file name: %s"
 msgstr ""
 "E746: Níl ainm na feidhme comhoiriúnach le hainm comhaid na scripte: %s"
@@ -709,6 +749,9 @@ msgstr ""
 "\n"
 "\tSocraithe is déanaí ó "
 
+msgid "No old files"
+msgstr "Gan seanchomhaid"
+
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
 msgstr "<%s>%s%s  %d,  Heics %02x,  Ocht %03o"
@@ -725,7 +768,7 @@ msgid "E134: Move lines into themselves"
 msgstr "E134: Bog línte isteach iontu féin"
 
 msgid "1 line moved"
-msgstr "Bogadh 1 líne"
+msgstr "Bogadh líne amháin"
 
 #, c-format
 msgid "%ld lines moved"
@@ -760,6 +803,9 @@ msgstr " eolas"
 msgid " marks"
 msgstr " marcanna"
 
+msgid " oldfiles"
+msgstr " seanchomhad"
+
 msgid " FAILED"
 msgstr " TEIPTHE"
 
@@ -885,7 +931,7 @@ msgid "%ld substitutions"
 msgstr "%ld ionadaíocht"
 
 msgid " on 1 line"
-msgstr " ar 1 líne"
+msgstr " ar líne amháin"
 
 #, c-format
 msgid " on %ld lines"
@@ -1011,8 +1057,8 @@ msgstr "Níl aon bhrisphointe socraithe"
 msgid "%3d  %s %s  line %ld"
 msgstr "%3d  %s %s  líne %ld"
 
-msgid "E750: First use :profile start <fname>"
-msgstr "E750: Úsáid :profile start <ainm> ar dtús"
+msgid "E750: First use \":profile start {fname}\""
+msgstr "E750: Úsáid \":profile start {ainm}\" ar dtús"
 
 #, c-format
 msgid "Save changes to \"%s\"?"
@@ -1162,7 +1208,7 @@ msgid "%d more files to edit.  Quit anyway?"
 msgstr "%d comhad le cur in eagar fós.  Scoir mar sin féin?"
 
 msgid "E173: 1 more file to edit"
-msgstr "E173: 1 comhad le heagrú"
+msgstr "E173: 1 chomhad le heagrú fós"
 
 #, c-format
 msgid "E173: %ld more files to edit"
@@ -1304,6 +1350,9 @@ msgstr "E191: Caithfidh an argóint a bheith litir nó comhartha athfhriotal"
 msgid "E192: Recursive use of :normal too deep"
 msgstr "E192: athchúrsáil :normal ródhomhain"
 
+msgid "E809: #< is not available without the +eval feature"
+msgstr "E809: níl #< ar fáil gan ghné +eval"
+
 msgid "E194: No alternate file name to substitute for '#'"
 msgstr "E194: Níl aon ainm comhaid a chur in ionad '#'"
 
@@ -1445,6 +1494,9 @@ msgstr "E193: Caithfidh :endfunction a bheith isteach i bhfeidhm"
 msgid "E788: Not allowed to edit another buffer now"
 msgstr "E788: Níl cead agat maolán eile a chur in eagar anois"
 
+msgid "E811: Not allowed to change buffer information now"
+msgstr "E811: Níl cead agat faisnéis an mhaoláin a athrú anois"
+
 msgid "tagname"
 msgstr "clibainm"
 
@@ -1482,6 +1534,10 @@ msgstr "E198: cmd_pchar os cionn fad an ordaithe"
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: Scriosadh an fhuinneog reatha nó an maolán reatha"
 
+msgid "E812: Autocommands changed buffer or buffer name"
+msgstr ""
+"E812: Bhí maolán nó ainm maoláin athraithe ag orduithe uathoibríocha"
+
 msgid "Illegal file name"
 msgstr "Ainm comhaid neamhcheadaithe"
 
@@ -1541,9 +1597,6 @@ msgstr "[L-A]"
 msgid "[CR missing]"
 msgstr "[CR ar iarraidh]"
 
-msgid "[NL found]"
-msgstr "[NL aimsithe]"
-
 msgid "[long lines split]"
 msgstr "[línte fada deighilte]"
 
@@ -1646,12 +1699,24 @@ msgstr ""
 "E513: earráid le linn scríobh, theip ar thiontú (úsáid 'fenc' folamh chun "
 "sárú)"
 
+#, c-format
+msgid ""
+"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
+"override)"
+msgstr ""
+"E513: earráid le linn scríofa, theip ar thiontú ar líne %ld (úsáid 'fenc' folamh le "
+"sárú)"
+
 msgid "E514: write error (file system full?)"
 msgstr "E514: earráid le linn scríofa (an bhfuil an córas comhaid lán?)"
 
 msgid " CONVERSION ERROR"
 msgstr " EARRÁID TIONTAITHE"
 
+#, c-format
+msgid " in line %ld;"
+msgstr " ar líne %ld;"
+
 msgid "[Device]"
 msgstr "[Gléas]"
 
@@ -2039,9 +2104,6 @@ msgstr "Vim: Milleadh an príomhfhuinneog gan choinne\n"
 msgid "Font Selection"
 msgstr "Roghnú Cló"
 
-msgid "Used CUT_BUFFER0 instead of empty selection"
-msgstr "Úsáideadh CUT_BUFFER0 in ionad roghnúcháin folaimh"
-
 msgid "&Filter"
 msgstr "&Scagaire"
 
@@ -2385,8 +2447,29 @@ msgid "cscope commands:\n"
 msgstr "Orduithe cscope:\n"
 
 #, c-format
-msgid "%-5s: %-30s (Usage: %s)"
-msgstr "%-5s: %-30s (Úsáid: %s)"
+msgid "%-5s: %s%*s (Usage: %s)"
+msgstr "%-5s: %s%*s (Úsáid: %s)"
+
+msgid ""
+"\n"
+"       c: Find functions calling this function\n"
+"       d: Find functions called by this function\n"
+"       e: Find this egrep pattern\n"
+"       f: Find this file\n"
+"       g: Find this definition\n"
+"       i: Find files #including this file\n"
+"       s: Find this C symbol\n"
+"       t: Find assignments to\n"
+msgstr ""
+"\n"
+"       c: Aimsigh feidhmeanna a chuireann glaoch ar an bhfeidhm seo\n"
+"       d: Aimsigh feidhmeanna a gcuireann an fheidhm seo glaoch orthu\n"
+"       e: Aimsigh an patrún egrep seo\n"
+"       f: Aimsigh an comhad seo\n"
+"       g: Aimsigh an sainmhíniú seo\n"
+"       i: Aimsigh comhaid a #include-áil an comhad seo\n"
+"       s: Aimsigh an tsiombail C seo\n"
+"       t: Aimsigh sanntaí do\n"
 
 #, c-format
 msgid "E625: cannot open cscope database: %s"
@@ -2398,9 +2481,6 @@ msgstr "E626: ní féidir eolas a fháil faoin bhunachar sonraí cscope"
 msgid "E568: duplicate cscope database not added"
 msgstr "E568: níor cuireadh bunachar sonraí dúblach cscope leis"
 
-msgid "E569: maximum number of cscope connections reached"
-msgstr "E569: ní cheadaítear níos mó ná an líon uasta nasc cscope"
-
 #, c-format
 msgid "E261: cscope connection %s not found"
 msgstr "E261: nasc cscope %s gan aimsiú"
@@ -2441,10 +2521,10 @@ msgid " # pid    database name                       prepend path\n"
 msgstr " # pid    ainm bunachair                       conair thosaigh\n"
 
 msgid ""
-"???: Sorry, this command is disabled, the MzScheme library could not be "
+"E815: Sorry, this command is disabled, the MzScheme libraries could not be "
 "loaded."
 msgstr ""
-"???: Tá brón orm, níl an t-ordú seo le fáil, níorbh fhéidir an leabharlann "
+"E815: Tá brón orm, bhí an t-ordú seo díchumasaithe, níorbh fhéidir leabharlanna "
 "MzScheme a luchtú."
 
 msgid "invalid expression"
@@ -2530,8 +2610,8 @@ msgid "line number out of range"
 msgstr "líne-uimhir as raon"
 
 #, c-format
-msgid "<buffer object (deleted) at %8lX>"
-msgstr "<maolán (scriosta) ag %8lX>"
+msgid "<buffer object (deleted) at %p>"
+msgstr "<réad maoláin (scriosta) ag %p>"
 
 msgid "invalid mark name"
 msgstr "ainm neamhbhailí mairc"
@@ -2549,12 +2629,12 @@ msgid "cursor position outside buffer"
 msgstr "cúrsóir taobh amuigh den mhaolán"
 
 #, c-format
-msgid "<window object (deleted) at %.8lX>"
-msgstr "<fuinneog (scriosta) ag %.8lX>"
+msgid "<window object (deleted) at %p>"
+msgstr "<réad fuinneoige (scriosta) ag %p>"
 
 #, c-format
-msgid "<window object (unknown) at %.8lX>"
-msgstr "<fuinneog (anaithnid) ag %.8lX>"
+msgid "<window object (unknown) at %p>"
+msgstr "<réad fuinneoige (anaithnid) ag %p>"
 
 #, c-format
 msgid "<window %d>"
@@ -2792,6 +2872,9 @@ msgstr "%d comhad le heagrú\n"
 msgid "This Vim was not compiled with the diff feature."
 msgstr "Níor tiomsaíodh an leagan Vim seo le `diff' ar fáil."
 
+msgid "'-nb' cannot be used: not enabled at compile time\n"
+msgstr "Ní féidir '-nb' a úsáid: níor cumasaíodh é ag am tiomsaithe\n"
+
 msgid "Attempt to open script file again: \""
 msgstr "Déan iarracht ar oscailt na scripte arís: \""
 
@@ -3062,6 +3145,9 @@ msgstr "--serverlist\t\tTaispeáin freastalaithe Vim atá ar fáil agus scoir"
 msgid "--servername <name>\tSend to/become the Vim server <name>"
 msgstr "--servername <ainm>\tSeol chuig/Téigh i do fhreastalaí Vim <ainm>"
 
+msgid "--startuptime <file>\tWrite startup timing messages to <file>"
+msgstr "--startuptime <comhad>\tScríobh faisnéis maidir le tréimhse tosaithe i <comhad>"
+
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
 msgstr "-i <viminfo>\t\tÚsáid <viminfo> in ionad .viminfo"
 
@@ -3843,17 +3929,22 @@ msgstr "E338: Níl brabhsálaí comhaid ar fáil sa mhód consóil"
 msgid "E766: Insufficient arguments for printf()"
 msgstr "E766: Easpa argóintí d'fheidhm printf()"
 
+msgid "E807: Expected Float argument for printf()"
+msgstr "E807: Bhíothas ag súil le hargóint Snámhphointe d'fheidhm printf()"
+
 msgid "E767: Too many arguments to printf()"
 msgstr "E767: An iomarca argóintí d'fheidhm printf()"
 
 msgid "W10: Warning: Changing a readonly file"
 msgstr "W10: Rabhadh: Comhad inléite amháin á athrú"
 
-msgid "Type number or click with mouse (<Enter> cancels): "
-msgstr "Clóscríobh uimhir nó cliceáil le do luch (<Enter> = cealú): "
+msgid "Type number and <Enter> or click with mouse (empty cancels): "
+msgstr ""
+"Clóscríobh uimhir agus <Enter> nó cliceáil leis an luch (fág folamh le "
+"cealú): "
 
-msgid "Choice number (<Enter> cancels): "
-msgstr "Uimhir do rogha (<Enter> = cealú): "
+msgid "Type number and <Enter> (empty cancels): "
+msgstr "Clóscríobh uimhir agus <Enter> (fág folamh le cealú): "
 
 msgid "1 more line"
 msgstr "1 líne eile"
@@ -3965,7 +4056,6 @@ msgstr "E346: Níl comhadlann \"%s\" sa cdpath a thuilleadh"
 msgid "E347: No more file \"%s\" found in path"
 msgstr "E347: Níl comhad \"%s\" sa chonair a thuilleadh"
 
-#. Get here when the server can't be found.
 msgid "Cannot connect to Netbeans #2"
 msgstr "Ní féidir nascadh le Netbeans #2"
 
@@ -3986,6 +4076,9 @@ msgstr "E658: Cailleadh nasc NetBeans le haghaidh maoláin %ld"
 msgid "E505: "
 msgstr "E505: "
 
+msgid "E349: No identifier under cursor"
+msgstr "E349: Níl aitheantóir faoin chúrsóir"
+
 msgid "E774: 'operatorfunc' is empty"
 msgstr "E774: 'operatorfunc' folamh"
 
@@ -3998,9 +4091,6 @@ msgstr "Rabhadh: ní féidir leis an teirminéal aibhsiú"
 msgid "E348: No string under cursor"
 msgstr "E348: Níl teaghrán faoin chúrsóir"
 
-msgid "E349: No identifier under cursor"
-msgstr "E349: Níl aitheantóir faoin chúrsóir"
-
 msgid "E352: Cannot erase folds with current 'foldmethod'"
 msgstr "E352: Ní féidir fillteacha a léirscriosadh leis an 'foldmethod' reatha"
 
@@ -4041,7 +4131,7 @@ msgid "%ld lines to indent... "
 msgstr "%ld líne le heangú... "
 
 msgid "1 line indented "
-msgstr "eangaíodh 1 líne "
+msgstr "eangaíodh líne amháin "
 
 #, c-format
 msgid "%ld lines indented "
@@ -4055,7 +4145,7 @@ msgid "cannot yank; delete anyway"
 msgstr "ní féidir a sracadh; scrios mar sin féin"
 
 msgid "1 line changed"
-msgstr "athraíodh 1 líne"
+msgstr "athraíodh líne amháin"
 
 #, c-format
 msgid "%ld lines changed"
@@ -4066,10 +4156,10 @@ msgid "freeing %ld lines"
 msgstr "%ld líne á saoradh"
 
 msgid "block of 1 line yanked"
-msgstr "sracadh bloc de 1 líne"
+msgstr "sracadh bloc de líne amháin"
 
 msgid "1 line yanked"
-msgstr "sracadh 1 líne"
+msgstr "sracadh líne amháin"
 
 #, c-format
 msgid "block of %ld lines yanked"
@@ -4808,6 +4898,9 @@ msgstr "E388: Sainmhíniú gan aimsiú"
 msgid "E389: Couldn't find pattern"
 msgstr "E389: Patrún gan aimsiú"
 
+msgid "Substitute "
+msgstr "Ionadú "
+
 # in .viminfo
 #, c-format
 msgid ""
@@ -4911,6 +5004,10 @@ msgstr ""
 "tar éis míre PFX i %s líne %d"
 
 #, c-format
+msgid "Wrong COMPOUNDRULES value in %s line %d: %s"
+msgstr "Luach mícheart ar COMPOUNDRULES i %s líne %d: %s"
+
+#, c-format
 msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
 msgstr "Luach mícheart ar COMPOUNDWORDMAX i %s líne %d: %s"
 
@@ -5449,6 +5546,9 @@ msgstr "E432: Comhad clibeanna gan sórtáil: %s"
 msgid "E433: No tags file"
 msgstr "E433: Níl aon chomhad clibeanna"
 
+msgid "Ignoring long line in tags file"
+msgstr "Ag déanamh neamhaird de líne fhada sa chomhad clibeanna"
+
 msgid "E434: Can't find tag pattern"
 msgstr "E434: Patrún clibe gan aimsiú"
 
@@ -5491,6 +5591,9 @@ msgstr "tosaíodh blaosc nua\n"
 msgid "Vim: Error reading input, exiting...\n"
 msgstr "Vim: Earráid agus an t-inchomhad á léamh; ag scor...\n"
 
+msgid "Used CUT_BUFFER0 instead of empty selection"
+msgstr "Úsáideadh CUT_BUFFER0 in ionad roghnúcháin folaimh"
+
 #. must display the prompt
 msgid "No undo possible; continue anyway"
 msgstr "Ní féidir a chealú; lean ar aghaidh mar sin féin"
@@ -5586,6 +5689,13 @@ msgstr " le tacaíocht OLE"
 
 msgid ""
 "\n"
+"MS-Windows 64-bit console version"
+msgstr ""
+"\n"
+"Leagan consóil 64 giotán MS-Windows"
+
+msgid ""
+"\n"
 "MS-Windows 32-bit console version"
 msgstr ""
 "\n"
@@ -5642,11 +5752,25 @@ msgstr ""
 
 msgid ""
 "\n"
+"OpenVMS version"
+msgstr ""
+"\n"
+"Leagan OpenVMS"
+
+msgid ""
+"\n"
 "Included patches: "
 msgstr ""
 "\n"
 "Paistí san áireamh: "
 
+msgid ""
+"\n"
+"Extra patches: "
+msgstr ""
+"\n"
+"Paistí sa bhreis: "
+
 msgid "Modified by "
 msgstr "Mionathraithe ag "
 
@@ -5799,7 +5923,7 @@ msgid "by Bram Moolenaar et al."
 msgstr "le Bram Moolenaar et al."
 
 msgid "Vim is open source and freely distributable"
-msgstr "Is saorbhogearraí Vim"
+msgstr "Is saorbhogearra é Vim"
 
 msgid "Help poor children in Uganda!"
 msgstr "Tabhair cabhair do pháistí bochta in Uganda!"
@@ -5884,6 +6008,12 @@ msgstr "E443: Ní féidir rothlú nuair atá fuinneog eile scoilte"
 msgid "E444: Cannot close last window"