Update runtime files.

4 files changed, 498 insertions, 510 deletions

diff --git a/src/po/de.po b/src/po/de.po
index b5441b73d..01c8c49c1 100644
--- a/src/po/de.po
+++ b/src/po/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-01 09:43+0100\n"
+"POT-Creation-Date: 2018-11-04 18:02+0100\n"
 "PO-Revision-Date: 2008-05-24 17:26+0200\n"
 "Last-Translator: Christian Brabandt <cb@256bit.org>\n"
 "Language-Team: German\n"
@@ -58,7 +58,7 @@ msgid "E937: Attempt to delete a buffer that is in use"
 msgstr "E937: Versuch, Puffer zu l�schen, der noch benutzt wird."
 
 msgid "E515: No buffers were unloaded"
-msgstr "E515: Kein Puffer wurden entladen."
+msgstr "E515: Kein Puffer wurde entladen."
 
 msgid "E516: No buffers were deleted"
 msgstr "E516: Kein Puffer wurde gel�scht."
@@ -85,7 +85,7 @@ msgstr[0] "%d Puffer vollst�ndig gel�scht"
 msgstr[1] "%d Puffer vollst�ndig gel�scht"
 
 msgid "E90: Cannot unload last buffer"
-msgstr "E90: Kann letzten Puffer nicht ausladen"
+msgstr "E90: Kann letzten Puffer nicht entladen"
 
 msgid "E84: No modified buffer found"
 msgstr "E84: Keinen ver�nderter Puffer gefunden"
@@ -154,7 +154,7 @@ msgid "[RO]"
 msgstr "[RO]"
 
 msgid "[readonly]"
-msgstr "[Nur Lesen]"
+msgstr "[Schreibgesch�tzt]"
 
 #, c-format
 msgid "%ld line --%d%%--"
@@ -334,7 +334,7 @@ msgid "Patch file"
 msgstr "Patch-Datei"
 
 msgid "E816: Cannot read patch output"
-msgstr "E816: Kann Patch Ausgabe nicht lesen."
+msgstr "E816: Patch-Ausgabe kann nicht gelesen werden."
 
 msgid "E98: Cannot read diff output"
 msgstr "E98: Diff-Ausgabe kann nicht gelesen werden."
@@ -346,7 +346,7 @@ msgid "E99: Current buffer is not in diff mode"
 msgstr "E99: Aktueller Puffer ist nicht im Diff-Modus."
 
 msgid "E793: No other buffer in diff mode is modifiable"
-msgstr "E793: Kein weitere Puffer im diff-Modues ist modifizierbar."
+msgstr "E793: Kein weiterer Puffer im diff-Modues ist modifizierbar."
 
 msgid "E100: No other buffer in diff mode"
 msgstr "E100: Kein weiterer Puffer ist im Diff-Modus."
@@ -366,10 +366,10 @@ msgid "E787: Buffer changed unexpectedly"
 msgstr "E787: Puffer �nderte sich unerwartet."
 
 msgid "E104: Escape not allowed in digraph"
-msgstr "E104: 'Escape' ist in einem Digraphen nicht erlaubt."
+msgstr "E104: <Escape> ist in einem Digraphen nicht erlaubt."
 
 msgid "E544: Keymap file not found"
-msgstr "E544: Datei f�r die Tastaturbelegung (keymap) nicht gefunden."
+msgstr "E544: Keymap-Datei f�r die Tastaturbelegung nicht gefunden."
 
 msgid "E105: Using :loadkeymap not in a sourced file"
 msgstr "E105: :loadkeymap au�erhalb einer eingelesenen Datei."
@@ -378,46 +378,46 @@ msgid "E791: Empty keymap entry"
 msgstr "E791: Leerer keymap Eintrag"
 
 msgid " Keyword completion (^N^P)"
-msgstr " Stichwort-Erg�nzung (^N^P)"
+msgstr " Stichwort Vervollst�ndigung (^N^P)"
 
 msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 msgstr " ^X Modus (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 
 msgid " Whole line completion (^L^N^P)"
-msgstr " Zeilen-Erg�nzung (^L^N^P)"
+msgstr " Zeilen-Vervollst�ndigung (^L^N^P)"
 
 msgid " File name completion (^F^N^P)"
-msgstr " Dateinamen-Erg�nzung (^F^N^P)"
+msgstr " Dateinamen-Vervollst�ndigung (^F^N^P)"
 
 msgid " Tag completion (^]^N^P)"
-msgstr " Tag-Erg�nzung  (^]^N^P)"
+msgstr " Tag-Vervollst�ndigung  (^]^N^P)"
 
 msgid " Path pattern completion (^N^P)"
-msgstr " Pfadmuster-Erg�nzung (^N^P)"
+msgstr " Pfad-Vervollst�ndigung (^N^P)"
 
 msgid " Definition completion (^D^N^P)"
-msgstr " Definitions-Erg�nzung (^D^N^P)"
+msgstr " Definitions-Vervollst�ndigung (^D^N^P)"
 
 msgid " Dictionary completion (^K^N^P)"
-msgstr " Dictionary-Erg�nzung (^K^N^P) "
+msgstr " Dictionary-Vervollst�ndigung (^K^N^P) "
 
 msgid " Thesaurus completion (^T^N^P)"
-msgstr " Thesaurus-Erg�nzung (^T^N^P)"
+msgstr " Thesaurus-Vervollst�ndigung (^T^N^P)"
 
 msgid " Command-line completion (^V^N^P)"
-msgstr " Kommandozeilen-Erg�nzung (^V^N^P)"
+msgstr " Kommandozeilen-Vervollst�ndigung (^V^N^P)"
 
 msgid " User defined completion (^U^N^P)"
-msgstr " Benutzerdefinierte Erg�nzung (^U^N^P)"
+msgstr " Benutzerdefinierte Vervollst�ndigung (^U^N^P)"
 
 msgid " Omni completion (^O^N^P)"
-msgstr " Omni-Erg�nzung (^O^N^P)"
+msgstr " Omni-Vervollst�ndigung (^O^N^P)"
 
 msgid " Spelling suggestion (s^N^P)"
 msgstr " Vorschlag der Rechtschreibpr�fung (s^N^P)"
 
 msgid " Keyword Local completion (^N^P)"
-msgstr " Lokale Stichwort-Erg�nzung(^N^P)"
+msgstr " Lokale Stichwort-Vervollst�ndigung(^N^P)"
 
 msgid "Hit end of paragraph"
 msgstr "Absatzende erreicht"
@@ -492,11 +492,11 @@ msgstr "E719: Kann [:] nicht mit einem Dictionary verwenden"
 
 #, c-format
 msgid "E734: Wrong variable type for %s="
-msgstr "E734: Falscher Typ der Variable f�r %s="
+msgstr "E734: Falscher Variablentyp f�r %s="
 
 #, c-format
 msgid "E461: Illegal variable name: %s"
-msgstr "E461: Unzul�ssiger Name der Variable: %s"
+msgstr "E461: Unzul�ssiger Variablenname: %s"
 
 msgid "E806: using Float as a String"
 msgstr "E806: Float als String benutzt."
@@ -521,7 +521,7 @@ msgid "E708: [:] must come last"
 msgstr "E708: [:] muss am Schluss kommen."
 
 msgid "E709: [:] requires a List value"
-msgstr "E709: [:] ben�tigt eine Liste als Wert"
+msgstr "E709: [:] ben�tigt einen Listenwert"
 
 msgid "E710: List value has more items than target"
 msgstr "E710: Listenwert hat mehr Eintr�ge als das Ziel."
@@ -538,10 +538,10 @@ msgstr "E108: Keine solche Variable: \"%s\""
 
 #, c-format
 msgid "E940: Cannot lock or unlock variable %s"
-msgstr "E940: Kann Variable \"%s\" nicht sperren  bzw. entsperren."
+msgstr "E940: Kann Variable \"%s\" nicht sperren bzw. entsperren."
 
 msgid "E743: variable nested too deep for (un)lock"
-msgstr "E743: Variable ist zu tief verschachtelt f�r (un)lock."
+msgstr "E743: Variable ist zu tief verschachtelt zum (ent)sperren."
 
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: Fehlender ':' nach '?'"
@@ -720,8 +720,8 @@ msgstr "&Ok"
 #, c-format
 msgid "+-%s%3ld line: "
 msgid_plural "+-%s%3ld lines: "
-msgstr[0] "+-%s%3ld Zeile, "
-msgstr[1] "+-%s%3ld Zeilen, "
+msgstr[0] "+-%s%3ld Zeile: "
+msgstr[1] "+-%s%3ld Zeilen: "
 
 #, c-format
 msgid "E700: Unknown function: %s"
@@ -967,8 +967,8 @@ msgstr "E141: Kein Dateiname f�r Puffer %ld"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr ""
-"E142: Datei wurde nicht geschrieben: Schreiben ist durch die Option 'write' "
-"ausgeschaltet"
+"E142: Datei wurde nicht geschrieben: Schreiben ist durch die 'write' Option "
+"deaktiviert"
 
 #, c-format
 msgid ""
@@ -1244,7 +1244,7 @@ msgstr "in '%s' nicht gefunden: \"%s\""
 #, c-format
 msgid "W20: Required python version 2.x not supported, ignoring file: %s"
 msgstr ""
-"W20: Erfoderliche Python Version 2.x nicht unterst�tzt, ignoriere Datei: %s"
+"W20: Erforderliche Python Version 2.x nicht unterst�tzt, ignoriere Datei: %s"
 
 #, c-format
 msgid "W21: Required python version 3.x not supported, ignoring file: %s"
@@ -1571,7 +1571,7 @@ msgid "E196: No digraphs in this version"
 msgstr "E196: Keine Digraphen in dieser Version."
 
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
-msgstr "E608: Kann nicht :throw Exceptions mit 'Vim' Pr�fix"
+msgstr "E608: Kann nicht Exceptions mit 'Vim' Pr�fix werfen (:throw)"
 
 #, c-format
 msgid "Exception thrown: %s"
@@ -1681,7 +1681,7 @@ msgid "tagname"
 msgstr "Tag-Name"
 
 msgid " kind file\n"
-msgstr " verwandte Datei\n"
+msgstr " Typ Datei\n"
 
 msgid "'history' option is zero"
 msgstr "Option 'history' ist Null"
@@ -1861,7 +1861,7 @@ msgstr "E512: Fehler beim Schlie�en"
 
 msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
 msgstr ""
-"E513: Schreibfehler, Umwandlung schlug fehl (leere 'fenc' um sie zu "
+"E513: Schreibfehler, Umwandlung schlug fehl (leere 'fenc' um es zu "
 "erzwingen)"
 
 #, c-format
@@ -1869,8 +1869,8 @@ msgid ""
 "E513: write error, conversion failed in line %ld (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: Schreibfehler, Konvertierung fehlgeschlagen in Zeile %ld (leere 'fenc' "
-"um sie zu erzwingen)"
+"E513: Schreibfehler, Konvertierung in Zeile %ld fehlgeschlagen (leere 'fenc' "
+"um es zu erzwingen)"
 
 msgid "E514: write error (file system full?)"
 msgstr "E514: Schreibfehler (Dateisystem voll?)"
@@ -1914,7 +1914,7 @@ msgid ""
 "WARNING: Original file may be lost or damaged\n"
 msgstr ""
 "\n"
-"ACHTUNG: Original-Datei k�nnte verloren oder zerst�rt sein\n"
+"ACHTUNG: Original-Datei k�nnte verloren oder besch�digt sein\n"
 
 msgid "don't quit the editor until the file is successfully written!"
 msgstr ""
@@ -1960,7 +1960,7 @@ msgid "WARNING: The file has been changed since reading it!!!"
 msgstr "ACHTUNG: Die Datei wurde seit dem letzten Lesen ge�ndert!!!"
 
 msgid "Do you really want to write to it"
-msgstr "M�chten Sie es wirklich schreiben"
+msgstr "M�chten Sie sie wirklich schreiben"
 
 #, c-format
 msgid "E208: Error writing to \"%s\""
@@ -2049,7 +2049,7 @@ msgid "E936: Cannot delete the current group"
 msgstr "E936: Kann die aktuelle Gruppe nicht l�schen."
 
 msgid "W19: Deleting augroup that is still in use"
-msgstr "W19: L�sche Autogruppe, die noch in Benutztung ist."
+msgstr "W19: L�sche Autogruppe, die noch in Benutzung ist."
 
 #, c-format
 msgid "E215: Illegal character after *: %s"
