translations PR 20180522 (#8837)

* translations PR 20180522

* Fix italian translation

1 files changed, 20 insertions, 20 deletions

diff --git a/i18n/en.json b/i18n/en.json
index 9f008a64b..d802eb76b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3783,14 +3783,6 @@
     "translation": "You have a new Direct Message from @{{.SenderName}}"
   },
   {
-    "id": "app.notification.body.intro.notification.full",
-    "translation": "You have a new notification."
-  },
-  {
-    "id": "app.notification.body.intro.notification.generic",
-    "translation": "You have a new notification from @{{.SenderName}}"
-  },
-  {
     "id": "app.notification.body.intro.group_message.full",
     "translation": "You have a new Group Message."
   },
@@ -3799,6 +3791,14 @@
     "translation": "You have a new Group Message from @{{.SenderName}}"
   },
   {
+    "id": "app.notification.body.intro.notification.full",
+    "translation": "You have a new notification."
+  },
+  {
+    "id": "app.notification.body.intro.notification.generic",
+    "translation": "You have a new notification from @{{.SenderName}}"
+  },
+  {
     "id": "app.notification.body.text.direct.full",
     "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
@@ -3807,19 +3807,19 @@
     "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
-    "id": "app.notification.body.text.notification.full",
+    "id": "app.notification.body.text.group_message.full",
     "translation": "Channel: {{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
-    "id": "app.notification.body.text.notification.generic",
+    "id": "app.notification.body.text.group_message.generic",
     "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
-    "id": "app.notification.body.text.group_message.full",
+    "id": "app.notification.body.text.notification.full",
     "translation": "Channel: {{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
-    "id": "app.notification.body.text.group_message.generic",
+    "id": "app.notification.body.text.notification.generic",
     "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
@@ -3827,10 +3827,6 @@
     "translation": "[{{.SiteName}}] New Direct Message from @{{.SenderDisplayName}} on {{.Month}} {{.Day}}, {{.Year}}"
   },
   {
-    "id": "app.notification.subject.notification.full",
-    "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}"
-  },
-  {
     "id": "app.notification.subject.group_message.full",
     "translation": "[{{ .SiteName }}] New Group Message in {{ .ChannelName}} on {{.Month}} {{.Day}}, {{.Year}}"
   },
@@ -3839,6 +3835,10 @@
     "translation": "[{{ .SiteName }}] New Group Message on {{.Month}} {{.Day}}, {{.Year}}"
   },
   {
+    "id": "app.notification.subject.notification.full",
+    "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}"
+  },
+  {
     "id": "app.plugin.activate.app_error",
     "translation": "Unable to activate extracted plugin."
   },
@@ -5063,14 +5063,14 @@
     "translation": "AD/LDAP field \"ID Attribute\" is required."
   },
   {
-    "id": "model.config.is_valid.ldap_login_id",
-    "translation": "AD/LDAP field \"Login ID Attribute\" is required."
-  },
-  {
     "id": "model.config.is_valid.ldap_lastname",
     "translation": "AD/LDAP field \"Last Name Attribute\" is required."
   },
   {
+    "id": "model.config.is_valid.ldap_login_id",
+    "translation": "AD/LDAP field \"Login ID Attribute\" is required."
+  },
+  {
     "id": "model.config.is_valid.ldap_max_page_size.app_error",
     "translation": "Invalid max page size value."
   },