From 47f3c064db885c2cb2e75c195ea24e2ef687891d Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Thu, 24 May 2018 08:25:52 -0400
Subject: translations PR 20180522 (#8837)

* translations PR 20180522

* Fix italian translation
---
 i18n/en.json | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'i18n/en.json')

diff --git a/i18n/en.json b/i18n/en.json
index 9f008a64b..d802eb76b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3782,14 +3782,6 @@
     "id": "app.notification.body.intro.direct.generic",
     "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."
@@ -3798,6 +3790,14 @@
     "id": "app.notification.body.intro.group_message.generic",
     "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,29 +3807,25 @@
     "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}}"
   },
   {
     "id": "app.notification.subject.direct.full",
     "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}}"
@@ -3838,6 +3834,10 @@
     "id": "app.notification.subject.group_message.generic",
     "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."
@@ -5062,14 +5062,14 @@
     "id": "model.config.is_valid.ldap_id",
     "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."
-- 
cgit v1.2.3-1-g7c22