Update runtime files
diff --git a/src/po/af.po b/src/po/af.po
index 9b6fb0a..2ff7369 100644
--- a/src/po/af.po
+++ b/src/po/af.po
@@ -240,7 +240,7 @@
 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
+#. Scroll has its own msgs, in its 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)"
diff --git a/src/po/cs.cp1250.po b/src/po/cs.cp1250.po
index 1813401..db3590d 100644
--- a/src/po/cs.cp1250.po
+++ b/src/po/cs.cp1250.po
@@ -218,7 +218,7 @@
 msgid " ^X mode (^E/^Y/^L/^]/^F/^I/^K/^D/^V/^N/^P)"
 msgstr " ^X režim (^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
+#. Scroll has its own msgs, in its place there is the msg for local
 #. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL)  -- Acevedo
 msgid " Keyword Local completion (^N/^P)"
 msgstr " Lokální doplòování klíèových slov (^N/^P)"
diff --git a/src/po/cs.po b/src/po/cs.po
index 5b9e686..df18a13 100644
--- a/src/po/cs.po
+++ b/src/po/cs.po
@@ -218,7 +218,7 @@
 msgid " ^X mode (^E/^Y/^L/^]/^F/^I/^K/^D/^V/^N/^P)"
 msgstr " ^X re¾im (^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
+#. Scroll has its own msgs, in its place there is the msg for local
 #. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL)  -- Acevedo
 msgid " Keyword Local completion (^N/^P)"
 msgstr " Lokální doplòování klíèových slov (^N/^P)"
diff --git a/src/po/es.po b/src/po/es.po
index e4efdf9..91f8618 100644
--- a/src/po/es.po
+++ b/src/po/es.po
@@ -357,7 +357,7 @@
 msgid " Spelling suggestion (s^N^P)"
 msgstr " Sugerencia de ortografía (s^N^P)"
 
-# Scroll has it's own msgs, in it's place there is the msg for local
+# Scroll has its own msgs, in its place there is the msg for local
 # * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL)  -- Acevedo
 #: edit.c:57
 msgid " Keyword Local completion (^N^P)"
diff --git a/src/po/gvim.desktop.in b/src/po/gvim.desktop.in
index 287a489..7d52348 100644
--- a/src/po/gvim.desktop.in
+++ b/src/po/gvim.desktop.in
@@ -45,7 +45,6 @@
 Comment[id]=Edit file teks
 Comment[is]=Vinna með textaskrár
 Comment[it]=Modifica file di testo
-Comment[ja]=テキストファイルを編集します
 Comment[kn]=ಪಠ್ಯ ಕಡತಗಳನ್ನು ಸಂಪಾದಿಸು
 Comment[ko]=텍스트 파일을 편집합니다
 Comment[lt]=Redaguoti tekstines bylas
diff --git a/src/po/ja.euc-jp.po b/src/po/ja.euc-jp.po
index e503f31..f2d0115 100644
--- a/src/po/ja.euc-jp.po
+++ b/src/po/ja.euc-jp.po
@@ -14,8 +14,8 @@
 msgstr ""
 "Project-Id-Version: Vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-18 19:15+0900\n"
-"PO-Revision-Date: 2019-03-12 08:23+0900\n"
+"POT-Creation-Date: 2019-05-05 11:27+0900\n"
+"PO-Revision-Date: 2019-05-05 13:00+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"
@@ -331,6 +331,51 @@
 msgid "[crypted]"
 msgstr "[°Å¹æ²½]"
 
+msgid "Entering Debug mode.  Type \"cont\" to continue."
+msgstr "¥Ç¥Ð¥Ã¥°¥â¡¼¥É¤ËÆþ¤ê¤Þ¤¹. ³¤±¤ë¤Ë¤Ï \"cont\" ¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤."
+
+#, c-format
+msgid "Oldval = \"%s\""
+msgstr "¸Å¤¤ÃÍ = \"%s\""
+
+#, c-format
+msgid "Newval = \"%s\""
+msgstr "¿·¤·¤¤ÃÍ = \"%s\""
+
+#, c-format
+msgid "line %ld: %s"
+msgstr "¹Ô %ld: %s"
+
+#, c-format
+msgid "cmd: %s"
+msgstr "¥³¥Þ¥ó¥É: %s"
+
+msgid "frame is zero"
+msgstr "¥Õ¥ì¡¼¥à¤¬ 0 ¤Ç¤¹"
+
+#, c-format
+msgid "frame at highest level: %d"
+msgstr "ºÇ¹â¥ì¥Ù¥ë¤Î¥Õ¥ì¡¼¥à: %d"
+
+#, c-format
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "¥Ö¥ì¡¼¥¯¥Ý¥¤¥ó¥È \"%s%s\" ¹Ô %ld"
+
+#, c-format
+msgid "E161: Breakpoint not found: %s"
+msgstr "E161: ¥Ö¥ì¡¼¥¯¥Ý¥¤¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s"
+
+msgid "No breakpoints defined"
+msgstr "¥Ö¥ì¡¼¥¯¥Ý¥¤¥ó¥È¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+#, c-format
+msgid "%3d  %s %s  line %ld"
+msgstr "%3d  %s %s  ¹Ô %ld"
+
+#, c-format
+msgid "%3d  expr %s"
+msgstr "%3d  expr %s"
+
 #, c-format
 msgid "E720: Missing colon in Dictionary: %s"
 msgstr "E720: ¼­½ñ·¿¤Ë¥³¥í¥ó¤¬¤¢¤ê¤Þ¤»¤ó: %s"
@@ -494,106 +539,6 @@
 msgid "E791: Empty keymap entry"
 msgstr "E791: ¶õ¤Î¥­¡¼¥Þ¥Ã¥×¥¨¥ó¥È¥ê"
 
-msgid " Keyword completion (^N^P)"
-msgstr " ¥­¡¼¥ï¡¼¥ÉÊä´° (^N^P)"
-
-msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-msgstr " ^X ¥â¡¼¥É (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-
-msgid " Whole line completion (^L^N^P)"
-msgstr " ¹Ô(Á´ÂÎ)Êä´° (^L^N^P)"
-
-msgid " File name completion (^F^N^P)"
-msgstr " ¥Õ¥¡¥¤¥ë̾Êä´° (^F^N^P)"
-
-msgid " Tag completion (^]^N^P)"
-msgstr " ¥¿¥°Êä´° (^]^N^P)"
-
-msgid " Path pattern completion (^N^P)"
-msgstr " ¥Ñ¥¹¥Ñ¥¿¡¼¥óÊä´° (^N^P)"
-
-msgid " Definition completion (^D^N^P)"
-msgstr " ÄêµÁÊä´° (^D^N^P)"
-
-msgid " Dictionary completion (^K^N^P)"
-msgstr " ¼­½ñÊä´° (^K^N^P)"
-
-msgid " Thesaurus completion (^T^N^P)"
-msgstr " ¥·¥½¡¼¥é¥¹Êä´° (^T^N^P)"
-
-msgid " Command-line completion (^V^N^P)"
-msgstr " ¥³¥Þ¥ó¥É¥é¥¤¥óÊä´° (^V^N^P)"
-
-msgid " User defined completion (^U^N^P)"
-msgstr " ¥æ¡¼¥¶¡¼ÄêµÁÊä´° (^U^N^P)"
-
-msgid " Omni completion (^O^N^P)"
-msgstr " ¥ª¥à¥ËÊä´° (^O^N^P)"
-
-msgid " Spelling suggestion (s^N^P)"
-msgstr " Ä֤꽤Àµ¸õÊä (s^N^P)"
-
-msgid " Keyword Local completion (^N^P)"
-msgstr " ¶É½ê¥­¡¼¥ï¡¼¥ÉÊä´° (^N^P)"
-
-msgid "Hit end of paragraph"
-msgstr "ÃÊÍî¤ÎºÇ¸å¤Ë¥Ò¥Ã¥È"
-
-msgid "E839: Completion function changed window"
-msgstr "E839: Êä´Ö´Ø¿ô¤¬¥¦¥£¥ó¥É¥¦¤òÊѹ¹¤·¤Þ¤·¤¿"
-
-msgid "E840: Completion function deleted text"
-msgstr "E840: Êä´°´Ø¿ô¤¬¥Æ¥­¥¹¥È¤òºï½ü¤·¤Þ¤·¤¿"
-
-msgid "'dictionary' option is empty"
-msgstr "'dictionary' ¥ª¥×¥·¥ç¥ó¤¬¶õ¤Ç¤¹"
-
-msgid "'thesaurus' option is empty"
-msgstr "'thesaurus' ¥ª¥×¥·¥ç¥ó¤¬¶õ¤Ç¤¹"
-
-#, c-format
-msgid "Scanning dictionary: %s"
-msgstr "¼­½ñ¤ò¥¹¥­¥ã¥óÃæ: %s"
-
-msgid " (insert) Scroll (^E/^Y)"
-msgstr " (ÁÞÆþ) ¥¹¥¯¥í¡¼¥ë(^E/^Y)"
-
-msgid " (replace) Scroll (^E/^Y)"
-msgstr " (ÃÖ´¹) ¥¹¥¯¥í¡¼¥ë (^E/^Y)"
-
-#, c-format
-msgid "Scanning: %s"
-msgstr "¥¹¥­¥ã¥óÃæ: %s"
-
-msgid "Scanning tags."
-msgstr "¥¿¥°¤ò¥¹¥­¥ã¥óÃæ."
-
-msgid "match in file"
-msgstr "¥Õ¥¡¥¤¥ëÆâ¤Î¥Þ¥Ã¥Á"
-
-msgid " Adding"
-msgstr " ÄɲÃÃæ"
-
-msgid "-- Searching..."
-msgstr "-- ¸¡º÷Ãæ..."
-
-msgid "Back at original"
-msgstr "»Ï¤á¤ËÌá¤ë"
-
-msgid "Word from other line"
-msgstr "¾¤Î¹Ô¤Îñ¸ì"
-
-msgid "The only match"
-msgstr "Í£°ì¤Î³ºÅö"
-
-#, c-format
-msgid "match %d of %d"
-msgstr "%d ÈÖÌܤγºÅö (Á´³ºÅö %d ¸ÄÃæ)"
-
-#, c-format
-msgid "match %d"
-msgstr "%d ÈÖÌܤγºÅö"
-
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: ͽ´ü¤»¤Ìʸ»ú¤¬ :let ¤Ë¤¢¤ê¤Þ¤·¤¿"
 
@@ -618,6 +563,9 @@
 msgid "E806: using Float as a String"
 msgstr "E806: ÉâÆ°¾®¿ôÅÀ¿ô¤òʸ»úÎó¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
 
+msgid "E985: .= is not supported with script version 2"
+msgstr "E985: .= ¤Ï¥¹¥¯¥ê¥×¥È¥Ð¡¼¥¸¥ç¥ó 2 ¤Ç¤ÏÂбþ¤·¤Æ¤¤¤Þ¤»¤ó"
+
 msgid "E687: Less targets than List items"
 msgstr "E687: ¥¿¡¼¥²¥Ã¥È¤¬¥ê¥¹¥È·¿Æâ¤ÎÍ×ÁǤè¤ê¤â¾¯¤Ê¤¤¤Ç¤¹"
 
@@ -846,6 +794,9 @@
 msgid "E928: String required"
 msgstr "E928: ʸ»úÎó¤¬É¬ÍפǤ¹"
 
+msgid "E957: Invalid window number"
+msgstr "E957: ̵¸ú¤Ê¥¦¥£¥ó¥É¥¦ÈÖ¹æ¤Ç¤¹"
+
 msgid "E808: Number or Float required"
 msgstr "E808: ¿ôÃͤ«ÉâÆ°¾®¿ôÅÀ¿ô¤¬É¬ÍפǤ¹"
 
@@ -902,9 +853,6 @@
 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\": %d"
 msgstr "E798: ID ¤Ï \":match\" ¤Î¤¿¤á¤ËͽÌó¤µ¤ì¤Æ¤¤¤Þ¤¹: %d"
@@ -1248,51 +1196,6 @@
 msgid "No old files"
 msgstr "¸Å¤¤¥Õ¥¡¥¤¥ë¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "¥Ç¥Ð¥Ã¥°¥â¡¼¥É¤ËÆþ¤ê¤Þ¤¹. ³¤±¤ë¤Ë¤Ï \"cont\" ¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤."
