From 07c3f74862786d6079aa65ae6bfe493e5ada1823 Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Fri, 22 Jul 2016 13:05:26 -0400
Subject: daily + include nederlands (#3659)

---
 i18n/en.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'i18n/en.json')

diff --git a/i18n/en.json b/i18n/en.json
index d91fea61c..ca59d541a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -79,10 +79,6 @@
     "id": "api.admin.init.debug",
     "translation": "Initializing admin api routes"
   },
-  {
-    "id": "api.status.init.debug",
-    "translation": "Initializing status api routes"
-  },
   {
     "id": "api.admin.recycle_db_end.warn",
     "translation": "Finished recycling the database connection"
@@ -927,10 +923,6 @@
     "id": "api.post.check_for_out_of_channel_mentions.message.one",
     "translation": "{{.Username}} was mentioned, but they did not receive a notification because they do not belong to this channel."
   },
-  {
-    "id": "api.post.notification.here.warn",
-    "translation": "Unable to send notification to online users with @here, err=%v"
-  },
   {
     "id": "api.post.create_post.bad_filename.error",
     "translation": "Bad filename discarded, filename=%v"
@@ -1019,6 +1011,10 @@
     "id": "api.post.make_direct_channel_visible.update_pref.error",
     "translation": "Failed to update direct channel preference user_id=%v other_user_id=%v err=%v"
   },
+  {
+    "id": "api.post.notification.here.warn",
+    "translation": "Unable to send notification to online users with @here, err=%v"
+  },
   {
     "id": "api.post.send_notifications_and_forget.comment_thread.error",
     "translation": "Failed to retrieve comment thread posts in notifications root_post_id=%v, err=%v"
@@ -1251,6 +1247,10 @@
     "id": "api.slackimport.slack_import.zip.app_error",
     "translation": "Unable to open zip file"
   },
+  {
+    "id": "api.status.init.debug",
+    "translation": "Initializing status api routes"
+  },
   {
     "id": "api.status.last_activity.error",
     "translation": "Failed to update LastActivityAt for user_id=%v and session_id=%v, err=%v"
@@ -3907,14 +3907,14 @@
     "id": "store.sql_status.get.missing.app_error",
     "translation": "No entry for that status exists"
   },
-  {
-    "id": "store.sql_status.get_online_away.app_error",
-    "translation": "Encountered an error retrieving all the online/away statuses"
-  },
   {
     "id": "store.sql_status.get_online.app_error",
     "translation": "Encountered an error retrieving all the online statuses"
   },
+  {
+    "id": "store.sql_status.get_online_away.app_error",
+    "translation": "Encountered an error retrieving all the online/away statuses"
+  },
   {
     "id": "store.sql_status.get_total_active_users_count.app_error",
     "translation": "We could not count the active users"
-- 
cgit v1.2.3-1-g7c22