Author: jsrain Date: Fri Apr 18 15:39:40 2008 New Revision: 46851 URL: http://svn.opensuse.org/viewcvs/yast?rev=46851&view=rev Log: merged texts from proofread Modified: trunk/mail/VERSION trunk/mail/package/yast2-mail.changes trunk/mail/src/helps.ycp trunk/mail/src/mail-advanced.ycp trunk/mail/src/mail-server.ycp trunk/mail/src/mail-server_complex.ycp trunk/mail/src/mail-server_dialogs.ycp trunk/mail/src/mail-server_helps.ycp trunk/mail/src/mail.ycp Modified: trunk/mail/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/VERSION?rev=46851&r1=46850&r2=46851&view=diff ============================================================================== --- trunk/mail/VERSION (original) +++ trunk/mail/VERSION Fri Apr 18 15:39:40 2008 @@ -1 +1 @@ -2.16.1 +2.16.2 Modified: trunk/mail/package/yast2-mail.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/package/yast2-mail.changes?rev=46851&r1=46850&r2=46851&view=diff ============================================================================== --- trunk/mail/package/yast2-mail.changes (original) +++ trunk/mail/package/yast2-mail.changes Fri Apr 18 15:39:40 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 18 15:34:10 CEST 2008 - jsrain@suse.cz + +- merged texts from proofread +- 2.16.2 + +------------------------------------------------------------------- Mon Mar 17 12:43:32 CET 2008 - jsrain@suse.cz - added 'StartupNotify=true' to the desktop file (bnc #304964) Modified: trunk/mail/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/helps.ycp?rev=46851&r1=46850&r2=46851&view=diff ============================================================================== --- trunk/mail/src/helps.ycp (original) +++ trunk/mail/src/helps.ycp Fri Apr 18 15:39:40 2008 @@ -80,8 +80,9 @@ mails will not be sent immediately but rather after invoking <b>sendmail -q</b>.</p> ") + -_("<p>Choosing <b>No connection</b> the mail server will be started -but only local mail transport is possible. The MTA listens on localhost.</p>"); +_("<p>If choosing <b>No Connection</b>, the mail server will be started. +However, only local mail transport is possible. The MTA listens to the localhost.</p> +"); return s; } Modified: trunk/mail/src/mail-advanced.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-advanced.ycp?rev=46851&r1=46850&r2=46851&view=diff ============================================================================== --- trunk/mail/src/mail-advanced.ycp (original) +++ trunk/mail/src/mail-advanced.ycp Fri Apr 18 15:39:40 2008 @@ -53,7 +53,7 @@ "actions" : $[ "setup" : $[ "handler" : SetupMailServer, - "help" : _("Advanced Mail Server setup with LDAP backend"), + "help" : _("Advanced mail server setup with LDAP back-end"), ], ], "options" : $[ Modified: trunk/mail/src/mail-server.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server.ycp?rev=46851&r1=46850&r2=46851&view=diff ============================================================================== --- trunk/mail/src/mail-server.ycp (original) +++ trunk/mail/src/mail-server.ycp Fri Apr 18 15:39:40 2008 @@ -59,7 +59,7 @@ Label::WarningMsg(), _("You have configured your MTA without LDAP support.<br>") + _("This modul will configure your MTA with LDAP support.<br>") + - _("This will corrupt your actuall configuration."), + _("This will corrupt your actual configuration."), 80, 10, Label::ContinueButton(), Label::CancelButton(), Modified: trunk/mail/src/mail-server_complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_complex.ycp?rev=46851&r1=46850&r2=46851&view=diff ============================================================================== --- trunk/mail/src/mail-server_complex.ycp (original) +++ trunk/mail/src/mail-server_complex.ycp Fri Apr 18 15:39:40 2008 @@ -39,7 +39,7 @@ */ symbol SetupDialog() { Wizard::RestoreHelp(HELPS["setup"]:""); - string caption = _("Setup the Mail Server"); + string caption = _("Set up the mail server"); integer steps = 3; integer sl = 3; @@ -50,20 +50,20 @@ /* Progress stage 0/3 */ _("Read needed packages"), /* Progress stage 1/3 */ - _("Read LDAP Settings"), + _("Read LDAP settings"), /* Progress stage 2/3 */ - _("Choose LDAP/CA Settings"), + _("Choose LDAP/CA settings"), /* Progress stage 3/3 */ - _("Setup/Configure LDAP-Server and CA managemant") + _("Set up/Configure LDAP server and CA managemant") ], [ /* Progress stage 0/7 */ _("Reading packages..."), /* Progress stage 1/3 */ - _("Reading LDAP Settings..."), + _("Reading LDAP settings..."), /* Progress stage 2/3 */ - _("Choosing LDAP/CA Settings..."), + _("Choosing LDAP/CA settings..."), /* Progress stage 3/3 */ - _("Seting up /Configuring LDAP-Server and CA managemant..."), + _("Seting up /Configuring LDAP server and CA managemant..."), /* Progress finished */ _("Finished") ] @@ -104,7 +104,7 @@ Label::WarningMsg(), _("You have configured your MTA without LDAP support.<br>") + _("This modul will configure your MTA with LDAP support.<br>") + - _("This will corrupt your actuall configuration."), + _("This will corrupt your actual configuration."), 80, 10, Label::ContinueButton(), Label::CancelButton(), Modified: trunk/mail/src/mail-server_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_dialogs.ycp?rev=46851&r1=46850&r2=46851&view=diff ============================================================================== --- trunk/mail/src/mail-server_dialogs.ycp (original) +++ trunk/mail/src/mail-server_dialogs.ycp Fri Apr 18 15:39:40 2008 @@ -47,26 +47,26 @@ setup_ldap_server = true; ca_mgm = true; conf_ldap_server = true; - comment = _("Your computer is not configured as LDAP-client.") + "<br>" + - _("We suggest to setup a local LDAP-server for the mail server.") + "<br>" + - _("To secure your system we suggest to create certificates for the LDAP and Mail Server.") + "<br>"; + 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>" + + _("Create certificates for the LDAP and mail server in order to secure your system.") + "<br>"; } else { //The computer is configured as LDAP-Client if( LDAPSettings["ldap_server"]:"" == "127.0.0.1" ) { // The LDAP-Server is local - comment = _("Your computer is configured as LDAP-client and the LDAP-Server is local.") + "<br>" + - _("We suggest to 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>" + + 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>" + + _("For this reason you have to know the password of the LDAP administrator account:") + "<br>" + "<B>" + LDAPSettings["bind_dn"]:"" + ".</B><BR>"; } 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>" + - _("For this reason you have to know the password of the LDAP-administrator account:") + "<br>" + + 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>" + + _("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 have to contain the <B>suse-mailserver.schema</B> and the correspondig index entries."); + _("Furthermore, the LDAP server has to contain the <b>suse-mailserver.schema</b> and the corresponding index entries."); } } @@ -77,11 +77,11 @@ `VSpacing(0.2), `RichText(comment), `VSpacing(0.2), - `Left(`CheckBox(`id(`setup_ldap_server),_("Setup an local LDAP-Server."), setup_ldap_server)), + `Left(`CheckBox(`id(`setup_ldap_server),_("Set up a local LDAP server."), setup_ldap_server)), `VSpacing(0.2), `Left(`CheckBox(`id(`ca_mgm), _("Create certificates."), ca_mgm)), `VSpacing(0.2), - `Left(`CheckBox(`id(`conf_ldap_server), _("Configure dedicated LDAP-Server."), conf_ldap_server)), + `Left(`CheckBox(`id(`conf_ldap_server), _("Configure dedicated LDAP server."), conf_ldap_server)), `HBox ( `PushButton (`id (`abort),Label::AbortButton()), `PushButton (`id (`next),Label::NextButton()) @@ -156,7 +156,7 @@ if(LDAPSettings["bind_dn"]:"" == "" ) { string ERROR = _("You must configure LDAP to use the mail server.") + - "\n" + _("Now we will start the LDAP configuration."); + "\n" + _(" The LDAP configuration starts now."); if(Popup::YesNo(ERROR)) { return `ldapsetup; Modified: trunk/mail/src/mail-server_helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_helps.ycp?rev=46851&r1=46850&r2=46851&view=diff ============================================================================== --- trunk/mail/src/mail-server_helps.ycp (original) +++ trunk/mail/src/mail-server_helps.ycp Fri Apr 18 15:39:40 2008 @@ -24,7 +24,7 @@ "), /* Setup dialog help 1/1 */ - "setup" : _("<p><b><big>Setup Mail Server Configuration</big></b><br> + "setup" : _("<p><b><big>Set Up Mail Server Configuration</big></b><br> Please wait...<br></p> ") , /* Read dialog help 1/2 */ Modified: trunk/mail/src/mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail.ycp?rev=46851&r1=46850&r2=46851&view=diff ============================================================================== --- trunk/mail/src/mail.ycp (original) +++ trunk/mail/src/mail.ycp Fri Apr 18 15:39:40 2008 @@ -50,15 +50,17 @@ // Translators: start dialog help, part 1 of 4 _("<P><B>Email 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>")+ + _("<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>Be aware:</B><BR> + _("<p><b>Warning:</b><p> Most home users can use the build-in features of their email application to send and -get email. They do not need this module.</P>")+ +receive e-mail. They do not need this module.</P> +")+ // Translators: start dialog help, part 4 of 4 - _("<P>You will need Postfix only if you want to store -the email on your local system, or in some other special cases.</P>"); + _("<P>You need Postfix only to store +the e-mail on your local system, or for some special cases.</P> +"); } define string StartDialog (string type, boolean first ) ``{ @@ -66,9 +68,9 @@ y2milestone ("Mail configuration type %1", type); Wizard::SetScreenShotName ("mail-0-start"); - string caption = _("Email Server Configuration"); + string caption = _("E-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"+ + string status = _("Mail server is not configured.")+"\n"+ _("Select configuration type according your personal needs"); if( first ) { @@ -78,13 +80,13 @@ { if( type == "standard" ) { - status = _("The running Mail Server configuration is based on type \"Standard\".")+ "\n"+ - _("It's possible to change to \"Advanced\", but this will overwrite all existing settings."); + 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."); } else if( type == "advanced" ) { - status = _("The running Mail Server configuration is based on type \"Advanced\".")+"\n"+ - _("It's possible to change to \"Standard\", but this will overwrite all existing settings."); + 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."); } } term contents = @@ -230,7 +232,7 @@ "actions" : $[ "setup" : $[ /* Commandline command help */ - "help" : _("Setup the Mail Server Configuration"), + "help" : _("Set Up the Mail Server Configuration"), "handler" : Setup, ], ], -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org