-
-#, c-format
-msgid "Oldval = \"%s\""
-msgstr "¸Å¤¤ÃÍ = \"%s\""
-
-#, c-format
-msgid "Newval = \"%s\""
-msgstr "¿·¤·¤¤ÃÍ = \"%s\""
-
-#, c-format
-msgid "line %ld: %s"
-msgstr "¹Ô %ld: %s"
-
-#, c-format
-msgid "cmd: %s"
-msgstr "¥³¥Þ¥ó¥É: %s"
-
-msgid "frame is zero"
-msgstr "¥Õ¥ì¡¼¥à¤¬ 0 ¤Ç¤¹"
-
-#, c-format
-msgid "frame at highest level: %d"
-msgstr "ºÇ¹â¥ì¥Ù¥ë¤Î¥Õ¥ì¡¼¥à: %d"
-
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "¥Ö¥ì¡¼¥¯¥Ý¥¤¥ó¥È \"%s%s\" ¹Ô %ld"
-
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: ¥Ö¥ì¡¼¥¯¥Ý¥¤¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s"
-
-msgid "No breakpoints defined"
-msgstr "¥Ö¥ì¡¼¥¯¥Ý¥¤¥ó¥È¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-#, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  ¹Ô %ld"
-
-#, c-format
-msgid "%3d  expr %s"
-msgstr "%3d  expr %s"
-
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: ½é¤á¤Ë \":profile start {fname}\" ¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤"
 
@@ -1396,6 +1299,13 @@
 msgid "E167: :scriptencoding used outside of a sourced file"
 msgstr "E167: :scriptencoding ¤¬¼è¹þ¥¹¥¯¥ê¥×¥È°Ê³°¤Ç»ÈÍѤµ¤ì¤Þ¤·¤¿"
 
+msgid "E984: :scriptversion used outside of a sourced file"
+msgstr "E984: :scriptversion ¤¬¼è¹þ¥¹¥¯¥ê¥×¥È°Ê³°¤Ç»ÈÍѤµ¤ì¤Þ¤·¤¿"
+
+#, c-format
+msgid "E999: scriptversion not supported: %d"
+msgstr "E999: scriptversion ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %d"
+
 msgid "E168: :finish used outside of a sourced file"
 msgstr "E168: :finish ¤¬¼è¹þ¥¹¥¯¥ê¥×¥È°Ê³°¤Ç»ÈÍѤµ¤ì¤Þ¤·¤¿"
 
@@ -1445,6 +1355,12 @@
 msgid "E494: Use w or w>>"
 msgstr "E494: w ¤â¤·¤¯¤Ï w>> ¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤"
 
+msgid ""
+"INTERNAL: Cannot use DFLALL with ADDR_NONE, ADDR_UNSIGNED or ADDR_QUICKFIX"
+msgstr ""
+"ÆâÉô¥¨¥é¡¼: DFLALL ¤ò ADDR_NONE, ADDR_UNSIGNED ¤ä ADDR_QUICKFIX ¤È¤È¤â¤Ë»È¤¦"
+"¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
+
 msgid "E943: Command table needs to be updated, run 'make cmdidxs'"
 msgstr ""
 "E943: ¥³¥Þ¥ó¥É¥Æ¡¼¥Ö¥ë¤ò¹¹¿·¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡¢'make cmdidxs' ¤ò¼Â¹Ô¤·¤Æ¤¯¤À"
@@ -1463,69 +1379,6 @@
 msgid_plural "E173: %d more files to edit"
 msgstr[0] "E173: ÊÔ½¸¤¹¤Ù¤­¥Õ¥¡¥¤¥ë¤¬¤¢¤È %d ¸Ä¤¢¤ê¤Þ¤¹"
 
-#, c-format
-msgid "E174: Command already exists: add ! to replace it: %s"
-msgstr "E174: ¥³¥Þ¥ó¥É¤¬´û¤Ë¤¢¤ê¤Þ¤¹: ºÆÄêµÁ¤¹¤ë¤Ë¤Ï ! ¤òÄɲ䷤Ƥ¯¤À¤µ¤¤: %s"
-
-msgid ""
-"\n"
-"    Name        Args       Address   Complete  Definition"
-msgstr ""
-"\n"
-"    ̾Á°        °ú¿ô       ¥¢¥É¥ì¥¹  Êä´°      ÄêµÁ"
-
-msgid "No user-defined commands found"
-msgstr "¥æ¡¼¥¶¡¼ÄêµÁ¥³¥Þ¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
-
-msgid "E175: No attribute specified"
-msgstr "E175: °À­¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-msgid "E176: Invalid number of arguments"
-msgstr "E176: °ú¿ô¤Î¿ô¤¬Ìµ¸ú¤Ç¤¹"
-
-msgid "E177: Count cannot be specified twice"
-msgstr "E177: ¥«¥¦¥ó¥È¤ò2½Å»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
-
-msgid "E178: Invalid default value for count"
-msgstr "E178: ¥«¥¦¥ó¥È¤Î¾ÊάÃͤ¬Ìµ¸ú¤Ç¤¹"
-
-msgid "E179: argument required for -complete"
-msgstr "E179: -complete ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹"
-
-msgid "E179: argument required for -addr"
-msgstr "E179: -addr ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹"
-
-#, c-format
-msgid "E181: Invalid attribute: %s"
-msgstr "E181: ̵¸ú¤Ê°À­¤Ç¤¹: %s"
-
-msgid "E182: Invalid command name"
-msgstr "E182: ̵¸ú¤Ê¥³¥Þ¥ó¥É̾¤Ç¤¹"
-
-msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: ¥æ¡¼¥¶¡¼ÄêµÁ¥³¥Þ¥ó¥É¤Ï±ÑÂçʸ»ú¤Ç»Ï¤Þ¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-
-msgid "E841: Reserved name, cannot be used for user defined command"
-msgstr "E841: ͽÌó̾¤Ê¤Î¤Ç¡¢¥æ¡¼¥¶¡¼ÄêµÁ¥³¥Þ¥ó¥É¤ËÍøÍѤǤ­¤Þ¤»¤ó"
-
-#, c-format
-msgid "E184: No such user-defined command: %s"
-msgstr "E184: ¤½¤Î¥æ¡¼¥¶¡¼ÄêµÁ¥³¥Þ¥ó¥É¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
-
-#, c-format
-msgid "E180: Invalid address type value: %s"
-msgstr "E180: ̵¸ú¤Ê¥¢¥É¥ì¥¹¥¿¥¤¥×ÃͤǤ¹: %s"
-
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: ̵¸ú¤ÊÊä´°»ØÄê¤Ç¤¹: %s"
-
-msgid "E468: Completion argument only allowed for custom completion"
-msgstr "E468: Êä´°°ú¿ô¤Ï¥«¥¹¥¿¥àÊä´°¤Ç¤·¤«»ÈÍѤǤ­¤Þ¤»¤ó"
-
-msgid "E467: Custom completion requires a function argument"
-msgstr "E467: ¥«¥¹¥¿¥àÊä´°¤Ë¤Ï°ú¿ô¤È¤·¤Æ´Ø¿ô¤¬É¬ÍפǤ¹"
-
 msgid "unknown"
 msgstr "ÉÔÌÀ"
 
@@ -1908,20 +1761,21 @@
 msgstr "¤ÏÆÉ¹þÀìÍѤǤ¹ (¶¯À©½ñ¹þ¤Ë¤Ï ! ¤òÄɲÃ)"
 
 msgid "E506: Can't write to backup file (add ! to override)"
-msgstr "E506: ¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤òÊݸ¤Ç¤­¤Þ¤»¤ó (! ¤òÄɲäǶ¯À©Êݸ)"
+msgstr "E506: ¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤òÊݸ¤Ç¤­¤Þ¤»¤ó (! ¤òÄɲäǶ¯À©½ñ¹þ)"
 
 msgid "E507: Close error for backup file (add ! to override)"
 msgstr ""
-"E507: ¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤òÊĤ¸¤ëºÝ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (! ¤òÄɲäǶ¯À©)"
+"E507: ¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤òÊĤ¸¤ëºÝ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (! ¤òÄɲäǶ¯À©½ñ"
+"¹þ)"
 
 msgid "E508: Can't read file for backup (add ! to override)"
-msgstr "E508: ¥Ð¥Ã¥¯¥¢¥Ã¥×ÍÑ¥Õ¥¡¥¤¥ë¤òÆÉ¹þ¤á¤Þ¤»¤ó (! ¤òÄɲäǶ¯À©ÆÉ¹þ)"
+msgstr "E508: ¥Ð¥Ã¥¯¥¢¥Ã¥×ÍÑ¥Õ¥¡¥¤¥ë¤òÆÉ¹þ¤á¤Þ¤»¤ó (! ¤òÄɲäǶ¯À©½ñ¹þ)"
 
 msgid "E509: Cannot create backup file (add ! to override)"
-msgstr "E509: ¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤òºî¤ì¤Þ¤»¤ó (! ¤òÄɲäǶ¯À©ºîÀ®)"
+msgstr "E509: ¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤òºî¤ì¤Þ¤»¤ó (! ¤òÄɲäǶ¯À©½ñ¹þ)"
 
 msgid "E510: Can't make backup file (add ! to override)"
-msgstr "E510: ¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤òºî¤ì¤Þ¤»¤ó (! ¤òÄɲäǶ¯À©ºîÀ®)"
+msgstr "E510: ¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤òºî¤ì¤Þ¤»¤ó (! ¤òÄɲäǶ¯À©½ñ¹þ)"
 
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: ÊݸÍѰì»þ¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
@@ -2391,6 +2245,9 @@
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
 msgstr "E243: °ú¿ô¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Þ¤»¤ó: \"-%s\"; OLEÈǤò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤."
 
+msgid "E988: GUI cannot be used. Cannot execute gvim.exe."
+msgstr "E988: GUI¤Ï»ÈÍÑÉÔ²Äǽ¤Ç¤¹¡£gvim.exe¤òµ¯Æ°¤Ç¤­¤Þ¤»¤ó¡£"
+
 msgid "E672: Unable to open window inside MDI application"
 msgstr "E672: MDI¥¢¥×¥ê¤ÎÃæ¤Ç¤Ï¥¦¥£¥ó¥É¥¦¤ò³«¤±¤Þ¤»¤ó"
 
@@ -2931,6 +2788,106 @@
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: VIM ¼ÂÂΤÎÅÐÏ¿¥×¥í¥Ñ¥Æ¥£¤¬ÉÔÀµ¤Ç¤¹. ¾Ãµî¤·¤Þ¤·¤¿!"
 
+msgid " Keyword completion (^N^P)"
+msgstr " ¥­¡¼¥ï¡¼¥ÉÊä´° (^N^P)"
+
+msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
+msgstr " ^X ¥â¡¼¥É (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
+
+msgid " Whole line completion (^L^N^P)"
+msgstr " ¹Ô(Á´ÂÎ)Êä´° (^L^N^P)"
+
+msgid " File name completion (^F^N^P)"
+msgstr " ¥Õ¥¡¥¤¥ë̾Êä´° (^F^N^P)"
+
+msgid " Tag completion (^]^N^P)"
+msgstr " ¥¿¥°Êä´° (^]^N^P)"
+
+msgid " Path pattern completion (^N^P)"
+msgstr " ¥Ñ¥¹¥Ñ¥¿¡¼¥óÊä´° (^N^P)"
+
+msgid " Definition completion (^D^N^P)"
+msgstr " ÄêµÁÊä´° (^D^N^P)"
+
+msgid " Dictionary completion (^K^N^P)"
+msgstr " ¼­½ñÊä´° (^K^N^P)"
+
+msgid " Thesaurus completion (^T^N^P)"
+msgstr " ¥·¥½¡¼¥é¥¹Êä´° (^T^N^P)"
+
+msgid " Command-line completion (^V^N^P)"
+msgstr " ¥³¥Þ¥ó¥É¥é¥¤¥óÊä´° (^V^N^P)"
+
+msgid " User defined completion (^U^N^P)"
+msgstr " ¥æ¡¼¥¶¡¼ÄêµÁÊä´° (^U^N^P)"
+
+msgid " Omni completion (^O^N^P)"
+msgstr " ¥ª¥à¥ËÊä´° (^O^N^P)"
+
+msgid " Spelling suggestion (s^N^P)"
+msgstr " Ä֤꽤Àµ¸õÊä (s^N^P)"
+
+msgid " Keyword Local completion (^N^P)"
+msgstr " ¶É½ê¥­¡¼¥ï¡¼¥ÉÊä´° (^N^P)"
+
+msgid "Hit end of paragraph"
+msgstr "ÃÊÍî¤ÎºÇ¸å¤Ë¥Ò¥Ã¥È"
+
+msgid "E839: Completion function changed window"
+msgstr "E839: Êä´°´Ø¿ô¤¬¥¦¥£¥ó¥É¥¦¤òÊѹ¹¤·¤Þ¤·¤¿"
+
+msgid "E840: Completion function deleted text"
+msgstr "E840: Êä´°´Ø¿ô¤¬¥Æ¥­¥¹¥È¤òºï½ü¤·¤Þ¤·¤¿"
+
+msgid "'dictionary' option is empty"
+msgstr "'dictionary' ¥ª¥×¥·¥ç¥ó¤¬¶õ¤Ç¤¹"
+
+msgid "'thesaurus' option is empty"
+msgstr "'thesaurus' ¥ª¥×¥·¥ç¥ó¤¬¶õ¤Ç¤¹"
+
+#, c-format
+msgid "Scanning dictionary: %s"
+msgstr "¼­½ñ¤ò¥¹¥­¥ã¥óÃæ: %s"
+
+msgid " (insert) Scroll (^E/^Y)"
+msgstr " (ÁÞÆþ) ¥¹¥¯¥í¡¼¥ë(^E/^Y)"
+
+msgid " (replace) Scroll (^E/^Y)"
+msgstr " (ÃÖ´¹) ¥¹¥¯¥í¡¼¥ë (^E/^Y)"
+
+#, c-format
+msgid "Scanning: %s"
+msgstr "¥¹¥­¥ã¥óÃæ: %s"
+
+msgid "Scanning tags."
+msgstr "¥¿¥°¤ò¥¹¥­¥ã¥óÃæ."
+
+msgid "match in file"
+msgstr "¥Õ¥¡¥¤¥ëÆâ¤Î¥Þ¥Ã¥Á"
+
+msgid " Adding"
+msgstr " ÄɲÃÃæ"
+
+msgid "-- Searching..."
+msgstr "-- ¸¡º÷Ãæ..."
+
+msgid "Back at original"
+msgstr "»Ï¤á¤ËÌá¤ë"
+
+msgid "Word from other line"
+msgstr "¾¤Î¹Ô¤Îñ¸ì"
+
+msgid "The only match"
+msgstr "Í£°ì¤Î³ºÅö"
+
+#, c-format
+msgid "match %d of %d"
+msgstr "%d ÈÖÌܤγºÅö (Á´³ºÅö %d ¸ÄÃæ)"
+
+#, c-format
+msgid "match %d"
+msgstr "%d ÈÖÌܤγºÅö"
+
 #, c-format
 msgid "E938: Duplicate key in JSON: \"%s\""
 msgstr "E938: JSON¤Ë½ÅÊ£¥­¡¼¤¬¤¢¤ê¤Þ¤¹: \"%s\""
