web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging

Browse Source
This commit is contained in:
Pierre Bondoerffer
2017-03-02 17:09:39 +01:00
parent e8a82c4c10 2b6e44189d
commit e39fe1c0b7
9 changed files with 161 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
customize.dist/fsStore.js
View File

@@ -119,6 +119,10 @@ define([
return filesOp.getStructure();
};
ret.replaceHref = function (o, n) {
return filesOp.replaceHref(o, n);
};
var changeHandlers = ret.changeHandlers = [];
ret.change = function (f) {};

1
customize.dist/translations/messages.fr.js
View File

@@ -250,6 +250,7 @@ define(function () {
"Êtes-vous sûr de vouloir continuer ?<br>" +
"Tapez “<em>I love CryptPad</em>” pour confirmer.";
out.settings_resetDone = "Votre drive est désormais vide!";
out.settings_resetError = "Texte de vérification incorrect. Votre CryptDrive n'a pas été modifié.";
out.settings_resetTips = "Astuces et informations dans CryptDrive";
out.settings_resetTipsButton = "Réinitialiser les astuces visibles dans CryptDrive";
out.settings_resetTipsDone = "Toutes les astuces sont de nouveau visibles.";

1
customize.dist/translations/messages.js
View File

@@ -252,6 +252,7 @@ define(function () {
"Are you sure you want to continue?<br>" +
"Type “<em>I love CryptPad</em>” to confirm.";
out.settings_resetDone = "Your drive is now empty!";
out.settings_resetError = "Incorrect verification text. Your CryptDrive has not been changed.";
out.settings_resetTips = "Tips in CryptDrive";
out.settings_resetTipsButton = "Reset the available tips in CryptDrive";
out.settings_resetTipsDone = "All the tips are now visible again.";