diff --git a/src/po/af.po b/src/po/af.po
index 5c0eb870c4571d2596ea9a1dab17c7e349d4d9b9..7f1db1d3266070040356965346e639f741b5401e 100644
--- a/src/po/af.po
+++ b/src/po/af.po
@@ -3,7 +3,8 @@
 # Do ":help credits" in Vim to see a list of people who contributed.
 # Danie Roux <droux@tuks.co.za>, 2001
 # Edited: Jean Jordaan (njj) <jean@upfrontsystems.co.za>, 10/01/2001
-# Edited by Danie on 10/31/2001
+# Edited by Danie on the 31st of October 2001
+# Edited by Danie on the 30th of July 2005
 #
 # njj: Save == Stoor. Write == Skryf.
 # njj: "deleted" == "geskrap"; "remove" == "verwyder"
@@ -17,11 +18,15 @@
 # en XML elemente. Maar ek kan nie nou aan 'n spesifieker woord dink
 # nie.)
 # Printing aborted - drukkery gestaak? (njj: ek dink dis reg.)
-
+#
+# exception - uitsondering
+# abandon - weg gegooi
+# socket - WEET NIE
 msgid ""
 msgstr ""
 "Project-Id-Version: Vim 6.0\n"
-"POT-Creation-Date: 2001-10-31 12:43+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-04-17 23:24+0200\n"
 "PO-Revision-Date: Wed Oct 31 13:41 SAST 2001\n"
 "Last-Translator: Danie Roux <droux@tuks.co.za>\n"
 "Language-Team: Danie Roux <droux@tuks.co.za>\n"
@@ -35,14 +40,14 @@ msgstr "E82: Kan nie buffer toeken nie, program sluit..."
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: Kan nie buffer toeken nie, gaan ander een gebruik..."
 
-msgid "No buffers were unloaded"
-msgstr "Geen buffers is uitgelaai nie"
+msgid "E515: No buffers were unloaded"
+msgstr "E515: Geen buffers is uitgelaai nie"
 
-msgid "No buffers were deleted"
-msgstr "Geen buffers is geskrap nie"
+msgid "E516: No buffers were deleted"
+msgstr "E516: Geen buffers is geskrap nie"
 
-msgid "No buffers were wiped out"
-msgstr "Geen buffers is geskrap nie"
+msgid "E517: No buffers were wiped out"
+msgstr "E517: Geen buffers is geskrap nie"
 
 msgid "1 buffer unloaded"
 msgstr "1 buffer uitgelaai"
@@ -72,9 +77,8 @@ msgstr "E84: Geen veranderde buffer gevind nie"
 msgid "E85: There is no listed buffer"
 msgstr "E85: Daar is geen gelyste buffer nie"
 
-#, c-format
-msgid "E86: Cannot go to buffer %ld"
-msgstr "E86: Kan nie na buffer %ld gaan nie"
+msgid "E86: Buffer %ld does not exist"
+msgstr "E86: Buffer %ld bestaan nie"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: Kan nie verby laaste buffer gaan nie"
@@ -82,10 +86,8 @@ msgstr "E87: Kan nie verby laaste buffer gaan nie"
 msgid "E88: Cannot go before first buffer"
 msgstr "E88: Kan nie vóór eerste buffer gaan nie"
 
-#, c-format
-msgid "E89: No write since last change for buffer %ld (use ! to override)"
-msgstr ""
-"E89: Buffer %ld nog ongestoor sedert vorige wysiging (gebruik ! om te dwing)"
+msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgstr "E89: Buffer %ld nog ongestoor sedert vorige wysiging (gebruik ! om te dwing)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: Kan nie laaste buffer uitlaai nie"
@@ -161,6 +163,7 @@ msgstr "Ond"
 msgid "Top"
 msgstr "Bo"
 
+#, c-format
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -224,47 +227,47 @@ msgstr "E103: Buffer \"%s\" is nie in 'diff' modus nie"
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: 'Escape' nie toegelaat in digraaf nie"
 
-msgid "Keymap file not found"
-msgstr "Sleutelbindinglêer nie gevind nie"
+msgid "E544: Keymap file not found"
+msgstr "E544: Sleutelbindinglêer nie gevind nie"
 
 msgid "E105: Using :loadkeymap not in a sourced file"
 msgstr "E105: :loadkeymap word buite 'n uitvoerlêer gebruik"
 
-msgid " Keyword completion (^N/^P)"
-msgstr " Sleutelwoord voltooiing (^N/^P)"
+msgid " Keyword completion (^N^P)"
+msgstr " Sleutelwoord voltooiing (^N^P)"
 
 #. ctrl_x_mode == 0, ^P/^N compl.
-msgid " ^X mode (^E/^Y/^L/^]/^F/^I/^K/^D/^V/^N/^P)"
-msgstr " ^X modus (^E/^Y/^L/^]/^F/^I/^K/^D/^N/^P)"
+msgid " ^X mode (^E^Y^L^]^F^I^K^D^V^N^P)"
+msgstr " ^X modus (^E^Y^L^]^F^I^K^D^V^N^P)"
 
 #. Scroll has it's own msgs, in it's place there is the msg for local
 #. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL)  -- Acevedo
-msgid " Keyword Local completion (^N/^P)"
-msgstr " Sleutelwoord Lokale voltooiing (^N/^P)"
+msgid " Keyword Local completion (^N^P)"
+msgstr " Sleutelwoord Lokale voltooiing (^N^P)"
 
-msgid " Whole line completion (^L/^N/^P)"
-msgstr " Hele-reël voltooiing (^L/^N/^P)"
+msgid " Whole line completion (^L^N^P)"
+msgstr " Hele-reël voltooiing (^L^N^P)"
 
-msgid " File name completion (^F/^N/^P)"
-msgstr " Lêernaam voltooiing (^F/^N/^P)"
+msgid " File name completion (^F^N^P)"
+msgstr " Lêernaam voltooiing (^F^N^P)"
 
-msgid " Tag completion (^]/^N/^P)"
-msgstr " Etiketvoltooiing (^]/^N/^P)"
+msgid " Tag completion (^]^N^P)"
+msgstr " Etiketvoltooiing (^]^N^P)"
 
-msgid " Path pattern completion (^N/^P)"
-msgstr " Gidspatroon voltooiing (^N/^P)"
+msgid " Path pattern completion (^N^P)"
+msgstr " Gidspatroon voltooiing (^N^P)"
 
-msgid " Definition completion (^D/^N/^P)"
-msgstr " Definisievoltooiing (^D/^N/^P)"
+msgid " Definition completion (^D^N^P)"
+msgstr " Definisievoltooiing (^D^N^P)"
 
-msgid " Dictionary completion (^K/^N/^P)"
-msgstr " Woordeboekvoltooiing (^K/^N/^P)"
+msgid " Dictionary completion (^K^N^P)"
+msgstr " Woordeboekvoltooiing (^K^N^P)"
 
-msgid " Thesaurus completion (^T/^N/^P)"
-msgstr " Tesourusvoltooiing (^T/^N/^P)"
+msgid " Thesaurus completion (^T^N^P)"
+msgstr " Tesourusvoltooiing (^T^N^P)"
 
-msgid " Command-line completion (^V/^N/^P)"
-msgstr " Bevelreëlvoltooiing (^V/^N/^P)"
+msgid " Command-line completion (^V^N^P)"
+msgstr " Bevelreëlvoltooiing (^V^N^P)"
 
 msgid "Hit end of paragraph"
 msgstr "Het einde van paragraaf getref"
@@ -289,6 +292,7 @@ msgstr " (vervang) Rol (^E/^Y)"
 msgid "Scanning: %s"
 msgstr "Soek vir: %s"
 
+#, c-format
 msgid "Scanning tags."
 msgstr "Deursoek etikette."
 
@@ -319,6 +323,8 @@ msgstr "treffer %d van %d"
 msgid "match %d"
 msgstr "treffer %d"
 
+#. Skip further arguments but do continue to
+#. * search for a trailing command.
 #, c-format
 msgid "E106: Unknown variable: \"%s\""
 msgstr "E106: Onbekende veranderlike: \"%s\""
@@ -376,6 +382,14 @@ msgstr "E119: Te min parameters vir funksie: %s"
 msgid "E120: Using <SID> not in a script context: %s"
 msgstr "E120: <SID> word buite skripkonteks gebruik: %s"
 
+#.
+#. * Yes this is ugly, I don't particularly like it either.  But doing it
+#. * this way has the compelling advantage that translations need not to
+#. * be touched at all.  See below what 'ok' and 'ync' are used for.
+#.
+msgid "&Ok"
+msgstr "&Ok"
+
 #, c-format
 msgid "+-%s%3ld lines: "
 msgstr "+-%s%3ld reëls: "
@@ -387,6 +401,12 @@ msgstr ""
 "&OK\n"
 "&Kanselleer"
 
+msgid "called inputrestore() more often than inputsave()"
+msgstr "inputrestore() is meer gereeld as inputsave() geroep"
+
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: Te veel simboliese skakels (siklus?)"
+
 msgid "E240: No connection to Vim server"
 msgstr "E240: Geen verbinding met Vim bediener"
 
@@ -407,8 +427,10 @@ msgstr "(Ongeldig)"
 msgid "E121: Undefined variable: %s"
 msgstr "E121: Ongedefinieerde veranderlike: %s"
 
-#, c-format
-msgid "E122: Function %s already exists, use ! to replace"
+msgid "E461: Illegal variable name: %s"
+msgstr "E461: Ongeldige veranderlikenaam: %s"
+
+msgid "E122: Function %s already exists, add ! to replace it"
 msgstr "E122: Funksie %s bestaan alreeds, gebruik ! om te vervang"
 
 #, c-format
@@ -430,15 +452,12 @@ msgstr "E126: Ontbrekende ':endfunction'"
 msgid "E127: Cannot redefine function %s: It is in use"
 msgstr "E127: Kan funksie %s nie herdefinieer nie: Dit is in gebruik"
 
-#, c-format
-msgid "E128: Function name must start with a capital: %s"
-msgstr "E128: Funksienaam moet met 'n hoofletter begin: %s"
-
 msgid "E129: Function name required"
 msgstr "E129: Funksienaam vereis"
 
-msgid "function "
-msgstr "funksie "
+#, c-format
+msgid "E128: Function name must start with a capital: %s"
+msgstr "E128: Funksienaam moet met 'n hoofletter begin: %s"
 
 #, c-format
 msgid "E130: Undefined function: %s"
@@ -456,13 +475,8 @@ msgstr "E132: Funksieroepdiepte is groter as 'maxfuncdepth'"
 msgid "calling %s"
 msgstr "roep %s"
 
-#. always scroll up, don't overwrite
-#, c-format
-msgid "continuing in %s"
-msgstr "vervolg in %s"
-
-msgid "E133: :return not inside a function"
-msgstr "E133: ':return' buite funksie"
+msgid "%s aborted"
+msgstr "%s gekanselleer"
 
 #, c-format
 msgid "%s returning #%ld"
@@ -472,6 +486,15 @@ msgstr "%s lewer #%ld op"
 msgid "%s returning \"%s\""
 msgstr "%s lewer \"%s\" op"
 
+#. always scroll up, don't overwrite
+#, c-format
+msgid "continuing in %s"
+msgstr "vervolg in %s"
+
+msgid "E133: :return not inside a function"
+msgstr "E133: ':return' buite funksie"
+
+#, c-format
 msgid ""
 "\n"
 "# global variables:\n"
@@ -479,10 +502,196 @@ msgstr ""
 "\n"
 "# globale veranderlikes:\n"
 
