Merge branch 'advanced-permissions-phase-1'

1 files changed, 32 insertions, 0 deletions

diff --git a/i18n/en.json b/i18n/en.json
index 8f0e61588..cf3e88b5a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -48,6 +48,10 @@
     "translation": "September"
   },
   {
+    "id": "api.roles.patch_roles.license.error",
+    "translation": "Your current license does not support advanced permissions."
+  },
+  {
     "id": "api.admin.add_certificate.no_file.app_error",
     "translation": "No file under 'certificate' in request."
   },
@@ -2427,10 +2431,18 @@
     "translation": "Your email address for {{.TeamDisplayName}} has been changed to {{.NewEmail}}.<br>If you did not make this change, please contact the system administrator."
   },
   {
+    "id": "app.role.check_roles_exist.role_not_found",
+    "translation": "The provided role does not exist"
+  },
+  {
     "id": "api.templates.email_change_body.title",
     "translation": "You updated your email"
   },
   {
+    "id": "store.sql_role.save.invalid_role.app_error",
+    "translation": "The role was not valid"
+  },
+  {
     "id": "api.templates.email_change_subject",
     "translation": "[{{ .SiteName }}] Your email address has changed"
   },
@@ -6599,6 +6611,26 @@
     "translation": "Unable to save reaction"
   },
   {
+    "id": "store.sql_role.save.insert.app_error",
+    "translation": "Unable to save new role"
+  },
+  {
+    "id": "store.sql_role.save.update.app_error",
+    "translation": "Unable to update role"
+  },
+  {
+    "id": "store.sql_role.get.app_error",
+    "translation": "Unable to get role"
+  },
+  {
+    "id": "store.sql_role.get_by_name.app_error",
+    "translation": "Unable to get role"
+  },
+  {
+    "id": "store.sql_role.get_by_names.app_error",
+    "translation": "Unable to get roles"
+  },
+  {
     "id": "store.sql_session.analytics_session_count.app_error",
     "translation": "We couldn't count the sessions"
   },