[Phpgroupware-cvs] email/setup/phpgw_en.lang, 1.18.2.8

[nomail]

Update of /email/setup
Modified Files:
        Branch: Version-0_9_16-branch
          phpgw_en.lang

date: 2004/11/06 16:13:48;  author: powerstat;  state: Exp;  lines: +3 -3

Log Message:
replaced <br> with <br /> and <hr> with <hr /> for better w3c compatibility
=====================================================================
Index: email/setup/phpgw_en.lang
diff -u email/setup/phpgw_en.lang:1.18.2.7 email/setup/phpgw_en.lang:1.18.2.8
--- email/setup/phpgw_en.lang:1.18.2.7  Sat Oct  9 12:43:32 2004
+++ email/setup/phpgw_en.lang   Sat Nov  6 16:13:48 2004
@@ -317,9 +317,9 @@
 then do this   email   en      Then do this
 then take this actions email   en      Then take this actions
 there is no text or other part of the email to display to the user, all 
part(s) are attachments.       email   en      There is no text or other part 
of the email to display to the user, all part(s) are attachments.
-there was an error trying to connect to your imap server.<br>please contact 
your admin to check the servername, username or password.  email   en      
There was an error trying to connect to your IMAP server.<br>Please contact 
your admin to check the servername, username or password.
-there was an error trying to connect to your mail server.<br>please, check 
your username and password, or contact your admin.  email   en      There was 
an error trying to connect to your mail server.<br>Please, check your username 
and password, or contact your admin.
-there was an error trying to connect to your pop3 server.<br>please contact 
your admin to check the servername, username or password.  email   en      
There was an error trying to connect to your POP3 server.<br>Please contact 
your admin to check the servername, username or password.
+there was an error trying to connect to your imap server.<br />please contact 
your admin to check the servername, username or password.        email   en     
 There was an error trying to connect to your IMAP server.<br />Please contact 
your admin to check the servername, username or password.
+there was an error trying to connect to your mail server.<br />please, check 
your username and password, or contact your admin.        email   en      There 
was an error trying to connect to your mail server.<br />Please, check your 
username and password, or contact your admin.
+there was an error trying to connect to your pop3 server.<br />please contact 
your admin to check the servername, username or password.        email   en     
 There was an error trying to connect to your POP3 server.<br />Please contact 
your admin to check the servername, username or password.
 this confusing and often misunderstood option is left over from this email 
apps origins as aeromail by mark cushman. when viewing a list of emails in a 
folder, the from column may show you a) the senders name only, if a name was 
provided, b) the senders from email address, in addition to the senders name, 
or c) the senders reply to address if it is different from the senders from 
address, in addition to the senders name if it was provided. typically users 
set this to none, which will show only the senders name. if no name was 
supplied by the sender, then the senders from email address will be shown, 
whether a seperate reply to address is provided has no effect on this, the from 
address is always used if the senders name is not provided.     email   en      
This confusing and often misunderstood option is left over from this email apps 
origins as Aeromail by Mark Cushman. When viewing a list of emails in a folder, 
the FROM column may show you a) the senders name only, if a name was prov
 ided, b) the senders From email address, in addition to the senders name, or 
c) the senders reply to address if it is different from the senders from 
address, in addition to the senders name if it was provided. Typically users 
set this to none, which will show only the senders name. If no name was 
supplied by the sender, then the senders FROM email address will be shown, 
whether a seperate reply to address is provided has no effect on this, the FROM 
address is always used if the senders name is not provided.
 this data not supplied.        email   en      This data not supplied
 this folder is empty   email   en      This folder is empty