Author: jsrain Date: Thu Sep 11 08:30:20 2008 New Revision: 51003 URL: http://svn.opensuse.org/viewcvs/yast?rev=51003&view=rev Log: merged texts from proofread Modified: trunk/mail/package/yast2-mail.changes trunk/mail/src/mail-server_dialogs.ycp trunk/mail/src/mail-server_helps.ycp trunk/mail/src/mail.ycp Modified: trunk/mail/package/yast2-mail.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/package/yast2-mail.changes?rev=51003&r1=51002&r2=51003&view=diff ============================================================================== --- trunk/mail/package/yast2-mail.changes (original) +++ trunk/mail/package/yast2-mail.changes Thu Sep 11 08:30:20 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Sep 11 08:29:39 CEST 2008 - jsrain@suse.cz + +- merged texts from proofread + +------------------------------------------------------------------- Wed Sep 10 14:52:55 CEST 2008 - varkoly@suse.de - fix: use the right widget for get a number Modified: trunk/mail/src/mail-server_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_dialogs.ycp?rev=51003&r1=51002&r2=51003&view=diff ============================================================================== --- trunk/mail/src/mail-server_dialogs.ycp (original) +++ trunk/mail/src/mail-server_dialogs.ycp Thu Sep 11 08:30:20 2008 @@ -52,7 +52,7 @@ conf_ldap_client = true; ldap_server_local = true; comment = _("Your computer is not configured as an LDAP client.") + "<br>" + - _("We suggest to set up a local LDAP server for the mail server.") + "<br>" + + _("We suggest you set up a local LDAP server for the mail server.") + "<br>" + _("Create certificates for the LDAP and mail server in order to secure your system.") + "<br>"; } else @@ -60,15 +60,15 @@ if( LDAPSettings["ldap_server"]:"" == "127.0.0.1" ) { // The LDAP-Server is local comment = _("Your computer is configured as an LDAP client and the LDAP server is local.") + "<br>" + - _("We suggest to adapt the LDAP server configuration for the mail server.") + "<br>" + + _("We suggest you adapt the LDAP server configuration for the mail server.") + "<br>" + _("For this reason you have to know the password of the LDAP administrator account:") + "<br>" + "<B>" + LDAPSettings["bind_dn"]:"" + ".</B><BR>"; ldap_server_local = true; } else { // The LDAP-Server is not local - comment = _("Your computer is configured as LDAP client and the LDAP server is not local.") + "<br>" + - _("We suggest to configure the LDAP server for the mail server.") + "<br>" + + comment = _("Your computer is configured as a LDAP client and the LDAP server is not local.") + "<br>" + + _("We suggest you configure the LDAP server for the mail server.") + "<br>" + _("For this reason you have to know the password of the LDAP administrator account:") + "<br>" + "<B>" + LDAPSettings["bind_dn"]:"" + ".</B><BR>" + _("Furthermore, the LDAP server has to contain the <b>suse-mailserver.schema</b> and the corresponding index entries."); Modified: trunk/mail/src/mail-server_helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_helps.ycp?rev=51003&r1=51002&r2=51003&view=diff ============================================================================== --- trunk/mail/src/mail-server_helps.ycp (original) +++ trunk/mail/src/mail-server_helps.ycp Thu Sep 11 08:30:20 2008 @@ -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 spams. +If you start the virus scanner AMAVIS, your e-mails 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 install other (comerciel) virus scanner engine. +and configured too. 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 configured if the local delivery method <b>cyrus imapd</b> is. -In this case 2 shared folder <b>NewSpam</b> and <b>NoSpam</b> will be created. In this folders can put -anyone e-mails. E-mails which was not detected by the <b>SpamAssassin</b> you can put into the -folder <p>NewSpam</p>. If you want your spam finder works good you have to put non spam mails into -the folder <p>NoSpam</p> too. The e-mails in this folder can not be read by anyone. +The spam learning extension can only 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 +which was not detected by <b>SpamAssassin</b> should be put into the folder <p>NewSpam</p>. +If you want your spam finder to be most effective you should also put non spam e-mail into +the folder <p>NoSpam</p>. The e-mails in this folder can not be read by anyone. </p> "), Modified: trunk/mail/src/mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail.ycp?rev=51003&r1=51002&r2=51003&view=diff ============================================================================== --- trunk/mail/src/mail.ycp (original) +++ trunk/mail/src/mail.ycp Thu Sep 11 08:30:20 2008 @@ -53,8 +53,8 @@ _("<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 build-in -features of their email application to send and +<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> ")+ // Translators: start dialog help, part 4 of 4 @@ -72,7 +72,7 @@ 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 MTA you have to use Standard configuration."); + _("If you want to use sendmail as your MTA you have to use Standard configuration."); if( first ) { tskip_ask = `VSpacing(1); @@ -82,12 +82,12 @@ if( type == "standard" ) { status = _("The running mail server configuration is based on the <b>Standard</b> type.")+ "\n"+ - _("It is possible to change to <b>Advanced</b>. This will overwrite all existing settings."); + _("It is possible to change to <b>Advanced</b> settings. This will overwrite all existing settings."); } else if( type == "advanced" ) { status = _("The running mail server configuration is based on the <b>Advanced</b> type.")+"\n"+ - _("It is possible to change to <b>Standard</b>. This will overwrite all existing settings."); + _("It is possible to change to <b>Standard</b> settings. This will overwrite all existing settings."); } } term contents = -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org