+msgid "Entering Debug mode.  Type \"cont\" to continue."
+msgstr "Ontfoutmodus begin nou.  Tik \"cont\" om te verlaat."
+
+#, c-format
+msgid "line %ld: %s"
+msgstr "reël %ld: %s"
+
+#, c-format
+msgid "cmd: %s"
+msgstr "cmd: %s"
+
+#, c-format
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "Inspeksiepunt in \"%s%s\" reël %ld"
+
+#, c-format
+msgid "E161: Breakpoint not found: %s"
+msgstr "E161: Inspeksiepunt kon nie gevind word nie: %s"
+
+msgid "No breakpoints defined"
+msgstr "Geen inspeksiepunte gedefinieer nie"
+
+#, c-format
+msgid "%3d  %s %s  line %ld"
+msgstr "%3d  %s %s  reël %ld"
+
+msgid "Save As"
+msgstr "Stoor As"
+
+#, c-format
+msgid "Save changes to \"%.*s\"?"
+msgstr "Stoor veranderinge na \"%.*s\"?"
+
+msgid "Untitled"
+msgstr "Ongetiteld"
+
+#, c-format
+msgid "E162: No write since last change for buffer \"%s\""
+msgstr "E162: Buffer \"%s\" is nie geskryf sedert vorige wysiging nie"
+
+msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
+msgstr "Waarskuwing: Ander buffer onverwags betree (kyk na outobevele)"
+
+msgid "E163: There is only one file to edit"
+msgstr "E163: Daar is net een lêer om te bewerk"
+
+msgid "E164: Cannot go before first file"
+msgstr "E164: Kan nie vóór die eerste lêer gaan nie"
+
+msgid "E165: Cannot go beyond last file"
+msgstr "E165: Kan nie verby die laaste lêer gaan nie"
+
+msgid "E666: compiler not supported: %s"
+msgstr "E666: vertaler word nie ondersteun nie: %s"
+
+#, c-format
+msgid "Searching for \"%s\" in \"%s\""
+msgstr "Besig om te soek vir \"%s\" in \"%s\""
+
+#, c-format
+msgid "Searching for \"%s\""
+msgstr "Besig om te soek vir \"%s\""
+
+#, c-format
+msgid "not found in 'runtimepath': \"%s\""
+msgstr "kon nie in 'runtimepath' gevind word nie: \"%s\""
+
+msgid "Source Vim script"
+msgstr "Voer Vim skrip uit"
+
+#, c-format
+msgid "Cannot source a directory: \"%s\""
+msgstr "Kan nie gids uitvoer nie: \"%s\""
+
+#, c-format
+msgid "could not source \"%s\""
+msgstr "kon nie \"%s\" uitvoer nie"
+
+#, c-format
+msgid "line %ld: could not source \"%s\""
+msgstr "reël %ld: kon nie \"%s\" uitvoer nie"
+
+#, c-format
+msgid "sourcing \"%s\""
+msgstr "besig om \"%s\" uit te voer"
+
+#, c-format
+msgid "line %ld: sourcing \"%s\""
+msgstr "reël %ld: voer nou \"%s\" uit"
+
+#, c-format
+msgid "finished sourcing %s"
+msgstr "%s klaar uitgevoer"
+
+msgid "W15: Warning: Wrong line separator, ^M may be missing"
+msgstr "W15: Waarskuwing: Verkeerde reëlskeiding, ^M ontbreek dalk"
+
+msgid "E167: :scriptencoding used outside of a sourced file"
+msgstr "E167: ':scriptencoding' buite 'n uitvoerlêer gebruik"
+
+msgid "E168: :finish used outside of a sourced file"
+msgstr "E168: ':finish' buite 'n uitvoerlêer gebruik"
+
+#, c-format
+msgid "Page %d"
+msgstr "Bladsy %d"
+
+msgid "No text to be printed"
+msgstr "Geen teks om te druk nie"
+
+#, c-format
+msgid "Printing page %d (%d%%)"
+msgstr "Druk nou bladsy %d (%d%%)"
+
+#, c-format
+msgid " Copy %d of %d"
+msgstr " Kopie %d van %d"
+
+#, c-format
+msgid "Printed: %s"
+msgstr "Gedruk: %s"
+
+#, c-format
+msgid "Printing aborted"
+msgstr "Drukkery gestaak"
+
+msgid "E455: Error writing to PostScript output file"
+msgstr "E455: Kan nie na 'PostScript' afvoerlêer skryf nie"
+
+msgid "E624: Can't open file \"%s\""
+msgstr "E624: Kan nie lêer \"%s\" oopmaak nie"
+
+#, c-format
+msgid "E457: Can't read PostScript resource file \"%s\""
+msgstr "E457: Kan nie 'PostScript' hulpbron-lêer \"%s\" lees nie"
+
+msgid "E618: file \"%s\" is not a PostScript resource file"
+msgstr "E618: Lêer \"%s\" is nie 'n 'PostScript' hulpbron-lêer nie"
+
+msgid "E619: file \"%s\" is not a supported PostScript resource file"
+msgstr "E619: Lêer \"%s\" is nie 'n ondersteunde 'PostScript' hulpbron-lêer nie"
+
+#, c-format
+msgid "E621: \"%s\" resource file has wrong version"
+msgstr "E621: \"%s\" die hulpbron lêer het die verkeerde weergawe"
+
+msgid "E324: Can't open PostScript output file"
+msgstr "E324: Kan nie 'PostScript' afvoerlêer oopmaak nie"
+
+#, c-format
+msgid "E456: Can't open file \"%s\""
+msgstr "E456: Kan nie lêer %s oopmaak nie"
+
+msgid "E456: Can't find PostScript resource file \"prolog.ps\""
+msgstr "E456: Kan nie 'PostScript' hulpbron-lêer \"prolog.ps\" lees nie"
+
+msgid "E456: Can't find PostScript resource file \"%s.ps\""
+msgstr "E456: Kan nie 'PostScript' hulpbron-lêer \"%s\" vind nie"
+
+#, c-format
+msgid "E620: Unable to convert from multi-byte to \"%s\" encoding"
+msgstr "E620: Kon nie van wye-greep na \"%s\" enkodering verander nie"
+
+msgid "Sending to printer..."
+msgstr "Besig om te stuur na drukker..."
+
+msgid "E365: Failed to print PostScript file"
+msgstr "E365: Kon nie 'PostScript' lêer druk nie"
+
+msgid "Print job sent."
+msgstr "Druktaak gestuur."
+
+#, c-format
+msgid "Current %slanguage: \"%s\""
+msgstr "Huidige %staal: \"%s\""
+
+#, c-format
+msgid "E197: Cannot set language to \"%s\""
+msgstr "E197: Kan nie taal na \"%s\" verander nie"
+
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
 msgstr "<%s>%s%s  %d,  Hex %02x,  Oktaal %03o"
 
+msgid "> %d, Hex %04x, Octal %o"
+msgstr "> %d, Hex %04x, Oktaal %o"
+
+msgid "> %d, Hex %08x, Octal %o"
+msgstr "> %d, Hex %08x, Oktaal %o"
+
 msgid "E134: Move lines into themselves"
 msgstr "E134: Skuif reëls in hulself in"
 
@@ -503,9 +712,8 @@ msgstr "E135: *Filter* Outobevele mag nie die huidige buffer verander nie"
 msgid "[No write since last change]\n"
 msgstr "[Ongestoor sedert vorige verandering]\n"
 
-#, c-format
-msgid "viminfo: %s in line: "
-msgstr "viminfo: %s in reël: "
+msgid "%sviminfo: %s in line: "
+msgstr "%sviminfo: %s in reël: "
 
 msgid "E136: viminfo: Too many errors, skipping rest of file"
 msgstr "E136: viminfo: Te veel foute, slaan die res van die lêer oor"
@@ -540,6 +748,7 @@ msgstr "Besig om viminfo l
 msgid "# This viminfo file was generated by Vim %s.\n"
 msgstr "# Hierdie viminfo lêer is gegenereer deur Vim %s.\n"
 
+#, c-format
 msgid ""
 "# You may edit it if you're careful!\n"
 "\n"
@@ -547,15 +756,13 @@ msgstr ""
 "# Jy mag dit wysig as jy versigtig is!\n"
 "\n"
 
+#, c-format
 msgid "# Value of 'encoding' when this file was written\n"
 msgstr "# Waarde van 'encoding' toe hierdie lêer gestoor is\n"
 
 msgid "Illegal starting char"
 msgstr "Ongeldige beginkarakter"
 
-msgid "Save As"
-msgstr "Stoor As"
-
 #. Overwriting a file that is loaded in another buffer is not a
 #. * good idea.
 msgid "E139: File is loaded in another buffer"
@@ -633,232 +840,99 @@ msgstr "E148: Patroon ontbreek uit globaal"
 msgid "Pattern found in every line: %s"
 msgstr "Patroon gevind in elke reël: %s"
 
+#, c-format
 msgid ""
 "\n"
-"# Last Substitute String:\n"
-"$"
-msgstr ""
-"\n"
-"# Vorige Vervangstring:\n"
-"$"
-
-#, c-format
-msgid "E149: Sorry, no help for %s"
-msgstr "E149: Jammer, geen hulp vir %s nie"
-
-#, c-format
-msgid "Sorry, help file \"%s\" not found"
-msgstr "Jammer, hulplêer \"%s\" kan nie gevind word nie"
-
-#, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: Nie 'n gids nie: %s"
-
-#, c-format
-msgid "E152: Cannot open %s for writing"
-msgstr "E152: Kan nie %s oopmaak om te skryf nie"
-
-#, c-format
-msgid "E153: Unable to open %s for reading"
-msgstr "E153: Kan nie %s oop maak om te lees nie"
-
-#, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s"
-msgstr "E154: Duplikaat etiket \"%s\" in lêer %s"
-
-#, c-format
-msgid "E160: Unknown sign command: %s"
-msgstr "E160: Onbekende funksie: %s"
-
-msgid "E156: Missing sign name"
-msgstr "E156: Ontbrekende tekennaam"
-
-msgid "E255: Too many signs defined"
-msgstr "E77: Te veel tekens gedefinieer"
-
-#, c-format
-msgid "E239: Invalid sign text: %s"
-msgstr "E239: Ongeldige tekenteks: %s"
-
-#, c-format
-msgid "E155: Unknown sign: %s"
-msgstr "E155: Onbekende opsie: %s"
-
-msgid "E159: Missing sign number"
-msgstr "E159: Ontbrekende tekennommer"
-
-#, c-format
-msgid "E158: Invalid buffer name: %s"
-msgstr "E158: Ongeldige buffernaam: %s"
-
-#, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Ongeldige teken ID: %ld"
-
-msgid "[Deleted]"
-msgstr "[Geskrap]"
-
-msgid "Entering Debug mode.  Type \"cont\" to leave."
-msgstr "Ontfoutmodus begin nou.  Tik \"cont\" om te verlaat."
-
-#, c-format
-msgid "line %ld: %s"
-msgstr "reël %ld: %s"
-
-#, c-format
-msgid "cmd: %s"
-msgstr "cmd: %s"
-
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Inspeksiepunt in \"%s%s\" reël %ld"
-
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: Inspeksiepunt kon nie gevind word nie: %s"
-
-msgid "No breakpoints defined"
-msgstr "Geen inspeksiepunte gedefinieer nie"
-
-#, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  reël %ld"
-
-#, c-format
-msgid "Save changes to \"%.*s\"?"
-msgstr "Stoor veranderinge na \"%.*s\"?"
-
-msgid "Untitled"
-msgstr "Ongetiteld"
-
-#, c-format
-msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: Buffer \"%s\" is nie geskryf sedert vorige wysiging nie"
-
-msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr "Waarskuwing: Ander buffer onverwags betree (kyk na outobevele)"
-
-msgid "E163: There is only one file to edit"
-msgstr "E163: Daar is net een lêer om te bewerk"
-
-msgid "E164: Cannot go before first file"
-msgstr "E164: Kan nie vóór die eerste lêer gaan nie"
-
-msgid "E165: Cannot go beyond last file"
-msgstr "E165: Kan nie verby die laaste lêer gaan nie"
-
-#, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "Besig om te soek vir \"%s\" in \"%s\""
-
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "Besig om te soek vir \"%s\""
+"# Last Substitute String:\n"
+"$"
+msgstr ""
+"\n"
+"# Vorige Vervangstring:\n"
+"$"
 
-#, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "kon nie in 'runtimepath' gevind word nie: \"%s\""
+msgid "E478: Don't panic!"
+msgstr "E478: Bly kalm!"
 
-msgid "Run Macro"
-msgstr "Voer Makro uit"
+msgid "E661: Sorry, no '%s' help for %s"
+msgstr "E661: Jammer, geen '%s' hulp vir %s nie"
 
 #, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "Kan nie gids uitvoer nie: \"%s\""
+msgid "E149: Sorry, no help for %s"
+msgstr "E149: Jammer, geen hulp vir %s nie"
 
 #, c-format
-msgid "could not source \"%s\""
-msgstr "kon nie \"%s\" uitvoer nie"
+msgid "Sorry, help file \"%s\" not found"
+msgstr "Jammer, hulplêer \"%s\" kan nie gevind word nie"
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "reël %ld: kon nie \"%s\" uitvoer nie"
+msgid "E150: Not a directory: %s"
+msgstr "E150: Nie 'n gids nie: %s"
 
 #, c-format
-msgid "sourcing \"%s\""
-msgstr "besig om \"%s\" uit te voer"
+msgid "E152: Cannot open %s for writing"
+msgstr "E152: Kan nie %s oopmaak om te skryf nie"
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "reël %ld: voer nou \"%s\" uit"
+msgid "E153: Unable to open %s for reading"
+msgstr "E153: Kan nie %s oop maak om te lees nie"
 
 #, c-format
-msgid "finished sourcing %s"
-msgstr "%s klaar uitgevoer"
-
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: Waarskuwing: Verkeerde reëlskeiding, ^M ontbreek dalk"
+msgid "E670: Mix of help file encodings within a language: %s"
+msgstr "E670: 'n Mengsel van hulplêer enkoderings in 'n taal: %s"
 
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: ':scriptencoding' buite 'n uitvoerlêer gebruik"
+msgid "E154: Duplicate tag \"%s\" in file %s/%s"
+msgstr "E154: Duplikaat etiket \"%s\" in lêer %s/%s"
 
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: ':finish' buite 'n uitvoerlêer gebruik"
+#, c-format
+msgid "E160: Unknown sign command: %s"
+msgstr "E160: Onbekende funksie: %s"
 
-msgid "No text to be printed"
-msgstr "Geen teks om te druk nie"
+msgid "E156: Missing sign name"
+msgstr "E156: Ontbrekende tekennaam"
 
-#, c-format
-msgid "Printing page %d (%d%%)"
-msgstr "Druk nou bladsy %d (%d%%)"
+msgid "E612: Too many signs defined"
+msgstr "Te veel tekens gedefinieer"
 
 #, c-format
-msgid " Copy %d of %d"
-msgstr " Kopie %d van %d"
+msgid "E239: Invalid sign text: %s"
+msgstr "E239: Ongeldige tekenteks: %s"
 
 #, c-format
-msgid "Printed: %s"
-msgstr "Gedruk: %s"
-
-msgid "Printing aborted"
-msgstr "Drukkery gestaak"
-
-msgid "E455: Error writing to PostScript output file"
-msgstr "E455: Kan nie na 'PostScript' afvoerlêer skryf nie"
+msgid "E155: Unknown sign: %s"
+msgstr "E155: Onbekende opsie: %s"
 
-msgid "E324: Can't open PostScript output file"
-msgstr "E324: Kan nie 'PostScript' afvoerlêer oopmaak nie"
+msgid "E159: Missing sign number"
+msgstr "E159: Ontbrekende tekennommer"
 
 #, c-format
-msgid "E456: Can't open file \"%s\""
-msgstr "E456: Kan nie lêer %s oopmaak nie"
+msgid "E158: Invalid buffer name: %s"
+msgstr "E158: Ongeldige buffernaam: %s"
 
 #, c-format
-msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: Kan nie 'PostScript' hulpbron-lêer \"%s\" lees nie"
-
-msgid "Sending to printer..."
-msgstr "Besig om te stuur na drukker..."
-
-msgid "E365: Failed to print PostScript file"
-msgstr "E365: Kon nie 'PostScript' lêer druk nie"
+msgid "E157: Invalid sign ID: %ld"
+msgstr "E157: Ongeldige teken ID: %ld"
 
-msgid "Print job sent."
-msgstr "Druktaak gestuur."
+msgid " (NOT FOUND)"
+msgstr " (NIE GEVIND NIE)"
 
-#, c-format
-msgid "Current %slanguage: \"%s\""
-msgstr "Huidige %staal: \"%s\""
+msgid " (not supported)"
+msgstr " (word nie ondersteun nie)"
 
-#, c-format
-msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: Kan nie taal na \"%s\" verander nie"
+msgid "[Deleted]"
+msgstr "[Geskrap]"
 
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "Betree Ex modus.  Tik \"visual\" om na Normale modus terug te keer."
 
 #. must be at EOF
-msgid "At end-of-file"
-msgstr "By lêereinde"
+msgid "E501: At end-of-file"
+msgstr "E501: By lêereinde"
 
 msgid "E169: Command too recursive"
 msgstr "E169: Bevel te rekursief"
 
-msgid "E170: Missing :endwhile"
-msgstr "E170: Ontbrekende ':endwhile'"
-
-msgid "E171: Missing :endif"
-msgstr "E171: Ontbrekende ':endif'"
+msgid "E605: Exception not caught: %s"
+msgstr "E605: Uitsondering nie gevang nie: %s"
 
 msgid "End of sourced file"
 msgstr "Einde van uitvoerlêer"
