commit f37506f60f87d52a9e8850e30067645e2b13783c
author Bram Moolenaar <Bram@vim.org> Wed Aug 31 22:22:10 2016 +0200
committer Bram Moolenaar <Bram@vim.org> Wed Aug 31 22:22:10 2016 +0200
tree a11d81f91e6ccb82f9ccdde6ad426ffbbaf3940f
parent c628fdcd46e93c308f742efdf54248695960e290

Updated runtime files.  Remove HiLink commands.

src/po/ja.euc-jp.po

diff --git a/src/po/ja.euc-jp.po b/src/po/ja.euc-jp.po
index c6edba4..cbd89f7 100644
--- a/src/po/ja.euc-jp.po
+++ b/src/po/ja.euc-jp.po
@@ -14,8 +14,8 @@
 msgstr ""
 "Project-Id-Version: Vim 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-01 09:02+0900\n"
-"PO-Revision-Date: 2016-02-01-09:08+0900\n"
+"POT-Creation-Date: 2016-08-31 18:10+0900\n"
+"PO-Revision-Date: 2016-08-31 21:20+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n"
 "Language: Japanese\n"
@@ -53,6 +53,9 @@
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: ¥Ð¥Ã¥Õ¥¡¤òºîÀ®¤Ç¤­¤Ê¤¤¤Î¤Ç, ¾¤Î¤ò»ÈÍѤ·¤Þ¤¹..."
 
+msgid "E931: Buffer cannot be registered"
+msgstr "E931: ¥Ð¥Ã¥Õ¥¡¤òÅÐÏ¿¤Ç¤­¤Þ¤»¤ó"
+
 msgid "E515: No buffers were unloaded"
 msgstr "E515: ²òÊü¤µ¤ì¤¿¥Ð¥Ã¥Õ¥¡¤Ï¤¢¤ê¤Þ¤»¤ó"
 
@@ -202,17 +205,55 @@
 msgid "    line=%ld  id=%d  name=%s"
 msgstr "    ¹Ô=%ld  ¼±ÊÌ»Ò=%d  ̾Á°=%s"
 
-msgid "E897: All channels are in use"
-msgstr "E897: Á´¥Á¥ã¥ó¥Í¥ë¤¬»ÈÍÑÃæ¤Ç¤¹"
-
-msgid "E899: Cannot connect to port after retry2"
-msgstr "E899: 2²ó¤Î¥ê¥È¥é¥¤¤ò¤·¤Æ¤â¥Ý¡¼¥È¤ËÀܳ¤Ç¤­¤Þ¤»¤ó"
-
 msgid "E902: Cannot connect to port"
 msgstr "E902: ¥Ý¡¼¥È¤ËÀܳ¤Ç¤­¤Þ¤»¤ó"
 
-msgid "E896: read from channel"
-msgstr "E896: ¥Á¥ã¥ó¥Í¥ë¤«¤éÆɤ߹þ¤ß"
+msgid "E901: gethostbyname() in channel_open()"
+msgstr "E901: channel_open() Æâ¤Î gethostbyname() ¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
+
+msgid "E898: socket() in channel_open()"
+msgstr "E898: channel_open() Æâ¤Î socket() ¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
+
+msgid "E903: received command with non-string argument"
+msgstr "E903: Èóʸ»úÎó¤Î°ú¿ô¤Î¥³¥Þ¥ó¥É¤ò¼õ¿®¤·¤Þ¤·¤¿"
+
+msgid "E904: last argument for expr/call must be a number"
+msgstr "E904: expr/call ¤ÎºÇ¸å¤Î°ú¿ô¤Ï¿ô»ú¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
+
+msgid "E904: third argument for call must be a list"
+msgstr "E904: call ¤Î3ÈÖÌܤΰú¿ô¤Ï¥ê¥¹¥È·¿¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
+
+#, c-format
+msgid "E905: received unknown command: %s"
+msgstr "E905: ̤ÃΤΥ³¥Þ¥ó¥É¤ò¼õ¿®¤·¤Þ¤·¤¿: %s"
+
+#, c-format
+msgid "E630: %s(): write while not connected"
+msgstr "E630: %s(): ÈóÀܳ¾õÂ֤ǽñ¤­¹þ¤ß¤Þ¤·¤¿"
+
+#, c-format
+msgid "E631: %s(): write failed"
+msgstr "E631: %s(): ½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+
+#, c-format
+msgid "E917: Cannot use a callback with %s()"
+msgstr "E917: %s() ¤Ë¥³¡¼¥ë¥Ð¥Ã¥¯¤Ï»È¤¨¤Þ¤»¤ó"
+
+msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
+msgstr "E912: À¸¤ä nl ¥Á¥ã¥ó¥Í¥ë¤Ë ch_evalexpr()/ch_sendexpr ¤Ï»È¤¨¤Þ¤»¤ó"
+
+msgid "E906: not an open channel"
+msgstr "E906: ³«¤¤¤Æ¤¤¤Ê¤¤¥Á¥ã¥ó¥Í¥ë¤Ç¤¹"
+
+msgid "E920: _io file requires _name to be set"
+msgstr "E920: _io ¥Õ¥¡¥¤¥ë¤Ï _name ¤ÎÀßÄ꤬ɬÍפǤ¹"
+
+msgid "E915: in_io buffer requires in_buf or in_name to be set"
+msgstr "E915: in_io ¥Ð¥Ã¥Õ¥¡¤Ï in_buf ¤« in_name ¤ÎÀßÄ꤬ɬÍפǤ¹"
+
+#, c-format
+msgid "E918: buffer must be loaded: %s"
+msgstr "E918: ¥Ð¥Ã¥Õ¥¡¤¬¥í¡¼¥É¤µ¤ì¤Æ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó: %s"
 
 msgid "E821: File is encrypted with unknown method"
 msgstr "E821: ¥Õ¥¡¥¤¥ë¤¬Ì¤ÃΤÎÊýË¡¤Ç°Å¹æ²½¤µ¤ì¤Æ¤¤¤Þ¤¹"
@@ -233,7 +274,30 @@
 msgstr "[°Å¹æ²½]"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: ¼­½ñ·¿¤Ë¥³¥í¥ó¤¬¤¢¤ê¤Þ¤»¤ó: %s"
+
+#, c-format
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: ¼­½ñ·¿¤Ë½ÅÊ£¥­¡¼¤¬¤¢¤ê¤Þ¤¹: \"%s\""
+
+#, c-format
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: ¼­½ñ·¿¤Ë¥«¥ó¥Þ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: ¼­½ñ·¿¤ÎºÇ¸å¤Ë '}' ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
+
+msgid "extend() argument"
+msgstr "extend() ¤Î°ú¿ô"
+
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: ¥­¡¼¤Ï´û¤Ë¸ºß¤·¤Þ¤¹: %s"
+
+#, c-format
+msgid "E96: Cannot diff more than %ld buffers"
 msgstr "E96: %ld °Ê¾å¤Î¥Ð¥Ã¥Õ¥¡¤Ïdiff¤Ç¤­¤Þ¤»¤ó"
 
 msgid "E810: Cannot read or write temp files"
@@ -389,52 +453,17 @@
 msgid "match %d"
 msgstr "%d ÈÖÌܤγºÅö"
 
+#. maximum nesting of lists and dicts
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: ͽ´ü¤»¤Ìʸ»ú¤¬ :let ¤Ë¤¢¤ê¤Þ¤·¤¿"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: ¥ê¥¹¥È¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¤¬Èϰϳ°¤Ç¤¹: %ld"
-
-#, c-format
 msgid "E121: Undefined variable: %s"
 msgstr "E121: ̤ÄêµÁ¤ÎÊÑ¿ô¤Ç¤¹: %s"
 
 msgid "E111: Missing ']'"
 msgstr "E111: ']' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: %s ¤Î°ú¿ô¤Ï¥ê¥¹¥È·¿¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: %s ¤Î°ú¿ô¤Ï¥ê¥¹¥È·¿¤Þ¤¿¤Ï¼­½ñ·¿¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-
-msgid "E714: List required"
-msgstr "E714: ¥ê¥¹¥È·¿¤¬É¬ÍפǤ¹"
-
-msgid "E715: Dictionary required"
-msgstr "E715: ¼­½ñ·¿¤¬É¬ÍפǤ¹"
-
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: ´Ø¿ô¤Î°ú¿ô¤¬Â¿²á¤®¤Þ¤¹: %s"
-
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: ¼­½ñ·¿¤Ë¥­¡¼¤¬Â¸ºß¤·¤Þ¤»¤ó: %s"
-
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: ´Ø¿ô %s ¤ÏÄêµÁºÑ¤Ç¤¹, ºÆÄêµÁ¤¹¤ë¤Ë¤Ï ! ¤òÄɲ䷤Ƥ¯¤À¤µ¤¤"
-
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: ¼­½ñ·¿Æâ¤Ë¥¨¥ó¥È¥ê¤¬´û¤Ë¸ºß¤·¤Þ¤¹"
-
-msgid "E718: Funcref required"
-msgstr "E718: ´Ø¿ô»²¾È·¿¤¬Í׵ᤵ¤ì¤Þ¤¹"
-
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: [:] ¤ò¼­½ñ·¿¤ÈÁȤ߹ç¤ï¤»¤Æ¤Ï»È¤¨¤Þ¤»¤ó"
 
@@ -443,10 +472,6 @@
 msgstr "E734: °Û¤Ê¤Ã¤¿·¿¤ÎÊÑ¿ô¤Ç¤¹ %s="
 
 #, c-format
-msgid "E130: Unknown function: %s"
-msgstr "E130: ̤ÃΤδؿô¤Ç¤¹: %s"
-
-#, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: ÉÔÀµ¤ÊÊÑ¿ô̾¤Ç¤¹: %s"
 
@@ -486,10 +511,6 @@
 msgstr "E690: :for ¤Î¸å¤Ë \"in\" ¤¬¤¢¤ê¤Þ¤»¤ó"
 
 #, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: ¥«¥Ã¥³ '(' ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
-
-#, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: ¤½¤ÎÊÑ¿ô¤Ï¤¢¤ê¤Þ¤»¤ó: \"%s\""
 
@@ -511,9 +532,6 @@
 msgid "E736: Invalid operation for Dictionary"
 msgstr "E736: ¼­½ñ·¿¤Ë¤Ï̵¸ú¤ÊÁàºî¤Ç¤¹"
 
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: ´Ø¿ô»²¾È·¿¤Ï´Ø¿ô»²¾È·¿¤È¤·¤«Èæ³Ó¤Ç¤­¤Þ¤»¤ó"
-
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: ´Ø¿ô»²¾È·¿¤Ë¤Ï̵¸ú¤ÊÁàºî¤Ç¤¹"
 
@@ -526,6 +544,9 @@
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: ´Ø¿ô»²¾È·¿¤Ï¥¤¥ó¥Ç¥Ã¥¯¥¹¤Ç¤­¤Þ¤»¤ó"
 
+msgid "E909: Cannot index a special variable"
+msgstr "E909: ÆüìÊÑ¿ô¤Ï¥¤¥ó¥Ç¥Ã¥¯¥¹¤Ç¤­¤Þ¤»¤ó"
+
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: ¥ª¥×¥·¥ç¥ó̾¤¬¤¢¤ê¤Þ¤»¤ó: %s"
@@ -542,60 +563,116 @@
 msgid "E115: Missing quote: %s"
 msgstr "E115: °úÍÑÉä (') ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
 
-#, c-format
-msgid "E696: Missing comma in List: %s"
-msgstr "E696: ¥ê¥¹¥È·¿¤Ë¥«¥ó¥Þ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
-
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: ¥ê¥¹¥È·¿¤ÎºÇ¸å¤Ë ']' ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
-
 msgid "Not enough memory to set references, garbage collection aborted!"
 msgstr ""
 "¥¬¡¼¥Ù¥Ã¥¸¥³¥ì¥¯¥·¥ç¥ó¤òÃæ»ß¤·¤Þ¤·¤¿! »²¾È¤òºîÀ®¤¹¤ë¤Î¤Ë¥á¥â¥ê¤¬ÉÔ­¤·¤Þ¤·¤¿"
 
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: ¼­½ñ·¿¤Ë¥³¥í¥ó¤¬¤¢¤ê¤Þ¤»¤ó: %s"
-
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: ¼­½ñ·¿¤Ë½ÅÊ£¥­¡¼¤¬¤¢¤ê¤Þ¤¹: \"%s\""
-
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: ¼­½ñ·¿¤Ë¥«¥ó¥Þ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
-
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: ¼­½ñ·¿¤ÎºÇ¸å¤Ë '}' ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
-
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: ɽ¼¨¤¹¤ë¤Ë¤ÏÊÑ¿ô¤ÎÆþ¤ì»Ò¤¬¿¼²á¤®¤Þ¤¹"
 
-#, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E740: ´Ø¿ô¤Î°ú¿ô¤¬Â¿²á¤®¤Þ¤¹: %s"
+msgid "E805: Using a Float as a Number"
+msgstr "E805: ÉâÆ°¾®¿ôÅÀ¿ô¤ò¿ôÃͤȤ·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
+
+msgid "E703: Using a Funcref as a Number"
+msgstr "E703: ´Ø¿ô»²¾È·¿¤ò¿ôÃͤȤ·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹¡£"
+
+msgid "E745: Using a List as a Number"
+msgstr "E745: ¥ê¥¹¥È·¿¤ò¿ôÃͤȤ·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
+
+msgid "E728: Using a Dictionary as a Number"
+msgstr "E728: ¼­½ñ·¿¤ò¿ôÃͤȤ·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
+
+msgid "E910: Using a Job as a Number"
+msgstr "E910: ¥¸¥ç¥Ö¤ò¿ôÃͤȤ·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
+
+msgid "E913: Using a Channel as a Number"
+msgstr "E913: ¥Á¥ã¥ó¥Í¥ë¤ò¿ôÃͤȤ·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹¡£"
+
+msgid "E891: Using a Funcref as a Float"
+msgstr "E891: ´Ø¿ô»²¾È·¿¤òÉâÆ°¾®¿ôÅÀ¿ô¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹¡£"
+
+msgid "E892: Using a String as a Float"
+msgstr "E892: ʸ»úÎó¤òÉâÆ°¾®¿ôÅÀ¿ô¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
+
+msgid "E893: Using a List as a Float"
+msgstr "E893: ¥ê¥¹¥È·¿¤òÉâÆ°¾®¿ôÅÀ¿ô¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
+
+msgid "E894: Using a Dictionary as a Float"
+msgstr "E894: ¼­½ñ·¿¤òÉâÆ°¾®¿ôÅÀ¿ô¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
+
+msgid "E907: Using a special value as a Float"
+msgstr "E907: ÆüìÃͤòÉâÆ°¾®¿ôÅÀ¿ô¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
+
+msgid "E911: Using a Job as a Float"
+msgstr "E911: ¥¸¥ç¥Ö¤òÉâÆ°¾®¿ôÅÀ¿ô¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
+
+msgid "E914: Using a Channel as a Float"
+msgstr "E914: ¥Á¥ã¥ó¥Í¥ë¤òÉâÆ°¾®¿ôÅÀ¿ô¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹¡£"
+
+msgid "E729: using Funcref as a String"
+msgstr "E729: ´Ø¿ô»²¾È·¿¤òʸ»úÎó¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
+
+msgid "E730: using List as a String"
+msgstr "E730: ¥ê¥¹¥È·¿¤òʸ»úÎó¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
+
+msgid "E731: using Dictionary as a String"
+msgstr "E731: ¼­½ñ·¿¤òʸ»úÎó¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
+
+msgid "E908: using an invalid value as a String"
+msgstr "E908: ̵¸ú¤ÊÃͤòʸ»úÎó¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
 
 #, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: ´Ø¿ô¤Î̵¸ú¤Ê°ú¿ô¤Ç¤¹: %s"
+msgid "E795: Cannot delete variable %s"
+msgstr "E795: ÊÑ¿ô %s ¤òºï½ü¤Ç¤­¤Þ¤»¤ó"
 
 #, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: ̤ÃΤδؿô¤Ç¤¹: %s"
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: ´Ø¿ô»²¾È·¿ÊÑ¿ô̾¤ÏÂçʸ»ú¤Ç»Ï¤Þ¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó: %s"
 
 #, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: ´Ø¿ô¤Î°ú¿ô¤¬Â­¤ê¤Þ¤»¤ó: %s"
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: ÊÑ¿ô̾¤¬´û¸¤Î´Ø¿ô̾¤È¾×Æͤ·¤Þ¤¹: %s"
 
 #, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: ¥¹¥¯¥ê¥×¥È°Ê³°¤Ç<SID>¤¬»È¤ï¤ì¤Þ¤·¤¿: %s"
+msgid "E741: Value is locked: %s"
+msgstr "E741: Ãͤ¬¥í¥Ã¥¯¤µ¤ì¤Æ¤¤¤Þ¤¹: %s"
+
+msgid "Unknown"
+msgstr "ÉÔÌÀ"
 
 #, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr "E725: ¼­½ñÍÑ´Ø¿ô¤¬¸Æ¤Ð¤ì¤Þ¤·¤¿¤¬¼­½ñ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
+msgid "E742: Cannot change value of %s"
+msgstr "E742: %s ¤ÎÃͤòÊѹ¹¤Ç¤­¤Þ¤»¤ó"
+
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: ¥³¥Ô¡¼¤ò¼è¤ë¤Ë¤ÏÊÑ¿ô¤ÎÆþ¤ì»Ò¤¬¿¼²á¤®¤Þ¤¹"
+
+msgid ""
+"\n"
+"# global variables:\n"
+msgstr ""
+"\n"
+"# ¥°¥í¡¼¥Ð¥ëÊÑ¿ô:\n"
+
+msgid ""
+"\n"
+"\tLast set from "
+msgstr ""
+"\n"
+"\tºÇ¸å¤Ë¥»¥Ã¥È¤·¤¿¥¹¥¯¥ê¥×¥È: "
+
+msgid "map() argument"
+msgstr "map() ¤Î°ú¿ô"
+
+msgid "filter() argument"
+msgstr "filter() ¤Î°ú¿ô"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s ¤Î°ú¿ô¤Ï¥ê¥¹¥È·¿¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
+
+msgid "E928: String required"
+msgstr "E928: ʸ»úÎó¤¬É¬ÍפǤ¹"
 
 msgid "E808: Number or Float required"
 msgstr "E808: ¿ôÃͤ«ÉâÆ°¾®¿ôÅÀ¿ô¤¬É¬ÍפǤ¹"
@@ -603,9 +680,6 @@
 msgid "add() argument"
 msgstr "add() ¤Î°ú¿ô"
 
-msgid "E699: Too many arguments"
-msgstr "E699: °ú¿ô¤¬Â¿²á¤®¤Þ¤¹"
-
 msgid "E785: complete() can only be used in Insert mode"
 msgstr "E785: complete() ¤ÏÁÞÆþ¥â¡¼¥É¤Ç¤·¤«ÍøÍѤǤ­¤Þ¤»¤ó"
 
@@ -617,33 +691,22 @@
 msgid "&Ok"
 msgstr "&Ok"
 
-msgid "E999: Invalid callback argument"
-msgstr "E999: ̵¸ú¤Ê¥³¡¼¥ë¥Ð¥Ã¥¯°ú¿ô¤Ç¤¹"
-
-msgid "E999: not an open channel"
-msgstr "E999: ³«¤¤¤Æ¤¤¤Ê¤¤¥Á¥ã¥ó¥Í¥ë¤Ç¤¹"
-
-msgid "extend() argument"
-msgstr "extend() ¤Î°ú¿ô"
-
 #, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: ¥­¡¼¤Ï´û¤Ë¸ºß¤·¤Þ¤¹: %s"
-
-msgid "map() argument"
-msgstr "map() ¤Î°ú¿ô"
-
-msgid "filter() argument"
-msgstr "filter() ¤Î°ú¿ô"
-
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld ¹Ô: "
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld ¹Ô: "
+msgstr[1] "+-%s%3ld ¹Ô: "
 
 #, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: ̤ÃΤδؿô¤Ç¤¹: %s"
 
+msgid "E922: expected a dict"
+msgstr "E922: ¼­½ñ¤¬´üÂÔ¤µ¤ì¤Æ¤¤¤Þ¤¹"
+
+msgid "E923: Second argument of function() must be a list or a dict"
+msgstr "E923: function() ¤ÎÂè 2 °ú¿ô¤Ï¥ê¥¹¥È·¿¤Þ¤¿¤Ï¼­½ñ·¿¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
+
 msgid ""
 "&OK\n"
 "&Cancel"
@@ -660,9 +723,16 @@
 msgid "E786: Range not allowed"
 msgstr "E786: ÈÏ°Ï»ØÄê¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
+msgid "E916: not a valid job"
+msgstr "E916: Í­¸ú¤Ê¥¸¥ç¥Ö¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
+
 msgid "E701: Invalid type for len()"
 msgstr "E701: len() ¤Ë¤Ï̵¸ú¤Ê·¿¤Ç¤¹"
 
+#, c-format
+msgid "E798: ID is reserved for \":match\": %ld"
+msgstr "E798: ID ¤Ï \":match\" ¤Î¤¿¤á¤ËͽÌ󤵤ì¤Æ¤¤¤Þ¤¹: %ld"
+
 msgid "E726: Stride is zero"
 msgstr "E726: ¥¹¥È¥é¥¤¥É(Á°¿ÊÎÌ)¤¬ 0 ¤Ç¤¹"
 
@@ -695,6 +765,10 @@
 msgid "E258: Unable to send to client"
 msgstr "E258: ¥¯¥é¥¤¥¢¥ó¥È¤ØÁ÷¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
+#, c-format
+msgid "E927: Invalid action: '%s'"
+msgstr "E927: ̵¸ú¤ÊÁàºî¤Ç¤¹: %s"
+
 msgid "sort() argument"
 msgstr "sort() ¤Î°ú¿ô"
 
@@ -710,163 +784,15 @@
 msgid "(Invalid)"
 msgstr "(̵¸ú)"
 
+#, c-format
+msgid "E935: invalid submatch number: %d"
+msgstr "E935: ̵¸ú¤Ê¥µ¥Ö¥Þ¥Ã¥ÁÈÖ¹æ: %d"
+
 msgid "E677: Error writing temp file"
 msgstr "E677: °ì»þ¥Õ¥¡¥¤¥ë½ñ¹þÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-msgid "E805: Using a Float as a Number"
