diff --git a/languages/ja-JP/ControlPanel.multids b/languages/ja-JP/ControlPanel.multids
index d7f7c1a5d..977db554d 100644
--- a/languages/ja-JP/ControlPanel.multids
+++ b/languages/ja-JP/ControlPanel.multids
@@ -10,8 +10,8 @@ Basics/DefaultTiddlers/BottomHint: タイトルに空白を含めたいときは
 Basics/DefaultTiddlers/Prompt: デフォルト tiddler:
 Basics/DefaultTiddlers/TopHint: このファイルを開いたときに初期表示される tiddler を設定してください:
 Basics/Language/Prompt: 現在の言語:
-Basics/NewJournal/Tags/Prompt: 日誌（journal tiddler）のタグ
 Basics/NewJournal/Title/Prompt: 日誌（journal tiddlers）のデフォルトのタイトル
+Basics/NewJournal/Tags/Prompt: 日誌（journal tiddler）のタグ
 Basics/OverriddenShadowTiddlers/Prompt: 上書きされている隠し tiddler 数:
 Basics/ShadowTiddlers/Prompt: 隠し tiddler 数:
 Basics/Subtitle/Prompt: サブタイトル:
@@ -61,7 +61,7 @@ Saving/TiddlySpot/Password: パスワード
 Saving/TiddlySpot/ServerURL: サーバーURL
 Saving/TiddlySpot/UploadDir: アップロードディレクトリ
 Saving/TiddlySpot/UserName: Wiki 名
-Settings/AutoSave/Caption: 自動保存
+Settings/AutoSave/Caption: 自動保存:
 Settings/AutoSave/Disabled/Description: 自動的に保存しない。
 Settings/AutoSave/Enabled/Description: 自動的に保存する。
 Settings/AutoSave/Hint: 自動的に保存するかどうかの設定
diff --git a/languages/ja-JP/Help/clearpassword.tid b/languages/ja-JP/Help/clearpassword.tid
new file mode 100644
index 000000000..936d9b75c
--- /dev/null
+++ b/languages/ja-JP/Help/clearpassword.tid
@@ -0,0 +1,8 @@
+title: $:/language/Help/clearpassword
+description: Clear a password for subsequent crypto operations
+
+Clear the password for subsequent crypto operations
+
+```
+--clearpassword
+```
diff --git a/languages/ja-JP/Help/password.tid b/languages/ja-JP/Help/password.tid
deleted file mode 100644
index eba91c6a2..000000000
--- a/languages/ja-JP/Help/password.tid
+++ /dev/null
@@ -1,9 +0,0 @@
-title: $:/language/Help/password
-description: Set a password for subsequent crypto operations
-
-暗号化されたファイルを扱う場合にパスワードを指定します。
-
-```
---password <password>
-```
-
diff --git a/languages/ja-JP/NewJournal.multids b/languages/ja-JP/NewJournal.multids
new file mode 100644
index 000000000..96c65ce81
--- /dev/null
+++ b/languages/ja-JP/NewJournal.multids
@@ -0,0 +1,4 @@
+title: $:/config/NewJournal/
+
+Title: YYYY年MM月DD日(ddd)
+Tags: Journal
diff --git a/languages/ja-JP/Search.multids b/languages/ja-JP/Search.multids
index fbb70c923..bb7230b56 100644
--- a/languages/ja-JP/Search.multids
+++ b/languages/ja-JP/Search.multids
@@ -1,6 +1,7 @@
 title: $:/language/Search/
 
 Advanced/Matches: //<small><<resultCount>> 件一致</small>//
