From 594d5725cb095226765237ea29bad07037992aea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20N=C3=B6thlich?= Date: Sun, 22 Sep 2019 21:51:26 +0200 Subject: [PATCH 1/3] Bump NodeJS version to 10 to fix #447 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Adrian Nöthlich --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0093f414c..ae312e3f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # We use multi stage builds -FROM node:6-stretch-slim AS build +FROM node:10-stretch-slim AS build RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq git jq python RUN npm install -g bower @@ -16,7 +16,7 @@ RUN npm install --production \ && npm install -g bower \ && bower install --allow-root -FROM node:6-stretch-slim +FROM node:10-stretch-slim # You want USE_SSL=true if not putting cryptpad behind a proxy ENV USE_SSL=false From 445438698b481de9a92a9431f1ab26461a1832d4 Mon Sep 17 00:00:00 2001 From: Weblate Date: Tue, 24 Sep 2019 14:58:06 +0000 Subject: [PATCH 2/3] Translated using Weblate (English) Currently translated at 100.0% (1107 of 1107 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1106 of 1106 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1105 of 1105 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1104 of 1104 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ --- www/common/translations/messages.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json index 5c736ac08..ed753d9d5 100644 --- a/www/common/translations/messages.json +++ b/www/common/translations/messages.json @@ -1197,5 +1197,9 @@ "team_nameHint": "Set the team's name", "team_avatarTitle": "Team avatar", "team_avatarHint": "500KB maximum size (png, jpg, jpeg, gif)", - "team_infoContent": "Each team has its own CryptDrive, storage quota, chat, and members list. Team owners can delete the whole team, Admins can invite or kick members, members can leave the team." + "team_infoContent": "Each team has its own CryptDrive, storage quota, chat, and members list. Team owners can delete the whole team, Admins can invite or kick members, members can leave the team.", + "team_maxOwner": "Each user account is restricted to owning a single team.", + "team_maxTeams": "Each user account can only be a member of {0} teams.", + "team_listTitle": "Your teams", + "team_listSlot": "Available team slot" } From 5f6e95cb09762f1b9aa0c8aa5e6696a08a367a23 Mon Sep 17 00:00:00 2001 From: Weblate Date: Tue, 24 Sep 2019 14:58:06 +0000 Subject: [PATCH 3/3] Translated using Weblate (French) Currently translated at 100.0% (1107 of 1107 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/ --- www/common/translations/messages.fr.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json index cbfc6ca4d..ea32345ad 100644 --- a/www/common/translations/messages.fr.json +++ b/www/common/translations/messages.fr.json @@ -1197,5 +1197,9 @@ "team_nameHint": "Définir le nom de l'équipe", "team_avatarTitle": "Avatar de l'équipe", "team_avatarHint": "500 Ko maximum (png, jpg, jpeg, gif)", - "team_infoContent": "Chaque équipe possède son propre CryptDrive, sa limite de stockage, son chat et sa liste de membres. Les Propriétaires de l'équipe peuvent la supprimer complètement, les Administrateurs peuvent inviter ou expulser des members et les Membres peuvent quitter l'équipe." + "team_infoContent": "Chaque équipe possède son propre CryptDrive, sa limite de stockage, son chat et sa liste de membres. Les Propriétaires de l'équipe peuvent la supprimer complètement, les Administrateurs peuvent inviter ou expulser des members et les Membres peuvent quitter l'équipe.", + "team_maxOwner": "Chaque compte utilisateur ne peut être propriétaire que d'une seule équipe.", + "team_maxTeams": "Chaque compte utilisateur ne peut être membre que de {0} équipes.", + "team_listTitle": "Vos équipes", + "team_listSlot": "Emplacement d'équipe disponible" }