Hello community, here is the log from the commit of package yast2-update for openSUSE:Factory checked in at Mon Oct 3 09:27:40 CEST 2011.
-------- --- openSUSE:Factory/yast2-update/yast2-update.changes 2011-09-26 10:42:54.000000000 +0200 +++ yast2-update/yast2-update.changes 2011-09-23 16:59:24.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Sep 23 11:01:27 UTC 2011 - [email protected] + +- code cleanup - removed obsoled code for handling selections + (replaced by patterns long time ago), + use Pkg::SourceProductData() instead of obsoleted + Pkg::SourceProduct() +- 2.21.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-update-2.21.0.tar.bz2 New: ---- yast2-update-2.21.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.DFPaeJ/_old 2011-10-03 09:27:37.000000000 +0200 +++ /var/tmp/diff_new_pack.DFPaeJ/_new 2011-10-03 09:27:37.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-update (Version 2.21.0) +# spec file for package yast2-update # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -14,21 +14,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + # norootforbuild + Name: yast2-update -Version: 2.21.0 +Version: 2.21.1 Release: 0 - BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-update-2.21.0.tar.bz2 +Source0: yast2-update-%{version}.tar.bz2 -prefix: /usr +Prefix: /usr Group: System/YaST License: GPL v2 or later -BuildRequires: perl-XML-Writer yast2-devtools yast2-testsuite update-desktop-files +BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite # FileSystems::possible_root_fs BuildRequires: yast2-storage >= 2.19.12 # Packages::GetBaseSourceID @@ -84,7 +85,7 @@ Use this component if you wish to update your system. %prep -%setup -n yast2-update-2.21.0 +%setup -n yast2-update-%{version} %build %{prefix}/bin/y2tool y2autoconf @@ -108,7 +109,6 @@ %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done - %clean rm -rf "$RPM_BUILD_ROOT" @@ -140,3 +140,5 @@ /usr/share/YaST2/control/update.xml /usr/share/YaST2/clients/update.ycp /usr/share/YaST2/clients/run_update.ycp + +%changelog ++++++ yast2-update-2.21.0.tar.bz2 -> yast2-update-2.21.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.21.0/VERSION new/yast2-update-2.21.1/VERSION --- old/yast2-update-2.21.0/VERSION 2011-09-22 11:02:54.000000000 +0200 +++ new/yast2-update-2.21.1/VERSION 2011-09-23 16:56:36.000000000 +0200 @@ -1 +1 @@ -2.21.0 +2.21.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.21.0/configure new/yast2-update-2.21.1/configure --- old/yast2-update-2.21.0/configure 2011-09-22 13:57:39.000000000 +0200 +++ new/yast2-update-2.21.1/configure 2011-09-23 16:58:55.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-update 2.21.0. +# Generated by GNU Autoconf 2.68 for yast2-update 2.21.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-update' PACKAGE_TARNAME='yast2-update' -PACKAGE_VERSION='2.21.0' -PACKAGE_STRING='yast2-update 2.21.0' +PACKAGE_VERSION='2.21.1' +PACKAGE_STRING='yast2-update 2.21.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1229,7 +1229,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.21.0 to adapt to many kinds of systems. +\`configure' configures yast2-update 2.21.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1300,7 +1300,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-update 2.21.0:";; + short | recursive ) echo "Configuration of yast2-update 2.21.1:";; esac cat <<\_ACEOF @@ -1380,7 +1380,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-update configure 2.21.0 +yast2-update configure 2.21.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1397,7 +1397,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.21.0, which was +It was created by yast2-update $as_me 2.21.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2327,7 +2327,7 @@ # Define the identity of the package. PACKAGE='yast2-update' - VERSION='2.21.0' + VERSION='2.21.1' cat >>confdefs.h <<_ACEOF @@ -2449,7 +2449,7 @@ -VERSION="2.21.0" +VERSION="2.21.1" RPMNAME="yast2-update" MAINTAINER="Jiří Suchomel <[email protected]>" @@ -3381,7 +3381,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-update $as_me 2.21.0, which was +This file was extended by yast2-update $as_me 2.21.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3434,7 +3434,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-update config.status 2.21.0 +yast2-update config.status 2.21.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.21.0/configure.in new/yast2-update-2.21.1/configure.in --- old/yast2-update-2.21.0/configure.in 2011-09-22 13:57:35.000000000 +0200 +++ new/yast2-update-2.21.1/configure.in 2011-09-23 16:58:53.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-update dnl -dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-update, 2.21.0, http://bugs.opensuse.org/, yast2-update) +AC_INIT(yast2-update, 2.21.1, http://bugs.opensuse.org/, yast2-update) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.21.0" +VERSION="2.21.1" RPMNAME="yast2-update" MAINTAINER="Jiří Suchomel <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.21.0/kernel-update-tool.pot new/yast2-update-2.21.1/kernel-update-tool.pot --- old/yast2-update-2.21.0/kernel-update-tool.pot 2011-06-23 15:53:11.000000000 +0200 +++ new/yast2-update-2.21.1/kernel-update-tool.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,34 +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: 2011-06-23 15:53+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <[email protected]>\n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: src/clients/kernel-update.ycp:189 -msgid "Warning" -msgstr "" - -#: src/clients/kernel-update.ycp:190 -msgid "Abort the kernel upgrade?" -msgstr "" - -#: src/clients/kernel-update.ycp:247 -msgid "Alternate Download Location" -msgstr "" - -#: src/clients/kernel-update.ycp:510 -msgid "Kernel Update Status Log" -msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.21.0/src/clients/inst_update.ycp new/yast2-update-2.21.1/src/clients/inst_update.ycp --- old/yast2-update-2.21.0/src/clients/inst_update.ycp 2009-12-18 14:52:33.000000000 +0100 +++ new/yast2-update-2.21.1/src/clients/inst_update.ycp 2011-09-23 13:02:18.000000000 +0200 @@ -9,7 +9,7 @@ * Show checkboxes for software categories. Let the user select his software. * if he want to UPGRADE his system. * - * $Id: inst_update.ycp 47330 2008-05-06 16:49:50Z locilka $ + * $Id: inst_update.ycp 65966 2011-09-23 11:02:17Z lslezak $ */ { @@ -25,35 +25,8 @@ // screen title for update options string title = _("Update Options"); - // create box with base selections, check if current selection really is available - term baseconfsbox = `VBox (); - - // loop through available base selections, create radio button entry for every base selection - // preselect current selection - - list<string> base_configurations = []; - - if (Packages::using_patterns) - { - baseconfsbox = `PushButton (`id (`details), _("Select Patterns")); - } - else - { - // get available base selection sorted by reverse order (highest ordered base selection first) - list<string> available_base_selections = Update::GetBaseSelections (); - y2milestone ("available_base_selections %1, current_selection %2", available_base_selections, Update::selected_selection); - foreach (string selection, available_base_selections, { - map selection_data = Pkg::SelectionData (selection); - string selection_summary = selection_data["summary"]:""; - boolean preselect = (selection == Update::selected_selection); - baseconfsbox = add (baseconfsbox, `Left(`RadioButton(`id(selection), - `opt(`notify, `autoShortcut), - selection_summary, - preselect))); - }); - baseconfsbox = `RadioButtonGroup(`id(`baseconf), baseconfsbox); - base_configurations = available_base_selections; - } + // push button label + term baseconfsbox = `PushButton (`id (`details), _("Select Patterns")); // Checking: already selected addons or single selection? @@ -157,12 +130,6 @@ UI::ChangeWidget(`id(`upgrade), `Value, !Update::onlyUpdateInstalled); UI::ChangeWidget(`id(`notupgrade), `Value, Update::onlyUpdateInstalled); - // grey out radio buttons if only already installed packages should be updated - - foreach (string sel, base_configurations, { - UI::ChangeWidget(`id(sel), `Enabled, !Update::onlyUpdateInstalled); - }); - // UI::ChangeWidget(`id(`delete), `Value, Update::deleteOldPackages); any ret = nil; @@ -175,16 +142,6 @@ if (ret == `abort && Popup::ConfirmAbort (`painless)) break; - if (ret == `upgrade || ret == `notupgrade) - { - boolean tmp = (boolean) UI::QueryWidget (`id(`upgrade), `Value); - foreach (string sel, base_configurations, { - UI::ChangeWidget(`id(sel), `Enabled, tmp); - }); - - continue; - } - if (ret == `details) { @@ -205,20 +162,6 @@ if (UI::QueryWidget (`id(`notupgrade), `Value) != Update::onlyUpdateInstalled) something_changed = true; - if (Packages::using_patterns) - { - y2milestone ("Using patterns"); - } - else - { - if ((boolean) UI::QueryWidget (`id(`upgrade), `Value) && - Update::selected_selection != UI::QueryWidget(`id(`baseconf), `CurrentButton)) - something_changed = true; - } - -// if (UI::QueryWidget (`id(`delete), `Value ) != Update::deleteOldPackages) -// something_changed = true; - if (something_changed && Packages::base_selection_modified) { // yes/no question @@ -239,22 +182,9 @@ Update::onlyUpdateInstalled = (boolean) UI::QueryWidget (`id(`notupgrade), `Value); // Update::deleteOldPackages = (boolean) UI::QueryWidget (`id(`delete), `Value); - if (Packages::using_patterns) + if (b1 != Update::onlyUpdateInstalled || details_pressed) { - if (b1 != Update::onlyUpdateInstalled || details_pressed) - { - Update::manual_interaction = true; - } - } - else - { - string s1 = Update::selected_selection; - Update::selected_selection = (string) UI::QueryWidget(`id(`baseconf), `CurrentButton); - - if (b1 != Update::onlyUpdateInstalled || s1 != Update::selected_selection) - { - Update::manual_interaction = true; - } + Update::manual_interaction = true; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.21.0/src/clients/update_proposal.ycp new/yast2-update-2.21.1/src/clients/update_proposal.ycp --- old/yast2-update-2.21.0/src/clients/update_proposal.ycp 2010-02-08 08:07:48.000000000 +0100 +++ new/yast2-update-2.21.1/src/clients/update_proposal.ycp 2011-09-23 13:05:57.000000000 +0200 @@ -5,7 +5,7 @@ * * Purpose: Let user choose update settings. * - * $Id: update_proposal.ycp 60593 2010-01-28 10:12:45Z locilka $ + * $Id: update_proposal.ycp 65968 2011-09-23 11:05:56Z lslezak $ */ { textdomain "update"; @@ -192,12 +192,6 @@ { Update::did_init1 = true; - if (size (Pkg::ResolvableProperties ("", `pattern, "")) > 0) - { - y2milestone ("No base selection found, but patterns found..."); - Packages::using_patterns = true; - } - list<string> restore = []; list<map<string,any> > selected = Pkg::ResolvableProperties ("", `product, ""); foreach (map<string,any> s, selected, { @@ -216,57 +210,19 @@ }); if (! Update::onlyUpdateInstalled) { - if (Packages::using_patterns) - { - Update::SetDesktopPattern (); - } - else - { - Update::ProposeSelection (); - } - } - - if (Update::onlyUpdateInstalled) // just consider already installed packages - { - Pkg::SetSelection (""); // -> don't select any additional selections + Update::SetDesktopPattern (); } - else if (Packages::using_patterns) - { - if (! ProductFeatures::GetBooleanFeature ("software", - "only_update_installed")) - { - foreach (string pat, Product::patterns, { - y2milestone("Pre-select pattern %1", pat); - Pkg::ResolvableInstall( pat, `pattern ); - }); - } - } - else // update selections too + if (!Update::onlyUpdateInstalled // just consider already installed packages + && (!ProductFeatures::GetBooleanFeature ("software", "only_update_installed"))) { - Pkg::SetSelection (Update::selected_selection); // -> set the base selection (minimal, default, ....) - - if (!Update::manual_interaction) - { - // now compare installed (old) selections against available (new) selections - // and set all selections which are installed (old) and available (new) - // as 'to be installed' -> UI will show "to be updated" for these selections - - list<string> available_addons = Pkg::GetSelections (`available, ""); - list<string> installed_addons = Pkg::GetSelections (`installed, ""); - - foreach (string installed, installed_addons, - { - if (contains (available_addons, installed)) // we have a newer selection for an installed one - { - Pkg::SetSelection (installed); // update this selection too (selection solving included) - } - }); - } + foreach (string pat, Product::patterns, { + y2milestone("Pre-select pattern %1", pat); + Pkg::ResolvableInstall( pat, `pattern ); + }); } Packages::SelectProduct(); - Pkg::ActivateSelections (); // now go through all selected selections and select their packages // bnc #382208 Packages::SelectKernelPackages (); @@ -354,16 +310,6 @@ ]; } - list available_base_selections = Update::GetBaseSelections (); - if ((! Packages::using_patterns) && size (available_base_selections) == 0) { - y2error ("No base selections available"); - // Can't find any software data, probably a installation media error - // error message - return $[ "warning" : _("Cannot read package data from installation media. Media error?"), - "warning_level" : `blocker, - "raw_proposal" : [] ]; - } - // TRANSLATORS: unknown product (label) string update_from = _("Unknown product"); if (Installation::installedVersion["show"]:"" != "" && Installation::installedVersion["show"]:"?" != "?") { @@ -438,30 +384,21 @@ // Proposal for backup during update summary_text = summary_text + "<li>" + _("Only update installed packages") + "</li>\n"; } else { - if (Packages::using_patterns) { - list<map<string,any> > patterns = Pkg::ResolvableProperties ("", `pattern, ""); - patterns = filter (map<string,any> p, patterns, { - return p["status"]:nil == `selected && p["user_visible"]:true && p["summary"]:p["name"]:"" != ""; - }); - // proposal string - summary_text = summary_text + "<li>" + _("Update based on patterns") + "</li>\n"; + list<map<string,any> > patterns = Pkg::ResolvableProperties ("", `pattern, ""); + patterns = filter (map<string,any> p, patterns, { + return p["status"]:nil == `selected && p["user_visible"]:true && p["summary"]:p["name"]:"" != ""; + }); + // proposal string + summary_text = summary_text + "<li>" + _("Update based on patterns") + "</li>\n"; - if (patterns != nil && size (patterns) > 0) { - summary_text = summary_text + HTML::ListStart(); + if (patterns != nil && size (patterns) > 0) { + summary_text = summary_text + HTML::ListStart(); - foreach (map <string, any> p, patterns, { - summary_text = summary_text + "<li>" + p["summary"]:p["name"]:"" + "</li>\n"; - }); - - summary_text = summary_text + HTML::ListEnd(); - } - } else { - map selection_data = Pkg::SelectionData (Update::selected_selection); - string selection_summary = selection_data["summary"]:"error"; - - // Proposal for selection during update, %1 stands for selection name - summary_text = summary_text + "<li>" + sformat (_("Update based on selection \"%1\""), - selection_summary) + "</li>\n"; + foreach (map <string, any> p, patterns, { + summary_text = summary_text + "<li>" + p["summary"]:p["name"]:"" + "</li>\n"; + }); + + summary_text = summary_text + HTML::ListEnd(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.21.0/src/modules/Update.ycp new/yast2-update-2.21.1/src/modules/Update.ycp --- old/yast2-update-2.21.0/src/modules/Update.ycp 2009-12-18 14:52:34.000000000 +0100 +++ new/yast2-update-2.21.1/src/modules/Update.ycp 2011-09-23 16:58:40.000000000 +0200 @@ -7,7 +7,7 @@ * * Purpose: Update module * - * $Id: Update.ycp 51421 2008-09-23 15:24:33Z locilka $ + * $Id: Update.ycp 66018 2011-09-23 14:58:39Z lslezak $ */ { module "Update"; @@ -307,7 +307,7 @@ list<string> to_install = maplist (integer src, Pkg::SourceGetCurrent (true), { - map<string,string> prod_info = Pkg::SourceProduct (src); + map<string,any> prod_info = Pkg::SourceProductData(src); return prod_info["name"]:""; }); // filter out empty products @@ -615,21 +615,6 @@ } - /** - * Get all available base selections sorted in reverse order - * (highest ordered bases selection comes first). - */ - global define list<string> GetBaseSelections () - { - list<string> available_base_selections = sort (string x, string y, Pkg::GetSelections (`available, "base"), { - map xmap = Pkg::SelectionData(x); - map ymap = Pkg::SelectionData(y); - return (xmap["order"]:"" > ymap["order"]:""); - }); - y2milestone ("available_base_selections %1", available_base_selections); - return available_base_selections; - } - string ReadInstalledDesktop() { SCR::Execute (.target.bash, "/bin/mv -f /etc/sysconfig/windowmanager /etc/sysconfig/windowmanager.old"); SCR::Execute (.target.bash, "/bin/ln -s /mnt/etc/sysconfig/windowmanager /etc/sysconfig/windowmanager"); @@ -649,66 +634,6 @@ } /** - * Propose a selection for the update and save it's name in - * Update::selected_selection. - */ - global define void ProposeSelection () - { - selected_selection = ""; - - list available_selections = GetBaseSelections (); - - // nulth try: teh default desktop - - string desktop = ReadInstalledDesktop(); - map wm2sel = $[ - "kde" : "default", - "gnome" : "default-Gnome", - ]; - selected_selection = wm2sel[desktop]:""; - - if (!contains (available_selections, selected_selection)) - selected_selection = ""; - - if (selected_selection != "") - { - y2milestone ("using default desktop %1 to define selection: %2", - desktop, selected_selection); - return; - } - - // first try: installed one - - list tmp1 = Pkg::GetSelections (`installed, "base"); - if (tmp1 != nil && tmp1 != []) - selected_selection = tmp1[0]:""; - - if (!contains (available_selections, selected_selection)) - selected_selection = ""; - - if (selected_selection != "") { - y2milestone ("using installed selection: %1", selected_selection); - return; - } - - // second try: available selection with highest order - - if (size (available_selections) > 0) - selected_selection = available_selections[0]:""; - - if (selected_selection != "") { - y2milestone ("using highest order selection: %1", selected_selection); - return; - } - - // error: no selection available - - y2error ("no selection available"); - - } - - - /** * */ global define void Detach () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.21.0/update.pot new/yast2-update-2.21.1/update.pot --- old/yast2-update-2.21.0/update.pot 2011-06-23 15:53:11.000000000 +0200 +++ new/yast2-update-2.21.1/update.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,779 +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: 2011-06-23 15:53+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <[email protected]>\n" -"Language: \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:46 -msgid "Create Backup of Modified Files" -msgstr "" - -#. Proposal for backup during update -#: src/clients/backup_proposal.ycp:51 -msgid "Create Backup of /etc/sysconfig Directory" -msgstr "" - -#. Proposal for backup during update -#: src/clients/backup_proposal.ycp:56 -msgid "Do Not Create Backups" -msgstr "" - -#. Proposal for backup during update -#: src/clients/backup_proposal.ycp:61 -msgid "Remove Backups from Previous Updates" -msgstr "" - -#. this is a heading -#: src/clients/backup_proposal.ycp:92 -msgid "Backup" -msgstr "" - -#. this is a menu entry -#: src/clients/backup_proposal.ycp:94 -msgid "&Backup" -msgstr "" - -#. error popup, user did not enter a valid directory specification -#: src/clients/inst_backup.ycp:40 -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:80 -#, ycp-format -msgid "Minimum disk space of %1 MB required." -msgstr "" - -#. screen title for software selection -#: src/clients/inst_backup.ycp:92 -msgid "Backup System Before Update" -msgstr "" - -#. checkbox label if user wants to backup modified files -#: src/clients/inst_backup.ycp:102 -msgid "Create &Backup of Modified Files" -msgstr "" - -#. checkbox label if user wants to backup /etc/sysconfig -#: src/clients/inst_backup.ycp:105 -msgid "Create a &Complete Backup of /etc/sysconfig" -msgstr "" - -#. checkbox label if user wants remove old backup stuff -#: src/clients/inst_backup.ycp:109 -msgid "Remove &Old Backups from the Backup Directory" -msgstr "" - -#. help text for backup dialog during update 1/7 -#: src/clients/inst_backup.ycp:114 -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:119 -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:124 -msgid "<p>Select the desired options.</p>\n" -msgstr "" - -#. help text for backup dialog during update 4/7 -#: src/clients/inst_backup.ycp:128 -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:133 -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:139 -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:146 -#, 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:26 src/clients/update_proposal.ycp:516 -msgid "Update Options" -msgstr "" - -#: src/clients/inst_update.ycp:38 -msgid "Select Patterns" -msgstr "" - -#. Display warning message -#: src/clients/inst_update.ycp:65 -msgid "" -"You have already chosen software from \"Detailed selection\".\n" -"You will lose that selection if you change the basic selection." -msgstr "" - -#. Build and show dialog -#. Table item (unknown system [neither openSUSE 11.1 nor SLES 14 nor ...]) -#. Table item (unknown architecture) -#. Table item (unknown file system) -#. label - name of sustem to update -#. label for an unknown installed system -#: src/clients/inst_update.ycp:72 src/clients/inst_update.ycp:73 -#: src/include/rootpart.ycp:70 src/include/rootpart.ycp:76 -#: src/include/rootpart.ycp:93 src/modules/RootPart.ycp:131 -#: src/modules/RootPart.ycp:1189 src/modules/RootPart.ycp:1193 -#: src/modules/RootPart.ycp:1601 -msgid "Unknown" -msgstr "" - -#. label showing to which version we are updating -#. TRANSLATORS: proposal summary item, %1 is a product name -#: src/clients/inst_update.ycp:78 src/clients/update_proposal.ycp:428 -#, ycp-format -msgid "Update to %1" -msgstr "" - -#. label showing from which version to which version we are updating -#: src/clients/inst_update.ycp:81 -#, ycp-format -msgid "Update from %1 to %2" -msgstr "" - -#. frame title for update selection -#: src/clients/inst_update.ycp:89 -msgid "Update Mode" -msgstr "" - -#. radio button label for update including new packages -#: src/clients/inst_update.ycp:96 -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:107 -msgid "Only U&pdate Installed Packages" -msgstr "" - -#. help text for dialog "update options" 1/4 -#: src/clients/inst_update.ycp:125 -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, %1 is a product name -#: src/clients/inst_update.ycp:130 -#, ycp-format -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 <tt>%1</tt> 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:137 -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:144 -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:225 -msgid "" -"Do you really want\n" -"to reset your detailed selection?" -msgstr "" - -#. error report -#. inform user in the proposal about the failed mount -#. error report -#: src/clients/inst_update_partition_auto.ycp:46 -#: src/clients/rootpart_proposal.ycp:95 src/include/rootpart.ycp:348 -msgid "Failed to mount target system" -msgstr "" - -#: src/clients/inst_update_partition_auto.ycp:50 -msgid "A possibly incomplete installation has been detected." -msgstr "" - -#. proposal for packages during update, %1 is count of packages -#: src/clients/packages_proposal.ycp:105 -#, ycp-format -msgid "Packages to Update: %1" -msgstr "" - -#. proposal for packages during update, %1 is count of packages -#: src/clients/packages_proposal.ycp:108 -#, ycp-format -msgid "New Packages to Install: %1" -msgstr "" - -#. proposal for packages during update, %1 is count of packages -#: src/clients/packages_proposal.ycp:111 -#, 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:114 -#, ycp-format -msgid "Total Size of Packages to Update: %1" -msgstr "" - -#. warning text -#: src/clients/packages_proposal.ycp:122 -msgid "Cannot solve all conflicts. Manual intervention is required." -msgstr "" - -#. this is a heading -#: src/clients/packages_proposal.ycp:172 -msgid "Packages" -msgstr "" - -#. this is a menu entry -#: src/clients/packages_proposal.ycp:174 -msgid "&Packages" -msgstr "" - -#. Proposal for system to update -#: src/clients/rootpart_proposal.ycp:51 -msgid "No root partition found" -msgstr "" - -#. Proposal for system to update -#: src/clients/rootpart_proposal.ycp:86 -#, ycp-format -msgid "%1 on root partition %2" -msgstr "" - -#. this is a heading -#: src/clients/rootpart_proposal.ycp:139 -msgid "Selected for Update" -msgstr "" - -#. this is a menu entry -#: src/clients/rootpart_proposal.ycp:141 -msgid "&Selected for Update" -msgstr "" - -#: src/clients/run_update.ycp:37 -msgid "&Update" -msgstr "" - -#. TRANSLATORS: error message - the module does not provide command line interface -#: src/clients/update.ycp:25 -msgid "There is no user interface available for this module." -msgstr "" - -#. part of error popup message -#. error message in proposal -#: src/clients/update_proposal.ycp:113 src/clients/update_proposal.ycp:336 -msgid "Cannot read the current RPM Database." -msgstr "" - -#. part of error popup message, %1 stands for newline-separated list of files -#: src/clients/update_proposal.ycp:115 -#, ycp-format -msgid "None of these files exist:%1" -msgstr "" - -#. continue-cancel popup -#: src/clients/update_proposal.ycp:295 -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:351 -msgid "The installed product is not compatible with the product on the installation media." -msgstr "" - -#. Can't find any software data, probably a installation media error -#. error message -#: src/clients/update_proposal.ycp:362 -msgid "Cannot read package data from installation media. Media error?" -msgstr "" - -#. TRANSLATORS: unknown product (label) -#. TRANSLATORS: unknown product name -#: src/clients/update_proposal.ycp:368 src/clients/update_proposal.ycp:376 -#: src/clients/update_proposal.ycp:405 src/clients/update_proposal.ycp:407 -msgid "Unknown product" -msgstr "" - -#. TRANSLATORS: proposal error, %1 is the version of installed system -#. %2 is the version being installed -#: src/clients/update_proposal.ycp:388 -#, ycp-format -msgid "" -"Updating system to another version (%1 -> %2) is not supported on the running system.<br>\n" -"Please, boot from the installation media and use a normal upgrade\n" -"or disable software repositories of products with different versions." -msgstr "" - -#. TRANSLATORS: proposal warning, both %1 and %2 are replaced with product names -#: src/clients/update_proposal.ycp:403 -#, ycp-format -msgid "Warning: Updating from '%1' to '%2', products do not exactly match." -msgstr "" - -#. Proposal for backup during update -#: src/clients/update_proposal.ycp:439 -msgid "Only update installed packages" -msgstr "" - -#. proposal string -#: src/clients/update_proposal.ycp:447 -msgid "Update based on patterns" -msgstr "" - -#. Proposal for selection during update, %1 stands for selection name -#: src/clients/update_proposal.ycp:463 -#, ycp-format -msgid "Update based on selection \"%1\"" -msgstr "" - -#. TRANSLATORS: proposal dialog help -#: src/clients/update_proposal.ycp:472 -msgid "" -"<p><b><big>Update Options</big></b>\n" -"Here you can choose how your system is going to be updated.\n" -"Choose whether only installed packages should be updated or whether new ones should be installed also \n" -"(the default selection), and whether unmaintained packages should be deleted.</p>" -msgstr "" - -#. this is a menu entry -#: src/clients/update_proposal.ycp:518 -msgid "&Update Options" -msgstr "" - -#: src/config/update.glade:18 src/config/update.glade:42 -msgid "Update Settings" -msgstr "" - -#: src/config/update.glade:34 -msgid "Update" -msgstr "" - -#: src/config/update.glade:48 src/config/update.glade:52 -msgid "Perform Update" -msgstr "" - -#: src/config/update.glade:63 -msgid "Clean Up" -msgstr "" - -#: src/config/update.glade:67 -msgid "Update System Configuration" -msgstr "" - -#. TRANSLATORS: dialog caption -#: src/config/update.glade:75 src/modules/RootPart.ycp:1771 -msgid "Update Configuration" -msgstr "" - -#. Table item (unknown system) -#: src/include/rootpart.ycp:63 -msgid "Unknown Linux" -msgstr "" - -#. Table item (unknown system) -#: src/include/rootpart.ycp:66 -msgid "Unknown or Non-Linux" -msgstr "" - -#: src/include/rootpart.ycp:86 -#, ycp-format -msgid "%1 (%2)" -msgstr "" - -#. label for selection of root partition (for boot) -#: src/include/rootpart.ycp:154 -msgid "Partition or System to Boot:" -msgstr "" - -#. help text for root partition dialog (for boot) -#: src/include/rootpart.ycp:157 -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:165 -msgid "Partition or System to Update:" -msgstr "" - -#. help text for root partition dialog (for update) -#: src/include/rootpart.ycp:168 -msgid "" -"<p>\n" -"Select the partition or system to update.\n" -"</p>\n" -msgstr "" - -#. headline for dialog "Select for update" -#: src/include/rootpart.ycp:176 -msgid "Select for Update" -msgstr "" - -#. help text for root partition dialog (general part) -#: src/include/rootpart.ycp:181 -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:198 -msgid "System" -msgstr "" - -#. table header item -#: src/include/rootpart.ycp:200 -msgid "Partition" -msgstr "" - -#. table header item -#: src/include/rootpart.ycp:202 -msgid "Architecture" -msgstr "" - -#. table header item -#: src/include/rootpart.ycp:204 -msgid "File System" -msgstr "" - -#. table header item -#: src/include/rootpart.ycp:206 -msgid "Label" -msgstr "" - -#. check box -#: src/include/rootpart.ycp:213 -msgid "&Show All Partitions" -msgstr "" - -#. pushbutton to (rightaway) boot the system selected above -#: src/include/rootpart.ycp:245 -msgid "&Boot" -msgstr "" - -#. continue-cancel popup -#: src/include/rootpart.ycp:322 -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:329 -msgid "" -"The architecture of the system installed in the selected partition\n" -"is different than the one of this product." -msgstr "" - -#. pop-up question -#: src/include/rootpart.ycp:357 -msgid "" -"A possibly incomplete installation has been detected on the selected partition.\n" -"Are sure you want to use it anyway?" -msgstr "" - -#. button label -#: src/include/rootpart.ycp:360 -msgid "&Yes, Use It" -msgstr "" - -#: src/include/rootpart.ycp:390 src/include/rootpart.ycp:411 -msgid "" -"Initializing the system for upgrade has failed for unknown reason.\n" -"It is highly recommended not to continue the upgrade process.\n" -"\n" -"Are you sure you want to continue?" -msgstr "" - -#: src/include/rootpart.ycp:394 src/include/rootpart.ycp:415 -msgid "&Yes, Continue" -msgstr "" - -#. * -#. * Link to SDB article concerning renaming of devices. -#. -#: src/modules/RootPart.ycp:102 -#, ycp-format -msgid "" -"See the SDB article at %1 for details\n" -"about how to solve this problem." -msgstr "" - -#. label - name of sustem to update -#: src/modules/RootPart.ycp:122 -msgid "Unknown Linux System" -msgstr "" - -#. label - name of sustem to update -#: src/modules/RootPart.ycp:127 -msgid "Non-Linux System" -msgstr "" - -#. error report, %1 is device (eg. /dev/hda1) -#: src/modules/RootPart.ycp:224 -#, 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:289 -#, ycp-format -msgid "Checking partition %1" -msgstr "" - -#: src/modules/RootPart.ycp:329 -msgid "Show &Details" -msgstr "" - -#: src/modules/RootPart.ycp:416 -#, ycp-format -msgid "Checking file system on %1..." -msgstr "" - -#. popup headline -#: src/modules/RootPart.ycp:440 -msgid "File System Check Failed" -msgstr "" - -#. popup question (continue/cancel dialog) -#. %1 is a device name such as /dev/hda5 -#: src/modules/RootPart.ycp:444 -#, ycp-format -msgid "" -"The file system check of device %1 has failed.\n" -"\n" -"Would you like to continue in the mounting the device?" -msgstr "" - -#. button -#: src/modules/RootPart.ycp:450 -msgid "&Skip Mounting" -msgstr "" - -#. yes-no popup -#: src/modules/RootPart.ycp:871 -msgid "Incorrect password. Try again?" -msgstr "" - -#. TRANSLATORS: a popup headline -#: src/modules/RootPart.ycp:958 -msgid "Warning" -msgstr "" - -#: src/modules/RootPart.ycp:963 -#, ycp-format -msgid "" -"Your /boot partition is too small (%1 MB).\n" -"We recommend a size not less than %2 MB. It might happen, that the\n" -"new Kernel does not fit, so it would be safer to either enlarge that partition\n" -"or not to use the /boot partition at all.\n" -"\n" -"Would you like to continue updating the current system?" -msgstr "" - -#. label in a popup, %1 is device (eg. /dev/hda1), %2 is output of the 'mount' command -#: src/modules/RootPart.ycp:1035 -#, 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:1049 -msgid "&Specify Mount Options" -msgstr "" - -#. popup heading -#: src/modules/RootPart.ycp:1068 -msgid "Mount Options" -msgstr "" - -#. text entry label -#: src/modules/RootPart.ycp:1071 -msgid "&Mount Point" -msgstr "" - -#. tex entry label -#: src/modules/RootPart.ycp:1074 -msgid "&Device" -msgstr "" - -#. text entry label -#: src/modules/RootPart.ycp:1077 -msgid "" -"&File System\n" -"(empty for autodetection)" -msgstr "" - -#. error message -#: src/modules/RootPart.ycp:1155 -#, ycp-format -msgid "The /var partition %1 could not be mounted.\n" -msgstr "" - -#. Informational text about selected partition, %x are replaced with values later -#: src/modules/RootPart.ycp:1183 -#, ycp-format -msgid "" -"<b>File system:</b> %1, <b>Type:</b> %2,<br>\n" -"<b>Label:</b> %3, <b>Size:</b> %4,<br>\n" -"<b>udev IDs:</b> %5,<br>\n" -"<b>udev path:</b> %6" -msgstr "" - -#: src/modules/RootPart.ycp:1190 -msgid "None" -msgstr "" - -#. a popup caption -#: src/modules/RootPart.ycp:1207 -msgid "Unable to find the /var partition automatically" -msgstr "" - -#. a popup message -#: src/modules/RootPart.ycp:1209 -msgid "" -"Your system uses a separate /var partition which is required for the upgrade\n" -"process to detect the disk-naming changes. Select the /var partition manually\n" -"to continue the upgrade process." -msgstr "" - -#. a combo-box label -#: src/modules/RootPart.ycp:1217 -msgid "&Select /var Partition Device" -msgstr "" - -#. an informational rich-text widget label -#: src/modules/RootPart.ycp:1222 -msgid "Device Info" -msgstr "" - -#. error message -#: src/modules/RootPart.ycp:1339 -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:1364 -#, ycp-format -msgid "" -"Partitions could not be mounted.\n" -"\n" -"Check the log file %1." -msgstr "" - -#: src/modules/RootPart.ycp:1394 -#, ycp-format -msgid "" -"Some partitions in the system on %1 are mounted by kernel-device name. This is\n" -"not reliable for the update since kernel-device names are unfortunately not\n" -"persistent. It is strongly recommended to start the old system and change the\n" -"mount-by method to any other method for all partitions." -msgstr "" - -#. error message -#: src/modules/RootPart.ycp:1409 -msgid "No fstab found." -msgstr "" - -#. message part 1 -#: src/modules/RootPart.ycp:1429 -msgid "The root partition in /etc/fstab has an invalid root device.\n" -msgstr "" - -#. message part 2 -#: src/modules/RootPart.ycp:1431 -#, ycp-format -msgid "It is currently mounted as %1 but listed as %2.\n" -msgstr "" - -#: src/modules/RootPart.ycp:1697 -msgid "Evaluating root partition. One moment please..." -msgstr "" - -#. intermediate popup while mounting partitions -#: src/modules/RootPart.ycp:1756 -msgid "Mounting partitions. One moment please..." -msgstr "" - -#. TRANSLATORS: "Update to: $product_name" -#: src/modules/Update.ycp:282 -msgid "Unknown Product" -msgstr "" - -#. TRANSLATORS: check-box, it might happen that we need to downgrade some packages during update -#: src/modules/Update.ycp:723 -msgid "Allow Package Downgrade" -msgstr "" continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
