diff --git a/boot/boot.js b/boot/boot.js
index acdfa0327..dab39238f 100644
--- a/boot/boot.js
+++ b/boot/boot.js
@@ -126,8 +126,8 @@ Display an error and exit
 */
 $tw.utils.error = function(err) {
 	// Prepare the error message
-	var errHeading = "Internal JavaScript Error",
-		promptMsg = "Well, this is embarrassing. It is recommended that you restart TiddlyWiki by refreshing your browser";
+	var errHeading = ( $tw.language == undefined ? "Internal JavaScript Error" : $tw.language.getString("InternalJavaScriptError/Title") ),
+		promptMsg = ( $tw.language == undefined ? "Well, this is embarrassing. It is recommended that you restart TiddlyWiki by refreshing your browser" : $tw.language.getString("InternalJavaScriptError/Hint") );
 	// Log the error to the console
 	console.error($tw.node ? "\x1b[1;31m" + err + "\x1b[0m" : err);
 	if($tw.browser && !$tw.node) {
diff --git a/core/language/en-GB/ControlPanel.multids b/core/language/en-GB/ControlPanel.multids
index 7a0e61434..f6f09f5b0 100644
--- a/core/language/en-GB/ControlPanel.multids
+++ b/core/language/en-GB/ControlPanel.multids
@@ -52,11 +52,14 @@ Plugins/Disabled/Status: (disabled)
 Plugins/Empty/Hint: None
 Plugins/Enable/Caption: enable
 Plugins/Enable/Hint: Enable this plugin when reloading page
+Plugins/Install: install
 Plugins/Installed/Hint: Currently installed plugins:
 Plugins/Languages/Caption: Languages
 Plugins/Languages/Hint: Language pack plugins
+Plugins/OpenPluginLibrary: open plugin library
 Plugins/Plugins/Caption: Plugins
 Plugins/Plugins/Hint: Plugins
+Plugins/Reinstall: reinstall
 Plugins/Themes/Caption: Themes
 Plugins/Themes/Hint: Theme plugins
 Saving/Caption: Saving
@@ -126,8 +129,7 @@ Toolbars/EditToolbar/Caption: Edit Toolbar
 Toolbars/EditToolbar/Hint: Choose which buttons are displayed for tiddlers in edit mode
 Toolbars/Hint: Select which toolbar buttons are displayed
 Toolbars/PageControls/Caption: Page Toolbar
-Toolbars/PageControls/Hint: Choose which buttons are displayed on the main page toolbar  
+Toolbars/PageControls/Hint: Choose which buttons are displayed on the main page toolbar
 Toolbars/ViewToolbar/Caption: View Toolbar
 Toolbars/ViewToolbar/Hint: Choose which buttons are displayed for tiddlers in view mode
 Tools/Download/Full/Caption: Download full wiki
-
diff --git a/core/language/en-GB/Help/load.tid b/core/language/en-GB/Help/load.tid
index e1100250f..fb2168e24 100644
--- a/core/language/en-GB/Help/load.tid
+++ b/core/language/en-GB/Help/load.tid
@@ -1,7 +1,7 @@
 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 tiddlers from 2.x.x TiddlyWiki files (`.html`), `.tiddler`, `.tid`, `.json` or other files
 
 ```
 --load <filepath>
diff --git a/core/language/en-GB/Help/savetiddler.tid b/core/language/en-GB/Help/savetiddler.tid
index da86126e6..643d318fd 100644
--- a/core/language/en-GB/Help/savetiddler.tid
+++ b/core/language/en-GB/Help/savetiddler.tid
@@ -1,7 +1,7 @@
 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. 
+Saves an individual tiddler in its raw text or binary format to the specified filename.
 
 ```
 --savetiddler <title> <filename>
diff --git a/core/language/en-GB/Help/savetiddlers.tid b/core/language/en-GB/Help/savetiddlers.tid
index 37bb10e5a..8cac2a950 100644
--- a/core/language/en-GB/Help/savetiddlers.tid
+++ b/core/language/en-GB/Help/savetiddlers.tid
@@ -1,7 +1,7 @@
 title: $:/language/Help/savetiddlers
 description: Saves a group of raw tiddlers to a directory
 
-Saves a group of tiddlers in their raw text or binary format to the specified directory. 
+Saves a group of tiddlers in their raw text or binary format to the specified directory.
 
 ```
 --savetiddlers <filter> <pathname> ["noclean"]
diff --git a/core/language/en-GB/Help/server.tid b/core/language/en-GB/Help/server.tid
index c8a989c2e..4e0ccf45a 100644
--- a/core/language/en-GB/Help/server.tid
+++ b/core/language/en-GB/Help/server.tid
@@ -12,7 +12,7 @@ At the root, it serves a rendering of a specified tiddler. Away from the root, i
 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") 
+* ''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
diff --git a/core/language/en-GB/Help/setfield.tid b/core/language/en-GB/Help/setfield.tid
index 8e09380da..dd90b25fe 100644
--- a/core/language/en-GB/Help/setfield.tid
+++ b/core/language/en-GB/Help/setfield.tid
@@ -14,5 +14,4 @@ The parameters are:
 * ''filter'' - filter identifying the tiddlers to be affected
 * ''fieldname'' - the field to modify (defaults to "text")
 * ''templatetitle'' - the tiddler to wikify into the specified field. If blank or missing then the specified field is deleted
-* ''type'' - the text type to render (defaults to "text/plain"; "text/html" can be used to include HTML tags)
-
+* ''rendertype'' - the text type to render (defaults to "text/plain"; "text/html" can be used to include HTML tags)
diff --git a/core/language/en-GB/Help/verbose.tid b/core/language/en-GB/Help/verbose.tid
index 395321a30..802965f15 100644
--- a/core/language/en-GB/Help/verbose.tid
+++ b/core/language/en-GB/Help/verbose.tid
@@ -1,7 +1,7 @@
 title: $:/language/Help/verbose
 description: Triggers verbose output mode
 
-Triggers verbose output, useful for debugging 
+Triggers verbose output, useful for debugging
 
 ```
 --verbose
diff --git a/core/language/en-GB/Import.multids b/core/language/en-GB/Import.multids
index 536ace2aa..9475d6a2c 100644
--- a/core/language/en-GB/Import.multids
+++ b/core/language/en-GB/Import.multids
@@ -1,13 +1,14 @@
 title: $:/language/Import/
 
+Imported: The following tiddlers were imported:
 Listing/Cancel/Caption: Cancel
 Listing/Hint: These tiddlers are ready to import:
 Listing/Import/Caption: Import
 Listing/Select/Caption: Select
 Listing/Status/Caption: Status
 Listing/Title/Caption: Title
-Upgrader/Plugins/Suppressed/Incompatible: Blocked incompatible or obsolete plugin 
-Upgrader/Plugins/Suppressed/Version: Blocked plugin (due to incoming <<incoming>>  being older than existing <<existing>>)
+Upgrader/Plugins/Suppressed/Incompatible: Blocked incompatible or obsolete plugin
+Upgrader/Plugins/Suppressed/Version: Blocked plugin (due to incoming <<incoming>> being older than existing <<existing>>)
 Upgrader/Plugins/Upgraded: Upgraded plugin from <<incoming>> to <<upgraded>>
 Upgrader/State/Suppressed: Blocked temporary state tiddler
 Upgrader/System/Suppressed: Blocked system tiddler
diff --git a/core/language/en-GB/Misc.multids b/core/language/en-GB/Misc.multids
index d7a09a048..3c19e0e37 100644
--- a/core/language/en-GB/Misc.multids
+++ b/core/language/en-GB/Misc.multids
@@ -2,7 +2,7 @@ title: $:/language/
 
 AboveStory/ClassicPlugin/Warning: It looks like you are trying to load a plugin designed for ~TiddlyWiki Classic. Please note that [[these plugins do not work with TiddlyWiki version 5.x.x|http://tiddlywiki.com/#TiddlyWikiClassic]]. ~TiddlyWiki Classic plugins detected:
 BinaryWarning/Prompt: This tiddler contains binary data
-ClassicWarning/Hint: This tiddler is written in TiddlyWiki Classic wiki text format, which is not fully compatible with TiddlyWiki version 5. See http://tiddlywiki.com/static/Upgrading.html for more details. 
+ClassicWarning/Hint: This tiddler is written in TiddlyWiki Classic wiki text format, which is not fully compatible with TiddlyWiki version 5. See http://tiddlywiki.com/static/Upgrading.html for more details.
 ClassicWarning/Upgrade/Caption: upgrade
 CloseAll/Button: close all
 ConfirmCancelTiddler: Do you wish to discard changes to the tiddler "<$text text=<<title>>/>"?
@@ -19,10 +19,13 @@ Encryption/Password: Password
 Encryption/RepeatPassword: Repeat password
 Encryption/PasswordNoMatch: Passwords do not match
 Encryption/SetPassword: Set password
+InternalJavaScriptError/Title: Internal JavaScript Error
+InternalJavaScriptError/Hint: Well, this is embarrassing. It is recommended that you restart TiddlyWiki by refreshing your browser
 InvalidFieldName: Illegal characters in field name "<$text text=<<fieldName>>/>". Fields can only contain lowercase letters, digits and the characters underscore (`_`), hyphen (`-`) and period (`.`)
 LazyLoadingWarning: <p>Loading external text from ''<$text text={{!!_canonical_uri}}/>''</p><p>If this message doesn't disappear you may be using a browser that doesn't support external text in this configuration. See http://tiddlywiki.com/#ExternalText</p>
 MissingTiddler/Hint: Missing tiddler "<$text text=<<currentTiddler>>/>" - click {{$:/core/images/edit-button}} to create
 OfficialPluginLibrary: Official ~TiddlyWiki Plugin Library
+OfficialPluginLibrary/Hint: The official ~TiddlyWiki plugin library at tiddlywiki.com. Plugins, themes and language packs are maintained by the core team.
 PluginReloadWarning: Please save {{$:/core/ui/Buttons/save-wiki}} and reload {{$:/core/ui/Buttons/refresh}} to allow changes to plugins to take effect
 RecentChanges/DateFormat: DDth MMM YYYY
 SystemTiddler/Tooltip: This is a system tiddler
diff --git a/core/language/en-GB/Search.multids b/core/language/en-GB/Search.multids
index d8d7ae3d7..fd6eadc7e 100644
--- a/core/language/en-GB/Search.multids
+++ b/core/language/en-GB/Search.multids
@@ -5,6 +5,9 @@ Filter/Caption: Filter
 Filter/Hint: Search via a [[filter expression|http://tiddlywiki.com/static/Filters.html]]
 Filter/Matches: //<small><<resultCount>> matches</small>//
 Matches: //<small><<resultCount>> matches</small>//
+Matches/All: All matches:
+Matches/Title: Title matches:
+Search: Search
 Shadows/Caption: Shadows
 Shadows/Hint: Search for shadow tiddlers
 Shadows/Matches: //<small><<resultCount>> matches</small>//
diff --git a/core/modules/widgets/navigator.js b/core/modules/widgets/navigator.js
index c6aab7aee..b6aab02f4 100755
--- a/core/modules/widgets/navigator.js
+++ b/core/modules/widgets/navigator.js
@@ -556,7 +556,7 @@ NavigatorWidget.prototype.handlePerformImportEvent = function(event) {
 		importData = this.wiki.getTiddlerDataCached(event.param,{tiddlers: {}}),
 		importReport = [];
 	// Add the tiddlers to the store
-	importReport.push("The following tiddlers were imported:\n");
+	importReport.push($tw.language.getString("Import/Imported") + "\n");
 	$tw.utils.each(importData.tiddlers,function(tiddlerFields) {
 		var title = tiddlerFields.title;
 		if(title && importTiddler && importTiddler.fields["selection-" + title] !== "unchecked") {
diff --git a/core/ui/ControlPanel/Modals/AddPlugins.tid b/core/ui/ControlPanel/Modals/AddPlugins.tid
index e25aa7425..d05c41767 100644
--- a/core/ui/ControlPanel/Modals/AddPlugins.tid
+++ b/core/ui/ControlPanel/Modals/AddPlugins.tid
@@ -6,8 +6,8 @@ subtitle: {{$:/core/images/download-button}} {{$:/language/ControlPanel/Plugins/
 \define install-plugin-button()
 <$button>
 <$action-sendmessage $message="tm-load-plugin-from-library" url={{!!url}} title={{$(assetInfo)$!!original-title}}/>
-<$list filter="[<assetInfo>get[original-title]get[version]]" variable="installedVersion" emptyMessage="""install""">
-reinstall
+<$list filter="[<assetInfo>get[original-title]get[version]]" variable="installedVersion" emptyMessage="""{{$:/language/ControlPanel/Plugins/Install}}""">
+{{$:/language/ControlPanel/Plugins/Reinstall}}
 </$list>
 </$button>
 \end
@@ -65,12 +65,12 @@ This plugin is already installed at version <$text text=<<installedVersion>>/>
 \define load-plugin-library-button()
 <$button class="tc-btn-big-green">
 <$action-sendmessage $message="tm-load-plugin-library" url={{!!url}} infoTitlePrefix="$:/temp/RemoteAssetInfo/"/>
-{{$:/core/images/chevron-right}} open plugin library
+{{$:/core/images/chevron-right}} {{$:/language/ControlPanel/Plugins/OpenPluginLibrary}}
 </$button>
 \end
 
 \define display-server-assets(type)
-Search: <$edit-text tiddler="""$:/temp/RemoteAssetSearch/$(currentTiddler)$""" default="" type="search" tag="input"/>
+{{$:/language/Search/Search}}: <$edit-text tiddler="""$:/temp/RemoteAssetSearch/$(currentTiddler)$""" default="" type="search" tag="input"/>
 <$reveal state="""$:/temp/RemoteAssetSearch/$(currentTiddler)$""" type="nomatch" text="">
 <$button class="tc-btn-invisible">
 <$action-setfield $tiddler="""$:/temp/RemoteAssetSearch/$(currentTiddler)$""" $field="text" $value=""/>
diff --git a/core/ui/DefaultSearchResultList.tid b/core/ui/DefaultSearchResultList.tid
index 3341af098..331ef8718 100644
--- a/core/ui/DefaultSearchResultList.tid
+++ b/core/ui/DefaultSearchResultList.tid
@@ -3,11 +3,11 @@ tags: $:/tags/SearchResults
 caption: {{$:/language/Search/DefaultResults/Caption}}
 
 \define searchResultList()
-//<small>Title matches:</small>//
+//<small>{{$:/language/Search/Matches/Title}}</small>//
 
 <$list filter="[!is[system]search:title{$(searchTiddler)$}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>
 
-//<small>All matches:</small>//
+//<small>{{$:/language/Search/Matches/All}}</small>//
 
 <$list filter="[!is[system]search{$(searchTiddler)$}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>
 
diff --git a/core/wiki/config/OfficialPluginLibrary.tid b/core/wiki/config/OfficialPluginLibrary.tid
index f98be9acc..e4bfbc02c 100644
--- a/core/wiki/config/OfficialPluginLibrary.tid
+++ b/core/wiki/config/OfficialPluginLibrary.tid
@@ -3,4 +3,4 @@ tags: $:/tags/PluginLibrary
 url: http://tiddlywiki.com/library/v5.1.9/index.html
 caption: {{$:/language/OfficialPluginLibrary}}
 
-The official ~TiddlyWiki plugin library at tiddlywiki.com. Plugins, themes and language packs are maintained by the core team.
+{{$:/language/OfficialPluginLibrary/Hint}}
diff --git a/languages/ca-ES/Help/setfield.tid b/languages/ca-ES/Help/setfield.tid
index b025fd037..1f2fde61e 100644
--- a/languages/ca-ES/Help/setfield.tid
+++ b/languages/ca-ES/Help/setfield.tid
@@ -14,5 +14,4 @@ Els paràmetres són:
 * ''filtre'' - filtre que identifica els tiddlers afectats
 * ''nomdelcamp'' - el camp a modificar (per omisió "text")
 * ''plantilladeltítol'' - el tiddler a wikificar del camp indicat. Si està en blanc o no hi és llavors el camp indicar es suprimirà
-* ''tipus'' - el tipus de text que cal generar (per omisió "text/plain"; es possible utilitzar "text/html" per incloure etiquetes HTML)
-
+* ''rendertipus'' - el tipus de text que cal generar (per omisió "text/plain"; es possible utilitzar "text/html" per incloure etiquetes HTML)
diff --git a/languages/da-DK/Help/setfield.tid b/languages/da-DK/Help/setfield.tid
index 8f6d25928..c7f4ab1cc 100644
--- a/languages/da-DK/Help/setfield.tid
+++ b/languages/da-DK/Help/setfield.tid
@@ -14,5 +14,4 @@ Parametrene er:
 * ''filter'' - filter der identificerer de tiddlere der påvirkes
 * ''fieldname'' - feltet der ændres (standard til "text")
 * ''templatetitle'' - tiddleren der wikificeres til det angivne felt. Hvis tom eller manglende slettes det specificerede felt
-* ''type'' - text type til renderingr (standard til "text/plain"; "text/html" kan bruges for at inkludere HTML tags)
-
+* ''rendertype'' - text type til renderingr (standard til "text/plain"; "text/html" kan bruges for at inkludere HTML tags)
diff --git a/languages/de-DE/Help/setfield.tid b/languages/de-DE/Help/setfield.tid
index 76870eb3e..9ba1632ed 100644
--- a/languages/de-DE/Help/setfield.tid
+++ b/languages/de-DE/Help/setfield.tid
@@ -14,4 +14,4 @@ The parameters are:
 * ''filter'' - Filter, der die zu modifizierenden Tiddler auswählt.
 * ''fieldname'' - Das zu verändernde Feld (Standardwert: "text").
 * ''templatetitle'' - Der zu wikifizierende Vorlagen Tiddler, dessen Ergebnis in das Feld geschrieben wird. Wenn Leer, dann wird das Feld gelöscht.
-* ''type'' - Der Text Typ für den "rendering" Vorgang (Standardwert: "text/plain"; "text/html" kann verwendet werden, um "HTML tags" zu erzeugen).
+* ''rendertype'' - Der Text Typ für den "rendering" Vorgang (Standardwert: "text/plain"; "text/html" kann verwendet werden, um "HTML tags" zu erzeugen).
diff --git a/languages/es-ES/Help/setfield.tid b/languages/es-ES/Help/setfield.tid
index dd6ed9b26..268ee67e4 100644
--- a/languages/es-ES/Help/setfield.tid
+++ b/languages/es-ES/Help/setfield.tid
@@ -14,5 +14,4 @@ Los parámetros son:
 * ''filter'' - filtro que identifica los tiddlers que se verán afectados
 * ''fieldname'' - el campo que será modificado (por defecto, "text")
 * ''templatetitle'' - el tiddler a ''wikify'' en el campo especificado. Si se deja en blanco o está ausente, el campo especificado es borrado. 
-* ''type'' - el tipo de texto a generar (por defecto, "text/plain"; se puede usar también "text/html" para incluir etiquetas HTML)
-
+* ''rendertype'' - el tipo de texto a generar (por defecto, "text/plain"; se puede usar también "text/html" para incluir etiquetas HTML)
diff --git a/languages/fr-FR/Help/setfield.tid b/languages/fr-FR/Help/setfield.tid
index 009ef526c..858d3dc41 100644
--- a/languages/fr-FR/Help/setfield.tid
+++ b/languages/fr-FR/Help/setfield.tid
@@ -14,5 +14,4 @@ Les paramètres sont les suivants :
 * ''filtre'' - filtre identifiant les tiddlers cibles
 * ''nom-du-champ'' - le champ à modifier ("text" par défaut)
 * ''titre-du-template'' - le tiddler à wikifier dans le champ spécifié. Si manquant ou blanc, le champ spécifié est supprimé
-* ''type'' - le type de texte à utiliser pour le rendu ("text/plain" par défaut ; "text/html" peut être utilisé pour inclure des éléments HTML)
-
+* ''type-de-rendu'' - le type de texte à utiliser pour le rendu ("text/plain" par défaut ; "text/html" peut être utilisé pour inclure des éléments HTML)
diff --git a/languages/ia-IA/Help/setfield.tid b/languages/ia-IA/Help/setfield.tid
index 105018f98..6a916d164 100644
--- a/languages/ia-IA/Help/setfield.tid
+++ b/languages/ia-IA/Help/setfield.tid
@@ -14,5 +14,4 @@ Le parametros es:
 * ''filter'' - filtro que identifica le notas a esser toccate
 * ''fieldname'' - le quadro a modificar (le standard es "text")
 * ''templatetitle'' - le nota a wikificar a in le quadro specificate. Si vacue o mancante, alora le quadro specificate es delite
-* ''type'' - le typo de texto a tractar (le standard es "text/plain"; "text/html" pote esser usate pro includer etiquettas HTML)
-
+* ''rendertype'' - le typo de texto a tractar (le standard es "text/plain"; "text/html" pote esser usate pro includer etiquettas HTML)
diff --git a/languages/ja-JP/Help/setfield.tid b/languages/ja-JP/Help/setfield.tid
index 11da11e17..1a8e6d233 100644
--- a/languages/ja-JP/Help/setfield.tid
+++ b/languages/ja-JP/Help/setfield.tid
@@ -1,7 +1,6 @@
 title: $:/language/Help/setfield
 description: tiddlerを使用する準備
 
-
 //注意　このコマンドは実験的なもので、今後変更される可能性があります。//
 
 テンプレートtiddlerの内容を、複数のtiddlerの指定のフィールドに設定する。
@@ -15,4 +14,4 @@ description: tiddlerを使用する準備
 * "filter" - コマンドの対象となるtiddler
 * "fieldname" - 変更するフィールド（規定値は"text"）
 * "templatetitle" - 指定のフィールドに転記する元になるtiddler。もし空白あるはtiddlerが存在しない場合は、指定したフィールドは削除される。
-* "type" - テキストの種類（規定値は"text/plain"。"text/html"にするとHTMLタグを含められる。）
+* "rendertype" - テキストの種類（規定値は"text/plain"。"text/html"にするとHTMLタグを含められる。）
diff --git a/languages/ko-KR/ControlPanel.multids b/languages/ko-KR/ControlPanel.multids
index 164601cc3..a2edb0f3c 100644
--- a/languages/ko-KR/ControlPanel.multids
+++ b/languages/ko-KR/ControlPanel.multids
@@ -52,11 +52,14 @@ Plugins/Disabled/Status: (비활성화됨)
 Plugins/Empty/Hint: 없음
 Plugins/Enable/Caption: 활성화
 Plugins/Enable/Hint: 페이지를 다시 불러올 때 이 플러그인을 활성화합니다
+Plugins/Install: 설치
 Plugins/Installed/Hint: 현재 설치된 플러그인:
 Plugins/Languages/Caption: 언어
 Plugins/Languages/Hint: 언어 팩 플러그인
+Plugins/OpenPluginLibrary: 플러그인 라이브러리 열기
 Plugins/Plugins/Caption: 플러그인
 Plugins/Plugins/Hint: 플러그인
+Plugins/Reinstall: 재설치
 Plugins/Themes/Caption: 테마
 Plugins/Themes/Hint: 테마 플러그인
 Saving/Caption: 저장
diff --git a/languages/ko-KR/Import.multids b/languages/ko-KR/Import.multids
index 04d51751d..7d79de60d 100644
--- a/languages/ko-KR/Import.multids
+++ b/languages/ko-KR/Import.multids
@@ -1,5 +1,6 @@
 title: $:/language/Import/
 
+Imported: 다음 티들러를 가져왔습니다:
 Listing/Cancel/Caption: 취소
 Listing/Hint: 이 티들러는 가져올 준비가 되었습니다:
 Listing/Import/Caption: 가져오기
diff --git a/languages/ko-KR/Misc.multids b/languages/ko-KR/Misc.multids
index d9307f959..22c3b9eb4 100644
--- a/languages/ko-KR/Misc.multids
+++ b/languages/ko-KR/Misc.multids
@@ -22,9 +22,12 @@ Exporters/CsvFile: CSV 파일
 Exporters/JsonFile: JSON 파일
 Exporters/StaticRiver: 정적 HTML
 Exporters/TidFile: ".tid" 파일
+InternalJavaScriptError/Title: 내부 자바스크립트 오류
+InternalJavaScriptError/Hint: 아이 창피해. 브라우저를 새로 고쳐 TiddlyWiki를 다시 시작할 것을 권장합니다
 InvalidFieldName: "<$text text=<<fieldName>>/>" 필드 이름에 잘못된 문자가 있습니다. 필드는 소문자, 숫자 및 밑줄 문자 (`_`), 하이픈 (`-`) 및 마침표 (`.`)만을 포함할 수 있습니다.
 MissingTiddler/Hint: "<$text text=<<currentTiddler>>/>" 티들러가 없습니다 - 만드려면 {{$:/core/images/edit-button}}을 클릭하세요
 OfficialPluginLibrary: 공식 ~TiddlyWiki 플러그인 라이브러리
+OfficialPluginLibrary/Hint: tiddlywiki.com에서의 공식 ~TiddlyWiki 플러그인 라이브러리입니다. 플러그인, 테마 및 언어 팩은 코어 팀이 유지 관리하고 있습니다.
 PluginReloadWarning: 플러그인의 바뀜을 적용할 수 있도록 하려면 저장 {{$:/core/ui/Buttons/save-wiki}}하고 나서 다시 불러오세요 {{$:/core/ui/Buttons/refresh}}
 RecentChanges/DateFormat: YYYY년 MMM DD일
 SystemTiddler/Tooltip: 이것은 시스템 티들러입니다
diff --git a/languages/ko-KR/Search.multids b/languages/ko-KR/Search.multids
index 811f7ff5d..b668d84d4 100644
--- a/languages/ko-KR/Search.multids
+++ b/languages/ko-KR/Search.multids
@@ -5,6 +5,9 @@ Filter/Caption: 필터
 Filter/Hint: [[필터 표현식|http://tiddlywiki.com/static/Filters.html]]을 통해 검색합니다
 Filter/Matches: //<small><<resultCount>>개 일치</small>//
 Matches: //<small><<resultCount>>개 일치</small>//
+Matches/All: 모든 일치:
+Matches/Title: 제목 일치:
+Search: 검색
 Shadows/Caption: 섀도우
 Shadows/Hint: 섀도우 티들러에 대해 검색합니다
 Shadows/Matches: //<small><<resultCount>>개 일치</small>//
diff --git a/languages/nl-NL/Help/setfield.tid b/languages/nl-NL/Help/setfield.tid
index b8f05bcaf..af9ceb7d2 100644
--- a/languages/nl-NL/Help/setfield.tid
+++ b/languages/nl-NL/Help/setfield.tid
@@ -14,5 +14,4 @@ De parameters zijn:
 * ''filter'' - filter dat de tiddlers selecteert
 * ''fieldname'' - het betreffende veld (standaard "text")
 * ''templatetitle'' - de tiddler die in het betreffende veld gewikificeerd moet worden. In geval van een leeg of ontbrekend veld wordt het veld verwijderd
-* ''type'' - het teksttype om te renderen (tonen) - standaard "text/plain"; "text/html" kan worden gebruikt om HTML-elementen te kunnen gebruiken
-
+* ''rendertype'' - het teksttype om te renderen (tonen) - standaard "text/plain"; "text/html" kan worden gebruikt om HTML-elementen te kunnen gebruiken
diff --git a/languages/pt-PT/Help/setfield.tid b/languages/pt-PT/Help/setfield.tid
index 9240c8a74..20e73b52f 100644
--- a/languages/pt-PT/Help/setfield.tid
+++ b/languages/pt-PT/Help/setfield.tid
@@ -14,5 +14,4 @@ Os parâmetros são:
 * ''filter'' - filtro que selecciona os tiddlers a ser afectados
 * ''fieldname'' - nome do campo a modificar (por defeito "texto")
 * ''templatetitle'' - o tiddler a interpretar para o campo especificado. Se for deixado em branco ou estiver em falta o campo especificado será eliminado
-* ''type'' - O tipo de texto a interpretar (por defeito "text/plain"; "text/html" pode ser utilizado para incluir etiquetas HTML)
-
+* ''rendertype'' - O tipo de texto a interpretar (por defeito "text/plain"; "text/html" pode ser utilizado para incluir etiquetas HTML)
diff --git a/languages/sk-SK/Help/setfield.tid b/languages/sk-SK/Help/setfield.tid
index 84c9dff70..7cadf3214 100644
--- a/languages/sk-SK/Help/setfield.tid
+++ b/languages/sk-SK/Help/setfield.tid
@@ -14,5 +14,4 @@ Parametre sú:
 * ''filter'' - filter špecifikujúci tiddlery, na ktoré sa má aplikovať
 * ''fieldname'' - pole, ktoré treba modifikovať (štandardne "text")
 * ''templatetitle'' - tiddler, ktorý treba vložiť vo wiki podobe do daného poľa. Ak neexistuje alebo je prázdny, tak sa špecifikované pole vymaže
-* ''type'' - typ textu, ktorý treba renderovať (štandardne "text/plain"; je možné použiť "text/html" na zahrnutie  HTML štítkov)
-
+* ''rendertype'' - typ textu, ktorý treba renderovať (štandardne "text/plain"; je možné použiť "text/html" na zahrnutie  HTML štítkov)
diff --git a/languages/sv-SE/Help/setfield.tid b/languages/sv-SE/Help/setfield.tid
index 83e277d1d..f1e6efe64 100755
--- a/languages/sv-SE/Help/setfield.tid
+++ b/languages/sv-SE/Help/setfield.tid
@@ -14,5 +14,4 @@ Parametrarna är:
 * ''filter'' - filtrera de identifierade tiddlers som kommer påverkas
 * ''fieldname'' - fältet som ska ändras (standard satt till "text")
 * ''templatetitle'' - tiddlern som ska wikifieras till ett specifikt fält. Om det är blankt eller saknas så kommer det specificerade fältet tas bort
-* ''type'' - texttypen att rendera (standard satt till "text/plain"; "text/html" kan användas för att få med HTML-taggar)
-
+* ''rendertype'' - texttypen att rendera (standard satt till "text/plain"; "text/html" kan användas för att få med HTML-taggar)
diff --git a/languages/zh-Hans/Help/setfield.tid b/languages/zh-Hans/Help/setfield.tid
index 6f82e10c2..dc10f8491 100644
--- a/languages/zh-Hans/Help/setfield.tid
+++ b/languages/zh-Hans/Help/setfield.tid
@@ -14,4 +14,4 @@ description: 准备用于外部条目
 * ''filter'' - 受影响的辨识条目的筛选条件
 * ''fieldname'' - 要修改的栏位（默认为 "text"）
 * ''templatetitle'' - 该条目 wikify 到指定栏位。若为空白或丢失，则删除指定的栏位
-* ''type'' - 要呈现的文本类型（默认为 "text/plain"; "text/html" 可以用于包含 HTML 标记)）
+* ''rendertype'' - 要呈现的文本类型（默认为 "text/plain"; "text/html" 可以用于包含 HTML 标记)）
diff --git a/languages/zh-Hant/Help/setfield.tid b/languages/zh-Hant/Help/setfield.tid
index 7f9a5d100..144f7260c 100644
--- a/languages/zh-Hant/Help/setfield.tid
+++ b/languages/zh-Hant/Help/setfield.tid
@@ -14,4 +14,4 @@ description: 準備用於外部條目
 * ''filter'' - 受影響的辨識條目的篩選條件
 * ''fieldname'' - 要修改的欄位（預設為 "text"）
 * ''templatetitle'' - 該條目 wikify 到指定欄位。若為空白或丟失，則刪除指定的欄位
-* ''type'' - 要呈現的文本類型（預設為 "text/plain"; "text/html" 可以用於包含 HTML 標記)）
+* ''rendertype'' - 要呈現的文本類型（預設為 "text/plain"; "text/html" 可以用於包含 HTML 標記)）