-msgstr "E805: ÉâÆ°¾®¿ôÅÀ¿ô¤ò¿ôÃͤȤ·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
-
-msgid "E703: Using a Funcref as a Number"
-msgstr "E703: ´Ø¿ô»²¾È·¿¤ò¿ôÃͤȤ·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹¡£"
-
-msgid "E745: Using a List as a Number"
-msgstr "E745: ¥ê¥¹¥È·¿¤ò¿ôÃͤȤ·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
-
-msgid "E728: Using a Dictionary as a Number"
-msgstr "E728: ¼­½ñ·¿¤ò¿ôÃͤȤ·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
-
-msgid "E891: Using a Funcref as a Float"
-msgstr "E891: ´Ø¿ô»²¾È·¿¤òÉâÆ°¾®¿ôÅÀ¿ô¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹¡£"
-
-msgid "E892: Using a String as a Float"
-msgstr "E892: ʸ»úÎó¤òÉâÆ°¾®¿ôÅÀ¿ô¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
-
-msgid "E893: Using a List as a Float"
-msgstr "E893: ¥ê¥¹¥È·¿¤òÉâÆ°¾®¿ôÅÀ¿ô¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
-
-msgid "E894: Using a Dictionary as a Float"
-msgstr "E894: ¼­½ñ·¿¤òÉâÆ°¾®¿ôÅÀ¿ô¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
-
-msgid "E729: using Funcref as a String"
-msgstr "E729: ´Ø¿ô»²¾È·¿¤òʸ»úÎó¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
-
-msgid "E730: using List as a String"
-msgstr "E730: ¥ê¥¹¥È·¿¤òʸ»úÎó¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
-
-msgid "E731: using Dictionary as a String"
-msgstr "E731: ¼­½ñ·¿¤òʸ»úÎó¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
-
-#, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: ÊÑ¿ô¤Î·¿¤¬°ìÃפ·¤Þ¤»¤ó: %s"
-
-#, c-format
-msgid "E795: Cannot delete variable %s"
-msgstr "E795: ÊÑ¿ô %s ¤òºï½ü¤Ç¤­¤Þ¤»¤ó"
-
-#, c-format
-msgid "E704: Funcref variable name must start with a capital: %s"
-msgstr "E704: ´Ø¿ô»²¾È·¿ÊÑ¿ô̾¤ÏÂçʸ»ú¤Ç»Ï¤Þ¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó: %s"
-
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr "E705: ÊÑ¿ô̾¤¬´û¸¤Î´Ø¿ô̾¤È¾×Æͤ·¤Þ¤¹: %s"
-
-#, c-format
-msgid "E741: Value is locked: %s"
-msgstr "E741: Ãͤ¬¥í¥Ã¥¯¤µ¤ì¤Æ¤¤¤Þ¤¹: %s"
-
-msgid "Unknown"
-msgstr "ÉÔÌÀ"
-
-#, c-format
-msgid "E742: Cannot change value of %s"
-msgstr "E742: %s ¤ÎÃͤòÊѹ¹¤Ç¤­¤Þ¤»¤ó"
-
-msgid "E698: variable nested too deep for making a copy"
-msgstr "E698: ¥³¥Ô¡¼¤ò¼è¤ë¤Ë¤ÏÊÑ¿ô¤ÎÆþ¤ì»Ò¤¬¿¼²á¤®¤Þ¤¹"
-
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: ̤ÄêµÁ¤Î´Ø¿ô¤Ç¤¹: %s"
-
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: '(' ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
-
-msgid "E862: Cannot use g: here"
-msgstr "E862: ¤³¤³¤Ç¤Ï g: ¤Ï»È¤¨¤Þ¤»¤ó"
-
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: ÉÔÀµ¤Ê°ú¿ô¤Ç¤¹: %s"
-
-#, c-format
-msgid "E853: Duplicate argument name: %s"
-msgstr "E853: °ú¿ô̾¤¬½ÅÊ£¤·¤Æ¤¤¤Þ¤¹: %s"
-
-msgid "E126: Missing :endfunction"
-msgstr "E126: :endfunction ¤¬¤¢¤ê¤Þ¤»¤ó"
-
-#, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E707: ´Ø¿ô̾¤¬ÊÑ¿ô̾¤È¾×Æͤ·¤Þ¤¹: %s"
-
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: ´Ø¿ô %s ¤òºÆÄêµÁ¤Ç¤­¤Þ¤»¤ó: »ÈÍÑÃæ¤Ç¤¹"
-
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr "E746: ´Ø¿ô̾¤¬¥¹¥¯¥ê¥×¥È¤Î¥Õ¥¡¥¤¥ë̾¤È°ìÃפ·¤Þ¤»¤ó: %s"
-
-msgid "E129: Function name required"
-msgstr "E129: ´Ø¿ô̾¤¬Í׵ᤵ¤ì¤Þ¤¹"
-
-#, c-format
-msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr "E128: ´Ø¿ô̾¤ÏÂçʸ»ú¤« \"s:\" ¤Ç»Ï¤Þ¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó: %s"
-
-#, c-format
-msgid "E884: Function name cannot contain a colon: %s"
-msgstr "E884: ´Ø¿ô̾¤Ë¤Ï¥³¥í¥ó¤Ï´Þ¤á¤é¤ì¤Þ¤»¤ó: %s"
-
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: ´Ø¿ô %s ¤òºï½ü¤Ç¤­¤Þ¤»¤ó: »ÈÍÑÃæ¤Ç¤¹"
-
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: ´Ø¿ô¸Æ½Ð¤ÎÆþ¤ì»Ò¿ô¤¬ 'maxfuncdepth' ¤òĶ¤¨¤Þ¤·¤¿"
-
-#, c-format
-msgid "calling %s"
-msgstr "%s ¤ò¼Â¹ÔÃæ¤Ç¤¹"
-
-#, c-format
-msgid "%s aborted"
-msgstr "%s ¤¬ÃæÃǤµ¤ì¤Þ¤·¤¿"
-
-#, c-format
-msgid "%s returning #%ld"
-msgstr "%s ¤¬ #%ld ¤òÊÖ¤·¤Þ¤·¤¿"
-
-#, c-format
-msgid "%s returning %s"
-msgstr "%s ¤¬ %s ¤òÊÖ¤·¤Þ¤·¤¿"
-
-#, c-format
-msgid "continuing in %s"
-msgstr "%s ¤Î¼Â¹Ô¤ò·Ñ³Ãæ¤Ç¤¹"
-
-msgid "E133: :return not inside a function"
-msgstr "E133: ´Ø¿ô³°¤Ë :return ¤¬¤¢¤ê¤Þ¤·¤¿"
-
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# ¥°¥í¡¼¥Ð¥ëÊÑ¿ô:\n"
-
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\tLast set from "
-
-msgid "No old files"
-msgstr "¸Å¤¤¥Õ¥¡¥¤¥ë¤Ï¤¢¤ê¤Þ¤»¤ó"
+msgid "E921: Invalid callback argument"
+msgstr "E921: ̵¸ú¤Ê¥³¡¼¥ë¥Ð¥Ã¥¯°ú¿ô¤Ç¤¹"
 
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
@@ -929,6 +855,10 @@
 msgstr "E137: viminfo¥Õ¥¡¥¤¥ë¤¬½ñ¹þ¤ß¤Ç¤­¤Þ¤»¤ó: %s"
 
 #, c-format
+msgid "E929: Too many viminfo temp files, like %s!"
+msgstr "E929: °ì»þviminfo¥Õ¥¡¥¤¥ë¤¬Â¿²á¤®¤Þ¤¹! Îã: %s"
+
+#, c-format
 msgid "E138: Can't write viminfo file %s!"
 msgstr "E138: viminfo¥Õ¥¡¥¤¥ë %s ¤òÊݸ¤Ç¤­¤Þ¤»¤ó!"
 
@@ -1098,8 +1028,8 @@
 msgstr "»ÄÇ°¤Ç¤¹¤¬¥Ø¥ë¥×¥Õ¥¡¥¤¥ë \"%s\" ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 #, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: ¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
+msgid "E151: No match: %s"
+msgstr "E151: ¥Þ¥Ã¥Á¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
 
 #, c-format
 msgid "E152: Cannot open %s for writing"
@@ -1119,6 +1049,10 @@
 msgstr "E154: ¥¿¥° \"%s\" ¤¬¥Õ¥¡¥¤¥ë %s/%s ¤Ë½ÅÊ£¤·¤Æ¤¤¤Þ¤¹"
 
 #, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: ¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
+
+#, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: ̤ÃΤÎsign¥³¥Þ¥ó¥É¤Ç¤¹: %s"
 
@@ -1143,6 +1077,9 @@
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: ̵¸ú¤Ê¥Ð¥Ã¥Õ¥¡Ì¾¤Ç¤¹: %s"
 
+msgid "E934: Cannot jump to a buffer that does not have a name"
+msgstr "E934: ̾Á°¤Î̵¤¤¥Ð¥Ã¥Õ¥¡¤Ø¤Ï¥¸¥ã¥ó¥×¤Ç¤­¤Þ¤»¤ó"
+
 #, c-format
 msgid "E157: Invalid sign ID: %ld"
 msgstr "E157: ̵¸ú¤Êsign¼±Ê̻ҤǤ¹: %ld"
@@ -1161,6 +1098,9 @@
 msgid "[Deleted]"
 msgstr "[ºï½üºÑ]"
 
+msgid "No old files"
+msgstr "¸Å¤¤¥Õ¥¡¥¤¥ë¤Ï¤¢¤ê¤Þ¤»¤ó"
+
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "¥Ç¥Ð¥Ã¥°¥â¡¼¥É¤ËÆþ¤ê¤Þ¤¹. ³¤±¤ë¤Ë¤Ï \"cont\" ¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤."
 
@@ -1233,8 +1173,8 @@
 msgstr "\"%s\" ¤ò¸¡º÷Ãæ"
 
 #, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "'runtimepath' ¤ÎÃæ¤Ë¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó: \"%s\""
+msgid "not found in '%s': \"%s\""
+msgstr "'%s' ¤ÎÃæ¤Ë¤Ï¤¢¤ê¤Þ¤»¤ó: \"%s\""
 
 msgid "Source Vim script"
 msgstr "Vim¥¹¥¯¥ê¥×¥È¤Î¼è¹þ¤ß"
@@ -1263,6 +1203,10 @@
 msgid "finished sourcing %s"
 msgstr "%s ¤Î¼è¹þ¤ò´°Î»"
 
+#, c-format
+msgid "continuing in %s"
+msgstr "%s ¤Î¼Â¹Ô¤ò·Ñ³Ãæ¤Ç¤¹"
+
 msgid "modeline"
 msgstr "¥â¡¼¥É¹Ô"
 
@@ -1466,6 +1410,9 @@
 msgid "E466: :winpos requires two number arguments"
 msgstr "E466: :winpos ¤Ë¤Ï2¤Ä¤Î¿ôÃͤΰú¿ô¤¬É¬ÍפǤ¹"
 
+msgid "E930: Cannot use :redir inside execute()"
+msgstr "E930: execute() ¤ÎÃæ¤Ç¤Ï :redir ¤Ï»È¤¨¤Þ¤»¤ó"
+
 msgid "Save Redirection"
 msgstr "¥ê¥À¥¤¥ì¥¯¥È¤òÊݸ¤·¤Þ¤¹"
 
@@ -1674,6 +1621,9 @@
 msgid "Input Line"
 msgstr "ÆþÎϹÔ"
 
+msgid "Debug Line"
+msgstr "¥Ç¥Ð¥Ã¥°¹Ô"
+
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar ¤¬¥³¥Þ¥ó¥ÉŤòĶ¤¨¤Þ¤·¤¿"
 
@@ -1919,11 +1869,6 @@
 msgid "%lld characters"
 msgstr "%lld ʸ»ú"
 
-#. Explicit typecast avoids warning on Mac OS X 10.6
-#, c-format
-msgid "%ld characters"
-msgstr "%ld ʸ»ú"
-
 msgid "[noeol]"
 msgstr "[noeol]"
 
@@ -2003,9 +1948,6 @@
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: \"%s\" ¤Ï¥ê¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-msgid "--Deleted--"
-msgstr "--ºï½üºÑ--"
-
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "autocommand: %s <¥Ð¥Ã¥Õ¥¡=%d> ¤¬¼«Æ°Åª¤Ëºï½ü¤µ¤ì¤Þ¤¹"
@@ -2015,6 +1957,12 @@
 msgid "E367: No such group: \"%s\""
 msgstr "E367: ¤½¤Î¥°¥ë¡¼¥×¤Ï¤¢¤ê¤Þ¤»¤ó: \"%s\""
 
+msgid "W19: Deleting augroup that is still in use"
+msgstr "W19: »ÈÍÑÃæ¤Î augroup ¤ò¾Ã¤½¤¦¤È¤·¤Æ¤¤¤Þ¤¹"
+
+msgid "--Deleted--"
+msgstr "--ºï½üºÑ--"
+
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: * ¤Î¸å¤ËÉÔÀµ¤Êʸ»ú¤¬¤¢¤ê¤Þ¤·¤¿: %s"
@@ -2076,8 +2024,10 @@
 msgstr "E351: ¸½ºß¤Î 'foldmethod' ¤Ç¤ÏÀÞ¾ö¤ß¤òºï½ü¤Ç¤­¤Þ¤»¤ó"
 
 #, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld ¹Ô¤¬ÀÞ¾ö¤Þ¤ì¤Þ¤·¤¿ "
+msgid "+--%3ld line folded "
+msgid_plural "+--%3ld lines folded "
+msgstr[0] "+--%3ld ¹Ô¤¬ÀÞ¾ö¤Þ¤ì¤Þ¤·¤¿ "
+msgstr[1] "+--%3ld ¹Ô¤¬ÀÞ¾ö¤Þ¤ì¤Þ¤·¤¿ "
 
 msgid "E222: Add to read buffer"
 msgstr "E222: Æɹþ¥Ð¥Ã¥Õ¥¡¤ØÄɲÃ"
@@ -2170,6 +2120,18 @@
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: ¥á¥Ã¥»¡¼¥¸¤È¥³¡¼¥ë¥Ð¥Ã¥¯¤Î¤¢¤ë BalloonEval ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó"
 
+msgid "_Cancel"
+msgstr "¥­¥ã¥ó¥»¥ë(_C)"
+
+msgid "_Save"
+msgstr "Êݸ(_S)"
+
+msgid "_Open"
+msgstr "³«¤¯(_O)"
+
+msgid "_OK"
+msgstr "_OK"
+
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -2179,6 +2141,12 @@
 "¤¤¤¤¤¨(&N)\n"
 "¥­¥ã¥ó¥»¥ë(&C)"
 
+msgid "Yes"
+msgstr "¤Ï¤¤"
+
+msgid "No"
+msgstr "¤¤¤¤¤¨"
+
 msgid "Input _Methods"
 msgstr "¥¤¥ó¥×¥Ã¥È¥á¥½¥Ã¥É"
 
@@ -2212,18 +2180,18 @@
 msgid "Down"
 msgstr "²¼"
 
-#. 'Find Next' button
 msgid "Find Next"
 msgstr "¼¡¤ò¸¡º÷"
 
-#. 'Replace' button
 msgid "Replace"
 msgstr "ÃÖ´¹"
 
-#. 'Replace All' button
 msgid "Replace All"
 msgstr "Á´¤ÆÃÖ´¹"
 
+msgid "_Close"
+msgstr "ÊĤ¸¤ë(_C)"
+
 msgid "Vim: Received \"die\" request from session manager\n"
 msgstr "Vim: ¥»¥Ã¥·¥ç¥ó¥Þ¥Í¡¼¥¸¥ã¤«¤é \"die\" Í×µá¤ò¼õ¤±¼è¤ê¤Þ¤·¤¿\n"
 
@@ -2275,17 +2243,6 @@
 msgid "&Undo"
 msgstr "¥¢¥ó¥É¥¥(&U)"
 
-#, c-format
-msgid "E671: Cannot find window title \"%s\""
-msgstr "E671: ¥¿¥¤¥È¥ë¤¬ \"%s\" ¤Î¥¦¥£¥ó¥É¥¦¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó"
-
-#, c-format
-msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-msgstr "E243: °ú¿ô¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Þ¤»¤ó: \"-%s\"; OLEÈǤò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤."
-
-msgid "E672: Unable to open window inside MDI application"
-msgstr "E672: MDI¥¢¥×¥ê¤ÎÃæ¤Ç¤Ï¥¦¥£¥ó¥É¥¦¤ò³«¤±¤Þ¤»¤ó"
-
 msgid "Open tab..."
 msgstr "¥¿¥Ö¥Ú¡¼¥¸¤ò³«¤¯"
 
@@ -2303,6 +2260,17 @@
 msgid "Directory\t*.nothing\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê\t*.nothing\n"
 
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: ¥¿¥¤¥È¥ë¤¬ \"%s\" ¤Î¥¦¥£¥ó¥É¥¦¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó"
+
+#, c-format
+msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
+msgstr "E243: °ú¿ô¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Þ¤»¤ó: \"-%s\"; OLEÈǤò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤."
+
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: MDI¥¢¥×¥ê¤ÎÃæ¤Ç¤Ï¥¦¥£¥ó¥É¥¦¤ò³«¤±¤Þ¤»¤ó"
+
 msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
 msgstr "Vim E458: ¿§»ØÄ꤬Àµ¤·¤¯¤Ê¤¤¤Î¤Ç¥¨¥ó¥È¥ê¤ò³ä¤êÅö¤Æ¤é¤ì¤Þ¤»¤ó"
 
@@ -2564,6 +2532,7 @@
 
 msgid ""
 "\n"
+"       a: Find assignments to this symbol\n"
 "       c: Find functions calling this function\n"
 "       d: Find functions called by this function\n"
 "       e: Find this egrep pattern\n"
@@ -2574,6 +2543,7 @@
 "       t: Find this text string\n"
 msgstr ""
 "\n"
+"       a: ¤³¤Î¥·¥ó¥Ü¥ë¤ËÂФ¹¤ëÂåÆþ¤òõ¤¹\n"
 "       c: ¤³¤Î´Ø¿ô¤ò¸Æ¤ó¤Ç¤¤¤ë´Ø¿ô¤òõ¤¹\n"
 "       d: ¤³¤Î´Ø¿ô¤«¤é¸Æ¤ó¤Ç¤¤¤ë´Ø¿ô¤òõ¤¹\n"
 "       e: ¤³¤Îegrep¥Ñ¥¿¡¼¥ó¤òõ¤¹\n"
@@ -2701,19 +2671,6 @@
 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 ¤ò»È¤¨¤Þ¤»¤ó"
 
@@ -2769,95 +2726,6 @@
 msgid "E273: unknown longjmp status %d"
 msgstr "E273: ̤ÃΤÎlongjmp¾õÂÖ: %d"
 
-msgid "Toggle implementation/definition"
-msgstr "¼ÂÁõ¤ÈÄêµÁ¤òÀÚ¤êÂؤ¨¤ë"
-
-msgid "Show base class of"
-msgstr "¼¡¤Î¥¯¥é¥¹¤Î´ðÄì¤òɽ¼¨"
-
-msgid "Show overridden member function"
-msgstr "¥ª¡¼¥Ð¡¼¥é¥¤¥É¤µ¤ì¤¿¥á¥ó¥Ð´Ø¿ô¤òɽ¼¨"
-
-msgid "Retrieve from file"
-msgstr "¥Õ¥¡¥¤¥ë¤«¤é²óÉü¤¹¤ë"
-
-msgid "Retrieve from project"
-msgstr "¥×¥í¥¸¥§¥¯¥È¤«¤é²óÉü¤¹¤ë"
-
-msgid "Retrieve from all projects"
-msgstr "Á´¤Æ¤Î¥×¥í¥¸¥§¥¯¥È¤«¤é²óÉü¤¹¤ë"
-
-msgid "Retrieve"
-msgstr "²óÉü"
-
-msgid "Show source of"
-msgstr "¼¡¤Î¥½¡¼¥¹¤òɽ¼¨¤¹¤ë"
-
-msgid "Find symbol"
-msgstr "¸«¤Ä¤±¤¿¥·¥ó¥Ü¥ë"
-
-msgid "Browse class"
-msgstr "¥¯¥é¥¹¤ò»²¾È"
-
-msgid "Show class in hierarchy"
-msgstr "³¬Áؤǥ¯¥é¥¹¤òɽ¼¨"
-
-msgid "Show class in restricted hierarchy"
-msgstr "¸ÂÄꤵ¤ì¤¿³¬Áؤǥ¯¥é¥¹¤òɽ¼¨"
-
-msgid "Xref refers to"
-msgstr "Xref ¤Î»²¾ÈÀè"
-
-msgid "Xref referred by"
-msgstr "Xref ¤¬»²¾È¤µ¤ì¤ë"
-
-msgid "Xref has a"
-msgstr "Xref ¤¬¼¡¤Î¤â¤Î¤ò¤â¤Ã¤Æ¤¤¤Þ¤¹"
-
-msgid "Xref used by"
-msgstr "Xref ¤¬»ÈÍѤµ¤ì¤ë"
-
-msgid "Show docu of"
-msgstr "¼¡¤Îʸ¾Ï¤òɽ¼¨"
-
-msgid "Generate docu for"
-msgstr "¼¡¤Îʸ¾Ï¤òÀ¸À®"
-
-msgid ""
-"Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-"$PATH).\n"
-msgstr ""
-"SNiFF+¤ËÀܳ¤Ç¤­¤Þ¤»¤ó. ´Ä¶­¤ò¥Á¥§¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤(sniffemacs ¤¬ $PATH ¤Ë¤Ê¤±"
-"¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó).\n"
-
-msgid "E274: Sniff: Error during read. Disconnected"
-msgstr "E274: Sniff: ÆɹþÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿. ÀÚÃǤ·¤Þ¤·¤¿"
-
-msgid "SNiFF+ is currently "
-msgstr "¸½ºßSNiFF+ ¤Î¾õÂ֤ϡÖ"
-
-msgid "not "
-msgstr "̤"
-
-msgid "connected"
-msgstr "Àܳ¡×¤Ç¤¹"
-
-#, c-format
-msgid "E275: Unknown SNiFF+ request: %s"
-msgstr "E275: ̤ÃΤΠSNiFF+ ¥ê¥¯¥¨¥¹¥È¤Ç¤¹: %s"
-
-msgid "E276: Error connecting to SNiFF+"
-msgstr "E276: SNiFF+ ¤Ø¤ÎÀܳÃæ¤Î¥¨¥é¡¼¤Ç¤¹"
-
-msgid "E278: SNiFF+ not connected"
-msgstr "E278: SNiFF+ ¤ËÀܳ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-msgid "E279: Not a SNiFF+ buffer"
-msgstr "E279: SNiFF+ ¥Ð¥Ã¥Õ¥¡¤¬¤¢¤ê¤Þ¤»¤ó"
-
-msgid "Sniff: Error during write. Disconnected"
-msgstr "Sniff: ½ñ¹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤¿¤Î¤ÇÀÚÃǤ·¤Þ¤·¤¿"
-
 msgid "invalid buffer number"
 msgstr "̵¸ú¤Ê¥Ð¥Ã¥Õ¥¡ÈÖ¹æ¤Ç¤¹"
 
@@ -2944,6 +2812,14 @@
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: VIM ¼ÂÂΤÎÅÐÏ¿¥×¥í¥Ñ¥Æ¥£¤¬ÉÔÀµ¤Ç¤¹. ¾Ãµî¤·¤Þ¤·¤¿!"
 
+#, c-format
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: ¥ê¥¹¥È·¿¤Ë¥«¥ó¥Þ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
+
+#, c-format
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: ¥ê¥¹¥È·¿¤ÎºÇ¸å¤Ë ']' ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
+
 msgid "Unknown option argument"
 msgstr "̤ÃΤΥª¥×¥·¥ç¥ó°ú¿ô¤Ç¤¹"
 
@@ -2969,12 +2845,12 @@
 msgid "netbeans is not supported with this GUI\n"
 msgstr "netbeans ¤Ï¤³¤ÎGUI¤Ç¤ÏÍøÍѤǤ­¤Þ¤»¤ó\n"
 
-msgid "This Vim was not compiled with the diff feature."
-msgstr "¤³¤ÎVim¤Ë¤Ïdiffµ¡Ç½¤¬¤¢¤ê¤Þ¤»¤ó(¥³¥ó¥Ñ¥¤¥ë»þÀßÄê)."
-
 msgid "'-nb' cannot be used: not enabled at compile time\n"
 msgstr "'-nb' »ÈÍÑÉÔ²Äǽ¤Ç¤¹: ¥³¥ó¥Ñ¥¤¥ë»þ¤Ë̵¸ú¤Ë¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
+msgid "This Vim was not compiled with the diff feature."
+msgstr "¤³¤ÎVim¤Ë¤Ïdiffµ¡Ç½¤¬¤¢¤ê¤Þ¤»¤ó(¥³¥ó¥Ñ¥¤¥ë»þÀßÄê)."
+
 msgid "Attempt to open script file again: \""
 msgstr "¥¹¥¯¥ê¥×¥È¥Õ¥¡¥¤¥ë¤òºÆ¤Ó³«¤¤¤Æ¤ß¤Þ¤¹: \""
 
@@ -2987,6 +2863,9 @@
 msgid "Vim: Error: Failure to start gvim from NetBeans\n"
 msgstr "Vim: ¥¨¥é¡¼: NetBeans¤«¤égvim¤ò¥¹¥¿¡¼¥È¤Ç¤­¤Þ¤»¤ó\n"
 
+msgid "Vim: Error: This version of Vim does not run in a Cygwin terminal\n"
+msgstr "Vim: ¥¨¥é¡¼: ¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤ÎVim¤ÏCygwinüËö¤Ç¤ÏÆ°ºî¤·¤Þ¤»¤ó\n"
+
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim: ·Ù¹ð: üËö¤Ø¤Î½ÐÎϤǤϤ¢¤ê¤Þ¤»¤ó\n"
 
@@ -3151,6 +3030,9 @@
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminal>\tüËö¤ò <terminal> ¤ËÀßÄꤹ¤ë"
 
+msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
+msgstr "--not-a-term\t\tÆþ½ÐÎϤ¬Ã¼Ëö¤Ç¤Ê¤¤¤È¤Î·Ù¹ð¤ò¥¹¥­¥Ã¥×¤¹¤ë"
+
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\t.vimrc¤ÎÂå¤ï¤ê¤Ë <vimrc> ¤ò»È¤¦"
 
@@ -3821,15 +3703,13 @@
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
 "    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
+"    file when making changes.  Quit, or continue with caution.\n"
 msgstr ""
 "\n"
 "(1) ÊÌ¤Î¥×¥í¥°¥é¥à¤¬Æ±¤¸¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤·¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó.\n"
 "    ¤³¤Î¾ì¹ç¤Ë¤Ï, Êѹ¹¤ò¤·¤Æ¤·¤Þ¤¦¤È1¤Ä¤Î¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ°Û¤Ê¤ë2¤Ä¤Î\n"
-"    ¥¤¥ó¥¹¥¿¥ó¥¹¤¬¤Ç¤­¤Æ¤·¤Þ¤¦¤Î¤Ç, ¤½¤¦¤·¤Ê¤¤¤è¤¦¤Ëµ¤¤ò¤Ä¤±¤Æ¤¯¤À¤µ¤¤."
-
-msgid "  Quit, or continue with caution.\n"
-msgstr "    ½ªÎ»¤¹¤ë¤«, Ãí°Õ¤·¤Ê¤¬¤é³¤±¤Æ¤¯¤À¤µ¤¤.\n"
+"    ¥¤¥ó¥¹¥¿¥ó¥¹¤¬¤Ç¤­¤Æ¤·¤Þ¤¦¤Î¤Ç, ¤½¤¦¤·¤Ê¤¤¤è¤¦¤Ëµ¤¤ò¤Ä¤±¤Æ¤¯¤À¤µ¤¤.\n"
+"    ½ªÎ»¤¹¤ë¤«, Ãí°Õ¤·¤Ê¤¬¤é³¤±¤Æ¤¯¤À¤µ¤¤.\n"
 
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) ¤³¤Î¥Õ¥¡¥¤¥ë¤ÎÊÔ½¸¥»¥Ã¥·¥ç¥ó¤¬¥¯¥é¥Ã¥·¥å¤·¤¿.\n"
@@ -4275,25 +4155,27 @@
 msgstr "%ld Îó; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "ÁªÂò %s%ld / %ld ¹Ô; %ld / %ld ñ¸ì; %ld / %ld ¥Ð¥¤¥È"
