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

This commit is contained in:
ansuz
2018-03-08 15:06:30 +01:00
7 changed files with 169 additions and 50 deletions

View File

@@ -672,7 +672,7 @@ define(function () {
out.footer_aboutUs = "À propos";
out.about = "À propos";
out.privacy = "Vie privée";
out.privacy = "Confidentialité";
out.contact = "Contact";
out.terms = "Conditions";
out.blog = "Blog";
@@ -759,6 +759,7 @@ define(function () {
out.faq_link = "FAQ";
out.faq_title = "Foire Aux Questions";
out.faq_whatis = "Qu'est-ce que CryptPad ?";
out.faq = {};
out.faq.keywords = {
title: 'Termes spéciaux',

View File

@@ -765,6 +765,7 @@ define(function () {
out.faq_link = "FAQ";
out.faq_title = "Frequently Asked Questions";
out.faq_whatis = "What is CryptPad?";
out.faq = {};
out.faq.keywords = {
title: 'Keywords',