emailengine-app 2.61.1 → 2.61.2

package/translations/pl.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2025-08-13 10:54+0000\n"
+"POT-Creation-Date: 2025-12-29 11:35+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -11,7 +11,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 "
 "|| n%100>14) ? 1 : 2);\n"
-"X-Generator: Poedit 3.6\n"
+"X-Generator: Poedit 3.8\n"
 
 #: views/config/license.hbs:45
 msgid "%d day"
@@ -20,6 +20,10 @@ msgstr[0] "%d dzień"
 msgstr[1] "%d dni"
 msgstr[2] "%d dni"
 
+#: views/redirect.hbs:1
+msgid "Click <a href=\"%s\">here</a> to continue&mldr;"
+msgstr "Kliknij <a href=\"%s\">tutaj</a>, aby kontynuować&mldr;"
+
 #: views/unsubscribe.hbs:3 views/unsubscribe.hbs:62 views/unsubscribe.hbs:85
 msgid "Unsubscribe"
 msgstr "Wypisz się"
@@ -65,10 +69,6 @@ msgstr "Adres e-mail"
 msgid "Enter your email address"
 msgstr "Wprowadź swój adres e-mail"
 
-#: views/redirect.hbs:1
-msgid "Click <a href=\"%s\">here</a> to continue&mldr;"
-msgstr "Kliknij <a href=\"%s\">tutaj</a>, aby kontynuować&mldr;"
-
 #: views/accounts/register/index.hbs:2
 msgid "Choose your email account provider"
 msgstr "Wybierz dostawcę konta e-mail"
@@ -77,6 +77,28 @@ msgstr "Wybierz dostawcę konta e-mail"
 msgid "Standard IMAP"
 msgstr "Standardowy IMAP"
 
+#: views/accounts/register/imap.hbs:11
+msgid "Your name"
+msgstr "Twoje imię"
+
+#: views/accounts/register/imap.hbs:17
+msgid "Enter your full name"
+msgstr "Wpisz swoje imię i nazwisko"
+
+#: views/accounts/register/imap.hbs:31
+#: views/accounts/register/imap-server.hbs:36
+#: views/accounts/register/imap-server.hbs:128
+msgid "Password"
+msgstr "Hasło"
+
+#: views/accounts/register/imap.hbs:37
+msgid "Enter your account password"
+msgstr "Wprowadź hasło do konta"
+
+#: views/accounts/register/imap.hbs:51
+msgid "Continue"
+msgstr "Kontynuuj"
+
 #: views/accounts/register/imap-server.hbs:19
 msgid "IMAP"
 msgstr "IMAP"
@@ -86,12 +108,6 @@ msgstr "IMAP"
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: views/accounts/register/imap-server.hbs:36
-#: views/accounts/register/imap-server.hbs:128
-#: views/accounts/register/imap.hbs:31
-msgid "Password"
-msgstr "Hasło"
-
 #: views/accounts/register/imap-server.hbs:45
 #: views/accounts/register/imap-server.hbs:136
 msgid "Important"
@@ -160,75 +176,59 @@ msgstr ""
 "szyfrowania opartego na STARTTLS."
 
 #: views/accounts/register/imap-server.hbs:209
-msgid "Test settings"
-msgstr "Sprawdź ustawienia"
+msgid "Verify connection"
+msgstr "Zweryfikuj polaczenie"
 
 #: views/accounts/register/imap-server.hbs:218
-#: views/accounts/register/imap.hbs:51
-msgid "Continue"
-msgstr "Kontynuuj"
+msgid "Save and continue"
+msgstr "Zapisz i kontynuuj"
 
 #: views/accounts/register/imap-server.hbs:226
-msgid "Continue without testing"
-msgstr "Kontynuuj bez testowania"
+msgid "Skip verification"
+msgstr "Pomin weryfikacje"
 
 #: views/accounts/register/imap-server.hbs:241
-msgid "Test failed"
-msgstr "Test nie powiódł się"
+msgid "Connection test failed"
+msgstr "Test polaczenia nie powiodl sie"
 
 #: views/accounts/register/imap-server.hbs:247
