Making more things translateable

Now we’re done with the text that lives in tiddlers, and we’ll need to get on with the text that is embedded in code modules.
2014-02-16 09:46:43 +00:00 · 2014-02-16 09:46:43 +00:00 · e051eb7d90
parent 75b9de222e
commit e051eb7d90
53 changed files with 181 additions and 119 deletions
--- a/core/language/en-GB/ControlPanel.tids
+++ b/core/language/en-GB/ControlPanel.tids
@ -1,26 +1,32 @@
 title: $:/language/ControlPanel/

 Basics/Caption: Basics
-Basics/Version: ~TiddlyWiki version
-Basics/Title: Title of this ~TiddlyWiki
-Basics/Subtitle: Subtitle
-Basics/Username: Username for signing edits
-Basics/AnimDuration: Animation duration
-Basics/DefaultTiddlers: Default tiddlers
-Basics/DefaultTiddlers/Prompt: Choose which tiddlers are displayed at startup:
-Basics/DefaultTiddlers/Hint: 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/Tiddlers: Number of tiddlers
-Basics/Tags: Number of tags
-Basics/SystemTiddlers: Number of system tiddlers
-Basics/ShadowTiddlers: Number of shadow tiddlers
-Basics/OverriddenShadowTiddlers: Number of overridden shadow tiddlers
+Basics/Version/Prompt: ~TiddlyWiki version:
+Basics/Title/Prompt: Title of this ~TiddlyWiki:
+Basics/Subtitle/Prompt: Subtitle:
+Basics/Username/Prompt: Username for signing edits:
+Basics/AnimDuration/Prompt: Animation duration:
+Basics/DefaultTiddlers/Prompt: Default tiddlers:
+Basics/DefaultTiddlers/TopHint: Choose which tiddlers are displayed at startup:
+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/Tiddlers/Prompt: Number of tiddlers:
+Basics/Tags/Prompt: Number of tags:
+Basics/SystemTiddlers/Prompt: Number of system tiddlers:
+Basics/ShadowTiddlers/Prompt: Number of shadow tiddlers:
+Basics/OverriddenShadowTiddlers/Prompt: Number of overridden shadow tiddlers:
 Basics/Language/Prompt: Hello! Current language:
 Appearance/Caption: Appearance
+Appearance/Theme/Caption: Current theme:
 Appearance/Theme/Heading: Theme
+Appearance/StoryView/Caption: Current view:
 Appearance/StoryView/Heading: Story View
 Saving/Caption: Saving
 Saving/Heading: Saving
-Saving/AutoSave: Auto Save
+Saving/AutoSave: Autosave
+Saving/AutoSave/Enabled/Prompt: Autosave is currently enabled
+Saving/AutoSave/Enabled/Button: disable
+Saving/AutoSave/Disabled/Prompt: Autosave is currently disabled
+Saving/AutoSave/Disabled/Button: enable
 Saving/TiddlySpot/Heading: ~TiddlySpot
 Saving/TiddlySpot/UserName: Wiki Name
 Saving/TiddlySpot/Password: Password
@ -37,10 +43,17 @@ Plugins/Fields/Description: Description
 Plugins/Fields/Version: Version
 Tools/Caption: Tools
 Tools/Import/Heading: Import
+Tools/Import/Prompt: 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/Export/Heading: Export
 Tools/Export/AllAsStaticHTML/Caption: Download all tiddlers as static HTML
+Tools/Download/Full/Caption: Download full wiki
 Tools/Encryption/Heading: Encryption
+Tools/Encryption/Enabled/Prompt: This wiki is encrypted
+Tools/Encryption/Disabled/Prompt: This wiki is not encrypted
+Tools/Encryption/ClearPassword/Button: clear password
+Tools/Encryption/ChangePassword/Button: change password
+Tools/Encryption/SetPassword/Button: set password
 Internals/Caption: Internals
 Internals/TiddlerFields/Heading: TiddlerFields
 Internals/TiddlerFields/Hint: This is the full set of TiddlerFields in use in this wiki (including system tiddlers but excluding shadow tiddlers).
--- a/core/language/en-GB/EditTemplate.tids
+++ b/core/language/en-GB/EditTemplate.tids
@ -0,0 +1,14 @@
+title: $:/language/EditTemplate/
+
+Tags/Add/Placeholder: tag name
+Tags/Add/Button: add
+Body/Hint: Use WikiText to add formatting, images, and dynamic features
+Body/Placeholder: Type the text for this tiddler
+Body/Preview/Button/Show: show preview
+Body/Preview/Button/Hide: hide preview
+Type/Prompt: Type:
+Type/Placeholder: content type
+Fields/Add/Prompt: Add a new field:
+Fields/Add/Name/Placeholder: field name
+Fields/Add/Value/Placeholder: field value
+Fields/Add/Button: add
--- a/core/language/en-GB/GettingStarted.tid
+++ b/core/language/en-GB/GettingStarted.tid
--- a/core/language/en-GB/Modals/Download.tid
+++ b/core/language/en-GB/Modals/Download.tid
@ -1,8 +1,8 @@
-title: $:/messages/Download
+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://five.tiddlywiki.com/static/DownloadingChanges.html
+help: http://tiddlywiki.com/static/DownloadingChanges.html

 Your browser only supports manual saving.

