diff --git a/customize.dist/images/AGPL.png b/customize.dist/images/AGPL.png
new file mode 100644
index 000000000..c3db548cb
Binary files /dev/null and b/customize.dist/images/AGPL.png differ
diff --git a/customize.dist/images/agplv3.svg b/customize.dist/images/agplv3.svg
deleted file mode 100644
index 98439bc7c..000000000
--- a/customize.dist/images/agplv3.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 0aec56e08..5e856f673 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -654,7 +654,8 @@ define([
h('div.col-12.col-sm-4.cp-index-block.cp-index-block-host', h('div', [
setHTML(h('span'), Msg.home_host),
h('img', {
- src: "/customize/images/agplv3.svg"
+ src: "/customize/images/AGPL.png",
+ title: Msg.home_host_agpl
})
])),
h('div.col-12.col-sm-4.cp-index-block.cp-index-block-product', h('div', [
diff --git a/customize.dist/src/less2/pages/page-index.less b/customize.dist/src/less2/pages/page-index.less
index fb24451a1..9c900bcef 100644
--- a/customize.dist/src/less2/pages/page-index.less
+++ b/customize.dist/src/less2/pages/page-index.less
@@ -218,7 +218,8 @@
margin: auto;
max-width: 70%;
background: white;
- padding: 5px;
+ max-height: 50px;
+ margin-top: 1em;
}
}
diff --git a/www/common/translations/messages.fr.js b/www/common/translations/messages.fr.js
index 57afb1996..c2291261c 100644
--- a/www/common/translations/messages.fr.js
+++ b/www/common/translations/messages.fr.js
@@ -555,10 +555,27 @@ define(function () {
out.settings_save = "Sauver";
out.settings_backupCategory = "Sauvegarde";
- out.settings_backupTitle = "Créer ou restaurer une sauvegarde de vos données";
+ out.settings_backupHint = "Créer ou restaurer une sauvegarde de votre CryptDrive. Cette sauvegarde ne contient pas le contenu de vos pads mais uniquement les clés qui permettent d'y accéder.";
out.settings_backup = "Sauvegarder";
out.settings_restore = "Restaurer";
+ out.settings_backupHint2 = "Télécharger le contenu actuel de tous vos pads. Ceux-ci seront téléchargés dans un format lisible si un tel format est disponible.";
+ out.settings_backup2 = "Télécharger mon CryptDrive";
+ out.settings_backup2Confirm = "Vous allez télécharger tous les pads de votre CryptDrive. Si vous souhaitez continuer, choisissez un nom et appuyez sur OK.";
+ out.settings_exportTitle = "Téléchargement de votre CryptDrive";
+ out.settings_exportDescription = "Veuillez patienter pendant que nous téléchargeons et déchiffrons vos documents. Cette opération peut prendre plusieurs minutes. Fermer l'onglet du navigateur interrompra le processus.";
+ out.settings_exportWarning = "Pour de meilleures performances, il est recommandé de ne pas changer d'onglet pendant le téléchargement.";
+ out.settings_exportCancel = "Êtes-vous sûr de vouloir annuler ce téléchargement ? Vous devrez recommencer du début la prochaine fois.";
+ out.settings_export_reading = "Lecture de votre CryptDrive...";
+ out.settings_export_download = "Téléchargement et déchiffrement des documents...";
+ out.settings_export_compressing = "Compression des données...";
+ out.settings_export_done = "Votre téléchargement est prêt !";
+ out.settings_exportError = "Voir les erreurs";
+ out.settings_exportErrorDescription = "Nous n'avons pas réussi à ajouter les documents suivant dans le téléchargement :";
+ out.settings_exportErrorEmpty = "Ce document ne peut pas être exporté (document vide ou contenu invalide)";
+ out.settings_exportErrorMissing = "Ce document n'est plus stocké sur nos serveurs (expiré ou supprimé par son propriétaire)";
+ out.settings_exportErrorOther = "Une erreur est survenue lors de la récupération de ce document : {0}";
+
out.settings_resetNewTitle = "Vider CryptDrive";
out.settings_resetButton = "Supprimer";
out.settings_reset = "Supprimer tous les fichiers et dossiers de votre CryptDrive";
@@ -698,6 +715,10 @@ define(function () {
// index.html
+ out.home_product = "CryptPad est une alternative respectant la vie privée aux outils office et aux services cloud populaires. Tout le contenu stocké dans CryptPad est chiffré avant d'être envoyé, ce qui signifie que personne ne peut accéder à vos données à moins que vous ne leur donniez les clés (même pas nous).";
+ out.home_host = "Ceci est une instance communautaire et indépendante de CryptPad. Le code source du projet est disponible sur GitHub.";
+ out.home_host_agpl = "CryptPad est distribué sous les termes de la licence logicielle AGPL3";
+
//about.html
out.about_intro = 'CryptPad est développé au sein de l\'équipe Recherche d\'XWiki SAS, une petite entreprise située à Paris en France et à Iasi en Roumanie. Il y a 3 développeurs principaux qui travaillent sur CryptPad, ainsi que quelques contributeurs à la fois dans et en dehors d\'XWiki SAS';
out.about_core = 'Développeurs principaux';
@@ -783,40 +804,48 @@ define(function () {
// features.html
out.features = "Fonctionnalités";
- out.features_title = "Tableau des fonctionnalités";
+ out.features_title = "Comparaison des fonctionnalités";
out.features_feature = "Fonctionnalité";
out.features_anon = "Utilisateur anonyme";
out.features_registered = "Utilisateur enregistré";
+ out.features_premium = "Utilisateur premium";
out.features_notes = "Notes";
- out.features_f_pad = "Créer/modifier/voir un pad";
- out.features_f_pad_notes = "Texte, Code, Présentation, Sondage et Tableau blanc";
- out.features_f_history = "Historique";
- out.features_f_history_notes = "Voir et restaurer n'importe quelle version d'un pad";
- out.features_f_todo = "Créer une TODO-list";
- out.features_f_drive = "Fonctionnalités CryptDrive limitées";
- out.features_f_drive_full = "Fonctionnalités CryptDrive complètes";
- out.features_f_export = "Export/Import";
- out.features_f_export_notes = "Pour les pads et CryptDrive";
- out.features_f_viewFiles = "Voir des fichiers";
- out.features_f_uploadFiles = "Importer des fichiers";
- out.features_f_embedFiles = "Intégrer des fichiers";
- out.features_f_embedFiles_notes = "Intégrer un fichier de CryptDrive dans un pad";
- out.features_f_multiple = "Appareils multiples";
- out.features_f_multiple_notes = "Moyen facile de voir vos pads depuis n'importe quel appareil";
- out.features_f_logoutEverywhere = "Se déconnecter partout";
- out.features_f_logoutEverywhere_notes = "Se déconnecter des autres appareils utilisés";
- out.features_f_templates = "Utiliser les modèles";
- out.features_f_templates_notes = "Créer des modèles et créer des pads basés sur ces modèles";
- out.features_f_profile = "Créer un profil";
- out.features_f_profile_notes = "Page personnelle contenant un avatar et une description";
- out.features_f_tags = "Utiliser les tags";
- out.features_f_tags_notes = "Permet la recherche de documents par tags dans CryptDrive";
- out.features_f_contacts = "Application Contacts";
- out.features_f_contacts_notes = "Ajouter des contacts et discuter avec eux de manière sécurisée";
- out.features_f_storage = "Stockage";
- out.features_f_storage_anon = "Pads supprimés après 3 mois";
- out.features_f_storage_registered = "Gratuit: 50Mo Premium: 5Go/20Go/50Go";
- out.features_f_register = "S'inscrire gratuitement";
+
+ out.features_f_apps = "Accès aux applications principales";
+ out.features_f_core = "Fonctions communes des applications";
+ out.features_f_core_note = "Édition, Export, Historique, Liste d'utilisateurs, Chat";
+ out.features_f_file0 = "Ouvrir des fichiers";
+ out.features_f_file0_note = "Voir et télécharger des fichiers partagés par d'autres utilisateurs";
+ out.features_f_cryptdrive0 = "Accès limité à CryptDrive";
+ out.features_f_cryptdrive0_note = "Stockage dans votre navigateur des pads visités afin de pouvoir les retrouver plus tard.";
+ out.features_f_storage0 = "Durée de stockage limitée";
+ out.features_f_storage0_note = "Les pads créés risquent d'être supprimés après trois mois d'inactivité.";
+
+ out.features_f_anon = "Avantages des utilisateurs anonymes";
+ out.features_f_anon_note = "Avec une meilleure ergonomie et plus de contrôle sur vos pads";
+ out.features_f_cryptdrive1 = "Accès complet à CryptDrive";
+ out.features_f_cryptdrive1_note = "Dossiers, dossiers partagés, modèles, tags";
+ out.features_f_devices = "Vos pads sur tous vos appareils";
+ out.features_f_devices_note = "Accéder à votre CryptDrive de partout grâce à votre compte utilisateur";
+ out.features_f_social = "Applications sociales";
+ out.features_f_social_note = "Créer un profil, utiliser un avatar, chat avec les contacts";
+ out.features_f_file1 = "Importer et partager des fichiers";
+ out.features_f_file1_note = "Partager des fichiers avec vos amis ou les intégrer dans vos pads";
+ out.features_f_storage1 = "Stockage permanent (50Mo)";
+ out.features_f_storage1_note = "Les pads stockés dans votre CryptDrive ne seront jamais supprimés pour cause d'inactivité.";
+ out.features_f_register = "S'enregistrer gratuitement";
+ out.features_f_register_note = "Pas d'email ou d'information personnelle requis";
+
+ out.features_f_reg = "Avantages des utilisateurs enregistrés";
+ out.features_f_reg_note = "Et aider au développement de CryptPad";
+ out.features_f_storage2 = "Espace de stockage supplémentaire";
+ out.features_f_storage2_note = "De 5 Go à 50 Go en fonction du plan sélectionné";
+ out.features_f_support = "Support plus rapide";
+ out.features_f_support_note = "Support email professionnel avec le plan Équipe";
+ out.features_f_supporter = "Devenir un défenseur de la vie privée";
+ out.features_f_supporter_note = "Nous aider à montrer que les logiciels protégeant les données personnelles devraient être la norme";
+ out.features_f_subscribe = "S'abonner à un compte premium";
+ out.features_f_subscribe_note = "Vous devez d'abord vous connecter à un compte CryptPad";
// faq.html
@@ -1227,7 +1256,8 @@ define(function () {
// Crowdfunding messages
out.crowdfunding_home1 = "CryptPad a besoin d'aide !";
- out.crowdfunding_home2 = "Cliquez pour découvrir notre campagne de financement participatif.";
+ out.crowdfunding_home2 = "Cliquez sur le bouton pour découvrir notre campagne de financement participatif.";
+ out.crowdfunding_button = "Soutenir CryptPad";
out.crowdfunding_popup_text = "
Aider CryptPad
" +
"Pour vous assurer que CryptPad soit activement développé, nous vous invitons à supporter le projet via la " +
diff --git a/www/common/translations/messages.js b/www/common/translations/messages.js
index b8ced6b9f..6de3a6ef2 100644
--- a/www/common/translations/messages.js
+++ b/www/common/translations/messages.js
@@ -560,27 +560,26 @@ define(function () {
out.settings_save = "Save";
out.settings_backupCategory = "Backup";
- out.settings_backupHint = "Backup or restore all your CryptDrive's content. It won't contain the content of your pads, just the link to access them.";
+ out.settings_backupHint = "Backup or restore all your CryptDrive's content. It won't contain the content of your pads, just the keys to access them.";
out.settings_backup = "Backup";
- out.settings_backupHint2 = "Download all your pads. Pads will be downloaded in an readable format when available.";
- out.settings_backup2 = "Download my CryptDrive";
out.settings_restore = "Restore";
- // XXX
+ out.settings_backupHint2 = "Download the current content of all your pads. Pads will be downloaded in an readable format if such a format is available.";
+ out.settings_backup2 = "Download my CryptDrive";
out.settings_backup2Confirm = "This will download all the pads and files from your CryptDrive. If you want to continue, pick a name and press OK";
out.settings_exportTitle = "Export your CryptDrive";
- out.settings_exportDescription = "Please wait while we're downloading and decrypting your documents, this may take a few minutes. Closing the tab will interrupt the process.";
- out.settings_exportWarning = "For better performances, it is recommended to leave this tab focused.";
- out.settings_exportCancel = "Are you sure you want to cancel the export? You will have to start again from the beginning for your next export.";
+ out.settings_exportDescription = "Please wait while we're downloading and decrypting your documents. This may take a few minutes. Closing the tab will interrupt the process.";
+ out.settings_exportWarning = "For better performance, it is recommended to leave this tab focused.";
+ out.settings_exportCancel = "Are you sure you want to cancel the export? You will have to start again from the beginning next time.";
out.settings_export_reading = "Reading your CryptDrive...";
- out.settings_export_download = "Decrypting and downloading your documents...";
- out.settings_export_compressing = "Compressing the data...";
- out.settings_export_done = "Export is ready!";
+ out.settings_export_download = "Downloading and decrypting your documents...";
+ out.settings_export_compressing = "Compressing data...";
+ out.settings_export_done = "Your download is ready!";
out.settings_exportError = "View errors";
out.settings_exportErrorDescription = "We weren't able to add the following documents into the export:";
- out.settings_exportErrorEmpty = "The document can't be exported (empty or invalid content).";
- out.settings_exportErrorMissing = "The document is missing from our servers (expired or deleted by its owner)";
- out.settings_exportErrorOther = "An error occured while trying to export the document: {0}";
+ out.settings_exportErrorEmpty = "This document can't be exported (empty or invalid content).";
+ out.settings_exportErrorMissing = "This document is missing from our servers (expired or deleted by its owner)";
+ out.settings_exportErrorOther = "An error occured while trying to export this document: {0}";
out.settings_resetNewTitle = "Clean CryptDrive";
out.settings_resetButton = "Remove";
@@ -726,8 +725,9 @@ define(function () {
// index.html
- out.home_product = "CryptPad is an open-source and private-by-design alternative to popular office tools and cloud services. All the content stored on CryptPad is encrypted before being sent, which means nobody can access your data unless you give them the keys.";
- out.home_host = "This is a community-hosted instance of CryptPad. The source code is available on Github.";
+ out.home_product = "CryptPad is a private-by-design alternative to popular office tools and cloud services. All the content stored on CryptPad is encrypted before being sent, which means nobody can access your data unless you give them the keys (not even us).";
+ out.home_host = "This is an independent community instance of CryptPad. Its source code is available on GitHub.";
+ out.home_host_agpl = "CryptPad is distributed under the terms of the AGPL3 software license";
//about.html
out.about_intro = 'CryptPad is created inside of the Research Team at XWiki SAS, a small business located in Paris France and Iasi Romania. There are 3 core team members working on CryptPad plus a number of contributors both inside and outside of XWiki SAS.';
@@ -814,13 +814,13 @@ define(function () {
// features.html
out.features = "Features";
- out.features_title = "Features table";
+ out.features_title = "Feature comparison";
out.features_feature = "Feature";
out.features_anon = "Anonymous user";
out.features_registered = "Registered user";
out.features_premium = "Premium user";
out.features_notes = "Notes";
- // XXX
+
out.features_f_apps = "Access to the main applications";
out.features_f_core = "Common features for the applications";
out.features_f_core_note = "Edit, Import & Export, History, Userlist, Chat";
@@ -831,9 +831,9 @@ define(function () {
out.features_f_storage0 = "Limited storage time";
out.features_f_storage0_note = "Created pads risk deletion after 3 months of inactivity";
- out.features_f_anon = "All anonymous users features";
+ out.features_f_anon = "All anonymous user features";
out.features_f_anon_note = "With better usability and more power over your pads";
- out.features_f_cryptdrive1 = "Complete CryptDrive functionalities";
+ out.features_f_cryptdrive1 = "Complete CryptDrive functionality";
out.features_f_cryptdrive1_note = "Folders, shared folders, templates, tags";
out.features_f_devices = "Your pads on all your devices";
out.features_f_devices_note = "Access your CryptDrive everywhere with your user account";
@@ -846,48 +846,16 @@ define(function () {
out.features_f_register = "Register for free";
out.features_f_register_note = "No email or personal information required";
- out.features_f_reg = "All registered users features";
- out.features_f_reg_note = "And help CryptPad's developement";
+ out.features_f_reg = "All registered user features";
+ out.features_f_reg_note = "And help CryptPad's development";
out.features_f_storage2 = "Extra storage space";
out.features_f_storage2_note = "From 5GB to 50GB depending on the selected plan";
out.features_f_support = "Faster support";
out.features_f_support_note = "Professional email support with the Team plan";
out.features_f_supporter = "Become a privacy supporter";
- out.features_f_supporter_note = "Help us show that privacy-enhancing softwares should be the norm";
- out.features_f_project = "Keep the project alive";
- out.features_f_project_note = "Help us keep this open-source project running by funding its hosting and developement";
+ out.features_f_supporter_note = "Help us show that privacy-enhancing software should be the norm";
out.features_f_subscribe = "Subscribe to premium";
out.features_f_subscribe_note = "You need to be logged in to CryptPad first";
- // End XXX
-
- out.features_f_pad = "Create/edit/view a pad";
- out.features_f_pad_notes = "Rich Text, Code, Slide, Poll and Whiteboard applications";
- out.features_f_history = "History";
- out.features_f_history_notes = "View and restore any version of your pads";
- out.features_f_todo = "Create a TODO-list";
- out.features_f_drive = "Limited CryptDrive functionality";
- out.features_f_drive_full = "Complete CryptDrive functionality";
- out.features_f_export = "Export/Import";
- out.features_f_export_notes = "For pads and CryptDrive";
- out.features_f_viewFiles = "View files";
- out.features_f_uploadFiles = "Upload files";
- out.features_f_embedFiles = "Embed files";
- out.features_f_embedFiles_notes = "Embed a file stored in CryptDrive in a pad";
- out.features_f_multiple = "Use on multiple devices";
- out.features_f_multiple_notes = "Easy way to access your pads from any device";
- out.features_f_logoutEverywhere = "Log out from other devices";
- out.features_f_logoutEverywhere_notes = ""; // Used in the French translation to explain
- out.features_f_templates = "Use templates";
- out.features_f_templates_notes = "Create templates and create new pads from your templates";
- out.features_f_profile = "Create a profile";
- out.features_f_profile_notes = "Personal page including an avatar and a description";
- out.features_f_tags = "Use tags";
- out.features_f_tags_notes = "Allow users to search by tags in CryptDrive";
- out.features_f_contacts = "Contacts application";
- out.features_f_contacts_notes = "Add contacts and chat with them in an encrypted session";
- out.features_f_storage = "Storage";
- out.features_f_storage_anon = "Pads are deleted after 3 months";
- out.features_f_storage_registered = "Free: 50MB Premium: 5GB/20GB/50GB";
// faq.html