@@ -3852,6 +3809,9 @@
 "\"\n"
 "    ¤ò¾Ã¤»¤Ð¤³¤Î¥á¥Ã¥»¡¼¥¸¤ò²óÈò¤Ç¤­¤Þ¤¹.\n"
 
+msgid "Found a swap file that is not useful, deleting it"
+msgstr "ÉÔÍפʥ¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿¡£ºï½ü¤·¤Þ¤¹"
+
 msgid "Swap file \""
 msgstr "¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë \""
 
@@ -4142,6 +4102,9 @@
 "¤¹¤Ù¤Æ¤ÎÊѹ¹¤òÇË´þ¤·¡¢Vim¤ò½ªÎ»¤¹¤ë¤Ë¤Ï  :qa!  ¤ÈÆþÎϤ· <Enter> ¤ò²¡¤·¤Æ¤¯¤À"
 "¤µ¤¤"
 
+msgid "Type  :qa  and press <Enter> to exit Vim"
+msgstr "Vim¤ò½ªÎ»¤¹¤ë¤Ë¤Ï  :qa  ¤ÈÆþÎϤ· <Enter> ¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤"
+
 #, c-format
 msgid "%ld line %sed %d time"
 msgid_plural "%ld line %sed %d times"
@@ -4618,15 +4581,6 @@
 msgid "At line"
 msgstr "¹Ô"
 
-msgid "Could not load vim32.dll!"
-msgstr "vim32.dll ¤ò¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
-
-msgid "VIM Error"
-msgstr "VIM¥¨¥é¡¼"
-
-msgid "Could not fix up function pointers to the DLL!"
-msgstr "DLL¤«¤é´Ø¿ô¥Ý¥¤¥ó¥¿¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
-
 #, c-format
 msgid "Vim: Caught %s event\n"
 msgstr "Vim: ¥¤¥Ù¥ó¥È %s ¤ò¸¡ÃÎ\n"
@@ -4659,6 +4613,9 @@
 msgid "shell returned %d"
 msgstr "¥·¥§¥ë¤¬¥³¡¼¥É %d ¤Ç½ªÎ»¤·¤Þ¤·¤¿"
 
+msgid "E553: No more items"
+msgstr "E553: Í×ÁǤ¬¤â¤¦¤¢¤ê¤Þ¤»¤ó"
+
 msgid "E926: Current location list was changed"
 msgstr "E926: ¸½ºß¤Î¥í¥±¡¼¥·¥ç¥ó¥ê¥¹¥È¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿"
 
@@ -4691,9 +4648,6 @@
 msgid "E379: Missing or empty directory name"
 msgstr "E379: ¥Ç¥£¥ì¥¯¥È¥ê̾¤¬Ìµ¤¤¤«¶õ¤Ç¤¹"
 
-msgid "E553: No more items"
-msgstr "E553: Í×ÁǤ¬¤â¤¦¤¢¤ê¤Þ¤»¤ó"
-
 msgid "E924: Current window was closed"
 msgstr "E924: ¸½ºß¤Î¥¦¥£¥ó¥É¥¦¤¬ÊĤ¸¤é¤ì¤Þ¤·¤¿"
 
@@ -5705,6 +5659,12 @@
 msgid "E556: at top of tag stack"
 msgstr "E556: ¥¿¥°¥¹¥¿¥Ã¥¯¤ÎÀèÆ¬¤Ç¤¹"
 
+msgid "E986: cannot modify the tag stack within tagfunc"
+msgstr "E986: tagfuncÆâ¤Î¥¿¥°¥¹¥¿¥Ã¥¯¤òÊѹ¹¤Ç¤­¤Þ¤»¤ó"
+
+msgid "E987: invalid return value from tagfunc"
+msgstr "E987: tagfunc¤«¤é¤ÎÌá¤êÃͤ¬Ìµ¸ú¤Ç¤¹"
+
 msgid "E425: Cannot go before first matching tag"
 msgstr "E425: ºÇ½é¤Î³ºÅö¥¿¥°¤ò±Û¤¨¤ÆÌá¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
 
@@ -5712,12 +5672,6 @@
 msgid "E426: tag not found: %s"
 msgstr "E426: ¥¿¥°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s"
 
-msgid "  # pri kind tag"
-msgstr "  # pri kind tag"
-
-msgid "file\n"
-msgstr "¥Õ¥¡¥¤¥ë\n"
-
 msgid "E427: There is only one matching tag"
 msgstr "E427: ³ºÅö¥¿¥°¤¬1¤Ä¤À¤±¤·¤«¤¢¤ê¤Þ¤»¤ó"
 
@@ -5742,6 +5696,12 @@
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: ¥Õ¥¡¥¤¥ë \"%s\" ¤¬¤¢¤ê¤Þ¤»¤ó"
 
+msgid "  # pri kind tag"
+msgstr "  # pri kind tag"
+
+msgid "file\n"
+msgstr "¥Õ¥¡¥¤¥ë\n"
+
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -5818,6 +5778,10 @@
 msgstr "$VIMRUNTIME/rgb.txt¤ò³«¤±¤Þ¤»¤ó"
 
 #, c-format
+msgid "E181: Invalid attribute: %s"
+msgstr "E181: ̵¸ú¤Ê°À­¤Ç¤¹: %s"
+
+#, c-format
 msgid "Kill job in \"%s\"?"
 msgstr "\"%s\" Æâ¤Î¥¸¥ç¥Ö¤ò½ªÎ»¤·¤Þ¤¹¤«?"
 
@@ -6023,6 +5987,65 @@
 msgid "E440: undo line missing"
 msgstr "E440: ¥¢¥ó¥É¥¥¹Ô¤¬¤¢¤ê¤Þ¤»¤ó"
 
+msgid ""
+"\n"
+"    Name              Args Address Complete    Definition"
+msgstr ""
+"\n"
+"    ̾Á°              °ú¿ô ¥¢¥É¥ì¥¹ Êä´°       ÄêµÁ"
+
+msgid "No user-defined commands found"
+msgstr "¥æ¡¼¥¶¡¼ÄêµÁ¥³¥Þ¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#, c-format
+msgid "E180: Invalid address type value: %s"
+msgstr "E180: ̵¸ú¤Ê¥¢¥É¥ì¥¹¥¿¥¤¥×ÃͤǤ¹: %s"
+
+#, c-format
+msgid "E180: Invalid complete value: %s"
+msgstr "E180: ̵¸ú¤ÊÊä´°»ØÄê¤Ç¤¹: %s"
+
+msgid "E468: Completion argument only allowed for custom completion"
+msgstr "E468: Êä´°°ú¿ô¤Ï¥«¥¹¥¿¥àÊä´°¤Ç¤·¤«»ÈÍѤǤ­¤Þ¤»¤ó"
+
+msgid "E467: Custom completion requires a function argument"
+msgstr "E467: ¥«¥¹¥¿¥àÊä´°¤Ë¤Ï°ú¿ô¤È¤·¤Æ´Ø¿ô¤¬É¬ÍפǤ¹"
+
+msgid "E175: No attribute specified"
+msgstr "E175: °À­¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+msgid "E176: Invalid number of arguments"
+msgstr "E176: °ú¿ô¤Î¿ô¤¬Ìµ¸ú¤Ç¤¹"
+
+msgid "E177: Count cannot be specified twice"
+msgstr "E177: ¥«¥¦¥ó¥È¤ò2½Å»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
+
+msgid "E178: Invalid default value for count"
+msgstr "E178: ¥«¥¦¥ó¥È¤Î¾ÊάÃͤ¬Ìµ¸ú¤Ç¤¹"
+
+msgid "E179: argument required for -complete"
+msgstr "E179: -complete ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹"
+
+msgid "E179: argument required for -addr"
+msgstr "E179: -addr ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹"
+
+#, c-format
+msgid "E174: Command already exists: add ! to replace it: %s"
+msgstr "E174: ¥³¥Þ¥ó¥É¤¬´û¤Ë¤¢¤ê¤Þ¤¹: ºÆÄêµÁ¤¹¤ë¤Ë¤Ï ! ¤òÄɲ䷤Ƥ¯¤À¤µ¤¤: %s"
+
+msgid "E182: Invalid command name"
+msgstr "E182: ̵¸ú¤Ê¥³¥Þ¥ó¥É̾¤Ç¤¹"
+
+msgid "E183: User defined commands must start with an uppercase letter"
+msgstr "E183: ¥æ¡¼¥¶¡¼ÄêµÁ¥³¥Þ¥ó¥É¤Ï±ÑÂçʸ»ú¤Ç»Ï¤Þ¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
+
+msgid "E841: Reserved name, cannot be used for user defined command"
+msgstr "E841: ͽÌó̾¤Ê¤Î¤Ç¡¢¥æ¡¼¥¶¡¼ÄêµÁ¥³¥Þ¥ó¥É¤ËÍøÍѤǤ­¤Þ¤»¤ó"
+
+#, c-format
+msgid "E184: No such user-defined command: %s"
+msgstr "E184: ¤½¤Î¥æ¡¼¥¶¡¼ÄêµÁ¥³¥Þ¥ó¥É¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
+
 #, c-format
 msgid "E122: Function %s already exists, add ! to replace it"
 msgstr "E122: ´Ø¿ô %s ¤ÏÄêµÁºÑ¤Ç¤¹¡¢ºÆÄêµÁ¤¹¤ë¤Ë¤Ï ! ¤òÄɲ䷤Ƥ¯¤À¤µ¤¤"
@@ -6157,6 +6180,20 @@
 
 msgid ""
 "\n"
+"MS-Windows 64-bit GUI/console version"
+msgstr ""
+"\n"
+"MS-Windows 64 ¥Ó¥Ã¥È GUI/¥³¥ó¥½¡¼¥ë ÈÇ"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit GUI/console version"
+msgstr ""
+"\n"
+"MS-Windows 32 ¥Ó¥Ã¥È GUI/¥³¥ó¥½¡¼¥ë ÈÇ"
+
+msgid ""
+"\n"
 "MS-Windows 64-bit GUI version"
 msgstr ""
 "\n"
@@ -6594,6 +6631,10 @@
 msgstr "E475: ̵¸ú¤Ê°ú¿ô¤Ç¤¹: %s"
 
 #, c-format
+msgid "E983: Duplicate argument: %s"
+msgstr "E983: °ú¿ô¤¬½ÅÊ£¤·¤Æ¤¤¤Þ¤¹: %s"
+
+#, c-format
 msgid "E475: Invalid value for argument %s"
 msgstr "E475: °ú¿ô %s ¤ËÂФ·¤ÆÌµ¸ú¤ÊÃͤǤ¹"
 
