Hello community,
here is the log from the commit of package yast2-installation
checked in at Mon Dec 1 18:13:15 CET 2008.
--------
--- yast2-installation/yast2-installation.changes 2008-11-28 12:16:49.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2008-12-01 17:02:45.000000000 +0100
@@ -1,0 +2,12 @@
+Mon Dec 1 16:59:14 CET 2008 - locilka@suse.cz
+
+- Fixed proposing the online update depending on the fact whether
+ network is running (bnc #450229).
+- 2.17.43
+
+-------------------------------------------------------------------
+Fri Nov 28 15:05:02 CET 2008 - locilka@suse.cz
+
+- Updated labels of Installation Scenarios for SLES (bnc #428202).
+
+-------------------------------------------------------------------
@@ -22 +34 @@
-- the real fix for #442691
+- the real fix for bnc#442691
calling whatdependson for head-i586
Old:
----
yast2-installation-2.17.42.tar.bz2
New:
----
yast2-installation-2.17.43.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.z13449/_old 2008-12-01 18:10:54.000000000 +0100
+++ /var/tmp/diff_new_pack.z13449/_new 2008-12-01 18:10:54.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.17.42)
+# spec file for package yast2-installation (Version 2.17.43)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-installation
-Version: 2.17.42
+Version: 2.17.43
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.17.42.tar.bz2
+Source0: yast2-installation-2.17.43.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite
# PackageCallbacks::RegisterEmptyProgressCallbacks()
@@ -120,7 +120,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-installation-2.17.42
+%setup -n yast2-installation-2.17.43
%build
%{prefix}/bin/y2tool y2autoconf
@@ -189,6 +189,12 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog
+* Mon Dec 01 2008 locilka@suse.cz
+- Fixed proposing the online update depending on the fact whether
+ network is running (bnc #450229).
+- 2.17.43
+* Fri Nov 28 2008 locilka@suse.cz
+- Updated labels of Installation Scenarios for SLES (bnc #428202).
* Fri Nov 28 2008 locilka@suse.cz
- Fixed behavior of inst_new_desktop when user switched to another
language later (bnc #449818).
@@ -202,7 +208,7 @@
- Adjusting ImageInstallation-related SlideShow only if
ImageInstallation is in use (bnc #439104).
* Thu Nov 27 2008 ug@suse.de
-- the real fix for #442691
+- the real fix for bnc#442691
deploy_image_auto doesn't use the boolean variable
image_installation
- 2.17.41
++++++ yast2-installation-2.17.42.tar.bz2 -> yast2-installation-2.17.43.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.42/control.pot new/yast2-installation-2.17.43/control.pot
--- old/yast2-installation-2.17.42/control.pot 2008-11-24 16:03:56.000000000 +0100
+++ new/yast2-installation-2.17.43/control.pot 2008-11-28 12:34:26.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-24 16:03+0100\n"
+"POT-Creation-Date: 2008-11-28 12:34+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -38,19 +38,19 @@
"\t"
msgstr ""
-#: control/control.SLED.glade:331 control/control.openSUSE.glade:355
+#: control/control.SLED.glade:331 control/control.openSUSE.glade:364
msgid "Initialization..."
msgstr ""
-#: control/control.SLED.glade:332 control/control.openSUSE.glade:356
+#: control/control.SLED.glade:332 control/control.openSUSE.glade:365
msgid "Configuring network..."
msgstr ""
-#: control/control.SLED.glade:333 control/control.openSUSE.glade:357
+#: control/control.SLED.glade:333 control/control.openSUSE.glade:366
msgid "Configuring hardware..."
msgstr ""
-#: control/control.SLED.glade:334 control/control.openSUSE.glade:358
+#: control/control.SLED.glade:334 control/control.openSUSE.glade:367
msgid "Finishing configuration..."
msgstr ""
@@ -61,9 +61,9 @@
#: control/control.SLES.glade:905 control/control.SLES.glade:952
#: control/control.glade:81 control/control.glade:139
#: control/control.glade:475 control/control.glade:525
-#: control/control.openSUSE.glade:386 control/control.openSUSE.glade:497
-#: control/control.openSUSE.glade:757 control/control.openSUSE.glade:761
-#: control/control.openSUSE.glade:936 control/control.openSUSE.glade:987
+#: control/control.openSUSE.glade:395 control/control.openSUSE.glade:506
+#: control/control.openSUSE.glade:766 control/control.openSUSE.glade:770
+#: control/control.openSUSE.glade:945 control/control.openSUSE.glade:996
msgid "Installation Settings"
msgstr ""
@@ -78,14 +78,14 @@
msgstr ""
#: control/control.SLED.glade:418 control/control.SLES.glade:484
-#: control/control.glade:125 control/control.openSUSE.glade:483
-#: control/control.openSUSE.glade:852 control/control.openSUSE.glade:857
+#: control/control.glade:125 control/control.openSUSE.glade:492
+#: control/control.openSUSE.glade:861 control/control.openSUSE.glade:866
msgid "Update Settings"
msgstr ""
#: control/control.SLED.glade:450 control/control.SLES.glade:536
#: control/control.SLES.glade:578 control/control.glade:159
-#: control/control.openSUSE.glade:514
+#: control/control.openSUSE.glade:523
msgid "Network Configuration"
msgstr ""
@@ -96,8 +96,8 @@
#: control/control.SLES.glade:1198 control/control.SLES.glade:1210
#: control/control.glade:199 control/control.glade:725
#: control/control.glade:730 control/control.glade:734
-#: control/control.openSUSE.glade:555 control/control.openSUSE.glade:1193
-#: control/control.openSUSE.glade:1199
+#: control/control.openSUSE.glade:564 control/control.openSUSE.glade:1202
+#: control/control.openSUSE.glade:1208
msgid "Hardware Configuration"
msgstr ""
@@ -105,8 +105,8 @@
#: control/control.SLED.glade:728 control/control.SLES.glade:652
#: control/control.SLES.glade:761 control/control.SLES.glade:875
#: control/control.glade:218 control/control.glade:324
-#: control/control.glade:427 control/control.openSUSE.glade:577
-#: control/control.openSUSE.glade:805 control/control.openSUSE.glade:903
+#: control/control.glade:427 control/control.openSUSE.glade:586
+#: control/control.openSUSE.glade:814 control/control.openSUSE.glade:912
msgid "Preparation"
msgstr ""
@@ -118,16 +118,16 @@
#: control/control.glade:242 control/control.glade:330
#: control/control.glade:339 control/control.glade:348
#: control/control.glade:460 control/control.glade:510
-#: control/control.openSUSE.glade:582 control/control.openSUSE.glade:703
-#: control/control.openSUSE.glade:811 control/control.openSUSE.glade:931
-#: control/control.openSUSE.glade:982
+#: control/control.openSUSE.glade:591 control/control.openSUSE.glade:712
+#: control/control.openSUSE.glade:820 control/control.openSUSE.glade:940
+#: control/control.openSUSE.glade:991
msgid "Welcome"
msgstr ""
#: control/control.SLED.glade:531 control/control.SLED.glade:641
#: control/control.SLES.glade:673 control/control.SLES.glade:782
#: control/control.glade:248 control/control.glade:354
-#: control/control.openSUSE.glade:592 control/control.openSUSE.glade:819
+#: control/control.openSUSE.glade:601 control/control.openSUSE.glade:828
msgid "Disk Activation"
msgstr ""
@@ -137,31 +137,31 @@
#: control/control.SLES.glade:788 control/control.SLES.glade:794
#: control/control.glade:254 control/control.glade:260
#: control/control.glade:360 control/control.glade:366
-#: control/control.openSUSE.glade:596 control/control.openSUSE.glade:600
-#: control/control.openSUSE.glade:823 control/control.openSUSE.glade:827
+#: control/control.openSUSE.glade:605 control/control.openSUSE.glade:609
+#: control/control.openSUSE.glade:832 control/control.openSUSE.glade:836
msgid "System Analysis"
msgstr ""
#: control/control.SLED.glade:549 control/control.SLED.glade:669
#: control/control.SLES.glade:691 control/control.SLES.glade:810
#: control/control.glade:266 control/control.glade:383
-#: control/control.openSUSE.glade:610 control/control.openSUSE.glade:843
+#: control/control.openSUSE.glade:619 control/control.openSUSE.glade:852
msgid "Add-On Products"
msgstr ""
#: control/control.SLED.glade:555 control/control.SLES.glade:697
-#: control/control.glade:272 control/control.openSUSE.glade:615
-#: control/control.openSUSE.glade:723
+#: control/control.glade:272 control/control.openSUSE.glade:624
+#: control/control.openSUSE.glade:732
msgid "Time Zone"
msgstr ""
#: control/control.SLED.glade:572 control/control.SLED.glade:576
-#: control/control.openSUSE.glade:633 control/control.openSUSE.glade:637
-#: control/control.openSUSE.glade:737 control/control.openSUSE.glade:741
+#: control/control.openSUSE.glade:642 control/control.openSUSE.glade:646
+#: control/control.openSUSE.glade:746 control/control.openSUSE.glade:750
msgid "User Settings"
msgstr ""
-#: control/control.SLED.glade:580 control/control.openSUSE.glade:645
+#: control/control.SLED.glade:580 control/control.openSUSE.glade:654
msgid "Installation Overview"
msgstr ""
@@ -203,34 +203,34 @@
#: control/control.glade:785 control/control.glade:789
#: control/control.glade:793 control/control.glade:810
#: control/control.glade:818 control/control.glade:822
-#: control/control.glade:826 control/control.openSUSE.glade:652
-#: control/control.openSUSE.glade:656 control/control.openSUSE.glade:662
-#: control/control.openSUSE.glade:667 control/control.openSUSE.glade:674
-#: control/control.openSUSE.glade:678 control/control.openSUSE.glade:684
-#: control/control.openSUSE.glade:767 control/control.openSUSE.glade:771
-#: control/control.openSUSE.glade:777 control/control.openSUSE.glade:781
-#: control/control.openSUSE.glade:785 control/control.openSUSE.glade:791
-#: control/control.openSUSE.glade:867 control/control.openSUSE.glade:943
-#: control/control.openSUSE.glade:947 control/control.openSUSE.glade:953
-#: control/control.openSUSE.glade:957 control/control.openSUSE.glade:961
-#: control/control.openSUSE.glade:994 control/control.openSUSE.glade:998
-#: control/control.openSUSE.glade:1004 control/control.openSUSE.glade:1008
-#: control/control.openSUSE.glade:1012 control/control.openSUSE.glade:1283
-#: control/control.openSUSE.glade:1287 control/control.openSUSE.glade:1291
-#: control/control.openSUSE.glade:1295 control/control.openSUSE.glade:1299
-#: control/control.openSUSE.glade:1303 control/control.openSUSE.glade:1307
-#: control/control.openSUSE.glade:1324 control/control.openSUSE.glade:1328
-#: control/control.openSUSE.glade:1332
+#: control/control.glade:826 control/control.openSUSE.glade:661
+#: control/control.openSUSE.glade:665 control/control.openSUSE.glade:671
+#: control/control.openSUSE.glade:676 control/control.openSUSE.glade:683
+#: control/control.openSUSE.glade:687 control/control.openSUSE.glade:693
+#: control/control.openSUSE.glade:776 control/control.openSUSE.glade:780
+#: control/control.openSUSE.glade:786 control/control.openSUSE.glade:790
+#: control/control.openSUSE.glade:794 control/control.openSUSE.glade:800
+#: control/control.openSUSE.glade:876 control/control.openSUSE.glade:952
+#: control/control.openSUSE.glade:956 control/control.openSUSE.glade:962
+#: control/control.openSUSE.glade:966 control/control.openSUSE.glade:970
+#: control/control.openSUSE.glade:1003 control/control.openSUSE.glade:1007
+#: control/control.openSUSE.glade:1013 control/control.openSUSE.glade:1017
+#: control/control.openSUSE.glade:1021 control/control.openSUSE.glade:1292
+#: control/control.openSUSE.glade:1296 control/control.openSUSE.glade:1300
+#: control/control.openSUSE.glade:1304 control/control.openSUSE.glade:1308
+#: control/control.openSUSE.glade:1312 control/control.openSUSE.glade:1316
+#: control/control.openSUSE.glade:1333 control/control.openSUSE.glade:1337
+#: control/control.openSUSE.glade:1341
msgid "Perform Installation"
msgstr ""
#: control/control.SLED.glade:659 control/control.SLES.glade:800
-#: control/control.glade:372 control/control.openSUSE.glade:831
+#: control/control.glade:372 control/control.openSUSE.glade:840
msgid "System for Update"
msgstr ""
#: control/control.SLED.glade:676 control/control.SLES.glade:817
-#: control/control.glade:390 control/control.openSUSE.glade:849
+#: control/control.glade:390 control/control.openSUSE.glade:858
msgid "Update"
msgstr ""
@@ -252,20 +252,20 @@
#: control/control.glade:404 control/control.glade:408
#: control/control.glade:412 control/control.glade:416
#: control/control.glade:561 control/control.glade:569
-#: control/control.openSUSE.glade:871 control/control.openSUSE.glade:877
-#: control/control.openSUSE.glade:881 control/control.openSUSE.glade:885
-#: control/control.openSUSE.glade:891
+#: control/control.openSUSE.glade:880 control/control.openSUSE.glade:886
+#: control/control.openSUSE.glade:890 control/control.openSUSE.glade:894
+#: control/control.openSUSE.glade:900
msgid "Perform Update"
msgstr ""
#: control/control.SLED.glade:732 control/control.SLES.glade:879
#: control/control.glade:432 control/control.glade:440
-#: control/control.openSUSE.glade:907
+#: control/control.openSUSE.glade:916
msgid "System Information"
msgstr ""
#: control/control.SLED.glade:736 control/control.SLES.glade:883
-#: control/control.glade:444 control/control.openSUSE.glade:911
+#: control/control.glade:444 control/control.openSUSE.glade:920
msgid "Perform Repair"
msgstr ""
@@ -273,8 +273,8 @@
#: control/control.SLED.glade:1041 control/control.SLES.glade:894
#: control/control.SLES.glade:941 control/control.SLES.glade:1226
#: control/control.glade:455 control/control.glade:505
-#: control/control.glade:742 control/control.openSUSE.glade:925
-#: control/control.openSUSE.glade:977 control/control.openSUSE.glade:1255
+#: control/control.glade:742 control/control.openSUSE.glade:934
+#: control/control.openSUSE.glade:986 control/control.openSUSE.glade:1264
msgid "Base Installation"
msgstr ""
@@ -288,8 +288,8 @@
#: control/control.SLED.glade:1118 control/control.SLES.glade:998
#: control/control.SLES.glade:1090 control/control.SLES.glade:1309
#: control/control.glade:574 control/control.glade:658
-#: control/control.glade:831 control/control.openSUSE.glade:1095
-#: control/control.openSUSE.glade:1220 control/control.openSUSE.glade:1337
+#: control/control.glade:831 control/control.openSUSE.glade:1104
+#: control/control.openSUSE.glade:1229 control/control.openSUSE.glade:1346
msgid "Configuration"
msgstr ""
@@ -300,8 +300,8 @@
#: control/control.SLES.glade:1126 control/control.SLES.glade:1130
#: control/control.glade:577 control/control.glade:583
#: control/control.glade:670 control/control.glade:675
-#: control/control.glade:679 control/control.openSUSE.glade:1136
-#: control/control.openSUSE.glade:1142 control/control.openSUSE.glade:1146
+#: control/control.glade:679 control/control.openSUSE.glade:1145
+#: control/control.openSUSE.glade:1151 control/control.openSUSE.glade:1155
msgid "Network"
msgstr ""
@@ -323,9 +323,9 @@
#: control/control.glade:595 control/control.glade:601
#: control/control.glade:607 control/control.glade:689
#: control/control.glade:695 control/control.glade:699
-#: control/control.glade:703 control/control.openSUSE.glade:1150
-#: control/control.openSUSE.glade:1154 control/control.openSUSE.glade:1158
-#: control/control.openSUSE.glade:1162 control/control.openSUSE.glade:1166
+#: control/control.glade:703 control/control.openSUSE.glade:1159
+#: control/control.openSUSE.glade:1163 control/control.openSUSE.glade:1167
+#: control/control.openSUSE.glade:1171 control/control.openSUSE.glade:1175
msgid "Online Update"
msgstr ""
@@ -339,38 +339,38 @@
#: control/control.SLED.glade:896 control/control.SLED.glade:1019
#: control/control.SLES.glade:1043 control/control.SLES.glade:1182
#: control/control.glade:615 control/control.glade:721
-#: control/control.openSUSE.glade:1189
+#: control/control.openSUSE.glade:1198
msgid "Release Notes"
msgstr ""
-#: control/control.SLED.glade:923 control/control.openSUSE.glade:1103
-#: control/control.openSUSE.glade:1223
+#: control/control.SLED.glade:923 control/control.openSUSE.glade:1112
+#: control/control.openSUSE.glade:1232
msgid "Automatic Configuration"
msgstr ""
#: control/control.SLED.glade:929 control/control.SLES.glade:1093
-#: control/control.openSUSE.glade:1109
+#: control/control.openSUSE.glade:1118
msgid "root Password"
msgstr ""
#: control/control.SLED.glade:934 control/control.SLED.glade:940
#: control/control.SLED.glade:946 control/control.SLES.glade:1098
#: control/control.SLES.glade:1104 control/control.SLES.glade:1110
-#: control/control.openSUSE.glade:1114 control/control.openSUSE.glade:1120
-#: control/control.openSUSE.glade:1126
+#: control/control.openSUSE.glade:1123 control/control.openSUSE.glade:1129
+#: control/control.openSUSE.glade:1135
msgid "Check Installation"
msgstr ""
#: control/control.SLED.glade:952 control/control.SLES.glade:1116
-#: control/control.glade:666 control/control.openSUSE.glade:1132
+#: control/control.glade:666 control/control.openSUSE.glade:1141
msgid "Hostname"
msgstr ""
#: control/control.SLED.glade:999 control/control.SLED.glade:1003
#: control/control.SLED.glade:1007 control/control.SLES.glade:1168
#: control/control.SLES.glade:1172 control/control.glade:707
-#: control/control.glade:711 control/control.openSUSE.glade:1170
-#: control/control.openSUSE.glade:1174
+#: control/control.glade:711 control/control.openSUSE.glade:1179
+#: control/control.openSUSE.glade:1183
msgid "Users"
msgstr ""
@@ -379,13 +379,13 @@
#: control/control.SLES.glade:1241 control/control.SLES.glade:1245
#: control/control.glade:752 control/control.glade:760
#: control/control.glade:766 control/control.glade:770
-#: control/control.openSUSE.glade:1264 control/control.openSUSE.glade:1270
-#: control/control.openSUSE.glade:1274
+#: control/control.openSUSE.glade:1273 control/control.openSUSE.glade:1279
+#: control/control.openSUSE.glade:1283
msgid "AutoYaST Settings"
msgstr ""
#: control/control.SLED.glade:1121 control/control.SLES.glade:1312
-#: control/control.glade:834 control/control.openSUSE.glade:1340
+#: control/control.glade:834 control/control.openSUSE.glade:1349
msgid "System Configuration"
msgstr ""
@@ -426,7 +426,7 @@
msgstr ""
#: control/control.SLES.glade:707 control/control.glade:288
-#: control/control.openSUSE.glade:642 control/control.openSUSE.glade:698
+#: control/control.openSUSE.glade:651 control/control.openSUSE.glade:707
msgid "Installation"
msgstr ""
@@ -453,7 +453,7 @@
"\t"
msgstr ""
-#: control/control.glade:281 control/control.openSUSE.glade:623
+#: control/control.glade:281 control/control.openSUSE.glade:632
msgid "Desktop Selection"
msgstr ""
@@ -461,7 +461,7 @@
msgid "Root Password"
msgstr ""
-#: control/control.openSUSE.glade:346
+#: control/control.openSUSE.glade:355
msgid ""
"\n"
"<p><b>Congratulations!</b></p>\n"
@@ -472,7 +472,7 @@
"\t "
msgstr ""
-#: control/control.openSUSE.glade:361
+#: control/control.openSUSE.glade:370
msgid ""
"openSUSE offers you a choice of user interfaces. The two major complete \n"
"desktops are KDE and GNOME. Both provide an easy-to-use desktop with a full \n"
@@ -481,51 +481,51 @@
"As desktop selection is a matter of taste, we do not give a recommendation."
msgstr ""
-#: control/control.openSUSE.glade:368
+#: control/control.openSUSE.glade:377
msgid "GNOME"
msgstr ""
-#: control/control.openSUSE.glade:369
+#: control/control.openSUSE.glade:378
msgid "KDE 4.1"
msgstr ""
-#: control/control.openSUSE.glade:370
+#: control/control.openSUSE.glade:379
msgid "KDE 3.5"
msgstr ""
-#: control/control.openSUSE.glade:371
+#: control/control.openSUSE.glade:380
msgid "XFCE Desktop"
msgstr ""
-#: control/control.openSUSE.glade:372
+#: control/control.openSUSE.glade:381
msgid "Minimal X Window"
msgstr ""
-#: control/control.openSUSE.glade:373
+#: control/control.openSUSE.glade:382
msgid "Minimal Server Selection (Text Mode)"
msgstr ""
-#: control/control.openSUSE.glade:376
+#: control/control.openSUSE.glade:385
msgid ""
"GNOME 2.24 is the latest desktop from the GNOME Project. \n"
"It combines stability and maturity with incremental innovations."
msgstr ""
-#: control/control.openSUSE.glade:378
+#: control/control.openSUSE.glade:387
msgid ""
"KDE 4.1 is the latest stable desktop released by the KDE Project.\n"
"It delivers an innovative, highly integrated desktop environment\n"
"with a modern look and feel."
msgstr ""
-#: control/control.openSUSE.glade:467
+#: control/control.openSUSE.glade:476
msgid "Live Installation Settings"
msgstr ""
-#: control/control.openSUSE.glade:605 control/control.openSUSE.glade:838
+#: control/control.openSUSE.glade:614 control/control.openSUSE.glade:847
msgid "Online Repositories"
msgstr ""
-#: control/control.openSUSE.glade:627 control/control.openSUSE.glade:731
+#: control/control.openSUSE.glade:636 control/control.openSUSE.glade:740
msgid "Disk"
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.42/installation.pot new/yast2-installation-2.17.43/installation.pot
--- old/yast2-installation-2.17.42/installation.pot 2008-11-24 16:03:56.000000000 +0100
+++ new/yast2-installation-2.17.43/installation.pot 2008-11-28 12:34:26.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-24 16:03+0100\n"
+"POT-Creation-Date: 2008-11-28 12:34+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -41,31 +41,31 @@
msgid "Copying system files to the installed system..."
msgstr ""
-#: src/clients/deploy_image_auto.ycp:56
+#: src/clients/deploy_image_auto.ycp:57
msgid "Installation from images is: <b>enabled</b>"
msgstr ""
-#: src/clients/deploy_image_auto.ycp:58
+#: src/clients/deploy_image_auto.ycp:59
msgid "Installation from images is: <b>disabled</b>"
msgstr ""
#. TRANSLATORS: dialog caption
#. this is a heading
-#: src/clients/deploy_image_auto.ycp:92 src/clients/deploy_image_auto.ycp:96
+#: src/clients/deploy_image_auto.ycp:93 src/clients/deploy_image_auto.ycp:97
#: src/clients/deploying_proposal.ycp:130
msgid "Installation from Images"
msgstr ""
-#: src/clients/deploy_image_auto.ycp:102
+#: src/clients/deploy_image_auto.ycp:103
msgid "&Install from Images"
msgstr ""
-#: src/clients/deploy_image_auto.ycp:108
+#: src/clients/deploy_image_auto.ycp:109
msgid "&Do Not Install from Images"
msgstr ""
#. TRANSLATORS: help text
-#: src/clients/deploy_image_auto.ycp:117
+#: src/clients/deploy_image_auto.ycp:118
msgid ""
"<p><b>Installation from Images</b> is used to speed the installation up. \n"
"Images contain compressed snapshots of installed system matching your selection \n"
@@ -233,25 +233,25 @@
msgid "&Keyboard Layout"
msgstr ""
-#. TRANSLATORS: dialog caption
-#: src/clients/inst_complex_welcome.ycp:97
-#: src/clients/inst_complex_welcome.ycp:129
-msgid "License Agreement"
-msgstr ""
-
#. bnc #359456
#. TRANSLATORS: check-box
-#: src/clients/inst_complex_welcome.ycp:109
+#: src/clients/inst_complex_welcome.ycp:82
msgid "I &Agree to the License Terms."
msgstr ""
+#. TRANSLATORS: dialog caption
+#: src/clients/inst_complex_welcome.ycp:104
+#: src/clients/inst_complex_welcome.ycp:133
+msgid "License Agreement"
+msgstr ""
+
#. TRANSLATORS: button label
-#: src/clients/inst_complex_welcome.ycp:113
+#: src/clients/inst_complex_welcome.ycp:117
msgid "License &Translations..."
msgstr ""
#. help text for initial (first time) language screen
-#: src/clients/inst_complex_welcome.ycp:145
+#: src/clients/inst_complex_welcome.ycp:149
msgid ""
"<p>\n"
"Choose the <b>Language</b> and the <b>Keyboard layout</b> to be used during\n"
@@ -260,7 +260,7 @@
msgstr ""
#. help text, continued
-#: src/clients/inst_complex_welcome.ycp:152
+#: src/clients/inst_complex_welcome.ycp:156
msgid ""
"<p>\n"
"License has to be accepted before continuing the installation.\n"
@@ -269,7 +269,7 @@
msgstr ""
#. help text, continued
-#: src/clients/inst_complex_welcome.ycp:158
+#: src/clients/inst_complex_welcome.ycp:162
msgid ""
"<p>\n"
"Click <b>Next</b> to proceed to the next dialog.\n"
@@ -277,7 +277,7 @@
msgstr ""
#. help text, continued
-#: src/clients/inst_complex_welcome.ycp:164
+#: src/clients/inst_complex_welcome.ycp:168
msgid ""
"<p>\n"
"Nothing will happen to your computer until you confirm\n"
@@ -286,7 +286,7 @@
msgstr ""
#. help text, continued
-#: src/clients/inst_complex_welcome.ycp:171
+#: src/clients/inst_complex_welcome.ycp:175
msgid ""
"<p>\n"
"Select <b>Abort</b> to abort the\n"
@@ -294,12 +294,12 @@
"</p>\n"
msgstr ""
-#: src/clients/inst_complex_welcome.ycp:208
+#: src/clients/inst_complex_welcome.ycp:212
msgid "License needs to be accepted"
msgstr ""
#. popup message (user selected CJK language in text mode)
-#: src/clients/inst_complex_welcome.ycp:237
+#: src/clients/inst_complex_welcome.ycp:246
msgid ""
"The selected language cannot be used in text mode. English is used for\n"
"installation, but the selected language will be used for the new system."
@@ -386,38 +386,38 @@
msgstr ""
#. twice more steps
-#: src/clients/inst_deploy_image.ycp:114 src/clients/inst_deploy_image.ycp:228
-#: src/clients/inst_prepareprogress.ycp:41
+#: src/clients/inst_deploy_image.ycp:143 src/clients/inst_deploy_image.ycp:265
+#: src/clients/inst_prepareprogress.ycp:45
msgid "Deploying Images..."
msgstr ""
-#: src/clients/inst_deploy_image.ycp:131
+#: src/clients/inst_deploy_image.ycp:167
#, ycp-format
msgid "Downloading image at speed %1/s"
msgstr ""
-#: src/clients/inst_deploy_image.ycp:133
+#: src/clients/inst_deploy_image.ycp:169
#, ycp-format
msgid "Downloading image %1 at speed %2/s"
msgstr ""
-#: src/clients/inst_deploy_image.ycp:186
+#: src/clients/inst_deploy_image.ycp:222
msgid "Deploying image..."
msgstr ""
-#: src/clients/inst_deploy_image.ycp:188
+#: src/clients/inst_deploy_image.ycp:224
#, ycp-format
msgid "Deploying image %1..."
msgstr ""
-#: src/clients/inst_deploy_image.ycp:285
+#: src/clients/inst_deploy_image.ycp:322
msgid ""
"Deploying from images has failed.\n"
"Aborting the installation..."
msgstr ""
#. TRANSLATORS: pop-up message
-#: src/clients/inst_deploy_image.ycp:309
+#: src/clients/inst_deploy_image.ycp:346
msgid ""
"Debugging has been turned on.\n"
"YaST will open a package manager for you to check the current status of packages."
@@ -489,7 +489,7 @@
msgstr ""
#. Headline for last dialog of base installation: Install LILO etc.
-#: src/clients/inst_finish.ycp:57 src/clients/inst_finish.ycp:276
+#: src/clients/inst_finish.ycp:57 src/clients/inst_finish.ycp:277
msgid "Finishing Basic Installation"
msgstr ""
@@ -522,7 +522,7 @@
msgid "Prepare system for initial boot"
msgstr ""
-#: src/clients/inst_finish.ycp:336
+#: src/clients/inst_finish.ycp:337
msgid "Finished."
msgstr ""
@@ -1195,26 +1195,26 @@
"installation that could fit your needs better."
msgstr ""
-#: src/clients/inst_new_desktop.ycp:162
+#: src/clients/inst_new_desktop.ycp:164
msgid "Other"
msgstr ""
#. TRANSLATORS: dialog caption
-#: src/clients/inst_new_desktop.ycp:221
+#: src/clients/inst_new_desktop.ycp:223
msgid "Desktop Selection"
msgstr ""
-#: src/clients/inst_new_desktop.ycp:251 src/clients/inst_new_desktop.ycp:266
+#: src/clients/inst_new_desktop.ycp:253 src/clients/inst_new_desktop.ycp:268
msgid ""
"No system type was selected.\n"
"Select the default type."
msgstr ""
-#: src/clients/inst_prepareprogress.ycp:35
+#: src/clients/inst_prepareprogress.ycp:39
msgid "Preparing disks..."
msgstr ""
-#: src/clients/inst_prepareprogress.ycp:47
+#: src/clients/inst_prepareprogress.ycp:53
msgid "Installing Packages..."
msgstr ""
@@ -2288,19 +2288,19 @@
msgid "Connecting to the inst-sys failed, debugger cannot continue."
msgstr ""
-#: src/modules/ImageInstallation.ycp:658
+#: src/modules/ImageInstallation.ycp:700
msgid "Failed to read information about installation images"
msgstr ""
-#: src/modules/ImageInstallation.ycp:930
+#: src/modules/ImageInstallation.ycp:972
msgid "Deploying..."
msgstr ""
-#: src/modules/ImageInstallation.ycp:953
+#: src/modules/ImageInstallation.ycp:995
msgid "Storing user preferences..."
msgstr ""
-#: src/modules/ImageInstallation.ycp:1063
+#: src/modules/ImageInstallation.ycp:1105
msgid "Restoring user preferences..."
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.42/src/clients/inst_ask_online_update.ycp new/yast2-installation-2.17.43/src/clients/inst_ask_online_update.ycp
--- old/yast2-installation-2.17.42/src/clients/inst_ask_online_update.ycp 2008-11-24 15:18:38.000000000 +0100
+++ new/yast2-installation-2.17.43/src/clients/inst_ask_online_update.ycp 2008-12-01 16:55:21.000000000 +0100
@@ -25,8 +25,14 @@
import "Label";
import "Internet";
import "Installation";
+ import "NetworkService";
- if (!Internet::do_you) return `auto;
+ // BNC #450229
+ // There used to be >if (!Internet::do_you)<
+ if (NetworkService::isNetworkRunning() != true) {
+ y2milestone ("No network running, skipping online update...");
+ return `auto;
+ }
map ui = UI::GetDisplayInfo();
@@ -106,17 +112,17 @@
}
else if ( ret == `next )
{
- if ( (boolean) UI::QueryWidget(`id(`noupdate), `Value) )
- ret = `skip;
+ // Skipping online update
+ if ((boolean) UI::QueryWidget(`id(`noupdate), `Value)) {
+ Internet::do_you = false;
+ } else {
+ // needed later
+ // BNC #450229
+ Internet::do_you = true;
+ }
}
- } until ( ret == `next || ret == `back || ret == `skip);
-
- if ( ret == `skip )
- {
- Internet::do_you = false;
- ret = `next;
- }
+ } until ( ret == `next || ret == `back );
return (symbol)ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.42/VERSION new/yast2-installation-2.17.43/VERSION
--- old/yast2-installation-2.17.42/VERSION 2008-11-28 12:16:55.000000000 +0100
+++ new/yast2-installation-2.17.43/VERSION 2008-12-01 16:59:09.000000000 +0100
@@ -1 +1 @@
-2.17.42
+2.17.43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org