@@ -2186,10 +2186,10 @@ msgid "E616: vim_SelFile: can't get font %s"
 msgstr "E616: vim_SelFile: kann Schriftart %s nicht erhalten"
 
 msgid "E614: vim_SelFile: can't return to current directory"
-msgstr "E614: vim_SelFile: kann nicht zum laufenden Verzeichnis zur�ckkehren."
+msgstr "E614: vim_SelFile: kann nicht zum aktuellen Verzeichnis zur�ckkehren."
 
 msgid "Pathname:"
-msgstr "Pfad:"
+msgstr "Pfadname:"
 
 msgid "E615: vim_SelFile: can't get current directory"
 msgstr "E615: vim_SelFile: aktuelles Verzeichnis kann nicht ermittelt werden."
@@ -2208,7 +2208,7 @@ msgstr "Vim-Dialog"
 
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr ""
-"E232: BalloonEval kann nicht mit sowohl \"message\" und \"callback\" erzeugt "
+"E232: BalloonEval kann nicht sowohl mit \"message\" als auch \"callback\" erzeugt "
 "werden"
 
 msgid "_Cancel"
@@ -2293,7 +2293,7 @@ msgid "Open Tab..."
 msgstr "�ffne Reiter..."
 
 msgid "Vim: Main window unexpectedly destroyed\n"
-msgstr "Vim: Hauptfenster unerwartet gel�scht\n"
+msgstr "Vim: Hauptfenster unerwartet zerst�rt\n"
 
 msgid "&Filter"
 msgstr "&Filter"
@@ -2314,7 +2314,7 @@ msgid "Files"
 msgstr "Dateien"
 
 msgid "&OK"
-msgstr "&Ok"
+msgstr "&OK"
 
 msgid "Selection"
 msgstr "Auswahl"
@@ -2488,10 +2488,10 @@ msgid "E621: \"%s\" resource file has wrong version"
 msgstr "E621: \"%s\" Ressource-Datei hat die falsche Version."
 
 msgid "E673: Incompatible multi-byte encoding and character set."
-msgstr "E673: Unzul�ssiger Multi-Byte Zeichensatz"
+msgstr "E673: Inkompatible Multi-Byte Kodierung und Zeichensatz"
 
 msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
-msgstr "E674: printmbcharset darf nicht leer sein mit Multi-Byte Zeichensatz."
+msgstr "E674: printmbcharset darf nicht leer sein mit Multi-Byte Kodierung."
 
 msgid "E675: No default font specified for multi-byte printing."
 msgstr "E675: Keine Standardschriftart angegeben f�r Multi-Byte Ausdruck."
@@ -2537,7 +2537,7 @@ msgid "Show this message"
 msgstr "diese Nachricht anzeigen"
 
 msgid "Kill a connection"
-msgstr "Verbindung abbrechen"
+msgstr "Verbindung beenden"
 
 msgid "Reinit all connections"
 msgstr "Verbindungen reinitialisieren"
@@ -2550,7 +2550,7 @@ msgid "E560: Usage: cs[cope] %s"
 msgstr "E560: Verwendung: cs[cope] %s"
 
 msgid "This cscope command does not support splitting the window.\n"
-msgstr "Dieser cscope-Befehl unterst�tzt nicht Teilen des Fensters.\n"
+msgstr "Dieser cscope-Befehl unterst�tzt nicht das Teilen des Fensters.\n"
 
 msgid "E562: Usage: cstag <ident>"
 msgstr "E562: Verwendung: cstag <ident>"
@@ -2682,7 +2682,7 @@ msgid "E609: Cscope error: %s"
 msgstr "E609: Cscope Fehler: %s"
 
 msgid "All cscope databases reset"
-msgstr "alle cscope Datenbanken zur�ckgesetzt"
+msgstr "Alle cscope Datenbanken zur�ckgesetzt"
 
 msgid "no cscope connections\n"
 msgstr "keine cscope-Verbindungen\n"
@@ -2847,7 +2847,7 @@ msgid "unknown vimOption"
 msgstr "unbekannte vimOption"
 
 msgid "keyboard interrupt"
-msgstr "Tastatur-Unterbrechung"
+msgstr "Tastatur-Interrupt"
 
 msgid "vim error"
 msgstr "vim Fehler"
@@ -2865,8 +2865,8 @@ msgid ""
 "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
 "org"
 msgstr ""
-"E280: TCL FATALER FEHLER: reflist kaputt!? Bitte vim-dev@vim."
-"orgbenachrichtigen."
+"E280: TCL FATALER FEHLER: reflist kaputt!? Bitte vim-dev@vim.org "
+"benachrichtigen."
 
 msgid "cannot register callback command: buffer/window reference not found"
 msgstr ""
@@ -2881,7 +2881,7 @@ msgstr ""
 
 #, c-format
 msgid "E572: exit code %d"
-msgstr "E572: Ekit-Code %d"
+msgstr "E572: Exit-Code %d"
 
 msgid "cannot get line"
 msgstr "kann Zeile nicht erhalten"
@@ -3057,7 +3057,7 @@ msgid "-E\t\t\tImproved Ex mode"
 msgstr "-E\t\t\tVerbesserter Ex Modus"
 
 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
-msgstr "-s\t\t\tLeiser (batch) Modus (nur f�r \"ex\")"
+msgstr "-s\t\t\tLeiser (Batch) Modus (nur f�r \"ex\")"
 
 msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
 msgstr "-d\t\t\tDiff Modus (wie \"vimdiff\")"
@@ -3128,7 +3128,7 @@ msgstr "-T <terminal>\tSetze Terminaltyp auf <terminal>"
 msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
 msgstr ""
 "--not-a-term\t\tKeine Warnung ausgeben, wenn Eingabe/Ausgabe nicht auf einem "
-"Terminal ausgegebn wird"
+"Terminal ausgegeben wird"
 
 msgid "--ttyfail\t\tExit if input or output is not a terminal"
 msgstr ""
@@ -3293,7 +3293,7 @@ msgstr "-italicfont <Schriftart>\tBenutze <Schriftart> f�r geneigten Text"
 
 msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
 msgstr ""
-"-geometry <geom>\tbenutze <geom> f�r die Anfangs Abmessungen (auch mit: -"
+"-geometry <geom>\tBenutze <geom> f�r die Anfangs Abmessungen (auch mit: -"
 "geom)"
 
 msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
@@ -3398,14 +3398,14 @@ msgid ""
 "# File marks:\n"
 msgstr ""
 "\n"
-"# Datei-Marken:\n"
+"# Datei-Markierungen:\n"
 
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
 msgstr ""
 "\n"
-"# Geschichte (neueste zuerst):\n"
+"# Jumplist (neueste zuerst):\n"
 
 msgid ""
 "\n"
@@ -3430,7 +3430,7 @@ msgid "E286: Failed to open input method"
 msgstr "E286: Eingabemethode konnte nicht ge�ffnet werden"
 
 msgid "E287: Warning: Could not set destroy callback to IM"
-msgstr "E287: Achtung: Destroy Callabck konnte nicht auf IM gesetzt werden"
+msgstr "E287: Achtung: Destroy Callback konnte nicht auf IM gesetzt werden"
 
 msgid "E288: input method doesn't support any style"
 msgstr "E288: Eingabemethode unterst�tzt keinen einzigen Stil"
@@ -3466,10 +3466,10 @@ msgid "E298: Didn't get block nr 2?"
 msgstr "E298: Block Nr. 2 nicht erhalten?"
 
 msgid "E843: Error while updating swap file crypt"
-msgstr "E843: Fehler beim Aktualisieren der Verschl�sselung der swap Datei."
+msgstr "E843: Fehler beim Aktualisieren der Verschl�sselung der Auslagerungsdatei."
 
 msgid "E301: Oops, lost the swap file!!!"
-msgstr "E301: Ups, Verlust der Auslagerungsdatei!!!"
+msgstr "E301: Upps, Verlust der Auslagerungsdatei!!!"
 
 msgid "E302: Could not rename swap file"
 msgstr "E302: Auslagerungsdatei konnte nicht umbenannt werden"
@@ -3521,20 +3521,20 @@ msgid " cannot be used on this computer.\n"
 msgstr " kann auf diesem Rechner nicht verwendet werden.\n"
 
 msgid "The file was created on "
-msgstr "Die Datei wurde erstellt um "
+msgstr "Die Datei wurde erstellt am "
 
 msgid ""
 ",\n"
 "or the file has been damaged."
 msgstr ""
 ",\n"
-"oder die Datei wurde zerst�rt."
+"oder die Datei wurde besch�digt."
 
 #, c-format
 msgid ""
 "E833: %s is encrypted and this version of Vim does not support encryption"
 msgstr ""
-"E833: %s is verschl�sselt, aber diese Version von Vim unterst�tzt "
+"E833: %s ist verschl�sselt, aber diese Version von Vim unterst�tzt "
 "Verschl�sselung nicht."
 
 msgid " has been damaged (page size is smaller than minimum value).\n"
@@ -3553,7 +3553,7 @@ msgstr "E308: Achtung: Die Originaldatei k�nnte ver�ndert worden sein"
 
 #, c-format
 msgid "Swap file is encrypted: \"%s\""
-msgstr "Swap Datei is verschl�sselt: \"%s\""
+msgstr "Swap Datei ist verschl�sselt: \"%s\""
 
 msgid ""
 "\n"
@@ -3587,7 +3587,7 @@ msgstr ""
 
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
-msgstr "E309: Block 1 kann nicht nicht von %s gelesen werden"
+msgstr "E309: Block 1 von %s kann nicht gelesen werden"
 
 msgid "???MANY LINES MISSING"
 msgstr "???VIELE ZEILEN FEHLEN"
@@ -3630,7 +3630,7 @@ msgid "See \":help E312\" for more information."
 msgstr "Lesen Sie \":help E312\" f�r weitere Informationen."
 
 msgid "Recovery completed. You should check if everything is OK."
-msgstr "Wiederherstellung beendet. Pr�fen Sie, ob alles alles OK ist."
+msgstr "Wiederherstellung beendet. Pr�fen Sie, ob alles OK ist."
 
 msgid ""
 "\n"
@@ -3712,14 +3712,14 @@ msgstr ""
 "     Benutzer-Name: "
 
 msgid "   host name: "
-msgstr "   Host-Name: "
+msgstr "   Hostname: "
 
 msgid ""
 "\n"
 "         host name: "
 msgstr ""
 "\n"
-"         Host-Name: "
+"         Hostname: "
 
 msgid ""
 "\n"
@@ -3775,7 +3775,7 @@ msgid "stack_idx should be 0"
 msgstr "stack_idx sollte 0 sein"
 
 msgid "E318: Updated too many blocks?"
-msgstr "E318: Zu viele Blocks aktualisiert?"
+msgstr "E318: Zu viele Bl�cke aktualisiert?"
 
 msgid "E317: pointer block id wrong 4"
 msgstr "E317: Zeiger Block id falsch 4"
@@ -3828,7 +3828,7 @@ msgid "      CANNOT BE FOUND"
 msgstr "      WURDE NICHT GEFUNDEN"
 
 msgid "      NEWER than swap file!\n"
-msgstr "      neuer als Auslagerungsdatei!\n"
+msgstr "      NEUER als Auslagerungsdatei!\n"
 
 msgid ""
 "\n"
@@ -3913,7 +3913,7 @@ msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: Teil des Men�punkt-Pfades muss zum Untermen� f�hren"
 
 msgid "E328: Menu only exists in another mode"
-msgstr "E328: Men� existiert nur in anderen Modus"
+msgstr "E328: Men� existiert nur in anderen Modi"
 
 #, c-format
 msgid "E329: No menu \"%s\""
@@ -4107,7 +4107,7 @@ msgid "E546: Illegal mode"
 msgstr "E546: Unzul�ssiger Modus"
 
 msgid "E547: Illegal mouseshape"
-msgstr "E547: Unzul�ssiger Mauszeiger"
+msgstr "E547: Unzul�ssiger Mauszeigerform"
 
 msgid "E548: digit expected"
 msgstr "E548: Ziffer erwartet"
@@ -4170,7 +4170,7 @@ msgid "E774: 'operatorfunc' is empty"
 msgstr "E774: 'operatorfunc' is empty"
 
 msgid "E775: Eval feature not available"
