merging files

1 files changed, 9 insertions, 5 deletions

diff --git a/i18n/en.json b/i18n/en.json
index fb4cf50b4..a37773460 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1016,6 +1016,10 @@
     "translation": "Only a team admin can export data."
   },
   {
+    "id": "api.team.get_invite_info.not_open_team",
+    "translation": "Invite is invalid because this is not an open team."
+  },
+  {
     "id": "api.team.import_team.admin.app_error",
     "translation": "Only a team admin can import data."
   },
@@ -3128,7 +3132,11 @@
     "translation": "We encountered an error finding the account"
   },
   {
-    "id": "store.sql_user.get_by_auth.app_error",
+    "id": "store.sql_user.get_by_auth.other.app_error",
+    "translation": "We encountered an error trying to find the account by authentication type."
+  },
+  {
+    "id": "store.sql_user.get_by_auth.missing_account.app_error",
     "translation": "We couldn't find an existing account matching your authentication type for this team. This team may require an invite from the team owner to join."
   },
   {
@@ -3646,9 +3654,5 @@
   {
     "id": "web.watcher_fail.error",
     "translation": "Failed to add directory to watcher %v"
-  },
-  {
-    "id": "api.team.get_invite_info.not_open_team",
-    "translation": "Invite is invalid because this is not an open team."
   }
 ]