Merge remote-tracking branch 'upstream/master'

core/language/en-GB/ControlPanel.multids

@@ -9,6 +9,11 @@ Advanced/TiddlerFields/Hint: This is the full set of TiddlerFields in use in thi
 Appearance/Caption: Appearance
 Appearance/Hint: Ways to customise the appearance of your TiddlyWiki.
 Appearance/Palette/Caption: Palette
+Appearance/Palette/Editor/Clone/Caption: clone
+Appearance/Palette/Editor/Clone/Prompt: It is recommended that you clone this shadow palette before editing it
+Appearance/Palette/Editor/Prompt/Modified: This shadow palette has been modified
+Appearance/Palette/Editor/Prompt: Editing
+Appearance/Palette/Editor/Reset/Caption: reset
 Appearance/Palette/Prompt: Current palette:
 Appearance/StoryView/Caption: Story View
 Appearance/StoryView/Prompt: Current view:

core/ui/PageStylesheet.tid

@@ -47,6 +47,10 @@ background-image: -webkit-linear-gradient($gradient$);
 background-image: -ms-linear-gradient($gradient$);
 ```
 \end
+\define datauri(title)
+<$macrocall $name="makedatauri" type={{$title$!!type}} text={{$title$}}/>
+\end
+
 <$list filter="[is[shadow]tag[$:/tags/stylesheet]] [!is[shadow]tag[$:/tags/stylesheet]]">
 <$transclude/>
 </$list>

core/wiki/paletteeditor.tid

@@ -1,19 +1,20 @@
 title: $:/snippets/paletteeditor
 
+\define lingo-base() $:/language/ControlPanel/Appearance/Palette/Editor/
 <$set name="currentTiddler" value={{$:/palette}}>
 
-Editing <$link to={{$:/palette}}><$macrocall $name="currentTiddler" $output="text/plain"/></$link>
+<<lingo Prompt>> <$link to={{$:/palette}}><$macrocall $name="currentTiddler" $output="text/plain"/></$link>
 
 <$list filter="[is[current]is[shadow]is[tiddler]]" variable="listItem">
-This shadow palette has been modified
+<<lingo Prompt/Modified>>
-<$button message="tw-delete-tiddler" param={{$:/palette}}>reset</$button>
+<$button message="tw-delete-tiddler" param={{$:/palette}}><<lingo Reset/Caption>></$button>
 </$list>
 
 <$list filter="[is[current]is[shadow]!is[tiddler]]" variable="listItem">
-It is recommended that you clone this shadow palette before editing it
+<<lingo Clone/Prompt>>
 </$list>
 
-<$button message="tw-new-tiddler" param={{$:/palette}}>clone</$button>
+<$button message="tw-new-tiddler" param={{$:/palette}}><<lingo Clone/Caption>></$button>
 
 <table><tbody><$list filter="[is[current]indexes[]]" variable="colourName"><tr><td><$macrocall $name="colourName" $output="text/plain"/></td>
 <td><$edit-text index=<<colourName>> tag="input"/></td>

editions/tw5.com/tiddlywiki.info

@@ -23,6 +23,7 @@
 		"de-AT",
 		"de-DE",
 		"fr-FR",
+		"zh-Hans",
 		"zh-Hant"
 	]
 }

languages/en-US/ControlPanel.multids

@@ -1,3 +0,0 @@
-title: $:/language/ControlPanel/
-
-Basics/Language/Prompt: Hiya! Current language:

languages/en-US/plugin.info

@@ -1,8 +0,0 @@
-{
-	"title": "$:/languages/en-US",
-	"name": "en-US",
-	"plugin-type": "language",
-	"description": "English (US)",
-	"author": "JeremyRuston",
-	"core-version": ">=5.0.0"
-}

languages/fr-FR/ControlPanel.multids

@@ -1,3 +0,0 @@
-title: $:/language/ControlPanel/
-
-Basics/Language/Prompt: Bonjour! Langage courant:

languages/fr-FR/plugin.info

@@ -1,8 +0,0 @@
-{
-	"title": "$:/languages/fr-FR",
-	"name": "fr-FR",
-	"plugin-type": "language",
-	"description": "French (France)",
-	"author": "JeremyRuston",
-	"core-version": ">=5.0.0"
-}

themes/tiddlywiki/starlight/styles.tid

@@ -2,39 +2,6 @@ title: $:/themes/tiddlywiki/starlight/styles.tid
 tags: [[$:/tags/stylesheet]]
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline
-\define border-radius(radius)
-```
-  -webkit-border-radius: $radius$;
-     -moz-border-radius: $radius$;
-          border-radius: $radius$;
-```
-\end
-\define box-shadow(shadow)
-```
-  -webkit-box-shadow: $shadow$;
-     -moz-box-shadow: $shadow$;
-          box-shadow: $shadow$;
-```
-\end
-\define filter(filter)
-```
-  -webkit-filter: $filter$;
-     -moz-filter: $filter$;
-          filter: $filter$;
-```
-\end
-\define background-linear-gradient(gradient)
-```
-background-image: linear-gradient($gradient$);
-background-image: -o-linear-gradient($gradient$);
-background-image: -moz-linear-gradient($gradient$);
-background-image: -webkit-linear-gradient($gradient$);
-background-image: -ms-linear-gradient($gradient$);
-```
-\end
-\define datauri(title)
-<$macrocall $name="makedatauri" type={{$title$!!type}} text={{$title$}}/>
-\end
 
 /*
 Placeholder for a more thorough refinement of Snow White