Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at Wed Jun 8 16:26:51 CEST 2011.
-------- --- yast2-installation/yast2-installation.changes 2011-05-19 14:24:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2011-06-07 09:50:10.000000000 +0200 @@ -1,0 +2,16 @@ +Wed Jun 1 17:24:25 CEST 2011 - [email protected] + +- always loading 'pciehp' kernel module on Dell hardware + (FATE #311991) +- fixed control file validation +- stricter btrfs_increase_percentage definition in all control + files (only 'integer' is allowed) + +------------------------------------------------------------------- +Wed Jun 1 11:56:08 CEST 2011 - [email protected] + +- add btrfs_increase_percentage to to category "partitioning" in + config.xml files +- 2.21.5 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-installation-2.21.4.tar.bz2 New: ---- yast2-installation-2.21.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.0q21tS/_old 2011-06-08 16:26:21.000000000 +0200 +++ /var/tmp/diff_new_pack.0q21tS/_new 2011-06-08 16:26:21.000000000 +0200 @@ -19,11 +19,11 @@ Name: yast2-installation -Version: 2.21.4 +Version: 2.21.5 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.21.4.tar.bz2 +Source0: yast2-installation-2.21.5.tar.bz2 Prefix: /usr @@ -136,7 +136,7 @@ System installation code as present on installation media. %prep -%setup -n yast2-installation-2.21.4 +%setup -n yast2-installation-2.21.5 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-installation-2.21.4.tar.bz2 -> yast2-installation-2.21.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.21.4/VERSION new/yast2-installation-2.21.5/VERSION --- old/yast2-installation-2.21.4/VERSION 2011-05-19 14:22:24.000000000 +0200 +++ new/yast2-installation-2.21.5/VERSION 2011-06-01 15:15:56.000000000 +0200 @@ -1 +1 @@ -2.21.4 +2.21.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.21.4/configure new/yast2-installation-2.21.5/configure --- old/yast2-installation-2.21.4/configure 2011-03-24 16:14:42.000000000 +0100 +++ new/yast2-installation-2.21.5/configure 2011-06-07 09:43:09.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-installation 2.21.0. +# Generated by GNU Autoconf 2.68 for yast2-installation 2.21.5. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-installation' PACKAGE_TARNAME='yast2-installation' -PACKAGE_VERSION='2.21.0' -PACKAGE_STRING='yast2-installation 2.21.0' +PACKAGE_VERSION='2.21.5' +PACKAGE_STRING='yast2-installation 2.21.5' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1240,7 +1240,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-installation 2.21.0 to adapt to many kinds of systems. +\`configure' configures yast2-installation 2.21.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1312,7 +1312,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-installation 2.21.0:";; + short | recursive ) echo "Configuration of yast2-installation 2.21.5:";; esac cat <<\_ACEOF @@ -1392,7 +1392,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-installation configure 2.21.0 +yast2-installation configure 2.21.5 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1409,7 +1409,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-installation $as_me 2.21.0, which was +It was created by yast2-installation $as_me 2.21.5, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2339,7 +2339,7 @@ # Define the identity of the package. PACKAGE='yast2-installation' - VERSION='2.21.0' + VERSION='2.21.5' cat >>confdefs.h <<_ACEOF @@ -2461,7 +2461,7 @@ -VERSION="2.21.0" +VERSION="2.21.5" RPMNAME="yast2-installation" MAINTAINER="Jiří Suchomel <[email protected]>" @@ -3624,7 +3624,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-installation $as_me 2.21.0, which was +This file was extended by yast2-installation $as_me 2.21.5, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3677,7 +3677,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-installation config.status 2.21.0 +yast2-installation config.status 2.21.5 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-installation-2.21.4/configure.in new/yast2-installation-2.21.5/configure.in --- old/yast2-installation-2.21.4/configure.in 2011-03-24 16:14:39.000000000 +0100 +++ new/yast2-installation-2.21.5/configure.in 2011-06-07 09:43:05.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.21.0, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.21.5, http://bugs.opensuse.org/, yast2-installation) 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.5" RPMNAME="yast2-installation" MAINTAINER="Jiří Suchomel <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.21.4/control/control.SLED.xml new/yast2-installation-2.21.5/control/control.SLED.xml --- old/yast2-installation-2.21.4/control/control.SLED.xml 2011-02-08 21:27:43.000000000 +0100 +++ new/yast2-installation-2.21.5/control/control.SLED.xml 2011-06-02 10:03:34.000000000 +0200 @@ -315,6 +315,7 @@ <vm_desired_size>15GB</vm_desired_size> <vm_home_max_size>25GB</vm_home_max_size> <boot_evms config:type="boolean">false</boot_evms> + <btrfs_increase_percentage config:type="integer">100</btrfs_increase_percentage> </partitioning> <network> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.21.4/control/control.SLES.xml new/yast2-installation-2.21.5/control/control.SLES.xml --- old/yast2-installation-2.21.4/control/control.SLES.xml 2011-02-08 21:27:43.000000000 +0100 +++ new/yast2-installation-2.21.5/control/control.SLES.xml 2011-06-02 10:03:34.000000000 +0200 @@ -262,6 +262,7 @@ <vm_desired_size>15GB</vm_desired_size> <vm_home_max_size>25GB</vm_home_max_size> <boot_evms config:type="boolean">false</boot_evms> + <btrfs_increase_percentage config:type="integer">100</btrfs_increase_percentage> </partitioning> <network> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.21.4/control/control.openSUSE.xml new/yast2-installation-2.21.5/control/control.openSUSE.xml --- old/yast2-installation-2.21.4/control/control.openSUSE.xml 2011-03-07 15:09:51.000000000 +0100 +++ new/yast2-installation-2.21.5/control/control.openSUSE.xml 2011-06-07 09:42:56.000000000 +0200 @@ -16,7 +16,7 @@ <firewall_enable_ssh config:type="boolean">false</firewall_enable_ssh> <!-- FATE #303875, see /etc/sysconfig/network/dhcp:WRITE_HOSTNAME_TO_HOSTS --> - <write_hostname_to_hosts config:type="boolean">true</write_hostname_to_hosts> + <write_hostname_to_hosts config:type="boolean">false</write_hostname_to_hosts> <!-- FATE #307555, see /etc/sysconfig/boot:RUN_PARALLEL --> <run_init_scripts_in_parallel config:type="boolean">true</run_init_scripts_in_parallel> @@ -192,15 +192,15 @@ <online_repos_preselected config:type="boolean">false</online_repos_preselected> <!-- FATE #300898, List of external sources accesible during the installation time --> - <external_sources_link>http://download.opensuse.org/YaST/Repos/openSUSE_114_Servers.xml</external_sources_link> + <external_sources_link>http://download.opensuse.org/YaST/Repos/openSUSE_121_Servers.xml</external_sources_link> <dropped_packages></dropped_packages> <extra_urls config:type="list"> <!-- Default update repository, bnc #381360 --> <extra_url> - <baseurl>http://download.opensuse.org/update/11.4/</baseurl> + <baseurl>http://download.opensuse.org/update/12.1/</baseurl> <alias>repo-update</alias> - <name>openSUSE-11.4-Update</name> + <name>openSUSE-12.1-Update</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">true</enabled> <autorefresh config:type="boolean">true</autorefresh> @@ -209,36 +209,36 @@ <!-- Replacement for EXTRAURLS and OPTIONALURLS --> <extra_url> - <baseurl>http://download.opensuse.org/distribution/11.4/repo/oss/</baseurl> + <baseurl>http://download.opensuse.org/distribution/12.1/repo/oss/</baseurl> <alias>repo-oss</alias> - <name>openSUSE-11.4-Oss</name> + <name>openSUSE-12.1-Oss</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">true</enabled> <autorefresh config:type="boolean">true</autorefresh> <priority config:type="integer">99</priority> </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/distribution/11.4/repo/non-oss/</baseurl> + <baseurl>http://download.opensuse.org/distribution/12.1/repo/non-oss/</baseurl> <alias>repo-non-oss</alias> - <name>openSUSE-11.4-Non-Oss</name> + <name>openSUSE-12.1-Non-Oss</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">true</enabled> <autorefresh config:type="boolean">true</autorefresh> <priority config:type="integer">99</priority> </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/debug/distribution/11.4/repo/oss/</baseurl> + <baseurl>http://download.opensuse.org/debug/distribution/12.1/repo/oss/</baseurl> <alias>repo-debug</alias> - <name>openSUSE-11.4-Debug</name> + <name>openSUSE-12.1-Debug</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">false</enabled> <autorefresh config:type="boolean">true</autorefresh> <priority config:type="integer">99</priority> </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/debug/update/11.4/</baseurl> + <baseurl>http://download.opensuse.org/debug/update/12.1/</baseurl> <alias>repo-debug-update</alias> - <name>openSUSE-11.4-Update-Debug</name> + <name>openSUSE-12.1-Update-Debug</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">false</enabled> <autorefresh config:type="boolean">true</autorefresh> @@ -246,9 +246,9 @@ </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/source/distribution/11.4/repo/oss/</baseurl> + <baseurl>http://download.opensuse.org/source/distribution/12.1/repo/oss/</baseurl> <alias>repo-source</alias> - <name>openSUSE-11.4-Source</name> + <name>openSUSE-12.1-Source</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">false</enabled> <autorefresh config:type="boolean">true</autorefresh> @@ -352,6 +352,7 @@ <vm_keep_unpartitioned_region config:type="boolean">false</vm_keep_unpartitioned_region> <vm_desired_size>15GB</vm_desired_size> <vm_home_max_size>25GB</vm_home_max_size> + <btrfs_increase_percentage config:type="integer">100</btrfs_increase_percentage> </partitioning> <network> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.21.4/control/control.rnc new/yast2-installation-2.21.5/control/control.rnc --- old/yast2-installation-2.21.4/control/control.rnc 2010-04-01 15:13:58.000000000 +0200 +++ new/yast2-installation-2.21.5/control/control.rnc 2011-06-02 10:03:34.000000000 +0200 @@ -416,6 +416,7 @@ | vm_keep_unpartitioned_region | remove_special_partitions | partitions + | btrfs_increase_percentage evms_config = element evms_config { BOOLEAN } try_separate_home = element try_separate_home { BOOLEAN } @@ -433,6 +434,7 @@ vm_keep_unpartitioned_region = element vm_keep_unpartitioned_region { BOOLEAN } # used by HASI Add-On use_separate_multipath_module = element use_separate_multipath_module { BOOLEAN } +btrfs_increase_percentage = element btrfs_increase_percentage { INTEGER } # these have to be defined by Storage partitions = element partitions { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.21.4/control/control.rng new/yast2-installation-2.21.5/control/control.rng --- old/yast2-installation-2.21.4/control/control.rng 2011-03-24 16:16:02.000000000 +0100 +++ new/yast2-installation-2.21.5/control/control.rng 2011-06-07 09:43:03.000000000 +0200 @@ -850,6 +850,7 @@ <ref name="vm_keep_unpartitioned_region"/> <ref name="remove_special_partitions"/> <ref name="partitions"/> + <ref name="btrfs_increase_percentage"/> </choice> </define> <define name="evms_config"> @@ -928,6 +929,11 @@ <ref name="BOOLEAN"/> </element> </define> + <define name="btrfs_increase_percentage"> + <element name="btrfs_increase_percentage"> + <ref name="INTEGER"/> + </element> + </define> <!-- these have to be defined by Storage --> <define name="partitions"> <element name="partitions"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.21.4/control/control.xml new/yast2-installation-2.21.5/control/control.xml --- old/yast2-installation-2.21.4/control/control.xml 2009-12-18 14:51:59.000000000 +0100 +++ new/yast2-installation-2.21.5/control/control.xml 2011-06-02 10:03:34.000000000 +0200 @@ -38,6 +38,7 @@ <root_space_percent>40</root_space_percent> <root_base_size>3GB</root_base_size> <root_max_size>10GB</root_max_size> + <btrfs_increase_percentage config:type="integer">100</btrfs_increase_percentage> </partitioning> <network> <force_static_ip config:type="boolean">false</force_static_ip> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.21.4/control.pot new/yast2-installation-2.21.5/control.pot --- old/yast2-installation-2.21.4/control.pot 2011-03-25 10:35:04.000000000 +0100 +++ new/yast2-installation-2.21.5/control.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,582 +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-03-25 10:35+0100\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" - -#: control/add-on-template_installation.glade:7 -msgid "Add-On Product Installation" -msgstr "" - -#: control/add-on-template_installation.glade:15 -msgid "Language Installation" -msgstr "" - -#: control/control.SLED.glade:348 -msgid "" -"\n" -"<p>\n" -"The installation has completed successfully.\n" -"Your system is ready for use.\n" -"Click <b>Finish</b> to log in to the system.\n" -"</p>\n" -"<p>\n" -"Please visit us at http://www.novell.com/linux/.\n"; -"</p>\n" -"\t" -msgstr "" - -#: control/control.SLED.glade:364 control/control.openSUSE.glade:397 -msgid "Initialization..." -msgstr "" - -#: control/control.SLED.glade:365 control/control.openSUSE.glade:398 -msgid "Configuring network..." -msgstr "" - -#: control/control.SLED.glade:366 control/control.openSUSE.glade:399 -msgid "Configuring hardware..." -msgstr "" - -#: control/control.SLED.glade:367 control/control.openSUSE.glade:400 -msgid "Finishing configuration..." -msgstr "" - -#: control/control.SLED.glade:370 control/control.SLES.glade:330 -msgid "CIM Server" -msgstr "" - -#: control/control.SLED.glade:375 control/control.SLED.glade:486 -#: control/control.SLED.glade:764 control/control.SLED.glade:768 -#: control/control.SLED.glade:949 control/control.SLED.glade:990 -#: control/control.SLES.glade:335 control/control.SLES.glade:423 -#: control/control.SLES.glade:541 control/control.SLES.glade:562 -#: control/control.SLES.glade:897 control/control.SLES.glade:901 -#: control/control.SLES.glade:1088 control/control.SLES.glade:1129 -#: control/control.glade:70 control/control.glade:130 -#: control/control.glade:463 control/control.glade:507 -#: control/control.openSUSE.glade:430 control/control.openSUSE.glade:550 -#: control/control.openSUSE.glade:862 control/control.openSUSE.glade:866 -#: control/control.openSUSE.glade:1038 control/control.openSUSE.glade:1083 -msgid "Installation Settings" -msgstr "" - -#: control/control.SLED.glade:429 control/control.SLES.glade:393 -#: control/control.SLES.glade:481 control/control.glade:90 -msgid "Overview" -msgstr "" - -#: control/control.SLED.glade:437 control/control.SLES.glade:403 -#: control/control.SLES.glade:489 control/control.glade:98 -msgid "Expert" -msgstr "" - -#: control/control.SLED.glade:454 control/control.SLES.glade:508 -#: control/control.openSUSE.glade:517 -msgid "Live Installation Settings" -msgstr "" - -#: control/control.SLED.glade:471 control/control.SLES.glade:526 -#: control/control.glade:115 control/control.openSUSE.glade:535 -#: control/control.openSUSE.glade:951 control/control.openSUSE.glade:956 -msgid "Update Settings" -msgstr "" - -#: control/control.SLED.glade:505 control/control.SLES.glade:581 -#: control/control.SLES.glade:624 control/control.glade:151 -#: control/control.openSUSE.glade:568 -msgid "Network Configuration" -msgstr "" - -#: control/control.SLED.glade:552 control/control.SLED.glade:1204 -#: control/control.SLED.glade:1210 control/control.SLES.glade:664 -#: control/control.SLES.glade:677 control/control.SLES.glade:688 -#: control/control.SLES.glade:1360 control/control.SLES.glade:1366 -#: control/control.SLES.glade:1372 control/control.SLES.glade:1384 -#: control/control.glade:192 control/control.glade:701 -#: control/control.glade:706 control/control.glade:710 -#: control/control.openSUSE.glade:610 control/control.openSUSE.glade:1283 -#: control/control.openSUSE.glade:1289 -msgid "Hardware Configuration" -msgstr "" - -#: control/control.SLED.glade:572 control/control.SLED.glade:685 -#: control/control.SLED.glade:809 control/control.SLED.glade:919 -#: control/control.SLED.glade:1312 control/control.SLES.glade:706 -#: control/control.SLES.glade:818 control/control.SLES.glade:942 -#: control/control.SLES.glade:1058 control/control.SLES.glade:1496 -#: control/control.glade:212 control/control.glade:312 -#: control/control.glade:415 control/control.openSUSE.glade:634 -#: control/control.openSUSE.glade:761 control/control.openSUSE.glade:904 -#: control/control.openSUSE.glade:1005 control/control.openSUSE.glade:1406 -msgid "Preparation" -msgstr "" - -#: control/control.SLED.glade:578 control/control.SLED.glade:587 -#: control/control.SLED.glade:690 control/control.SLED.glade:732 -#: control/control.SLED.glade:815 control/control.SLED.glade:824 -#: control/control.SLES.glade:712 control/control.SLES.glade:721 -#: control/control.SLES.glade:823 control/control.SLES.glade:865 -#: control/control.SLES.glade:948 control/control.SLES.glade:957 -#: control/control.glade:218 control/control.glade:227 -#: control/control.glade:236 control/control.glade:318 -#: control/control.glade:327 control/control.glade:336 -#: control/control.glade:448 control/control.glade:492 -#: control/control.openSUSE.glade:639 control/control.openSUSE.glade:766 -#: control/control.openSUSE.glade:808 control/control.openSUSE.glade:910 -#: control/control.openSUSE.glade:1033 control/control.openSUSE.glade:1078 -msgid "Welcome" -msgstr "" - -#: control/control.SLED.glade:593 control/control.SLES.glade:727 -#: control/control.glade:342 control/control.openSUSE.glade:649 -msgid "Network Activation" -msgstr "" - -#: control/control.SLED.glade:599 control/control.SLED.glade:700 -#: control/control.SLED.glade:830 control/control.SLES.glade:733 -#: control/control.SLES.glade:833 control/control.SLES.glade:963 -#: control/control.glade:242 control/control.glade:348 -#: control/control.openSUSE.glade:653 control/control.openSUSE.glade:776 -#: control/control.openSUSE.glade:918 -msgid "Disk Activation" -msgstr "" - -#: control/control.SLED.glade:605 control/control.SLED.glade:611 -#: control/control.SLED.glade:704 control/control.SLED.glade:708 -#: control/control.SLED.glade:836 control/control.SLED.glade:842 -#: control/control.SLED.glade:1317 control/control.SLES.glade:739 -#: control/control.SLES.glade:745 control/control.SLES.glade:837 -#: control/control.SLES.glade:841 control/control.SLES.glade:969 -#: control/control.SLES.glade:975 control/control.SLES.glade:1501 -#: control/control.glade:248 control/control.glade:254 -#: control/control.glade:354 control/control.glade:360 -#: control/control.openSUSE.glade:657 control/control.openSUSE.glade:661 -#: control/control.openSUSE.glade:780 control/control.openSUSE.glade:784 -#: control/control.openSUSE.glade:922 control/control.openSUSE.glade:926 -#: control/control.openSUSE.glade:1411 -msgid "System Analysis" -msgstr "" - -#: control/control.SLED.glade:617 control/control.SLED.glade:858 -#: control/control.SLES.glade:751 control/control.SLES.glade:991 -#: control/control.glade:260 control/control.glade:377 -#: control/control.openSUSE.glade:671 control/control.openSUSE.glade:942 -msgid "Add-On Products" -msgstr "" - -#: control/control.SLED.glade:623 control/control.SLED.glade:742 -#: control/control.SLES.glade:757 control/control.SLES.glade:875 -#: control/control.glade:266 control/control.openSUSE.glade:676 -#: control/control.openSUSE.glade:828 -msgid "Time Zone" -msgstr "" - -#: control/control.SLED.glade:640 control/control.SLED.glade:644 -#: control/control.SLED.glade:756 control/control.SLED.glade:760 -#: control/control.SLES.glade:889 control/control.SLES.glade:893 -#: control/control.openSUSE.glade:702 control/control.openSUSE.glade:706 -#: control/control.openSUSE.glade:842 control/control.openSUSE.glade:846 -msgid "User Settings" -msgstr "" - -#: control/control.SLED.glade:648 control/control.openSUSE.glade:714 -msgid "Installation Overview" -msgstr "" - -#: control/control.SLED.glade:655 control/control.SLED.glade:659 -#: control/control.SLED.glade:663 control/control.SLED.glade:667 -#: control/control.SLED.glade:671 control/control.SLED.glade:774 -#: control/control.SLED.glade:778 control/control.SLED.glade:784 -#: control/control.SLED.glade:788 control/control.SLED.glade:792 -#: control/control.SLED.glade:798 control/control.SLED.glade:956 -#: control/control.SLED.glade:960 control/control.SLED.glade:964 -#: control/control.SLED.glade:968 control/control.SLED.glade:997 -#: control/control.SLED.glade:1001 control/control.SLED.glade:1005 -#: control/control.SLED.glade:1009 control/control.SLED.glade:1282 -#: control/control.SLED.glade:1286 control/control.SLED.glade:1290 -#: control/control.SLED.glade:1294 control/control.SLED.glade:1298 -#: control/control.SLED.glade:1302 control/control.SLED.glade:1406 -#: control/control.SLED.glade:1410 control/control.SLED.glade:1414 -#: control/control.SLES.glade:783 control/control.SLES.glade:787 -#: control/control.SLES.glade:791 control/control.SLES.glade:795 -#: control/control.SLES.glade:800 control/control.SLES.glade:805 -#: control/control.SLES.glade:907 control/control.SLES.glade:911 -#: control/control.SLES.glade:917 control/control.SLES.glade:921 -#: control/control.SLES.glade:925 control/control.SLES.glade:931 -#: control/control.SLES.glade:1095 control/control.SLES.glade:1099 -#: control/control.SLES.glade:1103 control/control.SLES.glade:1107 -#: control/control.SLES.glade:1136 control/control.SLES.glade:1140 -#: control/control.SLES.glade:1144 control/control.SLES.glade:1148 -#: control/control.SLES.glade:1460 control/control.SLES.glade:1464 -#: control/control.SLES.glade:1468 control/control.SLES.glade:1472 -#: control/control.SLES.glade:1476 control/control.SLES.glade:1481 -#: control/control.SLES.glade:1486 control/control.SLES.glade:1590 -#: control/control.SLES.glade:1594 control/control.SLES.glade:1598 -#: control/control.glade:290 control/control.glade:294 -#: control/control.glade:298 control/control.glade:302 -#: control/control.glade:468 control/control.glade:472 -#: control/control.glade:476 control/control.glade:512 -#: control/control.glade:516 control/control.glade:520 -#: control/control.glade:615 control/control.glade:623 -#: control/control.glade:627 control/control.glade:753 -#: control/control.glade:757 control/control.glade:761 -#: control/control.glade:765 control/control.glade:769 -#: control/control.glade:786 control/control.glade:794 -#: control/control.glade:798 control/control.glade:802 -#: control/control.openSUSE.glade:721 control/control.openSUSE.glade:725 -#: control/control.openSUSE.glade:730 control/control.openSUSE.glade:737 -#: control/control.openSUSE.glade:741 control/control.openSUSE.glade:747 -#: control/control.openSUSE.glade:872 control/control.openSUSE.glade:876 -#: control/control.openSUSE.glade:880 control/control.openSUSE.glade:884 -#: control/control.openSUSE.glade:890 control/control.openSUSE.glade:1045 -#: control/control.openSUSE.glade:1049 control/control.openSUSE.glade:1053 -#: control/control.openSUSE.glade:1057 control/control.openSUSE.glade:1090 -#: control/control.openSUSE.glade:1094 control/control.openSUSE.glade:1098 -#: control/control.openSUSE.glade:1102 control/control.openSUSE.glade:1371 -#: control/control.openSUSE.glade:1375 control/control.openSUSE.glade:1379 -#: control/control.openSUSE.glade:1383 control/control.openSUSE.glade:1387 -#: control/control.openSUSE.glade:1391 control/control.openSUSE.glade:1395 -#: control/control.openSUSE.glade:1500 control/control.openSUSE.glade:1504 -#: control/control.openSUSE.glade:1508 -msgid "Perform Installation" -msgstr "" - -#: control/control.SLED.glade:713 control/control.SLES.glade:846 -#: control/control.openSUSE.glade:789 -msgid "Repair" -msgstr "" - -#: control/control.SLED.glade:727 control/control.SLES.glade:767 -#: control/control.SLES.glade:860 control/control.glade:282 -#: control/control.openSUSE.glade:711 control/control.openSUSE.glade:803 -msgid "Installation" -msgstr "" - -#: control/control.SLED.glade:750 control/control.SLES.glade:883 -#: control/control.openSUSE.glade:696 control/control.openSUSE.glade:836 -msgid "Disk" -msgstr "" - -#: control/control.SLED.glade:848 control/control.SLED.glade:1323 -#: control/control.SLES.glade:981 control/control.SLES.glade:1507 -#: control/control.glade:366 control/control.openSUSE.glade:930 -#: control/control.openSUSE.glade:1417 -msgid "System for Update" -msgstr "" - -#: control/control.SLED.glade:865 control/control.SLED.glade:1340 -#: control/control.SLES.glade:998 control/control.SLES.glade:1524 -#: control/control.glade:384 control/control.openSUSE.glade:948 -#: control/control.openSUSE.glade:1434 -msgid "Update" -msgstr "" - -#: control/control.SLED.glade:868 control/control.SLED.glade:873 -#: control/control.SLES.glade:1001 control/control.SLES.glade:1006 -#: control/control.glade:387 -msgid "Update Summary" -msgstr "" - -#. FATE #304940: s390 reIPL -#: control/control.SLED.glade:883 control/control.SLED.glade:892 -#: control/control.SLED.glade:896 control/control.SLED.glade:900 -#: control/control.SLED.glade:904 control/control.SLED.glade:908 -#: control/control.SLED.glade:1025 control/control.SLED.glade:1351 -#: control/control.SLED.glade:1356 control/control.SLED.glade:1361 -#: control/control.SLED.glade:1367 control/control.SLED.glade:1371 -#: control/control.SLED.glade:1375 control/control.SLED.glade:1379 -#: control/control.SLED.glade:1384 control/control.SLED.glade:1389 -#: control/control.SLED.glade:1441 control/control.SLED.glade:1445 -#: control/control.SLES.glade:1016 control/control.SLES.glade:1025 -#: control/control.SLES.glade:1029 control/control.SLES.glade:1033 -#: control/control.SLES.glade:1037 control/control.SLES.glade:1042 -#: control/control.SLES.glade:1047 control/control.SLES.glade:1164 -#: control/control.SLES.glade:1535 control/control.SLES.glade:1540 -#: control/control.SLES.glade:1545 control/control.SLES.glade:1551 -#: control/control.SLES.glade:1555 control/control.SLES.glade:1559 -#: control/control.SLES.glade:1563 control/control.SLES.glade:1568 -#: control/control.SLES.glade:1573 control/control.SLES.glade:1626 -#: control/control.SLES.glade:1630 control/control.glade:392 -#: control/control.glade:396 control/control.glade:400 -#: control/control.glade:404 control/control.glade:537 -#: control/control.glade:545 control/control.openSUSE.glade:966 -#: control/control.openSUSE.glade:975 control/control.openSUSE.glade:979 -#: control/control.openSUSE.glade:983 control/control.openSUSE.glade:987 -#: control/control.openSUSE.glade:993 control/control.openSUSE.glade:1445 -#: control/control.openSUSE.glade:1450 control/control.openSUSE.glade:1455 -#: control/control.openSUSE.glade:1461 control/control.openSUSE.glade:1465 -#: control/control.openSUSE.glade:1469 control/control.openSUSE.glade:1473 -#: control/control.openSUSE.glade:1478 control/control.openSUSE.glade:1483 -#: control/control.openSUSE.glade:1535 control/control.openSUSE.glade:1539 -msgid "Perform Update" -msgstr "" - -#: control/control.SLED.glade:923 control/control.SLES.glade:1062 -#: control/control.glade:420 control/control.glade:428 -#: control/control.openSUSE.glade:1009 -msgid "System Information" -msgstr "" - -#: control/control.SLED.glade:927 control/control.SLES.glade:1066 -#: control/control.glade:432 control/control.openSUSE.glade:1013 -msgid "Perform Repair" -msgstr "" - -#: control/control.SLED.glade:938 control/control.SLED.glade:979 -#: control/control.SLED.glade:1254 control/control.SLES.glade:1077 -#: control/control.SLES.glade:1118 control/control.SLES.glade:1432 -#: control/control.glade:443 control/control.glade:487 -#: control/control.glade:718 control/control.openSUSE.glade:1027 -#: control/control.openSUSE.glade:1073 control/control.openSUSE.glade:1343 -msgid "Base Installation" -msgstr "" - -#: control/control.SLED.glade:944 control/control.SLED.glade:985 -#: control/control.SLES.glade:1083 control/control.SLES.glade:1124 -#: control/control.glade:458 control/control.glade:502 -msgid "Language" -msgstr "" - -#: control/control.SLED.glade:1030 control/control.SLED.glade:1099 -#: control/control.SLED.glade:1231 control/control.SLED.glade:1419 -#: control/control.SLED.glade:1450 control/control.SLES.glade:1169 -#: control/control.SLES.glade:1262 control/control.SLES.glade:1409 -#: control/control.SLES.glade:1603 control/control.SLES.glade:1635 -#: control/control.glade:550 control/control.glade:634 -#: control/control.glade:807 control/control.openSUSE.glade:1185 -#: control/control.openSUSE.glade:1310 control/control.openSUSE.glade:1513 -#: control/control.openSUSE.glade:1544 -msgid "Configuration" -msgstr "" - -#: control/control.SLED.glade:1033 control/control.SLED.glade:1040 -#: control/control.SLED.glade:1137 control/control.SLED.glade:1143 -#: control/control.SLED.glade:1147 control/control.SLES.glade:1172 -#: control/control.SLES.glade:1179 control/control.SLES.glade:1294 -#: control/control.SLES.glade:1300 control/control.SLES.glade:1304 -#: control/control.glade:553 control/control.glade:559 -#: control/control.glade:646 control/control.glade:651 -#: control/control.glade:655 control/control.openSUSE.glade:1226 -#: control/control.openSUSE.glade:1232 control/control.openSUSE.glade:1236 -msgid "Network" -msgstr "" - -#: control/control.SLED.glade:1046 control/control.SLED.glade:1050 -#: control/control.SLED.glade:1151 control/control.SLED.glade:1155 -#: control/control.SLES.glade:1185 control/control.SLES.glade:1189 -#: control/control.SLES.glade:1308 control/control.SLES.glade:1312 -#: control/control.glade:565 control/control.glade:659 -msgid "Customer Center" -msgstr "" - -#: control/control.SLED.glade:1056 control/control.SLED.glade:1062 -#: control/control.SLED.glade:1068 control/control.SLED.glade:1162 -#: control/control.SLED.glade:1168 control/control.SLED.glade:1172 -#: control/control.SLED.glade:1176 control/control.SLES.glade:1195 -#: control/control.SLES.glade:1201 control/control.SLES.glade:1207 -#: control/control.SLES.glade:1318 control/control.SLES.glade:1324 -#: control/control.SLES.glade:1328 control/control.SLES.glade:1332 -#: control/control.glade:571 control/control.glade:577 -#: control/control.glade:583 control/control.glade:665 -#: control/control.glade:671 control/control.glade:675 -#: control/control.glade:679 control/control.openSUSE.glade:1240 -#: control/control.openSUSE.glade:1244 control/control.openSUSE.glade:1248 -#: control/control.openSUSE.glade:1252 control/control.openSUSE.glade:1256 -msgid "Online Update" -msgstr "" - -#: control/control.SLED.glade:1075 control/control.SLED.glade:1200 -#: control/control.SLES.glade:1215 control/control.SLES.glade:1356 -#: control/control.glade:591 control/control.glade:697 -#: control/control.openSUSE.glade:1279 -msgid "Release Notes" -msgstr "" - -#: control/control.SLED.glade:1102 control/control.SLED.glade:1234 -#: control/control.SLES.glade:1412 control/control.openSUSE.glade:1193 -#: control/control.openSUSE.glade:1313 -msgid "Automatic Configuration" -msgstr "" - -#: control/control.SLED.glade:1108 control/control.SLES.glade:1265 -#: control/control.openSUSE.glade:1199 -msgid "root Password" -msgstr "" - -#: control/control.SLED.glade:1113 control/control.SLED.glade:1119 -#: control/control.SLED.glade:1125 control/control.SLES.glade:1270 -#: control/control.SLES.glade:1276 control/control.SLES.glade:1282 -#: control/control.openSUSE.glade:1204 control/control.openSUSE.glade:1210 -#: control/control.openSUSE.glade:1216 -msgid "Check Installation" -msgstr "" - -#: control/control.SLED.glade:1131 control/control.SLES.glade:1288 -#: control/control.glade:642 control/control.openSUSE.glade:1222 -msgid "Hostname" -msgstr "" - -#: control/control.SLED.glade:1180 control/control.SLED.glade:1184 -#: control/control.SLES.glade:1342 control/control.SLES.glade:1346 -#: control/control.glade:683 control/control.glade:687 -#: control/control.openSUSE.glade:1260 control/control.openSUSE.glade:1264 -#: control/control.openSUSE.glade:1320 control/control.openSUSE.glade:1324 -msgid "Users" -msgstr "" - -#: control/control.SLED.glade:1263 control/control.SLED.glade:1269 -#: control/control.SLED.glade:1273 control/control.SLED.glade:1329 -#: control/control.SLED.glade:1335 control/control.SLED.glade:1343 -#: control/control.SLES.glade:1441 control/control.SLES.glade:1447 -#: control/control.SLES.glade:1451 control/control.SLES.glade:1513 -#: control/control.SLES.glade:1519 control/control.SLES.glade:1527 -#: control/control.glade:728 control/control.glade:736 -#: control/control.glade:742 control/control.glade:746 -#: control/control.openSUSE.glade:1352 control/control.openSUSE.glade:1358 -#: control/control.openSUSE.glade:1362 control/control.openSUSE.glade:1423 -#: control/control.openSUSE.glade:1429 control/control.openSUSE.glade:1437 -msgid "AutoYaST Settings" -msgstr "" - -#: control/control.SLED.glade:1422 control/control.SLED.glade:1453 -#: control/control.SLES.glade:1606 control/control.SLES.glade:1638 -#: control/control.glade:810 control/control.openSUSE.glade:1516 -#: control/control.openSUSE.glade:1547 -msgid "System Configuration" -msgstr "" - -#: control/control.SLED.glade:1457 control/control.SLES.glade:1211 -#: control/control.SLES.glade:1350 control/control.SLES.glade:1610 -#: control/control.SLES.glade:1642 control/control.glade:587 -#: control/control.glade:691 control/control.glade:814 -#: control/control.openSUSE.glade:1551 -msgid "Clean Up" -msgstr "" - -#: control/control.SLES.glade:302 -msgid "" -"\n" -"<p>\n" -"The installation has completed successfully.\n" -"Your system is ready for use.\n" -"Click Finish to log in to the system.\n" -"</p>\n" -"<p>\n" -"Please visit us at http://www.novell.com/linux/.\n"; -"</p>\n" -"\t" -msgstr "" - -#: control/control.SLES.glade:318 -msgid "Server Base Scenario" -msgstr "" - -#: control/control.SLES.glade:319 -msgid "" -"SUSE Linux Enterprise Server offers several base scenarios.\n" -"Choose the one that matches your server the best." -msgstr "" - -#: control/control.SLES.glade:325 -msgid "Physical Machine (Also for Fully Virtualized Guests)" -msgstr "" - -#: control/control.SLES.glade:326 -msgid "Virtual Machine (For Paravirtualized Environments Like Xen)" -msgstr "" - -#: control/control.SLES.glade:327 -msgid "Xen Virtualization Host (Local X11 Not Configured by Default)" -msgstr "" - -#: control/control.SLES.glade:650 -msgid "Network Services Configuration" -msgstr "" - -#: control/control.SLES.glade:771 -msgid "Server Scenario" -msgstr "" - -#: control/control.SLES.glade:776 control/control.glade:285 -msgid "Installation Summary" -msgstr "" - -#: control/control.SLES.glade:1336 -msgid "Service" -msgstr "" - -#: control/control.glade:275 control/control.openSUSE.glade:684 -msgid "Desktop Selection" -msgstr "" - -#: control/control.glade:637 -msgid "Root Password" -msgstr "" - -#: control/control.openSUSE.glade:388 -msgid "" -"\n" -"<p><b>Congratulations!</b></p>\n" -"<p>The installation of openSUSE on your machine is complete.\n" -"After clicking <b>Finish</b>, you can log in to the system.</p>\n" -"<p>Visit us at %1.</p>\n" -"<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n" -"\t " -msgstr "" - -#: control/control.openSUSE.glade:406 -msgid "" -"The desktop environment on your computer provides the graphical user\n" -"interface for your computer, as well as a suite of applications for\n" -"email, Web browsing, office productivity, games, and utilities to\n" -"manage your computer.\n" -"\n" -"openSUSE offers a choice of desktop environments. The most widely\n" -"used desktop environments are GNOME and KDE, and they are equally\n" -"supported under openSUSE. Both desktop environments are easy to use,\n" -"highly integrated, and have an attractive look and feel. Each desktop\n" -"environment has a distinct style, so personal taste determines which\n" -"is the most appropriate desktop for you." -msgstr "" - -#: control/control.openSUSE.glade:419 -msgid "GNOME Desktop" -msgstr "" - -#: control/control.openSUSE.glade:420 -msgid "KDE Desktop" -msgstr "" - -#: control/control.openSUSE.glade:421 -msgid "XFCE Desktop" -msgstr "" - -#: control/control.openSUSE.glade:422 -msgid "LXDE Desktop" -msgstr "" - -#: control/control.openSUSE.glade:423 -msgid "Minimal X Window" -msgstr "" - -#: control/control.openSUSE.glade:424 -msgid "Minimal Server Selection (Text Mode)" -msgstr "" - -#: control/control.openSUSE.glade:666 control/control.openSUSE.glade:937 -msgid "Online Repositories" -msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.21.4/installation.pot new/yast2-installation-2.21.5/installation.pot --- old/yast2-installation-2.21.4/installation.pot 2011-03-25 10:35:04.000000000 +0100 +++ new/yast2-installation-2.21.5/installation.pot 2010-07-07 18:09:16.000000000 +0200 @@ -8,11 +8,10 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-25 10:35+0100\n" +"POT-Creation-Date: 2010-07-07 18:09+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" @@ -160,26 +159,26 @@ msgid "Installation from &Images" msgstr "" -#: src/clients/inst_addon_update_sources.ycp:53 +#: src/clients/inst_addon_update_sources.ycp:52 #, ycp-format msgid "Updates for %1 %2" msgstr "" -#: src/clients/inst_addon_update_sources.ycp:54 +#: src/clients/inst_addon_update_sources.ycp:53 msgid "Unknown Product" msgstr "" #. feedback heading -#: src/clients/inst_addon_update_sources.ycp:65 +#: src/clients/inst_addon_update_sources.ycp:64 msgid "Add-On Product Installation" msgstr "" #. feedback message -#: src/clients/inst_addon_update_sources.ycp:67 +#: src/clients/inst_addon_update_sources.ycp:66 msgid "Reading packages available in the repositories..." msgstr "" -#: src/clients/inst_addon_update_sources.ycp:115 +#: src/clients/inst_addon_update_sources.ycp:112 #, ycp-format msgid "" "An error occurred while connecting to the server.\n" @@ -285,18 +284,18 @@ #. TRANSLATORS: dialog caption #: src/clients/inst_complex_welcome.ycp:108 -#: src/clients/inst_complex_welcome.ycp:138 +#: src/clients/inst_complex_welcome.ycp:137 msgid "License Agreement" msgstr "" #. TRANSLATORS: button label #. ID: #ICW_B1 button -#: src/clients/inst_complex_welcome.ycp:122 +#: src/clients/inst_complex_welcome.ycp:121 msgid "License &Translations..." msgstr "" #. help text for initial (first time) language screen -#: src/clients/inst_complex_welcome.ycp:154 +#: src/clients/inst_complex_welcome.ycp:153 msgid "" "<p>\n" "Choose the <b>Language</b> and the <b>Keyboard layout</b> to be used during\n" @@ -306,7 +305,7 @@ #. help text, continued #. Describes the #ICW_B1 button -#: src/clients/inst_complex_welcome.ycp:162 +#: src/clients/inst_complex_welcome.ycp:161 msgid "" "<p>\n" "License has to be accepted before continuing the installation.\n" @@ -315,7 +314,7 @@ msgstr "" #. help text, continued -#: src/clients/inst_complex_welcome.ycp:168 +#: src/clients/inst_complex_welcome.ycp:167 msgid "" "<p>\n" "Click <b>Next</b> to proceed to the next dialog.\n" @@ -323,7 +322,7 @@ msgstr "" #. help text, continued -#: src/clients/inst_complex_welcome.ycp:174 +#: src/clients/inst_complex_welcome.ycp:173 msgid "" "<p>\n" "Nothing will happen to your computer until you confirm\n" @@ -332,7 +331,7 @@ msgstr "" #. help text, continued -#: src/clients/inst_complex_welcome.ycp:181 +#: src/clients/inst_complex_welcome.ycp:180 msgid "" "<p>\n" "Select <b>Abort</b> to abort the\n" @@ -340,7 +339,7 @@ "</p>\n" msgstr "" -#: src/clients/inst_complex_welcome.ycp:218 +#: src/clients/inst_complex_welcome.ycp:217 msgid "License needs to be accepted" msgstr "" @@ -439,7 +438,7 @@ #. twice more steps #: src/clients/inst_deploy_image.ycp:143 src/clients/inst_deploy_image.ycp:265 -#: src/clients/inst_prepareprogress.ycp:71 +#: src/clients/inst_prepareprogress.ycp:58 msgid "Deploying Images..." msgstr "" @@ -536,7 +535,7 @@ msgid "Installation Error" msgstr "" -#: src/clients/inst_finish.ycp:74 src/clients/inst_prepareprogress.ycp:87 +#: src/clients/inst_finish.ycp:74 src/clients/inst_prepareprogress.ycp:74 msgid "Finishing Basic Installation" msgstr "" @@ -575,18 +574,18 @@ msgstr "" #. a fallback busy message -#: src/clients/inst_finish.ycp:358 +#: src/clients/inst_finish.ycp:355 #, ycp-format msgid "Calling step %1..." msgstr "" #. use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log -#: src/clients/inst_finish.ycp:363 +#: src/clients/inst_finish.ycp:360 #, ycp-format msgid " * %1" msgstr "" -#: src/clients/inst_finish.ycp:396 +#: src/clients/inst_finish.ycp:393 msgid "Finished" msgstr "" @@ -1254,11 +1253,11 @@ "Select the default type." msgstr "" -#: src/clients/inst_prepareprogress.ycp:65 +#: src/clients/inst_prepareprogress.ycp:52 msgid "Preparing disks..." msgstr "" -#: src/clients/inst_prepareprogress.ycp:79 +#: src/clients/inst_prepareprogress.ycp:66 msgid "Installing Packages..." msgstr "" @@ -1447,22 +1446,22 @@ msgstr "" #. question in a popup box -#: src/clients/inst_proposal.ycp:1251 +#: src/clients/inst_proposal.ycp:1247 msgid "Really reset everything to default values?" msgstr "" #. explain consequences of a decision -#: src/clients/inst_proposal.ycp:1253 +#: src/clients/inst_proposal.ycp:1249 msgid "You will lose all changes." msgstr "" #. message show when user has disabled the configuration -#: src/clients/inst_proposal.ycp:1265 +#: src/clients/inst_proposal.ycp:1261 msgid "Skipping configuration upon user request" msgstr "" #. error message is a popup -#: src/clients/inst_proposal.ycp:1283 +#: src/clients/inst_proposal.ycp:1279 msgid "" "The proposal contains an error that must be\n" "resolved before continuing.\n" @@ -2000,7 +1999,7 @@ #. Somehow the graphical frontend failed and we're running in #. text mode. Inform the user about this fact. -#: src/include/inst_inc_all.ycp:127 +#: src/include/inst_inc_all.ycp:114 #, ycp-format msgid "" "Your computer does not fulfill all requirements for\n" @@ -2018,7 +2017,7 @@ #. else if (Installation::no_x11 ()) #. Somehow the graphical frontend failed and we're running in #. text mode. Inform the user about this fact. -#: src/include/inst_inc_all.ycp:146 +#: src/include/inst_inc_all.ycp:133 msgid "" "The graphical interface could not be started.\n" "\n" @@ -2151,7 +2150,7 @@ #. for translators: use the localized page for your language if it exists, #. check the combo box "In other laguages" on top of the page #: src/include/scr_switch_debugger.ycp:120 -msgid "http://en.opensuse.org/openSUSE:Report_a_YaST_bug"; +msgid "http://en.opensuse.org/Bugs/YaST"; msgstr "" #. log-view label @@ -2395,7 +2394,7 @@ msgstr "" #. progress step title -#: src/inst_finish/umount_finish.ycp:47 +#: src/inst_finish/umount_finish.ycp:46 msgid "Unmounting all mounted devices..." msgstr "" @@ -2422,20 +2421,20 @@ msgid "Failed to read information about installation images" msgstr "" -#: src/modules/ImageInstallation.ycp:1017 +#: src/modules/ImageInstallation.ycp:1005 msgid "Deploying..." msgstr "" -#: src/modules/ImageInstallation.ycp:1040 +#: src/modules/ImageInstallation.ycp:1028 msgid "Storing user preferences..." msgstr "" -#: src/modules/ImageInstallation.ycp:1155 +#: src/modules/ImageInstallation.ycp:1143 msgid "Restoring user preferences..." msgstr "" #. Error message -#: src/modules/ImageInstallation.ycp:1236 +#: src/modules/ImageInstallation.ycp:1224 msgid "" "Installation was unable to solve package dependecies automatically.\n" "Package manager will be opened for you to solve them manually." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.21.4/src/inst_finish/kernel_finish.ycp new/yast2-installation-2.21.5/src/inst_finish/kernel_finish.ycp --- old/yast2-installation-2.21.4/src/inst_finish/kernel_finish.ycp 2009-12-18 14:52:10.000000000 +0100 +++ new/yast2-installation-2.21.5/src/inst_finish/kernel_finish.ycp 2011-06-01 17:30:48.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <[email protected]> * - * $Id: kernel_finish.ycp 54888 2009-01-22 11:47:19Z locilka $ + * $Id: kernel_finish.ycp 64190 2011-06-01 15:28:06Z locilka $ * */ @@ -34,6 +34,49 @@ y2debug("func=%1", func); y2debug("param=%1", param); + string manufacturer_regexp_dell = "^[dD][eE][lL][lL]"; + string module_to_load_dell = "pciehp"; + + string manufacturer () { + // Workaround for bug in YaST (FATE #311991, comment #34) + SCR::Read(.probe.bios_video); + list <map> bios_infos = (list <map>) SCR::Read(.probe.bios); + list <map> bios_info = (list <map>) bios_infos[0, "smbios"]:[]; + y2debug ("Bios Info: %1", bios_info); + map manufacturer_info = (map) find (map bios_item, bios_info, ``((bios_item["type"]:"" == "sysinfo") && (bios_item["manufacturer"]:"" != ""))); + y2milestone ("Bios manufacturer found: %1", manufacturer_info); + return manufacturer_info["manufacturer"]:""; + } + + boolean pciehp_needed () { + string manufacturer_s = manufacturer(); + if (manufacturer_s == nil || manufacturer_s == "") { + y2warning ("Cannot find the BIOS manufacturer"); + return false; + } + + if (regexpmatch (manufacturer_s, manufacturer_regexp_dell)) + return true; + + return false; + } + + boolean adjust_kernel_modules () { + string all_modules = (string) SCR::Read (.sysconfig.kernel.MODULES_LOADED_ON_BOOT); + if (all_modules == nil) all_modules = ""; + list <string> modules = splitstring (all_modules, " \t\n"); + y2milestone ("Modules: %1", modules); + + // already there + if (contains (modules, module_to_load_dell)) + return true; + + y2milestone ("Adding '%1' module to sysconfig/kernel:MODULES_LOADED_ON_BOOT", module_to_load_dell); + modules = add (modules, module_to_load_dell); + SCR::Write (.sysconfig.kernel.MODULES_LOADED_ON_BOOT, mergestring (modules, " ")); + return SCR::Write (.sysconfig.kernel, nil); + } + if (func == "Info") { return (any)$[ @@ -55,6 +98,10 @@ Kernel::AddModuleToLoad ("mmtimer"); } + // FATE #311991 + if (pciehp_needed()) + Kernel::AddModuleToLoad (module_to_load_dell); + // Write list of modules to load after system gets up Kernel::SaveModulesToLoad (); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
