Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

pull/1/head
yflory 6 years ago
commit 6f520dae77

@ -1051,5 +1051,14 @@
"drive_active1Day": "Letzte 24 Stunden",
"drive_active7Days": "Letzte 7 Tage",
"drive_active28Days": "Letzte 4 Wochen",
"drive_activeOld": "Ältere Pads"
"drive_activeOld": "Ältere Pads",
"friendRequest_later": "",
"friendRequest_accept": "",
"friendRequest_decline": "",
"friendRequest_declined": "",
"friendRequest_accepted": "",
"friendRequest_received": "",
"friendRequest_notification": "",
"notifications_empty": "",
"notifications_title": ""
}

@ -1060,5 +1060,9 @@
"friendRequest_received": "<b>{0}</b> souhaite être votre ami",
"friendRequest_notification": "<b>{0}</b> vous a envoyé une demande d'ami",
"notifications_empty": "Vous n'avez pas de nouvelle notification",
"notifications_title": "Vous avez des notifications non lues"
"notifications_title": "Vous avez des notifications non lues",
"profile_addDescription": "Ajouter une description",
"profile_editDescription": "Modifier votre description",
"profile_addLink": "Ajouter un lien vers votre site web",
"profile_info": "Les autres utilisateurs peuvent trouver votre profil en cliquant sur votre nom dans la liste d'utilisateurs des documents."
}

@ -1060,5 +1060,9 @@
"friendRequest_received": "<b>{0}</b> would like to be your friend",
"friendRequest_notification": "<b>{0}</b> sent you a friend request",
"notifications_empty": "You have no new notifications",
"notifications_title": "You have unread notifications"
"notifications_title": "You have unread notifications",
"profile_addDescription": "Add a description",
"profile_editDescription": "Edit your description",
"profile_addLink": "Add a link to your website",
"profile_info": "Other users can find your profile through your avatar in document user lists."
}

Loading…
Cancel
Save