Hello community,
here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2014-01-10 21:23:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old)
and /work/SRC/openSUSE:Factory/.yast2-storage.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-storage"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes 2013-12-18 16:56:04.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2014-01-10 21:23:52.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Jan 08 16:41:36 CET 2014 - aschnell@suse.de
+
+- added helptext for some buttons (see bnc#853087)
+- version 3.1.5
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-3.1.4.tar.bz2
New:
----
yast2-storage-3.1.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.kTlQKf/_old 2014-01-10 21:23:53.000000000 +0100
+++ /var/tmp/diff_new_pack.kTlQKf/_new 2014-01-10 21:23:53.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-storage
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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,7 +17,7 @@
Name: yast2-storage
-Version: 3.1.4
+Version: 3.1.5
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-storage-3.1.4.tar.bz2 -> yast2-storage-3.1.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.4/package/yast2-storage.changes new/yast2-storage-3.1.5/package/yast2-storage.changes
--- old/yast2-storage-3.1.4/package/yast2-storage.changes 2013-12-16 16:04:01.000000000 +0100
+++ new/yast2-storage-3.1.5/package/yast2-storage.changes 2014-01-10 10:38:58.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Jan 08 16:41:36 CET 2014 - aschnell@suse.de
+
+- added helptext for some buttons (see bnc#853087)
+- version 3.1.5
+
+-------------------------------------------------------------------
Mon Dec 16 12:15:43 CET 2013 - aschnell@suse.de
- fixed default btrfs subvolume for SLE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.4/package/yast2-storage.spec new/yast2-storage-3.1.5/package/yast2-storage.spec
--- old/yast2-storage-3.1.4/package/yast2-storage.spec 2013-12-16 16:04:01.000000000 +0100
+++ new/yast2-storage-3.1.5/package/yast2-storage.spec 2014-01-10 10:38:58.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-storage
-Version: 3.1.4
+Version: 3.1.5
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.4/src/clients/inst_disk_proposal.rb new/yast2-storage-3.1.5/src/clients/inst_disk_proposal.rb
--- old/yast2-storage-3.1.4/src/clients/inst_disk_proposal.rb 2013-12-16 16:04:01.000000000 +0100
+++ new/yast2-storage-3.1.5/src/clients/inst_disk_proposal.rb 2014-01-10 10:38:58.000000000 +0100
@@ -1,6 +1,6 @@
# encoding: utf-8
-# Copyright (c) 2012 Novell, Inc.
+# Copyright (c) [2012-2014] Novell, Inc.
#
# All Rights Reserved.
#
@@ -41,9 +41,10 @@
module Yast
class InstDiskProposalClient < Client
def main
- Yast.import "UI"
+
textdomain "storage"
+ Yast.import "UI"
Yast.import "Arch"
Yast.import "Wizard"
Yast.import "Mode"
@@ -127,7 +128,7 @@
@rframe = HBox(
HSpacing(20),
- StorageProposal.AddCommonWidgets,
+ StorageProposal.CommonWidgets(),
HSpacing(3)
)
@@ -159,7 +160,7 @@
# help on suggested partitioning
- @help_text = _(
+ help_text = _(
"<p>\n" +
"Your hard disks have been checked. The partition setup\n" +
"displayed is proposed for your hard drive.</p>"
@@ -167,8 +168,7 @@
# help text continued
# %1 is replaced by button text
- @help_text = Ops.add(
- @help_text,
+ help_text +=
Builtins.sformat(
_(
"<p>\n" +
@@ -179,12 +179,10 @@
),
Builtins.deletechars(@modify_str, "&")
)
- )
# help text continued
# %1 is replaced by button text
- @help_text = Ops.add(
- @help_text,
+ help_text +=
Builtins.sformat(
_(
"<p>\n" +
@@ -194,11 +192,9 @@
),
Builtins.deletechars(@import_str, "&")
)
- )
# help text continued
- @help_text = Ops.add(
- @help_text,
+ help_text +=
Builtins.sformat(
_(
"<p>\n" +
@@ -211,17 +207,8 @@
),
Builtins.deletechars(@detailed_str, "&")
)
- )
-
- # help text continued
- # %1 is replaced by button text
- @help_text = Ops.add(
- @help_text,
- _(
- "<p>\nTo create an LVM-based proposal, choose the corresponding button.</p>\n"
- )
- )
+ help_text += "\n" + StorageProposal.CommonWidgetsHelp()
@ret = nil
@@ -234,7 +221,7 @@
Wizard.SetContents(
@title,
@contents,
- @help_text,
+ help_text,
Ops.get_boolean(@enab, "enable_back", false),
Ops.get_boolean(@enab, "enable_next", false)
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.4/src/clients/inst_target_part.rb new/yast2-storage-3.1.5/src/clients/inst_target_part.rb
--- old/yast2-storage-3.1.4/src/clients/inst_target_part.rb 2013-12-16 16:04:01.000000000 +0100
+++ new/yast2-storage-3.1.5/src/clients/inst_target_part.rb 2014-01-10 10:38:58.000000000 +0100
@@ -1,6 +1,6 @@
# encoding: utf-8
-# Copyright (c) 2012 Novell, Inc.
+# Copyright (c) [2012-2014] Novell, Inc.
#
# All Rights Reserved.
#
@@ -33,9 +33,10 @@
module Yast
class InstTargetPartClient < Client
def main
- Yast.import "UI"
+
textdomain "storage"
+ Yast.import "UI"
Yast.import "Mode"
Yast.import "Popup"
Yast.import "Storage"
@@ -159,7 +160,7 @@
@partitions,
Ops.get_integer(@target, "cyl_size", 1)
)
- @vbox = Builtins.add(@vbox, StorageProposal.AddCommonWidgets)
+ @vbox = Builtins.add(@vbox, StorageProposal.CommonWidgets())
Builtins.y2milestone("can resize !")
else
# this is the normal case
@@ -171,12 +172,12 @@
)
@vbox = Builtins.add(
Ops.get_term(@tmp, "term", VBox()),
- StorageProposal.AddCommonWidgets
+ StorageProposal.CommonWidgets()
)
end
else
@vbox = create_whole_disk_dialog
- @vbox = Builtins.add(@vbox, StorageProposal.AddCommonWidgets)
+ @vbox = Builtins.add(@vbox, StorageProposal.CommonWidgets())
end
# Since resize case and normal case have different help texts we need
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.4/src/include/partitioning/auto_part_ui.rb new/yast2-storage-3.1.5/src/include/partitioning/auto_part_ui.rb
--- old/yast2-storage-3.1.4/src/include/partitioning/auto_part_ui.rb 2013-12-16 16:04:01.000000000 +0100
+++ new/yast2-storage-3.1.5/src/include/partitioning/auto_part_ui.rb 2014-01-10 10:38:58.000000000 +0100
@@ -1,6 +1,6 @@
# encoding: utf-8
-# Copyright (c) 2012 Novell, Inc.
+# Copyright (c) [2012-2014] Novell, Inc.
#
# All Rights Reserved.
#
@@ -203,26 +203,25 @@
#
def open_auto_dialog(targetname, targetbox)
targetbox = deep_copy(targetbox)
- # helptext for semi-automatic partitioning
- # part 1 of 4
+
+ # TRANSLATORS: helptext, part 1 of 4
helptext = _(
"<p>\n" +
"Select where on your hard disk to install &product;.\n" +
"</p>\n"
)
- # helptext, part 2 of 4
- helptext = Ops.add(
- helptext,
+
+ # TRANSLATORS: helptext, part 2 of 4
+ helptext +=
_(
"<p>\n" +
"Use either the <b>entire hard disk</b> or one or more of the\n" +
"partitions or free regions shown.\n" +
"</p>\n"
)
- )
- # helptext, part 3 of 4
- helptext = Ops.add(
- helptext,
+
+ # TRANSLATORS: helptext, part 3 of 4
+ helptext +=
_(
"<p>\n" +
"Notice: If you select a region that is not shown as <i>free</i>, you\n" +
@@ -230,17 +229,17 @@
"other operating systems.\n" +
"</p>"
)
- )
- # helptext, part 4 of 4
- helptext = Ops.add(
- helptext,
+
+ # TRANSLATORS: helptext, part 4 of 4
+ helptext +=
_(
"<p>\n" +
"<b><i>The marked regions will be deleted. All data there will be\n" +
"lost. </i></b> There will be no way to recover this data.\n" +
"</p>\n"
)
- )
+
+ helptext += "\n" + StorageProposal.CommonWidgetsHelp()
# Information what to do, background information
Wizard.SetContents(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.4/src/modules/StorageProposal.rb new/yast2-storage-3.1.5/src/modules/StorageProposal.rb
--- old/yast2-storage-3.1.4/src/modules/StorageProposal.rb 2013-12-16 16:04:01.000000000 +0100
+++ new/yast2-storage-3.1.5/src/modules/StorageProposal.rb 2014-01-10 10:38:58.000000000 +0100
@@ -1,6 +1,6 @@
# encoding: utf-8
-# Copyright (c) 2012 Novell, Inc.
+# Copyright (c) [2012-2014] Novell, Inc.
#
# All Rights Reserved.
#
@@ -37,10 +37,10 @@
module Yast
class StorageProposalClass < Module
def main
- Yast.import "UI"
textdomain "storage"
+ Yast.import "UI"
Yast.import "FileSystems"
Yast.import "Partitions"
Yast.import "Label"
@@ -3617,8 +3617,8 @@
Partitions.DefaultBootFs, "", "", "")
end
p
- end
- end
+ end
+ end
Builtins.y2milestone("can_boot_reuse ret:%1", ret)
end
deep_copy(ret)
@@ -5972,7 +5972,7 @@
end
- def AddCommonWidgets
+ def CommonWidgets()
space = SaveHeight() ? 0.0 : 0.5
vb = VBox()
@@ -6067,7 +6067,7 @@
)
Builtins.y2milestone(
- "AddCommonWidgets Home:%1 Snapshots:%2",
+ "CommonWidgets Home:%1 Snapshots:%2",
GetProposalHome(),
GetProposalSnapshots()
)
@@ -6075,6 +6075,33 @@
end
+ def CommonWidgetsHelp()
+
+ # TRANSLATORS: help text
+ help_text =
+ _(
+ "<p>To create an LVM-based proposal, choose the corresponding button.</p>\n"
+ )
+
+ # TRANSLATORS: help text
+ help_text +=
+ _(
+ "<p>Selecting \"Enable Snapshots\" will incease the size for the root\n" +
+ "filesystem and enable snapshots. Only works with the filesystem btrfs.</p>"
+ )
+
+ # TRANSLATORS: help text
+ help_text +=
+ _(
+ "<p>Use the button \"Enlarge Swap for Suspend\" to make the swap partition\n" +
+ "large enough to be used to suspend the system to disk.</p>"
+ )
+
+ return help_text
+
+ end
+
+
def QueryProposalPassword
no_query = false
Storage.CreateTargetBackup("query_prop_passwd")
@@ -6218,7 +6245,9 @@
publish :function => :get_proposal_vm, :type => "map