-msgid "Failed to validate provided email server settings."
-msgstr "Nie udało się zweryfikować podanych ustawień serwera poczty e-mail."
+msgid "We couldn't connect with these settings. Check the errors below."
+msgstr "Nie udalo sie polaczyc z tymi ustawieniami. Sprawdz bledy ponizej."
 
 #: views/accounts/register/imap-server.hbs:318
-msgid "General Error"
-msgstr "Błąd ogólny"
+msgid "Error"
+msgstr "Blad"
 
 #: views/accounts/register/imap-server.hbs:320
-msgid "Validation Error"
-msgstr "Błąd walidacji"
+msgid "Invalid settings"
+msgstr "Nieprawidlowe ustawienia"
 
 #: views/accounts/register/imap-server.hbs:326
-msgid "Failed to validate IMAP server settings"
-msgstr "Nie udało się zweryfikować ustawień serwera IMAP"
+msgid "Couldn't connect to IMAP server"
+msgstr "Nie udalo sie polaczyc z serwerem IMAP"
 
 #: views/accounts/register/imap-server.hbs:328
-msgid "IMAP Server responded with the following message:"
-msgstr "Serwer IMAP odpowiedział następującym komunikatem:"
+#: views/accounts/register/imap-server.hbs:337
+msgid "Server response:"
+msgstr "Odpowiedz serwera:"
 
 #: views/accounts/register/imap-server.hbs:335
-msgid "Failed to validate SMTP server settings"
-msgstr "Nie udało się zweryfikować ustawień serwera SMTP"
-
-#: views/accounts/register/imap-server.hbs:337
-msgid "SMTP Server responded with the following message:"
-msgstr "Serwer SMTP odpowiedział następującym komunikatem:"
+msgid "Couldn't connect to SMTP server"
+msgstr "Nie udalo sie polaczyc z serwerem SMTP"
 
 #: views/accounts/register/imap-server.hbs:395
-msgid "HTTP error!"
-msgstr "Błąd HTTP!"
-
-#: views/accounts/register/imap.hbs:11
-msgid "Your name"
-msgstr "Twoje imię"
+msgid "Request failed."
+msgstr "Zadanie nie powiodlo sie."
 
-#: views/accounts/register/imap.hbs:17
-msgid "Enter your full name"
-msgstr "Wpisz swoje imię i nazwisko"
-
-#: views/accounts/register/imap.hbs:37
-msgid "Enter your account password"
-msgstr "Wprowadź hasło do konta"
-
-#: lib/routes-ui.js:529
+#: lib/routes-ui.js:532
 msgid "Delegated"
 msgstr "Delegowany"
 
-#: lib/routes-ui.js:530
+#: lib/routes-ui.js:533
 msgid "Using credentials from \"%s\""
 msgstr "Używanie poświadczeń z \"%s\""
 
-#: lib/routes-ui.js:580
+#: lib/routes-ui.js:583
 msgid ""
 "Connection timed out. This usually occurs if you are behind a firewall or "
 "connecting to the wrong port."
@@ -236,11 +236,11 @@ msgstr ""
 "Przekroczono limit czasu połączenia. Zwykle dzieje się tak, gdy użytkownik "
 "znajduje się za zaporą sieciową lub łączy się z niewłaściwym portem."
 
-#: lib/routes-ui.js:583
+#: lib/routes-ui.js:586
 msgid "The server unexpectedly closed the connection."
 msgstr "Serwer nieoczekiwanie zamknął połączenie."
 
-#: lib/routes-ui.js:586
+#: lib/routes-ui.js:589
 msgid ""
 "The server unexpectedly closed the connection. This usually happens when "
 "attempting to connect to a TLS port without TLS enabled."
@@ -248,7 +248,7 @@ msgstr ""
 "Serwer nieoczekiwanie zamknął połączenie. Zwykle dzieje się tak podczas "
 "próby połączenia z portem TLS bez włączonego protokołu TLS."
 
-#: lib/routes-ui.js:591
+#: lib/routes-ui.js:594
 msgid ""
 "The server refused the connection. This typically occurs if the server is "
 "not running, is overloaded, or you are connecting to the wrong host or port."