@@ -866,23 +940,20 @@ msgstr "Einde van uitvoerl
 msgid "End of function"
 msgstr "Einde van funksie "
 
-msgid "Ambiguous use of user-defined command"
-msgstr "Dubbelsinnige gebruik van gebruiker-gedefinieerde bevel"
-
-msgid "Not an editor command"
-msgstr "Nie 'n verwerkerbevel nie"
+msgid "E464: Ambiguous use of user-defined command"
+msgstr "E464: Dubbelsinnige gebruik van gebruiker-gedefinieerde bevel"
 
-msgid "Don't panic!"
-msgstr "Bly kalm!"
+msgid "E492: Not an editor command"
+msgstr "E492: Nie 'n verwerkerbevel nie"
 
-msgid "Backwards range given"
-msgstr "Terugwaardse omvang gegee"
+msgid "E493: Backwards range given"
+msgstr "E493: Terugwaardse omvang gegee"
 
 msgid "Backwards range given, OK to swap"
 msgstr "Terugwaardse omvang gegee, OK om te ruil"
 
-msgid "Use w or w>>"
-msgstr "Gebruik w of w>>"
+msgid "E494: Use w or w>>"
+msgstr "E494: Gebruik w of w>>"
 
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: Jammer, die bevel is nie geïmplementeer nie"
@@ -890,15 +961,21 @@ msgstr "E319: Jammer, die bevel is nie ge
 msgid "E172: Only one file name allowed"
 msgstr "E172: Slegs een lêernaam toegelaat"
 
+msgid "1 more file to edit.  Quit anyway?"
+msgstr "Nog 1 lêer om te bewerk.  Stop in elk geval?"
+
 #, c-format
 msgid "%d more files to edit.  Quit anyway?"
 msgstr "Nog %d lêers om te bewerk.  Stop in elk geval?"
 
+msgid "E173: 1 more file to edit"
+msgstr "E173: Nog 1 lêer om te bewerk"
+
 #, c-format
 msgid "E173: %ld more files to edit"
 msgstr "E173: Nog %ld lêers om te bewerk"
 
-msgid "E174: Command already exists: use ! to redefine"
+msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: Bevel bestaan alreeds: gebruik ! om te herdefinieer"
 
 msgid ""
@@ -930,6 +1007,12 @@ msgstr "E179: parameter nodig vir voltooiing"
 msgid "E180: Invalid complete value: %s"
 msgstr "E180: Ongeldige voltooiingswaarde: %s"
 
+msgid "E468: Completion argument only allowed for custom completion"
+msgstr "E468: Voltooiingsargument words slegs toegelaat vir eie voltooiing"
+
+msgid "E467: Custom completion requires a function argument"
+msgstr "E467: Eie voltooiing benodig 'n funksie parameter"
+
 #, c-format
 msgid "E181: Invalid attribute: %s"
 msgstr "E181: Ongeldige eienskap: %s"
@@ -966,6 +1049,9 @@ msgstr "E186: Geen vorige gids nie"
 msgid "E187: Unknown"
 msgstr "E187: Onbekend"
 
+msgid "E465: :winsize requires two number arguments"
+msgstr "E465: ':winsize' benodig twee nommer parameters"
+
 #, c-format
 msgid "Window position: X %d, Y %d"
 msgstr "Vensterposisie: X %d, Y %d"
@@ -975,6 +1061,9 @@ msgstr ""
 "E188: Verkryging van vensterposisie is nie vir hierdie platform "
 "geïmplementeer nie"
 
+msgid "E466: :winpos requires two number arguments"
+msgstr "E466: :winpos benodig twee parameters"
+
 msgid "Save Redirection"
 msgstr "Stoor Herversturing"
 
@@ -987,8 +1076,7 @@ msgstr "Stoor Sessie"
 msgid "Save Setup"
 msgstr "Stoor konfigurasie"
 
-#, c-format
-msgid "E189: \"%s\" exists (use ! to override)"
+msgid "E189: \"%s\" exists (add ! to override)"
 msgstr "E189: \"%s\" bestaan (gebruik ! om te dwing)"
 
 #, c-format
@@ -1003,60 +1091,130 @@ msgstr ""
 msgid "E192: Recursive use of :normal too deep"
 msgstr "E192: Rekursiewe gebruik van ':normal' te diep"
 
-msgid ":if nesting too deep"
-msgstr "geneste ':if' te diep"
+msgid "E194: No alternate file name to substitute for '#'"
+msgstr "E194: Geen alternatiewe lêernaam vir '#' nie"
 
-msgid ":endif without :if"
-msgstr "':endif' sonder ':if'"
+msgid "E495: no autocommand file name to substitute for \"<afile>\""
+msgstr "E495: geen outobevel-lêernaam om \"<afile>\" mee te vervang nie"
 
-msgid ":else without :if"
-msgstr "':else' sonder ':if'"
+msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
+msgstr "E496: geen outobevel buffernommer om \"<abuf>\" mee te vervang nie"
 
-msgid ":elseif without :if"
-msgstr "':elseif' sonder ':if'"
+msgid "E497: no autocommand match name to substitute for \"<amatch>\""
+msgstr "E497: geen outobevel treffernaam om \"<amatch>\" mee te vervang nie"
 
-msgid ":while nesting too deep"
-msgstr "':while' te diep genes"
+msgid "E498: no :source file name to substitute for \"<sfile>\""
+msgstr "E498: geen ':source' lêernaam om \"<sfile>\" mee te vervang nie"
 
-msgid ":continue without :while"
-msgstr "':continue' sonder ':while'"
+msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
+msgstr "E499: Leë lêernaam vir '%' of '#', werk slegs met \":p:h\""
 
-msgid ":break without :while"
-msgstr "':break' sonder ':while'"
+msgid "E500: Evaluates to an empty string"
+msgstr "E500: Evalueer na 'n leë string"
 
-msgid ":endwhile without :while"
-msgstr "':endwhile' sonder ':while'"
+msgid "E195: Cannot open viminfo file for reading"
+msgstr "E195: Kan 'viminfo' lêer nie oopmaak om te lees nie"
 
-msgid "E193: :endfunction not inside a function"
-msgstr "E193: ':endfunction' nie in 'n funksie nie"
+msgid "E196: No digraphs in this version"
+msgstr "E196: Geen digrawe in hierdie weergawe nie"
 
-msgid "E194: No alternate file name to substitute for '#'"
-msgstr "E194: Geen alternatiewe lêernaam vir '#' nie"
+msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
+msgstr "E608: Kan nie uitsonderings ':throw' met 'Vim' voorvoegsel nie"
 
-msgid "no autocommand file name to substitute for \"<afile>\""
-msgstr "geen outobevel-lêernaam om \"<afile>\" mee te vervang nie"
+#. always scroll up, don't overwrite
+#, c-format
+msgid "Exception thrown: %s"
+msgstr "Uitsondering gegooi: %s"
 
-msgid "no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "geen outobevel buffernommer om \"<abuf>\" mee te vervang nie"
+#, c-format
+msgid "Exception finished: %s"
+msgstr "Uitsondering het klaar gemaak: %s"
 
-msgid "no autocommand match name to substitute for \"<amatch>\""
-msgstr "geen outobevel treffernaam om \"<amatch>\" mee te vervang nie"
+#, c-format
+msgid "Exception discarded: %s"
+msgstr "Uitsondering weg gegooi: %s"
 
-msgid "no :source file name to substitute for \"<sfile>\""
-msgstr "geen ':source' lêernaam om \"<sfile>\" mee te vervang nie"
+msgid "%s, line %ld"
+msgstr "%s, reël %ld"
 
-#, no-c-format
-msgid "Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "Leë lêernaam vir '%' of '#', werk slegs met \":p:h\""
+#. always scroll up, don't overwrite
+msgid "Exception caught: %s"
+msgstr "Uitsondering gevang: %s"
 
-msgid "Evaluates to an empty string"
-msgstr "Evalueer na 'n leë string"
+#, c-format
+msgid "%s made pending"
+msgstr "%s is afwagtend gemaak"
 
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: Kan 'viminfo' lêer nie oopmaak om te lees nie"
+msgid "%s resumed"
+msgstr "%s teruggekeer"
 
-msgid "E196: No digraphs in this version"
-msgstr "E196: Geen digrawe in hierdie weergawe nie"
+#, c-format
+msgid "%s discarded"
+msgstr "%s weg gegooi"
+
+msgid "Exception"
+msgstr "Uitsondering"
+
+msgid "Error and interrupt"
+msgstr "Fout en onderbreking"
+
+msgid "Error"
+msgstr "Fout"
+
+#. if (pending & CSTP_INTERRUPT)
+msgid "Interrupt"
+msgstr "Onderbreek"
+
+msgid "E579: :if nesting too deep"
+msgstr "E579: geneste ':if' te diep"
+
+msgid "E580: :endif without :if"
+msgstr "E580: ':endif' sonder ':if'"
+
+msgid "E581: :else without :if"
+msgstr "E581: ':else' sonder ':if'"
+
+msgid "E582: :elseif without :if"
+msgstr "E582: ':elseif' sonder ':if'"
+
+msgid "E583: multiple :else"
+msgstr "E583: meer as een ':else'"
+
+msgid "E584: :elseif after :else"
+msgstr "E584: ':elseif' na ':else'"
+
+msgid "E585: :while nesting too deep"
+msgstr "E585: ':while' te diep genes"
+
+msgid "E586: :continue without :while"
+msgstr "E586: ':continue' sonder ':while'"
+
+msgid "E587: :break without :while"
+msgstr "E587: ':break' sonder ':while'"
+
+msgid "E601: :try nesting too deep"
+msgstr "E601: geneste ':try' te diep"
+
+msgid "E603: :catch without :try"
+msgstr "E603: ':catch' sonder ':try'"
+
+#. Give up for a ":catch" after ":finally" and ignore it.
+#. * Just parse.
+msgid "E604: :catch after :finally"
+msgstr "E604: ':catch' na ':finally'"
+
+msgid "E606: :finally without :try"
+msgstr "E606: ':finally' sonder ':try'"
+
+#. Give up for a multiple ":finally" and ignore it.
+msgid "E607: multiple :finally"
+msgstr "E607: meer as een ':finally'"
+
+msgid "E602: :endtry without :try"
+msgstr "E602: ':endtry' sonder ':try'"
+
+msgid "E193: :endfunction not inside a function"
+msgstr "E193: ':endfunction' nie in 'n funksie nie"
 
 msgid "tagname"
 msgstr "etiketnaam"
@@ -1157,6 +1315,10 @@ msgstr "[gekodeer]"
 msgid "[CONVERSION ERROR]"
 msgstr "[OMSETTINGSFOUT]"
 
+#, c-format
+msgid "[ILLEGAL BYTE in line %ld]"
+msgstr "[ONWETTIGE GREEP in reël %ld]"
+
 msgid "[READ ERRORS]"
 msgstr "[LEESFOUTE]"
 
@@ -1175,34 +1337,40 @@ msgstr "E203: Outobevele het die skryfbuffer geskrap of uitgelaai"
 msgid "E204: Autocommand changed number of lines in unexpected way"
 msgstr "E204: Outobevel het etlike reëls op onverwagse wyse verander "
 
+msgid "NetBeans dissallows writes of unmodified buffers"
+msgstr "NetBeans laat nie skryf toe van onveranderde buffers nie"
+
+msgid "Partial writes disallowed for NetBeans buffers"
+msgstr "Gedeeltelike skryf word nie toegelaat vir NetBeans buffers nie"
+
 msgid "is not a file or writable device"
 msgstr "is nie 'n lêer of 'n skryfbare toestel nie"
 
-msgid "is read-only (use ! to override)"
+msgid "is read-only (add ! to override)"
 msgstr "is lees-alleen (gebruik ! om te dwing)"
 
-msgid "Can't write to backup file (use ! to override)"
-msgstr "Kan nie na rugsteunlêer skryf nie (gebruik ! om te dwing)"
+msgid "E506: Can't write to backup file (add ! to override)"
+msgstr "E506: Kan nie na rugsteunlêer skryf nie (gebruik ! om te dwing)"
 
-msgid "Close error for backup file (use ! to override)"
-msgstr "Sluitfout vir rugsteunlêer (gebruik ! om te dwing)"
+msgid "E507: Close error for backup file (add ! to override)"
+msgstr "E507: Sluitfout vir rugsteunlêer (gebruik ! om te dwing)"
 
-msgid "Can't read file for backup (use ! to override)"
-msgstr "Kan rugsteunlêer nie lees nie (gebruik ! om te dwing)"
+msgid "E508: Can't read file for backup (add ! to override)"
+msgstr "E508: Kan rugsteunlêer nie lees nie (gebruik ! om te dwing)"
 
-msgid "Cannot create backup file (use ! to override)"
-msgstr "Kan rugsteunlêer nie skep nie (gebruik ! om te dwing)"
+msgid "E509: Cannot create backup file (add ! to override)"
+msgstr "E509: Kan rugsteunlêer nie skep nie (gebruik ! om te dwing)"
 
-msgid "Can't make backup file (use ! to override)"
-msgstr "Kan rugsteunlêer nie skep nie (gebruik ! om te dwing)"
+msgid "E510: Can't make backup file (add ! to override)"
+msgstr "E510: Kan rugsteunlêer nie skep nie (gebruik ! om te dwing)"
 
-msgid "The resource fork will be lost (use ! to override)"
-msgstr "Die hulpbronvurk sal verlore gaan (gebruik ! om te dwing)"
+msgid "E460: The resource fork would be lost (add ! to override)"
+msgstr "E460: Die hulpbronvurk sal verlore gaan (gebruik ! om te dwing)"
 
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: Kan nie tydelike lêer vind vir skryf nie"
 
-msgid "E213: Cannot convert (use ! to write without conversion)"
+msgid "E213: Cannot convert (add ! to write without conversion)"
 msgstr "E213: Kan nie omsit nie (gebruik ! om te skryf sonder omsetting)"
 
 msgid "E166: Can't open linked file for writing"
@@ -1211,14 +1379,17 @@ msgstr "E166: Kan l
 msgid "E212: Can't open file for writing"
 msgstr "E212: Kan lêer nie oopmaak vir skryf nie"
 
-msgid "Close failed"
-msgstr "Sluiting gefaal"
+msgid "E667: Fsync failed"
+msgstr "E667: 'Fsync' het gefaal"
+
+msgid "E512: Close failed"
+msgstr "E512: Sluiting gefaal"
 
-msgid "write error, conversion failed"
-msgstr "skryffout, omsetting gefaal"
+msgid "E513: write error, conversion failed"
+msgstr "E513: skryffout, omsetting gefaal"
 
