Merge branch 'master' into fr-FR

core/images/globe.tid

@@ -1,7 +1,7 @@
 title: $:/core/images/globe
 tags: $:/tags/Image
 
-<svg class="tw-image-globe tw-image-button" width="128px" height="128px" viewBox="0 0 128 128">
+<svg class="tw-image-globe tw-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
     <g fill-rule="evenodd">
         <path d="M72.8111354,37.1275855 C72.8111354,37.9789875 72.8111354,38.8303894 72.8111354,39.6817913 C72.8111354,41.8784743 73.7885604,46.5631866 72.8111354,48.5143758 C71.3445471,51.4420595 68.1617327,52.0543531 66.4170946,54.3812641 C65.2352215,55.9575873 61.7987417,64.9821523 62.7262858,67.3005778 C66.6959269,77.2228204 74.26087,70.4881886 80.6887657,76.594328 C81.5527211,77.415037 83.5758191,78.8666631 83.985137,79.8899578 C87.2742852,88.1128283 76.4086873,94.8989524 87.7419325,106.189751 C88.9872885,107.430443 91.555495,102.372895 91.8205061,101.575869 C92.6726866,99.0129203 98.5458765,96.1267309 100.908882,94.5234439 C102.928056,93.1534443 105.782168,91.8557166 107.236936,89.7775886 C109.507391,86.5342557 108.717505,82.2640435 110.334606,79.0328716 C112.473794,74.7585014 114.163418,69.3979002 116.332726,65.0674086 C120.230862,57.2857361 121.054075,67.1596684 121.400359,67.5059523 C121.757734,67.8633269 122.411167,67.5059523 122.916571,67.5059523 C123.011132,67.5059523 124.364019,67.6048489 124.432783,67.5059523 C125.0832,66.5705216 123.390209,49.5852316 123.114531,48.2089091 C121.710578,41.1996597 116.17083,32.4278331 111.249523,27.7092761 C104.975994,21.6942076 104.160516,11.5121686 92.9912146,12.7547535 C92.7872931,12.7774397 87.906794,22.9027026 85.2136766,26.2672064 C81.486311,30.9237934 82.7434931,22.1144904 78.6876623,22.1144904 C78.6065806,22.1144904 77.5045497,22.0107615 77.4353971,22.1144904 C76.8488637,22.9942905 75.9952305,26.0101404 75.1288269,26.5311533 C74.8635477,26.6906793 73.4071369,26.2924966 73.2826811,26.5311533 C71.0401728,30.8313939 81.5394677,28.7427264 79.075427,34.482926 C76.7225098,39.9642538 72.747373,32.4860199 72.747373,43.0434079"></path>
         <path d="M44.4668556,7.01044608 C54.151517,13.1403033 45.1489715,19.2084878 47.1611905,23.2253896 C48.8157833,26.5283781 51.4021933,28.6198851 48.8753629,33.038878 C46.8123257,36.6467763 42.0052989,37.0050492 39.251679,39.7621111 C36.2115749,42.8060154 33.7884281,48.7028116 32.4624592,52.6732691 C30.8452419,57.5158356 47.0088721,59.5388126 44.5246867,63.6811917 C43.1386839,65.9923513 37.7785192,65.1466282 36.0880227,63.8791519 C34.9234453,63.0059918 32.4946425,63.3331166 31.6713597,62.0997342 C29.0575851,58.1839669 29.4107339,54.0758543 28.0457962,49.9707786 C27.1076833,47.1493864 21.732611,47.8501656 20.2022714,49.3776393 C19.6790362,49.8998948 19.8723378,51.1703278 19.8723378,51.8829111 C19.8723378,57.1682405 26.9914913,55.1986414 26.9914913,58.3421973 C26.9914913,72.9792302 30.9191897,64.8771867 38.1313873,69.6793121 C48.1678018,76.3618966 45.9763926,76.981595 53.0777543,84.0829567 C56.7511941,87.7563965 60.8192437,87.7689005 62.503478,93.3767069 C64.1046972,98.7081071 53.1759798,98.7157031 50.786754,100.825053 C49.663965,101.816317 47.9736094,104.970571 46.5680513,105.439676 C44.7757187,106.037867 43.334221,105.93607 41.6242359,107.219093 C39.1967302,109.040481 37.7241465,112.151588 37.6034934,112.030935 C35.4555278,109.88297 34.0848666,96.5511248 33.7147244,93.7726273 C33.1258872,89.3524817 28.1241923,88.2337027 26.7275443,84.7420826 C25.1572737,80.8164061 28.2518481,75.223612 25.599097,70.9819941 C19.0797019,60.557804 13.7775712,56.4811506 10.2493953,44.6896152 C9.3074899,41.5416683 13.5912267,38.1609942 15.1264825,35.8570308 C17.0029359,33.0410312 17.7876232,30.0028946 19.8723378,27.2224065 C22.146793,24.1888519 40.8551166,9.46076832 43.8574051,8.63490613 L44.4668556,7.01044608 Z"></path>