@@ -7218,3 +7259,21 @@
 "C¥½¡¼¥¹ (*.c, *.h)\t*.c;*.h\n"
 "C++¥½¡¼¥¹ (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
 "Vim¥Õ¥¡¥¤¥ë (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+
+#~ msgid "GVim"
+#~ msgstr ""
+
+msgid "Text Editor"
+msgstr "¥Æ¥­¥¹¥È¥¨¥Ç¥£¥¿"
+
+msgid "Edit text files"
+msgstr "¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤·¤Þ¤¹"
+
+msgid "Text;editor;"
+msgstr "¥Æ¥­¥¹¥È;¥¨¥Ç¥£¥¿;"
+
+#~ msgid "gvim"
+#~ msgstr ""
+
+#~ msgid "Vim"
+#~ msgstr ""
diff --git a/src/po/ja.po b/src/po/ja.po
index 38ec535..f66f2b1 100644
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -14,8 +14,8 @@
 msgstr ""
 "Project-Id-Version: Vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-18 19:15+0900\n"
-"PO-Revision-Date: 2019-03-12 08:23+0900\n"
+"POT-Creation-Date: 2019-05-05 11:27+0900\n"
+"PO-Revision-Date: 2019-05-05 13:00+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"
@@ -331,6 +331,51 @@
 msgid "[crypted]"
 msgstr "[暗号化]"
 
+msgid "Entering Debug mode.  Type \"cont\" to continue."
+msgstr "デバッグモードに入ります. 続けるには \"cont\" と入力してください."
+
+#, c-format
+msgid "Oldval = \"%s\""
+msgstr "古い値 = \"%s\""
+
+#, c-format
+msgid "Newval = \"%s\""
+msgstr "新しい値 = \"%s\""
+
+#, c-format
+msgid "line %ld: %s"
+msgstr "行 %ld: %s"
+
+#, c-format
+msgid "cmd: %s"
+msgstr "コマンド: %s"
+
+msgid "frame is zero"
+msgstr "フレームが 0 です"
+
+#, c-format
+msgid "frame at highest level: %d"
+msgstr "最高レベルのフレーム: %d"
+
+#, c-format
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "ブレークポイント \"%s%s\" 行 %ld"
+
+#, c-format
+msgid "E161: Breakpoint not found: %s"
+msgstr "E161: ブレークポイントが見つかりません: %s"
+
+msgid "No breakpoints defined"
+msgstr "ブレークポイントが定義されていません"
+
+#, c-format
+msgid "%3d  %s %s  line %ld"
+msgstr "%3d  %s %s  行 %ld"
+
+#, c-format
+msgid "%3d  expr %s"
+msgstr "%3d  expr %s"
+
 #, c-format
 msgid "E720: Missing colon in Dictionary: %s"
 msgstr "E720: 辞書型にコロンがありません: %s"
@@ -494,106 +539,6 @@
 msgid "E791: Empty keymap entry"
 msgstr "E791: 空のキーマップエントリ"
 
-msgid " Keyword completion (^N^P)"
-msgstr " キーワード補完 (^N^P)"
-
-msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-msgstr " ^X モード (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-
-msgid " Whole line completion (^L^N^P)"
-msgstr " 行(全体)補完 (^L^N^P)"
-
-msgid " File name completion (^F^N^P)"
-msgstr " ファイル名補完 (^F^N^P)"
-
-msgid " Tag completion (^]^N^P)"
-msgstr " タグ補完 (^]^N^P)"
-
-msgid " Path pattern completion (^N^P)"
-msgstr " パスパターン補完 (^N^P)"
-
-msgid " Definition completion (^D^N^P)"
-msgstr " 定義補完 (^D^N^P)"
-
-msgid " Dictionary completion (^K^N^P)"
-msgstr " 辞書補完 (^K^N^P)"
-
-msgid " Thesaurus completion (^T^N^P)"
-msgstr " シソーラス補完 (^T^N^P)"
-
-msgid " Command-line completion (^V^N^P)"
-msgstr " コマンドライン補完 (^V^N^P)"
-
-msgid " User defined completion (^U^N^P)"
-msgstr " ユーザー定義補完 (^U^N^P)"
-
-msgid " Omni completion (^O^N^P)"
-msgstr " オムニ補完 (^O^N^P)"
-
-msgid " Spelling suggestion (s^N^P)"
-msgstr " 綴り修正候補 (s^N^P)"
-
-msgid " Keyword Local completion (^N^P)"
-msgstr " 局所キーワード補完 (^N^P)"
-
-msgid "Hit end of paragraph"
-msgstr "段落の最後にヒット"
-
-msgid "E839: Completion function changed window"
-msgstr "E839: 補間関数がウィンドウを変更しました"
-
-msgid "E840: Completion function deleted text"
-msgstr "E840: 補完関数がテキストを削除しました"
-
-msgid "'dictionary' option is empty"
-msgstr "'dictionary' オプションが空です"
-
-msgid "'thesaurus' option is empty"
-msgstr "'thesaurus' オプションが空です"
-
-#, c-format
-msgid "Scanning dictionary: %s"
-msgstr "辞書をスキャン中: %s"
-
-msgid " (insert) Scroll (^E/^Y)"
-msgstr " (挿入) スクロール(^E/^Y)"
-
-msgid " (replace) Scroll (^E/^Y)"
-msgstr " (置換) スクロール (^E/^Y)"
-
-#, c-format
-msgid "Scanning: %s"
-msgstr "スキャン中: %s"
-
-msgid "Scanning tags."
-msgstr "タグをスキャン中."
-
-msgid "match in file"
-msgstr "ファイル内のマッチ"
-
-msgid " Adding"
-msgstr " 追加中"
-
-msgid "-- Searching..."
-msgstr "-- 検索中..."
-
-msgid "Back at original"
-msgstr "始めに戻る"
-
-msgid "Word from other line"
-msgstr "他の行の単語"
-
-msgid "The only match"
-msgstr "唯一の該当"
-
-#, c-format
-msgid "match %d of %d"
-msgstr "%d 番目の該当 (全該当 %d 個中)"
-
-#, c-format
-msgid "match %d"
-msgstr "%d 番目の該当"
-
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: 予期せぬ文字が :let にありました"
 
@@ -618,6 +563,9 @@
 msgid "E806: using Float as a String"
 msgstr "E806: 浮動小数点数を文字列として扱っています"
 
+msgid "E985: .= is not supported with script version 2"
+msgstr "E985: .= はスクリプトバージョン 2 では対応していません"
+
 msgid "E687: Less targets than List items"
 msgstr "E687: ターゲットがリスト型内の要素よりも少ないです"
 
@@ -846,6 +794,9 @@
 msgid "E928: String required"
 msgstr "E928: 文字列が必要です"
 
+msgid "E957: Invalid window number"
+msgstr "E957: 無効なウィンドウ番号です"
+
 msgid "E808: Number or Float required"
 msgstr "E808: 数値か浮動小数点数が必要です"
 
@@ -902,9 +853,6 @@
 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\": %d"
 msgstr "E798: ID は \":match\" のために予約されています: %d"
@@ -1248,51 +1196,6 @@
 msgid "No old files"
 msgstr "古いファイルはありません"
 
-msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "デバッグモードに入ります. 続けるには \"cont\" と入力してください."
-
-#, c-format
-msgid "Oldval = \"%s\""
-msgstr "古い値 = \"%s\""
-
-#, c-format
-msgid "Newval = \"%s\""
-msgstr "新しい値 = \"%s\""
-
-#, c-format
-msgid "line %ld: %s"
-msgstr "行 %ld: %s"
-
-#, c-format
-msgid "cmd: %s"
-msgstr "コマンド: %s"
-
-msgid "frame is zero"
-msgstr "フレームが 0 です"
-
-#, c-format
-msgid "frame at highest level: %d"
-msgstr "最高レベルのフレーム: %d"
-
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "ブレークポイント \"%s%s\" 行 %ld"
-
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: ブレークポイントが見つかりません: %s"
-
-msgid "No breakpoints defined"
-msgstr "ブレークポイントが定義されていません"
-
-#, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  行 %ld"
-
-#, c-format
-msgid "%3d  expr %s"
-msgstr "%3d  expr %s"
-
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: 初めに \":profile start {fname}\" を実行してください"
 
@@ -1396,6 +1299,13 @@
 msgid "E167: :scriptencoding used outside of a sourced file"
 msgstr "E167: :scriptencoding が取込スクリプト以外で使用されました"
 
+msgid "E984: :scriptversion used outside of a sourced file"
+msgstr "E984: :scriptversion が取込スクリプト以外で使用されました"
+
+#, c-format
+msgid "E999: scriptversion not supported: %d"
+msgstr "E999: scriptversion はサポートされていません: %d"
+
 msgid "E168: :finish used outside of a sourced file"
 msgstr "E168: :finish が取込スクリプト以外で使用されました"
 
@@ -1445,6 +1355,12 @@
 msgid "E494: Use w or w>>"
 msgstr "E494: w もしくは w>> を使用してください"
 
+msgid ""
+"INTERNAL: Cannot use DFLALL with ADDR_NONE, ADDR_UNSIGNED or ADDR_QUICKFIX"
+msgstr ""
+"内部エラー: DFLALL を ADDR_NONE, ADDR_UNSIGNED や ADDR_QUICKFIX とともに使う"
+"ことはできません"
+
 msgid "E943: Command table needs to be updated, run 'make cmdidxs'"
 msgstr ""
 "E943: コマンドテーブルを更新する必要があります、'make cmdidxs' を実行してくだ"
@@ -1463,69 +1379,6 @@
 msgid_plural "E173: %d more files to edit"
 msgstr[0] "E173: 編集すべきファイルがあと %d 個あります"
 
-#, c-format
-msgid "E174: Command already exists: add ! to replace it: %s"
-msgstr "E174: コマンドが既にあります: 再定義するには ! を追加してください: %s"
-
-msgid ""
-"\n"
-"    Name        Args       Address   Complete  Definition"
-msgstr ""
-"\n"
-"    名前        引数       アドレス  補完      定義"
-
-msgid "No user-defined commands found"
-msgstr "ユーザー定義コマンドが見つかりませんでした"
-
-msgid "E175: No attribute specified"
-msgstr "E175: 属性は定義されていません"
-
-msgid "E176: Invalid number of arguments"
-msgstr "E176: 引数の数が無効です"
-
-msgid "E177: Count cannot be specified twice"
-msgstr "E177: カウントを2重指定することはできません"
-
-msgid "E178: Invalid default value for count"
-msgstr "E178: カウントの省略値が無効です"
-
-msgid "E179: argument required for -complete"
-msgstr "E179: -complete には引数が必要です"
-
-msgid "E179: argument required for -addr"
-msgstr "E179: -addr には引数が必要です"
-
-#, c-format
-msgid "E181: Invalid attribute: %s"
-msgstr "E181: 無効な属性です: %s"
-
-msgid "E182: Invalid command name"
-msgstr "E182: 無効なコマンド名です"
-
-msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: ユーザー定義コマンドは英大文字で始まらなければなりません"
-
-msgid "E841: Reserved name, cannot be used for user defined command"
-msgstr "E841: 予約名なので、ユーザー定義コマンドに利用できません"
-
-#, c-format
-msgid "E184: No such user-defined command: %s"
-msgstr "E184: そのユーザー定義コマンドはありません: %s"
-
-#, c-format
-msgid "E180: Invalid address type value: %s"
-msgstr "E180: 無効なアドレスタイプ値です: %s"
-
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: 無効な補完指定です: %s"
-
-msgid "E468: Completion argument only allowed for custom completion"
-msgstr "E468: 補完引数はカスタム補完でしか使用できません"
-
-msgid "E467: Custom completion requires a function argument"
-msgstr "E467: カスタム補完には引数として関数が必要です"
-
 msgid "unknown"
 msgstr "不明"
 
@@ -1908,20 +1761,21 @@
 msgstr "は読込専用です (強制書込には ! を追加)"
 
 msgid "E506: Can't write to backup file (add ! to override)"
-msgstr "E506: バックアップファイルを保存できません (! を追加で強制保存)"
+msgstr "E506: バックアップファイルを保存できません (! を追加で強制書込)"
 
 msgid "E507: Close error for backup file (add ! to override)"
 msgstr ""
-"E507: バックアップファイルを閉じる際にエラーが発生しました (! を追加で強制)"
+"E507: バックアップファイルを閉じる際にエラーが発生しました (! を追加で強制書"
+"込)"
 
 msgid "E508: Can't read file for backup (add ! to override)"
-msgstr "E508: バックアップ用ファイルを読込めません (! を追加で強制読込)"
+msgstr "E508: バックアップ用ファイルを読込めません (! を追加で強制書込)"
 
 msgid "E509: Cannot create backup file (add ! to override)"
