Hello community,
here is the log from the commit of package yast2-firstboot for openSUSE:Factory
checked in at Fri Nov 5 15:52:12 CET 2010.
--------
--- yast2-firstboot/yast2-firstboot.changes 2010-04-23 16:24:52.000000000 +0200
+++ yast2-firstboot/yast2-firstboot.changes 2010-11-03 17:13:11.000000000 +0100
@@ -1,0 +2,12 @@
+Wed Nov 3 17:11:19 CET 2010 - jsuchome@suse.cz
+
+- translate bootloader items after setting the language (bnc#644062)
+- 2.20.1
+
+-------------------------------------------------------------------
+Wed Nov 3 16:27:19 CET 2010 - jsuchome@suse.cz
+
+- fix FIRSTBOOT_FINISH_FILE behavior and documentation (bnc#615146)
+- 2.20.0
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-firstboot-2.19.5.tar.bz2
New:
----
yast2-firstboot-2.20.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-firstboot.spec ++++++
--- /var/tmp/diff_new_pack.kuFh5K/_old 2010-11-05 15:14:46.000000000 +0100
+++ /var/tmp/diff_new_pack.kuFh5K/_new 2010-11-05 15:14:46.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-firstboot (Version 2.19.5)
+# spec file for package yast2-firstboot (Version 2.20.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,11 +19,11 @@
Name: yast2-firstboot
-Version: 2.19.5
+Version: 2.20.1
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-firstboot-2.19.5.tar.bz2
+Source0: yast2-firstboot-2.20.1.tar.bz2
Prefix: /usr
@@ -60,7 +60,7 @@
created to personalize the system.
%prep
-%setup -n yast2-firstboot-2.19.5
+%setup -n yast2-firstboot-2.20.1
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-firstboot-2.19.5.tar.bz2 -> yast2-firstboot-2.20.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.5/VERSION new/yast2-firstboot-2.20.1/VERSION
--- old/yast2-firstboot-2.19.5/VERSION 2010-04-23 16:25:12.000000000 +0200
+++ new/yast2-firstboot-2.20.1/VERSION 2010-11-03 17:11:35.000000000 +0100
@@ -1 +1 @@
-2.19.5
+2.20.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.5/configure new/yast2-firstboot-2.20.1/configure
--- old/yast2-firstboot-2.19.5/configure 2010-04-25 20:07:54.000000000 +0200
+++ new/yast2-firstboot-2.20.1/configure 2010-01-11 10:03:39.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-firstboot 2.19.5.
+# Generated by GNU Autoconf 2.63 for yast2-firstboot 2.19.2.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-firstboot'
PACKAGE_TARNAME='yast2-firstboot'
-PACKAGE_VERSION='2.19.5'
-PACKAGE_STRING='yast2-firstboot 2.19.5'
+PACKAGE_VERSION='2.19.2'
+PACKAGE_STRING='yast2-firstboot 2.19.2'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1282,7 +1282,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-firstboot 2.19.5 to adapt to many kinds of systems.
+\`configure' configures yast2-firstboot 2.19.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1353,7 +1353,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-firstboot 2.19.5:";;
+ short | recursive ) echo "Configuration of yast2-firstboot 2.19.2:";;
esac
cat <<\_ACEOF
@@ -1433,7 +1433,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-firstboot configure 2.19.5
+yast2-firstboot configure 2.19.2
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1447,7 +1447,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-firstboot $as_me 2.19.5, which was
+It was created by yast2-firstboot $as_me 2.19.2, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2427,7 +2427,7 @@
# Define the identity of the package.
PACKAGE='yast2-firstboot'
- VERSION='2.19.5'
+ VERSION='2.19.2'
cat >>confdefs.h <<_ACEOF
@@ -2549,7 +2549,7 @@
-VERSION="2.19.5"
+VERSION="2.19.2"
RPMNAME="yast2-firstboot"
MAINTAINER="Jiri Suchomel "
@@ -3610,7 +3610,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-firstboot $as_me 2.19.5, which was
+This file was extended by yast2-firstboot $as_me 2.19.2, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3660,7 +3660,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-firstboot config.status 2.19.5
+yast2-firstboot config.status 2.19.2
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.5/configure.in new/yast2-firstboot-2.20.1/configure.in
--- old/yast2-firstboot-2.19.5/configure.in 2010-04-25 20:07:49.000000000 +0200
+++ new/yast2-firstboot-2.20.1/configure.in 2010-01-11 10:03:34.000000000 +0100
@@ -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-firstboot, 2.19.5, http://bugs.opensuse.org/, yast2-firstboot)
+AC_INIT(yast2-firstboot, 2.19.2, http://bugs.opensuse.org/, yast2-firstboot)
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.19.5"
+VERSION="2.19.2"
RPMNAME="yast2-firstboot"
MAINTAINER="Jiri Suchomel "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.5/doc/firstboot-section_mod.xml new/yast2-firstboot-2.20.1/doc/firstboot-section_mod.xml
--- old/yast2-firstboot-2.19.5/doc/firstboot-section_mod.xml 2010-01-07 15:27:42.000000000 +0100
+++ new/yast2-firstboot-2.20.1/doc/firstboot-section_mod.xml 2010-10-20 13:39:44.000000000 +0200
@@ -147,8 +147,8 @@
</para>
<para>
- If you want to use FIRSTBOOT_FINISH_FILE, you need to update the firstboot workflow so that it calls firstboot_finish instead
- of inst_finish. The recommended way of customizing the congratulate text is specifying it in the firstboot.xml control file.
+ If you want to use FIRSTBOOT_FINISH_FILE, you need to update the firstboot workflow so that it calls firstboot_finish instead of inst_congratulate. The content of the given file would be shown as the final text.
+ However the recommended way of customizing the congratulate text is using default inst_congratulate step and specifying the text (as a value for 'congratulate' section) it in the firstboot.xml control file (see control.xml examples and documentation).
</para>
</section>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.5/firstboot.pot new/yast2-firstboot-2.20.1/firstboot.pot
--- old/yast2-firstboot-2.19.5/firstboot.pot 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-firstboot-2.20.1/firstboot.pot 2009-08-20 16:25:44.000000000 +0200
@@ -0,0 +1,434 @@
+# 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 , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-20 16:25+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/Firstboot.ycp:32
+msgid "No Text Available"
+msgstr ""
+
+#. summary item
+#: src/Firstboot.ycp:141
+msgid "Firstboot configuration disabled"
+msgstr ""
+
+#. summary item
+#: src/Firstboot.ycp:145
+msgid "Firstboot configuration enabled"
+msgstr ""
+
+#: src/control/firstboot.glade:60
+msgid "Hardware Configuration"
+msgstr ""
+
+#: src/control/firstboot.glade:69
+msgid "Network Configuration II"
+msgstr ""
+
+#: src/control/firstboot.glade:83
+msgid "Configuration"
+msgstr ""
+
+#: src/control/firstboot.glade:87
+msgid "Language and Keyboard"
+msgstr ""
+
+#: src/control/firstboot.glade:93
+msgid "Language"
+msgstr ""
+
+#: src/control/firstboot.glade:98
+msgid "Keyboard Layout"
+msgstr ""
+
+#: src/control/firstboot.glade:103
+msgid "Welcome"
+msgstr ""
+
+#. TRANSLATORS: dialog caption
+#: src/control/firstboot.glade:107 src/control/firstboot.glade:112
+#: src/firstboot_licenses.ycp:105
+msgid "License Agreement"
+msgstr ""
+
+#: src/control/firstboot.glade:117
+msgid "Host Name"
+msgstr ""
+
+#: src/control/firstboot.glade:126 src/control/firstboot.glade:152
+msgid "Network"
+msgstr ""
+
+#: src/control/firstboot.glade:132
+msgid "Automatic Configuration"
+msgstr ""
+
+#: src/control/firstboot.glade:137
+msgid "Time and Date"
+msgstr ""
+
+#: src/control/firstboot.glade:142
+msgid "NTP Client"
+msgstr ""
+
+#: src/control/firstboot.glade:147
+msgid "Desktop"
+msgstr ""
+
+#: src/control/firstboot.glade:158
+msgid "Root Password"
+msgstr ""
+
+#: src/control/firstboot.glade:163 src/control/firstboot.glade:168
+msgid "Users"
+msgstr ""
+
+#: src/control/firstboot.glade:173
+msgid "Customer Center"
+msgstr ""
+
+#: src/control/firstboot.glade:178
+msgid "Hardware"
+msgstr ""
+
+#: src/control/firstboot.glade:184 src/control/firstboot.glade:190
+#: src/control/firstboot.glade:196
+msgid "Finish Setup"
+msgstr ""
+
+#: src/control/firstboot.glade:207
+msgid "Configuring network..."
+msgstr ""
+
+#: src/control/firstboot.glade:208
+msgid "Configuring hardware..."
+msgstr ""
+
+#. dialog caption
+#: src/firstboot_auto.ycp:42
+msgid "Firstboot Configuration"
+msgstr ""
+
+#. text label, describing the check box meaning
+#. keep in 2 lines with roughly the same length
+#: src/firstboot_auto.ycp:47
+msgid ""
+"Check Enable Firstboot Sequence here to start YaST\n"
+"firstboot utility on the first boot after configuration"
+msgstr ""
+
+#. check box label
+#: src/firstboot_auto.ycp:51
+msgid "Enable Firstboot Sequence"
+msgstr ""
+
+#. help text
+#: src/firstboot_auto.ycp:56
+msgid ""
+"<p>Check <b>Enable Firstboot Sequence</b> to start YaST firstboot utility on the first boot after configuration.</p>\n"
+"<p>Check the documentation of yast2-firstboot module to find out more.</p>"
+msgstr ""
+
+#: src/firstboot_config.ycp:27
+msgid "Empty"
+msgstr ""
+
+#: src/firstboot_config.ycp:28
+msgid "Enabled"
+msgstr ""
+
+#: src/firstboot_config.ycp:29
+msgid "Disabled"
+msgstr ""
+
+#: src/firstboot_config.ycp:50
+msgid "Help"
+msgstr ""
+
+#: src/firstboot_config.ycp:53
+msgid "First Boot Configuration"
+msgstr ""
+
+#: src/firstboot_config.ycp:55
+msgid "&Up"
+msgstr ""
+
+#: src/firstboot_config.ycp:56
+msgid "D&own"
+msgstr ""
+
+#: src/firstboot_config.ycp:57
+msgid "Enab&le or Disable"
+msgstr ""
+
+#: src/firstboot_config.ycp:63
+msgid "Step"
+msgstr ""
+
+#: src/firstboot_config.ycp:63
+msgid "Label"
+msgstr ""
+
+#: src/firstboot_config.ycp:63
+msgid "Module Name"
+msgstr ""
+
+#: src/firstboot_config.ycp:63
+msgid "Status"
+msgstr ""
+
+#. translators: dialog text
+#: src/firstboot_desktop.ycp:73
+msgid ""
+"Select the desktop environment \n"
+"to use from the list below.\n"
+msgstr ""
+
+#. help text fro desktop dialog
+#: src/firstboot_desktop.ycp:89
+msgid ""
+"<p><h3>Desktop Selections</h3>\n"
+"This system has more than one desktop environment installed. Select\n"
+"the desktop to enable as the default desktop.</p>"
+msgstr ""
+
+#. translators: dialog title
+#: src/firstboot_desktop.ycp:94
+msgid "Select Your Default Desktop"
+msgstr ""
+
+#: src/firstboot_finish.ycp:43
+msgid "&Start YaST Control Center"
+msgstr ""
+
+#. caption for dialog "Congratulation Dialog"
+#: src/firstboot_finish.ycp:47
+msgid "Configuration Completed"
+msgstr ""
+
+#. congratulation text 1/4
+#: src/firstboot_finish.ycp:50
+msgid "<p><b>Congratulations!</b></p>"
+msgstr ""
+
+#. congratulation text 2/4
+#: src/firstboot_finish.ycp:53
+msgid ""
+"<p>The installation of &product; on your machine is complete.\n"
+"After clicking <b>Finish</b>, you can log in to the system.</p>\n"
+msgstr ""
+
+#. congratulation text 3/4
+#. Translators: If there exists a SuSE web-page for your language
+#. change the address accordingly. If in doubt leave the original.
+#: src/firstboot_finish.ycp:60
+msgid "<p>Visit us at www.suse.com.</p>"
+msgstr ""
+
+#. congratulation text 4/4
+#: src/firstboot_finish.ycp:63
+msgid "<p>Have a lot of fun!<br>Your SuSE Development Team</p>"
+msgstr ""
+
+#. help 1/4 for dialog "Congratulation Dialog"
+#: src/firstboot_finish.ycp:85
+msgid "<p>Your system is ready for use.</p>"
+msgstr ""
+
+#. help 2/4 for dialog "Congratulation Dialog"
+#: src/firstboot_finish.ycp:88
+msgid ""
+"<p><b>Finish</b> will close the YaST installation and continue\n"
+"to the login screen.</p>\n"
+msgstr ""
+
+#. help 3/4 for dialog "Congratulation Dialog"
+#: src/firstboot_finish.ycp:93
+msgid ""
+"<p>If you choose the default graphical desktop KDE, you can\n"
+"adjust some KDE settings to your hardware. Also notice\n"
+"our SuSE Welcome Dialog.</p>\n"
+msgstr ""
+
+#. help 4/4 for dialog "Congratulation Dialog"
+#: src/firstboot_finish.ycp:101
+msgid ""
+"<p>If desired, experts can use the full range of SuSE's configuration\n"
+"modules at this time. Check <b>Start YaST Control Center</b> and it will start\n"
+"after <b>Finish</b>. Note: The Control Center does not have a back button to\n"
+"return to this installation sequence.</p>\n"
+msgstr ""
+
+#. popup text
+#: src/firstboot_language.ycp:102
+msgid ""
+"Your language setting has been changed.\n"
+"\n"
+"If necessary, you may want to adapt your keyboard settings to the new\n"
+"language. This is possible either in the YaST2 Control Center or by \n"
+"starting \"yast2 keyboard\" directly."
+msgstr ""
+
+#. ----------------------------------------------------------------------
+#. * Build dialog
+#. * ----------------------------------------------------------------------
+#. heading text
+#: src/firstboot_language_keyboard.ycp:48
+msgid "Language and Keyboard Layout"
+msgstr ""
+
+#. combo box label
+#: src/firstboot_language_keyboard.ycp:54
+msgid "&Language"
+msgstr ""
+
+#. combo box label
+#: src/firstboot_language_keyboard.ycp:61
+msgid "&Keyboard Layout"
+msgstr ""
+
+#. help text for firstboot language + keyboard screen
+#: src/firstboot_language_keyboard.ycp:86
+msgid ""
+"<p>\n"
+"Choose the <b>Language</b> and the <b>Keyboard layout</b> to be used during\n"
+"configuration and for the installed system.\n"
+"</p>\n"
+msgstr ""
+
+#. help text, continued
+#: src/firstboot_language_keyboard.ycp:92 src/firstboot_licenses.ycp:128
+msgid ""
+"<p>\n"
+"Click <b>Next</b> to proceed to the next dialog.\n"
+"</p>\n"
+msgstr ""
+
+#. help text, continued
+#: src/firstboot_language_keyboard.ycp:97 src/firstboot_licenses.ycp:134
+msgid ""
+"<p>\n"
+"Select <b>Abort</b> to abort the\n"
+"installation process at any time.\n"
+"</p>\n"
+msgstr ""
+
+#. popup message (user selected CJK language in text mode)
+#: src/firstboot_language_keyboard.ycp:144
+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."
+msgstr ""
+
+#. error message
+#: src/firstboot_language_keyboard.ycp:194
+msgid "There is not enough space to install all additional packages."
+msgstr ""
+
+#. ----------------------------------------------------------------------
+#. * Build dialog
+#. * ----------------------------------------------------------------------
+#. heading text
+#: src/firstboot_licenses.ycp:43
+msgid "License Agreements"
+msgstr ""
+
+#. TRANSLATORS: check-box
+#: src/firstboot_licenses.ycp:63
+msgid "I &Agree to the License Terms."
+msgstr ""
+
+#. TRANSLATORS: button label
+#. ID: #ICW_B1 button
+#: src/firstboot_licenses.ycp:69
+msgid "License &Translations..."
+msgstr ""
+
+#. TRANSLATORS: check-box
+#: src/firstboot_licenses.ycp:83
+msgid "&I Agree to the License Terms."
+msgstr ""
+
+#. TRANSLATORS: button label
+#. ID: #ICW_B1 button
+#: src/firstboot_licenses.ycp:89
+msgid "&License Translations..."
+msgstr ""
+
+#. help text for licenses screen
+#. Describes the #ICW_B1 button
+#: src/firstboot_licenses.ycp:122
+msgid ""
+"<p>\n"
+"Licenses have to be accepted before continuing the installation.\n"
+"Use <b>License Translations...</b> to show the license in all available translations.\n"
+"</p>"
+msgstr ""
+
+#: src/firstboot_licenses.ycp:157
+msgid "License needs to be accepted"
+msgstr ""
+
+#. heading text
+#: src/firstboot_web_services.ycp:16
+msgid "Network Services"
+msgstr ""
+
+#. combo box label
+#: src/firstboot_web_services.ycp:22
+msgid "combo"
+msgstr ""
+
+#. help text
+#: src/firstboot_web_services.ycp:76
+msgid ""
+"<p>\n"
+"help text\n"
+"</p>\n"
+msgstr ""
+
+#. progress stages
+#: src/firstboot_write.ycp:23
+msgid "Update configuration"
+msgstr ""
+
+#. progress stages
+#: src/firstboot_write.ycp:25
+msgid "Prepare system for first login"
+msgstr ""
+
+#. progress stages
+#: src/firstboot_write.ycp:31
+msgid "Updating configuration..."
+msgstr ""
+
+#. progress stages
+#: src/firstboot_write.ycp:33
+msgid "Preparing system for first login..."
+msgstr ""
+
+#. Help text for last dialog of base installation
+#: src/firstboot_write.ycp:38
+msgid ""
+"<p>\n"
+"Please wait while the system is being configured.\n"
+"</p>"
+msgstr ""
+
+#. Headline for last dialog of first boot workflow
+#: src/firstboot_write.ycp:47
+msgid "Completing the System Configuration"
+msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.5/src/data/sysconfig.firstboot new/yast2-firstboot-2.20.1/src/data/sysconfig.firstboot
--- old/yast2-firstboot-2.19.5/src/data/sysconfig.firstboot 2009-07-07 10:09:35.000000000 +0200
+++ new/yast2-firstboot-2.20.1/src/data/sysconfig.firstboot 2010-11-03 17:09:36.000000000 +0100
@@ -46,9 +46,9 @@
## Type: string
## Default: ""
#
-# finish text file
+# finish text file, containing the finish text in richtext format
# enable firstboot_finish instead of inst_finish in the control file
-# preffered way is to define the text in the control file
+# (but preffered way is to define the text in the control file)
FIRSTBOOT_FINISH_FILE=""
## Type: yesno
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.5/src/firstboot_finish.ycp new/yast2-firstboot-2.20.1/src/firstboot_finish.ycp
--- old/yast2-firstboot-2.19.5/src/firstboot_finish.ycp 2008-08-22 12:12:07.000000000 +0200
+++ new/yast2-firstboot-2.20.1/src/firstboot_finish.ycp 2010-11-03 17:09:57.000000000 +0100
@@ -6,12 +6,13 @@
*
* Display a nice congratulation message for the user.
*
- * $Id: firstboot_finish.ycp 50325 2008-08-22 10:12:07Z jsrain $
+ * $Id: firstboot_finish.ycp 62742 2010-11-03 16:09:56Z jsuchome $
*/
{
textdomain "firstboot";
+ import "FileUtils";
import "Misc";
import "Mode";
import "Wizard";
@@ -63,10 +64,15 @@
_("<p>Have a lot of fun!<br>Your SuSE Development Team</p>");
- // If text exists, read it from file instead.
- string finish_text = Misc::SysconfigRead (
+ // If text exists, read it from file instead; it is expected to be richtext.
+ string finish_text = "";
+ string finish_text_file = Misc::SysconfigRead (
.sysconfig.firstboot.FIRSTBOOT_FINISH_FILE, "");
- if (finish_text == "")
+ if (finish_text_file != "" && FileUtils::Exists (finish_text_file))
+ {
+ finish_text = (string)SCR::Read (.target.string, finish_text_file);
+ }
+ if (finish_text == nil || finish_text == "")
finish_text = text;
term contents = `VBox (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.5/src/firstboot_language.ycp new/yast2-firstboot-2.20.1/src/firstboot_language.ycp
--- old/yast2-firstboot-2.19.5/src/firstboot_language.ycp 2009-08-20 16:38:29.000000000 +0200
+++ new/yast2-firstboot-2.20.1/src/firstboot_language.ycp 2010-11-03 17:11:12.000000000 +0100
@@ -20,6 +20,7 @@
import "Console";
import "Directory";
+ import "GfxMenu";
import "Language";
import "Wizard";
import "Firstboot";
@@ -104,6 +105,11 @@
If necessary, you may want to adapt your keyboard settings to the new
language. Use keyboard layout configuration tool after the login."));
}
+
+ // update bootloader menu
+ Language::WfmSetLanguage();
+ GfxMenu::Update();
+
}
else
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.5/src/firstboot_language_keyboard.ycp new/yast2-firstboot-2.20.1/src/firstboot_language_keyboard.ycp
--- old/yast2-firstboot-2.19.5/src/firstboot_language_keyboard.ycp 2010-03-18 12:12:14.000000000 +0100
+++ new/yast2-firstboot-2.20.1/src/firstboot_language_keyboard.ycp 2010-11-03 17:11:12.000000000 +0100
@@ -21,6 +21,7 @@
import "Console";
import "Directory";
import "GetInstArgs";
+ import "GfxMenu";
import "Keyboard";
import "Label";
import "Language";
@@ -200,6 +201,8 @@
Keyboard::Save ();
Timezone::Save ();
Console::Save ();
+ // update bootloader menu items
+ GfxMenu::Update();
}
return false;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org