translations PR 20170703 (#6836)

* translations PR 20170703

* Fix bad merge

1 files changed, 157 insertions, 9 deletions

diff --git a/i18n/fr.json b/i18n/fr.json
index 0baecb2fe..c4fcf4a51 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -429,7 +429,7 @@
   },
   {
     "id": "api.command.execute_command.not_found.app_error",
-    "translation": "La commande avec le déclencheur '{{.Trigger}}' n'a pas pu être trouvée"
+    "translation": "Command with a trigger of '{{.Trigger}}' not found. To send a message beginning with \"/\", try adding an empty space at the beginning of the message."
   },
   {
     "id": "api.command.execute_command.save.app_error",
@@ -460,6 +460,10 @@
     "translation": "[Nom@domaine.com ...]"
   },
   {
+    "id": "api.command.invite_people.invite_off",
+    "translation": "User creation has been disabled on this server, no invite(s) sent"
+  },
+  {
     "id": "api.command.invite_people.name",
     "translation": "inviter_personne"
   },
@@ -496,6 +500,38 @@
     "translation": "Vous êtes maintenant absent(e)"
   },
   {
+    "id": "api.command_channel_header.channel.app_error",
+    "translation": "Error to retrieve the current channel."
+  },
+  {
+    "id": "api.command_channel_header.desc",
+    "translation": "Edit the channel header"
+  },
+  {
+    "id": "api.command_channel_header.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_channel_header.message.app_error",
+    "translation": "Text must be provided with the /header command."
+  },
+  {
+    "id": "api.command_channel_header.name",
+    "translation": "header"
+  },
+  {
+    "id": "api.command_channel_header.permission.app_error",
+    "translation": "You do not have the appropriate permissions to edit the channel header."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.app_error",
+    "translation": "Error to update the current channel."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.success",
+    "translation": "Channel header successfully updated."
+  },
+  {
     "id": "api.command_collapse.desc",
     "translation": "Activer la réduction automatique des aperçus d'images"
   },
@@ -552,6 +588,14 @@
     "translation": "Une erreur est survenue lors de l'expansion des aperçus"
   },
   {
+    "id": "api.command_help.desc",
+    "translation": "Open the Mattermost help page"
+  },
+  {
+    "id": "api.command_help.name",
+    "translation": "help"
+  },
+  {
     "id": "api.command_join.desc",
     "translation": "Rejoint un canal ouvert"
   },
@@ -1648,6 +1692,10 @@
     "translation": " Un ou plusieurs fichiers envoyés "
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_image_only_dm",
+    "translation": " Uploaded one or more files in a direct message"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_in",
     "translation": " dans "
   },
@@ -2004,14 +2052,6 @@
     "translation": "Le nombre de routines Go en fonctionnement est supérieur à la limite de %v / %v"
   },
   {
-    "id": "api.team.add_user_to_team.invalid_data.app_error",
-    "translation": "Donnée invalide."
-  },
-  {
-    "id": "api.team.add_user_to_team.invalid_invite_id.app_error",
-    "translation": "ID d'invitation invalide. Aucune équipe ne correspond à cet ID d'invitation."
-  },
-  {
     "id": "api.team.add_user_to_team.missing_parameter.app_error",
     "translation": "Paramètre requis pour ajouter l'utilisateur à une équipe."
   },
@@ -2084,6 +2124,10 @@
     "translation": "Cette personne est déjà dans votre équipe"
   },
   {
+    "id": "api.team.invite_members.invalid_email.app_error",
+    "translation": "The following email addresses do not belong to an accepted domain: {{.Addresses}}. Please contact your System Administrator for details."
+  },
+  {
     "id": "api.team.invite_members.member",
     "translation": "membre"
   },
