Merge branch 'master' into update-for-8.1.0097

Author: k-takata

runtime/lang/menu_ja_jp.utf-8.vim

@@ -5,7 +5,7 @@
 " Last Change:		28-Jan-2016.
 "
 " Copyright (C) 2001-2016 MURAOKA Taro <koron.kaoriya@gmail.com>,
-"			  vim-jp (http://vim-jp.org/)
+"			  vim-jp <http://vim-jp.org/>
 "
 " THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
 
@@ -174,6 +174,10 @@ menutrans Set\ language\ to\ "en_nz"	言語を\ "en_nz"\ に設定する
 menutrans Set\ language\ to\ "en_us"	言語を\ "en_us"\ に設定する
 menutrans &Find\ More\ Languages	他の言語を検索する(&F)
 
+let g:menutrans_spell_change_ARG_to = '"%s"\ を変更'
+let g:menutrans_spell_add_ARG_to_word_list = '"%s"\ を単語リストに追加'
+let g:menutrans_spell_ignore_ARG = '"%s"\ を無視'
+
 " Tools.Fold Menu
 menutrans &Folding			折畳み(&F)
 " open close folds

src/po/Makefile

@@ -25,7 +25,7 @@ ja.sjis.po: $(MASTER_PO)
 
 ja.euc-jp.po: $(MASTER_PO)
 	iconv -f utf-8 -t euc-jp $< | \
-	  sed -e 's/charset=utf-8/charset=euc-jp/' -e 's/# Original translations/# Generated from ja.po, DO NOT EDIT/' > $@
+	  sed -e 's/charset=[uU][tT][fF]-8/charset=euc-jp/' -e 's/# Original translations/# Generated from ja.po, DO NOT EDIT/' > $@
 
 sjiscorr: sjiscorr.c
 	$(CC) -o $@ $<

src/po/ja.po

@@ -4,7 +4,7 @@
 # Do ":help credits" in Vim to see a list of people who contributed.
 #
 # Copyright (C) 2001-2018 MURAOKA Taro <koron.kaoriya@gmail.com>,
-# 			  vim-jp (http://vim-jp.org/)
+# 			  vim-jp <http://vim-jp.org/>
 #
 # THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
 #
@@ -17,11 +17,11 @@ msgstr ""
 "POT-Creation-Date: 2018-06-23 07:15+0900\n"
 "PO-Revision-Date: 2017-05-18 00:45+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"
+"Language-Team: Japanese <https://github.com/vim-jp/lang-ja>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 msgid "E831: bf_key_init() called with empty password"

src/po/sjiscorr.c

@@ -7,9 +7,7 @@
 #include <string.h>
 
 	int
-main(argc, argv)
-	int	argc;
-	char	**argv;
+main(int argc, char **argv)
 {
 	char buffer[BUFSIZ];
 	char *p;
@@ -18,7 +16,8 @@ main(argc, argv)
 	{
 		for (p = buffer; *p != 0; p++)
 		{
-			if (strncmp(p, "charset=utf-8", 13) == 0)
+			if (strncmp(p, "charset=utf-8", 13) == 0
+				|| strncmp(p, "charset=UTF-8", 13) == 0)
 			{
 				fputs("charset=cp932", stdout);
 				p += 12;