From 1facb7492638d27f47e0e69149404cb7685f2945 Mon Sep 17 00:00:00 2001 From: Weblate Date: Thu, 20 Jun 2019 09:05:57 +0000 Subject: [PATCH 1/4] Translated using Weblate (French) Currently translated at 100.0% (981 of 981 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/ --- www/common/translations/messages.fr.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json index 0ec209815..a5bd0f946 100644 --- a/www/common/translations/messages.fr.json +++ b/www/common/translations/messages.fr.json @@ -1074,5 +1074,6 @@ "share_withFriends": "Partager", "notifications_dismiss": "Cacher", "fm_info_sharedFolderHistory": "Vous regardez l'historique de votre dossier partagé {0}
Votre CryptDrive restera en lecture seule pendant la navigation.", - "share_description": "Choisissez ce que vous souhaitez partager puis obtenez le lien ou envoyez-le directement à vos amis CryptPad." + "share_description": "Choisissez ce que vous souhaitez partager puis obtenez le lien ou envoyez-le directement à vos amis CryptPad.", + "fc_color": "Changer la couleur" } From 2a3a31111b1d8913e3f916e84ac940341f3e0879 Mon Sep 17 00:00:00 2001 From: Weblate Date: Thu, 20 Jun 2019 09:05:58 +0000 Subject: [PATCH 2/4] Translated using Weblate (German) Currently translated at 100.0% (981 of 981 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/ --- www/common/translations/messages.de.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json index 1824df1cd..f8618fdb9 100644 --- a/www/common/translations/messages.de.json +++ b/www/common/translations/messages.de.json @@ -1074,5 +1074,6 @@ "fm_info_sharedFolderHistory": "Dies ist nur der Verlauf deines geteilten Ordners: {0}
Dein CryptDrive bleibt beim Navigieren im Nur-Lesen-Modus.", "share_description": "Wähle aus, was du teilen möchtest. Dir wird dann ein entsprechender Link anzeigt. Du kannst es auch direkt an deine Freunde in CryptPad senden.", "fc_expandAll": "Alle ausklappen", - "fc_collapseAll": "Alle einklappen" + "fc_collapseAll": "Alle einklappen", + "fc_color": "Farbe ändern" } From 31e03558d85ed95563e2b044fa741a4f2fd991b2 Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 20 Jun 2019 11:14:33 +0200 Subject: [PATCH 3/4] update about page --- customize.dist/pages/about.js | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/customize.dist/pages/about.js b/customize.dist/pages/about.js index 6410debbf..e683da183 100644 --- a/customize.dist/pages/about.js +++ b/customize.dist/pages/about.js @@ -21,22 +21,6 @@ define([ h('h2.text-center', Msg.about_core) ]), ]), - h('div.row.align-items-center', [ - h('div.col-12.col-sm-12.col-md-12.col-lg-6.cp-bio-avatar', [ - h('img.img-fluid', {'src': '/customize/images/CalebJames.jpg'}) - ]), - h('div.col-12.col-sm-12.col-md-12.col-lg-6.cp-profile-det', [ - h('h3', "Caleb James Delisle"), - h('hr'), - Pages.setHTML(h('div#bioCaleb'), '

Caleb is a cryptography developer, Machine Technology graduate of the Franklin County Technical School and lifelong tinkerer.
In 2011, he started the cjdns Open Source project to show that secure networking could be invisible and easily deployed.
After joining XWiki SAS in 2014, he started the CryptPad project with the intent of bringing the same transparent security to collaborative editing.
He\'s always trying to learn from more experienced colleagues and when someone passes through the Research Team office, his favorite words are "Pull up a chair!".

'), - h('a.cp-soc-media', { href : 'https://twitter.com/cjdelisle'}, [ - h('i.fa.fa-twitter') - ]), - h('a.cp-soc-media', { href : 'https://github.com/cjdelisle'}, [ - h('i.fa.fa-github') - ]) - ]), - ]), h('div.row.align-items-center',[ h('div.col-12.col-sm-12.col-md-12.col-lg-6.order-lg-2.cp-bio-avatar.cp-bio-avatar-right', [ h('img.img-fluid', {'src': '/customize/images/AaronMacSween.jpg'}) @@ -74,16 +58,16 @@ define([ ]), h('div.row.align-items-center', [ h('div.col-12.col-sm-12.col-md-12.col-lg-6.cp-bio-avatar', [ - h('img.img-fluid', {'src': '/customize/images/Pierre-new.jpg'}) + h('img.img-fluid', {'src': '/customize/images/CalebJames.jpg'}) ]), h('div.col-12.col-sm-12.col-md-12.col-lg-6.cp-profile-det', [ - h('h3', "Pierre Bondoerffer"), + h('h3', "Caleb James Delisle"), h('hr'), - Pages.setHTML(h('div#bioPierre'), '

Resident CSS wizard and emoji extraordinaire, Pierre is passionate about anything related to technology. He loves to hack around computers and put parts together.
He is currently studying at 42, where he learns about algorithms, networking, kernel programming and graphics.
As a part of an internship, he joined XWiki SAS and worked on CryptPad to improve user experience. He also maintains the Spanish translation.

'), - h('a.cp-soc-media', { href : 'https://twitter.com/pbondoer'}, [ + Pages.setHTML(h('div#bioCaleb'), '

Caleb is a cryptography developer, Machine Technology graduate of the Franklin County Technical School and lifelong tinkerer.
In 2011, he started the cjdns Open Source project to show that secure networking could be invisible and easily deployed.
After joining XWiki SAS in 2014, he started the CryptPad project with the intent of bringing the same transparent security to collaborative editing.
He\'s always trying to learn from more experienced colleagues and when someone passes through the Research Team office, his favorite words are "Pull up a chair!".

'), + h('a.cp-soc-media', { href : 'https://twitter.com/cjdelisle'}, [ h('i.fa.fa-twitter') ]), - h('a.cp-soc-media', { href : 'https://github.com/pbondoer'}, [ + h('a.cp-soc-media', { href : 'https://github.com/cjdelisle'}, [ h('i.fa.fa-github') ]) ]), From 85871ead2e9d9fcd2639800c7893c29afd6d941f Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 20 Jun 2019 11:16:36 +0200 Subject: [PATCH 4/4] update version --- customize.dist/pages.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/customize.dist/pages.js b/customize.dist/pages.js index 10e712a30..8a21fa233 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -103,7 +103,7 @@ define([ ])*/ ]) ]), - h('div.cp-version-footer', "CryptPad v2.23.0 (Xenops)") + h('div.cp-version-footer', "CryptPad v2.24.0 (Yak)") ]); }; diff --git a/package.json b/package.json index 06c187f11..2020d6df4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cryptpad", "description": "realtime collaborative visual editor with zero knowlege server", - "version": "2.23.0", + "version": "2.24.0", "license": "AGPL-3.0+", "repository": { "type": "git",