-msgstr "E775: Evaluierungsfunktion nicht verf�gbar"
+msgstr "E775: Eval Eigenschaft nicht verf�gbar"
 
 msgid "Warning: terminal cannot highlight"
 msgstr "Achtung: Terminal unterst�tzt keine Hervorhebung"
@@ -4280,7 +4280,7 @@ msgid ""
 "E883: search pattern and expression register may not contain two or more "
 "lines"
 msgstr ""
-"E883: Suchmuster und Ausdrucksregister d�rfen nicht mehr als 1 Zeile "
+"E883: Suchmuster- und Ausdrucksregister d�rfen nicht mehr als 1 Zeile "
 "enthalten."
 
 #, c-format
@@ -4797,7 +4797,7 @@ msgid "Cannot open file \"%s\""
 msgstr "Kann Datei \"%s\" nicht �ffnen"
 
 msgid "E681: Buffer is not loaded"
-msgstr "E681: Buffer ist nicht geladen"
+msgstr "E681: Puffer ist nicht geladen"
 
 msgid "E777: String or List expected"
 msgstr "E777: Zeichenkette oder Liste erwartet"
@@ -5345,7 +5345,7 @@ msgstr "Lese W�rterbuch-Datei %s..."
 
 #, c-format
 msgid "E760: No word count in %s"
-msgstr "E760: Keine W�rter gez�hlt in %s"
+msgstr "E760: Kein Wortanzahl in %s"
 
 #, c-format
 msgid "line %6d, word %6ld - %s"
@@ -5404,7 +5404,7 @@ msgid "Ignored %d words with non-ASCII characters"
 msgstr "%d W�rter mit nicht-ASCII Zeichen ignoriert"
 
 msgid "E845: Insufficient memory, word list will be incomplete"
-msgstr "E845: Nicht ausreichend Speicher, Wortlist wird unvollst�ndig sein"
+msgstr "E845: Nicht ausreichend Speicher, Wortliste wird unvollst�ndig sein"
 
 #, c-format
 msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
@@ -5455,7 +5455,7 @@ msgstr "Fertig!"
 
 #, c-format
 msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' hat nicht %ld Eintr�ge"
+msgstr "E765: 'spellfile' hat keine %ld Eintr�ge"
 
 #, c-format
 msgid "Word '%.*s' removed from %s"
@@ -5685,10 +5685,10 @@ msgid "E418: Illegal value: %s"
 msgstr "E418: Unzul�ssiger Wert: %s"
 
 msgid "E419: FG color unknown"
-msgstr "E419: FG Farbe unbekannt"
+msgstr "E419: Vordergrundfarbe unbekannt"
 
 msgid "E420: BG color unknown"
-msgstr "E420: BG Farbe unbekannt"
+msgstr "E420: Hintergrundfarbe unbekannt"
 
 #, c-format
 msgid "E421: Color name or number not recognized: %s"
@@ -5728,7 +5728,7 @@ msgid "E426: tag not found: %s"
 msgstr "E426: Konnte Tag \"%s\" nicht finden"
 
 msgid "  # pri kind tag"
-msgstr "   # pri verw. tag"
+msgstr "   # Prio Art Tag"
 
 msgid "file\n"
 msgstr "Datei\n"
@@ -5773,7 +5773,7 @@ msgid "E430: Tag file path truncated for %s\n"
 msgstr "E430: Tag-Dateipfad wurde abgeschnitten f�r %s\n"
 
 msgid "Ignoring long line in tags file"
-msgstr "Ignoriere zu lange Zeile in Tagsdatei"
+msgstr "Ignoriere zu lange Zeile in Tag-Datei"
 
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
@@ -5781,7 +5781,7 @@ msgstr "E431: Format Fehler in Tag-Datei \"%s\""
 
 #, c-format
 msgid "Before byte %ld"
-msgstr "Vor byte %ld"
+msgstr "Vor Byte %ld"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5847,7 +5847,7 @@ msgid "active"
 msgstr "aktiv"
 
 msgid "running"
-msgstr "F�hre aus"
+msgstr "f�hre aus"
 
 msgid "finished"
 msgstr "beendet"
@@ -5887,7 +5887,7 @@ msgstr "E825: Besch�digte Undo-Datei (%s): %s"
 
 msgid "Cannot write undo file in any directory in 'undodir'"
 msgstr ""
-"Undo-Datei kann nicht in eines der Verzeichnisse aus 'undodir' geschrieben "
+"Undo-Datei kann in keines der Verzeichnisse aus 'undodir' geschrieben "
 "werden."
 
 #, c-format
@@ -6106,7 +6106,7 @@ msgid "E124: Missing '(': %s"
 msgstr "E124: Fehlendes '(': %s"
 
 msgid "E862: Cannot use g: here"
-msgstr "E862: g: kann nicht hier benutzt werden"
+msgstr "E862: g: kann hier nicht benutzt werden"
 
 #, c-format
 msgid "E932: Closure function should not be at top level: %s"
@@ -6365,7 +6365,7 @@ msgid "Vim is open source and freely distributable"
 msgstr "Vim ist Open Source und kann frei weitergegeben werden"
 
 msgid "Help poor children in Uganda!"
-msgstr "Helfen Sie armen Kindern in Uganda!"
+msgstr "Hilf armen Kindern in Uganda!"
 
 msgid "type  :help iccf<Enter>       for information "
 msgstr "Tippe  :help iccf<Enter>        f�r Informationen dar�ber "
@@ -6412,7 +6412,7 @@ msgid "Sponsor Vim development!"
 msgstr "Unterst�tzen Sie die Entwicklung von Vim"
 
 msgid "Become a registered Vim user!"
-msgstr "Werden Sie ein registrierter Benutzer von Vim!"
+msgstr "Werd ein registrierter Vim-Nutzer!"
 
 msgid "type  :help sponsor<Enter>    for information "
 msgstr "Tippe  :help sponsor<Enter>     f�r mehr Informationen    "
@@ -6531,7 +6531,7 @@ msgid "E471: Argument required"
 msgstr "E471: Argument ben�tigt"
 
 msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\ sollte von /, ? or & gefolgt werden"
+msgstr "E10: \\ sollte von /, ? oder & gefolgt werden"
 
 msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
 msgstr "E11: Ung�ltig im Kommandozeilenfenster; <CR> f�hrt aus, CTRL-C beendet"
@@ -6631,7 +6631,7 @@ msgid "E448: Could not load library function %s"
 msgstr "E448: Bibliotheksfunktion %s konnte nicht geladen werden"
 
 msgid "E19: Mark has invalid line number"
-msgstr "E19: Marke hat ung�ltige Zeilennummer"
+msgstr "E19: Markierung hat ung�ltige Zeilennummer"
 
 msgid "E20: Mark not set"
 msgstr "E20: Markierung nicht gesetzt"
@@ -6758,7 +6758,7 @@ msgid "E459: Cannot go back to previous directory"
 msgstr "E459: Kann nicht ins vorhergehende Verzeichnis wechseln"
 
 msgid "E42: No Errors"
-msgstr "E42: Kein Fehler"
+msgstr "E42: Keine Fehler"
 
 msgid "E776: No location list"
 msgstr "E776: Keine Positionsliste"
@@ -6830,10 +6830,10 @@ msgid "E72: Close error on swap file"
 msgstr "E72: Fehler beim Schlie�en der Auslagerungsdatei"
 
 msgid "E73: tag stack empty"
-msgstr "E73: tag Stapel leer."
+msgstr "E73: Tag Stapel leer."
 
 msgid "E74: Command too complex"
-msgstr "E74: Befehl zu kompliziert"
+msgstr "E74: Befehl zu komplex"
 
 msgid "E75: Name too long"
 msgstr "E75: Name zu lang"
@@ -6863,7 +6863,7 @@ msgid "E80: Error while writing"
 msgstr "E80: Fehler w�hrend des Schreibens"
 
 msgid "E939: Positive count required"
-msgstr "E939: Positiver Zahl ben�tigt"
+msgstr "E939: Positive Zahl ben�tigt"
 
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: <SID> wurde nicht in einer Skript-Umgebung benutzt"
@@ -6921,10 +6921,10 @@ msgid "empty keys are not allowed"
 msgstr "Leerer Schl�ssel nicht erlaubt"
 
 msgid "dictionary is locked"
-msgstr "Dictionary is gesperrt"
+msgstr "Dictionary ist gesperrt"
 
 msgid "list is locked"
-msgstr "Liste is gesperrt"
+msgstr "Liste ist gesperrt"
 
 #, c-format
 msgid "failed to add key '%s' to dictionary"
@@ -7009,7 +7009,7 @@ msgstr "Hashtab ver�nderte sich w�hrend der Initialisierung"
 #, c-format
 msgid "expected sequence element of size 2, but got sequence of size %d"
 msgstr ""
-"erwartete Sequenz Element der Gr��e 2, but erhielt Sequenz der Gr��e %d"
+"erwartete Sequenz Element der Gr��e 2, erhielt jedoch Sequenz der Gr��e %d"
 
 msgid "list constructor does not accept keyword arguments"
 msgstr "Listen Konstruktor akzeptiert keine Keyword Argumente"
@@ -7031,7 +7031,7 @@ msgstr ""
 
 #, c-format
 msgid "internal error: no vim list item %d"
-msgstr "interner Fehler: Keine Vim Listobjekt %d"
+msgstr "interner Fehler: Kein Vim Listobjekt %d"
 
 msgid "internal error: not enough list items"
 msgstr "interner Fehler: nicht gen�gend Listobjekte"
@@ -7080,7 +7080,7 @@ msgstr "Konnte globale Option %s nicht aufheben"
 
 #, c-format
 msgid "unable to unset option %s which does not have global value"
-msgstr "konnte option %s nicht aufheben, da sie keinen globalen Wert hat"
+msgstr "konnte Option %s nicht aufheben, da sie keinen globalen Wert hat"
 
 msgid "attempt to refer to deleted tab page"
 msgstr "Versuch, Bezug auf einen gel�schten Reiter zu nehmen"
diff --git a/src/po/ja.euc-jp.po b/src/po/ja.euc-jp.po
index 477a817b0..4759103d3 100644
--- a/src/po/ja.euc-jp.po
+++ b/src/po/ja.euc-jp.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-18 00:43+0900\n"
-"PO-Revision-Date: 2017-05-18 00:45+0900\n"
+"POT-Creation-Date: 2018-11-13 19:44+0900\n"
+"PO-Revision-Date: 2018-11-16 09:41+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: Japanese <https://github.com/vim-jp/lang-ja>\n"
 "Language: ja\n"
@@ -69,26 +69,20 @@ msgstr "E516: ������줿�Хåե��Ϥ���ޤ���"
 msgid "E517: No buffers were wiped out"
 msgstr "E517: �˴����줿�Хåե��Ϥ���ޤ���"
 
-msgid "1 buffer unloaded"
-msgstr "1 �ĤΥХåե�����������ޤ���"
-
 #, c-format
-msgid "%d buffers unloaded"
-msgstr "%d �ĤΥХåե�����������ޤ���"
-
-msgid "1 buffer deleted"
-msgstr "1 �ĤΥХåե����������ޤ���"
+msgid "%d buffer unloaded"
+msgid_plural "%d buffers unloaded"
+msgstr[0] "%d �ĤΥХåե�����������ޤ���"
 
 #, c-format
-msgid "%d buffers deleted"
-msgstr "%d �ĤΥХåե����������ޤ���"
-
-msgid "1 buffer wiped out"
-msgstr "1 �ĤΥХåե����˴�����ޤ���"
+msgid "%d buffer deleted"
+msgid_plural "%d buffers deleted"
+msgstr[0] "%d �ĤΥХåե����������ޤ���"
 
 #, c-format
-msgid "%d buffers wiped out"
-msgstr "%d �ĤΥХåե����˴�����ޤ���"
+msgid "%d buffer wiped out"
+msgid_plural "%d buffers wiped out"
+msgstr[0] "%d �ĤΥХåե����˴�����ޤ���"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: �Ǹ�ΥХåե��ϲ����Ǥ��ޤ���"
@@ -162,12 +156,9 @@ msgid "[readonly]"
 msgstr "[�ɹ�����]"
 
 #, c-format
-msgid "1 line --%d%%--"
-msgstr "1 �� --%d%%--"
-
-#, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld �� --%d%%--"
+msgid "%ld line --%d%%--"
+msgid_plural "%ld lines --%d%%--"
+msgstr[0] "%ld �� --%d%%--"
 
 #, c-format
 msgid "line %ld of %ld --%d%%-- col "