+msgid "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes"
+msgstr "ÁªÂò %s%ld / %ld ¹Ô; %lld / %lld ñ¸ì; %lld / %lld ¥Ð¥¤¥È"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
-"Bytes"
-msgstr "ÁªÂò %s%ld / %ld ¹Ô; %ld / %ld ñ¸ì; %ld / %ld ʸ»ú; %ld / %ld ¥Ð¥¤¥È"
-
-#, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Îó %s / %s; ¹Ô %ld of %ld; ñ¸ì %ld / %ld; ¥Ð¥¤¥È %ld / %ld"
-
-#, c-format
-msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
+"%lld Bytes"
 msgstr ""
-"Îó %s / %s; ¹Ô %ld / %ld; ñ¸ì %ld / %ld; ʸ»ú %ld / %ld; ¥Ð¥¤¥È %ld of %ld"
+"ÁªÂò %s%ld / %ld ¹Ô; %lld / %lld ñ¸ì; %lld / %lld ʸ»ú; %lld / %lld ¥Ð¥¤¥È"
+
+#, c-format
+msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
+msgstr "Îó %s / %s; ¹Ô %ld of %ld; ñ¸ì %lld / %lld; ¥Ð¥¤¥È %lld / %lld"
+
+#, c-format
+msgid ""
+"Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
+"%lld of %lld"
+msgstr ""
+"Îó %s / %s; ¹Ô %ld / %ld; ñ¸ì %lld / %lld; ʸ»ú %lld / %lld; ¥Ð¥¤¥È %lld of "
+"%lld"
 
 #, c-format
 msgid "(+%ld for BOM)"
@@ -4526,7 +4408,7 @@
 msgstr "¥á¥Ã¥»¡¼¥¸"
 
 msgid "'columns' is not 80, cannot execute external commands"
-msgstr "'columns' ¤¬80¤Ç¤Ï¤Ê¤¤¤¿¤á, ³°Éô¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó"
+msgstr "'columns' ¤¬ 80 ¤Ç¤Ï¤Ê¤¤¤¿¤á¡¢³°Éô¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó"
 
 msgid "E237: Printer selection failed"
 msgstr "E237: ¥×¥ê¥ó¥¿¤ÎÁªÂò¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
@@ -4552,6 +4434,10 @@
 msgstr "E244: ʸ»ú¥»¥Ã¥È̾ \"%s\" ¤ÏÉÔÀµ¤Ç¤¹ (¥Õ¥©¥ó¥È̾ \"%s\")"
 
 #, c-format
+msgid "E244: Illegal quality name \"%s\" in font name \"%s\""
+msgstr "E244: ÉʼÁ̾ \"%s\" ¤ÏÉÔÀµ¤Ç¤¹ (¥Õ¥©¥ó¥È̾ \"%s\")"
+
+#, c-format
 msgid "E245: Illegal char '%c' in font name \"%s\""
 msgstr "E245: '%c' ¤ÏÉÔÀµ¤Êʸ»ú¤Ç¤¹ (¥Õ¥©¥ó¥È̾ \"%s\")"
 
@@ -4596,13 +4482,6 @@
 
 msgid ""
 "\n"
-"Cannot execute shell "
-msgstr ""
-"\n"
-"¥·¥§¥ë¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó "
-
-msgid ""
-"\n"
 "Cannot execute shell sh\n"
 msgstr ""
 "\n"
@@ -4631,6 +4510,13 @@
 
 msgid ""
 "\n"
+"Cannot execute shell "
+msgstr ""
+"\n"
+"¥·¥§¥ë¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó "
+
+msgid ""
+"\n"
 "Command terminated\n"
 msgstr ""
 "\n"
@@ -4672,10 +4558,6 @@
 msgstr "DLL¤«¤é´Ø¿ô¥Ý¥¤¥ó¥¿¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
 #, c-format
-msgid "shell returned %d"
-msgstr "¥·¥§¥ë¤¬¥³¡¼¥É %d ¤Ç½ªÎ»¤·¤Þ¤·¤¿"
-
-#, c-format
 msgid "Vim: Caught %s event\n"
 msgstr "Vim: ¥¤¥Ù¥ó¥È %s ¤ò¸¡ÃÎ\n"
 
@@ -4704,6 +4586,10 @@
 msgstr "Vim¤Î·Ù¹ð"
 
 #, c-format
+msgid "shell returned %d"
+msgstr "¥·¥§¥ë¤¬¥³¡¼¥É %d ¤Ç½ªÎ»¤·¤Þ¤·¤¿"
+
+#, c-format
 msgid "E372: Too many %%%c in format string"
 msgstr "E372: ¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Ë %%%c ¤¬Â¿²á¤®¤Þ¤¹"
 
@@ -4726,6 +4612,7 @@
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: ¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Ë̵¸ú¤Ê %%%c ¤¬¤¢¤ê¤Þ¤¹"
 
+#. nothing found
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat' ¤Ë¥Ñ¥¿¡¼¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
@@ -4735,6 +4622,15 @@
 msgid "E553: No more items"
 msgstr "E553: Í×ÁǤ¬¤â¤¦¤¢¤ê¤Þ¤»¤ó"
 
+msgid "E924: Current window was closed"
+msgstr "E924: ¸½ºß¤Î¥¦¥£¥ó¥É¥¦¤¬ÊĤ¸¤é¤ì¤Þ¤·¤¿"
+
+msgid "E925: Current quickfix was changed"
+msgstr "E925: ¸½ºß¤Î quickfix ¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿"
+
+msgid "E926: Current location list was changed"
+msgstr "E926: ¸½ºß¤Î¥í¥±¡¼¥·¥ç¥ó¥ê¥¹¥È¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿"
+
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d of %d)%s%s: "
@@ -4742,15 +4638,18 @@
 msgid " (line deleted)"
 msgstr " (¹Ô¤¬ºï½ü¤µ¤ì¤Þ¤·¤¿)"
 
+#, c-format
+msgid "%serror list %d of %d; %d errors "
+msgstr "%s ¥¨¥é¡¼°ìÍ÷ %d of %d; %d ¸Ä¥¨¥é¡¼"
+
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: quickfix ¥¹¥¿¥Ã¥¯¤ÎËöÈø¤Ç¤¹"
 
 msgid "E381: At top of quickfix stack"
 msgstr "E381: quickfix ¥¹¥¿¥Ã¥¯¤ÎÀèƬ¤Ç¤¹"
 
-#, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "¥¨¥é¡¼°ìÍ÷ %d of %d; %d ¸Ä¥¨¥é¡¼"
+msgid "No entries"
+msgstr "¥¨¥ó¥È¥ê¤¬¤¢¤ê¤Þ¤»¤ó"
 
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: 'buftype' ¥ª¥×¥·¥ç¥ó¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¤Î¤Ç½ñ¹þ¤ß¤Þ¤»¤ó"
@@ -4986,9 +4885,6 @@
 msgid " Arabic"
 msgstr " ¥¢¥é¥Ó¥¢"
 
-msgid " (lang)"
-msgstr " (¸À¸ì)"
-
 msgid " (paste)"
 msgstr " (Ž¤êÉÕ¤±)"
 
@@ -5083,8 +4979,49 @@
 "# ºÇ¸å¤Î %s¸¡º÷¥Ñ¥¿¡¼¥ó:\n"
 "~"
 
-msgid "E759: Format error in spell file"
-msgstr "E759: ¥¹¥Ú¥ë¥Õ¥¡¥¤¥ë¤Î½ñ¼°¥¨¥é¡¼¤Ç¤¹"
+msgid "E756: Spell checking is not enabled"
+msgstr "E756: ¥¹¥Ú¥ë¥Á¥§¥Ã¥¯¤Ï̵¸ú²½¤µ¤ì¤Æ¤¤¤Þ¤¹"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
+msgstr ""
+"·Ù¹ð: ñ¸ì¥ê¥¹¥È \"%s_%s.spl\" ¤ª¤è¤Ó \"%s_ascii.spl\" ¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+msgstr ""
+"·Ù¹ð: ñ¸ì¥ê¥¹¥È \"%s.%s.spl\" ¤ª¤è¤Ó \"%s.ascii.spl\" ¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó"
+
+msgid "E797: SpellFileMissing autocommand deleted buffer"
+msgstr "E797: autocommand ¤Î SpellFileMissing ¤¬¥Ð¥Ã¥Õ¥¡¤òºï½ü¤·¤Þ¤·¤¿"
+
+#, c-format
+msgid "Warning: region %s not supported"
+msgstr "·Ù¹ð9: %s ¤È¤¤¤¦ÈϰϤϥµ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+msgid "Sorry, no suggestions"
+msgstr "»ÄÇ°¤Ç¤¹¤¬, ½¤Àµ¸õÊä¤Ï¤¢¤ê¤Þ¤»¤ó"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "»ÄÇ°¤Ç¤¹¤¬, ½¤Àµ¸õÊä¤Ï %ld ¸Ä¤·¤«¤¢¤ê¤Þ¤»¤ó"
+
+#. for when 'cmdheight' > 1
+#. avoid more prompt
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "\"%.*s\" ¤ò¼¡¤ØÊÑ´¹:"
+
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
+msgid "E752: No previous spell replacement"
+msgstr "E752: ¥¹¥Ú¥ëÃÖ´¹¤¬¤Þ¤À¼Â¹Ô¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: ¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s"
 
 msgid "E758: Truncated spell file"
 msgstr "E758: ¥¹¥Ú¥ë¥Õ¥¡¥¤¥ë¤¬ÀÚ¼è¤é¤ì¤Æ¤¤¤ë¤è¤¦¤Ç¤¹"
@@ -5107,19 +5044,6 @@
 msgid "Compressing word tree..."
 msgstr "ñ¸ì¥Ä¥ê¡¼¤ò°µ½Ì¤·¤Æ¤¤¤Þ¤¹..."
 
-msgid "E756: Spell checking is not enabled"
-msgstr "E756: ¥¹¥Ú¥ë¥Á¥§¥Ã¥¯¤Ï̵¸ú²½¤µ¤ì¤Æ¤¤¤Þ¤¹"
-
-#, c-format
-msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
-msgstr ""
-"·Ù¹ð: ñ¸ì¥ê¥¹¥È \"%s_%s.spl\" ¤ª¤è¤Ó \"%s_ascii.spl\" ¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó"
-
-#, c-format
-msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-msgstr ""
-"·Ù¹ð: ñ¸ì¥ê¥¹¥È \"%s.%s.spl\" ¤ª¤è¤Ó \"%s.ascii.spl\" ¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó"
-
 #, c-format
 msgid "Reading spell file \"%s\""
 msgstr "¥¹¥Ú¥ë¥Õ¥¡¥¤¥ë \"%s\" ¤òÆɹþÃæ"
@@ -5137,8 +5061,24 @@
 msgstr "E770: ¥¹¥Ú¥ë¥Õ¥¡¥¤¥ë¤Ë¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¥»¥¯¥·¥ç¥ó¤¬¤¢¤ê¤Þ¤¹"
 
 #, c-format
-msgid "Warning: region %s not supported"
-msgstr "·Ù¹ð9: %s ¤È¤¤¤¦ÈϰϤϥµ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: .sug ¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹: %s"
+
+#, c-format
+msgid "E779: Old .sug file, needs to be updated: %s"
+msgstr "E779: ¸Å¤¤ .sug ¥Õ¥¡¥¤¥ë¤Ê¤Î¤Ç, ¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Æ¤¯¤À¤µ¤¤: %s"
+
+#, c-format
+msgid "E780: .sug file is for newer version of Vim: %s"
+msgstr "E780: ¤è¤ê¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î Vim ÍѤΠ.sug ¥Õ¥¡¥¤¥ë¤Ç¤¹: %s"
+
+#, c-format
+msgid "E781: .sug file doesn't match .spl file: %s"
+msgstr "E781: .sug ¥Õ¥¡¥¤¥ë¤¬ .spl ¥Õ¥¡¥¤¥ë¤È°ìÃפ·¤Þ¤»¤ó: %s"
+
+#, c-format
+msgid "E782: error while reading .sug file: %s"
+msgstr "E782: .sug ¥Õ¥¡¥¤¥ë¤ÎÆɹþÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿: %s"
 
 #, c-format
 msgid "Reading affix file %s ..."
@@ -5409,50 +5349,6 @@
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: ñ¸ì¤Îʸ»ú¤¬¥¹¥Ú¥ë¥Õ¥¡¥¤¥ë¤È°Û¤Ê¤ê¤Þ¤¹"
 
-msgid "Sorry, no suggestions"
-msgstr "»ÄÇ°¤Ç¤¹¤¬, ½¤Àµ¸õÊä¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "»ÄÇ°¤Ç¤¹¤¬, ½¤Àµ¸õÊä¤Ï %ld ¸Ä¤·¤«¤¢¤ê¤Þ¤»¤ó"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "\"%.*s\" ¤ò¼¡¤ØÊÑ´¹:"
-
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
-msgid "E752: No previous spell replacement"
-msgstr "E752: ¥¹¥Ú¥ëÃÖ´¹¤¬¤Þ¤À¼Â¹Ô¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: ¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s"
-
-#, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E778: .sug ¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹: %s"
-
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: ¸Å¤¤ .sug ¥Õ¥¡¥¤¥ë¤Ê¤Î¤Ç, ¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Æ¤¯¤À¤µ¤¤: %s"
-
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr "E780: ¤è¤ê¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î Vim ÍѤΠ.sug ¥Õ¥¡¥¤¥ë¤Ç¤¹: %s"
-
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr "E781: .sug ¥Õ¥¡¥¤¥ë¤¬ .spl ¥Õ¥¡¥¤¥ë¤È°ìÃפ·¤Þ¤»¤ó: %s"
-
-#, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E782: .sug ¥Õ¥¡¥¤¥ë¤ÎÆɹþÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿: %s"
-
 #. This should have been checked when generating the .spl
 #. * file.
 msgid "E783: duplicate char in MAP entry"
@@ -5789,6 +5685,9 @@
 "\n"
 "--- üËö¥­¡¼ ---"
 
+msgid "Cannot open $VIMRUNTIME/rgb.txt"
+msgstr "$VIMRUNTIME/rgb.txt¤ò³«¤±¤Þ¤»¤ó"
+
 msgid "new shell started\n"
 msgstr "¿·¤·¤¤¥·¥§¥ë¤òµ¯Æ°¤·¤Þ¤¹\n"
 
@@ -5936,6 +5835,130 @@
 msgid "E440: undo line missing"
 msgstr "E440: ¥¢¥ó¥É¥¥¹Ô¤¬¤¢¤ê¤Þ¤»¤ó"
 
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: ´Ø¿ô %s ¤ÏÄêµÁºÑ¤Ç¤¹, ºÆÄêµÁ¤¹¤ë¤Ë¤Ï ! ¤òÄɲ䷤Ƥ¯¤À¤µ¤¤"
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: ¼­½ñ·¿Æâ¤Ë¥¨¥ó¥È¥ê¤¬´û¤Ë¸ºß¤·¤Þ¤¹"
+
+msgid "E718: Funcref required"
+msgstr "E718: ´Ø¿ô»²¾È·¿¤¬Í׵ᤵ¤ì¤Þ¤¹"
+
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: ̤ÃΤδؿô¤Ç¤¹: %s"
+
+#, c-format
+msgid "E125: Illegal argument: %s"
+msgstr "E125: ÉÔÀµ¤Ê°ú¿ô¤Ç¤¹: %s"
+
+#, c-format
+msgid "E853: Duplicate argument name: %s"
+msgstr "E853: °ú¿ô̾¤¬½ÅÊ£¤·¤Æ¤¤¤Þ¤¹: %s"
+
+#, c-format
+msgid "E740: Too many arguments for function %s"
+msgstr "E740: ´Ø¿ô¤Î°ú¿ô¤¬Â¿²á¤®¤Þ¤¹: %s"
+
+#, c-format
+msgid "E116: Invalid arguments for function %s"
+msgstr "E116: ´Ø¿ô¤Î̵¸ú¤Ê°ú¿ô¤Ç¤¹: %s"
+
+msgid "E132: Function call depth is higher than 'maxfuncdepth'"
+msgstr "E132: ´Ø¿ô¸Æ½Ð¤ÎÆþ¤ì»Ò¿ô¤¬ 'maxfuncdepth' ¤òĶ¤¨¤Þ¤·¤¿"
+
+#, c-format
+msgid "calling %s"
+msgstr "%s ¤ò¼Â¹ÔÃæ¤Ç¤¹"
+
+#, c-format
+msgid "%s aborted"
+msgstr "%s ¤¬ÃæÃǤµ¤ì¤Þ¤·¤¿"
+
+#, c-format
+msgid "%s returning #%ld"
+msgstr "%s ¤¬ #%ld ¤òÊÖ¤·¤Þ¤·¤¿"
+
+#, c-format
+msgid "%s returning %s"
+msgstr "%s ¤¬ %s ¤òÊÖ¤·¤Þ¤·¤¿"
+
+msgid "E699: Too many arguments"
+msgstr "E699: °ú¿ô¤¬Â¿²á¤®¤Þ¤¹"
+
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: ̤ÃΤδؿô¤Ç¤¹: %s"
+
+#, c-format
+msgid "E933: Function was deleted: %s"
+msgstr "E933: ´Ø¿ô¤Ïºï½ü¤µ¤ì¤Þ¤·¤¿: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: ´Ø¿ô¤Î°ú¿ô¤¬Â­¤ê¤Þ¤»¤ó: %s"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: ¥¹¥¯¥ê¥×¥È°Ê³°¤Ç<SID>¤¬»È¤ï¤ì¤Þ¤·¤¿: %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: ¼­½ñÍÑ´Ø¿ô¤¬¸Æ¤Ð¤ì¤Þ¤·¤¿¤¬¼­½ñ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
+
+msgid "E129: Function name required"
+msgstr "E129: ´Ø¿ô̾¤¬Í׵ᤵ¤ì¤Þ¤¹"
+
+#, c-format
+msgid "E128: Function name must start with a capital or \"s:\": %s"
+msgstr "E128: ´Ø¿ô̾¤ÏÂçʸ»ú¤« \"s:\" ¤Ç»Ï¤Þ¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó: %s"
+
+#, c-format
+msgid "E884: Function name cannot contain a colon: %s"
+msgstr "E884: ´Ø¿ô̾¤Ë¤Ï¥³¥í¥ó¤Ï´Þ¤á¤é¤ì¤Þ¤»¤ó: %s"
+
+#, c-format
+msgid "E123: Undefined function: %s"
+msgstr "E123: ̤ÄêµÁ¤Î´Ø¿ô¤Ç¤¹: %s"
+
+#, c-format
+msgid "E124: Missing '(': %s"
+msgstr "E124: '(' ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
+
+msgid "E862: Cannot use g: here"
+msgstr "E862: ¤³¤³¤Ç¤Ï g: ¤Ï»È¤¨¤Þ¤»¤ó"
+
+#, c-format
+msgid "E932: Closure function should not be at top level: %s"
+msgstr "E932: ¥¯¥í¡¼¥¸¥ã¡¼´Ø¿ô¤Ï¥È¥Ã¥×¥ì¥Ù¥ë¤Ëµ­½Ò¤Ç¤­¤Þ¤»¤ó: %s"
+
+msgid "E126: Missing :endfunction"
+msgstr "E126: :endfunction ¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#, c-format
+msgid "E707: Function name conflicts with variable: %s"
+msgstr "E707: ´Ø¿ô̾¤¬ÊÑ¿ô̾¤È¾×Æͤ·¤Þ¤¹: %s"
+
+#, c-format
+msgid "E127: Cannot redefine function %s: It is in use"
+msgstr "E127: ´Ø¿ô %s ¤òºÆÄêµÁ¤Ç¤­¤Þ¤»¤ó: »ÈÍÑÃæ¤Ç¤¹"
+
+#, c-format
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: ´Ø¿ô̾¤¬¥¹¥¯¥ê¥×¥È¤Î¥Õ¥¡¥¤¥ë̾¤È°ìÃפ·¤Þ¤»¤ó: %s"
+
+#, c-format
+msgid "E131: Cannot delete function %s: It is in use"
+msgstr "E131: ´Ø¿ô %s ¤òºï½ü¤Ç¤­¤Þ¤»¤ó: »ÈÍÑÃæ¤Ç¤¹"
+
+msgid "E133: :return not inside a function"
+msgstr "E133: ´Ø¿ô³°¤Ë :return ¤¬¤¢¤ê¤Þ¤·¤¿"
+
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: ¥«¥Ã¥³ '(' ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
+
 #. Only MS VC 4.1 and earlier can do Win32s
 msgid ""
 "\n"
@@ -5958,9 +5981,6 @@
 "\n"
 "MS-Windows 32 ¥Ó¥Ã¥È GUI ÈÇ"
 
-msgid " in Win32s mode"
-msgstr " in Win32s ¥â¡¼¥É"
-
 msgid " with OLE support"
 msgstr " with OLE ¥µ¥Ý¡¼¥È"
 
@@ -5980,27 +6000,6 @@
 
 msgid ""
 "\n"
-"MS-Windows 16-bit version"
-msgstr ""
-"\n"
-"MS-Windows 16 ¥Ó¥Ã¥È ÈÇ"
-
-msgid ""
-"\n"
-"32-bit MS-DOS version"
-msgstr ""
-"\n"
-"32 ¥Ó¥Ã¥È MS-DOS ÈÇ"
-
-msgid ""
-"\n"
-"16-bit MS-DOS version"
-msgstr ""
-"\n"
-"16 ¥Ó¥Ã¥È MS-DOS ÈÇ"
-
-msgid ""
-"\n"
 "MacOS X (unix) version"
 msgstr ""
 "\n"
@@ -6092,6 +6091,9 @@
 msgid "without GUI."
 msgstr "without GUI."
 
+msgid "with GTK3 GUI."
+msgstr "with GTK3 GUI."
+
 msgid "with GTK2-GNOME GUI."
 msgstr "with GTK2-GNOME GUI."
 
@@ -6155,6 +6157,9 @@
 msgid "3rd user gvimrc file: \""
 msgstr "  Âè3¥æ¡¼¥¶¡¼ gvimrc: \""
 
+msgid "       defaults file: \""
+msgstr "  ¥Ç¥Õ¥©¥ë¥È¥Õ¥¡¥¤¥ë: \""
+
 msgid "    system menu file: \""
 msgstr "    ¥·¥¹¥Æ¥à¥á¥Ë¥å¡¼: \""
 
@@ -6246,10 +6251,10 @@
 msgstr "¾ÜºÙ¤Ï¥á¥Ë¥å¡¼¤Î ¥Ø¥ë¥×->¥¹¥Ý¥ó¥µ¡¼/ÅÐÏ¿ ¤ò»²¾È¤·¤Æ²¼¤µ¤¤"
 
 msgid "WARNING: Windows 95/98/ME detected"
-msgstr "   ·Ù¹ð: Windows 95/98/Me ¤ò¸¡½Ð  "
+msgstr "·Ù¹ð: Windows 95/98/ME ¤ò¸¡½Ð¤·¤Þ¤·¤¿"
 
 msgid "type  :help windows95<Enter>  for info on this"
-msgstr " ¾ÜºÙ¤Ê¾ðÊó¤Ï          :help windows95<Enter> "
+msgstr "¾ÜºÙ¤Ê¾ðÊó¤Ï            :help windows95<Enter>"
 
 msgid "Already only one window"
 msgstr "´û¤Ë¥¦¥£¥ó¥É¥¦¤Ï1¤Ä¤·¤«¤¢¤ê¤Þ¤»¤ó"
@@ -6282,9 +6287,38 @@
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: path¤Ë¤Ï \"%s\" ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
 
+#, c-format
+msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E799: ̵¸ú¤Ê ID: %ld (1 °Ê¾å¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó)"
+
+#, c-format
+msgid "E801: ID already taken: %ld"
+msgstr "E801: ID ¤Ï¤¹¤Ç¤ËÍøÍÑÃæ¤Ç¤¹: %ld"
+
 msgid "List or number required"
 msgstr "¥ê¥¹¥È¤«¿ôÃͤ¬É¬ÍפǤ¹"
 
+#, c-format
+msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E802: ̵¸ú¤Ê ID: %ld (1 °Ê¾å¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó)"
+
+#, c-format
+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)"
 
@@ -6561,6 +6595,28 @@
 msgid "E713: Cannot use empty key for Dictionary"
 msgstr "E713: ¼­½ñ·¿¤Ë¶õ¤Î¥­¡¼¤ò»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
 
+msgid "E715: Dictionary required"
+msgstr "E715: ¼­½ñ·¿¤¬É¬ÍפǤ¹"
+
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: ¥ê¥¹¥È¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¤¬Èϰϳ°¤Ç¤¹: %ld"
+
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: ´Ø¿ô¤Î°ú¿ô¤¬Â¿²á¤®¤Þ¤¹: %s"
+
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: ¼­½ñ·¿¤Ë¥­¡¼¤¬Â¸ºß¤·¤Þ¤»¤ó: %s"
+
+msgid "E714: List required"
+msgstr "E714: ¥ê¥¹¥È·¿¤¬É¬ÍפǤ¹"
+
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: %s ¤Î°ú¿ô¤Ï¥ê¥¹¥È·¿¤Þ¤¿¤Ï¼­½ñ·¿¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
+
 msgid "E47: Error while reading errorfile"
 msgstr "E47: ¥¨¥é¡¼¥Õ¥¡¥¤¥ë¤ÎÆɹþÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
@@ -6660,6 +6716,10 @@
 msgid "E850: Invalid register name"
 msgstr "E850: ̵¸ú¤Ê¥ì¥¸¥¹¥¿Ì¾¤Ç¤¹"
 