-msgid "write error (file system full?)"
-msgstr "skryffout (lêerstelsel vol?)"
+msgid "E514: write error (file system full?)"
+msgstr "E514: skryffout (lêerstelsel vol?)"
 
 msgid " CONVERSION ERROR"
 msgstr " OMSETTINGSFOUT"
@@ -1348,6 +1519,9 @@ msgstr ""
 msgid "W13: Warning: File \"%s\" has been created after editing started"
 msgstr "W13: Waarskuwing: Lêer \"%s\" is geskep sedert bewerking begin het"
 
+msgid "See \":help W11\" for more info."
+msgstr "Sien \":help W11\" vir meer inligting."
+
 msgid "Warning"
 msgstr "Waarskuwing"
 
@@ -1358,6 +1532,9 @@ msgstr ""
 "&OK\n"
 "&Laai Lêer"
 
+msgid "E462: Could not prepare for reloading \"%s\""
+msgstr "E462: Kon nie voorberei vir herlaai nie \"%s\""
+
 #, c-format
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: Kon nie \"%s\" herlaai nie"
@@ -1378,6 +1555,9 @@ msgstr "E215: Ongeldige karakter na *: %s"
 msgid "E216: No such event: %s"
 msgstr "E216: Geen sodanige gebeurtenis nie: %s"
 
+msgid "E216: No such group or event: %s"
+msgstr "E216: Geen sodanige groep of gebeurtenis nie: %s"
+
 #. Highlight title
 msgid ""
 "\n"
@@ -1414,8 +1594,8 @@ msgstr "E219: Ontbrekende {."
 msgid "E220: Missing }."
 msgstr "E220: Ontbrekende }."
 
-msgid "No fold found"
-msgstr "Geen vou gevind nie"
+msgid "E490: No fold found"
+msgstr "E490: Geen vou gevind nie"
 
 msgid "E350: Cannot create fold with current 'foldmethod'"
 msgstr "E350: Kan nie vou skep met huidige 'foldmethod' nie"
@@ -1423,9 +1603,6 @@ msgstr "E350: Kan nie vou skep met huidige 'foldmethod' nie"
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: Kan nie vou skrap met huidige 'foldmethod' nie"
 
-msgid "E221: 'commentstring' is empty"
-msgstr "E221: 'commentstring' opsie is leeg"
-
 msgid "E222: Add to read buffer"
 msgstr "E222: Voeg by leesbuffer"
 
@@ -1457,57 +1634,71 @@ msgstr "Geen binding gevind nie"
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: Ongeldige modus"
 
-msgid "E229: Cannot start the GUI"
-msgstr "E229: Kan nie die GUI begin nie"
-
-#, c-format
-msgid "E230: Cannot read from \"%s\""
-msgstr "E230: Kan nie lees uit \"%s\" nie"
-
-msgid "E231: 'guifontwide' invalid"
-msgstr "E231: 'guifontwide' ongeldig"
-
-msgid "Error"
-msgstr "Fout"
-
-msgid "&Ok"
-msgstr "&Ok"
-
 msgid "<cannot open> "
 msgstr "<kan nie oopmaak nie> "
 
-#, c-format
-msgid "vim_SelFile: can't get font %s"
-msgstr "'vim_SelFile': kan font %s nie kry nie"
+msgid "E616: vim_SelFile: can't get font %s"
+msgstr "E616: 'vim_SelFile': kan font %s nie kry nie"
 
-msgid "vim_SelFile: can't return to current directory"
-msgstr "'vim_SelFile': Kan nie terugkeer na huidige gids nie"
+msgid "E614: vim_SelFile: can't return to current directory"
+msgstr "E614: 'vim_SelFile': Kan nie terugkeer na huidige gids nie"
 
 msgid "Pathname:"
 msgstr "Gidsnaam:"
 
-msgid "vim_SelFile: can't get current directory"
-msgstr "vim_SelFile: Kan nie huidige gids verkry nie"
+msgid "E615: vim_SelFile: can't get current directory"
+msgstr "E615: vim_SelFile: Kan nie huidige gids verkry nie"
 
 msgid "OK"
 msgstr "OK"
 
-#. 'Cancel' button
 msgid "Cancel"
 msgstr "Kanselleer"
 
-msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-msgstr "Rolstaafelement: Kon nie pikselmatriks-duimnael se geometrie kry nie"
-
 msgid "Vim dialog"
 msgstr "Vim dialooghokkie"
 
+msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
+msgstr "Rolstaafelement: Kon nie pikselmatriks-duimnael se geometrie kry nie"
+
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: Kan nie BalloonEval skep met beide boodskap en terugroep nie"
 
+msgid "E229: Cannot start the GUI"
+msgstr "E229: Kan nie die GUI begin nie"
+
+#, c-format
+msgid "E230: Cannot read from \"%s\""
+msgstr "E230: Kan nie lees uit \"%s\" nie"
+
+msgid "E665: Cannot start GUI, no valid font found"
+msgstr "E665: Kan nie GUI begin nie, geen geldige font gevind nie"
+
+msgid "E231: 'guifontwide' invalid"
+msgstr "E231: 'guifontwide' ongeldig"
+
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: Waarde van 'imactivatekey' is ongeldig"
+
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: Kan nie kleur %s toeken nie"
+
 msgid "Vim dialog..."
 msgstr "Vim dialooghokkie..."
 
+msgid ""
+"&Yes\n"
+"&No\n"
+"&Cancel"
+msgstr ""
+"&Ja\n"
+"&Nee\n"
+"&Kanselleer"
+
+msgid "Input _Methods"
+msgstr "Invoer _Metodes"
+
 msgid "VIM - Search and Replace..."
 msgstr "VIM - Soek en Vervang..."
 
@@ -1520,10 +1711,14 @@ msgstr "Soek na:"
 msgid "Replace with:"
 msgstr "Vervang met:"
 
-#. exact match only button
-msgid "Match exact word only"
+#. whole word only button
+msgid "Match whole word only"
 msgstr "Tref slegs presiese woord"
 
+#. match case button
+msgid "Match case"
+msgstr "Tref kas"
+
 msgid "Direction"
 msgstr "Rigting"
 
@@ -1534,40 +1729,24 @@ msgstr "Op"
 msgid "Down"
 msgstr "Af"
 
-#. 'Find Next' button
 msgid "Find Next"
 msgstr "Vind volgende"
 
-#. 'Replace' button
 msgid "Replace"
 msgstr "Vervang"
 
-#. 'Replace All' button
 msgid "Replace All"
 msgstr "Vervang alles"
 
-msgid "E233: cannot open display"
-msgstr "E233: kan nie vertoonskerm oopmaak nie"
+msgid "Vim: Received \"die\" request from session manager\n"
+msgstr "Vim: Het die \"die\" opdrag ontvang van sessiebestuurder\n"
 
-#, c-format
-msgid "E234: Unknown fontset: %s"
-msgstr "E234: Onbekende fontstel: %s"
+msgid "Vim: Main window unexpectedly destroyed\n"
+msgstr "Vim: Hoofvenster onverwags verwoes\n"
 
 msgid "Font Selection"
 msgstr "Fontkeuse"
 
-#, c-format
-msgid "E235: Unknown font: %s"
-msgstr "E235: Onbekende font: %s"
-
-#, c-format
-msgid "E236: Font \"%s\" is not fixed-width"
-msgstr "E236: Font \"%s\" is nie 'n vaste-wydte font nie"
-
-#, c-format
-msgid "E242: Color name not recognized: %s"
-msgstr "E242: Kleurnaam is onbekend: %s"
-
 msgid "Used CUT_BUFFER0 instead of empty selection"
 msgstr "'CUT_BUFFER0' is gebruik in plaas van leë seleksie"
 
@@ -1589,17 +1768,11 @@ msgstr "Seleksie"
 msgid "Undo"
 msgstr "Herroep"
 
-#, c-format
-msgid "E235: Can't load Zap font '%s'"
-msgstr "E235: Kan nie Zap font '%s' laai nie"
-
-#, c-format
-msgid "E235: Can't use font %s"
-msgstr "E235: Kan nie font %s gebruik nie"
+msgid "E610: Can't load Zap font '%s'"
+msgstr "E610: Kan nie Zap font '%s' laai nie"
 
-#, c-format
-msgid "E242: Missing color: %s"
-msgstr "E242: Ontbrekende kleur: %s"
+msgid "E611: Can't use font %s"
+msgstr "E611: Kan nie font %s gebruik nie"
 
 msgid ""
 "\n"
@@ -1608,10 +1781,16 @@ msgstr ""
 "\n"
 "Besig om doodsboodskap aan kindproses te stuur.\n"
 
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: Kan nie venster titel vind nie \"%s\""
+
 #, c-format
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
 msgstr "E243: Parameter nie bekend: \"-%s\"; Gebruik die OLE weergawe."
 
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: Kon nie venster oopmaak binne 'n MDI toepassing nie"
+
 msgid "Find string (use '\\\\' to find  a '\\')"
 msgstr "Vind string (gebruik '\\\\' om 'n '\\' te vind"
 
@@ -1648,9 +1827,8 @@ msgstr "Font0: %s\n"
 msgid "Font1: %s\n"
 msgstr "Font1: %s\n"
 
-#, c-format
-msgid "Font%d width is not twice that of font0\n"
-msgstr "Font%d wydte is nie twee keer díe van font0 nie\n"
+msgid "Font%ld width is not twice that of font0\n"
+msgstr "Font%ld wydte is nie twee keer díe van font0 nie\n"
 
 #, c-format
 msgid "Font0 width: %ld\n"
@@ -1664,20 +1842,9 @@ msgstr ""
 "Font1 wydte: %ld\n"
 "\n"
 
-#, c-format
-msgid "E254: Cannot allocate color %s"
-msgstr "E254: Kan nie kleur %s toeken nie"
-
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: Fout -- kon nie tekendata lees nie!"
-
 msgid "E256: Hangul automata ERROR"
 msgstr "E256: Hangul outomatiserings FOUT"
 
-#, c-format
-msgid "Usage: cs[cope] %s"
-msgstr "Gebruik: cs[cope] %s"
-
 msgid "Add a new database"
 msgstr "Voeg 'n nuwe databasis by"
 
@@ -1696,103 +1863,112 @@ msgstr "Herstel alle verbindings"
 msgid "Show connections"
 msgstr "Wys verbindings"
 
+msgid "E560: Usage: cs[cope] %s"
+msgstr "E560: Gebruik: cs[cope] %s"
+
 msgid "This cscope command does not support splitting the window.\n"
 msgstr ""
 "Hierdie 'cscope' bevel ondersteun nie die splitsing van die venster nie.\n"
 
-msgid "Usage: cstag <ident>"
-msgstr "Gebruik: 'cstag <ident>'"
+msgid "E562: Usage: cstag <ident>"
+msgstr "E562: Gebruik: 'cstag <ident>'"
 
 msgid "E257: cstag: tag not found"
 msgstr "E257: 'cstag': etiket nie gevind nie"
 
-#, c-format
-msgid "stat(%s) error: %d"
-msgstr "'stat(%s)' fout: %d"
+msgid "E563: stat(%s) error: %d"
+msgstr "E563: 'stat(%s)' fout: %d"
+
+msgid "E563: stat error"
+msgstr "E563: 'stat' fout"
+
+msgid "E564: %s is not a directory or a valid cscope database"
+msgstr "E564: %s is nie 'n gids of 'n geldige 'cscope' databasis nie"
 
 #, c-format
 msgid "Added cscope database %s"
 msgstr "'cscope' databasis %s bygevoeg"
 
-#, c-format
-msgid "%s is not a directory or a valid cscope database"
-msgstr "%s is nie 'n gids of 'n geldige 'cscope' databasis nie"
+msgid "E262: error reading cscope connection %ld"
+msgstr "E262: 'cscope' verbinding %ld kon nie gelees word nie"
 
-#, c-format
-msgid "error reading cscope connection %d"
-msgstr "'cscope' verbinding %d kon nie gelees word nie"
+msgid "E561: unknown cscope search type"
+msgstr "E561: onbekende 'cscope' soektipe"
 
-msgid "unknown cscope search type"
-msgstr "onbekende 'cscope' soektipe"
+msgid "E566: Could not create cscope pipes"
+msgstr "E566: Kon nie 'cscope' pype skep nie"
 
-msgid "Could not create cscope pipes"
-msgstr "Kon nie 'cscope' pype skep nie"
+msgid "E622: Could not fork for cscope"
+msgstr "E622: Kon nie vurk vir 'cscope' nie"
 
 msgid "cs_create_connection exec failed"
 msgstr "'cs_create_connection' uitvoering het misluk"
 
+msgid "E623: Could not spawn cscope process"
+msgstr "E623: Kon nie 'cscope' proses skep nie"
+
 msgid "cs_create_connection: fdopen for to_fp failed"
 msgstr "'cs_create_connection': 'fdopen' vir 'to_fp' het misluk"
 
 msgid "cs_create_connection: fdopen for fr_fp failed"
 msgstr "'cs_create_connection': 'fdopen' vir 'fr_fp' het misluk"
 
-msgid "no cscope connections"
-msgstr "geen 'cscope' verbindings nie"
+msgid "E567: no cscope connections"
+msgstr "E567: geen 'cscope' verbindings nie"
 
 #, c-format
 msgid "E259: no matches found for cscope query %s of %s"
 msgstr "E259: geen treffers gevind vir 'cscope' versoek %s van %s nie"
 
+#, c-format
+msgid "E469: invalid cscopequickfix flag %c for %c"
+msgstr "E469: ongeldige 'cscopequickfix' vlag %c vir %c"
+
 msgid "cscope commands:\n"
 msgstr "'cscope' bevele:\n"
 
-#, c-format
-msgid "%-5s: %-30s (Usage: %s)\n"
-msgstr "%-5s: %-30s (Gebruik: %s)\n"
-
-msgid "duplicate cscope database not added"
-msgstr "duplikaat 'cscope' databasis nie bygevoeg nie"
+msgid "%-5s: %-30s (Usage: %s)"
+msgstr "%-5s: %-30s: (Gebruik: %s)"
 
-msgid "maximum number of cscope connections reached"
-msgstr "maksimum aantal 'cscope' verbindings bereik"
+msgid "E625: cannot open cscope database: %s"
+msgstr "E625: Kon nie 'cscope' databasis oopmaak nie: %s"
 
-msgid "E260: cscope connection not found"
-msgstr "E260: 'cscope' verbinding nie gevind nie"
+msgid "E626: cannot get cscope database information"
+msgstr "E626: kan nie 'cscope' databasisinligting kry nie"
 