@@ -256,62 +256,54 @@ msgstr ""
 "Serwer odmówił połączenia. Zwykle dzieje się tak, gdy serwer nie działa, "
 "jest przeciążony lub łączysz się z niewłaściwym hostem lub portem."
 
-#: lib/routes-ui.js:709
+#: lib/routes-ui.js:712
 msgid "Invalid API key for OpenAI"
 msgstr "Nieprawidłowy klucz API dla OpenAI"
 
-#: lib/routes-ui.js:5006 lib/routes-ui.js:6958 lib/routes-ui.js:6969
+#: lib/routes-ui.js:5031 lib/routes-ui.js:6986 lib/routes-ui.js:6997
 msgid "Server hostname was not found"
 msgstr "Nie znaleziono nazwy hosta serwera"
 
-#: lib/routes-ui.js:5009 lib/routes-ui.js:6961 lib/routes-ui.js:6972
+#: lib/routes-ui.js:5034 lib/routes-ui.js:6989 lib/routes-ui.js:7000
 msgid "Invalid username or password"
 msgstr "Nieprawidłowa nazwa użytkownika lub hasło"
 
-#: lib/routes-ui.js:5013 lib/routes-ui.js:6976
+#: lib/routes-ui.js:5038 lib/routes-ui.js:7004
 msgid "TLS protocol error"
 msgstr "Błąd protokołu TLS"
 
-#: lib/routes-ui.js:6705 lib/routes-ui.js:6740 lib/routes-ui.js:6855
-#: lib/routes-ui.js:6902 lib/routes-ui.js:7131 lib/routes-ui.js:7167
-#: workers/api.js:2346
+#: lib/routes-ui.js:6733 lib/routes-ui.js:6768 lib/routes-ui.js:6883
+#: lib/routes-ui.js:6930 lib/routes-ui.js:7159 lib/routes-ui.js:7195
+#: workers/api.js:2407
 msgid "Email Account Setup"
 msgstr "Konfiguracja konta e-mail"
 
-#: lib/routes-ui.js:6765 lib/routes-ui.js:6798 lib/routes-ui.js:9717
-msgid "Failed to validate request arguments"
-msgstr "Nie udało się zweryfikować argumentów żądania"
-
-#: lib/routes-ui.js:6895 lib/routes-ui.js:7160
-msgid "Failed to process account"
-msgstr "Nie udało się przetworzyć konta"
+#: lib/routes-ui.js:6793 lib/routes-ui.js:6826 lib/routes-ui.js:9745
+msgid "Invalid request. Check your input and try again."
+msgstr "Nie udało się zweryfikować argumentów żądania."
 
-#: lib/routes-ui.js:9680 lib/tools.js:795
+#: lib/routes-ui.js:9708 lib/tools.js:794
 msgid "Invalid input"
 msgstr "Nieprawidłowe dane wejściowe"
 
-#: lib/routes-ui.js:9690 lib/routes-ui.js:9808 lib/routes-ui.js:9825
-#: lib/routes-ui.js:9861
+#: lib/routes-ui.js:9718 lib/routes-ui.js:9836 lib/routes-ui.js:9853
+#: lib/routes-ui.js:9889
 msgid "Subscription Management"
 msgstr "Zarządzanie subskrypcjami"
 
-#: lib/routes-ui.js:9819 lib/routes-ui.js:9854
-msgid "Failed to process request"
-msgstr "Nie udało się przetworzyć żądania"
-
-#: workers/api.js:8996 workers/api.js:9112
+#: workers/api.js:9113 workers/api.js:9229
 msgid "Requested page not found"
 msgstr "Nie znaleziono żądanej strony"
 
-#: workers/api.js:8997
+#: workers/api.js:9114
 msgid "Something went wrong"
 msgstr "Ups... Coś poszlo nie tak"
 
-#: lib/tools.js:1494
+#: lib/tools.js:1493
 msgid "Signature validation failed"
 msgstr "Walidacja podpisu nie powiodła się"
 