+#, c-format
+msgid "E919: Directory not found in '%s': \"%s\""
+msgstr "E919: ¥Ç¥£¥ì¥¯¥È¥ê¤¬ '%s' ¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó: \"%s\""
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "¾å¤Þ¤Ç¸¡º÷¤·¤¿¤Î¤Ç²¼¤ËÌá¤ê¤Þ¤¹"
 
@@ -6731,11 +6791,11 @@
 
 #, c-format
 msgid "expected 3-tuple as imp.find_module() result, but got %s"
-msgstr "imp.find_module() ¤¬ %s ¤òÊÖ¤·¤Þ¤·¤¿ (´üÂÔÃÍ: 2 Í×ÁǤΥ¿¥×¥ë)"
+msgstr "imp.find_module() ¤¬ %s ¤òÊÖ¤·¤Þ¤·¤¿ (´üÂÔÃÍ: 3 Í×ÁǤΥ¿¥×¥ë)"
 
 #, c-format
 msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
-msgstr "impl.find_module() ¤¬ %d Í×ÁǤΥ¿¥×¥ë¤òÊÖ¤·¤Þ¤·¤¿ (´üÂÔÃÍ: 2)"
+msgstr "imp.find_module() ¤¬ %d Í×ÁǤΥ¿¥×¥ë¤òÊÖ¤·¤Þ¤·¤¿ (´üÂÔÃÍ: 3)"
 
 msgid "internal error: imp.find_module returned tuple with NULL"
 msgstr "ÆâÉô¥¨¥é¡¼: imp.find_module ¤¬ NULL ¤ò´Þ¤à¥¿¥×¥ë¤òÊÖ¤·¤Þ¤·¤¿"
@@ -6806,9 +6866,6 @@
 msgid "function %s does not exist"
 msgstr "´Ø¿ô %s ¤¬¤¢¤ê¤Þ¤»¤ó"
 
-msgid "function constructor does not accept keyword arguments"
-msgstr "´Ø¿ô¤Î¥³¥ó¥¹¥È¥é¥¯¥¿¤Ï¥­¡¼¥ï¡¼¥É°ú¿ô¤ò¼õ¤±ÉÕ¤±¤Þ¤»¤ó"
-
 #, c-format
 msgid "failed to run function %s"
 msgstr "´Ø¿ô %s ¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
@@ -6896,6 +6953,10 @@
 msgstr "%s vim¤Î¼­½ñ·¿¤ËÊÑ´¹¤Ç¤­¤Þ¤»¤ó"
 
 #, c-format
+msgid "unable to convert %s to vim list"
+msgstr "%s ¤òvim¤Î¥ê¥¹¥È¤ËÊÑ´¹¤Ç¤­¤Þ¤»¤ó"
+
+#, c-format
 msgid "unable to convert %s to vim structure"
 msgstr "%s ¤òvim¤Î¹½Â¤ÂΤËÊÑ´¹¤Ç¤­¤Þ¤»¤ó"
 

src/po/ja.po

diff --git a/src/po/ja.po b/src/po/ja.po
index e1f9b1d..f93f923 100644
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -14,8 +14,8 @@
 msgstr ""
 "Project-Id-Version: Vim 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-01 09:02+0900\n"
-"PO-Revision-Date: 2016-02-01-09:08+0900\n"
+"POT-Creation-Date: 2016-08-31 18:10+0900\n"
+"PO-Revision-Date: 2016-08-31 21:20+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n"
 "Language: Japanese\n"
@@ -53,6 +53,9 @@
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: バッファを作成できないので, 他のを使用します..."
 
+msgid "E931: Buffer cannot be registered"
+msgstr "E931: バッファを登録できません"
+
 msgid "E515: No buffers were unloaded"
 msgstr "E515: 解放されたバッファはありません"
 
@@ -202,17 +205,55 @@
 msgid "    line=%ld  id=%d  name=%s"
 msgstr "    行=%ld  識別子=%d  名前=%s"
 
-msgid "E897: All channels are in use"
-msgstr "E897: 全チャンネルが使用中です"
-
-msgid "E899: Cannot connect to port after retry2"
-msgstr "E899: 2回のリトライをしてもポートに接続できません"
-
 msgid "E902: Cannot connect to port"
 msgstr "E902: ポートに接続できません"
 
-msgid "E896: read from channel"
-msgstr "E896: チャンネルから読み込み"
+msgid "E901: gethostbyname() in channel_open()"
+msgstr "E901: channel_open() 内の gethostbyname() が失敗しました"
+
+msgid "E898: socket() in channel_open()"
+msgstr "E898: channel_open() 内の socket() が失敗しました"
+
+msgid "E903: received command with non-string argument"
+msgstr "E903: 非文字列の引数のコマンドを受信しました"
+
+msgid "E904: last argument for expr/call must be a number"
+msgstr "E904: expr/call の最後の引数は数字でなければなりません"
+
+msgid "E904: third argument for call must be a list"
+msgstr "E904: call の3番目の引数はリスト型でなければなりません"
+
+#, c-format
+msgid "E905: received unknown command: %s"
+msgstr "E905: 未知のコマンドを受信しました: %s"
+
+#, c-format
+msgid "E630: %s(): write while not connected"
+msgstr "E630: %s(): 非接続状態で書き込みました"
+
+#, c-format
+msgid "E631: %s(): write failed"
+msgstr "E631: %s(): 書き込みに失敗しました"
+
+#, c-format
+msgid "E917: Cannot use a callback with %s()"
+msgstr "E917: %s() にコールバックは使えません"
+
+msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
+msgstr "E912: 生や nl チャンネルに ch_evalexpr()/ch_sendexpr は使えません"
+
+msgid "E906: not an open channel"
+msgstr "E906: 開いていないチャンネルです"
+
+msgid "E920: _io file requires _name to be set"
+msgstr "E920: _io ファイルは _name の設定が必要です"
+
+msgid "E915: in_io buffer requires in_buf or in_name to be set"
+msgstr "E915: in_io バッファは in_buf か in_name の設定が必要です"
+
+#, c-format
+msgid "E918: buffer must be loaded: %s"
+msgstr "E918: バッファがロードされてなければなりません: %s"
 
 msgid "E821: File is encrypted with unknown method"
 msgstr "E821: ファイルが未知の方法で暗号化されています"
@@ -233,7 +274,30 @@
 msgstr "[暗号化]"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: 辞書型にコロンがありません: %s"
+
+#, c-format
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: 辞書型に重複キーがあります: \"%s\""
+
+#, c-format
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: 辞書型にカンマがありません: %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: 辞書型の最後に '}' がありません: %s"
+
+msgid "extend() argument"
+msgstr "extend() の引数"
+
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: キーは既に存在します: %s"
+
+#, c-format
+msgid "E96: Cannot diff more than %ld buffers"
 msgstr "E96: %ld 以上のバッファはdiffできません"
 
 msgid "E810: Cannot read or write temp files"
@@ -389,52 +453,17 @@
 msgid "match %d"
 msgstr "%d 番目の該当"
 
+#. maximum nesting of lists and dicts
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: 予期せぬ文字が :let にありました"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: リストのインデックスが範囲外です: %ld"
-
-#, c-format
 msgid "E121: Undefined variable: %s"
 msgstr "E121: 未定義の変数です: %s"
 
 msgid "E111: Missing ']'"
 msgstr "E111: ']' が見つかりません"
 
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: %s の引数はリスト型でなければなりません"
-
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: %s の引数はリスト型または辞書型でなければなりません"
-
-msgid "E714: List required"
-msgstr "E714: リスト型が必要です"
-
-msgid "E715: Dictionary required"
-msgstr "E715: 辞書型が必要です"
-
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: 関数の引数が多過ぎます: %s"
-
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: 辞書型にキーが存在しません: %s"
-
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: 関数 %s は定義済です, 再定義するには ! を追加してください"
-
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: 辞書型内にエントリが既に存在します"
-
-msgid "E718: Funcref required"
-msgstr "E718: 関数参照型が要求されます"
-
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: [:] を辞書型と組み合わせては使えません"
 
@@ -443,10 +472,6 @@
 msgstr "E734: 異なった型の変数です %s="
 
 #, c-format
-msgid "E130: Unknown function: %s"
-msgstr "E130: 未知の関数です: %s"
-
-#, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: 不正な変数名です: %s"
 
@@ -486,10 +511,6 @@
 msgstr "E690: :for の後に \"in\" がありません"
 
 #, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: カッコ '(' がありません: %s"
-
-#, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: その変数はありません: \"%s\""
 
@@ -511,9 +532,6 @@
 msgid "E736: Invalid operation for Dictionary"
 msgstr "E736: 辞書型には無効な操作です"
 
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: 関数参照型は関数参照型としか比較できません"
-
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: 関数参照型には無効な操作です"
 
@@ -526,6 +544,9 @@
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: 関数参照型はインデックスできません"
 
+msgid "E909: Cannot index a special variable"
+msgstr "E909: 特殊変数はインデックスできません"
+
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: オプション名がありません: %s"
@@ -542,60 +563,116 @@
 msgid "E115: Missing quote: %s"
 msgstr "E115: 引用符 (') がありません: %s"
 
-#, c-format
-msgid "E696: Missing comma in List: %s"
-msgstr "E696: リスト型にカンマがありません: %s"
-
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: リスト型の最後に ']' がありません: %s"
-
 msgid "Not enough memory to set references, garbage collection aborted!"
 msgstr ""
 "ガーベッジコレクションを中止しました! 参照を作成するのにメモリが不足しました"
 
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: 辞書型にコロンがありません: %s"
-
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: 辞書型に重複キーがあります: \"%s\""
-
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: 辞書型にカンマがありません: %s"
-
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: 辞書型の最後に '}' がありません: %s"
-
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: 表示するには変数の入れ子が深過ぎます"
 
-#, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E740: 関数の引数が多過ぎます: %s"
+msgid "E805: Using a Float as a Number"
+msgstr "E805: 浮動小数点数を数値として扱っています"
+
+msgid "E703: Using a Funcref as a Number"
+msgstr "E703: 関数参照型を数値として扱っています。"
+
+msgid "E745: Using a List as a Number"
+msgstr "E745: リスト型を数値として扱っています"
+
+msgid "E728: Using a Dictionary as a Number"
+msgstr "E728: 辞書型を数値として扱っています"
+
+msgid "E910: Using a Job as a Number"
+msgstr "E910: ジョブを数値として扱っています"
+
+msgid "E913: Using a Channel as a Number"
+msgstr "E913: チャンネルを数値として扱っています。"
+
+msgid "E891: Using a Funcref as a Float"
+msgstr "E891: 関数参照型を浮動小数点数として扱っています。"
+
+msgid "E892: Using a String as a Float"
+msgstr "E892: 文字列を浮動小数点数として扱っています"
+
+msgid "E893: Using a List as a Float"
+msgstr "E893: リスト型を浮動小数点数として扱っています"
+
+msgid "E894: Using a Dictionary as a Float"
+msgstr "E894: 辞書型を浮動小数点数として扱っています"
+
+msgid "E907: Using a special value as a Float"
+msgstr "E907: 特殊値を浮動小数点数として扱っています"
+
+msgid "E911: Using a Job as a Float"
+msgstr "E911: ジョブを浮動小数点数として扱っています"
+
+msgid "E914: Using a Channel as a Float"
+msgstr "E914: チャンネルを浮動小数点数として扱っています。"
+
+msgid "E729: using Funcref as a String"
+msgstr "E729: 関数参照型を文字列として扱っています"
+
+msgid "E730: using List as a String"
+msgstr "E730: リスト型を文字列として扱っています"
+
+msgid "E731: using Dictionary as a String"
+msgstr "E731: 辞書型を文字列として扱っています"
+
+msgid "E908: using an invalid value as a String"
+msgstr "E908: 無効な値を文字列として扱っています"
 
 #, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: 関数の無効な引数です: %s"
+msgid "E795: Cannot delete variable %s"
+msgstr "E795: 変数 %s を削除できません"
 
 #, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: 未知の関数です: %s"
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: 関数参照型変数名は大文字で始まらなければなりません: %s"
 
 #, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: 関数の引数が足りません: %s"
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: 変数名が既存の関数名と衝突します: %s"
 
 #, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: スクリプト以外で<SID>が使われました: %s"
+msgid "E741: Value is locked: %s"
+msgstr "E741: 値がロックされています: %s"
+
+msgid "Unknown"
+msgstr "不明"
 
 #, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr "E725: 辞書用関数が呼ばれましたが辞書がありません: %s"
+msgid "E742: Cannot change value of %s"
+msgstr "E742: %s の値を変更できません"
+
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: コピーを取るには変数の入れ子が深過ぎます"
+
+msgid ""
+"\n"
+"# global variables:\n"
+msgstr ""
+"\n"
+"# グローバル変数:\n"
+
+msgid ""
+"\n"
+"\tLast set from "
+msgstr ""
+"\n"
+"\t最後にセットしたスクリプト: "
+
+msgid "map() argument"
+msgstr "map() の引数"
+
+msgid "filter() argument"
+msgstr "filter() の引数"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s の引数はリスト型でなければなりません"
+
+msgid "E928: String required"
+msgstr "E928: 文字列が必要です"
 
 msgid "E808: Number or Float required"
 msgstr "E808: 数値か浮動小数点数が必要です"
@@ -603,9 +680,6 @@
 msgid "add() argument"
 msgstr "add() の引数"
 
-msgid "E699: Too many arguments"
-msgstr "E699: 引数が多過ぎます"
-
 msgid "E785: complete() can only be used in Insert mode"
 msgstr "E785: complete() は挿入モードでしか利用できません"
 
@@ -617,33 +691,22 @@
 msgid "&Ok"
 msgstr "&Ok"
 
-msgid "E999: Invalid callback argument"
-msgstr "E999: 無効なコールバック引数です"
-
-msgid "E999: not an open channel"
-msgstr "E999: 開いていないチャンネルです"
-
-msgid "extend() argument"
-msgstr "extend() の引数"
-
 #, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: キーは既に存在します: %s"
-
-msgid "map() argument"
-msgstr "map() の引数"
-
-msgid "filter() argument"
-msgstr "filter() の引数"
-
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld 行: "
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld 行: "
+msgstr[1] "+-%s%3ld 行: "
 
 #, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: 未知の関数です: %s"
 
+msgid "E922: expected a dict"
+msgstr "E922: 辞書が期待されています"
+
+msgid "E923: Second argument of function() must be a list or a dict"
+msgstr "E923: function() の第 2 引数はリスト型または辞書型でなければなりません"
+
 msgid ""
 "&OK\n"
 "&Cancel"
@@ -660,9 +723,16 @@
 msgid "E786: Range not allowed"
 msgstr "E786: 範囲指定は許可されていません"
 
+msgid "E916: not a valid job"
+msgstr "E916: 有効なジョブではありません"
+
 msgid "E701: Invalid type for len()"
 msgstr "E701: len() には無効な型です"
 
+#, c-format
+msgid "E798: ID is reserved for \":match\": %ld"
+msgstr "E798: ID は \":match\" のために予約されています: %ld"
+
 msgid "E726: Stride is zero"
 msgstr "E726: ストライド(前進量)が 0 です"
 
@@ -695,6 +765,10 @@
 msgid "E258: Unable to send to client"
 msgstr "E258: クライアントへ送ることができません"
 
+#, c-format
+msgid "E927: Invalid action: '%s'"
+msgstr "E927: 無効な操作です: %s"
+
 msgid "sort() argument"
 msgstr "sort() の引数"
 
@@ -710,163 +784,15 @@
 msgid "(Invalid)"
 msgstr "(無効)"
 
+#, c-format
+msgid "E935: invalid submatch number: %d"
+msgstr "E935: 無効なサブマッチ番号: %d"
+
 msgid "E677: Error writing temp file"
 msgstr "E677: 一時ファイル書込中にエラーが発生しました"
 
-msgid "E805: Using a Float as a Number"
-msgstr "E805: 浮動小数点数を数値として扱っています"
-
-msgid "E703: Using a Funcref as a Number"
-msgstr "E703: 関数参照型を数値として扱っています。"
-
-msgid "E745: Using a List as a Number"
-msgstr "E745: リスト型を数値として扱っています"
-
-msgid "E728: Using a Dictionary as a Number"
-msgstr "E728: 辞書型を数値として扱っています"
-
-msgid "E891: Using a Funcref as a Float"
-msgstr "E891: 関数参照型を浮動小数点数として扱っています。"
-
-msgid "E892: Using a String as a Float"
-msgstr "E892: 文字列を浮動小数点数として扱っています"
-
-msgid "E893: Using a List as a Float"
-msgstr "E893: リスト型を浮動小数点数として扱っています"
-
-msgid "E894: Using a Dictionary as a Float"
-msgstr "E894: 辞書型を浮動小数点数として扱っています"
-
-msgid "E729: using Funcref as a String"
-msgstr "E729: 関数参照型を文字列として扱っています"
-
-msgid "E730: using List as a String"
-msgstr "E730: リスト型を文字列として扱っています"
-
-msgid "E731: using Dictionary as a String"
-msgstr "E731: 辞書型を文字列として扱っています"
-
-#, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: 変数の型が一致しません: %s"
-
-#, c-format
-msgid "E795: Cannot delete variable %s"
-msgstr "E795: 変数 %s を削除できません"
-
-#, c-format
-msgid "E704: Funcref variable name must start with a capital: %s"
-msgstr "E704: 関数参照型変数名は大文字で始まらなければなりません: %s"
-
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr "E705: 変数名が既存の関数名と衝突します: %s"
-
-#, c-format
-msgid "E741: Value is locked: %s"
-msgstr "E741: 値がロックされています: %s"
-
-msgid "Unknown"
-msgstr "不明"
-
-#, c-format
-msgid "E742: Cannot change value of %s"
-msgstr "E742: %s の値を変更できません"
-
-msgid "E698: variable nested too deep for making a copy"
-msgstr "E698: コピーを取るには変数の入れ子が深過ぎます"
-
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: 未定義の関数です: %s"
-
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: '(' がありません: %s"
-
-msgid "E862: Cannot use g: here"
-msgstr "E862: ここでは g: は使えません"
-
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: 不正な引数です: %s"
-
-#, c-format
-msgid "E853: Duplicate argument name: %s"
-msgstr "E853: 引数名が重複しています: %s"
-
-msgid "E126: Missing :endfunction"
-msgstr "E126: :endfunction がありません"
-
-#, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E707: 関数名が変数名と衝突します: %s"
-
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: 関数 %s を再定義できません: 使用中です"
-
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr "E746: 関数名がスクリプトのファイル名と一致しません: %s"
-
-msgid "E129: Function name required"
-msgstr "E129: 関数名が要求されます"
-
-#, c-format
-msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr "E128: 関数名は大文字か \"s:\" で始まらなければなりません: %s"
-
-#, c-format
-msgid "E884: Function name cannot contain a colon: %s"
-msgstr "E884: 関数名にはコロンは含められません: %s"
-
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: 関数 %s を削除できません: 使用中です"
-
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: 関数呼出の入れ子数が 'maxfuncdepth' を超えました"
-
-#, c-format
-msgid "calling %s"
-msgstr "%s を実行中です"
-
-#, c-format
-msgid "%s aborted"
-msgstr "%s が中断されました"
-
-#, c-format
-msgid "%s returning #%ld"
-msgstr "%s が #%ld を返しました"
-
-#, c-format
-msgid "%s returning %s"
-msgstr "%s が %s を返しました"
-
-#, c-format
-msgid "continuing in %s"
-msgstr "%s の実行を継続中です"
-
-msgid "E133: :return not inside a function"
-msgstr "E133: 関数外に :return がありました"
-
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# グローバル変数:\n"
-
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\tLast set from "
-
-msgid "No old files"
-msgstr "古いファイルはありません"
+msgid "E921: Invalid callback argument"
+msgstr "E921: 無効なコールバック引数です"
 
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
@@ -929,6 +855,10 @@
 msgstr "E137: viminfoファイルが書込みできません: %s"
 
 #, c-format
+msgid "E929: Too many viminfo temp files, like %s!"
+msgstr "E929: 一時viminfoファイルが多過ぎます! 例: %s"
+
+#, c-format
 msgid "E138: Can't write viminfo file %s!"
 msgstr "E138: viminfoファイル %s を保存できません!"
 
@@ -1098,8 +1028,8 @@
 msgstr "残念ですがヘルプファイル \"%s\" が見つかりません"
 
 #, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: ディレクトリではありません: %s"
+msgid "E151: No match: %s"
+msgstr "E151: マッチはありません: %s"
 
 #, c-format
 msgid "E152: Cannot open %s for writing"
@@ -1119,6 +1049,10 @@
 msgstr "E154: タグ \"%s\" がファイル %s/%s に重複しています"
 
 #, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: ディレクトリではありません: %s"
+
+#, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: 未知のsignコマンドです: %s"
 
@@ -1143,6 +1077,9 @@
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: 無効なバッファ名です: %s"
 
+msgid "E934: Cannot jump to a buffer that does not have a name"
+msgstr "E934: 名前の無いバッファへはジャンプできません"
+
 #, c-format
 msgid "E157: Invalid sign ID: %ld"
 msgstr "E157: 無効なsign識別子です: %ld"
@@ -1161,6 +1098,9 @@
 msgid "[Deleted]"
 msgstr "[削除済]"
 
+msgid "No old files"
+msgstr "古いファイルはありません"
+
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "デバッグモードに入ります. 続けるには \"cont\" と入力してください."
 
@@ -1233,8 +1173,8 @@
 msgstr "\"%s\" を検索中"
 
 #, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "'runtimepath' の中には見つかりません: \"%s\""
+msgid "not found in '%s': \"%s\""
+msgstr "'%s' の中にはありません: \"%s\""
 
 msgid "Source Vim script"
 msgstr "Vimスクリプトの取込み"
@@ -1263,6 +1203,10 @@
 msgid "finished sourcing %s"
 msgstr "%s の取込を完了"
 
+#, c-format
+msgid "continuing in %s"
+msgstr "%s の実行を継続中です"
+
 msgid "modeline"
 msgstr "モード行"
 
@@ -1466,6 +1410,9 @@
 msgid "E466: :winpos requires two number arguments"
 msgstr "E466: :winpos には2つの数値の引数が必要です"
 
+msgid "E930: Cannot use :redir inside execute()"
+msgstr "E930: execute() の中では :redir は使えません"
+
 msgid "Save Redirection"
 msgstr "リダイレクトを保存します"
 
@@ -1674,6 +1621,9 @@
 msgid "Input Line"
 msgstr "入力行"
 
+msgid "Debug Line"
+msgstr "デバッグ行"
+
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar がコマンド長を超えました"
 
@@ -1919,11 +1869,6 @@
 msgid "%lld characters"
 msgstr "%lld 文字"
 
-#. Explicit typecast avoids warning on Mac OS X 10.6
-#, c-format
-msgid "%ld characters"
-msgstr "%ld 文字"
-
 msgid "[noeol]"
 msgstr "[noeol]"
 
@@ -2003,9 +1948,6 @@
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: \"%s\" はリロードできませんでした"
 
-msgid "--Deleted--"
-msgstr "--削除済--"
-
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "autocommand: %s <バッファ=%d> が自動的に削除されます"
@@ -2015,6 +1957,12 @@
 msgid "E367: No such group: \"%s\""
 msgstr "E367: そのグループはありません: \"%s\""
 
+msgid "W19: Deleting augroup that is still in use"
+msgstr "W19: 使用中の augroup を消そうとしています"
+
+msgid "--Deleted--"
+msgstr "--削除済--"
+
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: * の後に不正な文字がありました: %s"
@@ -2076,8 +2024,10 @@
 msgstr "E351: 現在の 'foldmethod' では折畳みを削除できません"
 
 #, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld 行が折畳まれました "
+msgid "+--%3ld line folded "
+msgid_plural "+--%3ld lines folded "
+msgstr[0] "+--%3ld 行が折畳まれました "
+msgstr[1] "+--%3ld 行が折畳まれました "
 
 msgid "E222: Add to read buffer"
 msgstr "E222: 読込バッファへ追加"
@@ -2170,6 +2120,18 @@
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: メッセージとコールバックのある BalloonEval を作成できません"
 
+msgid "_Cancel"
+msgstr "キャンセル(_C)"
+
+msgid "_Save"
+msgstr "保存(_S)"
+
+msgid "_Open"
+msgstr "開く(_O)"
+
+msgid "_OK"
+msgstr "_OK"
+
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -2179,6 +2141,12 @@
 "いいえ(&N)\n"
 "キャンセル(&C)"
 
+msgid "Yes"
+msgstr "はい"
+
+msgid "No"
+msgstr "いいえ"
+
 msgid "Input _Methods"
 msgstr "インプットメソッド"
 
@@ -2212,18 +2180,18 @@
 msgid "Down"
 msgstr "下"
 
-#. 'Find Next' button
 msgid "Find Next"
 msgstr "次を検索"
 
-#. 'Replace' button
 msgid "Replace"
 msgstr "置換"
 
-#. 'Replace All' button
 msgid "Replace All"
 msgstr "全て置換"
 
+msgid "_Close"
+msgstr "閉じる(_C)"
+
 msgid "Vim: Received \"die\" request from session manager\n"
 msgstr "Vim: セッションマネージャから \"die\" 要求を受け取りました\n"
 
@@ -2275,17 +2243,6 @@
 msgid "&Undo"
 msgstr "アンドゥ(&U)"
 
