diff --git a/languages/ja-JP/ControlPanel.multids b/languages/ja-JP/ControlPanel.multids
new file mode 100644
index 000000000..0a52368c6
--- /dev/null
+++ b/languages/ja-JP/ControlPanel.multids
@@ -0,0 +1,75 @@
+title: $:/language/ControlPanel/
+
+Advanced/Caption: 高度な機能
+Advanced/Hint: Internal information about this TiddlyWiki
+Advanced/LoadedModules/Caption: Loaded Modules
+Advanced/LoadedModules/Hint: These are the currently loaded tiddler modules linked to their source tiddlers. Any italicised modules lack a source tiddler, typically because they were setup during the boot process.
+Advanced/TiddlerFields/Caption: Tiddler Fields
+Advanced/TiddlerFields/Hint: This is the full set of TiddlerFields in use in this wiki (including system tiddlers but excluding shadow tiddlers).
+Appearance/Caption: Appearance
+Appearance/Hint: Ways to customise the appearance of your TiddlyWiki.
+Appearance/Palette/Caption: Palette
+Appearance/Palette/Editor/Clone/Caption: clone
+Appearance/Palette/Editor/Clone/Prompt: It is recommended that you clone this shadow palette before editing it
+Appearance/Palette/Editor/Prompt/Modified: This shadow palette has been modified
+Appearance/Palette/Editor/Prompt: Editing
+Appearance/Palette/Editor/Reset/Caption: reset
+Appearance/Palette/HideEditor/Caption: hide editor
+Appearance/Palette/Prompt: Current palette:
+Appearance/Palette/ShowEditor/Caption: show editor
+Appearance/StoryView/Caption: Story View
+Appearance/StoryView/Prompt: Current view:
+Appearance/Theme/Caption: Theme
+Appearance/Theme/Prompt: Current theme:
+Basics/AnimDuration/Prompt: Animation duration:
+Basics/Caption: Basics
+Basics/DefaultTiddlers/BottomHint: Use &#91;&#91;double square brackets&#93;&#93; for titles with spaces. Or you can choose to <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">retain story ordering</$button>
+Basics/DefaultTiddlers/Prompt: Default tiddlers:
+Basics/DefaultTiddlers/TopHint: Choose which tiddlers are displayed at startup:
+Basics/Language/Prompt: Hello! Current language:
+Basics/OverriddenShadowTiddlers/Prompt: Number of overridden shadow tiddlers:
+Basics/ShadowTiddlers/Prompt: Number of shadow tiddlers:
+Basics/Subtitle/Prompt: Subtitle:
+Basics/SystemTiddlers/Prompt: Number of system tiddlers:
+Basics/Tags/Prompt: Number of tags:
+Basics/Tiddlers/Prompt: Number of tiddlers:
+Basics/Title/Prompt: Title of this ~TiddlyWiki:
+Basics/Username/Prompt: Username for signing edits:
+Basics/Version/Prompt: ~TiddlyWiki version:
+Plugins/Caption: Plugins
+Plugins/Fields/Description: Description
+Plugins/Fields/Title: Title
+Plugins/Fields/Version: Version
+Plugins/Language/Prompt: Languages
+Plugins/Plugin/Prompt: Plugins
+Plugins/Theme/Prompt: Themes
+Saving/AutoSave/Disabled/Button: enable
+Saving/AutoSave/Disabled/Prompt: Autosave is currently disabled
+Saving/AutoSave/Enabled/Button: disable
+Saving/AutoSave/Enabled/Prompt: Autosave is currently enabled
+Saving/AutoSave: Autosave
+Saving/Caption: Saving
+Saving/Heading: Saving
+Saving/TiddlySpot/Advanced/Heading: Advanced Settings
+Saving/TiddlySpot/BackupDir: Backup Directory
+Saving/TiddlySpot/Backups: Backups
+Saving/TiddlySpot/Filename: Upload Filename
+Saving/TiddlySpot/Heading: ~TiddlySpot
+Saving/TiddlySpot/Hint: //The server URL defaults to `http://<wikiname>.tiddlyspot.com/store.cgi` and can be changed to use a custom server address//
+Saving/TiddlySpot/Password: Password
+Saving/TiddlySpot/ServerURL: Server URL
+Saving/TiddlySpot/UploadDir: Upload Directory
+Saving/TiddlySpot/UserName: Wiki Name
+Tools/Caption: Tools
+Tools/Download/Full/Caption: Download full wiki
+Tools/Encryption/ChangePassword/Button: change password
+Tools/Encryption/ClearPassword/Button: clear password
+Tools/Encryption/Disabled/Prompt: This wiki is not encrypted
+Tools/Encryption/Enabled/Prompt: This wiki is encrypted
+Tools/Encryption/Heading: Encryption
+Tools/Encryption/SetPassword/Button: set password
+Tools/Export/AllAsStaticHTML/Caption: Download all tiddlers as static HTML
+Tools/Export/Heading: Export
+Tools/Import/Heading: Import
+Tools/Import/Hint: Browse for files on your computer to import their contents (the individual tiddlers within TiddlyWiki HTML files are imported separately). You can also drag and drop files directly to the browser window.
+Tools/Import/Prompt: Import:
diff --git a/languages/ja-JP/Docs/ModuleTypes.multids b/languages/ja-JP/Docs/ModuleTypes.multids
new file mode 100644
index 000000000..c94056db5
--- /dev/null
+++ b/languages/ja-JP/Docs/ModuleTypes.multids
@@ -0,0 +1,22 @@
+title: $:/language/Docs/ModuleTypes/
+
+animation: Animations that may be used with the RevealWidget.
+browser-startup: Startup functions that are only executed in the browser.
+command: Commands that can be executed under Node.js.
+config: Data to be inserted into `$tw.config`.
+filteroperator: Individual filter operator methods.
+global: Global data to be inserted into `$tw`.
+isfilteroperator: Operands for the ''is'' filter operator.
+macro: JavaScript macro definitions.
+parser: Parsers for different content types.
+saver: Savers handle different methods for saving files from the browser.
+startup: Startup functions.
+storyview: Story views customise the animation and behaviour of list widgets.
+tiddlerdeserializer: Converts different content types into tiddlers.
+tiddlerfield: Defines the behaviour of an individual tiddler field.
+tiddlermethod: Adds methods to the `$tw.Tiddler` prototype.
+utils: Adds methods to `$tw.utils`.
+utils-node: Adds Node.js-specific methods to `$tw.utils`.
+widget: Widgets encapsulate DOM rendering and refreshing.
+wikimethod: Adds methods to `$tw.Wiki`.
+wikirule: Individual parser rules for the main WikiText parser.
diff --git a/languages/ja-JP/Docs/PaletteColours.multids b/languages/ja-JP/Docs/PaletteColours.multids
new file mode 100644
index 000000000..db9548452
--- /dev/null
+++ b/languages/ja-JP/Docs/PaletteColours.multids
@@ -0,0 +1,100 @@
+title: $:/language/Docs/PaletteColours/
+
+alert-background: Alert background
+alert-border: Alert border
+alert-highlight: Alert highlight
+alert-muted-foreground: Alert muted foreground
+background: General background
+blockquote-bar: Blockquote bar
+code-background: Code background
+code-border: Code border
+code-foreground: Code foreground
+download-background: Download button background
+download-foreground: Download button foreground
+dragger-background: Dragger background
+dragger-foreground: Dragger foreground
+dropdown-background: Dropdown background
+dropdown-border: Dropdown border
+dropdown-tab-background-selected: Dropdown tab background for selected tabs
+dropdown-tab-background: Dropdown tab background
+dropzone-background: Dropzone background
+external-link-background-hover: External link background hover
+external-link-background-visited: External link background visited
+external-link-background: External link background
+external-link-foreground-hover: External link foreground hover
+external-link-foreground-visited: External link foreground visited
+external-link-foreground: External link foreground
+foreground: General foreground
+message-background: Message box background
+message-border: Message box border
+message-foreground: Message box foreground
+modal-backdrop: Modal backdrop
+modal-background: Modal background
+modal-border: Modal border
+modal-footer-background: Modal footer background
+modal-footer-border: Modal footer border
+modal-header-border: Modal header border
+muted-foreground: General muted foreground
+notification-background: Notification background
+notification-border: Notification border
+page-background: Page background
+pre-background: Preformatted code background
+pre-border: Preformatted code border
+primary: General primary
+sidebar-button-foreground: Sidebar button foreground
+sidebar-controls-foreground-hover: Sidebar controls foreground hover
+sidebar-controls-foreground: Sidebar controls foreground
+sidebar-foreground-shadow: Sidebar foreground shadow
+sidebar-foreground: Sidebar foreground
+sidebar-muted-foreground-hover: Sidebar muted foreground hover
+sidebar-muted-foreground: Sidebar muted foreground
+sidebar-tab-background-selected: Sidebar tab background for selected tabs
+sidebar-tab-background: Sidebar tab background
+sidebar-tab-border-selected: Sidebar tab border for selected tabs
+sidebar-tab-border: Sidebar tab border
+sidebar-tab-divider: Sidebar tab divider
+sidebar-tab-foreground-selected: Sidebar tab foreground for selected tabs
+sidebar-tab-foreground: Sidebar tab foreground
+sidebar-tiddler-link-foreground-hover: Sidebar tiddler link foreground hover
+sidebar-tiddler-link-foreground: Sidebar tiddler link foreground
+static-alert-foreground: Static alert foreground
+tab-background-selected: Tab background for selected tabs
+tab-background: Tab background
+tab-border-selected: Tab border for selected tabs
+tab-border: Tab border
+tab-divider: Tab divider
+tab-foreground-selected: Tab foreground for selected tabs
+tab-foreground: Tab foreground
+table-border: Table border
+table-footer-background: Table footer background
+table-header-background: Table header background
+tag-background: Tag background
+tag-foreground: Tag foreground
+tiddler-background: Tiddler background
+tiddler-border: Tiddler border
+tiddler-controls-foreground-hover: Tiddler controls foreground hover
+tiddler-controls-foreground-selected: Tiddler controls foreground for selected controls
+tiddler-controls-foreground: Tiddler controls foreground
+tiddler-editor-background: Tiddler editor background
+tiddler-editor-border-image: Tiddler editor border image
+tiddler-editor-border: Tiddler editor border
+tiddler-editor-fields-even: Tiddler editor background for even fields
+tiddler-editor-fields-odd: Tiddler editor background for odd fields
+tiddler-info-background: Tiddler info panel background
+tiddler-info-border: Tiddler info panel border
+tiddler-info-tab-background: Tiddler info panel tab background
+tiddler-link-background: Tiddler link background
+tiddler-link-foreground: Tiddler link foreground
+tiddler-subtitle-foreground: Tiddler subtitle foreground
+tiddler-title-foreground: Tiddler title foreground
+toolbar-new-button: Toolbar 'new tiddler' button foreground
+toolbar-options-button: Toolbar 'options' button foreground
+toolbar-save-button: Toolbar 'save' button foreground
+toolbar-info-button: Toolbar 'info' button foreground
+toolbar-edit-button: Toolbar 'edit' button foreground
+toolbar-close-button: Toolbar 'close' button foreground
+toolbar-delete-button: Toolbar 'delete' button foreground
+toolbar-cancel-button: Toolbar 'cancel' button foreground
+toolbar-done-button: Toolbar 'done' button foreground
+untagged-background: Untagged pill background
+very-muted-foreground: Very muted foreground
diff --git a/languages/ja-JP/EditTemplate.multids b/languages/ja-JP/EditTemplate.multids
new file mode 100644
index 000000000..7084e4734
--- /dev/null
+++ b/languages/ja-JP/EditTemplate.multids
@@ -0,0 +1,14 @@
+title: $:/language/EditTemplate/
+
+Body/Hint: 文書整形、画像、動的機能を追加するには[[wiki text|http://tiddlywiki.com/static/WikiText.html]]を使用してください
+Body/Placeholder: このtiddlerのタイプ
+Body/Preview/Button/Hide: プレビューを隠す
+Body/Preview/Button/Show: プレビューを表示する
+Fields/Add/Button: 追加
+Fields/Add/Name/Placeholder: フィールド名
+Fields/Add/Prompt: 新しいフィールドを追加:
+Fields/Add/Value/Placeholder: フィールド値
+Tags/Add/Button: 追加
+Tags/Add/Placeholder: タグ名
+Type/Placeholder: コンテンツのタイプ
+Type/Prompt: タイプ:
diff --git a/languages/ja-JP/Fields.multids b/languages/ja-JP/Fields.multids
new file mode 100644
index 000000000..23652295b
--- /dev/null
+++ b/languages/ja-JP/Fields.multids
@@ -0,0 +1,34 @@
+title: $:/language/Docs/Fields/
+
+bag: tiddlerが来たbagの名前
+caption: タブやボタンに表示されるテキスト
+color: tiddlerに関連するCSSの色の値
+component: [[alert tiddler|AlertMechanism]]の原因となるコンポーネントの名前
+current-tiddler: [[history list|HistoryMechanism]]の上部のtiddlerをキャッシュするのに使用する
+created: tiddlerが作成された日付
+creator: tiddlerが作成した人の名前
+dependents: プラグイン用に依存するプラグインのタイトルの一覧を表示する
+description: プラグインやモーダルダイアログの説明文
+draft.of: ドラフトtiddler用に、このtiddlerをドラフトとするtiddlerのタイトルを記入する
+draft.title: ドラフトtiddler用に、tiddlerの新しいタイトルを記入する
+footer: ウィザード用のフッター
+hack-to-give-us-something-to-compare-against: [[$:/core/templates/static.content]]内の一時的な保管フィールド
+icon: このtiddlerに関連するアイコンを含むこのtiddlerのタイトル
+library: "yes"を設定するとtiddlerがJavaScriptライブラリとして保存される
+list: 関連するtiddlerのリスト
+list-before: 設定したtiddlerの後にリストされる。空ならリストの先頭になる
+list-after: 設定したtiddlerの前ににリストされる
+modified: tiddlerが最後に変更された日時
+modifier: tiddlerを最後に変更した人の名前
+name: プラグインtiddlerに関連した人間が読みやすい名前
+plugin-priority: プラグインtiddlerの優先度を示す数値
+plugin-type: プラグインtiddlerのタイプ
+revision: サーバに保持されるこのtiddlerのリビジョン
+released: TiddlyWikiのリリース日
+source: tiddlerに関連するソースURL
+subtitle: ウィザード用のサブタイトル
+tags: tidlerに関連するタグのリスト
+text: tiddlerの本文
+title: tiddlerの一意な名前
+type: tiddlerのコンテンツのタイプ
+version: プラグインのバージョン
diff --git a/languages/ja-JP/Filters.multids b/languages/ja-JP/Filters.multids
new file mode 100644
index 000000000..7db644753
--- /dev/null
+++ b/languages/ja-JP/Filters.multids
@@ -0,0 +1,12 @@
+title: $:/language/Filters/
+
+AllTiddlers: システムtiddler以外のすべてのtiddler
+RecentTiddlers: 最近変更されたtiddler
+AllTags: システムタグ以外のすべてのタグ
+Missing: リンクされているが定義されていないtiddler
+Drafts: ドラフトtiddler
+Orphans: リンクされていないtiddler
+SystemTiddlers: システムtiddler
+ShadowTiddlers: 隠しtiddler
+OverriddenShadowTiddlers: 上書きされた隠しtiddler
+SystemTags: システムタグ
diff --git a/languages/ja-JP/GettingStarted.tid b/languages/ja-JP/GettingStarted.tid
new file mode 100644
index 000000000..c4fdbbffd
--- /dev/null
+++ b/languages/ja-JP/GettingStarted.tid
@@ -0,0 +1,13 @@
+title: GettingStarted
+
+TiddlyWikiへようこそ。TiddlyWikiは非線形な（上から読むだけではなくて記事と記事とがつながった）個人のWebノートです。
+
+まずはじめに、変更を保存できるか確認してください。 - 詳しい手順は http://tiddlywiki.com/ を見てください。
+
+次に、以下のようなことができます。
+
+* サイドバーの’＋’ボタンを押して新しいtiddlerを作成してください。
+* Wikiをカスタマイズするにはサイドバーの歯車ボタンを押して[[control panel|$:/ControlPanel]]を開いてください。
+** ''Basics'' タブのdefault tiddlersを変更して、このメッセージを表示しないようにしてください。
+* サイドバーのダウンロードボタンを押して変更を保存してください。
+* 詳しい記法は [[WikiText|http://tiddlywiki.com/static/WikiText.html]]を見てください。
diff --git a/languages/ja-JP/GettingStarted.tid~ b/languages/ja-JP/GettingStarted.tid~
new file mode 100644
index 000000000..16b3ab6ef
--- /dev/null
+++ b/languages/ja-JP/GettingStarted.tid~
@@ -0,0 +1,13 @@
+title: GettingStarted
+
+TiddlyWikiへようこそ。TiddlyWikiは非線形な（上から読むだけではなくて記事と記事とがつながった）個人のWebノートです。
+
+まずはじめに、変更を保存できるか確認してください。 - 詳しい手順は http://tiddlywiki.com/ を見てください。
+
+次に、以下のようなことができます。
+
+* サイドバーの’＋’ボタンを押して新しい記事を作る。
+* Wikiをカスタマイズするにはサイドバーの歯車ボタンを押して[[control panel|$:/ControlPanel]]を開いてください。
+** ''Basics'' タブのdefault tiddlersを変更して、このメッセージを表示しないようにしてください。
+* サイドバーのダウンロードボタンを押して変更を保存してください。
+* 詳しい記法は [[WikiText|http://tiddlywiki.com/static/WikiText.html]]を見てください。
diff --git a/languages/ja-JP/Help/default.tid b/languages/ja-JP/Help/default.tid
new file mode 100644
index 000000000..0a8fce44c
--- /dev/null
+++ b/languages/ja-JP/Help/default.tid
@@ -0,0 +1,22 @@
+title: $:/language/Help/default
+
+\define commandTitle()
+$:/language/Help/$(command)$
+\end
+```
+usage: tiddlywiki [<wikifolder>] [--<command> [<args>...]...]
+```
+
+Available commands:
+
+<ul>
+<$list filter="[commands[]sort[title]]" variable="command">
+<li><$link to=<<commandTitle>>><$macrocall $name="command" $type="text/plain" $output="text/plain"/></$link>: <$transclude tiddler=<<commandTitle>> field="description"/></li>
+</$list>
+</ul>
+
+To get detailed help on a command:
+
+```
+tiddlywiki --help <command>
+```
diff --git a/languages/ja-JP/Help/help.tid b/languages/ja-JP/Help/help.tid
new file mode 100644
index 000000000..88bb38a8f
--- /dev/null
+++ b/languages/ja-JP/Help/help.tid
@@ -0,0 +1,10 @@
+title: $:/language/Help/help
+description: Display help for TiddlyWiki commands
+
+Displays help text for a command:
+
+```
+--help [<command>]
+```
+
+If the command name is omitted then a list of available commands is displayed.
diff --git a/languages/ja-JP/Help/init.tid b/languages/ja-JP/Help/init.tid
new file mode 100644
index 000000000..71a7be224
--- /dev/null
+++ b/languages/ja-JP/Help/init.tid
@@ -0,0 +1,23 @@
+title: $:/language/Help/init
+description: Initialise a new wiki folder
+
+Initialise an empty [[WikiFolder|WikiFolders]] with a copy of the specified edition.
+
+```
+--init <edition> [<edition> ...]
+```
+
+For example:
+
+```
+tiddlywiki ./MyWikiFolder --init empty
+```
+
+Note:
+
+* The wiki folder directory will be created if necessary
+* The "edition" defaults to ''empty''
+* The init command will fail if the wiki folder is not empty
+* The init command removes any `includeWikis` definitions in the edition's `tiddlywiki.info` file
+* When multiple editions are specified, editions initialised later will overwrite any files shared with earlier editions (so, the final `tiddlywiki.info` file will be copied from the last edition)
+* `--help editions` returns a list of available editions
diff --git a/languages/ja-JP/Help/load.tid b/languages/ja-JP/Help/load.tid
new file mode 100644
index 000000000..e1100250f
--- /dev/null
+++ b/languages/ja-JP/Help/load.tid
@@ -0,0 +1,16 @@
+title: $:/language/Help/load
+description: Load tiddlers from a file
+
+Load tiddlers from 2.x.x TiddlyWiki files (`.html`), `.tiddler`, `.tid`, `.json` or other files 
+
+```
+--load <filepath>
+```
+
+To load tiddlers from an encrypted TiddlyWiki file you should first specify the password with the PasswordCommand. For example:
+
+```
+tiddlywiki ./MyWiki --password pa55w0rd --load my_encrypted_wiki.html
+```
+
+Note that TiddlyWiki will not load an older version of an already loaded plugin.
diff --git a/languages/ja-JP/Help/notfound.tid b/languages/ja-JP/Help/notfound.tid
new file mode 100644
index 000000000..83eca6baa
--- /dev/null
+++ b/languages/ja-JP/Help/notfound.tid
@@ -0,0 +1,3 @@
+title: $:/language/Help/notfound
+
+No such help item
\ No newline at end of file
diff --git a/languages/ja-JP/Help/password.tid b/languages/ja-JP/Help/password.tid
new file mode 100644
index 000000000..d9e87a503
--- /dev/null
+++ b/languages/ja-JP/Help/password.tid
@@ -0,0 +1,9 @@
+title: $:/language/Help/password
+description: Set a password for subsequent crypto operations
+
+Set a password for subsequent crypto operations
+
+```
+--password <password>
+```
+
diff --git a/languages/ja-JP/Help/rendertiddler.tid b/languages/ja-JP/Help/rendertiddler.tid
new file mode 100644
index 000000000..c26ade841
--- /dev/null
+++ b/languages/ja-JP/Help/rendertiddler.tid
@@ -0,0 +1,8 @@
+title: $:/language/Help/rendertiddler
+description: Render an individual tiddler as a specified ContentType
+
+Render an individual tiddler as a specified ContentType, defaults to `text/html` and save it to the specified filename:
+
+```
+--rendertiddler <title> <filename> [<type>]
+```
diff --git a/languages/ja-JP/Help/rendertiddlers.tid b/languages/ja-JP/Help/rendertiddlers.tid
new file mode 100644
index 000000000..2d69bb0fd
--- /dev/null
+++ b/languages/ja-JP/Help/rendertiddlers.tid
@@ -0,0 +1,14 @@
+title: $:/language/Help/rendertiddlers
+description: Render tiddlers matching a filter to a specified ContentType
+
+Render a set of tiddlers matching a filter to separate files of a specified ContentType (defaults to `text/html`) and extension (defaults to `.html`).
+
+```
+--rendertiddlers <filter> <template> <pathname> [<type>] [<extension>]
+```
+
+For example:
+
+```
+--rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html ./static text/plain
+```
diff --git a/languages/ja-JP/Help/savetiddler.tid b/languages/ja-JP/Help/savetiddler.tid
new file mode 100644
index 000000000..f9de07a15
--- /dev/null
+++ b/languages/ja-JP/Help/savetiddler.tid
@@ -0,0 +1,8 @@
+title: $:/language/Help/savetiddler
+description: Saves a raw tiddler to a file
+
+Saves an individual tiddler in its raw text or binary format to the specified filename. 
+
+```
+--savetiddler <title> <filename>
+```
diff --git a/languages/ja-JP/Help/server.tid b/languages/ja-JP/Help/server.tid
new file mode 100644
index 000000000..ef900b5bd
--- /dev/null
+++ b/languages/ja-JP/Help/server.tid
@@ -0,0 +1,30 @@
+title: $:/language/Help/server
+description: Provides an HTTP server interface to TiddlyWiki
+
+The server built in to TiddlyWiki5 is very simple. Although compatible with TiddlyWeb it doesn't support many of the features needed for robust Internet-facing usage.
+
+At the root, it serves a rendering of a specified tiddler. Away from the root, it serves individual tiddlers encoded in JSON, and supports the basic HTTP operations for `GET`, `PUT` and `DELETE`.
+
+```
+--server <port> <roottiddler> <rendertype> <servetype> <username> <password> <host>
+```
+
+The parameters are:
+
+* ''port'' - port number to serve from (defaults to "8080")
+* ''roottiddler'' - the tiddler to serve at the root (defaults to "$:/core/save/all") 
+* ''rendertype'' - the content type to which the root tiddler should be rendered (defaults to "text/plain")
+* ''servetype'' - the content type with which the root tiddler should be served (defaults to "text/html")
+* ''username'' - the default username for signing edits
+* ''password'' - optional password for basic authentication
+* ''host'' - optional hostname to serve from (defaults to "127.0.0.1" aka "localhost")
+
+If the password parameter is specified then the browser will prompt the user for the username and password. Note that the password is transmitted in plain text so this implementation isn't suitable for general use.
+
+For example:
+
+```
+--server 8080 $:/core/save/all text/plain text/html MyUserName passw0rd
+```
+
+To run multiple TiddlyWiki servers at the same time you'll need to put each one on a different port.
diff --git a/languages/ja-JP/Help/verbose.tid b/languages/ja-JP/Help/verbose.tid
new file mode 100644
index 000000000..395321a30
--- /dev/null
+++ b/languages/ja-JP/Help/verbose.tid
@@ -0,0 +1,8 @@
+title: $:/language/Help/verbose
+description: Triggers verbose output mode
+
+Triggers verbose output, useful for debugging 
+
+```
+--verbose
+```
diff --git a/languages/ja-JP/Help/version.tid b/languages/ja-JP/Help/version.tid
new file mode 100644
index 000000000..4d9ba0bae
--- /dev/null
+++ b/languages/ja-JP/Help/version.tid
@@ -0,0 +1,8 @@
+title: $:/language/Help/version
+description: Displays the version number of TiddlyWiki
+
+Displays the version number of TiddlyWiki.
+
+```
+--version
+```
diff --git a/languages/ja-JP/Misc.multids b/languages/ja-JP/Misc.multids
new file mode 100644
index 000000000..a399a6ebc
--- /dev/null
+++ b/languages/ja-JP/Misc.multids
@@ -0,0 +1,30 @@
+title: $:/language/
+
+ClassicWarning/Hint: このtiddlerは、TiddlyWiki version 5と完全な互換性がないTiddlyWiki Classic wikiのテキストフォーマットで書かれています。詳しくはhttp://tiddlywiki.com/static/Upgrading.htmlを見てください。
+ClassicWarning/Upgrade/Caption: アップグレード
+CloseAll/Button: すべて閉じる
+ConfirmCancelTiddler: このtiddler "<$text text=<<title>>/>"への変更をすべて破棄しますか?
+ConfirmDeleteTiddler: このtiddler "<$text text=<<title>>/>"を削除しますか?
+ConfirmOverwriteTiddler: このtiddler "<$text text=<<title>>/>"を上書きしますか?
+InvalidFieldName: フィールド名 "<$text text=<<fieldName>>/>"に不正な文字が使われています。フィールドは小文字、アンダースコア (`_`)、ハイフン (`-`)、ピリオド (`.`)のみが使用できます
+MissingTiddler/Hint: このtiddler "<$text text=<<currentTiddler>>/>"は作成されていません。クリック{{$:/core/images/edit-button}}して作成できます
+RecentChanges/DateFormat: YYYY/MM/DD
+RelativeDate/Future/Days: <<period>>日後
+RelativeDate/Future/Hours: <<period>>時間後
+RelativeDate/Future/Minutes: <<period>>分後
+RelativeDate/Future/Months: <<period>>ヶ月後
+RelativeDate/Future/Second: 1秒後
+RelativeDate/Future/Seconds: <<period>>秒後
+RelativeDate/Future/Years: <<period>>年後
+RelativeDate/Past/Days: <<period>>日前
+RelativeDate/Past/Hours: <<period>>時間前
+RelativeDate/Past/Minutes: <<period>>分前
+RelativeDate/Past/Months: <<period>>ヶ月前
+RelativeDate/Past/Second: 1秒前
+RelativeDate/Past/Seconds: <<period>>秒前
+RelativeDate/Past/Years: <<period>>年前
+SystemTiddler/Tooltip: これはシステムtiddlerです
+TagManager/Colour/Heading: 色
+TagManager/Count/Heading: 個数
+TagManager/Icon/Heading: アイコン
+TagManager/Tag/Heading: タグ
diff --git a/languages/ja-JP/Modals/Download.tid b/languages/ja-JP/Modals/Download.tid
new file mode 100644
index 000000000..e82c40e51
--- /dev/null
+++ b/languages/ja-JP/Modals/Download.tid
@@ -0,0 +1,13 @@
+title: $:/language/Modals/Download
+type: text/vnd.tiddlywiki
+subtitle: Download changes
+footer: <$button message="tw-close-tiddler" class="btn btn-primary">Close</$button>
+help: http://tiddlywiki.com/static/DownloadingChanges.html
+
+お使いのブラウザは手動保存にしか対応していません。
+
+変更されたwikiを保存するには、下のダウンロードリンクを右クリックして"ファイルをダウンロードする"や"ファイルを保存する"を選び、フォルダーやファイル名を選んでください。
+
+//You can marginally speed things up by clicking the link with the control key (Windows) or the options/alt key (Mac OS X). You will not be prompted for the folder or filename, but your browser is likely to give it an unrecognisable name -- you may need to rename the file to include an `.html` extension before you can do anything useful with it.//
+
+On smartphones that do not allow files to be downloaded you can instead bookmark the link, and then sync your bookmarks to a desktop computer from where the wiki can be saved normally.
diff --git a/languages/ja-JP/Modals/SaveInstructions.tid b/languages/ja-JP/Modals/SaveInstructions.tid
new file mode 100644
index 000000000..b5af8d33a
--- /dev/null
+++ b/languages/ja-JP/Modals/SaveInstructions.tid
@@ -0,0 +1,22 @@
+title: $:/language/Modals/SaveInstructions
+type: text/vnd.tiddlywiki
+subtitle: Save your work
+footer: <$button message="tw-close-tiddler" class="btn btn-primary">Close</$button>
+help: http://tiddlywiki.com/static/SavingChanges.html
+
+このwikiへの変更を保存するには ~TiddlyWiki HTMLファイルとして保存する必要があります。
+
+!!! デスクトップブラウザ
+
+# ''ファイル''メニューから''別名で保存''を選択します。
+# ファイル名と場所を選びます。
+#* ブラウザによっては''Webページ、HTMLのみ''のような保存フォーマットを選択することを求められることがあります。
+# タブを閉じます。
+
+!!! スマートフォンブラウザ
+
+# このページへのブックマークを作成します。
+#* iCloudやGoogle Syncがあればブックマークは自動的にデスクトップと動機するので上記の方法で保存できます。
+# タブを閉じます。
+
+//If you open the bookmark again in Mobile Safari you will see this message again. If you want to go ahead and use the file, just click the ''close'' button below//
diff --git a/languages/ja-JP/Notifications.multids b/languages/ja-JP/Notifications.multids
new file mode 100644
index 000000000..072adbd01
--- /dev/null
+++ b/languages/ja-JP/Notifications.multids
@@ -0,0 +1,4 @@
+title: $:/language/Notifications/
+
+Save/Done: wikiを保存しました
+Save/Starting: wikiを保存します
diff --git a/languages/ja-JP/Search.multids b/languages/ja-JP/Search.multids
new file mode 100644
index 000000000..4830960c3
--- /dev/null
+++ b/languages/ja-JP/Search.multids
@@ -0,0 +1,10 @@
+title: $:/language/Search/
+
+Advanced/Matches: //<small><$count filter={{$:/temp/advancedsearch}}/> matches</small>//
+Filter/Caption: フィルター
+Filter/Hint: [[filter expression|http://tiddlywiki.com/static/TiddlerFilters.html]]で検索
+Matches: //<small><$count filter="[!is[system]search{$:/temp/search}]"/> matches</small>//
+Shadows/Caption: 隠し
+Shadows/Hint: 隠しtiddlerを検索
+System/Caption: システム
+System/Hint: システムtiddlerを検索
diff --git a/languages/ja-JP/SideBar.multids b/languages/ja-JP/SideBar.multids
new file mode 100644
index 000000000..c0b62fb0d
--- /dev/null
+++ b/languages/ja-JP/SideBar.multids
@@ -0,0 +1,17 @@
+title: $:/language/SideBar/
+
+All/Caption: すべて
+Drafts/Caption: ドラフト
+Missing/Caption: リンクされているが定義されていないtiddler
+More/Caption: もっと見る
+Open/Caption: 開いているtiddler
+Orphans/Caption: リンクされていないtiddler
+Recent/Caption: 最近
+Shadows/Caption: 隠し
+System/Caption: システム
+Tags/Caption: タグ
+Tags/TagManager/Caption: タグマネージャー
+Tags/Untagged/Caption: タグされていない
+Tools/Caption: ツール
+Types/Caption: タイプ
+
diff --git a/languages/ja-JP/SiteSubtitle.tid b/languages/ja-JP/SiteSubtitle.tid
new file mode 100644
index 000000000..692ebddbb
--- /dev/null
+++ b/languages/ja-JP/SiteSubtitle.tid
@@ -0,0 +1,3 @@
+title: $:/SiteSubtitle
+
+a non-linear personal web notebook
\ No newline at end of file
diff --git a/languages/ja-JP/SiteTitle.tid b/languages/ja-JP/SiteTitle.tid
new file mode 100644
index 000000000..9f522664a
--- /dev/null
+++ b/languages/ja-JP/SiteTitle.tid
@@ -0,0 +1,3 @@
+title: $:/SiteTitle
+
+My ~TiddlyWiki
\ No newline at end of file
diff --git a/languages/ja-JP/TiddlerInfo.multids b/languages/ja-JP/TiddlerInfo.multids
new file mode 100644
index 000000000..4e8cd8a02
--- /dev/null
+++ b/languages/ja-JP/TiddlerInfo.multids
@@ -0,0 +1,20 @@
+title: $:/language/TiddlerInfo/
+
+Advanced/Caption: 高度な機能
+Advanced/PluginInfo/Empty/Hint: なし
+Advanced/PluginInfo/Heading: プラグイン詳細
+Advanced/PluginInfo/Hint: このプラグインには以下の隠しtiddlerが含まれます
+Advanced/ShadowInfo/Heading: 隠し状態
+Advanced/ShadowInfo/NotShadow/Hint: このtiddler <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> は隠しtiddlerではありません
+Advanced/ShadowInfo/Shadow/Hint: このtiddler <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> は隠しtiddlerです
+Advanced/ShadowInfo/Shadow/Source: これはこのプラグイン <$link to=<<pluginTiddler>>><$text text=<<pluginTiddler>>/></$link>で定義されています
+Advanced/ShadowInfo/OverriddenShadow/Hint: これは通常のtiddlerで上書きされます
+Fields/Caption: フィールド
+List/Caption: リスト
+List/Empty: このtiddlerにはリストがありません
+Listed/Caption: リストされています
+Listed/Empty: このtiddlerは他のどのtiddlerからもリストされていません
+References/Caption: 参照
+References/Empty: 関連付けられているtiddlerはありません
+Tagging/Caption: タグ付け
+Tagging/Empty: このタグにタグ付けされているtiddlerはありません
diff --git a/languages/ja-JP/Types/application_json.tid b/languages/ja-JP/Types/application_json.tid
new file mode 100644
index 000000000..8cf1c8be1
--- /dev/null
+++ b/languages/ja-JP/Types/application_json.tid
@@ -0,0 +1,3 @@
+title: $:/language/Docs/Types/application/json
+description: JSON data
+name: application/json
diff --git a/languages/ja-JP/Types/application_x_tiddler_dictionary.tid b/languages/ja-JP/Types/application_x_tiddler_dictionary.tid
new file mode 100644
index 000000000..3789fcd4f
--- /dev/null
+++ b/languages/ja-JP/Types/application_x_tiddler_dictionary.tid
@@ -0,0 +1,3 @@
+title: $:/language/Docs/Types/application/x-tiddler-dictionary
+description: Data dictionary
+name: application/x-tiddler-dictionary
diff --git a/languages/ja-JP/Types/image_gif.tid b/languages/ja-JP/Types/image_gif.tid
new file mode 100644
index 000000000..3ed84467f
--- /dev/null
+++ b/languages/ja-JP/Types/image_gif.tid
@@ -0,0 +1,3 @@
+title: $:/language/Docs/Types/image/gif
+description: GIF image
+name: image/gif
diff --git a/languages/ja-JP/Types/image_jpeg.tid b/languages/ja-JP/Types/image_jpeg.tid
new file mode 100644
index 000000000..5d7d8db70
--- /dev/null
+++ b/languages/ja-JP/Types/image_jpeg.tid
@@ -0,0 +1,3 @@
+title: $:/language/Docs/Types/image/jpeg
+description: JPEG image
+name: image/jpeg
diff --git a/languages/ja-JP/Types/image_png.tid b/languages/ja-JP/Types/image_png.tid
new file mode 100644
index 000000000..47867d4d5
--- /dev/null
+++ b/languages/ja-JP/Types/image_png.tid
@@ -0,0 +1,3 @@
+title: $:/language/Docs/Types/image/png
+description: PNG image
+name: image/png
diff --git a/languages/ja-JP/Types/image_svg_xml.tid b/languages/ja-JP/Types/image_svg_xml.tid
new file mode 100644
index 000000000..8e06b230f
--- /dev/null
+++ b/languages/ja-JP/Types/image_svg_xml.tid
@@ -0,0 +1,3 @@
+title: $:/language/Docs/Types/image/svg+xml
+description: Structured Vector Graphics image
+name: image/svg+xml
diff --git a/languages/ja-JP/Types/image_x-icon.tid b/languages/ja-JP/Types/image_x-icon.tid
new file mode 100644
index 000000000..3ad50c454
--- /dev/null
+++ b/languages/ja-JP/Types/image_x-icon.tid
@@ -0,0 +1,3 @@
+title: $:/language/Docs/Types/image/x-icon
+description: ICO format icon file
+name: image/x-icon
diff --git a/languages/ja-JP/Types/text_css.tid b/languages/ja-JP/Types/text_css.tid
new file mode 100644
index 000000000..095775ad5
--- /dev/null
+++ b/languages/ja-JP/Types/text_css.tid
@@ -0,0 +1,3 @@
+title: $:/language/Docs/Types/text/css
+description: Static stylesheet
+name: text/css
diff --git a/languages/ja-JP/Types/text_html.tid b/languages/ja-JP/Types/text_html.tid
new file mode 100644
index 000000000..d71b753d9
--- /dev/null
+++ b/languages/ja-JP/Types/text_html.tid
@@ -0,0 +1,3 @@
+title: $:/language/Docs/Types/text/html
+description: HTML markup
+name: text/html
diff --git a/languages/ja-JP/Types/text_plain.tid b/languages/ja-JP/Types/text_plain.tid
new file mode 100644
index 000000000..251ce9ce7
--- /dev/null
+++ b/languages/ja-JP/Types/text_plain.tid
@@ -0,0 +1,3 @@
+title: $:/language/Docs/Types/text/plain
+description: Plain text
+name: text/plain
diff --git a/languages/ja-JP/Types/text_vnd.tiddlywiki.tid b/languages/ja-JP/Types/text_vnd.tiddlywiki.tid
new file mode 100644
index 000000000..682841f32
--- /dev/null
+++ b/languages/ja-JP/Types/text_vnd.tiddlywiki.tid
@@ -0,0 +1,3 @@
+title: $:/language/Docs/Types/text/vnd.tiddlywiki
+description: TiddlyWiki version 5 wikitext
+name: text/vnd.tiddlywiki
diff --git a/languages/ja-JP/Types/text_x-tiddlywiki.tid b/languages/ja-JP/Types/text_x-tiddlywiki.tid
new file mode 100644
index 000000000..f5969148e
--- /dev/null
+++ b/languages/ja-JP/Types/text_x-tiddlywiki.tid
@@ -0,0 +1,3 @@
+title: $:/language/Docs/Types/text/x-tiddlywiki
+description: TiddlyWiki Classic wikitext
+name: text/x-tiddlywiki
diff --git a/languages/ja-JP/plugin.info b/languages/ja-JP/plugin.info
new file mode 100644
index 000000000..3a8b82f52
--- /dev/null
+++ b/languages/ja-JP/plugin.info
@@ -0,0 +1,8 @@
+{
+	"title": "$:/languages/ja-JP",
+	"name": "ja-JP",
+	"plugin-type": "language",
+	"description": "Japanese(Japanese)",
+	"author": "pekopeko1",
+	"core-version": ">=5.0.9"
+}
diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md
index 2ccf5c757..409c2ae38 100644
--- a/licenses/cla-individual.md
+++ b/licenses/cla-individual.md
@@ -150,3 +150,5 @@ Maurizio Pollio, @mpollio, 2014/03/21
 Michael Fogleman, @mwfogleman, 2014/04/08
 
 James W. Anderson, @welford, 2014/04/08
+
+Tomohiro Miura, @pekopeko1, 2014/04/15