Remove unnecessary markup from translatable strings.

Now that attribute parsing is available for GtkBuilder files, I've
fially fixed bug 112962 and replaced strings of the form <b>foo</b>
with plain foo and set the text attributes appropriately. Obviously
this doesn't affect strings with embedded markup, only those with
global markup. This should make life easier for translators.

1 files changed, 229 insertions, 169 deletions

diff --git a/stickynotes/stickynotes.ui b/stickynotes/stickynotes.ui
index 06a99d129..feaba4f76 100644
--- a/stickynotes/stickynotes.ui
+++ b/stickynotes/stickynotes.ui
@@ -1,69 +1,27 @@
 <?xml version="1.0"?>
-<!--*- mode: xml -*-->
 <interface>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">500</property>
+    <property name="value">1</property>
     <property name="lower">1</property>
-    <property name="page_increment">100</property>
+    <property name="upper">500</property>
     <property name="step_increment">10</property>
-    <property name="page_size">0</property>
-    <property name="value">1</property>
+    <property name="page_increment">100</property>
   </object>
   <object class="GtkAdjustment" id="adjustment2">
-    <property name="upper">500</property>
+    <property name="value">1</property>
     <property name="lower">1</property>
-    <property name="page_increment">100</property>
+    <property name="upper">500</property>
     <property name="step_increment">10</property>
-    <property name="page_size">0</property>
-    <property name="value">1</property>
-  </object>
-  <object class="GtkUIManager" id="uimanager1">
-    <child>
-      <object class="GtkActionGroup" id="actiongroup1">
-        <child>
-          <object class="GtkAction" id="popup_create">
-            <property name="stock_id">gtk-new</property>
-            <property name="name">popup_create</property>
-            <property name="label" translatable="yes">_New Note</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="popup_destroy">
-            <property name="stock_id">gtk-delete</property>
-            <property name="name">popup_destroy</property>
-            <property name="label" translatable="yes">_Delete Note...</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToggleAction" id="popup_toggle_lock">
-            <property name="name">popup_toggle_lock</property>
-            <property name="label" translatable="yes">_Lock Note</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="popup_properties">
-            <property name="name">popup_properties</property>
-            <property name="label" translatable="yes">_Properties</property>
-          </object>
-        </child>
-      </object>
-    </child>
-    <ui>
-      <popup name="stickynote_menu">
-        <menuitem action="popup_create"/>
-        <menuitem action="popup_destroy"/>
-        <separator/>
-        <menuitem action="popup_toggle_lock"/>
-        <separator/>
-        <menuitem action="popup_properties"/>
-      </popup>
-    </ui>
+    <property name="page_increment">100</property>
   </object>
+  <object class="GtkUIManager" id="uimanager1"/>
   <object class="GtkDialog" id="preferences_dialog">
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Sticky Notes Preferences</property>
     <property name="resizable">False</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
@@ -82,12 +40,15 @@
                   <object class="GtkLabel" id="label11">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Default Note Properties&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Default Note Properties</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -96,11 +57,12 @@
                     <child>
                       <object class="GtkLabel" id="label14">
                         <property name="visible">True</property>
-                        <property name="label" translatable="no">    </property>
+                        <property name="label">    </property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -114,7 +76,8 @@
                           <object class="GtkFontButton" id="default_font">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip-text" translatable="yes">Choose a font to use for all sticky notes</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">Choose a font to use for all sticky notes</property>
                             <property name="title" translatable="yes">Pick a default sticky note font</property>
                           </object>
                           <packing>
@@ -123,7 +86,7 @@
                             <property name="top_attach">6</property>
                             <property name="bottom_attach">7</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
@@ -148,9 +111,10 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="sys_font_check">
+                            <property name="label" translatable="yes">Use fo_nt from the system theme</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Use fo_nt from the system theme</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -159,7 +123,7 @@
                             <property name="top_attach">5</property>
                             <property name="bottom_attach">6</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