-#, c-format
-msgid "E671: Cannot find window title \"%s\""
-msgstr "E671: タイトルが \"%s\" のウィンドウは見つかりません"
-
-#, c-format
-msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-msgstr "E243: 引数はサポートされません: \"-%s\"; OLE版を使用してください."
-
-msgid "E672: Unable to open window inside MDI application"
-msgstr "E672: MDIアプリの中ではウィンドウを開けません"
-
 msgid "Open tab..."
 msgstr "タブページを開く"
 
@@ -2303,6 +2260,17 @@
 msgid "Directory\t*.nothing\n"
 msgstr "ディレクトリ\t*.nothing\n"
 
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: タイトルが \"%s\" のウィンドウは見つかりません"
+
+#, c-format
+msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
+msgstr "E243: 引数はサポートされません: \"-%s\"; OLE版を使用してください."
+
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: MDIアプリの中ではウィンドウを開けません"
+
 msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
 msgstr "Vim E458: 色指定が正しくないのでエントリを割り当てられません"
 
@@ -2564,6 +2532,7 @@
 
 msgid ""
 "\n"
+"       a: Find assignments to this symbol\n"
 "       c: Find functions calling this function\n"
 "       d: Find functions called by this function\n"
 "       e: Find this egrep pattern\n"
@@ -2574,6 +2543,7 @@
 "       t: Find this text string\n"
 msgstr ""
 "\n"
+"       a: このシンボルに対する代入を探す\n"
 "       c: この関数を呼んでいる関数を探す\n"
 "       d: この関数から呼んでいる関数を探す\n"
 "       e: このegrepパターンを探す\n"
@@ -2701,19 +2671,6 @@
 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 を使えません"
 
@@ -2769,95 +2726,6 @@
 msgid "E273: unknown longjmp status %d"
 msgstr "E273: 未知のlongjmp状態: %d"
 
-msgid "Toggle implementation/definition"
-msgstr "実装と定義を切り替える"
-
-msgid "Show base class of"
-msgstr "次のクラスの基底を表示"
-
-msgid "Show overridden member function"
-msgstr "オーバーライドされたメンバ関数を表示"
-
-msgid "Retrieve from file"
-msgstr "ファイルから回復する"
-
-msgid "Retrieve from project"
-msgstr "プロジェクトから回復する"
-
-msgid "Retrieve from all projects"
-msgstr "全てのプロジェクトから回復する"
-
-msgid "Retrieve"
-msgstr "回復"
-
-msgid "Show source of"
-msgstr "次のソースを表示する"
-
-msgid "Find symbol"
-msgstr "見つけたシンボル"
-
-msgid "Browse class"
-msgstr "クラスを参照"
-
-msgid "Show class in hierarchy"
-msgstr "階層でクラスを表示"
-
-msgid "Show class in restricted hierarchy"
-msgstr "限定された階層でクラスを表示"
-
-msgid "Xref refers to"
-msgstr "Xref の参照先"
-
-msgid "Xref referred by"
-msgstr "Xref が参照される"
-
-msgid "Xref has a"
-msgstr "Xref が次のものをもっています"
-
-msgid "Xref used by"
-msgstr "Xref が使用される"
-
-msgid "Show docu of"
-msgstr "次の文章を表示"
-
-msgid "Generate docu for"
-msgstr "次の文章を生成"
-
-msgid ""
-"Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-"$PATH).\n"
-msgstr ""
-"SNiFF+に接続できません. 環境をチェックしてください(sniffemacs が $PATH になけ"
-"ればなりません).\n"
-
-msgid "E274: Sniff: Error during read. Disconnected"
-msgstr "E274: Sniff: 読込中にエラーが発生しました. 切断しました"
-
-msgid "SNiFF+ is currently "
-msgstr "現在SNiFF+ の状態は「"
-
-msgid "not "
-msgstr "未"
-
-msgid "connected"
-msgstr "接続」です"
-
-#, c-format
-msgid "E275: Unknown SNiFF+ request: %s"
-msgstr "E275: 未知の SNiFF+ リクエストです: %s"
-
-msgid "E276: Error connecting to SNiFF+"
-msgstr "E276: SNiFF+ への接続中のエラーです"
-
-msgid "E278: SNiFF+ not connected"
-msgstr "E278: SNiFF+ に接続されていません"
-
-msgid "E279: Not a SNiFF+ buffer"
-msgstr "E279: SNiFF+ バッファがありません"
-
-msgid "Sniff: Error during write. Disconnected"
-msgstr "Sniff: 書込み中にエラーが発生したので切断しました"
-
 msgid "invalid buffer number"
 msgstr "無効なバッファ番号です"
 
@@ -2944,6 +2812,14 @@
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: VIM 実体の登録プロパティが不正です. 消去しました!"
 
+#, c-format
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: リスト型にカンマがありません: %s"
+
+#, c-format
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: リスト型の最後に ']' がありません: %s"
+
 msgid "Unknown option argument"
 msgstr "未知のオプション引数です"
 
@@ -2969,12 +2845,12 @@
 msgid "netbeans is not supported with this GUI\n"
 msgstr "netbeans はこのGUIでは利用できません\n"
 
-msgid "This Vim was not compiled with the diff feature."
-msgstr "このVimにはdiff機能がありません(コンパイル時設定)."
-
 msgid "'-nb' cannot be used: not enabled at compile time\n"
 msgstr "'-nb' 使用不可能です: コンパイル時に無効にされています\n"
 
+msgid "This Vim was not compiled with the diff feature."
+msgstr "このVimにはdiff機能がありません(コンパイル時設定)."
+
 msgid "Attempt to open script file again: \""
 msgstr "スクリプトファイルを再び開いてみます: \""
 
@@ -2987,6 +2863,9 @@
 msgid "Vim: Error: Failure to start gvim from NetBeans\n"
 msgstr "Vim: エラー: NetBeansからgvimをスタートできません\n"
 
+msgid "Vim: Error: This version of Vim does not run in a Cygwin terminal\n"
+msgstr "Vim: エラー: このバージョンのVimはCygwin端末では動作しません\n"
+
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim: 警告: 端末への出力ではありません\n"
 
@@ -3151,6 +3030,9 @@
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminal>\t端末を <terminal> に設定する"
 
+msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
+msgstr "--not-a-term\t\t入出力が端末でないとの警告をスキップする"
+
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\t.vimrcの代わりに <vimrc> を使う"
 
@@ -3821,15 +3703,13 @@
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
 "    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
+"    file when making changes.  Quit, or continue with caution.\n"
 msgstr ""
 "\n"
 "(1) 別のプログラムが同じファイルを編集しているかもしれません.\n"
 "    この場合には, 変更をしてしまうと1つのファイルに対して異なる2つの\n"
-"    インスタンスができてしまうので, そうしないように気をつけてください."
-
-msgid "  Quit, or continue with caution.\n"
-msgstr "    終了するか, 注意しながら続けてください.\n"
+"    インスタンスができてしまうので, そうしないように気をつけてください.\n"
+"    終了するか, 注意しながら続けてください.\n"
 
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) このファイルの編集セッションがクラッシュした.\n"
@@ -4275,25 +4155,27 @@
 msgstr "%ld 列; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "選択 %s%ld / %ld 行; %ld / %ld 単語; %ld / %ld バイト"
+msgid "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes"
+msgstr "選択 %s%ld / %ld 行; %lld / %lld 単語; %lld / %lld バイト"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
-"Bytes"
-msgstr "選択 %s%ld / %ld 行; %ld / %ld 単語; %ld / %ld 文字; %ld / %ld バイト"
-
-#, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "列 %s / %s; 行 %ld of %ld; 単語 %ld / %ld; バイト %ld / %ld"
-
-#, c-format
-msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
+"%lld Bytes"
 msgstr ""
-"列 %s / %s; 行 %ld / %ld; 単語 %ld / %ld; 文字 %ld / %ld; バイト %ld of %ld"
+"選択 %s%ld / %ld 行; %lld / %lld 単語; %lld / %lld 文字; %lld / %lld バイト"
+
+#, c-format
+msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
+msgstr "列 %s / %s; 行 %ld of %ld; 単語 %lld / %lld; バイト %lld / %lld"
+
+#, c-format
+msgid ""
+"Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
+"%lld of %lld"
+msgstr ""
+"列 %s / %s; 行 %ld / %ld; 単語 %lld / %lld; 文字 %lld / %lld; バイト %lld of "
+"%lld"
 
 #, c-format
 msgid "(+%ld for BOM)"
@@ -4526,7 +4408,7 @@
 msgstr "メッセージ"
 
 msgid "'columns' is not 80, cannot execute external commands"
-msgstr "'columns' が80ではないため, 外部コマンドを実行できません"
+msgstr "'columns' が 80 ではないため、外部コマンドを実行できません"
 
 msgid "E237: Printer selection failed"
 msgstr "E237: プリンタの選択に失敗しました"
@@ -4552,6 +4434,10 @@
 msgstr "E244: 文字セット名 \"%s\" は不正です (フォント名 \"%s\")"
 
 #, c-format
+msgid "E244: Illegal quality name \"%s\" in font name \"%s\""
+msgstr "E244: 品質名 \"%s\" は不正です (フォント名 \"%s\")"
+
+#, c-format
 msgid "E245: Illegal char '%c' in font name \"%s\""
 msgstr "E245: '%c' は不正な文字です (フォント名 \"%s\")"
 
@@ -4596,13 +4482,6 @@
 
 msgid ""
 "\n"
-"Cannot execute shell "
-msgstr ""
-"\n"
-"シェルを実行できません "
-
-msgid ""
-"\n"
 "Cannot execute shell sh\n"
 msgstr ""
 "\n"
@@ -4631,6 +4510,13 @@
 
 msgid ""
 "\n"
+"Cannot execute shell "
+msgstr ""
+"\n"
+"シェルを実行できません "
+
+msgid ""
+"\n"
 "Command terminated\n"
 msgstr ""
 "\n"
@@ -4672,10 +4558,6 @@
 msgstr "DLLから関数ポインタを取得できませんでした"
 
 #, c-format
-msgid "shell returned %d"
-msgstr "シェルがコード %d で終了しました"
-
-#, c-format
 msgid "Vim: Caught %s event\n"
 msgstr "Vim: イベント %s を検知\n"
 
@@ -4704,6 +4586,10 @@
 msgstr "Vimの警告"
 
 #, c-format
+msgid "shell returned %d"
+msgstr "シェルがコード %d で終了しました"
+
+#, c-format
 msgid "E372: Too many %%%c in format string"
 msgstr "E372: フォーマット文字列に %%%c が多過ぎます"
 
@@ -4726,6 +4612,7 @@
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: フォーマット文字列に無効な %%%c があります"
 
+#. nothing found
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat' にパターンが指定されていません"
 
@@ -4735,6 +4622,15 @@
 msgid "E553: No more items"
 msgstr "E553: 要素がもうありません"
 
+msgid "E924: Current window was closed"
+msgstr "E924: 現在のウィンドウが閉じられました"
+
+msgid "E925: Current quickfix was changed"
+msgstr "E925: 現在の quickfix が変更されました"
+
+msgid "E926: Current location list was changed"
+msgstr "E926: 現在のロケーションリストが変更されました"
+
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d of %d)%s%s: "
@@ -4742,15 +4638,18 @@
 msgid " (line deleted)"
 msgstr " (行が削除されました)"
 
+#, c-format
+msgid "%serror list %d of %d; %d errors "
+msgstr "%s エラー一覧 %d of %d; %d 個エラー"
+
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: quickfix スタックの末尾です"
 
 msgid "E381: At top of quickfix stack"
 msgstr "E381: quickfix スタックの先頭です"
 
-#, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "エラー一覧 %d of %d; %d 個エラー"
+msgid "No entries"
+msgstr "エントリがありません"
 
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: 'buftype' オプションが設定されているので書込みません"
@@ -4986,9 +4885,6 @@
 msgid " Arabic"
 msgstr " アラビア"
 
-msgid " (lang)"
-msgstr " (言語)"
-
 msgid " (paste)"
 msgstr " (貼り付け)"
 
@@ -5083,8 +4979,49 @@
 "# 最後の %s検索パターン:\n"
 "~"
 
-msgid "E759: Format error in spell file"
-msgstr "E759: スペルファイルの書式エラーです"
+msgid "E756: Spell checking is not enabled"
+msgstr "E756: スペルチェックは無効化されています"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
+msgstr ""
+"警告: 単語リスト \"%s_%s.spl\" および \"%s_ascii.spl\" は見つかりません"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+msgstr ""
+"警告: 単語リスト \"%s.%s.spl\" および \"%s.ascii.spl\" は見つかりません"
+
+msgid "E797: SpellFileMissing autocommand deleted buffer"
+msgstr "E797: autocommand の SpellFileMissing がバッファを削除しました"
+
+#, c-format
+msgid "Warning: region %s not supported"
+msgstr "警告9: %s という範囲はサポートされていません"
+
+msgid "Sorry, no suggestions"
+msgstr "残念ですが, 修正候補はありません"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "残念ですが, 修正候補は %ld 個しかありません"
+
+#. for when 'cmdheight' > 1
+#. avoid more prompt
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "\"%.*s\" を次へ変換:"
+
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
+msgid "E752: No previous spell replacement"
+msgstr "E752: スペル置換がまだ実行されていません"
+
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: 見つかりません: %s"
 
 msgid "E758: Truncated spell file"
 msgstr "E758: スペルファイルが切取られているようです"
@@ -5107,19 +5044,6 @@
 msgid "Compressing word tree..."
 msgstr "単語ツリーを圧縮しています..."
 
-msgid "E756: Spell checking is not enabled"
-msgstr "E756: スペルチェックは無効化されています"
-
-#, c-format
-msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
-msgstr ""
-"警告: 単語リスト \"%s_%s.spl\" および \"%s_ascii.spl\" は見つかりません"
-
-#, c-format
-msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-msgstr ""
-"警告: 単語リスト \"%s.%s.spl\" および \"%s.ascii.spl\" は見つかりません"
-
 #, c-format
 msgid "Reading spell file \"%s\""
 msgstr "スペルファイル \"%s\" を読込中"
@@ -5137,8 +5061,24 @@
 msgstr "E770: スペルファイルにサポートしていないセクションがあります"
 
 #, c-format
-msgid "Warning: region %s not supported"
-msgstr "警告9: %s という範囲はサポートされていません"
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: .sug ファイルではないようです: %s"
+
+#, c-format
+msgid "E779: Old .sug file, needs to be updated: %s"
+msgstr "E779: 古い .sug ファイルなので, アップデートしてください: %s"
+
+#, c-format
+msgid "E780: .sug file is for newer version of Vim: %s"
+msgstr "E780: より新しいバージョンの Vim 用の .sug ファイルです: %s"
+
+#, c-format
+msgid "E781: .sug file doesn't match .spl file: %s"
+msgstr "E781: .sug ファイルが .spl ファイルと一致しません: %s"
+
+#, c-format
+msgid "E782: error while reading .sug file: %s"
+msgstr "E782: .sug ファイルの読込中にエラーが発生しました: %s"
 
 #, c-format
 msgid "Reading affix file %s ..."
@@ -5409,50 +5349,6 @@
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: 単語の文字がスペルファイルと異なります"
 
-msgid "Sorry, no suggestions"
-msgstr "残念ですが, 修正候補はありません"
-
-#, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "残念ですが, 修正候補は %ld 個しかありません"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "\"%.*s\" を次へ変換:"
-
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
-msgid "E752: No previous spell replacement"
-msgstr "E752: スペル置換がまだ実行されていません"
-
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: 見つかりません: %s"
-
-#, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E778: .sug ファイルではないようです: %s"
-
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: 古い .sug ファイルなので, アップデートしてください: %s"
-
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr "E780: より新しいバージョンの Vim 用の .sug ファイルです: %s"
-
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr "E781: .sug ファイルが .spl ファイルと一致しません: %s"
-
-#, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E782: .sug ファイルの読込中にエラーが発生しました: %s"
-
 #. This should have been checked when generating the .spl
 #. * file.
 msgid "E783: duplicate char in MAP entry"
@@ -5789,6 +5685,9 @@
 "\n"
 "--- 端末キー ---"
 
+msgid "Cannot open $VIMRUNTIME/rgb.txt"
+msgstr "$VIMRUNTIME/rgb.txtを開けません"
+
 msgid "new shell started\n"
 msgstr "新しいシェルを起動します\n"
 
@@ -5936,6 +5835,130 @@
 msgid "E440: undo line missing"
 msgstr "E440: アンドゥ行がありません"
 
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: 関数 %s は定義済です, 再定義するには ! を追加してください"
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: 辞書型内にエントリが既に存在します"
+
+msgid "E718: Funcref required"
+msgstr "E718: 関数参照型が要求されます"
+
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: 未知の関数です: %s"
+
+#, c-format
+msgid "E125: Illegal argument: %s"
+msgstr "E125: 不正な引数です: %s"
+
+#, c-format
+msgid "E853: Duplicate argument name: %s"
+msgstr "E853: 引数名が重複しています: %s"
+
+#, c-format
+msgid "E740: Too many arguments for function %s"
+msgstr "E740: 関数の引数が多過ぎます: %s"
+
+#, c-format
+msgid "E116: Invalid arguments for function %s"
+msgstr "E116: 関数の無効な引数です: %s"
+
+msgid "E132: Function call depth is higher than 'maxfuncdepth'"
+msgstr "E132: 関数呼出の入れ子数が 'maxfuncdepth' を超えました"
+
+#, c-format
+msgid "calling %s"
+msgstr "%s を実行中です"
+
+#, c-format
+msgid "%s aborted"
+msgstr "%s が中断されました"
+
+#, c-format
+msgid "%s returning #%ld"
+msgstr "%s が #%ld を返しました"
+
+#, c-format
+msgid "%s returning %s"
+msgstr "%s が %s を返しました"
+
+msgid "E699: Too many arguments"
+msgstr "E699: 引数が多過ぎます"
+
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: 未知の関数です: %s"
+
+#, c-format
+msgid "E933: Function was deleted: %s"
+msgstr "E933: 関数は削除されました: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: 関数の引数が足りません: %s"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: スクリプト以外で<SID>が使われました: %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: 辞書用関数が呼ばれましたが辞書がありません: %s"
+
+msgid "E129: Function name required"
+msgstr "E129: 関数名が要求されます"
+
+#, c-format
+msgid "E128: Function name must start with a capital or \"s:\": %s"
+msgstr "E128: 関数名は大文字か \"s:\" で始まらなければなりません: %s"
+
+#, c-format
+msgid "E884: Function name cannot contain a colon: %s"
+msgstr "E884: 関数名にはコロンは含められません: %s"
+
+#, c-format
+msgid "E123: Undefined function: %s"
+msgstr "E123: 未定義の関数です: %s"
+
+#, c-format
+msgid "E124: Missing '(': %s"
+msgstr "E124: '(' がありません: %s"
+
+msgid "E862: Cannot use g: here"
+msgstr "E862: ここでは g: は使えません"
+
+#, c-format
+msgid "E932: Closure function should not be at top level: %s"
+msgstr "E932: クロージャー関数はトップレベルに記述できません: %s"
+
+msgid "E126: Missing :endfunction"
+msgstr "E126: :endfunction がありません"
+
+#, c-format
+msgid "E707: Function name conflicts with variable: %s"
+msgstr "E707: 関数名が変数名と衝突します: %s"
+
+#, c-format
+msgid "E127: Cannot redefine function %s: It is in use"
+msgstr "E127: 関数 %s を再定義できません: 使用中です"
+
+#, c-format
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: 関数名がスクリプトのファイル名と一致しません: %s"
+
+#, c-format
+msgid "E131: Cannot delete function %s: It is in use"
+msgstr "E131: 関数 %s を削除できません: 使用中です"
+
+msgid "E133: :return not inside a function"
+msgstr "E133: 関数外に :return がありました"
+
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: カッコ '(' がありません: %s"
+
 #. Only MS VC 4.1 and earlier can do Win32s
 msgid ""
 "\n"
@@ -5958,9 +5981,6 @@
 "\n"
 "MS-Windows 32 ビット GUI 版"
 
-msgid " in Win32s mode"
-msgstr " in Win32s モード"
-
 msgid " with OLE support"
 msgstr " with OLE サポート"
 
@@ -5980,27 +6000,6 @@
 
 msgid ""
 "\n"
-"MS-Windows 16-bit version"
-msgstr ""
-"\n"
-"MS-Windows 16 ビット 版"
-
-msgid ""
-"\n"
-"32-bit MS-DOS version"
-msgstr ""
-"\n"
-"32 ビット MS-DOS 版"
-
-msgid ""
-"\n"
-"16-bit MS-DOS version"
-msgstr ""
-"\n"
-"16 ビット MS-DOS 版"
-
-msgid ""
-"\n"
 "MacOS X (unix) version"
 msgstr ""
 "\n"
@@ -6092,6 +6091,9 @@
 msgid "without GUI."
 msgstr "without GUI."
 
+msgid "with GTK3 GUI."
+msgstr "with GTK3 GUI."
+
 msgid "with GTK2-GNOME GUI."
 msgstr "with GTK2-GNOME GUI."
 
@@ -6155,6 +6157,9 @@
 msgid "3rd user gvimrc file: \""
 msgstr "  第3ユーザー gvimrc: \""
 
+msgid "       defaults file: \""
+msgstr "  デフォルトファイル: \""
+
 msgid "    system menu file: \""
 msgstr "    システムメニュー: \""
 
@@ -6246,10 +6251,10 @@
 msgstr "詳細はメニューの ヘルプ->スポンサー/登録 を参照して下さい"
 
 msgid "WARNING: Windows 95/98/ME detected"
-msgstr "   警告: Windows 95/98/Me を検出  "
+msgstr "警告: Windows 95/98/ME を検出しました"
 
 msgid "type  :help windows95<Enter>  for info on this"
-msgstr " 詳細な情報は          :help windows95<Enter> "
+msgstr "詳細な情報は            :help windows95<Enter>"
 
 msgid "Already only one window"
 msgstr "既にウィンドウは1つしかありません"
@@ -6282,9 +6287,38 @@
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: pathには \"%s\" というファイルがありません"
 
+#, c-format
+msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E799: 無効な ID: %ld (1 以上でなければなりません)"
+
+#, c-format
+msgid "E801: ID already taken: %ld"
+msgstr "E801: ID はすでに利用中です: %ld"
+
 msgid "List or number required"
 msgstr "リストか数値が必要です"
 
+#, c-format
+msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E802: 無効な ID: %ld (1 以上でなければなりません)"
+
+#, c-format
+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)"
 
@@ -6561,6 +6595,28 @@
 msgid "E713: Cannot use empty key for Dictionary"
 msgstr "E713: 辞書型に空のキーを使うことはできません"
 
+msgid "E715: Dictionary required"
+msgstr "E715: 辞書型が必要です"
+
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: リストのインデックスが範囲外です: %ld"
+
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: 関数の引数が多過ぎます: %s"
+
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: 辞書型にキーが存在しません: %s"
+
+msgid "E714: List required"
+msgstr "E714: リスト型が必要です"
+
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: %s の引数はリスト型または辞書型でなければなりません"
+
 msgid "E47: Error while reading errorfile"
 msgstr "E47: エラーファイルの読込中にエラーが発生しました"
 
@@ -6660,6 +6716,10 @@
 msgid "E850: Invalid register name"
 msgstr "E850: 無効なレジスタ名です"
 
+#, c-format
+msgid "E919: Directory not found in '%s': \"%s\""
+msgstr "E919: ディレクトリが '%s' の中にありません: \"%s\""
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "上まで検索したので下に戻ります"
 
@@ -6731,11 +6791,11 @@
 
 #, c-format
 msgid "expected 3-tuple as imp.find_module() result, but got %s"
-msgstr "imp.find_module() が %s を返しました (期待値: 2 要素のタプル)"
+msgstr "imp.find_module() が %s を返しました (期待値: 3 要素のタプル)"
 
 #, c-format
 msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
-msgstr "impl.find_module() が %d 要素のタプルを返しました (期待値: 2)"
+msgstr "imp.find_module() が %d 要素のタプルを返しました (期待値: 3)"
 
 msgid "internal error: imp.find_module returned tuple with NULL"
 msgstr "内部エラー: imp.find_module が NULL を含むタプルを返しました"
@@ -6806,9 +6866,6 @@
 msgid "function %s does not exist"
 msgstr "関数 %s がありません"
 
-msgid "function constructor does not accept keyword arguments"
-msgstr "関数のコンストラクタはキーワード引数を受け付けません"
-
 #, c-format
 msgid "failed to run function %s"
 msgstr "関数 %s の実行に失敗しました"
@@ -6896,6 +6953,10 @@
 msgstr "%s vimの辞書型に変換できません"
 
 #, c-format
+msgid "unable to convert %s to vim list"
+msgstr "%s をvimのリストに変換できません"
+
+#, c-format
 msgid "unable to convert %s to vim structure"
 msgstr "%s をvimの構造体に変換できません"
 

src/po/ja.sjis.po

diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po
index e69599d..bbdaf0a 100644
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -14,8 +14,8 @@
 msgstr ""
 "Project-Id-Version: Vim 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-01 09:02+0900\n"
-"PO-Revision-Date: 2016-02-01-09:08+0900\n"
+"POT-Creation-Date: 2016-08-31 18:10+0900\n"
+"PO-Revision-Date: 2016-08-31 21:20+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n"
 "Language: Japanese\n"
@@ -53,6 +53,9 @@
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: ƒoƒbƒtƒ@‚ðì¬‚Å‚«‚È‚¢‚Ì‚Å, ‘¼‚Ì‚ðŽg—p‚µ‚Ü‚·..."
 
