1.1 --- a/debian/masqmail.templates	Fri Sep 26 17:05:23 2008 +0200
     1.2 +++ b/debian/masqmail.templates	Fri Sep 26 20:56:23 2008 +0200
     1.3 @@ -1,34 +1,7 @@
     1.4 -Template: masqmail/note_moved_tpl
     1.5 -Type: note
     1.6 -Description: Failure notice templates have been moved
     1.7 - The delivery failure notices that lived in /etc/masqmail/tpl are now in
     1.8 - /usr/share/masqmail/tpl/.
     1.9 - .
    1.10 - You will notice this only if you have changed the location in
    1.11 - masqmail.conf or changed the templates.
    1.12 - .
    1.13 - Since they are no longer conffiles because of the move, you should
    1.14 - give a customized version another name, otherwise it will be
    1.15 - overwritten on the next upgrade.
    1.16 -
    1.17 -Template: masqmail/note_pcmcia_scripts
    1.18 -Type: note
    1.19 -Description: Removed executable bit in scripts in /etc/pcmcia/ip-{up,down}.d/
    1.20 - The scripts in /etc/pcmcia/ip-{up,down}.d/ are deprecated
    1.21 - and are replaced with the scripts /etc/network/if-{up,down}.d/1masqmail, which
    1.22 - will work for _any_ network card (not just pcmcia). The executable bit of the
    1.23 - old scripts has been removed, because otherwise they and the new scripts would be
    1.24 - exececuted, which is not desired.
    1.25 - .
    1.26 - You should remove these scripts from /etc/pcmcia/ip-{up,down}.d/. If you still want
    1.27 - to use them, just reset the executable bit.
    1.28 - .
    1.29 - Whatever you do, you will never see the note again.
    1.30 -
    1.31  Template: masqmail/manage_config_with_debconf
    1.32  Type: boolean
    1.33  Default: true
    1.34 -Description: Manage masqmail.conf using debconf?
    1.35 +_Description: Manage masqmail.conf using debconf?
    1.36   The /etc/masqmail/masqmail.conf file can be handled automatically
    1.37   by debconf, or manually by you.
    1.38   .
    1.39 @@ -39,7 +12,7 @@
    1.40  Template: masqmail/move_existing_nondebconf_config
    1.41  Type: boolean
    1.42  Default: false
    1.43 -Description: Replace existing /etc/masqmail/masqmail.conf file?
    1.44 +_Description: Replace existing /etc/masqmail/masqmail.conf file?
    1.45   The existing /etc/masqmail/masqmail.conf file currently on the system does
    1.46   not contain a marked section for debconf to write its data.
    1.47   .
    1.48 @@ -53,28 +26,27 @@
    1.49  Template: masqmail/host_name
    1.50  Type: string
    1.51  Default:
    1.52 -Description: The name with which masqmail identifies itself to others
    1.53 +_Description: Masqmail host name:
    1.54 + Please enter the name used by masqmail to identify itself to others.
    1.55   This is most likely your hostname. It is used in its SMTP greeting
    1.56   banner, for expanding unqualified addresses, the Message ID and so on.
    1.57  
    1.58  Template: masqmail/local_hosts
    1.59  Type: string
    1.60 -Default:
    1.61 -Description: hosts considered local
    1.62 - This is a list of hosts, separated with semicolons (;), which are
    1.63 - considered 'local', ie. mail to this host will be delivered to a
    1.64 +_Description: Hosts considered local:
    1.65 + Please enter a list of hosts, separated with semicolons (;), which are
    1.66 + considered 'local', ie. mail to these hosts will be delivered to a
    1.67   mailbox (or Maildir or MDA) on this host.
    1.68   .
    1.69   You will most likely insert 'localhost', your hostname in its fully
    1.70 - qualified version, and just the simple hostname here.
    1.71 + qualified form and just the simple hostname here.
    1.72   .
    1.73   You can also use wildcard expressions like '*' and '?'.
    1.74  
    1.75  Template: masqmail/local_nets
    1.76  Type: string
    1.77 -Default:
    1.78 -Description: nets considered local, for immediate delivery attempts
    1.79 - This is a list of hosts, separated with semicolons (;), which are
    1.80 +_Description: Nets considered local:
    1.81 + Please enter a list of hosts, separated with semicolons (;), which are
    1.82   on your local network, ie. they are always reachable, without a
    1.83   dialup connection. Mail to these hosts will be delivered immediately,
    1.84   without checking for the online status.
    1.85 @@ -83,35 +55,36 @@
    1.86   .
    1.87   If you have only one box, you can leave this empty. If you do not want
    1.88   to use masqmail as an offline MTA, and the whole internet or another mail
    1.89 - server which accepts outgoing mail is all time
    1.90 + server which accepts outgoing mail is at all times
    1.91   reachable to you, just insert '*'.
    1.92  
    1.93  Template: masqmail/listen_addresses
    1.94  Type: string
    1.95  Default: localhost:25
    1.96 -Description: accept connections on these interfaces
    1.97 - masqmail, for security reasons, does not listen an all network interfaces
    1.98 - by default. If there are no other hosts connected to your host, just leave
    1.99 - this 'localhost:25'. If there are other hosts that may want to send SMTP
   1.100 - messages to this host, add the address of you network interface here,
   1.101 - eg.: localhost:25;192.168.1.2:25.
   1.102 +_Description: Interfaces for incoming connections:
   1.103 + Masqmail, for security reasons, does not listen an all network
   1.104 + interfaces by default. If there are no other hosts connected to your
   1.105 + host, just leave the default 'localhost:25' value. If there are other
   1.106 + hosts that may want to send SMTP messages to this host, add the
   1.107 + address of your network interface here, eg.:
   1.108 + localhost:25;192.168.1.2:25.
   1.109   .
   1.110 - Of course you can also replace the '25' with another port number, but
   1.111 + Of course you can also replace the '25' with another port number, however
   1.112   this is unusual.
   1.113  
   1.114  Template: masqmail/use_syslog
   1.115  Type: boolean
   1.116  Default: false
   1.117 -Description: use syslogd for logs?
   1.118 +_Description: Use syslogd for logs?
   1.119   You can decide whether masqmail should log via syslog or not. If not,
   1.120   logs will be written to /var/log/masqmail/masqmail.log.
   1.121  
   1.122  Template: masqmail/online_detect
   1.123  Type: select
   1.124 -Choices: file, pipe
   1.125 +__Choices: file, pipe
   1.126  Default: file
   1.127 -Description: the online detection method
   1.128 - masqmail has different methods to determine whether it is online or not,
   1.129 +_Description: Online detection method:
   1.130 + Masqmail has different methods to determine whether it is online or not,
   1.131   these are 'file','pipe'.
   1.132   .
   1.133   For 'file', masqmail checks for the existence of a file, and, if it
   1.134 @@ -123,21 +96,23 @@
   1.135  Template: masqmail/online_file
   1.136  Type: string
   1.137  Default: /var/run/masqmail-route
   1.138 -Description: the name of the file to determine the online status
   1.139 +_Description: File used to determine the online status:
   1.140  
   1.141  Template: masqmail/online_pipe
   1.142  Type: string
   1.143  Default:
   1.144 -Description: the name of the program to determine the online status
   1.145 - Note that, when this program is called, masqmail has the user id 'mail'.
   1.146 +_Description: Name of the program used to determine the online status:
   1.147 + Please choose the program to use to determine the online
   1.148 + status. Please note that, when this program is called, masqmail has
   1.149 + the user id 'mail'.
   1.150  
   1.151  Template: masqmail/mbox_default
   1.152  Type: select
   1.153  Choices: mbox, mda, maildir
   1.154  Default: mbox
   1.155 -Description: local delivery style
   1.156 +_Description: Local delivery style:
   1.157   Local mail can be delivered to a mailbox, to an MDA (eg. procmail)
   1.158 - or to a qmail style maildir in the users home dir.
   1.159 + or to a qmail style Maildir in the users home dir.
   1.160   .
   1.161   You can select the default style here. You can configure this also
   1.162   on a per-user basis with the options mbox_users, mda_users and
   1.163 @@ -146,53 +121,51 @@
   1.164  Template: masqmail/mda
   1.165  Type: string
   1.166  Default: /usr/bin/procmail -Y -d ${rcpt_local}
   1.167 -Description: The MDA command line including options
   1.168 - Give here the path to the mda, including its arguments. You can use
   1.169 - substitution values here, eg. ${rcpt_local} for the user name.
   1.170 +_Description: MDA command line (including options):
   1.171 + Please choose the path to the mail delivery agent (MDA), including
   1.172 + its arguments. You can use substitution values here,
   1.173 + eg. ${rcpt_local} for the user name.
   1.174   .
   1.175   For other substitutions please see the man page.
   1.176   .
   1.177 - (This question is also asked if you did not set mbox_default to mda,
   1.178 - since you can use mda for a set of users specially)
   1.179 + This question is also asked if you did not set mbox_default to mda,
   1.180 + since you can use mda for a set of users specially.
   1.181  
   1.182  Template: masqmail/alias_local_caseless
   1.183  Type: boolean
   1.184  Default: false
   1.185 -Description: Alias expansion regarding case or not
   1.186 - masqmail uses the file /etc/aliases to redirect local addresses.
   1.187 +_Description: Alias expansion regarding case or not:
   1.188 + Masqmail uses the file /etc/aliases to redirect local addresses.
   1.189   The search for a match in /etc/aliases can be regarding upper/lower
   1.190   case or insensitive to case.
   1.191  
   1.192  Template: masqmail/init_smtp_daemon
   1.193  Type: boolean
   1.194  Default: true
   1.195 -Description: Start SMTP listening daemon?
   1.196 - Select 'yes' if you want masqmail to start as an SMTP listening
   1.197 +_Description: Start SMTP listening daemon?
   1.198 + Please choose whether you want masqmail to start as an SMTP listening
   1.199   daemon. You will need this if:
   1.200 - .
   1.201 - - there are other hosts in your local network that may want to send mail via this host
   1.202 - .
   1.203 - - you use a mail client that sends mail via SMTP (netscape, mozilla are examples)
   1.204 - .
   1.205 - If in doubt, select 'yes'.
   1.206 +  - there are other hosts in your local network that may want to send
   1.207 +    mail via this host
   1.208 +  - you use a mail client that sends mail via SMTP (netscape,
   1.209 +    mozilla are examples)
   1.210  
   1.211  Template: masqmail/init_queue_daemon
   1.212  Type: boolean
   1.213  Default: true
   1.214 -Description: Start SMTP queue running daemon?
   1.215 - Select 'yes' if you want masqmail to start as a queue running daemon. You will
   1.216 - need this very likely. It is used for mail that cannot delivered immediately,
   1.217 - either because of delivery failures or because you were not online on
   1.218 - the first attempt to send a mail.
   1.219 - .
   1.220 - If in doubt, select 'yes'.
   1.221 +_Description: Start SMTP queue running daemon?
   1.222 + Please choose this option if you want masqmail to start as a queue
   1.223 + running daemon. You're very likely to need this. It is used for mail
   1.224 + that cannot delivered immediately, either because of delivery
   1.225 + failures or because you were not online on the first attempt to send
   1.226 + a mail.
   1.227  
   1.228  Template: masqmail/queue_daemon_ival
   1.229  Type: string
   1.230  Default: -q10m
   1.231 -Description: The interval for the queue running daemon
   1.232 - Set the interval for the queue running daemon. -q10m means flush the queue every
   1.233 - 10 minutes.
   1.234 +_Description: Interval for the queue running daemon:
   1.235 + Please choose the interval for the queue running daemon. -q10m means
   1.236 + flush the queue every 10 minutes.
   1.237   .
   1.238   The format is -q, followed by an numeric value and one of the letters s,m,h,d,w for
   1.239   seconds, minutes, hours, days or weeks respectively.
   1.240 @@ -202,10 +175,11 @@
   1.241  Template: masqmail/init_fetch_daemon
   1.242  Type: boolean
   1.243  Default: false
   1.244 -Description: Start POP3 fetch daemon?
   1.245 - Select 'yes' if you want masqmail to start as a fetch daemon. If you say 'yes',
   1.246 - masqmail will try to fetch mail from pop servers that you configure in regular
   1.247 - intervals, detecting the online status first.
   1.248 +_Description: Start POP3 fetch daemon?
   1.249 + Please choose this option if you want masqmail to start as a fetch
   1.250 + daemon. If you do so, masqmail will try to fetch mail from POP3
   1.251 + servers that you configure in regular intervals, detecting the online
   1.252 + status first.
   1.253   .
   1.254   No matter what you choose here, you can later select whether you want to fetch
   1.255   mail the moment you get online.
   1.256 @@ -213,9 +187,8 @@
   1.257  Template: masqmail/fetch_daemon_ival
   1.258  Type: string
   1.259  Default: -go5m
   1.260 -Description: The interval for the fetch daemon
   1.261 - Set the interval for the fetch daemon. -go5m means try to fetch mail every
   1.262 - 5 minutes.
   1.263 +_Description: Interval for the fetch daemon:
   1.264 + Please choose the interval for the fetch daemon.
   1.265   .
   1.266   The format is -go, followed by an numeric value and one of the letters s,m,h,d,w for
   1.267   seconds, minutes, hours, days or weeks respectively.
   1.268 @@ -225,43 +198,30 @@
   1.269  Template: masqmail/ipup_runqueue
   1.270  Type: boolean
   1.271  Default: true
   1.272 -Description: flush mail queue when you get online?
   1.273 - Select 'yes' if you want masqmail to immediately flush its mail queue as soon
   1.274 - as you go online. This will be done in the ip-up script in /etc/ppp/ip-up or
   1.275 - in /etc/network/if-up.d/.
   1.276 +_Description: Flush mail queue when you get online?
   1.277 + Please choose whether you want masqmail to immediately flush its mail
   1.278 + queue as soon as you go online. This will be done in the ip-up script
   1.279 + in /etc/ppp/ip-up or in /etc/network/if-up.d/.
   1.280  
   1.281  Template: masqmail/ipup_fetch
   1.282  Type: boolean
   1.283  Default: false
   1.284 -Description: fetch mail when you get online?
   1.285 - Select 'yes' if you want masqmail to immediately fetch mail from POP3
   1.286 - servers as soon as you go online. This will be done in the ip-up script
   1.287 - in /etc/ppp/ip-up or in /etc/network/if-up.d/.
   1.288 +_Description: Fetch mail when you get online?
   1.289 + Please choose whether you want masqmail to immediately fetch mail
   1.290 + from POP3 servers as soon as you go online. This will be done in the
   1.291 + ip-up script in /etc/ppp/ip-up or in /etc/network/if-up.d/.
   1.292  
   1.293  Template: masqmail/ifup_ifaces
   1.294  Type: string
   1.295  Default: all
   1.296 -Description: a list of interfaces used for masqmail online detection
   1.297 - Set this to a list of network interfaces. When any of those interfaces go
   1.298 - up, the current online status will be used for queue runs and/or fetching
   1.299 - mails. The list will be used in the /etc/ppp/ip-up and /etc/network/if-up.d/
   1.300 - scripts, when the interface goes up.
   1.301 +_Description: List of interfaces used for masqmail online detection:
   1.302 + Please choose a list of network interfaces which will trigger queue
   1.303 + runs and/or fetching mails when going up. The list will be used in
   1.304 + the /etc/ppp/ip-up and /etc/network/if-up.d/ scripts, when the
   1.305 + interface goes up.
   1.306   .
   1.307   A reasonable choice is eg. 'ppp0' for a desktop at home, or 'ppp0 eth0' for
   1.308 - a notebook". If this is set to eg. 'ppp0', nothing happens if eth0 goes up.
   1.309 + a notebook.
   1.310   .
   1.311   Set to 'all' for all interfaces, or 'none' for no interfaces.
   1.312  
   1.313 -Template: masqmail/you_are_not_finished
   1.314 -Type: note
   1.315 -Description: You are not finished
   1.316 - Although masqmail is not as feature rich as other MTAs like sendmail
   1.317 - or exim, this debconf does not (yet) do all configurations for you.
   1.318 - .
   1.319 - To make use of masqmail, you still have to create some sub configuration
   1.320 - files for sending mail to some ISP and/or to fetch mail. masqmail has
   1.321 - lots of man pages and examples which are hopefully clear enough to
   1.322 - explain to you how to do it.
   1.323 - .
   1.324 - You should start with the man pages masqmail.conf, masqmail.route
   1.325 - and masqmail.get.