@@ -321,12 +312,19 @@ msgstr "E737: �����ϴ���¸�ߤ��ޤ�: %s"
 msgid "E96: Cannot diff more than %ld buffers"
 msgstr "E96: %ld �ʾ�ΥХåե���diff�Ǥ��ޤ���"
 
+#, c-format
+msgid "Not enough memory to use internal diff for buffer \"%s\""
+msgstr "�Хåե� \"%s\" �Ѥ�����diff��Ȥ�����Υ��꤬��­���Ƥ��ޤ�"
+
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: ����ե�������ɹ��⤷���Ͻ�����Ǥ��ޤ���"
 
 msgid "E97: Cannot create diffs"
 msgstr "E97: ��ʬ������Ǥ��ޤ���"
 
+msgid "E960: Problem creating the internal diff"
+msgstr "E960: ����diff�����������꤬ȯ�����ޤ���"
+
 msgid "Patch file"
 msgstr "�ѥå��ե�����"
 
@@ -336,6 +334,9 @@ msgstr "E816: patch�ν��Ϥ��ɹ���ޤ���"
 msgid "E98: Cannot read diff output"
 msgstr "E98: diff�ν��Ϥ��ɹ���ޤ���"
 
+msgid "E959: Invalid diff format."
+msgstr "E959: ̵����diff�����Ǥ�"
+
 msgid "E99: Current buffer is not in diff mode"
 msgstr "E99: ���ߤΥХåե��Ϻ�ʬ�⡼�ɤǤϤ���ޤ���"
 
@@ -667,6 +668,9 @@ msgstr ""
 "\n"
 "\t�Ǹ�˥��åȤ���������ץ�: "
 
+msgid " line "
+msgstr " �� "
+
 msgid "E691: Can only compare List with List"
 msgstr "E691: �ꥹ�ȷ��ϥꥹ�ȷ��Ȥ�����ӤǤ��ޤ���"
 
@@ -744,6 +748,9 @@ msgstr "E916: ͭ���ʥ���֤ǤϤ���ޤ���"
 msgid "E701: Invalid type for len()"
 msgstr "E701: len() �ˤ�̵���ʷ��Ǥ�"
 
+msgid "E957: Invalid window number"
+msgstr "E957: ̵���ʥ�����ɥ��ֹ�Ǥ�"
+
 #, c-format
 msgid "E798: ID is reserved for \":match\": %ld"
 msgstr "E798: ID �� \":match\" �Τ����ͽ�󤵤�Ƥ��ޤ�: %ld"
@@ -790,6 +797,10 @@ msgstr "E258: ���饤����Ȥ����뤳�Ȥ��Ǥ��ޤ���"
 msgid "E927: Invalid action: '%s'"
 msgstr "E927: ̵�������Ǥ�: %s"
 
+#, c-format
+msgid "E962: Invalid action: '%s'"
+msgstr "E962: ̵�������Ǥ�: %s"
+
 msgid "sort() argument"
 msgstr "sort() ���"
 
@@ -839,15 +850,13 @@ msgstr "> %d, 16�ʿ� %04x, 8�ʿ� %o"
 msgid "> %d, Hex %08x, Octal %o"
 msgstr "> %d, 16�ʿ� %08x, 8�ʿ� %o"
 
-msgid "E134: Move lines into themselves"
-msgstr "E134: �Ԥ򤽤켫�Ȥˤϰ�ư�Ǥ��ޤ���"
-
-msgid "1 line moved"
-msgstr "1 �Ԥ���ư����ޤ���"
+msgid "E134: Cannot move a range of lines into itself"
+msgstr "E134: �Ԥ��ϰϤ򤽤켫�Ȥˤϰ�ư�Ǥ��ޤ���"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld �Ԥ���ư����ޤ���"
+msgid "%ld line moved"
+msgid_plural "%ld lines moved"
+msgstr[0] "%ld �Ԥ���ư����ޤ���"
 
 #, c-format
 msgid "%ld lines filtered"
@@ -999,26 +1008,25 @@ msgstr "%s ���ִ����ޤ���? (y/n/a/q/l/^E/^Y)"
 msgid "(Interrupted) "
 msgstr "(����ޤ�ޤ���) "
 
-msgid "1 match"
-msgstr "1 �ս곺�����ޤ���"
-
-msgid "1 substitution"
-msgstr "1 �ս��ִ����ޤ���"
-
 #, c-format
-msgid "%ld matches"
-msgstr "%ld �ս곺�����ޤ���"
+msgid "%ld match on %ld line"
+msgid_plural "%ld matches on %ld line"
+msgstr[0] "%ld �ս곺�����ޤ��� (�� %ld ����)"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld �ս��ִ����ޤ���"
+msgid "%ld substitution on %ld line"
+msgid_plural "%ld substitutions on %ld line"
+msgstr[0] "%ld �ս��ִ����ޤ��� (�� %ld ����)"
 
-msgid " on 1 line"
-msgstr " (�� 1 ����)"
+#, c-format
+msgid "%ld match on %ld lines"
+msgid_plural "%ld matches on %ld lines"
+msgstr[0] "%ld �ս곺�����ޤ��� (�� %ld ����)"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " (�� %ld ����)"
+msgid "%ld substitution on %ld lines"
+msgid_plural "%ld substitutions on %ld lines"
+msgstr[0] "%ld �ս��ִ����ޤ��� (�� %ld ����)"
 
 msgid "E147: Cannot do :global recursive with a range"
 msgstr "E147: :global ���ϰ��դ��ǺƵ�Ū�ˤϻȤ��ޤ���"
@@ -1334,19 +1342,15 @@ msgstr ""
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: ���ΥС������ǤϤ��Υ��ޥ�ɤ����ѤǤ��ޤ��󡢤����ʤ���"
 
-msgid "1 more file to edit.  Quit anyway?"
-msgstr "�Խ����٤��ե����뤬 1 �Ĥ���ޤ�������λ���ޤ���?"
-
 #, c-format
-msgid "%d more files to edit.  Quit anyway?"
-msgstr "�Խ����٤��ե����뤬���� %d �Ĥ���ޤ�������λ���ޤ���?"
-
-msgid "E173: 1 more file to edit"
-msgstr "E173: �Խ����٤��ե����뤬 1 �Ĥ���ޤ�"
+msgid "%d more file to edit.  Quit anyway?"
+msgid_plural "%d more files to edit.  Quit anyway?"
+msgstr[0] "�Խ����٤��ե����뤬���� %d �Ĥ���ޤ�������λ���ޤ���?"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: �Խ����٤��ե����뤬���� %ld �Ĥ���ޤ�"
+msgid "E173: %ld more file to edit"
+msgid_plural "E173: %ld more files to edit"
+msgstr[0] "E173: �Խ����٤��ե����뤬���� %ld �Ĥ���ޤ�"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: ���ޥ�ɤ����ˤ���ޤ�: ���������ˤ� ! ���ɲä��Ƥ�������"
@@ -1521,6 +1525,9 @@ msgstr "E498: \"<sfile>\"���֤������� :source �оݥե�����̾������ޤ���"
 msgid "E842: no line number to use for \"<slnum>\""
 msgstr "E842: \"<slnum>\"���֤���������ֹ椬����ޤ���"
 
+msgid "E961: no line number to use for \"<sflnum>\""
+msgstr "E961: \"<sflnum>\"���֤���������ֹ椬����ޤ���"
+
 #, no-c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
 msgstr ""
@@ -1725,9 +1732,6 @@ msgstr "ɸ�����Ϥ����ɹ�����..."
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: �Ѵ����ե�������ɹ��ԲĤˤ��ޤ���"
 
-msgid "[fifo/socket]"
-msgstr "[FIFO/�����å�]"
-
 msgid "[fifo]"
 msgstr "[FIFO]"
 
@@ -1904,19 +1908,15 @@ msgstr "[unix]"
 msgid "[unix format]"
 msgstr "[unix�ե����ޥå�]"
 
-msgid "1 line, "
-msgstr "1 ��, "
-
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld ��, "
-
-msgid "1 character"
-msgstr "1 ʸ��"
+msgid "%ld line, "
+msgid_plural "%ld lines, "
+msgstr[0] "%ld ��, "
 
 #, c-format
-msgid "%lld characters"
-msgstr "%lld ʸ��"
+msgid "%lld character"
+msgid_plural "%lld characters"
+msgstr[0] "%lld ʸ��"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -2289,11 +2289,11 @@ msgstr "����ɥ�(&U)"
 msgid "Open tab..."
 msgstr "���֥ڡ����򳫤�"
 
-msgid "Find string (use '\\\\' to find a '\\')"
-msgstr "����ʸ���� ('\\' �򸡺�����ˤ� '\\\\')"
+msgid "Find string"
+msgstr "����ʸ����"
 
-msgid "Find & Replace (use '\\\\' to find a '\\')"
-msgstr "�������ִ� ('\\' �򸡺�����ˤ� '\\\\')"
+msgid "Find & Replace"
+msgstr "�������ִ�"
 
 msgid "Not Used"
 msgstr "�Ȥ��ޤ���"
@@ -2710,19 +2710,6 @@ msgstr "�ϰϳ��ι��ֹ�Ǥ�"
 msgid "not allowed in the Vim sandbox"
 msgstr "����ɥܥå����Ǥϵ�����ޤ���"
 
-#, c-format
-msgid "E370: Could not load library %s"
-msgstr "E370: �饤�֥�� %s ������ɤǤ��ޤ���Ǥ���"
-
-msgid "Sorry, this command is disabled: the Perl library could not be loaded."
-msgstr ""
-"���Υ��ޥ�ɤ�̵���Ǥ��������ʤ���: Perl�饤�֥�������ɤǤ��ޤ���Ǥ���."
-
-msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-msgstr ""
-"E299: ����ɥܥå����Ǥ� Safe �⥸�塼�����Ѥ��ʤ�Perl������ץȤ϶ؤ����"
-"�Ƥ��ޤ�"
-
 msgid "E836: This Vim cannot execute :python after using :py3"
 msgstr "E836: ����Vim�Ǥ� :py3 ��Ȥä���� :python ��Ȥ��ޤ���"
 
@@ -3003,7 +2990,7 @@ msgid "-g\t\t\tRun using GUI (like \"gvim\")"
 msgstr "-g\t\t\tGUI�ǵ�ư���� (\"gvim\" ��Ʊ��)"
 
 msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