+msgid "E931: Buffer cannot be registered"
+msgstr "E931: ƒoƒbƒtƒ@‚ð“o˜^‚Å‚«‚Ü‚¹‚ñ"
+
 msgid "E515: No buffers were unloaded"
 msgstr "E515: ‰ð•ú‚³‚ꂽƒoƒbƒtƒ@‚Í‚ ‚è‚Ü‚¹‚ñ"
 
@@ -202,17 +205,55 @@
 msgid "    line=%ld  id=%d  name=%s"
 msgstr "    s=%ld  Ž¯•ÊŽq=%d  –¼‘O=%s"
 
-msgid "E897: All channels are in use"
-msgstr "E897: ‘Sƒ`ƒƒƒ“ƒlƒ‹‚ªŽg—p’†‚Å‚·"
-
-msgid "E899: Cannot connect to port after retry2"
-msgstr "E899: 2‰ñ‚̃Šƒgƒ‰ƒC‚ð‚µ‚Ä‚àƒ|[ƒg‚ɐڑ±‚Å‚«‚Ü‚¹‚ñ"
-
 msgid "E902: Cannot connect to port"
 msgstr "E902: ƒ|[ƒg‚ɐڑ±‚Å‚«‚Ü‚¹‚ñ"
 
-msgid "E896: read from channel"
-msgstr "E896: ƒ`ƒƒƒ“ƒlƒ‹‚©‚ç“ǂݍž‚Ý"
+msgid "E901: gethostbyname() in channel_open()"
+msgstr "E901: channel_open() “à‚Ì gethostbyname() ‚ªŽ¸”s‚µ‚Ü‚µ‚½"
+
+msgid "E898: socket() in channel_open()"
+msgstr "E898: channel_open() “à‚Ì socket() ‚ªŽ¸”s‚µ‚Ü‚µ‚½"
+
+msgid "E903: received command with non-string argument"
+msgstr "E903: ”ñ•¶Žš—ñ‚̈ø”‚̃Rƒ}ƒ“ƒh‚ðŽóM‚µ‚Ü‚µ‚½"
+
+msgid "E904: last argument for expr/call must be a number"
+msgstr "E904: expr/call ‚̍Ōã‚̈ø”‚͐”Žš‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
+
+msgid "E904: third argument for call must be a list"
+msgstr "E904: call ‚Ì3”Ԗڂ̈ø”‚̓ŠƒXƒgŒ^‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "E905: received unknown command: %s"
+msgstr "E905: –¢’m‚̃Rƒ}ƒ“ƒh‚ðŽóM‚µ‚Ü‚µ‚½: %s"
+
+#, c-format
+msgid "E630: %s(): write while not connected"
+msgstr "E630: %s(): ”ñÚ‘±ó‘Ԃŏ‘‚«ž‚Ý‚Ü‚µ‚½"
+
+#, c-format
+msgid "E631: %s(): write failed"
+msgstr "E631: %s(): ‘‚«ž‚Ý‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
+
+#, c-format
+msgid "E917: Cannot use a callback with %s()"
+msgstr "E917: %s() ‚ɃR[ƒ‹ƒoƒbƒN‚ÍŽg‚¦‚Ü‚¹‚ñ"
+
+msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
+msgstr "E912: ¶‚â nl ƒ`ƒƒƒ“ƒlƒ‹‚É ch_evalexpr()/ch_sendexpr ‚ÍŽg‚¦‚Ü‚¹‚ñ"
+
+msgid "E906: not an open channel"
+msgstr "E906: ŠJ‚¢‚Ä‚¢‚È‚¢ƒ`ƒƒƒ“ƒlƒ‹‚Å‚·"
+
+msgid "E920: _io file requires _name to be set"
+msgstr "E920: _io ƒtƒ@ƒCƒ‹‚Í _name ‚̐ݒ肪•K—v‚Å‚·"
+
+msgid "E915: in_io buffer requires in_buf or in_name to be set"
+msgstr "E915: in_io ƒoƒbƒtƒ@‚Í in_buf ‚© in_name ‚̐ݒ肪•K—v‚Å‚·"
+
+#, c-format
+msgid "E918: buffer must be loaded: %s"
+msgstr "E918: ƒoƒbƒtƒ@‚ªƒ[ƒh‚³‚ê‚Ä‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ: %s"
 
 msgid "E821: File is encrypted with unknown method"
 msgstr "E821: ƒtƒ@ƒCƒ‹‚ª–¢’m‚Ì•û–@‚ň͆‰»‚³‚ê‚Ä‚¢‚Ü‚·"
@@ -233,7 +274,30 @@
 msgstr "[ˆÃ†‰»]"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: Ž«‘Œ^‚ɃRƒƒ“‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