-#, c-format
-msgid "E261: cscope connection %s not found"
-msgstr "E261: 'cscope' verbinding %s nie gevind nie"
+msgid "E568: duplicate cscope database not added"
+msgstr "E568: duplikaat 'cscope' databasis nie bygevoeg nie"
 
-msgid "cscope connection closed"
-msgstr "'cscope' verbinding gesluit"
+msgid "E569: maximum number of cscope connections reached"
+msgstr "E569: maksimum aantal 'cscope' verbindings bereik"
 
 #, c-format
-msgid "cscope connection %s closed\n"
-msgstr "'cscope' verbinding %s gesluit\n"
-
-#. should not reach here
-msgid "fatal error in cs_manage_matches"
-msgstr "fatale fout in 'cs_manage_matches'"
+msgid "E261: cscope connection %s not found"
+msgstr "E261: 'cscope' verbinding %s nie gevind nie"
 
-#, c-format
-msgid "E262: error reading cscope connection %d"
-msgstr "E262: 'cscope' verbinding %d kon nie gelees word nie"
+msgid "cscope connection %s closed"
+msgstr "'cscope' verbinding %s gesluit"
 
-# njj: dalk 'verbinding' ipv 'verbinding' orals?
-msgid "couldn't malloc\n"
-msgstr "kon nie 'malloc' nie\n"
+#. should not reach here
+msgid "E570: fatal error in cs_manage_matches"
+msgstr "E570: fatale fout in 'cs_manage_matches'"
 
-#, c-format
-msgid "Cscope tag: %s\n"
-msgstr "Cscope etiket: %s\n"
+msgid "Cscope tag: %s"
+msgstr "Cscope etiket: %s"
 
-msgid "   #   line"
-msgstr "   #   reël"
+msgid ""
+"\n"
+"   #   line"
+msgstr ""
+"\n"
+"   #   reël"
 
 msgid "filename / context / line\n"
 msgstr "lêernaam / konteks / reël\n"
 
+msgid "E609: Cscope error: %s"
+msgstr "E609: Cscope fout: %s"
+
 msgid "All cscope databases reset"
 msgstr "Alle 'cscope' databasisse herstel"
 
@@ -1802,10 +1978,6 @@ msgstr "geen 'cscope' verbindings nie\n"
 msgid " # pid    database name                       prepend path\n"
 msgstr " # pid    databasis naam                      gidsvoorvoegsel\n"
 
-#, c-format
-msgid "%2d %-5ld  %-34s  <none>\n"
-msgstr "%2d %-5ld  %-34s  <geen>\n"
-
 msgid ""
 "E263: Sorry, this command is disabled, the Python library could not be "
 "loaded."
@@ -1813,6 +1985,9 @@ msgstr ""
 "E263: Jammer, hierdie bevel is afgeskakel, die Python biblioteek lêer kon "
 "nie gelaai word nie."
 
+msgid "E659: Cannot invoke Python recursively"
+msgstr "E659: Kan nie Python rekursief roep nie"
+
 msgid "can't delete OutputObject attributes"
 msgstr "kan nie 'OutputObject' eienskappe skrap nie"
 
@@ -2044,10 +2219,11 @@ msgid "cannot register callback command: buffer/window reference not found"
 msgstr ""
 "kan terugroepbevel nie registreer nie: buffer/vensterverwysing nie gevind nie"
 
-msgid "Sorry, this command is disabled: the Tcl library could not be loaded."
+msgid ""
+"E571: Sorry, this command is disabled: the Tcl library could not be loaded."
 msgstr ""
-"Jammer, hierdie bevel is afgeskakel, die Tcl biblioteek kon nie gelaai "
-"wordnie."
+"E571: Jammer, hierdie bevel is afgeskakel, die Tcl biblioteek kon nie gelaai "
+"word nie."
 
 msgid ""
 "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
@@ -2061,19 +2237,11 @@ msgstr "kan nie re
 msgid "Unable to register a command server name"
 msgstr "Kon nie bevelbediener naam registreer nie"
 
-#, c-format
-msgid "E247: no registered server named \"%s\""
-msgstr "E247: geen geregistreerde bediener genaamd \"%s\""
-
 msgid "E248: Failed to send command to the destination program"
 msgstr "E248: Het gefaal om bevel na doel program te stuur"
 
-#, c-format
-msgid "Invalid server id used: %s"
-msgstr "Ongeldige bediener-id gebruik: %s"
-
-msgid "E249: couldn't read VIM instance registry property"
-msgstr "E249: kon nie VIM instansie register-kenmerk lees nie"
+msgid "E573: Invalid server id used: %s"
+msgstr "E573: Ongeldige bediener-id gebruik: %s"
 
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: VIM instansie register-kenmerk is swak gevorm. Geskrap!"
@@ -2090,8 +2258,8 @@ msgstr "Parameter ontbreek na"
 msgid "Garbage after option"
 msgstr "Gemors na opsie"
 
-msgid "Too many \"+command\" or \"-c command\" arguments"
-msgstr "Te veel \"+command\" of \"-c command\" parameters"
+msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
+msgstr "Te veel \"+command\", \"-c command\" of \"--cmd command\" parameters"
 
 msgid "Invalid argument for"
 msgstr "Ongeldige parameter vir"
@@ -2102,9 +2270,6 @@ msgstr "Hierdie Vim is nie gekompileer met 'diff' funksionaliteit nie."
 msgid "Attempt to open script file again: \""
 msgstr "Probeer weer om skriplêer oop te maak: \""
 
-msgid "\"\n"
-msgstr "\"\n"
-
 msgid "Cannot open for reading: \""
 msgstr "Kan nie oopmaak om te lees nie: \""
 
@@ -2179,6 +2344,9 @@ msgstr ""
 msgid "--\t\t\tOnly file names after this"
 msgstr "--\t\t\tSlegs lêername hierna"
 
+msgid "--literal\t\tDon't expand wildcards"
+msgstr "--literal\t\tMoet nie plekhouers uitbrei nie"
+
 msgid "-register\t\tRegister this gvim for OLE"
 msgstr "-register\t\tRegistreer hierdie gvim vir OLE"
 
@@ -2188,8 +2356,8 @@ msgstr "-unregister\t\tOnregistreer gvim vir OLE"
 msgid "-g\t\t\tRun using GUI (like \"gvim\")"
 msgstr "-g\t\t\tVoer uit met die GUI (soos \"gvim\")"
 
