Merge remote-tracking branch 'upstream/master'
fr-FR translations for new ToolBars-related strings
Add a page control for encryption
Merge pull request #709 from xcazin/fr-FR

fr-FR translations for new ToolBars-related & import-related strings
Merge remote-tracking branch 'upstream/master'
Update chinese translations for toolbars
* New 'home', 'more' and 'encryption' buttons
* New toolbar tabs in control panel
* New tools tab in tiddler info
german translation including commit 2380392
fr-FR translation of Encryption-related strings
Add close-all page control button
Merge remote-tracking branch 'upstream/master'
Fix checkbox setting text field to empty string
Add chinese translations for close-all page control button
Merge branch 'master' of https://github.com/Jermolene/TiddlyWiki5 into de-DE
add close all button
Merge pull request #712 from pmario/de-DE

german translation including commit 2380392
Merge pull request #710 from BramChen/master

Update chinese translations for toolbars
Ensure sticky titles theme works in edit mode
fix for fr-FR Encryption-related strings
Merge branch 'master' into fr-FR
fr-FR translations for the CloseAll-related strings