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

Merge branch 'soon' into upload-size-error

This commit is contained in:
ansuz 2022-05-31 17:58:32 +05:30
parent 104a04597c 0df76ed64e
commit 019d2f0f16
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -452,7 +452,7 @@
"upload_notEnoughSpace": "Il n'y a pas assez d'espace libre dans votre CryptDrive pour ce fichier.",
"upload_notEnoughSpaceBrief": "Pas assez d'espace",
"upload_tooLarge": "Ce fichier dépasse la taille maximale autorisée pour votre compte.",
"upload_tooLargeBrief": "Le fichier dépasse la limite de {0} Mo",
"upload_tooLargeBrief": "Le fichier dépasse la limite de {0} Mo pour ce drive",
"upload_choose": "Choisir un fichier",
"upload_pending": "En attente",
"upload_cancelled": "Annulé",

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

@ -467,7 +467,7 @@
"upload_notEnoughSpace": "There is not enough space for this file in your CryptDrive.",
"upload_notEnoughSpaceBrief": "Not enough space",
"upload_tooLarge": "This file exceeds the maximum upload size allowed for your account.",
"upload_tooLargeBrief": "File exceeds the {0}MB limit",
"upload_tooLargeBrief": "File exceeds the {0}MB limit for this drive",
"upload_choose": "Choose a file",
"upload_pending": "Pending",
"upload_cancelled": "Cancelled",

4
www/teams/app-team.less
View File

@ -251,7 +251,7 @@
.cp-teams-invite-from-author {
display: flex;
margin-left: 10px;
.cp-teams-invite-from-avatar {
.cp-teams-invite-from-avatar {
.avatar_main(25px);
margin: 0px 5px;
}
@ -264,7 +264,7 @@
width: 100%;
padding: 12px;
margin-bottom: 20px;
white-space: pre;
border-radius: @variables_radius;
}
.cp-teams-invite-password {
margin-bottom: 20px;