Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2012-04-02 10:43:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2", Maintainer is "jsrain@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2012-03-29 07:49:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2012-04-02 10:43:34.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Mar 29 14:02:47 CEST 2012 - jsuchome@suse.cz + +- merged proofed texts +- 2.22.6 + +------------------------------------------------------------------- Old: ---- yast2-2.22.5.tar.bz2 New: ---- yast2-2.22.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.FmdfW3/_old 2012-04-02 10:43:36.000000000 +0200 +++ /var/tmp/diff_new_pack.FmdfW3/_new 2012-04-02 10:43:36.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,20 +17,23 @@ Name: yast2 -Version: 2.22.5 +Version: 2.22.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-%{version}.tar.bz2 - -Group: System/YaST -License: GPL-2.0+ Source1: yast2-rpmlintrc -BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite +BuildRequires: perl-XML-Writer +BuildRequires: update-desktop-files +BuildRequires: yast2-devtools +BuildRequires: yast2-perl-bindings +BuildRequires: yast2-testsuite # Needed already in build time -BuildRequires: yast2-core >= 2.18.12 yast2-pkg-bindings >= 2.20.3 yast2-ycp-ui-bindings >= 2.18.4 +BuildRequires: yast2-core >= 2.18.12 +BuildRequires: yast2-pkg-bindings >= 2.20.3 +BuildRequires: yast2-ycp-ui-bindings >= 2.18.4 # pre-requires for filling the sysconfig template (sysconfig.yast2) PreReq: %fillup_prereq @@ -48,8 +51,10 @@ Requires: perl-Config-Crontab # for ag_tty (/bin/stty) # for /usr/bin/md5sum -Requires: coreutils sysconfig -Requires: yast2-xml yast2-hardware-detection +Requires: coreutils +Requires: sysconfig +Requires: yast2-hardware-detection +Requires: yast2-xml # for SLPAPI.pm Requires: yast2-perl-bindings # for ag_anyxml @@ -89,22 +94,30 @@ Provides: yast2-lib-sequencer Obsoletes: yast2-lib-sequencer -Provides: yast2-lib-wizard yast2-lib-wizard-devel yast2-trans-wizard -Obsoletes: yast2-lib-wizard yast2-lib-wizard-devel yast2-trans-wizard -Provides: yast2-trans-menu y2t_menu -Obsoletes: yast2-trans-menu y2t_menu +Provides: yast2-lib-wizard +Provides: yast2-lib-wizard-devel +Provides: yast2-trans-wizard +Obsoletes: yast2-lib-wizard +Obsoletes: yast2-lib-wizard-devel +Obsoletes: yast2-trans-wizard +Provides: y2t_menu +Provides: yast2-trans-menu +Obsoletes: y2t_menu +Obsoletes: yast2-trans-menu # moved here from another packages -Provides: yast2-installation:/usr/share/YaST2/modules/Installation.ycp -Provides: yast2-installation:/usr/share/YaST2/modules/Product.ycp +Provides: yast2-dns-server:/usr/share/YaST2/modules/DnsServerAPI.pm Provides: yast2-installation:/usr/share/YaST2/modules/Hotplug.ycp Provides: yast2-installation:/usr/share/YaST2/modules/HwStatus.ycp +Provides: yast2-installation:/usr/share/YaST2/modules/Installation.ycp +Provides: yast2-installation:/usr/share/YaST2/modules/Product.ycp +Provides: yast2-mail-aliases Provides: yast2-network:/usr/share/YaST2/modules/Internet.ycp Provides: yast2-packager:/usr/lib/YaST2/servers_non_y2/ag_anyxml -Provides: yast2-dns-server:/usr/share/YaST2/modules/DnsServerAPI.pm -Provides: yast2-mail-aliases Summary: YaST2 - Main Package +License: GPL-2.0+ +Group: System/YaST %description This package contains scripts and data needed for SuSE Linux @@ -112,14 +125,14 @@ %package devel-doc Requires: yast2 = %version -Group: System/YaST Provides: yast2-lib-sequencer-devel -Obsoletes: yast2-lib-sequencer-devel Obsoletes: yast2-devel +Obsoletes: yast2-lib-sequencer-devel Provides: yast2-devel Requires: yast2-core-devel Summary: YaST2 - Development Scripts and Documentation +Group: System/YaST %description devel-doc This package contains scripts and data needed for a SUSE Linux @@ -151,7 +164,6 @@ %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done - mkdir -p "$RPM_BUILD_ROOT"/usr/share/YaST2/clients mkdir -p "$RPM_BUILD_ROOT"%{_prefix}/share/applications/YaST2 mkdir -p "$RPM_BUILD_ROOT"/usr/share/YaST2/images ++++++ yast2-2.22.5.tar.bz2 -> yast2-2.22.6.tar.bz2 ++++++ ++++ 6071 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.22.5/VERSION new/yast2-2.22.6/VERSION --- old/yast2-2.22.5/VERSION 2012-03-28 12:04:45.000000000 +0200 +++ new/yast2-2.22.6/VERSION 2012-03-29 14:03:39.000000000 +0200 @@ -1 +1 @@ -2.22.5 +2.22.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.22.5/configure.in new/yast2-2.22.6/configure.in --- old/yast2-2.22.5/configure.in 2012-02-15 11:22:12.000000000 +0100 +++ new/yast2-2.22.6/configure.in 2012-03-29 14:03:53.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2 dnl -dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.8 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.21.25, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.22.6, http://bugs.opensuse.org/, yast2) 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.25" +VERSION="2.22.6" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain@suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.22.5/library/commandline/src/CommandLine.ycp new/yast2-2.22.6/library/commandline/src/CommandLine.ycp --- old/yast2-2.22.5/library/commandline/src/CommandLine.ycp 2011-10-11 12:35:35.000000000 +0200 +++ new/yast2-2.22.6/library/commandline/src/CommandLine.ycp 2012-03-29 14:02:20.000000000 +0200 @@ -564,7 +564,7 @@ } // translators: default module description if none is provided by the module itself - Print( modulecommands["help"]: _("This is a YaST2 module.")+"\n" ); + Print( modulecommands["help"]: _("This is a YaST module.")+"\n" ); // translators: short help title for command line Print(_("Basic Syntax:")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.22.5/library/desktop/src/menu.ycp new/yast2-2.22.6/library/desktop/src/menu.ycp --- old/yast2-2.22.5/library/desktop/src/menu.ycp 2010-10-21 14:00:31.000000000 +0200 +++ new/yast2-2.22.6/library/desktop/src/menu.ycp 2012-03-29 14:02:20.000000000 +0200 @@ -55,7 +55,7 @@ `HBox( `HSpacing(2), /* Heading for NCurses Control Center */ - `HCenter(`Heading( _("YaST2 Control Center")) ), + `HCenter(`Heading( _("YaST Control Center")) ), `HSpacing(2) ), `VSpacing(0.4) @@ -139,7 +139,7 @@ define void ShowNcursesHelp() { /* NCurses (textmode) Control Center headline */ - string headline = _("Controlling YaST2 ncurses with the Keyboard"); + string headline = _("Controlling YaST ncurses with the Keyboard"); /* NCurses Control Center help 1/ */ string help = _("<p>1) <i>General</i><br> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.22.5/library/log/src/ALog.ycp new/yast2-2.22.6/library/log/src/ALog.ycp --- old/yast2-2.22.5/library/log/src/ALog.ycp 2010-10-21 14:00:29.000000000 +0200 +++ new/yast2-2.22.6/library/log/src/ALog.ycp 2012-03-29 14:02:20.000000000 +0200 @@ -77,7 +77,7 @@ * that she did using YaST, logs it using @ref Note */ global void CommitPopup() { - string i = uiInput(_("Enter a log message to describe the changes that you did")); + string i = uiInput(_("Enter a log message that describes the changes you made.")); string msg = (i == nil)? "*empty log message*": i; Note(msg); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.22.5/library/modules/Version.ycp new/yast2-2.22.6/library/modules/Version.ycp --- old/yast2-2.22.5/library/modules/Version.ycp 2012-03-28 12:06:09.000000000 +0200 +++ new/yast2-2.22.6/library/modules/Version.ycp 2012-03-29 14:04:02.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.22.5"; +global string yast2 = "2.22.6"; /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.22.5/library/network/src/CWMFirewallInterfaces.ycp new/yast2-2.22.6/library/network/src/CWMFirewallInterfaces.ycp --- old/yast2-2.22.5/library/network/src/CWMFirewallInterfaces.ycp 2011-10-11 12:35:35.000000000 +0200 +++ new/yast2-2.22.6/library/network/src/CWMFirewallInterfaces.ycp 2012-03-29 14:02:20.000000000 +0200 @@ -96,10 +96,10 @@ // bnc #429861 if (Stage::initial()) { // label - label = _("Firewall cannot be adjusted during first stage installation"); + label = _("Firewall cannot be adjusted during first stage installation."); } else { // label - label = _("Firewall package is not installed"); + label = _("Firewall package is not installed."); } } else if (status == `off) @@ -469,8 +469,9 @@ Report::Message ( sformat ( - _("These network interfaces assigned to internal network cannot be unselected: -%1"), + _("These network interfaces assigned to internal network cannot be deselected: +%1 +"), mergestring (int_not_selected, "\n") ) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.22.5/library/network/src/NetworkService.ycp new/yast2-2.22.6/library/network/src/NetworkService.ycp --- old/yast2-2.22.5/library/network/src/NetworkService.ycp 2010-10-21 14:00:30.000000000 +0200 +++ new/yast2-2.22.6/library/network/src/NetworkService.ycp 2012-03-29 14:02:20.000000000 +0200 @@ -165,7 +165,7 @@ y2internal("RunningNetworkPopup %1", isNetworkRunning()); if (isNetworkRunning()) return true; else { - string error_text = sformat("%1\n%2 %3", _("No running network detected!"), + string error_text = sformat("%1\n%2 %3", _("No running network detected."), Mode::installation() ? _("Restart installation and configure network in Linuxrc") : _("Configure network with YaST or Network Manager plug-in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.22.5/library/network/src/SuSEFirewallProposal.ycp new/yast2-2.22.6/library/network/src/SuSEFirewallProposal.ycp --- old/yast2-2.22.5/library/network/src/SuSEFirewallProposal.ycp 2010-10-21 14:00:30.000000000 +0200 +++ new/yast2-2.22.6/library/network/src/SuSEFirewallProposal.ycp 2012-03-29 14:02:20.000000000 +0200 @@ -517,7 +517,7 @@ is_ssh_enabled = true; // TRANSLATORS: Network proposal informative text with link around // IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text - output = output + "<li>" + _("SSH port is open (<a href=\"firewall--disable_ssh_in_proposal\">close</a>), but there are still no network interfaces configured") + "</li>"; + output = output + "<li>" + _("SSH port is open (<a href=\"firewall--disable_ssh_in_proposal\">close</a>), but\nthere are no network interfaces configured") + "</li>"; } y2milestone("SSH is " + (is_ssh_enabled ? "":"not ") + "enabled"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.22.5/library/packages/src/PackageCallbacks.ycp new/yast2-2.22.6/library/packages/src/PackageCallbacks.ycp --- old/yast2-2.22.5/library/packages/src/PackageCallbacks.ycp 2011-10-11 12:35:36.000000000 +0200 +++ new/yast2-2.22.6/library/packages/src/PackageCallbacks.ycp 2012-03-29 14:02:20.000000000 +0200 @@ -435,7 +435,8 @@ // TODO: add "Don't show again" checkbox // a warning popup displayed after pressing [Ignore] after a download error Popup::Warning(_("Ignoring a download failure may result in a broken system. -The system should be later verified by running the Software Management module.")); +Verify the system later by running the Software Management module. +")); } return "I"; @@ -1305,7 +1306,7 @@ y2milestone ("Source create: error: url: %1, error: %2, description: %3", URL::HidePassword(url), error, description); // error message - a label followed by a richtext with details - string message = _("Error occurred while creating the repository."); + string message = _("An error occurred while creating the repository."); if (error == `NOT_FOUND) // error message - a label followed by a richtext with details diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.22.5/library/packages/src/SignatureCheckDialogs.ycp new/yast2-2.22.6/library/packages/src/SignatureCheckDialogs.ycp --- old/yast2-2.22.5/library/packages/src/SignatureCheckDialogs.ycp 2012-02-15 14:13:02.000000000 +0100 +++ new/yast2-2.22.6/library/packages/src/SignatureCheckDialogs.ycp 2012-03-29 14:02:21.000000000 +0200 @@ -377,10 +377,12 @@ // %3 is URL of the repository _("The file %1 from repository %2 %3 -is not digitally signed. This means that the origin and integrity of the file -cannot be verified. Using the file may put the integrity of your system at risk. +is not digitally signed. The origin and integrity of the file +cannot be verified. Using the file anyway puts the integrity of your +system at risk. -Use it anyway?") +Use it anyway? +") ), item_name, repo["name"]:_("Unknown"), repo["url"]:_("Unknown")); UI::OpenDialog( @@ -425,11 +427,12 @@ string description_text = sformat((item_type == `package ? // popup question, %1 stands for the package name _("No checksum for package %1 was found in the repository. -This means that the package is part of the signed repository, but the list of checksums -in this repository does not mention this package. Installing the package may put +While the package is part of the signed repository, it is not contained +in the list of checksums in this repository. Installing the package puts the integrity of your system at risk. -Install it anyway?") +Install it anyway? +") : // popup question, %1 stands for the filename _("No checksum for file %1 was found in the repository. @@ -530,22 +533,24 @@ %3 is signed with the following GnuPG key, but the integrity check failed: %4 -This means that the package has been changed by accident or by an attacker +The package has been changed, either by accident or by an attacker, since the repository creator signed it. Installing it is a big risk for the integrity and security of your system. -Install it anyway?") +Install it anyway? +") : // popup question, %1 stands for the filename, %2 for the complete description of the GnuPG key (multiline) _("File %1 from repository %2 %3 is signed with the following GnuPG key, but the integrity check failed: %4 -This means that the file has been changed by accident or by an attacker +The file has been changed, either by accident or by an attacker, since the repository creator signed it. Using it is a big risk for the integrity and security of your system. -Use it anyway?") +Use it anyway? +") ), item_name, repo["name"]:_("Unknown"), @@ -673,23 +678,25 @@ _("The package %1 is digitally signed with key '%2 (%3)'. -There is no trust relationship to the owner of the key. +There is no trust relationship with the owner of the key. If you trust the owner, mark the key as trusted. -Installing a package from an unknown repository can put +Installing a package from an unknown repository puts the integrity of your system at risk. It is safest -to skip the package.") +to skip the package. +") : // popup question, %1 stands for the filename, %2 for the key ID, %3 for the key name _("The file %1 is digitally signed with key '%2 (%3)'. -There is no trust relationship to the owner of the key. +There is no trust relationship with the owner of the key. If you trust the owner, mark the key as trusted. -Installing a file from an unknown repository can put +Installing a file from an unknown repository puts the integrity of your system at risk. It is safest -to skip it.") +to skip it. +") ), item_name, key["id"]:"", key["name"]:""); UI::OpenDialog( @@ -880,11 +887,12 @@ is %2, but the current checksum is %3. -This means that the file has been changed by accident or by an attacker +The file has been changed by accident or by an attacker since the repository creator signed it. Using it is a big risk for the integrity and security of your system. -Use it anyway?"), +Use it anyway? +"), filename, requested_digest, found_digest @@ -912,9 +920,10 @@ but the expected checksum is not known. This means that the origin and integrity of the file -cannot be verified. Using the file may put the integrity of your system at risk. +cannot be verified. Using the file puts the integrity of your system at risk. -Use it anyway?"), +Use it anyway? +"), filename, digest ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.22.5/library/packages/src/SlideShow.ycp new/yast2-2.22.6/library/packages/src/SlideShow.ycp --- old/yast2-2.22.5/library/packages/src/SlideShow.ycp 2010-10-21 14:00:31.000000000 +0200 +++ new/yast2-2.22.6/library/packages/src/SlideShow.ycp 2012-03-29 14:02:21.000000000 +0200 @@ -647,7 +647,7 @@ string HelpText() { // Help text while software packages are being installed (displayed only in rare cases) - string help_text = _("<p>Please wait while packages are being installed.</p>") + string help_text = _("<p>Packages are being installed.</p>") + _("<P><B>Aborting Installation</B> Package installation can be aborted using the <B>Abort</B> button. However, the system then can be in an inconsistent or unusable state or it may not boot if the basic system component is not installed.</P>"); return help_text; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.22.5/library/system/src/FileChanges.ycp new/yast2-2.22.6/library/system/src/FileChanges.ycp --- old/yast2-2.22.5/library/system/src/FileChanges.ycp 2011-02-02 13:34:46.000000000 +0100 +++ new/yast2-2.22.6/library/system/src/FileChanges.ycp 2012-03-29 14:02:21.000000000 +0200 @@ -156,7 +156,8 @@ { // Continue/Cancel question, %1 is a file name string msg = _("File %1 has been changed manually. -YaST might lose some of the changes"); +YaST might lose some of the changes. +"); if (size (files) > 1) // Continue/Cancel question, %1 is a coma separated list of file names msg = _("Files %1 have been changed manually. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.22.5/library/wizard/src/Confirm.ycp new/yast2-2.22.6/library/wizard/src/Confirm.ycp --- old/yast2-2.22.5/library/wizard/src/Confirm.ycp 2011-02-02 13:34:46.000000000 +0100 +++ new/yast2-2.22.6/library/wizard/src/Confirm.ycp 2012-03-29 14:02:21.000000000 +0200 @@ -74,7 +74,7 @@ `VSpacing(0.5), // This is in information message. Next come the // hardware class name (network cards). - `HVCenter(`Label(_("YaST2 will detect the following hardware:"))), + `HVCenter(`Label(_("YaST will detect the following hardware:"))), `HVCenter(`HBox(icon, `HSpacing(0.5), `Heading(class))), `VSpacing(0.5) ))), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.22.5/library/wizard/src/Wizard.ycp new/yast2-2.22.6/library/wizard/src/Wizard.ycp --- old/yast2-2.22.5/library/wizard/src/Wizard.ycp 2012-02-15 14:13:02.000000000 +0100 +++ new/yast2-2.22.6/library/wizard/src/Wizard.ycp 2012-03-29 14:02:21.000000000 +0200 @@ -235,7 +235,9 @@ `VSpacing(0.2), `HBox( // translators: dialog title to appear before any content is initialized - `Heading(`id(`title), `opt (`hstretch), _("YaST2\nInitializing ...")), + `Heading(`id(`title), `opt (`hstretch), _("YaST +Initializing ... +")), `HStretch() ), `VWeight( 1, // Layout trick: Lower layout priority with weight @@ -415,7 +417,7 @@ if ( haveFancyUI() ) { UI::OpenDialog(`opt(`wizardDialog ), - `Wizard(`apply, _( "&Apply" ), + `Wizard(`apply, _("&Apply"), `abort, Label::AbortButton(), `finish, Label::FinishButton() ) ); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org