commit yast2-update

26 May 2006

Hello community,

here is the log from the commit of package yast2-update
checked in at Fri May 26 15:48:19 CEST 2006.

--------

--- yast2-update/yast2-update.changes	2006-05-11 09:04:21.000000000 +0200
+++ yast2-update/yast2-update.changes	2006-05-25 13:34:37.000000000 +0200
@@ -1,0 +2,13 @@
+Thu May 25 13:15:54 CEST 2006 - jsrain@suse.cz
+
+- fixed keeping locked packages during upgrade (#177469)
+- 2.13.29
+
+-------------------------------------------------------------------
+Mon May 22 12:22:35 CEST 2006 - jsrain@suse.cz
+
+- do not delete unmaintained packages if not wanted by user
+  (#176788)
+- 2.13.28
+
+-------------------------------------------------------------------

Old:
----
  yast2-update-2.13.27.tar.bz2

New:
----
  yast2-update-2.13.29.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-update.spec ++++++
--- /var/tmp/diff_new_pack.aKERUg/_old	2006-05-26 15:48:05.000000000 +0200
+++ /var/tmp/diff_new_pack.aKERUg/_new	2006-05-26 15:48:05.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-update (Version 2.13.27)
+# spec file for package yast2-update (Version 2.13.29)
 #
 # 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-update
-Version:        2.13.27
-Release:        2
+Version:        2.13.29
+Release:        1
 License:        GPL
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-update-2.13.27.tar.bz2
+Source0:        yast2-update-2.13.29.tar.bz2
 prefix:		/usr
 BuildRequires:  docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-mouse yast2-packager yast2-testsuite yast2-xml
 Requires:       yast2 yast2-installation yast2-storage yast2-packager
@@ -39,7 +39,7 @@
     Arvin Schnell <arvin@suse.de>
 
 %prep
-%setup -n yast2-update-2.13.27
+%setup -n yast2-update-2.13.29
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -74,6 +74,13 @@
 %doc %{prefix}/share/doc/packages/yast2-update
 
 %changelog -n yast2-update
+* Thu May 25 2006 - jsrain@suse.cz
+- fixed keeping locked packages during upgrade (#177469)
+- 2.13.29
+* Mon May 22 2006 - jsrain@suse.cz
+- do not delete unmaintained packages if not wanted by user
+  (#176788)
+- 2.13.28
 * Thu May 11 2006 - jsrain@suse.cz
 - preselect patterns specified in the content file (#168297)
 - 2.13.27

++++++ yast2-update-2.13.27.tar.bz2 -> yast2-update-2.13.29.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.27/VERSION new/yast2-update-2.13.29/VERSION
--- old/yast2-update-2.13.27/VERSION	2006-05-11 09:00:16.000000000 +0200
+++ new/yast2-update-2.13.29/VERSION	2006-05-25 13:20:20.000000000 +0200
@@ -1 +1 @@
-2.13.27
+2.13.29
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.27/configure new/yast2-update-2.13.29/configure
--- old/yast2-update-2.13.27/configure	2006-05-11 09:04:00.000000000 +0200
+++ new/yast2-update-2.13.29/configure	2006-05-25 13:33:24.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-update 2.13.27.
+# Generated by GNU Autoconf 2.59 for yast2-update 2.13.29.
 #
 # Report bugs to <http://bugs.opensuse.org/>.
 #
@@ -269,8 +269,8 @@
 # Identity of this package.
 PACKAGE_NAME='yast2-update'
 PACKAGE_TARNAME='yast2-update'
-PACKAGE_VERSION='2.13.27'
-PACKAGE_STRING='yast2-update 2.13.27'
+PACKAGE_VERSION='2.13.29'
+PACKAGE_STRING='yast2-update 2.13.29'
 PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
 
 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-update 2.13.27 to adapt to many kinds of systems.
+\`configure' configures yast2-update 2.13.29 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-update 2.13.27:";;
+     short | recursive ) echo "Configuration of yast2-update 2.13.29:";;
    esac
   cat <<\_ACEOF
 
@@ -908,7 +908,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-yast2-update configure 2.13.27
+yast2-update configure 2.13.29
 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-update $as_me 2.13.27, which was
+It was created by yast2-update $as_me 2.13.29, 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-update'
- VERSION='2.13.27'
+ VERSION='2.13.29'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
 
 
 
-VERSION="2.13.27"
+VERSION="2.13.29"
 RPMNAME="yast2-update"
 MAINTAINER="Jiri Srain <jsrain@suse.cz>"
 
@@ -2695,7 +2695,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by yast2-update $as_me 2.13.27, which was
+This file was extended by yast2-update $as_me 2.13.29, 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-update config.status 2.13.27
+yast2-update config.status 2.13.29
 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-update-2.13.27/configure.in new/yast2-update-2.13.29/configure.in
--- old/yast2-update-2.13.27/configure.in	2006-05-11 09:03:56.000000000 +0200
+++ new/yast2-update-2.13.29/configure.in	2006-05-25 13:33:06.000000000 +0200
@@ -3,7 +3,7 @@
 dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-update, 2.13.27, http://bugs.opensuse.org/, yast2-update)
+AC_INIT(yast2-update, 2.13.29, http://bugs.opensuse.org/, yast2-update)
 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.27"
+VERSION="2.13.29"
 RPMNAME="yast2-update"
 MAINTAINER="Jiri Srain <jsrain@suse.cz>"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.27/kernel-update-tool.pot new/yast2-update-2.13.29/kernel-update-tool.pot
--- old/yast2-update-2.13.27/kernel-update-tool.pot	1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-update-2.13.29/kernel-update-tool.pot	2006-05-12 12:36:43.000000000 +0200
@@ -0,0 +1,33 @@
+# 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 <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-12 12:36+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/clients/kernel-update.ycp:188
+msgid "Warning"
+msgstr ""
+
+#: src/clients/kernel-update.ycp:189
+msgid "Abort the kernel upgrade?"
+msgstr ""
+
+#: src/clients/kernel-update.ycp:246
+msgid "Alternate Download Location"
+msgstr ""
+
+#: src/clients/kernel-update.ycp:509
+msgid "Kernel Update Status Log"
+msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.27/src/clients/update_proposal.ycp new/yast2-update-2.13.29/src/clients/update_proposal.ycp
--- old/yast2-update-2.13.27/src/clients/update_proposal.ycp	2006-05-11 08:53:33.000000000 +0200
+++ new/yast2-update-2.13.29/src/clients/update_proposal.ycp	2006-05-25 12:46:33.000000000 +0200
@@ -92,12 +92,9 @@
 		Packages::using_patterns = true;
 	    }
 
-	    if (!Update::did_init2)
+	    Pkg::PkgApplReset ();
+	    if (! Update::onlyUpdateInstalled)
 	    {
-		Pkg::PkgReset ();
-		Update::did_init2 = true;
-		if (! Update::onlyUpdateInstalled)
-		{
 		    if (Packages::using_patterns)
 		    {
 			Update::SetDesktopPattern ();
@@ -106,12 +103,10 @@
 		    {
 			Update::ProposeSelection ();
 		    }
-		}
 	    }
 
 	    if (Update::onlyUpdateInstalled)			// just consider already installed packages
 	    {
-		Pkg::PkgReset();
 		Pkg::SetSelection ("");				// -> don't select any additional selections
 	    }
 	    else if (Packages::using_patterns)
@@ -128,7 +123,6 @@
 	    }
 	    else						// update selections too
 	    {
-		Pkg::PkgReset();
 		Pkg::SetSelection (Update::selected_selection);	// -> set the base selection (minimal, default, ....)
 
 		if (!Update::manual_interaction)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.27/update.pot new/yast2-update-2.13.29/update.pot
--- old/yast2-update-2.13.27/update.pot	2005-09-09 16:22:12.000000000 +0200
+++ new/yast2-update-2.13.29/update.pot	2006-05-12 12:36:43.000000000 +0200
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-09 16:22+0200\n"
+"POT-Creation-Date: 2006-05-12 12:36+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,68 +18,81 @@
 
 #. Proposal for backup during update
 #: src/clients/backup_proposal.ycp:42
+#: yast2-update-2.13.25/src/clients/backup_proposal.ycp:42
 msgid "Create Backup of Modified Files"
 msgstr ""
 
 #. Proposal for backup during update
 #: src/clients/backup_proposal.ycp:47
+#: yast2-update-2.13.25/src/clients/backup_proposal.ycp:47
 msgid "Create Backup of /etc/sysconfig Directory"
 msgstr ""
 
 #. Proposal for backup during update
 #: src/clients/backup_proposal.ycp:52
+#: yast2-update-2.13.25/src/clients/backup_proposal.ycp:52
 msgid "Do Not Create Backups"
 msgstr ""
 
 #. Proposal for backup during update
 #: src/clients/backup_proposal.ycp:57
+#: yast2-update-2.13.25/src/clients/backup_proposal.ycp:57
 msgid "Remove Backups from Previous Updates"
 msgstr ""
 
 #. this is a heading
 #: src/clients/backup_proposal.ycp:88
+#: yast2-update-2.13.25/src/clients/backup_proposal.ycp:88
 msgid "Backup"
 msgstr ""
 
 #. this is a menu entry
 #: src/clients/backup_proposal.ycp:90
+#: yast2-update-2.13.25/src/clients/backup_proposal.ycp:90
 msgid "&Backup"
 msgstr ""
 
 #. error popup, user did not enter a valid directory specification
 #: src/clients/inst_backup.ycp:38
+#: yast2-update-2.13.25/src/clients/inst_backup.ycp:38
 msgid "Invalid backup path."
 msgstr ""
 
 #. there is not enough space for the backup during update
 #. inform the user about this (MB==megabytes)
 #: src/clients/inst_backup.ycp:78
+#: yast2-update-2.13.25/src/clients/inst_backup.ycp:78
 #, ycp-format
 msgid "Minimum disk space of %1 MB required."
 msgstr ""
 
 #. screen title for software selection
 #: src/clients/inst_backup.ycp:90
+#: yast2-update-2.13.25/src/clients/inst_backup.ycp:90
 msgid "Backup System Before Update"
 msgstr ""
 
 #. checkbox label if user wants to backup modified files
 #: src/clients/inst_backup.ycp:100
+#: yast2-update-2.13.25/src/clients/inst_backup.ycp:100
 msgid "Create &Backup of Modified Files"
 msgstr ""
 
 #. checkbox label if user wants to backup /etc/sysconfig
 #: src/clients/inst_backup.ycp:103
+#: yast2-update-2.13.25/src/clients/inst_backup.ycp:103
 msgid "Create a &Complete Backup of /etc/sysconfig"
 msgstr ""
 
 #. checkbox label if user wants remove old backup stuff
 #: src/clients/inst_backup.ycp:107
+#: yast2-update-2.13.25/src/clients/inst_backup.ycp:107
 msgid "Remove &Old Backups from the Backup Directory"
 msgstr ""
 
 #. help text for backup dialog during update 1/7
 #: src/clients/inst_backup.ycp:112
+#: yast2-update-2.13.25/src/clients/inst_backup.ycp:112
 msgid ""
 "<p>To avoid any loss of information during update,\n"
 "it is possible to create a <b>backup</b> prior to updating.</p>\n"
@@ -87,6 +100,7 @@
 
 #. help text for backup dialog during update 2/7
 #: src/clients/inst_backup.ycp:117
+#: yast2-update-2.13.25/src/clients/inst_backup.ycp:117
 msgid ""
 "<p><b>Warning:</b> This will not be a complete\n"
 "backup. Only modified files will be saved.</p>\n"
@@ -94,11 +108,13 @@
 
 #. help text for backup dialog during update 3/7
 #: src/clients/inst_backup.ycp:122
+#: yast2-update-2.13.25/src/clients/inst_backup.ycp:122
 msgid "<p>Select the desired options.</p>\n"
 msgstr ""
 
 #. help text for backup dialog during update 4/7
 #: src/clients/inst_backup.ycp:126
+#: yast2-update-2.13.25/src/clients/inst_backup.ycp:126
 msgid ""
 "<p><b>Create a Backup of Modified Files:</b>\n"
 "Stores those modified files that are replaced during update.</p>\n"
@@ -106,6 +122,7 @@
 
 #. help text for backup dialog during update 5/7
 #: src/clients/inst_backup.ycp:131
+#: yast2-update-2.13.25/src/clients/inst_backup.ycp:131
 msgid ""
 "<p><b>Create a Complete Backup of\n"
 "/etc/sysconfig:</b> This covers all configuration files that are part of the\n"
@@ -114,6 +131,7 @@
 
 #. help text for backup dialog during update 6/7
 #: src/clients/inst_backup.ycp:137
+#: yast2-update-2.13.25/src/clients/inst_backup.ycp:137
 msgid ""
 "<p><b>Remove Old Backups from the Backup\n"
 "Directory:</b> If your current system already is the result of an earlier\n"
@@ -123,18 +141,29 @@
 
 #. help text for backup dialog during update 7/7
 #: src/clients/inst_backup.ycp:144
+#: yast2-update-2.13.25/src/clients/inst_backup.ycp:144
 #, ycp-format
 msgid "<p>All backups are placed in %1.</p>"
 msgstr ""
 
 #. screen title for update options
 #. this is a heading
-#: src/clients/inst_update.ycp:27 src/clients/update_proposal.ycp:288
+#. screen title for update options
+#. this is a heading
+#: src/clients/inst_update.ycp:27 src/clients/update_proposal.ycp:357
+#: yast2-update-2.13.25/src/clients/inst_update.ycp:27
+#: yast2-update-2.13.25/src/clients/update_proposal.ycp:346
 msgid "Update Options"
 msgstr ""
 
+#: src/clients/inst_update.ycp:39
+#: yast2-update-2.13.25/src/clients/inst_update.ycp:39
+msgid "Select Patterns"
+msgstr ""
+
 #. Display warning message
-#: src/clients/inst_update.ycp:56
+#: src/clients/inst_update.ycp:66
+#: yast2-update-2.13.25/src/clients/inst_update.ycp:66
 msgid ""
 "You have already chosen software from \"Detailed selection\".\n"
 "You will lose that selection if you change the basic selection."
@@ -142,50 +171,62 @@
 
 #. Unkown for unknown system
 #. label for an unknown installed system
-#: src/clients/inst_update.ycp:64 src/include/rootpart.ycp:30
-#: src/include/rootpart.ycp:33 src/modules/RootPart.ycp:117
-#: src/modules/RootPart.ycp:1067
+#. Unkown for unknown system
+#. label for an unknown installed system
+#: src/clients/inst_update.ycp:74 src/include/rootpart.ycp:30
+#: src/include/rootpart.ycp:33 src/modules/RootPart.ycp:94
+#: src/modules/RootPart.ycp:1014
+#: yast2-update-2.13.25/src/clients/inst_update.ycp:74
+#: yast2-update-2.13.25/src/modules/RootPart.ycp:94
+#: yast2-update-2.13.25/src/modules/RootPart.ycp:1014
 msgid "Unknown"
 msgstr ""
 
 #. label showing from what version to what version we are updating
-#: src/clients/inst_update.ycp:69
+#: src/clients/inst_update.ycp:79
+#: yast2-update-2.13.25/src/clients/inst_update.ycp:79
 #, ycp-format
 msgid "Update from %1 to %2"
 msgstr ""
 
 #. frame title for update selection
-#: src/clients/inst_update.ycp:72
+#: src/clients/inst_update.ycp:82
+#: yast2-update-2.13.25/src/clients/inst_update.ycp:82
 msgid "Update Mode"
 msgstr ""
 
 #. radio button label for update including new packages
-#: src/clients/inst_update.ycp:79
+#: src/clients/inst_update.ycp:89
+#: yast2-update-2.13.25/src/clients/inst_update.ycp:89
 msgid ""
 "&Update with Installation of New Software and Features\n"
 "Based on the Selection:\n"
 msgstr ""
 
 #. radio button label for update of already installed packages only
-#: src/clients/inst_update.ycp:90
+#: src/clients/inst_update.ycp:100
+#: yast2-update-2.13.25/src/clients/inst_update.ycp:100
 msgid "Only U&pdate Installed Packages"
 msgstr ""
 
 #. check box label
 #. translator: add a & shortcut
-#: src/clients/inst_update.ycp:100
+#: src/clients/inst_update.ycp:110
+#: yast2-update-2.13.25/src/clients/inst_update.ycp:110
 msgid "&Delete Unmaintained Packages"
 msgstr ""
 
 #. help text for dialog "update options" 1/4
-#: src/clients/inst_update.ycp:108
+#: src/clients/inst_update.ycp:118
+#: yast2-update-2.13.25/src/clients/inst_update.ycp:118
 msgid ""
 "<p>The update option differs between two modes. In\n"
 "either case, it is recommended to make a backup of your personal data.</p>\n"
 msgstr ""
 
 #. help text for dialog "update options" 2/4
-#: src/clients/inst_update.ycp:113
+#: src/clients/inst_update.ycp:123
+#: yast2-update-2.13.25/src/clients/inst_update.ycp:123
 msgid ""
 "<p><b>With New Software:</b> This default setting\n"
 "updates the existing software and installs all new features and benefits of\n"
@@ -194,7 +235,8 @@
 msgstr ""
 
 #. help text for dialog "update options" 3/4
-#: src/clients/inst_update.ycp:120
+#: src/clients/inst_update.ycp:130
+#: yast2-update-2.13.25/src/clients/inst_update.ycp:130
 msgid ""
 "<p><b>Only Installed Packages:</b> This selection\n"
 "only updates the packages already installed on your system. <i>Note:</i>\n"
@@ -203,7 +245,8 @@
 msgstr ""
 
 #. help text for dialog "update options" 4/4
-#: src/clients/inst_update.ycp:127
+#: src/clients/inst_update.ycp:137
+#: yast2-update-2.13.25/src/clients/inst_update.ycp:137
 msgid ""
 "<p>After the update, some software might not\n"
 "function anymore. Activate <b>Delete Unmaintained Packages</b> to delete those\n"
@@ -211,84 +254,101 @@
 msgstr ""
 
 #. yes/no question
-#: src/clients/inst_update.ycp:186
+#: src/clients/inst_update.ycp:216
+#: yast2-update-2.13.25/src/clients/inst_update.ycp:216
 msgid ""
 "Do you really want\n"
 "to reset your detailed selection?"
 msgstr ""
 
 #. proposal for packages during update, %1 is count of packages
-#: src/clients/packages_proposal.ycp:74
+#: src/clients/packages_proposal.ycp:75
+#: yast2-update-2.13.25/src/clients/packages_proposal.ycp:75
 #, ycp-format
 msgid "Packages to Update: %1"
 msgstr ""
 
 #. proposal for packages during update, %1 is count of packages
-#: src/clients/packages_proposal.ycp:77
+#: src/clients/packages_proposal.ycp:78
+#: yast2-update-2.13.25/src/clients/packages_proposal.ycp:78
 #, ycp-format
 msgid "New Packages to Install: %1"
 msgstr ""
 
 #. proposal for packages during update, %1 is count of packages
-#: src/clients/packages_proposal.ycp:80
+#: src/clients/packages_proposal.ycp:81
+#: yast2-update-2.13.25/src/clients/packages_proposal.ycp:81
 #, ycp-format
 msgid "Packages to Remove: %1"
 msgstr ""
 
 #. part of summary, %1 is size of packages (in MB or GB)
-#: src/clients/packages_proposal.ycp:83
+#: src/clients/packages_proposal.ycp:84
+#: yast2-update-2.13.25/src/clients/packages_proposal.ycp:84
 #, ycp-format
 msgid "Total Size of Packages to Update: %1"
 msgstr ""
 
 #. warning text
-#: src/clients/packages_proposal.ycp:91
-msgid "Cannot solve all conflicts, requires manual intervention"
+#: src/clients/packages_proposal.ycp:92
+#: yast2-update-2.13.25/src/clients/packages_proposal.ycp:92
+msgid "Cannot solve all conflicts. Manual intervention is required."
 msgstr ""
 
 #. this is a heading
-#: src/clients/packages_proposal.ycp:138
+#: src/clients/packages_proposal.ycp:139
+#: yast2-update-2.13.25/src/clients/packages_proposal.ycp:139
 msgid "Packages"
 msgstr ""
 
 #. this is a menu entry
-#: src/clients/packages_proposal.ycp:140
+#: src/clients/packages_proposal.ycp:141
+#: yast2-update-2.13.25/src/clients/packages_proposal.ycp:141
 msgid "&Packages"
 msgstr ""
 
 #. Proposal for system to update
 #: src/clients/rootpart_proposal.ycp:50
+#: yast2-update-2.13.25/src/clients/rootpart_proposal.ycp:50
 msgid "No root partition found"
 msgstr ""
 
 #. Proposal for system to update
 #: src/clients/rootpart_proposal.ycp:85
+#: yast2-update-2.13.25/src/clients/rootpart_proposal.ycp:85
 #, ycp-format
 msgid "%1 on root partition %2"
 msgstr ""
 
 #. inform user in the proposal about the failed mount
-#: src/clients/rootpart_proposal.ycp:94
+#. error report
+#. inform user in the proposal about the failed mount
+#: src/clients/rootpart_proposal.ycp:94 src/include/rootpart.ycp:226
+#: yast2-update-2.13.25/src/clients/rootpart_proposal.ycp:94
 msgid "Failed to mount target system"
 msgstr ""
 
 #. this is a heading
 #: src/clients/rootpart_proposal.ycp:138
+#: yast2-update-2.13.25/src/clients/rootpart_proposal.ycp:138
 msgid "Selected for Update"
 msgstr ""
 
 #. this is a menu entry
 #: src/clients/rootpart_proposal.ycp:140
+#: yast2-update-2.13.25/src/clients/rootpart_proposal.ycp:140
 msgid "&Selected for Update"
 msgstr ""
 
 #. intermediate popup while initializing internal packagemanagement
-#: src/clients/update_proposal.ycp:62
+#: src/clients/update_proposal.ycp:67
+#: yast2-update-2.13.25/src/clients/update_proposal.ycp:65
 msgid "Reading package information. One moment please..."
 msgstr ""
 
 #. continue-cancel popup
-#: src/clients/update_proposal.ycp:138
+#: src/clients/update_proposal.ycp:172
+#: yast2-update-2.13.25/src/clients/update_proposal.ycp:161
 msgid ""
 "The installed product is not compatible with the product\n"
 "on the installation media. If you try to update using the\n"
@@ -297,45 +357,59 @@
 msgstr ""
 
 #. error message in proposal
-#: src/clients/update_proposal.ycp:195
+#: src/clients/update_proposal.ycp:249
+#: yast2-update-2.13.25/src/clients/update_proposal.ycp:238
 msgid "The installed product is not compatible with the product on the installatin media."
 msgstr ""
 
 #. Can't find any software data, probably a installation media error
 #. error message
-#: src/clients/update_proposal.ycp:209
+#: src/clients/update_proposal.ycp:263
+#: yast2-update-2.13.25/src/clients/update_proposal.ycp:252
 msgid "Cannot read package data from installation media. Media error?"
 msgstr ""
 
 #. proposal error
-#: src/clients/update_proposal.ycp:220
+#: src/clients/update_proposal.ycp:274
+#: yast2-update-2.13.25/src/clients/update_proposal.ycp:263
 msgid "Updating to another version is not supported from the running system."
 msgstr ""
 
 #. summary text (%1 is package selection)
-#: src/clients/update_proposal.ycp:229
+#: src/clients/update_proposal.ycp:283
+#: yast2-update-2.13.25/src/clients/update_proposal.ycp:272
 #, ycp-format
 msgid "Update to %1"
 msgstr ""
 
 #. Proposal for backup during update
-#: src/clients/update_proposal.ycp:234
+#: src/clients/update_proposal.ycp:288
+#: yast2-update-2.13.25/src/clients/update_proposal.ycp:277
 msgid "Only Update Installed Packages"
 msgstr ""
 
+#. proposal string
+#: src/clients/update_proposal.ycp:299
+#: yast2-update-2.13.25/src/clients/update_proposal.ycp:288
+msgid "Update Based on Patterns"
+msgstr ""
+
 #. Proposal for selection during update
-#: src/clients/update_proposal.ycp:242
+#: src/clients/update_proposal.ycp:310
+#: yast2-update-2.13.25/src/clients/update_proposal.ycp:299
 #, ycp-format
 msgid "Update Based on Selection \"%1\""
 msgstr ""
 
 #. Proposal for backup during update
-#: src/clients/update_proposal.ycp:252
+#: src/clients/update_proposal.ycp:321
+#: yast2-update-2.13.25/src/clients/update_proposal.ycp:310
 msgid "Delete Old Packages"
 msgstr ""
 
 #. this is a menu entry
-#: src/clients/update_proposal.ycp:290
+#: src/clients/update_proposal.ycp:359
+#: yast2-update-2.13.25/src/clients/update_proposal.ycp:348
 msgid "&Update Options"
 msgstr ""
 
@@ -364,12 +438,12 @@
 msgstr ""
 
 #. label for selection of root partition (for boot)
-#: src/include/rootpart.ycp:56
+#: src/include/rootpart.ycp:58
 msgid "Partition or System to Boot:"
 msgstr ""
 
 #. help text for root partition dialog (for boot)
-#: src/include/rootpart.ycp:59
+#: src/include/rootpart.ycp:61
 msgid ""
 "<p>\n"
 "Select the partition or system to boot.\n"
@@ -377,12 +451,12 @@
 msgstr ""
 
 #. label for selection of root partition (for update)
-#: src/include/rootpart.ycp:67
+#: src/include/rootpart.ycp:69
 msgid "Partition or System to Update:"
 msgstr ""
 
 #. help text for root partition dialog (for update)
-#: src/include/rootpart.ycp:70
+#: src/include/rootpart.ycp:72
 msgid ""
 "<p>\n"
 "Select the partition or system to update.\n"
@@ -390,12 +464,12 @@
 msgstr ""
 
 #. headline for dialog "Select for update"
-#: src/include/rootpart.ycp:78
+#: src/include/rootpart.ycp:80
 msgid "Select for Update"
 msgstr ""
 
 #. help text for root partition dialog (general part)
-#: src/include/rootpart.ycp:83
+#: src/include/rootpart.ycp:85
 msgid ""
 "<p>\n"
 "<b>Show All Partitions</b> expands the list to a\n"
@@ -404,39 +478,44 @@
 msgstr ""
 
 #. table header
-#: src/include/rootpart.ycp:99
+#: src/include/rootpart.ycp:100
 msgid "System"
 msgstr ""
 
 #. table header
-#: src/include/rootpart.ycp:101
+#: src/include/rootpart.ycp:102
 msgid "Partition"
 msgstr ""
 
 #. table header
-#: src/include/rootpart.ycp:103
+#: src/include/rootpart.ycp:104
 msgid "Architecture"
 msgstr ""
 
+#. table header
+#: src/include/rootpart.ycp:106
+msgid "Label"
+msgstr ""
+
 #. check box
-#: src/include/rootpart.ycp:107
+#: src/include/rootpart.ycp:110
 msgid "&Show All Partitions"
 msgstr ""
 
 #. pushbutton to (rightaway) boot the system selected above
-#: src/include/rootpart.ycp:133
+#: src/include/rootpart.ycp:135
 msgid "&Boot"
 msgstr ""
 
 #. continue-cancel popup
-#: src/include/rootpart.ycp:198
+#: src/include/rootpart.ycp:200
 msgid ""
 "No installed system that can be upgraded with this product was found\n"
 "on the selected partition."
 msgstr ""
 
 #. continue-cancel popup
-#: src/include/rootpart.ycp:205
+#: src/include/rootpart.ycp:207
 msgid ""
 "The architecture of the system installed in the selected partition\n"
 "is different than the one of this product."
@@ -445,7 +524,8 @@
 #. *
 #. *  Link to SDB article concerning renaming of devices.
 #.
-#: src/modules/RootPart.ycp:106
+#: src/modules/RootPart.ycp:83
+#: yast2-update-2.13.25/src/modules/RootPart.ycp:83
 #, ycp-format
 msgid ""
 "See the SBD article at %1 for details\n"
@@ -453,7 +533,8 @@
 msgstr ""
 
 #. error report, %1 is device (eg. /dev/hda1)
-#: src/modules/RootPart.ycp:188
+#: src/modules/RootPart.ycp:176
+#: yast2-update-2.13.25/src/modules/RootPart.ycp:176
 #, ycp-format
 msgid ""
 "Cannot unmount partition %1.\n"
@@ -464,18 +545,21 @@
 msgstr ""
 
 #. label, %1 is partition
-#: src/modules/RootPart.ycp:254
+#: src/modules/RootPart.ycp:240
+#: yast2-update-2.13.25/src/modules/RootPart.ycp:240
 #, ycp-format
 msgid "Checking partition %1"
 msgstr ""
 
 #. yes-no popup
-#: src/modules/RootPart.ycp:589
+#: src/modules/RootPart.ycp:517
+#: yast2-update-2.13.25/src/modules/RootPart.ycp:517
 msgid "Incorrect password. Try again?"
 msgstr ""
 
 #. label in a popup, %1 is device (eg. /dev/hda1), %2 is output of the 'mount' command
-#: src/modules/RootPart.ycp:700
+#: src/modules/RootPart.ycp:635
+#: yast2-update-2.13.25/src/modules/RootPart.ycp:635
 #, ycp-format
 msgid ""
 "The partition %1 could not be mounted.\n"
@@ -489,45 +573,53 @@
 msgstr ""
 
 #. push button
-#: src/modules/RootPart.ycp:714
+#: src/modules/RootPart.ycp:649
+#: yast2-update-2.13.25/src/modules/RootPart.ycp:649
 msgid "&Specify Mount Options"
 msgstr ""
 
 #. popup heading
-#: src/modules/RootPart.ycp:733
+#: src/modules/RootPart.ycp:668
+#: yast2-update-2.13.25/src/modules/RootPart.ycp:668
 msgid "Mount Options"
 msgstr ""
 
 #. text entry label
-#: src/modules/RootPart.ycp:736
+#: src/modules/RootPart.ycp:671
+#: yast2-update-2.13.25/src/modules/RootPart.ycp:671
 msgid "&Mount Point"
 msgstr ""
 
 #. tex entry label
-#: src/modules/RootPart.ycp:739
+#: src/modules/RootPart.ycp:674
+#: yast2-update-2.13.25/src/modules/RootPart.ycp:674
 msgid "&Device"
 msgstr ""
 
 #. text entry label
-#: src/modules/RootPart.ycp:742
+#: src/modules/RootPart.ycp:677
+#: yast2-update-2.13.25/src/modules/RootPart.ycp:677
 msgid ""
 "&File System\n"
 "(empty for autodetection)"
 msgstr ""
 
 #. error message
-#: src/modules/RootPart.ycp:812
+#: src/modules/RootPart.ycp:747
+#: yast2-update-2.13.25/src/modules/RootPart.ycp:747
 #, ycp-format
 msgid "The /var partition %1 could not be mounted.\n"
 msgstr ""
 
 #. error message
-#: src/modules/RootPart.ycp:857
+#: src/modules/RootPart.ycp:792
+#: yast2-update-2.13.25/src/modules/RootPart.ycp:792
 msgid "Unable to mount /var partition with this disk configuration.\n"
 msgstr ""
 
 #. popup message, %1 will be replace with the name of the logfile
-#: src/modules/RootPart.ycp:882
+#: src/modules/RootPart.ycp:817
+#: yast2-update-2.13.25/src/modules/RootPart.ycp:817
 #, ycp-format
 msgid ""
 "Partitions could not be mounted.\n"
@@ -536,27 +628,32 @@
 msgstr ""
 
 #. error message
-#: src/modules/RootPart.ycp:918
+#: src/modules/RootPart.ycp:855
+#: yast2-update-2.13.25/src/modules/RootPart.ycp:855
 msgid "No fstab found."
 msgstr ""
 
 #. message part 1
-#: src/modules/RootPart.ycp:944
+#: src/modules/RootPart.ycp:881
+#: yast2-update-2.13.25/src/modules/RootPart.ycp:881
 msgid "The root partition in /etc/fstab has an invalid root device.\n"
 msgstr ""
 
 #. message part 2
-#: src/modules/RootPart.ycp:946
+#: src/modules/RootPart.ycp:883
+#: yast2-update-2.13.25/src/modules/RootPart.ycp:883
 #, ycp-format
 msgid "It is currently mounted as %1 but listed as %2.\n"
 msgstr ""
 
 #. intermediate popup while mounting partitions
-#: src/modules/RootPart.ycp:1169
+#: src/modules/RootPart.ycp:1112
+#: yast2-update-2.13.25/src/modules/RootPart.ycp:1112
 msgid "Mounting partitions. One moment please..."
 msgstr ""
 
 #. label
-#: src/modules/RootPart.ycp:1184
+#: src/modules/RootPart.ycp:1127
+#: yast2-update-2.13.25/src/modules/RootPart.ycp:1127
 msgid "Evaluating root partition. One moment please..."
 msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.27/yast2-update-2.13.25/update.pot new/yast2-update-2.13.29/yast2-update-2.13.25/update.pot
--- old/yast2-update-2.13.27/yast2-update-2.13.25/update.pot	2005-09-09 16:22:12.000000000 +0200
+++ new/yast2-update-2.13.29/yast2-update-2.13.25/update.pot	1970-01-01 01:00:00.000000000 +0100
@@ -1,562 +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 <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-09 16:22+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Proposal for backup during update
-#: src/clients/backup_proposal.ycp:42
-msgid "Create Backup of Modified Files"
-msgstr ""
-
-#. Proposal for backup during update
-#: src/clients/backup_proposal.ycp:47
-msgid "Create Backup of /etc/sysconfig Directory"
-msgstr ""
-
-#. Proposal for backup during update
-#: src/clients/backup_proposal.ycp:52
-msgid "Do Not Create Backups"
-msgstr ""
-
-#. Proposal for backup during update
-#: src/clients/backup_proposal.ycp:57
-msgid "Remove Backups from Previous Updates"
-msgstr ""
-
-#. this is a heading
-#: src/clients/backup_proposal.ycp:88
-msgid "Backup"
-msgstr ""
-
-#. this is a menu entry
-#: src/clients/backup_proposal.ycp:90
-msgid "&Backup"
-msgstr ""
-
-#. error popup, user did not enter a valid directory specification
-#: src/clients/inst_backup.ycp:38
-msgid "Invalid backup path."
-msgstr ""
-
-#. there is not enough space for the backup during update
-#. inform the user about this (MB==megabytes)
-#: src/clients/inst_backup.ycp:78
-#, ycp-format
-msgid "Minimum disk space of %1 MB required."
-msgstr ""
-
-#. screen title for software selection
-#: src/clients/inst_backup.ycp:90
-msgid "Backup System Before Update"
-msgstr ""
-
-#. checkbox label if user wants to backup modified files
-#: src/clients/inst_backup.ycp:100
-msgid "Create &Backup of Modified Files"
-msgstr ""
-
-#. checkbox label if user wants to backup /etc/sysconfig
-#: src/clients/inst_backup.ycp:103
-msgid "Create a &Complete Backup of /etc/sysconfig"
-msgstr ""
-
-#. checkbox label if user wants remove old backup stuff
-#: src/clients/inst_backup.ycp:107
-msgid "Remove &Old Backups from the Backup Directory"
-msgstr ""
-
-#. help text for backup dialog during update 1/7
-#: src/clients/inst_backup.ycp:112
-msgid ""
-"<p>To avoid any loss of information during update,\n"
-"it is possible to create a <b>backup</b> prior to updating.</p>\n"
-msgstr ""
-
-#. help text for backup dialog during update 2/7
-#: src/clients/inst_backup.ycp:117
-msgid ""
-"<p><b>Warning:</b> This will not be a complete\n"
-"backup. Only modified files will be saved.</p>\n"
-msgstr ""
-
-#. help text for backup dialog during update 3/7
-#: src/clients/inst_backup.ycp:122
-msgid "<p>Select the desired options.</p>\n"
-msgstr ""
-
-#. help text for backup dialog during update 4/7
-#: src/clients/inst_backup.ycp:126
-msgid ""
-"<p><b>Create a Backup of Modified Files:</b>\n"
-"Stores those modified files that are replaced during update.</p>\n"
-msgstr ""
-
-#. help text for backup dialog during update 5/7
-#: src/clients/inst_backup.ycp:131
-msgid ""
-"<p><b>Create a Complete Backup of\n"
-"/etc/sysconfig:</b> This covers all configuration files that are part of the\n"
-"sysconfig mechanism, even those that are not replaced.</p>\n"
-msgstr ""
-
-#. help text for backup dialog during update 6/7
-#: src/clients/inst_backup.ycp:137
-msgid ""
-"<p><b>Remove Old Backups from the Backup\n"
-"Directory:</b> If your current system already is the result of an earlier\n"
-"update, there may be old configuration file backups. Select this option to\n"
-"remove them.</p>\n"
-msgstr ""
-
-#. help text for backup dialog during update 7/7
-#: src/clients/inst_backup.ycp:144
-#, ycp-format
-msgid "<p>All backups are placed in %1.</p>"
-msgstr ""
-
-#. screen title for update options
-#. this is a heading
-#: src/clients/inst_update.ycp:27 src/clients/update_proposal.ycp:288
-msgid "Update Options"
-msgstr ""
-
-#. Display warning message
-#: src/clients/inst_update.ycp:56
-msgid ""
-"You have already chosen software from \"Detailed selection\".\n"
-"You will lose that selection if you change the basic selection."
-msgstr ""
-
-#. Unkown for unknown system
-#. label for an unknown installed system
-#: src/clients/inst_update.ycp:64 src/include/rootpart.ycp:30
-#: src/include/rootpart.ycp:33 src/modules/RootPart.ycp:117
-#: src/modules/RootPart.ycp:1067
-msgid "Unknown"
-msgstr ""
-
-#. label showing from what version to what version we are updating
-#: src/clients/inst_update.ycp:69
-#, ycp-format
-msgid "Update from %1 to %2"
-msgstr ""
-
-#. frame title for update selection
-#: src/clients/inst_update.ycp:72
-msgid "Update Mode"
-msgstr ""
-
-#. radio button label for update including new packages
-#: src/clients/inst_update.ycp:79
-msgid ""
-"&Update with Installation of New Software and Features\n"
-"Based on the Selection:\n"
-msgstr ""
-
-#. radio button label for update of already installed packages only
-#: src/clients/inst_update.ycp:90
-msgid "Only U&pdate Installed Packages"
-msgstr ""
-
-#. check box label
-#. translator: add a & shortcut
-#: src/clients/inst_update.ycp:100
-msgid "&Delete Unmaintained Packages"
-msgstr ""
-
-#. help text for dialog "update options" 1/4
-#: src/clients/inst_update.ycp:108
-msgid ""
-"<p>The update option differs between two modes. In\n"
-"either case, it is recommended to make a backup of your personal data.</p>\n"
-msgstr ""
-
-#. help text for dialog "update options" 2/4
-#: src/clients/inst_update.ycp:113
-msgid ""
-"<p><b>With New Software:</b> This default setting\n"
-"updates the existing software and installs all new features and benefits of\n"
-"the new &product; version. The selection is based on the former predefined\n"
-"software selection.</p>\n"
-msgstr ""
-
-#. help text for dialog "update options" 3/4
-#: src/clients/inst_update.ycp:120
-msgid ""
-"<p><b>Only Installed Packages:</b> This selection\n"
-"only updates the packages already installed on your system. <i>Note:</i>\n"
-"New software in the predefined software selection, such as new YaST modules, is\n"
-"not available after the update. You might miss advertised features.</p>\n"
-msgstr ""
-
-#. help text for dialog "update options" 4/4
-#: src/clients/inst_update.ycp:127
-msgid ""
-"<p>After the update, some software might not\n"
-"function anymore. Activate <b>Delete Unmaintained Packages</b> to delete those\n"
-"packages during the update.</p>\n"
-msgstr ""
-
-#. yes/no question
-#: src/clients/inst_update.ycp:186
-msgid ""
-"Do you really want\n"
-"to reset your detailed selection?"
-msgstr ""
-
-#. proposal for packages during update, %1 is count of packages
-#: src/clients/packages_proposal.ycp:74
-#, ycp-format
-msgid "Packages to Update: %1"
-msgstr ""
-
-#. proposal for packages during update, %1 is count of packages
-#: src/clients/packages_proposal.ycp:77
-#, ycp-format
-msgid "New Packages to Install: %1"
-msgstr ""
-
-#. proposal for packages during update, %1 is count of packages
-#: src/clients/packages_proposal.ycp:80
-#, ycp-format
-msgid "Packages to Remove: %1"
-msgstr ""
-
-#. part of summary, %1 is size of packages (in MB or GB)
-#: src/clients/packages_proposal.ycp:83
-#, ycp-format
-msgid "Total Size of Packages to Update: %1"
-msgstr ""
-
-#. warning text
-#: src/clients/packages_proposal.ycp:91
-msgid "Cannot solve all conflicts, requires manual intervention"
-msgstr ""
-
-#. this is a heading
-#: src/clients/packages_proposal.ycp:138
-msgid "Packages"
-msgstr ""
-
-#. this is a menu entry
-#: src/clients/packages_proposal.ycp:140
-msgid "&Packages"
-msgstr ""
-
-#. Proposal for system to update
-#: src/clients/rootpart_proposal.ycp:50
-msgid "No root partition found"
-msgstr ""
-
-#. Proposal for system to update
-#: src/clients/rootpart_proposal.ycp:85
-#, ycp-format
-msgid "%1 on root partition %2"
-msgstr ""
-
-#. inform user in the proposal about the failed mount
-#: src/clients/rootpart_proposal.ycp:94
-msgid "Failed to mount target system"
-msgstr ""
-
-#. this is a heading
-#: src/clients/rootpart_proposal.ycp:138
-msgid "Selected for Update"
-msgstr ""
-
-#. this is a menu entry
-#: src/clients/rootpart_proposal.ycp:140
-msgid "&Selected for Update"
-msgstr ""
-
-#. intermediate popup while initializing internal packagemanagement
-#: src/clients/update_proposal.ycp:62
-msgid "Reading package information. One moment please..."
-msgstr ""
-
-#. continue-cancel popup
-#: src/clients/update_proposal.ycp:138
-msgid ""
-"The installed product is not compatible with the product\n"
-"on the installation media. If you try to update using the\n"
-"current installation media, the system may not start or\n"
-"some applications may not run properly."
-msgstr ""
-
-#. error message in proposal
-#: src/clients/update_proposal.ycp:195
-msgid "The installed product is not compatible with the product on the installatin media."
-msgstr ""
-
-#. Can't find any software data, probably a installation media error
-#. error message
-#: src/clients/update_proposal.ycp:209
-msgid "Cannot read package data from installation media. Media error?"
-msgstr ""
-
-#. proposal error
-#: src/clients/update_proposal.ycp:220
-msgid "Updating to another version is not supported from the running system."
-msgstr ""
-
-#. summary text (%1 is package selection)
-#: src/clients/update_proposal.ycp:229
-#, ycp-format
-msgid "Update to %1"
-msgstr ""
-
-#. Proposal for backup during update
-#: src/clients/update_proposal.ycp:234
-msgid "Only Update Installed Packages"
-msgstr ""
-
-#. Proposal for selection during update
-#: src/clients/update_proposal.ycp:242
-#, ycp-format
-msgid "Update Based on Selection \"%1\""
-msgstr ""
-
-#. Proposal for backup during update
-#: src/clients/update_proposal.ycp:252
-msgid "Delete Old Packages"
-msgstr ""
-
-#. this is a menu entry
-#: src/clients/update_proposal.ycp:290
-msgid "&Update Options"
-msgstr ""
-
-#: src/config/update.glade:15 src/config/update.glade:38
-msgid "Update Settings"
-msgstr ""
-
-#: src/config/update.glade:30
-msgid "Update"
-msgstr ""
-
-#: src/config/update.glade:44 src/config/update.glade:48
-msgid "Perform Update"
-msgstr ""
-
-#: src/config/update.glade:59
-msgid "Clean Up"
-msgstr ""
-
-#: src/config/update.glade:63
-msgid "Update System Configuration"
-msgstr ""
-
-#: src/config/update.glade:71
-msgid "Update Configuration"
-msgstr ""
-
-#. label for selection of root partition (for boot)
-#: src/include/rootpart.ycp:56
-msgid "Partition or System to Boot:"
-msgstr ""
-
-#. help text for root partition dialog (for boot)
-#: src/include/rootpart.ycp:59
-msgid ""
-"<p>\n"
-"Select the partition or system to boot.\n"
-"</p>\n"
-msgstr ""
-
-#. label for selection of root partition (for update)
-#: src/include/rootpart.ycp:67
-msgid "Partition or System to Update:"
-msgstr ""
-
-#. help text for root partition dialog (for update)
-#: src/include/rootpart.ycp:70
-msgid ""
-"<p>\n"
-"Select the partition or system to update.\n"
-"</p>\n"
-msgstr ""
-
-#. headline for dialog "Select for update"
-#: src/include/rootpart.ycp:78
-msgid "Select for Update"
-msgstr ""
-
-#. help text for root partition dialog (general part)
-#: src/include/rootpart.ycp:83
-msgid ""
-"<p>\n"
-"<b>Show All Partitions</b> expands the list to a\n"
-"general overview of your system's partitions.\n"
-"</p>\n"
-msgstr ""
-
-#. table header
-#: src/include/rootpart.ycp:99
-msgid "System"
-msgstr ""
-
-#. table header
-#: src/include/rootpart.ycp:101
-msgid "Partition"
-msgstr ""
-
-#. table header
-#: src/include/rootpart.ycp:103
-msgid "Architecture"
-msgstr ""
-
-#. check box
-#: src/include/rootpart.ycp:107
-msgid "&Show All Partitions"
-msgstr ""
-
-#. pushbutton to (rightaway) boot the system selected above
-#: src/include/rootpart.ycp:133
-msgid "&Boot"
-msgstr ""
-
-#. continue-cancel popup
-#: src/include/rootpart.ycp:198
-msgid ""
-"No installed system that can be upgraded with this product was found\n"
-"on the selected partition."
-msgstr ""
-
-#. continue-cancel popup
-#: src/include/rootpart.ycp:205
-msgid ""
-"The architecture of the system installed in the selected partition\n"
-"is different than the one of this product."
-msgstr ""
-
-#. *
-#. *  Link to SDB article concerning renaming of devices.
-#.
-#: src/modules/RootPart.ycp:106
-#, ycp-format
-msgid ""
-"See the SBD article at %1 for details\n"
-"about how to solve this problem."
-msgstr ""
-
-#. error report, %1 is device (eg. /dev/hda1)
-#: src/modules/RootPart.ycp:188
-#, ycp-format
-msgid ""
-"Cannot unmount partition %1.\n"
-"\n"
-"It is currently in use. If the partition stays mounted,\n"
-"the data may be lost. Unmount the partition manually\n"
-"or restart your computer.\n"
-msgstr ""
-
-#. label, %1 is partition
-#: src/modules/RootPart.ycp:254
-#, ycp-format
-msgid "Checking partition %1"
-msgstr ""
-
-#. yes-no popup
-#: src/modules/RootPart.ycp:589
-msgid "Incorrect password. Try again?"
-msgstr ""
-
-#. label in a popup, %1 is device (eg. /dev/hda1), %2 is output of the 'mount' command
-#: src/modules/RootPart.ycp:700
-#, ycp-format
-msgid ""
-"The partition %1 could not be mounted.\n"
-"\n"
-"%2\n"
-"\n"
-"If you are sure that the partition is not necessary for the\n"
-"update (it is not any system partition), click Continue.\n"
-"To check or fix the mount options, click Specify Mount Options.\n"
-"To abort update, click Cancel."
-msgstr ""
-
-#. push button
-#: src/modules/RootPart.ycp:714
-msgid "&Specify Mount Options"
-msgstr ""
-
-#. popup heading
-#: src/modules/RootPart.ycp:733
-msgid "Mount Options"
-msgstr ""
-
-#. text entry label
-#: src/modules/RootPart.ycp:736
-msgid "&Mount Point"
-msgstr ""
-
-#. tex entry label
-#: src/modules/RootPart.ycp:739
-msgid "&Device"
-msgstr ""
-
-#. text entry label
-#: src/modules/RootPart.ycp:742
-msgid ""
-"&File System\n"
-"(empty for autodetection)"
-msgstr ""
-
-#. error message
-#: src/modules/RootPart.ycp:812
-#, ycp-format
-msgid "The /var partition %1 could not be mounted.\n"
-msgstr ""
-
-#. error message
-#: src/modules/RootPart.ycp:857
-msgid "Unable to mount /var partition with this disk configuration.\n"
-msgstr ""
-
-#. popup message, %1 will be replace with the name of the logfile
-#: src/modules/RootPart.ycp:882
-#, ycp-format
-msgid ""
-"Partitions could not be mounted.\n"
-"\n"
-"Check the log file %1."
-msgstr ""
-
-#. error message
-#: src/modules/RootPart.ycp:918
-msgid "No fstab found."
-msgstr ""
-
-#. message part 1
-#: src/modules/RootPart.ycp:944
-msgid "The root partition in /etc/fstab has an invalid root device.\n"
-msgstr ""
-
-#. message part 2
-#: src/modules/RootPart.ycp:946
-#, ycp-format
-msgid "It is currently mounted as %1 but listed as %2.\n"
-msgstr ""
-
-#. intermediate popup while mounting partitions
-#: src/modules/RootPart.ycp:1169
-msgid "Mounting partitions. One moment please..."
-msgstr ""
-
-#. label
-#: src/modules/RootPart.ycp:1184
-msgid "Evaluating root partition. One moment please..."
-msgstr ""


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

commit yast2-update

root＠suse.de