Hello community,
here is the log from the commit of package yast2-packager
checked in at Mon Apr 10 17:50:57 CEST 2006.
--------
--- yast2-packager/yast2-packager.changes 2006-04-10 16:55:24.000000000 +0200
+++ STABLE/yast2-packager/yast2-packager.changes 2006-04-10 17:27:34.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Apr 10 17:13:58 CEST 2006 - locilka@suse.cz
+
+- Hide password when reporting the URL for failed adding add-on
+ product (#164881).
+- 2.13.74
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.13.73.tar.bz2
New:
----
yast2-packager-2.13.74.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.LM2Ayg/_old 2006-04-10 17:50:27.000000000 +0200
+++ /var/tmp/diff_new_pack.LM2Ayg/_new 2006-04-10 17:50:27.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.73)
+# spec file for package yast2-packager (Version 2.13.74)
#
# 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-packager
-Version: 2.13.73
+Version: 2.13.74
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.73.tar.bz2
+Source0: yast2-packager-2.13.74.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-installation yast2-testsuite yast2-xml
Requires: yast2 yast2-installation checkmedia yast2-country
@@ -41,7 +41,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.13.73
+%setup -n yast2-packager-2.13.74
%build
%{prefix}/bin/y2tool y2autoconf
@@ -78,6 +78,10 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Mon Apr 10 2006 - locilka@suse.cz
+- Hide password when reporting the URL for failed adding add-on
+ product (#164881).
+- 2.13.74
* Mon Apr 10 2006 - visnov@suse.cz
- adapt slideshow for new pkg-bindings API (#161298)
- 2.13.73
++++++ yast2-packager-2.13.73.tar.bz2 -> yast2-packager-2.13.74.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.73/Makefile.am new/yast2-packager-2.13.74/Makefile.am
--- old/yast2-packager-2.13.73/Makefile.am 2006-03-13 14:18:11.000000000 +0100
+++ new/yast2-packager-2.13.74/Makefile.am 2006-04-07 14:32:01.000000000 +0200
@@ -154,7 +154,7 @@
$(PREFIX)/bin/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
@@ -199,6 +199,9 @@
false; \
fi
+check-textdomain:
+ $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.73/Makefile.in new/yast2-packager-2.13.74/Makefile.in
--- old/yast2-packager-2.13.73/Makefile.in 2006-03-13 14:18:17.000000000 +0100
+++ new/yast2-packager-2.13.74/Makefile.in 2006-04-07 14:32:09.000000000 +0200
@@ -783,7 +783,7 @@
$(PREFIX)/bin/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 \
@@ -826,6 +826,9 @@
false; \
fi
+check-textdomain:
+ $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.73/VERSION new/yast2-packager-2.13.74/VERSION
--- old/yast2-packager-2.13.73/VERSION 2006-04-10 16:53:21.000000000 +0200
+++ new/yast2-packager-2.13.74/VERSION 2006-04-10 17:27:06.000000000 +0200
@@ -1 +1 @@
-2.13.73
+2.13.74
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.73/configure new/yast2-packager-2.13.74/configure
--- old/yast2-packager-2.13.73/configure 2006-03-13 14:18:14.000000000 +0100
+++ new/yast2-packager-2.13.74/configure 2006-04-07 14:32:06.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.41.
+# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.70.
#
# Report bugs to http://www.suse.de/feedback.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.13.41'
-PACKAGE_STRING='yast2-packager 2.13.41'
+PACKAGE_VERSION='2.13.70'
+PACKAGE_STRING='yast2-packager 2.13.70'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -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-packager 2.13.41 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.13.70 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-packager 2.13.41:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.13.70:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.13.41
+yast2-packager configure 2.13.70
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-packager $as_me 2.13.41, which was
+It was created by yast2-packager $as_me 2.13.70, 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-packager'
- VERSION='2.13.41'
+ VERSION='2.13.70'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.41"
+VERSION="2.13.70"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain "
@@ -2695,7 +2695,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-packager $as_me 2.13.41, which was
+This file was extended by yast2-packager $as_me 2.13.70, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2750,7 +2750,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.13.41
+yast2-packager config.status 2.13.70
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-packager-2.13.73/configure.in new/yast2-packager-2.13.74/configure.in
--- old/yast2-packager-2.13.73/configure.in 2006-03-13 14:18:11.000000000 +0100
+++ new/yast2-packager-2.13.74/configure.in 2006-04-07 14:32:01.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.13.41, http://www.suse.de/feedback, yast2-packager)
+AC_INIT(yast2-packager, 2.13.70, http://www.suse.de/feedback, yast2-packager)
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.41"
+VERSION="2.13.70"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.73/packager.pot new/yast2-packager-2.13.74/packager.pot
--- old/yast2-packager-2.13.73/packager.pot 2006-04-10 13:44:10.000000000 +0200
+++ new/yast2-packager-2.13.74/packager.pot 2006-04-07 10:45:26.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-10 13:44+0200\n"
+"POT-Creation-Date: 2006-04-07 10:45+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -18,46 +18,55 @@
#. module description
#: src/clients/checkmedia.ycp:36
+#: yast2-packager-2.13.66/src/clients/checkmedia.ycp:36
msgid "Check CD or DVD media integrity"
msgstr ""
#. screen title for installation into directory options
#: src/clients/dirinstall_options.ycp:19
+#: yast2-packager-2.13.66/src/clients/dirinstall_options.ycp:19
msgid "Directory Install Options"
msgstr ""
#. text entry
#: src/clients/dirinstall_options.ycp:28
+#: yast2-packager-2.13.66/src/clients/dirinstall_options.ycp:28
msgid "&Root Directory (not \"/\"):"
msgstr ""
#. check box
#: src/clients/dirinstall_options.ycp:30
+#: yast2-packager-2.13.66/src/clients/dirinstall_options.ycp:30
msgid "Run &YaST and SuSEconfig on First Boot"
msgstr ""
#. check box
#: src/clients/dirinstall_options.ycp:32
+#: yast2-packager-2.13.66/src/clients/dirinstall_options.ycp:32
msgid "Create Ima&ge"
msgstr ""
#. text entry
#: src/clients/dirinstall_options.ycp:34
+#: yast2-packager-2.13.66/src/clients/dirinstall_options.ycp:34
msgid "Ima&ge Name:"
msgstr ""
#. text entry
#: src/clients/dirinstall_options.ycp:38
+#: yast2-packager-2.13.66/src/clients/dirinstall_options.ycp:38
msgid "&Image Directory:"
msgstr ""
#. push button
#: src/clients/dirinstall_options.ycp:42
+#: yast2-packager-2.13.66/src/clients/dirinstall_options.ycp:42
msgid "Select &Directory"
msgstr ""
#. help text for dirinstall options 1/2
#: src/clients/dirinstall_options.ycp:50
+#: yast2-packager-2.13.66/src/clients/dirinstall_options.ycp:50
msgid ""
"<p>Choose a directory to which to install. Depending on the software selection, make sure\n"
"enough space is available.</p>\n"
@@ -65,6 +74,7 @@
#. help text for dirinstall options 2/2
#: src/clients/dirinstall_options.ycp:54
+#: yast2-packager-2.13.66/src/clients/dirinstall_options.ycp:54
msgid ""
"<p>Additionally, you can create an archive image of the directory using tar. To create an \n"
"image, specify the name and the location in the respective fields.</p>\n"
@@ -72,31 +82,37 @@
#. directory selection header
#: src/clients/dirinstall_options.ycp:89
+#: yast2-packager-2.13.66/src/clients/dirinstall_options.ycp:89
msgid "Select Directory"
msgstr ""
#. popup message
#: src/clients/dirinstall_options.ycp:107
+#: yast2-packager-2.13.66/src/clients/dirinstall_options.ycp:107
msgid "Specify a root directory. This does not mean /"
msgstr ""
#. this is a heading
#: src/clients/dirinstall_options_proposal.ycp:63
+#: yast2-packager-2.13.66/src/clients/dirinstall_options_proposal.ycp:63
msgid "Options"
msgstr ""
#. this is a menu entry
#: src/clients/dirinstall_options_proposal.ycp:65
+#: yast2-packager-2.13.66/src/clients/dirinstall_options_proposal.ycp:65
msgid "&Options"
msgstr ""
#. error popup
#: src/clients/inst_custom_packages.ycp:39
+#: yast2-packager-2.13.66/src/clients/inst_custom_packages.ycp:39
msgid "Could not read package information."
msgstr ""
#. explanation text for GNOME
#: src/clients/inst_desktop.ycp:76
+#: yast2-packager-2.13.66/src/clients/inst_desktop.ycp:76
msgid ""
"GNOME is a powerful and intuitive desktop\n"
"environment that uses Evolution as its mailer,\n"
@@ -106,6 +122,7 @@
#. explanation text for KDE
#: src/clients/inst_desktop.ycp:83
+#: yast2-packager-2.13.66/src/clients/inst_desktop.ycp:83
msgid ""
"KDE is a powerful and intuitive desktop\n"
"environment that uses Kontact as its mailer\n"
@@ -114,6 +131,7 @@
#. help text 1/3
#: src/clients/inst_desktop.ycp:88
+#: yast2-packager-2.13.66/src/clients/inst_desktop.ycp:88
msgid ""
"<p>Both <b>KDE</b> and <b>GNOME</b> are powerful and intuitive\n"
"desktop environments. They combine ease of use\n"
@@ -123,6 +141,7 @@
#. help text 2/3
#: src/clients/inst_desktop.ycp:94
+#: yast2-packager-2.13.66/src/clients/inst_desktop.ycp:94
msgid ""
"<p>Choosing the default <b>GNOME</b> or <b>KDE</b> desktop\n"
"environment installs a broad set of the\n"
@@ -132,6 +151,7 @@
#. help text 3/3
#: src/clients/inst_desktop.ycp:100
+#: yast2-packager-2.13.66/src/clients/inst_desktop.ycp:100
msgid ""
"<p>Choose <b>Other</b> then press <b>Select</b> to select\n"
"an alternative, such as a text-only system or a minimal graphical\n"
@@ -140,46 +160,55 @@
#. radio button
#: src/clients/inst_desktop.ycp:107
+#: yast2-packager-2.13.66/src/clients/inst_desktop.ycp:107
msgid "&KDE"
msgstr ""
#. radio button
#: src/clients/inst_desktop.ycp:122
+#: yast2-packager-2.13.66/src/clients/inst_desktop.ycp:122
msgid "&GNOME"
msgstr ""
#. radio button
#: src/clients/inst_desktop.ycp:148
+#: yast2-packager-2.13.66/src/clients/inst_desktop.ycp:148
msgid "&Other"
msgstr ""
#. push button
#: src/clients/inst_desktop.ycp:154
+#: yast2-packager-2.13.66/src/clients/inst_desktop.ycp:154
msgid "&Select..."
msgstr ""
#. frame
#: src/clients/inst_desktop.ycp:165
+#: yast2-packager-2.13.66/src/clients/inst_desktop.ycp:165
msgid "Alternate Desktops"
msgstr ""
#. radio button
#: src/clients/inst_desktop.ycp:169
+#: yast2-packager-2.13.66/src/clients/inst_desktop.ycp:169
msgid "Minimal &Graphical System"
msgstr ""
#. radio button
#: src/clients/inst_desktop.ycp:172
+#: yast2-packager-2.13.66/src/clients/inst_desktop.ycp:172
msgid "&Text Mode"
msgstr ""
#. dialog caption
#: src/clients/inst_desktop.ycp:182
+#: yast2-packager-2.13.66/src/clients/inst_desktop.ycp:182
msgid "Desktop Selection"
msgstr ""
#. popup message
#: src/clients/inst_desktop.ycp:214
+#: yast2-packager-2.13.66/src/clients/inst_desktop.ycp:214
msgid ""
"No desktop was selected. Select the\n"
"desktop to install."
@@ -187,58 +216,74 @@
#. progress stages
#: src/clients/inst_dirinstall_finish.ycp:30
+#: yast2-packager-2.13.66/src/clients/inst_dirinstall_finish.ycp:30
msgid "Finalize system configuration"
msgstr ""
#. progress stages
#: src/clients/inst_dirinstall_finish.ycp:32
+#: yast2-packager-2.13.66/src/clients/inst_dirinstall_finish.ycp:32
msgid "Prepare system for initial boot"
msgstr ""
#. progress stage
#: src/clients/inst_dirinstall_finish.ycp:39
+#: yast2-packager-2.13.66/src/clients/inst_dirinstall_finish.ycp:39
msgid "Create image file"
msgstr ""
#. help text
#: src/clients/inst_dirinstall_finish.ycp:47
+#: yast2-packager-2.13.66/src/clients/inst_dirinstall_finish.ycp:47
msgid "<p>Please wait while the system is being configured.</p>"
msgstr ""
#. Headline for last dialog of base installation: Install LILO etc.
#: src/clients/inst_dirinstall_finish.ycp:51
+#: yast2-packager-2.13.66/src/clients/inst_dirinstall_finish.ycp:51
msgid "Finishing Directory Installation"
msgstr ""
#. progress title
#: src/clients/inst_dirinstall_finish.ycp:61
+#: yast2-packager-2.13.66/src/clients/inst_dirinstall_finish.ycp:61
msgid "Configuring installed system"
msgstr ""
#. progress title
#: src/clients/inst_dirinstall_finish.ycp:127
+#: yast2-packager-2.13.66/src/clients/inst_dirinstall_finish.ycp:127
msgid "Building directory image..."
msgstr ""
#. part of item in summary
#: src/clients/inst_media.ycp:30 src/clients/inst_media.ycp:31
-#: src/modules/SourceManager.ycp:602 src/modules/SourceManager.ycp:660
+#: src/modules/SourceManager.ycp:604 src/modules/SourceManager.ycp:662
+#: yast2-packager-2.13.66/src/clients/inst_media.ycp:30
+#: yast2-packager-2.13.66/src/clients/inst_media.ycp:31
msgid "Unknown"
msgstr ""
#. screen title
#. this is a heading
+#. screen title
+#. this is a heading
#: src/clients/inst_media.ycp:37 src/clients/media_proposal.ycp:86
+#: yast2-packager-2.13.66/src/clients/inst_media.ycp:37
+#: yast2-packager-2.13.66/src/clients/media_proposal.ycp:86
msgid "Installation Media"
msgstr ""
#. label for showing installation sources
#: src/clients/inst_media.ycp:40 src/clients/inst_mediacopy.ycp:46
+#: yast2-packager-2.13.66/src/clients/inst_media.ycp:40
+#: yast2-packager-2.13.66/src/clients/inst_mediacopy.ycp:46
msgid "Registered Catalogs"
msgstr ""
#. help text for dialog to show installation sources
#: src/clients/inst_media.ycp:43
+#: yast2-packager-2.13.66/src/clients/inst_media.ycp:43
msgid ""
"<p>All registered installation sources are shown here.\n"
"</p>\n"
@@ -247,21 +292,28 @@
#. table header
#: src/clients/inst_media.ycp:56 src/clients/inst_mediacopy.ycp:56
#: src/clients/inst_source.ycp:248
+#: yast2-packager-2.13.66/src/clients/inst_media.ycp:56
+#: yast2-packager-2.13.66/src/clients/inst_mediacopy.ycp:56
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:248
msgid "Name"
msgstr ""
#. table header
#: src/clients/inst_media.ycp:58 src/clients/inst_mediacopy.ycp:57
+#: yast2-packager-2.13.66/src/clients/inst_media.ycp:58
+#: yast2-packager-2.13.66/src/clients/inst_mediacopy.ycp:57
msgid "Version"
msgstr ""
#. dialog heading
#: src/clients/inst_mediacopy.ycp:39
+#: yast2-packager-2.13.66/src/clients/inst_mediacopy.ycp:39
msgid "Copy Installation Media"
msgstr ""
#. help text
#: src/clients/inst_mediacopy.ycp:41
+#: yast2-packager-2.13.66/src/clients/inst_mediacopy.ycp:41
msgid ""
"<p>The installation CDs will be copied into the system\n"
"to create an installation source that can be used to install\n"
@@ -270,32 +322,41 @@
#. feedback popup 1/2
#: src/clients/inst_mediacopy.ycp:108
+#: yast2-packager-2.13.66/src/clients/inst_mediacopy.ycp:108
msgid "Copying CD contents to a local directory..."
msgstr ""
#. feedback popup 2/2
#: src/clients/inst_mediacopy.ycp:110
+#: yast2-packager-2.13.66/src/clients/inst_mediacopy.ycp:110
msgid "Please wait..."
msgstr ""
#: src/clients/inst_packages.ycp:69 src/clients/inst_packages.ycp:74
#: src/clients/inst_packages.ycp:79 src/clients/inst_packages.ycp:83
+#: yast2-packager-2.13.66/src/clients/inst_packages.ycp:69
+#: yast2-packager-2.13.66/src/clients/inst_packages.ycp:74
+#: yast2-packager-2.13.66/src/clients/inst_packages.ycp:79
+#: yast2-packager-2.13.66/src/clients/inst_packages.ycp:83
msgid "<p>"
msgstr ""
#. Dialog title
#. Hint for German translation: "Softwareauswahl und Einsatzzweck des Systems"
#: src/clients/inst_packages.ycp:95
+#: yast2-packager-2.13.66/src/clients/inst_packages.ycp:95
msgid "Software Selection and System Tasks"
msgstr ""
#. error report
#: src/clients/inst_rpmcopy.ycp:165
+#: yast2-packager-2.13.66/src/clients/inst_rpmcopy.ycp:165
msgid "Error occurred while switching the service pack catalog."
msgstr ""
#. error report
#: src/clients/inst_rpmcopy.ycp:186
+#: yast2-packager-2.13.66/src/clients/inst_rpmcopy.ycp:186
msgid ""
"Error occurred while switching the cached \n"
"source back to CD."
@@ -303,6 +364,7 @@
#. error report
#: src/clients/inst_rpmcopy.ycp:279
+#: yast2-packager-2.13.66/src/clients/inst_rpmcopy.ycp:279
#, ycp-format
msgid ""
"Error occurred while creating directory %1:\n"
@@ -311,6 +373,7 @@
#. error report
#: src/clients/inst_rpmcopy.ycp:293
+#: yast2-packager-2.13.66/src/clients/inst_rpmcopy.ycp:293
#, ycp-format
msgid ""
"Error occurred while getting temporary directory.\n"
@@ -319,24 +382,28 @@
#. error report
#: src/clients/inst_rpmcopy.ycp:319
+#: yast2-packager-2.13.66/src/clients/inst_rpmcopy.ycp:319
#, ycp-format
msgid "Error occurred while getting temporary directory. %1"
msgstr ""
#. error report
#: src/clients/inst_rpmcopy.ycp:413
+#: yast2-packager-2.13.66/src/clients/inst_rpmcopy.ycp:413
msgid "Error occurred while getting the directory with updated packages"
msgstr ""
#. 3. Copy /<arch>/<package> from cached source to Installation::destdir+"/{var?}/tmp"
#. translators: this is an information popup, %1 is a number
#: src/clients/inst_rpmcopy.ycp:420
+#: yast2-packager-2.13.66/src/clients/inst_rpmcopy.ycp:420
#, ycp-format
msgid "Copying files from CD %1 to disk..."
msgstr ""
#. error report
#: src/clients/inst_rpmcopy.ycp:436
+#: yast2-packager-2.13.66/src/clients/inst_rpmcopy.ycp:436
#, ycp-format
msgid ""
"Error occurred while copying packages\n"
@@ -345,6 +412,7 @@
#. error report
#: src/clients/inst_rpmcopy.ycp:460
+#: yast2-packager-2.13.66/src/clients/inst_rpmcopy.ycp:460
#, ycp-format
msgid ""
"Error occurred while copying packages\n"
@@ -353,16 +421,19 @@
#. error report
#: src/clients/inst_rpmcopy.ycp:489
+#: yast2-packager-2.13.66/src/clients/inst_rpmcopy.ycp:489
msgid "Switching to disk cache failed."
msgstr ""
#. continue-cancel popup
#: src/clients/inst_rpmcopy.ycp:513
+#: yast2-packager-2.13.66/src/clients/inst_rpmcopy.ycp:513
msgid "Initializing the target directory failed"
msgstr ""
#. error report, %1 is number
#: src/clients/inst_rpmcopy.ycp:659
+#: yast2-packager-2.13.66/src/clients/inst_rpmcopy.ycp:659
#, ycp-format
msgid "Failed to select %1 packages for installation"
msgstr ""
@@ -372,14 +443,24 @@
#. Dialog title for software selection
#. dialog caption
#. Dialog title for software selection
+#. dialog caption
+#. we have multiple base selections, let the user choose
+#. Dialog title for software selection
+#. dialog caption
+#. Dialog title for software selection
#: src/clients/inst_selections.ycp:40 src/clients/inst_selections.ycp:77
#: src/clients/inst_selections.ycp:172
#: src/clients/inst_sw_selection_select.ycp:75
+#: yast2-packager-2.13.66/src/clients/inst_selections.ycp:40
+#: yast2-packager-2.13.66/src/clients/inst_selections.ycp:77
+#: yast2-packager-2.13.66/src/clients/inst_selections.ycp:172
+#: yast2-packager-2.13.66/src/clients/inst_sw_selection_select.ycp:75
msgid "Software Selection"
msgstr ""
#. Intermediate contents of the software selection screen
#: src/clients/inst_selections.ycp:45 src/modules/Packages.ycp:1153
+#: yast2-packager-2.13.66/src/clients/inst_selections.ycp:45
msgid "Initializing catalogs..."
msgstr ""
@@ -388,6 +469,7 @@
#. some of the text in <b>'s, e.g. Default comes from the index file,
#. translations must be consistent with po/index/index.??.po
#: src/clients/inst_selections.ycp:83
+#: yast2-packager-2.13.66/src/clients/inst_selections.ycp:83
msgid ""
"<p>\n"
"The &product; Standard System is a good software\n"
@@ -397,6 +479,7 @@
#. help text, continued
#: src/clients/inst_selections.ycp:89
+#: yast2-packager-2.13.66/src/clients/inst_selections.ycp:89
msgid ""
"<p>You will not need to insert all of the media that\n"
"come with &product; for this selection. Additional software from the\n"
@@ -406,6 +489,7 @@
#. help text, continued
#: src/clients/inst_selections.ycp:95
+#: yast2-packager-2.13.66/src/clients/inst_selections.ycp:95
msgid ""
"<p>\n"
"The <b>Minimal</b> system includes just the bare essentials needed\n"
@@ -419,6 +503,7 @@
#. help text, continued
#: src/clients/inst_selections.ycp:106
+#: yast2-packager-2.13.66/src/clients/inst_selections.ycp:106
msgid ""
"<p>\n"
"With the <b>Minimum graphical system</b>, install the &product;\n"
@@ -430,6 +515,8 @@
#. help text, continued, optional
#: src/clients/inst_selections.ycp:115
#: src/clients/inst_sw_selection_select.ycp:125
+#: yast2-packager-2.13.66/src/clients/inst_selections.ycp:115
+#: yast2-packager-2.13.66/src/clients/inst_sw_selection_select.ycp:125
msgid ""
"<p>&product; offers a selection of efficient and comfortable desktops.\n"
"Select which desktop to install.</p>"
@@ -437,44 +524,62 @@
#. Frame caption for software selection
#. this is a heading
+#. Frame caption for software selection
+#. this is a heading
#: src/clients/inst_selections.ycp:157
#: src/clients/inst_sw_selection_select.ycp:231
#: src/clients/software_proposal.ycp:122
+#: yast2-packager-2.13.66/src/clients/inst_selections.ycp:157
+#: yast2-packager-2.13.66/src/clients/inst_sw_selection_select.ycp:231
+#: yast2-packager-2.13.66/src/clients/software_proposal.ycp:122
msgid "Software"
msgstr ""
#. dialog caption
#: src/clients/inst_source.ycp:32
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:32
msgid "Initializing..."
msgstr ""
#. corresponds to the "Enable/Disable" button
#: src/clients/inst_source.ycp:70 src/clients/inst_source.ycp:71
#: src/clients/inst_source.ycp:597 src/clients/inst_source.ycp:620
-#: src/modules/SourceManager.ycp:599
+#: src/modules/SourceManager.ycp:601
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:70
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:71
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:597
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:620
msgid "On"
msgstr ""
#. corresponds to the "Enable/Disable" button
#: src/clients/inst_source.ycp:70 src/clients/inst_source.ycp:71
#: src/clients/inst_source.ycp:597 src/clients/inst_source.ycp:620
-#: src/modules/SourceManager.ycp:601
+#: src/modules/SourceManager.ycp:603
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:70
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:71
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:597
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:620
msgid "Off"
msgstr ""
#. translators: unknown name for a given source
#. translators: name of a source if no other idenfication found
-#: src/clients/inst_source.ycp:73 src/modules/SourceManager.ycp:580
+#. translators: unknown name for a given source
+#: src/clients/inst_source.ycp:73 src/modules/SourceManager.ycp:582
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:73
msgid "unknown"
msgstr ""
#. label
-#: src/clients/inst_source.ycp:104 src/modules/SourceManager.ycp:459
+#: src/clients/inst_source.ycp:104 src/modules/SourceManager.ycp:461
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:104
msgid "Adding catalog..."
msgstr ""
#. message part 1
#: src/clients/inst_source.ycp:113
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:113
#, ycp-format
msgid ""
"Unable to create installation source\n"
@@ -482,28 +587,38 @@
msgstr ""
#. message part 2 alt. 1
-#: src/clients/inst_source.ycp:120 src/modules/SourceManager.ycp:478
+#: src/clients/inst_source.ycp:120 src/modules/SourceManager.ycp:480
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:120
msgid "A catalog for this product already exists."
msgstr ""
#. message part 2 alt. 2 followed by description
#. popup message part 2 followed by other info
#. popup message, after message header, header of details
+#. message part 2 alt. 2 followed by description
+#. popup message part 2 followed by other info
#: src/clients/inst_source.ycp:123 src/clients/inst_source.ycp:514
-#: src/modules/SourceManager.ycp:197 src/modules/SourceManager.ycp:480
+#: src/modules/SourceManager.ycp:199 src/modules/SourceManager.ycp:482
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:123
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:514
msgid "Details:"
msgstr ""
#. message part 3
#. popup message part 3
#. end of popup message, question
+#. message part 3
+#. popup message part 3
#: src/clients/inst_source.ycp:126 src/clients/inst_source.ycp:516
-#: src/modules/SourceManager.ycp:199 src/modules/SourceManager.ycp:483
+#: src/modules/SourceManager.ycp:201 src/modules/SourceManager.ycp:485
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:126
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:516
msgid "Try again?"
msgstr ""
#. continue-back popup
-#: src/clients/inst_source.ycp:144 src/modules/SourceManager.ycp:501
+#: src/clients/inst_source.ycp:144 src/modules/SourceManager.ycp:503
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:144
msgid ""
"There is no product information available at the given location.\n"
"If you expected to address a product, return back and enter\n"
@@ -514,124 +629,151 @@
#. pusg button
#: src/clients/inst_source.ycp:225
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:225
msgid "&Replace..."
msgstr ""
#. pusg button
#: src/clients/inst_source.ycp:227
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:227
msgid "Re&fresh..."
msgstr ""
#. pusg button
#: src/clients/inst_source.ycp:229
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:229
msgid "&Delete"
msgstr ""
#. pusg button
#: src/clients/inst_source.ycp:231
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:231
msgid "&Up"
msgstr ""
#. pusg button
#: src/clients/inst_source.ycp:233
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:233
msgid "D&own"
msgstr ""
#. pusg button
#: src/clients/inst_source.ycp:235
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:235
msgid "Enab&le or Disable"
msgstr ""
#. push button
#: src/clients/inst_source.ycp:237
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:237
msgid "Refre&sh On or Off"
msgstr ""
#. table header
#. progress bar label
+#. table header
#: src/clients/inst_source.ycp:244 src/modules/PackageCallbacks.ycp:869
#: src/modules/PackageCallbacks.ycp:953 src/modules/PackageCallbacks.ycp:1028
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:244
msgid "Status"
msgstr ""
#. table header
#: src/clients/inst_source.ycp:246
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:246
msgid "Refresh"
msgstr ""
#. table header
#: src/clients/inst_source.ycp:250 src/clients/inst_source.ycp:418
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:250
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:418
msgid "URL"
msgstr ""
#. menunutton
#: src/clients/inst_source.ycp:258
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:258
msgid "&Add"
msgstr ""
#. menunutton item
#: src/clients/inst_source.ycp:260
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:260
msgid "&Scan Using SLP..."
msgstr ""
#. menunutton item
#: src/clients/inst_source.ycp:262
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:262
msgid "&FTP..."
msgstr ""
#. menunutton item
#: src/clients/inst_source.ycp:264
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:264
msgid "&HTTP..."
msgstr ""
#. menunutton item
#: src/clients/inst_source.ycp:266
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:266
msgid "HTT&PS..."
msgstr ""
#. menunutton item
#. radio button
+#. menunutton item
#: src/clients/inst_source.ycp:268 src/include/inst_source_dialogs.ycp:318
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:268
msgid "&SMB/CIFS"
msgstr ""
#. menunutton item
#: src/clients/inst_source.ycp:270
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:270
msgid "&NFS..."
msgstr ""
#. menunutton item
#: src/clients/inst_source.ycp:272
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:272
msgid "&CD..."
msgstr ""
#. menunutton item
#: src/clients/inst_source.ycp:274
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:274
msgid "&DVD..."
msgstr ""
#. menunutton item
#: src/clients/inst_source.ycp:276
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:276
msgid "&Local Directory..."
msgstr ""
#. menubutton item
#: src/clients/inst_source.ycp:278
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:278
msgid "Specify &URL..."
msgstr ""
#. menu button
#: src/clients/inst_source.ycp:282
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:282
msgid "&Edit"
msgstr ""
#. dialog caption
#: src/clients/inst_source.ycp:302
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:302
msgid "Media Containing the Software Catalog"
msgstr ""
#. help
#: src/clients/inst_source.ycp:305
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:305
msgid ""
"<p>\n"
"Software packages can be installed from the CD, over a\n"
@@ -641,6 +783,7 @@
#. help, continued
#: src/clients/inst_source.ycp:312
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:312
msgid ""
"<p>\n"
"To install packages from <b>CD</b>,\n"
@@ -650,6 +793,7 @@
#. help, continued
#: src/clients/inst_source.ycp:319
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:319
msgid ""
"<p>\n"
"The &product; CDs can be copied to the <b>hard disk</b>.\n"
@@ -663,6 +807,7 @@
#. help, continued
#: src/clients/inst_source.ycp:330
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:330
msgid ""
"<p>\n"
"<b>Network</b> installation requires a working network connection.\n"
@@ -677,6 +822,7 @@
msgstr ""
#: src/clients/inst_source.ycp:350
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:350
msgid ""
"There were errors when restoring the source configuration.\n"
"Not all sources will be available for configuration.\n"
@@ -684,25 +830,30 @@
#. translators: popup busy message
#: src/clients/inst_source.ycp:388
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:388
msgid "Scanning network..."
msgstr ""
#: src/clients/inst_source.ycp:396
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:396
msgid "No SLP catalogs found."
msgstr ""
#. translators: popup heading
#: src/clients/inst_source.ycp:415
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:415
msgid "Choose SLP Catalog"
msgstr ""
#. translators: table header
#: src/clients/inst_source.ycp:418
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:418
msgid "Type"
msgstr ""
#. popup message part 1
#: src/clients/inst_source.ycp:510
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:510
msgid ""
"Unable to save changes to installation source\n"
"configuration."
@@ -710,11 +861,13 @@
#. popup headline
#: src/clients/inst_source.ycp:528
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:528
msgid "Abort Catalog Configuration"
msgstr ""
#. popup message
#: src/clients/inst_source.ycp:530
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:530
msgid ""
"Abort the catalog configuration?\n"
"All changes will be lost."
@@ -722,11 +875,13 @@
#. yes-no popup
#: src/clients/inst_source.ycp:586
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:586
msgid "Delete the selected catalog from the list?"
msgstr ""
#. popup message
#: src/clients/inst_source.ycp:612
+#: yast2-packager-2.13.66/src/clients/inst_source.ycp:612
msgid ""
"For the selected source, refresh\n"
"cannot be set."
@@ -737,6 +892,7 @@
#. some of the text in <b>'s, e.g. Default comes from the index file,
#. translations must be consistent with po/index/index.??.po
#: src/clients/inst_sw_selection_select.ycp:81
+#: yast2-packager-2.13.66/src/clients/inst_sw_selection_select.ycp:81
msgid ""
"<p>\n"
"The &product; <b>Default</b> system is a good software\n"
@@ -746,6 +902,7 @@
#. help text, continued
#: src/clients/inst_sw_selection_select.ycp:91
+#: yast2-packager-2.13.66/src/clients/inst_sw_selection_select.ycp:91
msgid ""
"<p>It includes powerful graphical office applications.\n"
"</p>"
@@ -753,6 +910,7 @@
#. help text, continued
#: src/clients/inst_sw_selection_select.ycp:96
+#: yast2-packager-2.13.66/src/clients/inst_sw_selection_select.ycp:96
msgid ""
"<p>\n"
" You will not need to insert all of the CDs that\n"
@@ -763,6 +921,7 @@
#. help text, continued
#: src/clients/inst_sw_selection_select.ycp:104
+#: yast2-packager-2.13.66/src/clients/inst_sw_selection_select.ycp:104
msgid ""
"<p>\n"
"The <b>Minimal</b> system includes just the bare essentials needed\n"
@@ -776,6 +935,7 @@
#. help text, continued
#: src/clients/inst_sw_selection_select.ycp:115
+#: yast2-packager-2.13.66/src/clients/inst_sw_selection_select.ycp:115
msgid ""
"<p>\n"
"With the <b>Minimum graphical system</b>, install the &product;\n"
@@ -786,6 +946,7 @@
#. help text, continued
#: src/clients/inst_sw_selection_select.ycp:129
+#: yast2-packager-2.13.66/src/clients/inst_sw_selection_select.ycp:129
msgid ""
"<p>\n"
"To make a more precise selection of software to install, select\n"
@@ -795,17 +956,21 @@
#. Intermediate contents of the software selection screen
#: src/clients/inst_sw_selection_select.ycp:141
+#: yast2-packager-2.13.66/src/clients/inst_sw_selection_select.ycp:141
msgid "This product has a fixed software selection that cannot be changed."
msgstr ""
#. Intermediate contents of the software selection screen
#: src/clients/inst_sw_selection_select.ycp:152
+#: yast2-packager-2.13.66/src/clients/inst_sw_selection_select.ycp:152
msgid "Reading package database..."
msgstr ""
#. Display warning message
#: src/clients/inst_sw_selection_select.ycp:219
#: src/clients/inst_sw_selection_select.ycp:376
+#: yast2-packager-2.13.66/src/clients/inst_sw_selection_select.ycp:219
+#: yast2-packager-2.13.66/src/clients/inst_sw_selection_select.ycp:376
msgid ""
"You have already chosen software from \"Detailed selection\".\n"
"You will lose that selection if you change the basic selection."
@@ -815,11 +980,13 @@
#. software selection (e.g. Multimedia, Games,
#. KDE, Gnome, ... - not the individual packages!)
#: src/clients/inst_sw_selection_select.ycp:243
+#: yast2-packager-2.13.66/src/clients/inst_sw_selection_select.ycp:243
msgid "&Detailed selection..."
msgstr ""
#. popup text: ask the user whether to reset his individuell selection
#: src/clients/inst_sw_selection_select.ycp:277
+#: yast2-packager-2.13.66/src/clients/inst_sw_selection_select.ycp:277
msgid ""
"Do you really want\n"
"to reset your detailed selection?"
@@ -827,58 +994,71 @@
#. message popup
#: src/clients/inst_sw_selection_select.ycp:338
+#: yast2-packager-2.13.66/src/clients/inst_sw_selection_select.ycp:338
msgid "There are package conflict which cannot be resolved automatically."
msgstr ""
#. intermediate popup while initializing internal packagemanagement
#: src/clients/media_proposal.ycp:33
+#: yast2-packager-2.13.66/src/clients/media_proposal.ycp:33
msgid "Reading package information. One moment please..."
msgstr ""
#. Proposal for system to update, part of the richtext
#: src/clients/media_proposal.ycp:45
+#: yast2-packager-2.13.66/src/clients/media_proposal.ycp:45
msgid "No Valid Installation Media"
msgstr ""
#. this is a menu entry
#: src/clients/media_proposal.ycp:88
+#: yast2-packager-2.13.66/src/clients/media_proposal.ycp:88
msgid "&Media"
msgstr ""
#. progress step title
#: src/clients/pkg_finish.ycp:41
+#: yast2-packager-2.13.66/src/clients/pkg_finish.ycp:41
msgid "Saving package manager configuration..."
msgstr ""
#. the language_changed flag has NOT been set by the NLD frame
#: src/clients/software_proposal.ycp:69
#: src/clients/software_simple_proposal.ycp:36
+#: yast2-packager-2.13.66/src/clients/software_proposal.ycp:69
+#: yast2-packager-2.13.66/src/clients/software_simple_proposal.ycp:36
msgid "The software proposal is reset to default values."
msgstr ""
#. warning text
#: src/clients/software_proposal.ycp:77
#: src/clients/software_simple_proposal.ycp:44
+#: yast2-packager-2.13.66/src/clients/software_proposal.ycp:77
+#: yast2-packager-2.13.66/src/clients/software_simple_proposal.ycp:44
msgid "Cannot solve dependencies automatically. Manual intervention is required."
msgstr ""
#. this is a menu entry
#: src/clients/software_proposal.ycp:124
+#: yast2-packager-2.13.66/src/clients/software_proposal.ycp:124
msgid "&Software"
msgstr ""
#. error popup, %1 is the name of the .rpm package
#: src/clients/sw_single.ycp:127 src/modules/PackageCallbacks.ycp:188
+#: yast2-packager-2.13.66/src/clients/sw_single.ycp:127
#, ycp-format
msgid "Package %1 was not found on the medium."
msgstr ""
#. label of popup
#: src/clients/sw_single.ycp:163
+#: yast2-packager-2.13.66/src/clients/sw_single.ycp:163
msgid "Reading package information..."
msgstr ""
#: src/clients/sw_single.ycp:223
+#: yast2-packager-2.13.66/src/clients/sw_single.ycp:223
msgid ""
"During the last package installation,\n"
"several package failed to install.\n"
@@ -887,6 +1067,7 @@
#. error report, %1 is a list of packages
#: src/clients/sw_single.ycp:257
+#: yast2-packager-2.13.66/src/clients/sw_single.ycp:257
#, ycp-format
msgid ""
"Following packages haven't been found on the medium:\n"
@@ -895,6 +1076,7 @@
#. Popup dialog contents
#: src/clients/sw_single.ycp:313
+#: yast2-packager-2.13.66/src/clients/sw_single.ycp:313
msgid "Install or remove more packages?"
msgstr ""
@@ -1904,7 +2086,7 @@
#. additional Richtext (HTML) warning text (kind of help), %1 stands for the key ID
#: src/modules/SignatureCheckDialogs.ycp:485
-#: src/modules/SignatureCheckDialogs.ycp:577
+#: src/modules/SignatureCheckDialogs.ycp:580
#, ycp-format
msgid ""
"<p>The owner of the key may distribute updates,\n"
@@ -1943,24 +2125,24 @@
#. push button
#: src/modules/SignatureCheckDialogs.ycp:540
-#: src/modules/SignatureCheckDialogs.ycp:632
+#: src/modules/SignatureCheckDialogs.ycp:635
msgid "&Import"
msgstr ""
#. push button
#: src/modules/SignatureCheckDialogs.ycp:543
-#: src/modules/SignatureCheckDialogs.ycp:635
+#: src/modules/SignatureCheckDialogs.ycp:638
msgid "&Details..."
msgstr ""
#. push button
#: src/modules/SignatureCheckDialogs.ycp:546
-#: src/modules/SignatureCheckDialogs.ycp:638
+#: src/modules/SignatureCheckDialogs.ycp:641
msgid "Do &Not Import"
msgstr ""
#. popup message, %1 stands for GPG key ID, %2 for key name
-#: src/modules/SignatureCheckDialogs.ycp:593
+#: src/modules/SignatureCheckDialogs.ycp:596
#, ycp-format
msgid ""
"The GnuPG key '%1 (%2)'\n"
@@ -1973,25 +2155,25 @@
msgstr ""
#. popup heading
-#: src/modules/SignatureCheckDialogs.ycp:621
+#: src/modules/SignatureCheckDialogs.ycp:624
msgid "Import Untrusted GnuPG Key"
msgstr ""
#. When data throughput goes downhill (stalled network connection etc.),
#. cut off the predicted time at a reasonable maximum.
#. "%1" is a predefined maximum time.
-#: src/modules/SlideShow.ycp:258
+#: src/modules/SlideShow.ycp:257
#, ycp-format
msgid ">%1"
msgstr ""
#. Nothing more to install from this CD (very concise - little space!!)
-#: src/modules/SlideShow.ycp:279 src/modules/SlideShow.ycp:300
+#: src/modules/SlideShow.ycp:278 src/modules/SlideShow.ycp:299
msgid "Done."
msgstr ""
#. (Short!) headline for the total remaining time or MBs to install
-#: src/modules/SlideShow.ycp:314
+#: src/modules/SlideShow.ycp:313
#, ycp-format
msgid ""
"Remaining:\n"
@@ -2002,7 +2184,7 @@
#. %1: Media type ("CD" / "DVD", ???)
#. %2: Media name ("SuSE Linux Professional CD 2" )
#. %3: Time remaining until this media will be needed
-#: src/modules/SlideShow.ycp:337
+#: src/modules/SlideShow.ycp:336
#, ycp-format
msgid "Next %1: %2 -- %3"
msgstr ""
@@ -2010,68 +2192,68 @@
#. Status line informing about the next CD that will be used
#. %1: Media type ("CD" / "DVD", ???)
#. %2: Media name ("SuSE Linux Professional CD 2" )
-#: src/modules/SlideShow.ycp:345
+#: src/modules/SlideShow.ycp:344
#, ycp-format
msgid "Next %1: %2"
msgstr ""
#. message in the installatino log, %1 is package name,
#. %2 is package size
-#: src/modules/SlideShow.ycp:679
+#: src/modules/SlideShow.ycp:678
#, ycp-format
msgid "Downloading %1 (%2)"
msgstr ""
#. List column header for total remaining MB and time to install
#. Progress bar for overall progress of software package installation
-#: src/modules/SlideShow.ycp:912 src/modules/SlideShow.ycp:1363
+#: src/modules/SlideShow.ycp:911 src/modules/SlideShow.ycp:1362
msgid "Total"
msgstr ""
#. Heading for the progress bar for the current package
#. while it is deleted. "%1" is the package name.
-#: src/modules/SlideShow.ycp:1229
+#: src/modules/SlideShow.ycp:1228
#, ycp-format
msgid "Deleting %1"
msgstr ""
#. Table headings for CD statistics during installation
-#: src/modules/SlideShow.ycp:1408
+#: src/modules/SlideShow.ycp:1407
msgid "Media"
msgstr ""
#. Table headings for CD statistics during installation
-#: src/modules/SlideShow.ycp:1410
+#: src/modules/SlideShow.ycp:1409
msgid "Size"
msgstr ""
#. Table headings for CD statistics during installation
-#: src/modules/SlideShow.ycp:1412
+#: src/modules/SlideShow.ycp:1411
msgid "Packages"
msgstr ""
#. Table headings for CD statistics during installation
-#: src/modules/SlideShow.ycp:1414
+#: src/modules/SlideShow.ycp:1413
msgid "Time"
msgstr ""
#. Help text while software packages are being installed (displayed only in rare cases)
-#: src/modules/SlideShow.ycp:1473
+#: src/modules/SlideShow.ycp:1472
msgid "<p>Please wait while packages are installed.</p>"
msgstr ""
#. tab
-#: src/modules/SlideShow.ycp:1492
+#: src/modules/SlideShow.ycp:1491
msgid "Slide Sho&w"
msgstr ""
#. tab
-#: src/modules/SlideShow.ycp:1494
+#: src/modules/SlideShow.ycp:1493
msgid "&Details"
msgstr ""
#. Dialog heading while software packages are being installed
-#: src/modules/SlideShow.ycp:1517 src/modules/SlideShow.ycp:1549
+#: src/modules/SlideShow.ycp:1516 src/modules/SlideShow.ycp:1548
msgid "Package Installation"
msgstr ""
@@ -2090,82 +2272,82 @@
msgstr ""
#. SourceManager read dialog caption
-#: src/modules/SourceManager.ycp:130
+#: src/modules/SourceManager.ycp:132
msgid "Initializing Available Catalogs"
msgstr ""
#. Progress stage 1/3
-#: src/modules/SourceManager.ycp:138
+#: src/modules/SourceManager.ycp:140
msgid "Read configured catalogs"
msgstr ""
#. Progress stage 2/3
-#: src/modules/SourceManager.ycp:140
+#: src/modules/SourceManager.ycp:142
msgid "Detect available catalogs via SLP"
msgstr ""
#. Progress step 1/3
-#: src/modules/SourceManager.ycp:143
+#: src/modules/SourceManager.ycp:145
msgid "Reading configured catalogs..."
msgstr ""
#. Progress step 2/3
-#: src/modules/SourceManager.ycp:145
+#: src/modules/SourceManager.ycp:147
msgid "Detecting available catalogs..."
msgstr ""
#. Progress finished
-#: src/modules/SourceManager.ycp:147 src/modules/SourceManager.ycp:235
+#: src/modules/SourceManager.ycp:149 src/modules/SourceManager.ycp:237
msgid "Finished"
msgstr ""
#. Error message
-#: src/modules/SourceManager.ycp:158
+#: src/modules/SourceManager.ycp:160
msgid "Cannot read catalogs."
msgstr ""
#. Error message
-#: src/modules/SourceManager.ycp:166
+#: src/modules/SourceManager.ycp:168
msgid "Cannot detect availabe catalogs."
msgstr ""
#. popup message header
-#: src/modules/SourceManager.ycp:192
+#: src/modules/SourceManager.ycp:194
msgid ""
"Unable to save changes to the catalog\n"
" repository.\n"
msgstr ""
#. SourceManager read dialog caption
-#: src/modules/SourceManager.ycp:222
+#: src/modules/SourceManager.ycp:224
msgid "Saving Catalog Configuration"
msgstr ""
#. Progress stage 1/1
-#: src/modules/SourceManager.ycp:229
+#: src/modules/SourceManager.ycp:231
msgid "Write catalog settings"
msgstr ""
#. Progress step 1/1
-#: src/modules/SourceManager.ycp:232
+#: src/modules/SourceManager.ycp:234
msgid "Writing the settings..."
msgstr ""
#. Popup::NoHeadline(),
#. popup headline
-#: src/modules/SourceManager.ycp:304
+#: src/modules/SourceManager.ycp:306
msgid "Reading Media Description Failed"
msgstr ""
#. popup message, %1 is filename
-#: src/modules/SourceManager.ycp:307
+#: src/modules/SourceManager.ycp:309
#, ycp-format
msgid ""
"Cannot read media description for %1.\n"
" Packages from this media cannot be installed."
msgstr ""
-#: src/modules/SourceManager.ycp:472
+#: src/modules/SourceManager.ycp:474
#, ycp-format
msgid ""
"Unable to create catalog\n"
@@ -2173,31 +2355,31 @@
msgstr ""
#. status info, to be used inside summary
-#: src/modules/SourceManager.ycp:573
+#: src/modules/SourceManager.ycp:575
msgid "Enabled"
msgstr ""
#. status info, to be used inside summary
-#: src/modules/SourceManager.ycp:575
+#: src/modules/SourceManager.ycp:577
msgid "Disabled"
msgstr ""
#. summary header
-#: src/modules/SourceManager.ycp:644
+#: src/modules/SourceManager.ycp:646
msgid "Configured Catalogs"
msgstr ""
#. part of item in summary meaning "switched on"
-#: src/modules/SourceManager.ycp:662
+#: src/modules/SourceManager.ycp:664
msgid " On "
msgstr ""
#. rug is a command name
-#: src/modules/SourceManager.ycp:834
+#: src/modules/SourceManager.ycp:840
msgid "rug failed to add a ZYPP service"
msgstr ""
-#: src/modules/SourceManager.ycp:835
+#: src/modules/SourceManager.ycp:841
msgid "rug failed to delete a ZYPP service"
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.73/src/modules/SourceManager.ycp new/yast2-packager-2.13.74/src/modules/SourceManager.ycp
--- old/yast2-packager-2.13.73/src/modules/SourceManager.ycp 2006-04-10 16:51:48.000000000 +0200
+++ new/yast2-packager-2.13.74/src/modules/SourceManager.ycp 2006-04-10 17:16:20.000000000 +0200
@@ -7,7 +7,7 @@
* Martin Vidner
* Status: Work in Progress
*
- * $Id: SourceManager.ycp 29861 2006-04-07 09:38:58Z kkaempf $
+ * $Id: SourceManager.ycp 29941 2006-04-10 15:15:57Z locilka $
*
* Representation of the configuration of source-manager.
* Input and output routines.
@@ -29,6 +29,7 @@
import "Mode";
import "Stage";
import "URL";
+import "InstURL";
global list<integer> newSources = [];
@@ -472,7 +473,7 @@
if ( size( newSources ) == 0 )
{
string _msg1 = sformat( _("Unable to create catalog
-from URL '%1'."), url );
+from URL '%1'."), InstURL::HidePassword(url) );
string err = Pkg::LastErrorId();
string _msg2 = "";
if ( err != "ok" ) {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...