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

This commit is contained in:
yflory
2018-06-12 14:02:13 +02:00
5 changed files with 13 additions and 10 deletions

View File

@@ -780,7 +780,7 @@
out.faq_link = "FAQ";
out.faq_title = "Häufigste Fragen";
out.faq_whatis = "Was ist CryptPad?";
out.faq_whatis = "Was ist <span class='cp-brand-font'>CryptPad</span>?";
out.faq = {};
out.faq.keywords = {
title: 'Schlüsselkonzepte',

View File

@@ -675,6 +675,7 @@ define(function () {
out.main_slidePad = 'Présentation Markdown';
out.main_pollPad = 'Sondage ou Planning';
out.main_whiteboardPad = 'Tableau blanc';
out.main_kanbanPad = 'Kanban';
out.main_localPads = 'Pads Locaux';
out.main_yourCryptDrive = 'Votre CryptDrive';
out.main_footerText = "Avec CryptPad, vous pouvez créer des documents collaboratifs rapidement pour prendre des notes à plusieurs.";

View File

@@ -680,6 +680,7 @@ define(function () {
out.main_slidePad = 'Markdown Presentation';
out.main_pollPad = 'Poll or Schedule';
out.main_whiteboardPad = 'Whiteboard';
out.main_kanbanPad = 'Kanban';
out.main_localPads = 'Local Pads';
out.main_yourCryptDrive = 'Your CryptDrive';
out.main_footerText = "With CryptPad, you can make quick collaborative documents for taking notes and writing down ideas together.";