-msgstr "E509: バックアップファイルを作れません (! を追加で強制作成)"
+msgstr "E509: バックアップファイルを作れません (! を追加で強制書込)"
 
 msgid "E510: Can't make backup file (add ! to override)"
-msgstr "E510: バックアップファイルを作れません (! を追加で強制作成)"
+msgstr "E510: バックアップファイルを作れません (! を追加で強制書込)"
 
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: 保存用一時ファイルが見つかりません"
@@ -2391,6 +2245,9 @@
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
 msgstr "E243: 引数はサポートされません: \"-%s\"; OLE版を使用してください."
 
+msgid "E988: GUI cannot be used. Cannot execute gvim.exe."
+msgstr "E988: GUIは使用不可能です。gvim.exeを起動できません。"
+
 msgid "E672: Unable to open window inside MDI application"
 msgstr "E672: MDIアプリの中ではウィンドウを開けません"
 
@@ -2931,6 +2788,106 @@
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: VIM 実体の登録プロパティが不正です. 消去しました!"
 
+msgid " Keyword completion (^N^P)"
+msgstr " キーワード補完 (^N^P)"
+
+msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
+msgstr " ^X モード (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
+
+msgid " Whole line completion (^L^N^P)"
+msgstr " 行(全体)補完 (^L^N^P)"
+
+msgid " File name completion (^F^N^P)"
+msgstr " ファイル名補完 (^F^N^P)"
+
+msgid " Tag completion (^]^N^P)"
+msgstr " タグ補完 (^]^N^P)"
+
+msgid " Path pattern completion (^N^P)"
+msgstr " パスパターン補完 (^N^P)"
+
+msgid " Definition completion (^D^N^P)"
+msgstr " 定義補完 (^D^N^P)"
+
+msgid " Dictionary completion (^K^N^P)"
+msgstr " 辞書補完 (^K^N^P)"
+
+msgid " Thesaurus completion (^T^N^P)"
+msgstr " シソーラス補完 (^T^N^P)"
+
+msgid " Command-line completion (^V^N^P)"
+msgstr " コマンドライン補完 (^V^N^P)"
+
+msgid " User defined completion (^U^N^P)"
+msgstr " ユーザー定義補完 (^U^N^P)"
+
+msgid " Omni completion (^O^N^P)"
+msgstr " オムニ補完 (^O^N^P)"
+
+msgid " Spelling suggestion (s^N^P)"
+msgstr " 綴り修正候補 (s^N^P)"
+
+msgid " Keyword Local completion (^N^P)"
+msgstr " 局所キーワード補完 (^N^P)"
+
+msgid "Hit end of paragraph"
+msgstr "段落の最後にヒット"
+
+msgid "E839: Completion function changed window"
+msgstr "E839: 補完関数がウィンドウを変更しました"
+
+msgid "E840: Completion function deleted text"
+msgstr "E840: 補完関数がテキストを削除しました"
+
+msgid "'dictionary' option is empty"
+msgstr "'dictionary' オプションが空です"
+
+msgid "'thesaurus' option is empty"
+msgstr "'thesaurus' オプションが空です"
+
+#, c-format
+msgid "Scanning dictionary: %s"
+msgstr "辞書をスキャン中: %s"
+
+msgid " (insert) Scroll (^E/^Y)"
+msgstr " (挿入) スクロール(^E/^Y)"
+
+msgid " (replace) Scroll (^E/^Y)"
+msgstr " (置換) スクロール (^E/^Y)"
+
+#, c-format
+msgid "Scanning: %s"
+msgstr "スキャン中: %s"
+
+msgid "Scanning tags."
+msgstr "タグをスキャン中."
+
+msgid "match in file"
+msgstr "ファイル内のマッチ"
+
+msgid " Adding"
+msgstr " 追加中"
+
+msgid "-- Searching..."
+msgstr "-- 検索中..."
+
+msgid "Back at original"
+msgstr "始めに戻る"
+
+msgid "Word from other line"
+msgstr "他の行の単語"
+
+msgid "The only match"
+msgstr "唯一の該当"
+
+#, c-format
+msgid "match %d of %d"
+msgstr "%d 番目の該当 (全該当 %d 個中)"
+
+#, c-format
+msgid "match %d"
+msgstr "%d 番目の該当"
+
 #, c-format
 msgid "E938: Duplicate key in JSON: \"%s\""
 msgstr "E938: JSONに重複キーがあります: \"%s\""
@@ -3852,6 +3809,9 @@
 "\"\n"
 "    を消せばこのメッセージを回避できます.\n"
 
+msgid "Found a swap file that is not useful, deleting it"
+msgstr "不要なスワップファイルが見つかりました。削除します"
+
 msgid "Swap file \""
 msgstr "スワップファイル \""
 
@@ -4142,6 +4102,9 @@
 "すべての変更を破棄し、Vimを終了するには  :qa!  と入力し <Enter> を押してくだ"
 "さい"
 
+msgid "Type  :qa  and press <Enter> to exit Vim"
+msgstr "Vimを終了するには  :qa  と入力し <Enter> を押してください"
+
 #, c-format
 msgid "%ld line %sed %d time"
 msgid_plural "%ld line %sed %d times"
@@ -4618,15 +4581,6 @@
 msgid "At line"
 msgstr "行"
 
-msgid "Could not load vim32.dll!"
-msgstr "vim32.dll をロードできませんでした"
-
-msgid "VIM Error"
-msgstr "VIMエラー"
-
-msgid "Could not fix up function pointers to the DLL!"
-msgstr "DLLから関数ポインタを取得できませんでした"
-
 #, c-format
 msgid "Vim: Caught %s event\n"
 msgstr "Vim: イベント %s を検知\n"
@@ -4659,6 +4613,9 @@
 msgid "shell returned %d"
 msgstr "シェルがコード %d で終了しました"
 
+msgid "E553: No more items"
+msgstr "E553: 要素がもうありません"
+
 msgid "E926: Current location list was changed"
 msgstr "E926: 現在のロケーションリストが変更されました"
 
@@ -4691,9 +4648,6 @@
 msgid "E379: Missing or empty directory name"
 msgstr "E379: ディレクトリ名が無いか空です"
 
-msgid "E553: No more items"
-msgstr "E553: 要素がもうありません"
-
 msgid "E924: Current window was closed"
 msgstr "E924: 現在のウィンドウが閉じられました"
 
@@ -5705,6 +5659,12 @@
 msgid "E556: at top of tag stack"
 msgstr "E556: タグスタックの先頭です"
 
+msgid "E986: cannot modify the tag stack within tagfunc"
+msgstr "E986: tagfunc内のタグスタックを変更できません"
+
+msgid "E987: invalid return value from tagfunc"
+msgstr "E987: tagfuncからの戻り値が無効です"
+
 msgid "E425: Cannot go before first matching tag"
 msgstr "E425: 最初の該当タグを越えて戻ることはできません"
 
@@ -5712,12 +5672,6 @@
 msgid "E426: tag not found: %s"
 msgstr "E426: タグが見つかりません: %s"
 
-msgid "  # pri kind tag"
-msgstr "  # pri kind tag"
-
-msgid "file\n"
-msgstr "ファイル\n"
-
 msgid "E427: There is only one matching tag"
 msgstr "E427: 該当タグが1つだけしかありません"
 
@@ -5742,6 +5696,12 @@
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: ファイル \"%s\" がありません"
 
+msgid "  # pri kind tag"
+msgstr "  # pri kind tag"
+
+msgid "file\n"
+msgstr "ファイル\n"
+
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -5818,6 +5778,10 @@
 msgstr "$VIMRUNTIME/rgb.txtを開けません"
 
 #, c-format
+msgid "E181: Invalid attribute: %s"
+msgstr "E181: 無効な属性です: %s"
+
+#, c-format
 msgid "Kill job in \"%s\"?"
 msgstr "\"%s\" 内のジョブを終了しますか?"
 
@@ -6023,6 +5987,65 @@
 msgid "E440: undo line missing"
 msgstr "E440: アンドゥ行がありません"
 
+msgid ""
+"\n"
+"    Name              Args Address Complete    Definition"
+msgstr ""
+"\n"
+"    名前              引数 アドレス 補完       定義"
+
+msgid "No user-defined commands found"
+msgstr "ユーザー定義コマンドが見つかりませんでした"
+
+#, c-format
+msgid "E180: Invalid address type value: %s"
+msgstr "E180: 無効なアドレスタイプ値です: %s"
+
+#, c-format
+msgid "E180: Invalid complete value: %s"
+msgstr "E180: 無効な補完指定です: %s"
+
+msgid "E468: Completion argument only allowed for custom completion"
+msgstr "E468: 補完引数はカスタム補完でしか使用できません"
+
+msgid "E467: Custom completion requires a function argument"
+msgstr "E467: カスタム補完には引数として関数が必要です"
+
+msgid "E175: No attribute specified"
+msgstr "E175: 属性は定義されていません"
+
+msgid "E176: Invalid number of arguments"
+msgstr "E176: 引数の数が無効です"
+
+msgid "E177: Count cannot be specified twice"
+msgstr "E177: カウントを2重指定することはできません"
+
+msgid "E178: Invalid default value for count"
+msgstr "E178: カウントの省略値が無効です"
+
+msgid "E179: argument required for -complete"
+msgstr "E179: -complete には引数が必要です"
+
+msgid "E179: argument required for -addr"
+msgstr "E179: -addr には引数が必要です"
+
+#, c-format
+msgid "E174: Command already exists: add ! to replace it: %s"
+msgstr "E174: コマンドが既にあります: 再定義するには ! を追加してください: %s"
+
+msgid "E182: Invalid command name"
+msgstr "E182: 無効なコマンド名です"
+
+msgid "E183: User defined commands must start with an uppercase letter"
+msgstr "E183: ユーザー定義コマンドは英大文字で始まらなければなりません"
+
+msgid "E841: Reserved name, cannot be used for user defined command"
+msgstr "E841: 予約名なので、ユーザー定義コマンドに利用できません"
+
+#, c-format
+msgid "E184: No such user-defined command: %s"
+msgstr "E184: そのユーザー定義コマンドはありません: %s"
+
 #, c-format
 msgid "E122: Function %s already exists, add ! to replace it"
 msgstr "E122: 関数 %s は定義済です、再定義するには ! を追加してください"
@@ -6157,6 +6180,20 @@
 
 msgid ""
 "\n"
+"MS-Windows 64-bit GUI/console version"
+msgstr ""
+"\n"
+"MS-Windows 64 ビット GUI/コンソール 版"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit GUI/console version"
+msgstr ""
+"\n"
+"MS-Windows 32 ビット GUI/コンソール 版"
+
+msgid ""
+"\n"
 "MS-Windows 64-bit GUI version"
 msgstr ""
 "\n"
@@ -6594,6 +6631,10 @@
 msgstr "E475: 無効な引数です: %s"
 
 #, c-format
+msgid "E983: Duplicate argument: %s"
+msgstr "E983: 引数が重複しています: %s"
+
+#, c-format
 msgid "E475: Invalid value for argument %s"
 msgstr "E475: 引数 %s に対して無効な値です"
 
@@ -7218,3 +7259,21 @@
 "Cソース (*.c, *.h)\t*.c;*.h\n"
 "C++ソース (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
 "Vimファイル (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+
+#~ msgid "GVim"
+#~ msgstr ""
+
+msgid "Text Editor"
+msgstr "テキストエディタ"
+
+msgid "Edit text files"
+msgstr "テキストファイルを編集します"
+
+msgid "Text;editor;"
+msgstr "テキスト;エディタ;"
+
+#~ msgid "gvim"
+#~ msgstr ""
+
+#~ msgid "Vim"
+#~ msgstr ""
diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po
index b8d0104..4327ce7 100644
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -14,8 +14,8 @@
 msgstr ""
 "Project-Id-Version: Vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-18 19:15+0900\n"
-"PO-Revision-Date: 2019-03-12 08:23+0900\n"
+"POT-Creation-Date: 2019-05-05 11:27+0900\n"
+"PO-Revision-Date: 2019-05-05 13:00+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"
@@ -331,6 +331,51 @@
 msgid "[crypted]"
 msgstr "[ˆÃ†‰»]"
 
