From 9673795d65b11196341baf8d07ac1ad29de173d2 Mon Sep 17 00:00:00 2001 From: Weblate Date: Thu, 12 Dec 2019 15:09:44 +0000 Subject: [PATCH 01/18] Translated using Weblate (English) Currently translated at 100.0% (1158 of 1158 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1157 of 1157 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1156 of 1156 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ --- www/common/translations/messages.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json index 69d460e86..9a505391c 100644 --- a/www/common/translations/messages.json +++ b/www/common/translations/messages.json @@ -1251,5 +1251,8 @@ "share_linkPasswordAlert": "This item is password protected. When you send the link the recipient will have to enter the password.", "share_contactPasswordAlert": "This item is password protected. Because you are sharing it with a CryptPad contact, the recipient will not have to enter the password.", "share_embedPasswordAlert": "This item is password protected. When you embed this pad, viewers will be asked for the password.", - "passwordFaqLink": "Read more about passwords" + "passwordFaqLink": "Read more about passwords", + "share_noContactsLoggedIn": "You are not connected with anyone on CryptPad yet. Share the link to your profile for people to send you contact requests.", + "share_copyProfileLink": "Copy profile link", + "share_noContactsNotLoggedIn": "Log in or register to see your existing contacts and add new ones." } From 1778200b574be5b6ee079c27c68fc660669c351b Mon Sep 17 00:00:00 2001 From: Weblate Date: Thu, 12 Dec 2019 15:09:44 +0000 Subject: [PATCH 02/18] Translated using Weblate (French) Currently translated at 100.0% (1158 of 1158 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/ --- www/common/translations/messages.fr.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json index 3b3b3cdd4..cac8d471b 100644 --- a/www/common/translations/messages.fr.json +++ b/www/common/translations/messages.fr.json @@ -1251,5 +1251,8 @@ "share_linkPasswordAlert": "Cet élément est protégé par un mot de passe. Quand vous partagez le lien, le destinataire doit saisir le mot de passe.", "share_contactPasswordAlert": "Cet élément est protégé par un mot de passe. Quand vous le partagez avec un contact CryptPad, le destinataire n'a pas a saisir le mot de passe.", "share_embedPasswordAlert": "Cet élément est protégé par un mot de passe. Quand vous l'intégrez à une page, les visiteurs doivent saisir le mot de passe.", - "passwordFaqLink": "En lire plus sur les mots de passe" + "passwordFaqLink": "En lire plus sur les mots de passe", + "share_noContactsLoggedIn": "Vous n'avez pas encore ajouté de contacts sur CryptPad. Partagez le lien de votre profil pour que l'on vous envoie des demandes de contact.", + "share_copyProfileLink": "Copier le lien du profil", + "share_noContactsNotLoggedIn": "Connectez-vous ou enregistrez-vous pour voir vos contacts ou en ajouter de nouveaux." } From 13307e40e5def576dc8e48876a247fdee5a4444e Mon Sep 17 00:00:00 2001 From: Weblate Date: Thu, 12 Dec 2019 15:09:44 +0000 Subject: [PATCH 03/18] Translated using Weblate (German) Currently translated at 100.0% (1155 of 1155 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/ --- www/common/translations/messages.de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json index d2f6c1998..b92c21309 100644 --- a/www/common/translations/messages.de.json +++ b/www/common/translations/messages.de.json @@ -1070,7 +1070,7 @@ "notification_folderShared": "{0} hat einen Ordner mit dir geteilt: {1}", "share_selectAll": "Alle auswählen", "share_filterFriend": "Nach Namen suchen", - "share_linkFriends": "Mit Freunden teilen", + "share_linkFriends": "Mit Kontakten teilen", "share_withFriends": "Teilen", "share_deselectAll": "Alle abwählen", "notifications_dismiss": "Verbergen", From df938c141b523166a649842b3131aad254512f0f Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 16 Dec 2019 13:42:18 +0000 Subject: [PATCH 04/18] Translated using Weblate (English) Currently translated at 100.0% (1163 of 1163 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1163 of 1163 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1162 of 1162 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1161 of 1161 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1160 of 1160 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1159 of 1159 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ --- www/common/translations/messages.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json index 9a505391c..8f6638f58 100644 --- a/www/common/translations/messages.json +++ b/www/common/translations/messages.json @@ -1254,5 +1254,10 @@ "passwordFaqLink": "Read more about passwords", "share_noContactsLoggedIn": "You are not connected with anyone on CryptPad yet. Share the link to your profile for people to send you contact requests.", "share_copyProfileLink": "Copy profile link", - "share_noContactsNotLoggedIn": "Log in or register to see your existing contacts and add new ones." + "share_noContactsNotLoggedIn": "Log in or register to see your existing contacts and add new ones.", + "contacts_mute": "Mute", + "contacts_unmute": "Unmute", + "contacts_manageMuted": "Manage muted", + "contacts_mutedUsers": "Muted accounts", + "contacts_muteInfo": "You will not receive any notifications or messages from muted users.
They will not know you have muted them. " } From 92f78afb0126a3cadec55a3f8632a5cbb50438ac Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 16 Dec 2019 13:42:18 +0000 Subject: [PATCH 05/18] Translated using Weblate (Finnish) Currently translated at 2.7% (31 of 1158 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fi/ --- www/common/translations/messages.fi.json | 35 ++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/www/common/translations/messages.fi.json b/www/common/translations/messages.fi.json index 2c63c0851..fb9a12fde 100644 --- a/www/common/translations/messages.fi.json +++ b/www/common/translations/messages.fi.json @@ -1,2 +1,37 @@ { + "type": { + "pad": "Teksti", + "code": "Koodi", + "poll": "Kysely", + "kanban": "Kanban", + "slide": "Esitys", + "drive": "CryptDrive", + "whiteboard": "Tussitaulu", + "file": "Tiedosto", + "media": "Media", + "todo": "Tehtävälista", + "contacts": "Yhteystiedot", + "sheet": "Taulukko (Beta)", + "teams": "Teams" + }, + "button_newpad": "Uusi Teksti-padi", + "button_newcode": "Uusi Koodi-padi", + "button_newpoll": "Uusi Kysely", + "button_newslide": "Uusi Esitys", + "button_newwhiteboard": "Uusi Tussitaulu", + "button_newkanban": "Uusi Kanban", + "button_newsheet": "Uusi Taulukko", + "common_connectionLost": "Yhteys palvelimelle katkennut
Sovellus on vain luku-tilassa, kunnes yhteys palaa.", + "websocketError": "Yhdistäminen websocket-palvelimelle epäonnistui...", + "typeError": "Tämä padi ei ole yhteensopiva valitun sovelluksen kanssa", + "onLogout": "Olet kirjautunut ulos, {0}klikkaa tästä{1} kirjautuaksesi sisään tai paina Esc-näppäintä käyttääksesi padia vain luku-tilassa.", + "wrongApp": "Reaaliaikaisen sisällön näyttäminen selaimessa epäonnistui. Ole hyvä ja yritä sivun lataamista uudelleen.", + "padNotPinned": "Tämä padi vanhenee kolmen kuukauden käyttämättömyyden jälkeen, {0}kirjaudu sisään{1} tai [2}rekisteröidy{3} säilyttääksesi sen.", + "padNotPinnedVariable": "Tämä padi vanhenee {4} päivän käyttämättömyyden jälkeen, {0}kirjaudu sisään{1} tai {2}rekisteröidy{3} säilyttääksesi sen.", + "anonymousStoreDisabled": "Tämän CryptPad-instanssin ylläpitäjä on estänyt anonyymien käyttäjien pääsyn tallennustilaan. Kirjaudu sisään käyttääksesi CryptDrivea.", + "expiredError": "Tämä padi on vanhentunut, eikä se ole enää saatavilla.", + "deletedError": "Tämä padi on poistettu omistajansa toimesta, eikä se ole enää saatavilla.", + "inactiveError": "Tämä padi on poistettu käyttämättömyyden vuoksi. Paina Esc-näppäintä luodaksesi uuden padin.", + "chainpadError": "Sisältöä päivitettäessä tapahtui vakava virhe. Tämä sivu on vain luku-tilassa, jotta tekemäsi muutokset eivät katoaisi.
Paina Esc-näppäintä jatkaaksesi padin katselua vain luku-tilassa, tai lataa sivu uudelleen yrittääksesi muokkaamista.", + "invalidHashError": "Pyytämäsi dokumentin URL-osoite on virheellinen." } From d3718679c0de1e138afeedfa5d02a4341dd2d607 Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 16 Dec 2019 13:42:18 +0000 Subject: [PATCH 06/18] Translated using Weblate (French) Currently translated at 99.6% (1158 of 1163 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/ --- www/common/translations/messages.fr.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json index cac8d471b..7f0533dbc 100644 --- a/www/common/translations/messages.fr.json +++ b/www/common/translations/messages.fr.json @@ -1254,5 +1254,10 @@ "passwordFaqLink": "En lire plus sur les mots de passe", "share_noContactsLoggedIn": "Vous n'avez pas encore ajouté de contacts sur CryptPad. Partagez le lien de votre profil pour que l'on vous envoie des demandes de contact.", "share_copyProfileLink": "Copier le lien du profil", - "share_noContactsNotLoggedIn": "Connectez-vous ou enregistrez-vous pour voir vos contacts ou en ajouter de nouveaux." + "share_noContactsNotLoggedIn": "Connectez-vous ou enregistrez-vous pour voir vos contacts ou en ajouter de nouveaux.", + "contacts_mute": "Masquer", + "contacts_unmute": "Réafficher", + "contacts_manageMuted": "Comptes masqués", + "contacts_mutedUsers": "Comptes masqués", + "contacts_muteInfo": "Vous ne receverez plus de notifications ou de messages si vous masquez ce compte.
L'utilisateur ne sera pas informé que vous l'avez masqué. " } From 89e08704e544cd4ea725289dcb1f889a58df5ff6 Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 16 Dec 2019 13:42:19 +0000 Subject: [PATCH 07/18] Translated using Weblate (German) Currently translated at 100.0% (1158 of 1158 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/ --- www/common/translations/messages.de.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json index b92c21309..aac7f9e03 100644 --- a/www/common/translations/messages.de.json +++ b/www/common/translations/messages.de.json @@ -1251,5 +1251,8 @@ "share_linkPasswordAlert": "Dieses Element ist passwortgeschützt. Wenn du diesen Link teilst, muss der Empfänger das Passwort eingeben.", "share_contactPasswordAlert": "Dieses Element ist passwortgeschützt. Weil du es mit einem CryptPad-Kontakt teilst, muss der Empfänger das Passwort nicht eingeben.", "share_embedPasswordAlert": "Dieses Element ist passwortgeschützt. Wenn du dieses Pad einbettest, werden Betrachter nach dem Passwort gefragt.", - "passwordFaqLink": "Mehr über Passwörter erfahren" + "passwordFaqLink": "Mehr über Passwörter erfahren", + "share_noContactsLoggedIn": "Du hast noch keine Kontakte bei CryptPad. Teile den Link zu deinem Profil, damit andere dir Kontaktanfragen senden können.", + "share_copyProfileLink": "Profil-Link kopieren", + "share_noContactsNotLoggedIn": "Logge dich ein oder registriere dich, um deine Kontakte zu sehen und neue hinzuzufügen." } From 00b0499db529986636df8e58d5c09027f4f8af53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Mon, 16 Dec 2019 16:03:56 +0000 Subject: [PATCH 08/18] add translation keys --- www/common/common-ui-elements.js | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index 44717f635..e5a7bb660 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -1640,15 +1640,14 @@ define([ // Invite from link var dismissButton = h('span.fa.fa-times'); var linkContent = h('div.cp-share-modal', [ - h('p', 'XXX Invite link description...'), // XXX - linkError = h('div.alert.alert-danger', {style : 'display: none;'}), + h('p', Messages.team_inviteLinkTitle ), // XXX linkForm = h('div.cp-teams-invite-form', [ linkName = h('input', { - placeholder: 'name...' // XXX + placeholder: Messages.team_inviteLinkTempName // XXX }), h('br'), h('div.cp-teams-invite-block', [ - h('span', 'password protection...'), // XXX + h('span', Messages.team_inviteLinkSetPassword), // XXX h('a.cp-teams-help.fa.fa-question-circle', { href: origin + '/faq.html#security-pad_password', target: "_blank", @@ -1657,20 +1656,19 @@ define([ ]), // XXX linkPassword = UI.passwordInput({ id: 'cp-teams-invite-password', - placeholder: 'password...' // XXX + placeholder: Messages.login_password // XXX }), h('div.cp-teams-invite-block', - h('span', 'add a note') // XXX + h('span', Messages.team_inviteLinkNote) // XXX ), - linkMessage = h('textarea', { // XXX ansuz hitting enter submits... - placeholder: 'note...' // XXX + placeholder: Messages.team_inviteLinkNoteMsg, // XXX }) ]), linkSpin = h('div', { style: 'display: none;' }, [ h('i.fa.fa-spinner.fa-spin'), - linkSpinText = h('span', 'Scrypt...') // XXX + linkSpinText = h('span', Messages.team_inviteLinkLoading) // XXX ]), linkResult = h('div', { style: 'display: none;' @@ -1680,7 +1678,7 @@ define([ linkWarning = h('div.cp-teams-invite-alert.alert.alert-warning.dismissable', { style: "display: none;" }, [ - h('span.cp-inline-alert-text', 'Warning...'), + h('span.cp-inline-alert-text', Messages.team_inviteLinkWarning), dismissButton ]) // XXX ]); @@ -1706,7 +1704,7 @@ define([ var hashData = Hash.parseTypeHash('invite', hash); href = origin + '/teams/#' + hash; if (!name || !name.trim()) { - $(linkError).text('empty name...').show(); // XXX + $(linkError).text(Messages.team_inviteLinkErrorName).show(); // XXX return true; } var bytes64; From 8b333a8147a9bbbe7c1269bfc2d64c0f27138657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Mon, 16 Dec 2019 16:05:06 +0000 Subject: [PATCH 09/18] size message textarea and remove resize --- customize.dist/src/less2/include/modals-ui-elements.less | 3 +++ www/common/common-ui-elements.js | 2 ++ 2 files changed, 5 insertions(+) diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less index 24e5d725f..6db976283 100644 --- a/customize.dist/src/less2/include/modals-ui-elements.less +++ b/customize.dist/src/less2/include/modals-ui-elements.less @@ -37,6 +37,9 @@ flex: 1; } } + .cp-teams-invite-message { + resize: none; + } .cp-teams-invite-alert { margin-top: 15px; } diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index e5a7bb660..ef82df83b 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -1661,7 +1661,9 @@ define([ h('div.cp-teams-invite-block', h('span', Messages.team_inviteLinkNote) // XXX ), + linkMessage = h('textarea.cp-teams-invite-message', { // XXX ansuz hitting enter submits... placeholder: Messages.team_inviteLinkNoteMsg, // XXX + rows: 3 }) ]), linkSpin = h('div', { From fccd1d5cc0b557d7fc5ed7b3399366a5146924ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Mon, 16 Dec 2019 16:05:41 +0000 Subject: [PATCH 10/18] resize spinner --- customize.dist/src/less2/include/modals-ui-elements.less | 5 +++++ www/common/common-ui-elements.js | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less index 6db976283..71f076d3f 100644 --- a/customize.dist/src/less2/include/modals-ui-elements.less +++ b/customize.dist/src/less2/include/modals-ui-elements.less @@ -42,5 +42,10 @@ } .cp-teams-invite-alert { margin-top: 15px; + .cp-teams-invite-spinner { + font-size: 1.2em; + .fa { + margin-right: 10px;; + } } } diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index ef82df83b..4ad2cb5c4 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -1666,7 +1666,7 @@ define([ rows: 3 }) ]), - linkSpin = h('div', { + linkSpin = h('div.cp-teams-invite-spinner', { style: 'display: none;' }, [ h('i.fa.fa-spinner.fa-spin'), From 4173bf168f3f28d93cb6d4d086daf3f79b16064d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Mon, 16 Dec 2019 16:05:59 +0000 Subject: [PATCH 11/18] alert margins --- customize.dist/src/less2/include/modals-ui-elements.less | 4 +++- www/common/common-ui-elements.js | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less index 71f076d3f..cf51f6342 100644 --- a/customize.dist/src/less2/include/modals-ui-elements.less +++ b/customize.dist/src/less2/include/modals-ui-elements.less @@ -29,6 +29,7 @@ color: @cryptpad_text_col; } + // teams invite modal .cp-teams-invite-block { display: flex; align-items: center; @@ -41,7 +42,8 @@ resize: none; } .cp-teams-invite-alert { - margin-top: 15px; + margin-top: 10px; + } .cp-teams-invite-spinner { font-size: 1.2em; .fa { diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index 4ad2cb5c4..b7a491714 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -1677,6 +1677,7 @@ define([ }, h('textarea', { readonly: 'readonly' })), + linkError = h('div.alert.alert-danger.cp-teams-invite-alert', {style : 'display: none;'}), linkWarning = h('div.cp-teams-invite-alert.alert.alert-warning.dismissable', { style: "display: none;" }, [ From b332c97db9a02416fde1ba78c9575b654389fbaa Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 16 Dec 2019 16:40:21 +0000 Subject: [PATCH 12/18] Translated using Weblate (English) Currently translated at 100.0% (1171 of 1171 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1170 of 1170 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1169 of 1169 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1168 of 1168 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1167 of 1167 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1166 of 1166 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1165 of 1165 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1164 of 1164 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ --- www/common/translations/messages.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json index 8f6638f58..1d1e3e1c1 100644 --- a/www/common/translations/messages.json +++ b/www/common/translations/messages.json @@ -1259,5 +1259,13 @@ "contacts_unmute": "Unmute", "contacts_manageMuted": "Manage muted", "contacts_mutedUsers": "Muted accounts", - "contacts_muteInfo": "You will not receive any notifications or messages from muted users.
They will not know you have muted them. " + "contacts_muteInfo": "You will not receive any notifications or messages from muted users.
They will not know you have muted them. ", + "team_inviteLinkTitle": "Create a personalized invitation to this team", + "team_inviteLinkTempName": "temporary name (visible in pending invitations list)", + "team_inviteLinkSetPassword": "Protect the link with a password (recommended)", + "team_inviteLinkNote": "Add a personal message", + "team_inviteLinkNoteMsg": "This message will be shown before the recipient decides whether to join this team.", + "team_inviteLinkLoading": "Generating your link", + "team_inviteLinkWarning": "The first person to access this link will be able to join this team and view its contents. Share it carefully.", + "team_inviteLinkErrorName": "Please give this invitation a name" } From 6d4bfe4dfdbec51908483c197c4575ec83240e19 Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 16 Dec 2019 16:40:21 +0000 Subject: [PATCH 13/18] Translated using Weblate (French) Currently translated at 100.0% (1171 of 1171 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/ --- www/common/translations/messages.fr.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json index 7f0533dbc..7ba175962 100644 --- a/www/common/translations/messages.fr.json +++ b/www/common/translations/messages.fr.json @@ -1259,5 +1259,13 @@ "contacts_unmute": "Réafficher", "contacts_manageMuted": "Comptes masqués", "contacts_mutedUsers": "Comptes masqués", - "contacts_muteInfo": "Vous ne receverez plus de notifications ou de messages si vous masquez ce compte.
L'utilisateur ne sera pas informé que vous l'avez masqué. " + "contacts_muteInfo": "Vous ne receverez plus de notifications ou de messages si vous masquez ce compte.
L'utilisateur ne sera pas informé que vous l'avez masqué. ", + "team_inviteLinkTitle": "Créer une invitation personnalisée à cette équipe", + "team_inviteLinkTempName": "Nom temporaire (apparaît dans la liste des invitations en cours)", + "team_inviteLinkSetPassword": "Protégez le lien avec un mot de passe (recommandé)", + "team_inviteLinkNote": "Ajoutez un message personnalisé", + "team_inviteLinkNoteMsg": "Ce message sera affiché avant que le destinataire décide de rejoindre cette équipe.", + "team_inviteLinkLoading": "Lien en cours de création", + "team_inviteLinkWarning": "La première personne qui accédera à ce lien pourra devenir membre de l'équipe et voir son contenu. Partagez le avec prudence.", + "team_inviteLinkErrorName": "Merci de donner un nom à cette invitation" } From daf5017bda090544efc91c562041b20076a33281 Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 16 Dec 2019 16:40:21 +0000 Subject: [PATCH 14/18] Translated using Weblate (German) Currently translated at 98.9% (1158 of 1171 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/ --- www/common/translations/messages.de.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json index aac7f9e03..8eba3e0f7 100644 --- a/www/common/translations/messages.de.json +++ b/www/common/translations/messages.de.json @@ -1254,5 +1254,10 @@ "passwordFaqLink": "Mehr über Passwörter erfahren", "share_noContactsLoggedIn": "Du hast noch keine Kontakte bei CryptPad. Teile den Link zu deinem Profil, damit andere dir Kontaktanfragen senden können.", "share_copyProfileLink": "Profil-Link kopieren", - "share_noContactsNotLoggedIn": "Logge dich ein oder registriere dich, um deine Kontakte zu sehen und neue hinzuzufügen." + "share_noContactsNotLoggedIn": "Logge dich ein oder registriere dich, um deine Kontakte zu sehen und neue hinzuzufügen.", + "contacts_mute": "", + "contacts_unmute": "", + "contacts_manageMuted": "", + "contacts_mutedUsers": "", + "contacts_muteInfo": "" } From c21a45fbde01c02f0bbcd09c7b4d2768285972a1 Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 16 Dec 2019 16:51:03 +0000 Subject: [PATCH 15/18] Translated using Weblate (English) Currently translated at 100.0% (1173 of 1173 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1172 of 1172 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ --- www/common/translations/messages.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json index 1d1e3e1c1..4dfb5143b 100644 --- a/www/common/translations/messages.json +++ b/www/common/translations/messages.json @@ -1267,5 +1267,7 @@ "team_inviteLinkNoteMsg": "This message will be shown before the recipient decides whether to join this team.", "team_inviteLinkLoading": "Generating your link", "team_inviteLinkWarning": "The first person to access this link will be able to join this team and view its contents. Share it carefully.", - "team_inviteLinkErrorName": "Please give this invitation a name" + "team_inviteLinkErrorName": "Please give this invitation a name", + "team_inviteLinkCreate": "CREATE LINK", + "team_inviteLinkCopy": "COPY LINK" } From 5a55bcde3da258fde7a2e4c0a0e851247829b124 Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 16 Dec 2019 16:51:03 +0000 Subject: [PATCH 16/18] Translated using Weblate (French) Currently translated at 100.0% (1173 of 1173 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/ --- www/common/translations/messages.fr.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json index 7ba175962..aa8065bee 100644 --- a/www/common/translations/messages.fr.json +++ b/www/common/translations/messages.fr.json @@ -1267,5 +1267,7 @@ "team_inviteLinkNoteMsg": "Ce message sera affiché avant que le destinataire décide de rejoindre cette équipe.", "team_inviteLinkLoading": "Lien en cours de création", "team_inviteLinkWarning": "La première personne qui accédera à ce lien pourra devenir membre de l'équipe et voir son contenu. Partagez le avec prudence.", - "team_inviteLinkErrorName": "Merci de donner un nom à cette invitation" + "team_inviteLinkErrorName": "Merci de donner un nom à cette invitation", + "team_inviteLinkCreate": "CRÉER LIEN", + "team_inviteLinkCopy": "COPIER LIEN" } From 71da3ed7231eb3012e959fabd916b4b69e338cf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Mon, 16 Dec 2019 16:51:53 +0000 Subject: [PATCH 17/18] add button keys --- customize.dist/src/less2/include/modals-ui-elements.less | 2 +- www/common/common-ui-elements.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less index cf51f6342..79964e888 100644 --- a/customize.dist/src/less2/include/modals-ui-elements.less +++ b/customize.dist/src/less2/include/modals-ui-elements.less @@ -29,7 +29,7 @@ color: @cryptpad_text_col; } - // teams invite modal + // teams invite modal .cp-teams-invite-block { display: flex; align-items: center; diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index 0bf990412..366931b24 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -1725,7 +1725,7 @@ define([ bytes64 = _bytes; })); }).nThen(function (waitFor) { - $(linkSpinText).text('Add invite link to team'); // XXX + $(linkSpinText).text(Messages.team_inviteLinkAdding); // XXX module.execCommand('CREATE_INVITE_LINK', { name: name, password: pw, @@ -1755,14 +1755,14 @@ define([ keys: [27] }, { className: 'primary cp-teams-invite-create', - name: 'CREATE LINK', // XXX + name: Messages.team_inviteLinkCreate, // XXX onClick: function () { return process(); }, keys: [13] }, { className: 'primary cp-teams-invite-copy', - name: 'COPY LINK', // XXX + name: Messages.team_inviteLinkCopy, // XXX onClick: function () { if (!href) { return; } var success = Clipboard.copy(href); From af6b77a2ff69f341dd3d64a84fe5f30c856b7898 Mon Sep 17 00:00:00 2001 From: ansuz Date: Mon, 16 Dec 2019 11:59:12 -0500 Subject: [PATCH 18/18] fix script errors --- www/common/invitation.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/common/invitation.js b/www/common/invitation.js index e26a39597..9ce1ec67e 100644 --- a/www/common/invitation.js +++ b/www/common/invitation.js @@ -66,9 +66,9 @@ var factory = function (Hash, Nacl, Scrypt/*, Util, Cred, nThen */) { define([ '/common/common-hash.js', '/bower_components/tweetnacl/nacl-fast.min.js', - '/bower_components/scrypt_async/scrypt-async.min.js', + '/bower_components/scrypt-async/scrypt-async.min.js', ], function (Hash /*, Nacl, Scrypt */) { - return factory(Hash, window.nacl, window.Scrypt); + return factory(Hash, window.nacl, window.scrypt); }); } }());