Hello community,
here is the log from the commit of package yast2-mail
checked in at Mon Apr 21 03:13:55 CEST 2008.
--------
--- yast2-mail/yast2-mail.changes 2008-04-14 10:48:44.000000000 +0200
+++ yast2-mail/yast2-mail.changes 2008-04-18 15:40:18.567277000 +0200
@@ -1,0 +2,6 @@
+Fri Apr 18 15:34:10 CEST 2008 - jsrain@suse.cz
+
+- merged texts from proofread
+- 2.16.2
+
+-------------------------------------------------------------------
Old:
----
yast2-mail-2.16.1.tar.bz2
New:
----
yast2-mail-2.16.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-mail.spec ++++++
--- /var/tmp/diff_new_pack.T32182/_old 2008-04-21 03:12:54.000000000 +0200
+++ /var/tmp/diff_new_pack.T32182/_new 2008-04-21 03:12:54.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-mail (Version 2.16.1)
+# spec file for package yast2-mail (Version 2.16.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-mail
-Version: 2.16.1
+Version: 2.16.2
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-mail-2.16.1.tar.bz2
+Source0: yast2-mail-2.16.2.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite
BuildRequires: yast2-ldap-server yast2-network yast2-perl-bindings yast2-users
@@ -68,7 +68,7 @@
Peter Varkoly
%prep
-%setup -n yast2-mail-2.16.1
+%setup -n yast2-mail-2.16.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -161,6 +161,9 @@
%dir /usr/share/YaST2/clients
/usr/share/YaST2/clients/users*
%changelog
+* Fri Apr 18 2008 jsrain@suse.cz
+- merged texts from proofread
+- 2.16.2
* Mon Mar 17 2008 jsrain@suse.cz
- added 'StartupNotify=true' to the desktop file (bnc #304964)
- 2.16.1
@@ -215,7 +218,7 @@
* Mon Apr 23 2007 varkoly@suse.de
- Include the testsuite directory
- 2.15.6
-* Fri Apr 20 2007 varkoly@suse.de
+* Sat Apr 21 2007 varkoly@suse.de
- we need the package yast2-mail-aliases too
- 2.15.5
* Thu Apr 19 2007 varkoly@suse.de
@@ -362,7 +365,7 @@
* Wed Mar 10 2004 sh@suse.de
- V 2.9.8
- Migration to new wizard
-* Tue Mar 09 2004 kkaempf@suse.de
+* Wed Mar 10 2004 kkaempf@suse.de
- adapt look&feel (sh@suse.de)
- fix POSTFIX_MDA value (#35517, partly)
- 2.9.6
@@ -489,7 +492,7 @@
- Instead of "The {host,domain} name is incorrect", show a standard
description of a valid address/name. (no new text)
- 2.6.13
-* Sun Aug 11 2002 mvidner@suse.cz
+* Mon Aug 12 2002 mvidner@suse.cz
- Let the tables keep the keyboard focus (#16116 workaround).
- 2.6.12
* Mon Aug 05 2002 mvidner@suse.cz
++++++ yast2-mail-2.16.1.tar.bz2 -> yast2-mail-2.16.2.tar.bz2 ++++++
++++ 2870 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.16.1/configure.in new/yast2-mail-2.16.2/configure.in
--- old/yast2-mail-2.16.1/configure.in 2008-04-14 10:48:16.000000000 +0200
+++ new/yast2-mail-2.16.2/configure.in 2008-04-18 15:39:44.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-mail, 2.16.1, http://bugs.opensuse.org/, yast2-mail)
+AC_INIT(yast2-mail, 2.16.2, http://bugs.opensuse.org/, yast2-mail)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.16.1"
+VERSION="2.16.2"
RPMNAME="yast2-mail"
MAINTAINER="Peter Varkoly "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.16.1/src/helps.ycp new/yast2-mail-2.16.2/src/helps.ycp
--- old/yast2-mail-2.16.1/src/helps.ycp 2008-01-08 17:40:23.000000000 +0100
+++ new/yast2-mail-2.16.2/src/helps.ycp 2008-04-18 15:39:40.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Martin Vidner
*
- * $Id: helps.ycp 43241 2007-12-30 18:28:50Z varkoly $
+ * $Id: helps.ycp 46851 2008-04-18 13:39:40Z jsrain $
*
* The help texts.
*
@@ -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;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.16.1/src/mail-advanced.ycp new/yast2-mail-2.16.2/src/mail-advanced.ycp
--- old/yast2-mail-2.16.1/src/mail-advanced.ycp 2007-11-09 17:25:07.000000000 +0100
+++ new/yast2-mail-2.16.2/src/mail-advanced.ycp 2008-04-18 15:32:15.000000000 +0200
@@ -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" : $[
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.16.1/src/mail-server_complex.ycp new/yast2-mail-2.16.2/src/mail-server_complex.ycp
--- old/yast2-mail-2.16.1/src/mail-server_complex.ycp 2007-11-09 17:25:07.000000000 +0100
+++ new/yast2-mail-2.16.2/src/mail-server_complex.ycp 2008-04-18 15:32:15.000000000 +0200
@@ -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(),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.16.1/src/mail-server_dialogs.ycp new/yast2-mail-2.16.2/src/mail-server_dialogs.ycp
--- old/yast2-mail-2.16.1/src/mail-server_dialogs.ycp 2008-01-08 17:40:23.000000000 +0100
+++ new/yast2-mail-2.16.2/src/mail-server_dialogs.ycp 2008-04-18 15:32:15.000000000 +0200
@@ -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;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.16.1/src/mail-server_helps.ycp new/yast2-mail-2.16.2/src/mail-server_helps.ycp
--- old/yast2-mail-2.16.1/src/mail-server_helps.ycp 2007-07-18 15:46:39.000000000 +0200
+++ new/yast2-mail-2.16.2/src/mail-server_helps.ycp 2008-04-18 15:32:15.000000000 +0200
@@ -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 */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.16.1/src/mail.ycp new/yast2-mail-2.16.2/src/mail.ycp
--- old/yast2-mail-2.16.1/src/mail.ycp 2007-11-09 17:25:07.000000000 +0100
+++ new/yast2-mail-2.16.2/src/mail.ycp 2008-04-18 15:39:40.000000000 +0200
@@ -12,7 +12,7 @@
* Martin Vidner
* Peter Varkoly
*
- * $Id: mail.ycp 41667 2007-10-31 11:29:56Z varkoly $
+ * $Id: mail.ycp 46851 2008-04-18 13:39:40Z jsrain $
*
* Main file for mail configuration. Uses all other files.
*
@@ -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,
],
],
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.16.1/VERSION new/yast2-mail-2.16.2/VERSION
--- old/yast2-mail-2.16.1/VERSION 2008-04-14 10:42:56.000000000 +0200
+++ new/yast2-mail-2.16.2/VERSION 2008-04-18 15:34:01.000000000 +0200
@@ -1 +1 @@
-2.16.1
+2.16.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org