Renamed some Lang Classes + Added some new Strings

data/web/lang/lang.de-de.json

@@ -228,6 +228,7 @@
         "oauth2_renew_secret": "Neues Client Secret generieren",
         "oauth2_revoke_tokens": "Alle Client Tokens entfernen",
         "optional": "Optional",
+        "options": "Einstellungen",
         "password": "Passwort",
         "password_length": "Passwortlänge",
         "password_policy": "Passwortrichtlinie",
@@ -938,16 +939,20 @@
         "type": "Typ"
     },
     "queue": {
-        "delete_queue": "Queue löschen",
-        "flush_queue": "Queue flushen",
-        "queue_ays": "Soll die derzeitige Queue wirklich komplett bereinigt werden?",
-        "queue_command_success": "Queue-Aufgabe erfolgreich ausgeführt",
-        "queue_deliver_mail": "Ausliefern",
-        "queue_hold_mail": "Zurückhalten",
+        "delete": "Queue löschen",
+        "flush": "Queue flushen",
+        "info" : "In der Mailqueue befinden sich alle E-Mails, welche auf eine Zustellung warten. Sollte eine E-Mail eine längere Zeit innerhalb der Mailqueue stecken wird diese automatisch vom System gelöscht.<br>Die Fehlermeldung der jeweiligen Mail gibt aufschluss darüber, warum diese nicht zugestellt werden konnte",
+        "legend": "Funktionen der Mailqueue Aktionen:",
+        "ays": "Soll die derzeitige Queue wirklich komplett bereinigt werden?",
+        "deliver_mail": "Ausliefern",
+        "deliver_mail_legend": "Versucht eine erneute Zustellung der ausgwählten Mails.",
+        "hold_mail": "Zurückhalten",
+        "hold_mail_legend": "Hält die ausgewählten Mails zurück. (Verhindert weitere Zustellversuche)",
         "queue_manager": "Queue Manager",
-        "queue_show_message": "Nachricht anzeigen",
-        "queue_unban": "queue unban",
-        "queue_unhold_mail": "Freigeben"
+        "show_message": "Nachricht anzeigen",
+        "unban": "queue unban",
+        "unhold_mail": "Freigeben",
+        "unhold_mail_legend": "Gibt ausgewählte Mails zur Auslieferung frei. (Erfordert vorheriges Zurückhalten)"
     },
     "start": {
         "help": "Hilfe ein-/ausblenden",

data/web/lang/lang.en-gb.json

@@ -232,6 +232,7 @@
         "oauth2_renew_secret": "Generate new client secret",
         "oauth2_revoke_tokens": "Revoke all client tokens",
         "optional": "optional",
+        "options": "Options",
         "password": "Password",
         "password_length": "Password length",
         "password_policy": "Password policy",
@@ -943,16 +944,20 @@
         "type": "Type"
     },
     "queue": {
-        "delete_queue": "Delete all",
-        "flush_queue": "Flush queue",
-        "queue_ays": "Please confirm you want to delete all items from the current queue.",
-        "queue_command_success": "Queue command completed successfully",
-        "queue_deliver_mail": "Deliver",
-        "queue_hold_mail": "Hold",
+        "delete": "Delete all",
+        "flush": "Flush queue",
+        "info" : "The mail queue contains all e-mails that are waiting for delivery. If an email is stuck in the mail queue for a long time, it is automatically deleted by the system.<br>The error message of the respective mail gives information about why the mail could not be delivered.",
+        "legend": "Mail queue actions functions:",
+        "ays": "Please confirm you want to delete all items from the current queue.",
+        "deliver_mail": "Deliver",
+        "deliver_mail_legend": "Attempts to redeliver selected mails.",
+        "hold_mail": "Hold",
+        "hold_mail_legend": "Holds the selected mails. (Prevents further delivery attempts)",
         "queue_manager": "Queue Manager",
-        "queue_show_message": "Show message",
-        "queue_unban": "queue unban",
-        "queue_unhold_mail": "Unhold"
+        "show_message": "Show message",
+        "unban": "queue unban",
+        "unhold_mail": "Unhold",
+        "unhold_mail_legend": "Releases selected mails for delivery. (Requires prior hold)"
     },
     "ratelimit": {
       "disabled": "Disabled",
@@ -1022,6 +1027,7 @@
         "password_policy_saved": "Password policy was saved successfully",
         "pushover_settings_edited": "Pushover settings successfully set, please verify credentials.",
         "qlearn_spam": "Message ID %s was learned as spam and deleted",
+        "queue_command_success": "Queue command completed successfully",
         "recipient_map_entry_deleted": "Recipient map ID %s has been deleted",
         "recipient_map_entry_saved": "Recipient map entry \"%s\" has been saved",
         "relayhost_added": "Map entry %s has been added",

data/web/templates/admin.twig

@@ -14,7 +14,7 @@
     </li>
 
     <li class="nav-item dropdown">
-      <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false">{{ lang.admin.configuration }}</a>
+      <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false">{{ lang.admin.options }}</a>
       <ul class="dropdown-menu">
         <li><button class="dropdown-item" data-bs-target="#tab-config-dkim" aria-selected="false" aria-controls="tab-config-dkim" role="tab" data-bs-toggle="tab">{{ lang.admin.dkim_keys }}</button></li>
         <li><button class="dropdown-item" data-bs-target="#tab-config-fwdhosts" aria-selected="false" aria-controls="tab-config-fwdhosts" role="tab" data-bs-toggle="tab">{{ lang.admin.forwarding_hosts }}</button></li>

data/web/templates/queue.twig

@@ -9,15 +9,22 @@
       </div>
     </div>
     <div class="card-body">
+      <p class="text-muted">{{ lang.queue.info|raw }}</p>
+      <p class="text-muted"><b>{{ lang.queue.legend|raw }}</b></p>
+      <ul class="text-muted">
+      <li>{{ lang.queue.deliver_mail }} | {{ lang.queue.deliver_mail_legend }}</li>
+      <li>{{ lang.queue.unhold_mail }} | {{ lang.queue.unhold_mail_legend }}</li>
+      <li>{{ lang.queue.hold_mail }} | {{ lang.queue.hold_mail_legend }}</li>
+      </ul>
       <table id="queuetable" class="table table-striped dt-responsive w-100"></table>
       <div class="mass-actions-admin">
         <div class="btn-group">
           <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary" id="toggle_multi_select_all" data-id="mailqitems" href="#"><i class="bi bi-check-all"></i> {{ lang.mailbox.toggle_all }}</a>
           <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary dropdown-toggle" data-bs-toggle="dropdown" href="#">{{ lang.mailbox.quick_actions }}</a>
-          <ul class="dropdown-menu top33">
-            <li><a class="dropdown-item" data-bs-toggle="tooltip" title="postqueue -i" data-action="edit_selected" data-id="mailqitems" data-api-url='edit/mailq' data-api-attr='{"action":"deliver"}' href="#">{{ lang.queue.queue_deliver_mail }}</a></li>
-            <li><a class="dropdown-item" data-bs-toggle="tooltip" title="postsuper -H" data-action="edit_selected" data-id="mailqitems" data-api-url='edit/mailq' data-api-attr='{"action":"unhold"}' href="#">{{ lang.queue.queue_unhold_mail }}</a></li>
-            <li><a class="dropdown-item" data-bs-toggle="tooltip" title="postsuper -h" data-action="edit_selected" data-id="mailqitems" data-api-url='edit/mailq' data-api-attr='{"action":"hold"}' href="#">{{ lang.queue.queue_hold_mail }}</a></li>
+          <ul class="dropdown-menu">
+            <li><a class="dropdown-item" data-bs-toggle="tooltip" title="postqueue -i" data-action="edit_selected" data-id="mailqitems" data-api-url='edit/mailq' data-api-attr='{"action":"deliver"}' href="#">{{ lang.queue.deliver_mail }}</a></li>
+            <li><a class="dropdown-item" data-bs-toggle="tooltip" title="postsuper -H" data-action="edit_selected" data-id="mailqitems" data-api-url='edit/mailq' data-api-attr='{"action":"unhold"}' href="#">{{ lang.queue.unhold_mail }}</a></li>
+            <li><a class="dropdown-item" data-bs-toggle="tooltip" title="postsuper -h" data-action="edit_selected" data-id="mailqitems" data-api-url='edit/mailq' data-api-attr='{"action":"hold"}' href="#">{{ lang.queue.hold_mail }}</a></li>
             <li><hr class="dropdown-divider"></li>
             <li><a class="dropdown-item" data-bs-toggle="tooltip" title="postsuper -d" data-action="delete_selected" data-id="mailqitems" data-api-url='delete/mailq' href="#">{{ lang.mailbox.remove }}</a></li>
           </ul>
@@ -27,7 +34,7 @@
              data-api-url='edit/mailq'
              data-api-attr='{"action":"flush"}'
              data-bs-toggle="tooltip" title="postqueue -f"
-             href="#"><i class="bi bi-check-all"></i> {{ lang.queue.flush_queue }}</a>
+             href="#"><i class="bi bi-check-all"></i> {{ lang.queue.flush }}</a>
           <a class="btn btn-sm d-block d-sm-inline btn-danger"
              id="super_delete"
              data-action="edit_selected"
@@ -35,7 +42,7 @@
              data-api-url='edit/mailq'
              data-api-attr='{"action":"super_delete"}'
              data-bs-toggle="tooltip" title="postsuper -d ALL"
-             href="#"><i class="bi bi-trash"></i> {{ lang.queue.delete_queue }}</a>
+             href="#"><i class="bi bi-trash"></i> {{ lang.queue.delete }}</a>
         </div>
       </div>
     </div>