Hello community, here is the log from the commit of package yast2-geo-cluster for openSUSE:Factory checked in at 2014-08-25 11:03:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-geo-cluster (Old) and /work/SRC/openSUSE:Factory/.yast2-geo-cluster.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-geo-cluster" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-geo-cluster/yast2-geo-cluster.changes 2014-07-10 09:32:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-geo-cluster.new/yast2-geo-cluster.changes 2014-08-25 11:04:59.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 22 03:08:19 UTC 2014 - nwang@suse.com + +- BNC#892900. Adjust English Software Strings of window's title. +- Version 3.1.7 + +------------------------------------------------------------------- Old: ---- yast2-geo-cluster-3.1.6.tar.bz2 New: ---- yast2-geo-cluster-3.1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-geo-cluster.spec ++++++ --- /var/tmp/diff_new_pack.1iNPqI/_old 2014-08-25 11:05:00.000000000 +0200 +++ /var/tmp/diff_new_pack.1iNPqI/_new 2014-08-25 11:05:00.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-geo-cluster -Version: 3.1.6 +Version: 3.1.7 Release: 0 %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services ++++++ yast2-geo-cluster-3.1.6.tar.bz2 -> yast2-geo-cluster-3.1.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-geo-cluster-3.1.6/package/yast2-geo-cluster.changes new/yast2-geo-cluster-3.1.7/package/yast2-geo-cluster.changes --- old/yast2-geo-cluster-3.1.6/package/yast2-geo-cluster.changes 2014-07-10 05:11:28.000000000 +0200 +++ new/yast2-geo-cluster-3.1.7/package/yast2-geo-cluster.changes 2014-08-22 05:36:17.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 22 03:08:19 UTC 2014 - nwang@suse.com + +- BNC#892900. Adjust English Software Strings of window's title. +- Version 3.1.7 + +------------------------------------------------------------------- Thu Jul 10 03:06:59 UTC 2014 - nwang@suse.com - BNC#886541. Modify the non standard English message ID. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-geo-cluster-3.1.6/package/yast2-geo-cluster.spec new/yast2-geo-cluster-3.1.7/package/yast2-geo-cluster.spec --- old/yast2-geo-cluster-3.1.6/package/yast2-geo-cluster.spec 2014-07-10 05:11:28.000000000 +0200 +++ new/yast2-geo-cluster-3.1.7/package/yast2-geo-cluster.spec 2014-08-22 05:36:17.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-geo-cluster -Version: 3.1.6 +Version: 3.1.7 Release: 0 %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-geo-cluster-3.1.6/src/include/geo-cluster/complex.rb new/yast2-geo-cluster-3.1.7/src/include/geo-cluster/complex.rb --- old/yast2-geo-cluster-3.1.6/src/include/geo-cluster/complex.rb 2014-07-10 05:11:28.000000000 +0200 +++ new/yast2-geo-cluster-3.1.7/src/include/geo-cluster/complex.rb 2014-08-22 05:36:17.000000000 +0200 @@ -80,7 +80,7 @@ # @return dialog result def SummaryDialog # GeoCluster summary dialog caption - caption = _("GeoCluster Configuration") + caption = _("Geo Cluster Configuration") # FIXME summary = GeoCluster.Summary @@ -140,7 +140,7 @@ # @return dialog result def OverviewDialog # GeoCluster overview dialog caption - caption = _("GeoCluster Overview") + caption = _("Geo Cluster Overview") overview = GeoCluster.Overview diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-geo-cluster-3.1.6/src/include/geo-cluster/dialogs.rb new/yast2-geo-cluster-3.1.7/src/include/geo-cluster/dialogs.rb --- old/yast2-geo-cluster-3.1.6/src/include/geo-cluster/dialogs.rb 2014-07-10 05:11:28.000000000 +0200 +++ new/yast2-geo-cluster-3.1.7/src/include/geo-cluster/dialogs.rb 2014-08-22 05:36:17.000000000 +0200 @@ -66,26 +66,30 @@ Ops.get(GeoCluster.global_files[conf], "port", "") ) ), - VBox( - SelectionBox(Id(:arbitrator_box), _("arbitrator")), - Left( - HBox( - PushButton(Id(:arbitrator_add), _("Add")), - PushButton(Id(:arbitrator_edit), _("Edit")), - PushButton(Id(:arbitrator_del), _("Delete")) + HBox( + VBox( + SelectionBox(Id(:arbitrator_box), _("arbitrator")), + Left( + HBox( + PushButton(Id(:arbitrator_add), _("Add")), + PushButton(Id(:arbitrator_edit), _("Edit")), + PushButton(Id(:arbitrator_del), _("Delete")) + ) ) - ) - ), - VBox( - SelectionBox(Id(:site_box), _("site")), - Left( - HBox( - PushButton(Id(:site_add), _("Add")), - PushButton(Id(:site_edit), _("Edit")), - PushButton(Id(:site_del), _("Delete")) + ), + VSpacing(1), + VBox( + SelectionBox(Id(:site_box), _("site")), + Right( + HBox( + PushButton(Id(:site_add), _("Add")), + PushButton(Id(:site_edit), _("Edit")), + PushButton(Id(:site_del), _("Delete")) + ) ) - ) + ), ), + HSpacing(2), VBox( Left(Label(_("ticket"))), Table(Id(:ticket_box), Header("ticket", "timeout", "retries", "weights", "expire", "acquire-after", "before-acquire-handler"), []), @@ -351,6 +355,7 @@ def ServiceDialog ret = nil event = {} + caption = _("Firewall Configuration") firewall_widget = CWMFirewallInterfaces.CreateOpenFirewallWidget( { #servie:geo-cluster is the name of /etc/sysconfig/SuSEfirewall2.d/services/geo-cluster @@ -367,7 +372,7 @@ VStretch() ) Wizard.SetContents( - _("Geo Cluster(geo-cluster) firewall configure"), + caption, firewall_layout, Ops.get_string(@HELPS, "geo-cluster", ""), true, @@ -408,7 +413,7 @@ # @return dialog result def ConfigureDialog(conf) # GeoCluster configure2 dialog caption - caption = _("GeoCluster Configuration") + caption = _("Geo Cluster Configuration") # Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"", # Label::BackButton(), Label::NextButton()); @@ -417,7 +422,7 @@ add_new_conf = false Wizard.SetContents( - _("Geo Cluster configure"), + caption, cluster_configure_layout(conf), Ops.get_string(@HELPS, "booth", ""), false, @@ -681,13 +686,14 @@ ret = nil current = 0 conf_list = [] + caption = _("Geo Cluster Configuration") while true Wizard.SelectTreeItem("choose_conf") # FIXME ugly work. Better use alias and function, see yast2 drbd. Wizard.SetContents( - _("Geo Cluster configure"), + caption, config_box, Ops.get_string(@HELPS, "confs", ""), true, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-geo-cluster-3.1.6/src/include/geo-cluster/wizards.rb new/yast2-geo-cluster-3.1.7/src/include/geo-cluster/wizards.rb --- old/yast2-geo-cluster-3.1.6/src/include/geo-cluster/wizards.rb 2014-07-10 05:11:28.000000000 +0200 +++ new/yast2-geo-cluster-3.1.7/src/include/geo-cluster/wizards.rb 2014-08-22 05:36:17.000000000 +0200 @@ -43,7 +43,7 @@ @PARENT = {} @NAME = { - "choose_conf" => _("GeoCluster Configurations"), + "choose_conf" => _("Geo Cluster Configuration"), "firewall" => _("Firewall Configuration"), } @@ -137,7 +137,7 @@ # @return sequence result def GeoClusterAutoSequence # Initialization dialog caption - caption = _("GeoCluster Configuration") + caption = _("Geo Cluster Configuration") # Initialization dialog contents contents = Label(_("Initializing...")) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-geo-cluster-3.1.6/src/modules/GeoCluster.rb new/yast2-geo-cluster-3.1.7/src/modules/GeoCluster.rb --- old/yast2-geo-cluster-3.1.6/src/modules/GeoCluster.rb 2014-07-08 05:31:32.000000000 +0200 +++ new/yast2-geo-cluster-3.1.7/src/modules/GeoCluster.rb 2014-08-22 05:36:17.000000000 +0200 @@ -270,7 +270,7 @@ def Read # GeoCluster read dialog caption - caption = _("Initializing geo-cluster Configuration") + caption = _("Initializing Geo Cluster Configuration") # TODO FIXME Set the right number of stages steps = 2 @@ -329,7 +329,7 @@ # @return true on success def Write # GeoCluster write dialog caption - caption = _("Saving geo-cluster Configuration") + caption = _("Saving Geo Cluster Configuration") ret = false # TODO FIXME And set the right number of stages -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org