dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into inviteUI

This commit is contained in:
yflory 2019-12-18 18:26:41 +01:00
parent b402b3c552 a518cbcce7
commit 8c09e7d43c
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/common/translations/messages.fr.json
View File

@ -1270,9 +1270,7 @@
"team_inviteLinkErrorName": "Merci de remplir un nom de la personne que vous invitez. Ce nom pourra être changé . ",
"team_inviteLinkCreate": "Créer le lien",
"team_inviteLinkCopy": "Copier le lien",
"Messages": {
"team_inviteFrom": "De :"
},
"team_inviteFrom": "De :",
"team_inviteFromMsg": "{0} vous a invité à rejoindre l'équipe <b>{1}</b>",
"team_invitePleaseLogin": "Merci de vous inscrire ou de vous connecter pour accepter cette invitation.",
"team_inviteEnterPassword": "Entrez le mot de passe pour continuer.",

4
www/common/translations/messages.json
View File

@ -1270,9 +1270,7 @@
"team_inviteLinkErrorName": "Please add a name for the person you're inviting. They can change it later. ",
"team_inviteLinkCreate": "Create link",
"team_inviteLinkCopy": "Copy link",
"Messages": {
"team_inviteFrom": "From:"
},
"team_inviteFrom": "From:",
"team_inviteFromMsg": "{0} has invited you to join the team <b>{1}</b>",
"team_invitePleaseLogin": "Please log in or register to accept this invitation.",
"team_inviteEnterPassword": "Please enter the invitation password to continue.",