+DefaultResults/Caption: List
 Filter/Caption: フィルタ
 Filter/Hint: [[フィルタ|http://tiddlywiki.com/static/Filters.html]]で検索します。 
 Filter/Matches: //<small><<resultCount>> 件一致</small>//
diff --git a/languages/ja-JP/SiteTitle.tid b/languages/ja-JP/SiteTitle.tid
index a32da7dfe..9f522664a 100644
--- a/languages/ja-JP/SiteTitle.tid
+++ b/languages/ja-JP/SiteTitle.tid
@@ -1,3 +1,3 @@
 title: $:/SiteTitle
 
-My TiddlyWiki
\ No newline at end of file
+My ~TiddlyWiki
\ No newline at end of file
diff --git a/languages/ja-JP/Types/application_javascript.tid b/languages/ja-JP/Types/application_javascript.tid
new file mode 100644
index 000000000..5b6914860
--- /dev/null
+++ b/languages/ja-JP/Types/application_javascript.tid
@@ -0,0 +1,4 @@
+title: $:/language/Docs/Types/application/javascript
+description: JavaScriptコード
+name: application/javascript
+group: Developer
diff --git a/languages/ja-JP/Types/application_json.tid b/languages/ja-JP/Types/application_json.tid
index 7b25596ee..6bbc27f14 100644
--- a/languages/ja-JP/Types/application_json.tid
+++ b/languages/ja-JP/Types/application_json.tid
@@ -1,3 +1,4 @@
 title: $:/language/Docs/Types/application/json
 description: JSON データ
 name: application/json
+group: Developer
diff --git a/languages/ja-JP/Types/application_x_tiddler_dictionary.tid b/languages/ja-JP/Types/application_x_tiddler_dictionary.tid
index 8d7626940..58f2d110c 100644
--- a/languages/ja-JP/Types/application_x_tiddler_dictionary.tid
+++ b/languages/ja-JP/Types/application_x_tiddler_dictionary.tid
@@ -1,3 +1,4 @@
 title: $:/language/Docs/Types/application/x-tiddler-dictionary
 description: データ辞書
 name: application/x-tiddler-dictionary
+group: Developer
diff --git a/languages/ja-JP/Types/image_gif.tid b/languages/ja-JP/Types/image_gif.tid
index a86f14c19..a77f77492 100644
--- a/languages/ja-JP/Types/image_gif.tid
+++ b/languages/ja-JP/Types/image_gif.tid
@@ -1,3 +1,4 @@
 title: $:/language/Docs/Types/image/gif
 description: GIF画像
 name: image/gif
+group: Image
diff --git a/languages/ja-JP/Types/image_jpeg.tid b/languages/ja-JP/Types/image_jpeg.tid
index f6c53e1e7..2fda98e6a 100644
--- a/languages/ja-JP/Types/image_jpeg.tid
+++ b/languages/ja-JP/Types/image_jpeg.tid
@@ -1,3 +1,4 @@
 title: $:/language/Docs/Types/image/jpeg
 description: JPEG画像
 name: image/jpeg
+group: Image
diff --git a/languages/ja-JP/Types/image_png.tid b/languages/ja-JP/Types/image_png.tid
index 8bad7aaab..abcfc2f67 100644
--- a/languages/ja-JP/Types/image_png.tid
+++ b/languages/ja-JP/Types/image_png.tid
@@ -1,3 +1,4 @@
 title: $:/language/Docs/Types/image/png
 description: PNG画像
 name: image/png
+group: Image
diff --git a/languages/ja-JP/Types/image_svg_xml.tid b/languages/ja-JP/Types/image_svg_xml.tid
index c451ea9a0..9f51a508a 100644
--- a/languages/ja-JP/Types/image_svg_xml.tid
+++ b/languages/ja-JP/Types/image_svg_xml.tid
@@ -1,3 +1,4 @@
 title: $:/language/Docs/Types/image/svg+xml
 description: SVG形式画像
 name: image/svg+xml
+group: Image
diff --git a/languages/ja-JP/Types/image_x-icon.tid b/languages/ja-JP/Types/image_x-icon.tid
index aac78de4f..76fc83b8d 100644
--- a/languages/ja-JP/Types/image_x-icon.tid
+++ b/languages/ja-JP/Types/image_x-icon.tid
@@ -1,3 +1,4 @@
 title: $:/language/Docs/Types/image/x-icon
 description: アイコンファイル（ICOフォーマット）
 name: image/x-icon
+group: Image
diff --git a/languages/ja-JP/Types/text_css.tid b/languages/ja-JP/Types/text_css.tid
index 8ec782cdb..2dfa804a4 100644
--- a/languages/ja-JP/Types/text_css.tid
+++ b/languages/ja-JP/Types/text_css.tid
@@ -1,3 +1,4 @@
 title: $:/language/Docs/Types/text/css
 description: CSSスタイルシート
 name: text/css
+group: Image
diff --git a/languages/ja-JP/Types/text_html.tid b/languages/ja-JP/Types/text_html.tid
index 1387cc45a..3b6a97688 100644
--- a/languages/ja-JP/Types/text_html.tid
+++ b/languages/ja-JP/Types/text_html.tid
@@ -1,3 +1,4 @@
 title: $:/language/Docs/Types/text/html
 description: HTML
 name: text/html
+group: Text
diff --git a/languages/ja-JP/Types/text_plain.tid b/languages/ja-JP/Types/text_plain.tid
index e9b12e905..def2839d0 100644
--- a/languages/ja-JP/Types/text_plain.tid
+++ b/languages/ja-JP/Types/text_plain.tid
@@ -1,3 +1,4 @@
 title: $:/language/Docs/Types/text/plain
 description: プレーンテキスト
 name: text/plain
+group: Text
diff --git a/languages/ja-JP/Types/text_vnd.tiddlywiki.tid b/languages/ja-JP/Types/text_vnd.tiddlywiki.tid
index c245adb7c..a89ce63e4 100644
--- a/languages/ja-JP/Types/text_vnd.tiddlywiki.tid
+++ b/languages/ja-JP/Types/text_vnd.tiddlywiki.tid
@@ -1,3 +1,4 @@
 title: $:/language/Docs/Types/text/vnd.tiddlywiki
-description: TiddlyWiki バージョン5形式 wikitext
+description: TiddlyWiki 5形式
 name: text/vnd.tiddlywiki
+group: Text
diff --git a/languages/ja-JP/Types/text_x-tiddlywiki.tid b/languages/ja-JP/Types/text_x-tiddlywiki.tid
index c122acecc..9b69ae65f 100644
--- a/languages/ja-JP/Types/text_x-tiddlywiki.tid
+++ b/languages/ja-JP/Types/text_x-tiddlywiki.tid
@@ -1,3 +1,4 @@
 title: $:/language/Docs/Types/text/x-tiddlywiki
-description: TiddlyWiki クラシック wikitext
+description: TiddlyWiki クラシック
 name: text/x-tiddlywiki
+group: Text
diff --git a/languages/ja-JP/plugin.info b/languages/ja-JP/plugin.info
index 55f59e1a3..acbdef21d 100644
--- a/languages/ja-JP/plugin.info
+++ b/languages/ja-JP/plugin.info
@@ -4,5 +4,5 @@
 	"plugin-type": "language",
 	"description": "Japanese (Japan)",
 	"author": "Makoto Hirohashi, OGOSHI Masayuki, pekopeko1",
-	"core-version": ">=5.0.9"
+	"core-version": ">=5.1.4"
 }