Merge branch 'master' into zh

2024-11-23 18:17:20 +00:00 · 2015-10-25 11:11:12 +08:00 · 2015-10-25 11:11:12 +08:00 · 5d61dfb1d7
commit 5d61dfb1d7
parent 0703a257f3 7ecaba9a65
48 changed files with 168 additions and 67 deletions
--- a/bin/clean.sh
+++ b/bin/clean.sh
@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Remove any output files
+
+find . -regex "^./editions/[a-z\.-]*/output/.*" -delete
--- 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) {
--- 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
@ -130,4 +133,3 @@ Toolbars/PageControls/Hint: Choose which buttons are displayed on the main page
 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
-
--- 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)
--- a/core/language/en-GB/Import.multids
+++ b/core/language/en-GB/Import.multids
@ -1,5 +1,6 @@
 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
@ -7,7 +8,7 @@ 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/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
--- a/core/language/en-GB/Misc.multids
+++ b/core/language/en-GB/Misc.multids
@ -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
--- 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>//
--- 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") {
--- a/core/modules/widgets/setvariable.js
+++ b/core/modules/widgets/setvariable.js
@ -43,6 +43,15 @@ SetWidget.prototype.execute = function() {
 	this.setValue = this.getAttribute("value");
 	this.setEmptyValue = this.getAttribute("emptyValue");
 	// Set context variable
+	this.setVariable(this.setName,this.getValue(),this.parseTreeNode.params);
+	// Construct the child widgets
+	this.makeChildWidgets();
+};
+
+/*
+Get the value to be assigned
+*/
+SetWidget.prototype.getValue = function() {
 	var value = this.setValue;
 	if(this.setFilter) {
 		var results = this.wiki.filterTiddlers(this.setFilter,this);
@ -53,9 +62,7 @@ SetWidget.prototype.execute = function() {
 			value = this.setEmptyValue;
 		}
 	}
-	this.setVariable(this.setName,value,this.parseTreeNode.params);
-	// Construct the child widgets
-	this.makeChildWidgets();
+	return value;
 };

 /*
@ -63,7 +70,8 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 */
 SetWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(changedAttributes.name || changedAttributes.filter || changedAttributes.value || changedAttributes.emptyValue) {
+	if(changedAttributes.name || changedAttributes.filter || changedAttributes.value || changedAttributes.emptyValue ||
+	   (this.setFilter && this.getValue() != this.variables[this.setName].value)) {
 		this.refreshSelf();
 		return true;
 	} else {
--- 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=""/>
--- 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"/>

--- 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}}
--- a/editions/prerelease/tiddlers/Release
+++ b/editions/prerelease/tiddlers/Release
@ -114,6 +114,7 @@ Revert

 [[@Jermolene|https://github.com/Jermolene]] would like to thank the contributors to this release who have generously given their time to help improve TiddlyWiki:

+* [[@afeldspar|https://github.com/afeldspar]]
 * [[@araname|https://github.com/araname]]
 * [[@BramChen|https://github.com/BramChen]]
 * [[@danielo515|https://github.com/danielo515]]
@ -123,6 +124,7 @@ Revert
 * [[@inmysocks|https://github.com/inmysocks]]
 * [[@matabele|https://github.com/matabele]]
 * [[@nameanyone|https://github.com/nameanyone]]
+* [[@senevoldsen90|https://github.com/senevoldsen90]]
 * [[@SuperDOS|https://github.com/SuperDOS]]
 * [[@tgrosinger|https://github.com/tgrosinger]]
 * [[@tobibeer|https://github.com/tobibeer]]
--- a/editions/tw5.com/tiddlers/community/resources/datepicker
+++ b/editions/tw5.com/tiddlers/community/resources/datepicker
@ -0,0 +1,12 @@
+created: 20151015072304780
+modified: 20151015073121685
+tags: Resources
+title: datepicker plugin based on Pikaday, by kixam
+type: text/vnd.tiddlywiki
+url: http://kixam.github.io/TW5-datePicker/
+
+An interactive date picker plugin based on [[Pikaday|https://github.com/dbushell/Pikaday]]. A demo can be found here: {{!!url}}.
+
+<<<
+datepicker is a TiddlyWiki plugin that allows you to use a widget much like EditTextWidget to pick a date (not a time). It shows a nice interactive mini-calendar when clicked, allows you to set a date format for display, and is compatible with core date fields such as `modified` and `created`.
+<<<
--- a/editions/tw5.com/tiddlers/filters/syntax/FilterRun.tid
+++ b/editions/tw5.com/tiddlers/filters/syntax/FilterRun.tid
@ -11,7 +11,7 @@ type: text/vnd.tiddlywiki
  |
  '"' [:{/'anything but "'/}] '"'
  |
-  "'" [:{/"anything but '"/}] '"'
+  "'" [:{/"anything but '"/}] "'"
 )
 """/>

--- a/editions/tw5.com/tiddlers/hellothere/Discover
+++ b/editions/tw5.com/tiddlers/hellothere/Discover
@ -1,5 +1,5 @@
 created: 20140904121000000
-modified: 20150414072046785
+modified: 20151023165341339
 tags: HelloThere
 title: Discover TiddlyWiki
 type: text/vnd.tiddlywiki
@ -13,7 +13,7 @@ You've never seen //anything// like ~TiddlyWiki. ~TiddlyWiki is:

 ! ~TiddlyWiki is a Tool

-''~TiddlyWiki is first and foremost a tool:'' it is a free downloadable tool for capturing and organising content from the web, from your documents or from your brain. Its a tool for note-taking, bookmarking, pinning, writing, managing to-do lists and projects, collaborating, blogging, and publishing.
+''~TiddlyWiki is first and foremost a tool:'' it is a free downloadable tool for capturing and organising content from the web, from your documents or from your brain. It is a tool for note-taking, bookmarking, pinning, writing, managing to-do lists and projects, collaborating, blogging, and publishing.

 In ~TiddlyWiki you create or paste content into notes called tiddlers, then connect your tiddlers with hyperlinks and tags. You can then quickly retrieve your notes through features such as tag pills, sidebar tabs, and ~TiddlyWiki's lightning fast search window. You can even dynamically include one tiddler's content inside another - similar to using building blocks - to create articles, lists, presentations and more.

--- a/editions/tw5.com/tiddlers/howtos/How
+++ b/editions/tw5.com/tiddlers/howtos/How
@ -0,0 +1,30 @@
+created: 20151006145934884
+modified: 20151006155211988
+tags: Learning
+title: How to export tiddlers
+type: text/vnd.tiddlywiki
+
+!!! Selecting All tiddlers for export
+
+To export ''all'' tiddlers click on the "Tools" tab of the Sidebar. Find and click the ``export all`` ({{$:/core/ui/Buttons/export-tiddler}}) button. A pop-up menu will offer you the chance to export tiddlers in multiple formats. 
+
+!!! Exporting a tiddler
+
+If you want to export a particular tiddler, first navigate to that tiddler. Then click on the More Actions  icon ({{$:/core/ui/Buttons/more-tiddler-actions}}) that appears above the tiddler. From the list that appears select ``export tiddler``. A pop-up menu will offer you the chance to export the tiddler in multiple formats. 
+
+!!! Exporting tiddlers matching a criteria (filter)
+
+To export a selection of tiddlers, click the little magnifying glass next to the search area on the sidebar. This will open the [[Advanced Search|$:/AdvancedSearch]] tiddler. Click on the ``Filter`` tab of the Advanced Search tiddler. Only the [[Filter|Filters]] tab will allow you to export a selection of tiddlers. [[Filters]] follow a particular syntax. Click on this [[Filters|Filters]] link to learn about how to make filters.
+
+Once you have written a filter, a list of tiddlers matching the filter will appear. Now you can click on the export icon ({{$:/core/ui/Buttons/export-tiddler}}) to the right of the filter input field. A pop-up menu will offer you the chance to export tiddlers in multiple formats. 
+
+!!! Export formats
+
+Currently, the export formats available are:
+
+  * CSV file format
+  * JSON file format
+  * Static HTML file
+  * ".tid" file format
+
+The ``".tid"`` format is unique from the other formats in that only one tiddler will be exported, even if you are attempting to export all tiddlers or a selection of tiddlers.
--- a/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid
@ -37,4 +37,14 @@ The content of the `<$button>` widget is displayed within the button.
 |tag |An optional html tag to use instead of the default "button" |
 |default |Default value if `set` tiddler is missing for testing against `setTo` to determine `selectedClass` |

+''Note:'' In almost all other cases where a TextReference is used as a widget attribute, it will be placed between curly brackets, to [[transclude|Transclusion in WikiText]] the value currently stored there.  However, when we use a TextReference as the value of a button widget's `set` attribute, we are referencing //the storage location itself//, rather than the value stored there, so we do ''not'' use curly brackets there.  //Example:// we could code a button widget that sets the `caption` field of TiddlerA to be the same as that of TiddlerB as:
+
+```
+<$button set="TiddlerA!!caption" setTo={{TiddlerB!!caption}} >
+
+Press me!
+
+</$button>
+```
+
 ''Tip:'' Set ''class'' to `tc-btn-invisible tc-tiddlylink` to have a button look like an internal link.
--- 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)
--- 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)
--- 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).
--- 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)
--- 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)
--- 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)
--- 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タグを含められる。）
--- a/languages/ko-KR/Buttons.multids
+++ b/languages/ko-KR/Buttons.multids
@ -30,6 +30,12 @@ ExportTiddler/Caption: 티들러 내보내기
 ExportTiddler/Hint: 티들러를 내보냅니다
 ExportTiddlers/Caption: 여러 티들러 내보내기
 ExportTiddlers/Hint: 여러 티들러를 내보냅니다
+Fold/Caption: 티들러 접기
+Fold/Hint: 이 티들러의 본문을 접습니다
+FoldAll/Caption: 모든 티들러 접기
+FoldAll/Hint: 모든 열린 티들러의 본문을 접습니다
+FoldOthers/Caption: 다른 티들러 접기
+FoldOthers/Hint: 다른 열린 티들러의 본문을 접습니다
 FullScreen/Caption: 전체 화면
 FullScreen/Hint: 전체 화면 모드에 들어가거나 떠납니다
 Help/Caption: 도움말
@ -39,7 +45,7 @@ HideSideBar/Hint: 사이드바를 숨깁니다
 Home/Caption: 홈
 Home/Hint: 기본 티들러를 엽니다
 Import/Caption: 가져오기
-Import/Hint: 파일을 가져옵니다
+Import/Hint: 텍스트, 그림, TiddlyWiki 또는 JSON을 포함한 여러 파일의 형식을 가져옵니다
 Info/Caption: 정보
 Info/Hint: 이 티들러에 대한 정보를 보여줍니다
 Language/Caption: 언어
@ -76,3 +82,7 @@ TagManager/Caption: 태그 관리자
 TagManager/Hint: 태그 관리자를 엽니다
 Theme/Caption: 테마
 Theme/Hint: 보일 테마를 선택합니다
+Unfold/Caption: 티들러 펼치기
+Unfold/Hint: 이 티들러의 본문을 펼칩니다
+UnfoldAll/Caption: 모든 티들러 펼치기
+UnfoldAll/Hint: 모든 열린 티들러의 본문을 펼칩니다
--- 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: 저장
@ -98,6 +101,9 @@ Settings/NavigationHistory/Caption: 둘러보기 역사
 Settings/NavigationHistory/Hint: 티들러로 둘러보기할 때 둘러보기 역사를 업데이트합니다:
 Settings/NavigationHistory/No/Description: 역사를 업데이트하지 않음
 Settings/NavigationHistory/Yes/Description: 역사를 업데이트
+Settings/PerformanceInstrumentation/Caption: 성능 계측
+Settings/PerformanceInstrumentation/Description: 성능 계측 활성화
+Settings/PerformanceInstrumentation/Hint: 브라우저 개발자 콘솔에서 성능 통계를 보여줍니다. 적용하려면 다시 불러와야 합니다
 Settings/TitleLinks/Caption: 티들러 제목
 Settings/TitleLinks/Hint: 티들러 제목을 링크로 선택적으로 보여줍니다
 Settings/TitleLinks/No/Description: 티들러 제목을 링크로 보여주지 않음
--- a/languages/ko-KR/GettingStarted.tid
+++ b/languages/ko-KR/GettingStarted.tid
@ -1,14 +1,17 @@
 title: GettingStarted

-TiddlyWiki와 TiddlyWiki 공동체에 오신 것을 환영합니다
+\define lingo-base() $:/language/ControlPanel/Basics/
+~TiddlyWiki와 ~TiddlyWiki 공동체에 오신 것을 환영합니다

-TiddlyWiki에 중요한 정보를 저장하는 것을 시작하기 전에 확실히 바뀜을 저장할 수 있는지 확인하는 것이 중요합니다. 자세한 사항은 http://tiddlywiki.com/#GettingStarted 를 참조하세요
+~TiddlyWiki에 중요한 정보를 저장하는 것을 시작하기 전에 확실히 바뀜을 저장할 수 있는지 확인하는 것이 중요합니다. 자세한 사항은 http://tiddlywiki.com/#GettingStarted 를 참조하세요

-!! 이 TiddlyWiki 설정하기
+!! 이 ~TiddlyWiki 설정하기

- HelloThere
-$:/Translators
-$:/plugins/tiddlywiki/translators/readme
+<div class="tc-control-panel">

+|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
+|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+</div>

-더 많은 옵션에 대해서는 제어판을 보세요.
+더 많은 옵션에 대해서는 [[제어판|$:/ControlPanel]]을 보세요.
--- a/languages/ko-KR/Help/password.tid
+++ b/languages/ko-KR/Help/password.tid
@ -7,3 +7,4 @@ description: 후속 암호화 조작을 하기 위해 비밀번호를 설정합
 --password <비밀번호>
 ```

+''참고'': 이것은 비밀번호로 보호된 TiddlyWiki를 서버에 넣어 사용해서는 안됩니다. 대신, [[ServerCommand]]에 따른 비밀번호 옵션을 보세요.
--- a/languages/ko-KR/Help/rendertiddler.tid
+++ b/languages/ko-KR/Help/rendertiddler.tid
@ -1,10 +1,10 @@
 title: $:/language/Help/rendertiddler
 description: 지정된 내용형식으로 개별 티들러를 렌더합니다

-지정된 내용형식으로 개별 티들러를 렌더합니다, 기본값은 `text/html`이며 지정된 파일이름으로 저장합니다:
+지정된 내용형식으로 개별 티들러를 렌더합니다, 기본값은 `text/html`이며 지정된 파일이름으로 저장합니다. 선택적으로 틀을 지정할 수 있으며, 이 경우 틀 티들러가 렌더되는 티들러로 "currentTiddler" 변수 집합으로 렌더됩니다. (첫 매개변수 값)

 ```
--rendertiddler <제목> <파일이름> [<형식>]
+--rendertiddler <제목> <파일이름> [<형식>] [<틀>]
 ```

 기본적으로, 파일이름은 에디션 디렉터리의 `output` 하위 디렉터리로 상대적으로 해석됩니다. `--output` 명령은 다른 디렉터리로 직접 출력하는 데 사용할 수 있습니다.
--- a/languages/ko-KR/Help/rendertiddlers.tid
+++ b/languages/ko-KR/Help/rendertiddlers.tid
@ -15,4 +15,4 @@ description: 지정된 내용형식으로 필터와 일치하는 티들러를

 기본적으로, 경로이름은 에디션 디렉터리의 `output` 하위 디렉터리로 상대적으로 해석됩니다. `--output` 명령은 다른 디렉터리로 직접 출력하는 데 사용할 수 있습니다.

-noclean 매개변수를 지정하지 않는 한 대상 디렉터리의 모든 파일이 삭제됩니다. 대상 디렉터리가 없으면 재귀적으로 만들어집니다.
+''noclean'' 플래그를 지정하지 않는 한 대상 디렉터리의 모든 파일이 삭제됩니다. 대상 디렉터리가 없으면 재귀적으로 만들어집니다.
--- a/languages/ko-KR/Help/savetiddlers.tid
+++ b/languages/ko-KR/Help/savetiddlers.tid
@ -4,9 +4,11 @@ description: 디렉터리로의 raw 티들러의 그룹을 저장합니다
 지정한 디렉터리로 raw 텍스트 또는 바이너리 형식의 티들러의 그룹을 저장합니다.

 ```
--savetiddlers <필터> <경로이름>
+--savetiddlers <필터> <경로이름> ["noclean"]
 ```

 기본적으로, 경로이름은 에디션 디렉터리의 `output` 하위 디렉터리로 상대적으로 해석됩니다. `--output` 명령은 다른 디렉터리로 직접 출력하는 데 사용할 수 있습니다.

+출력 디렉터리에는 지정된 파일을 저장하기 전에 기존 파일이 지워집니다. 삭제는 ''noclean'' 플래그를 지정하여 비활성화할 수 있습니다.
+
 경로이름에 없는 디렉터리는 자동으로 만들어집니다.
--- 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: 가져오기
--- a/languages/ko-KR/Misc.multids
+++ b/languages/ko-KR/Misc.multids
@ -1,5 +1,6 @@
 title: $:/language/

+AboveStory/ClassicPlugin/Warning: ~TiddlyWiki 클래식용으로 설계된 플러그인을 불러오려고 하는 것 같아 보입니다. [[이러한 플러그인은 TiddlyWiki 버전 5.x.x에 동작하지 않음|http://tiddlywiki.com/#TiddlyWikiClassic]]을 참고하세요. ~TiddlyWiki 클래식 플러그인이 감지되었습니다:
 BinaryWarning/Prompt: 이 티들러는 바이너리 데이터를 포함합니다
 ClassicWarning/Hint: 이 티들러는 TiddlyWiki 클래식 위키 텍스트 형식으로 쓰여져 있으며, TiddlyWiki 버전 5와 완전히 호환되지 않습니다. 자세한 사항은 http://tiddlywiki.com/static/Upgrading.html 을 참조하세요.
 ClassicWarning/Upgrade/Caption: 업그레이드
@ -22,9 +23,13 @@ Exporters/CsvFile: CSV 파일
 Exporters/JsonFile: JSON 파일
 Exporters/StaticRiver: 정적 HTML
 Exporters/TidFile: ".tid" 파일
+InternalJavaScriptError/Hint: 아이 창피해. 브라우저를 새로 고쳐 TiddlyWiki를 다시 시작할 것을 권장합니다
+InternalJavaScriptError/Title: 내부 자바스크립트 오류
 InvalidFieldName: "<$text text=<<fieldName>>/>" 필드 이름에 잘못된 문자가 있습니다. 필드는 소문자, 숫자 및 밑줄 문자 (`_`), 하이픈 (`-`) 및 마침표 (`.`)만을 포함할 수 있습니다.
+LazyLoadingWarning: <p>''<$text text={{!!_canonical_uri}}/>''에서 바깥 텍스트를 불러오는 중입니다</p><p>이 메시지가 사라지지 않으면 이 구성에서 바깥 텍스트를 지원하지 않는 브라우저를 사용하고 있을 수 있습니다. http://tiddlywiki.com/#ExternalText 를 보세요</p>
 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: 이것은 시스템 티들러입니다
@ -33,4 +38,5 @@ TagManager/Count/Heading: 횟수
 TagManager/Icon/Heading: 아이콘
 TagManager/Info/Heading: 정보
 TagManager/Tag/Heading: 태그
+Tiddler/DateFormat: YYYY년 MMM DD일 am hh12:mm
 UnsavedChangesWarning: TiddlyWiki에 저장하지 않은 바뀜이 있습니다
--- 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>//
--- a/languages/ko-KR/SiteTitle.tid
+++ b/languages/ko-KR/SiteTitle.tid
@ -1,3 +1,3 @@
 title: $:/SiteTitle

-내 TiddlyWiki
+내 ~TiddlyWiki
--- 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
--- 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)
--- 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)
--- 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)
--- 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 标记)）
--- 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 標記)）
--- a/licenses/cla-individual.md
+++ b/licenses/cla-individual.md
@ -252,3 +252,7 @@ William Jackson, @matabele 2015/09/26
 Karl Knechtel, @zahlman, 2015/10/03

 Tony Grosinger @tgrosinger 2015/10/03
+
+Antaeus Feldspar @afeldspar 2015/10/20
+
+Soeren Enevoldsen, @senevoldsen90, 2015/10/09