From 7cdf62e095977397ca87e27b612d45a45a13a048 Mon Sep 17 00:00:00 2001 From: iliajie Date: Wed, 19 Jul 2023 14:13:33 +0300 Subject: [PATCH 1/2] Fix to display special tags as teletype text --- mailbox/uconfig.info | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mailbox/uconfig.info b/mailbox/uconfig.info index 36cb1f38..c1a67ba9 100644 --- a/mailbox/uconfig.info +++ b/mailbox/uconfig.info @@ -2,7 +2,7 @@ line0=Mail list,11 perpage=Mail messages to display per page,0,5 top_buttons=Show buttons at top for,1,2-Mailboxes and mails,1-Mailboxes only,0-Never arrows=Show pager arrows at bottom for,1,2-Mailboxes and mails,1-Mailboxes only,0-Never -show_to=Show To: address in mailboxes?,1,1-Yes,0-No +show_to=Show To: address in mailboxes?,1,1-Yes,0-No refresh=Seconds between automatic mailbox refreshes,3,Don't refresh open_mode=Open messages in,1,1-New window,0-List window show_body=Show message body previews in list?,1,1-Yes,0-No @@ -14,7 +14,7 @@ wrap_width=Width to wrap displayed mail messages at,0,5 auto_mark=Automatically mark read messages?,1,1-Yes,0-No view_html=Show message body as,4,0-Always plain text,1-Text if possible, HTML otherwise,2-HTML if possible, text otherwise,3-Convert HTML to plain text view_images=Show inline images by default?,1,0-Yes, client fetched,3-Yes, server fetched,1-No external images,2-No -head_html=Include HTML from message <head> section on page?,1,1-Yes,0-No +head_html=Include HTML from message <head> section on page?,1,1-Yes,0-No check_mod=Check for mailbox modification when deleting mail?,1,1-Yes,0-No link_mode=Open links in,1,1-New window,0-Same window @@ -23,7 +23,7 @@ wrap_compose=Width to wrap composed mail messages at,10,-Don't wrap,80-80 column send_buttons=Show mail sending buttons,1,1-At top and bottom,0-At bottom only html_edit=Use HTML editor for composing?,4,2-Always,1-When replying to HTML email,0-Never html_edit_mode=HTML editor toolbar mode?,4,basic-Basic,simple-Simple,advanced-Advanced -html_quote=HTML quoting mode,1,1-Message below <hr>,0-Message inside <blockquote> +html_quote=HTML quoting mode,1,1-Message below <hr>,0-Message inside <blockquote> nospellcheck=Show spell checking option?,1,0-Yes,1-No spell_check=Enable spell checking by default?,1,1-Yes,0-No cc_tabs=Show To CC and BCC addresses,1,1-On the same tab,0-On separate tabs @@ -31,15 +31,15 @@ cc_tabs=Show To CC and BCC addresses,1,1-On the same tab,0-On separate tabs line1=Sending email,11 no_mime=Send text-only messages when possible?,1,1-Yes,0-No save_sent=Save sent mail?,1,1-Yes,0-No -real_name=Include real name in From: address?,1,1-Yes,0-No +real_name=Include real name in From: address?,1,1-Yes,0-No charset=Character set for sent mail,3,From selected language sig_file=Signature file,10,*-None,.signature-~/.signature,Other file sig_mode=Insert signature,1,0-At bottom,1-At top fwd_mode=Forward messages with quoting?,1,0-Yes,1-No -from_in_to=Show From: addresses when selecting a To: address?,1,1-Yes,0-No +from_in_to=Show From: addresses when selecting a To: address?,1,1-Yes,0-No sort_addrs=Sort address book by,1,0-Order added,1-Real name,2-Email address -reply_to=Reply-to: address,10,x-None,*-Choose when sending,Address.. -bcc_to=Bcc: sent messages to,0 +reply_to=Reply-to: address,10,x-None,*-Choose when sending,Address.. +bcc_to=Bcc: sent messages to,0 add_abook=Add email recipients to address book?,1,1-Yes,0-No real_expand=Lookup real names when sending?,1,1-Yes,0-No force_subject=Action if sent email subject is missing,10,-Do nothing,error-Display error,Set to From c2687fdb27fc560613b41370035082ffdc20f9e4 Mon Sep 17 00:00:00 2001 From: iliajie Date: Wed, 19 Jul 2023 14:20:20 +0300 Subject: [PATCH 2/2] Fix to display special tags as teletype text --- mailbox/config.info | 8 ++++---- mailbox/ulang/en | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mailbox/config.info b/mailbox/config.info index 03a0bb15..22b5e97e 100644 --- a/mailbox/config.info +++ b/mailbox/config.info @@ -23,10 +23,10 @@ no_mailer=Include Webmin version in X-Mailer header?,1,0-Yes,1-No html_base64=Encoding for HTML email,1,2-Base64,1-Quoted Printable,0-Automatic line3=User From addresses,11 -server_name=Default hostname for From: addresses,10,-From real hostname,*-From URL,ldap-Lookup in LDAP -edit_from=Allow editing of From: address,1,1-Yes,0-No (always username@hostname),2-Only the username part -from_map=From: address mapping file,3,None -from_format=Address mapping file format,1,0-Username to address (genericstable),1-Address to username (virtusertable) +server_name=Default hostname for From: addresses,10,-From real hostname,*-From URL,ldap-Lookup in LDAP +edit_from=Allow editing of From: address,1,1-Yes,0-No (always username@hostname),2-Only the username part +from_map=From: address mapping file,3,None +from_format=Address mapping file format,1,0-Username to address (genericstable),1-Address to username (virtusertable) line3.5=LDAP options,11 ldap_host=LDAP server,3,Not used diff --git a/mailbox/ulang/en b/mailbox/ulang/en index 4f754e32..eb747f6d 100644 --- a/mailbox/ulang/en +++ b/mailbox/ulang/en @@ -153,7 +153,7 @@ edit_sent=Sent mail file or directory edit_sent1=Usermin default edit_sent0=External mail file or directory edit_perpage=Messages to display per page -edit_sentview=Show To: address instead of From: ? +edit_sentview=Show To: address instead of From:? edit_pop3=POP3 account edit_imap=IMAP mailbox edit_server=POP3 server @@ -165,7 +165,7 @@ edit_pass=Password on server edit_mailbox=IMAP mailbox edit_imapinbox=User's inbox edit_imapother=Other mailbox -edit_fromaddr=From: address for messages sent from folder +edit_fromaddr=From: address for messages sent from folder edit_hide=Hide from folder menu? edit_comps=Sub-folders, oldest first edit_comp=Composite