diff options
Diffstat (limited to 'postfix_wizard')
| -rwxr-xr-x | postfix_wizard/Postfix.pm | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/postfix_wizard/Postfix.pm b/postfix_wizard/Postfix.pm index 5b74a00e..3a04077e 100755 --- a/postfix_wizard/Postfix.pm +++ b/postfix_wizard/Postfix.pm @@ -47,7 +47,7 @@ $o->{pages} = { next => 'config' }, config => { - name => N("Outgoing Mail Address") . "\n\n" . N("You can select the kind of address that outgoing mail will show in the \"From:\" and \"Reply-to\" field.") . "\n\n" . N("This should be chosen consistently with the address you use for incoming mail."), + name => N("Outgoing Mail Address") . "\n\n" . N('You can select the kind of address that outgoing mail will show in the "From:" and "Reply-to" field.') . "\n\n" . N("This should be chosen consistently with the address you use for incoming mail."), pre => sub { $o->{var}{wiz_mail_masquerade} ||= get_mail_masquerade(); }, @@ -58,20 +58,16 @@ $o->{pages} = { next => 'isp' }, warning => { - name => N("Warning:"), - data => [ - { label => N("You entered an empty address for the mail gateway.") }, - { label => N("Your choice can be accepted, but this will not allow you to send mail outside your local network. Press next to continue, or back to enter a value.") } + name => N("Warning:") . "\n\n" . N("You entered an empty address for the mail gateway.") . "\n\n" . N("Your choice can be accepted, but this will not allow you to send mail outside your local network. Press next to continue, or back to enter a value.") } ], next => 'summary' }, masquerade_not_good => { - name => N("Error."), - data => [ { label => N("Masquerade not good!") } ], + name => N("Error.") . "\n\n" . N("Masquerade not good!"), next => 'config' }, isp => { - name => N("Internet Mail Gateway") . "\n\n" . N("Your server will send the outgoing through a mail gateway, that will take care of the final delivery.") . "\n\n" . N("Internet host names must be in the form \"host.domain.domaintype\"; for example, if your provider is \"provider.com\", the internet mail server is usually \"smtp.provider.com\"."), + name => N("Internet Mail Gateway") . "\n\n" . N('Your server will send the outgoing through a mail gateway, that will take care of the final delivery.') . "\n\n" . N('Internet host names must be in the form "host.domain.domaintype"; for example, if your provider is "provider.com", the internet mail server is usually "smtp.provider.com".'), pre => sub { $o->{var}{wiz_ext_mail_relay} ||= get_mail_relay(); }, @@ -91,8 +87,7 @@ $o->{pages} = { next => 'end' }, end => { - name => N("Congratulations"), - data => [ { label => N("The wizard successfully configured your Internet Mail service of your server.") } ], + name => N("Congratulations") . "\n\n" . N("The wizard successfully configured your Internet Mail service of your server."), end => 1, next => 0 }, |