Upstream sync

2020-09-13 20:09:48 +02:00
parent 3db230de9b
commit 5cf7be6f13
59 changed files with 613 additions and 188 deletions
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1651,3 +1651,6 @@ en:
        edit: Edit
        report: Report
      generating: Generating...
+  locked_accounts:
+    index:
+      account_locked_message: This account is locked. Please contact a BIG admin.
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -705,3 +705,6 @@ es:
        production_elements_logs: Production Elements Logs, and more (ES)
        reduces_labor_cost: Reduces labor costs (ES)
        simplifies_cue_sheets: Simplifies Music Cue Sheets, Graphic Cue Sheets (ES)
+  locked_accounts:
+    index:
+      account_locked_message: This account is locked. Please contact a BIG admin. (ES)