+msgid "Entering Debug mode.  Type \"cont\" to continue."
+msgstr "ƒfƒoƒbƒOƒ‚[ƒh‚É“ü‚è‚Ü‚·. ‘±‚¯‚é‚É‚Í \"cont\" ‚Æ“ü—Í‚µ‚Ä‚­‚¾‚³‚¢."
+
+#, c-format
+msgid "Oldval = \"%s\""
+msgstr "ŒÃ‚¢’l = \"%s\""
+
+#, c-format
+msgid "Newval = \"%s\""
+msgstr "V‚µ‚¢’l = \"%s\""
+
+#, c-format
+msgid "line %ld: %s"
+msgstr "s %ld: %s"
+
+#, c-format
+msgid "cmd: %s"
+msgstr "ƒRƒ}ƒ“ƒh: %s"
+
+msgid "frame is zero"
+msgstr "ƒtƒŒ[ƒ€‚ª 0 ‚Å‚·"
+
+#, c-format
+msgid "frame at highest level: %d"
+msgstr "Å‚ƒŒƒxƒ‹‚̃tƒŒ[ƒ€: %d"
+
+#, c-format
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "ƒuƒŒ[ƒNƒ|ƒCƒ“ƒg \"%s%s\" s %ld"
+
+#, c-format
+msgid "E161: Breakpoint not found: %s"
+msgstr "E161: ƒuƒŒ[ƒNƒ|ƒCƒ“ƒg‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ: %s"
+
+msgid "No breakpoints defined"
+msgstr "ƒuƒŒ[ƒNƒ|ƒCƒ“ƒg‚ª’è‹`‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "%3d  %s %s  line %ld"
+msgstr "%3d  %s %s  s %ld"
+
+#, c-format
+msgid "%3d  expr %s"
+msgstr "%3d  expr %s"
+
 #, c-format
 msgid "E720: Missing colon in Dictionary: %s"
 msgstr "E720: Ž«‘Œ^‚ɃRƒƒ“‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
@@ -494,106 +539,6 @@
 msgid "E791: Empty keymap entry"
 msgstr "E791: ‹ó‚̃L[ƒ}ƒbƒvƒGƒ“ƒgƒŠ"
 
-msgid " Keyword completion (^N^P)"
-msgstr " ƒL[ƒ[ƒh•⊮ (^N^P)"
-
-msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-msgstr " ^X ƒ‚[ƒh (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-
-msgid " Whole line completion (^L^N^P)"
-msgstr " s(‘S‘Ì)•⊮ (^L^N^P)"
-
-msgid " File name completion (^F^N^P)"
-msgstr " ƒtƒ@ƒCƒ‹–¼•⊮ (^F^N^P)"
-
-msgid " Tag completion (^]^N^P)"
-msgstr " ƒ^ƒO•⊮ (^]^N^P)"
-
-msgid " Path pattern completion (^N^P)"
-msgstr " ƒpƒXƒpƒ^[ƒ“•⊮ (^N^P)"
-
-msgid " Definition completion (^D^N^P)"
-msgstr " ’è‹`•⊮ (^D^N^P)"
-
-msgid " Dictionary completion (^K^N^P)"
-msgstr " Ž«‘•⊮ (^K^N^P)"
-
-msgid " Thesaurus completion (^T^N^P)"
-msgstr " ƒVƒ\\[ƒ‰ƒX•⊮ (^T^N^P)"
-
-msgid " Command-line completion (^V^N^P)"
-msgstr " ƒRƒ}ƒ“ƒhƒ‰ƒCƒ“•⊮ (^V^N^P)"
-
-msgid " User defined completion (^U^N^P)"
-msgstr " ƒ†[ƒU[’è‹`•⊮ (^U^N^P)"
-
-msgid " Omni completion (^O^N^P)"
-msgstr " ƒIƒ€ƒj•⊮ (^O^N^P)"
-
-msgid " Spelling suggestion (s^N^P)"
-msgstr " ’Ô‚èC³Œó•â (s^N^P)"
-
-msgid " Keyword Local completion (^N^P)"
-msgstr " ‹ÇŠƒL[ƒ[ƒh•⊮ (^N^P)"
-
-msgid "Hit end of paragraph"
-msgstr "’i—Ž‚ÌÅŒã‚Ƀqƒbƒg"
-
-msgid "E839: Completion function changed window"
-msgstr "E839: •âŠÔŠÖ”‚ªƒEƒBƒ“ƒhƒE‚ð•ύX‚µ‚Ü‚µ‚½"
-
-msgid "E840: Completion function deleted text"
-msgstr "E840: •⊮ŠÖ”‚ªƒeƒLƒXƒg‚ðíœ‚µ‚Ü‚µ‚½"
-
-msgid "'dictionary' option is empty"
-msgstr "'dictionary' ƒIƒvƒVƒ‡ƒ“‚ª‹ó‚Å‚·"
-
-msgid "'thesaurus' option is empty"
-msgstr "'thesaurus' ƒIƒvƒVƒ‡ƒ“‚ª‹ó‚Å‚·"
-
-#, c-format
-msgid "Scanning dictionary: %s"
-msgstr "Ž«‘‚ðƒXƒLƒƒƒ“’†: %s"
-
-msgid " (insert) Scroll (^E/^Y)"
-msgstr " (‘}“ü) ƒXƒNƒ[ƒ‹(^E/^Y)"
-
-msgid " (replace) Scroll (^E/^Y)"
-msgstr " (’uŠ·) ƒXƒNƒ[ƒ‹ (^E/^Y)"
-
-#, c-format
-msgid "Scanning: %s"
-msgstr "ƒXƒLƒƒƒ“’†: %s"
-
-msgid "Scanning tags."
-msgstr "ƒ^ƒO‚ðƒXƒLƒƒƒ“’†."
-
-msgid "match in file"
-msgstr "ƒtƒ@ƒCƒ‹“à‚̃}ƒbƒ`"
-
-msgid " Adding"
-msgstr " ’ljÁ’†"
-
-msgid "-- Searching..."
-msgstr "-- ŒŸõ’†..."
-
-msgid "Back at original"
-msgstr "Žn‚߂ɖ߂é"
-
-msgid "Word from other line"
-msgstr "‘¼‚̍s‚Ì’PŒê"
-
-msgid "The only match"
-msgstr "—Bˆê‚ÌŠY“–"
-
-#, c-format
-msgid "match %d of %d"
-msgstr "%d ”Ô–Ú‚ÌŠY“– (‘SŠY“– %d ŒÂ’†)"
-
-#, c-format
-msgid "match %d"
-msgstr "%d ”Ô–Ú‚ÌŠY“–"
-
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: —\\Šú‚¹‚Ê•¶Žš‚ª :let ‚É‚ ‚è‚Ü‚µ‚½"
 
@@ -618,6 +563,9 @@
 msgid "E806: using Float as a String"
 msgstr "E806: •‚“®¬”“_”‚ð•¶Žš—ñ‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
 
+msgid "E985: .= is not supported with script version 2"
+msgstr "E985: .= ‚̓XƒNƒŠƒvƒgƒo[ƒWƒ‡ƒ“ 2 ‚ł͑Ήž‚µ‚Ä‚¢‚Ü‚¹‚ñ"
+
 msgid "E687: Less targets than List items"
 msgstr "E687: ƒ^[ƒQƒbƒg‚ªƒŠƒXƒgŒ^“à‚Ì—v‘f‚æ‚è‚à­‚È‚¢‚Å‚·"
 
@@ -846,6 +794,9 @@
 msgid "E928: String required"
 msgstr "E928: •¶Žš—ñ‚ª•K—v‚Å‚·"
 
+msgid "E957: Invalid window number"
+msgstr "E957: –³Œø‚ȃEƒBƒ“ƒhƒE”ԍ†‚Å‚·"
+
 msgid "E808: Number or Float required"
 msgstr "E808: ”’l‚©•‚“®¬”“_”‚ª•K—v‚Å‚·"
 
@@ -902,9 +853,6 @@
 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\": %d"
 msgstr "E798: ID ‚Í \":match\" ‚Ì‚½‚߂ɗ\\–ñ‚³‚ê‚Ä‚¢‚Ü‚·: %d"
@@ -1248,51 +1196,6 @@
 msgid "No old files"
 msgstr "ŒÃ‚¢ƒtƒ@ƒCƒ‹‚Í‚ ‚è‚Ü‚¹‚ñ"
 
-msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "ƒfƒoƒbƒOƒ‚[ƒh‚É“ü‚è‚Ü‚·. ‘±‚¯‚é‚É‚Í \"cont\" ‚Æ“ü—Í‚µ‚Ä‚­‚¾‚³‚¢."
-
-#, c-format
-msgid "Oldval = \"%s\""
-msgstr "ŒÃ‚¢’l = \"%s\""
-
-#, c-format
-msgid "Newval = \"%s\""
-msgstr "V‚µ‚¢’l = \"%s\""
-
-#, c-format
-msgid "line %ld: %s"
-msgstr "s %ld: %s"
-
-#, c-format
-msgid "cmd: %s"
-msgstr "ƒRƒ}ƒ“ƒh: %s"
-
-msgid "frame is zero"
-msgstr "ƒtƒŒ[ƒ€‚ª 0 ‚Å‚·"
-
-#, c-format
-msgid "frame at highest level: %d"
-msgstr "Å‚ƒŒƒxƒ‹‚̃tƒŒ[ƒ€: %d"
-
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "ƒuƒŒ[ƒNƒ|ƒCƒ“ƒg \"%s%s\" s %ld"
-
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: ƒuƒŒ[ƒNƒ|ƒCƒ“ƒg‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ: %s"
-
-msgid "No breakpoints defined"
-msgstr "ƒuƒŒ[ƒNƒ|ƒCƒ“ƒg‚ª’è‹`‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-
-#, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  s %ld"
-
-#, c-format
-msgid "%3d  expr %s"
-msgstr "%3d  expr %s"
-
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: ‰‚ß‚É \":profile start {fname}\" ‚ðŽÀs‚µ‚Ä‚­‚¾‚³‚¢"
 
@@ -1396,6 +1299,13 @@
 msgid "E167: :scriptencoding used outside of a sourced file"
 msgstr "E167: :scriptencoding ‚ªŽæžƒXƒNƒŠƒvƒgˆÈŠO‚ÅŽg—p‚³‚ê‚Ü‚µ‚½"
 
+msgid "E984: :scriptversion used outside of a sourced file"
+msgstr "E984: :scriptversion ‚ªŽæžƒXƒNƒŠƒvƒgˆÈŠO‚ÅŽg—p‚³‚ê‚Ü‚µ‚½"
+
+#, c-format
+msgid "E999: scriptversion not supported: %d"
+msgstr "E999: scriptversion ‚̓Tƒ|[ƒg‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ: %d"
+
 msgid "E168: :finish used outside of a sourced file"
 msgstr "E168: :finish ‚ªŽæžƒXƒNƒŠƒvƒgˆÈŠO‚ÅŽg—p‚³‚ê‚Ü‚µ‚½"
 
@@ -1445,6 +1355,12 @@
 msgid "E494: Use w or w>>"
 msgstr "E494: w ‚à‚µ‚­‚Í w>> ‚ðŽg—p‚µ‚Ä‚­‚¾‚³‚¢"
 
+msgid ""
+"INTERNAL: Cannot use DFLALL with ADDR_NONE, ADDR_UNSIGNED or ADDR_QUICKFIX"
+msgstr ""
+"“à•”ƒGƒ‰[: DFLALL ‚ð ADDR_NONE, ADDR_UNSIGNED ‚â ADDR_QUICKFIX ‚ƂƂà‚ÉŽg‚¤"
+"‚±‚Ƃ͂ł«‚Ü‚¹‚ñ"
+
 msgid "E943: Command table needs to be updated, run 'make cmdidxs'"
 msgstr ""
 "E943: ƒRƒ}ƒ“ƒhƒe[ƒuƒ‹‚ðXV‚·‚é•K—v‚ª‚ ‚è‚Ü‚·A'make cmdidxs' ‚ðŽÀs‚µ‚Ä‚­‚¾"
@@ -1463,69 +1379,6 @@
 msgid_plural "E173: %d more files to edit"
 msgstr[0] "E173: •ҏW‚·‚ׂ«ƒtƒ@ƒCƒ‹‚ª‚ ‚Æ %d ŒÂ‚ ‚è‚Ü‚·"
 
-#, c-format
-msgid "E174: Command already exists: add ! to replace it: %s"
-msgstr "E174: ƒRƒ}ƒ“ƒh‚ªŠù‚É‚ ‚è‚Ü‚·: Ä’è‹`‚·‚é‚É‚Í ! ‚ð’ljÁ‚µ‚Ä‚­‚¾‚³‚¢: %s"
-
-msgid ""
-"\n"
-"    Name        Args       Address   Complete  Definition"
-msgstr ""
-"\n"
-"    –¼‘O        ˆø”       ƒAƒhƒŒƒX  •⊮      ’è‹`"
-
-msgid "No user-defined commands found"
-msgstr "ƒ†[ƒU[’è‹`ƒRƒ}ƒ“ƒh‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½"
-
-msgid "E175: No attribute specified"
-msgstr "E175: ‘®«‚Í’è‹`‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-
-msgid "E176: Invalid number of arguments"
-msgstr "E176: ˆø”‚̐”‚ª–³Œø‚Å‚·"
-
-msgid "E177: Count cannot be specified twice"
-msgstr "E177: ƒJƒEƒ“ƒg‚ð2dŽw’è‚·‚邱‚Ƃ͂ł«‚Ü‚¹‚ñ"
-
-msgid "E178: Invalid default value for count"
-msgstr "E178: ƒJƒEƒ“ƒg‚̏ȗª’l‚ª–³Œø‚Å‚·"
-
-msgid "E179: argument required for -complete"
-msgstr "E179: -complete ‚ɂ͈ø”‚ª•K—v‚Å‚·"
-
-msgid "E179: argument required for -addr"
-msgstr "E179: -addr ‚ɂ͈ø”‚ª•K—v‚Å‚·"
-
-#, c-format
-msgid "E181: Invalid attribute: %s"
-msgstr "E181: –³Œø‚È‘®«‚Å‚·: %s"
-
-msgid "E182: Invalid command name"
-msgstr "E182: –³Œø‚ȃRƒ}ƒ“ƒh–¼‚Å‚·"
-
-msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: ƒ†[ƒU[’è‹`ƒRƒ}ƒ“ƒh‚͉p‘å•¶Žš‚ÅŽn‚Ü‚ç‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
-
-msgid "E841: Reserved name, cannot be used for user defined command"
-msgstr "E841: —\\–ñ–¼‚Ȃ̂ŁAƒ†[ƒU[’è‹`ƒRƒ}ƒ“ƒh‚É—˜—p‚Å‚«‚Ü‚¹‚ñ"
-
-#, c-format
-msgid "E184: No such user-defined command: %s"
-msgstr "E184: ‚»‚̃†[ƒU[’è‹`ƒRƒ}ƒ“ƒh‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
-
-#, c-format
-msgid "E180: Invalid address type value: %s"
-msgstr "E180: –³Œø‚ȃAƒhƒŒƒXƒ^ƒCƒv’l‚Å‚·: %s"
-
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: –³Œø‚ȕ⊮Žw’è‚Å‚·: %s"
-
-msgid "E468: Completion argument only allowed for custom completion"
-msgstr "E468: •⊮ˆø”‚̓JƒXƒ^ƒ€•⊮‚Å‚µ‚©Žg—p‚Å‚«‚Ü‚¹‚ñ"
-
-msgid "E467: Custom completion requires a function argument"
-msgstr "E467: ƒJƒXƒ^ƒ€•⊮‚ɂ͈ø”‚Æ‚µ‚Ċ֐”‚ª•K—v‚Å‚·"
-
 msgid "unknown"
 msgstr "•s–¾"
 
@@ -1908,20 +1761,21 @@
 msgstr "‚͓Ǎžê—p‚Å‚· (‹­§‘ž‚É‚Í ! ‚ð’ljÁ)"
 
 msgid "E506: Can't write to backup file (add ! to override)"
-msgstr "E506: ƒoƒbƒNƒAƒbƒvƒtƒ@ƒCƒ‹‚ð•Û‘¶‚Å‚«‚Ü‚¹‚ñ (! ‚ð’ljÁ‚Å‹­§•Û‘¶)"
+msgstr "E506: ƒoƒbƒNƒAƒbƒvƒtƒ@ƒCƒ‹‚ð•Û‘¶‚Å‚«‚Ü‚¹‚ñ (! ‚ð’ljÁ‚Å‹­§‘ž)"
 
 msgid "E507: Close error for backup file (add ! to override)"
 msgstr ""
-"E507: ƒoƒbƒNƒAƒbƒvƒtƒ@ƒCƒ‹‚ð•‚¶‚éÛ‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½ (! ‚ð’ljÁ‚Å‹­§)"
+"E507: ƒoƒbƒNƒAƒbƒvƒtƒ@ƒCƒ‹‚ð•‚¶‚éÛ‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½ (! ‚ð’ljÁ‚Å‹­§‘"
+"ž)"
 
 msgid "E508: Can't read file for backup (add ! to override)"
-msgstr "E508: ƒoƒbƒNƒAƒbƒv—pƒtƒ@ƒCƒ‹‚ð“Ǎž‚߂܂¹‚ñ (! ‚ð’ljÁ‚Å‹­§“Ǎž)"
+msgstr "E508: ƒoƒbƒNƒAƒbƒv—pƒtƒ@ƒCƒ‹‚ð“Ǎž‚߂܂¹‚ñ (! ‚ð’ljÁ‚Å‹­§‘ž)"
 
 msgid "E509: Cannot create backup file (add ! to override)"
-msgstr "E509: ƒoƒbƒNƒAƒbƒvƒtƒ@ƒCƒ‹‚ðì‚ê‚Ü‚¹‚ñ (! ‚ð’ljÁ‚Å‹­§ì¬)"
+msgstr "E509: ƒoƒbƒNƒAƒbƒvƒtƒ@ƒCƒ‹‚ðì‚ê‚Ü‚¹‚ñ (! ‚ð’ljÁ‚Å‹­§‘ž)"
 
 msgid "E510: Can't make backup file (add ! to override)"
-msgstr "E510: ƒoƒbƒNƒAƒbƒvƒtƒ@ƒCƒ‹‚ðì‚ê‚Ü‚¹‚ñ (! ‚ð’ljÁ‚Å‹­§ì¬)"
+msgstr "E510: ƒoƒbƒNƒAƒbƒvƒtƒ@ƒCƒ‹‚ðì‚ê‚Ü‚¹‚ñ (! ‚ð’ljÁ‚Å‹­§‘ž)"
 
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: •Û‘¶—pˆêŽžƒtƒ@ƒCƒ‹‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
@@ -2391,6 +2245,9 @@
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
 msgstr "E243: ˆø”‚̓Tƒ|[ƒg‚³‚ê‚Ü‚¹‚ñ: \"-%s\"; OLE”Å‚ðŽg—p‚µ‚Ä‚­‚¾‚³‚¢."
 
+msgid "E988: GUI cannot be used. Cannot execute gvim.exe."
+msgstr "E988: GUI‚ÍŽg—p•s‰Â”\\‚Å‚·Bgvim.exe‚ð‹N“®‚Å‚«‚Ü‚¹‚ñB"
+
 msgid "E672: Unable to open window inside MDI application"
 msgstr "E672: MDIƒAƒvƒŠ‚Ì’†‚ł̓EƒBƒ“ƒhƒE‚ðŠJ‚¯‚Ü‚¹‚ñ"
 
@@ -2931,6 +2788,106 @@
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: VIM ŽÀ‘̂̓o˜^ƒvƒƒpƒeƒB‚ª•s³‚Å‚·. Á‹Ž‚µ‚Ü‚µ‚½!"
 
+msgid " Keyword completion (^N^P)"
+msgstr " ƒL[ƒ[ƒh•⊮ (^N^P)"
+
+msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
+msgstr " ^X ƒ‚[ƒh (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
+
+msgid " Whole line completion (^L^N^P)"
+msgstr " s(‘S‘Ì)•⊮ (^L^N^P)"
+
+msgid " File name completion (^F^N^P)"
+msgstr " ƒtƒ@ƒCƒ‹–¼•⊮ (^F^N^P)"
+
+msgid " Tag completion (^]^N^P)"
+msgstr " ƒ^ƒO•⊮ (^]^N^P)"
+
+msgid " Path pattern completion (^N^P)"
+msgstr " ƒpƒXƒpƒ^[ƒ“•⊮ (^N^P)"
+
+msgid " Definition completion (^D^N^P)"
+msgstr " ’è‹`•⊮ (^D^N^P)"
+
+msgid " Dictionary completion (^K^N^P)"
+msgstr " Ž«‘•⊮ (^K^N^P)"
+
+msgid " Thesaurus completion (^T^N^P)"
+msgstr " ƒVƒ\\[ƒ‰ƒX•⊮ (^T^N^P)"
+
+msgid " Command-line completion (^V^N^P)"
+msgstr " ƒRƒ}ƒ“ƒhƒ‰ƒCƒ“•⊮ (^V^N^P)"
+
+msgid " User defined completion (^U^N^P)"
+msgstr " ƒ†[ƒU[’è‹`•⊮ (^U^N^P)"
+
+msgid " Omni completion (^O^N^P)"
+msgstr " ƒIƒ€ƒj•⊮ (^O^N^P)"
+
+msgid " Spelling suggestion (s^N^P)"
+msgstr " ’Ô‚èC³Œó•â (s^N^P)"
+
+msgid " Keyword Local completion (^N^P)"
+msgstr " ‹ÇŠƒL[ƒ[ƒh•⊮ (^N^P)"
+
+msgid "Hit end of paragraph"
+msgstr "’i—Ž‚ÌÅŒã‚Ƀqƒbƒg"
+
+msgid "E839: Completion function changed window"
+msgstr "E839: •⊮ŠÖ”‚ªƒEƒBƒ“ƒhƒE‚ð•ύX‚µ‚Ü‚µ‚½"
+
+msgid "E840: Completion function deleted text"
+msgstr "E840: •⊮ŠÖ”‚ªƒeƒLƒXƒg‚ðíœ‚µ‚Ü‚µ‚½"
+
+msgid "'dictionary' option is empty"
+msgstr "'dictionary' ƒIƒvƒVƒ‡ƒ“‚ª‹ó‚Å‚·"
+
+msgid "'thesaurus' option is empty"
+msgstr "'thesaurus' ƒIƒvƒVƒ‡ƒ“‚ª‹ó‚Å‚·"
+
+#, c-format
+msgid "Scanning dictionary: %s"
+msgstr "Ž«‘‚ðƒXƒLƒƒƒ“’†: %s"
+
+msgid " (insert) Scroll (^E/^Y)"
+msgstr " (‘}“ü) ƒXƒNƒ[ƒ‹(^E/^Y)"
+
+msgid " (replace) Scroll (^E/^Y)"
+msgstr " (’uŠ·) ƒXƒNƒ[ƒ‹ (^E/^Y)"
+
+#, c-format
+msgid "Scanning: %s"
+msgstr "ƒXƒLƒƒƒ“’†: %s"
+
+msgid "Scanning tags."
+msgstr "ƒ^ƒO‚ðƒXƒLƒƒƒ“’†."
+
+msgid "match in file"
+msgstr "ƒtƒ@ƒCƒ‹“à‚̃}ƒbƒ`"
+
+msgid " Adding"
+msgstr " ’ljÁ’†"
+
+msgid "-- Searching..."
+msgstr "-- ŒŸõ’†..."
+
+msgid "Back at original"
+msgstr "Žn‚߂ɖ߂é"
+
+msgid "Word from other line"
+msgstr "‘¼‚̍s‚Ì’PŒê"
+
+msgid "The only match"
+msgstr "—Bˆê‚ÌŠY“–"
+
+#, c-format
+msgid "match %d of %d"
+msgstr "%d ”Ô–Ú‚ÌŠY“– (‘SŠY“– %d ŒÂ’†)"
+
+#, c-format
+msgid "match %d"
+msgstr "%d ”Ô–Ú‚ÌŠY“–"
+
 #, c-format
 msgid "E938: Duplicate key in JSON: \"%s\""
 msgstr "E938: JSON‚ɏd•¡ƒL[‚ª‚ ‚è‚Ü‚·: \"%s\""
@@ -3852,6 +3809,9 @@
 "\"\n"
 "    ‚ðÁ‚¹‚΂±‚̃ƒbƒZ[ƒW‚ð‰ñ”ð‚Å‚«‚Ü‚·.\n"
 
+msgid "Found a swap file that is not useful, deleting it"
+msgstr "•s—v‚ȃXƒƒbƒvƒtƒ@ƒCƒ‹‚ªŒ©‚‚©‚è‚Ü‚µ‚½Bíœ‚µ‚Ü‚·"
+
 msgid "Swap file \""
 msgstr "ƒXƒƒbƒvƒtƒ@ƒCƒ‹ \""
 
@@ -4142,6 +4102,9 @@
 "‚·‚ׂĂ̕ύX‚ð”jŠü‚µAVim‚ðI—¹‚·‚é‚É‚Í  :qa!  ‚Æ“ü—Í‚µ <Enter> ‚ð‰Ÿ‚µ‚Ä‚­‚¾"
 "‚³‚¢"
 
+msgid "Type  :qa  and press <Enter> to exit Vim"
+msgstr "Vim‚ðI—¹‚·‚é‚É‚Í  :qa  ‚Æ“ü—Í‚µ <Enter> ‚ð‰Ÿ‚µ‚Ä‚­‚¾‚³‚¢"
+
 #, c-format
 msgid "%ld line %sed %d time"
 msgid_plural "%ld line %sed %d times"
@@ -4618,15 +4581,6 @@
 msgid "At line"
 msgstr "s"
 
-msgid "Could not load vim32.dll!"
-msgstr "vim32.dll ‚ðƒ[ƒh‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
-
-msgid "VIM Error"
-msgstr "VIMƒGƒ‰["
-
-msgid "Could not fix up function pointers to the DLL!"
-msgstr "DLL‚©‚çŠÖ”ƒ|ƒCƒ“ƒ^‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
-
 #, c-format
 msgid "Vim: Caught %s event\n"
 msgstr "Vim: ƒCƒxƒ“ƒg %s ‚ðŒŸ’m\n"
@@ -4659,6 +4613,9 @@
 msgid "shell returned %d"
 msgstr "ƒVƒFƒ‹‚ªƒR[ƒh %d ‚ŏI—¹‚µ‚Ü‚µ‚½"
 
+msgid "E553: No more items"
+msgstr "E553: —v‘f‚ª‚à‚¤‚ ‚è‚Ü‚¹‚ñ"
+
 msgid "E926: Current location list was changed"
 msgstr "E926: Œ»Ý‚̃ƒP[ƒVƒ‡ƒ“ƒŠƒXƒg‚ª•ύX‚³‚ê‚Ü‚µ‚½"
 
@@ -4691,9 +4648,6 @@
 msgid "E379: Missing or empty directory name"
 msgstr "E379: ƒfƒBƒŒƒNƒgƒŠ–¼‚ª–³‚¢‚©‹ó‚Å‚·"
 
-msgid "E553: No more items"
-msgstr "E553: —v‘f‚ª‚à‚¤‚ ‚è‚Ü‚¹‚ñ"
-
 msgid "E924: Current window was closed"
 msgstr "E924: Œ»Ý‚̃EƒBƒ“ƒhƒE‚ª•‚¶‚ç‚ê‚Ü‚µ‚½"
 
@@ -5705,6 +5659,12 @@
 msgid "E556: at top of tag stack"
 msgstr "E556: ƒ^ƒOƒXƒ^ƒbƒN‚̐擪‚Å‚·"
 
+msgid "E986: cannot modify the tag stack within tagfunc"
+msgstr "E986: tagfunc“à‚̃^ƒOƒXƒ^ƒbƒN‚ð•ύX‚Å‚«‚Ü‚¹‚ñ"
+
+msgid "E987: invalid return value from tagfunc"
+msgstr "E987: tagfunc‚©‚ç‚Ì–ß‚è’l‚ª–³Œø‚Å‚·"
+
 msgid "E425: Cannot go before first matching tag"
 msgstr "E425: Å‰‚ÌŠY“–ƒ^ƒO‚ð‰z‚¦‚Ė߂邱‚Ƃ͂ł«‚Ü‚¹‚ñ"
 
@@ -5712,12 +5672,6 @@
 msgid "E426: tag not found: %s"
 msgstr "E426: ƒ^ƒO‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ: %s"
 
-msgid "  # pri kind tag"
-msgstr "  # pri kind tag"
-
-msgid "file\n"
-msgstr "ƒtƒ@ƒCƒ‹\n"
-
 msgid "E427: There is only one matching tag"
 msgstr "E427: ŠY“–ƒ^ƒO‚ª1‚‚¾‚¯‚µ‚©‚ ‚è‚Ü‚¹‚ñ"
 
@@ -5742,6 +5696,12 @@
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: ƒtƒ@ƒCƒ‹ \"%s\" ‚ª‚ ‚è‚Ü‚¹‚ñ"
 
+msgid "  # pri kind tag"
+msgstr "  # pri kind tag"
+
+msgid "file\n"
+msgstr "ƒtƒ@ƒCƒ‹\n"
+
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -5818,6 +5778,10 @@
 msgstr "$VIMRUNTIME/rgb.txt‚ðŠJ‚¯‚Ü‚¹‚ñ"
 
 #, c-format
+msgid "E181: Invalid attribute: %s"
+msgstr "E181: –³Œø‚È‘®«‚Å‚·: %s"
+
+#, c-format
 msgid "Kill job in \"%s\"?"
 msgstr "\"%s\" “à‚̃Wƒ‡ƒu‚ðI—¹‚µ‚Ü‚·‚©?"
 
@@ -6023,6 +5987,65 @@
 msgid "E440: undo line missing"
 msgstr "E440: ƒAƒ“ƒhƒDs‚ª‚ ‚è‚Ü‚¹‚ñ"
 
+msgid ""
+"\n"
+"    Name              Args Address Complete    Definition"
+msgstr ""
+"\n"
+"    –¼‘O              ˆø” ƒAƒhƒŒƒX •⊮       ’è‹`"
+
+msgid "No user-defined commands found"
+msgstr "ƒ†[ƒU[’è‹`ƒRƒ}ƒ“ƒh‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½"
+
+#, c-format
+msgid "E180: Invalid address type value: %s"
+msgstr "E180: –³Œø‚ȃAƒhƒŒƒXƒ^ƒCƒv’l‚Å‚·: %s"
+
+#, c-format
+msgid "E180: Invalid complete value: %s"
+msgstr "E180: –³Œø‚ȕ⊮Žw’è‚Å‚·: %s"
+
+msgid "E468: Completion argument only allowed for custom completion"
+msgstr "E468: •⊮ˆø”‚̓JƒXƒ^ƒ€•⊮‚Å‚µ‚©Žg—p‚Å‚«‚Ü‚¹‚ñ"
+
+msgid "E467: Custom completion requires a function argument"
+msgstr "E467: ƒJƒXƒ^ƒ€•⊮‚ɂ͈ø”‚Æ‚µ‚Ċ֐”‚ª•K—v‚Å‚·"
+
+msgid "E175: No attribute specified"
+msgstr "E175: ‘®«‚Í’è‹`‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
+
+msgid "E176: Invalid number of arguments"
+msgstr "E176: ˆø”‚̐”‚ª–³Œø‚Å‚·"
+
+msgid "E177: Count cannot be specified twice"
+msgstr "E177: ƒJƒEƒ“ƒg‚ð2dŽw’è‚·‚邱‚Ƃ͂ł«‚Ü‚¹‚ñ"
+
+msgid "E178: Invalid default value for count"
+msgstr "E178: ƒJƒEƒ“ƒg‚̏ȗª’l‚ª–³Œø‚Å‚·"
+
+msgid "E179: argument required for -complete"
+msgstr "E179: -complete ‚ɂ͈ø”‚ª•K—v‚Å‚·"
+
+msgid "E179: argument required for -addr"
+msgstr "E179: -addr ‚ɂ͈ø”‚ª•K—v‚Å‚·"
+
+#, c-format
+msgid "E174: Command already exists: add ! to replace it: %s"
+msgstr "E174: ƒRƒ}ƒ“ƒh‚ªŠù‚É‚ ‚è‚Ü‚·: Ä’è‹`‚·‚é‚É‚Í ! ‚ð’ljÁ‚µ‚Ä‚­‚¾‚³‚¢: %s"
+
+msgid "E182: Invalid command name"
+msgstr "E182: –³Œø‚ȃRƒ}ƒ“ƒh–¼‚Å‚·"
+
+msgid "E183: User defined commands must start with an uppercase letter"
+msgstr "E183: ƒ†[ƒU[’è‹`ƒRƒ}ƒ“ƒh‚͉p‘å•¶Žš‚ÅŽn‚Ü‚ç‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
+
+msgid "E841: Reserved name, cannot be used for user defined command"
+msgstr "E841: —\\–ñ–¼‚Ȃ̂ŁAƒ†[ƒU[’è‹`ƒRƒ}ƒ“ƒh‚É—˜—p‚Å‚«‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "E184: No such user-defined command: %s"
+msgstr "E184: ‚»‚̃†[ƒU[’è‹`ƒRƒ}ƒ“ƒh‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
+
 #, c-format
 msgid "E122: Function %s already exists, add ! to replace it"
 msgstr "E122: ŠÖ” %s ‚Í’è‹`Ï‚Å‚·AÄ’è‹`‚·‚é‚É‚Í ! ‚ð’ljÁ‚µ‚Ä‚­‚¾‚³‚¢"
@@ -6157,6 +6180,20 @@
 
 msgid ""
 "\n"
+"MS-Windows 64-bit GUI/console version"
+msgstr ""
+"\n"
+"MS-Windows 64 ƒrƒbƒg GUI/ƒRƒ“ƒ\\[ƒ‹ ”Å"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit GUI/console version"
+msgstr ""
+"\n"
+"MS-Windows 32 ƒrƒbƒg GUI/ƒRƒ“ƒ\\[ƒ‹ ”Å"
+
+msgid ""
+"\n"
 "MS-Windows 64-bit GUI version"
 msgstr ""
 "\n"
@@ -6594,6 +6631,10 @@
 msgstr "E475: –³Œø‚Ȉø”‚Å‚·: %s"
 
 #, c-format
+msgid "E983: Duplicate argument: %s"
+msgstr "E983: ˆø”‚ªd•¡‚µ‚Ä‚¢‚Ü‚·: %s"
+
+#, c-format
 msgid "E475: Invalid value for argument %s"
 msgstr "E475: ˆø” %s ‚ɑ΂µ‚Ä–³Œø‚È’l‚Å‚·"
 
@@ -7218,3 +7259,21 @@
 "Cƒ\\[ƒX (*.c, *.h)\t*.c;*.h\n"
 "C++ƒ\\[ƒX (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
 "Vimƒtƒ@ƒCƒ‹ (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+
+#~ msgid "GVim"
+#~ msgstr ""
+
+msgid "Text Editor"
+msgstr "ƒeƒLƒXƒgƒGƒfƒBƒ^"
+
+msgid "Edit text files"
+msgstr "ƒeƒLƒXƒgƒtƒ@ƒCƒ‹‚ð•ҏW‚µ‚Ü‚·"
+
+msgid "Text;editor;"
+msgstr "ƒeƒLƒXƒg;ƒGƒfƒBƒ^;"
+
+#~ msgid "gvim"
+#~ msgstr ""
+
+#~ msgid "Vim"
+#~ msgstr ""
diff --git a/src/po/vi.po b/src/po/vi.po
index a222137..eee5a12 100644
--- a/src/po/vi.po
+++ b/src/po/vi.po
@@ -222,7 +222,7 @@
 msgid " ^X mode (^E^Y^L^]^F^I^K^D^V^N^P)"
 msgstr " Chế độ ^X (^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
+#. Scroll has its own msgs, in its place there is the msg for local
 #. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL)  -- Acevedo
 msgid " Keyword Local completion (^N^P)"
 msgstr " Tự động kết thúc nội bộ cho từ khóa (^N^P)"
diff --git a/src/po/vim.desktop.in b/src/po/vim.desktop.in
index f1ce31b..e0c49a3 100644
--- a/src/po/vim.desktop.in
+++ b/src/po/vim.desktop.in
@@ -42,7 +42,6 @@
 Comment[id]=Edit file teks
 Comment[is]=Vinna með textaskrár
 Comment[it]=Modifica file di testo
-Comment[ja]=テキストファイルを編集します
 Comment[kn]=ಪಠ್ಯ ಕಡತಗಳನ್ನು ಸಂಪಾದಿಸು
 Comment[ko]=텍스트 파일을 편집합니다
 Comment[lt]=Redaguoti tekstines bylas
diff --git a/src/po/zh_TW.UTF-8.po b/src/po/zh_TW.UTF-8.po
index 8b3656c..c1c5543 100644
--- a/src/po/zh_TW.UTF-8.po
+++ b/src/po/zh_TW.UTF-8.po
@@ -261,7 +261,7 @@
 msgid " ^X mode (^E^Y^L^]^F^I^K^D^V^N^P)"
 msgstr " ^X 模式 (^E^Y^L^]^F^I^K^D^N^P)"
 
-#. Scroll has it's own msgs, in it's place there is the msg for local
+#. Scroll has its own msgs, in its place there is the msg for local
 #. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL)  -- Acevedo
 msgid " Keyword Local completion (^N^P)"
 msgstr " 區域關鍵字自動完成 (^N^P)"
diff --git a/src/po/zh_TW.po b/src/po/zh_TW.po
index f29700f..0fc5eec 100644
--- a/src/po/zh_TW.po
+++ b/src/po/zh_TW.po
@@ -254,7 +254,7 @@
 msgid " ^X mode (^E^Y^L^]^F^I^K^D^V^N^P)"
 msgstr " ^X ¼Ò¦¡ (^E^Y^L^]^F^I^K^D^N^P)"
 
-#. Scroll has it's own msgs, in it's place there is the msg for local
+#. Scroll has its own msgs, in its place there is the msg for local
 #. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL)  -- Acevedo
 msgid " Keyword Local completion (^N^P)"
 msgstr " °Ï°ìÃöÁä¦r¦Û°Ê§¹¦¨ (^N^P)"