core/images/import-button.tid

@@ -0,0 +1,8 @@
+title: $:/core/images/import-button
+tags: $:/tags/Image
+
+<svg class="tw-image-import-button tw-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M105.449437,94.2138951 C105.449437,94.2138951 110.049457,94.1897106 110.049457,99.4026111 C110.049457,104.615512 105.163246,104.615511 105.163246,104.615511 L45.0075072,105.157833 C45.0075072,105.157833 0.367531803,106.289842 0.367532368,66.6449212 C0.367532934,27.0000003 45.0428249,27.0000003 45.0428249,27.0000003 L105.532495,27.0000003 C105.532495,27.0000003 138.996741,25.6734987 138.996741,55.1771866 C138.996741,84.6808745 105.727102,82.8457535 105.727102,82.8457535 L56.1735087,82.8457535 C56.1735087,82.8457535 22.6899229,85.1500223 22.6899229,66.0913753 C22.6899229,47.0327282 56.1735087,49.3383013 56.1735087,49.3383013 L105.727102,49.3383013 C105.727102,49.3383013 111.245209,49.3383024 111.245209,54.8231115 C111.245209,60.3079206 105.727102,60.5074524 105.727102,60.5074524 L56.1735087,60.5074524 C56.1735087,60.5074524 37.48913,60.5074528 37.48913,66.6449195 C37.48913,72.7823862 56.1735087,71.6766023 56.1735087,71.6766023 L105.727102,71.6766029 C105.727102,71.6766029 127.835546,73.1411469 127.835546,55.1771866 C127.835546,35.5304025 105.727102,38.3035317 105.727102,38.3035317 L45.0428249,38.3035317 C45.0428249,38.3035317 11.5287276,38.3035313 11.5287276,66.6449208 C11.5287276,94.9863103 45.0428244,93.9579678 45.0428244,93.9579678 L105.449437,94.2138951 Z" transform="translate(69.367532, 66.000000) rotate(-45.000000) translate(-69.367532, -66.000000) "></path>
+    </g>
+</svg>

core/images/storyview-cecily.tid

@@ -1,7 +1,7 @@
 title: $:/core/images/storyview-cecily
 tags: $:/tags/Image
 
-<svg class="tw-image-storyview-cecily tw-image-button" width="128px" height="128px" viewBox="0 0 128 128">
+<svg class="tw-image-storyview-cecily tw-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
     <g fill-rule="evenodd">
         <path d="M9.99919566,0 C4.48152297,0 0.00856547772,4.48053479 0.00856547772,9.99063018 L0.00856547772,118.00937 C0.00856547772,123.527043 4.48910027,128 9.99919566,128 L118.017935,128 C123.535608,128 128.008565,123.519465 128.008565,118.00937 L128.008565,9.99063018 C128.008565,4.47295749 123.528031,0 118.017935,0 L9.99919566,0 Z M9.00856548,9 L9.00856548,119 L119.008565,119 L119.008565,9 L9.00856548,9 Z"></path>
         <rect x="16.0098828" y="16" width="28.9901172" height="61"></rect>

core/images/storyview-classic.tid

@@ -1,7 +1,7 @@
 title: $:/core/images/storyview-classic
 tags: $:/tags/Image
 
