daily translations 20160519 (#3061)

1 files changed, 25 insertions, 5 deletions

diff --git a/i18n/fr.json b/i18n/fr.json
index da0e5dfa2..43d1ddd00 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -57,7 +57,7 @@
   },
   {
     "id": "api.admin.get_brand_image.storage.app_error",
-    "translation": "Image storage is not configured."
+    "translation": "Le stockage pour les images n'est pas configuré."
   },
   {
     "id": "api.admin.init.debug",
@@ -440,6 +440,18 @@
     "translation": "Messaged user."
   },
   {
+    "id": "api.command_shortcuts.desc",
+    "translation": "Displays a list of keyboard shortcuts"
+  },
+  {
+    "id": "api.command_shortcuts.list",
+    "translation": "### Keyboard Shortcuts\n\n#### CTRL/CMD\n\n- CTRL/CMD+K - Open up channel switcher\n- CTRL/CMD+U - Open up file upload\n- CTRL/CMD+Up - Reprint last message or slash command entered\n- CTRL/CMD+SHIFT+A - Open account settings\n- CTRL/CMD+SHIFT+M - Open recent mentions\n\n#### ALT\n\n- ALT+Up - Go to previous channel\n- ALT+Down - Go to next channel\n- ALT+SHIFT+Up - Go to previous channel with unread messages\n- ALT+SHIFT+Down - Go to next channel with unread messages\n\n#### General\n\n- Up - Edit last message\n- /+Up/Down - See available slash commands\n"
+  },
+  {
+    "id": "api.command_shortcuts.name",
+    "translation": "shortcuts"
+  },
+  {
     "id": "api.command_shrug.desc",
     "translation": "Ajoute ¯\\_(ツ)_/¯ à votre message"
   },
@@ -888,6 +900,10 @@
     "translation": "Nouveau Message Privé"
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_in",
+    "translation": " in "
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_mention",
     "translation": " vous a mentionné sur "
   },
@@ -896,6 +912,10 @@
     "translation": " vous a envoyé un message privé"
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_non_mention",
+    "translation": " posted in "
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_notification.debug",
     "translation": "Envoi d'une notification push à %v wi msg of '%v'"
   },
@@ -1353,15 +1373,15 @@
   },
   {
     "id": "api.templates.username_change_body.info",
-    "translation": "Your username for {{.TeamDisplayName}} has been changed to {{.NewUsername}}.<br>If you did not make this change, please contact the system administrator."
+    "translation": "Votre adresse électronique pour {{.TeamDisplayName}} a été modifiée en {{.NewEmail}}.<br>Si vous n'êtes pas à l'origine de cette action, veuillez contacter votre administrateur système."
   },
   {
     "id": "api.templates.username_change_body.title",
-    "translation": "You updated your username"
+    "translation": "Vous avez mis à jour votre adresse électronique."
   },
   {
     "id": "api.templates.username_change_subject",
-    "translation": "Your username has changed for {{.TeamDisplayName}}"
+    "translation": "Votre adresse électronique a été modifiée pour {{.TeamDisplayName}}"
   },
   {
     "id": "api.templates.verify_body.button",
@@ -1653,7 +1673,7 @@
   },
   {
     "id": "api.user.send_email_change_username_and_forget.error",
-    "translation": "Failed to send username change notification email successfully err=%v"
+    "translation": "Impossible d'envoyer le courriel de changement d'adresse électronique err=%v"
   },
   {
     "id": "api.user.send_email_change_verify_email_and_forget.error",