Hello community,
here is the log from the commit of package yast2-mail
checked in at Wed Aug 16 15:05:42 CEST 2006.
--------
--- yast2-mail/yast2-mail.changes 2006-03-07 17:28:33.000000000 +0100
+++ yast2-mail/yast2-mail.changes 2006-08-16 12:51:33.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Aug 16 12:35:29 CEST 2006 - kmachalkova@suse.cz
+
+- Install cyrus-imapd if POSTFIX_MDA is set to 'cyrus' (#172108)
+- 2.13.4
+
+-------------------------------------------------------------------
Old:
----
yast2-mail-2.13.3.tar.bz2
New:
----
yast2-mail-2.13.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-mail.spec ++++++
--- /var/tmp/diff_new_pack.P90Q1v/_old 2006-08-16 15:05:39.000000000 +0200
+++ /var/tmp/diff_new_pack.P90Q1v/_new 2006-08-16 15:05:39.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-mail (Version 2.13.3)
+# spec file for package yast2-mail (Version 2.13.4)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-mail
-Version: 2.13.3
+Version: 2.13.4
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-mail-2.13.3.tar.bz2
+Source0: yast2-mail-2.13.4.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
# new firewall interface
@@ -61,7 +61,7 @@
Martin Vidner
%prep
-%setup -n yast2-mail-2.13.3
+%setup -n yast2-mail-2.13.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -122,6 +122,9 @@
/usr/lib/YaST2/servers_non_y2/ag_mailtable
%changelog -n yast2-mail
+* Wed Aug 16 2006 - kmachalkova@suse.cz
+- Install cyrus-imapd if POSTFIX_MDA is set to 'cyrus' (#172108)
+- 2.13.4
* Tue Mar 07 2006 - mvidner@suse.cz
- Converted neededforbuild to BuildRequires
and removed yast2-devel-packages.
++++++ yast2-mail-2.13.3.tar.bz2 -> yast2-mail-2.13.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.13.3/Makefile.am new/yast2-mail-2.13.4/Makefile.am
--- old/yast2-mail-2.13.3/Makefile.am 2006-03-07 17:29:02.000000000 +0100
+++ new/yast2-mail-2.13.4/Makefile.am 2006-08-16 12:49:30.000000000 +0200
@@ -8,6 +8,7 @@
#where devtools are
PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -95,7 +96,7 @@
done
pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -116,7 +117,7 @@
fi
spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -143,20 +144,20 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(PREFIX)/bin/y2tool; then \
- echo "$(PREFIX)/bin/y2tool: not found."; \
+ if ! test -x $(Y2TOOL); then \
+ echo "$(Y2TOOL): not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
-TAGVERSION = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION = $(Y2TOOL) tagversion
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -199,10 +200,13 @@
false; \
fi
+check-textdomain:
+ $(Y2TOOL) check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(Y2TOOL) checkin-stable
# For po/ modules
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.13.3/Makefile.in new/yast2-mail-2.13.4/Makefile.in
--- old/yast2-mail-2.13.3/Makefile.in 2006-03-07 17:29:24.000000000 +0100
+++ new/yast2-mail-2.13.4/Makefile.in 2006-08-16 12:49:40.000000000 +0200
@@ -200,6 +200,7 @@
#where devtools are
PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(PREFIX)/bin/y2tool
SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS)
ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4)
HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE)
@@ -229,7 +230,7 @@
$(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) $(am__append_1)
@CREATE_PKGCONFIG_NOARCH_TRUE@@CREATE_PKGCONFIG_TRUE@pkgconfigdata_DATA = $(RPMNAME).pc
@CREATE_PKGCONFIG_NOARCH_FALSE@@CREATE_PKGCONFIG_TRUE@pkgconfig_DATA = $(RPMNAME).pc
-TAGVERSION = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION = $(Y2TOOL) tagversion
# test ! -d $(srcdir)/po \
# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
@@ -726,7 +727,7 @@
done
pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -747,7 +748,7 @@
fi
spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -774,18 +775,18 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(PREFIX)/bin/y2tool; then \
- echo "$(PREFIX)/bin/y2tool: not found."; \
+ if ! test -x $(Y2TOOL); then \
+ echo "$(Y2TOOL): not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -828,10 +829,13 @@
false; \
fi
+check-textdomain:
+ $(Y2TOOL) check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(Y2TOOL) checkin-stable
# For po/ modules
checkpo:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.13.3/VERSION new/yast2-mail-2.13.4/VERSION
--- old/yast2-mail-2.13.3/VERSION 2006-03-07 17:28:27.000000000 +0100
+++ new/yast2-mail-2.13.4/VERSION 2006-08-16 12:41:18.000000000 +0200
@@ -1 +1 @@
-2.13.3
+2.13.4
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.13.3/configure new/yast2-mail-2.13.4/configure
--- old/yast2-mail-2.13.3/configure 2006-03-07 17:29:18.000000000 +0100
+++ new/yast2-mail-2.13.4/configure 2006-08-16 12:49:36.000000000 +0200
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-mail 2.13.3.
+# Generated by GNU Autoconf 2.59 for yast2-mail 2.13.4.
#
-# Report bugs to http://www.suse.de/feedback.
+# Report bugs to http://bugs.opensuse.org/.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@@ -269,9 +269,9 @@
# Identity of this package.
PACKAGE_NAME='yast2-mail'
PACKAGE_TARNAME='yast2-mail'
-PACKAGE_VERSION='2.13.3'
-PACKAGE_STRING='yast2-mail 2.13.3'
-PACKAGE_BUGREPORT='http://www.suse.de/feedback'
+PACKAGE_VERSION='2.13.4'
+PACKAGE_STRING='yast2-mail 2.13.4'
+PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
ac_default_prefix=/usr
@@ -728,7 +728,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-mail 2.13.3 to adapt to many kinds of systems.
+\`configure' configures yast2-mail 2.13.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-mail 2.13.3:";;
+ short | recursive ) echo "Configuration of yast2-mail 2.13.4:";;
esac
cat <<\_ACEOF
@@ -812,7 +812,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to http://www.suse.de/feedback.
+Report bugs to http://bugs.opensuse.org/.
_ACEOF
fi
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-mail configure 2.13.3
+yast2-mail configure 2.13.4
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-mail $as_me 2.13.3, which was
+It was created by yast2-mail $as_me 2.13.4, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-mail'
- VERSION='2.13.3'
+ VERSION='2.13.4'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.3"
+VERSION="2.13.4"
RPMNAME="yast2-mail"
MAINTAINER="Martin Vidner "
@@ -2784,7 +2784,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-mail $as_me 2.13.3, which was
+This file was extended by yast2-mail $as_me 2.13.4, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2839,7 +2839,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-mail config.status 2.13.3
+yast2-mail config.status 2.13.4
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.13.3/configure.in new/yast2-mail-2.13.4/configure.in
--- old/yast2-mail-2.13.3/configure.in 2006-03-07 17:29:02.000000000 +0100
+++ new/yast2-mail-2.13.4/configure.in 2006-08-16 12:49:28.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-mail
dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-mail, 2.13.3, http://www.suse.de/feedback, yast2-mail)
+AC_INIT(yast2-mail, 2.13.4, http://bugs.opensuse.org/, yast2-mail)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.3"
+VERSION="2.13.4"
RPMNAME="yast2-mail"
MAINTAINER="Martin Vidner "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.13.3/mail.pot new/yast2-mail-2.13.4/mail.pot
--- old/yast2-mail-2.13.3/mail.pot 2005-08-12 14:35:15.000000000 +0200
+++ new/yast2-mail-2.13.4/mail.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,838 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-12 14:35+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Translators: popup message part, ends with a newline
-#: src/Mail.ycp:256
-msgid "AMaViS, a virus scanner, will be installed.\n"
-msgstr ""
-
-#. Translators: popup message part, ends with a newline
-#: src/Mail.ycp:265
-msgid "Fetchmail, a mail downloading utility, will be installed.\n"
-msgstr ""
-
-#. Translators: dialog caption
-#: src/Mail.ycp:308
-msgid "Initializing mail configuration"
-msgstr ""
-
-#. Translators: progress label
-#. do not translate MTA
-#: src/Mail.ycp:313
-msgid "Determining Mail Transport Agent (MTA)"
-msgstr ""
-
-#. Translators: progress label
-#: src/Mail.ycp:315
-msgid "Reading general settings"
-msgstr ""
-
-#. Translators: progress label
-#: src/Mail.ycp:317
-msgid "Reading masquerading settings"
-msgstr ""
-
-#. Translators: progress label
-#: src/Mail.ycp:319
-msgid "Reading downloading settings"
-msgstr ""
-
-#. Translators: progress label
-#: src/Mail.ycp:321
-msgid "Reading alias tables"
-msgstr ""
-
-#. Translators: progress label
-#. smtp-auth
-#: src/Mail.ycp:324
-msgid "Reading authentication settings..."
-msgstr ""
-
-#. Translators: error message,
-#. %1 is a file name,
-#. %2 is a long file name - leave it on a separate line
-#: src/Mail.ycp:518
-#, ycp-format
-msgid ""
-"Error reading file %1. The file must have\n"
-"a fixed format to be readable by YaST2. For details, see\n"
-"%2"
-msgstr ""
-
-#. Translators: error message
-#: src/Mail.ycp:829
-msgid "Error writing the fetchmail configuration."
-msgstr ""
-
-#. Translators: error message
-#: src/Mail.ycp:920 src/Mail.ycp:926 src/Mail.ycp:935 src/Mail.ycp:950
-#: src/Mail.ycp:971
-#, ycp-format
-msgid "Error writing file %1"
-msgstr ""
-
-#. Translators: error message
-#: src/Mail.ycp:1004
-msgid "Error running SuSEconfig."
-msgstr ""
-
-#. Translators: error message
-#: src/Mail.ycp:1023 src/Mail.ycp:1035 src/Mail.ycp:1058
-#, ycp-format
-msgid "Error starting service %1."
-msgstr ""
-
-#. Translators: progress label
-#: src/Mail.ycp:1077
-msgid "Writing general settings"
-msgstr ""
-
-#. Translators: progress label
-#: src/Mail.ycp:1082
-msgid "Writing masquerading settings"
-msgstr ""
-
-#. Translators: progress label
-#: src/Mail.ycp:1084
-msgid "Writing alias tables"
-msgstr ""
-
-#. Write them unconditionally, because it is now possible to
-#. enter them also in the Permanent mode. Bug #17417.
-#. Translators: progress label
-#: src/Mail.ycp:1088
-msgid "Writing downloading settings"
-msgstr ""
-
-#. Translators: progress label
-#: src/Mail.ycp:1090
-msgid "Writing authentication settings..."
-msgstr ""
-
-#. Translators: progress label
-#: src/Mail.ycp:1093
-msgid "Finishing writing configuration files"
-msgstr ""
-
-#. Translators: progress label
-#: src/Mail.ycp:1098
-msgid "Running SuSEconfig"
-msgstr ""
-
-#. Translators: progress label
-#: src/Mail.ycp:1101
-msgid "Restarting services"
-msgstr ""
-
-#. Translators: dialog caption
-#: src/Mail.ycp:1105
-msgid "Saving mail configuration"
-msgstr ""
-
-#. summary header; mail transfer agent
-#: src/Mail.ycp:1289
-msgid "MTA"
-msgstr ""
-
-#. summary header
-#: src/Mail.ycp:1292
-msgid "Connection Type"
-msgstr ""
-
-#. summary header
-#: src/Mail.ycp:1296
-msgid "Outgoing Mail Server"
-msgstr ""
-
-#. summary header; the "From: foo@bar.com" mail header
-#: src/Mail.ycp:1300
-msgid "From Header"
-msgstr ""
-
-#. summary item
-#: src/Mail.ycp:1304
-msgid "Local Domains"
-msgstr ""
-
-#. summary item
-#: src/Mail.ycp:1306
-msgid "Masquerade Other Domains"
-msgstr ""
-
-#. summary item
-#: src/Mail.ycp:1308
-msgid "Masquerade Users"
-msgstr ""
-
-#. summary header
-#: src/Mail.ycp:1310
-msgid "Accept remote SMTP connections"
-msgstr ""
-
-#. summary item
-#: src/Mail.ycp:1312 src/Mail.ycp:1316
-msgid "Yes"
-msgstr ""
-
-#: src/Mail.ycp:1312 src/Mail.ycp:1316
-msgid "No"
-msgstr ""
-
-#. summary header
-#: src/Mail.ycp:1314
-msgid "Use AMaViS"
-msgstr ""
-
-#. summary item
-#: src/Mail.ycp:1318
-msgid "Fetchmail"
-msgstr ""
-
-#. summary item
-#. Translators: dialog caption
-#: src/Mail.ycp:1320 src/ui.ycp:1286
-msgid "Aliases"
-msgstr ""
-
-#. summary item
-#: src/Mail.ycp:1322
-msgid "Virtual Users"
-msgstr ""
-
-#. summary item
-#: src/Mail.ycp:1324
-msgid "Authentication"
-msgstr ""
-
-#. For translators: mail read dialog help, part 1 of 2
-#: src/helps.ycp:31
-msgid ""
-"<P><B><BIG>Initializing mail</BIG></B><BR>\n"
-"Please wait...\n"
-"<BR></P>\n"
-msgstr ""
-
-#. For translators: mail read dialog help, part 2 of 2
-#: src/helps.ycp:36
-msgid ""
-"<P><B><BIG>Aborting the initialization:</BIG></B><BR>\n"
-"Safely abort the configuration utility by pressing <B>Abort</B>\n"
-"now.\n"
-"</P>\n"
-msgstr ""
-
-#. For translators: mail write dialog help, part 1 of 2
-#: src/helps.ycp:51
-msgid ""
-"<P><B><BIG>Saving mail configuration</BIG></B><BR>\n"
-"Please wait...\n"
-"<BR></P>\n"
-msgstr ""
-
-#. For translators: mail write dialog help, part 2 of 2
-#: src/helps.ycp:56
-msgid ""
-"<P><B><BIG>Aborting saving:</BIG></B><BR>\n"
-"Abort saving by pressing <B>Abort</B>.\n"
-"An additional dialog will inform you whether it is safe to do so.\n"
-"</P>\n"
-msgstr ""
-
-#. Translators: mailer (MTA) selection dialog help, part 1 of 1
-#. do not translate MTA
-#: src/helps.ycp:69
-msgid ""
-"<p>Select the mail system (Mail Transfer Agent, MTA)\n"
-"to install.</p>"
-msgstr ""
-
-#. Translators: connection type dialog help, part 1 of 2
-#: src/helps.ycp:78
-msgid ""
-"\n"
-"<p>How are you connected to the Internet? With a dial-up connection,\n"
-"mails will not be sent immediately but rather after invoking\n"
-"<b>sendmail -q</b>.</p>\n"
-msgstr ""
-
-#. Translators: masquerading dialog help, part 1 of 1
-#: src/helps.ycp:91
-msgid ""
-"\n"
-"<p>Specify the rewriting of the sender's address here for each user.</p>\n"
-msgstr ""
-
-#. Translators: authentication dialog help 1/4
-#: src/helps.ycp:101
-msgid ""
-"\n"
-"<p>Some servers require authentication for sending mails. Here you can\n"
-"enter information for this option. If you do not want to use authentication,\n"
-"simply leave these fields empty.</p>\n"
-msgstr ""
-
-#. Translators: authentication dialog help 2/4
-#: src/helps.ycp:107
-msgid ""
-"\n"
-"<p>The outgoing mail server is generally intended for dial-up connections.\n"
-"Enter the Internet service provider's SMTP server, such as <b>smtp.provider.com</b>.</p>\n"
-msgstr ""
-
-#. Translators: authentication dialog help 3/4
-#: src/helps.ycp:112
-msgid ""
-"\n"
-"<p>In the <b>User Name</b> field, enter the user name assigned by from your provider.</p>\n"
-msgstr ""
-
-#. Translators: authentication dialog help 4/4
-#: src/helps.ycp:116
-msgid ""
-"\n"
-"<p>Enter your password in the <b>Password</b> field.</p>\n"
-msgstr ""
-
-#. Translators: authentication dialog help, 5/4
-#: src/helps.ycp:120
-msgid ""
-"\n"
-"<p>Note: For simplicity, only one server is displayed in this dialog,\n"
-"although there may be more of them in your configuration file.\n"
-"They will not be lost.</p>\n"
-msgstr ""
-
-#. Translators: downloading dialog help, part 1 of 1
-#: src/helps.ycp:132
-msgid ""
-"\n"
-"<p>These are parameters for downloading mail from\n"
-"a POP or an IMAP server using <b>fetchmail</b>.</p>\n"
-msgstr ""
-
-#. Translators: aliases dialog help, part 1 of 2
-#: src/helps.ycp:143
-msgid ""
-"\n"
-"<p>This table redirects mail delivered locally.\n"
-"Redirect it to another local user (useful for system accounts,\n"
-"especially for <b>root</b>), to a remote address, or to a list of addresses.</p>\n"
-msgstr ""
-
-#. Translators: aliases dialog help, part 2 of 2
-#: src/helps.ycp:149
-msgid ""
-"\n"
-"<p>See the aliases(5) manual page\n"
-"for a description of advanced features.</p>\n"
-msgstr ""
-
-#. Translators: virtual domains dialog help, part 1 of 2
-#: src/helps.ycp:160
-msgid ""
-"\n"
-"<p>This table redirects incoming mail. Unlike the alias table,\n"
-"it also considers the domain\n"
-"part of the address.</p>\n"
-msgstr ""
-
-#. Translators: virtual domains dialog help, part 2 of 2
-#: src/helps.ycp:166
-msgid ""
-"\n"
-"<p>It allows hosting multiple \"virtual domains\"\n"
-"on a single machine.</p>\n"
-msgstr ""
-
-#. Command line help text for the mail module
-#: src/mail.ycp:86
-msgid "Configuration of mail"
-msgstr ""
-
-#. command line action help
-#: src/mail.ycp:94
-msgid "Mail configuration summary"
-msgstr ""
-
-#. Translators: continue/cancel dialog
-#. %1 is a sysconfig variable name
-#: src/ui.ycp:76
-#, ycp-format
-msgid ""
-"The setting %1 is turned off. You have\n"
-"probably modified the configuration files directly.\n"
-"If you continue, it will be turned on and\n"
-"SuSEconfig will overwrite manual changes.\n"
-msgstr ""
-
-#. After text freeze, but
-#. a) either something is very broken -> user must know
-#. b) user installed a different MTA -> knowledgeable enough to
-#. ba) never see this message anyway
-#. bb) read English
-#. TODO: look at exim and mention it in the popup
-#. Translators: error popup
-#: src/ui.ycp:94
-msgid ""
-"YaST2 can only configure Postfix and Sendmail,\n"
-"but neither of them is installed."
-msgstr ""
-
-#. not to be displayed, #37554.
-#. but ProbePackages still has to be called.
-#. continue-cancel popup
-#: src/ui.ycp:111
-msgid "The configuration will be written now.\n"
-msgstr ""
-
-#. Translators: dialog caption
-#. Mailer: Sendmail or Postfix
-#. Translators: frame label
-#. Mailer: Sendmail or Postfix
-#: src/ui.ycp:168 src/ui.ycp:173
-msgid "Mail transfer agent"
-msgstr ""
-
-#. Translators: dialog caption
-#: src/ui.ycp:240
-msgid "General Settings"
-msgstr ""
-
-#. Translators: frame label
-#: src/ui.ycp:244
-msgid "Connection type"
-msgstr ""
-
-#. Translators: radio button label
-#: src/ui.ycp:249
-msgid "&Permanent"
-msgstr ""
-
-#. Translators: radio button label
-#: src/ui.ycp:251
-msgid "&Dial-up"
-msgstr ""
-
-#. Translators: radio button label
-#: src/ui.ycp:253
-msgid "No &connection"
-msgstr ""
-
-#. Translators: dialog caption
-#. frame label
-#: src/ui.ycp:353 src/ui.ycp:371
-msgid "Outgoing Mail"
-msgstr ""
-
-#. Translators: button
-#. TODO ...
-#: src/ui.ycp:361
-msgid "&Masquerading"
-msgstr ""
-
-#. Translators: button
-#. TODO ...
-#: src/ui.ycp:364
-msgid "&Authentication"
-msgstr ""
-
-#. Translators: dialog caption
-#: src/ui.ycp:440
-msgid "Incoming Mail"
-msgstr ""
-
-#. pushbutton
-#: src/ui.ycp:478
-msgid "&Details..."
-msgstr ""
-
-#. frame label: mail downloading (fetchmail)
-#: src/ui.ycp:482
-msgid "&Downloading"
-msgstr ""
-
-#. pushbutton
-#: src/ui.ycp:506
-msgid "&Aliases..."
-msgstr ""
-
-#. pushbutton
-#: src/ui.ycp:508
-msgid "&Virtual domains..."
-msgstr ""
-
-#. popup text
-#. %1: variable name (eg. POSTFIX_LOCALDOMAINS)
-#. %2: file name (eg. /etc/sysconfig/postfix)
-#. %3: value (about 50 characters)
-#: src/ui.ycp:600
-#, ycp-format
-msgid ""
-"To be able to deliver mail to your local MTA,\n"
-"the value of %1 in %2 will be set to\n"
-"\"%3\"."
-msgstr ""
-
-#. There is a check whether the information from the UI is
-#. correct and complete. The login name may contain only
-#. certain characters and must begin with a letter.
-#. Already in Translation Memory
-#: src/ui.ycp:637
-msgid ""
-"The user login may contain only\n"
-"lower case letters, digits, \"-\" and \"_\"\n"
-"and must begin with a letter or \"_\".\n"
-"Please try again.\n"
-msgstr ""
-
-#. Translators: popup dialog heading
-#: src/ui.ycp:679
-msgid "Sender address rewriting"
-msgstr ""
-
-#. Translators: text entry label
-#. Translators: combo box label
-#: src/ui.ycp:682 src/ui.ycp:683 src/widgets.ycp:720
-msgid "&Local user"
-msgstr ""
-
-#. Translators: text entry label
-#: src/ui.ycp:685
-msgid "&Display as"
-msgstr ""
-
-#. Translators: error message
-#: src/ui.ycp:722
-msgid "The address for this user is already defined."
-msgstr ""
-
-#. error popup
-#: src/ui.ycp:730
-msgid "The mail address format is incorrect."
-msgstr ""
-
-#. Translators: dialog caption
-#: src/ui.ycp:757
-msgid "Masquerading"
-msgstr ""
-
-#. Translators: radio button label
-#: src/ui.ycp:772
-msgid "Masquerade &local domains"
-msgstr ""
-
-#. `HBox (
-#. `HSpacing (2),
-#. `TextEntry (`id (`masqdomains), `opt (`disabled), _("That is"), ld)
-#. // `Left (`Label (`opt (`outputField, `hstretch), ld))
-#. ),
-#. Translators: radio button label
-#: src/ui.ycp:780
-msgid "Ma&squerade other domains"
-msgstr ""
-
-#. Translators: text entry label
-#: src/ui.ycp:784
-msgid "Do&mains to masquerade"
-msgstr ""
-
-#. Translators: table column headings
-#: src/ui.ycp:795 src/ui.ycp:1139
-msgid "Local user"
-msgstr ""
-
-#. Translators: table column headings
-#: src/ui.ycp:797
-msgid "Display as"
-msgstr ""
-
-#. Translators: button
-#: src/ui.ycp:809 src/ui.ycp:1144 src/ui.ycp:1301 src/ui.ycp:1389
-msgid "A&dd"
-msgstr ""
-
-#. Translators: button
-#: src/ui.ycp:811 src/ui.ycp:1146 src/ui.ycp:1303 src/ui.ycp:1391
-msgid "&Edit"
-msgstr ""
-
-#. Translators: button
-#: src/ui.ycp:813
-msgid "Dele&te"
-msgstr ""
-
-#. Translators: error popup
-#. Already in Translation Memory
-#: src/ui.ycp:890
-msgid "The domain name is incorrect"
-msgstr ""
-
-#. string mod = listToString (Mail::masquerade_other_domains);
-#. list<string> lmod = [];
-#. list<map> mu = Mail::masquerade_users;
-#. Translators: dialog caption
-#: src/ui.ycp:931
-msgid "Outgoing Server Authentication"
-msgstr ""
-
-#: src/ui.ycp:940
-msgid "Outgoing &Server"
-msgstr ""
-
-#: src/ui.ycp:941
-msgid "&User name"
-msgstr ""
-
-#: src/ui.ycp:942
-msgid "&Password"
-msgstr ""
-
-#. Translators: popup dialog heading
-#. Translators: dialog caption
-#: src/ui.ycp:1047 src/ui.ycp:1103
-msgid "Mail downloading"
-msgstr ""
-
-#. Translators: table column headings
-#: src/ui.ycp:1133
-msgid "Server"
-msgstr ""
-
-#. Translators: table column headings
-#: src/ui.ycp:1135
-msgid "Protocol"
-msgstr ""
-
-#. Translators: table column headings
-#: src/ui.ycp:1137
-msgid "User"
-msgstr ""
-
-#. Translators: button
-#: src/ui.ycp:1148 src/ui.ycp:1305 src/ui.ycp:1393
-msgid "De&lete"
-msgstr ""
-
-#. Translators: popup dialog heading
-#: src/ui.ycp:1217
-msgid "Incoming mail redirection"
-msgstr ""
-
-#. Translators: text entry label
-#: src/ui.ycp:1219
-msgid "&Alias"
-msgstr ""
-
-#. Translators: text entry label
-#: src/ui.ycp:1221
-msgid "&Destinations"
-msgstr ""
-
-#. Translators: error message
-#: src/ui.ycp:1255
-msgid "The alias format is incorrect."
-msgstr ""
-
-#. Translators: error message
-#: src/ui.ycp:1261
-msgid "The destinations for this alias are already defined."
-msgstr ""
-
-#. Translators: table column headings
-#: src/ui.ycp:1294 src/ui.ycp:1382
-msgid "Alias"
-msgstr ""
-
-#. Translators: table column headings
-#: src/ui.ycp:1296 src/ui.ycp:1384
-msgid "Destinations"
-msgstr ""
-
-#. Translators: dialog caption
-#: src/ui.ycp:1374
-msgid "Virtual domains"
-msgstr ""
-
-#. Translators: dialog caption
-#: src/ui.ycp:1584
-msgid "Mail configuration"
-msgstr ""
-
-#. label
-#: src/ui.ycp:1586
-msgid "Initializing..."
-msgstr ""
-
-#. Translators: error popup
-#: src/widgets.ycp:146 src/widgets.ycp:337
-msgid "The host name is incorrect"
-msgstr ""
-
-#. Translators: error popup
-#: src/widgets.ycp:392 src/widgets.ycp:447 src/widgets.ycp:482
-msgid "The user name format is incorrect."
-msgstr ""
-
-#. Translators: error popup
-#. Validation
-#: src/widgets.ycp:549
-msgid "Cannot use procmail when root's mail is not forwarded."
-msgstr ""
-
-#. combo box choice:
-#. deliver mail normally
-#: src/widgets.ycp:577
-msgid "Directly"
-msgstr ""
-
-#. combo box choice:
-#. deliver mail through procmail
-#: src/widgets.ycp:580
-msgid "Through procmail"
-msgstr ""
-
-#. combo box choice:
-#. deliver mail to cyrus-imapd using LMTP
-#: src/widgets.ycp:583
-msgid "To Cyrus IMAP Server"
-msgstr ""
-
-#. just a template, do not translate
-#: src/widgets.ycp:602
-msgid "."
-msgstr ""
-
-#. Translators: text entry label
-#: src/widgets.ycp:610
-msgid "&Outgoing mail server"
-msgstr ""
-
-#. help text
-#: src/widgets.ycp:612
-msgid ""
-"\n"
-"<p>The outgoing mail server is generally intended for dial-up connections.\n"
-"Enter the Internet service provider's SMTP server, such as\n"
-"<b>smtp.provider.com</b>.</p>\n"
-msgstr ""
-
-#. Translators: text entry label
-#: src/widgets.ycp:624
-msgid "Do&main for the 'From' header"
-msgstr ""
-
-#. help text
-#: src/widgets.ycp:626
-msgid ""
-"\n"
-"<p>You may want the mail you sent to appear as if it originated from\n"
-"<b>company.com</b> instead of <b>pc-042.company.com</b>.\n"
-"Use the text box provided or a more detailed dialog.</p>\n"
-msgstr ""
-
-#. Translators: text entry label
-#: src/widgets.ycp:638
-msgid "&Domains for locally delivered mail"
-msgstr ""
-
-#. help text
-#: src/widgets.ycp:640
-msgid ""
-"\n"
-"<p>Here, specify the domains for which the mail\n"
-"will be delivered locally. If you enter nothing,\n"
-"the local host name is assumed.</p>\n"
-msgstr ""
-
-#. check box label
-#: src/widgets.ycp:652
-msgid "Accept remote &SMTP connections"
-msgstr ""
-
-#. help text
-#: src/widgets.ycp:654
-msgid ""
-"\n"
-"<p>Mail can be received directly via the SMTP protocol\n"
-"or it can be downloaded from\n"
-"a POP or an IMAP server using <b>fetchmail</b>.</p>"
-msgstr ""
-
-#. checkbox label
-#: src/widgets.ycp:664
-msgid "&Enable virus scanning (AMaViS)"
-msgstr ""
-
-#. help text
-#: src/widgets.ycp:666
-msgid ""
-"\n"
-"<p>Enabling virus scanning checks incoming and outgoing mail\n"
-"with AMaViS.</p>\n"
-msgstr ""
-
-#. help text
-#: src/widgets.ycp:671
-msgid ""
-"\n"
-"<p>If AMaViS is not installed and you want to use it, it will be installed\n"
-"automatically.</p>\n"
-msgstr ""
-
-#. Translators: text entry label
-#: src/widgets.ycp:681
-msgid "&Server"
-msgstr ""
-
-#. Translators: combo box label
-#: src/widgets.ycp:691
-msgid "&Protocol"
-msgstr ""
-
-#. Translators: text entry label
-#: src/widgets.ycp:700
-msgid "&Remote user name"
-msgstr ""
-
-#. Translators: text entry label
-#: src/widgets.ycp:709
-msgid "P&assword"
-msgstr ""
-
-#. Translators: text entry label
-#: src/widgets.ycp:730
-msgid "&Forward root's mail to"
-msgstr ""
-
-#. help text
-#: src/widgets.ycp:732
-msgid ""
-"<p>It is recommended to have a regular user account\n"
-"for the system administrator and redirect root's mail to this account.</p>"
-msgstr ""
-
-#. Translators: combo box label
-#. /etc/sysconfig/postfix: POSTFIX_MDA
-#: src/widgets.ycp:743
-msgid "&Delivery Mode"
-msgstr ""
-
-#. help text
-#: src/widgets.ycp:746
-msgid "<p>The <b>delivery mode</b> is usually <b>procmail</b>, unless you do not forward root's mail or want to access the mail via IMAP.</p>"
-msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.13.3/src/Mail.ycp new/yast2-mail-2.13.4/src/Mail.ycp
--- old/yast2-mail-2.13.3/src/Mail.ycp 2006-02-07 17:18:28.000000000 +0100
+++ new/yast2-mail-2.13.4/src/Mail.ycp 2006-08-16 12:48:02.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Martin Vidner
*
- * $Id: Mail.ycp 27688 2006-02-07 16:18:29Z mvidner $
+ * $Id: Mail.ycp 32372 2006-08-16 10:49:32Z kmachalkova $
*
* Representation of the configuration of mail.
* Input and output routines.
@@ -287,6 +287,13 @@
message = message + _("Fetchmail, a mail downloading utility, will be installed.\n");
}
+ if ((postfix_mda == `cyrus) &&
+ ! Package::Installed("cyrus-imapd"))
+ {
+ install_packages = add(install_packages,"cyrus-imapd");
+ // Translators: popup message part, ends with a newline
+ message = message + _("Cyrus-imapd, an IMAP server, will be installed.\n");
+ }
return message;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org