From a71cc759f6f7efc29d1fc2d01cbb674f96747540 Mon Sep 17 00:00:00 2001 From: DerLinkman Date: Mon, 12 Dec 2022 11:58:40 +0100 Subject: [PATCH] Renamed some Lang Classes + Added some new Strings --- data/web/lang/lang.de-de.json | 23 ++++++++++++++--------- data/web/lang/lang.en-gb.json | 24 +++++++++++++++--------- data/web/templates/admin.twig | 2 +- data/web/templates/queue.twig | 19 +++++++++++++------ 4 files changed, 43 insertions(+), 25 deletions(-) diff --git a/data/web/lang/lang.de-de.json b/data/web/lang/lang.de-de.json index 0a37321f..96ea99fd 100644 --- a/data/web/lang/lang.de-de.json +++ b/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.
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", diff --git a/data/web/lang/lang.en-gb.json b/data/web/lang/lang.en-gb.json index 90b208fc..ce6e2cf8 100644 --- a/data/web/lang/lang.en-gb.json +++ b/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.
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", diff --git a/data/web/templates/admin.twig b/data/web/templates/admin.twig index f3408928..863f87e9 100644 --- a/data/web/templates/admin.twig +++ b/data/web/templates/admin.twig @@ -14,7 +14,7 @@
  • - +