--- a/core/language/en-GB/Modals/SaveInstructions.tid
+++ b/core/language/en-GB/Modals/SaveInstructions.tid
@ -1,8 +1,8 @@
-title: $:/messages/SaveInstructions
+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://five.tiddlywiki.com/static/SavingChanges
+help: http://tiddlywiki.com/static/SavingChanges.html

 Your changes to this wiki need to be saved as a ~TiddlyWiki HTML file.

--- a/core/language/en-GB/Notifications.tids
+++ b/core/language/en-GB/Notifications.tids
@ -0,0 +1,4 @@
+title: $:/language/Notifications/
+
+Save/Starting: Starting to save wiki
+Save/Done: Saved wiki
--- a/core/language/en-GB/Search.tids
+++ b/core/language/en-GB/Search.tids
@ -0,0 +1,10 @@
+title: $:/language/Search/
+
+Matches: //<small><$count filter="[!is[system]search{$:/temp/search}]"/> matches</small>//
+Advanced/Matches: //<small><$count filter={{$:/temp/advancedsearch}}/> matches</small>//
+Filter/Caption: Filter
+Filter/Hint: Search via a [[filter expression|http://tiddlywiki.com/static/TiddlerFilters.html]]
+Shadows/Caption: Shadows
+Shadows/Hint: Search for shadow tiddlers
+System/Caption: System
+System/Hint: Search for system tiddlers
--- a/core/language/en-GB/SideBar.tids
+++ b/core/language/en-GB/SideBar.tids
@ -0,0 +1,16 @@
+title: $:/language/SideBar/
+
+Open/Caption: Open
+Recent/Caption: Recent
+Tools/Caption: Tools
+More/Caption: More
+All/Caption: All
+Tags/Caption: Tags
+Tags/Untagged/Caption: untagged
+Missing/Caption: Missing
+Drafts/Caption: Drafts
+Orphans/Caption: Orphans
+Types/Caption: Types
+System/Caption: System
+Shadows/Caption: Shadows
+
--- a/core/language/en-GB/SiteSubtitle.tid
+++ b/core/language/en-GB/SiteSubtitle.tid
--- a/core/language/en-GB/SiteTitle.tid
+++ b/core/language/en-GB/SiteTitle.tid
--- a/core/language/en-GB/TiddlerInfo.tids
+++ b/core/language/en-GB/TiddlerInfo.tids
@ -0,0 +1,11 @@
+title: $:/language/TiddlerInfo/
+
+Fields/Caption: Fields
+List/Caption: List
+List/Empty: This tiddler does not have a list
+Listed/Caption: Listed
+Listed/Empty: This tiddler is not listed by any others
+References/Caption: References
+References/Empty: No tiddlers link to this one
+Tagging/Caption: Tagging
+Tagging/Empty: No tiddlers are tagged with this one
--- a/core/messages/EnterEditMode.tid
+++ b/core/messages/EnterEditMode.tid
@ -1,16 +0,0 @@
-title: $:/messages/EnterEditMode
-type: text/vnd.tiddlywiki
-subtitle: Editing this wiki
-footer: <<button close class:"btn btn-primary"><Close>>
-help: http://five.tiddlywiki.com/static/EditMode
-
-You can edit this wiki and save your changes. You are strongly advised to verify that saving is working properly before trusting ~TiddlyWiki with your data.
-
-The following methods of saving changes are available:
-
-* Using Firefox's built-in file system access
-* Uploading to a simple server script
-* Using HTML5's data URI and download attribute
-
-
-[x] Don't show this message again
--- a/core/messages/Saved.tid
+++ b/core/messages/Saved.tid
@ -1,3 +0,0 @@
-title: $:/messages/Saved
-
-Saved wiki
--- a/core/messages/StartingSave.tid
+++ b/core/messages/StartingSave.tid
@ -1,3 +0,0 @@
-title: $:/messages/StartingSave
-
-Starting to save wiki
--- a/core/modules/savers/manualdownload.js
+++ b/core/modules/savers/manualdownload.js
@ -13,7 +13,7 @@ Handles saving changes via HTML5's download APIs
 "use strict";

 // Title of the tiddler containing the download message
-var downloadInstructionsTitle = "$:/messages/Download"
+var downloadInstructionsTitle = "$:/language/Modals/Download";

 /*
 Select the appropriate saver module and set it up
--- a/core/modules/savers/upload.js
+++ b/core/modules/savers/upload.js
@ -65,7 +65,7 @@ UploadSaver.prototype.save = function(text,method,callback) {
 		}
 	};
 	http.send(data);
-	$tw.notifier.display("$:/messages/StartingSave");
+	$tw.notifier.display("$:/language/Notifications/Save/Starting");
 	return true;
 };

--- a/core/modules/startup.js
+++ b/core/modules/startup.js
@ -203,7 +203,7 @@ exports.startup = function() {
 		// If we're being viewed on a data: URI then give instructions for how to save
 		if(document.location.protocol === "data:") {
 			$tw.utils.dispatchCustomEvent(document,"tw-modal",{
-				param: "$:/messages/SaveInstructions"
+				param: "$:/language/Modals/SaveInstructions"
 			});
 		}
 		// Call browser startup modules
--- a/core/modules/syncer.js
+++ b/core/modules/syncer.js
@ -65,6 +65,7 @@ Syncer.prototype.titleIsLoggedIn = "$:/status/IsLoggedIn";
 Syncer.prototype.titleUserName = "$:/status/UserName";
 Syncer.prototype.titleSyncFilter = "$:/config/SyncFilter";
 Syncer.prototype.titleAutoSave = "$:/config/AutoSave";
+Syncer.prototype.titleSavedNotification = "$:/language/Notifications/Save/Done";
 Syncer.prototype.taskTimerInterval = 1 * 1000; // Interval for sync timer
 Syncer.prototype.throttleInterval = 1 * 1000; // Defer saving tiddlers if they've changed in the last 1s...
 Syncer.prototype.fallbackInterval = 10 * 1000; // Unless the task is older than 10s
@ -124,7 +125,8 @@ Save the wiki contents. Options are:
 */
 Syncer.prototype.saveWiki = function(options) {
 	options = options || {};
-	var method = options.method || "save",
+	var self = this,
+		method = options.method || "save",
 		template = options.template || "$:/core/save/all",
 		downloadType = options.downloadType || "text/plain",
 		text = this.wiki.renderTiddler(downloadType,template),
@ -132,7 +134,7 @@ Syncer.prototype.saveWiki = function(options) {
 			if(err) {
 				alert("Error while saving:\n\n" + err);
 			} else {
-				$tw.notifier.display("$:/messages/Saved");
+				$tw.notifier.display(self.titleSavedNotification);
 				if(options.callback) {
 					options.callback();
 				}
--- a/core/ui/AdvancedSearch/Filter.tid
+++ b/core/ui/AdvancedSearch/Filter.tid
@ -1,10 +1,11 @@
 title: $:/core/ui/AdvancedSearch/Filter
 tags: $:/tags/AdvancedSearch
-caption: Filter
+caption: {{$:/language/Search/Filter/Caption}}

+\define lingo-base() $:/language/Search/
 <$linkcatcher to="$:/temp/advancedsearch">

-Search via a [[filter expression|http://tiddlywiki.com/static/TiddlerFilters.html]]:
+<<lingo Filter/Hint>>

 <div class="tw-search"><$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/><$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="btn-invisible">{{$:/core/images/close-button}}</$link></$reveal></div>

@ -14,7 +15,7 @@ Search via a [[filter expression|http://tiddlywiki.com/static/TiddlerFilters.htm

 <div class="tw-search-results">

-//<small><$count filter={{$:/temp/advancedsearch}}/> matches</small>//
+<<lingo Advanced/Matches>>

 <$list filter={{$:/temp/advancedsearch}} template="$:/core/ui/ListItemTemplate"/>

--- a/core/ui/AdvancedSearch/Shadows.tid
+++ b/core/ui/AdvancedSearch/Shadows.tid
@ -1,10 +1,11 @@
 title: $:/core/ui/AdvancedSearch/Shadows
 tags: $:/tags/AdvancedSearch
-caption: Shadows
+caption: {{$:/language/Search/Shadows/Caption}}

+\define lingo-base() $:/language/Search/
 <$linkcatcher to="$:/temp/advancedsearch">

-Search for shadow tiddlers:
+<<lingo Shadows/Hint>>

 <div class="tw-search"><$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/><$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="btn-invisible">{{$:/core/images/close-button}}</$link></$reveal></div>

@ -14,7 +15,7 @@ Search for shadow tiddlers:

 <div class="tw-search-results">

-//<small><$count filter="[is[shadow]search{$:/temp/advancedsearch}]"/> matches</small>//
+<<lingo Advanced/Matches>>

 <$list filter="[is[shadow]search{$:/temp/advancedsearch}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>

--- a/core/ui/AdvancedSearch/System.tid
+++ b/core/ui/AdvancedSearch/System.tid
@ -1,10 +1,11 @@
 title: $:/core/ui/AdvancedSearch/System
 tags: $:/tags/AdvancedSearch
-caption: System
+caption: {{$:/language/Search/System/Caption}}

+\define lingo-base() $:/language/Search/
 <$linkcatcher to="$:/temp/advancedsearch">

-Search for system tiddlers:
+<<lingo System/Hint>>

 <div class="tw-search"><$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/><$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="btn-invisible">{{$:/core/images/close-button}}</$link></$reveal></div>

@ -14,7 +15,7 @@ Search for system tiddlers:

 <div class="tw-search-results">

-//<small><$count filter="[is[system]search{$:/temp/advancedsearch}]"/> matches</small>//
+<<lingo Advanced/Matches>>

 <$list filter="[is[system]search{$:/temp/advancedsearch}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>

--- a/core/ui/ControlPanel/Basics.tid
+++ b/core/ui/ControlPanel/Basics.tid
@ -3,15 +3,15 @@ tags: $:/tags/ControlPanel
 caption: {{$:/language/ControlPanel/Basics/Caption}}

 \define lingo-base() $:/language/ControlPanel/Basics/
-|<<lingo Version>> |''<<version>>'' |
-|<$link to="SiteTitle"><<lingo Title>></$link> |<$edit-text tiddler="SiteTitle" default="" tag="input"/> |
-|<$link to="SiteSubtitle"><<lingo Subtitle>></$link> |<$edit-text tiddler="SiteSubtitle" default="" tag="input"/> |
-|<$link to="$:/status/UserName"><<lingo Username>></$link> |<$edit-text tiddler="$:/status/UserName" default="" tag="input"/> |
-|<$link to="$:/config/AnimationDuration"><<lingo AnimDuration>></$link> |<$edit-text tiddler="$:/config/AnimationDuration" default="" tag="input"/> |
-|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers>></$link> |<<lingo DefaultTiddlers/Prompt>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/Hint>>// |
-|<<lingo Language/Prompt>>s |{{$:/snippets/minilanguageswitcher}} |
-|<<lingo Tiddlers>> |''<$count filter="[!is[system]]"/>'' |
-|<<lingo Tags>> |''<$count filter="[tags[]]"/>'' |
-|<<lingo SystemTiddlers>> |''<$count filter="[is[system]]"/>'' |
-|<<lingo ShadowTiddlers>> |''<$count filter="[is[shadow]]"/>'' |
-|<<lingo OverriddenShadowTiddlers>> |''<$count filter="[!is[system]is[shadow]]"/>'' |
+|<<lingo Version/Prompt>> |''<<version>>'' |
+|<$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="$:/status/UserName"><<lingo Username/Prompt>></$link> |<$edit-text tiddler="$:/status/UserName" default="" tag="input"/> |
+|<$link to="$:/config/AnimationDuration"><<lingo AnimDuration/Prompt>></$link> |<$edit-text tiddler="$:/config/AnimationDuration" default="" tag="input"/> |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+|<<lingo Language/Prompt>> |{{$:/snippets/minilanguageswitcher}} |
+|<<lingo Tiddlers/Prompt>> |''<$count filter="[!is[system]]"/>'' |
+|<<lingo Tags/Prompt>> |''<$count filter="[tags[]]"/>'' |
+|<<lingo SystemTiddlers/Prompt>> |''<$count filter="[is[system]]"/>'' |
+|<<lingo ShadowTiddlers/Prompt>> |''<$count filter="[is[shadow]]"/>'' |
+|<<lingo OverriddenShadowTiddlers/Prompt>> |''<$count filter="[!is[system]is[shadow]]"/>'' |
--- a/core/ui/EditTemplate/body.tid
+++ b/core/ui/EditTemplate/body.tid
@ -1,21 +1,19 @@
 title: $:/core/ui/EditTemplate/body
 tags: $:/tags/EditTemplate

-\define prompt()
-Type the text for this tiddler
-\end
+\define lingo-base() $:/language/EditTemplate/
 <$reveal state="$:/ShowEditPreview" type="match" text="yes">
-<em class="tw-edit"><$transclude tiddler="$:/core/ui/EditorHint"/></em> <$button type="set" set="$:/ShowEditPreview" setTo="no">hide preview</$button>
+<em class="tw-edit"><<lingo Body/Hint>></em> <$button type="set" set="$:/ShowEditPreview" setTo="no"><<lingo Body/Preview/Button/Hide>></$button>
 <div class="tw-tiddler-preview">
 <div class="tw-tiddler-preview-preview">
 <$transclude />
 </div>
 <div class="tw-tiddler-preview-edit">
-<$edit field="text" class="tw-edit-texteditor" placeholder=<<prompt>>/>
+<$edit field="text" class="tw-edit-texteditor" placeholder={{$:/language/EditTemplate/Body/Placeholder}}/>
 </div>
 </div>
 </$reveal>
 <$reveal state="$:/ShowEditPreview" type="nomatch" text="yes">
-<em class="tw-edit"><$transclude tiddler="$:/core/ui/EditorHint"/></em> <$button type="set" set="$:/ShowEditPreview" setTo="yes">show preview</$button>
-<$edit field="text" class="tw-edit-texteditor" placeholder=<<prompt>>/>
+<em class="tw-edit"><<lingo Body/Hint>></em> <$button type="set" set="$:/ShowEditPreview" setTo="yes"><<lingo Body/Preview/Button/Show>></$button>
+<$edit field="text" class="tw-edit-texteditor" placeholder={{$:/language/EditTemplate/Body/Placeholder}}/>
 </$reveal>
--- a/core/ui/EditTemplate/fields.tid
+++ b/core/ui/EditTemplate/fields.tid
@ -1,14 +1,15 @@
 title: $:/core/ui/EditTemplate/fields
 tags: $:/tags/EditTemplate

+\define lingo-base() $:/language/EditTemplate/
 <$fieldmangler><div class="tw-edit-fields">
-<table class="tw-edit-fields"><tbody><$list filter="[is[current]fields[]] -title -tags -text -creator -created -modified -modifier -type -[[draft.title]] -[[draft.of]]" variable="currentField"><tr class="tw-edit-field"><td class="tw-edit-field-name"><<currentField>>:</td><td class="tw-edit-field-value"><$edit-text tiddler=<<currentTiddler>> field=<<currentField>> placeholder="field value"/></td><td class="tw-edit-field-remove"><$button message="tw-remove-field" param=<<currentField>> class="btn-invisible">{{$:/core/images/delete-button}}</$button></td>
+<table class="tw-edit-fields"><tbody><$list filter="[is[current]fields[]] -title -tags -text -creator -created -modified -modifier -type -[[draft.title]] -[[draft.of]]" variable="currentField"><tr class="tw-edit-field"><td class="tw-edit-field-name"><<currentField>>:</td><td class="tw-edit-field-value"><$edit-text tiddler=<<currentTiddler>> field=<<currentField>> placeholder={{$:/language/EditTemplate/Fields/Add/Value/Placeholder}}/></td><td class="tw-edit-field-remove"><$button message="tw-remove-field" param=<<currentField>> class="btn-invisible">{{$:/core/images/delete-button}}</$button></td>
 </tr>
 </$list>
 </tbody>
 </table>
 </div>

-<div class="tw-edit-field-add"><em class="tw-edit">Add a new field:</em> <span class="tw-edit-field-add-name"><$edit-text tiddler="$:/temp/NewFieldName" tag="input" default="" placeholder="field name" class="tw-edit-texteditor"/></span> <span class="tw-edit-field-add-button"><$button message="tw-add-field" param={{$:/temp/NewFieldName}} set="$:/temp/NewFieldName" setTo="" class="">add</$button></span></div>
+<div class="tw-edit-field-add"><em class="tw-edit"><<lingo Fields/Add/Prompt>></em> <span class="tw-edit-field-add-name"><$edit-text tiddler="$:/temp/NewFieldName" tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Name/Placeholder}} class="tw-edit-texteditor"/></span> <span class="tw-edit-field-add-button"><$button message="tw-add-field" param={{$:/temp/NewFieldName}} set="$:/temp/NewFieldName" setTo="" class="">add</$button></span></div>

 </$fieldmangler>
--- a/core/ui/EditTemplate/tags.tid
+++ b/core/ui/EditTemplate/tags.tid
@ -1,13 +1,14 @@
 title: $:/core/ui/EditTemplate/tags
 tags: $:/tags/EditTemplate

+\define lingo-base() $:/language/EditTemplate/
 \define tag-styles()
 background-color:$(backgroundColor)$;
 \end
 <div class="tw-edit-tags"><$fieldmangler><$list filter="[is[current]tags[]sort[title]]" storyview="pop"><$set name="backgroundColor" value={{!!color}}><span style=<<tag-styles>> class="tw-tag-label"><$view field="title" format="text" /><$button message="tw-remove-tag" param={{!!title}} class="btn-invisible tw-remove-tag-button">&times;</$button></span></$set>
 </$list>

-<div class="tw-edit-add-tag"><span class="tw-add-tag-name"><$edit-text tiddler="$:/temp/NewTagName" tag="input" default="" placeholder="tag name" focusPopup=<<qualify "$:/state/tagsAutoComplete">> class="tw-edit-texteditor"/></span> <$button popup=<<qualify "$:/state/tagsAutoComplete">> class="btn-invisible btn-dropdown">{{$:/core/images/down-arrow}}</$button> <span class="tw-add-tag-button"><$button message="tw-add-tag" param={{$:/temp/NewTagName}} set="$:/temp/NewTagName" setTo="" class="">add</$button></span></div>
+<div class="tw-edit-add-tag"><span class="tw-add-tag-name"><$edit-text tiddler="$:/temp/NewTagName" tag="input" default="" placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}} focusPopup=<<qualify "$:/state/tagsAutoComplete">> class="tw-edit-texteditor"/></span> <$button popup=<<qualify "$:/state/tagsAutoComplete">> class="btn-invisible btn-dropdown">{{$:/core/images/down-arrow}}</$button> <span class="tw-add-tag-button"><$button message="tw-add-tag" param={{$:/temp/NewTagName}} set="$:/temp/NewTagName" setTo="" class=""><<lingo Tags/Add/Button>></$button></span></div>

 <div class="tw-block-dropdown-wrapper">
 <$reveal state=<<qualify "$:/state/tagsAutoComplete">> type="nomatch" text="" default="">
--- a/core/ui/EditTemplate/type.tid
+++ b/core/ui/EditTemplate/type.tid
@ -1,7 +1,8 @@
 title: $:/core/ui/EditTemplate/type
 tags: $:/tags/EditTemplate

-<p><$fieldmangler><em class="tw-edit">Type:</em> <$edit-text field="type" tag="input" default="" placeholder="type" focusPopup=<<qualify "$:/state/typeDropdown">> class="tw-edit-typeeditor"/> <$button popup=<<qualify "$:/state/typeDropdown">> class="btn-invisible btn-dropdown">{{$:/core/images/down-arrow}}</$button> <$button message="tw-remove-field" param="type" class="btn-invisible btn-icon">{{$:/core/images/delete-button}}</$button></$fieldmangler></p>
+\define lingo-base() $:/language/EditTemplate/
+<p><$fieldmangler><em class="tw-edit"><<lingo Type/Prompt>></em> <$edit-text field="type" tag="input" default="" placeholder={{$:/language/EditTemplate/Type/Placeholder}} focusPopup=<<qualify "$:/state/typeDropdown">> class="tw-edit-typeeditor"/> <$button popup=<<qualify "$:/state/typeDropdown">> class="btn-invisible btn-dropdown">{{$:/core/images/down-arrow}}</$button> <$button message="tw-remove-field" param="type" class="btn-invisible btn-icon">{{$:/core/images/delete-button}}</$button></$fieldmangler></p>

 <div class="tw-block-dropdown-wrapper">
 <$reveal state=<<qualify "$:/state/typeDropdown">> type="nomatch" text="" default="">
--- a/core/ui/EditorHint.tid
+++ b/core/ui/EditorHint.tid
@ -1,3 +0,0 @@
-title: $:/core/ui/EditorHint
-
-Use WikiText to add formatting, images, and dynamic features
--- a/core/ui/MoreSideBar/All.tid
+++ b/core/ui/MoreSideBar/All.tid
@ -1,5 +1,5 @@
 title: $:/core/ui/MoreSideBar/All
 tags: $:/tags/MoreSideBar
-caption: All
+caption: {{$:/language/SideBar/All/Caption}}

 <$list filter="[!is[system]sort[title]]" template="$:/core/ui/ListItemTemplate"/>
--- a/core/ui/MoreSideBar/Drafts.tid
+++ b/core/ui/MoreSideBar/Drafts.tid
@ -1,5 +1,5 @@
 title: $:/core/ui/MoreSideBar/Drafts
 tags: $:/tags/MoreSideBar
-caption: Drafts
+caption: {{$:/language/SideBar/Drafts/Caption}}

 <$list filter="[has[draft.of]sort[title]]" template="$:/core/ui/ListItemTemplate"/>
--- a/core/ui/MoreSideBar/Missing.tid
+++ b/core/ui/MoreSideBar/Missing.tid
@ -1,5 +1,5 @@
 title: $:/core/ui/MoreSideBar/Missing
 tags: $:/tags/MoreSideBar
-caption: Missing
+caption: {{$:/language/SideBar/Missing/Caption}}

 <$list filter="[is[missing]sort[title]]" template="$:/core/ui/MissingTemplate"/>
--- a/core/ui/MoreSideBar/Orphans.tid
+++ b/core/ui/MoreSideBar/Orphans.tid
@ -1,5 +1,5 @@
 title: $:/core/ui/MoreSideBar/Orphans
 tags: $:/tags/MoreSideBar
-caption: Orphans
+caption: {{$:/language/SideBar/Orphans/Caption}}

 <$list filter="[is[orphan]sort[title]]" template="$:/core/ui/ListItemTemplate"/>
--- a/core/ui/MoreSideBar/Recent.tid
+++ b/core/ui/MoreSideBar/Recent.tid
@ -1,5 +1,5 @@
 title: $:/core/ui/MoreSideBar/Recent
 tags: $:/tags/MoreSideBar
-caption: Recent
+caption: {{$:/language/SideBar/Recent/Caption}}

 {{$:/snippets/recentchanges}}
--- a/core/ui/MoreSideBar/Shadows.tid
+++ b/core/ui/MoreSideBar/Shadows.tid
@ -1,5 +1,5 @@
 title: $:/core/ui/MoreSideBar/Shadows
 tags: $:/tags/MoreSideBar
-caption: Shadows
+caption: {{$:/language/SideBar/Shadows/Caption}}

 <$list filter="[is[shadow]sort[title]]" template="$:/core/ui/ListItemTemplate"/>
--- a/core/ui/MoreSideBar/System.tid
+++ b/core/ui/MoreSideBar/System.tid
@ -1,5 +1,5 @@
 title: $:/core/ui/MoreSideBar/System
 tags: $:/tags/MoreSideBar
-caption: System
+caption: {{$:/language/SideBar/System/Caption}}

 <$list filter="[is[system]sort[title]]" template="$:/core/ui/ListItemTemplate"/>
--- a/core/ui/MoreSideBar/Tags.tid
+++ b/core/ui/MoreSideBar/Tags.tid
@ -1,6 +1,6 @@
 title: $:/core/ui/MoreSideBar/Tags
 tags: $:/tags/MoreSideBar
-caption: Tags
+caption: {{$:/language/SideBar/Tags/Caption}}

 <$list filter="[tags[]sort[title]]">
 <$transclude tiddler="$:/core/ui/TagTemplate"/> <small class="tw-menu-list-count"><$count filter="[is[current]tagging[]]"/></small>
--- a/core/ui/MoreSideBar/Types.tid
+++ b/core/ui/MoreSideBar/Types.tid
@ -1,6 +1,6 @@
 title: $:/core/ui/MoreSideBar/Types
 tags: $:/tags/MoreSideBar
-caption: Types
+caption: {{$:/language/SideBar/Types/Caption}}

 <$list filter="[!is[system]has[type]each[type]sort[type]]">
 <div class="tw-menu-list-item">
--- a/core/ui/SideBar/More.tid
+++ b/core/ui/SideBar/More.tid
@ -1,6 +1,6 @@
 title: $:/core/ui/SideBar/More
 tags: $:/tags/SideBar
-caption: More
+caption: {{$:/language/SideBar/More/Caption}}

 <div class="tw-more-sidebar">
 <<tabs "[is[shadow]!has[draft.of]tag[$:/tags/MoreSideBar]] [!is[shadow]!has[draft.of]tag[$:/tags/MoreSideBar]] +[tag[$:/tags/MoreSideBar]]" "$:/core/ui/MoreSideBar/Tags" "$:/state/tab/moresidebar">>
--- a/core/ui/SideBar/Open.tid
+++ b/core/ui/SideBar/Open.tid
@ -1,6 +1,6 @@
 title: $:/core/ui/SideBar/Open
 tags: $:/tags/SideBar
-caption: Open
+caption: {{$:/language/SideBar/Open/Caption}}

 <$list filter="[list[$:/StoryList]]" history="$:/HistoryList" storyview="pop">
 <$button message="tw-close-tiddler" class="btn-invisible btn-mini">&times;</$button> <$link to={{!!title}}><$view field="title"/></$link>
--- a/core/ui/SideBar/Recent.tid
+++ b/core/ui/SideBar/Recent.tid
@ -1,5 +1,5 @@
 title: $:/core/ui/SideBar/Recent
 tags: $:/tags/SideBar
-caption: Recent
+caption: {{$:/language/SideBar/Recent/Caption}}

 {{$:/snippets/recentchanges}}
--- a/core/ui/SideBar/Tools.tid
+++ b/core/ui/SideBar/Tools.tid
@ -1,8 +1,9 @@
 title: $:/core/ui/SideBar/Tools
 tags: $:/tags/SideBar
-caption: Tools
+caption: {{$:/language/SideBar/Tools/Caption}}

-Import: <$browse/>
+\define lingo-base() $:/language/ControlPanel/
+<<lingo Tools/Import/Prompt>> <$browse/>

 ---

@ -10,7 +11,7 @@ Import: <$browse/>

 ---

-TiddlyWiki5 version <<version>>
+<<lingo Basics/Version/Prompt>> <<version>>

 ---

--- a/core/ui/SideBarLists.tid
+++ b/core/ui/SideBarLists.tid
@ -8,7 +8,7 @@ title: $:/core/ui/SideBarLists

 <div class="tw-search-results">

-//<small><$count filter="[!is[system]search{$:/temp/search}]"/> matches</small>//
+{{$:/language/Search/Matches}}

 <$list filter="[!is[system]search{$:/temp/search}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>

--- a/core/ui/TiddlerInfo/Fields.tid
+++ b/core/ui/TiddlerInfo/Fields.tid
@ -1,5 +1,5 @@
 title: $:/core/ui/TiddlerInfo/Fields
 tags: $:/tags/TiddlerInfo
-caption: Fields
+caption: {{$:/language/TiddlerInfo/Fields/Caption}}

 <$transclude tiddler="$:/core/ui/TiddlerFields"/>
--- a/core/ui/TiddlerInfo/List.tid
+++ b/core/ui/TiddlerInfo/List.tid
@ -1,5 +1,6 @@
 title: $:/core/ui/TiddlerInfo/List
 tags: $:/tags/TiddlerInfo
-caption: List
+caption: {{$:/language/TiddlerInfo/List/Caption}}

-<$list filter="[list{!!title}]" emptyMessage="This tiddler does not have a list" template="$:/core/ui/ListItemTemplate"/>
+\define lingo-base() $:/language/TiddlerInfo/
+<$list filter="[list{!!title}]" emptyMessage=<<lingo List/Empty>> template="$:/core/ui/ListItemTemplate"/>
--- a/core/ui/TiddlerInfo/Listed.tid
+++ b/core/ui/TiddlerInfo/Listed.tid
@ -1,5 +1,6 @@
 title: $:/core/ui/TiddlerInfo/Listed
 tags: $:/tags/TiddlerInfo
-caption: Listed
+caption: {{$:/language/TiddlerInfo/Listed/Caption}}

-<$list filter="[is[current]listed[]!is[system]]" emptyMessage="This tiddler is not listed by any others" template="$:/core/ui/ListItemTemplate"/>
+\define lingo-base() $:/language/TiddlerInfo/
+<$list filter="[is[current]listed[]!is[system]]" emptyMessage=<<lingo Listed/Empty>> template="$:/core/ui/ListItemTemplate"/>
--- a/core/ui/TiddlerInfo/References.tid
+++ b/core/ui/TiddlerInfo/References.tid
@ -1,6 +1,7 @@
 title: $:/core/ui/TiddlerInfo/References
 tags: $:/tags/TiddlerInfo
-caption: References
+caption: {{$:/language/TiddlerInfo/References/Caption}}

-<$list filter="[is[current]backlinks[]sort[title]]" emptyMessage="No tiddlers link to this one" template="$:/core/ui/ListItemTemplate">
+\define lingo-base() $:/language/TiddlerInfo/
+<$list filter="[is[current]backlinks[]sort[title]]" emptyMessage=<<lingo References/Empty>> template="$:/core/ui/ListItemTemplate">
 </$list>
--- a/core/ui/TiddlerInfo/Tagging.tid
+++ b/core/ui/TiddlerInfo/Tagging.tid
@ -1,5 +1,6 @@
 title: $:/core/ui/TiddlerInfo/Tagging
 tags: $:/tags/TiddlerInfo
-caption: Tagging
+caption: {{$:/language/TiddlerInfo/Tagging/Caption}}

-<$list filter="[is[current]tagging[]]" emptyMessage="No tiddlers are tagged with this one" template="$:/core/ui/ListItemTemplate"/>
+\define lingo-base() $:/language/TiddlerInfo/
+<$list filter="[is[current]tagging[]]" emptyMessage=<<lingo Tagging/Empty>> template="$:/core/ui/ListItemTemplate"/>
--- a/core/ui/UntaggedTemplate.tid
+++ b/core/ui/UntaggedTemplate.tid
@ -1,6 +1,7 @@
 title: $:/core/ui/UntaggedTemplate

-<$button popup=<<qualify "$:/state/tagpopup">> class="btn-invisible tw-untagged-label tw-tag-label">untagged</$button>
+\define lingo-base() $:/language/SideBar/
+<$button popup=<<qualify "$:/state/tagpopup">> class="btn-invisible tw-untagged-label tw-tag-label"><<lingo Tags/Untagged/Caption>></$button>
 <$reveal state=<<qualify "$:/state/tagpopup">> type="popup" position="below"><div class="tw-drop-down">
 <$list filter="[untagged[]!is[system]] -[tags[]] +[sort[title]]" template="$:/core/ui/ListItemTemplate"/>
 </div></$reveal>
--- a/core/wiki/autosavestatus.tid
+++ b/core/wiki/autosavestatus.tid
@ -1,10 +1,12 @@
 title: $:/snippets/autosavestatus

+\define lingo-base() $:/language/ControlPanel/Saving/
 <$reveal type="match" state="$:/config/AutoSave" text="yes">
-Autosave is currently enabled
-<$linkcatcher to="$:/config/AutoSave"><$link to="no">Disable</$link></$linkcatcher>
+<<lingo AutoSave/Enabled/Prompt>>
+<$linkcatcher to="$:/config/AutoSave"><$link to="no"><<lingo AutoSave/Enabled/Button>>
+</$link></$linkcatcher>
 </$reveal>
 <$reveal type="nomatch" state="$:/config/AutoSave" text="yes">
-Autosave is currently disabled
-<$linkcatcher to="$:/config/AutoSave"><$link to="yes">Enable</$link></$linkcatcher>
+<<lingo AutoSave/Disabled/Prompt>>
+<$linkcatcher to="$:/config/AutoSave"><$link to="yes"><<lingo AutoSave/Disabled/Button>></$link></$linkcatcher>
 </$reveal>
--- a/core/wiki/download-wiki-button.tid
+++ b/core/wiki/download-wiki-button.tid
@ -1,3 +1,4 @@
 title: $:/snippets/download-wiki-button

-<$button message="tw-download-file" param="$:/core/save/all" class="btn-big-green">Download Full {{$:/core/images/save-button}}</$button>
+\define lingo-base() $:/language/ControlPanel/Tools/Download/
+<$button message="tw-download-file" param="$:/core/save/all" class="btn-big-green"><<lingo Full/Caption>> {{$:/core/images/save-button}}</$button>
--- a/core/wiki/encryptionstatus.tid
+++ b/core/wiki/encryptionstatus.tid
@ -1,11 +1,12 @@
 title: $:/snippets/encryptionstatus

+\define lingo-base() $:/language/ControlPanel/Tools/Encryption/
 <$reveal type="match" state="$:/isEncrypted" text="yes">
-This wiki is encrypted.
-<$button message="tw-clear-password" class="btn btn-danger">Clear password</$button>
-<$button message="tw-set-password" class="btn btn-warning">Change password</$button>
+<<lingo Enabled/Prompt>>
+<$button message="tw-clear-password" class="btn btn-danger"><<lingo ClearPassword/Button>></$button>
+<$button message="tw-set-password" class="btn btn-warning"><<lingo ChangePassword/Button>></$button>
 </$reveal>
 <$reveal type="nomatch" state="$:/isEncrypted" text="yes">
-This wiki is not encrypted.
-<$button message="tw-set-password" class="btn btn-warning">Set password</$button>
+<<lingo Disabled/Prompt>>
+<$button message="tw-set-password" class="btn btn-warning"><<lingo SetPassword/Button>></$button>
 </$reveal>
--- a/core/wiki/minithemeswitcher.tid
+++ b/core/wiki/minithemeswitcher.tid
@ -1,6 +1,7 @@
 title: $:/snippets/minithemeswitcher

-Current theme: <$view tiddler={{$:/theme}} field="name"/>
+\define lingo-base() $:/language/ControlPanel/Appearance/Theme/
+<<lingo Caption>> <$view tiddler={{$:/theme}} field="name"/>

 <$linkcatcher to="$:/theme">
 <$list filter="[plugin-type[theme]sort[title]]"><div><$reveal state="$:/theme" type="match" text={{!!title}}>&bull;</$reveal><$reveal state="$:/theme" type="nomatch" text={{!!title}}>&nbsp;</$reveal> <$link to={{!!title}}><$view field="name" format="text"/></$link></div>
--- a/core/wiki/themeswitcher.tid
+++ b/core/wiki/themeswitcher.tid
@ -1,6 +1,7 @@
 title: $:/snippets/themeswitcher

-Current theme: <$view tiddler={{$:/theme}} field="name"/>
+\define lingo-base() $:/language/ControlPanel/Appearance/Theme/
+<<lingo Caption>> <$view tiddler={{$:/theme}} field="name"/>

 <$linkcatcher to="$:/theme">
 <$list filter="[plugin-type[theme]sort[title]]"><div><$reveal state="$:/theme" type="match" text={{!!title}}>&bull;</$reveal><$reveal state="$:/theme" type="nomatch" text={{!!title}}>&nbsp;</$reveal> <$link to={{!!title}}>''<$view field="name" format="text"/>'' <$view field="description" format="text"/></$link></div>
--- a/core/wiki/viewswitcher.tid
+++ b/core/wiki/viewswitcher.tid
@ -1,6 +1,7 @@
 title: $:/snippets/viewswitcher

-Current view: {{$:/view}}
+\define lingo-base() $:/language/ControlPanel/Appearance/StoryView/
+<<lingo Caption>> {{$:/view}}

 <$linkcatcher to="$:/view"><$list filter="classic zoomin pop"><div><$reveal state="$:/view" type="match" text={{!!title}}>&bull;</$reveal><$reveal state="$:/view" type="nomatch" text={{!!title}}>&nbsp;</$reveal> <$link to={{!!title}}><$view field="title"/></$link>
 </div>