-msgid "-f\t\t\tForeground: Don't fork when starting GUI"
-msgstr "-f\t\t\tVoorgrond: Moenie vurk wanneer GUI begin nie"
+msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
+msgstr "-f  of  --nofork\tVoorgrond: Moenie vurk wanneer GUI begin nie"
 
 msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\t\tVi modus (soos \"vi\")"
@@ -2254,11 +2422,14 @@ msgstr "-f\t\t\tMoet nie 'newcli' gebruik om venster oop te maak nie"
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <toestel>\t\tGebruik <toestel> vir I/O"
 
-msgid "-H\t\t\tstart in Hebrew mode"
-msgstr "-H\t\t\tbegin in Hebreeuse modus"
+msgid "-A\t\t\tstart in Arabic mode"
+msgstr "-A\t\t\tbegin in Arabiese modus"
 
-msgid "-F\t\t\tstart in Farsi mode"
-msgstr "-F\t\t\tbegin in Farsi modus"
+msgid "-H\t\t\tStart in Hebrew mode"
+msgstr "-H\t\t\tBegin in Hebreeuse modus"
+
+msgid "-F\t\t\tStart in Farsi mode"
+msgstr "-F\t\t\tBegin in Farsi modus"
 
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminaal>\tStel terminaaltipe na <terminaal>"
@@ -2275,8 +2446,8 @@ msgstr "--noplugin\t\tMoet nie inpropskripte laai nie"
 msgid "-o[N]\t\tOpen N windows (default: one for each file)"
 msgstr "-o[N]\t\tMaak N vensters oop (verstek: een vir elke lêer)"
 
-msgid "-O[N]\t\tlike -o but split vertically"
-msgstr "-O[N]\t\tsoos -o maar verdeel vertikaal"
+msgid "-O[N]\t\tLike -o but split vertically"
+msgstr "-O[N]\t\tSoos -o maar verdeel vertikaal"
 
 msgid "+\t\t\tStart at end of file"
 msgstr "+\t\t\tBegin by einde van lêer"
@@ -2312,16 +2483,21 @@ msgstr "-display <display>\tKoppel vim aan hierdie X-bediener"
 msgid "-X\t\t\tDo not connect to X server"
 msgstr "-X\t\t\tMoet nie verbinding met X-bediener maak nie"
 
-msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-msgstr "--socketid <xid>\tMaak Vim in 'n ander GTK element oop"
+msgid "--remote <files>\tEdit <files> in a Vim server if possible"
+msgstr "--remote <lêers>\tWysig die <lêers> in a Vim bediener indien moontlik"
 
-msgid "--remote <files>\tEdit <files> in a Vim server and exit"
-msgstr "--remote <lêers>\tWysig die <lêers> in a Vim bediener en verlaat"
+msgid "--remote-silent <files>  Same, don't complain if there is no server"
+msgstr "--remote-silent <lêers>  Dieselfde, moet nie kla as daar nie so 'n bediener is nie"
 
 msgid ""
 "--remote-wait <files>  As --remote but wait for files to have been edited"
 msgstr ""
-"--remote-wait <lêers> Soos '--remote', maar wag vir lêers om gewysigte word"
+"--remote-wait <lêers> Soos '--remote', maar wag vir lêers om gewysig te word"
+
+msgid ""
+"--remote-wait-silent <files>  Same, don't complain if there is no server"
+msgstr ""
+"--remote-wait-silent <lêers>  Dieselfde, moet nie kla as daar nie so 'n bediener is nie"
 
 msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
 msgstr ""
@@ -2340,11 +2516,11 @@ msgstr "--servername <naam>\tStuur na/word die Vim-bediener <naam>"
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
 msgstr "-i <viminfo>\t\tGebruik <viminfo> in plaas van .viminfo"
 
-msgid "-h\t\t\tprint Help (this message) and exit"
-msgstr "-h\t\t\tskryf Hulp (hierdie boodskap) en sluit"
+msgid "-h  or  --help\tPrint Help (this message) and exit"
+msgstr "-h  of  --help\tSkryf Hulp (hierdie boodskap) en sluit"
 
-msgid "--version\t\tprint version information and exit"
-msgstr "--version\t\tskryf weergawe-inligting en sluit"
+msgid "--version\t\tPrint version information and exit"
+msgstr "--version\t\tSkryf weergawe-inligting en sluit"
 
 msgid ""
 "\n"
@@ -2353,6 +2529,13 @@ msgstr ""
 "\n"
 "Parameters deur gvim herken (Motif weergawe):\n"
 
+msgid ""
+"\n"
+"Arguments recognised by gvim (neXtaw version):\n"
+msgstr ""
+"\n"
+"Parameters deur gvim herken (neXtaw weergawe):\n"
+
 msgid ""
 "\n"
 "Arguments recognised by gvim (Athena version):\n"
@@ -2433,31 +2616,35 @@ msgstr ""
 msgid "-display <display>\tRun vim on <display> (also: --display)"
 msgstr "-display <skerm>\tVoer vim op <skerm> uit: (ook --display)"
 
-msgid "--help\t\tShow Gnome arguments"
-msgstr "--help\t\tWys Gnome parameters"
+msgid "--role <role>\tSet a unique role to identify the main window"
+msgstr "--role <rol>\tStel 'n unieke rol om die hoofvenster te identifiseer"
+
+msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
+msgstr "--socketid <xid>\tMaak Vim in 'n ander GTK element oop"
+
+msgid "-P <parent title>\tOpen Vim inside parent application"
+msgstr "-P <ouer title>\tMaak Vim oop binne 'n ouer toepassing"
+
+msgid "No display"
+msgstr "Geen vertoonskerm"
 
 #. Failed to send, abort.
-msgid ""
-"\n"
-"Send failed.\n"
-msgstr ""
-"\n"
-"Stuur het gefaal.\n"
+msgid ": Send failed.\n"
+msgstr ": Stuur het gefaal.\n"
 
 #. Let vim start normally.
-msgid ""
-"\n"
-"Send failed. Trying to execute locally\n"
-msgstr ""
-"\n"
-"Stuur het gefaal. Probeer om lokaal uit te voer\n"
+msgid ": Send failed. Trying to execute locally\n"
+msgstr ": Stuur het gefaal. Probeer om lokaal uit te voer\n"
 
 #, c-format
 msgid "%d of %d edited"
 msgstr "%d van %d lêers bewerk"
 
-msgid "Send expression failed.\n"
-msgstr "Stuur van uitdrukking het gefaal.\n"
+msgid "No display: Send expression failed.\n"
+msgstr "Geen vertoonskerm: Stuur van uitdrukking het gefaal.\n"
+
+msgid ": Send expression failed.\n"
+msgstr ": Stuur van uitdrukking het gefaal.\n"
 
 msgid "No marks set"
 msgstr "Geen merkers gestel nie"
@@ -2482,6 +2669,15 @@ msgstr ""
 "\n"
 " spring reël kol lêer/teks"
 
+#. Highlight title
+msgid ""
+"\n"
+"change line  col text"
+msgstr ""
+"\n"
+"verander reël  kol teks"
+
+#, c-format
 msgid ""
 "\n"
 "# File marks:\n"
@@ -2490,6 +2686,7 @@ msgstr ""
 "# Lêermerkers:\n"
 
 #. Write the jumplist with -'
+#, c-format
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
@@ -2497,6 +2694,7 @@ msgstr ""
 "\n"
 "# Springlys (nuutste eerste):\n"
 
+#, c-format
 msgid ""
 "\n"
 "# History of marks within files (newest to oldest):\n"
@@ -2507,8 +2705,8 @@ msgstr ""
 msgid "Missing '>'"
 msgstr "Ontbrekende '>'"
 
-msgid "Not a valid codepage"
-msgstr "Nie 'n geldige kodeblad nie"
+msgid "E543: Not a valid codepage"
+msgstr "E543: Nie 'n geldige kodeblad nie"
 
 msgid "E284: Cannot set IC values"
 msgstr "E284: Kan nie IC waardes stel nie"
@@ -2673,6 +2871,9 @@ msgid ""
 msgstr ""
 "E312: Foute raakgesien gedurende herwinning; soek vir reëls wat begin met ???"
 
+msgid "See \":help E312\" for more information."
+msgstr "Sien \":help E312\" vir meer inligting."
+
 msgid "Recovery completed. You should check if everything is OK."
 msgstr "Herwinning is klaar. Kyk of alles reg is."
 
@@ -2918,11 +3119,13 @@ msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
 "&Recover\n"
-"&Quit"
+"&Quit\n"
+"&Abort"
 msgstr ""
 "&Maak as lees-alleen oop\n"
 "&Bewerk in elk geval\n"
 "&Herwin\n"
+"&Verlaat\n"
 "&Stop"
 
 msgid ""
@@ -2930,11 +3133,13 @@ msgid ""
 "&Edit anyway\n"
 "&Recover\n"
 "&Quit\n"
+"&Abort\n"
 "&Delete it"
 msgstr ""
 "&Maak as lees-alleen oop\n"
 "&Bewerk in elk geval\n"
 "&Herwin\n"
+"&Verlaat\n"
 "&Stop\n"
 "S&krap dit"
 
@@ -3030,15 +3235,6 @@ msgstr ""
 "&Ja\n"
 "&Nee"
 
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"&Ja\n"
-"&Nee\n"
-"&Kanselleer"
-
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -3089,6 +3285,7 @@ msgstr "Vim: bewaar l
 msgid "Vim: Finished.\n"
 msgstr "Vim: Klaar.\n"
 
+#, c-format
 msgid "ERROR: "
 msgstr "FOUT: "
 
@@ -3123,20 +3320,20 @@ msgstr "E342: Geheue is op! (ken %lu grepe toe)"
 msgid "Calling shell to execute: \"%s\""
 msgstr "Roep dop om uit te voer: \"%s\""
 
-msgid "Missing colon"
-msgstr "Ontbrekende dubbelpunt"
+msgid "E545: Missing colon"
+msgstr "E545: Ontbrekende dubbelpunt"
 
-msgid "Illegal mode"
-msgstr "Ongeldige modus"
+msgid "E546: Illegal mode"
+msgstr "E546: Ongeldige modus"
 
-msgid "Illegal mouseshape"
-msgstr "Ongeldige muisvorm"
+msgid "E547: Illegal mouseshape"
+msgstr "E547: Ongeldige muisvorm"
 
-msgid "digit expected"
-msgstr "syfer verwag"
+msgid "E548: digit expected"
+msgstr "E548: syfer verwag"
 
-msgid "Illegal percentage"
-msgstr "Ongeldige persentasie"
+msgid "E549: Illegal percentage"
+msgstr "E549: Ongeldige persentasie"
 
 msgid "Enter encryption key: "
 msgstr "Voer enkripsie-sleutel in: "
@@ -3171,8 +3368,31 @@ msgstr "E346: Geen gids \"%s\" meer gevind in 'cdpath' nie"
 msgid "E347: No more file \"%s\" found in path"
 msgstr "E347: Geen lêer \"%s\" meer gevind in pad nie"
 
-msgid "Illegal component"
-msgstr "Ongeldige komponent"
+msgid "E550: Missing colon"
+msgstr "E550: Ontbrekende dubbelpunt"
+
+msgid "E551: Illegal component"
+msgstr "E551: Ongeldige komponent"
+
+msgid "E552: digit expected"
+msgstr "E552: syfer verwag"
+
+#. Get here when the server can't be found.
+msgid "Cannot connect to Netbeans #2"
+msgstr "Kan nie aan Netbeans #2 koppel nie"
+
+msgid "Cannot connect to Netbeans"
+msgstr "Kan nie aan Netbeans koppel nie"
+
+#, c-format
+msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
+msgstr "E668: Verkeerde toegangsmodue vir NetBeans konneksie inligtingslêer: \"%s\""
+
+msgid "read from Netbeans socket"
+msgstr "lees vanaf Netbeans 'socket'"
+
+msgid "E658: NetBeans connection lost for buffer %ld"
+msgstr "E658: NetBeans konneksie vir buffer %ld verloor"
 
 msgid "Warning: terminal cannot highlight"
 msgstr "Waarskuwing: terminaal kan nie teks uitlig nie"
@@ -3186,6 +3406,18 @@ msgstr "E349: Geen identifiseerder onder loper nie"
 msgid "E352: Cannot erase folds with current 'foldmethod'"
 msgstr "E352: Kan nie voue verwyder met huidige 'foldmethod' nie"
 
+msgid "E664: changelist is empty"
+msgstr "E664: 'changelist' is leeg"
+
+msgid "E662: At start of changelist"
+msgstr "E662: By die begin van die veranderingslys"
+
+msgid "E663: At end of changelist"
+msgstr "E663: By die einde van die veranderingslys"
+
+msgid "Type  :quit<Enter>  to exit Vim"
+msgstr "Tik   :quit<Enter>  om Vim te verlaat"
+
 # Het te doen met < en >
 #, c-format
 msgid "1 line %sed 1 time"
@@ -3218,12 +3450,11 @@ msgstr "%ld re
 msgid "cannot yank; delete anyway"
 msgstr "kan nie pluk nie: verwyder in elk geval"
 
-msgid "1 line ~ed"
-msgstr "1 reël ge-~"
+msgid "1 line changed"
+msgstr "1 reël verander"
 
-#, c-format
-msgid "%ld lines ~ed"
-msgstr "%ld reëls ge-~"
+msgid "%ld lines changed"
+msgstr "%ld reëls verander"
 
 #, c-format
 msgid "freeing %ld lines"
@@ -3251,6 +3482,7 @@ msgstr ""
 msgid "Illegal register name"
 msgstr "Ongeldige registernaam"
 
+#, c-format
 msgid ""
 "\n"
 "# Registers:\n"
@@ -3258,9 +3490,8 @@ msgstr ""
 "\n"
 "# Registers:\n"
 
-#, c-format
-msgid "Unknown register type %d"
-msgstr "Onbekende registertipe %d"
+msgid "E574: Unknown register type %d"
+msgstr "E574: Onbekende registertipe %d"
 
 #, c-format
 msgid "E354: Invalid register name: '%s'"
@@ -3283,14 +3514,20 @@ msgstr "Kol %s van %s; Re
 msgid "(+%ld for BOM)"
 msgstr "(+%ld vir 'BOM')"
 
+msgid "%<%f%h%m%=Page %N"
+msgstr "%<%f%h%m%=Bladsy %N"
+
 msgid "Thanks for flying Vim"
 msgstr "Dankie dat jy vlieg met Vim"
 
-msgid "Option not supported"
-msgstr "Opsie is nie ondersteun nie"
+msgid "E518: Unknown option"
+msgstr "E518: Onbekende opsie"
 
-msgid "Not allowed in a modeline"
-msgstr "Nie toegelaat in 'n moduslyn nie"
+msgid "E519: Option not supported"
+msgstr "E519: Opsie is nie ondersteun nie"
+
+msgid "E520: Not allowed in a modeline"
+msgstr "E520: Nie toegelaat in 'n moduslyn nie"
 
 msgid ""
 "\n"
@@ -3299,101 +3536,95 @@ msgstr ""
 "\n"
 "\tLaas gestel vanaf "
 
-msgid "Number required after ="
-msgstr "Nommer vereis na ="
+msgid "E521: Number required after ="
+msgstr "E521: Nommer vereis na ="
 
-msgid "Not found in termcap"
-msgstr "Nie gevind in 'termcap' nie"
+msgid "E522: Not found in termcap"
+msgstr "E522: Nie gevind in 'termcap' nie"
 
-#, c-format
-msgid "Illegal character <%s>"
-msgstr "Ongeldige karakter <%s>"
+msgid "E539: Illegal character <%s>"
+msgstr "E539: Ongeldige karakter <%s>"
 
-msgid "Not allowed here"
-msgstr "Nie hier toegelaat nie"
+msgid "E529: Cannot set 'term' to empty string"
+msgstr "E529: Kan nie 'term' stel na leë string nie"
 
-msgid "Cannot set 'term' to empty string"
-msgstr "Kan nie 'term' stel na leë string nie"
+msgid "E530: Cannot change term in GUI"
+msgstr "E530: Kan nie 'term' verander in GUI nie"
 
-msgid "Cannot change term in GUI"
-msgstr "Kan nie 'term' verander in GUI nie"
+msgid "E531: Use \":gui\" to start the GUI"
+msgstr "E531: Gebruik \":gui\" om die GUI te begin"
 
-msgid "Use \":gui\" to start the GUI"
-msgstr "Gebruik \":gui\" om die GUI te begin"
+msgid "E589: 'backupext' and 'patchmode' are equal"
+msgstr "E589: 'backupext' en 'patchmode' is dieselfde"
 
-msgid "'backupext' and 'patchmode' are equal"
-msgstr "'backupext' en 'patchmode' is dieselfde"
+msgid "E617: Cannot be changed in the GTK+ 2 GUI"
+msgstr "E617: Kan nie 'term' verander in die GTK+ 2 GUI nie"
 
-msgid "Zero length string"
-msgstr "Nul-lengte string"
+msgid "E524: Missing colon"
+msgstr "E524: Ontbrekende dubbelpunt"
 
-#, c-format
-msgid "Missing number after <%s>"
-msgstr "Ontbrekende nommer na <%s>"
+msgid "E525: Zero length string"
+msgstr "E525: Nul-lengte string"
 
-msgid "Missing comma"
-msgstr "Ontbrekende komma"
+msgid "E526: Missing number after <%s>"
+msgstr "E526: Ontbrekende nommer na <%s>"
 
-msgid "Must specify a ' value"
-msgstr "Moet 'n ' waarde spesifiseer"
+msgid "E527: Missing comma"
+msgstr "E527: Ontbrekende komma"
 
-msgid "contains unprintable character"
-msgstr "bevat 'n ondrukbare karakter"
+msgid "E528: Must specify a ' value"
+msgstr "E528: Moet 'n ' waarde spesifiseer"
 
-msgid "Invalid font(s)"
-msgstr "Ongeldige font(e)"
+msgid "E595: contains unprintable or wide character"
+msgstr "E595: bevat 'n ondrukbare of wye karakter"
 
-msgid "can't select fontset"
-msgstr "kan nie fontstel kies nie"
+msgid "E596: Invalid font(s)"
+msgstr "E596: Ongeldige font(e)"
 
-msgid "Invalid fontset"
-msgstr "Ongeldige fontstel"
+msgid "E597: can't select fontset"
+msgstr "E597: kan nie fontstel kies nie"
 
-msgid "can't select wide font"
-msgstr "kan nie wye font kies nie"
+msgid "E598: Invalid fontset"
+msgstr "E598: Ongeldige fontstel"
 
-msgid "Invalid wide font"
-msgstr "Ongeldige wye font"
+msgid "E533: can't select wide font"
+msgstr "E533: kan nie wye font kies nie"
 
-#, c-format
-msgid "Illegal character after <%c>"
-msgstr "Ongeldige karakter na <%c>"
+msgid "E534: Invalid wide font"
+msgstr "E534: Ongeldige wye font"
 
-msgid "comma required"
-msgstr "komma benodig"
+msgid "E535: Illegal character after <%c>"
+msgstr "E535: Ongeldige karakter na <%c>"
 
-#, c-format
-msgid "'commentstring' must be empty or contain %s"
-msgstr "'commentstring' moet leeg wees of %s bevat"
+msgid "E536: comma required"
+msgstr "E536: komma benodig"
 
-msgid "No mouse support"
-msgstr "Geen muisondersteuning nie"
+msgid "E537: 'commentstring' must be empty or contain %s"
+msgstr "E537: 'commentstring' moet leeg wees of %s bevat"
 
-msgid "Unclosed expression sequence"
-msgstr "Onvoltooide uitdrukkingreeks"
+msgid "E538: No mouse support"
+msgstr "E538: Geen muisondersteuning nie"
 
-msgid "too many items"
-msgstr "te veel items"
+msgid "E540: Unclosed expression sequence"
+msgstr "E540: Onvoltooide uitdrukkingreeks"
 
-msgid "unbalanced groups"
-msgstr "ongebalanseerde groepe"
+msgid "E541: too many items"
+msgstr "E541: te veel items"
 
-msgid "A preview window already exists"
-msgstr "Daar bestaan reeds 'n voorskouvenster"
+msgid "E542: unbalanced groups"
+msgstr "E542: ongebalanseerde groepe"
 
-msgid "'winheight' cannot be smaller than 'winminheight'"
-msgstr "'winheight' kan nie kleiner as 'winminheight' wees nie"
+msgid "E590: A preview window already exists"
+msgstr "E590: Daar bestaan reeds 'n voorskouvenster"
 
-msgid "'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "'winwidth' kan nie kleiner as 'winminwidth' wees nie"
+msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
+msgstr "W17: Arabies benodig UTF-8, doen ':set encoding=utf-8'"
 
-#, c-format
-msgid "Need at least %d lines"
-msgstr "Benodig ten minste %d reëls"
+msgid "E593: Need at least %d lines"
+msgstr "E593: Benodig ten minste %d reëls"
 
-#, c-format
-msgid "Need at least %d columns"
-msgstr "Benodig ten minste %d kolomme"
+msgid "E594: Need at least %d columns"
+msgstr "E594: Benodig ten minste %d kolomme"
 
 #, c-format
 msgid "E355: Unknown option: %s"
@@ -3464,9 +3695,6 @@ msgstr "Vim stop met %d\n"
 msgid "cannot change console mode ?!\n"
 msgstr "kan konsole-modus nie verander nie ?!\n"
 
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: Skermmodus instelling nie ondersteun nie"
-
 msgid "mch_get_shellsize: not a console??\n"
 msgstr "'mch_get_shellsize': nie 'n konsole nie??\n"
 
@@ -3495,10 +3723,6 @@ msgstr "...(afgekap)"
 msgid "'columns' is not 80, cannot execute external commands"
 msgstr "'columns' is nie 80 nie, kan nie eksterne bevele uitvoer nie"
 
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: Biblioteekroep het gefaal vir \"%s\"()"
-
 msgid "E237: Printer selection failed"
 msgstr "E237: Drukker-seleksie het gefaal"
 
@@ -3506,6 +3730,9 @@ msgstr "E237: Drukker-seleksie het gefaal"
 msgid "to %s on %s"
 msgstr "na %s op %s"
 
+msgid "E613: Unknown printer font: %s"
+msgstr "E613: Onbekende drukker font: %s"
+
 #, c-format
 msgid "E238: Print error: %s"
 msgstr "E238: Drukfout: %s"
@@ -3535,6 +3762,7 @@ msgstr "Vim: Dubbel sein, staak\n"
 msgid "Vim: Caught deadly signal %s\n"
 msgstr "Vim: Het dodelike sein %s gevang\n"
 
+#, c-format
 msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: Het dodelike sein gevang\n"
 
@@ -3597,18 +3825,37 @@ msgstr ""
 "\n"
 "Bevel beëindig\n"
 
+msgid "XSMP lost ICE connection"
+msgstr "XSMP het ICE konneksie verloor"
+
 msgid "Opening the X display failed"
 msgstr "Oopmaak van die X vertoonskerm het gefaal"
 
+msgid "XSMP handling save-yourself request"
+msgstr "XSMP hanteer 'save-yourself' versoek"
+
+msgid "XSMP opening connection"
+msgstr "XSMP maak nou konneksie oop"
+
+msgid "XSMP ICE connection watch failed"
+msgstr "XSMP ICE konneksie beloer het gefaal"
+
+#, c-format
+msgid "XSMP SmcOpenConnection failed: %s"
+msgstr "XSMP 'SmcOpenConnection' het gefaal: %s"
+
 msgid "At line"
 msgstr "By reël"
 
-msgid "Could not load vim32.dll!"
-msgstr "Kon nie 'vim32.dll' laai nie!"
+msgid "Could not allocate memory for command line."
+msgstr "Kan nie geheue toeken vir bevelreël nie"
 
 msgid "VIM Error"
 msgstr "VIM Fout"
 
+msgid "Could not load vim32.dll!"
+msgstr "Kon nie 'vim32.dll' laai nie!"
+
 msgid "Could not fix up function pointers to the DLL!"
 msgstr "Kon nie funksiewysers na die DLL opstel nie!"
 
@@ -3673,8 +3920,8 @@ msgstr "E378: 'errorformat' bevat geen patroon nie"
 msgid "E379: Missing or empty directory name"
 msgstr "E379: Ontbrekende of leë gidsnaam"
 
-msgid "No more items"
-msgstr "Geen items meer nie"
+msgid "E553: No more items"
+msgstr "E553: Geen items meer nie"
 
 #, c-format
 msgid "(%d of %d)%s%s: "
@@ -3696,9 +3943,45 @@ msgstr "foutelys %d van %d; %d foute"
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: Kan nie skryf nie, 'buftype' opsie is aan"
 
+msgid "E369: invalid item in %s%%[]"
+msgstr "E369: ongeldige item in %s%%[]"
+
 msgid "E339: Pattern too long"
 msgstr "E339: Patroon te lank"
 
+msgid "E50: Too many \\z("
+msgstr "E50: Te veel \\z("
+
+msgid "E51: Too many %s("
+msgstr "E51: Te veel %s("
+
+msgid "E52: Unmatched \\z("
+msgstr "E52: Onpaar \\z("
+
+msgid "E53: Unmatched %s%%("
+msgstr "E53: Onpaar %s%%("
+
+msgid "E54: Unmatched %s("
+msgstr "E54: Onpaar %s("
+
+msgid "E55: Unmatched %s)"
+msgstr "E55: Onpaar %s)"
+
+msgid "E56: %s* operand could be empty"
+msgstr "E56: %s* operand mag leeg wees"
+
+msgid "E57: %s+ operand could be empty"
+msgstr "E57: %s+ operand mag leeg wees"
+
+msgid "E59: invalid character after %s@"
+msgstr "E59: ongeldige karakter na %s@"
+
+msgid "E58: %s{ operand could be empty"
+msgstr "E58: %s{ operand mag leeg wees"
+
+msgid "E60: Too many complex %s{...}s"
+msgstr "E60: Te veel komplekse %s{...}ies"
+
 #, c-format
 msgid "E61: Nested %s*"
 msgstr "E61: Geneste %s*"
@@ -3707,13 +3990,36 @@ msgstr "E61: Geneste %s*"
 msgid "E62: Nested %s%c"
 msgstr "E62: Geneste %s%c"
 
+msgid "E63: invalid use of \\_"
+msgstr "E63: ongeldige gebruik van \\_"
+
 #, c-format
 msgid "E64: %s%c follows nothing"
 msgstr "E64: %s%c volg niks"
 
-#, c-format
-msgid "Syntax error in %s{...}"
-msgstr "Sintaksfout in %s{...}"
+msgid "E65: Illegal back reference"
+msgstr "E65: Ongeldige tru-verwysing"
+
+msgid "E66: \\z( not allowed here"
+msgstr "E66: \\z( nie hier toegelaat nie"
+
+msgid "E67: \\z1 et al. not allowed here"
+msgstr "E67: \\z1 e.a. nie hier toegelaat nie"
+
+msgid "E68: Invalid character after \\z"
+msgstr "E68: ongeldige karakter na \\z"
+
+msgid "E69: Missing ] after %s%%["
+msgstr "E69: Ontbrekende ] na %s%%["
+
+msgid "E70: Empty %s%%[]"
+msgstr "E70: Leë %s%%[]"
+
+msgid "E71: Invalid character after %s%%"
+msgstr "E71: Ongeldige karakter na %s%%"
+
+msgid "E554: Syntax error in %s{...}"
+msgstr "E554: Sintaksfout in %s{...}"
 
 msgid "E361: Crash intercepted; regexp too complex?"
 msgstr "E361: Ineenstorting onderskep. Patroon te kompleks?"
@@ -3752,23 +4058,32 @@ msgstr " (vvervang)"
 msgid " Hebrew"
 msgstr " Hebreeus"
 
+msgid " Arabic"
+msgstr " Arabies"
+
 msgid " (lang)"
 msgstr " (taal)"
 
 msgid " (paste)"
 msgstr " (plak)"
 
-msgid " SELECT"
-msgstr " KIES"
-
 msgid " VISUAL"
 msgstr " VISUELE"
 
-msgid " BLOCK"
-msgstr " BLOK"
+msgid " VISUAL LINE"
+msgstr " VISUELE REËL"
 
-msgid " LINE"
-msgstr " REËL"
+msgid " VISUAL BLOCK"
+msgstr " VISUELE BLOK"
+
+msgid " SELECT"
+msgstr " KIES"
+
+msgid " SELECT LINE"
+msgstr " KIES REËL"
+
+msgid " SELECT BLOCK"
+msgstr " KIES BLOK"
 
 msgid "recording"
 msgstr "besig om op te neem"
@@ -3886,6 +4201,12 @@ msgstr "minimaal "
 msgid "maximal "
 msgstr "maksimaal "
 
+msgid "; match "
+msgstr "; treffer "
+
+msgid " line breaks"
+msgstr " reël breuke"
+
 msgid "E393: group[t]here not accepted here"
 msgstr "E393: 'group[t]here' nie hier aanvaar nie"
 
@@ -3952,6 +4273,9 @@ msgstr "E409: Onbekende groepnaam: %s"
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: Ongeldige :syntax subbevel %s"
 
+msgid "E679: recursive loop loading syncolor.vim"
+msgstr "E679: rekursiewe lus gedurende laai van syncolor.vim"
+
 #, c-format
 msgid "E411: highlight group not found: %s"
 msgstr "E411: uitliggroep nie gevind nie: %s"
@@ -4005,12 +4329,19 @@ msgstr "E423: Ongeldige parameter: %s"
 msgid "E424: Too many different highlighting attributes in use"
 msgstr "E424: Te veel verskillende uitlig-eienskappe in gebruik"
 
-# njj: 'inkleur' vir 'uitlig'? net 'n idee ..
-msgid "at bottom of tag stack"
-msgstr "onderaan etiketstapel"
+msgid "E669: Unprintable character in group name"
+msgstr "E669: Onvertoonbare karakter in groepnaam"
 
-msgid "at top of tag stack"
-msgstr "bo-aan etiketstapel"
+#. This is an error, but since there previously was no check only
+#. * give a warning.
+msgid "W18: Invalid character in group name"
+msgstr "W18: Ongeldige karakter groepnaam"
+
+msgid "E555: at bottom of tag stack"
+msgstr "E555: onderaan etiketstapel"
+
+msgid "E556: at top of tag stack"
+msgstr "E556: bo-aan etiketstapel"
 
 msgid "E425: Cannot go before first matching tag"
 msgstr "E425: Kan nie vóór eerste etiket-treffer gaan nie"
@@ -4065,12 +4396,6 @@ msgstr ""
 "\n"
 "  # NA etiket      VAN reël   in lêer/teks"
 
-msgid "Linear tag search"
-msgstr "Liniêre etiketsoek"
-
-msgid "Binary tag search"
-msgstr "Binêre etiketsoek"
-
 #, c-format
 msgid "Searching tags file %s"
 msgstr "Deursoek etiketlêer %s"
@@ -4107,14 +4432,14 @@ msgstr "' onbekend. Beskikbare ingeboude terminale is:"
 msgid "defaulting to '"
 msgstr "gebruik verstek '"
 
-msgid "Cannot open termcap file"
-msgstr "Kan nie 'termcap'-lêer oopmaak nie"
+msgid "E557: Cannot open termcap file"
+msgstr "E557: Kan nie 'termcap'-lêer oopmaak nie"
 
-msgid "Terminal entry not found in terminfo"
-msgstr "Terminaalinskrywing nie in 'terminfo' gevind nie"
+msgid "E558: Terminal entry not found in terminfo"
+msgstr "E558: Terminaalinskrywing nie in 'terminfo' gevind nie"
 
-msgid "Terminal entry not found in termcap"
-msgstr "Terminaalinskrywing nie in 'termcap' gevind nie"
+msgid "E559: Terminal entry not found in termcap"
+msgstr "E559: Terminaalinskrywing nie in 'termcap' gevind nie"
 
 #, c-format
 msgid "E436: No \"%s\" entry in termcap"
@@ -4241,6 +4566,9 @@ msgstr ""
 "\n"
 "Ingeslote laslappies:"
 
+msgid "Modified by "
+msgstr "Gewysig deur "
+
 msgid ""
 "\n"
 "Compiled "
@@ -4289,15 +4617,24 @@ msgstr ""
 msgid "without GUI."
 msgstr "sonder GUI."
 
+msgid "with GTK2-GNOME GUI."
+msgstr "met GTK2-GNOME GUI."
+
 msgid "with GTK-GNOME GUI."
 msgstr "met GTK-GNOME GUI."
 
+msgid "with GTK2 GUI."
+msgstr "met GTK2 GUI"
+
 msgid "with GTK GUI."
 msgstr "met GTK GUI"
 
 msgid "with X11-Motif GUI."
 msgstr "met X11-Motif GUI."
 
+msgid "with X11-neXtaw GUI."
+msgstr "met X11-neXtaw GUI"
+
 msgid "with X11-Athena GUI."
 msgstr "met X11-Athena GUI"
 
@@ -4410,6 +4747,39 @@ msgstr "tik   :set nocp<Enter>        vir Vim verstekwaardes   "
 msgid "type  :help cp-default<Enter> for info on this"
 msgstr "tik   :help cp-default<Enter> vir meer inligting hieroor"
 
+msgid "menu  Help->Orphans           for information    "
+msgstr "menu  Hulp->Weeskinders       vir meer inligting hieroor "
+
+msgid "Running modeless, typed text is inserted"
+msgstr "Voer modus-loos uit, getikte teks word ingevoeg"
+
+msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
+msgstr "menu  Redigeer->Globale verstellings->Stel en herstel Invoeg Modus"
+
+msgid "                              for two modes      "
+msgstr "                              vir twee modusse   "
+
+msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
+msgstr "menu  Redigeer->Global verstellings->Stel en herstel Vi Versoenbaar"
+
+msgid "                              for Vim defaults   "
+msgstr "                              vir Vim verstekwaardes"
+
+msgid "Sponsor Vim development!"
+msgstr "Borg Vim ontwikkeling!"
+
+msgid "Become a registered Vim user!"
+msgstr "Word 'n geregistreerde Vim gebruiker!"
+
+msgid "type  :help sponsor<Enter>    for information "
+msgstr "tik   :help sponsor<Enter>    vir meer inligting hieroor "
+
+msgid "type  :help register<Enter>   for information "
+msgstr "tik   :help register<Enter>   vir meer inligting hieroor "
+
+msgid "menu  Help->Sponsor/Register  for information    "
+msgstr "menu  Hulp->Borg/Registreer   vir meer inligting"
+
 msgid "WARNING: Windows 95/98/ME detected"
 msgstr "WAARSKUWING: Windows 95/98/ME bespeur"
 
@@ -4441,12 +4811,26 @@ msgstr "E446: Geen l
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: Kan lêer \"%s\" nie vind in pad nie"
 
+msgid "E370: Could not load library %s"
+msgstr "E370: Kon nie biblioteek laai nie %s"
+
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr ""
+"Jammer, hierdie bevel is afgeskakel: die Perl biblioteek kon nie gelaai "
+"word nie."
+
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr "E299: Perl evaluasie verbied in die sandput sonder die 'Safe' module"
+
 msgid "Edit with &multiple Vims"
 msgstr "Wysig met &meer as een Vim"
 
 msgid "Edit with single &Vim"
 msgstr "Wysig met 'n enkel &Vim"
 
+msgid "&Diff with Vim"
+msgstr "Wys verskille ('&diff') met Vim"
+
 msgid "Edit with &Vim"
 msgstr "Wysig met &Vim"
 
@@ -4473,11 +4857,11 @@ msgstr "--Geen re
 #. * The error messages that can be shared are included here.
 #. * Excluded are errors that are only used once and debugging messages.
 #.
-msgid "Command aborted"
-msgstr "Bevel gekansellleer"
+msgid "E470: Command aborted"
+msgstr "E470: Bevel gekanselleer"
 
-msgid "Argument required"
-msgstr "Parameter benodig"
+msgid "E471: Argument required"
+msgstr "E471: Parameter benodig"
 
 msgid "E10: \\ should be followed by /, ? or &"
 msgstr "E10: \\ moet gevolg word deur /, ? of &"
@@ -4489,14 +4873,38 @@ msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
 msgstr ""
 "E12: Bevel uit exrc/vimrc nie toegelaat in huidige gids- of etiketsoektog nie"
 
+msgid "E171: Missing :endif"
+msgstr "E171: Ontbrekende ':endif'"
+
+msgid "E600: Missing :endtry"
+msgstr "E600: Ontbrekende ':endtry'"
+
+msgid "E170: Missing :endwhile"
+msgstr "E170: Ontbrekende ':endwhile'"
+
+msgid "E588: :endwhile without :while"
+msgstr "E588: ':endwhile' sonder ':while'"
+
 msgid "E13: File exists (add ! to override)"
 msgstr "E13: Lêer bestaan (gebruik ! om te dwing)"
 
-msgid "Command failed"
-msgstr "Bevel het gefaal"
+msgid "E472: Command failed"
+msgstr "E472: Bevel het gefaal"
 
-msgid "Internal error"
-msgstr "Interne fout"
+#, c-format
+msgid "E234: Unknown fontset: %s"
+msgstr "E234: Onbekende fontstel: %s"
+
+#, c-format
+msgid "E235: Unknown font: %s"
+msgstr "E235: Onbekende font: %s"
+
+#, c-format
+msgid "E236: Font \"%s\" is not fixed-width"
+msgstr "E236: Font \"%s\" is nie 'n vaste-wydte font nie"
+
+msgid "E473: Internal error"
+msgstr "E473: Interne fout"
 
 msgid "Interrupted"
 msgstr "Onderbreek"
@@ -4504,12 +4912,11 @@ msgstr "Onderbreek"
 msgid "E14: Invalid address"
 msgstr "E14: Ongeldige adres"
 
-msgid "Invalid argument"
-msgstr "Ongeldige parameter"
+msgid "E474: Invalid argument"
+msgstr "E474: Ongeldige parameter"
 
-#, c-format
-msgid "Invalid argument: %s"
-msgstr "Ongeldige parameter: %s"
+msgid "E475: Invalid argument: %s"
+msgstr "E475: Ongeldige parameter: %s"
 
 #, c-format
 msgid "E15: Invalid expression: %s"
@@ -4518,8 +4925,8 @@ msgstr "E15: Ongeldige uitdrukking: %s"
 msgid "E16: Invalid range"
 msgstr "E16: Ongeldige omvang"
 
-msgid "Invalid command"
-msgstr "Ongeldige bevel"
+msgid "E476: Invalid command"
+msgstr "E476: Ongeldige bevel"
 
 #, c-format
 msgid "E17: \"%s\" is a directory"
@@ -4528,6 +4935,14 @@ msgstr "E17: \"%s\" is 'n gids"
 msgid "E18: Unexpected characters before '='"
 msgstr "E18: Onverwagte karakters voor '='"
 
+#, c-format
+msgid "E364: Library call failed for \"%s()\""
+msgstr "E364: Biblioteekroep het gefaal vir \"%s\"()"
+
+#, c-format
+msgid "E448: Could not load library function %s"
+msgstr "E448: Kon nie biblioteek funksie laai nie %s"
+
 msgid "E19: Mark has invalid line number"
 msgstr "E19: Merker het ongeldige reëlnommer"
 
@@ -4546,8 +4961,8 @@ msgstr "E23: Geen alternatiewe l
 msgid "E24: No such abbreviation"
 msgstr "E24: Afkorting bestaan nie"
 
-msgid "No ! allowed"
-msgstr "Geen ! toegelaat nie"
+msgid "E477: No ! allowed"
+msgstr "E477: Geen ! toegelaat nie"
 
 msgid "E25: GUI cannot be used: Not enabled at compile time"
 msgstr "E25: GUI kan nie gebruik word nie: Nie tydens kompilering gekies nie"
@@ -4560,6 +4975,10 @@ msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
 msgstr ""
 "E27: Farsi kan nie gebruik word nie: Nie tydens kompilering gekies nie\n"
 
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr ""
+"E800: Arabies kan nie gebruik word nie: Nie tydens kompilering gekies nie\n"
+
 #, c-format
 msgid "E28: No such highlight group name: %s"
 msgstr "E28: Geen sodanige uitliggroepnaam nie: %s"
@@ -4573,12 +4992,11 @@ msgstr "E30: Geen vorige bevelre
 msgid "E31: No such mapping"
 msgstr "E31: Geen so 'n binding nie"
 
-msgid "No match"
-msgstr "Geen treffer nie"
+msgid "E479: No match"
+msgstr "E479: Geen treffer nie"
 
-#, c-format
-msgid "No match: %s"
-msgstr "Geen treffer: %s"
+msgid "E480: No match: %s"
+msgstr "E480: Geen treffer: %s"
 
 msgid "E32: No file name"
 msgstr "E32: Geen lêernaam"
@@ -4592,35 +5010,34 @@ msgstr "E34: Geen vorige bevel nie"
 msgid "E35: No previous regular expression"
 msgstr "E35: Geen vorige patroon nie"
 
-msgid "No range allowed"
-msgstr "Geen omvang toegelaat nie"
+msgid "E481: No range allowed"
+msgstr "E481: Geen omvang toegelaat nie"
 
 msgid "E36: Not enough room"
 msgstr "E36: Te min plek"
 
 #, c-format
-msgid "Can't create file %s"
-msgstr "Kan nie lêer %s skep nie"
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: geen geregistreerde bediener genaamd \"%s\""
 
-msgid "Can't get temp file name"
-msgstr "Kan nie tydelike lêernaam kry nie"
+msgid "E482: Can't create file %s"
+msgstr "E482: Kan nie lêer %s skep nie"
 
-#, c-format
-msgid "Can't open file %s"
-msgstr "Kan nie lêer %s oopmaak nie"
+msgid "E483: Can't get temp file name"
+msgstr "E483: Kan nie tydelike lêernaam kry nie"
 
-#, c-format
-msgid "Can't read file %s"
-msgstr "Kan nie lêer %s lees nie"
+msgid "E484: Can't open file %s"
+msgstr "E484: Kan nie lêer %s oopmaak nie"
 
-msgid "E37: No write since last change (use ! to override)"
+msgid "E485: Can't read file %s"
+msgstr "E485: Kan nie lêer %s lees nie"
+
+msgid "E37: No write since last change (add ! to override)"
 msgstr "E37: Ongeskryf sedert vorige verandering (gebruik ! om te dwing)"
 
 msgid "E38: Null argument"
 msgstr "E38: Nul parameter"
 
-# njj: hmm, hoe hanteer mens die onderskeid tussen 'Null' (afwesig) en
-# njj: 'Zero' (die nommer)?
 msgid "E39: Number expected"
 msgstr "E39: Nommer verwag"
 
@@ -4628,18 +5045,23 @@ msgstr "E39: Nommer verwag"
 msgid "E40: Can't open errorfile %s"
 msgstr "E40: Kan nie foutlêer %s oopmaak nie"
 
+msgid "E233: cannot open display"
+msgstr "E233: kan nie vertoonskerm oopmaak nie"
+
 msgid "E41: Out of memory!"
 msgstr "E41: Geheue op!"
 
 msgid "Pattern not found"
 msgstr "Patroon nie gevind nie"
 
-#, c-format
-msgid "Pattern not found: %s"
-msgstr "Patroon nie gevind nie: %s"
+msgid "E486: Pattern not found: %s"
+msgstr "E486: Patroon nie gevind nie: %s"
+
+msgid "E487: Argument must be positive"
+msgstr "E487: Parameter moet positief wees"
 
-msgid "Argument must be positive"
-msgstr "Parameter moet positief wees"
+msgid "E459: Cannot go back to previous directory"
+msgstr "E459: Kan nie terug gaan na die vorige gids nie"
 
 msgid "E42: No Errors"
 msgstr "E42: Geen Foute"
@@ -4650,7 +5072,7 @@ msgstr "E43: Beskadige trefferstring"
 msgid "E44: Corrupted regexp program"
 msgstr "E44: Korrupte patroonprogram"
 
-msgid "E45: 'readonly' option is set (use ! to override)"
+msgid "E45: 'readonly' option is set (add ! to override)"
 msgstr "E45: 'readonly' opsie is aan (gebruik ! om te dwing)"
 
 #, c-format
@@ -4663,12 +5085,21 @@ msgstr "E47: Fout tydens lees van 'errorfile'"
 msgid "E48: Not allowed in sandbox"
 msgstr "E48: Nie toegelaat in sandput nie"
 
+msgid "E523: Not allowed here"
+msgstr "E523: Nie hier toegelaat nie"
+
+msgid "E359: Screen mode setting not supported"
+msgstr "E359: Skermmodus instelling nie ondersteun nie"
+
 msgid "E49: Invalid scroll size"
 msgstr "E49: Ongeldige rolgrootte"
 
 msgid "E91: 'shell' option is empty"
 msgstr "E91: 'shell' (dop) opsie is leeg"
 
+msgid "E255: Couldn't read in sign data!"
+msgstr "E255: Fout -- kon nie tekendata lees nie!"
+
 msgid "E72: Close error on swap file"
 msgstr "E72: Sluitfout met ruillêer"
 
@@ -4687,8 +5118,8 @@ msgstr "E76: Te veel ["
 msgid "E77: Too many file names"
 msgstr "E77: Te veel lêername"
 
-msgid "Trailing characters"
-msgstr "Oorbodige karakters"
+msgid "E488: Trailing characters"
+msgstr "E488: Oorbodige karakters"
 
 msgid "E78: Unknown mark"
 msgstr "E78: Onbekende merker"
@@ -4696,6 +5127,12 @@ msgstr "E78: Onbekende merker"
 msgid "E79: Cannot expand wildcards"
 msgstr "E79: Kan nie plekhouers uitbrei nie"
 
+msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
+msgstr "E591: 'winheight' kan nie kleiner as 'winminheight' wees nie"
+
+msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
+msgstr "E592: 'winwidth' kan nie kleiner as 'winminwidth' wees nie"
+
 msgid "E80: Error while writing"
 msgstr "E80: Fout tydens skryfoperasie"
 
@@ -4705,6 +5142,73 @@ msgstr "Nul telling"
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: Gebruik van '<SID>' buite skripkonteks"
 
+msgid "E449: Invalid expression received"
+msgstr "E449: Ongeldige uitdrukking ontvang"
+
+msgid "E463: Region is guarded, cannot modify"
+msgstr "E463: Omgewing is onder bewaking, kan nie verander nie"
+
+#~ msgid "function "
+#~ msgstr "funksie "
+
+#~ msgid "Run Macro"
+#~ msgstr "Voer Makro uit"
+
+#~ msgid "E221: 'commentstring' is empty"
+#~ msgstr "E221: 'commentstring' opsie is leeg"
+
+#~ msgid "E242: Color name not recognized: %s"
+#~ msgstr "E242: Kleurnaam is onbekend: %s"
+
+#~ msgid "E242: Missing color: %s"
+#~ msgstr "E242: Ontbrekende kleur: %s"
+
+#~ msgid "error reading cscope connection %d"
+#~ msgstr "'cscope' verbinding %d kon nie gelees word nie"
+
+#~ msgid "E260: cscope connection not found"
+#~ msgstr "E260: 'cscope' verbinding nie gevind nie"
+
+#~ msgid "cscope connection closed"
+#~ msgstr "'cscope' verbinding gesluit"
+
+# njj: dalk 'verbinding' ipv 'verbinding' orals?
+#~ msgid "couldn't malloc\n"
+#~ msgstr "kon nie 'malloc' nie\n"
+
+#~ msgid "%2d %-5ld  %-34s  <none>\n"
+#~ msgstr "%2d %-5ld  %-34s  <geen>\n"
+
+#~ msgid "E249: couldn't read VIM instance registry property"
+#~ msgstr "E249: kon nie VIM instansie register-kenmerk lees nie"
+
+#~ msgid "\"\n"
+#~ msgstr "\"\n"
+
+#~ msgid "--help\t\tShow Gnome arguments"
+#~ msgstr "--help\t\tWys Gnome parameters"
+
+#~ msgid "1 line ~ed"
+#~ msgstr "1 reël ge-~"
+
+#~ msgid "%ld lines ~ed"
+#~ msgstr "%ld reëls ge-~"
+
+#~ msgid " BLOCK"
+#~ msgstr " BLOK"
+
+#~ msgid " LINE"
+#~ msgstr " REËL"
+
+#~ msgid "Linear tag search"
+#~ msgstr "Liniêre etiketsoek"
+
+#~ msgid "Binary tag search"
+#~ msgstr "Binêre etiketsoek"
+
+#~ msgid "Can't open file %s"
+#~ msgstr "Kan nie lêer %s oopmaak nie"
+
 #~ msgid "E258: no matches found in cscope connections"
 #~ msgstr "E258: geen treffers gevind in 'cscope' verbindings nie"
 
@@ -4756,9 +5260,6 @@ msgstr "E81: Gebruik van '<SID>' buite skripkonteks"
 #~ msgid "loaded fontname: %s"
 #~ msgstr "gelaaide fontnaam: %s"
 
-#~ msgid "Cannot allocate memory for debugger sign"
-#~ msgstr "Kan nie geheue toeken vir ontfouterteken nie"
-
 #~ msgid "automata ERROR: internal"
 #~ msgstr "automata FOUT: intern"
 
@@ -4826,39 +5327,15 @@ msgstr "E81: Gebruik van '<SID>' buite skripkonteks"
 #~ msgid "Ambiguous mapping, conflicts with \"%s\""
 #~ msgstr "Dubbelsinnige binding, bots met \"%s\""
 
-#~ msgid "Too many \\z("
-#~ msgstr "Te veel \\z("
-
 #~ msgid "Too many \\("
 #~ msgstr "Te veel \\("
 
-#~ msgid "Unmatched \\z("
-#~ msgstr "Onpaar \\z("
-
-#~ msgid "Unmatched \\%("
-#~ msgstr "Onpaar \\z"
-
 #~ msgid "Unmatched \\("
 #~ msgstr "Onpaar \\("
 
-#~ msgid "Unmatched \\)"
-#~ msgstr "Onpaar \\)"
-
-#~ msgid "*, \\+ or \\{ operand could be empty"
-#~ msgstr "*, \\+ of \\{ operand mag leeg wees"
-
-#~ msgid "invalid character after \\@"
-#~ msgstr "ongeldige karakter na \\@"
-
-#~ msgid "Too many complex \\{...}s"
-#~ msgstr "Te veel komplekse \\{...}ies"
-
 #~ msgid "Nested *, \\=, \\+, \\! or \\{"
 #~ msgstr "Geneste *, \\=, \\+, \\! of \\{"
 
-#~ msgid "invalid use of \\_"
-#~ msgstr "ongeldige gebruik van \\_"
-
 #~ msgid "\\= follows nothing"
 #~ msgstr "\\= volg niks"
 
@@ -4874,27 +5351,6 @@ msgstr "E81: Gebruik van '<SID>' buite skripkonteks"
 #~ msgid "\\* follows nothing"
 #~ msgstr "\\* volg niks"
 
-#~ msgid "Illegal back reference"
-#~ msgstr "Ongeldige tru-verwysing"
-
-#~ msgid "\\z( not allowed here"
-#~ msgstr "\\z( nie hier toegelaat nie"
-
-#~ msgid "\\z1 et al. not allowed here"
-#~ msgstr "\\z1 e.a. nie hier toegelaat nie"
-
-#~ msgid "Invalid character after \\z"
-#~ msgstr "ongeldige karakter na \\z"
-
-#~ msgid "Missing ] after \\%["
-#~ msgstr "Ontbrekende ] na \\%["
-
-#~ msgid "Empty \\%[]"
-#~ msgstr "Leë \\%[]"
-
-#~ msgid "Invalid character after \\%"
-#~ msgstr "ongeldige karakter na \\%"
-
 #~ msgid "Unexpected magic character; check META."
 #~ msgstr "Onverwagte toorkarakter; kyk na META."