From e5afc3472884f287d2a762cd234f12d514fa64fc Mon Sep 17 00:00:00 2001 From: Vivek Patel Date: Thu, 30 Dec 2021 19:01:59 +0530 Subject: [PATCH] Update corteza-locale dep --- .../corteza-locale/src/en/corteza-webapp-compose/chart.yaml | 1 + .../corteza-locale/src/en/corteza-webapp-workflow/steps.yaml | 2 +- vendor/modules.txt | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) 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 f7a7c7cd3..9e479362c 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 @@ -113,6 +113,7 @@ notification: saved: Chart saved deleteFailed: Could not delete this chart deleted: Chart deleted +not-defined: Not defined searchPlaceholder: Type here to search all charts in this namespace title: List of Charts undefined: undefined diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-workflow/steps.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-workflow/steps.yaml index e5e6d60ec..20517fb18 100644 --- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-workflow/steps.yaml +++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-workflow/steps.yaml @@ -11,7 +11,7 @@ delay: label: Delay tooltip: Delays workflow execution error: - label: Error + label: Error tooltip: Throws error and stops workflow execution, also prevents saving of records triggered with before trigger 'error-handler': label: Error Handler diff --git a/vendor/modules.txt b/vendor/modules.txt index 8917e2a3f..62643aa49 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -44,7 +44,11 @@ github.com/brianvoe/gofakeit/v6 github.com/brianvoe/gofakeit/v6/data # github.com/cespare/xxhash/v2 v2.1.1 github.com/cespare/xxhash/v2 +<<<<<<< HEAD # github.com/cortezaproject/corteza-locale v0.0.0-20220111142345-b53bc6baba9e +======= +# github.com/cortezaproject/corteza-locale v0.0.0-20211223150209-707ba6b62b17 +>>>>>>> 6973ce5a (Update corteza-locale dep) ## explicit github.com/cortezaproject/corteza-locale # github.com/crewjam/httperr v0.0.0-20190612203328-a946449404da