-#: lib/tools.js:1503 lib/tools.js:1508
+#: lib/tools.js:1502 lib/tools.js:1507
 msgid "Invalid or expired account setup URL"
 msgstr "Nieprawidłowy lub wygasły adres URL konfiguracji konta"
 
@@ -326,3 +318,13 @@ msgstr ""
 "aplikacji) dla kont e-mail w usługach Outlook.com, Hotmail.com i Microsoft "
 "365. Aby kontynuować, użyj przycisku \"Zaloguj się za pomocą Microsoft\", "
 "aby bezpiecznie połączyć swoje konto."
+
+#, fuzzy
+#~| msgid "Failed to process account"
+#~ msgid "Couldn't set up account. Try again."
+#~ msgstr "Nie udało się przetworzyć konta"
+
+#, fuzzy
+#~| msgid "Failed to process request"
+#~ msgid "Couldn't process request. Try again."
+#~ msgstr "Nie udało się przetworzyć żądania"

package/views/account/security.hbs

@@ -113,8 +113,8 @@
                 <form method="post" action="/admin/account/tfa/disable">
                     <input type="hidden" name="crumb" value="{{crumb}}" />
                     <input type="hidden" name="type" value="totp" />
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                    <button type="submit" class="btn btn-danger">Yes, Disable 2FA</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" class="btn btn-danger">Disable 2FA</button>
                 </form>
             </div>
         </div>
@@ -151,7 +151,7 @@
 
                     <input type="hidden" name="crumb" value="{{crumb}}" />
                     <input type="hidden" name="type" value="totp" />
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
                     <button type="submit" class="btn btn-primary">Enable 2FA</button>
                 </div>
             </div>
@@ -177,7 +177,7 @@
                 <div class="modal-footer">
 
                     <input type="hidden" name="crumb" value="{{crumb}}" />
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
                     <button type="submit" class="btn btn-primary"><i
                             class="fas fa-sign-out-alt fa-sm fa-fw mr-2 text-gray-400"></i> Sign Out Everywhere</button>
                 </div>

package/views/accounts/account.hbs

@@ -15,12 +15,12 @@
 
                 <a type="button" class="btn btn-light" href="/admin/accounts/{{account.account}}/edit"
                     title="Edit account configuration" data-toggle="tooltip" data-placement="top">
-                    <i class="fas fa-user-edit fa-fw"></i> Edit
+                    <i class="fas fa-user-edit fa-fw"></i> Edit account
                 </a>
 
                 <button type="button" class="btn btn-light" data-toggle="modal" data-target="#deleteModal"
                     title="Delete this account and all associated data" id="delete-btn" data-placement="top">
-                    <i class="fas fa-trash-alt fa-fw"></i> Delete
+                    <i class="fas fa-trash-alt fa-fw"></i> Delete account
                 </button>
 
                 <button type="button" class="btn btn-light" id="request-reconnect"
