Merge remote-tracking branch 'upstream/release-5.2' into release-5.2-daily-merge-20180808

1 files changed, 8 insertions, 0 deletions

diff --git a/i18n/en.json b/i18n/en.json
index 3c2cee632..d3ffdebb5 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3111,6 +3111,10 @@
     "translation": "This API endpoint is not accessible as required migrations have not yet completed."
   },
   {
+    "id": "app.system_install_date.parse_int.app_error",
+    "translation": "Failed to parse installation date"
+  },
+  {
     "id": "app.team.join_user_to_team.max_accounts.app_error",
     "translation": "This team has reached the maximum number of allowed accounts. Contact your systems administrator to set a higher limit."
   },
@@ -5939,6 +5943,10 @@
     "translation": "We found multiple users matching your credentials and were unable to log you in. Please contact an administrator."
   },
   {
+    "id": "store.sql_user.get_system_install_date.app_error",
+    "translation": "Unable to infer the system date based on the first user creation date."
+  },
+  {
     "id": "store.sql_user.get_new_users.app_error",
     "translation": "We encountered an error while finding the new users"
   },