translations PR 20170703 (#6836)

* translations PR 20170703

* Fix bad merge

i18n/ru.json

@@ -429,7 +429,7 @@
   },
   {
     "id": "api.command.execute_command.not_found.app_error",
-    "translation": "Команда с триггером '{{.Trigger}}' не найдена"
+    "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",
@@ -459,6 +459,10 @@
     "id": "api.command.invite_people.hint",
     "translation": "[name@domain.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": "пригласить людей"
@@ -495,6 +499,38 @@
     "id": "api.command_away.success",
     "translation": "Сейчас ваше состояние \"Нет на месте\""
   },
+  {
+    "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": "Включить сворачивание миниатюр изображений"
@@ -551,6 +587,14 @@
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "Произошла ошибка при открытии превью"
   },
+  {
+    "id": "api.command_help.desc",
+    "translation": "Open the Mattermost help page"
+  },
+  {
+    "id": "api.command_help.name",
+    "translation": "Помощь"
+  },
   {
     "id": "api.command_join.desc",
     "translation": "Присоединиться к отрытому каналу"
@@ -1645,7 +1689,11 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " Uploaded one or more files "
+    "translation": " Uploaded one or more files in "
+  },
+  {
+    "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",
@@ -2003,14 +2051,6 @@
     "id": "api.system.go_routines",
     "translation": "The number of running goroutines is over the health threshold %v of %v"
   },
-  {
-    "id": "api.team.add_user_to_team.invalid_data.app_error",
-    "translation": "Неверные данные."
-  },
-  {
-    "id": "api.team.add_user_to_team.invalid_invite_id.app_error",
-    "translation": "Неверный идентификатор приглашения. Не найдено команд с таким идентификатором."
-  },
   {
     "id": "api.team.add_user_to_team.missing_parameter.app_error",
     "translation": "Для добавления пользователя в команду требуется указать параметр."
@@ -2083,6 +2123,10 @@
     "id": "api.team.invite_members.already.app_error",
     "translation": "Этот человек уже есть в вашей команде"
   },
+  {
+    "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": "участник"
@@ -2975,10 +3019,50 @@
     "id": "app.import.import_channel.team_not_found.error",
     "translation": "Ошибка импорта канала. Команда с именем \"{{.TeamName}}\" не найдена."
   },
+  {
+    "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": "Строка импорта данных содержит тип \"channel\", но объект channel равен null."
   },
+  {
+    "id": "app.import.import_line.null_direct_channel.error",
+    "translation": "Строка импорта данных содержит тип \"channel\", но объект channel равен null."
+  },
+  {
+    "id": "app.import.import_line.null_direct_post.error",
+    "translation": "Строка импорта данных содержит тип \"post\", но объект post равен null."
+  },
   {
     "id": "app.import.import_line.null_post.error",
     "translation": "Строка импорта данных содержит тип \"post\", но объект post равен null."
@@ -3051,6 +3135,54 @@
     "id": "app.import.validate_channel_import_data.type_missing.error",
     "translation": "Пропущено обязательное свойство channel: 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": "Пропущено обязательное свойство channel: 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": "Отсутствует необходимое поле для Post: 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": "Отсутствует необходимое поле для Post: 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": "Отсутствует необходимое поле для Post: Message."
+  },
+  {
+    "id": "app.import.validate_direct_post_import_data.user_missing.error",
+    "translation": "Отсутствует необходимое поле для Post: User."
+  },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
     "translation": "Отсутствует необходимое поле для Post: Channel."
@@ -3371,6 +3503,14 @@
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "Failed to set ElasticSearch index settings"
   },
+  {
+    "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": "Ограничения на дополнительные эмодзи недоступны при текущей лицензии. Пожалуйста, свяжитесь с системным администратором по поводу улучшения вашей корпоративной лицензии."
@@ -4171,6 +4311,10 @@
     "id": "model.config.is_valid.sql_query_timeout.app_error",
     "translation": "Неверная высота профиля в настройках файлов. Число должно быть положительным."
   },
+  {
+    "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": "Обновления статуса набора текста пользователем не могут быть чаще, чем раз в 1000 миллисекунд."
@@ -5723,6 +5867,10 @@
     "id": "store.sql_user.get_for_login.multiple_users",
     "translation": "Обнаружен ряд пользователей с соответствующими учетными данными, вход невозможен. Пожалуйста, свяжитесь с администратором."
   },
+  {
+    "id": "store.sql_user.get_new_users.app_error",
+    "translation": "Возникла ошибка при поиске настроек"
+  },
   {
     "id": "store.sql_user.get_profiles.app_error",
     "translation": "Возникла ошибка при поиске пользовательских профилей"