-<svg class="tw-image-storyview-classic tw-image-button" width="129px" height="128px" viewBox="0 0 129 128">
+<svg class="tw-image-storyview-classic tw-image-button" width="22pt" height="22pt" viewBox="0 0 129 128">
     <g fill-rule="evenodd">
         <path d="M9.99919566,0 C4.48152297,0 0.00856547772,4.48053479 0.00856547772,9.99063018 L0.00856547772,118.00937 C0.00856547772,123.527043 4.48910027,128 9.99919566,128 L118.017935,128 C123.535608,128 128.008565,123.519465 128.008565,118.00937 L128.008565,9.99063018 C128.008565,4.47295749 123.528031,0 118.017935,0 L9.99919566,0 Z M9.00856548,9 L9.00856548,119 L119.008565,119 L119.008565,9 L9.00856548,9 Z"></path>
         <rect x="16.0098828" y="16" width="96.203165" height="32"></rect>

core/images/storyview-pop.tid

@@ -1,7 +1,7 @@
 title: $:/core/images/storyview-pop
 tags: $:/tags/Image
 
-<svg class="tw-image-storyview-pop tw-image-button" width="128px" height="128px" viewBox="0 0 128 128">
+<svg class="tw-image-storyview-pop tw-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
     <g fill-rule="evenodd">
         <path d="M9.99919566,0 C4.48152297,0 0.00856547772,4.48053479 0.00856547772,9.99063018 L0.00856547772,118.00937 C0.00856547772,123.527043 4.48910027,128 9.99919566,128 L118.017935,128 C123.535608,128 128.008565,123.519465 128.008565,118.00937 L128.008565,9.99063018 C128.008565,4.47295749 123.528031,0 118.017935,0 L9.99919566,0 Z M9.00856548,9 L9.00856548,119 L119.008565,119 L119.008565,9 L9.00856548,9 Z"></path>
         <rect x="16.0098828" y="16" width="96.203165" height="32"></rect>

core/images/storyview-zoomin.tid

@@ -1,7 +1,7 @@
 title: $:/core/images/storyview-zoomin
 tags: $:/tags/Image
 
-<svg class="tw-image-storyview-zoomin tw-image-button" width="128px" height="128px" viewBox="0 0 128 128">
+<svg class="tw-image-storyview-zoomin tw-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
     <g fill-rule="evenodd">
         <path d="M9.99919566,0 C4.48152297,0 0.00856547772,4.48053479 0.00856547772,9.99063018 L0.00856547772,118.00937 C0.00856547772,123.527043 4.48910027,128 9.99919566,128 L118.017935,128 C123.535608,128 128.008565,123.519465 128.008565,118.00937 L128.008565,9.99063018 C128.008565,4.47295749 123.528031,0 118.017935,0 L9.99919566,0 Z M9.00856548,9 L9.00856548,119 L119.008565,119 L119.008565,9 L9.00856548,9 Z"></path>
         <rect x="16.0098828" y="16" width="96.203165" height="57.9273639"></rect>

core/language/en-GB/Buttons.multids

@@ -26,6 +26,8 @@ Encryption/SetPassword/Caption: set password
 Encryption/SetPassword/Hint: Set a password for saving this wiki with encryption
 FullScreen/Caption: full-screen
 FullScreen/Hint: Enter or leave full-screen mode
+Import/Caption: import
+Import/Hint: Import files
 Info/Caption: info
 Info/Hint: Show information for this tiddler
 Home/Caption: home

core/language/en-GB/Import.multids

@@ -6,7 +6,8 @@ Listing/Import/Caption: Import
 Listing/Select/Caption: Select
 Listing/Status/Caption: Status
 Listing/Title/Caption: Title
-Upgrader/Plugins/Suppressed: Suppressed 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/System/Suppressed: Suppressed system tiddler
+Upgrader/System/Suppressed: Blocked system tiddler
 Upgrader/ThemeTweaks/Created: Migrated theme tweak from <$text text=<<from>>/>

core/modules/upgraders/plugins.js

@@ -14,6 +14,12 @@ Upgrader module that checks that plugins are newer than any already installed ve
 
 var UPGRADE_LIBRARY_TITLE = "$:/UpgradeLibrary";
 
+var BLOCKED_PLUGINS = {
+	"$:/plugins/tiddlywiki/fullscreen": {
+		versions: ["*"]
+	}
+};
+
 exports.upgrade = function(wiki,titles,tiddlers) {
 	var self = this,
 		messages = {},
@@ -23,7 +29,7 @@ exports.upgrade = function(wiki,titles,tiddlers) {
 				upgradeLibrary = wiki.getTiddlerData(UPGRADE_LIBRARY_TITLE,{});
 				upgradeLibrary.tiddlers = upgradeLibrary.tiddlers || {};
 			}
-			return upgradeLibrary.tiddlers[title]
+			return upgradeLibrary.tiddlers[title];
 		};
 
 	// Go through all the incoming tiddlers
