diff --git a/bower.json b/bower.json index c26a379ef..c7100f505 100644 --- a/bower.json +++ b/bower.json @@ -20,6 +20,7 @@ "dependencies": { "jquery": "~2.1.3", "tweetnacl": "~0.12.2", + "components-font-awesome": "^4.6.3", "ckeditor": "~4.5.6", "codemirror": "^5.19.0", "requirejs": "~2.1.15", @@ -40,7 +41,6 @@ "diff-dom": "#gh-pages", "alertifyjs": "^1.0.11", "spin.js": "^2.3.2", - "scrypt-async": "^1.2.0", - "components-font-awesome": "^4.6.3" + "scrypt-async": "^1.2.0" } } diff --git a/customize.dist/messages.js b/customize.dist/messages.js index 1b21b9835..10ee247fa 100644 --- a/customize.dist/messages.js +++ b/customize.dist/messages.js @@ -69,5 +69,20 @@ define(['/customize/languageSelector.js', '*/' ].join(''); + messages.slideInitialState = [ + '# CryptSlide\n', + '* This is a zero knowledge realtime collaborative editor.\n', + '* What you type here is encrypted so only people who have the link can access it.\n', + '* Even the server cannot see what you type.\n', + '* What you see here, what you hear here, when you leave here, let it stay here.\n', + '\n', + '---', + '\n', + '# How to use\n', + '1. Write your slides content using the markdown syntax\n', + '2. Separate your slides with ---\n', + '3. Click on the "Play" button to see the result' + ].join(''); + return messages; }); diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js index 0dbc1eb53..838f5edf3 100644 --- a/customize.dist/translations/messages.fr.js +++ b/customize.dist/translations/messages.fr.js @@ -47,8 +47,8 @@ define(function () { out.back = '⇐ Retour'; out.backToCryptpad = '⇐ Retour vers Cryptpad'; - out.changeNameButton = 'Changer de nom'; - out.changeNamePrompt = 'Changer votre nom : '; + out.userButton = 'UTILISATEUR'; + out.userButtonTitle = "Changer votre nom d'utilisateur"; out.renameButton = 'RENOMMER'; out.renameButtonTitle = 'Changer le titre utilisé par ce document dans la page d\'accueil de Cryptpad'; diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js index 2d4e6ba09..054c08f63 100644 --- a/customize.dist/translations/messages.js +++ b/customize.dist/translations/messages.js @@ -47,7 +47,8 @@ define(function () { out.back = '⇐ Back'; out.backToCryptpad = '⇐ Back to Cryptpad'; - out.changeNameButton = 'Change name'; + out.userButton = 'USER'; + out.userButtonTitle = 'Change your username'; out.changeNamePrompt = 'Change your name: '; out.renameButton = 'RENAME'; diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js index be31e9f5e..127f016a0 100644 --- a/www/common/cryptpad-common.js +++ b/www/common/cryptpad-common.js @@ -616,14 +616,14 @@ define([ switch (type) { case 'export': button = $('