@@ -2976,10 +3020,50 @@
     "translation": "Erreur lors de l'importation du canal. L'équipe portant le nom \"{{.TeamName}}\" n'a pas pu être trouvée."
   },
   {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Failed to get direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_direct_channel.error",
+    "translation": "Failed to get direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Failed to get group channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.create_group_channel.error",
+    "translation": "Failed to get group channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.member_not_found.error",
+    "translation": "Could not find channel member when importing direct channel"
+  },
+  {
+    "id": "app.import.import_direct_channel.update_header_failed.error",
+    "translation": "Failed to update direct channel header"
+  },
+  {
+    "id": "app.import.import_direct_post.channel_member_not_found.error",
+    "translation": "Could not find channel member when importing direct channel post"
+  },
+  {
+    "id": "app.import.import_direct_post.user_not_found.error",
+    "translation": "Post user does not exist"
+  },
+  {
     "id": "app.import.import_line.null_channel.error",
     "translation": "La ligne de données importée dispose d'un type \"channel\", mais l'objet channel est null."
   },
   {
+    "id": "app.import.import_line.null_direct_channel.error",
+    "translation": "La ligne de données importée dispose d'un type \"channel\", mais l'objet channel est null."
+  },
+  {
+    "id": "app.import.import_line.null_direct_post.error",
+    "translation": "La ligne de données importée dispose d'un type \"post\", mais l'objet post est null."
+  },
+  {
     "id": "app.import.import_line.null_post.error",
     "translation": "La ligne de données importée dispose d'un type \"post\", mais l'objet post est null."
   },
@@ -3052,6 +3136,54 @@
     "translation": "La propriété de canal requise est manquante : type."
   },
   {
+    "id": "app.import.validate_direct_channel_import_data.header_length.error",
+    "translation": "Direct channel header is too long"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_required.error",
+    "translation": "La propriété de canal requise est manquante : name"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_few.error",
+    "translation": "Direct channel members list contains too few items"
+  },
+  {
+    "id": "app.import.validate_direct_channel_import_data.members_too_many.error",
+    "translation": "Direct channel members list contains too many items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
+    "translation": "La propriété de message requise est manquante : create_at."
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_few.error",
+    "translation": "Direct post channel members list contains too few items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.channel_members_too_many.error",
+    "translation": "Direct post channel members list contains too many items"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_missing.error",
+    "translation": "La propriété de message requise est manquante : create_at."
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.create_at_zero.error",
+    "translation": "CreateAt must be greater than 0"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_length.error",
+    "translation": "Message is too long"
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.message_missing.error",
+    "translation": "La propriété de message requise est manquante : Message."
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.user_missing.error",
+    "translation": "La propriété de message requise est manquante : User."
+  },
+  {
     "id": "app.import.validate_post_import_data.channel_missing.error",
     "translation": "La propriété de message requise est manquante : Channel."
   },
@@ -3372,6 +3504,14 @@
     "translation": "Impossible de définir les paramètres de l'index d'ElasticSearch"
   },
   {
+    "id": "ent.elasticsearch.test_config.indexing_disabled.error",
+    "translation": "Elasticsearch is disabled."
+  },
+  {
+    "id": "ent.elasticsearch.test_config.license.error",
+    "translation": "License does not support Elasticsearch."
+  },
+  {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "Les émoticônes personnalisées sont désactivées par la licence actuellement utilisée. Veuillez contacter votre administrateur système à propos d'une mise à niveau vers la licence entreprise."
   },
@@ -4172,6 +4312,10 @@
     "translation": "Temps d'attente pour la requête SQL invalide. Doit être un entier positif."
   },
   {
+    "id": "model.config.is_valid.teammate_name_display.app_error",
+    "translation": "Invalid teammate display.  Must be 'full_name', 'nickname_full_name' or 'username'"
+  },
+  {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "Le temps entre chaque utilisateur tapant une mise à jour ne doit pas être inférieur à 1000 millisecondes."
   },
@@ -5724,6 +5868,10 @@
     "translation": "Nous avons trouvé plusieurs utilisateurs correspondant à vos informations d'identification et nous avons été incapables de vous connecter. Veuillez contacter un administrateur."
   },
   {
+    "id": "store.sql_user.get_new_users.app_error",
+    "translation": "Nous avons rencontré une erreur durant la recherche des préférences"
+  },
+  {
     "id": "store.sql_user.get_profiles.app_error",
     "translation": "Nous avons rencontré une erreur lors de la recherche des profils utilisateurs"
   },