@@ -46,7 +52,18 @@ exports.upgrade = function(wiki,titles,tiddlers) {
 				// Reject the incoming plugin by blanking all its fields
 				if($tw.utils.checkVersions(existingTiddler.fields.version,incomingTiddler.version)) {
 					tiddlers[title] = Object.create(null);
-					messages[title] = $tw.language.getString("Import/Upgrader/Plugins/Suppressed",{variables: {incoming: incomingTiddler.version, existing: existingTiddler.fields.version}});
+					messages[title] = $tw.language.getString("Import/Upgrader/Plugins/Suppressed/Version",{variables: {incoming: incomingTiddler.version, existing: existingTiddler.fields.version}});
+					return;
+				}
+			}
+		}
+		if(incomingTiddler && incomingTiddler["plugin-type"]) {
+			// Check whether the plugin is on the blocked list
+			var blockInfo = BLOCKED_PLUGINS[title];
+			if(blockInfo) {
+				if(blockInfo.versions.indexOf("*") !== -1 || (incomingTiddler.version && blockInfo.versions.indexOf(incomingTiddler.version) !== -1)) {
+					tiddlers[title] = Object.create(null);
+					messages[title] = $tw.language.getString("Import/Upgrader/Plugins/Suppressed/Incompatible");
 					return;
 				}
 			}

core/modules/widgets/tiddler.js

@@ -57,7 +57,7 @@ TiddlerWidget.prototype.getTagClasses = function() {
 	if(tiddler) {
 		var tags = [];
 		$tw.utils.each(tiddler.fields.tags,function(tag) {
-			tags.push("tw-tag-" + encodeURIComponent(tag));
+			tags.push("tw-tagged-" + encodeURIComponent(tag));
 		});
 		return tags.join(" ");
 	} else {

core/ui/PageControls/import.tid

@@ -0,0 +1,16 @@
+title: $:/core/ui/Buttons/import
+tags: $:/tags/PageControls
+caption: {{$:/core/images/import-button}} {{$:/language/Buttons/Import/Caption}}
+description: {{$:/language/Buttons/Import/Hint}}
+
+<div class="tw-file-input-wrapper">
+<$button title={{$:/language/Buttons/Import/Hint}} aria-label={{$:/language/Buttons/Import/Caption}} class=<<tw-config-toolbar-class>>>
+<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
+{{$:/core/images/import-button}}
+</$list>
+<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
+<$text text={{$:/language/Buttons/Import/Caption}}/>
+</$list>
+</$button>
+<$browse/>
+</div>

core/ui/PageControls/language.tid

@@ -5,7 +5,9 @@ description: {{$:/language/Buttons/Language/Hint}}
 
 <$button popup=<<qualify "$:/state/popup/language">> title={{$:/language/Buttons/Language/Hint}} aria-label={{$:/language/Buttons/Language/Caption}} class=<<tw-config-toolbar-class>> selectedClass="tw-selected">
 <$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
-<$transclude tiddler="$:/language/Flag"/>
+<span class="tw-image-button">
+<$image source="$:/language/Flag"/>
+</span>
 </$list>
 <$list filter="[<tw-config-toolbar-text>prefix[yes]]">
 <$text text={{$:/language/Buttons/Language/Caption}}/>
@@ -24,11 +26,13 @@ description: {{$:/language/Buttons/Language/Hint}}
 &nbsp;
 </$reveal>
 </span>
+<span class="tw-image-button">
 <$transclude subtiddler="$:/language/Flag">
 <$list filter="[all[current]field:title[$:/languages/en-GB]]">
 <$transclude tiddler="$:/core" subtiddler="$:/language/Flag"/>
 </$list>
 </$transclude>
+</span>
 <$view field="description">
 <$view field="name">
 <$view field="title"/>

core/ui/SideBar/Tools.tid

@@ -3,24 +3,30 @@ tags: $:/tags/SideBar
 caption: {{$:/language/SideBar/Tools/Caption}}
 
 \define lingo-base() $:/language/ControlPanel/
-<<lingo Tools/Import/Prompt>> <$browse/>
+\define config-title()
-
+$:/config/PageControlButtons/Visibility/$(listItem)$
----
+\end
-
-{{$:/snippets/encryptionstatus}}
-
----
 
 <<lingo Basics/Version/Prompt>> <<version>>
 
----
+<$set name="tw-config-toolbar-icons" value="yes">
 
-{{$:/snippets/viewswitcher}}
+<$set name="tw-config-toolbar-text" value="yes">
+
+<$set name="tw-config-toolbar-class" value="">
+
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">
+
+<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>>/> <i class="tw-muted"><$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>
+
+</$list>
+
+</$set>
+
+</$set>
+
+</$set>
 
 ---
 
 {{$:/snippets/minithemeswitcher}}
-
----
-
-{{$:/snippets/languageswitcher}}

core/ui/TiddlerInfo/Tools.tid

@@ -6,7 +6,6 @@ caption: {{$:/language/TiddlerInfo/Tools/Caption}}
 \define config-title()
 $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 \end
-
 <$set name="tw-config-toolbar-icons" value="yes">
 
 <$set name="tw-config-toolbar-text" value="yes">

core/wiki/config/PageControlButtons.multids

@@ -4,6 +4,7 @@ core/ui/Buttons/close-all: hide
 core/ui/Buttons/encryption: hide
 core/ui/Buttons/full-screen: hide
 core/ui/Buttons/home: hide
+core/ui/Buttons/import: hide
 core/ui/Buttons/language: hide
 core/ui/Buttons/more-page-actions: hide
 core/ui/Buttons/permaview: hide

core/wiki/tags/PageControls.tid

@@ -1,2 +1,2 @@
 title: $:/tags/PageControls
-list: [[$:/core/ui/Buttons/home]] [[$:/core/ui/Buttons/permaview]] [[$:/core/ui/Buttons/new-tiddler]] [[$:/core/ui/Buttons/control-panel]] [[$:/core/ui/Buttons/save-wiki]]
+list: [[$:/core/ui/Buttons/home]] [[$:/core/ui/Buttons/close-all]] [[$:/core/ui/Buttons/permaview]] [[$:/core/ui/Buttons/new-tiddler]] [[$:/core/ui/Buttons/import]] [[$:/core/ui/Buttons/control-panel]] [[$:/core/ui/Buttons/language]] [[$:/core/ui/Buttons/storyview]] [[$:/core/ui/Buttons/encryption]] [[$:/core/ui/Buttons/full-screen]] [[$:/core/ui/Buttons/save-wiki]] [[$:/core/ui/Buttons/more-page-actions]]

editions/tw5.com/tiddlers/concepts/CurrentTiddler.tid

@@ -5,3 +5,5 @@ title: CurrentTiddler
 type: text/vnd.tiddlywiki
 
 The CurrentTiddler is the current tiddler during WikiText processing. A context tiddler is set by the TiddlerWidget. It allows you to write references like `<$view field="title" format="link"/>` in TemplateTiddlers without explicitly specifying the tiddler that it applies to.
+
+The title of the current tiddler is contained in the widget variable ''currentTiddler''.

editions/tw5.com/tiddlers/system/github-fork-ribbon.tid

@@ -1,6 +1,7 @@
 title: $:/editions/tw5.com/github-fork-ribbon
 tags: $:/tags/PageControls
 caption: ~GitHub ribbon
+description: ~GitHub ribbon for tw5.com
 
 <div class="github-fork-ribbon-wrapper right"><div class="github-fork-ribbon"><a href="https://github.com/Jermolene/TiddlyWiki5" target="_blank">Find me on ~GitHub</a></div>
 </div>

editions/tw5.com/tiddlers/widgets/TiddlerWidget.tid

@@ -1,5 +1,5 @@
 created: 20130824154300000
-modified: 20140107114152456
+modified: 20140802114152456
 tags: widget
 title: TiddlerWidget
 type: text/vnd.tiddlywiki
@@ -13,3 +13,23 @@ The TiddlerWidget sets the CurrentTiddler that applies for processing its conten
 |!Attribute |!Description |
 |tiddler |The title of the tiddler to become the new CurrentTiddler |
 |class |CSS classes to added to the generated elements |
+
+! CSS Class Variables
+
+The tiddler widget assigns several useful CSS classes to variables that it creates:
+
+* ''missingTiddlerClass'': ''"tw-tiddler-exists"'' or ''"tw-tiddler-missing"'' depending upon whether the target tiddler exists
+* ''shadowTiddlerClass'': ''"tw-tiddler-shadow"'' if the tiddler is a shadow tiddler
+* ''systemTiddlerClass'': ''"tw-tiddler-system"'' if the tiddler is a system tiddler
+* ''tiddlerTagClasses'': A space separated list of CSS classes named ''"tw-tagged-{tagname}"''. For example ''"tw-tagged-introduction"''. Note that tag names are UrlEncoded which means that the tag ''$:/tags/Macro'' appears as the CSS class ''"tw-tagged-%24%3A%2Ftags%2FMacro"''
+
+You can use these variables like this:
+
+```
+<$tiddler tiddler="MyOtherTiddler">
+<div class=<<missingTiddlerClass>>>
+<$transclude/>
+</$tiddler>
+```
+
+See also [[$:/core/ui/ViewTemplate]].

languages/de-DE/Import.multids

@@ -6,7 +6,7 @@ Listing/Import/Caption: Importieren
 Listing/Select/Caption: Auswahl
 Listing/Status/Caption: Status
 Listing/Title/Caption: Titel
-Upgrader/Plugins/Suppressed: Einige "plugins" weden unterdrückt! Importierte plugins: <<incoming>> sind älter als existierende: <<existing>>.
+Upgrader/Plugins/Suppressed/Version: Einige "plugins" weden unterdrückt! Importierte plugins: <<incoming>> sind älter als existierende: <<existing>>.
 Upgrader/Plugins/Upgraded:  Aktualisieren der plugins von: <<incoming>> nach: <<upgraded>>
 Upgrader/System/Suppressed: Unterdrückte "System Tiddler"
 Upgrader/ThemeTweaks/Created: Migrieren der "theme tweaks" von: <$text text=<<from>>/>

languages/fr-FR/Import.multids

@@ -6,7 +6,7 @@ Listing/Import/Caption: Importer
 Listing/Select/Caption: Sélectionner
 Listing/Status/Caption: Statut
 Listing/Title/Caption: Titre
-Upgrader/Plugins/Suppressed: Plugin supprimé (le pressenti <<incoming>> étant plus ancien que l'existant <<existing>>)
+Upgrader/Plugins/Suppressed/Version: Plugin supprimé (le pressenti <<incoming>> étant plus ancien que l'existant <<existing>>)
 Upgrader/Plugins/Upgraded: Plugin mis à jour depuis <<incoming>> vers <<upgraded>>
 Upgrader/System/Suppressed: Tiddler système supprimé
 Upgrader/ThemeTweaks/Created: Thème modifié à partir de <$text text=<<from>>/>

languages/zh-Hans/Buttons.multids

@@ -24,6 +24,8 @@ Encryption/ClearPassword/Caption: 清除密码
 Encryption/ClearPassword/Hint: 清除密码且不加密保存此维基
 Encryption/SetPassword/Caption: 设置密码
 Encryption/SetPassword/Hint: 设置加密保存此维基的密码
+FullScreen/Caption: 全屏幕
+FullScreen/Hint: 进入或离开全屏模式
 Home/Caption: 首页
 Home/Hint: 刷新页面且开启首页条目
 Info/Caption: 信息
@@ -42,6 +44,8 @@ Save/Caption: 保存
 Save/Hint: 保存此条目
 SaveWiki/Caption: 保存变更
 SaveWiki/Hint: 保存变更
+StoryView/Caption: 检视模式
+StoryView/Hint: 选择检视条目的视觉效果
 HideSideBar/Caption: 隐藏侧边栏
 HideSideBar/Hint: 隐藏侧边栏
 ShowSideBar/Caption: 显示侧边栏

languages/zh-Hans/Import.multids

@@ -6,7 +6,7 @@ Listing/Import/Caption: 导入
 Listing/Select/Caption: 选择
 Listing/Status/Caption: 状态
 Listing/Title/Caption: 条目
-Upgrader/Plugins/Suppressed: 排除插件 (由于传入的 <<incoming>> 较现有版本 <<existing>> 旧)
+Upgrader/Plugins/Suppressed/Version: 排除插件 (由于传入的 <<incoming>> 较现有版本 <<existing>> 旧)
 Upgrader/Plugins/Upgraded: 升级插件，从 <<incoming>> 到 <<upgraded>>
 Upgrader/System/Suppressed: 排除系统条目
 Upgrader/ThemeTweaks/Created: 從 <$text text=<<from>>/> 遷移佈景主題

languages/zh-Hant/Buttons.multids

@@ -24,6 +24,8 @@ Encryption/ClearPassword/Caption: 清除密碼
 Encryption/ClearPassword/Hint: 清除密碼且不加密儲存此維基
 Encryption/SetPassword/Caption: 設定密碼
 Encryption/SetPassword/Hint: 設定加密儲存此維基的密碼
+FullScreen/Caption: 全螢幕
+FullScreen/Hint: 進入或離開全螢幕模式
 Home/Caption: 首頁
 Home/Hint: 刷新頁面且開啟首頁條目
 Info/Caption: 資訊
@@ -42,6 +44,8 @@ Save/Caption: 儲存
 Save/Hint: 儲存此條目
 SaveWiki/Caption: 儲存變更
 SaveWiki/Hint: 儲存變更
+StoryView/Caption: 檢視模式
+StoryView/Hint: 選擇檢視條目的視覺效果
 HideSideBar/Caption: 隱藏側邊欄
 HideSideBar/Hint: 隱藏側邊欄
 ShowSideBar/Caption: 顯示側邊欄

languages/zh-Hant/Import.multids

@@ -6,7 +6,7 @@ Listing/Import/Caption: 導入
 Listing/Select/Caption: 選擇
 Listing/Status/Caption: 狀態
 Listing/Title/Caption: 條目
-Upgrader/Plugins/Suppressed: 排除插件 (由於傳入的 <<incoming>> 較現有版本 <<existing>> 舊)
+Upgrader/Plugins/Suppressed/Version: 排除插件 (由於傳入的 <<incoming>> 較現有版本 <<existing>> 舊)
 Upgrader/Plugins/Upgraded: 升級插件，從 <<incoming>> 到 <<upgraded>>
 Upgrader/System/Suppressed: 排除系統條目
 Upgrader/ThemeTweaks/Created: 從 <$text text=<<from>>/> 遷移佈景主題

themes/tiddlywiki/vanilla/base.tid

@@ -270,8 +270,9 @@ button svg, button img {
 	color: <<colour foreground>>;
 }
 
-.tw-sidebar-lists button.btn {
+.tw-sidebar-lists button {
 	color: <<colour sidebar-button-foreground>>;
+	fill: <<colour sidebar-button-foreground>>;
 }
 
 .tw-sidebar-lists button.btn-mini {
@@ -282,7 +283,7 @@ button svg, button img {
 	color: <<colour sidebar-muted-foreground-hover>>;
 }
 
-.tw-image-button {
+button svg.tw-image-button, button .tw-image-button img {
 	height: 1em;
 	width: 1em;
 }
@@ -534,6 +535,11 @@ button svg, button img {
 	border-bottom: 1px solid <<colour tiddler-info-border>>;
 }
 
+.tw-tiddler-info p {
+	margin-top: 3px;
+	margin-bottom: 3px;
+}
+
 .tw-tiddler-info .tw-tab-buttons button.tw-tab-selected {
 	background-color: <<colour tiddler-info-tab-background>>;
 	border-bottom: 1px solid <<colour tiddler-info-tab-background>>;
@@ -872,6 +878,15 @@ canvas.tw-edit-bitmapeditor  {
 	padding: 0 14px 0 14px;
 }
 
+.tw-drop-down svg {
+	width: 1em;
+	height: 1em;
+}
+
+.tw-drop-down img {
+	width: 1em;
+}
+
 .tw-drop-down a, .tw-drop-down button {
 	display: block;
 	padding: 0 14px 0 14px;
@@ -1343,3 +1358,31 @@ body.tw-dirty span.tw-dirty-indicator, body.tw-dirty span.tw-dirty-indicator svg
 	fill: <<colour dirty-indicator>>;
 	color: <<colour dirty-indicator>>;
 }
+
+/*
+** File inputs
+*/
+
+.tw-file-input-wrapper {
+	position: relative;
+	overflow: hidden;
+	display: inline-block;
+	vertical-align: middle;
+}
+
+.tw-file-input-wrapper input[type=file] {
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	font-size: 999px;
+	max-width: 100%;
+	max-height: 100%;
+	filter: alpha(opacity=0);
+	opacity: 0;
+	outline: none;
+	background: white;
+	cursor: pointer;
+	display: inline-block;
+}