-msgstr "-f or  --nofork\t�ե������饦���: GUI��Ϥ��Ȥ���fork���ʤ�"
+msgstr "-f  or  --nofork\t�ե������饦���: GUI��Ϥ��Ȥ���fork���ʤ�"
 
 msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\t\tVi�⡼�� (\"vi\" ��Ʊ��)"
@@ -3148,7 +3135,7 @@ msgstr "--remote-silent <files>  Ʊ�塢�����С���̵���Ƥ�ٹ�ʸ����Ϥ��ʤ�"
 
 msgid ""
 "--remote-wait <files>  As --remote but wait for files to have been edited"
-msgstr "--remote-wait <files>\t--remote�� �ե�������Խ��������Τ��Ԥ�"
+msgstr "--remote-wait <files>  --remote�� �ե�������Խ��������Τ��Ԥ�"
 
 msgid ""
 "--remote-wait-silent <files>  Same, don't complain if there is no server"
@@ -3266,7 +3253,7 @@ msgid "--role <role>\tSet a unique role to identify the main window"
 msgstr "--role <role>\t�ᥤ�󥦥���ɥ����̤����դ����(role)�����ꤹ��"
 
 msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-msgstr "--socketid <xid>\t�ۤʤ�GTK widget��Vim�򳫤�"
+msgstr "--socketid <xid>\t�ۤʤ�GTK widget��������Vim�򳫤�"
 
 msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
 msgstr "--echo-wid\t\t������ɥ�ID��ɸ����Ϥ˽��Ϥ���"
@@ -3322,7 +3309,7 @@ msgid ""
 "change line  col text"
 msgstr ""
 "\n"
-"�ѹ�   ��    ��  �ƥ�����"
+"�ѹ�     ��   �� �ƥ�����"
 
 msgid ""
 "\n"
@@ -3649,7 +3636,7 @@ msgstr ""
 "\n"
 "        �ץ�����ID: "
 
-msgid " (still running)"
+msgid " (STILL RUNNING)"
 msgstr " (�ޤ��¹���)"
 
 msgid ""
@@ -3745,6 +3732,9 @@ msgstr ""
 msgid "While opening file \""
 msgstr "���Υե�����򳫤��Ƥ������ \""
 
+msgid "      CANNOT BE FOUND"
+msgstr "      ���Ĥ���ޤ���"
+
 msgid "      NEWER than swap file!\n"
 msgstr "      ����åץե�������⿷�����Ǥ�!\n"
 
@@ -3960,19 +3950,15 @@ msgstr ""
 msgid "Type number and <Enter> (empty cancels): "
 msgstr "�ֹ��<Enter>�����Ϥ��Ƥ������� (���ǥ���󥻥�): "
 
-msgid "1 more line"
-msgstr "1 �� �ɲä��ޤ���"
-
-msgid "1 line less"
-msgstr "1 �� ������ޤ���"
-
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld �� �ɲä��ޤ���"
+msgid "%ld more line"
+msgid_plural "%ld more lines"
+msgstr[0] "%ld �� �ɲä��ޤ���"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld �� ������ޤ���"
+msgid "%ld line less"
+msgid_plural "%ld fewer lines"
+msgstr[0] "%ld �� ������ޤ���"
 
 msgid " (Interrupted)"
 msgstr " (����ޤ�ޤ���)"
@@ -4042,7 +4028,7 @@ msgstr ""
 
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: cdpath�ˤ� \"%s\" �Ȥ����ե����뤬����ޤ���"
+msgstr "E344: cdpath�ˤ� \"%s\" �Ȥ����ǥ��쥯�ȥ꤬����ޤ���"
 
 #, c-format
 msgid "E345: Can't find file \"%s\" in path"
@@ -4050,7 +4036,7 @@ msgstr "E345: path�ˤ� \"%s\" �Ȥ����ե����뤬����ޤ���"
 
 #, c-format
 msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: cdpath�ˤϤ���ʾ� \"%s\" �Ȥ����ե����뤬����ޤ���"
+msgstr "E346: cdpath�ˤϤ���ʾ� \"%s\" �Ȥ����ǥ��쥯�ȥ꤬����ޤ���"
 
 #, c-format
 msgid "E347: No more file \"%s\" found in path"
@@ -4108,31 +4094,23 @@ msgstr ""
 "����"
 
 #, c-format
-msgid "1 line %sed 1 time"
-msgstr "1 �Ԥ� %s �� 1 ���������ޤ���"
-
-#, c-format
-msgid "1 line %sed %d times"
-msgstr "1 �Ԥ� %s �� %d ���������ޤ���"
+msgid "%ld line %sed %d time"
+msgid_plural "%ld line %sed %d times"
+msgstr[0] "%ld �Ԥ� %s �� %d ���������ޤ���"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld �Ԥ� %s �� 1 ���������ޤ���"
-
-#, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld �Ԥ� %s �� %d ���������ޤ���"
+msgid "%ld lines %sed %d time"
+msgid_plural "%ld lines %sed %d times"
+msgstr[0] "%ld �Ԥ� %s �� %d ���������ޤ���"
 
 #, c-format
 msgid "%ld lines to indent... "
 msgstr "%ld �Ԥ�����ǥ�Ȥ���ޤ�... "
 
-msgid "1 line indented "
-msgstr "1 �Ԥ򥤥�ǥ�Ȥ��ޤ��� "
-
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld �Ԥ򥤥�ǥ�Ȥ��ޤ��� "
+msgid "%ld line indented "
+msgid_plural "%ld lines indented "
+msgstr[0] "%ld �Ԥ򥤥�ǥ�Ȥ��ޤ��� "
 
 msgid "E748: No previously used register"
 msgstr "E748: �ޤ��쥸��������Ѥ��Ƥ��ޤ���"
@@ -4140,12 +4118,10 @@ msgstr "E748: �ޤ��쥸��������Ѥ��Ƥ��ޤ���"
 msgid "cannot yank; delete anyway"
 msgstr "��󥯤Ǥ��ޤ���; �Ȥˤ����õ�"
 
-msgid "1 line changed"
-msgstr "1 �Ԥ��ѹ�����ޤ���"
-
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld �Ԥ��ѹ�����ޤ���"
+msgid "%ld line changed"
+msgid_plural "%ld lines changed"
+msgstr[0] "%ld �Ԥ��ѹ�����ޤ���"
 
 #, c-format
 msgid "freeing %ld lines"
@@ -4156,20 +4132,14 @@ msgid " into \"%c"
 msgstr " \"%c ��"
 
 #, c-format
-msgid "block of 1 line yanked%s"
-msgstr "1 �ԤΥ֥��å���%s��󥯤���ޤ���"
-
-#, c-format
-msgid "1 line yanked%s"
-msgstr "1 �Ԥ�%s��󥯤���ޤ���"
-
-#, c-format
-msgid "block of %ld lines yanked%s"
-msgstr "%ld �ԤΥ֥��å���%s��󥯤���ޤ���"
+msgid "block of %ld line yanked%s"
+msgid_plural "block of %ld lines yanked%s"
+msgstr[0] "%ld �ԤΥ֥��å���%s��󥯤���ޤ���"
 
 #, c-format
-msgid "%ld lines yanked%s"
-msgstr "%ld �Ԥ�%s��󥯤���ޤ���"
+msgid "%ld line yanked%s"
+msgid_plural "%ld lines yanked%s"
+msgstr[0] "%ld �Ԥ�%s��󥯤���ޤ���"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -5387,6 +5357,9 @@ msgstr "E783: MAP ����ȥ�˽�ʣʸ����¸�ߤ��ޤ�"
 msgid "No Syntax items defined for this buffer"
 msgstr "���ΥХåե���������줿��ʸ���ǤϤ���ޤ���"
 
+msgid "'redrawtime' exceeded, syntax highlighting disabled"
+msgstr "'redrawtime' ��Ķ�ᤷ�����ᡢ��ʸ�ϥ��饤�Ȥ�̵��������ޤ�"
+
 msgid "syntax conceal on"
 msgstr "��ʸ�� conceal �ϸ��� on �Ǥ�"
 
@@ -5415,6 +5388,9 @@ msgstr "��ʸ�� spell �ϸ��� default �Ǥ�"
 msgid "syntax iskeyword "
 msgstr "��ʸ�� iskeyword "
 
+msgid "syntax iskeyword not set"
+msgstr "��ʸ�� iskeyword �ϥ��åȤ���Ƥ��ޤ���"
+
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: ���Τ褦�ʹ�ʸ���饹���Ϥ���ޤ���: %s"
@@ -5754,6 +5730,9 @@ msgstr "�¹���"
 msgid "finished"
 msgstr "��λ"
 
+msgid "E958: Job already finished"
+msgstr "E958: ����֤Ϥ��Ǥ˽�λ���Ƥ��ޤ�"
+
 #, c-format
 msgid "E953: File exists: %s"
 msgstr "E953: �ե�����ϴ���¸�ߤ��ޤ�: %s"
@@ -5893,8 +5872,9 @@ msgid "number changes  when               saved"
 msgstr "����   �ѹ���   �ѹ�����           ��¸��"
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "%ld �÷вᤷ�Ƥ��ޤ�"
+msgid "%ld second ago"
+msgid_plural "%ld seconds ago"
+msgstr[0] "%ld �÷вᤷ�Ƥ��ޤ�"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undo ��ľ��� undojoin �ϤǤ��ޤ���"
@@ -6360,6 +6340,19 @@ msgstr "E802: ̵���� ID: %ld (1 �ʾ�Ǥʤ���Фʤ�ޤ���)"
 msgid "E803: ID not found: %ld"
 msgstr "E803: ID �Ϥ���ޤ���: %ld"
 
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: �饤�֥�� %s ������ɤǤ��ޤ���Ǥ���"
+
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr ""
+"���Υ��ޥ�ɤ�̵���Ǥ��������ʤ���: Perl�饤�֥�������ɤǤ��ޤ���Ǥ���."
+
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr ""
+"E299: ����ɥܥå����Ǥ� Safe �⥸�塼�����Ѥ��ʤ�Perl������ץȤ϶ؤ����"
+"�Ƥ��ޤ�"
+
 msgid "Edit with &multiple Vims"
 msgstr "ʣ����Vim���Խ����� (&M)"
 
@@ -6372,6 +6365,9 @@ msgstr "Vim�Ǻ�ʬ��ɽ������"
 msgid "Edit with &Vim"
 msgstr "Vim���Խ����� (&V)"
 
+msgid "Edit with existing Vim"
+msgstr "��ư�Ѥ�Vim���Խ�����"
+
 msgid "Edit with existing Vim - "
 msgstr "��ư�Ѥ�Vim���Խ����� - "
 
diff --git a/src/po/ja.po b/src/po/ja.po
index 2dfad1c45..2e70701b1 100644
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-18 00:43+0900\n"
-"PO-Revision-Date: 2017-05-18 00:45+0900\n"
+"POT-Creation-Date: 2018-11-13 19:44+0900\n"
+"PO-Revision-Date: 2018-11-16 09:41+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: Japanese <https://github.com/vim-jp/lang-ja>\n"
 "Language: ja\n"
@@ -69,26 +69,20 @@ msgstr "E516: 削除されたバッファはありません"
 msgid "E517: No buffers were wiped out"
 msgstr "E517: 破棄されたバッファはありません"
 
-msgid "1 buffer unloaded"
-msgstr "1 個のバッファが解放されました"
-
 #, c-format
-msgid "%d buffers unloaded"
-msgstr "%d 個のバッファが解放されました"
-
-msgid "1 buffer deleted"
-msgstr "1 個のバッファが削除されました"
+msgid "%d buffer unloaded"
+msgid_plural "%d buffers unloaded"
+msgstr[0] "%d 個のバッファが解放されました"
 
 #, c-format
-msgid "%d buffers deleted"
-msgstr "%d 個のバッファが削除されました"
-
-msgid "1 buffer wiped out"
-msgstr "1 個のバッファが破棄されました"
+msgid "%d buffer deleted"
+msgid_plural "%d buffers deleted"
+msgstr[0] "%d 個のバッファが削除されました"
 
 #, c-format
-msgid "%d buffers wiped out"
-msgstr "%d 個のバッファが破棄されました"
+msgid "%d buffer wiped out"
+msgid_plural "%d buffers wiped out"
+msgstr[0] "%d 個のバッファが破棄されました"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: 最後のバッファは解放できません"
@@ -162,12 +156,9 @@ msgid "[readonly]"
 msgstr "[読込専用]"
 
 #, c-format
-msgid "1 line --%d%%--"
-msgstr "1 行 --%d%%--"
-
-#, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld 行 --%d%%--"
+msgid "%ld line --%d%%--"
+msgid_plural "%ld lines --%d%%--"
+msgstr[0] "%ld 行 --%d%%--"
 
 #, c-format
 msgid "line %ld of %ld --%d%%-- col "
@@ -321,12 +312,19 @@ msgstr "E737: キーは既に存在します: %s"
 msgid "E96: Cannot diff more than %ld buffers"
 msgstr "E96: %ld 以上のバッファはdiffできません"
 
+#, c-format
+msgid "Not enough memory to use internal diff for buffer \"%s\""
+msgstr "バッファ \"%s\" 用に内部diffを使うためのメモリが不足しています"
+
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: 一時ファイルの読込もしくは書込ができません"
 
 msgid "E97: Cannot create diffs"
 msgstr "E97: 差分を作成できません"
 
+msgid "E960: Problem creating the internal diff"
+msgstr "E960: 内部diff作成時に問題が発生しました"
+
 msgid "Patch file"
 msgstr "パッチファイル"
 
@@ -336,6 +334,9 @@ msgstr "E816: patchの出力を読込めません"
 msgid "E98: Cannot read diff output"
 msgstr "E98: diffの出力を読込めません"
 
+msgid "E959: Invalid diff format."
+msgstr "E959: 無効なdiff形式です"
+
 msgid "E99: Current buffer is not in diff mode"
 msgstr "E99: 現在のバッファは差分モードではありません"
 
@@ -667,6 +668,9 @@ msgstr ""
 "\n"
 "\t最後にセットしたスクリプト: "
 
+msgid " line "
+msgstr " 行 "
+
 msgid "E691: Can only compare List with List"
 msgstr "E691: リスト型はリスト型としか比較できません"
 
@@ -744,6 +748,9 @@ msgstr "E916: 有効なジョブではありません"
 msgid "E701: Invalid type for len()"
 msgstr "E701: len() には無効な型です"
 
+msgid "E957: Invalid window number"
+msgstr "E957: 無効なウィンドウ番号です"
+
 #, c-format
 msgid "E798: ID is reserved for \":match\": %ld"
 msgstr "E798: ID は \":match\" のために予約されています: %ld"
@@ -790,6 +797,10 @@ msgstr "E258: クライアントへ送ることができません"
 msgid "E927: Invalid action: '%s'"
 msgstr "E927: 無効な操作です: %s"
 
+#, c-format
+msgid "E962: Invalid action: '%s'"
+msgstr "E962: 無効な操作です: %s"
+
 msgid "sort() argument"
 msgstr "sort() の引数"
 
@@ -839,15 +850,13 @@ msgstr "> %d, 16進数 %04x, 8進数 %o"
 msgid "> %d, Hex %08x, Octal %o"
 msgstr "> %d, 16進数 %08x, 8進数 %o"
 
-msgid "E134: Move lines into themselves"
-msgstr "E134: 行をそれ自身には移動できません"
-
-msgid "1 line moved"
-msgstr "1 行が移動されました"
+msgid "E134: Cannot move a range of lines into itself"
+msgstr "E134: 行の範囲をそれ自身には移動できません"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld 行が移動されました"
+msgid "%ld line moved"
+msgid_plural "%ld lines moved"
+msgstr[0] "%ld 行が移動されました"
 
 #, c-format
 msgid "%ld lines filtered"
@@ -999,26 +1008,25 @@ msgstr "%s に置換しますか? (y/n/a/q/l/^E/^Y)"
 msgid "(Interrupted) "
 msgstr "(割込まれました) "
 
-msgid "1 match"
-msgstr "1 箇所該当しました"
-
-msgid "1 substitution"
-msgstr "1 箇所置換しました"
-
 #, c-format
-msgid "%ld matches"
-msgstr "%ld 箇所該当しました"
+msgid "%ld match on %ld line"
+msgid_plural "%ld matches on %ld line"
+msgstr[0] "%ld 箇所該当しました (計 %ld 行内)"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld 箇所置換しました"
+msgid "%ld substitution on %ld line"
+msgid_plural "%ld substitutions on %ld line"
+msgstr[0] "%ld 箇所置換しました (計 %ld 行内)"
 
-msgid " on 1 line"
-msgstr " (計 1 行内)"
+#, c-format
+msgid "%ld match on %ld lines"
+msgid_plural "%ld matches on %ld lines"
+msgstr[0] "%ld 箇所該当しました (計 %ld 行内)"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " (計 %ld 行内)"
+msgid "%ld substitution on %ld lines"
+msgid_plural "%ld substitutions on %ld lines"
+msgstr[0] "%ld 箇所置換しました (計 %ld 行内)"
 
 msgid "E147: Cannot do :global recursive with a range"
 msgstr "E147: :global を範囲付きで再帰的には使えません"
@@ -1334,19 +1342,15 @@ msgstr ""
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: このバージョンではこのコマンドは利用できません、ごめんなさい"
 
-msgid "1 more file to edit.  Quit anyway?"
-msgstr "編集すべきファイルが 1 個ありますが、終了しますか?"
-
 #, c-format
-msgid "%d more files to edit.  Quit anyway?"
-msgstr "編集すべきファイルがあと %d 個ありますが、終了しますか?"
-
-msgid "E173: 1 more file to edit"
-msgstr "E173: 編集すべきファイルが 1 個あります"
+msgid "%d more file to edit.  Quit anyway?"
+msgid_plural "%d more files to edit.  Quit anyway?"
+msgstr[0] "編集すべきファイルがあと %d 個ありますが、終了しますか?"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: 編集すべきファイルがあと %ld 個あります"
+msgid "E173: %ld more file to edit"
+msgid_plural "E173: %ld more files to edit"
+msgstr[0] "E173: 編集すべきファイルがあと %ld 個あります"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: コマンドが既にあります: 再定義するには ! を追加してください"
@@ -1521,6 +1525,9 @@ msgstr "E498: \"<sfile>\"を置き換える :source 対象ファイル名があ�
 msgid "E842: no line number to use for \"<slnum>\""
 msgstr "E842: \"<slnum>\"を置き換える行番号がありません"
 
+msgid "E961: no line number to use for \"<sflnum>\""
+msgstr "E961: \"<sflnum>\"を置き換える行番号がありません"
+
 #, no-c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
 msgstr ""
@@ -1725,9 +1732,6 @@ msgstr "標準入力から読込み中..."
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: 変換がファイルを読込不可にしました"
 
-msgid "[fifo/socket]"
-msgstr "[FIFO/ソケット]"
-
 msgid "[fifo]"
 msgstr "[FIFO]"
 
@@ -1904,19 +1908,15 @@ msgstr "[unix]"
 msgid "[unix format]"
 msgstr "[unixフォーマット]"
 
-msgid "1 line, "
-msgstr "1 行, "
-
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld 行, "
-
-msgid "1 character"
-msgstr "1 文字"
+msgid "%ld line, "
+msgid_plural "%ld lines, "
+msgstr[0] "%ld 行, "
 
 #, c-format
-msgid "%lld characters"
-msgstr "%lld 文字"
+msgid "%lld character"
+msgid_plural "%lld characters"
+msgstr[0] "%lld 文字"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -2289,11 +2289,11 @@ msgstr "アンドゥ(&U)"
 msgid "Open tab..."
 msgstr "タブページを開く"
 
-msgid "Find string (use '\\\\' to find a '\\')"
-msgstr "検索文字列 ('\\' を検索するには '\\\\')"
+msgid "Find string"
+msgstr "検索文字列"
 
-msgid "Find & Replace (use '\\\\' to find a '\\')"
-msgstr "検索・置換 ('\\' を検索するには '\\\\')"
+msgid "Find & Replace"
+msgstr "検索・置換"
 
 msgid "Not Used"
 msgstr "使われません"
@@ -2710,19 +2710,6 @@ msgstr "範囲外の行番号です"
 msgid "not allowed in the Vim sandbox"
 msgstr "サンドボックスでは許されません"
 
-#, c-format
-msgid "E370: Could not load library %s"
-msgstr "E370: ライブラリ %s をロードできませんでした"
-
-msgid "Sorry, this command is disabled: the Perl library could not be loaded."
-msgstr ""
-"このコマンドは無効です、ごめんなさい: Perlライブラリをロードできませんでした."
-
-msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-msgstr ""
-"E299: サンドボックスでは Safe モジュールを使用しないPerlスクリプトは禁じられ"
-"ています"
-
 msgid "E836: This Vim cannot execute :python after using :py3"
 msgstr "E836: このVimでは :py3 を使った後に :python を使えません"
 
@@ -3003,7 +2990,7 @@ msgid "-g\t\t\tRun using GUI (like \"gvim\")"
 msgstr "-g\t\t\tGUIで起動する (\"gvim\" と同じ)"
 
 msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
-msgstr "-f or  --nofork\tフォアグラウンド: GUIを始めるときにforkしない"
+msgstr "-f  or  --nofork\tフォアグラウンド: GUIを始めるときにforkしない"
 
 msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\t\tViモード (\"vi\" と同じ)"
@@ -3148,7 +3135,7 @@ msgstr "--remote-silent <files>  同上、サーバーが無くても警告文�
 
 msgid ""
 "--remote-wait <files>  As --remote but wait for files to have been edited"
-msgstr "--remote-wait <files>\t--remote後 ファイルの編集が終わるのを待つ"
+msgstr "--remote-wait <files>  --remote後 ファイルの編集が終わるのを待つ"
 
 msgid ""
 "--remote-wait-silent <files>  Same, don't complain if there is no server"
@@ -3266,7 +3253,7 @@ msgid "--role <role>\tSet a unique role to identify the main window"
 msgstr "--role <role>\tメインウィンドウを識別する一意な役割(role)を設定する"
 
 msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-msgstr "--socketid <xid>\t異なるGTK widgetでVimを開く"
+msgstr "--socketid <xid>\t異なるGTK widgetの内部にVimを開く"
 
 msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
 msgstr "--echo-wid\t\tウィンドウIDを標準出力に出力する"
@@ -3322,7 +3309,7 @@ msgid ""
 "change line  col text"
 msgstr ""
 "\n"
-"変更   行    列  テキスト"
+"変更     行   列 テキスト"
 
 msgid ""
 "\n"
@@ -3649,7 +3636,7 @@ msgstr ""
 "\n"
 "        プロセスID: "
 
-msgid " (still running)"
+msgid " (STILL RUNNING)"
 msgstr " (まだ実行中)"
 
 msgid ""
@@ -3745,6 +3732,9 @@ msgstr ""
 msgid "While opening file \""
 msgstr "次のファイルを開いている最中 \""
 
+msgid "      CANNOT BE FOUND"
+msgstr "      見つかりません"
+
 msgid "      NEWER than swap file!\n"
 msgstr "      スワップファイルよりも新しいです!\n"
 
@@ -3960,19 +3950,15 @@ msgstr ""
 msgid "Type number and <Enter> (empty cancels): "
 msgstr "番号と<Enter>を入力してください (空でキャンセル): "
 
-msgid "1 more line"
-msgstr "1 行 追加しました"
-
-msgid "1 line less"
-msgstr "1 行 削除しました"
-
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld 行 追加しました"
+msgid "%ld more line"
+msgid_plural "%ld more lines"
+msgstr[0] "%ld 行 追加しました"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld 行 削除しました"
+msgid "%ld line less"
+msgid_plural "%ld fewer lines"
+msgstr[0] "%ld 行 削除しました"
 
 msgid " (Interrupted)"
 msgstr " (割込まれました)"
@@ -4042,7 +4028,7 @@ msgstr ""
 
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: cdpathには \"%s\" というファイルがありません"
+msgstr "E344: cdpathには \"%s\" というディレクトリがありません"
 
 #, c-format
 msgid "E345: Can't find file \"%s\" in path"
@@ -4050,7 +4036,7 @@ msgstr "E345: pathには \"%s\" というファイルがありません"
 
 #, c-format
 msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: cdpathにはこれ以上 \"%s\" というファイルがありません"
+msgstr "E346: cdpathにはこれ以上 \"%s\" というディレクトリがありません"
 
 #, c-format
 msgid "E347: No more file \"%s\" found in path"
@@ -4108,31 +4094,23 @@ msgstr ""
 "さい"
 
 #, c-format
-msgid "1 line %sed 1 time"
-msgstr "1 行が %s で 1 回処理されました"
-
-#, c-format
-msgid "1 line %sed %d times"
-msgstr "1 行が %s で %d 回処理されました"
+msgid "%ld line %sed %d time"
+msgid_plural "%ld line %sed %d times"
+msgstr[0] "%ld 行が %s で %d 回処理されました"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld 行が %s で 1 回処理されました"
-
-#, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld 行が %s で %d 回処理されました"
+msgid "%ld lines %sed %d time"
+msgid_plural "%ld lines %sed %d times"
+msgstr[0] "%ld 行が %s で %d 回処理されました"
 
 #, c-format
 msgid "%ld lines to indent... "
 msgstr "%ld 行がインデントされます... "
 
-msgid "1 line indented "
-msgstr "1 行をインデントしました "
-
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld 行をインデントしました "
+msgid "%ld line indented "
+msgid_plural "%ld lines indented "
+msgstr[0] "%ld 行をインデントしました "
 
 msgid "E748: No previously used register"
 msgstr "E748: まだレジスタを使用していません"
@@ -4140,12 +4118,10 @@ msgstr "E748: まだレジスタを使用していません"
 msgid "cannot yank; delete anyway"
 msgstr "ヤンクできません; とにかく消去"
 
-msgid "1 line changed"
-msgstr "1 行が変更されました"
-
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld 行が変更されました"
+msgid "%ld line changed"
+msgid_plural "%ld lines changed"
+msgstr[0] "%ld 行が変更されました"
 
 #, c-format
 msgid "freeing %ld lines"
@@ -4156,20 +4132,14 @@ msgid " into \"%c"
 msgstr " \"%c に"
 
 #, c-format
-msgid "block of 1 line yanked%s"
-msgstr "1 行のブロックが%sヤンクされました"
-
-#, c-format
-msgid "1 line yanked%s"
-msgstr "1 行が%sヤンクされました"
-
-#, c-format
-msgid "block of %ld lines yanked%s"
-msgstr "%ld 行のブロックが%sヤンクされました"
+msgid "block of %ld line yanked%s"
+msgid_plural "block of %ld lines yanked%s"
+msgstr[0] "%ld 行のブロックが%sヤンクされました"
 
 #, c-format
-msgid "%ld lines yanked%s"
-msgstr "%ld 行が%sヤンクされました"
+msgid "%ld line yanked%s"
+msgid_plural "%ld lines yanked%s"
+msgstr[0] "%ld 行が%sヤンクされました"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -5387,6 +5357,9 @@ msgstr "E783: MAP エントリに重複文字が存在します"
 msgid "No Syntax items defined for this buffer"
 msgstr "このバッファに定義された構文要素はありません"
 
+msgid "'redrawtime' exceeded, syntax highlighting disabled"
+msgstr "'redrawtime' を超過したため、構文ハイライトは無効化されます"
+
 msgid "syntax conceal on"
 msgstr "構文の conceal は現在 on です"
 
@@ -5415,6 +5388,9 @@ msgstr "構文の spell は現在 default です"
 msgid "syntax iskeyword "
 msgstr "構文用 iskeyword "
 
+msgid "syntax iskeyword not set"
+msgstr "構文用 iskeyword はセットされていません"
+
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: そのような構文クラスタはありません: %s"
@@ -5754,6 +5730,9 @@ msgstr "実行中"
 msgid "finished"
 msgstr "終了"
 
+msgid "E958: Job already finished"
+msgstr "E958: ジョブはすでに終了しています"
+
 #, c-format
 msgid "E953: File exists: %s"
 msgstr "E953: ファイルは既に存在します: %s"
@@ -5893,8 +5872,9 @@ msgid "number changes  when               saved"
 msgstr "通番   変更数   変更時期           保存済"
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "%ld 秒経過しています"
+msgid "%ld second ago"
+msgid_plural "%ld seconds ago"
+msgstr[0] "%ld 秒経過しています"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undo の直後に undojoin はできません"
@@ -6360,6 +6340,19 @@ msgstr "E802: 無効な ID: %ld (1 以上でなければなりません)"
 msgid "E803: ID not found: %ld"
 msgstr "E803: ID はありません: %ld"
 
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: ライブラリ %s をロードできませんでした"
+
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr ""
+"このコマンドは無効です、ごめんなさい: Perlライブラリをロードできませんでした."
+
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr ""
+"E299: サンドボックスでは Safe モジュールを使用しないPerlスクリプトは禁じられ"
+"ています"
+
 msgid "Edit with &multiple Vims"
 msgstr "複数のVimで編集する (&M)"
 
@@ -6372,6 +6365,9 @@ msgstr "Vimで差分を表示する"
 msgid "Edit with &Vim"
 msgstr "Vimで編集する (&V)"
 
+msgid "Edit with existing Vim"
+msgstr "起動済のVimで編集する"
+
 msgid "Edit with existing Vim - "
 msgstr "起動済のVimで編集する - "
 
diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po
index 538db7249..9e7074581 100644
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-18 00:43+0900\n"
-"PO-Revision-Date: 2017-05-18 00:45+0900\n"
+"POT-Creation-Date: 2018-11-13 19:44+0900\n"
+"PO-Revision-Date: 2018-11-16 09:41+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: Japanese <https://github.com/vim-jp/lang-ja>\n"
 "Language: ja\n"
@@ -69,26 +69,20 @@ msgstr "E516: �폜���ꂽ�o�b�t�@�͂���܂���"
 msgid "E517: No buffers were wiped out"
 msgstr "E517: �j�����ꂽ�o�b�t�@�͂���܂���"
 
-msgid "1 buffer unloaded"
-msgstr "1 �‚̃o�b�t�@���������܂���"
-
 #, c-format
-msgid "%d buffers unloaded"
-msgstr "%d �‚̃o�b�t�@���������܂���"
-
-msgid "1 buffer deleted"
-msgstr "1 �‚̃o�b�t�@���폜����܂���"
+msgid "%d buffer unloaded"
+msgid_plural "%d buffers unloaded"
+msgstr[0] "%d �‚̃o�b�t�@���������܂���"
 
 #, c-format
-msgid "%d buffers deleted"
-msgstr "%d �‚̃o�b�t�@���폜����܂���"
-
-msgid "1 buffer wiped out"
-msgstr "1 �‚̃o�b�t�@���j������܂���"
+msgid "%d buffer deleted"
+msgid_plural "%d buffers deleted"
+msgstr[0] "%d �‚̃o�b�t�@���폜����܂���"
 
 #, c-format
-msgid "%d buffers wiped out"
-msgstr "%d �‚̃o�b�t�@���j������܂���"
+msgid "%d buffer wiped out"
+msgid_plural "%d buffers wiped out"
+msgstr[0] "%d �‚̃o�b�t�@���j������܂���"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: �Ō�̃o�b�t�@�͉���ł��܂���"
@@ -162,12 +156,9 @@ msgid "[readonly]"
 msgstr "[�Ǎ���p]"
 
 #, c-format
-msgid "1 line --%d%%--"
-msgstr "1 �s --%d%%--"
-
-#, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld �s --%d%%--"
+msgid "%ld line --%d%%--"
+msgid_plural "%ld lines --%d%%--"
+msgstr[0] "%ld �s --%d%%--"
 
 #, c-format
 msgid "line %ld of %ld --%d%%-- col "
@@ -321,12 +312,19 @@ msgstr "E737: �L�[�͊��ɑ��݂��܂�: %s"
 msgid "E96: Cannot diff more than %ld buffers"
 msgstr "E96: %ld �ȏ�̃o�b�t�@��diff�ł��܂���"
 
+#, c-format
+msgid "Not enough memory to use internal diff for buffer \"%s\""
+msgstr "�o�b�t�@ \"%s\" �p�ɓ���diff���g�����߂̃��������s�����Ă��܂�"
+
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: �ꎞ�t�@�C���̓Ǎ��������͏������ł��܂���"
 
 msgid "E97: Cannot create diffs"
 msgstr "E97: �������쐬�ł��܂���"
 
+msgid "E960: Problem creating the internal diff"
+msgstr "E960: ����diff�쐬���ɖ�肪�������܂���"
+
 msgid "Patch file"
 msgstr "�p�b�`�t�@�C��"
 
@@ -336,6 +334,9 @@ msgstr "E816: patch�̏o�͂�Ǎ��߂܂���"
 msgid "E98: Cannot read diff output"
 msgstr "E98: diff�̏o�͂�Ǎ��߂܂���"
 
+msgid "E959: Invalid diff format."
+msgstr "E959: ������diff�`���ł�"
+
 msgid "E99: Current buffer is not in diff mode"
 msgstr "E99: ���݂̃o�b�t�@�͍������[�h�ł͂���܂���"
 
@@ -667,6 +668,9 @@ msgstr ""
 "\n"
 "\t�Ō�ɃZ�b�g�����X�N���v�g: "
 
+msgid " line "
+msgstr " �s "
+
 msgid "E691: Can only compare List with List"
 msgstr "E691: ���X�g�^�̓��X�g�^�Ƃ�����r�ł��܂���"
 
@@ -744,6 +748,9 @@ msgstr "E916: �L���ȃW���u�ł͂���܂���"
 msgid "E701: Invalid type for len()"
 msgstr "E701: len() �ɂ͖����Ȍ^�ł�"
 
+msgid "E957: Invalid window number"
+msgstr "E957: �����ȃE�B���h�E�ԍ��ł�"
+
 #, c-format
 msgid "E798: ID is reserved for \":match\": %ld"
 msgstr "E798: ID �� \":match\" �̂��߂ɗ\\�񂳂�Ă��܂�: %ld"
@@ -790,6 +797,10 @@ msgstr "E258: �N���C�A���g�֑��邱�Ƃ��ł��܂���"
 msgid "E927: Invalid action: '%s'"
 msgstr "E927: �����ȑ���ł�: %s"
 
+#, c-format
+msgid "E962: Invalid action: '%s'"
+msgstr "E962: �����ȑ���ł�: %s"
+
 msgid "sort() argument"
 msgstr "sort() �̈���"
 
@@ -839,15 +850,13 @@ msgstr "> %d, 16�i�� %04x, 8�i�� %o"
 msgid "> %d, Hex %08x, Octal %o"
 msgstr "> %d, 16�i�� %08x, 8�i�� %o"
 
-msgid "E134: Move lines into themselves"
-msgstr "E134: �s�����ꎩ�g�ɂ͈ړ��ł��܂���"
-
-msgid "1 line moved"
-msgstr "1 �s���ړ�����܂���"
+msgid "E134: Cannot move a range of lines into itself"
+msgstr "E134: �s�͈̔͂����ꎩ�g�ɂ͈ړ��ł��܂���"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld �s���ړ�����܂���"
+msgid "%ld line moved"
+msgid_plural "%ld lines moved"
+msgstr[0] "%ld �s���ړ�����܂���"
 
 #, c-format
 msgid "%ld lines filtered"
@@ -999,26 +1008,25 @@ msgstr "%s �ɒu�����܂���? (y/n/a/q/l/^E/^Y)"
 msgid "(Interrupted) "
 msgstr "(�����܂�܂���) "
 
-msgid "1 match"
-msgstr "1 �ӏ��Y�����܂���"
-
-msgid "1 substitution"
-msgstr "1 �ӏ��u�����܂���"
-
 #, c-format
-msgid "%ld matches"
-msgstr "%ld �ӏ��Y�����܂���"
+msgid "%ld match on %ld line"
+msgid_plural "%ld matches on %ld line"
+msgstr[0] "%ld �ӏ��Y�����܂��� (�v %ld �s��)"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld �ӏ��u�����܂���"
+msgid "%ld substitution on %ld line"
+msgid_plural "%ld substitutions on %ld line"
+msgstr[0] "%ld �ӏ��u�����܂��� (�v %ld �s��)"
 
-msgid " on 1 line"
-msgstr " (�v 1 �s��)"
+#, c-format
+msgid "%ld match on %ld lines"
+msgid_plural "%ld matches on %ld lines"
+msgstr[0] "%ld �ӏ��Y�����܂��� (�v %ld �s��)"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " (�v %ld �s��)"
+msgid "%ld substitution on %ld lines"
+msgid_plural "%ld substitutions on %ld lines"
+msgstr[0] "%ld �ӏ��u�����܂��� (�v %ld �s��)"
 
 msgid "E147: Cannot do :global recursive with a range"
 msgstr "E147: :global ��͈͕t���ōċA�I�ɂ͎g���܂���"
@@ -1334,19 +1342,15 @@ msgstr ""
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: ���̃o�[�W�����ł͂��̃R�}���h�͗��p�ł��܂���A���߂�Ȃ���"
 
-msgid "1 more file to edit.  Quit anyway?"
-msgstr "�ҏW���ׂ��t�@�C���� 1 �‚���܂����A�I�����܂���?"
-
 #, c-format
-msgid "%d more files to edit.  Quit anyway?"
-msgstr "�ҏW���ׂ��t�@�C�������� %d �‚���܂����A�I�����܂���?"
-
-msgid "E173: 1 more file to edit"
-msgstr "E173: �ҏW���ׂ��t�@�C���� 1 �‚���܂�"
+msgid "%d more file to edit.  Quit anyway?"
+msgid_plural "%d more files to edit.  Quit anyway?"
+msgstr[0] "�ҏW���ׂ��t�@�C�������� %d �‚���܂����A�I�����܂���?"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: �ҏW���ׂ��t�@�C�������� %ld �‚���܂�"
+msgid "E173: %ld more file to edit"
+msgid_plural "E173: %ld more files to edit"
+msgstr[0] "E173: �ҏW���ׂ��t�@�C�������� %ld �‚���܂�"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: �R�}���h�����ɂ���܂�: �Ē�`����ɂ� ! ��lj����Ă�������"
@@ -1521,6 +1525,9 @@ msgstr "E498: \"<sfile>\"��u�������� :source �Ώۃt�@�C����������܂���"
 msgid "E842: no line number to use for \"<slnum>\""
 msgstr "E842: \"<slnum>\"��u��������s�ԍ�������܂���"
 
+msgid "E961: no line number to use for \"<sflnum>\""
+msgstr "E961: \"<sflnum>\"��u��������s�ԍ�������܂���"
+
 #, no-c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
 msgstr ""
@@ -1725,9 +1732,6 @@ msgstr "�W�����͂���Ǎ��ݒ�..."
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: �ϊ����t�@�C����Ǎ��s�‚ɂ��܂���"
 
-msgid "[fifo/socket]"
-msgstr "[FIFO/�\\�P�b�g]"
-
 msgid "[fifo]"
 msgstr "[FIFO]"
 
@@ -1904,19 +1908,15 @@ msgstr "[unix]"
 msgid "[unix format]"
 msgstr "[unix�t�H�[�}�b�g]"
 
-msgid "1 line, "
-msgstr "1 �s, "
-
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld �s, "
-
-msgid "1 character"
-msgstr "1 ����"
+msgid "%ld line, "
+msgid_plural "%ld lines, "
+msgstr[0] "%ld �s, "
 
 #, c-format
-msgid "%lld characters"
-msgstr "%lld ����"
+msgid "%lld character"
+msgid_plural "%lld characters"
+msgstr[0] "%lld ����"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -2289,11 +2289,11 @@ msgstr "�A���h�D(&U)"
 msgid "Open tab..."
 msgstr "�^�u�y�[�W���J��"
 
-msgid "Find string (use '\\\\' to find a '\\')"
-msgstr "���������� ('\\' ����������ɂ� '\\\\')"
+msgid "Find string"
+msgstr "����������"
 
-msgid "Find & Replace (use '\\\\' to find a '\\')"
-msgstr "�����E�u�� ('\\' ����������ɂ� '\\\\')"
+msgid "Find & Replace"
+msgstr "�����E�u��"
 
 msgid "Not Used"
 msgstr "�g���܂���"
@@ -2710,19 +2710,6 @@ msgstr "�͈͊O�̍s�ԍ��ł�"
 msgid "not allowed in the Vim sandbox"
 msgstr "�T���h�{�b�N�X�ł͋�����܂���"
 
-#, c-format
-msgid "E370: Could not load library %s"
-msgstr "E370: ���C�u���� %s �����[�h�ł��܂���ł���"
-
-msgid "Sorry, this command is disabled: the Perl library could not be loaded."
-msgstr ""
-"���̃R�}���h�͖����ł��A���߂�Ȃ���: Perl���C�u���������[�h�ł��܂���ł���."
-
-msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-msgstr ""
-"E299: �T���h�{�b�N�X�ł� Safe ���W���[�����g�p���Ȃ�Perl�X�N���v�g�͋ւ����"
-"�Ă��܂�"
-
 msgid "E836: This Vim cannot execute :python after using :py3"
 msgstr "E836: ����Vim�ł� :py3 ���g������� :python ���g���܂���"
 
@@ -3003,7 +2990,7 @@ msgid "-g\t\t\tRun using GUI (like \"gvim\")"
 msgstr "-g\t\t\tGUI�ŋN������ (\"gvim\" �Ɠ���)"
 
 msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
-msgstr "-f or  --nofork\t�t�H�A�O���E���h: GUI���n�߂�Ƃ���fork���Ȃ�"
+msgstr "-f  or  --nofork\t�t�H�A�O���E���h: GUI���n�߂�Ƃ���fork���Ȃ�"
 
 msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\t\tVi���[�h (\"vi\" �Ɠ���)"
@@ -3148,7 +3135,7 @@ msgstr "--remote-silent <files>  ����A�T�[�o�[�������Ă��x�������o�͂��Ȃ�"
 
 msgid ""
 "--remote-wait <files>  As --remote but wait for files to have been edited"
-msgstr "--remote-wait <files>\t--remote�� �t�@�C���̕ҏW���I���̂�҂�"
+msgstr "--remote-wait <files>  --remote�� �t�@�C���̕ҏW���I���̂�҂�"
 
 msgid ""
 "--remote-wait-silent <files>  Same, don't complain if there is no server"
@@ -3266,7 +3253,7 @@ msgid "--role <role>\tSet a unique role to identify the main window"
 msgstr "--role <role>\t���C���E�B���h�E�����ʂ����ӂȖ���(role)��ݒ肷��"
 
 msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-msgstr "--socketid <xid>\t�قȂ�GTK widget��Vim���J��"
+msgstr "--socketid <xid>\t�قȂ�GTK widget�̓�����Vim���J��"
 
 msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
 msgstr "--echo-wid\t\t�E�B���h�EID��W���o�͂ɏo�͂���"
@@ -3322,7 +3309,7 @@ msgid ""
 "change line  col text"
 msgstr ""
 "\n"
-"�ύX   �s    ��  �e�L�X�g"
+"�ύX     �s   �� �e�L�X�g"
 
 msgid ""
 "\n"
@@ -3649,7 +3636,7 @@ msgstr ""
 "\n"
 "        �v���Z�XID: "
 
-msgid " (still running)"
+msgid " (STILL RUNNING)"
 msgstr " (�܂����s��)"
 
 msgid ""
@@ -3745,6 +3732,9 @@ msgstr ""
 msgid "While opening file \""
 msgstr "���̃t�@�C�����J���Ă���Œ� \""
 
+msgid "      CANNOT BE FOUND"
+msgstr "      ���‚���܂���"
+
 msgid "      NEWER than swap file!\n"
 msgstr "      �X���b�v�t�@�C�������V�����ł�!\n"
 
@@ -3960,19 +3950,15 @@ msgstr ""
 msgid "Type number and <Enter> (empty cancels): "
 msgstr "�ԍ���<Enter>����͂��Ă������� (��ŃL�����Z��): "
 
-msgid "1 more line"
-msgstr "1 �s �lj����܂���"
-
-msgid "1 line less"
-msgstr "1 �s �폜���܂���"
-
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld �s �lj����܂���"
+msgid "%ld more line"
+msgid_plural "%ld more lines"
+msgstr[0] "%ld �s �lj����܂���"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld �s �폜���܂���"
+msgid "%ld line less"
+msgid_plural "%ld fewer lines"
+msgstr[0] "%ld �s �폜���܂���"
 
 msgid " (Interrupted)"
 msgstr " (�����܂�܂���)"
@@ -4042,7 +4028,7 @@ msgstr ""
 
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: cdpath�ɂ� \"%s\" �Ƃ����t�@�C��������܂���"
+msgstr "E344: cdpath�ɂ� \"%s\" �Ƃ����f�B���N�g��������܂���"
 
 #, c-format
 msgid "E345: Can't find file \"%s\" in path"
@@ -4050,7 +4036,7 @@ msgstr "E345: path�ɂ� \"%s\" �Ƃ����t�@�C��������܂���"
 
 #, c-format
 msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: cdpath�ɂ͂���ȏ� \"%s\" �Ƃ����t�@�C��������܂���"
+msgstr "E346: cdpath�ɂ͂���ȏ� \"%s\" �Ƃ����f�B���N�g��������܂���"
 
 #, c-format
 msgid "E347: No more file \"%s\" found in path"
@@ -4108,31 +4094,23 @@ msgstr ""
 "����"
 
 #, c-format
-msgid "1 line %sed 1 time"
-msgstr "1 �s�� %s �� 1 �񏈗�����܂���"
-
-#, c-format
-msgid "1 line %sed %d times"
-msgstr "1 �s�� %s �� %d �񏈗�����܂���"
+msgid "%ld line %sed %d time"
+msgid_plural "%ld line %sed %d times"
+msgstr[0] "%ld �s�� %s �� %d �񏈗�����܂���"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld �s�� %s �� 1 �񏈗�����܂���"
-
-#, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld �s�� %s �� %d �񏈗�����܂���"
+msgid "%ld lines %sed %d time"
+msgid_plural "%ld lines %sed %d times"
+msgstr[0] "%ld �s�� %s �� %d �񏈗�����܂���"
 
 #, c-format
 msgid "%ld lines to indent... "
 msgstr "%ld �s���C���f���g����܂�... "
 
-msgid "1 line indented "
-msgstr "1 �s���C���f���g���܂��� "
-
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld �s���C���f���g���܂��� "
+msgid "%ld line indented "
+msgid_plural "%ld lines indented "
+msgstr[0] "%ld �s���C���f���g���܂��� "
 
 msgid "E748: No previously used register"
 msgstr "E748: �܂����W�X�^���g�p���Ă��܂���"
@@ -4140,12 +4118,10 @@ msgstr "E748: �܂����W�X�^���g�p���Ă��܂���"
 msgid "cannot yank; delete anyway"
 msgstr "�����N�ł��܂���; �Ƃɂ�������"
 
-msgid "1 line changed"
-msgstr "1 �s���ύX����܂���"
-
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld �s���ύX����܂���"
+msgid "%ld line changed"
+msgid_plural "%ld lines changed"
+msgstr[0] "%ld �s���ύX����܂���"
 
 #, c-format
 msgid "freeing %ld lines"
@@ -4156,20 +4132,14 @@ msgid " into \"%c"
 msgstr " \"%c ��"
 
 #, c-format
-msgid "block of 1 line yanked%s"
-msgstr "1 �s�̃u���b�N��%s�����N����܂���"
-
-#, c-format
-msgid "1 line yanked%s"
-msgstr "1 �s��%s�����N����܂���"
-
-#, c-format
-msgid "block of %ld lines yanked%s"
-msgstr "%ld �s�̃u���b�N��%s�����N����܂���"
+msgid "block of %ld line yanked%s"
+msgid_plural "block of %ld lines yanked%s"
+msgstr[0] "%ld �s�̃u���b�N��%s�����N����܂���"
 
 #, c-format
-msgid "%ld lines yanked%s"
-msgstr "%ld �s��%s�����N����܂���"
+msgid "%ld line yanked%s"
+msgid_plural "%ld lines yanked%s"
+msgstr[0] "%ld �s��%s�����N����܂���"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -5387,6 +5357,9 @@ msgstr "E783: MAP �G���g���ɏd�����������݂��܂�"
 msgid "No Syntax items defined for this buffer"
 msgstr "���̃o�b�t�@�ɒ�`���ꂽ�\\���v�f�͂���܂���"
 
+msgid "'redrawtime' exceeded, syntax highlighting disabled"
+msgstr "'redrawtime' �𒴉߂������߁A�\\���n�C���C�g�͖���������܂�"
+
 msgid "syntax conceal on"
 msgstr "�\\���� conceal �͌��� on �ł�"
 
@@ -5415,6 +5388,9 @@ msgstr "�\\���� spell �͌��� default �ł�"
 msgid "syntax iskeyword "
 msgstr "�\\���p iskeyword "
 
+msgid "syntax iskeyword not set"
+msgstr "�\\���p iskeyword �̓Z�b�g����Ă��܂���"
+
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: ���̂悤�ȍ\\���N���X�^�͂���܂���: %s"
@@ -5754,6 +5730,9 @@ msgstr "���s��"
 msgid "finished"
 msgstr "�I��"
 
+msgid "E958: Job already finished"
+msgstr "E958: �W���u�͂��łɏI�����Ă��܂�"
+
 #, c-format
 msgid "E953: File exists: %s"
 msgstr "E953: �t�@�C���͊��ɑ��݂��܂�: %s"
@@ -5893,8 +5872,9 @@ msgid "number changes  when               saved"
 msgstr "�ʔ�   �ύX��   �ύX����           �ۑ���"
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "%ld �b�o�߂��Ă��܂�"
+msgid "%ld second ago"
+msgid_plural "%ld seconds ago"
+msgstr[0] "%ld �b�o�߂��Ă��܂�"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undo �̒���� undojoin �͂ł��܂���"
@@ -6360,6 +6340,19 @@ msgstr "E802: ������ ID: %ld (1 �ȏ�łȂ���΂Ȃ�܂���)"
 msgid "E803: ID not found: %ld"
 msgstr "E803: ID �͂���܂���: %ld"
 
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: ���C�u���� %s �����[�h�ł��܂���ł���"
+
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr ""
+"���̃R�}���h�͖����ł��A���߂�Ȃ���: Perl���C�u���������[�h�ł��܂���ł���."
+
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr ""
+"E299: �T���h�{�b�N�X�ł� Safe ���W���[�����g�p���Ȃ�Perl�X�N���v�g�͋ւ����"
+"�Ă��܂�"
+
 msgid "Edit with &multiple Vims"
 msgstr "������Vim�ŕҏW���� (&M)"
 
@@ -6372,6 +6365,9 @@ msgstr "Vim�ō�����\\������"
 msgid "Edit with &Vim"
 msgstr "Vim�ŕҏW���� (&V)"
 
+msgid "Edit with existing Vim"
+msgstr "�N���ς�Vim�ŕҏW����"
+
 msgid "Edit with existing Vim - "
 msgstr "�N���ς�Vim�ŕҏW���� - "