Merge remote-tracking branch 'upstream/devel' into devel

1 files changed, 50 insertions, 19 deletions

diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json
index eabd58d2..0eeb19df 100644
--- a/i18n/fr.i18n.json
+++ b/i18n/fr.i18n.json
@@ -1,4 +1,5 @@
 {
+    "accept": "Accepter",
     "actions": "Actions",
     "activities": "Activitées",
     "activity": "Activité",
@@ -7,8 +8,8 @@
     "activity-attached": "a attaché %s à %s",
     "activity-created": "a créé %s",
     "activity-excluded": "a exclu %s de %s",
-    "activity-imported": "imported %s into %s from %s",
-    "activity-imported-board": "imported %s from %s",
+    "activity-imported": "a importé %s vers %s depuis %s",
+    "activity-imported-board": "a importé %s depuis %s",
     "activity-joined": "a rejoint %s",
     "activity-moved": "a déplacé %s depuis %s vers %s",
     "activity-on": "sur %s",
@@ -36,7 +37,7 @@
     "archive-card": "Archiver la carte",
     "archive-list": "Archiver cette liste",
     "archive-selection": "Archiver la selection",
-    "archiveBoardPopup-title": "Fermer le tableau ?",
+    "archiveBoardPopup-title": "Archive Board?",
     "archived-items": "Éléments archivés",
     "archives": "Archives",
     "assign-member": "Assigner un membre",
@@ -55,7 +56,7 @@
     "boardChangeColorPopup-title": "Change la fond du tableau",
     "boardChangeTitlePopup-title": "Renommer le tableau",
     "boardChangeVisibilityPopup-title": "Changer la visibilité",
-    "boardImportBoardPopup-title": "Import board from Trello",
+    "boardImportBoardPopup-title": "Importer le tableau depuis Trello",
     "boardMenuPopup-title": "Menu du tableau",
     "boards": "Tableaux",
     "bucket-example": "Comme « todo list » par exemple",
@@ -77,7 +78,7 @@
     "cardMembersPopup-title": "Membres",
     "cardMorePopup-title": "Plus",
     "cards": "Cartes",
-    "change": "Change",
+    "change": "Changer",
     "change-avatar": "Changer l'avatar",
     "change-password": "Changer le mot de passe",
     "change-permissions": "Changer les permissions",
@@ -87,19 +88,20 @@
     "changePermissionsPopup-title": "Changer les permissions",
     "click-to-star": "Cliquez pour ajouter ce tableau aux favoris.",
     "click-to-unstar": "Cliquez pour retirer ce tableau des favoris.",
+    "clipboard": "Clipboard or drag & drop",
     "close": "Fermer",
     "close-board": "Fermer le tableau",
-    "close-board-pop": "Vous pouvez ré-ouvrir le tableau en cliquant sur le menu « Tableau » dans la barre d'en-tête, puis en sélection « Voir les tableaux fermés », en trouvant le tableau désiré puis en cliquant sur « Ré-ouvrir ».",
-    "color-green": "green",
-    "color-yellow": "yellow",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
+    "color-green": "vert",
+    "color-yellow": "jaune",
     "color-orange": "orange",
-    "color-red": "red",
-    "color-purple": "purple",
-    "color-blue": "blue",
-    "color-sky": "sky",
-    "color-lime": "lime",
-    "color-pink": "pink",
-    "color-black": "black",
+    "color-red": "rouge",
+    "color-purple": "violet",
+    "color-blue": "bleu",
+    "color-sky": "ciel",
+    "color-lime": "citron vert",
+    "color-pink": "rose",
+    "color-black": "noir",
     "comment": "Commentaire",
     "comment-placeholder": "Rédiger un commentaire",
     "computer": "Ordinateur",
@@ -107,6 +109,7 @@
     "createBoardPopup-title": "Créer un tableau",
     "createLabelPopup-title": "Créer un étiquette",
     "current": "courant",
+    "decline": "Refuser",
     "default-avatar": "Avatar par défaut",
     "delete": "Supprimer",
     "deleteLabelPopup-title": "Supprimer l'étiquette ?",
@@ -114,6 +117,7 @@
     "disambiguateMultiLabelPopup-title": "Préciser l'action sur l'étiquette",
     "disambiguateMultiMemberPopup-title": "Préciser l'action sur le membre",
     "discard": "Mettre à la corbeille",
+    "done": "Fait",
     "download": "Télécharger",
     "edit": "Éditer",
     "edit-avatar": "Changer l'avatar",
@@ -121,10 +125,27 @@
     "editLabelPopup-title": "Changer l'étiquette",
     "editProfilePopup-title": "Éditer le profil",
     "email": "Email",
+    "email-enrollAccount-subject": "An account created for you on __url__",
+    "email-enrollAccount-text": "Hello __user__,\n\nTo start using the service, simply click the link below.\n\n__url__\n\nThanks.",
+    "email-fail": "Sending email failed",
+    "email-invalid": "Invalid email",
+    "email-invite": "Invite via Email",
+    "email-invite-subject": "__inviter__ sent you an invitation",
+    "email-invite-text": "Dear __user__,\n\n__inviter__ invites you to join board \"__board__\" for collaborations.\n\nPlease follow the link below:\n\n__url__\n\nThanks.",
+    "email-resetPassword-subject": "Reset your password on __url__",
+    "email-resetPassword-text": "Hello __user__,\n\nTo reset your password, simply click the link below.\n\n__url__\n\nThanks.",
+    "email-verifyEmail-subject": "Verify your email address on __url__",
+    "email-verifyEmail-text": "Hello __user__,\n\nTo verify your account email, simply click the link below.\n\n__url__\n\nThanks.",
+    "email-sent": "Email sent",
+    "error-board-doesNotExist": "This board does not exist",
+    "error-board-notAdmin": "You need to be admin of this board to do that",
     "error-board-notAMember": "You need to be a member of this board to do that",
     "error-json-malformed": "Your text is not valid JSON",
     "error-json-schema": "Your JSON data does not include the proper information in the correct format",
     "error-list-doesNotExist": "This list does not exist",
+    "error-user-doesNotExist": "This user does not exist",
+    "error-user-notAllowSelf": "This action on self is not allowed",
+    "error-user-notCreated": "This user is not created",
     "filter": "Filtrer",
     "filter-cards": "Filtrer les cartes",
     "filter-clear": "Retirer les filtres",
@@ -140,9 +161,13 @@
     "import-card": "Import a Trello card",
     "import-card-trello-instruction": "Go to a Trello card, select 'Share and more...' then 'Export JSON' and copy the resulting text",
     "import-json-placeholder": "Paste your valid JSON data here",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
+    "import-show-user-mapping": "Review members mapping",
+    "import-user-select": "Pick the Wekan user you want to use as this member",
     "info": "Infos",
     "initials": "Initiales",
     "joined": "a joint",
+    "just-invited": "You are just invited to this board",
     "keyboard-shortcuts": "Raccourcis clavier",
     "label-create": "Créer une nouvelle étiquette",
     "label-default": "%s label (default)",
@@ -157,18 +182,18 @@
     "list-move-cards": "Déplacer les cartes de cette liste",
     "list-select-cards": "Sélectionner les cartes de cette liste",
     "listActionPopup-title": "Liste des actions",
-    "listArchiveCardsPopup-title": "Archiver les cartes de la liste ?",
     "listImportCardPopup-title": "Import a Trello card",
-    "listMoveCardsPopup-title": "Déplacer les cartes de la liste",
     "lists": "Listes",
     "log-out": "Déconnexion",
     "loginPopup-title": "Connexion",
+    "mapMembersPopup-title": "Associer les membres",
+    "mapMembersAddPopup-title": "Sélectioner le membre Wekan",
     "memberMenuPopup-title": "Préférence de membre",
     "members": "Membres",
     "menu": "Menu",
     "moveCardPopup-title": "Déplacer la carte",
     "multi-selection": "Sélection multiple",
-    "multi-selection-on": "Multi-Selection is on",
+    "multi-selection-on": "Multi-Selection active",
     "my-boards": "Mes tableaux",
     "name": "Nom",
     "no-archived-cards": "Pas de carte archivée.",
@@ -176,11 +201,16 @@
     "no-results": "Pas de résultats",
     "normal": "Normal",
     "normal-desc": "Peut voir et éditer les cartes. Ne peut pas changer les paramètres.",
+    "not-accepted-yet": "L’invitation n’a pas encore été acceptée",
     "optional": "optionnel",
-    "or": "or",
+    "or": "ou",
     "page-maybe-private": "Cette page est peut-être privée. Vous pourrez peut-être la voir en vous <a href='%s'>connectant</a>.",
     "page-not-found": "Page non trouvée",
     "password": "Mot de passe",
+    "paste-or-dragdrop": "to paste, or drag & drop image file to it (image only)",
+    "preview": "Preview",
+    "previewClipboardImagePopup-title": "Preview",
+    "previewAttachedImagePopup-title": "Preview",
     "private": "Privé",
     "private-desc": "Ce tableau est privé. Seul les membres peuvent y accéder.",
     "profile": "Profil",
@@ -220,6 +250,7 @@
     "title": "Titre",
     "unassign-member": "Retirer le membre",
     "unsaved-description": "Vous avez une description non sauvegardée",
+    "upload": "Upload",
     "upload-avatar": "Télécharger un avatar",
     "uploaded-avatar": "Avatar téléchargé",
     "username": "Nom d'utilisateur",