@@ -208,6 +172,7 @@
                           <object class="GtkColorButton" id="font_color">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -215,14 +180,15 @@
                             <property name="top_attach">3</property>
                             <property name="bottom_attach">4</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkColorButton" id="default_color">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip-text" translatable="yes">Choose a base color to use for all sticky notes</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">Choose a base color to use for all sticky notes</property>
                             <property name="title" translatable="yes">Pick a default sticky note color</property>
                           </object>
                           <packing>
@@ -230,14 +196,15 @@
                             <property name="right_attach">2</property>
                             <property name="top_attach">4</property>
                             <property name="bottom_attach">5</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="sys_color_check">
+                            <property name="label" translatable="yes">Use co_lor from the system theme</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Use co_lor from the system theme</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -246,14 +213,14 @@
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkSpinButton" id="height_spin">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip-text" translatable="yes">Specify the default height (in pixels) of new notes</property>
+                            <property name="tooltip_text" translatable="yes">Specify the default height (in pixels) of new notes</property>
                             <property name="adjustment">adjustment1</property>
                             <property name="climb_rate">1</property>
                             <property name="numeric">True</property>
@@ -263,14 +230,14 @@
                             <property name="right_attach">2</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkSpinButton" id="width_spin">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip-text" translatable="yes">Specify the default width (in pixels) of new notes</property>
+                            <property name="tooltip_text" translatable="yes">Specify the default width (in pixels) of new notes</property>
                             <property name="adjustment">adjustment2</property>
                             <property name="climb_rate">1</property>
                             <property name="numeric">True</property>
@@ -278,7 +245,7 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
@@ -293,7 +260,7 @@
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
@@ -306,7 +273,7 @@
                           </object>
                           <packing>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                       </object>
@@ -323,6 +290,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -333,12 +301,15 @@
                   <object class="GtkLabel" id="label31">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Behavior&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Behavior</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -347,11 +318,12 @@
                     <child>
                       <object class="GtkLabel" id="label32">
                         <property name="visible">True</property>
-                        <property name="label" translatable="no">    </property>
+                        <property name="label">    </property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -362,17 +334,12 @@
                         <property name="column_spacing">12</property>
                         <property name="row_spacing">6</property>
                         <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
                           <object class="GtkCheckButton" id="force_default_check">
+                            <property name="label" translatable="yes">Force _default color and font on notes</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip-text" translatable="yes">Choose if the default style is forced on all notes</property>
-                            <property name="label" translatable="yes">Force _default color and font on notes</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">Choose if the default style is forced on all notes</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -380,15 +347,16 @@
                             <property name="right_attach">2</property>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="sticky_check">
+                            <property name="label" translatable="yes">_Put notes on all workspaces</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip-text" translatable="yes">Choose if notes are visible on all workspaces</property>
-                            <property name="label" translatable="yes">_Put notes on all workspaces</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">Choose if notes are visible on all workspaces</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -396,9 +364,15 @@
                             <property name="right_attach">2</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </object>
                       <packing>
                         <property name="position">1</property>
@@ -426,44 +400,47 @@
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="helpbutton1">
+                <property name="label">gtk-help</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-help</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="closebutton1">
+                <property name="label">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-close</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">default_font</action-widget>
-      <action-widget response="0">sys_font_check</action-widget>
-      <action-widget response="0">font_color</action-widget>
-      <action-widget response="0">default_color</action-widget>
-      <action-widget response="0">sys_color_check</action-widget>
-      <action-widget response="0">force_default_check</action-widget>
-      <action-widget response="0">sticky_check</action-widget>
       <action-widget response="-11">helpbutton1</action-widget>
       <action-widget response="-7">closebutton1</action-widget>
     </action-widgets>
@@ -472,7 +449,7 @@
     <property name="border_width">5</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox3">
@@ -488,17 +465,44 @@
                 <property name="visible">True</property>
                 <property name="yalign">0</property>
                 <property name="stock">gtk-dialog-warning</property>
-                <property name="icon_size">6</property>
+                <property name="icon-size">6</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label30">
+              <object class="GtkVBox" id="vbox1">
                 <property name="visible">True</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;Delete this sticky note?&lt;/b&gt;
