diff --git a/go.mod b/go.mod
index 1b6b13bef..3aaa0790e 100644
--- a/go.mod
+++ b/go.mod
@@ -18,7 +18,7 @@ require (
 	github.com/SentimensRG/ctx v0.0.0-20180729130232-0bfd988c655d
 	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
 	github.com/brianvoe/gofakeit/v6 v6.5.0
-	github.com/cortezaproject/corteza-locale v0.0.0-20210902094343-6e40ca3a7d14
+	github.com/cortezaproject/corteza-locale v0.0.0-20210923111547-fb8aa18cc3b7
 	github.com/crewjam/saml v0.4.5
 	github.com/crusttech/go-oidc v0.0.0-20180918092017-982855dad3e1
 	github.com/davecgh/go-spew v1.1.1
diff --git a/go.sum b/go.sum
index 83d25b620..1801c241e 100644
--- a/go.sum
+++ b/go.sum
@@ -90,6 +90,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cortezaproject/corteza-locale v0.0.0-20210902094343-6e40ca3a7d14 h1:QMaq2KCK3t0PDwJ6i9tBfxihbUhUMB6/4UatwEAhKhg=
 github.com/cortezaproject/corteza-locale v0.0.0-20210902094343-6e40ca3a7d14/go.mod h1:wsI1UftEdBqTuEDKBZmx2LfNu/kZun5pRbCAi420JCg=
+github.com/cortezaproject/corteza-locale v0.0.0-20210923111547-fb8aa18cc3b7 h1:tlx1ruaAgwzWzK8lPDglH2iMGW+sYJXlTP12hkCoYz0=
+github.com/cortezaproject/corteza-locale v0.0.0-20210923111547-fb8aa18cc3b7/go.mod h1:wsI1UftEdBqTuEDKBZmx2LfNu/kZun5pRbCAi420JCg=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/crewjam/httperr v0.0.0-20190612203328-a946449404da h1:WXnT88cFG2davqSFqvaFfzkSMC0lqh/8/rKZ+z7tYvI=
 github.com/crewjam/httperr v0.0.0-20190612203328-a946449404da/go.mod h1:+rmNIXRvYMqLQeR4DHyTvs6y0MEMymTz4vyFpFkKTPs=
diff --git a/vendor/github.com/cortezaproject/corteza-locale/DEV.md b/vendor/github.com/cortezaproject/corteza-locale/DEV.md
index dea2f9384..cff9c2177 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/DEV.md
+++ b/vendor/github.com/cortezaproject/corteza-locale/DEV.md
@@ -1,17 +1,38 @@
-# Guide for frontend and backend developers
+# Developer's guide to corteza-locale 
+
+## Notes translation files
+
+Please note that not old translations follow these rules.
+All new features and larger changes should strictly follow them
+
+### Translation namespaces
+ - In general, keep **each component** in its **own namespace**; with some exceptions
+    - Pass translated strings with params into smaller, reusable components
+    - Use namespace of the larger component when it is split into smaller, private components
+ - Corteza-vue as collection of reusable components must
+    - accept translated strings as arguments when there are few translations, or
+    - use a shared namespace name (like in case of `permissions.yaml`)
+
+### Translation keys
+ - keep keys in a structured format, especially when providing translations for larger component split into smaller parts and take advantage of key prefixes
+ - must be in **kebab-case**; using dash as a delimiter
+ - must be **descriptive**; 
+   for example: if translations break or key is not translated the meaning should be clear 
+
+## Setting up Corteza
 
 This guide is for corteza frontend and backend developers.
 It shows how to connect translations from corteza-locale repository to frontend web applications and backend server.
 
-## Prerequisites
+### Prerequisites
 
 Clone corteza-locale repository to a separate folder.
 
-## Fronted developers
+### Fronted developers
 
-### Using corteza-server Docker container to support webapp development
+#### Using corteza-server Docker container to support webapp development
 
-#### Configuration with Docker Compose 
+##### Configuration with Docker Compose 
 
 See the `docker-compose.yaml` in the root of the repository.
 
@@ -25,7 +46,7 @@ docker-compose up -d
 window.CortezaAPI = `//localhost:1818/api`
 ```
 
-#### Verify the loaded languages
+##### Verify the loaded languages
 
 ```shell
 docker-compose logs | grep locale | head
@@ -34,19 +55,16 @@ docker-compose logs | grep locale | head
 This will show you first couple (head) filtered (grep) log lines.
 If some of them contain "language loaded" that reflect the setup in your `corteza-locale/src` you have successfully loaded translations into Corteza server.  
 
-#### Verify by loading translations
+##### Verify by loading translations
 ```shell
 curl 'http://localhost:1818/api/system/locale/en/corteza-webapp-admin' -H "Accept: application/json" -H 'Accept-Language: en'
 ```
 
-
-
-
-## Backend developers
+### Backend developers
 
 Corteza server loads, parses and serves all languages files for all frontend web applications and server. 
 
-### Changes in configuration
+#### Changes in configuration
 
 The following chapter assumes your Corteza server development env is already set-up
 
@@ -60,7 +78,7 @@ Path can be absolute or relative and should contain subdirectories with language
 You can remove or comment-out LOCALE_LOG if you find the setting to verbose.  
 
 
-#### Verify the loaded languages
+##### Verify the loaded languages
 
 When you (re)start your corteza server yu should see the following log among the first logged lines:
 
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/config.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/config.yaml
index 785a363ce..33dcc698a 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/config.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/config.yaml
@@ -1,14 +1 @@
 name: English
-
-#extends: base
-
-
-# Language defaults, can be overwritten in the configuration
-#formats:
-#  datetime:
-#  full:  'YYYY-MM-DD hh:mm:ss'
-#  short: 'YYYY-MM-DD'
-#  time:  'hh:mm'
-#
-#  currency: '$'
-
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/change-password.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/change-password.yaml
index 0990bb393..18575621f 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/change-password.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/change-password.yaml
@@ -2,18 +2,15 @@ template:
   title: Change your password
   form:
     email:
-      label: E-mail *
+      label: E-mail
       placeholder: email@domain.ltd
-      aria-label: Email
     old-password:
-      label: Old password *
+      label: Old password
       placeholder: Enter your old password
-      aria-label: Old password
     new-password:
-      label: New password *
+      label: New password
       placeholder: Enter your new password
-      aria-label: New password
     button:
       change-password: Change your password
 alerts:
-  passw-changed: Password successfully changed.
+  password-change-success: Password successfully changed.
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/create-password.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/create-password.yaml
new file mode 100644
index 000000000..f255a35ba
--- /dev/null
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/create-password.yaml
@@ -0,0 +1,14 @@
+template:
+  title: Create your password
+  form:
+    email:
+      label: E-mail
+    password:
+      label: Password
+      placeholder: Enter your password
+    button:
+      create-password: Create your password
+alerts:
+  invalid-expired-password-token: Invalid or expired password create token, please repeat password create request.
+  password-create-success: Password successfully created.
+  password-create-disabled: Password create disabled.
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/password-reset-requested.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/password-reset-requested.yaml
index dac8461e9..1b490ab93 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/password-reset-requested.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/password-reset-requested.yaml
@@ -3,6 +3,6 @@ template:
   instructions: If the email you entered is found in our database, you'll receive a password reset link to your inbox in a few moments.
   links: <a href="{{signup}}">Create new account</a> or <a href="{{login}}">log in</a>.
 alert:
-  inv-exp-passw-token: Invalid or expired password reset token, please repeat password reset request.
-  pass-reset-success: Password successfully reset.
-  pass-reset-disabled: Password reset disabled.
+  invalid-expired-password-token: Invalid or expired password reset token, please repeat password reset request.
+  password-reset-success: Password successfully reset.
+  password-reset-disabled: Password reset disabled.
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/profile.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/profile.yaml
index 5bd8e30e7..0ad43ab89 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/profile.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/profile.yaml
@@ -11,6 +11,8 @@ template:
     handle:
       label: Handle
       placeholder: Short name, nickname or handle
+    preferred-language:
+      label: Preferred language
     buttons:
       submit: Update profile
 alerts:
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/signup.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/signup.yaml
index a3b9db5c5..df32967f7 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/signup.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/signup.yaml
@@ -2,10 +2,10 @@ template:
   title: Sign up
   form:
     email:
-      label: E-mail *
+      label: E-mail
       placeholder: email@domain.ltd
     password:
-      label: Password *
+      label: Password
       placeholder: Password
     name:
       label: Full name
@@ -20,5 +20,5 @@ template:
 alerts:
   signup-successful: Sign-up successful.
   email-confirmed-logged-in: Email address confirmed, you're now logged-in.
-  inv-or-exp-token: Invalid or expired email confirmation token, please resend confirmation request.
+  invalid-expired-token: Invalid or expired email confirmation token, please resend confirmation request.
   signup-disabled: Signup disabled
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/compose/namespace.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/compose/namespace.yaml
index 8e5f17003..452e4b2c9 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/compose/namespace.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/compose/namespace.yaml
@@ -10,3 +10,6 @@ errors:
   notAllowedToUpdate: not allowed to update this namespace
   notFound: namespace does not exist
   staleData: stale data
+  unsupportedExportFormat: unsupported export format
+  unsupportedImportFormat: unsupported import format
+  cloneMultiple: not allowed to clone multiple namespaces at once
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/admin.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/admin.yaml
index e14b76ff0..0b80191e9 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/admin.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/admin.yaml
@@ -102,170 +102,3 @@ navigation:
     loggedInAs: Logged in as {{user}}
     logout: Logout
     profile: Profile
-permission:
-  automationWorkflow:
-    all: all workflows
-    operations:
-      delete:
-        description: 'Default: deny'
-        specific: Delete this workflow
-        title: Delete any workflow
-      execute:
-        description: 'Default: deny'
-        specific: Execute this workflow
-        title: Execute any workflow
-      read:
-        description: 'Default: deny'
-        specific: Read this workflow
-        title: Read any workflow
-      sessionsManage:
-        description: 'Default: deny'
-        specific: Manage sessions for this workflow
-        title: Manage all sessions
-      triggersManage:
-        description: 'Default: deny'
-        specific: Manage triggers for this workflow
-        title: Manage all triggers
-      undelete:
-        description: 'Default: deny'
-        specific: Undelete this workflow
-        title: Undelete any workflow
-      update:
-        description: 'Default: deny'
-        specific: Update this workflow
-        title: Update any workflow
-    specific: workflow "{{target}}"
-  base:
-    compose: Compose
-    system: System
-  resetBack: Reset back to "{{current}}"
-  saveChanges: Save changes
-  setFor: Set permissions for {{target}}
-  systemApplication:
-    all: all applications
-    operations:
-      delete:
-        description: 'Default: deny'
-        specific: Delete {{target}}
-        title: Delete any application
-      read:
-        description: 'Default: deny'
-        specific: Read {{target}}
-        title: Read any application
-      update:
-        description: 'Default: deny'
-        specific: Update {{target}}
-        title: Update any application
-    specific: application "{{target}}"
-  systemApigwRoute:
-    all: all routes
-    operations:
-      delete:
-        description: 'Default: deny'
-        specific: Delete {{target}}
-        title: Delete any route
-      read:
-        description: 'Default: deny'
-        specific: Read {{target}}
-        title: Read any route
-      update:
-        description: 'Default: deny'
-        specific: Update {{target}}
-        title: Update any route
-    specific: route "{{target}}"
-  systemAuthClient:
-    all: all auth clients
-    operations:
-      authorize:
-        description: 'User can authorize (use) this client. Default: deny'
-        specific: Authorize client "{{target}}
-        title: Authorize any client
-      delete:
-        description: 'Default: deny'
-        specific: Delete client "{{target}}
-        title: Delete any client
-      read:
-        description: 'Default: deny'
-        specific: Read client "{{target}}
-        title: Read any client
-      update:
-        description: 'Default: deny'
-        specific: Update client "{{target}}
-        title: Update any client
-    specific: auth client "{{target}}"
-  systemRole:
-    all: all roles
-    operations:
-      delete:
-        description: 'Default: deny'
-        specific: Delete {{target}}
-        title: Delete any role
-      membersManage:
-        description: 'Default: deny'
-        specific: Manage members for {{target}}
-        title: Manage members for any role
-      read:
-        description: 'Default: deny'
-        specific: Read {{target}}
-        title: Read any role
-      update:
-        description: 'Default: deny'
-        specific: Update {{target}}
-        title: Update any role
-    specific: role "{{target}}"
-  systemTemplate:
-    all: all templates
-    operations:
-      delete:
-        description: 'Default: deny'
-        specific: Delete {{target}}
-        title: Delete any template
-      read:
-        description: 'Default: deny'
-        specific: Read {{target}}
-        title: Read any template
-      render:
-        description: 'Default: deny'
-        specific: Render {{target}}
-        title: Render any template
-      update:
-        description: 'Default: deny'
-        specific: Update {{target}}
-        title: Update any template
-    specific: template "{{target}}"
-  systemUser:
-    all: all users
-    operations:
-      delete:
-        description: 'Default: deny'
-        specific: Delete {{target}}
-        title: Delete any user
-      emailUnmask:
-        description: 'Default: deny'
-        specific: Show email details for {{target}}
-        title: Show email details for any user
-      impersonate:
-        description: 'Default: deny'
-        specific: Impersonate this user {{target}}
-        title: Impersonate any user
-      nameUnmask:
-        description: 'Default: deny'
-        specific: Show name details for {{target}}
-        title: Show name details for any user
-      read:
-        description: 'Default: deny'
-        specific: Read {{target}}
-        title: Read any user
-      suspend:
-        description: 'Default: deny'
-        specific: Suspend {{target}}
-        title: Suspend any user
-      unsuspend:
-        description: 'Default: deny'
-        specific: Unsuspend {{target}}
-        title: Unsuspend any user
-      update:
-        description: 'Default: deny'
-        specific: Update {{target}}
-        title: Update any user
-    specific: user "{{target}}"
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.permissions.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.permissions.yaml
deleted file mode 100644
index 3786519c8..000000000
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.permissions.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-list:
-  rules:
-    add: Add role
-    addRole: Add new role
-    component:
-      operations:
-        grant: Grant permissions on automation
-        sessionsSearch: Search sessions
-        triggersSearch: Search triggers
-        workflowCreate: Create new workflow
-        workflowsSearch: Search workflows
-      type:
-        label: Automation
-    loading: Loading permissions
-    noRole: No role selected
-    notAllowed: Not allowed to set permissions
-    submit: Submit
-    tip1: Click on permission/role cell to allow a specific operation
-    tip2: Use Alt-Click to set explicit deny on operation
-    title: List of rules
-    workflow:
-      operations:
-        delete: Delete workflow
-        execute: Execute workflow
-        read: Read workflow
-        sessionsManage: Manage workflow sessions
-        triggersManage: Manage workflow triggers
-        undelete: Undelete workflow
-        update: Update workflow
-      type:
-        label: Workflow
-  title: Automation permissions
-navItem:
-  label: Permissions
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.scripts.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.scripts.yaml
index 94291e40f..abd65eed3 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.scripts.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.scripts.yaml
@@ -14,5 +14,3 @@ list:
     triggers: Triggers
   labelMissing: <label missing>
   title: Corredor Scripts
-navItem:
-  label: Corredor Scripts
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.sessions.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.sessions.yaml
index 1a6d5e4e9..489045194 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.sessions.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.sessions.yaml
@@ -49,5 +49,3 @@ list:
   numFound: '{{count}} session found'
   numFound_plural: '{{count}} sessions found'
   title: Sessions
-navItem:
-  label: Sessions
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.workflows.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.workflows.yaml
index 7a9d83609..22ca05529 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.workflows.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.workflows.yaml
@@ -48,5 +48,3 @@ list:
   permissions: Permissions
   title: Workflows
   yaml: YAML
-navItem:
-  label: Workflows
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.yaml
deleted file mode 100644
index 3cc5147bf..000000000
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-navGroup:
-  label: Automation
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/compose.automation.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/compose.automation.yaml
index ab468660d..df84c365e 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/compose.automation.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/compose.automation.yaml
@@ -4,5 +4,3 @@ list:
     label: Label
     name: Name
   title: Compose Automation
-navItem:
-  label: Automation
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/compose.permissions.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/compose.permissions.yaml
deleted file mode 100644
index bcef76366..000000000
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/compose.permissions.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-list:
-  rules:
-    add: Add role
-    addRole: Add new role
-    chart:
-      operations:
-        delete: Delete any chart
-        read: Read any chart
-        update: Update any chart
-      type:
-        label: Charts
-    component:
-      operations:
-        grant: Grant permissions on compose service
-        namespaceCreate: Create namespaces
-        namespacesSearch: List and search namespaces
-        settingsManage: Manage all settings
-        settingsRead: Access all settings
-      type:
-        label: Compose service
-    loading: Loading permissions
-    module:
-      operations:
-        delete: Delete any module
-        read: Read any module
-        recordCreate: Create record under any module
-        recordsSearch: List and search records under any module
-        update: Update any module
-      type:
-        label: Modules
-    moduleField:
-      operations:
-        recordValueRead: Read any module field
-        recordValueUpdate: Update any module field
-      type:
-        label: Module fields
-    namespace:
-      operations:
-        chartCreate: Create charts under any namespace
-        chartsSearch: List and search charts under any namespace
-        delete: Delete any namespace
-        manage: Manage any namespace
-        moduleCreate: Create modules under any namespace
-        modulesSearch: List and search modules under any namespace
-        pageCreate: Create pages under any namespace
-        pagesSearch: List and search pages under any namespace
-        read: Access any namespace
-        update: Update any namespace
-      type:
-        label: Namespaces
-    noRole: No role selected
-    notAllowed: Not allowed to set permissions
-    page:
-      operations:
-        delete: Delete any page
-        read: Read any page
-        update: Update any page
-      type:
-        label: Pages
-    record:
-      operations:
-        delete: Delete any record
-        read: Read any record
-        update: Update any record
-      type:
-        label: Records
-    submit: Submit
-    tip1: Click on permission/role cell to allow a specific operation
-    tip2: Use Alt-Click to set explicit deny on operation
-    title: List of rules
-  title: Compose permissions
-navItem:
-  label: Permissions
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/compose.settings.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/compose.settings.yaml
index a924021d9..d66887b3c 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/compose.settings.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/compose.settings.yaml
@@ -9,5 +9,3 @@ editor:
         whitelist: File type whitelist
     title: Basic
   title: Compose settings
-navItem:
-  label: Settings
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/compose.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/compose.yaml
deleted file mode 100644
index bfaedb872..000000000
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/compose.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-navGroup:
-  label: Compose
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/dashboard.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/dashboard.yaml
index 790cccc32..60df40ae1 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/dashboard.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/dashboard.yaml
@@ -3,8 +3,6 @@ applications:
   deleted: Deleted
   title: Active application(s)
   total: Total
-navItem:
-  label: Dashboard
 roles:
   archived: Archived
   deleted: Deleted
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/federation.nodes.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/federation.nodes.yaml
index 7a40d0538..cc8e8b788 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/federation.nodes.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/federation.nodes.yaml
@@ -62,5 +62,3 @@ list:
         description: Pairing successful, pending final confirmation by administrator
   title: Federated Networks
   yaml: YAML
-navItem:
-  label: Nodes
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/federation.permissions.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/federation.permissions.yaml
deleted file mode 100644
index c20885318..000000000
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/federation.permissions.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-list:
-  rules:
-    add: Add role
-    addRole: Add new role
-    component:
-      operations:
-        grant: Grant permissions on federation service
-        nodeCreate: Create nodes
-        nodesSearch: List or create nodes
-        pair: Pair nodes
-        settingsManage: Manage all settings
-        settingsRead: Access all settings
-      type:
-        label: Federation service
-    exposedModule:
-      operations:
-        manage: Manage any module
-      type:
-        label: Modules
-    loading: Loading permissions
-    noRole: No role selected
-    node:
-      operations:
-        delete: Delete any node
-        manage: Manage any node
-        moduleCreate: Create modules
-        pair: Pair nodes
-        read: Access any node
-        update: Update any node
-      type:
-        label: Nodes
-    notAllowed: Not allowed to set permissions
-    sharedModule:
-      operations:
-        map: Map any module
-      type:
-        label: Modules
-    submit: Submit
-    tip1: Click on permission/role cell to allow a specific operation
-    tip2: Use Alt-Click to set explicit deny on operation
-    title: List of rules
-  title: Federation permissions
-navItem:
-  label: Permissions
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/federation.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/federation.yaml
deleted file mode 100644
index 8b44af1fa..000000000
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/federation.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-navGroup:
-  label: Federation
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/navigation.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/navigation.yaml
new file mode 100644
index 000000000..0f49a8ffd
--- /dev/null
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/navigation.yaml
@@ -0,0 +1,43 @@
+dashboard: Dashboard
+
+system:
+  group: System
+  items:
+    users: Users
+    actionlog: Action log
+    apigw: Horizon (API Gateway)
+    applications: Applications
+    authclients: Auth Clients
+    permissions: Permissions
+    queues: Messaging Queues
+    roles: Roles
+    settings: Settings
+    stats: Stats
+    templates: Templates
+
+compose:
+  group: Compose
+  items:
+    automation: Automation
+    permissions: Permissions
+    settings: Settings
+
+automation:
+  group: Automation
+  items:
+    permissions: Permissions
+    scripts: Corredor Scripts
+    sessions: Sessions
+    workflows: Workflows
+
+federation:
+  group: Federation
+  items:
+    nodes: Nodes
+    permissions: Permissions
+
+ui:
+  group: User interface
+  items:
+    settings: Settings
+
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/permissions.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/permissions.yaml
new file mode 100644
index 000000000..0619a274e
--- /dev/null
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/permissions.yaml
@@ -0,0 +1,458 @@
+# Admin "permissions" translation namespace
+# Holds mix of translations for two ui component types:
+#  - inline permission table (admin interface only)
+#  - modal permission table (common perm. interface)
+ui:
+  reset-back: Reset back to "{{current}}"
+  save-changes: Save changes
+  set-for: Set permissions for {{target}}
+
+  access:
+    allow: Allow
+    inherit: Inherit
+    deny: Deny
+
+  #############################################################################
+  # Inline permission table UI:
+  click-on-cell-to-allow: Click on permission/role cell to allow a specific operation
+  alt-click-to-deny: Use Alt-Click to set explicit deny on operation
+
+  not-allowed: Not allowed to set permissions
+  loading: Loading permissions
+
+  role:
+    add-new: Add new role
+    add: Add role
+    no-role-selected: No role selected
+
+  title:
+    automation: Automation permissions
+    system: System permissions
+    compose: Compose permissions
+    federation: Federation permissions
+
+resources:
+  automation:
+    component:
+      label: Automation component
+      operations:
+        grant:
+          title: Grant permissions on automation
+        sessions.search:
+          title: Search sessions
+        triggers.search:
+          title: Search triggers
+        workflow.create:
+          title: Create new workflow
+        workflows.search:
+          title: Search workflows
+        resource-translations.manage:
+          title: Manage resource translations
+
+    workflow:
+      label: Workflows
+      all: all workflows
+      specific: workflow "{{target}}"
+      operations:
+        delete:
+          description: 'Default: deny'
+          specific: Delete this workflow
+          title: Delete any workflow
+        execute:
+          description: 'Default: deny'
+          specific: Execute this workflow
+          title: Execute any workflow
+        read:
+          description: 'Default: deny'
+          specific: Read this workflow
+          title: Read any workflow
+        sessions.manage:
+          description: 'Default: deny'
+          specific: Manage sessions for this workflow
+          title: Manage all sessions
+        triggers.manage:
+          description: 'Default: deny'
+          specific: Manage triggers for this workflow
+          title: Manage all triggers
+        undelete:
+          description: 'Default: deny'
+          specific: Undelete this workflow
+          title: Undelete any workflow
+        update:
+          description: 'Default: deny'
+          specific: Update this workflow
+          title: Update any workflow
+
+  system:
+    component:
+      label: System component
+      operations:
+        action-log.read:
+          title: Access action log
+        application.create:
+          title: Create new application
+        application.flag.global:
+          title: Can pin application for everyone
+        application.flag.self:
+          title: Can pin application for themselves
+        applications.search:
+          title: List and search applications
+        auth-client.create:
+          title: Create new auth client
+        auth-clients.search:
+          title: List and search auth clients
+        apigw-route.create:
+          title: Create new route
+        apigw-routes.search:
+          title: List and search routes
+        apigw-filter.create:
+          title: Create new filter
+        apigw-filters.search:
+          title: List and search filters
+        grant:
+          title: Grant permission on system component
+        queue.create:
+          title: Create new messaging queue
+        queues.search:
+          title: List and search messaging queues
+        reminder.assign:
+          title: Allow reminder assignment
+        role.create:
+          title: Create new role
+        roles.search:
+          title: List and search roles
+        settings.manage:
+          title: Manage all settings
+        settings.read:
+          title: Access all settings
+        template.create:
+          title: Create new template
+        templates.search:
+          title: List and search templates
+        user.create:
+          title: Create new user
+        users.search:
+          title: List and search users
+        resource-translations.manage:
+          title: Manage resource translations
+        report.create:
+          title: Create new report
+        reports.search:
+          title: List and search reports
+
+    application:
+      label: Applications
+      all: all applications
+      specific: application "{{target}}"
+      operations:
+        delete:
+          description: 'Default: deny'
+          specific: Delete {{target}}
+          title: Delete any application
+        read:
+          description: 'Default: deny'
+          specific: Read {{target}}
+          title: Read any application
+        update:
+          description: 'Default: deny'
+          specific: Update {{target}}
+          title: Update any application
+
+    apigw-route:
+      label: Gateway routes
+      all: all routes
+      specific: route "{{target}}"
+      operations:
+        delete:
+          description: 'Default: deny'
+          specific: Delete {{target}}
+          title: Delete any route
+        read:
+          description: 'Default: deny'
+          specific: Read {{target}}
+          title: Read any route
+        update:
+          description: 'Default: deny'
+          specific: Update {{target}}
+          title: Update any route
+
+    auth-client:
+      label: Auth Clients
+      all: all auth clients
+      specific: auth client "{{target}}"
+      operations:
+        authorize:
+          description: 'User can authorize (use) this client. Default: deny'
+          specific: Authorize client "{{target}}
+          title: Authorize any client
+        delete:
+          description: 'Default: deny'
+          specific: Delete client "{{target}}
+          title: Delete any client
+        read:
+          description: 'Default: deny'
+          specific: Read client "{{target}}
+          title: Read any client
+        update:
+          description: 'Default: deny'
+          specific: Update client "{{target}}
+          title: Update any client
+
+    role:
+      label: Roles
+      all: all roles
+      specific: role "{{target}}"
+      operations:
+        delete:
+          description: 'Default: deny'
+          specific: Delete {{target}}
+          title: Delete any role
+        members.manage:
+          description: 'Default: deny'
+          specific: Manage members for {{target}}
+          title: Manage members for any role
+        read:
+          description: 'Default: deny'
+          specific: Read {{target}}
+          title: Read any role
+        update:
+          description: 'Default: deny'
+          specific: Update {{target}}
+          title: Update any role
+
+    queue:
+      label: Queues
+      all: all queues
+      specific: queue "{{target}}"
+      operations:
+        delete:
+          description: 'Default: deny'
+          specific: Delete {{target}}
+          title: Delete any role
+        members.manage:
+          description: 'Default: deny'
+          specific: Manage members for {{target}}
+          title: Manage members for any role
+        read:
+          description: 'Default: deny'
+          specific: Read {{target}}
+          title: Read any role
+        update:
+          description: 'Default: deny'
+          specific: Update {{target}}
+          title: Update any role
+        queue.read:
+          description: 'Default: deny'
+          specific: Read messages from {{target}}
+          title: Read messages from any role
+        queue.write:
+          description: 'Default: deny'
+          specific: Write messages to {{target}}
+          title: Write messages to any role
+
+    template:
+      label: Templates
+      all: all templates
+      specific: template "{{target}}"
+      operations:
+        delete:
+          description: 'Default: deny'
+          specific: Delete {{target}}
+          title: Delete any template
+        read:
+          description: 'Default: deny'
+          specific: Read {{target}}
+          title: Read any template
+        render:
+          description: 'Default: deny'
+          specific: Render {{target}}
+          title: Render any template
+        update:
+          description: 'Default: deny'
+          specific: Update {{target}}
+          title: Update any template
+
+
+    report:
+      label: Reports
+      all: all reports
+      specific: report "{{target}}"
+      operations:
+        delete:
+          description: 'Default: deny'
+          specific: Delete {{target}}
+          title: Delete any report
+        read:
+          description: 'Default: deny'
+          specific: Read {{target}}
+          title: Read any report
+        run:
+          description: 'Default: deny'
+          specific: Run {{target}}
+          title: Run any report
+        update:
+          description: 'Default: deny'
+          specific: Update {{target}}
+          title: Update any report
+
+    user:
+      label: Users
+      all: all users
+      specific: user "{{target}}"
+      operations:
+        delete:
+          description: 'Default: deny'
+          specific: Delete {{target}}
+          title: Delete any user
+        email.unmask:
+          description: 'Default: deny'
+          specific: Show email details for {{target}}
+          title: Show email details for any user
+        name.unmask:
+          description: 'Default: deny'
+          specific: Show name details for {{target}}
+          title: Show name details for any user
+        impersonate:
+          description: 'Default: deny'
+          specific: Impersonate this user {{target}}
+          title: Impersonate any user
+        read:
+          description: 'Default: deny'
+          specific: Read {{target}}
+          title: Read any user
+        suspend:
+          description: 'Default: deny'
+          specific: Suspend {{target}}
+          title: Suspend any user
+        unsuspend:
+          description: 'Default: deny'
+          specific: Unsuspend {{target}}
+          title: Unsuspend any user
+        update:
+          description: 'Default: deny'
+          specific: Update {{target}}
+          title: Update any user
+
+  federation:
+    component:
+      label: Federation component
+      operations:
+        grant:
+          title: Grant permissions on federation component
+        node.create:
+          title: Create nodes
+        nodes.search:
+          title: List or create nodes
+        pair:
+          title: Pair nodes
+        settings.manage:
+          title: Manage all settings
+        settings.read:
+          title: Access all settings
+
+    node:
+      label: Nodes
+      operations:
+        manage:
+          title: Manage any node
+        module.create:
+          title: Create modules
+
+    exposed-module:
+      label: Modules
+      operations:
+        manage:
+          title: Manage any module
+
+    shared-module:
+      label: Modules
+      operations:
+        map:
+          title: Map any module
+
+  compose:
+    component:
+      label: Compose component
+      operations:
+        grant:
+          title: Grant permissions on compose component
+        namespace.create:
+          title: Create namespaces
+        namespaces.search:
+          title: List and search namespaces
+        settings.manage:
+          title: Manage all settings
+        settings.read:
+          title: Access all settings
+        resource-translations.manage:
+          title: Manage resource translations
+    chart:
+      label: Charts
+      operations:
+        delete:
+          title: Delete any chart
+        read:
+          title: Read any chart
+        update:
+          title: Update any chart
+    module:
+      label: Modules
+      operations:
+        delete:
+          title: Delete any module
+        read:
+          title: Read any module
+        record.create:
+          title: Create record under any module
+        records.search:
+          title: List and search records under any module
+        update:
+          title: Update any module
+    module-field:
+      label: Module fields
+      operations:
+        record.value.read:
+          title: Read any module field
+        record.value.update:
+          title: Update any module field
+    namespace:
+      label: Namespaces
+      operations:
+        chart.create:
+          title: Create charts under any namespace
+        charts.search:
+          title: List and search charts under any namespace
+        delete:
+          title: Delete any namespace
+        manage:
+          title: Manage any namespace
+        module.create:
+          title: Create modules under any namespace
+        modules.search:
+          title: List and search modules under any namespace
+        page.create:
+          title: Create pages under any namespace
+        pages.search:
+          title: List and search pages under any namespace
+        read:
+          title: Access any namespace
+        update:
+          title: Update any namespace
+    page:
+      label: Pages
+      operations:
+        delete:
+          title: Delete any page
+        read:
+          title: Read any page
+        update:
+          title: Update any page
+    record:
+      label: Records
+      operations:
+        delete:
+          title: Delete any record
+        read:
+          title: Read any record
+        update:
+          title: Update any record
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.actionlog.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.actionlog.yaml
index 688e0fe70..d1567d160 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.actionlog.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.actionlog.yaml
@@ -43,5 +43,3 @@ list:
     today: Today
   loadOlder: Load older actions
   title: Action log
-navItem:
-  label: Action log
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.apigw.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.apigw.yaml
index 1012c1c8c..d27a22c73 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.apigw.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.apigw.yaml
@@ -1,8 +1,5 @@
-navItem:
-  label: 'API Gateway'
-
 list:
-  title: 'API Gateway'
+  title: 'Horizon (API Gateway)'
   new: 'New'
   permissions: 'Permissions'
   yaml: 'YAML'
@@ -12,7 +9,7 @@ list:
 
   filterForm:
     query:
-      label: 'Filter API Gateway list'
+      label: 'Filter route list'
       placeholder: 'Filter routes by name'
 
 
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.applications.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.applications.yaml
index a4e300592..e5bad8073 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.applications.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.applications.yaml
@@ -56,5 +56,3 @@ list:
   permissions: Permissions
   title: Applications
   yaml: YAML
-navItem:
-  label: Applications
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.authclients.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.authclients.yaml
index a2f9559f7..fe6d7d92b 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.authclients.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.authclients.yaml
@@ -49,6 +49,10 @@ editor:
     validFrom:
       description: If not defined the client is valid until expiration
       label: Valid from
+    generateCurl: Generate cURL snippet
+    hideCurl: Hide cURL snippet
+    cUrl: Generated cURL
+    testCurl: Test auth
   new: New
   permissions: Permissions
   title:
@@ -81,5 +85,3 @@ list:
   permissions: Permissions
   title: Auth Clients
   yaml: YAML
-navItem:
-  label: Auth Clients
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.permissions.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.permissions.yaml
deleted file mode 100644
index bd4b440db..000000000
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.permissions.yaml
+++ /dev/null
@@ -1,118 +0,0 @@
-list:
-  rules:
-    add: Add role
-    addRole: Add new role
-    application:
-      operations:
-        delete: Delete any application
-        read: Read any application
-        update: Update any application
-      type:
-        label: Applications
-    authClient:
-      operations:
-        authorize: Authorize any client
-        delete: Delete any client
-        read: Read any client
-        update: Update any client
-      type:
-        label: Auth clients
-    component:
-      operations:
-        actionLogRead: Access action log
-        applicationCreate: Create new application
-        applicationFlagGlobal: Can pin application for everyone
-        applicationFlagSelf: Can pin application for themselves
-        applicationsSearch: List and search applications
-        authClientCreate: Create new auth client
-        authClientsSearch: List and search auth clients
-        apigwRouteCreate: Create new route
-        apigwRoutesSearch: List and search routes
-        apigwFilterCreate: Create new filter
-        apigwFiltersSearch: List and search filters
-
-        grant: Grant permission on system service
-        queueCreate: Create new messaging queue
-        queuesSearch: List and search messaging queues
-        reminderAssign: Allow reminder assignment
-        roleCreate: Create new role
-        rolesSearch: List and search roles
-        settingsManage: Manage all settings
-        settingsRead: Access all settings
-        templateCreate: Create new template
-        templatesSearch: List and search templates
-        userCreate: Create new user
-        usersSearch: List and search users
-      type:
-        label: System service
-    loading: Loading permissions
-    noRole: No role selected
-    notAllowed: Not allowed to set permissions
-    queue:
-      operations:
-        delete: Delete any queue
-        queueRead: Read messages from queue
-        queueWrite: Write messages to queue
-        read: Read any queue
-        update: Update any queue
-      type:
-        label: Messaging queues
-    role:
-      operations:
-        delete: Delete any role
-        membersManage: Manage members for any role
-        read: Read any role
-        update: Update any role
-      type:
-        label: Roles
-    submit: Submit
-    apigwRoute:
-      type:
-        label: 'API gateway Routes'
-
-      operations:
-        read: 'Read any route'
-        update: 'Update any route'
-        delete: 'Delete any route'
-    apigwFilter:
-      type:
-        label: 'API gateway filters'
-
-      operations:
-        read: 'Read any filters'
-        update: 'Update any filters'
-        delete: 'Delete any filters'
-    template:
-      operations:
-        delete: Delete any template
-        read: Read any template
-        render: Render any template
-        update: Update any template
-      type:
-        label: Templates
-    tip1: Click on permission/role cell to allow a specific operation
-    tip2: Use Alt-Click to set explicit deny on operation
-    title: List of rules
-    user:
-      operations:
-        delete: Delete any user
-        emailUnmask: Show email details
-        impersonate: Impersonate any user
-        nameUnmask: Show name details
-        read: Read any user
-        suspend: Suspend any user
-        unsuspend: Unsuspend any user
-        update: Update any user
-      type:
-        label: Users
-    report:
-      operations:
-        read: Read any report
-        update: Update any report
-        delete: Delete any report
-        run: Run any report
-      type:
-        label: Reports
-  title: System permissions
-navItem:
-  label: Permissions
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.queues.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.queues.yaml
index 629d8590d..1a52b6073 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.queues.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.queues.yaml
@@ -38,5 +38,3 @@ list:
   loading: Loading messaging queues
   new: New
   title: Messaging queues
-navItem:
-  label: Messaging Queues
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.roles.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.roles.yaml
index 39e8e7936..ea58c8c93 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.roles.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.roles.yaml
@@ -51,5 +51,3 @@ list:
   permissions: Permissions
   title: Roles
   yaml: YAML
-navItem:
-  label: Roles
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.settings.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.settings.yaml
index d09c1f2ec..e7683c35e 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.settings.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.settings.yaml
@@ -67,5 +67,3 @@ editor:
       title: SAML
     title: External Authentication Providers
   title: System settings
-navItem:
-  label: Settings
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.stats.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.stats.yaml
deleted file mode 100644
index 1c4d8ddd6..000000000
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.stats.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-navItem:
-  label: Stats
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.templates.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.templates.yaml
index d26802c5a..3ccd51b68 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.templates.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.templates.yaml
@@ -68,5 +68,3 @@ list:
   permissions: Permissions
   title: Templates
   yaml: YAML
-navItem:
-  label: Templates
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.users.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.users.yaml
index b5bfe3c54..aff054dc1 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.users.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.users.yaml
@@ -89,5 +89,3 @@ list:
   permissions: Permissions
   title: Users
   yaml: YAML
-navItem:
-  label: Users
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.yaml
deleted file mode 100644
index 90c3a88d8..000000000
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-navGroup:
-  label: System
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/ui.settings.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/ui.settings.yaml
index 77cbe97a1..bdf4641f7 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/ui.settings.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/ui.settings.yaml
@@ -1,6 +1,3 @@
-navItem:
-  label: 'Settings'
-
 editor:
   title: 'User Interface Settings'
 
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/block.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/block.yaml
index 9f270065f..bfc9e5587 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/block.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/block.yaml
@@ -64,33 +64,62 @@ calendar:
     listMonth: Agenda
     timeGridDay: Day
     timeGridWeek: Week
-  viewLabel: $t(block.calendar.label)
+  viewLabel: Calendar
 chart:
   add: New Chart
   addFunnel: Funnel chart
   addGauge: Gauge chart
   addGeneric: Generic chart
+  createFailed: Could not create a chart
   configure:
     label: Configure chart
     reportLabel: Report {{l}}
     reportsLabel: Reports
   display: 'Chart to display inside this block:'
-  edit: Edit chart
+  edit:
+    label: Edit chart
+    dimension:
+      function:
+        date: DATE
+        label: Function
+        month: MONTH
+        none: (no grouping / buckets)
+        placeholder: Select dimension modifier (bucket size)
+        quarter: QUARTER
+        week: WEEK
+        year: YEAR
   label: Chart
+  noChart: No charts
   pick: Pick a chart
   preview:
     chartId: Chart preview (ID {{0}})
+  searchPlaceholder: Type here to search all charts in this namespace
 content:
   label: Content
+  ok: Ok
+  urlPlaceholder: https://example.tld
 file:
   label: File
   preview:
     label: File block
 general:
   changeBlock: Change existing block
-  descriptionLabel: $t(general.label.description)
+  descriptionLabel: Description
   descriptionPlaceholder: Block description
   headerStyle: Block header style (color)
+  label:
+    add: Add
+    back: Back
+    edit: Edit
+    general: General
+    import: Import
+    next: Next
+    none: None
+    ok: Ok
+    permissions: Permissions
+    remove: Remove
+    save: Save
+    search: Search
   module: Module
   style:
     danger: Danger variant
@@ -100,8 +129,10 @@ general:
     success: Success variant
     warning: Warning variant
   title: Add new block
-  titleLabel: $t(general.label.title)
+  titleLabel: Title
   titlePlaceholder: Block title
+  tooltip:
+    dragAndDrop: Drag and drop to change order
 iframe:
   label: IFrame
   pickURLField: Pick an URL field
@@ -149,10 +180,19 @@ metric:
     labelLabel: Label style
     valueLabel: Value style
   label: Metric
+notification:
+  record:
+    loadFailed: Could not load record
 record:
   confirmDelete: Are you sure you want to delete this record?
+  deleteFailed: Could not delete record
   deleteRecord: Delete record
+  invalidOwnerVar: Can not use ${ownerID} variable in non-record pages
+  invalidRecordVar: Can not use ${record...} variable in non-record pages
   label: Record
+  listLoadFailed: Could not load record list
+  moduleOrPageNotSet: 'RecordList block error: module or page option not set'
+  moduleMismatch: Module incompatible, module mismatch
   preview:
     blockNoRecord: Can not render this block without a record
     fieldsFromModule: Single record block, displaying fields ({{0}}) from module {{1}}
@@ -226,7 +266,7 @@ recordList:
     dropzoneLabel: Click or drop file here to upload (.csv or JSON)
     failed: 'Something went wrong during the import. Please try again: {{failReason}}'
     fileColumns: File columns
-    hasRequiredFileFields: This module has required file upload fields that are not yet supported via the importer
+    hasRequiredFileFields: 'This module has required file upload fields'
     matchFields: 'Match imported columns with existing ones:'
     moduleFields: Module fields
     onError: 'If any record fails to import:'
@@ -252,6 +292,7 @@ recordList:
     uploadFile: Upload the file you want to import (.csv or JSON format)
   label: Record list
   moduleFootnote: Modules without a {{0}} can only be used in a record list as an inline editor
+  noRecords: There are no records matching your request
   pagination:
     next: Next
     prev: Previous
@@ -335,3 +376,30 @@ socialFeed:
     socialFeed: Twitterblo feed
   twitterProfileField: Field that contains Twitter Profile URL for a record
   twitterProfileLabel: Twitter Profile URL for list pages i.e (https://twitter.com/bloomberg)
+selectBlockFootnote: Some types might be disabled for non-record pages
+field:
+  noPermission: No permission to read field value
+  selector:
+    available: Fields available
+    systemField: (system field)
+comment:
+  label: 'Comments'
+  titleField:
+    label: 'Title field'
+    footnote: 'Field value will be used as record title'
+  contentField:
+    label: 'Content field'
+    footnote: 'Field value will be used as record content'
+  titleInput: 'Enter comment title'
+  contentInput: 'Enter comment content'
+  submit: 'Submit'
+  sortDirection:
+    label: 'Sort direction'
+    footnote: 'Field value will be used as sorting direction reference'
+    asc: 'ASC'
+    desc: 'DESC'
+  referenceField:
+    label: 'Reference field'
+    footnote: 'Field value will be used as reference'
+navigation:
+  chart: Charts
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/chart.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/chart.yaml
index 0321a9946..fd60273c3 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/chart.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/chart.yaml
@@ -1,5 +1,14 @@
 colorLabel: '{{count}} colors'
 colorScheme: Color scheme
+configure:
+  reportsLabel: Reports
+general:
+  label:
+    title: Label
+    add: Add
+  value: Value
+  placeholder:
+    handle: handle (a - z, 0 - 9, underscore, dash)
 edit:
   dimension:
     calculateLabelCount: Calculate how many labels can be shown
@@ -93,5 +102,11 @@ edit:
 import: 'Import chart(s):'
 newLabel: 'Create a new chart:'
 newPlaceholder: Chart name
+notification:
+  loadFailed: Could not load chart
+  saveFailed: Could not save this chart
+  saved: Chart saved
+  deleteFailed: Could not delete this chart
+  deleted: Chart deleted
 searchPlaceholder: Type here to search all charts in this namespace
 title: List of Charts
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/field.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/field.yaml
index 59576682c..4e7afb6f1 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/field.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/field.yaml
@@ -43,6 +43,7 @@ kind:
     formatLabel: Format
     formatPlaceholder: Format
     label: Number
+    liveExample: 'Live example:'
     precisionLabel: Precision
     precisionPlaceholder: Precision
     prefixLabel: Prefix
@@ -131,10 +132,9 @@ sanitizers:
     placeholder: trim(value)
   label: Value sanitization
 selector:
-  available: Columns available
-  footnote: Add fields by dragging or double-clicking on them. Selected fields can also be reordered
+  available: Fields available
   selectAll: Select all
-  selected: Columns selected
+  selected: Fields selected
   systemField: (system field)
   unselectAll: Unselect all
 system:
@@ -157,3 +157,6 @@ valueExpr:
   description: Insert a formula or expression that calculates numeric values or combines and manipulates text values
   label: Field value expression
   placeholder: ((floor(numField1) + numField2) / 10) + 0.5
+label:
+  required: Required
+  multi: Multi value
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/general.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/general.yaml
index 43a7f0ab4..8da4d0040 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/general.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/general.yaml
@@ -22,13 +22,11 @@ label:
   enabled: Enabled
   export: Export
   fileTypeNotAllowed: File type not allowed
-  uploadError: 'Issue with file upload: "{{message}}"'
   general: General
   handle: Handle
   here: here
   import: Import
   importPlaceholder: Upload files to import
-  label: Label
   loading: Loading
   makeDefault: Make default
   moduleName: Module name
@@ -50,20 +48,23 @@ label:
   required: Required
   save: Save
   saveAndClose: Save and close
-  search: Search
   status: Status
   timeHour: '{{t}}h'
   timeMinute: '{{t}}min'
   title: Title
   type: Type
-  updatedAt: $t(field.system.updatedAt)
+  updatedAt: Updated at
+  uploadError: 'Issue with file upload: "{{message}}"'
   uploading: Uploading
   urlPlaceholder: https://example.tld
   validation: Validation
-  value: Value
   view: View
-  welcome: Welcome!
   "yes": "Yes"
+navigation:
+  chart: Charts
+  namespace: Namespaces
+  module: Modules
+  page: Pages
 placeholder:
   handle: handle (a - z, 0 - 9, underscore, dash)
   sample: Sample
@@ -84,3 +85,37 @@ reminder:
   snooze: Snooze
 tooltip:
   dragAndDrop: Drag and drop to change order
+fieldKinds:
+  Bool:
+    label: Checkbox (Y/N)
+  DateTime:
+    label: Date and time
+  Email:
+    label: Email input
+  File:
+    label: File upload
+  Number:
+    label: Number input
+  Record:
+    label: Record selector
+  Select:
+    label: Select / dropdown
+  String:
+    label: Text input (string)
+  Url:
+    label: URL input
+  User:
+    label: User selector
+field:
+  selectAll: Select all
+  unselectAll: Unselect all
+  kind:
+    user:
+      suggestionPlaceholder: Start typing to search for users by email or name
+notification:
+  composeAccessNotAllowed: Not allowed to access Compose
+  import:
+    failed: Import failed
+    readingError: Error reading file
+    successful: Import successful
+    typeMissmatch: 'Import error: trying to import object of type "{{type1}}" into a list of objects of type "{{type2}}"'
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/module.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/module.yaml
index 33aaabdc1..3307eab67 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/module.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/module.yaml
@@ -6,10 +6,15 @@ allRecords:
   label: All records
   list:
     title: All records for module "{{name}}"
-  selectFields:
+  columns:
     title: Configure columns
+    description: The columns picked won't be saved after you refresh the page
   view:
     title: View record for module "{{name}}"
+block:
+  record:
+    recordDeleted: This record was deleted
+    loadFailed: Could not load record
 createLabel: New Module
 edit:
   create: Create module
@@ -54,34 +59,35 @@ edit:
     required: Required field
     title: The name displayed in form input / data lists
 federated: Federated
-fieldKinds:
-  Bool:
-    label: Checkbox (Y/N)
-  DateTime:
-    label: Date and time
-  Email:
-    label: Email input
-  File:
-    label: File upload
-  Number:
-    label: Number input
-  Record:
-    label: Record selector
-  Select:
-    label: Select / dropdown
-  String:
-    label: Text input (string)
-  Url:
-    label: URL input
-  User:
-    label: User selector
 forModule:
   recordList: Record List for module
   recordListPage: Record List page for module
   recordPage: Record page for module
+general:
+  label:
+    attributes: Attributes
+    handle: Handle
+    name: Name
+    permissions: Permissions
+    title: Title
+    type: Type
+    saveAndClose: Save and close
+  placeholder:
+    handle: handle (a - z, 0 - 9, underscore, dash)
+    sample: Sample
 import: Module import
+navigation:
+  module: Modules
 newLabel: Module Name *
 newPlaceholder: Name used on the list of modules
+noModule: No modules
+notification:
+  deleteFailed: Could not delete this module
+  deleted: Module deleted
+  saveFailed: Could not save this module
+  saved: Module saved
+  page:
+    createFailed: Could not create a page
 recordPage:
   create: Create record page
   edit: Page builder
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/namespace.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/namespace.yaml
index a30593d51..584918db5 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/namespace.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/namespace.yaml
@@ -2,23 +2,47 @@ application:
   label: Enable on application list
 clickOpen: Click to open
 create: Create new namespace
+import: Import namespace
 description:
   label: Namespace description
   placeholder: Enter namespace description
 disabled: Namespace is disabled
 edit: Edit namespace
+clone: Clone namespace
+cloneSuffix: copy
+cloneWarning:
+  wfInclusion: Workflows and other automation are not cloned. Use the workflow editor interface to clone the ones you need.
+export: Export namespace
 enabled:
   label: Enable on namespace list
 icon:
   label: Icon
   placeholder: Choose an image for namespace icon or drop it here...
+label:
+  permissions: Permissions
 logo:
   label: Logo
   placeholder: Choose an image for namespace logo or drop it here...
+  show: Show logo
+  preview: Preview
+  reset: Reset
 name:
   label: Full namespace name *
   placeholder: Enter namespace name
 noResults: No namespaces found
+notification:
+  application:
+    createFailed: Could not create namespace application
+    fetchFailed: Could not fetch namespace application
+    saveFailed: Could not save namespace application
+  assetUploadFailed: Could not upload attached assets
+  createFailed: Could not create namespace
+  deleteFailed: Could not delete this namespace
+  disabled: Namespace disabled - redirecting
+  saveFailed: Could not save this namespace
+  cloneFailed: Could not clone this namespace
+  saved: Namespace saved
+  imported: Namespace imported
 searchPlaceholder: Type here to search among all namespaces...
 setPermissions: Set namespace permissions
 slug:
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/navigation.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/navigation.yaml
index 668a6002a..168b51118 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/navigation.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/navigation.yaml
@@ -1,4 +1,3 @@
-adminPanel: Admin panel
 automation: Automation
 chart: Charts
 configuration: Configuration
@@ -13,7 +12,6 @@ more: More
 namespace: Namespaces
 noPageTitle: No page title
 page: Pages
-publicPages: Public pages
 userSettings:
   changePassword: Change password
   loggedInAs: Logged in as {{user}}
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/notification.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/notification.yaml
index c0abcf6c3..46187a10c 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/notification.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/notification.yaml
@@ -32,11 +32,6 @@ general:
   error: Error
   success: Success
   warning: Warning
-import:
-  failed: Import failed
-  readingError: Error reading file
-  successful: Import successful
-  typeMissmatch: 'Import error: trying to import object of type "{{type1}}" into a list of objects of type "{{type2}}"'
 module:
   createFailed: Could not create a module
   deleteFailed: Could not delete this module
@@ -59,8 +54,6 @@ page:
   deleteFailed: Could not delete this page
   loadFailed: Could not load the page tree
   noPages: No pages found
-  pageMoveFailed: Could not move this page
-  reordered: Page reordered
   saveFailed: Could not save this page
   saveFailedRequired: Could not save this page, all required module fields must be present
   saved: Page saved
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/onboarding.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/onboarding.yaml
index 44ee9e335..6a73fe507 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/onboarding.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/onboarding.yaml
@@ -2,6 +2,15 @@ message:
   noPages: It seems this namespace has no visible pages yet.
   notifyAdministrator: Notify your system administrator.
   startBuilding: Follow these steps to start building
+label:
+  pageBuilder: Page builder
+  welcome: Welcome!
+navigation:
+  noPageTitle: No page title
+notification:
+  module:
+    createFailed: Could not create a module
+    saveFailed: Could not save this module
 step:
   chart:
     create: Make Chart
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/page.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/page.yaml
index 6f4575bc3..cdfd6c985 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/page.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/page.yaml
@@ -1,6 +1,18 @@
+block:
+  general:
+    changeBlock: Change existing block
+    label:
+      cancel: Cancel
+      noHandle: No handle
+      pageBuilder: Page builder
+      saveAndClose: Save and close
+    placeholder:
+      handle: handle (a - z, 0 - 9, underscore, dash)
+      sample: Sample
+    title: Add new block
+changeBlock: Change existing block
 build:
   addBlock: Add block
-  selectBlockFootnote: Some types might be disabled for non-record pages
   selectBlockTitle: Select type of the new block
 createLabel: Create page
 edit:
@@ -11,9 +23,29 @@ edit:
 import: 'Import page(s):'
 instructions: Drag and drop pages to adjust the order and hierarchy.
 invalid: Invalid configuration
+label:
+  cancel: Cancel
+  description: Description
+  handle: Handle
+  pageBuilder: Page builder
+  permissions: Permissions
+  saveAndClose: Save and close
+moduleEdit: Edit module
+navigation:
+  page: Pages
+  viewPage: View Page
 newPlaceholder: Page title
 noBlock: No block added yet
+noPages: No pages
+notification:
+  deleteFailed: Could not delete this page
+  loadFailed: Could not load the page tree
+  saved: Page saved
+  saveFailed: Could not save this page
+  saveFailedRequired: Could not save this page, all required module fields must be present
 notVisible: Hidden
+pageMoveFailed: Could not move this page
+reordered: Page reordered
 title: List of Pages
 view: View
 visible: Visible
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/permission.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/permission.yaml
deleted file mode 100644
index 7c29d9fec..000000000
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/permission.yaml
+++ /dev/null
@@ -1,131 +0,0 @@
-composeChart:
-  all: all charts
-  operations:
-    delete:
-      description: 'Default: deny'
-      specific: Delete chart "{{target}}"
-      title: Delete any chart
-    read:
-      description: 'Default: deny'
-      specific: Read chart "{{target}}"
-      title: Read any chart
-    update:
-      description: 'Default: deny'
-      specific: Update chart "{{target}}"
-      title: Update any chart
-  specific: chart "{{target}}"
-composeModule:
-  all: all modules
-  operations:
-    delete:
-      description: 'Default: deny'
-      specific: Delete module "{{target}}"
-      title: Delete any module
-    read:
-      description: 'Default: deny'
-      specific: Read module "{{target}}"
-      title: Read any module
-    recordCreate:
-      description: 'Default: deny'
-      specific: Create record of module "{{target}}"
-      title: Create record of any module
-    recordsSearch:
-      description: 'Default: deny'
-      specific: List and search records of module "{{target}}"
-      title: List and search records of any module
-    update:
-      description: 'Default: deny'
-      specific: Update module "{{target}}"
-      title: Update any module
-  specific: module "{{target}}"
-composeModuleField:
-  all: all module fields
-  operations:
-    recordValueRead:
-      description: 'Default: deny'
-      specific: 'Read "{{target}}" record fields '
-      title: Read record fields of any module
-    recordValueUpdate:
-      description: 'Default: deny'
-      specific: 'Update "{{target}}" record fields '
-      title: Update record fields of any module
-  specific: field "{{target}}"
-composeNamespace:
-  all: all namespaces
-  operations:
-    chartCreate:
-      description: ""
-      specific: Create charts under namespace "{{target}}"
-      title: Create charts under any namespace
-    chartsSearch:
-      description: ""
-      specific: List and search charts under namespace "{{target}}"
-      title: List and search charts under any namespace
-    delete:
-      description: ""
-      specific: Delete namespace "{{target}}"
-      title: Delete any namespace
-    manage:
-      description: Allow access to namespace's admin pages
-      specific: Manage namespace "{{target}}"
-      title: Manage any namespace
-    moduleCreate:
-      description: ""
-      specific: Create modules under namespace "{{target}}"
-      title: Create modules under any namespace
-    modulesSearch:
-      description: ""
-      specific: List and search modules under namespace "{{target}}"
-      title: List and search modules under any namespace
-    pageCreate:
-      description: ""
-      specific: Create pages under namespace "{{target}}"
-      title: Create pages under any namespace
-    pagesSearch:
-      description: ""
-      specific: List and search pages under namespace "{{target}}"
-      title: List and search pages under any namespace
-    read:
-      description: ""
-      specific: Read namespace "{{target}}"
-      title: Read any namespace
-    update:
-      description: ""
-      specific: Update namespace "{{target}}"
-      title: Update any namespace
-  specific: namespace "{{target}}"
-composePage:
-  all: all pages
-  operations:
-    delete:
-      description: 'Default: deny'
-      specific: Delete page "{{target}}"
-      title: Delete any page
-    read:
-      description: 'Default: deny'
-      specific: Read page "{{target}}"
-      title: Read any page
-    update:
-      description: 'Default: deny'
-      specific: Update page "{{target}}"
-      title: Update any page
-  specific: page "{{target}}"
-composeRecord:
-  all: all records
-  operations:
-    delete:
-      description: 'Default: deny'
-      specific: Delete record
-      title: Delete records of any module
-    read:
-      description: 'Default: deny'
-      specific: Read record
-      title: Read records of any module
-    update:
-      description: 'Default: deny'
-      specific: Update record
-      title: Update records of any module
-  specific: record
-resetBack: Reset back to "{{current}}"
-saveChanges: Save changes
-setFor: Set permissions for {{target}}
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/permissions.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/permissions.yaml
new file mode 100644
index 000000000..25303d0dd
--- /dev/null
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/permissions.yaml
@@ -0,0 +1,145 @@
+ui:
+  reset-back: Reset back to "{{current}}"
+  save-changes: Save changes
+  set-for: Set permissions for {{target}}
+
+  access:
+    allow: Allow
+    inherit: Inherit
+    deny: Deny
+
+resources:
+  compose:
+    chart:
+      all: all charts
+      specific: chart "{{target}}"
+      operations:
+        delete:
+          description: 'Default: deny'
+          specific: Delete chart "{{target}}"
+          title: Delete any chart
+        read:
+          description: 'Default: deny'
+          specific: Read chart "{{target}}"
+          title: Read any chart
+        update:
+          description: 'Default: deny'
+          specific: Update chart "{{target}}"
+          title: Update any chart
+
+    module:
+      all: all modules
+      specific: module "{{target}}"
+      operations:
+        delete:
+          description: 'Default: deny'
+          specific: Delete module "{{target}}"
+          title: Delete any module
+        read:
+          description: 'Default: deny'
+          specific: Read module "{{target}}"
+          title: Read any module
+        record.create:
+          description: 'Default: deny'
+          specific: Create record of module "{{target}}"
+          title: Create record of any module
+        records.search:
+          description: 'Default: deny'
+          specific: List and search records of module "{{target}}"
+          title: List and search records of any module
+        update:
+          description: 'Default: deny'
+          specific: Update module "{{target}}"
+          title: Update any module
+
+    module-field:
+      all: all module fields
+      specific: field "{{target}}"
+      operations:
+        record.value.read:
+          description: 'Default: deny'
+          specific: 'Read "{{target}}" record fields '
+          title: Read record fields of any module
+        record.value.update:
+          description: 'Default: deny'
+          specific: 'Update "{{target}}" record fields '
+          title: Update record fields of any module
+
+    namespace:
+      all: all namespaces
+      specific: namespace "{{target}}"
+      operations:
+        chart.create:
+          description: ""
+          specific: Create charts under namespace "{{target}}"
+          title: Create charts under any namespace
+        charts.search:
+          description: ""
+          specific: List and search charts under namespace "{{target}}"
+          title: List and search charts under any namespace
+        delete:
+          description: ""
+          specific: Delete namespace "{{target}}"
+          title: Delete any namespace
+        manage:
+          description: Allow access to namespace's admin pages
+          specific: Manage namespace "{{target}}"
+          title: Manage any namespace
+        module.create:
+          description: ""
+          specific: Create modules under namespace "{{target}}"
+          title: Create modules under any namespace
+        modules.search:
+          description: ""
+          specific: List and search modules under namespace "{{target}}"
+          title: List and search modules under any namespace
+        page.create:
+          description: ""
+          specific: Create pages under namespace "{{target}}"
+          title: Create pages under any namespace
+        pages.search:
+          description: ""
+          specific: List and search pages under namespace "{{target}}"
+          title: List and search pages under any namespace
+        read:
+          description: ""
+          specific: Read namespace "{{target}}"
+          title: Read any namespace
+        update:
+          description: ""
+          specific: Update namespace "{{target}}"
+          title: Update any namespace
+
+    page:
+      all: all pages
+      specific: page "{{target}}"
+      operations:
+        delete:
+          description: 'Default: deny'
+          specific: Delete page "{{target}}"
+          title: Delete any page
+        read:
+          description: 'Default: deny'
+          specific: Read page "{{target}}"
+          title: Read any page
+        update:
+          description: 'Default: deny'
+          specific: Update page "{{target}}"
+          title: Update any page
+
+    record:
+      all: all records
+      specific: record
+      operations:
+        delete:
+          description: 'Default: deny'
+          specific: Delete record
+          title: Delete records of any module
+        read:
+          description: 'Default: deny'
+          specific: Read record
+          title: Read records of any module
+        update:
+          description: 'Default: deny'
+          specific: Update record
+          title: Update records of any module
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/preview.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/preview.yaml
index f9c06c508..c310993b9 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/preview.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/preview.yaml
@@ -1,3 +1,9 @@
+general:
+  label:
+    attachmentFileInfo: '(File size: {{0}}, uploaded {{1}})'
+    download: Download
+  tooltip:
+    dragAndDrop: Drag and drop to change order
 pdf:
   clickToRetry: Click to retry
   downloadForAll: Download to see all pages
@@ -5,4 +11,4 @@ pdf:
   loading: Loading
   noPages: This document is empty
   pageLoadFailed: Page failed to load
-  pageLoading: $t(preview.pdf.loading)
+  pageLoading: Loading
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/resource-translator.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/resource-translator.yaml
new file mode 100644
index 000000000..08bcfc603
--- /dev/null
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/resource-translator.yaml
@@ -0,0 +1,17 @@
+translator:
+  save-changes: Save
+  add-language: Add language
+  missing-translation: Missing translation
+
+resources:
+  namespace:
+    title: Namespace "{{ handle }}"
+  module:
+    title: Module "{{ handle }}"
+    field:
+      title: Module field "{{ name }}"
+
+  page:
+    title: Page "{{ handle }}"
+    block:
+      title: "Page block #{{ blockID }}"
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/sidebar.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/sidebar.yaml
index e54ddff1f..6f8c59b09 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/sidebar.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/sidebar.yaml
@@ -1,4 +1,9 @@
+adminPanel: Admin panel
+chart: Charts
 namespaceList: Namespace list
+module: Modules
 noPages: No pages
+page: Pages
 pickNamespace: Select a namespace
+publicPages: Public pages
 searchPlaceholder: Search pages...
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-one/layout.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-one/layout.yaml
index 31b24fcef..7d2ddff6c 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-one/layout.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-one/layout.yaml
@@ -1,2 +1,2 @@
-noApps: No Applications
+no-applications: No Applications
 search: Type here to search
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-reporter/general.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-reporter/general.yaml
index 9ea0523c5..2cfc3e842 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-reporter/general.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-reporter/general.yaml
@@ -2,4 +2,6 @@ label:
   add: + Add
   back: Back
   delete: Delete
+  ok: Ok
   save: Save
+  urlPlaceholder: https://example.tld
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-reporter/permission.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-reporter/permission.yaml
deleted file mode 100644
index a0575a805..000000000
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-reporter/permission.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-report:
-  all: all reports
-  specific: report "{{target}}"
-resetBack: Reset back to "{{current}}"
-saveChanges: Save changes
-setFor: Set permissions for {{target}}
-system-report:
-  delete:
-    description: ""
-    specific: Delete report "{{target}}"
-    title: Delete any report
-  read:
-    description: ""
-    specific: Read report "{{target}}"
-    title: Read any report
-  run:
-    description: ""
-    specific: Run report "{{target}}"
-    title: Run any report
-  update:
-    description: ""
-    specific: Update report "{{target}}"
-    title: Update any report
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-reporter/permissions.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-reporter/permissions.yaml
new file mode 100644
index 000000000..c176353b2
--- /dev/null
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-reporter/permissions.yaml
@@ -0,0 +1,32 @@
+ui:
+  reset-back: Reset back to "{{current}}"
+  save-changes: Save changes
+  set-for: Set permissions for {{target}}
+
+  access:
+    allow: Allow
+    inherit: Inherit
+    deny: Deny
+
+resources:
+  system:
+    report:
+      all: all reports
+      specific: report "{{target}}"
+      operations:
+        delete:
+          description: ""
+          specific: Delete report "{{target}}"
+          title: Delete any report
+        read:
+          description: ""
+          specific: Read report "{{target}}"
+          title: Read any report
+        run:
+          description: ""
+          specific: Run report "{{target}}"
+          title: Run any report
+        update:
+          description: ""
+          specific: Update report "{{target}}"
+          title: Update any report
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-workflow/navigation.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-workflow/navigation.yaml
index 1d7d4746d..1b344509c 100644
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-workflow/navigation.yaml
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-workflow/navigation.yaml
@@ -3,6 +3,7 @@ help:
   feedback: Send feedback
   forum: Help
   version: 'Version:'
+
 userSettings:
   changePassword: Change password
   loggedInAs: Logged in as {{user}}
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-workflow/permission.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-workflow/permission.yaml
deleted file mode 100644
index 8a0fcf74a..000000000
--- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-workflow/permission.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-automationWorkflow:
-  all: all workflows
-  operations:
-    delete:
-      description: 'Default: deny'
-      specific: Delete this workflow
-      title: Delete any workflow
-    execute:
-      description: 'Default: deny'
-      specific: Execute this workflow
-      title: Execute any workflow
-    read:
-      description: 'Default: deny'
-      specific: Read this workflow
-      title: Read any workflow
-    sessionsManage:
-      description: 'Default: deny'
-      specific: Manage sessions for this workflow
-      title: Manage all sessions
-    triggersManage:
-      description: 'Default: deny'
-      specific: Manage triggers for this workflow
-      title: Manage all triggers
-    undelete:
-      description: 'Default: deny'
-      specific: Undelete this workflow
-      title: Undelete any workflow
-    update:
-      description: 'Default: deny'
-      specific: Update this workflow
-      title: Update any workflow
-  specific: workflow "{{target}}"
-resetBack: Reset back to "{{current}}"
-saveChanges: Save changes
-setFor: Set permissions for {{target}}
diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-workflow/permissions.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-workflow/permissions.yaml
new file mode 100644
index 000000000..d9003bed3
--- /dev/null
+++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-workflow/permissions.yaml
@@ -0,0 +1,44 @@
+ui:
+  reset-back: Reset back to "{{current}}"
+  save-changes: Save changes
+  set-for: Set permissions for {{target}}
+
+  access:
+    allow: Allow
+    inherit: Inherit
+    deny: Deny
+
+resources:
+  automation:
+    workflow:
+      all: all workflows
+      specific: workflow "{{target}}"
+      operations:
+        delete:
+          description: 'Default: deny'
+          specific: Delete this workflow
+          title: Delete any workflow
+        execute:
+          description: 'Default: deny'
+          specific: Execute this workflow
+          title: Execute any workflow
+        read:
+          description: 'Default: deny'
+          specific: Read this workflow
+          title: Read any workflow
+        sessions.manage:
+          description: 'Default: deny'
+          specific: Manage sessions for this workflow
+          title: Manage all sessions
+        triggers.manage:
+          description: 'Default: deny'
+          specific: Manage triggers for this workflow
+          title: Manage all triggers
+        undelete:
+          description: 'Default: deny'
+          specific: Undelete this workflow
+          title: Undelete any workflow
+        update:
+          description: 'Default: deny'
+          specific: Update this workflow
+          title: Update any workflow
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 621d650d6..5a4f8602b 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -44,7 +44,7 @@ github.com/brianvoe/gofakeit/v6
 github.com/brianvoe/gofakeit/v6/data
 # github.com/cespare/xxhash/v2 v2.1.1
 github.com/cespare/xxhash/v2
-# github.com/cortezaproject/corteza-locale v0.0.0-20210902094343-6e40ca3a7d14
+# github.com/cortezaproject/corteza-locale v0.0.0-20210923111547-fb8aa18cc3b7
 ## explicit
 github.com/cortezaproject/corteza-locale
 # github.com/crewjam/httperr v0.0.0-20190612203328-a946449404da