Mailinglist Archive: yast-commit (275 mails)

< Previous Next >
[yast-commit] r67785 - in /trunk/mail: package/yast2-mail.changes src/mail-server_helps.ycp src/mail.ycp src/ui.ycp src/widgets.ycp
Author: jsuchome
Date: Thu Mar 29 15:24:22 2012
New Revision: 67785

URL: http://svn.opensuse.org/viewcvs/yast?rev=67785&view=rev
Log:
- merged proofread texts


Modified:
trunk/mail/package/yast2-mail.changes
trunk/mail/src/mail-server_helps.ycp
trunk/mail/src/mail.ycp
trunk/mail/src/ui.ycp
trunk/mail/src/widgets.ycp

Modified: trunk/mail/package/yast2-mail.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/mail/package/yast2-mail.changes?rev=67785&r1=67784&r2=67785&view=diff
==============================================================================
--- trunk/mail/package/yast2-mail.changes (original)
+++ trunk/mail/package/yast2-mail.changes Thu Mar 29 15:24:22 2012
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Thu Mar 29 15:24:06 CEST 2012 - jsuchome@xxxxxxx
+
+- merged proofread texts
+
+-------------------------------------------------------------------
Wed Jan 25 14:42:40 UTC 2012 - varkoly@xxxxxxxx

- bnc#743369 - yast2 mail module does not open the firewall

Modified: trunk/mail/src/mail-server_helps.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_helps.ycp?rev=67785&r1=67784&r2=67785&view=diff
==============================================================================
--- trunk/mail/src/mail-server_helps.ycp (original)
+++ trunk/mail/src/mail-server_helps.ycp Thu Mar 29 15:24:22 2012
@@ -25,7 +25,7 @@