-
-This cannot be undone.</property>
-                <property name="use_markup">True</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkLabel" id="label30">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">0</property>
+                    <property name="label" translatable="yes">Delete this sticky note?</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label1">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">This cannot be undone.</property>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -516,32 +520,42 @@ This cannot be undone.</property>
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area3">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button1">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-cancel</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="button2">
+                <property name="label">gtk-delete</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-delete</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>
@@ -554,7 +568,7 @@ This cannot be undone.</property>
   <object class="GtkDialog" id="delete_all_dialog">
     <property name="border_width">5</property>
     <property name="resizable">False</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox4">
@@ -570,21 +584,44 @@ This cannot be undone.</property>
                 <property name="visible">True</property>
                 <property name="yalign">0</property>
                 <property name="stock">gtk-dialog-warning</property>
-                <property name="icon_size">6</property>
+                <property name="icon-size">6</property>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label29">
+              <object class="GtkVBox" id="vbox1">
                 <property name="visible">True</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;Delete all sticky notes?&lt;/b&gt;
-
-This cannot be undone.</property>
-                <property name="use_markup">True</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkLabel" id="label29">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">0</property>
+                    <property name="label" translatable="yes">Delete all sticky notes?</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label1">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">This cannot be undone.</property>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -602,21 +639,28 @@ This cannot be undone.</property>
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area4">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button3">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-cancel</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="button4">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
+                <property name="receives_default">False</property>
                 <child>
                   <object class="GtkAlignment" id="alignment1">
                     <property name="visible">True</property>
@@ -634,6 +678,7 @@ This cannot be undone.</property>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -654,13 +699,16 @@ This cannot be undone.</property>
                 </child>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>
@@ -681,8 +729,9 @@ This cannot be undone.</property>
             <child>
               <object class="GtkButton" id="lock_button">
                 <property name="can_focus">True</property>
-                <property name="tooltip-text" translatable="yes">Lock/Unlock note</property>
-                <property name="relief">GTK_RELIEF_NONE</property>
+                <property name="receives_default">False</property>
+                <property name="tooltip_text" translatable="yes">Lock/Unlock note</property>
+                <property name="relief">none</property>
                 <child>
                   <object class="GtkImage" id="lock_img">
                     <property name="visible">True</property>
@@ -693,6 +742,7 @@ This cannot be undone.</property>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -700,7 +750,7 @@ This cannot be undone.</property>
                 <property name="visible">True</property>
                 <property name="xpad">2</property>
                 <property name="use_markup">True</property>
-                <property name="justify">GTK_JUSTIFY_CENTER</property>
+                <property name="justify">center</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -709,8 +759,9 @@ This cannot be undone.</property>
             <child>
               <object class="GtkButton" id="close_button">
                 <property name="can_focus">True</property>
-                <property name="tooltip-text" translatable="yes">Close note</property>
-                <property name="relief">GTK_RELIEF_NONE</property>
+                <property name="receives_default">False</property>
+                <property name="tooltip_text" translatable="yes">Close note</property>
+                <property name="relief">none</property>
                 <child>
                   <object class="GtkImage" id="close_img">
                     <property name="visible">True</property>
@@ -728,23 +779,24 @@ This cannot be undone.</property>
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
-	  <object class="GtkScrolledWindow" id="body_scroller">
+          <object class="GtkScrolledWindow" id="body_scroller">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="hscrollbar_policy">never</property>
             <property name="vscrollbar_policy">never</property>
             <child>
               <object class="GtkTextView" id="body_text">
-		<property name="visible">True</property>
-		<property name="can_focus">True</property>
-		<property name="wrap_mode">GTK_WRAP_WORD</property>
-		<property name="left_margin">4</property>
-		<property name="right_margin">4</property>
-	      </object>
-	    </child>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="wrap_mode">word</property>
+                <property name="left_margin">4</property>
+                <property name="right_margin">4</property>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="position">1</property>
@@ -755,7 +807,7 @@ This cannot be undone.</property>
             <child>
               <object class="GtkEventBox" id="resize_sw_box">
                 <property name="visible">True</property>
-                <property name="tooltip-text" translatable="yes">Resize note</property>
+                <property name="tooltip_text" translatable="yes">Resize note</property>
                 <child>
                   <object class="GtkImage" id="resize_sw_img">
                     <property name="visible">True</property>
@@ -768,12 +820,13 @@ This cannot be undone.</property>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkEventBox" id="resize_se_box">
                 <property name="visible">True</property>
-                <property name="tooltip-text" translatable="yes">Resize note</property>
+                <property name="tooltip_text" translatable="yes">Resize note</property>
                 <child>
                   <object class="GtkImage" id="resize_se_img">
                     <property name="visible">True</property>
@@ -786,7 +839,7 @@ This cannot be undone.</property>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack_type">GTK_PACK_END</property>
+                <property name="pack_type">end</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -800,19 +853,12 @@ This cannot be undone.</property>
       </object>
     </child>
   </object>
-  <object class="GtkMenu" constructor="uimanager1" id="stickynote_menu">
-    
-    
-    
-    
-    
-    
-  </object>
+  <object class="GtkMenu" id="stickynote_menu"/>
   <object class="GtkDialog" id="stickynote_properties">
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Sticky Note Properties</property>
     <property name="resizable">False</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox2">
@@ -831,12 +877,15 @@ This cannot be undone.</property>
                   <object class="GtkLabel" id="label35">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Properties&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Properties</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -845,11 +894,12 @@ This cannot be undone.</property>
                     <child>
                       <object class="GtkLabel" id="label36">
                         <property name="visible">True</property>
-                        <property name="label" translatable="no">    </property>
+                        <property name="label">    </property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -863,7 +913,8 @@ This cannot be undone.</property>
                           <object class="GtkFontButton" id="note_font">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip-text" translatable="yes">Choose a font for the note</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">Choose a font for the note</property>
                             <property name="title" translatable="yes">Pick a font for the sticky note</property>
                           </object>
                           <packing>
@@ -872,7 +923,7 @@ This cannot be undone.</property>
                             <property name="top_attach">5</property>
                             <property name="bottom_attach">6</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
@@ -897,9 +948,10 @@ This cannot be undone.</property>
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="def_font_check">
+                            <property name="label" translatable="yes">Use default fo_nt</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Use default fo_nt</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -908,14 +960,15 @@ This cannot be undone.</property>
                             <property name="top_attach">4</property>
                             <property name="bottom_attach">5</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkColorButton" id="note_color">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip-text" translatable="yes">Choose a color for the note</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">Choose a color for the note</property>
                             <property name="title" translatable="yes">Pick a color for the sticky note</property>
                           </object>
                           <packing>
@@ -924,7 +977,7 @@ This cannot be undone.</property>
                             <property name="top_attach">3</property>
                             <property name="bottom_attach">4</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
@@ -951,6 +1004,7 @@ This cannot be undone.</property>
                           <object class="GtkColorButton" id="font_color">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -958,7 +1012,7 @@ This cannot be undone.</property>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
@@ -983,9 +1037,10 @@ This cannot be undone.</property>
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="def_color_check">
+                            <property name="label" translatable="yes">Use default co_lor</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Use default co_lor</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -993,20 +1048,19 @@ This cannot be undone.</property>
                             <property name="right_attach">2</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkEntry" id="title_entry">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip-text" translatable="yes">Specify a title for the note</property>
-                            <property name="invisible_char">*</property>
+                            <property name="tooltip_text" translatable="yes">Specify a title for the note</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
@@ -1019,7 +1073,7 @@ This cannot be undone.</property>
                           </object>
                           <packing>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                       </object>
@@ -1036,6 +1090,7 @@ This cannot be undone.</property>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
           </object>
@@ -1048,42 +1103,47 @@ This cannot be undone.</property>
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area2">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="helpbutton2">
+                <property name="label">gtk-help</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-help</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="closebutton2">
+                <property name="label">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-close</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">note_font</action-widget>
-      <action-widget response="0">def_font_check</action-widget>
-      <action-widget response="0">note_color</action-widget>
-      <action-widget response="0">font_color</action-widget>
-      <action-widget response="0">def_color_check</action-widget>
       <action-widget response="-11">helpbutton2</action-widget>
       <action-widget response="-7">closebutton2</action-widget>
     </action-widgets>