Hi,

Please review the fix for d.o.o 
#13205(control-center-03-compiz-integration.diff incorrectly place 
SUN_BRANDING mark the middle of a propety segment.)

Index: control-center-03-compiz-integration.diff
===================================================================
--- control-center-03-compiz-integration.diff   (revision 20161)
+++ control-center-03-compiz-integration.diff   (working copy)
@@ -1356,7 +1356,7 @@
 +                            <property name="visible">True</property>
 +                            <property 
name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 +                            <property name="xpad">6</property>
-+                            <property comments="SUN_BRANDING" 
name="label" translatable="yes">&lt;b&gt;_None:&lt;/b&gt; Provides a 
simple desktop environment without any effects.</property>
++                            <property name="label" translatable="yes" 
comments="SUN_BRANDING">&lt;b&gt;_None:&lt;/b&gt; Provides a simple 
desktop environment without any effects.</property>
 +                            <property name="use_markup">True</property>
 +                            <property name="use_underline">True</property>
 +                            <property name="wrap">True</property>
@@ -1401,7 +1401,7 @@
 +                            <property name="visible">True</property>
 +                            <property 
name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 +                            <property name="xpad">6</property>
-+                            <property comments="SUN_BRANDING" 
name="label" translatable="yes">&lt;b&gt;N_ormal:&lt;/b&gt; Provides 
improved usability and good balance between attractiveness and moderate 
performance-requirements.</property>
++                            <property name="label" translatable="yes" 
comments="SUN_BRANDING">&lt;b&gt;N_ormal:&lt;/b&gt; Provides improved 
usability and good balance between attractiveness and moderate 
performance-requirements.</property>
 +                            <property name="use_markup">True</property>
 +                            <property name="use_underline">True</property>
 +                            <property name="wrap">True</property>
@@ -1447,7 +1447,7 @@
 +                            <property name="visible">True</property>
 +                            <property 
name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 +                            <property name="xpad">6</property>
-+                            <property comments="SUN_BRANDING" 
name="label" translatable="yes">&lt;b&gt;E_xtra:&lt;/b&gt; Provides more 
aesthetically pleasing set of effects. Requires faster 
graphics-card.</property>
++                            <property name="label" translatable="yes" 
comments="SUN_BRANDING">&lt;b&gt;E_xtra:&lt;/b&gt; Provides more 
aesthetically pleasing set of effects. Requires faster 
graphics-card.</property>
 +                            <property name="use_markup">True</property>
 +                            <property name="use_underline">True</property>
 +                            <property name="wrap">True</property>
@@ -1502,7 +1502,7 @@
 +                              <object class="GtkLabel" 
id="label_desc_custom_effects">
 +                                <property name="visible">True</property>
 +                                <property 
name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-+                                <property comments="SUN_BRANDING" 
name="label" translatable="yes">&lt;b&gt;C_ustom:&lt;/b&gt; Uses custom 
set of effects.</property>
++                                <property name="label" 
translatable="yes" comments="SUN_BRANDING">&lt;b&gt;C_ustom:&lt;/b&gt; 
Uses custom set of effects.</property>
 +                                <property 
name="use_markup">True</property>
 +                                <property 
name="use_underline">True</property>
 +                                <property name="wrap">True</property>
@@ -1582,7 +1582,7 @@
 +              <object class="GtkLabel" id="effects_label">
 +                <property name="visible">True</property>
 +                <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
-+                <property comments="SUN_BRANDING" name="label" 
translatable="yes">Visual Effects</property>
++                <property name="label" translatable="yes" 
comments="SUN_BRANDING">Visual Effects</property>
 +              </object>
 +              <packing>
 +                <property name="position">4</property>

Reply via email to