/* Setup dialog help 1/1 */
"setup" : _("<p><b><big>Set Up Mail Server Configuration</big></b><br>
-Please wait...<br></p>
+</p>
") ,
/* Read dialog help 1/2 */
"read" : _("<p><b><big>Initializing Mail Server Configuration</big></b><br>
@@ -85,18 +85,18 @@
") +
/* MailPrevention dialog help 2/3 */
_("<p><b><big>Start Virus Scanner AMAVIS:</big></b><br>
-If you start the virus scanner AMAVIS, your e-mails will be scanned for
viruses and and for spam.
+If you start the virus scanner AMAVIS, your emails will be scanned for viruses
and and for spam.
The virus scanner engine <b>Clamavd</b> and the spam finder
<b>SpamAssassin</b> will be installed
-and configured too. You can also install other (commercial) virus scanner
engines.
+and configured as well. You can also install other (commercial) virus scanner
engines.
</p>
") +
/* MailPrevention dialog help 3/3 */
_("<p><b><big>Configure Spam Learning Extension:</big></b><br>
The spam learning extension can only be configured if the local delivery
method is <b>cyrus imapd</b>.
-In this case the shared folders <b>NewSpam</b> and <b>NoSpam</b> will be
created. Spam e-mail
+In this case the shared folders <b>NewSpam</b> and <b>NoSpam</b> will be
created. Spam email
which was not detected by <b>SpamAssassin</b> should be put into the folder
<b>NewSpam</b>.
-If you want your spam finder to be most effective you should also put non spam
e-mail into
-the folder <b>NoSpam</b>. The e-mails in this folder cannot be read by anyone.
+If you want your spam finder to be most effective you should also put non-spam
email into
+the folder <b>NoSpam</b>. The emails in this folder cannot be read by anyone.
</p>
"),

@@ -146,15 +146,15 @@
") +
/* MailLocalDomains dialog help 2/3 */
_("<p>Note: You can create and set up the domains with the YaST
-DNS server module. In this module, you only can set the properties
+DNS server module. In the current module, you only can set the properties
concerning the mail server.
</p>
")+
/* MailLocalDomains dialog help 3/3 */
_("<p><b><big>Type:</big></b><br>
You can define virtual and local domains. In virtual domains, only users
-assigned a mail address in the domain can receive mail.
-In local domains, all user can get mails. Assign virtual mail
+assigned an email address in the domain can receive emails.
+In local domains, all users can get emails. Assign virtual email
addresses in the YaST user module.
</p>
"),

Modified: trunk/mail/src/mail.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail.ycp?rev=67785&r1=67784&r2=67785&view=diff
==============================================================================
--- trunk/mail/src/mail.ycp (original)
+++ trunk/mail/src/mail.ycp Thu Mar 29 15:24:22 2012
@@ -48,18 +48,18 @@
define string StartDialogHelp () ``{
return
// Translators: start dialog help, part 1 of 4
- _("<P><B>Email Server Configuration</B><BR>") +
+ _("<P><B>Mail Server Configuration</B><BR>") +
// Translators: start dialog help, part 2 of 4
_("<P>This module will configure and start Postfix and, if
necessary, the Cyrus IMAP server.</P>")+
// Translators: start dialog help, part 3 of 4
_("<P><B>Warning:</B></P>
<P>Most home users can use the built-in
-features of their e-mail application to send and
-receive e-mail. They do not need this module.</P>
+features of their email application to send and
+receive email. They do not need this module.</P>
")+
// Translators: start dialog help, part 4 of 4
_("<P>You need Postfix only to store
-the e-mail on your local system, or for some special cases.</P>
+email on your local system or for some special cases.</P>
");
}

@@ -68,11 +68,11 @@
y2milestone ("Mail configuration type %1", type);

Wizard::SetScreenShotName ("mail-0-start");
- string caption = _("E-Mail Server Configuration");
+ string caption = _("Mail Server Configuration");
term tskip_ask = `Left(`CheckBox(`id(`skip_ask), _("Skip this page in
the future")));
string status = _("Mail server is not configured.")+"\n"+
- _("Select configuration type according your personal
needs")+"\n"+
- _("If you want to use sendmail as your MTA you have to
use Standard configuration.")+
+ _("Select configuration type according your
needs.")+"\n"+
+ _("If you want to use sendmail as your MTA, you have to
use the Standard configuration.")+
_("The Advanced configuration use LDAP as backend and
will configure your system as LDAP-Client and setup an LDAP-Server if
necessary.");
if( first )
{

Modified: trunk/mail/src/ui.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/ui.ycp?rev=67785&r1=67784&r2=67785&view=diff
==============================================================================
--- trunk/mail/src/ui.ycp (original)
+++ trunk/mail/src/ui.ycp Thu Mar 29 15:24:22 2012
@@ -375,7 +375,7 @@
`VBox (
WJ_MakeWidget (`outgoing_mail_server),
// TLS
- `Label (_("The server use &TLS")),
+ `Label (_("The server uses &TLS.")),
`RadioButtonGroup(`id(`TLS),
`HBox(
`Left(`RadioButton(`id("no"), _("No"), TLSnone)),

Modified: trunk/mail/src/widgets.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/widgets.ycp?rev=67785&r1=67784&r2=67785&view=diff
==============================================================================
--- trunk/mail/src/widgets.ycp (original)
+++ trunk/mail/src/widgets.ycp Thu Mar 29 15:24:22 2012
@@ -763,8 +763,8 @@
// help text
+ _("
<p>Enabling DKIM for outgoing emails requires additional actions. A SSL key
-will be generated for the 'mydomain'-value defined in postfix. A new service
-'submission' will be configured in postfix. After this is set up you can send
+will be generated for the 'mydomain' value defined in Postfix. A new service
+'submission' will be configured in Postfix. After this is set up you can send
email with this service 'submission' from 'mynetworks' with enabled SASL
authentication. Only the emails sent by this new service will be signed with
the domain key.</p>
@@ -773,14 +773,14 @@
_("
<p>The public key of the domain key needs to be offered by a Domain Name
Service. The public key will be saved as a DNS TXT record
-into <b>/var/db/dkim/[mydomain].public.txt</b> and needs to be deployed to an
+in <b>/var/db/dkim/[mydomain].public.txt</b> and needs to be deployed to an
according Domain Name Service. If there is a name service
-running on this server, which is the authoritative server for that domain the
+running on this server, which is the authoritative server for that domain, the
public key will be added as a TXT record to that domain zone
automatically.</p>
") +
// help text
- _("Enabling DKIM support the virus scanning (AMaViS) will be enabled
too."),
+ _("If you enable DKIM support, the virus scanning (AMaViS) will be
enabled too."),
"get": Get_use_dkim,
"set": Set_use_dkim,
],

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages