Merge remote-tracking branch 'upstream/release-5.1' into release-5.1-daily-merge-20180712

1 files changed, 24 insertions, 0 deletions

diff --git a/i18n/nl.json b/i18n/nl.json
index 4ce0e742d..2b751e794 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -192,6 +192,10 @@
     "translation": "%v heeft het kanaal verlaten."
   },
   {
+    "id": "api.channel.patch_update_channel.forbidden.app_error",
+    "translation": "Failed to update the channel"
+  },
+  {
     "id": "api.channel.post_channel_privacy_message.error",
     "translation": "Failed to post channel privacy update message."
   },
@@ -308,6 +312,10 @@
     "translation": "Stuur een email uitnodiging naar jouw Mattermost team"
   },
   {
+    "id": "api.command.invite_people.email_invitations_off",
+    "translation": "Email invitations are disabled, no invite(s) sent"
+  },
+  {
     "id": "api.command.invite_people.email_off",
     "translation": "Email is niet geconfigureerd, geen uitnodiging(en) verstuurd"
   },
@@ -575,6 +583,10 @@
     "translation": "bericht"
   },
   {
+    "id": "api.command_groupmsg.permission.app_error",
+    "translation": "You don't have the appropriate permissions to create a new group message."
+  },
+  {
     "id": "api.command_help.desc",
     "translation": "Open the Mattermost help page"
   },
@@ -635,6 +647,10 @@
     "translation": "{{.User}} is already in the channel."
   },
   {
+    "id": "api.command_invite_people.permission.app_error",
+    "translation": "You don't have permission to invite new users to this server."
+  },
+  {
     "id": "api.command_join.desc",
     "translation": "Neem deel aan het open kanaal"
   },
@@ -727,6 +743,10 @@
     "translation": "bericht"
   },
   {
+    "id": "api.command_msg.permission.app_error",
+    "translation": "You don't have the appropriate permissions to direct message this user."
+  },
+  {
     "id": "api.command_mute.desc",
     "translation": "Turns off desktop, email and push notifications for the current channel or the [channel] specified."
   },
@@ -1599,6 +1619,10 @@
     "translation": "Malformed request: filesize field is not present."
   },
   {
+    "id": "api.team.invite_members.disabled.app_error",
+    "translation": "Email invitations are disabled."
+  },
+  {
     "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."
   },