@@ -87,7 +87,7 @@
                 {{#if canReadMail}}
                 <a type="button" class="btn btn-light" href="/admin/accounts/{{account.account}}/browse"
                     title="Browse messages" data-toggle="tooltip" data-placement="top">
-                    <i class="fas fa-folder-open fa-fw"></i> Browse
+                    <i class="fas fa-folder-open fa-fw"></i> Browse messages
                 </a>
                 {{/if}}
             </div>
@@ -98,7 +98,7 @@
                     title="Re-authenticate OAuth2 account" id="renew-grant-btn" data-placement="top">
                     {{#if account.type.icon}}
                     <i class="{{account.type.icon}} fa-fw"></i>
-                    {{/if}} Renew grant
+                    {{/if}} Re-authenticate
                 </button>
             </div>
             {{/if}}
@@ -181,7 +181,7 @@
                     <div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
                         <a class="dropdown-item" href="#" id="toggle-logs">{{#if
                             account.logs}}Disable{{else}}Enable{{/if}}</a>
-                        <a class="dropdown-item" href="#" id="flush-logs">Flush stored logs</a>
+                        <a class="dropdown-item" href="#" id="flush-logs">Clear stored logs</a>
                     </div>
                 </div>
 
@@ -787,7 +787,7 @@
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title" id="renewGrantLabel">Renew grant</h5>
+                <h5 class="modal-title" id="renewGrantLabel">Re-authenticate account</h5>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
@@ -805,11 +805,11 @@
                     <input type="hidden" name="type" value="{{account.oauth2.provider}}">
                     <input type="hidden" name="data" value="{{accountForm.data}}">
                     <input type="hidden" name="sig" value="{{accountForm.signature}}">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
                     <button type="submit" class="btn btn-primary">
                         {{#if account.type.icon}}
                         <i class="{{account.type.icon}} fa-fw"></i>
-                        {{/if}} Renew grant
+                        {{/if}} Re-authenticate
                     </button>
                 </form>
             </div>
@@ -821,20 +821,20 @@
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title" id="deleteModalLabel">Delete account</h5>
+                <h5 class="modal-title" id="deleteModalLabel">Delete Account</h5>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
             <div class="modal-body">
-                <p>Are you sure you want to delete the account for {{account.name}}? This action is not
-                    recoverable.</p>
+                <p>Are you sure you want to delete the account for {{account.name}}? This action cannot be
+                    undone.</p>
             </div>
             <div class="modal-footer">
                 <form method="post" action="/admin/accounts/{{account.account}}/delete">
                     <input type="hidden" name="crumb" value="{{crumb}}" />
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                    <button type="submit" class="btn btn-danger">Delete</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" class="btn btn-danger">Delete account</button>
                 </form>
             </div>
         </div>

package/views/accounts/register/imap-server.hbs

@@ -206,7 +206,7 @@
                     <span class="icon text-white-50">
                         <i class="fas fa-question-circle"></i>
                     </span>
-                    <span class="text">{{_ "Test settings" templateLocale }}</span>
+                    <span class="text">{{_ "Verify connection" templateLocale }}</span>
                 </button>
 
                 <div class="btn-group">
@@ -215,7 +215,7 @@
                         <span class="icon text-white-50">
                             <i class="fas fa-arrow-right"></i>
                         </span>
-                        <span class="text">{{_ "Continue" templateLocale }}</span>
+                        <span class="text">{{_ "Save and continue" templateLocale }}</span>
                     </button>
                     <button type="button" id="submit-settings-btn-down"
                         class="btn btn-secondary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"
@@ -223,7 +223,7 @@
                         <span class="sr-only">Toggle Dropdown</span>
                     </button>
                     <div class="dropdown-menu">
-                        <a class="dropdown-item" href="#" id="submit-wo-testing">{{_ "Continue without testing"
+                        <a class="dropdown-item" href="#" id="submit-wo-testing">{{_ "Skip verification"
                             templateLocale }}</a>
                     </div>
                 </div>
@@ -238,13 +238,13 @@
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title" id="testResponseModalLabel">{{_ "Test failed" templateLocale }}</h5>
+                <h5 class="modal-title" id="testResponseModalLabel">{{_ "Connection test failed" templateLocale }}</h5>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
             <div class="modal-body">
-                <p>{{_ "Failed to validate provided email server settings." templateLocale}}</p>
+                <p>{{_ "We couldn't connect with these settings. Check the errors below." templateLocale}}</p>
                 <dl class="row" id="test-errors-list"></dl>
             </div>
             <div class="modal-footer">
@@ -315,26 +315,26 @@
             errorsListElm.innerHTML = '';
 
             if (data.error && !data.fields) {
-                addErrorRow('{{_ "General Error" templateLocale }}', data.error.message || data.error)
+                addErrorRow('{{_ "Error" templateLocale }}', data.error.message || data.error)
             } else if (data.fields) {
-                addErrorRow('{{_ "Validation Error" templateLocale }}', data.message);
+                addErrorRow('{{_ "Invalid settings" templateLocale }}', data.message);
                 for (let field of data.fields) {
                     addErrorRow('-', field.message, 'aaaa', 'bbbbbb');
                 }
             } else {
                 if (!data.imap || !data.imap.success) {
-                    let error = data.imap && data.imap.error || '{{_ "Failed to validate IMAP server settings" templateLocale }}'
+                    let error = data.imap && data.imap.error || '{{_ "Couldn't connect to IMAP server" templateLocale }}'
                     if (data.imap && data.imap.responseText) {
-                        addErrorRow('IMAP', error, '{{_ "IMAP Server responded with the following message:" templateLocale }}', data.imap.responseText);
+                        addErrorRow('IMAP', error, '{{_ "Server response:" templateLocale }}', data.imap.responseText);
                     } else {
                         addErrorRow('IMAP', error);
                     }
                 }
 
                 if (!data.smtp || !data.smtp.success) {
-                    let error = data.smtp && data.smtp.error || '{{_ "Failed to validate SMTP server settings" templateLocale }}'
+                    let error = data.smtp && data.smtp.error || '{{_ "Couldn't connect to SMTP server" templateLocale }}'
                     if (data.smtp && data.smtp.responseText) {
-                        addErrorRow('SMTP', error, '{{_ "SMTP Server responded with the following message:" templateLocale }}', data.smtp.responseText);
+                        addErrorRow('SMTP', error, '{{_ "Server response:" templateLocale }}', data.smtp.responseText);
                     } else {
                         addErrorRow('SMTP', error);
                     }
@@ -392,7 +392,7 @@
                     console.error(err)
                 }
 
-                throw new Error(`{{_ "HTTP error!" templateLocale}} status: ${res.status}`);
+                throw new Error(`{{_ "Request failed." templateLocale}} status: ${res.status}`);
             }
 
             const data = await res.json();

package/views/config/document-store/pre-processing/index.hbs

@@ -52,7 +52,8 @@
                 <div style="line-height: 1; margin-bottom: 10px;">
                     <small>JavaScript code to determine if the email should be stored. If the code evaluates to
                         <code>true</code> then the email is synced to the document store, otherwise it is skipped. The
-                        script includes <code>payload</code> as a global variable that contains the email data.</small>
+                        script includes <code>payload</code> as a global variable that contains the email data.
+                        Use <code>env</code> to access <a href="/admin/config/service#scriptEnv">script variables</a>.</small>
                 </div>
                 <div id="editor-fn" class="code-editor"></div>
                 <div class="editor-embed-block">
@@ -89,7 +90,8 @@
                 <div style="line-height: 1; margin-bottom: 10px;">
                     <small>JavaScript code to modify email payload structure. Protected fields <code>id</code>,
                         <code>account</code>, <code>path</code>, <code>uid</code>, <code>specialUse</code>, and
-                        <code>messageId</code> can not be modified.</small>
+                        <code>messageId</code> cannot be modified.
+                        Use <code>env</code> to access <a href="/admin/config/service#scriptEnv">script variables</a>.</small>
                 </div>
 
                 <div class="row">

package/views/config/oauth/app.hbs

@@ -30,12 +30,12 @@
 
                 <a type="button" class="btn btn-light" href="/admin/config/oauth/edit/{{app.id}}"
                     title="Edit OAuth2 application" data-toggle="tooltip" data-placement="top">
-                    <i class="fas fa-user-edit fa-fw"></i> Edit
+                    <i class="fas fa-user-edit fa-fw"></i> Edit app
                 </a>
 
                 <button type="button" class="btn btn-light" data-toggle="modal" data-target="#deleteModal"
                     title="Delete this application" id="delete-btn" data-placement="top">
-                    <i class="fas fa-trash-alt fa-fw"></i> Delete
+                    <i class="fas fa-trash-alt fa-fw"></i> Delete app
                 </button>
 
             </div>
@@ -280,21 +280,20 @@
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title" id="deleteModalLabel">Delete application</h5>
+                <h5 class="modal-title" id="deleteModalLabel">Delete OAuth2 App</h5>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
             <div class="modal-body">
-                <p>Are you sure you want to delete the OAuth2 application "{{app.name}}"? This action is not
-                    recoverable.</p>
+                <p>Are you sure you want to delete the OAuth2 application "{{app.name}}"? This action cannot be undone.</p>
             </div>
             <div class="modal-footer">
                 <form method="post" action="/admin/config/oauth/delete" class="pending-form">
                     <input type="hidden" name="crumb" value="{{crumb}}" />
                     <input type="hidden" name="app" value="{{app.id}}" />
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                    <button type="submit" class="btn btn-danger"><i class="fas fa-trash-alt"></i> Delete</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" class="btn btn-danger"><i class="fas fa-trash-alt"></i> Delete app</button>
                 </form>
             </div>
         </div>

package/views/config/oauth/index.hbs

@@ -1,7 +1,7 @@
 <div class="float-right">
     <div class="btn-group">
         <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-            <i class="fas fa-plus fa-fw" id="test-smtp-icon"></i> Create new
+            <i class="fas fa-plus fa-fw" id="test-smtp-icon"></i> Create OAuth2 app
         </button>
         <div class="dropdown-menu">
             <a class="dropdown-item" href="{{newLink}}?provider=gmail">Gmail</a>
@@ -135,7 +135,7 @@
             {{#if firstPage}}
             No OAuth2 apps have been registered yet.
             {{else}}
-            Nothing to show here.
+            No OAuth2 apps found.
             {{/if}}
         </p>
     </div>

package/views/config/service.hbs

@@ -445,12 +445,12 @@
 
             <p>Global settings for filter and map functions in <a href="/admin/webhooks">webhook routes</a>.</p>
 
-            <div class="form-group">
+            <div class="form-group" id="scriptEnv">
 
                 <div class="text-muted float-right code-link">[<a href="/admin/swagger#/Settings/postV1Settings"
                         target="_blank" rel="noopener noreferrer">scriptEnv</a>]</div>
 
-                <label>Environment Variables (JSON)</label>
+                <label>Script Variables (JSON)</label>
 
                 <input type="hidden" class="{{#if errors.scriptEnv}}is-invalid{{/if}}" id="scriptEnvElement"
                     name="scriptEnv" value="{{values.scriptEnv}}">
@@ -469,8 +469,7 @@
                 <span class="invalid-feedback">{{errors.scriptEnv}}</span>
                 {{/if}}
 
-                <small class="form-text text-muted">JSON object available as <code>env</code> variable in all webhook
-                    scripts.</small>
+                <small class="form-text text-muted">JSON object available as <code>env</code> variable in all filter and map functions. Use for shared secrets like API keys, access tokens, or configuration values. For example, if set to <code>{"token":"secret123"}</code>, then <code>env.token</code> in your scripts returns <code>"secret123"</code>.</small>
             </div>
 
         </div>

package/views/dashboard.hbs

@@ -52,14 +52,12 @@
                 <div class="col mr-2">
                     <div class="text-xs font-weight-bold text-success text-uppercase mb-1">Welcome to EmailEngine!
                     </div>
-                    <p>To start using EmailEngine, add an email account to the <a href="/admin/accounts">account
-                            registry</a>. Once registered, you can access this account to send
-                        and receive emails using the <a href="/admin/swagger">EmailEngine API</a>.
+                    <p>Get started by connecting your first email account. Once connected, you can send
+                        and receive emails through the <a href="/admin/swagger">API</a>.
                     </p>
-                    <p>You can add email accounts by using the API endpoint for <a
+                    <p class="text-muted small">You can also add accounts programmatically via the <a
                             href="https://api.emailengine.app/#operation/postV1Account" target="_blank"
-                            rel="noopener noreferrer" referrerpolicy="no-referrer">registering
-                            accounts</a> or through the hosted authentication form.
+                            rel="noopener noreferrer" referrerpolicy="no-referrer">API endpoint</a>.
                     </p>
                     <div>
                         <button type="button" class="btn btn-primary btn-icon-split" data-toggle="modal"
@@ -67,7 +65,7 @@
                             <span class="icon text-white-50">
                                 <i class="fas fa-user-plus"></i>
                             </span>
-                            <span class="text">Add an account</span>
+                            <span class="text">Connect your first account</span>
                         </button>
                     </div>
                 </div>