+
+#, c-format
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: Ž«‘Œ^‚ɏd•¡ƒL[‚ª‚ ‚è‚Ü‚·: \"%s\""
+
+#, c-format
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: Ž«‘Œ^‚ɃJƒ“ƒ}‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: Ž«‘Œ^‚̍Ōã‚É '}' ‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
+
+msgid "extend() argument"
+msgstr "extend() ‚̈ø”"
+
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: ƒL[‚ÍŠù‚É‘¶Ý‚µ‚Ü‚·: %s"
+
+#, c-format
+msgid "E96: Cannot diff more than %ld buffers"
 msgstr "E96: %ld ˆÈã‚̃oƒbƒtƒ@‚Ídiff‚Å‚«‚Ü‚¹‚ñ"
 
 msgid "E810: Cannot read or write temp files"
@@ -389,52 +453,17 @@
 msgid "match %d"
 msgstr "%d ”Ô–Ú‚ÌŠY“–"
 
+#. maximum nesting of lists and dicts
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: —\\Šú‚¹‚Ê•¶Žš‚ª :let ‚É‚ ‚è‚Ü‚µ‚½"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: ƒŠƒXƒg‚̃Cƒ“ƒfƒbƒNƒX‚ª”͈͊O‚Å‚·: %ld"
-
-#, c-format
 msgid "E121: Undefined variable: %s"
 msgstr "E121: –¢’è‹`‚̕ϐ”‚Å‚·: %s"
 
 msgid "E111: Missing ']'"
 msgstr "E111: ']' ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
 
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: %s ‚̈ø”‚̓ŠƒXƒgŒ^‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
-
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: %s ‚̈ø”‚̓ŠƒXƒgŒ^‚Ü‚½‚ÍŽ«‘Œ^‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
-
-msgid "E714: List required"
-msgstr "E714: ƒŠƒXƒgŒ^‚ª•K—v‚Å‚·"
-
-msgid "E715: Dictionary required"
-msgstr "E715: Ž«‘Œ^‚ª•K—v‚Å‚·"
-
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: ŠÖ”‚̈ø”‚ª‘½‰ß‚¬‚Ü‚·: %s"
-
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: Ž«‘Œ^‚ɃL[‚ª‘¶Ý‚µ‚Ü‚¹‚ñ: %s"
-
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: ŠÖ” %s ‚Í’è‹`Ï‚Å‚·, Ä’è‹`‚·‚é‚É‚Í ! ‚ð’ljÁ‚µ‚Ä‚­‚¾‚³‚¢"
-
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: Ž«‘Œ^“à‚ɃGƒ“ƒgƒŠ‚ªŠù‚É‘¶Ý‚µ‚Ü‚·"
-
-msgid "E718: Funcref required"
-msgstr "E718: ŠÖ”ŽQÆŒ^‚ª—v‹‚³‚ê‚Ü‚·"
-
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: [:] ‚ðŽ«‘Œ^‚Æ‘g‚ݍ‡‚킹‚Ä‚ÍŽg‚¦‚Ü‚¹‚ñ"
 
@@ -443,10 +472,6 @@
 msgstr "E734: ˆÙ‚È‚Á‚½Œ^‚̕ϐ”‚Å‚· %s="
 
 #, c-format
-msgid "E130: Unknown function: %s"
-msgstr "E130: –¢’m‚̊֐”‚Å‚·: %s"
-
-#, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: •s³‚ȕϐ”–¼‚Å‚·: %s"
 
@@ -486,10 +511,6 @@
 msgstr "E690: :for ‚ÌŒã‚É \"in\" ‚ª‚ ‚è‚Ü‚¹‚ñ"
 
 #, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: ƒJƒbƒR '(' ‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
-
-#, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: ‚»‚̕ϐ”‚Í‚ ‚è‚Ü‚¹‚ñ: \"%s\""
 
@@ -511,9 +532,6 @@
 msgid "E736: Invalid operation for Dictionary"
 msgstr "E736: Ž«‘Œ^‚É‚Í–³Œø‚È‘€ì‚Å‚·"
 
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: ŠÖ”ŽQÆŒ^‚͊֐”ŽQÆŒ^‚Æ‚µ‚©”äŠr‚Å‚«‚Ü‚¹‚ñ"
-
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: ŠÖ”ŽQÆŒ^‚É‚Í–³Œø‚È‘€ì‚Å‚·"
 
@@ -526,6 +544,9 @@
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: ŠÖ”ŽQÆŒ^‚̓Cƒ“ƒfƒbƒNƒX‚Å‚«‚Ü‚¹‚ñ"
 
+msgid "E909: Cannot index a special variable"
+msgstr "E909: “ÁŽê•Ï”‚̓Cƒ“ƒfƒbƒNƒX‚Å‚«‚Ü‚¹‚ñ"
+
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: ƒIƒvƒVƒ‡ƒ“–¼‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
@@ -542,60 +563,116 @@
 msgid "E115: Missing quote: %s"
 msgstr "E115: ˆø—p•„ (') ‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
 
-#, c-format
-msgid "E696: Missing comma in List: %s"
-msgstr "E696: ƒŠƒXƒgŒ^‚ɃJƒ“ƒ}‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
-
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: ƒŠƒXƒgŒ^‚̍Ōã‚É ']' ‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
-
 msgid "Not enough memory to set references, garbage collection aborted!"
 msgstr ""
 "ƒK[ƒxƒbƒWƒRƒŒƒNƒVƒ‡ƒ“‚𒆎~‚µ‚Ü‚µ‚½! ŽQÆ‚ðì¬‚·‚é‚̂Ƀƒ‚ƒŠ‚ª•s‘«‚µ‚Ü‚µ‚½"
 
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: Ž«‘Œ^‚ɃRƒƒ“‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
-
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: Ž«‘Œ^‚ɏd•¡ƒL[‚ª‚ ‚è‚Ü‚·: \"%s\""
-
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: Ž«‘Œ^‚ɃJƒ“ƒ}‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
-
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: Ž«‘Œ^‚̍Ōã‚É '}' ‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
-
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: •\\Ž¦‚·‚é‚ɂ͕ϐ”‚Ì“ü‚êŽq‚ª[‰ß‚¬‚Ü‚·"
 
-#, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E740: ŠÖ”‚̈ø”‚ª‘½‰ß‚¬‚Ü‚·: %s"
+msgid "E805: Using a Float as a Number"
+msgstr "E805: •‚“®¬”“_”‚𐔒l‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
+
+msgid "E703: Using a Funcref as a Number"
+msgstr "E703: ŠÖ”ŽQÆŒ^‚𐔒l‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·B"
+
+msgid "E745: Using a List as a Number"
+msgstr "E745: ƒŠƒXƒgŒ^‚𐔒l‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
+
+msgid "E728: Using a Dictionary as a Number"
+msgstr "E728: Ž«‘Œ^‚𐔒l‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
+
+msgid "E910: Using a Job as a Number"
+msgstr "E910: ƒWƒ‡ƒu‚𐔒l‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
+
+msgid "E913: Using a Channel as a Number"
+msgstr "E913: ƒ`ƒƒƒ“ƒlƒ‹‚𐔒l‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·B"
+
+msgid "E891: Using a Funcref as a Float"
+msgstr "E891: ŠÖ”ŽQÆŒ^‚ð•‚“®¬”“_”‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·B"
+
+msgid "E892: Using a String as a Float"
+msgstr "E892: •¶Žš—ñ‚ð•‚“®¬”“_”‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
+
+msgid "E893: Using a List as a Float"
+msgstr "E893: ƒŠƒXƒgŒ^‚ð•‚“®¬”“_”‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
+
+msgid "E894: Using a Dictionary as a Float"
+msgstr "E894: Ž«‘Œ^‚ð•‚“®¬”“_”‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
+
+msgid "E907: Using a special value as a Float"
+msgstr "E907: “ÁŽê’l‚ð•‚“®¬”“_”‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
+
+msgid "E911: Using a Job as a Float"
+msgstr "E911: ƒWƒ‡ƒu‚ð•‚“®¬”“_”‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
+
+msgid "E914: Using a Channel as a Float"
+msgstr "E914: ƒ`ƒƒƒ“ƒlƒ‹‚ð•‚“®¬”“_”‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·B"
+
+msgid "E729: using Funcref as a String"
+msgstr "E729: ŠÖ”ŽQÆŒ^‚𕶎š—ñ‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
+
+msgid "E730: using List as a String"
+msgstr "E730: ƒŠƒXƒgŒ^‚𕶎š—ñ‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
+
+msgid "E731: using Dictionary as a String"
+msgstr "E731: Ž«‘Œ^‚𕶎š—ñ‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
+
+msgid "E908: using an invalid value as a String"
+msgstr "E908: –³Œø‚È’l‚𕶎š—ñ‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
 
 #, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: ŠÖ”‚Ì–³Œø‚Ȉø”‚Å‚·: %s"
+msgid "E795: Cannot delete variable %s"
+msgstr "E795: •Ï” %s ‚ðíœ‚Å‚«‚Ü‚¹‚ñ"
 
 #, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: –¢’m‚̊֐”‚Å‚·: %s"
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: ŠÖ”ŽQÆŒ^•Ï”–¼‚͑啶Žš‚ÅŽn‚Ü‚ç‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ: %s"
 
 #, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: ŠÖ”‚̈ø”‚ª‘«‚è‚Ü‚¹‚ñ: %s"
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: •Ï”–¼‚ªŠù‘¶‚̊֐”–¼‚ƏՓ˂µ‚Ü‚·: %s"
 
 #, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: ƒXƒNƒŠƒvƒgˆÈŠO‚Å<SID>‚ªŽg‚í‚ê‚Ü‚µ‚½: %s"
+msgid "E741: Value is locked: %s"
+msgstr "E741: ’l‚ªƒƒbƒN‚³‚ê‚Ä‚¢‚Ü‚·: %s"
+
+msgid "Unknown"
+msgstr "•s–¾"
 
 #, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr "E725: Ž«‘—pŠÖ”‚ªŒÄ‚΂ê‚Ü‚µ‚½‚ªŽ«‘‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
+msgid "E742: Cannot change value of %s"
+msgstr "E742: %s ‚Ì’l‚ð•ÏX‚Å‚«‚Ü‚¹‚ñ"
+
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: ƒRƒs[‚ðŽæ‚é‚ɂ͕ϐ”‚Ì“ü‚êŽq‚ª[‰ß‚¬‚Ü‚·"
+
+msgid ""
+"\n"
+"# global variables:\n"
+msgstr ""
+"\n"
+"# ƒOƒ[ƒoƒ‹•Ï”:\n"
+
+msgid ""
+"\n"
+"\tLast set from "
+msgstr ""
+"\n"
+"\tÅŒã‚ɃZƒbƒg‚µ‚½ƒXƒNƒŠƒvƒg: "
+
+msgid "map() argument"
+msgstr "map() ‚̈ø”"
+
+msgid "filter() argument"
+msgstr "filter() ‚̈ø”"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s ‚̈ø”‚̓ŠƒXƒgŒ^‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
+
+msgid "E928: String required"
+msgstr "E928: •¶Žš—ñ‚ª•K—v‚Å‚·"
 
 msgid "E808: Number or Float required"
 msgstr "E808: ”’l‚©•‚“®¬”“_”‚ª•K—v‚Å‚·"
@@ -603,9 +680,6 @@
 msgid "add() argument"
 msgstr "add() ‚̈ø”"
 
-msgid "E699: Too many arguments"
-msgstr "E699: ˆø”‚ª‘½‰ß‚¬‚Ü‚·"
-
 msgid "E785: complete() can only be used in Insert mode"
 msgstr "E785: complete() ‚Í‘}“üƒ‚[ƒh‚Å‚µ‚©—˜—p‚Å‚«‚Ü‚¹‚ñ"
 
@@ -617,33 +691,22 @@
 msgid "&Ok"
 msgstr "&Ok"
 
-msgid "E999: Invalid callback argument"
-msgstr "E999: –³Œø‚ȃR[ƒ‹ƒoƒbƒNˆø”‚Å‚·"
-
-msgid "E999: not an open channel"
-msgstr "E999: ŠJ‚¢‚Ä‚¢‚È‚¢ƒ`ƒƒƒ“ƒlƒ‹‚Å‚·"
-
-msgid "extend() argument"
-msgstr "extend() ‚̈ø”"
-
 #, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: ƒL[‚ÍŠù‚É‘¶Ý‚µ‚Ü‚·: %s"
-
-msgid "map() argument"
-msgstr "map() ‚̈ø”"
-
-msgid "filter() argument"
-msgstr "filter() ‚̈ø”"
-
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld s: "
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld s: "
+msgstr[1] "+-%s%3ld s: "
 
 #, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: –¢’m‚̊֐”‚Å‚·: %s"
 
+msgid "E922: expected a dict"
+msgstr "E922: Ž«‘‚ªŠú‘Ò‚³‚ê‚Ä‚¢‚Ü‚·"
+
+msgid "E923: Second argument of function() must be a list or a dict"
+msgstr "E923: function() ‚Ì‘æ 2 ˆø”‚̓ŠƒXƒgŒ^‚Ü‚½‚ÍŽ«‘Œ^‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
+
 msgid ""
 "&OK\n"
 "&Cancel"
@@ -660,9 +723,16 @@
 msgid "E786: Range not allowed"
 msgstr "E786: ”͈͎w’è‚Í‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
 
+msgid "E916: not a valid job"
+msgstr "E916: —LŒø‚ȃWƒ‡ƒu‚Å‚Í‚ ‚è‚Ü‚¹‚ñ"
+
 msgid "E701: Invalid type for len()"
 msgstr "E701: len() ‚É‚Í–³Œø‚ÈŒ^‚Å‚·"
 
+#, c-format
+msgid "E798: ID is reserved for \":match\": %ld"
+msgstr "E798: ID ‚Í \":match\" ‚Ì‚½‚ß‚É—\\–ñ‚³‚ê‚Ä‚¢‚Ü‚·: %ld"
+
 msgid "E726: Stride is zero"
 msgstr "E726: ƒXƒgƒ‰ƒCƒh(‘Oi—Ê)‚ª 0 ‚Å‚·"
 
@@ -695,6 +765,10 @@
 msgid "E258: Unable to send to client"
 msgstr "E258: ƒNƒ‰ƒCƒAƒ“ƒg‚Ö‘—‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ"
 
+#, c-format
+msgid "E927: Invalid action: '%s'"
+msgstr "E927: –³Œø‚È‘€ì‚Å‚·: %s"
+
 msgid "sort() argument"
 msgstr "sort() ‚̈ø”"
 
@@ -710,163 +784,15 @@
 msgid "(Invalid)"
 msgstr "(–³Œø)"
 
+#, c-format
+msgid "E935: invalid submatch number: %d"
+msgstr "E935: –³Œø‚ȃTƒuƒ}ƒbƒ`”ԍ†: %d"
+
 msgid "E677: Error writing temp file"
 msgstr "E677: ˆêŽžƒtƒ@ƒCƒ‹‘ž’†‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½"
 
-msgid "E805: Using a Float as a Number"
-msgstr "E805: •‚“®¬”“_”‚𐔒l‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
-
-msgid "E703: Using a Funcref as a Number"
-msgstr "E703: ŠÖ”ŽQÆŒ^‚𐔒l‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·B"
-
-msgid "E745: Using a List as a Number"
-msgstr "E745: ƒŠƒXƒgŒ^‚𐔒l‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
-
-msgid "E728: Using a Dictionary as a Number"
-msgstr "E728: Ž«‘Œ^‚𐔒l‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
-
-msgid "E891: Using a Funcref as a Float"
-msgstr "E891: ŠÖ”ŽQÆŒ^‚ð•‚“®¬”“_”‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·B"
-
-msgid "E892: Using a String as a Float"
-msgstr "E892: •¶Žš—ñ‚ð•‚“®¬”“_”‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
-
-msgid "E893: Using a List as a Float"
-msgstr "E893: ƒŠƒXƒgŒ^‚ð•‚“®¬”“_”‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
-
-msgid "E894: Using a Dictionary as a Float"
-msgstr "E894: Ž«‘Œ^‚ð•‚“®¬”“_”‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
-
-msgid "E729: using Funcref as a String"
-msgstr "E729: ŠÖ”ŽQÆŒ^‚𕶎š—ñ‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
-
-msgid "E730: using List as a String"
-msgstr "E730: ƒŠƒXƒgŒ^‚𕶎š—ñ‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
-
-msgid "E731: using Dictionary as a String"
-msgstr "E731: Ž«‘Œ^‚𕶎š—ñ‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
-
-#, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: •Ï”‚ÌŒ^‚ªˆê’v‚µ‚Ü‚¹‚ñ: %s"
-
-#, c-format
-msgid "E795: Cannot delete variable %s"
-msgstr "E795: •Ï” %s ‚ðíœ‚Å‚«‚Ü‚¹‚ñ"
-
-#, c-format
-msgid "E704: Funcref variable name must start with a capital: %s"
-msgstr "E704: ŠÖ”ŽQÆŒ^•Ï”–¼‚͑啶Žš‚ÅŽn‚Ü‚ç‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ: %s"
-
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr "E705: •Ï”–¼‚ªŠù‘¶‚̊֐”–¼‚ƏՓ˂µ‚Ü‚·: %s"
-
-#, c-format
-msgid "E741: Value is locked: %s"
-msgstr "E741: ’l‚ªƒƒbƒN‚³‚ê‚Ä‚¢‚Ü‚·: %s"
-
-msgid "Unknown"
-msgstr "•s–¾"
-
-#, c-format
-msgid "E742: Cannot change value of %s"
-msgstr "E742: %s ‚Ì’l‚ð•ÏX‚Å‚«‚Ü‚¹‚ñ"
-
-msgid "E698: variable nested too deep for making a copy"
-msgstr "E698: ƒRƒs[‚ðŽæ‚é‚ɂ͕ϐ”‚Ì“ü‚êŽq‚ª[‰ß‚¬‚Ü‚·"
-
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: –¢’è‹`‚̊֐”‚Å‚·: %s"
-
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: '(' ‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
-
-msgid "E862: Cannot use g: here"
-msgstr "E862: ‚±‚±‚Å‚Í g: ‚ÍŽg‚¦‚Ü‚¹‚ñ"
-
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: •s³‚Ȉø”‚Å‚·: %s"
-
-#, c-format
-msgid "E853: Duplicate argument name: %s"
-msgstr "E853: ˆø”–¼‚ªd•¡‚µ‚Ä‚¢‚Ü‚·: %s"
-
-msgid "E126: Missing :endfunction"
-msgstr "E126: :endfunction ‚ª‚ ‚è‚Ü‚¹‚ñ"
-
-#, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E707: ŠÖ”–¼‚ª•Ï”–¼‚ƏՓ˂µ‚Ü‚·: %s"
-
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: ŠÖ” %s ‚ðÄ’è‹`‚Å‚«‚Ü‚¹‚ñ: Žg—p’†‚Å‚·"
-
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr "E746: ŠÖ”–¼‚ªƒXƒNƒŠƒvƒg‚̃tƒ@ƒCƒ‹–¼‚ƈê’v‚µ‚Ü‚¹‚ñ: %s"
-
-msgid "E129: Function name required"
-msgstr "E129: ŠÖ”–¼‚ª—v‹‚³‚ê‚Ü‚·"
-
-#, c-format
-msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr "E128: ŠÖ”–¼‚͑啶Žš‚© \"s:\" ‚ÅŽn‚Ü‚ç‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ: %s"
-
-#, c-format
-msgid "E884: Function name cannot contain a colon: %s"
-msgstr "E884: ŠÖ”–¼‚ɂ̓Rƒƒ“‚ÍŠÜ‚ß‚ç‚ê‚Ü‚¹‚ñ: %s"
-
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: ŠÖ” %s ‚ðíœ‚Å‚«‚Ü‚¹‚ñ: Žg—p’†‚Å‚·"
-
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: ŠÖ”ŒÄo‚Ì“ü‚êŽq”‚ª 'maxfuncdepth' ‚ð’´‚¦‚Ü‚µ‚½"
-
-#, c-format
-msgid "calling %s"
-msgstr "%s ‚ðŽÀs’†‚Å‚·"
-
-#, c-format
-msgid "%s aborted"
-msgstr "%s ‚ª’†’f‚³‚ê‚Ü‚µ‚½"
-
-#, c-format
-msgid "%s returning #%ld"
-msgstr "%s ‚ª #%ld ‚ð•Ô‚µ‚Ü‚µ‚½"
-
-#, c-format
-msgid "%s returning %s"
-msgstr "%s ‚ª %s ‚ð•Ô‚µ‚Ü‚µ‚½"
-
-#, c-format
-msgid "continuing in %s"
-msgstr "%s ‚ÌŽÀs‚ðŒp‘±’†‚Å‚·"
-
-msgid "E133: :return not inside a function"
-msgstr "E133: ŠÖ”ŠO‚É :return ‚ª‚ ‚è‚Ü‚µ‚½"
-
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# ƒOƒ[ƒoƒ‹•Ï”:\n"
-
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\tLast set from "
-
-msgid "No old files"
-msgstr "ŒÃ‚¢ƒtƒ@ƒCƒ‹‚Í‚ ‚è‚Ü‚¹‚ñ"
+msgid "E921: Invalid callback argument"
+msgstr "E921: –³Œø‚ȃR[ƒ‹ƒoƒbƒNˆø”‚Å‚·"
 
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
@@ -929,6 +855,10 @@
 msgstr "E137: viminfoƒtƒ@ƒCƒ‹‚ª‘ž‚Ý‚Å‚«‚Ü‚¹‚ñ: %s"
 
 #, c-format
+msgid "E929: Too many viminfo temp files, like %s!"
+msgstr "E929: ˆêŽžviminfoƒtƒ@ƒCƒ‹‚ª‘½‰ß‚¬‚Ü‚·! —á: %s"
+
+#, c-format
 msgid "E138: Can't write viminfo file %s!"
 msgstr "E138: viminfoƒtƒ@ƒCƒ‹ %s ‚ð•Û‘¶‚Å‚«‚Ü‚¹‚ñ!"
 
@@ -1098,8 +1028,8 @@
 msgstr "Žc”O‚Å‚·‚ªƒwƒ‹ƒvƒtƒ@ƒCƒ‹ \"%s\" ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
 
 #, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: ƒfƒBƒŒƒNƒgƒŠ‚Å‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
+msgid "E151: No match: %s"
+msgstr "E151: ƒ}ƒbƒ`‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
 
 #, c-format
 msgid "E152: Cannot open %s for writing"
@@ -1119,6 +1049,10 @@
 msgstr "E154: ƒ^ƒO \"%s\" ‚ªƒtƒ@ƒCƒ‹ %s/%s ‚ɏd•¡‚µ‚Ä‚¢‚Ü‚·"
 
 #, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: ƒfƒBƒŒƒNƒgƒŠ‚Å‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
+
+#, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: –¢’m‚ÌsignƒRƒ}ƒ“ƒh‚Å‚·: %s"
 
@@ -1143,6 +1077,9 @@
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: –³Œø‚ȃoƒbƒtƒ@–¼‚Å‚·: %s"
 
+msgid "E934: Cannot jump to a buffer that does not have a name"
+msgstr "E934: –¼‘O‚Ì–³‚¢ƒoƒbƒtƒ@‚ւ̓Wƒƒƒ“ƒv‚Å‚«‚Ü‚¹‚ñ"
+
 #, c-format
 msgid "E157: Invalid sign ID: %ld"
 msgstr "E157: –³Œø‚ÈsignŽ¯•ÊŽq‚Å‚·: %ld"
@@ -1161,6 +1098,9 @@
 msgid "[Deleted]"
 msgstr "[íœÏ]"
 
+msgid "No old files"
+msgstr "ŒÃ‚¢ƒtƒ@ƒCƒ‹‚Í‚ ‚è‚Ü‚¹‚ñ"
+
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "ƒfƒoƒbƒOƒ‚[ƒh‚É“ü‚è‚Ü‚·. ‘±‚¯‚é‚É‚Í \"cont\" ‚Æ“ü—Í‚µ‚Ä‚­‚¾‚³‚¢."
 
@@ -1233,8 +1173,8 @@
 msgstr "\"%s\" ‚ðŒŸõ’†"
 
 #, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "'runtimepath' ‚Ì’†‚É‚ÍŒ©‚‚©‚è‚Ü‚¹‚ñ: \"%s\""
+msgid "not found in '%s': \"%s\""
+msgstr "'%s' ‚Ì’†‚É‚Í‚ ‚è‚Ü‚¹‚ñ: \"%s\""
 
 msgid "Source Vim script"
 msgstr "VimƒXƒNƒŠƒvƒg‚̎捞‚Ý"
@@ -1263,6 +1203,10 @@
 msgid "finished sourcing %s"
 msgstr "%s ‚̎捞‚ðŠ®—¹"
 
+#, c-format
+msgid "continuing in %s"
+msgstr "%s ‚ÌŽÀs‚ðŒp‘±’†‚Å‚·"
+
 msgid "modeline"
 msgstr "ƒ‚[ƒhs"
 
@@ -1466,6 +1410,9 @@
 msgid "E466: :winpos requires two number arguments"
 msgstr "E466: :winpos ‚É‚Í2‚‚̐”’l‚̈ø”‚ª•K—v‚Å‚·"
 
+msgid "E930: Cannot use :redir inside execute()"
+msgstr "E930: execute() ‚Ì’†‚Å‚Í :redir ‚ÍŽg‚¦‚Ü‚¹‚ñ"
+
 msgid "Save Redirection"
 msgstr "ƒŠƒ_ƒCƒŒƒNƒg‚ð•Û‘¶‚µ‚Ü‚·"
 
@@ -1674,6 +1621,9 @@
 msgid "Input Line"
 msgstr "“ü—͍s"
 
+msgid "Debug Line"
+msgstr "ƒfƒoƒbƒOs"
+
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar ‚ªƒRƒ}ƒ“ƒh’·‚ð’´‚¦‚Ü‚µ‚½"
 
@@ -1919,11 +1869,6 @@
 msgid "%lld characters"
 msgstr "%lld •¶Žš"
 
-#. Explicit typecast avoids warning on Mac OS X 10.6
-#, c-format
-msgid "%ld characters"
-msgstr "%ld •¶Žš"
-
 msgid "[noeol]"
 msgstr "[noeol]"
 
@@ -2003,9 +1948,6 @@
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: \"%s\" ‚̓Šƒ[ƒh‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
 
-msgid "--Deleted--"
-msgstr "--íœÏ--"
-
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "autocommand: %s <ƒoƒbƒtƒ@=%d> ‚ªŽ©“®“I‚ɍ폜‚³‚ê‚Ü‚·"
@@ -2015,6 +1957,12 @@
 msgid "E367: No such group: \"%s\""
 msgstr "E367: ‚»‚̃Oƒ‹[ƒv‚Í‚ ‚è‚Ü‚¹‚ñ: \"%s\""
 
+msgid "W19: Deleting augroup that is still in use"
+msgstr "W19: Žg—p’†‚Ì augroup ‚ðÁ‚»‚¤‚Æ‚µ‚Ä‚¢‚Ü‚·"
+
+msgid "--Deleted--"
+msgstr "--íœÏ--"
+
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: * ‚ÌŒã‚É•s³‚È•¶Žš‚ª‚ ‚è‚Ü‚µ‚½: %s"
@@ -2076,8 +2024,10 @@
 msgstr "E351: Œ»Ý‚Ì 'foldmethod' ‚ł͐܏ô‚Ý‚ðíœ‚Å‚«‚Ü‚¹‚ñ"
 
 #, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld s‚ªÜô‚Ü‚ê‚Ü‚µ‚½ "
+msgid "+--%3ld line folded "
+msgid_plural "+--%3ld lines folded "
+msgstr[0] "+--%3ld s‚ªÜô‚Ü‚ê‚Ü‚µ‚½ "
+msgstr[1] "+--%3ld s‚ªÜô‚Ü‚ê‚Ü‚µ‚½ "
 
 msgid "E222: Add to read buffer"
 msgstr "E222: “Ǎžƒoƒbƒtƒ@‚֒ljÁ"
@@ -2170,6 +2120,18 @@
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: ƒƒbƒZ[ƒW‚ƃR[ƒ‹ƒoƒbƒN‚Ì‚ ‚é BalloonEval ‚ðì¬‚Å‚«‚Ü‚¹‚ñ"
 
+msgid "_Cancel"
+msgstr "ƒLƒƒƒ“ƒZƒ‹(_C)"
+
+msgid "_Save"
+msgstr "•Û‘¶(_S)"
+
+msgid "_Open"
+msgstr "ŠJ‚­(_O)"
+
+msgid "_OK"
+msgstr "_OK"
+
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -2179,6 +2141,12 @@
 "‚¢‚¢‚¦(&N)\n"
 "ƒLƒƒƒ“ƒZƒ‹(&C)"
 
+msgid "Yes"
+msgstr "‚Í‚¢"
+
+msgid "No"
+msgstr "‚¢‚¢‚¦"
+
 msgid "Input _Methods"
 msgstr "ƒCƒ“ƒvƒbƒgƒƒ\\ƒbƒh"
 
@@ -2212,18 +2180,18 @@
 msgid "Down"
 msgstr "‰º"
 
-#. 'Find Next' button
 msgid "Find Next"
 msgstr "ŽŸ‚ðŒŸõ"
 
-#. 'Replace' button
 msgid "Replace"
 msgstr "’uŠ·"
 
-#. 'Replace All' button
 msgid "Replace All"
 msgstr "‘S‚Ä’uŠ·"
 
+msgid "_Close"
+msgstr "•Â‚¶‚é(_C)"
+
 msgid "Vim: Received \"die\" request from session manager\n"
 msgstr "Vim: ƒZƒbƒVƒ‡ƒ“ƒ}ƒl[ƒWƒƒ‚©‚ç \"die\" —v‹‚ðŽó‚¯Žæ‚è‚Ü‚µ‚½\n"
 
@@ -2275,17 +2243,6 @@
 msgid "&Undo"
 msgstr "ƒAƒ“ƒhƒD(&U)"
 
-#, c-format
-msgid "E671: Cannot find window title \"%s\""
-msgstr "E671: ƒ^ƒCƒgƒ‹‚ª \"%s\" ‚̃EƒBƒ“ƒhƒE‚ÍŒ©‚‚©‚è‚Ü‚¹‚ñ"
-
-#, c-format
-msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-msgstr "E243: ˆø”‚̓Tƒ|[ƒg‚³‚ê‚Ü‚¹‚ñ: \"-%s\"; OLE”Å‚ðŽg—p‚µ‚Ä‚­‚¾‚³‚¢."
-
-msgid "E672: Unable to open window inside MDI application"
-msgstr "E672: MDIƒAƒvƒŠ‚Ì’†‚ł̓EƒBƒ“ƒhƒE‚ðŠJ‚¯‚Ü‚¹‚ñ"
-
 msgid "Open tab..."
 msgstr "ƒ^ƒuƒy[ƒW‚ðŠJ‚­"
 
@@ -2303,6 +2260,17 @@
 msgid "Directory\t*.nothing\n"
 msgstr "ƒfƒBƒŒƒNƒgƒŠ\t*.nothing\n"
 
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: ƒ^ƒCƒgƒ‹‚ª \"%s\" ‚̃EƒBƒ“ƒhƒE‚ÍŒ©‚‚©‚è‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
+msgstr "E243: ˆø”‚̓Tƒ|[ƒg‚³‚ê‚Ü‚¹‚ñ: \"-%s\"; OLE”Å‚ðŽg—p‚µ‚Ä‚­‚¾‚³‚¢."
+
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: MDIƒAƒvƒŠ‚Ì’†‚ł̓EƒBƒ“ƒhƒE‚ðŠJ‚¯‚Ü‚¹‚ñ"
+
 msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
 msgstr "Vim E458: FŽw’肪³‚µ‚­‚È‚¢‚̂ŃGƒ“ƒgƒŠ‚ðŠ„‚è“–‚Ä‚ç‚ê‚Ü‚¹‚ñ"
 
@@ -2564,6 +2532,7 @@
 
 msgid ""
 "\n"
+"       a: Find assignments to this symbol\n"
 "       c: Find functions calling this function\n"
 "       d: Find functions called by this function\n"
 "       e: Find this egrep pattern\n"
@@ -2574,6 +2543,7 @@
 "       t: Find this text string\n"
 msgstr ""
 "\n"
+"       a: ‚±‚̃Vƒ“ƒ{ƒ‹‚ɑ΂·‚é‘ã“ü‚ð’T‚·\n"
 "       c: ‚±‚̊֐”‚ðŒÄ‚ñ‚Å‚¢‚éŠÖ”‚ð’T‚·\n"
 "       d: ‚±‚̊֐”‚©‚çŒÄ‚ñ‚Å‚¢‚éŠÖ”‚ð’T‚·\n"
 "       e: ‚±‚Ìegrepƒpƒ^[ƒ“‚ð’T‚·\n"
@@ -2701,19 +2671,6 @@
 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‚Í–³Œø‚Å‚·, ‚²‚ß‚ñ‚È‚³‚¢: 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‚¦‚Ü‚¹‚ñ"
 
@@ -2769,95 +2726,6 @@
 msgid "E273: unknown longjmp status %d"
 msgstr "E273: –¢’m‚Ìlongjmpó‘Ô: %d"
 
-msgid "Toggle implementation/definition"
-msgstr "ŽÀ‘•‚Æ’è‹`‚ðØ‚è‘Ö‚¦‚é"
-
-msgid "Show base class of"
-msgstr "ŽŸ‚̃Nƒ‰ƒX‚ÌŠî’ê‚ð•\\Ž¦"
-
-msgid "Show overridden member function"
-msgstr "ƒI[ƒo[ƒ‰ƒCƒh‚³‚ꂽƒƒ“ƒoŠÖ”‚ð•\\Ž¦"
-
-msgid "Retrieve from file"
-msgstr "ƒtƒ@ƒCƒ‹‚©‚ç‰ñ•œ‚·‚é"
-
-msgid "Retrieve from project"
-msgstr "ƒvƒƒWƒFƒNƒg‚©‚ç‰ñ•œ‚·‚é"
-
-msgid "Retrieve from all projects"
-msgstr "‘S‚ẴvƒƒWƒFƒNƒg‚©‚ç‰ñ•œ‚·‚é"
-
-msgid "Retrieve"
-msgstr "‰ñ•œ"
-
-msgid "Show source of"
-msgstr "ŽŸ‚̃\\[ƒX‚ð•\\Ž¦‚·‚é"
-
-msgid "Find symbol"
-msgstr "Œ©‚‚¯‚½ƒVƒ“ƒ{ƒ‹"
-
-msgid "Browse class"
-msgstr "ƒNƒ‰ƒX‚ðŽQÆ"
-
-msgid "Show class in hierarchy"
-msgstr "ŠK‘w‚ŃNƒ‰ƒX‚ð•\\Ž¦"
-
-msgid "Show class in restricted hierarchy"
-msgstr "ŒÀ’肳‚ꂽŠK‘w‚ŃNƒ‰ƒX‚ð•\\Ž¦"
-
-msgid "Xref refers to"
-msgstr "Xref ‚ÌŽQÆæ"
-
-msgid "Xref referred by"
-msgstr "Xref ‚ªŽQÆ‚³‚ê‚é"
-
-msgid "Xref has a"
-msgstr "Xref ‚ªŽŸ‚Ì‚à‚Ì‚ð‚à‚Á‚Ä‚¢‚Ü‚·"
-
-msgid "Xref used by"
-msgstr "Xref ‚ªŽg—p‚³‚ê‚é"
-
-msgid "Show docu of"
-msgstr "ŽŸ‚Ì•¶Í‚ð•\\Ž¦"
-
-msgid "Generate docu for"
-msgstr "ŽŸ‚Ì•¶Í‚𐶐¬"
-
-msgid ""
-"Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-"$PATH).\n"
-msgstr ""
-"SNiFF+‚ɐڑ±‚Å‚«‚Ü‚¹‚ñ. ŠÂ‹«‚ðƒ`ƒFƒbƒN‚µ‚Ä‚­‚¾‚³‚¢(sniffemacs ‚ª $PATH ‚É‚È‚¯"
-"‚ê‚΂Ȃè‚Ü‚¹‚ñ).\n"
-
-msgid "E274: Sniff: Error during read. Disconnected"
-msgstr "E274: Sniff: “Ǎž’†‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½. Ø’f‚µ‚Ü‚µ‚½"
-
-msgid "SNiFF+ is currently "
-msgstr "Œ»ÝSNiFF+ ‚̏ó‘Ԃ́u"
-
-msgid "not "
-msgstr "–¢"
-
-msgid "connected"
-msgstr "Ú‘±v‚Å‚·"
-
-#, c-format
-msgid "E275: Unknown SNiFF+ request: %s"
-msgstr "E275: –¢’m‚Ì SNiFF+ ƒŠƒNƒGƒXƒg‚Å‚·: %s"
-
-msgid "E276: Error connecting to SNiFF+"
-msgstr "E276: SNiFF+ ‚ւ̐ڑ±’†‚̃Gƒ‰[‚Å‚·"
-
-msgid "E278: SNiFF+ not connected"
-msgstr "E278: SNiFF+ ‚ɐڑ±‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-
-msgid "E279: Not a SNiFF+ buffer"
-msgstr "E279: SNiFF+ ƒoƒbƒtƒ@‚ª‚ ‚è‚Ü‚¹‚ñ"
-
-msgid "Sniff: Error during write. Disconnected"
-msgstr "Sniff: ‘ž‚Ý’†‚ɃGƒ‰[‚ª”­¶‚µ‚½‚̂Őؒf‚µ‚Ü‚µ‚½"
-
 msgid "invalid buffer number"
 msgstr "–³Œø‚ȃoƒbƒtƒ@”ԍ†‚Å‚·"
 
@@ -2944,6 +2812,14 @@
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: VIM ŽÀ‘Ì‚Ì“o˜^ƒvƒƒpƒeƒB‚ª•s³‚Å‚·. Á‹Ž‚µ‚Ü‚µ‚½!"
 
+#, c-format
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: ƒŠƒXƒgŒ^‚ɃJƒ“ƒ}‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
+
+#, c-format
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: ƒŠƒXƒgŒ^‚̍Ōã‚É ']' ‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
+
 msgid "Unknown option argument"
 msgstr "–¢’m‚̃IƒvƒVƒ‡ƒ“ˆø”‚Å‚·"
 
@@ -2969,12 +2845,12 @@
 msgid "netbeans is not supported with this GUI\n"
 msgstr "netbeans ‚Í‚±‚ÌGUI‚Å‚Í—˜—p‚Å‚«‚Ü‚¹‚ñ\n"
 
-msgid "This Vim was not compiled with the diff feature."
-msgstr "‚±‚ÌVim‚É‚Ídiff‹@”\\‚ª‚ ‚è‚Ü‚¹‚ñ(ƒRƒ“ƒpƒCƒ‹ŽžÝ’è)."
-
 msgid "'-nb' cannot be used: not enabled at compile time\n"
 msgstr "'-nb' Žg—p•s‰Â”\\‚Å‚·: ƒRƒ“ƒpƒCƒ‹Žž‚É–³Œø‚É‚³‚ê‚Ä‚¢‚Ü‚·\n"
 
+msgid "This Vim was not compiled with the diff feature."
+msgstr "‚±‚ÌVim‚É‚Ídiff‹@”\\‚ª‚ ‚è‚Ü‚¹‚ñ(ƒRƒ“ƒpƒCƒ‹ŽžÝ’è)."
+
 msgid "Attempt to open script file again: \""
 msgstr "ƒXƒNƒŠƒvƒgƒtƒ@ƒCƒ‹‚ðÄ‚ÑŠJ‚¢‚Ä‚Ý‚Ü‚·: \""
 
@@ -2987,6 +2863,9 @@
 msgid "Vim: Error: Failure to start gvim from NetBeans\n"
 msgstr "Vim: ƒGƒ‰[: NetBeans‚©‚çgvim‚ðƒXƒ^[ƒg‚Å‚«‚Ü‚¹‚ñ\n"
 
+msgid "Vim: Error: This version of Vim does not run in a Cygwin terminal\n"
+msgstr "Vim: ƒGƒ‰[: ‚±‚̃o[ƒWƒ‡ƒ“‚ÌVim‚ÍCygwin’[––‚Å‚Í“®ì‚µ‚Ü‚¹‚ñ\n"
+
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim: Œx: ’[––‚ւ̏o—Í‚Å‚Í‚ ‚è‚Ü‚¹‚ñ\n"
 
@@ -3151,6 +3030,9 @@
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminal>\t’[––‚ð <terminal> ‚ɐݒ肷‚é"
 
+msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
+msgstr "--not-a-term\t\t“üo—Í‚ª’[––‚Å‚È‚¢‚Æ‚ÌŒx‚ðƒXƒLƒbƒv‚·‚é"
+
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\t.vimrc‚Ì‘ã‚í‚è‚É <vimrc> ‚ðŽg‚¤"
 
@@ -3821,15 +3703,13 @@
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
 "    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
+"    file when making changes.  Quit, or continue with caution.\n"
 msgstr ""
 "\n"
 "(1) •Ê‚̃vƒƒOƒ‰ƒ€‚ª“¯‚¶ƒtƒ@ƒCƒ‹‚ð•ÒW‚µ‚Ä‚¢‚é‚©‚à‚µ‚ê‚Ü‚¹‚ñ.\n"
 "    ‚±‚̏ꍇ‚É‚Í, •ÏX‚ð‚µ‚Ä‚µ‚Ü‚¤‚Æ1‚‚̃tƒ@ƒCƒ‹‚ɑ΂µ‚ĈقȂé2‚‚Ì\n"
-"    ƒCƒ“ƒXƒ^ƒ“ƒX‚ª‚Å‚«‚Ä‚µ‚Ü‚¤‚Ì‚Å, ‚»‚¤‚µ‚È‚¢‚悤‚É‹C‚ð‚‚¯‚Ä‚­‚¾‚³‚¢."
-
-msgid "  Quit, or continue with caution.\n"
-msgstr "    I—¹‚·‚é‚©, ’ˆÓ‚µ‚È‚ª‚瑱‚¯‚Ä‚­‚¾‚³‚¢.\n"
+"    ƒCƒ“ƒXƒ^ƒ“ƒX‚ª‚Å‚«‚Ä‚µ‚Ü‚¤‚Ì‚Å, ‚»‚¤‚µ‚È‚¢‚悤‚É‹C‚ð‚‚¯‚Ä‚­‚¾‚³‚¢.\n"
+"    I—¹‚·‚é‚©, ’ˆÓ‚µ‚È‚ª‚瑱‚¯‚Ä‚­‚¾‚³‚¢.\n"
 
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) ‚±‚̃tƒ@ƒCƒ‹‚̕ҏWƒZƒbƒVƒ‡ƒ“‚ªƒNƒ‰ƒbƒVƒ…‚µ‚½.\n"
@@ -4275,25 +4155,27 @@
 msgstr "%ld —ñ; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "‘I‘ð %s%ld / %ld s; %ld / %ld ’PŒê; %ld / %ld ƒoƒCƒg"
+msgid "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes"
+msgstr "‘I‘ð %s%ld / %ld s; %lld / %lld ’PŒê; %lld / %lld ƒoƒCƒg"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
-"Bytes"
-msgstr "‘I‘ð %s%ld / %ld s; %ld / %ld ’PŒê; %ld / %ld •¶Žš; %ld / %ld ƒoƒCƒg"
-
-#, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "—ñ %s / %s; s %ld of %ld; ’PŒê %ld / %ld; ƒoƒCƒg %ld / %ld"
-
-#, c-format
-msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
+"%lld Bytes"
 msgstr ""
-"—ñ %s / %s; s %ld / %ld; ’PŒê %ld / %ld; •¶Žš %ld / %ld; ƒoƒCƒg %ld of %ld"
+"‘I‘ð %s%ld / %ld s; %lld / %lld ’PŒê; %lld / %lld •¶Žš; %lld / %lld ƒoƒCƒg"
+
+#, c-format
+msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
+msgstr "—ñ %s / %s; s %ld of %ld; ’PŒê %lld / %lld; ƒoƒCƒg %lld / %lld"
+
+#, c-format
+msgid ""
+"Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
+"%lld of %lld"
+msgstr ""
+"—ñ %s / %s; s %ld / %ld; ’PŒê %lld / %lld; •¶Žš %lld / %lld; ƒoƒCƒg %lld of "
+"%lld"
 
 #, c-format
 msgid "(+%ld for BOM)"
@@ -4526,7 +4408,7 @@
 msgstr "ƒƒbƒZ[ƒW"
 
 msgid "'columns' is not 80, cannot execute external commands"
-msgstr "'columns' ‚ª80‚Å‚Í‚È‚¢‚½‚ß, ŠO•”ƒRƒ}ƒ“ƒh‚ðŽÀs‚Å‚«‚Ü‚¹‚ñ"
+msgstr "'columns' ‚ª 80 ‚Å‚Í‚È‚¢‚½‚߁AŠO•”ƒRƒ}ƒ“ƒh‚ðŽÀs‚Å‚«‚Ü‚¹‚ñ"
 
 msgid "E237: Printer selection failed"
 msgstr "E237: ƒvƒŠƒ“ƒ^‚Ì‘I‘ð‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
@@ -4552,6 +4434,10 @@
 msgstr "E244: •¶ŽšƒZƒbƒg–¼ \"%s\" ‚Í•s³‚Å‚· (ƒtƒHƒ“ƒg–¼ \"%s\")"
 
 #, c-format
+msgid "E244: Illegal quality name \"%s\" in font name \"%s\""
+msgstr "E244: •iŽ¿–¼ \"%s\" ‚Í•s³‚Å‚· (ƒtƒHƒ“ƒg–¼ \"%s\")"
+
+#, c-format
 msgid "E245: Illegal char '%c' in font name \"%s\""
 msgstr "E245: '%c' ‚Í•s³‚È•¶Žš‚Å‚· (ƒtƒHƒ“ƒg–¼ \"%s\")"
 
@@ -4596,13 +4482,6 @@
 
 msgid ""
 "\n"
-"Cannot execute shell "
-msgstr ""
-"\n"
-"ƒVƒFƒ‹‚ðŽÀs‚Å‚«‚Ü‚¹‚ñ "
-
-msgid ""
-"\n"
 "Cannot execute shell sh\n"
 msgstr ""
 "\n"
@@ -4631,6 +4510,13 @@
 
 msgid ""
 "\n"
+"Cannot execute shell "
+msgstr ""
+"\n"
+"ƒVƒFƒ‹‚ðŽÀs‚Å‚«‚Ü‚¹‚ñ "
+
+msgid ""
+"\n"
 "Command terminated\n"
 msgstr ""
 "\n"
@@ -4672,10 +4558,6 @@
 msgstr "DLL‚©‚çŠÖ”ƒ|ƒCƒ“ƒ^‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
 
 #, c-format
-msgid "shell returned %d"
-msgstr "ƒVƒFƒ‹‚ªƒR[ƒh %d ‚ŏI—¹‚µ‚Ü‚µ‚½"
-
-#, c-format
 msgid "Vim: Caught %s event\n"
 msgstr "Vim: ƒCƒxƒ“ƒg %s ‚ðŒŸ’m\n"
 
@@ -4704,6 +4586,10 @@
 msgstr "Vim‚ÌŒx"
 
 #, c-format
+msgid "shell returned %d"
+msgstr "ƒVƒFƒ‹‚ªƒR[ƒh %d ‚ŏI—¹‚µ‚Ü‚µ‚½"
+
+#, c-format
 msgid "E372: Too many %%%c in format string"
 msgstr "E372: ƒtƒH[ƒ}ƒbƒg•¶Žš—ñ‚É %%%c ‚ª‘½‰ß‚¬‚Ü‚·"
 
@@ -4726,6 +4612,7 @@
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: ƒtƒH[ƒ}ƒbƒg•¶Žš—ñ‚É–³Œø‚È %%%c ‚ª‚ ‚è‚Ü‚·"
 
+#. nothing found
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat' ‚Ƀpƒ^[ƒ“‚ªŽw’肳‚ê‚Ä‚¢‚Ü‚¹‚ñ"
 
@@ -4735,6 +4622,15 @@
 msgid "E553: No more items"
 msgstr "E553: —v‘f‚ª‚à‚¤‚ ‚è‚Ü‚¹‚ñ"
 
+msgid "E924: Current window was closed"
+msgstr "E924: Œ»Ý‚̃EƒBƒ“ƒhƒE‚ª•Â‚¶‚ç‚ê‚Ü‚µ‚½"
+
+msgid "E925: Current quickfix was changed"
+msgstr "E925: Œ»Ý‚Ì quickfix ‚ª•ÏX‚³‚ê‚Ü‚µ‚½"
+
+msgid "E926: Current location list was changed"
+msgstr "E926: Œ»Ý‚̃ƒP[ƒVƒ‡ƒ“ƒŠƒXƒg‚ª•ÏX‚³‚ê‚Ü‚µ‚½"
+
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d of %d)%s%s: "
@@ -4742,15 +4638,18 @@
 msgid " (line deleted)"
 msgstr " (s‚ªíœ‚³‚ê‚Ü‚µ‚½)"
 
+#, c-format
+msgid "%serror list %d of %d; %d errors "
+msgstr "%s ƒGƒ‰[ˆê—— %d of %d; %d ŒÂƒGƒ‰["
+
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: quickfix ƒXƒ^ƒbƒN‚Ì––”ö‚Å‚·"
 
 msgid "E381: At top of quickfix stack"
 msgstr "E381: quickfix ƒXƒ^ƒbƒN‚̐擪‚Å‚·"
 
-#, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "ƒGƒ‰[ˆê—— %d of %d; %d ŒÂƒGƒ‰["
+msgid "No entries"
+msgstr "ƒGƒ“ƒgƒŠ‚ª‚ ‚è‚Ü‚¹‚ñ"
 
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: 'buftype' ƒIƒvƒVƒ‡ƒ“‚ªÝ’肳‚ê‚Ä‚¢‚é‚̂ŏ‘ž‚Ý‚Ü‚¹‚ñ"
@@ -4986,9 +4885,6 @@
 msgid " Arabic"
 msgstr " ƒAƒ‰ƒrƒA"
 
-msgid " (lang)"
-msgstr " (Œ¾Œê)"
-
 msgid " (paste)"
 msgstr " (“\\‚è•t‚¯)"
 
@@ -5083,8 +4979,49 @@
 "# ÅŒã‚Ì %sŒŸõƒpƒ^[ƒ“:\n"
 "~"
 
-msgid "E759: Format error in spell file"
-msgstr "E759: ƒXƒyƒ‹ƒtƒ@ƒCƒ‹‚̏‘Ž®ƒGƒ‰[‚Å‚·"
+msgid "E756: Spell checking is not enabled"
+msgstr "E756: ƒXƒyƒ‹ƒ`ƒFƒbƒN‚Í–³Œø‰»‚³‚ê‚Ä‚¢‚Ü‚·"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
+msgstr ""
+"Œx: ’PŒêƒŠƒXƒg \"%s_%s.spl\" ‚¨‚æ‚Ñ \"%s_ascii.spl\" ‚ÍŒ©‚‚©‚è‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+msgstr ""
+"Œx: ’PŒêƒŠƒXƒg \"%s.%s.spl\" ‚¨‚æ‚Ñ \"%s.ascii.spl\" ‚ÍŒ©‚‚©‚è‚Ü‚¹‚ñ"
+
+msgid "E797: SpellFileMissing autocommand deleted buffer"
+msgstr "E797: autocommand ‚Ì SpellFileMissing ‚ªƒoƒbƒtƒ@‚ðíœ‚µ‚Ü‚µ‚½"
+
+#, c-format
+msgid "Warning: region %s not supported"
+msgstr "Œx9: %s ‚Æ‚¢‚¤”͈͂̓Tƒ|[ƒg‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
+
+msgid "Sorry, no suggestions"
+msgstr "Žc”O‚Å‚·‚ª, C³Œó•â‚Í‚ ‚è‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "Žc”O‚Å‚·‚ª, C³Œó•â‚Í %ld ŒÂ‚µ‚©‚ ‚è‚Ü‚¹‚ñ"
+
+#. for when 'cmdheight' > 1
+#. avoid more prompt
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "\"%.*s\" ‚ðŽŸ‚Ö•ÏŠ·:"
+
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
+msgid "E752: No previous spell replacement"
+msgstr "E752: ƒXƒyƒ‹’uŠ·‚ª‚Ü‚¾ŽÀs‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: Œ©‚‚©‚è‚Ü‚¹‚ñ: %s"
 
 msgid "E758: Truncated spell file"
 msgstr "E758: ƒXƒyƒ‹ƒtƒ@ƒCƒ‹‚ªØŽæ‚ç‚ê‚Ä‚¢‚é‚悤‚Å‚·"
@@ -5107,19 +5044,6 @@
 msgid "Compressing word tree..."
 msgstr "’PŒêƒcƒŠ[‚ðˆ³k‚µ‚Ä‚¢‚Ü‚·..."
 
-msgid "E756: Spell checking is not enabled"
-msgstr "E756: ƒXƒyƒ‹ƒ`ƒFƒbƒN‚Í–³Œø‰»‚³‚ê‚Ä‚¢‚Ü‚·"
-
-#, c-format
-msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
-msgstr ""
-"Œx: ’PŒêƒŠƒXƒg \"%s_%s.spl\" ‚¨‚æ‚Ñ \"%s_ascii.spl\" ‚ÍŒ©‚‚©‚è‚Ü‚¹‚ñ"
-
-#, c-format
-msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-msgstr ""
-"Œx: ’PŒêƒŠƒXƒg \"%s.%s.spl\" ‚¨‚æ‚Ñ \"%s.ascii.spl\" ‚ÍŒ©‚‚©‚è‚Ü‚¹‚ñ"
-
 #, c-format
 msgid "Reading spell file \"%s\""
 msgstr "ƒXƒyƒ‹ƒtƒ@ƒCƒ‹ \"%s\" ‚ð“Ǎž’†"
@@ -5137,8 +5061,24 @@
 msgstr "E770: ƒXƒyƒ‹ƒtƒ@ƒCƒ‹‚ɃTƒ|[ƒg‚µ‚Ä‚¢‚È‚¢ƒZƒNƒVƒ‡ƒ“‚ª‚ ‚è‚Ü‚·"
 
 #, c-format
-msgid "Warning: region %s not supported"
-msgstr "Œx9: %s ‚Æ‚¢‚¤”͈͂̓Tƒ|[ƒg‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: .sug ƒtƒ@ƒCƒ‹‚Å‚Í‚È‚¢‚悤‚Å‚·: %s"
+
+#, c-format
+msgid "E779: Old .sug file, needs to be updated: %s"
+msgstr "E779: ŒÃ‚¢ .sug ƒtƒ@ƒCƒ‹‚È‚Ì‚Å, ƒAƒbƒvƒf[ƒg‚µ‚Ä‚­‚¾‚³‚¢: %s"
+
+#, c-format
+msgid "E780: .sug file is for newer version of Vim: %s"
+msgstr "E780: ‚æ‚èV‚µ‚¢ƒo[ƒWƒ‡ƒ“‚Ì Vim —p‚Ì .sug ƒtƒ@ƒCƒ‹‚Å‚·: %s"
+
+#, c-format
+msgid "E781: .sug file doesn't match .spl file: %s"
+msgstr "E781: .sug ƒtƒ@ƒCƒ‹‚ª .spl ƒtƒ@ƒCƒ‹‚ƈê’v‚µ‚Ü‚¹‚ñ: %s"
+
+#, c-format
+msgid "E782: error while reading .sug file: %s"
+msgstr "E782: .sug ƒtƒ@ƒCƒ‹‚̓Ǎž’†‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½: %s"
 
 #, c-format
 msgid "Reading affix file %s ..."
@@ -5409,50 +5349,6 @@
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: ’PŒê‚Ì•¶Žš‚ªƒXƒyƒ‹ƒtƒ@ƒCƒ‹‚ƈقȂè‚Ü‚·"
 
-msgid "Sorry, no suggestions"
-msgstr "Žc”O‚Å‚·‚ª, C³Œó•â‚Í‚ ‚è‚Ü‚¹‚ñ"
-
-#, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "Žc”O‚Å‚·‚ª, C³Œó•â‚Í %ld ŒÂ‚µ‚©‚ ‚è‚Ü‚¹‚ñ"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "\"%.*s\" ‚ðŽŸ‚Ö•ÏŠ·:"
-
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
-msgid "E752: No previous spell replacement"
-msgstr "E752: ƒXƒyƒ‹’uŠ·‚ª‚Ü‚¾ŽÀs‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: Œ©‚‚©‚è‚Ü‚¹‚ñ: %s"
-
-#, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E778: .sug ƒtƒ@ƒCƒ‹‚Å‚Í‚È‚¢‚悤‚Å‚·: %s"
-
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: ŒÃ‚¢ .sug ƒtƒ@ƒCƒ‹‚È‚Ì‚Å, ƒAƒbƒvƒf[ƒg‚µ‚Ä‚­‚¾‚³‚¢: %s"
-
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr "E780: ‚æ‚èV‚µ‚¢ƒo[ƒWƒ‡ƒ“‚Ì Vim —p‚Ì .sug ƒtƒ@ƒCƒ‹‚Å‚·: %s"
-
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr "E781: .sug ƒtƒ@ƒCƒ‹‚ª .spl ƒtƒ@ƒCƒ‹‚ƈê’v‚µ‚Ü‚¹‚ñ: %s"
-
-#, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E782: .sug ƒtƒ@ƒCƒ‹‚̓Ǎž’†‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½: %s"
-
 #. This should have been checked when generating the .spl
 #. * file.
 msgid "E783: duplicate char in MAP entry"
@@ -5789,6 +5685,9 @@
 "\n"
 "--- ’[––ƒL[ ---"
 
+msgid "Cannot open $VIMRUNTIME/rgb.txt"
+msgstr "$VIMRUNTIME/rgb.txt‚ðŠJ‚¯‚Ü‚¹‚ñ"
+
 msgid "new shell started\n"
 msgstr "V‚µ‚¢ƒVƒFƒ‹‚ð‹N“®‚µ‚Ü‚·\n"
 
@@ -5936,6 +5835,130 @@
 msgid "E440: undo line missing"
 msgstr "E440: ƒAƒ“ƒhƒDs‚ª‚ ‚è‚Ü‚¹‚ñ"
 
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: ŠÖ” %s ‚Í’è‹`Ï‚Å‚·, Ä’è‹`‚·‚é‚É‚Í ! ‚ð’ljÁ‚µ‚Ä‚­‚¾‚³‚¢"
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: Ž«‘Œ^“à‚ɃGƒ“ƒgƒŠ‚ªŠù‚É‘¶Ý‚µ‚Ü‚·"
+
+msgid "E718: Funcref required"
+msgstr "E718: ŠÖ”ŽQÆŒ^‚ª—v‹‚³‚ê‚Ü‚·"
+
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: –¢’m‚̊֐”‚Å‚·: %s"
+
+#, c-format
+msgid "E125: Illegal argument: %s"
+msgstr "E125: •s³‚Ȉø”‚Å‚·: %s"
+
+#, c-format
+msgid "E853: Duplicate argument name: %s"
+msgstr "E853: ˆø”–¼‚ªd•¡‚µ‚Ä‚¢‚Ü‚·: %s"
+
+#, c-format
+msgid "E740: Too many arguments for function %s"
+msgstr "E740: ŠÖ”‚̈ø”‚ª‘½‰ß‚¬‚Ü‚·: %s"
+
+#, c-format
+msgid "E116: Invalid arguments for function %s"
+msgstr "E116: ŠÖ”‚Ì–³Œø‚Ȉø”‚Å‚·: %s"
+
+msgid "E132: Function call depth is higher than 'maxfuncdepth'"
+msgstr "E132: ŠÖ”ŒÄo‚Ì“ü‚êŽq”‚ª 'maxfuncdepth' ‚ð’´‚¦‚Ü‚µ‚½"
+
+#, c-format
+msgid "calling %s"
+msgstr "%s ‚ðŽÀs’†‚Å‚·"
+
+#, c-format
+msgid "%s aborted"
+msgstr "%s ‚ª’†’f‚³‚ê‚Ü‚µ‚½"
+
+#, c-format
+msgid "%s returning #%ld"
+msgstr "%s ‚ª #%ld ‚ð•Ô‚µ‚Ü‚µ‚½"
+
+#, c-format
+msgid "%s returning %s"
+msgstr "%s ‚ª %s ‚ð•Ô‚µ‚Ü‚µ‚½"
+
+msgid "E699: Too many arguments"
+msgstr "E699: ˆø”‚ª‘½‰ß‚¬‚Ü‚·"
+
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: –¢’m‚̊֐”‚Å‚·: %s"
+
+#, c-format
+msgid "E933: Function was deleted: %s"
+msgstr "E933: ŠÖ”‚͍폜‚³‚ê‚Ü‚µ‚½: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: ŠÖ”‚̈ø”‚ª‘«‚è‚Ü‚¹‚ñ: %s"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: ƒXƒNƒŠƒvƒgˆÈŠO‚Å<SID>‚ªŽg‚í‚ê‚Ü‚µ‚½: %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: Ž«‘—pŠÖ”‚ªŒÄ‚΂ê‚Ü‚µ‚½‚ªŽ«‘‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
+
+msgid "E129: Function name required"
+msgstr "E129: ŠÖ”–¼‚ª—v‹‚³‚ê‚Ü‚·"
+
+#, c-format
+msgid "E128: Function name must start with a capital or \"s:\": %s"
+msgstr "E128: ŠÖ”–¼‚͑啶Žš‚© \"s:\" ‚ÅŽn‚Ü‚ç‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ: %s"
+
+#, c-format
+msgid "E884: Function name cannot contain a colon: %s"
+msgstr "E884: ŠÖ”–¼‚ɂ̓Rƒƒ“‚ÍŠÜ‚ß‚ç‚ê‚Ü‚¹‚ñ: %s"
+
+#, c-format
+msgid "E123: Undefined function: %s"
+msgstr "E123: –¢’è‹`‚̊֐”‚Å‚·: %s"
+
+#, c-format
+msgid "E124: Missing '(': %s"
+msgstr "E124: '(' ‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
+
+msgid "E862: Cannot use g: here"
+msgstr "E862: ‚±‚±‚Å‚Í g: ‚ÍŽg‚¦‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "E932: Closure function should not be at top level: %s"
+msgstr "E932: ƒNƒ[ƒWƒƒ[ŠÖ”‚̓gƒbƒvƒŒƒxƒ‹‚É‹Lq‚Å‚«‚Ü‚¹‚ñ: %s"
+
+msgid "E126: Missing :endfunction"
+msgstr "E126: :endfunction ‚ª‚ ‚è‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "E707: Function name conflicts with variable: %s"
+msgstr "E707: ŠÖ”–¼‚ª•Ï”–¼‚ƏՓ˂µ‚Ü‚·: %s"
+
+#, c-format
+msgid "E127: Cannot redefine function %s: It is in use"
+msgstr "E127: ŠÖ” %s ‚ðÄ’è‹`‚Å‚«‚Ü‚¹‚ñ: Žg—p’†‚Å‚·"
+
+#, c-format
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: ŠÖ”–¼‚ªƒXƒNƒŠƒvƒg‚̃tƒ@ƒCƒ‹–¼‚ƈê’v‚µ‚Ü‚¹‚ñ: %s"
+
+#, c-format
+msgid "E131: Cannot delete function %s: It is in use"
+msgstr "E131: ŠÖ” %s ‚ðíœ‚Å‚«‚Ü‚¹‚ñ: Žg—p’†‚Å‚·"
+
+msgid "E133: :return not inside a function"
+msgstr "E133: ŠÖ”ŠO‚É :return ‚ª‚ ‚è‚Ü‚µ‚½"
+
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: ƒJƒbƒR '(' ‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
+
 #. Only MS VC 4.1 and earlier can do Win32s
 msgid ""
 "\n"
@@ -5958,9 +5981,6 @@
 "\n"
 "MS-Windows 32 ƒrƒbƒg GUI ”Å"
 
-msgid " in Win32s mode"
-msgstr " in Win32s ƒ‚[ƒh"
-
 msgid " with OLE support"
 msgstr " with OLE ƒTƒ|[ƒg"
 
@@ -5980,27 +6000,6 @@
 
 msgid ""
 "\n"
-"MS-Windows 16-bit version"
-msgstr ""
-"\n"
-"MS-Windows 16 ƒrƒbƒg ”Å"
-
-msgid ""
-"\n"
-"32-bit MS-DOS version"
-msgstr ""
-"\n"
-"32 ƒrƒbƒg MS-DOS ”Å"
-
-msgid ""
-"\n"
-"16-bit MS-DOS version"
-msgstr ""
-"\n"
-"16 ƒrƒbƒg MS-DOS ”Å"
-
-msgid ""
-"\n"
 "MacOS X (unix) version"
 msgstr ""
 "\n"
@@ -6092,6 +6091,9 @@
 msgid "without GUI."
 msgstr "without GUI."
 
+msgid "with GTK3 GUI."
+msgstr "with GTK3 GUI."
+
 msgid "with GTK2-GNOME GUI."
 msgstr "with GTK2-GNOME GUI."
 
@@ -6155,6 +6157,9 @@
 msgid "3rd user gvimrc file: \""
 msgstr "  ‘æ3ƒ†[ƒU[ gvimrc: \""
 
+msgid "       defaults file: \""
+msgstr "  ƒfƒtƒHƒ‹ƒgƒtƒ@ƒCƒ‹: \""
+
 msgid "    system menu file: \""
 msgstr "    ƒVƒXƒeƒ€ƒƒjƒ…[: \""
 
@@ -6246,10 +6251,10 @@
 msgstr "Ú×‚̓ƒjƒ…[‚Ì ƒwƒ‹ƒv->ƒXƒ|ƒ“ƒT[/“o˜^ ‚ðŽQÆ‚µ‚ĉº‚³‚¢"
 
 msgid "WARNING: Windows 95/98/ME detected"
-msgstr "   Œx: Windows 95/98/Me ‚ðŒŸo  "
+msgstr "Œx: Windows 95/98/ME ‚ðŒŸo‚µ‚Ü‚µ‚½"
 
 msgid "type  :help windows95<Enter>  for info on this"
-msgstr " Ú×‚ȏî•ñ‚Í          :help windows95<Enter> "
+msgstr "Ú×‚ȏî•ñ‚Í            :help windows95<Enter>"
 
 msgid "Already only one window"
 msgstr "Šù‚ɃEƒBƒ“ƒhƒE‚Í1‚‚µ‚©‚ ‚è‚Ü‚¹‚ñ"
@@ -6282,9 +6287,38 @@
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: path‚É‚Í \"%s\" ‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹‚ª‚ ‚è‚Ü‚¹‚ñ"
 
+#, c-format
+msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E799: –³Œø‚È ID: %ld (1 ˆÈã‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ)"
+
+#, c-format
+msgid "E801: ID already taken: %ld"
+msgstr "E801: ID ‚Í‚·‚Å‚É—˜—p’†‚Å‚·: %ld"
+
 msgid "List or number required"
 msgstr "ƒŠƒXƒg‚©”’l‚ª•K—v‚Å‚·"
 
+#, c-format
+msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E802: –³Œø‚È ID: %ld (1 ˆÈã‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ)"
+
+#, c-format
+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‚Í–³Œø‚Å‚·, ‚²‚ß‚ñ‚È‚³‚¢: 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)"
 
@@ -6561,6 +6595,28 @@
 msgid "E713: Cannot use empty key for Dictionary"
 msgstr "E713: Ž«‘Œ^‚É‹ó‚̃L[‚ðŽg‚¤‚±‚Æ‚Í‚Å‚«‚Ü‚¹‚ñ"
 
+msgid "E715: Dictionary required"
+msgstr "E715: Ž«‘Œ^‚ª•K—v‚Å‚·"
+
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: ƒŠƒXƒg‚̃Cƒ“ƒfƒbƒNƒX‚ª”͈͊O‚Å‚·: %ld"
+
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: ŠÖ”‚̈ø”‚ª‘½‰ß‚¬‚Ü‚·: %s"
+
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: Ž«‘Œ^‚ɃL[‚ª‘¶Ý‚µ‚Ü‚¹‚ñ: %s"
+
+msgid "E714: List required"
+msgstr "E714: ƒŠƒXƒgŒ^‚ª•K—v‚Å‚·"
+
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: %s ‚̈ø”‚̓ŠƒXƒgŒ^‚Ü‚½‚ÍŽ«‘Œ^‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
+
 msgid "E47: Error while reading errorfile"
 msgstr "E47: ƒGƒ‰[ƒtƒ@ƒCƒ‹‚̓Ǎž’†‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½"
 
@@ -6660,6 +6716,10 @@
 msgid "E850: Invalid register name"
 msgstr "E850: –³Œø‚ȃŒƒWƒXƒ^–¼‚Å‚·"
 
+#, c-format
+msgid "E919: Directory not found in '%s': \"%s\""
+msgstr "E919: ƒfƒBƒŒƒNƒgƒŠ‚ª '%s' ‚Ì’†‚É‚ ‚è‚Ü‚¹‚ñ: \"%s\""
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "ã‚Ü‚ÅŒŸõ‚µ‚½‚̂ʼnº‚É–ß‚è‚Ü‚·"
 
@@ -6731,11 +6791,11 @@
 
 #, c-format
 msgid "expected 3-tuple as imp.find_module() result, but got %s"
-msgstr "imp.find_module() ‚ª %s ‚ð•Ô‚µ‚Ü‚µ‚½ (Šú‘Ò’l: 2 —v‘f‚̃^ƒvƒ‹)"
+msgstr "imp.find_module() ‚ª %s ‚ð•Ô‚µ‚Ü‚µ‚½ (Šú‘Ò’l: 3 —v‘f‚̃^ƒvƒ‹)"
 
 #, c-format
 msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
-msgstr "impl.find_module() ‚ª %d —v‘f‚̃^ƒvƒ‹‚ð•Ô‚µ‚Ü‚µ‚½ (Šú‘Ò’l: 2)"
+msgstr "imp.find_module() ‚ª %d —v‘f‚̃^ƒvƒ‹‚ð•Ô‚µ‚Ü‚µ‚½ (Šú‘Ò’l: 3)"
 
 msgid "internal error: imp.find_module returned tuple with NULL"
 msgstr "“à•”ƒGƒ‰[: imp.find_module ‚ª NULL ‚ðŠÜ‚Þƒ^ƒvƒ‹‚ð•Ô‚µ‚Ü‚µ‚½"
@@ -6806,9 +6866,6 @@
 msgid "function %s does not exist"
 msgstr "ŠÖ” %s ‚ª‚ ‚è‚Ü‚¹‚ñ"
 
-msgid "function constructor does not accept keyword arguments"
-msgstr "ŠÖ”‚̃Rƒ“ƒXƒgƒ‰ƒNƒ^‚̓L[ƒ[ƒhˆø”‚ðŽó‚¯•t‚¯‚Ü‚¹‚ñ"
-
 #, c-format
 msgid "failed to run function %s"
 msgstr "ŠÖ” %s ‚ÌŽÀs‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
@@ -6896,6 +6953,10 @@
 msgstr "%s vim‚ÌŽ«‘Œ^‚É•ÏŠ·‚Å‚«‚Ü‚¹‚ñ"
 
 #, c-format
+msgid "unable to convert %s to vim list"
+msgstr "%s ‚ðvim‚̃ŠƒXƒg‚É•ÏŠ·‚Å‚«‚Ü‚¹‚ñ"
+
+#, c-format
 msgid "unable to convert %s to vim structure"
 msgstr "%s ‚ðvim‚̍\\‘¢‘Ì‚É•ÏŠ·‚Å‚«‚Ü‚¹‚ñ"