[orca] Fix for b.g.o. 593203 (Orca preferences does not fit in 1024x600 screen resolution) and for b.g.o. 5



commit 5e0a0f435cf5e8053e4192c828101273e06bed08
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Sat Jan 9 22:32:46 2010 -0500

    Fix for b.g.o. 593203 (Orca preferences does not fit in 1024x600 screen resolution) and for b.g.o. 592424 (Progress bar options in the Preferences dialog cannot be translated properly for all locales).

 src/orca/orca-setup.ui     | 4746 +++++++++++++++-----------------------------
 src/orca/orca_gui_prefs.py |   11 -
 2 files changed, 1624 insertions(+), 3133 deletions(-)
---
diff --git a/src/orca/orca-setup.ui b/src/orca/orca-setup.ui
index fca7a47..5af2bff 100644
--- a/src/orca/orca-setup.ui
+++ b/src/orca/orca-setup.ui
@@ -1,128 +1,106 @@
 <?xml version="1.0"?>
-<!--*- mode: xml -*-->
 <interface>
+  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="adjustment1">
+    <property name="value">5</property>
     <property name="upper">10</property>
-    <property name="lower">0</property>
-    <property name="page_increment">1</property>
     <property name="step_increment">0.10000000149</property>
-    <property name="page_size">0</property>
-    <property name="value">5</property>
+    <property name="page_increment">1</property>
   </object>
   <object class="GtkAdjustment" id="adjustment10">
+    <property name="value">1</property>
     <property name="upper">20</property>
-    <property name="lower">0</property>
-    <property name="page_increment">10</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">1</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment11">
-    <property name="upper">1</property>
     <property name="lower">-1</property>
+    <property name="upper">1</property>
+    <property name="step_increment">0.050000000745099998</property>
     <property name="page_increment">0.25</property>
-    <property name="step_increment">0.0500000007451</property>
-    <property name="page_size">0</property>
-    <property name="value">0</property>
   </object>
   <object class="GtkAdjustment" id="adjustment12">
-    <property name="upper">1</property>
     <property name="lower">-1</property>
+    <property name="upper">1</property>
+    <property name="step_increment">0.050000000745099998</property>
     <property name="page_increment">0.25</property>
-    <property name="step_increment">0.0500000007451</property>
-    <property name="page_size">0</property>
-    <property name="value">0</property>
   </object>
   <object class="GtkAdjustment" id="adjustment13">
-    <property name="upper">256</property>
+    <property name="value">1</property>
     <property name="lower">24</property>
-    <property name="page_increment">10</property>
+    <property name="upper">256</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">1</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment14">
-    <property name="upper">256</property>
+    <property name="value">1</property>
     <property name="lower">1</property>
-    <property name="page_increment">10</property>
+    <property name="upper">256</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">1</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment15">
     <property name="upper">100</property>
-    <property name="lower">0</property>
-    <property name="page_increment">10</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">0</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment2">
+    <property name="value">50</property>
     <property name="upper">100</property>
-    <property name="lower">0</property>
-    <property name="page_increment">10</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">50</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment3">
+    <property name="value">10</property>
     <property name="upper">10</property>
-    <property name="lower">0</property>
-    <property name="page_increment">1</property>
     <property name="step_increment">0.10000000149</property>
-    <property name="page_size">0</property>
-    <property name="value">10</property>
+    <property name="page_increment">1</property>
   </object>
   <object class="GtkAdjustment" id="adjustment4">
+    <property name="value">10</property>
     <property name="upper">9999</property>
-    <property name="lower">0</property>
-    <property name="page_increment">10</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">10</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment5">
-    <property name="upper">16</property>
+    <property name="value">1</property>
     <property name="lower">1</property>
-    <property name="page_increment">1</property>
+    <property name="upper">16</property>
     <property name="step_increment">0.25</property>
-    <property name="page_size">0</property>
-    <property name="value">1</property>
+    <property name="page_increment">1</property>
   </object>
   <object class="GtkAdjustment" id="adjustment6">
-    <property name="upper">9999</property>
+    <property name="value">1</property>
     <property name="lower">1</property>
-    <property name="page_increment">10</property>
+    <property name="upper">9999</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">1</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment7">
-    <property name="upper">9999</property>
+    <property name="value">1</property>
     <property name="lower">1</property>
-    <property name="page_increment">10</property>
+    <property name="upper">9999</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">1</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment8">
-    <property name="upper">9999</property>
+    <property name="value">1</property>
     <property name="lower">1</property>
-    <property name="page_increment">10</property>
+    <property name="upper">9999</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">1</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment9">
-    <property name="upper">9999</property>
+    <property name="value">1</property>
     <property name="lower">1</property>
-    <property name="page_increment">10</property>
+    <property name="upper">9999</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">1</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkListStore" id="model1">
     <columns>
+      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -139,6 +117,7 @@
   </object>
   <object class="GtkListStore" id="model2">
     <columns>
+      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -152,6 +131,7 @@
   </object>
   <object class="GtkListStore" id="model3">
     <columns>
+      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -177,6 +157,7 @@
   </object>
   <object class="GtkListStore" id="model4">
     <columns>
+      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -193,6 +174,7 @@
   </object>
   <object class="GtkListStore" id="model5">
     <columns>
+      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -209,6 +191,7 @@
   </object>
   <object class="GtkListStore" id="model6">
     <columns>
+      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -228,6 +211,7 @@
   </object>
   <object class="GtkListStore" id="model7">
     <columns>
+      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -244,167 +228,76 @@
   </object>
   <object class="GtkDialog" id="orcaSetupWindow">
     <property name="title" translatable="yes">Orca Preferences</property>
-    <property name="type">GTK_WINDOW_TOPLEVEL</property>
-    <property name="window_position">GTK_WIN_POS_NONE</property>
-    <property name="modal">False</property>
-    <property name="resizable">True</property>
-    <property name="destroy_with_parent">False</property>
-    <property name="decorated">True</property>
-    <property name="skip_taskbar_hint">False</property>
-    <property name="skip_pager_hint">False</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-    <property name="focus_on_map">True</property>
-    <property name="urgency_hint">False</property>
+    <property name="type_hint">normal</property>
     <property name="has_separator">False</property>
-    <signal handler="windowDestroyed" last_modification_time="Tue, 12 Sep 2006 19:10:48 GMT" name="destroy"/>
-    <signal handler="windowClosed" last_modification_time="Tue, 12 Sep 2006 19:10:48 GMT" name="close"/>
+    <signal name="destroy" handler="windowDestroyed"/>
+    <signal name="close" handler="windowClosed"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
-        <property name="homogeneous">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">3</property>
-        <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>
-            <child>
-              <object class="GtkButton" id="helpButton">
-                <property name="visible">True</property>
-                <property name="can_default">True</property>
-                <property name="can_focus">True</property>
-                <property name="label">gtk-help</property>
-                <property name="use_stock">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="focus_on_click">True</property>
-                <signal handler="helpButtonClicked" last_modification_time="Fri, 05 May 2006 19:24:41 GMT" name="clicked"/>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton" id="applyButton">
-                <property name="visible">True</property>
-                <property name="can_default">True</property>
-                <property name="can_focus">True</property>
-                <property name="label">gtk-apply</property>
-                <property name="use_stock">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="focus_on_click">True</property>
-                <signal handler="applyButtonClicked" last_modification_time="Thu, 07 Sep 2006 15:30:40 GMT" name="clicked"/>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton" id="cancelButton">
-                <property name="visible">True</property>
-                <property name="can_default">True</property>
-                <property name="can_focus">True</property>
-                <property name="label">gtk-cancel</property>
-                <property name="use_stock">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="focus_on_click">True</property>
-                <signal handler="cancelButtonClicked" last_modification_time="Thu, 07 Sep 2006 15:29:41 GMT" name="clicked"/>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton" id="okButton">
-                <property name="visible">True</property>
-                <property name="can_default">True</property>
-                <property name="can_focus">True</property>
-                <property name="label">gtk-ok</property>
-                <property name="use_stock">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="focus_on_click">True</property>
-                <signal handler="okButtonClicked" last_modification_time="Thu, 07 Sep 2006 15:28:21 GMT" name="clicked"/>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="padding">0</property>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">GTK_PACK_END</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkVBox" id="mainvbox">
-            <property name="border_width">6</property>
             <property name="visible">True</property>
-            <property name="homogeneous">False</property>
+            <property name="border_width">6</property>
+            <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
               <object class="GtkNotebook" id="notebook">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="show_tabs">True</property>
-                <property name="show_border">True</property>
-                <property name="tab_pos">GTK_POS_TOP</property>
-                <property name="scrollable">False</property>
-                <property name="enable_popup">False</property>
                 <child>
                   <object class="GtkVBox" id="generalVBox">
-                    <property name="border_width">12</property>
                     <property name="visible">True</property>
-                    <property name="homogeneous">False</property>
-                    <property name="spacing">0</property>
+                    <property name="border_width">12</property>
+                    <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkFrame" id="frame9">
                         <property name="visible">True</property>
                         <property name="label_xalign">0</property>
-                        <property name="label_yalign">0.5</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkAlignment" id="alignment47">
                             <property name="visible">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xscale">1</property>
-                            <property name="yscale">1</property>
-                            <property name="top_padding">0</property>
-                            <property name="bottom_padding">0</property>
                             <property name="left_padding">12</property>
-                            <property name="right_padding">0</property>
                             <child>
                               <object class="GtkVBox" id="vbox22">
-                                <property name="border_width">3</property>
                                 <property name="visible">True</property>
-                                <property name="homogeneous">False</property>
-                                <property name="spacing">0</property>
+                                <property name="border_width">3</property>
+                                <property name="orientation">vertical</property>
                                 <child>
                                   <object class="GtkRadioButton" id="generalDesktopButton">
+                                    <property name="label" translatable="yes">_Desktop</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes">_Desktop</property>
+                                    <property name="receives_default">False</property>
                                     <property name="use_underline">True</property>
-                                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                                    <property name="focus_on_click">True</property>
-                                    <property name="active">False</property>
-                                    <property name="inconsistent">False</property>
+                                    <property name="active">True</property>
                                     <property name="draw_indicator">True</property>
-                                    <signal handler="keyboardLayoutChanged" last_modification_time="Mon, 13 Nov 2006 15:56:51 GMT" name="toggled"/>
+                                    <signal name="toggled" handler="keyboardLayoutChanged"/>
                                   </object>
                                   <packing>
-                                    <property name="padding">0</property>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
+                                    <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="generalLaptopButton">
+                                    <property name="label" translatable="yes">_Laptop</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes">_Laptop</property>
+                                    <property name="receives_default">False</property>
                                     <property name="use_underline">True</property>
-                                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                                    <property name="focus_on_click">True</property>
-                                    <property name="active">False</property>
-                                    <property name="inconsistent">False</property>
                                     <property name="draw_indicator">True</property>
                                     <property name="group">generalDesktopButton</property>
-                                    <signal handler="keyboardLayoutChanged" last_modification_time="Mon, 13 Nov 2006 15:57:12 GMT" name="toggled"/>
+                                    <signal name="toggled" handler="keyboardLayoutChanged"/>
                                   </object>
                                   <packing>
-                                    <property name="padding">0</property>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
+                                    <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
@@ -415,567 +308,514 @@
                           <object class="GtkLabel" id="generalKeyboardLabel">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">&lt;b&gt;Keyboard Layout&lt;/b&gt;</property>
-                            <property name="use_underline">False</property>
                             <property name="use_markup">True</property>
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap">False</property>
-                            <property name="selectable">False</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                            <property name="width_chars">-1</property>
-                            <property name="single_line_mode">False</property>
-                            <property name="angle">0</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="showMainWindowCheckButton">
+                      <object class="GtkCheckButton" id="confirmQuitCheckButton">
+                        <property name="label" translatable="yes">Quit Orca _without confirmation</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Show Orca _main window</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
-                        <property name="active">True</property>
-                        <property name="inconsistent">False</property>
                         <property name="draw_indicator">True</property>
-                        <signal handler="showMainWindowChecked" last_modification_time="Mon, 02 Oct 2006 18:23:03 GMT" name="toggled"/>
+                        <signal name="toggled" handler="confirmQuitChecked"/>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="confirmQuitCheckButton">
+                      <object class="GtkCheckButton" id="disableKeyGrabCheckButton">
+                        <property name="label" translatable="yes">Disable gksu _keyboard grab</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Quit Orca _without confirmation</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
-                        <property name="active">False</property>
-                        <property name="inconsistent">False</property>
                         <property name="draw_indicator">True</property>
-                        <signal handler="confirmQuitChecked" last_modification_time="Mon, 02 Apr 2007 16:42:11 GMT" name="toggled"/>
+                        <signal name="toggled" handler="disableKeyGrabChecked"/>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="disableKeyGrabCheckButton">
+                      <object class="GtkCheckButton" id="presentToolTipsCheckButton">
+                        <property name="label" translatable="yes">_Present tooltips</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Disable gksu _keyboard grab</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
-                        <property name="active">False</property>
-                        <property name="inconsistent">False</property>
                         <property name="draw_indicator">True</property>
-                        <signal handler="disableKeyGrabChecked" last_modification_time="Wed, 03 Jan 2007 16:37:07 GMT" name="toggled"/>
+                        <signal name="toggled" handler="presentToolTipsChecked"/>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="presentToolTipsCheckButton">
+                      <object class="GtkCheckButton" id="showMainWindowCheckButton">
+                        <property name="label" translatable="yes">Show Orca _main window</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">_Present tooltips</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
-                        <property name="active">False</property>
-                        <property name="inconsistent">False</property>
+                        <property name="active">True</property>
                         <property name="draw_indicator">True</property>
-                        <signal handler="presentToolTipsChecked" last_modification_time="Wed, 09 May 2007 00:18:20 GMT" name="toggled"/>
+                        <signal name="toggled" handler="showMainWindowChecked"/>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">4</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="speakUnderMouseCheckButton">
+                      <object class="GtkCheckButton" id="autostartOrcaCheckbutton">
+                        <property name="label" translatable="yes">Start Orca when you lo_gin</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Speak object under mo_use</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
-                        <property name="active">True</property>
-                        <property name="inconsistent">False</property>
                         <property name="draw_indicator">True</property>
-                        <signal handler="speakUnderMouseChecked" last_modification_time="Mon, 17 Mar 2008 06:29:21 GMT" name="toggled"/>
+                        <signal name="toggled" handler="autostartOrcaChecked"/>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">5</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="autostartOrcaCheckbutton">
+                      <object class="GtkCheckButton" id="speakUnderMouseCheckButton">
+                        <property name="label" translatable="yes">Speak object under mo_use</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Start Orca when you lo_gin</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
-                        <property name="active">False</property>
-                        <property name="inconsistent">False</property>
+                        <property name="active">True</property>
                         <property name="draw_indicator">True</property>
-                        <signal handler="autostartOrcaChecked" last_modification_time="Tue, 13 May 2008 14:30:23 GMT" name="toggled"/>
+                        <signal name="toggled" handler="speakUnderMouseChecked"/>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">6</property>
                       </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="tab_expand">False</property>
-                    <property name="tab_fill">True</property>
-                  </packing>
                 </child>
                 <child type="tab">
                   <object class="GtkLabel" id="generalTabLabel">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">General</property>
-                    <property name="use_underline">False</property>
-                    <property name="use_markup">False</property>
-                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                    <property name="wrap">False</property>
-                    <property name="selectable">False</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xpad">0</property>
-                    <property name="ypad">0</property>
-                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                    <property name="width_chars">-1</property>
-                    <property name="single_line_mode">False</property>
-                    <property name="angle">0</property>
                   </object>
+                  <packing>
+                    <property name="tab_fill">False</property>
+                  </packing>
                 </child>
                 <child>
                   <object class="GtkVBox" id="vbox20">
-                    <property name="border_width">12</property>
                     <property name="visible">True</property>
-                    <property name="homogeneous">False</property>
-                    <property name="spacing">0</property>
+                    <property name="border_width">12</property>
+                    <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkCheckButton" id="speechSupportCheckbutton">
+                        <property name="label" translatable="yes">_Enable speech</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">_Enable speech</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
                         <property name="active">True</property>
-                        <property name="inconsistent">False</property>
                         <property name="draw_indicator">True</property>
-                        <signal handler="speechSupportChecked" last_modification_time="Thu, 04 May 2006 15:44:16 GMT" name="toggled"/>
+                        <signal name="toggled" handler="speechSupportChecked"/>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkVBox" id="speechVbox">
-                        <property name="border_width">12</property>
                         <property name="visible">True</property>
-                        <property name="homogeneous">False</property>
+                        <property name="border_width">12</property>
+                        <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkTable" id="speechTable">
                             <property name="visible">True</property>
-                            <property name="n_rows">8</property>
-                            <property name="n_columns">2</property>
-                            <property name="homogeneous">False</property>
-                            <property name="row_spacing">3</property>
+                            <property name="n_rows">2</property>
+                            <property name="n_columns">3</property>
                             <property name="column_spacing">3</property>
+                            <property name="row_spacing">3</property>
                             <child>
-                              <object class="GtkLabel" id="speechSystemsLabel">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Speech _system:</property>
-                                <property name="use_underline">True</property>
-                                <property name="use_markup">False</property>
-                                <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                                <property name="wrap">False</property>
-                                <property name="selectable">False</property>
-                                <property name="xalign">1</property>
-                                <property name="yalign">0.5</property>
-                                <property name="xpad">0</property>
-                                <property name="ypad">0</property>
-                                <property name="mnemonic_widget">speechSystems</property>
-                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                <property name="width_chars">-1</property>
-                                <property name="single_line_mode">False</property>
-                                <property name="angle">0</property>
-                                <accessibility>
-                                  <relation target="speechSystems" type="label-for"/>
-                                </accessibility>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="right_attach">1</property>
-                                <property name="top_attach">0</property>
-                                <property name="bottom_attach">1</property>
-                                <property name="x_options">fill</property>
-                                <property name="y_options"/>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkComboBox" id="speechSystems">
-                                <property name="visible">True</property>
-                                <property name="add_tearoffs">False</property>
-                                <property name="focus_on_click">True</property>
-                                <accessibility>
-                                  <relation target="speechSystemsLabel" type="labelled-by"/>
-                                </accessibility>
-                                <signal handler="speechSystemsChanged" last_modification_time="Fri, 28 Apr 2006 18:47:56 GMT" name="changed"/>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">0</property>
-                                <property name="bottom_attach">1</property>
-                                <property name="x_options">fill</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="speechServersLabel">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Speech synthesi_zer:</property>
-                                <property name="use_underline">True</property>
-                                <property name="use_markup">False</property>
-                                <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                                <property name="wrap">False</property>
-                                <property name="selectable">False</property>
-                                <property name="xalign">1</property>
-                                <property name="yalign">0.5</property>
-                                <property name="xpad">0</property>
-                                <property name="ypad">0</property>
-                                <property name="mnemonic_widget">speechServers</property>
-                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                <property name="width_chars">-1</property>
-                                <property name="single_line_mode">False</property>
-                                <property name="angle">0</property>
-                                <accessibility>
-                                  <relation target="speechServers" type="label-for"/>
-                                </accessibility>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="right_attach">1</property>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                                <property name="x_options">fill</property>
-                                <property name="y_options"/>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="voiceSettingsLabel">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">_Voice settings:</property>
-                                <property name="use_underline">True</property>
-                                <property name="use_markup">False</property>
-                                <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                                <property name="wrap">False</property>
-                                <property name="selectable">False</property>
-                                <property name="xalign">1</property>
-                                <property name="yalign">0.5</property>
-                                <property name="xpad">0</property>
-                                <property name="ypad">0</property>
-                                <property name="mnemonic_widget">voiceTypes</property>
-                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                <property name="width_chars">-1</property>
-                                <property name="single_line_mode">False</property>
-                                <property name="angle">0</property>
-                                <accessibility>
-                                  <relation target="voiceTypes" type="label-for"/>
-                                </accessibility>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="right_attach">1</property>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                                <property name="x_options">fill</property>
-                                <property name="y_options"/>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="pitchLabel">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Pi_tch:</property>
-                                <property name="use_underline">True</property>
-                                <property name="use_markup">False</property>
-                                <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                                <property name="wrap">False</property>
-                                <property name="selectable">False</property>
-                                <property name="xalign">1</property>
-                                <property name="yalign">0.5</property>
-                                <property name="xpad">3</property>
-                                <property name="ypad">0</property>
-                                <property name="mnemonic_widget">pitchScale</property>
-                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                <property name="width_chars">-1</property>
-                                <property name="single_line_mode">False</property>
-                                <property name="angle">0</property>
-                                <accessibility>
-                                  <relation target="pitchScale" type="label-for"/>
-                                </accessibility>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="right_attach">1</property>
-                                <property name="top_attach">5</property>
-                                <property name="bottom_attach">6</property>
-                                <property name="x_options">fill</property>
-                                <property name="y_options"/>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkHScale" id="pitchScale">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="draw_value">True</property>
-                                <property name="value_pos">GTK_POS_RIGHT</property>
-                                <property name="digits">1</property>
-                                <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-                                <property name="inverted">False</property>
-                                <property name="adjustment">adjustment1</property>
-                                <accessibility>
-                                  <relation target="pitchLabel" type="labelled-by"/>
-                                </accessibility>
-                                <signal handler="pitchValueChanged" last_modification_time="Wed, 26 Apr 2006 18:48:18 GMT" name="value_changed"/>
-                                <accelerator key="t" modifiers="GDK_MOD1_MASK" signal="grab_focus"/>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">5</property>
-                                <property name="bottom_attach">6</property>
-                                <property name="x_options">fill</property>
-                                <property name="y_options">fill</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="volumeLabel">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Vo_lume:</property>
-                                <property name="use_underline">True</property>
-                                <property name="use_markup">False</property>
-                                <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                                <property name="wrap">False</property>
-                                <property name="selectable">False</property>
-                                <property name="xalign">1</property>
-                                <property name="yalign">0.170000001788</property>
-                                <property name="xpad">3</property>
-                                <property name="ypad">0</property>
-                                <property name="mnemonic_widget">volumeScale</property>
-                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                <property name="width_chars">-1</property>
-                                <property name="single_line_mode">False</property>
-                                <property name="angle">0</property>
-                                <accessibility>
-                                  <relation target="volumeScale" type="label-for"/>
-                                </accessibility>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="right_attach">1</property>
-                                <property name="top_attach">6</property>
-                                <property name="bottom_attach">7</property>
-                                <property name="x_options">fill</property>
-                                <property name="y_options">fill</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkComboBox" id="speechServers">
+                              <object class="GtkTable" id="sliderTable">
                                 <property name="visible">True</property>
-                                <property name="add_tearoffs">False</property>
-                                <property name="focus_on_click">True</property>
-                                <accessibility>
-                                  <relation target="speechServersLabel" type="labelled-by"/>
-                                </accessibility>
-                                <signal handler="speechServersChanged" last_modification_time="Fri, 28 Apr 2006 18:50:26 GMT" name="changed"/>
+                                <property name="n_rows">3</property>
+                                <property name="n_columns">2</property>
+                                <property name="column_spacing">10</property>
+                                <child>
+                                  <object class="GtkLabel" id="rateLabel">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">1</property>
+                                    <property name="xpad">5</property>
+                                    <property name="label" translatable="yes">_Rate:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="justify">right</property>
+                                    <property name="mnemonic_widget">rateScale</property>
+                                    <accessibility>
+                                      <relation type="label-for" target="rateScale"/>
+                                    </accessibility>
+                                  </object>
+                                  <packing>
+                                    <property name="x_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="pitchLabel">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">1</property>
+                                    <property name="xpad">3</property>
+                                    <property name="label" translatable="yes">Pi_tch:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="justify">right</property>
+                                    <property name="mnemonic_widget">pitchScale</property>
+                                    <accessibility>
+                                      <relation type="label-for" target="pitchScale"/>
+                                    </accessibility>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHScale" id="pitchScale">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="adjustment">adjustment1</property>
+                                    <property name="value_pos">right</property>
+                                    <accelerator key="t" signal="grab_focus" modifiers="GDK_MOD1_MASK"/>
+                                    <signal name="value_changed" handler="pitchValueChanged"/>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="y_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="volumeLabel">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">1</property>
+                                    <property name="xpad">3</property>
+                                    <property name="label" translatable="yes">Vo_lume:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="justify">right</property>
+                                    <property name="mnemonic_widget">volumeScale</property>
+                                    <accessibility>
+                                      <relation type="label-for" target="volumeScale"/>
+                                    </accessibility>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHScale" id="volumeScale">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="adjustment">adjustment3</property>
+                                    <property name="value_pos">right</property>
+                                    <accelerator key="l" signal="grab_focus" modifiers="GDK_MOD1_MASK"/>
+                                    <signal name="value_changed" handler="volumeValueChanged"/>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="y_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkAlignment" id="alignment48">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <object class="GtkHScale" id="rateScale">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="adjustment">adjustment2</property>
+                                        <property name="digits">0</property>
+                                        <property name="value_pos">right</property>
+                                        <accelerator key="r" signal="grab_focus" modifiers="GDK_MOD1_MASK"/>
+                                        <signal name="value_changed" handler="rateValueChanged"/>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                  </packing>
+                                </child>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                                <property name="y_options">fill</property>
+                                <property name="right_attach">3</property>
+                                <property name="x_padding">10</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkComboBox" id="voiceTypes">
+                              <object class="GtkTable" id="comboBoxTable">
                                 <property name="visible">True</property>
-                                <property name="add_tearoffs">False</property>
-                                <property name="focus_on_click">True</property>
-                                <accessibility>
-                                  <relation target="voiceSettingsLabel" type="labelled-by"/>
-                                </accessibility>
-                                <signal handler="voiceTypesChanged" last_modification_time="Fri, 28 Apr 2006 18:55:04 GMT" name="changed"/>
-                                <property name="model">model1</property>
+                                <property name="n_rows">4</property>
+                                <property name="n_columns">2</property>
+                                <property name="column_spacing">10</property>
                                 <child>
-                                  <object class="GtkCellRendererText" id="renderer1"/>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
+                                  <object class="GtkLabel" id="speechSystemsLabel">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">1</property>
+                                    <property name="label" translatable="yes">Speech _system:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="justify">right</property>
+                                    <property name="mnemonic_widget">speechSystems</property>
+                                    <accessibility>
+                                      <relation type="label-for" target="speechSystems"/>
+                                    </accessibility>
+                                  </object>
+                                  <packing>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkComboBox" id="speechSystems">
+                                    <property name="visible">True</property>
+                                    <signal name="changed" handler="speechSystemsChanged"/>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="speechServersLabel">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">1</property>
+                                    <property name="label" translatable="yes">Speech synthesi_zer:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="justify">right</property>
+                                    <property name="mnemonic_widget">speechServers</property>
+                                    <accessibility>
+                                      <relation type="label-for" target="speechServers"/>
+                                    </accessibility>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkComboBox" id="speechServers">
+                                    <property name="visible">True</property>
+                                    <signal name="changed" handler="speechServersChanged"/>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="y_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="voiceSettingsLabel">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">1</property>
+                                    <property name="label" translatable="yes">_Voice settings:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="justify">right</property>
+                                    <property name="mnemonic_widget">voiceTypes</property>
+                                    <accessibility>
+                                      <relation type="label-for" target="voiceTypes"/>
+                                    </accessibility>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkComboBox" id="voiceTypes">
+                                    <property name="visible">True</property>
+                                    <property name="model">model1</property>
+                                    <signal name="changed" handler="voiceTypesChanged"/>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="renderer1"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="y_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="familyLabel">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">1</property>
+                                    <property name="label" translatable="yes">_Person:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="justify">right</property>
+                                    <property name="mnemonic_widget">speechFamilies</property>
+                                    <accessibility>
+                                      <relation type="label-for" target="speechFamilies"/>
+                                    </accessibility>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkComboBox" id="speechFamilies">
+                                    <property name="visible">True</property>
+                                    <signal name="changed" handler="speechFamiliesChanged"/>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options">GTK_FILL</property>
+                                  </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                                <property name="y_options">fill</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                                <property name="y_padding">5</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkHBox" id="hbox35">
                                 <property name="visible">True</property>
-                                <property name="homogeneous">False</property>
-                                <property name="spacing">0</property>
                                 <child>
                                   <object class="GtkAlignment" id="alignment34">
                                     <property name="visible">True</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xscale">1</property>
-                                    <property name="yscale">1</property>
                                     <property name="top_padding">12</property>
-                                    <property name="bottom_padding">0</property>
-                                    <property name="left_padding">0</property>
-                                    <property name="right_padding">0</property>
                                     <child>
                                       <object class="GtkFrame" id="frame5">
                                         <property name="visible">True</property>
                                         <property name="label_xalign">0</property>
-                                        <property name="label_yalign">0.5</property>
-                                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                        <property name="shadow_type">none</property>
                                         <child>
                                           <object class="GtkAlignment" id="alignment32">
                                             <property name="visible">True</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xscale">1</property>
-                                            <property name="yscale">1</property>
-                                            <property name="top_padding">0</property>
-                                            <property name="bottom_padding">0</property>
                                             <property name="left_padding">12</property>
-                                            <property name="right_padding">0</property>
                                             <child>
                                               <object class="GtkTable" id="radioButtonTable">
                                                 <property name="visible">True</property>
                                                 <property name="n_rows">2</property>
                                                 <property name="n_columns">2</property>
-                                                <property name="homogeneous">False</property>
                                                 <child>
                                                   <object class="GtkRadioButton" id="noneButton">
+                                                    <property name="label" translatable="yes">_None</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
-                                                    <property name="label" translatable="yes">_None</property>
+                                                    <property name="receives_default">False</property>
                                                     <property name="use_underline">True</property>
-                                                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                                                    <property name="focus_on_click">True</property>
-                                                    <property name="active">False</property>
-                                                    <property name="inconsistent">False</property>
+                                                    <property name="active">True</property>
                                                     <property name="draw_indicator">True</property>
-                                                    <signal handler="punctuationLevelChanged" last_modification_time="Thu, 27 Apr 2006 14:59:34 GMT" name="toggled"/>
+                                                    <signal name="toggled" handler="punctuationLevelChanged"/>
                                                   </object>
                                                   <packing>
-                                                    <property name="left_attach">0</property>
-                                                    <property name="right_attach">1</property>
-                                                    <property name="top_attach">0</property>
-                                                    <property name="bottom_attach">1</property>
+                                                    <property name="y_options"></property>
                                                   </packing>
                                                 </child>
                                                 <child>
                                                   <object class="GtkRadioButton" id="someButton">
+                                                    <property name="label" translatable="yes">So_me</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
-                                                    <property name="label" translatable="yes">So_me</property>
+                                                    <property name="receives_default">False</property>
                                                     <property name="use_underline">True</property>
-                                                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                                                    <property name="focus_on_click">True</property>
-                                                    <property name="active">False</property>
-                                                    <property name="inconsistent">False</property>
                                                     <property name="draw_indicator">True</property>
                                                     <property name="group">noneButton</property>
-                                                    <signal handler="punctuationLevelChanged" last_modification_time="Thu, 27 Apr 2006 14:59:42 GMT" name="toggled"/>
+                                                    <signal name="toggled" handler="punctuationLevelChanged"/>
                                                   </object>
                                                   <packing>
-                                                    <property name="left_attach">0</property>
-                                                    <property name="right_attach">1</property>
                                                     <property name="top_attach">1</property>
                                                     <property name="bottom_attach">2</property>
+                                                    <property name="y_options"></property>
                                                   </packing>
                                                 </child>
                                                 <child>
                                                   <object class="GtkRadioButton" id="mostButton">
+                                                    <property name="label" translatable="yes">M_ost</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
-                                                    <property name="label" translatable="yes">M_ost</property>
+                                                    <property name="receives_default">False</property>
                                                     <property name="use_underline">True</property>
-                                                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                                                    <property name="focus_on_click">True</property>
-                                                    <property name="active">False</property>
-                                                    <property name="inconsistent">False</property>
                                                     <property name="draw_indicator">True</property>
                                                     <property name="group">noneButton</property>
-                                                    <signal handler="punctuationLevelChanged" last_modification_time="Thu, 22 Jun 2006 14:15:29 GMT" name="toggled"/>
+                                                    <signal name="toggled" handler="punctuationLevelChanged"/>
                                                   </object>
                                                   <packing>
                                                     <property name="left_attach">1</property>
                                                     <property name="right_attach">2</property>
-                                                    <property name="top_attach">0</property>
-                                                    <property name="bottom_attach">1</property>
+                                                    <property name="y_options"></property>
                                                   </packing>
                                                 </child>
                                                 <child>
                                                   <object class="GtkRadioButton" id="allButton">
+                                                    <property name="label" translatable="yes">_All</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
-                                                    <property name="label" translatable="yes">_All</property>
+                                                    <property name="receives_default">False</property>
                                                     <property name="use_underline">True</property>
-                                                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                                                    <property name="focus_on_click">True</property>
-                                                    <property name="active">False</property>
-                                                    <property name="inconsistent">False</property>
                                                     <property name="draw_indicator">True</property>
                                                     <property name="group">noneButton</property>
-                                                    <signal handler="punctuationLevelChanged" last_modification_time="Thu, 27 Apr 2006 14:59:51 GMT" name="toggled"/>
+                                                    <signal name="toggled" handler="punctuationLevelChanged"/>
                                                   </object>
                                                   <packing>
                                                     <property name="left_attach">1</property>
                                                     <property name="right_attach">2</property>
                                                     <property name="top_attach">1</property>
                                                     <property name="bottom_attach">2</property>
+                                                    <property name="y_options"></property>
                                                   </packing>
                                                 </child>
                                               </object>
@@ -986,101 +826,66 @@
                                           <object class="GtkLabel" id="punctuationLabel">
                                             <property name="visible">True</property>
                                             <property name="label" translatable="yes">&lt;b&gt;Punctuation Level&lt;/b&gt;</property>
-                                            <property name="use_underline">False</property>
                                             <property name="use_markup">True</property>
-                                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                            <property name="wrap">False</property>
-                                            <property name="selectable">False</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xpad">0</property>
-                                            <property name="ypad">0</property>
-                                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                            <property name="width_chars">-1</property>
-                                            <property name="single_line_mode">False</property>
-                                            <property name="angle">0</property>
                                           </object>
                                         </child>
                                       </object>
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkAlignment" id="alignment35">
                                     <property name="visible">True</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xscale">1</property>
-                                    <property name="yscale">1</property>
                                     <property name="top_padding">12</property>
-                                    <property name="bottom_padding">0</property>
-                                    <property name="left_padding">0</property>
-                                    <property name="right_padding">0</property>
                                     <child>
                                       <object class="GtkFrame" id="frame6">
                                         <property name="visible">True</property>
                                         <property name="label_xalign">0</property>
-                                        <property name="label_yalign">0.5</property>
-                                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                        <property name="shadow_type">none</property>
                                         <child>
                                           <object class="GtkAlignment" id="alignment33">
                                             <property name="visible">True</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xscale">1</property>
-                                            <property name="yscale">1</property>
-                                            <property name="top_padding">0</property>
-                                            <property name="bottom_padding">0</property>
                                             <property name="left_padding">12</property>
-                                            <property name="right_padding">0</property>
                                             <child>
                                               <object class="GtkVBox" id="vbox17">
-                                                <property name="border_width">3</property>
                                                 <property name="visible">True</property>
-                                                <property name="homogeneous">False</property>
-                                                <property name="spacing">0</property>
+                                                <property name="border_width">3</property>
+                                                <property name="orientation">vertical</property>
                                                 <child>
                                                   <object class="GtkRadioButton" id="speechBriefButton">
+                                                    <property name="label" translatable="yes">Brie_f</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
-                                                    <property name="label" translatable="yes">Brie_f</property>
+                                                    <property name="receives_default">False</property>
                                                     <property name="use_underline">True</property>
-                                                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                                                    <property name="focus_on_click">True</property>
-                                                    <property name="active">False</property>
-                                                    <property name="inconsistent">False</property>
+                                                    <property name="active">True</property>
                                                     <property name="draw_indicator">True</property>
-                                                    <signal handler="speechVerbosityChanged" last_modification_time="Thu, 27 Apr 2006 14:44:54 GMT" name="toggled"/>
+                                                    <signal name="toggled" handler="speechVerbosityChanged"/>
                                                   </object>
                                                   <packing>
-                                                    <property name="padding">0</property>
                                                     <property name="expand">False</property>
                                                     <property name="fill">False</property>
+                                                    <property name="position">0</property>
                                                   </packing>
                                                 </child>
                                                 <child>
                                                   <object class="GtkRadioButton" id="speechVerboseButton">
+                                                    <property name="label" translatable="yes">Ver_bose</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
-                                                    <property name="label" translatable="yes">Ver_bose</property>
+                                                    <property name="receives_default">False</property>
                                                     <property name="use_underline">True</property>
-                                                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                                                    <property name="focus_on_click">True</property>
-                                                    <property name="active">False</property>
-                                                    <property name="inconsistent">False</property>
                                                     <property name="draw_indicator">True</property>
                                                     <property name="group">speechBriefButton</property>
-                                                    <signal handler="speechVerbosityChanged" last_modification_time="Thu, 27 Apr 2006 14:45:04 GMT" name="toggled"/>
+                                                    <signal name="toggled" handler="speechVerbosityChanged"/>
                                                   </object>
                                                   <packing>
-                                                    <property name="padding">0</property>
                                                     <property name="expand">False</property>
                                                     <property name="fill">False</property>
+                                                    <property name="position">1</property>
                                                   </packing>
                                                 </child>
                                               </object>
@@ -1091,101 +896,66 @@
                                           <object class="GtkLabel" id="speechVerbosityLabel">
                                             <property name="visible">True</property>
                                             <property name="label" translatable="yes">&lt;b&gt;Verbosity&lt;/b&gt;</property>
-                                            <property name="use_underline">False</property>
                                             <property name="use_markup">True</property>
-                                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                            <property name="wrap">False</property>
-                                            <property name="selectable">False</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xpad">0</property>
-                                            <property name="ypad">0</property>
-                                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                            <property name="width_chars">-1</property>
-                                            <property name="single_line_mode">False</property>
-                                            <property name="angle">0</property>
                                           </object>
                                         </child>
                                       </object>
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkAlignment" id="alignment45">
                                     <property name="visible">True</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xscale">1</property>
-                                    <property name="yscale">1</property>
                                     <property name="top_padding">12</property>
-                                    <property name="bottom_padding">0</property>
-                                    <property name="left_padding">0</property>
-                                    <property name="right_padding">0</property>
                                     <child>
                                       <object class="GtkFrame" id="frame8">
                                         <property name="visible">True</property>
                                         <property name="label_xalign">0</property>
-                                        <property name="label_yalign">0.5</property>
-                                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                        <property name="shadow_type">none</property>
                                         <child>
                                           <object class="GtkAlignment" id="alignment46">
                                             <property name="visible">True</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xscale">1</property>
-                                            <property name="yscale">1</property>
-                                            <property name="top_padding">0</property>
-                                            <property name="bottom_padding">0</property>
                                             <property name="left_padding">12</property>
-                                            <property name="right_padding">0</property>
                                             <child>
                                               <object class="GtkVBox" id="vbox21">
-                                                <property name="border_width">3</property>
                                                 <property name="visible">True</property>
-                                                <property name="homogeneous">False</property>
-                                                <property name="spacing">0</property>
+                                                <property name="border_width">3</property>
+                                                <property name="orientation">vertical</property>
                                                 <child>
                                                   <object class="GtkRadioButton" id="cellSpeechButton">
+                                                    <property name="label" translatable="yes" comments="Translators: This is one of two options available in the Preferences dialog for the Table Rows setting. If chosen, Orca will speak just the new cell when the user arrows Up or Down in a table.">Speak _cell</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
-                                                    <property name="label" translatable="yes">Speak current _cell</property>
+                                                    <property name="receives_default">False</property>
                                                     <property name="use_underline">True</property>
-                                                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                                                    <property name="focus_on_click">True</property>
-                                                    <property name="active">False</property>
-                                                    <property name="inconsistent">False</property>
+                                                    <property name="active">True</property>
                                                     <property name="draw_indicator">True</property>
-                                                    <signal handler="tableSpeechChanged" last_modification_time="Wed, 21 Jun 2006 20:44:01 GMT" name="toggled"/>
+                                                    <signal name="toggled" handler="tableSpeechChanged"/>
                                                   </object>
                                                   <packing>
-                                                    <property name="padding">0</property>
                                                     <property name="expand">False</property>
                                                     <property name="fill">False</property>
+                                                    <property name="position">0</property>
                                                   </packing>
                                                 </child>
                                                 <child>
                                                   <object class="GtkRadioButton" id="rowSpeechButton">
+                                                    <property name="label" translatable="yes" comments="Translators: This is one of two options available in the Preferences dialog for the Table Rows setting. If chosen, Orca will speak the entire row when the user arrows Up or Down in a table.">Speak ro_w</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
-                                                    <property name="label" translatable="yes">Speak current ro_w</property>
+                                                    <property name="receives_default">False</property>
                                                     <property name="use_underline">True</property>
-                                                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                                                    <property name="focus_on_click">True</property>
-                                                    <property name="active">True</property>
-                                                    <property name="inconsistent">False</property>
                                                     <property name="draw_indicator">True</property>
                                                     <property name="group">cellSpeechButton</property>
-                                                    <signal handler="tableSpeechChanged" last_modification_time="Wed, 21 Jun 2006 20:44:22 GMT" name="toggled"/>
+                                                    <signal name="toggled" handler="tableSpeechChanged"/>
                                                   </object>
                                                   <packing>
-                                                    <property name="padding">0</property>
                                                     <property name="expand">False</property>
                                                     <property name="fill">False</property>
+                                                    <property name="position">1</property>
                                                   </packing>
                                                 </child>
                                               </object>
@@ -1195,240 +965,217 @@
                                         <child type="label">
                                           <object class="GtkLabel" id="label24">
                                             <property name="visible">True</property>
-                                            <property name="label" translatable="yes">&lt;b&gt;Table Row Speech&lt;/b&gt;</property>
-                                            <property name="use_underline">False</property>
+                                            <property name="label" translatable="yes" comments="Translators: This is label in the Preferences dialog box. It refers to what Orca will speak when the user arrows Up or Down in a table. The choices are to speak just the new cell or to speak the entire row.">&lt;b&gt;Table Rows&lt;/b&gt;</property>
                                             <property name="use_markup">True</property>
-                                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                            <property name="wrap">False</property>
-                                            <property name="selectable">False</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xpad">0</property>
-                                            <property name="ypad">0</property>
-                                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                            <property name="width_chars">-1</property>
-                                            <property name="single_line_mode">False</property>
-                                            <property name="angle">0</property>
                                           </object>
                                         </child>
                                       </object>
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
+                                    <property name="position">2</property>
                                   </packing>
                                 </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">7</property>
-                                <property name="bottom_attach">8</property>
-                                <property name="x_options">fill</property>
-                                <property name="y_options">fill</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="familyLabel">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">_Person:</property>
-                                <property name="use_underline">True</property>
-                                <property name="use_markup">False</property>
-                                <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                                <property name="wrap">False</property>
-                                <property name="selectable">False</property>
-                                <property name="xalign">1</property>
-                                <property name="yalign">0.5</property>
-                                <property name="xpad">0</property>
-                                <property name="ypad">0</property>
-                                <property name="mnemonic_widget">speechFamilies</property>
-                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                <property name="width_chars">-1</property>
-                                <property name="single_line_mode">False</property>
-                                <property name="angle">0</property>
-                                <accessibility>
-                                  <relation target="speechFamilies" type="label-for"/>
-                                </accessibility>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="right_attach">1</property>
-                                <property name="top_attach">3</property>
-                                <property name="bottom_attach">4</property>
-                                <property name="x_options">fill</property>
-                                <property name="y_options"/>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkComboBox" id="speechFamilies">
-                                <property name="visible">True</property>
-                                <property name="add_tearoffs">False</property>
-                                <property name="focus_on_click">True</property>
-                                <accessibility>
-                                  <relation target="familyLabel" type="labelled-by"/>
-                                </accessibility>
-                                <signal handler="speechFamiliesChanged" last_modification_time="Fri, 28 Apr 2006 18:55:50 GMT" name="changed"/>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">3</property>
-                                <property name="bottom_attach">4</property>
-                                <property name="x_options">fill</property>
-                                <property name="y_options">fill</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkAlignment" id="alignment48">
-                                <property name="visible">True</property>
-                                <property name="xalign">0.5</property>
-                                <property name="yalign">0.5</property>
-                                <property name="xscale">1</property>
-                                <property name="yscale">1</property>
-                                <property name="top_padding">12</property>
-                                <property name="bottom_padding">0</property>
-                                <property name="left_padding">0</property>
-                                <property name="right_padding">0</property>
                                 <child>
-                                  <object class="GtkHScale" id="rateScale">
+                                  <object class="GtkAlignment" id="alignment1">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="draw_value">True</property>
-                                    <property name="value_pos">GTK_POS_RIGHT</property>
-                                    <property name="digits">0</property>
-                                    <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-                                    <property name="inverted">False</property>
-                                    <property name="adjustment">adjustment2</property>
-                                    <accessibility>
-                                      <relation target="rateLabel" type="labelled-by"/>
-                                    </accessibility>
-                                    <signal handler="rateValueChanged" last_modification_time="Wed, 26 Apr 2006 18:48:00 GMT" name="value_changed"/>
-                                    <accelerator key="r" modifiers="GDK_MOD1_MASK" signal="grab_focus"/>
+                                    <property name="top_padding">12</property>
+                                    <child>
+                                      <object class="GtkFrame" id="frame1">
+                                        <property name="visible">True</property>
+                                        <property name="label_xalign">0</property>
+                                        <property name="shadow_type">none</property>
+                                        <child>
+                                          <object class="GtkAlignment" id="alignment2">
+                                            <property name="visible">True</property>
+                                            <property name="yalign">0</property>
+                                            <property name="left_padding">12</property>
+                                            <child>
+                                              <object class="GtkHBox" id="hbox1">
+                                                <property name="visible">True</property>
+                                                <child>
+                                                  <object class="GtkAlignment" id="alignment3">
+                                                    <property name="visible">True</property>
+                                                    <property name="yalign">0</property>
+                                                    <property name="yscale">0</property>
+                                                    <property name="top_padding">3</property>
+                                                    <child>
+                                                      <object class="GtkCheckButton" id="speechProgressBarCheckbutton">
+                                                        <property name="label" translatable="yes" context="ProgressBarUpdates" comments="Translators: This is an option in the Preferences dialog box related to the speaking of progress bar information. If checked, Orca will speak progress bar information.">Enable_d</property>
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="receives_default">False</property>
+                                                        <property name="use_underline">True</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="yalign">0</property>
+                                                        <property name="active">True</property>
+                                                        <property name="draw_indicator">True</property>
+                                                        <signal name="toggled" handler="speechProgressBarChecked"/>
+                                                      </object>
+                                                    </child>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="position">0</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkVBox" id="progressBarVBox">
+                                                    <property name="visible">True</property>
+                                                    <property name="orientation">vertical</property>
+                                                    <child>
+                                                      <object class="GtkHBox" id="speakUpdateIntervalHBox">
+                                                        <property name="visible">True</property>
+                                                        <property name="spacing">3</property>
+                                                        <child>
+                                                          <object class="GtkLabel" id="speakProgressBarLabel">
+                                                            <property name="visible">True</property>
+                                                            <property name="label" translatable="yes" context="ProgressBar" comments="Translators: Here this is a label for a spin button through which a user can customize the frequency in seconds an announcement should be made regarding the current value of a progress bar.">Frequency (secs):</property>
+                                                            <property name="use_underline">True</property>
+                                                            <property name="mnemonic_widget">speakProgressBarSpinButton</property>
+                                                            <accessibility>
+                                                            <relation type="label-for" target="speakProgressBarSpinButton"/>
+                                                            </accessibility>
+                                                          </object>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">False</property>
+                                                            <property name="position">0</property>
+                                                          </packing>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkSpinButton" id="speakProgressBarSpinButton">
+                                                            <property name="visible">True</property>
+                                                            <property name="can_focus">True</property>
+                                                            <property name="invisible_char">&#x25CF;</property>
+                                                            <property name="adjustment">adjustment4</property>
+                                                            <property name="climb_rate">1</property>
+                                                            <property name="numeric">True</property>
+                                                            <accessibility>
+                                                            <relation type="labelled-by" target="speakProgressBarLabel"/>
+                                                            </accessibility>
+                                                            <signal name="value_changed" handler="speakProgressBarValueChanged"/>
+                                                          </object>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="position">1</property>
+                                                          </packing>
+                                                        </child>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="expand">False</property>
+                                                        <property name="fill">False</property>
+                                                        <property name="position">0</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkHBox" id="progressBarVerbosityHBox">
+                                                        <property name="visible">True</property>
+                                                        <child>
+                                                          <object class="GtkLabel" id="progressBarVerbosityLabel">
+                                                            <property name="visible">True</property>
+                                                            <property name="label" translatable="yes" comments="Translators: Orca has a setting which determines which progress bar updates should be announced. The options are all progress bars, only progress bars in the active application, or only progress bars in the current window.">Restrict to:</property>
+                                                            <accessibility>
+                                                            <relation type="label-for" target="progressBarVerbosity"/>
+                                                            </accessibility>
+                                                          </object>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="position">0</property>
+                                                          </packing>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkComboBox" id="progressBarVerbosity">
+                                                            <property name="visible">True</property>
+                                                            <property name="model">model7</property>
+                                                            <accessibility>
+                                                            <relation type="labelled-by" target="progressBarVerbosityLabel"/>
+                                                            </accessibility>
+                                                            <signal name="changed" handler="progressBarVerbosityChanged"/>
+                                                            <child>
+                                                            <object class="GtkCellRendererText" id="renderer33"/>
+                                                            <attributes>
+                                                            <attribute name="text">0</attribute>
+                                                            </attributes>
+                                                            </child>
+                                                          </object>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">False</property>
+                                                            <property name="padding">3</property>
+                                                            <property name="position">1</property>
+                                                          </packing>
+                                                        </child>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="position">1</property>
+                                                      </packing>
+                                                    </child>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="position">1</property>
+                                                  </packing>
+                                                </child>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child type="label">
+                                          <object class="GtkLabel" id="label1">
+                                            <property name="visible">True</property>
+                                            <property name="label" translatable="yes" comments="Translators: This is a label in the Preferences dialog box. It applies to several options related to which progress bars Orca should speak and how often Orca should speak them.">&lt;b&gt;Progress Bar Updates&lt;/b&gt;</property>
+                                            <property name="use_markup">True</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
                                   </object>
+                                  <packing>
+                                    <property name="position">3</property>
+                                  </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">4</property>
-                                <property name="bottom_attach">5</property>
-                                <property name="x_options">fill</property>
-                                <property name="y_options">fill</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkHScale" id="volumeScale">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="draw_value">True</property>
-                                <property name="value_pos">GTK_POS_RIGHT</property>
-                                <property name="digits">1</property>
-                                <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-                                <property name="inverted">False</property>
-                                <property name="adjustment">adjustment3</property>
-                                <accessibility>
-                                  <relation target="volumeLabel" type="labelled-by"/>
-                                </accessibility>
-                                <signal handler="volumeValueChanged" last_modification_time="Wed, 26 Apr 2006 18:48:39 GMT" name="value_changed"/>
-                                <accelerator key="l" modifiers="GDK_MOD1_MASK" signal="grab_focus"/>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">6</property>
-                                <property name="bottom_attach">7</property>
-                                <property name="x_options">fill</property>
-                                <property name="y_options">fill</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="rateLabel">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">_Rate:</property>
-                                <property name="use_underline">True</property>
-                                <property name="use_markup">False</property>
-                                <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                                <property name="wrap">False</property>
-                                <property name="selectable">False</property>
-                                <property name="xalign">1</property>
-                                <property name="yalign">0.75</property>
-                                <property name="xpad">3</property>
-                                <property name="ypad">0</property>
-                                <property name="mnemonic_widget">rateScale</property>
-                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                <property name="width_chars">-1</property>
-                                <property name="single_line_mode">False</property>
-                                <property name="angle">0</property>
-                                <accessibility>
-                                  <relation target="rateScale" type="label-for"/>
-                                </accessibility>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="right_attach">1</property>
-                                <property name="top_attach">4</property>
-                                <property name="bottom_attach">5</property>
-                                <property name="x_options">fill</property>
+                                <property name="right_attach">3</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options">GTK_FILL</property>
+                                <property name="y_padding">3</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="padding">0</property>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkTable" id="checkBoxTable">
                             <property name="visible">True</property>
-                            <property name="n_rows">5</property>
+                            <property name="n_rows">4</property>
                             <property name="n_columns">2</property>
                             <child>
-                              <object class="GtkCheckButton" id="speechIndentationCheckbutton">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">Speak _indentation and justification</property>
-                                <property name="use_underline">True</property>
-                                <property name="relief">GTK_RELIEF_NORMAL</property>
-                                <property name="focus_on_click">True</property>
-                                <property name="active">False</property>
-                                <property name="inconsistent">False</property>
-                                <property name="draw_indicator">True</property>
-                                <signal handler="speechIndentationChecked" last_modification_time="Mon, 19 Jun 2006 15:46:40 GMT" name="toggled"/>
-                              </object>
-                              <packing>
-                                <property name="top_attach">3</property>
-                                <property name="bottom_attach">4</property>
-                              </packing>
-                            </child>
-                            <child>
                               <object class="GtkCheckButton" id="speakBlankLinesCheckButton">
+                                <property name="label" translatable="yes">Speak blank lines</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">Speak blank lines</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="relief">GTK_RELIEF_NORMAL</property>
-                                <property name="focus_on_click">True</property>
                                 <property name="active">True</property>
-                                <property name="inconsistent">False</property>
                                 <property name="draw_indicator">True</property>
-                                <signal handler="speakBlankLinesChecked" last_modification_time="Wed, 01 Nov 2006 01:09:29 GMT" name="toggled"/>
+                                <signal name="toggled" handler="speakBlankLinesChecked"/>
                               </object>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" id="speakMultiCaseAsWordsCheckButton">
+                              <object class="GtkCheckButton" id="speechIndentationCheckbutton">
+                                <property name="label" translatable="yes">Speak _indentation and justification</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property comments="Translators: multicase strings are StringsWithWordsMashedTogetherLikeThis." name="label" translatable="yes">Speak multicase strings as wor_ds</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="relief">GTK_RELIEF_NORMAL</property>
-                                <property name="focus_on_click">True</property>
-                                <property name="active">True</property>
-                                <property name="inconsistent">False</property>
                                 <property name="draw_indicator">True</property>
-                                <signal handler="speakMultiCaseStringsToggled" last_modification_time="Sun, 23 Nov 2008 18:38:04 GMT" name="toggled"/>
+                                <signal name="toggled" handler="speechIndentationChecked"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -1436,36 +1183,33 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" id="speakTutorialMessagesCheckButton">
+                              <object class="GtkCheckButton" id="speakMnemonicsCheckButton">
+                                <property name="label" translatable="yes">Spea_k object mnemonics</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">Speak tutorial messages</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="relief">GTK_RELIEF_NORMAL</property>
-                                <property name="focus_on_click">True</property>
                                 <property name="active">True</property>
-                                <property name="inconsistent">False</property>
                                 <property name="draw_indicator">True</property>
-                                <signal handler="speakTutorialMessagesToggled" last_modification_time="Mon, 04 Aug 2008 17:11:04 GMT" name="toggled"/>
+                                <signal name="toggled" handler="mnemonicSpeakingChecked"/>
                               </object>
                               <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" id="pauseBreaksCheckButton">
+                              <object class="GtkCheckButton" id="speakTutorialMessagesCheckButton">
+                                <property name="label" translatable="yes">Speak tutorial messages</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property comments="Translators: different speech systems and speech engines work differently when it comes to handling pauses (e.g., sentence boundaries).  This property allows the user to specify whether speech should be sent to the speech synthesis system immediately when a pause directive is enountered or if it should be queued up and sent to the speech synthesis system once the entire set of utterances has been calculated." name="label" translatable="yes">Break speech into ch_unks between pauses</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="relief">GTK_RELIEF_NORMAL</property>
-                                <property name="focus_on_click">True</property>
                                 <property name="active">True</property>
-                                <property name="inconsistent">False</property>
-                                <property name="inconsistent">False</property>
                                 <property name="draw_indicator">True</property>
-                                <signal handler="pauseBreaksToggled" last_modification_time="Mon, 04 Aug 2008 17:11:04 GMT" name="toggled"/>
+                                <signal name="toggled" handler="speakTutorialMessagesToggled"/>
                               </object>
                               <packing>
                                 <property name="top_attach">2</property>
@@ -1474,15 +1218,14 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="speakPositionCheckButton">
+                                <property name="label" translatable="yes" comments="Translators: This checkbox toggles whether or not Orca says the child position (e.g., 'item 6 of 7').">Speak child p_osition</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property comments="Translators: This checkbox toggles whether or not Orca says the child position (e.g., 'item 6 of 7')." name="label" translatable="yes">Speak child p_osition</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="relief">GTK_RELIEF_NORMAL</property>
-                                <property name="focus_on_click">True</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
-                                <signal handler="speakPositionToggled" last_modification_time="Mon, 27 Jul 2009 09:34:04 GMT" name="toggled"/>
+                                <signal name="toggled" handler="speakPositionToggled"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -1492,33 +1235,45 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" id="speakMnemonicsCheckButton">
+                              <object class="GtkCheckButton" id="speakMultiCaseAsWordsCheckButton">
+                                <property name="label" translatable="yes" comments="Translators: multicase strings are StringsWithWordsMashedTogetherLikeThis.">Speak multicase strings as wor_ds</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">Spea_k object mnemonics</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="relief">GTK_RELIEF_NORMAL</property>
-                                <property name="focus_on_click">True</property>
                                 <property name="active">True</property>
-                                <property name="inconsistent">False</property>
                                 <property name="draw_indicator">True</property>
-                                <signal handler="mnemonicSpeakingChecked" last_modification_time="Mon, 04 Aug 2008 17:11:04 GMT" name="toggled"/>
+                                <signal name="toggled" handler="speakMultiCaseStringsToggled"/>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
                               </packing>
                             </child>
                             <child>
+                              <object class="GtkCheckButton" id="pauseBreaksCheckButton">
+                                <property name="label" translatable="yes" comments="Translators: different speech systems and speech engines work differently when it comes to handling pauses (e.g., sentence boundaries).  This property allows the user to specify whether speech should be sent to the speech synthesis system immediately when a pause directive is enountered or if it should be queued up and sent to the speech synthesis system once the entire set of utterances has been calculated.">Break speech into ch_unks between pauses</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="pauseBreaksToggled"/>
+                              </object>
+                              <packing>
+                                <property name="top_attach">3</property>
+                                <property name="bottom_attach">4</property>
+                              </packing>
+                            </child>
+                            <child>
                               <object class="GtkHBox" id="hbox39">
                                 <property name="visible">True</property>
                                 <property name="spacing">3</property>
                                 <child>
                                   <object class="GtkLabel" id="sayAllLabel">
                                     <property name="visible">True</property>
-                                    <property comments="Translators: Say all by refers to the way that Orca will say (speak) an amount of text -- in particular, where Orca where insert pauses. There are currently two choices (supplied by a combo box to the right of this label): say all by sentence and  say all by line.  If Orca were speaking a work of fiction, it's probably best to do say all by sentence so it sound more natural. If Orca were speaking something like a page of computer commands, doing a say all by line would work better." name="label" translatable="yes">Say All B_y:</property>
+                                    <property name="label" translatable="yes" comments="Translators: Say all by refers to the way that Orca will say (speak) an amount of text -- in particular, where Orca where insert pauses. There are currently two choices (supplied by a combo box to the right of this label): say all by sentence and  say all by line.  If Orca were speaking a work of fiction, it's probably best to do say all by sentence so it sound more natural. If Orca were speaking something like a page of computer commands, doing a say all by line would work better.">Say All B_y:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">sayAllStyle</property>
                                     <accessibility>
@@ -1555,147 +1310,10 @@
                                 </child>
                               </object>
                               <packing>
-                                <property name="top_attach">4</property>
-                                <property name="bottom_attach">5</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkVBox" id="progressBarVBox">
-                                <property name="visible">True</property>
-                                <child>
-                                  <object class="GtkHBox" id="hbox43">
-                                    <property name="visible">True</property>
-                                    <child>
-                                      <object class="GtkCheckButton" id="speechProgressBarCheckbutton">
-                                        <property name="label" translatable="yes">Speak progress bar _updates</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="active">True</property>
-                                        <property name="draw_indicator">True</property>
-                                        <signal name="toggled" handler="speechProgressBarChecked"/>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkHBox" id="speakUpdateIntervalHBox">
-                                        <property name="visible">True</property>
-                                        <property name="spacing">3</property>
-                                        <child>
-                                          <object class="GtkLabel" id="speakProgressBarLabel">
-                                            <property name="visible">True</property>
-                                            <property name="label" comments="Translators: Here 'every' labels a spin button through which a user can customize the frequency in seconds an announcement should be made. (The spin button is followed by the label 'seconds'.) Thus if a user chooses 5 in the spin button, the complete phrase would be 'every 5 seconds'." translatable="yes">every</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="mnemonic_widget">speakProgressBarSpinButton</property>
-                                            <accessibility>
-                                              <relation type="label-for" target="speakProgressBarSpinButton"/>
-                                            </accessibility>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">False</property>
-                                            <property name="position">0</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSpinButton" id="speakProgressBarSpinButton">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="invisible_char">&#x25CF;</property>
-                                            <property name="adjustment">adjustment4</property>
-                                            <property name="climb_rate">1</property>
-                                            <property name="numeric">True</property>
-                                            <accessibility>
-                                              <relation type="labelled-by" target="speakProgressBarUnitsLabel"/>
-                                              <relation type="labelled-by" target="speakProgressBarLabel"/>
-                                            </accessibility>
-                                            <signal name="value_changed" handler="speakProgressBarValueChanged"/>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="speakProgressBarUnitsLabel">
-                                            <property name="visible">True</property>
-                                            <property name="label" translatable="yes">seconds</property>
-                                            <accessibility>
-                                              <relation type="label-for" target="speakProgressBarSpinButton"/>
-                                            </accessibility>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">False</property>
-                                            <property name="position">2</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkHBox" id="progressBarVerbosityHBox">
-                                    <property name="visible">True</property>
-                                    <child>
-                                      <object class="GtkLabel" id="progressBarVerbosityLabel">
-                                        <property name="visible">True</property>
-                                        <property name="label" translatable="yes" comments="Translators: Orca has a setting which determines which progress bar updates should be announced. The options are all progress bars, only progress bars in the active application, or only progress bars in the current window.">Restrict progress bar updates to:</property>
-                                        <accessibility>
-                                          <relation type="label-for" target="progressBarVerbosity"/>
-                                        </accessibility>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkComboBox" id="progressBarVerbosity">
-                                        <property name="visible">True</property>
-                                        <property name="model">model7</property>
-                                        <accessibility>
-                                          <relation type="labelled-by" target="progressBarVerbosityLabel"/>
-                                        </accessibility>
-                                        <signal name="changed" handler="progressBarVerbosityChanged"/>
-                                        <child>
-                                          <object class="GtkCellRendererText" id="renderer33"/>
-                                          <attributes>
-                                            <attribute name="text">0</attribute>
-                                          </attributes>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="padding">3</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
                                 <property name="top_attach">3</property>
-                                <property name="bottom_attach">5</property>
+                                <property name="bottom_attach">4</property>
                               </packing>
                             </child>
                           </object>
@@ -1722,441 +1340,303 @@
                   <object class="GtkLabel" id="speechTabLabel">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">Speech</property>
-                    <property name="use_underline">False</property>
-                    <property name="use_markup">False</property>
-                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                    <property name="wrap">False</property>
-                    <property name="selectable">False</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xpad">0</property>
-                    <property name="ypad">0</property>
-                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                    <property name="width_chars">-1</property>
-                    <property name="single_line_mode">False</property>
-                    <property name="angle">0</property>
                   </object>
+                  <packing>
+                    <property name="position">1</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
                 </child>
                 <child>
                   <object class="GtkVBox" id="brailleVbox">
-                    <property name="border_width">12</property>
                     <property name="visible">True</property>
-                    <property name="homogeneous">False</property>
+                    <property name="border_width">12</property>
+                    <property name="orientation">vertical</property>
                     <property name="spacing">12</property>
                     <child>
-                      <object class="GtkVBox" id="vbox23">
+                      <object class="GtkTable" id="table2">
                         <property name="visible">True</property>
-                        <property name="homogeneous">False</property>
-                        <property name="spacing">0</property>
-                        <child>
-                          <object class="GtkCheckButton" id="brailleSupportCheckbutton">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Enable Braille _support</property>
-                            <property name="use_underline">True</property>
-                            <property name="relief">GTK_RELIEF_NORMAL</property>
-                            <property name="focus_on_click">True</property>
-                            <property name="active">True</property>
-                            <property name="inconsistent">False</property>
-                            <property name="draw_indicator">True</property>
-                            <signal handler="brailleSupportChecked" last_modification_time="Thu, 20 Apr 2006 15:27:27 GMT" name="toggled"/>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
+                        <property name="n_rows">2</property>
+                        <property name="n_columns">2</property>
+                        <property name="row_spacing">12</property>
                         <child>
-                          <object class="GtkCheckButton" id="brailleMonitorCheckbutton">
+                          <object class="GtkVBox" id="vbox23">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Enable Braille _monitor</property>
-                            <property name="use_underline">True</property>
-                            <property name="relief">GTK_RELIEF_NORMAL</property>
-                            <property name="focus_on_click">True</property>
-                            <property name="active">False</property>
-                            <property name="inconsistent">False</property>
-                            <property name="draw_indicator">True</property>
-                            <signal handler="brailleMonitorChecked" last_modification_time="Thu, 20 Apr 2006 15:27:39 GMT" name="toggled"/>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="abbrevRolenames">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">_Abbreviated role names</property>
-                            <property name="use_underline">True</property>
-                            <property name="relief">GTK_RELIEF_NORMAL</property>
-                            <property name="focus_on_click">True</property>
-                            <property name="active">False</property>
-                            <property name="inconsistent">False</property>
-                            <property name="draw_indicator">True</property>
-                            <signal handler="abbrevRolenamesChecked" last_modification_time="Thu, 27 Apr 2006 14:39:01 GMT" name="toggled"/>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="disableBrailleEOL">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Disable _end of line symbol</property>
-                            <property name="use_underline">True</property>
-                            <property name="relief">GTK_RELIEF_NORMAL</property>
-                            <property name="focus_on_click">True</property>
-                            <property name="active">False</property>
-                            <property name="inconsistent">False</property>
-                            <property name="draw_indicator">True</property>
-                            <signal handler="disableBrailleEOLChecked" last_modification_time="Thu, 21 May 2008 14:39:01 GMT" name="toggled"/>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkFrame" id="contractedBrailleFrame">
-                        <property name="visible">True</property>
-                        <property name="label_xalign">0</property>
-                        <property name="label_yalign">0.5</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
-                        <child>
-                          <object class="GtkAlignment" id="alignment87">
-                            <property name="visible">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xscale">1</property>
-                            <property name="yscale">1</property>
-                            <property name="top_padding">0</property>
-                            <property name="bottom_padding">0</property>
-                            <property name="left_padding">12</property>
-                            <property name="right_padding">0</property>
+                            <property name="orientation">vertical</property>
                             <child>
-                              <object class="GtkVBox" id="vbox34">
-                                <property name="border_width">3</property>
+                              <object class="GtkCheckButton" id="brailleSupportCheckbutton">
+                                <property name="label" translatable="yes">Enable Braille _support</property>
                                 <property name="visible">True</property>
-                                <property name="homogeneous">False</property>
-                                <property name="spacing">0</property>
-                                <child>
-                                  <object class="GtkCheckButton" id="contractedBrailleCheckbutton">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes">_Enable Contracted Braille</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                                    <property name="focus_on_click">True</property>
-                                    <property name="active">False</property>
-                                    <property name="inconsistent">False</property>
-                                    <property name="draw_indicator">True</property>
-                                    <signal handler="contractedBrailleToggled" last_modification_time="Fri, 11 Jan 2008 19:07:29 GMT" name="toggled"/>
-                                  </object>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
-                                </child>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="brailleSupportChecked"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="brailleMonitorCheckbutton">
+                                <property name="label" translatable="yes">Enable Braille _monitor</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="brailleMonitorChecked"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="contractedBrailleCheckbutton">
+                                <property name="label" translatable="yes">_Enable Contracted Braille</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="contractedBrailleToggled"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkAlignment" id="alignment4">
+                                <property name="visible">True</property>
+                                <property name="left_padding">20</property>
                                 <child>
                                   <object class="GtkHBox" id="contractionTablesHBox">
                                     <property name="visible">True</property>
                                     <property name="sensitive">False</property>
-                                    <property name="homogeneous">False</property>
                                     <property name="spacing">3</property>
                                     <child>
                                       <object class="GtkLabel" id="contractionTableLabel">
                                         <property name="visible">True</property>
                                         <property name="label" translatable="yes">Contraction _Table:</property>
                                         <property name="use_underline">True</property>
-                                        <property name="use_markup">False</property>
-                                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                        <property name="wrap">False</property>
-                                        <property name="selectable">False</property>
-                                        <property name="xalign">0.5</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xpad">0</property>
-                                        <property name="ypad">0</property>
                                         <property name="mnemonic_widget">contractionTableCombo</property>
-                                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                        <property name="width_chars">-1</property>
-                                        <property name="single_line_mode">False</property>
-                                        <property name="angle">0</property>
                                         <accessibility>
-                                          <relation target="contractionTableCombo" type="label-for"/>
+                                          <relation type="label-for" target="contractionTableCombo"/>
                                         </accessibility>
                                       </object>
                                       <packing>
-                                        <property name="padding">0</property>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkComboBox" id="contractionTableCombo">
                                         <property name="visible">True</property>
-                                        <property name="add_tearoffs">False</property>
-                                        <property name="focus_on_click">True</property>
                                         <accessibility>
-                                          <relation target="contractionTableLabel" type="labelled-by"/>
+                                          <relation type="labelled-by" target="contractionTableLabel"/>
                                         </accessibility>
-                                        <signal handler="contractionTableComboChanged" last_modification_time="Fri, 18 Jan 2008 00:39:59 GMT" name="changed"/>
+                                        <signal name="changed" handler="contractionTableComboChanged"/>
                                       </object>
                                       <packing>
-                                        <property name="padding">0</property>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
                                       </packing>
                                     </child>
                                   </object>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                  </packing>
                                 </child>
                               </object>
+                              <packing>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="abbrevRolenames">
+                                <property name="label" translatable="yes">_Abbreviated role names</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="abbrevRolenamesChecked"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">4</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="disableBrailleEOL">
+                                <property name="label" translatable="yes">Disable _end of line symbol</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="disableBrailleEOLChecked"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">5</property>
+                              </packing>
                             </child>
                           </object>
+                          <packing>
+                            <property name="y_options"></property>
+                          </packing>
                         </child>
-                        <child type="label">
-                          <object class="GtkLabel" id="label48">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Contracted Braille&lt;/b&gt;</property>
-                            <property name="use_underline">False</property>
-                            <property name="use_markup">True</property>
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap">False</property>
-                            <property name="selectable">False</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                            <property name="width_chars">-1</property>
-                            <property name="single_line_mode">False</property>
-                            <property name="angle">0</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkFrame" id="frame7">
-                        <property name="visible">True</property>
-                        <property name="label_xalign">0</property>
-                        <property name="label_yalign">0.5</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
                         <child>
-                          <object class="GtkAlignment" id="alignment36">
+                          <object class="GtkFrame" id="frame7">
                             <property name="visible">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xscale">1</property>
-                            <property name="yscale">1</property>
-                            <property name="top_padding">0</property>
-                            <property name="bottom_padding">0</property>
-                            <property name="left_padding">12</property>
-                            <property name="right_padding">0</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">none</property>
                             <child>
-                              <object class="GtkVBox" id="vbox18">
-                                <property name="border_width">3</property>
+                              <object class="GtkAlignment" id="alignment36">
                                 <property name="visible">True</property>
-                                <property name="homogeneous">False</property>
-                                <property name="spacing">0</property>
-                                <child>
-                                  <object class="GtkRadioButton" id="brailleBriefButton">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes">Brie_f</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                                    <property name="focus_on_click">True</property>
-                                    <property name="active">False</property>
-                                    <property name="inconsistent">False</property>
-                                    <property name="draw_indicator">True</property>
-                                    <signal handler="brailleVerbosityChanged" last_modification_time="Thu, 27 Apr 2006 14:44:24 GMT" name="toggled"/>
-                                  </object>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
-                                </child>
+                                <property name="left_padding">12</property>
                                 <child>
-                                  <object class="GtkRadioButton" id="brailleVerboseButton">
+                                  <object class="GtkVBox" id="vbox18">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes">Ver_bose</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                                    <property name="focus_on_click">True</property>
-                                    <property name="active">False</property>
-                                    <property name="inconsistent">False</property>
-                                    <property name="draw_indicator">True</property>
-                                    <property name="group">brailleBriefButton</property>
-                                    <signal handler="brailleVerbosityChanged" last_modification_time="Thu, 27 Apr 2006 14:44:41 GMT" name="toggled"/>
+                                    <property name="border_width">3</property>
+                                    <property name="orientation">vertical</property>
+                                    <child>
+                                      <object class="GtkRadioButton" id="brailleBriefButton">
+                                        <property name="label" translatable="yes">Brie_f</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="active">True</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="brailleVerbosityChanged"/>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkRadioButton" id="brailleVerboseButton">
+                                        <property name="label" translatable="yes">Ver_bose</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="draw_indicator">True</property>
+                                        <property name="group">brailleBriefButton</property>
+                                        <signal name="toggled" handler="brailleVerbosityChanged"/>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
                                   </object>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
                                 </child>
                               </object>
                             </child>
+                            <child type="label">
+                              <object class="GtkLabel" id="brailleVerbosityLabel">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">&lt;b&gt;Verbosity&lt;/b&gt;</property>
+                                <property name="use_markup">True</property>
+                              </object>
+                            </child>
                           </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                          </packing>
                         </child>
-                        <child type="label">
-                          <object class="GtkLabel" id="brailleVerbosityLabel">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Verbosity&lt;/b&gt;</property>
-                            <property name="use_underline">False</property>
-                            <property name="use_markup">True</property>
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap">False</property>
-                            <property name="selectable">False</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                            <property name="width_chars">-1</property>
-                            <property name="single_line_mode">False</property>
-                            <property name="angle">0</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="hbox62">
-                        <property name="visible">True</property>
-                        <property name="homogeneous">False</property>
-                        <property name="spacing">0</property>
                         <child>
                           <object class="GtkFrame" id="brailleSelectionFrame">
                             <property name="visible">True</property>
                             <property name="label_xalign">0</property>
-                            <property name="label_yalign">0.5</property>
-                            <property name="shadow_type">GTK_SHADOW_NONE</property>
+                            <property name="shadow_type">none</property>
                             <child>
                               <object class="GtkAlignment" id="alignment57">
                                 <property name="visible">True</property>
-                                <property name="xalign">0.5</property>
-                                <property name="yalign">0.5</property>
-                                <property name="xscale">1</property>
-                                <property name="yscale">1</property>
-                                <property name="top_padding">0</property>
-                                <property name="bottom_padding">0</property>
                                 <property name="left_padding">12</property>
-                                <property name="right_padding">0</property>
                                 <child>
                                   <object class="GtkVBox" id="vbox28">
-                                    <property name="border_width">3</property>
                                     <property name="visible">True</property>
-                                    <property name="homogeneous">False</property>
-                                    <property name="spacing">0</property>
+                                    <property name="border_width">3</property>
+                                    <property name="orientation">vertical</property>
                                     <child>
                                       <object class="GtkRadioButton" id="brailleSelectionNoneButton">
+                                        <property name="label" translatable="yes">_None</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">_None</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
-                                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                                        <property name="focus_on_click">True</property>
-                                        <property name="active">False</property>
-                                        <property name="inconsistent">False</property>
+                                        <property name="active">True</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal handler="brailleSelectionChanged" last_modification_time="Thu, 28 Jun 2007 20:00:47 GMT" name="toggled"/>
+                                        <signal name="toggled" handler="brailleSelectionChanged"/>
                                       </object>
                                       <packing>
-                                        <property name="padding">0</property>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkRadioButton" id="brailleSelection7Button">
+                                        <property name="label" translatable="yes">Dot _7</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Dot _7</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
-                                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                                        <property name="focus_on_click">True</property>
-                                        <property name="active">False</property>
-                                        <property name="inconsistent">False</property>
                                         <property name="draw_indicator">True</property>
                                         <property name="group">brailleSelectionNoneButton</property>
-                                        <signal handler="brailleSelectionChanged" last_modification_time="Thu, 28 Jun 2007 20:01:03 GMT" name="toggled"/>
+                                        <signal name="toggled" handler="brailleSelectionChanged"/>
                                       </object>
                                       <packing>
-                                        <property name="padding">0</property>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">1</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkRadioButton" id="brailleSelection8Button">
+                                        <property name="label" translatable="yes">Dot _8</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Dot _8</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
-                                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                                        <property name="focus_on_click">True</property>
-                                        <property name="active">False</property>
-                                        <property name="inconsistent">False</property>
                                         <property name="draw_indicator">True</property>
                                         <property name="group">brailleSelectionNoneButton</property>
-                                        <signal handler="brailleSelectionChanged" last_modification_time="Thu, 28 Jun 2007 20:01:28 GMT" name="toggled"/>
+                                        <signal name="toggled" handler="brailleSelectionChanged"/>
                                       </object>
                                       <packing>
-                                        <property name="padding">0</property>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">2</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkRadioButton" id="brailleSelectionBothButton">
+                                        <property name="label" translatable="yes">Dots 7 an_d 8</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Dots 7 an_d 8</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
-                                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                                        <property name="focus_on_click">True</property>
-                                        <property name="active">False</property>
-                                        <property name="inconsistent">False</property>
                                         <property name="draw_indicator">True</property>
                                         <property name="group">brailleSelectionNoneButton</property>
-                                        <signal handler="brailleSelectionChanged" last_modification_time="Thu, 28 Jun 2007 20:01:43 GMT" name="toggled"/>
+                                        <signal name="toggled" handler="brailleSelectionChanged"/>
                                       </object>
                                       <packing>
-                                        <property name="padding">0</property>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">3</property>
                                       </packing>
                                     </child>
                                   </object>
@@ -2167,127 +1647,94 @@
                               <object class="GtkLabel" id="label28">
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes">&lt;b&gt;Selection Indicator&lt;/b&gt;</property>
-                                <property name="use_underline">False</property>
                                 <property name="use_markup">True</property>
-                                <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                <property name="wrap">False</property>
-                                <property name="selectable">False</property>
-                                <property name="xalign">0.5</property>
-                                <property name="yalign">0.5</property>
-                                <property name="xpad">0</property>
-                                <property name="ypad">0</property>
-                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                <property name="width_chars">-1</property>
-                                <property name="single_line_mode">False</property>
-                                <property name="angle">0</property>
                               </object>
                             </child>
                           </object>
                           <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkFrame" id="frame14">
                             <property name="visible">True</property>
                             <property name="label_xalign">0</property>
-                            <property name="label_yalign">0.5</property>
-                            <property name="shadow_type">GTK_SHADOW_NONE</property>
+                            <property name="shadow_type">none</property>
                             <child>
                               <object class="GtkAlignment" id="alignment88">
                                 <property name="visible">True</property>
-                                <property name="xalign">0.5</property>
-                                <property name="yalign">0.5</property>
-                                <property name="xscale">1</property>
-                                <property name="yscale">1</property>
-                                <property name="top_padding">0</property>
-                                <property name="bottom_padding">0</property>
                                 <property name="left_padding">12</property>
-                                <property name="right_padding">0</property>
                                 <child>
                                   <object class="GtkVBox" id="vbox35">
                                     <property name="visible">True</property>
-                                    <property name="homogeneous">False</property>
-                                    <property name="spacing">0</property>
+                                    <property name="orientation">vertical</property>
                                     <child>
                                       <object class="GtkRadioButton" id="brailleLinkNoneButton">
+                                        <property name="label" translatable="yes">_None</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">_None</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
-                                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                                        <property name="focus_on_click">True</property>
-                                        <property name="active">False</property>
-                                        <property name="inconsistent">False</property>
+                                        <property name="active">True</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal handler="brailleLinkChanged" last_modification_time="Mon, 21 Apr 2008 17:04:44 GMT" name="toggled"/>
+                                        <signal name="toggled" handler="brailleLinkChanged"/>
                                       </object>
                                       <packing>
-                                        <property name="padding">0</property>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkRadioButton" id="brailleLink7Button">
+                                        <property name="label" translatable="yes">Dot _7</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Dot _7</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
-                                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                                        <property name="focus_on_click">True</property>
-                                        <property name="active">False</property>
-                                        <property name="inconsistent">False</property>
                                         <property name="draw_indicator">True</property>
                                         <property name="group">brailleLinkNoneButton</property>
-                                        <signal handler="brailleLinkChanged" last_modification_time="Mon, 21 Apr 2008 17:05:03 GMT" name="toggled"/>
+                                        <signal name="toggled" handler="brailleLinkChanged"/>
                                       </object>
                                       <packing>
-                                        <property name="padding">0</property>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">1</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkRadioButton" id="brailleLink8Button">
+                                        <property name="label" translatable="yes">Dot _8</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Dot _8</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
-                                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                                        <property name="focus_on_click">True</property>
-                                        <property name="active">False</property>
-                                        <property name="inconsistent">False</property>
                                         <property name="draw_indicator">True</property>
                                         <property name="group">brailleLinkNoneButton</property>
-                                        <signal handler="brailleLinkChanged" last_modification_time="Mon, 21 Apr 2008 17:05:17 GMT" name="toggled"/>
+                                        <signal name="toggled" handler="brailleLinkChanged"/>
                                       </object>
                                       <packing>
-                                        <property name="padding">0</property>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">2</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkRadioButton" id="brailleLinkBothButton">
+                                        <property name="label" translatable="yes">Dots 7 an_d 8</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Dots 7 an_d 8</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
-                                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                                        <property name="focus_on_click">True</property>
-                                        <property name="active">False</property>
-                                        <property name="inconsistent">False</property>
                                         <property name="draw_indicator">True</property>
                                         <property name="group">brailleLinkNoneButton</property>
-                                        <signal handler="brailleLinkChanged" last_modification_time="Mon, 21 Apr 2008 17:05:29 GMT" name="toggled"/>
+                                        <signal name="toggled" handler="brailleLinkChanged"/>
                                       </object>
                                       <packing>
-                                        <property name="padding">0</property>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">3</property>
                                       </packing>
                                     </child>
                                   </object>
@@ -2298,38 +1745,27 @@
                               <object class="GtkLabel" id="label49">
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes">&lt;b&gt;Hyperlink Indicator&lt;/b&gt;</property>
-                                <property name="use_underline">False</property>
                                 <property name="use_markup">True</property>
-                                <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                <property name="wrap">False</property>
-                                <property name="selectable">False</property>
-                                <property name="xalign">0.5</property>
-                                <property name="yalign">0.5</property>
-                                <property name="xpad">0</property>
-                                <property name="ypad">0</property>
-                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                <property name="width_chars">-1</property>
-                                <property name="single_line_mode">False</property>
-                                <property name="angle">0</property>
                               </object>
                             </child>
                           </object>
                           <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="tab_expand">False</property>
+                    <property name="position">2</property>
                     <property name="tab_fill">False</property>
                   </packing>
                 </child>
@@ -2337,300 +1773,207 @@
                   <object class="GtkLabel" id="brailleTabLabel">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">Braille</property>
-                    <property name="use_underline">False</property>
-                    <property name="use_markup">False</property>
-                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                    <property name="wrap">False</property>
-                    <property name="selectable">False</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xpad">0</property>
-                    <property name="ypad">0</property>
-                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                    <property name="width_chars">-1</property>
-                    <property name="single_line_mode">False</property>
-                    <property name="angle">0</property>
                   </object>
+                  <packing>
+                    <property name="position">2</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
                 </child>
                 <child>
                   <object class="GtkVBox" id="keyechoVbox">
-                    <property name="border_width">12</property>
                     <property name="visible">True</property>
-                    <property name="homogeneous">False</property>
-                    <property name="spacing">0</property>
+                    <property name="border_width">12</property>
+                    <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkCheckButton" id="keyEchoCheckbutton">
+                        <property name="label" translatable="yes">Enable _key echo</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Enable _key echo</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
-                        <property name="active">False</property>
-                        <property name="inconsistent">False</property>
                         <property name="draw_indicator">True</property>
-                        <signal handler="keyEchoChecked" last_modification_time="Thu, 20 Apr 2006 15:28:03 GMT" name="toggled"/>
+                        <signal name="toggled" handler="keyEchoChecked"/>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkAlignment" id="alignment11">
                         <property name="visible">True</property>
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xscale">1</property>
-                        <property name="yscale">1</property>
-                        <property name="top_padding">0</property>
-                        <property name="bottom_padding">0</property>
                         <property name="left_padding">12</property>
-                        <property name="right_padding">0</property>
                         <child>
                           <object class="GtkCheckButton" id="printableCheckbutton">
+                            <property name="label" translatable="yes">Enable _alphanumeric and punctuation keys</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Enable _alphanumeric and punctuation keys</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="relief">GTK_RELIEF_NORMAL</property>
-                            <property name="focus_on_click">True</property>
-                            <property name="active">False</property>
-                            <property name="inconsistent">False</property>
                             <property name="draw_indicator">True</property>
-                            <signal handler="printableKeysChecked" last_modification_time="Fri, 21 Apr 2006 17:16:43 GMT" name="toggled"/>
+                            <signal name="toggled" handler="printableKeysChecked"/>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkAlignment" id="alignment12">
                         <property name="visible">True</property>
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xscale">1</property>
-                        <property name="yscale">1</property>
-                        <property name="top_padding">0</property>
-                        <property name="bottom_padding">0</property>
                         <property name="left_padding">12</property>
-                        <property name="right_padding">0</property>
                         <child>
                           <object class="GtkCheckButton" id="modifierCheckbutton">
+                            <property name="label" translatable="yes">Enable _modifier keys</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Enable _modifier keys</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="relief">GTK_RELIEF_NORMAL</property>
-                            <property name="focus_on_click">True</property>
-                            <property name="active">False</property>
-                            <property name="inconsistent">False</property>
                             <property name="draw_indicator">True</property>
-                            <signal handler="modifierKeysChecked" last_modification_time="Thu, 20 Apr 2006 15:30:12 GMT" name="toggled"/>
+                            <signal name="toggled" handler="modifierKeysChecked"/>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkAlignment" id="alignment13">
                         <property name="visible">True</property>
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xscale">1</property>
-                        <property name="yscale">1</property>
-                        <property name="top_padding">0</property>
-                        <property name="bottom_padding">0</property>
                         <property name="left_padding">12</property>
-                        <property name="right_padding">0</property>
                         <child>
                           <object class="GtkCheckButton" id="lockingCheckbutton">
+                            <property name="label" translatable="yes">Enable lockin_g keys</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Enable lockin_g keys</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="relief">GTK_RELIEF_NORMAL</property>
-                            <property name="focus_on_click">True</property>
-                            <property name="active">False</property>
-                            <property name="inconsistent">False</property>
                             <property name="draw_indicator">True</property>
-                            <signal handler="lockingKeysChecked" last_modification_time="Thu, 20 Apr 2006 15:30:19 GMT" name="toggled"/>
+                            <signal name="toggled" handler="lockingKeysChecked"/>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkAlignment" id="alignment14">
                         <property name="visible">True</property>
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xscale">1</property>
-                        <property name="yscale">1</property>
-                        <property name="top_padding">0</property>
-                        <property name="bottom_padding">0</property>
                         <property name="left_padding">12</property>
-                        <property name="right_padding">0</property>
                         <child>
                           <object class="GtkCheckButton" id="functionCheckbutton">
+                            <property name="label" translatable="yes">Enable _function keys</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Enable _function keys</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="relief">GTK_RELIEF_NORMAL</property>
-                            <property name="focus_on_click">True</property>
-                            <property name="active">False</property>
-                            <property name="inconsistent">False</property>
                             <property name="draw_indicator">True</property>
-                            <signal handler="functionKeysChecked" last_modification_time="Thu, 20 Apr 2006 15:30:26 GMT" name="toggled"/>
+                            <signal name="toggled" handler="functionKeysChecked"/>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">4</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkAlignment" id="alignment15">
                         <property name="visible">True</property>
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xscale">1</property>
-                        <property name="yscale">1</property>
-                        <property name="top_padding">0</property>
-                        <property name="bottom_padding">0</property>
                         <property name="left_padding">12</property>
-                        <property name="right_padding">0</property>
                         <child>
                           <object class="GtkCheckButton" id="actionCheckbutton">
+                            <property name="label" translatable="yes">Enable ac_tion keys</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Enable ac_tion keys</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="relief">GTK_RELIEF_NORMAL</property>
-                            <property name="focus_on_click">True</property>
-                            <property name="active">False</property>
-                            <property name="inconsistent">False</property>
                             <property name="draw_indicator">True</property>
-                            <signal handler="actionKeysChecked" last_modification_time="Thu, 20 Apr 2006 15:30:34 GMT" name="toggled"/>
+                            <signal name="toggled" handler="actionKeysChecked"/>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">5</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkAlignment" id="alignment59">
                         <property name="visible">True</property>
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xscale">1</property>
-                        <property name="yscale">1</property>
-                        <property name="top_padding">0</property>
-                        <property name="bottom_padding">0</property>
                         <property name="left_padding">12</property>
-                        <property name="right_padding">0</property>
                         <child>
                           <object class="GtkCheckButton" id="navigationCheckbutton">
+                            <property name="label" translatable="yes">Enable _navigation keys</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Enable _navigation keys</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="relief">GTK_RELIEF_NORMAL</property>
-                            <property name="focus_on_click">True</property>
-                            <property name="active">False</property>
-                            <property name="inconsistent">False</property>
                             <property name="draw_indicator">True</property>
-                            <signal handler="navigationKeysChecked" last_modification_time="Tue, 30 Oct 2007 20:11:26 GMT" name="toggled"/>
+                            <signal name="toggled" handler="navigationKeysChecked"/>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">6</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkAlignment" id="alignment63">
                         <property name="visible">True</property>
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xscale">1</property>
-                        <property name="yscale">1</property>
-                        <property name="top_padding">0</property>
-                        <property name="bottom_padding">0</property>
                         <property name="left_padding">12</property>
-                        <property name="right_padding">0</property>
                         <child>
                           <object class="GtkCheckButton" id="diacriticalCheckbutton">
+                            <property name="label" translatable="yes" comments="Translators: When this option is enabled, dead keys will be announced when pressed.">Enable non-spacing _diacritical keys</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" comments="Translators: When this option is enabled, dead keys will be announced when pressed." translatable="yes">Enable non-spacing _diacritical keys</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="relief">GTK_RELIEF_NORMAL</property>
-                            <property name="focus_on_click">True</property>
-                            <property name="active">False</property>
-                            <property name="inconsistent">False</property>
                             <property name="draw_indicator">True</property>
-                            <signal handler="diacriticalKeysChecked" last_modification_time="Tue, 30 Oct 2007 20:11:26 GMT" name="toggled"/>
+                            <signal name="toggled" handler="diacriticalKeysChecked"/>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">7</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkAlignment" id="alignment64">
                         <property name="visible">True</property>
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xscale">1</property>
-                        <property name="yscale">1</property>
                         <property name="top_padding">12</property>
-                        <property name="bottom_padding">0</property>
-                        <property name="left_padding">0</property>
-                        <property name="right_padding">0</property>
                         <child>
                           <object class="GtkCheckButton" id="echoByCharacterCheckbutton">
+                            <property name="label" translatable="yes" comments="Translators: When this option is enabled, inserted text of length 1 is spoken.">Enable echo by cha_racter</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" comments="Translators: When this option is enabled, inserted text of length 1 is spoken." translatable="yes">Enable echo by cha_racter</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="relief">GTK_RELIEF_NORMAL</property>
-                            <property name="focus_on_click">True</property>
-                            <property name="active">False</property>
-                            <property name="inconsistent">False</property>
                             <property name="draw_indicator">True</property>
-                            <signal handler="echoByCharacterChecked" last_modification_time="Thu, 20 Apr 2006 15:29:51 GMT" name="toggled"/>
+                            <signal name="toggled" handler="echoByCharacterChecked"/>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">8</property>
                       </packing>
                     </child>
                     <child>
@@ -2638,47 +1981,41 @@
                         <property name="visible">True</property>
                         <child>
                           <object class="GtkCheckButton" id="echoByWordCheckbutton">
+                            <property name="label" translatable="yes">Enable echo by _word</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Enable echo by _word</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="relief">GTK_RELIEF_NORMAL</property>
-                            <property name="focus_on_click">True</property>
-                            <property name="active">False</property>
-                            <property name="inconsistent">False</property>
                             <property name="draw_indicator">True</property>
-                            <signal handler="echoByWordChecked" last_modification_time="Thu, 20 Apr 2006 15:29:51 GMT" name="toggled"/>
+                            <signal name="toggled" handler="echoByWordChecked"/>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">9</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="echoBySentenceCheckbutton">
+                        <property name="label" translatable="yes">Enable echo by _sentence</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Enable echo by _sentence</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
-                        <property name="active">False</property>
-                        <property name="inconsistent">False</property>
                         <property name="draw_indicator">True</property>
-                        <signal handler="echoBySentenceChecked" last_modification_time="Thu, 12 Jun 2008 15:31:32 GMT" name="toggled"/>
+                        <signal name="toggled" handler="echoBySentenceChecked"/>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">10</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="tab_expand">False</property>
+                    <property name="position">3</property>
                     <property name="tab_fill">False</property>
                   </packing>
                 </child>
@@ -2686,350 +2023,236 @@
                   <object class="GtkLabel" id="keyEchoTabLabel">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">Key Echo</property>
-                    <property name="use_underline">False</property>
-                    <property name="use_markup">False</property>
-                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                    <property name="wrap">False</property>
-                    <property name="selectable">False</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xpad">0</property>
-                    <property name="ypad">0</property>
-                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                    <property name="width_chars">-1</property>
-                    <property name="single_line_mode">False</property>
-                    <property name="angle">0</property>
                   </object>
+                  <packing>
+                    <property name="position">3</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
                 </child>
                 <child>
                   <object class="GtkVBox" id="vbox19">
-                    <property name="border_width">12</property>
                     <property name="visible">True</property>
-                    <property name="homogeneous">False</property>
-                    <property name="spacing">0</property>
+                    <property name="border_width">12</property>
+                    <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkCheckButton" id="magnifierSupportCheckbutton">
+                        <property name="label" translatable="yes">Enable _magnifier</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Enable _magnifier</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
-                        <property name="active">False</property>
-                        <property name="inconsistent">False</property>
                         <property name="draw_indicator">True</property>
-                        <signal handler="magnifierSupportChecked" last_modification_time="Thu, 04 May 2006 15:44:50 GMT" name="toggled"/>
+                        <signal name="toggled" handler="magnifierSupportChecked"/>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkTable" id="magnifierTable">
-                        <property name="border_width">12</property>
                         <property name="visible">True</property>
-                        <property name="n_rows">4</property>
-                        <property name="n_columns">3</property>
-                        <property name="homogeneous">False</property>
-                        <property name="row_spacing">3</property>
-                        <property name="column_spacing">24</property>
+                        <property name="border_width">12</property>
+                        <property name="n_rows">3</property>
+                        <property name="n_columns">4</property>
+                        <property name="column_spacing">25</property>
+                        <property name="row_spacing">10</property>
                         <child>
-                          <object class="GtkAlignment" id="alignment23">
+                          <object class="GtkAlignment" id="magZoomerAlignment">
                             <property name="visible">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xscale">1</property>
-                            <property name="yscale">1</property>
-                            <property name="top_padding">0</property>
-                            <property name="bottom_padding">0</property>
-                            <property name="left_padding">0</property>
-                            <property name="right_padding">0</property>
                             <child>
                               <object class="GtkFrame" id="magZoomerSettingsFrame">
                                 <property name="visible">True</property>
                                 <property name="label_xalign">0</property>
-                                <property name="label_yalign">0.5</property>
-                                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkAlignment" id="alignment41">
                                     <property name="visible">True</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xscale">1</property>
-                                    <property name="yscale">1</property>
-                                    <property name="top_padding">0</property>
-                                    <property name="bottom_padding">0</property>
                                     <property name="left_padding">12</property>
-                                    <property name="right_padding">0</property>
                                     <child>
                                       <object class="GtkTable" id="table5">
-                                        <property name="border_width">6</property>
                                         <property name="visible">True</property>
+                                        <property name="border_width">6</property>
                                         <property name="n_rows">3</property>
                                         <property name="n_columns">3</property>
-                                        <property name="homogeneous">False</property>
-                                        <property name="row_spacing">3</property>
                                         <property name="column_spacing">3</property>
+                                        <property name="row_spacing">3</property>
                                         <child>
                                           <object class="GtkLabel" id="magZoomFactorLabel">
                                             <property name="visible">True</property>
+                                            <property name="xalign">0</property>
                                             <property name="label" translatable="yes">Scale _factor:</property>
                                             <property name="use_underline">True</property>
-                                            <property name="use_markup">False</property>
-                                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                            <property name="wrap">False</property>
-                                            <property name="selectable">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xpad">0</property>
-                                            <property name="ypad">0</property>
                                             <property name="mnemonic_widget">magZoomFactorSpinButton</property>
-                                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                            <property name="width_chars">-1</property>
-                                            <property name="single_line_mode">False</property>
-                                            <property name="angle">0</property>
                                             <accessibility>
-                                              <relation target="magZoomFactorSpinButton" type="label-for"/>
+                                              <relation type="label-for" target="magZoomFactorSpinButton"/>
                                             </accessibility>
                                           </object>
                                           <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="right_attach">1</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="bottom_attach">1</property>
-                                            <property name="x_options">fill</property>
-                                            <property name="y_options"/>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkSpinButton" id="magZoomFactorSpinButton">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
+                                            <property name="adjustment">adjustment5</property>
                                             <property name="climb_rate">1</property>
                                             <property name="digits">2</property>
                                             <property name="numeric">True</property>
-                                            <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                                            <property name="snap_to_ticks">False</property>
-                                            <property name="wrap">False</property>
-                                            <property name="adjustment">adjustment5</property>
                                             <accessibility>
-                                              <relation target="magZoomFactorLabel" type="labelled-by"/>
+                                              <relation type="labelled-by" target="magZoomFactorLabel"/>
                                             </accessibility>
-                                            <signal handler="magZoomFactorValueChanged" last_modification_time="Wed, 03 May 2006 15:49:39 GMT" name="value_changed"/>
+                                            <signal name="value_changed" handler="magZoomFactorValueChanged"/>
                                           </object>
                                           <packing>
                                             <property name="left_attach">1</property>
                                             <property name="right_attach">2</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="bottom_attach">1</property>
-                                            <property name="x_options">fill</property>
-                                            <property name="y_options"/>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkAlignment" id="alignment61">
                                             <property name="visible">True</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xscale">1</property>
-                                            <property name="yscale">1</property>
-                                            <property name="top_padding">0</property>
-                                            <property name="bottom_padding">0</property>
                                             <property name="left_padding">25</property>
-                                            <property name="right_padding">0</property>
                                             <child>
                                               <object class="GtkTable" id="magZoomerCustomPositionTable">
-                                                <property name="border_width">3</property>
                                                 <property name="visible">True</property>
+                                                <property name="border_width">3</property>
                                                 <property name="n_rows">3</property>
                                                 <property name="n_columns">2</property>
-                                                <property name="homogeneous">False</property>
-                                                <property name="row_spacing">3</property>
                                                 <property name="column_spacing">3</property>
+                                                <property name="row_spacing">3</property>
                                                 <child>
                                                   <object class="GtkHBox" id="hbox23">
                                                     <property name="visible">True</property>
-                                                    <property name="homogeneous">False</property>
-                                                    <property name="spacing">0</property>
                                                     <child>
                                                       <object class="GtkLabel" id="magZoomerTopLabel">
                                                         <property name="visible">True</property>
                                                         <property name="label" translatable="yes">_Top:</property>
                                                         <property name="use_underline">True</property>
-                                                        <property name="use_markup">False</property>
-                                                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                                        <property name="wrap">False</property>
-                                                        <property name="selectable">False</property>
-                                                        <property name="xalign">0.5</property>
-                                                        <property name="yalign">0.5</property>
-                                                        <property name="xpad">0</property>
-                                                        <property name="ypad">0</property>
                                                         <property name="mnemonic_widget">magZoomerTopSpinButton</property>
-                                                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                                        <property name="width_chars">-1</property>
-                                                        <property name="single_line_mode">False</property>
-                                                        <property name="angle">0</property>
                                                         <accessibility>
-                                                          <relation target="magZoomerTopSpinButton" type="label-for"/>
+                                                          <relation type="label-for" target="magZoomerTopSpinButton"/>
                                                         </accessibility>
                                                       </object>
                                                       <packing>
-                                                        <property name="padding">3</property>
                                                         <property name="expand">False</property>
                                                         <property name="fill">False</property>
+                                                        <property name="padding">3</property>
+                                                        <property name="position">0</property>
                                                       </packing>
                                                     </child>
                                                     <child>
                                                       <object class="GtkSpinButton" id="magZoomerTopSpinButton">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">True</property>
+                                                        <property name="adjustment">adjustment6</property>
                                                         <property name="climb_rate">1</property>
-                                                        <property name="digits">0</property>
                                                         <property name="numeric">True</property>
-                                                        <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                                                        <property name="snap_to_ticks">False</property>
-                                                        <property name="wrap">False</property>
-                                                        <property name="adjustment">adjustment6</property>
                                                         <accessibility>
-                                                          <relation target="magZoomerTopLabel" type="labelled-by"/>
+                                                          <relation type="labelled-by" target="magZoomerTopLabel"/>
                                                         </accessibility>
-                                                        <signal handler="magZoomerTopValueChanged" last_modification_time="Wed, 03 May 2006 15:41:20 GMT" name="value_changed"/>
+                                                        <signal name="value_changed" handler="magZoomerTopValueChanged"/>
                                                       </object>
                                                       <packing>
-                                                        <property name="padding">0</property>
                                                         <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>
                                                   </object>
                                                   <packing>
-                                                    <property name="left_attach">0</property>
                                                     <property name="right_attach">2</property>
-                                                    <property name="top_attach">0</property>
-                                                    <property name="bottom_attach">1</property>
-                                                    <property name="x_options"/>
+                                                    <property name="x_options"></property>
                                                   </packing>
                                                 </child>
                                                 <child>
                                                   <object class="GtkHBox" id="hbox24">
                                                     <property name="visible">True</property>
-                                                    <property name="homogeneous">False</property>
-                                                    <property name="spacing">0</property>
                                                     <child>
                                                       <object class="GtkLabel" id="magZoomerBottomLabel">
                                                         <property name="visible">True</property>
                                                         <property name="label" translatable="yes">_Bottom:</property>
                                                         <property name="use_underline">True</property>
-                                                        <property name="use_markup">False</property>
-                                                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                                        <property name="wrap">False</property>
-                                                        <property name="selectable">False</property>
-                                                        <property name="xalign">0.5</property>
-                                                        <property name="yalign">0.5</property>
-                                                        <property name="xpad">0</property>
-                                                        <property name="ypad">0</property>
                                                         <property name="mnemonic_widget">magZoomerBottomSpinButton</property>
-                                                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                                        <property name="width_chars">-1</property>
-                                                        <property name="single_line_mode">False</property>
-                                                        <property name="angle">0</property>
                                                         <accessibility>
-                                                          <relation target="magZoomerBottomSpinButton" type="label-for"/>
+                                                          <relation type="label-for" target="magZoomerBottomSpinButton"/>
                                                         </accessibility>
                                                       </object>
                                                       <packing>
-                                                        <property name="padding">3</property>
                                                         <property name="expand">False</property>
                                                         <property name="fill">False</property>
+                                                        <property name="padding">3</property>
+                                                        <property name="position">0</property>
                                                       </packing>
                                                     </child>
                                                     <child>
                                                       <object class="GtkSpinButton" id="magZoomerBottomSpinButton">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">True</property>
+                                                        <property name="adjustment">adjustment7</property>
                                                         <property name="climb_rate">1</property>
-                                                        <property name="digits">0</property>
                                                         <property name="numeric">True</property>
-                                                        <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                                                        <property name="snap_to_ticks">False</property>
-                                                        <property name="wrap">False</property>
-                                                        <property name="adjustment">adjustment7</property>
                                                         <accessibility>
-                                                          <relation target="magZoomerBottomLabel" type="labelled-by"/>
+                                                          <relation type="labelled-by" target="magZoomerBottomLabel"/>
                                                         </accessibility>
-                                                        <signal handler="magZoomerBottomValueChanged" last_modification_time="Wed, 03 May 2006 15:42:28 GMT" name="value_changed"/>
+                                                        <signal name="value_changed" handler="magZoomerBottomValueChanged"/>
                                                       </object>
                                                       <packing>
-                                                        <property name="padding">0</property>
                                                         <property name="expand">False</property>
                                                         <property name="fill">False</property>
+                                                        <property name="position">1</property>
                                                       </packing>
                                                     </child>
                                                   </object>
                                                   <packing>
-                                                    <property name="left_attach">0</property>
                                                     <property name="right_attach">2</property>
                                                     <property name="top_attach">2</property>
                                                     <property name="bottom_attach">3</property>
-                                                    <property name="x_options"/>
+                                                    <property name="x_options"></property>
                                                   </packing>
                                                 </child>
                                                 <child>
                                                   <object class="GtkHBox" id="hbox25">
                                                     <property name="visible">True</property>
-                                                    <property name="homogeneous">False</property>
-                                                    <property name="spacing">0</property>
                                                     <child>
                                                       <object class="GtkLabel" id="magZoomerRightLabel">
                                                         <property name="visible">True</property>
                                                         <property name="label" translatable="yes">_Right:</property>
                                                         <property name="use_underline">True</property>
-                                                        <property name="use_markup">False</property>
-                                                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                                        <property name="wrap">False</property>
-                                                        <property name="selectable">False</property>
-                                                        <property name="xalign">0.5</property>
-                                                        <property name="yalign">0.5</property>
-                                                        <property name="xpad">0</property>
-                                                        <property name="ypad">0</property>
                                                         <property name="mnemonic_widget">magZoomerRightSpinButton</property>
-                                                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                                        <property name="width_chars">-1</property>
-                                                        <property name="single_line_mode">False</property>
-                                                        <property name="angle">0</property>
                                                         <accessibility>
-                                                          <relation target="magZoomerRightSpinButton" type="label-for"/>
+                                                          <relation type="label-for" target="magZoomerRightSpinButton"/>
                                                         </accessibility>
                                                       </object>
                                                       <packing>
-                                                        <property name="padding">4</property>
                                                         <property name="expand">False</property>
                                                         <property name="fill">False</property>
+                                                        <property name="padding">4</property>
+                                                        <property name="position">0</property>
                                                       </packing>
                                                     </child>
                                                     <child>
                                                       <object class="GtkSpinButton" id="magZoomerRightSpinButton">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">True</property>
+                                                        <property name="adjustment">adjustment8</property>
                                                         <property name="climb_rate">1</property>
-                                                        <property name="digits">0</property>
                                                         <property name="numeric">True</property>
-                                                        <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                                                        <property name="snap_to_ticks">False</property>
-                                                        <property name="wrap">False</property>
-                                                        <property name="adjustment">adjustment8</property>
                                                         <accessibility>
-                                                          <relation target="magZoomerRightLabel" type="labelled-by"/>
+                                                          <relation type="labelled-by" target="magZoomerRightLabel"/>
                                                         </accessibility>
-                                                        <signal handler="magZoomerRightValueChanged" last_modification_time="Wed, 03 May 2006 15:44:33 GMT" name="value_changed"/>
+                                                        <signal name="value_changed" handler="magZoomerRightValueChanged"/>
                                                       </object>
                                                       <packing>
-                                                        <property name="padding">0</property>
                                                         <property name="expand">False</property>
                                                         <property name="fill">False</property>
+                                                        <property name="position">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
@@ -3037,10 +2260,8 @@
                                                         <property name="visible">True</property>
                                                       </object>
                                                       <packing>
-                                                        <property name="padding">0</property>
-                                                        <property name="expand">True</property>
-                                                        <property name="fill">True</property>
-                                                        <property name="pack_type">GTK_PACK_END</property>
+                                                        <property name="pack_type">end</property>
+                                                        <property name="position">2</property>
                                                       </packing>
                                                     </child>
                                                   </object>
@@ -3049,23 +2270,19 @@
                                                     <property name="right_attach">2</property>
                                                     <property name="top_attach">1</property>
                                                     <property name="bottom_attach">2</property>
-                                                    <property name="x_options"/>
-                                                    <property name="y_options">fill</property>
+                                                    <property name="x_options"></property>
+                                                    <property name="y_options">GTK_FILL</property>
                                                   </packing>
                                                 </child>
                                                 <child>
                                                   <object class="GtkHBox" id="hbox22">
                                                     <property name="visible">True</property>
-                                                    <property name="homogeneous">False</property>
-                                                    <property name="spacing">0</property>
                                                     <child>
                                                       <object class="GtkFixed" id="fixed1">
                                                         <property name="visible">True</property>
                                                       </object>
                                                       <packing>
-                                                        <property name="padding">0</property>
-                                                        <property name="expand">True</property>
-                                                        <property name="fill">True</property>
+                                                        <property name="position">0</property>
                                                       </packing>
                                                     </child>
                                                     <child>
@@ -3073,58 +2290,41 @@
                                                         <property name="visible">True</property>
                                                         <property name="label" translatable="yes">_Left:</property>
                                                         <property name="use_underline">True</property>
-                                                        <property name="use_markup">False</property>
-                                                        <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                                                        <property name="wrap">False</property>
-                                                        <property name="selectable">False</property>
-                                                        <property name="xalign">0.5</property>
-                                                        <property name="yalign">0.5</property>
-                                                        <property name="xpad">0</property>
-                                                        <property name="ypad">0</property>
+                                                        <property name="justify">right</property>
                                                         <property name="mnemonic_widget">magZoomerLeftSpinButton</property>
-                                                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                                        <property name="width_chars">-1</property>
-                                                        <property name="single_line_mode">False</property>
-                                                        <property name="angle">0</property>
                                                         <accessibility>
-                                                          <relation target="magZoomerLeftSpinButton" type="label-for"/>
+                                                          <relation type="label-for" target="magZoomerLeftSpinButton"/>
                                                         </accessibility>
                                                       </object>
                                                       <packing>
-                                                        <property name="padding">3</property>
                                                         <property name="expand">False</property>
-                                                        <property name="fill">True</property>
+                                                        <property name="padding">3</property>
+                                                        <property name="position">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
                                                       <object class="GtkSpinButton" id="magZoomerLeftSpinButton">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">True</property>
+                                                        <property name="adjustment">adjustment9</property>
                                                         <property name="climb_rate">1</property>
-                                                        <property name="digits">0</property>
                                                         <property name="numeric">True</property>
-                                                        <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                                                        <property name="snap_to_ticks">False</property>
-                                                        <property name="wrap">False</property>
-                                                        <property name="adjustment">adjustment9</property>
                                                         <accessibility>
-                                                          <relation target="magZoomerLeftLabel" type="labelled-by"/>
+                                                          <relation type="labelled-by" target="magZoomerLeftLabel"/>
                                                         </accessibility>
-                                                        <signal handler="magZoomerLeftValueChanged" last_modification_time="Wed, 03 May 2006 15:43:41 GMT" name="value_changed"/>
+                                                        <signal name="value_changed" handler="magZoomerLeftValueChanged"/>
                                                       </object>
                                                       <packing>
-                                                        <property name="padding">0</property>
                                                         <property name="expand">False</property>
                                                         <property name="fill">False</property>
+                                                        <property name="position">2</property>
                                                       </packing>
                                                     </child>
                                                   </object>
                                                   <packing>
-                                                    <property name="left_attach">0</property>
-                                                    <property name="right_attach">1</property>
                                                     <property name="top_attach">1</property>
                                                     <property name="bottom_attach">2</property>
-                                                    <property name="x_options"/>
+                                                    <property name="x_options"></property>
                                                   </packing>
                                                 </child>
                                               </object>
@@ -3133,66 +2333,44 @@
                                           <packing>
                                             <property name="left_attach">2</property>
                                             <property name="right_attach">3</property>
-                                            <property name="top_attach">0</property>
                                             <property name="bottom_attach">3</property>
-                                            <property name="x_options">fill</property>
-                                            <property name="y_options">fill</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options">GTK_FILL</property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkAlignment" id="alignment60">
                                             <property name="visible">True</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xscale">1</property>
-                                            <property name="yscale">1</property>
-                                            <property name="top_padding">0</property>
-                                            <property name="bottom_padding">0</property>
                                             <property name="left_padding">25</property>
-                                            <property name="right_padding">0</property>
                                             <child>
                                               <object class="GtkHBox" id="hbox46">
                                                 <property name="visible">True</property>
-                                                <property name="homogeneous">False</property>
                                                 <property name="spacing">3</property>
                                                 <child>
                                                   <object class="GtkLabel" id="magZoomerPositionLabel">
                                                     <property name="visible">True</property>
+                                                    <property name="xalign">0</property>
                                                     <property name="label" translatable="yes">_Position:</property>
                                                     <property name="use_underline">True</property>
-                                                    <property name="use_markup">False</property>
-                                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                                    <property name="wrap">False</property>
-                                                    <property name="selectable">False</property>
-                                                    <property name="xalign">0</property>
-                                                    <property name="yalign">0.5</property>
-                                                    <property name="xpad">0</property>
-                                                    <property name="ypad">0</property>
                                                     <property name="mnemonic_widget">magZoomerPositionComboBox</property>
-                                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                                    <property name="width_chars">-1</property>
-                                                    <property name="single_line_mode">False</property>
-                                                    <property name="angle">0</property>
                                                     <accessibility>
-                                                      <relation target="magZoomerPositionComboBox" type="label-for"/>
+                                                      <relation type="label-for" target="magZoomerPositionComboBox"/>
                                                     </accessibility>
                                                   </object>
                                                   <packing>
-                                                    <property name="padding">0</property>
                                                     <property name="expand">False</property>
                                                     <property name="fill">False</property>
+                                                    <property name="position">0</property>
                                                   </packing>
                                                 </child>
                                                 <child>
                                                   <object class="GtkComboBox" id="magZoomerPositionComboBox">
                                                     <property name="visible">True</property>
-                                                    <property name="add_tearoffs">False</property>
-                                                    <property name="focus_on_click">True</property>
+                                                    <property name="model">model3</property>
                                                     <accessibility>
-                                                      <relation target="magZoomerPositionLabel" type="labelled-by"/>
+                                                      <relation type="labelled-by" target="magZoomerPositionLabel"/>
                                                     </accessibility>
-                                                    <signal handler="magZoomerPositionChanged" last_modification_time="Thu, 06 Dec 2007 03:25:44 GMT" name="changed"/>
-                                                    <property name="model">model3</property>
+                                                    <signal name="changed" handler="magZoomerPositionChanged"/>
                                                     <child>
                                                       <object class="GtkCellRendererText" id="renderer3"/>
                                                       <attributes>
@@ -3201,57 +2379,46 @@
                                                     </child>
                                                   </object>
                                                   <packing>
-                                                    <property name="padding">0</property>
                                                     <property name="expand">False</property>
                                                     <property name="fill">False</property>
+                                                    <property name="position">1</property>
                                                   </packing>
                                                 </child>
                                               </object>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="left_attach">0</property>
                                             <property name="right_attach">2</property>
                                             <property name="top_attach">1</property>
                                             <property name="bottom_attach">2</property>
-                                            <property name="x_options"/>
-                                            <property name="y_options"/>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkAlignment" id="alignment31">
                                             <property name="visible">True</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xscale">1</property>
-                                            <property name="yscale">1</property>
                                             <property name="top_padding">2</property>
-                                            <property name="bottom_padding">0</property>
                                             <property name="left_padding">19</property>
-                                            <property name="right_padding">0</property>
                                             <child>
                                               <object class="GtkCheckButton" id="magHideCursorCheckButton">
-                                                <property name="border_width">3</property>
+                                                <property name="label" translatable="yes">Hide s_ystem pointer</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
-                                                <property name="label" translatable="yes">Hide s_ystem pointer</property>
+                                                <property name="receives_default">False</property>
+                                                <property name="border_width">3</property>
                                                 <property name="use_underline">True</property>
-                                                <property name="relief">GTK_RELIEF_NORMAL</property>
-                                                <property name="focus_on_click">True</property>
-                                                <property name="active">False</property>
-                                                <property name="inconsistent">False</property>
                                                 <property name="draw_indicator">True</property>
-                                                <signal handler="magHideCursorChecked" last_modification_time="Mon, 07 Jul 2008 14:41:59 GMT" name="toggled"/>
+                                                <signal name="toggled" handler="magHideCursorChecked"/>
                                               </object>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="left_attach">0</property>
                                             <property name="right_attach">2</property>
                                             <property name="top_attach">2</property>
                                             <property name="bottom_attach">3</property>
-                                            <property name="x_options">fill</property>
-                                            <property name="y_options">fill</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options">GTK_FILL</property>
                                           </packing>
                                         </child>
                                       </object>
@@ -3261,433 +2428,202 @@
                                 <child type="label">
                                   <object class="GtkLabel" id="label21">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;Zoomer Settings&lt;/b&gt;</property>
-                                    <property name="use_underline">False</property>
+                                    <property name="label" translatable="yes" context="Magnification" comments="Translators: This is a label in the Preferences dialog. It applies to a number of settings related to magnification. The Zoomer is what holds/displays the magnified version of the screen contents.">&lt;b&gt;Zoomer&lt;/b&gt;</property>
                                     <property name="use_markup">True</property>
-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                    <property name="wrap">False</property>
-                                    <property name="selectable">False</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                    <property name="width_chars">-1</property>
-                                    <property name="single_line_mode">False</property>
-                                    <property name="angle">0</property>
                                   </object>
                                 </child>
                               </object>
                             </child>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
                             <property name="right_attach">2</property>
-                            <property name="top_attach">0</property>
-                            <property name="bottom_attach">1</property>
-                            <property name="x_options">fill</property>
-                            <property name="y_options">fill</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkAlignment" id="alignment70">
+                          <object class="GtkAlignment" id="magCrossHairLabelAlignment">
                             <property name="visible">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xscale">1</property>
-                            <property name="yscale">1</property>
-                            <property name="top_padding">0</property>
-                            <property name="bottom_padding">0</property>
-                            <property name="left_padding">0</property>
-                            <property name="right_padding">0</property>
+                            <property name="top_padding">12</property>
                             <child>
-                              <object class="GtkFrame" id="frame10">
+                              <object class="GtkFrame" id="magCrossHairSettingsFrame">
                                 <property name="visible">True</property>
                                 <property name="label_xalign">0</property>
-                                <property name="label_yalign">0.5</property>
-                                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                <property name="shadow_type">none</property>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment72">
+                                  <object class="GtkAlignment" id="alignment40">
                                     <property name="visible">True</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xscale">1</property>
-                                    <property name="yscale">1</property>
-                                    <property name="top_padding">0</property>
-                                    <property name="bottom_padding">0</property>
                                     <property name="left_padding">12</property>
-                                    <property name="right_padding">0</property>
                                     <child>
-                                      <object class="GtkVBox" id="vbox31">
+                                      <object class="GtkVBox" id="vbox33">
                                         <property name="visible">True</property>
-                                        <property name="homogeneous">False</property>
-                                        <property name="spacing">0</property>
+                                        <property name="orientation">vertical</property>
                                         <child>
-                                          <object class="GtkAlignment" id="alignment78">
+                                          <object class="GtkAlignment" id="alignment83">
                                             <property name="visible">True</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xscale">1</property>
-                                            <property name="yscale">1</property>
-                                            <property name="top_padding">5</property>
-                                            <property name="bottom_padding">0</property>
-                                            <property name="left_padding">0</property>
-                                            <property name="right_padding">0</property>
+                                            <property name="left_padding">3</property>
                                             <child>
-                                              <object class="GtkCheckButton" id="magBorderCheckButton">
+                                              <object class="GtkCheckButton" id="magCrossHairOnOffCheckButton">
+                                                <property name="label" translatable="yes">Enable cross-h_air</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
-                                                <property name="label" translatable="yes">Enable bor_der</property>
+                                                <property name="receives_default">False</property>
                                                 <property name="use_underline">True</property>
-                                                <property name="relief">GTK_RELIEF_NORMAL</property>
-                                                <property name="focus_on_click">True</property>
-                                                <property name="active">False</property>
-                                                <property name="inconsistent">False</property>
                                                 <property name="draw_indicator">True</property>
-                                                <signal handler="magBorderChecked" last_modification_time="Mon, 10 Dec 2007 18:01:08 GMT" name="toggled"/>
+                                                <signal name="toggled" handler="magCrossHairOnOffChecked"/>
                                               </object>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">True</property>
-                                            <property name="fill">True</property>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkAlignment" id="alignment79">
+                                          <object class="GtkAlignment" id="alignment82">
                                             <property name="visible">True</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xscale">1</property>
-                                            <property name="yscale">1</property>
-                                            <property name="top_padding">0</property>
-                                            <property name="bottom_padding">0</property>
-                                            <property name="left_padding">0</property>
-                                            <property name="right_padding">0</property>
                                             <child>
-                                              <object class="GtkTable" id="magBorderTable">
+                                              <object class="GtkTable" id="magCrossHairTable">
                                                 <property name="visible">True</property>
-                                                <property name="n_rows">2</property>
-                                                <property name="n_columns">2</property>
-                                                <property name="homogeneous">False</property>
-                                                <property name="row_spacing">3</property>
+                                                <property name="border_width">3</property>
+                                                <property name="n_rows">3</property>
                                                 <property name="column_spacing">3</property>
+                                                <property name="row_spacing">3</property>
                                                 <child>
-                                                  <object class="GtkLabel" id="magBorderSizeLabel">
-                                                    <property name="visible">True</property>
-                                                    <property name="label" translatable="yes">Border size:</property>
-                                                    <property name="use_underline">False</property>
-                                                    <property name="use_markup">False</property>
-                                                    <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                                                    <property name="wrap">False</property>
-                                                    <property name="selectable">False</property>
-                                                    <property name="xalign">0</property>
-                                                    <property name="yalign">0.5</property>
-                                                    <property name="xpad">0</property>
-                                                    <property name="ypad">0</property>
-                                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                                    <property name="width_chars">-1</property>
-                                                    <property name="single_line_mode">False</property>
-                                                    <property name="angle">0</property>
-                                                    <accessibility>
-                                                      <relation target="magBorderSizeSpinButton" type="label-for"/>
-                                                    </accessibility>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="left_attach">0</property>
-                                                    <property name="right_attach">1</property>
-                                                    <property name="top_attach">0</property>
-                                                    <property name="bottom_attach">1</property>
-                                                    <property name="x_options">fill</property>
-                                                    <property name="y_options"/>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkSpinButton" id="magBorderSizeSpinButton">
+                                                  <object class="GtkCheckButton" id="magCrossHairClipCheckButton">
+                                                    <property name="label" translatable="yes">Enable cross-hair cl_ip</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
-                                                    <property name="climb_rate">1</property>
-                                                    <property name="digits">0</property>
-                                                    <property name="numeric">True</property>
-                                                    <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                                                    <property name="snap_to_ticks">False</property>
-                                                    <property name="wrap">False</property>
-                                                    <property name="adjustment">adjustment10</property>
-                                                    <accessibility>
-                                                      <relation target="magBorderSizeLabel" type="labelled-by"/>
-                                                    </accessibility>
-                                                    <signal handler="magBorderSizeValueChanged" last_modification_time="Mon, 10 Dec 2007 18:01:58 GMT" name="value_changed"/>
+                                                    <property name="receives_default">False</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="draw_indicator">True</property>
+                                                    <signal name="toggled" handler="magCrossHairClipOnOffChecked"/>
                                                   </object>
                                                   <packing>
-                                                    <property name="left_attach">1</property>
-                                                    <property name="right_attach">2</property>
-                                                    <property name="top_attach">0</property>
-                                                    <property name="bottom_attach">1</property>
-                                                    <property name="x_options">fill</property>
-                                                    <property name="y_options"/>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkLabel" id="magBorderColorLabel">
+                                                  <object class="GtkAlignment" id="alignment52">
                                                     <property name="visible">True</property>
-                                                    <property name="label" translatable="yes">Border color:</property>
-                                                    <property name="use_underline">False</property>
-                                                    <property name="use_markup">False</property>
-                                                    <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                                                    <property name="wrap">False</property>
-                                                    <property name="selectable">False</property>
-                                                    <property name="xalign">0</property>
-                                                    <property name="yalign">0.5</property>
-                                                    <property name="xpad">0</property>
-                                                    <property name="ypad">0</property>
-                                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                                    <property name="width_chars">-1</property>
-                                                    <property name="single_line_mode">False</property>
-                                                    <property name="angle">0</property>
-                                                    <accessibility>
-                                                      <relation target="magBorderColorButton" type="label-for"/>
-                                                    </accessibility>
+                                                    <child>
+                                                      <object class="GtkHBox" id="hbox33">
+                                                        <property name="visible">True</property>
+                                                        <property name="spacing">3</property>
+                                                        <child>
+                                                          <object class="GtkLabel" id="magCrossHairSizeLabel">
+                                                            <property name="visible">True</property>
+                                                            <property name="xalign">0</property>
+                                                            <property name="label" translatable="yes">Cross-hair si_ze:</property>
+                                                            <property name="use_underline">True</property>
+                                                            <property name="mnemonic_widget">magCrossHairSizeSpinButton</property>
+                                                            <accessibility>
+                                                            <relation type="label-for" target="magCrossHairSizeSpinButton"/>
+                                                            </accessibility>
+                                                          </object>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">False</property>
+                                                            <property name="position">0</property>
+                                                          </packing>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkSpinButton" id="magCrossHairSizeSpinButton">
+                                                            <property name="visible">True</property>
+                                                            <property name="can_focus">True</property>
+                                                            <property name="invisible_char">&#x25CF;</property>
+                                                            <property name="adjustment">adjustment14</property>
+                                                            <property name="climb_rate">1</property>
+                                                            <property name="numeric">True</property>
+                                                            <accessibility>
+                                                            <relation type="labelled-by" target="magCrossHairSizeLabel"/>
+                                                            <relation type="labelled-by" target="magCrossHairSizeUnitsLabel"/>
+                                                            </accessibility>
+                                                            <signal name="value_changed" handler="magCrossHairSizeValueChanged"/>
+                                                          </object>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="position">1</property>
+                                                          </packing>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkLabel" id="magCrossHairSizeUnitsLabel">
+                                                            <property name="visible">True</property>
+                                                            <property name="label" translatable="yes">pixels</property>
+                                                            <accessibility>
+                                                            <relation type="label-for" target="magCrossHairSizeSpinButton"/>
+                                                            </accessibility>
+                                                          </object>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">False</property>
+                                                            <property name="position">2</property>
+                                                          </packing>
+                                                        </child>
+                                                      </object>
+                                                    </child>
                                                   </object>
                                                   <packing>
-                                                    <property name="left_attach">0</property>
-                                                    <property name="right_attach">1</property>
                                                     <property name="top_attach">1</property>
                                                     <property name="bottom_attach">2</property>
-                                                    <property name="x_options">fill</property>
-                                                    <property name="y_options"/>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options">GTK_FILL</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkColorButton" id="magBorderColorButton">
+                                                  <object class="GtkAlignment" id="alignment75">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="use_alpha">False</property>
-                                                    <property name="focus_on_click">True</property>
-                                                    <accessibility>
-                                                      <relation target="magBorderColorLabel" type="labelled-by"/>
-                                                    </accessibility>
-                                                    <signal handler="magBorderColorSet" last_modification_time="Mon, 10 Dec 2007 18:48:34 GMT" name="color_set"/>
+                                                    <child>
+                                                      <object class="GtkHBox" id="hbox54">
+                                                        <property name="visible">True</property>
+                                                        <property name="spacing">3</property>
+                                                        <child>
+                                                          <object class="GtkLabel" id="magCrossHairColorLabel">
+                                                            <property name="visible">True</property>
+                                                            <property name="label" translatable="yes">Cross-hair color:</property>
+                                                            <accessibility>
+                                                            <relation type="label-for" target="magCrossHairColorButton"/>
+                                                            </accessibility>
+                                                          </object>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">False</property>
+                                                            <property name="position">0</property>
+                                                          </packing>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkColorButton" id="magCrossHairColorButton">
+                                                            <property name="visible">True</property>
+                                                            <property name="can_focus">True</property>
+                                                            <property name="receives_default">True</property>
+                                                            <property name="color">#000000000000</property>
+                                                            <accessibility>
+                                                            <relation type="labelled-by" target="magCrossHairColorLabel"/>
+                                                            </accessibility>
+                                                            <signal name="color_set" handler="magCrossHairColorSet"/>
+                                                          </object>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">False</property>
+                                                            <property name="position">1</property>
+                                                          </packing>
+                                                        </child>
+                                                      </object>
+                                                    </child>
                                                   </object>
                                                   <packing>
-                                                    <property name="left_attach">1</property>
-                                                    <property name="right_attach">2</property>
-                                                    <property name="top_attach">1</property>
-                                                    <property name="bottom_attach">2</property>
-                                                    <property name="x_options">fill</property>
-                                                    <property name="y_options"/>
+                                                    <property name="top_attach">2</property>
+                                                    <property name="bottom_attach">3</property>
+                                                    <property name="x_options">GTK_FILL</property>
                                                   </packing>
                                                 </child>
                                               </object>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">True</property>
-                                            <property name="fill">True</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child type="label">
-                                  <object class="GtkLabel" id="label36">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;Border Settings&lt;/b&gt;</property>
-                                    <property name="use_underline">False</property>
-                                    <property name="use_markup">True</property>
-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                    <property name="wrap">False</property>
-                                    <property name="selectable">False</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                    <property name="width_chars">-1</property>
-                                    <property name="single_line_mode">False</property>
-                                    <property name="angle">0</property>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="right_attach">3</property>
-                            <property name="top_attach">0</property>
-                            <property name="bottom_attach">1</property>
-                            <property name="y_options">fill</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment71">
-                            <property name="visible">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xscale">1</property>
-                            <property name="yscale">1</property>
-                            <property name="top_padding">12</property>
-                            <property name="bottom_padding">0</property>
-                            <property name="left_padding">0</property>
-                            <property name="right_padding">0</property>
-                            <child>
-                              <object class="GtkFrame" id="frame11">
-                                <property name="visible">True</property>
-                                <property name="label_xalign">0</property>
-                                <property name="label_yalign">0.5</property>
-                                <property name="shadow_type">GTK_SHADOW_NONE</property>
-                                <child>
-                                  <object class="GtkAlignment" id="alignment73">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xscale">1</property>
-                                    <property name="yscale">1</property>
-                                    <property name="top_padding">5</property>
-                                    <property name="bottom_padding">0</property>
-                                    <property name="left_padding">12</property>
-                                    <property name="right_padding">0</property>
-                                    <child>
-                                      <object class="GtkTable" id="table14">
-                                        <property name="visible">True</property>
-                                        <property name="n_rows">3</property>
-                                        <property name="n_columns">2</property>
-                                        <property name="homogeneous">False</property>
-                                        <property name="row_spacing">3</property>
-                                        <property name="column_spacing">3</property>
-                                        <child>
-                                          <object class="GtkCheckButton" id="magInvertColorsCheckBox">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="label" translatable="yes">In_vert colors</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="relief">GTK_RELIEF_NORMAL</property>
-                                            <property name="focus_on_click">True</property>
-                                            <property name="active">False</property>
-                                            <property name="inconsistent">False</property>
-                                            <property name="draw_indicator">True</property>
-                                            <signal handler="magInvertColorsChecked" last_modification_time="Wed, 03 May 2006 15:59:57 GMT" name="toggled"/>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="right_attach">2</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="bottom_attach">1</property>
-                                            <property name="x_options">fill</property>
-                                            <property name="y_options"/>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="magColorBrightnessLabel">
-                                            <property name="visible">True</property>
-                                            <property name="label" translatable="yes">Brightness:</property>
-                                            <property name="use_underline">False</property>
-                                            <property name="use_markup">False</property>
-                                            <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                                            <property name="wrap">False</property>
-                                            <property name="selectable">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xpad">0</property>
-                                            <property name="ypad">0</property>
-                                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                            <property name="width_chars">-1</property>
-                                            <property name="single_line_mode">False</property>
-                                            <property name="angle">0</property>
-                                            <accessibility>
-                                              <relation target="magColorBrightnessSpinButton" type="label-for"/>
-                                            </accessibility>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="right_attach">1</property>
-                                            <property name="top_attach">1</property>
-                                            <property name="bottom_attach">2</property>
-                                            <property name="x_options">fill</property>
-                                            <property name="y_options"/>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="magColorContrastLabel">
-                                            <property name="visible">True</property>
-                                            <property name="label" translatable="yes">Contrast:</property>
-                                            <property name="use_underline">False</property>
-                                            <property name="use_markup">False</property>
-                                            <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                                            <property name="wrap">False</property>
-                                            <property name="selectable">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xpad">0</property>
-                                            <property name="ypad">0</property>
-                                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                            <property name="width_chars">-1</property>
-                                            <property name="single_line_mode">False</property>
-                                            <property name="angle">0</property>
-                                            <accessibility>
-                                              <relation target="magColorContrastSpinButton" type="label-for"/>
-                                            </accessibility>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="right_attach">1</property>
-                                            <property name="top_attach">2</property>
-                                            <property name="bottom_attach">3</property>
-                                            <property name="x_options">fill</property>
-                                            <property name="y_options"/>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSpinButton" id="magColorBrightnessSpinButton">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="climb_rate">1</property>
-                                            <property name="digits">2</property>
-                                            <property name="numeric">True</property>
-                                            <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                                            <property name="snap_to_ticks">False</property>
-                                            <property name="wrap">False</property>
-                                            <property name="adjustment">adjustment11</property>
-                                            <accessibility>
-                                              <relation target="magColorBrightnessLabel" type="labelled-by"/>
-                                            </accessibility>
-                                            <signal handler="magColorBrightnessValueChanged" last_modification_time="Mon, 10 Dec 2007 18:33:38 GMT" name="value_changed"/>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
-                                            <property name="top_attach">1</property>
-                                            <property name="bottom_attach">2</property>
-                                            <property name="x_options">fill</property>
-                                            <property name="y_options"/>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSpinButton" id="magColorContrastSpinButton">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="climb_rate">1</property>
-                                            <property name="digits">2</property>
-                                            <property name="numeric">True</property>
-                                            <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                                            <property name="snap_to_ticks">False</property>
-                                            <property name="wrap">False</property>
-                                            <property name="adjustment">adjustment12</property>
-                                            <accessibility>
-                                              <relation target="magColorContrastLabel" type="labelled-by"/>
-                                            </accessibility>
-                                            <signal handler="magColorContrastValueChanged" last_modification_time="Mon, 10 Dec 2007 18:04:24 GMT" name="value_changed"/>
-                                            <signal handler="magColorContrastValueChanged" last_modification_time="Mon, 10 Dec 2007 18:33:55 GMT" name="value_changed"/>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
-                                            <property name="top_attach">2</property>
-                                            <property name="bottom_attach">3</property>
-                                            <property name="x_options">fill</property>
-                                            <property name="y_options"/>
+                                            <property name="position">1</property>
                                           </packing>
                                         </child>
                                       </object>
@@ -3695,330 +2631,208 @@
                                   </object>
                                 </child>
                                 <child type="label">
-                                  <object class="GtkLabel" id="label37">
+                                  <object class="GtkLabel" id="label20">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;Color Settings&lt;/b&gt;</property>
-                                    <property name="use_underline">False</property>
+                                    <property name="label" translatable="yes" context="Magnification" comments="Translators: This is a label in the Preferences dialog box. It applies to a group of settings related to the customization of the mouse pointer by adding a plus/cross-hair around it to make it easier to see. Options include whether or not cross-hairs should be enabled, as well as what their color and size should be.">&lt;b&gt;Cross-hair&lt;/b&gt;</property>
                                     <property name="use_markup">True</property>
-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                    <property name="wrap">False</property>
-                                    <property name="selectable">False</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                    <property name="width_chars">-1</property>
-                                    <property name="single_line_mode">False</property>
-                                    <property name="angle">0</property>
                                   </object>
                                 </child>
                               </object>
                             </child>
                           </object>
                           <packing>
-                            <property name="left_attach">2</property>
-                            <property name="right_attach">3</property>
+                            <property name="left_attach">3</property>
+                            <property name="right_attach">4</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
-                            <property name="x_options">fill</property>
-                            <property name="y_options">fill</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkAlignment" id="magCursorLabelAlignment">
                             <property name="visible">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xscale">1</property>
-                            <property name="yscale">1</property>
                             <property name="top_padding">12</property>
-                            <property name="bottom_padding">0</property>
-                            <property name="left_padding">0</property>
-                            <property name="right_padding">0</property>
                             <child>
                               <object class="GtkFrame" id="magCursorSettingsFrame">
                                 <property name="visible">True</property>
                                 <property name="label_xalign">0</property>
-                                <property name="label_yalign">0.5</property>
-                                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkAlignment" id="alignment39">
                                     <property name="visible">True</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xscale">1</property>
-                                    <property name="yscale">1</property>
-                                    <property name="top_padding">0</property>
-                                    <property name="bottom_padding">0</property>
                                     <property name="left_padding">12</property>
-                                    <property name="right_padding">0</property>
                                     <child>
                                       <object class="GtkVBox" id="vbox32">
                                         <property name="visible">True</property>
-                                        <property name="homogeneous">False</property>
-                                        <property name="spacing">0</property>
+                                        <property name="orientation">vertical</property>
                                         <child>
                                           <object class="GtkAlignment" id="alignment81">
                                             <property name="visible">True</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xscale">1</property>
-                                            <property name="yscale">1</property>
-                                            <property name="top_padding">0</property>
-                                            <property name="bottom_padding">0</property>
                                             <property name="left_padding">3</property>
-                                            <property name="right_padding">0</property>
                                             <child>
                                               <object class="GtkCheckButton" id="magCursorOnOffCheckButton">
+                                                <property name="label" translatable="yes">Enable c_ursor</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
-                                                <property name="label" translatable="yes">Enable c_ursor</property>
+                                                <property name="receives_default">False</property>
                                                 <property name="use_underline">True</property>
-                                                <property name="relief">GTK_RELIEF_NORMAL</property>
-                                                <property name="focus_on_click">True</property>
-                                                <property name="active">False</property>
-                                                <property name="inconsistent">False</property>
                                                 <property name="draw_indicator">True</property>
-                                                <signal handler="magCursorOnOffChecked" last_modification_time="Wed, 03 May 2006 15:26:53 GMT" name="toggled"/>
+                                                <signal name="toggled" handler="magCursorOnOffChecked"/>
                                               </object>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="padding">0</property>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkAlignment" id="alignment80">
                                             <property name="visible">True</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xscale">1</property>
-                                            <property name="yscale">1</property>
-                                            <property name="top_padding">0</property>
-                                            <property name="bottom_padding">0</property>
-                                            <property name="left_padding">0</property>
-                                            <property name="right_padding">0</property>
                                             <child>
                                               <object class="GtkTable" id="magCursorTable">
-                                                <property name="border_width">3</property>
                                                 <property name="visible">True</property>
+                                                <property name="border_width">3</property>
                                                 <property name="n_rows">3</property>
-                                                <property name="n_columns">1</property>
-                                                <property name="homogeneous">False</property>
-                                                <property name="row_spacing">3</property>
                                                 <property name="column_spacing">3</property>
+                                                <property name="row_spacing">3</property>
                                                 <child>
                                                   <object class="GtkCheckButton" id="magCursorSizeCheckButton">
+                                                    <property name="label" translatable="yes">Custom siz_e</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
-                                                    <property name="label" translatable="yes">Custom siz_e</property>
+                                                    <property name="receives_default">False</property>
                                                     <property name="use_underline">True</property>
-                                                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                                                    <property name="focus_on_click">True</property>
-                                                    <property name="active">False</property>
-                                                    <property name="inconsistent">False</property>
                                                     <property name="draw_indicator">True</property>
-                                                    <signal handler="magCursorExplicitSizeChecked" last_modification_time="Wed, 03 May 2006 15:29:51 GMT" name="toggled"/>
+                                                    <signal name="toggled" handler="magCursorExplicitSizeChecked"/>
                                                   </object>
                                                   <packing>
-                                                    <property name="left_attach">0</property>
-                                                    <property name="right_attach">1</property>
-                                                    <property name="top_attach">0</property>
-                                                    <property name="bottom_attach">1</property>
-                                                    <property name="x_options">fill</property>
-                                                    <property name="y_options"/>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
                                                   </packing>
                                                 </child>
                                                 <child>
                                                   <object class="GtkAlignment" id="alignment51">
                                                     <property name="visible">True</property>
-                                                    <property name="xalign">0.5</property>
-                                                    <property name="yalign">0.5</property>
-                                                    <property name="xscale">1</property>
-                                                    <property name="yscale">1</property>
-                                                    <property name="top_padding">0</property>
-                                                    <property name="bottom_padding">0</property>
-                                                    <property name="left_padding">0</property>
-                                                    <property name="right_padding">0</property>
                                                     <child>
                                                       <object class="GtkHBox" id="hbox38">
                                                         <property name="visible">True</property>
-                                                        <property name="homogeneous">False</property>
                                                         <property name="spacing">3</property>
                                                         <child>
                                                           <object class="GtkLabel" id="magCursorSizeLabel">
                                                             <property name="visible">True</property>
                                                             <property name="label" translatable="yes">Cursor size:</property>
                                                             <property name="use_underline">True</property>
-                                                            <property name="use_markup">False</property>
-                                                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                                            <property name="wrap">False</property>
-                                                            <property name="selectable">False</property>
-                                                            <property name="xalign">0.5</property>
-                                                            <property name="yalign">0.5</property>
-                                                            <property name="xpad">0</property>
-                                                            <property name="ypad">0</property>
                                                             <property name="mnemonic_widget">magCursorSizeSpinButton</property>
-                                                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                                            <property name="width_chars">-1</property>
-                                                            <property name="single_line_mode">False</property>
-                                                            <property name="angle">0</property>
                                                             <accessibility>
-                                                            <relation target="magCursorSizeSpinButton" type="label-for"/>
+                                                            <relation type="label-for" target="magCursorSizeSpinButton"/>
                                                             </accessibility>
                                                           </object>
                                                           <packing>
-                                                            <property name="padding">0</property>
                                                             <property name="expand">False</property>
                                                             <property name="fill">False</property>
+                                                            <property name="position">0</property>
                                                           </packing>
                                                         </child>
                                                         <child>
                                                           <object class="GtkSpinButton" id="magCursorSizeSpinButton">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
+                                                            <property name="invisible_char">&#x25CF;</property>
+                                                            <property name="adjustment">adjustment13</property>
                                                             <property name="climb_rate">1</property>
-                                                            <property name="digits">0</property>
                                                             <property name="numeric">True</property>
-                                                            <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                                                            <property name="snap_to_ticks">False</property>
-                                                            <property name="wrap">False</property>
-                                                            <property name="adjustment">adjustment13</property>
                                                             <accessibility>
-                                                            <relation target="magCursorSizeLabel" type="labelled-by"/>
-                                                            <relation target="magCursorSizeUnitsLabel" type="labelled-by"/>
+                                                            <relation type="labelled-by" target="magCursorSizeLabel"/>
+                                                            <relation type="labelled-by" target="magCursorSizeUnitsLabel"/>
                                                             </accessibility>
-                                                            <signal handler="magCursorSizeValueChanged" last_modification_time="Wed, 03 May 2006 15:31:48 GMT" name="value_changed"/>
+                                                            <signal name="value_changed" handler="magCursorSizeValueChanged"/>
                                                           </object>
                                                           <packing>
-                                                            <property name="padding">0</property>
                                                             <property name="expand">False</property>
                                                             <property name="fill">False</property>
+                                                            <property name="position">1</property>
                                                           </packing>
                                                         </child>
                                                         <child>
                                                           <object class="GtkLabel" id="magCursorSizeUnitsLabel">
                                                             <property name="visible">True</property>
                                                             <property name="label" translatable="yes">pixels</property>
-                                                            <property name="use_underline">False</property>
-                                                            <property name="use_markup">False</property>
-                                                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                                            <property name="wrap">False</property>
-                                                            <property name="selectable">False</property>
-                                                            <property name="xalign">0.5</property>
-                                                            <property name="yalign">0.5</property>
-                                                            <property name="xpad">0</property>
-                                                            <property name="ypad">0</property>
-                                                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                                            <property name="width_chars">-1</property>
-                                                            <property name="single_line_mode">False</property>
-                                                            <property name="angle">0</property>
                                                             <accessibility>
-                                                            <relation target="magCursorSizeSpinButton" type="label-for"/>
+                                                            <relation type="label-for" target="magCursorSizeSpinButton"/>
                                                             </accessibility>
                                                           </object>
                                                           <packing>
-                                                            <property name="padding">0</property>
                                                             <property name="expand">False</property>
                                                             <property name="fill">False</property>
+                                                            <property name="position">2</property>
                                                           </packing>
                                                         </child>
                                                       </object>
                                                     </child>
                                                   </object>
                                                   <packing>
-                                                    <property name="left_attach">0</property>
-                                                    <property name="right_attach">1</property>
                                                     <property name="top_attach">1</property>
                                                     <property name="bottom_attach">2</property>
-                                                    <property name="x_options">fill</property>
+                                                    <property name="x_options">GTK_FILL</property>
                                                   </packing>
                                                 </child>
                                                 <child>
                                                   <object class="GtkAlignment" id="alignment50">
                                                     <property name="visible">True</property>
-                                                    <property name="xalign">0.5</property>
-                                                    <property name="yalign">0.5</property>
-                                                    <property name="xscale">1</property>
-                                                    <property name="yscale">1</property>
-                                                    <property name="top_padding">0</property>
-                                                    <property name="bottom_padding">0</property>
-                                                    <property name="left_padding">0</property>
-                                                    <property name="right_padding">0</property>
                                                     <child>
                                                       <object class="GtkHBox" id="hbox37">
                                                         <property name="visible">True</property>
-                                                        <property name="homogeneous">False</property>
                                                         <property name="spacing">3</property>
                                                         <child>
                                                           <object class="GtkLabel" id="magCursorColorLabel">
                                                             <property name="visible">True</property>
+                                                            <property name="xalign">1</property>
                                                             <property name="label" translatable="yes">Cursor color:</property>
                                                             <property name="use_underline">True</property>
-                                                            <property name="use_markup">False</property>
-                                                            <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                                                            <property name="wrap">False</property>
-                                                            <property name="selectable">False</property>
-                                                            <property name="xalign">1</property>
-                                                            <property name="yalign">0.5</property>
-                                                            <property name="xpad">0</property>
-                                                            <property name="ypad">0</property>
+                                                            <property name="justify">right</property>
                                                             <property name="mnemonic_widget">magCursorColorButton</property>
-                                                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                                            <property name="width_chars">-1</property>
-                                                            <property name="single_line_mode">False</property>
-                                                            <property name="angle">0</property>
                                                             <accessibility>
-                                                            <relation target="magCursorColorButton" type="label-for"/>
+                                                            <relation type="label-for" target="magCursorColorButton"/>
                                                             </accessibility>
                                                           </object>
                                                           <packing>
-                                                            <property name="padding">0</property>
                                                             <property name="expand">False</property>
                                                             <property name="fill">False</property>
+                                                            <property name="position">0</property>
                                                           </packing>
                                                         </child>
                                                         <child>
                                                           <object class="GtkColorButton" id="magCursorColorButton">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
-                                                            <property name="use_alpha">False</property>
-                                                            <property name="focus_on_click">True</property>
+                                                            <property name="receives_default">True</property>
+                                                            <property name="color">#000000000000</property>
                                                             <accessibility>
-                                                            <relation target="magCursorColorLabel" type="labelled-by"/>
+                                                            <relation type="labelled-by" target="magCursorColorLabel"/>
                                                             </accessibility>
-                                                            <signal handler="magCursorColorSet" last_modification_time="Wed, 03 May 2006 15:34:37 GMT" name="color_set"/>
+                                                            <signal name="color_set" handler="magCursorColorSet"/>
                                                           </object>
                                                           <packing>
-                                                            <property name="padding">0</property>
                                                             <property name="expand">False</property>
                                                             <property name="fill">False</property>
+                                                            <property name="position">1</property>
                                                           </packing>
                                                         </child>
-                                                        <child>
-                                                          <placeholder/>
-                                                        </child>
                                                       </object>
                                                     </child>
                                                   </object>
                                                   <packing>
-                                                    <property name="left_attach">0</property>
-                                                    <property name="right_attach">1</property>
                                                     <property name="top_attach">2</property>
                                                     <property name="bottom_attach">3</property>
-                                                    <property name="x_options">fill</property>
+                                                    <property name="x_options">GTK_FILL</property>
                                                   </packing>
                                                 </child>
                                               </object>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">True</property>
-                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
                                           </packing>
                                         </child>
                                       </object>
@@ -4028,324 +2842,285 @@
                                 <child type="label">
                                   <object class="GtkLabel" id="label19">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;Cursor Settings&lt;/b&gt;</property>
-                                    <property name="use_underline">False</property>
+                                    <property name="label" translatable="yes" context="Magnification" comments="Translators: This is a label in the Preferences dialog box. It applies to a group of settings related to the cursor displayed for magnification users. Users can opt to enable an enlarged cursor, and customize its size and color.">&lt;b&gt;Cursor&lt;/b&gt;</property>
                                     <property name="use_markup">True</property>
-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                    <property name="wrap">False</property>
-                                    <property name="selectable">False</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                    <property name="width_chars">-1</property>
-                                    <property name="single_line_mode">False</property>
-                                    <property name="angle">0</property>
                                   </object>
                                 </child>
                               </object>
                             </child>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="right_attach">1</property>
+                            <property name="left_attach">2</property>
+                            <property name="right_attach">3</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
-                            <property name="x_options">fill</property>
+                            <property name="x_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkAlignment" id="magCrossHairLabelAlignment">
+                          <object class="GtkAlignment" id="magColorLabelAlignment">
+                            <property name="visible">True</property>
+                            <property name="top_padding">12</property>
+                            <child>
+                              <object class="GtkFrame" id="frame11">
+                                <property name="visible">True</property>
+                                <property name="label_xalign">0</property>
+                                <property name="shadow_type">none</property>
+                                <child>
+                                  <object class="GtkAlignment" id="alignment73">
+                                    <property name="visible">True</property>
+                                    <property name="left_padding">12</property>
+                                    <child>
+                                      <object class="GtkTable" id="table14">
+                                        <property name="visible">True</property>
+                                        <property name="n_rows">3</property>
+                                        <property name="n_columns">2</property>
+                                        <property name="column_spacing">3</property>
+                                        <property name="row_spacing">3</property>
+                                        <child>
+                                          <object class="GtkCheckButton" id="magInvertColorsCheckBox">
+                                            <property name="label" translatable="yes">In_vert colors</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">False</property>
+                                            <property name="use_underline">True</property>
+                                            <property name="draw_indicator">True</property>
+                                            <signal name="toggled" handler="magInvertColorsChecked"/>
+                                          </object>
+                                          <packing>
+                                            <property name="right_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="magColorBrightnessLabel">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Brightness:</property>
+                                            <property name="justify">right</property>
+                                            <accessibility>
+                                              <relation type="label-for" target="magColorBrightnessSpinButton"/>
+                                            </accessibility>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="magColorContrastLabel">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Contrast:</property>
+                                            <property name="justify">right</property>
+                                            <accessibility>
+                                              <relation type="label-for" target="magColorContrastSpinButton"/>
+                                            </accessibility>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkSpinButton" id="magColorBrightnessSpinButton">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="invisible_char">&#x25CF;</property>
+                                            <property name="adjustment">adjustment11</property>
+                                            <property name="climb_rate">1</property>
+                                            <property name="digits">2</property>
+                                            <property name="numeric">True</property>
+                                            <accessibility>
+                                              <relation type="labelled-by" target="magColorBrightnessLabel"/>
+                                            </accessibility>
+                                            <signal name="value_changed" handler="magColorBrightnessValueChanged"/>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkSpinButton" id="magColorContrastSpinButton">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="invisible_char">&#x25CF;</property>
+                                            <property name="adjustment">adjustment12</property>
+                                            <property name="climb_rate">1</property>
+                                            <property name="digits">2</property>
+                                            <property name="numeric">True</property>
+                                            <accessibility>
+                                              <relation type="labelled-by" target="magColorContrastLabel"/>
+                                            </accessibility>
+                                            <signal name="value_changed" handler="magColorContrastValueChanged"/>
+                                            <signal name="value_changed" handler="magColorContrastValueChanged"/>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</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>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="label37">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes" context="Magnification" comments="Translators: This is a label in the Preferences dialog box. It applies to a group of settings related to the colors displayed for magnification users, namely brightness, contrast, and whether or not all colors should be inverted.">&lt;b&gt;Color&lt;/b&gt;</property>
+                                    <property name="use_markup">True</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkAlignment" id="magBorderAlignment">
                             <property name="visible">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xscale">1</property>
-                            <property name="yscale">1</property>
                             <property name="top_padding">12</property>
-                            <property name="bottom_padding">0</property>
                             <property name="left_padding">25</property>
-                            <property name="right_padding">0</property>
                             <child>
-                              <object class="GtkFrame" id="magCrossHairSettingsFrame">
+                              <object class="GtkFrame" id="frame10">
                                 <property name="visible">True</property>
                                 <property name="label_xalign">0</property>
-                                <property name="label_yalign">0.5</property>
-                                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                <property name="shadow_type">none</property>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment40">
+                                  <object class="GtkAlignment" id="alignment72">
                                     <property name="visible">True</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xscale">1</property>
-                                    <property name="yscale">1</property>
-                                    <property name="top_padding">0</property>
-                                    <property name="bottom_padding">0</property>
+                                    <property name="yalign">0</property>
+                                    <property name="yscale">0</property>
                                     <property name="left_padding">12</property>
-                                    <property name="right_padding">0</property>
                                     <child>
-                                      <object class="GtkVBox" id="vbox33">
+                                      <object class="GtkVBox" id="vbox31">
                                         <property name="visible">True</property>
-                                        <property name="homogeneous">False</property>
-                                        <property name="spacing">0</property>
+                                        <property name="orientation">vertical</property>
                                         <child>
-                                          <object class="GtkAlignment" id="alignment83">
+                                          <object class="GtkAlignment" id="alignment78">
                                             <property name="visible">True</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xscale">1</property>
-                                            <property name="yscale">1</property>
-                                            <property name="top_padding">0</property>
-                                            <property name="bottom_padding">0</property>
-                                            <property name="left_padding">3</property>
-                                            <property name="right_padding">0</property>
                                             <child>
-                                              <object class="GtkCheckButton" id="magCrossHairOnOffCheckButton">
+                                              <object class="GtkCheckButton" id="magBorderCheckButton">
+                                                <property name="label" translatable="yes">Enable bor_der</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
-                                                <property name="label" translatable="yes">Enable cross-h_air</property>
+                                                <property name="receives_default">False</property>
                                                 <property name="use_underline">True</property>
-                                                <property name="relief">GTK_RELIEF_NORMAL</property>
-                                                <property name="focus_on_click">True</property>
-                                                <property name="active">False</property>
-                                                <property name="inconsistent">False</property>
                                                 <property name="draw_indicator">True</property>
-                                                <signal handler="magCrossHairOnOffChecked" last_modification_time="Wed, 03 May 2006 15:36:39 GMT" name="toggled"/>
+                                                <signal name="toggled" handler="magBorderChecked"/>
                                               </object>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">False</property>
-                                            <property name="fill">False</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkAlignment" id="alignment82">
+                                          <object class="GtkAlignment" id="alignment79">
                                             <property name="visible">True</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xscale">1</property>
-                                            <property name="yscale">1</property>
-                                            <property name="top_padding">0</property>
-                                            <property name="bottom_padding">0</property>
-                                            <property name="left_padding">0</property>
-                                            <property name="right_padding">0</property>
                                             <child>
-                                              <object class="GtkTable" id="magCrossHairTable">
-                                                <property name="border_width">3</property>
+                                              <object class="GtkTable" id="magBorderTable">
                                                 <property name="visible">True</property>
-                                                <property name="n_rows">3</property>
-                                                <property name="n_columns">1</property>
-                                                <property name="homogeneous">False</property>
-                                                <property name="row_spacing">3</property>
+                                                <property name="n_rows">2</property>
+                                                <property name="n_columns">2</property>
                                                 <property name="column_spacing">3</property>
+                                                <property name="row_spacing">3</property>
                                                 <child>
-                                                  <object class="GtkCheckButton" id="magCrossHairClipCheckButton">
+                                                  <object class="GtkLabel" id="magBorderSizeLabel">
+                                                    <property name="visible">True</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">Border size:</property>
+                                                    <property name="justify">right</property>
+                                                    <accessibility>
+                                                      <relation type="label-for" target="magBorderSizeSpinButton"/>
+                                                    </accessibility>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkSpinButton" id="magBorderSizeSpinButton">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
-                                                    <property name="label" translatable="yes">Enable cross-hair cl_ip</property>
-                                                    <property name="use_underline">True</property>
-                                                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                                                    <property name="focus_on_click">True</property>
-                                                    <property name="active">False</property>
-                                                    <property name="inconsistent">False</property>
-                                                    <property name="draw_indicator">True</property>
-                                                    <signal handler="magCrossHairClipOnOffChecked" last_modification_time="Wed, 03 May 2006 15:37:49 GMT" name="toggled"/>
+                                                    <property name="invisible_char">&#x25CF;</property>
+                                                    <property name="adjustment">adjustment10</property>
+                                                    <property name="climb_rate">1</property>
+                                                    <property name="numeric">True</property>
+                                                    <accessibility>
+                                                      <relation type="labelled-by" target="magBorderSizeLabel"/>
+                                                    </accessibility>
+                                                    <signal name="value_changed" handler="magBorderSizeValueChanged"/>
                                                   </object>
                                                   <packing>
-                                                    <property name="left_attach">0</property>
-                                                    <property name="right_attach">1</property>
-                                                    <property name="top_attach">0</property>
-                                                    <property name="bottom_attach">1</property>
-                                                    <property name="x_options">fill</property>
-                                                    <property name="y_options"/>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="right_attach">2</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkAlignment" id="alignment52">
+                                                  <object class="GtkLabel" id="magBorderColorLabel">
                                                     <property name="visible">True</property>
-                                                    <property name="xalign">0.5</property>
-                                                    <property name="yalign">0.5</property>
-                                                    <property name="xscale">1</property>
-                                                    <property name="yscale">1</property>
-                                                    <property name="top_padding">0</property>
-                                                    <property name="bottom_padding">0</property>
-                                                    <property name="left_padding">0</property>
-                                                    <property name="right_padding">0</property>
-                                                    <child>
-                                                      <object class="GtkHBox" id="hbox33">
-                                                        <property name="visible">True</property>
-                                                        <property name="homogeneous">False</property>
-                                                        <property name="spacing">3</property>
-                                                        <child>
-                                                          <object class="GtkLabel" id="magCrossHairSizeLabel">
-                                                            <property name="visible">True</property>
-                                                            <property name="label" translatable="yes">Cross-hair si_ze:</property>
-                                                            <property name="use_underline">True</property>
-                                                            <property name="use_markup">False</property>
-                                                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                                            <property name="wrap">False</property>
-                                                            <property name="selectable">False</property>
-                                                            <property name="xalign">0</property>
-                                                            <property name="yalign">0.5</property>
-                                                            <property name="xpad">0</property>
-                                                            <property name="ypad">0</property>
-                                                            <property name="mnemonic_widget">magCrossHairSizeSpinButton</property>
-                                                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                                            <property name="width_chars">-1</property>
-                                                            <property name="single_line_mode">False</property>
-                                                            <property name="angle">0</property>
-                                                            <accessibility>
-                                                            <relation target="magCrossHairSizeSpinButton" type="label-for"/>
-                                                            </accessibility>
-                                                          </object>
-                                                          <packing>
-                                                            <property name="padding">0</property>
-                                                            <property name="expand">False</property>
-                                                            <property name="fill">False</property>
-                                                          </packing>
-                                                        </child>
-                                                        <child>
-                                                          <object class="GtkSpinButton" id="magCrossHairSizeSpinButton">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">True</property>
-                                                            <property name="climb_rate">1</property>
-                                                            <property name="digits">0</property>
-                                                            <property name="numeric">True</property>
-                                                            <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                                                            <property name="snap_to_ticks">False</property>
-                                                            <property name="wrap">False</property>
-                                                            <property name="adjustment">adjustment14</property>
-                                                            <accessibility>
-                                                            <relation target="magCrossHairSizeLabel" type="labelled-by"/>
-                                                            <relation target="magCrossHairSizeUnitsLabel" type="labelled-by"/>
-                                                            </accessibility>
-                                                            <signal handler="magCrossHairSizeValueChanged" last_modification_time="Wed, 03 May 2006 15:39:23 GMT" name="value_changed"/>
-                                                          </object>
-                                                          <packing>
-                                                            <property name="padding">0</property>
-                                                            <property name="expand">False</property>
-                                                            <property name="fill">True</property>
-                                                          </packing>
-                                                        </child>
-                                                        <child>
-                                                          <object class="GtkLabel" id="magCrossHairSizeUnitsLabel">
-                                                            <property name="visible">True</property>
-                                                            <property name="label" translatable="yes">pixels</property>
-                                                            <property name="use_underline">False</property>
-                                                            <property name="use_markup">False</property>
-                                                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                                            <property name="wrap">False</property>
-                                                            <property name="selectable">False</property>
-                                                            <property name="xalign">0.5</property>
-                                                            <property name="yalign">0.5</property>
-                                                            <property name="xpad">0</property>
-                                                            <property name="ypad">0</property>
-                                                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                                            <property name="width_chars">-1</property>
-                                                            <property name="single_line_mode">False</property>
-                                                            <property name="angle">0</property>
-                                                            <accessibility>
-                                                            <relation target="magCrossHairSizeSpinButton" type="label-for"/>
-                                                            </accessibility>
-                                                          </object>
-                                                          <packing>
-                                                            <property name="padding">0</property>
-                                                            <property name="expand">False</property>
-                                                            <property name="fill">False</property>
-                                                          </packing>
-                                                        </child>
-                                                      </object>
-                                                    </child>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">Border color:</property>
+                                                    <property name="justify">right</property>
+                                                    <accessibility>
+                                                      <relation type="label-for" target="magBorderColorButton"/>
+                                                    </accessibility>
                                                   </object>
                                                   <packing>
-                                                    <property name="left_attach">0</property>
-                                                    <property name="right_attach">1</property>
                                                     <property name="top_attach">1</property>
                                                     <property name="bottom_attach">2</property>
-                                                    <property name="x_options">fill</property>
-                                                    <property name="y_options">fill</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkAlignment" id="alignment75">
+                                                  <object class="GtkColorButton" id="magBorderColorButton">
                                                     <property name="visible">True</property>
-                                                    <property name="xalign">0.5</property>
-                                                    <property name="yalign">0.5</property>
-                                                    <property name="xscale">1</property>
-                                                    <property name="yscale">1</property>
-                                                    <property name="top_padding">0</property>
-                                                    <property name="bottom_padding">0</property>
-                                                    <property name="left_padding">0</property>
-                                                    <property name="right_padding">0</property>
-                                                    <child>
-                                                      <object class="GtkHBox" id="hbox54">
-                                                        <property name="visible">True</property>
-                                                        <property name="homogeneous">False</property>
-                                                        <property name="spacing">3</property>
-                                                        <child>
-                                                          <object class="GtkLabel" id="magCrossHairColorLabel">
-                                                            <property name="visible">True</property>
-                                                            <property name="label" translatable="yes">Cross-hair color:</property>
-                                                            <property name="use_underline">False</property>
-                                                            <property name="use_markup">False</property>
-                                                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                                            <property name="wrap">False</property>
-                                                            <property name="selectable">False</property>
-                                                            <property name="xalign">0.5</property>
-                                                            <property name="yalign">0.5</property>
-                                                            <property name="xpad">0</property>
-                                                            <property name="ypad">0</property>
-                                                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                                            <property name="width_chars">-1</property>
-                                                            <property name="single_line_mode">False</property>
-                                                            <property name="angle">0</property>
-                                                            <accessibility>
-                                                            <relation target="magCrossHairColorButton" type="label-for"/>
-                                                            </accessibility>
-                                                          </object>
-                                                          <packing>
-                                                            <property name="padding">0</property>
-                                                            <property name="expand">False</property>
-                                                            <property name="fill">False</property>
-                                                          </packing>
-                                                        </child>
-                                                        <child>
-                                                          <object class="GtkColorButton" id="magCrossHairColorButton">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">True</property>
-                                                            <property name="use_alpha">False</property>
-                                                            <property name="focus_on_click">True</property>
-                                                            <accessibility>
-                                                            <relation target="magCrossHairColorLabel" type="labelled-by"/>
-                                                            </accessibility>
-                                                            <signal handler="magCrossHairColorSet" last_modification_time="Mon, 10 Dec 2007 18:04:59 GMT" name="color_set"/>
-                                                          </object>
-                                                          <packing>
-                                                            <property name="padding">0</property>
-                                                            <property name="expand">False</property>
-                                                            <property name="fill">False</property>
-                                                          </packing>
-                                                        </child>
-                                                      </object>
-                                                    </child>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="receives_default">True</property>
+                                                    <property name="color">#000000000000</property>
+                                                    <accessibility>
+                                                      <relation type="labelled-by" target="magBorderColorLabel"/>
+                                                    </accessibility>
+                                                    <signal name="color_set" handler="magBorderColorSet"/>
                                                   </object>
                                                   <packing>
-                                                    <property name="left_attach">0</property>
-                                                    <property name="right_attach">1</property>
-                                                    <property name="top_attach">2</property>
-                                                    <property name="bottom_attach">3</property>
-                                                    <property name="x_options">fill</property>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="right_attach">2</property>
+                                                    <property name="top_attach">1</property>
+                                                    <property name="bottom_attach">2</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
                                                   </packing>
                                                 </child>
                                               </object>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">True</property>
-                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
                                           </packing>
                                         </child>
                                       </object>
@@ -4353,22 +3128,10 @@
                                   </object>
                                 </child>
                                 <child type="label">
-                                  <object class="GtkLabel" id="label20">
+                                  <object class="GtkLabel" id="label36">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;Cross-hair Settings&lt;/b&gt;</property>
-                                    <property name="use_underline">False</property>
+                                    <property name="label" translatable="yes" context="Magnification" comments="Translators: This is a label in the Preferences dialog box. It applies to a group of settings related to the border which separates the magnified and non-magnified views of the screen contents (i.e. when a split screen is being used). The options include whether or not there should be a border, the size of the border, and the color of the border.">&lt;b&gt;Border&lt;/b&gt;</property>
                                     <property name="use_markup">True</property>
-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                    <property name="wrap">False</property>
-                                    <property name="selectable">False</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                    <property name="width_chars">-1</property>
-                                    <property name="single_line_mode">False</property>
-                                    <property name="angle">0</property>
                                   </object>
                                 </child>
                               </object>
@@ -4379,116 +3142,72 @@
                             <property name="right_attach">2</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
+                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkAlignment" id="alignment666">
+                          <object class="GtkAlignment" id="magTrackingAlignment">
                             <property name="visible">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xscale">1</property>
-                            <property name="yscale">1</property>
-                            <property name="top_padding">12</property>
-                            <property name="bottom_padding">0</property>
-                            <property name="left_padding">0</property>
-                            <property name="right_padding">0</property>
                             <child>
                               <object class="GtkFrame" id="magTrackingAndAlignmentFrame">
                                 <property name="visible">True</property>
                                 <property name="label_xalign">0</property>
-                                <property name="label_yalign">0.5</property>
-                                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkAlignment" id="alignment62">
                                     <property name="visible">True</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xscale">1</property>
-                                    <property name="yscale">1</property>
-                                    <property name="top_padding">0</property>
-                                    <property name="bottom_padding">0</property>
                                     <property name="left_padding">12</property>
-                                    <property name="right_padding">0</property>
                                     <child>
                                       <object class="GtkTable" id="table13">
                                         <property name="visible">True</property>
                                         <property name="n_rows">3</property>
                                         <property name="n_columns">3</property>
-                                        <property name="homogeneous">False</property>
-                                        <property name="row_spacing">3</property>
                                         <property name="column_spacing">3</property>
+                                        <property name="row_spacing">3</property>
                                         <child>
                                           <object class="GtkLabel" id="magMouseTrackingLabel">
                                             <property name="visible">True</property>
+                                            <property name="xalign">1</property>
                                             <property name="label" translatable="yes">Mouse poi_nter:</property>
                                             <property name="use_underline">True</property>
-                                            <property name="use_markup">False</property>
-                                            <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                                            <property name="wrap">False</property>
-                                            <property name="selectable">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xpad">0</property>
-                                            <property name="ypad">0</property>
+                                            <property name="justify">right</property>
                                             <property name="mnemonic_widget">magMouseTrackingComboBox</property>
-                                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                            <property name="width_chars">-1</property>
-                                            <property name="single_line_mode">False</property>
-                                            <property name="angle">0</property>
                                             <accessibility>
-                                              <relation target="magMouseTrackingComboBox" type="label-for"/>
+                                              <relation type="label-for" target="magMouseTrackingComboBox"/>
                                             </accessibility>
                                           </object>
                                           <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="right_attach">1</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="bottom_attach">1</property>
-                                            <property name="x_options">fill</property>
-                                            <property name="y_options"/>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkLabel" id="magControlTrackingLabel">
                                             <property name="visible">True</property>
+                                            <property name="xalign">1</property>
                                             <property name="label" translatable="yes">_Control and menu item:</property>
                                             <property name="use_underline">True</property>
-                                            <property name="use_markup">False</property>
-                                            <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                                            <property name="wrap">False</property>
-                                            <property name="selectable">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xpad">0</property>
-                                            <property name="ypad">0</property>
+                                            <property name="justify">right</property>
                                             <property name="mnemonic_widget">magControlTrackingComboBox</property>
-                                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                            <property name="width_chars">-1</property>
-                                            <property name="single_line_mode">False</property>
-                                            <property name="angle">0</property>
                                             <accessibility>
-                                              <relation target="magControlTrackingComboBox" type="label-for"/>
+                                              <relation type="label-for" target="magControlTrackingComboBox"/>
                                             </accessibility>
                                           </object>
                                           <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="right_attach">1</property>
                                             <property name="top_attach">1</property>
                                             <property name="bottom_attach">2</property>
-                                            <property name="x_options">fill</property>
-                                            <property name="y_options"/>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkComboBox" id="magControlTrackingComboBox">
                                             <property name="visible">True</property>
-                                            <property name="add_tearoffs">False</property>
-                                            <property name="focus_on_click">True</property>
+                                            <property name="model">model4</property>
                                             <accessibility>
-                                              <relation target="magControlTrackingLabel" type="labelled-by"/>
+                                              <relation type="labelled-by" target="magControlTrackingLabel"/>
                                             </accessibility>
-                                            <signal handler="magControlTrackingChanged" last_modification_time="Thu, 06 Dec 2007 22:56:53 GMT" name="changed"/>
-                                            <property name="model">model4</property>
+                                            <signal name="changed" handler="magControlTrackingChanged"/>
                                             <child>
                                               <object class="GtkCellRendererText" id="renderer4"/>
                                               <attributes>
@@ -4501,51 +3220,37 @@
                                             <property name="right_attach">2</property>
                                             <property name="top_attach">1</property>
                                             <property name="bottom_attach">2</property>
-                                            <property name="x_options">fill</property>
-                                            <property name="y_options">fill</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options">GTK_FILL</property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkLabel" id="magTextCursorTrackingLabel">
                                             <property name="visible">True</property>
+                                            <property name="xalign">1</property>
                                             <property name="label" translatable="yes">Te_xt cursor:</property>
                                             <property name="use_underline">True</property>
-                                            <property name="use_markup">False</property>
-                                            <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                                            <property name="wrap">False</property>
-                                            <property name="selectable">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xpad">0</property>
-                                            <property name="ypad">0</property>
+                                            <property name="justify">right</property>
                                             <property name="mnemonic_widget">magTextCursorTrackingComboBox</property>
-                                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                            <property name="width_chars">-1</property>
-                                            <property name="single_line_mode">False</property>
-                                            <property name="angle">0</property>
                                             <accessibility>
-                                              <relation target="magTextCursorTrackingComboBox" type="label-for"/>
+                                              <relation type="label-for" target="magTextCursorTrackingComboBox"/>
                                             </accessibility>
                                           </object>
                                           <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="right_attach">1</property>
                                             <property name="top_attach">2</property>
                                             <property name="bottom_attach">3</property>
-                                            <property name="x_options">fill</property>
-                                            <property name="y_options"/>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkComboBox" id="magTextCursorTrackingComboBox">
                                             <property name="visible">True</property>
-                                            <property name="add_tearoffs">False</property>
-                                            <property name="focus_on_click">True</property>
+                                            <property name="model">model5</property>
                                             <accessibility>
-                                              <relation target="magTextCursorTrackingLabel" type="labelled-by"/>
+                                              <relation type="labelled-by" target="magTextCursorTrackingLabel"/>
                                             </accessibility>
-                                            <signal handler="magTextTrackingChanged" last_modification_time="Thu, 06 Dec 2007 22:57:13 GMT" name="changed"/>
-                                            <property name="model">model5</property>
+                                            <signal name="changed" handler="magTextTrackingChanged"/>
                                             <child>
                                               <object class="GtkCellRendererText" id="renderer5"/>
                                               <attributes>
@@ -4558,20 +3263,18 @@
                                             <property name="right_attach">2</property>
                                             <property name="top_attach">2</property>
                                             <property name="bottom_attach">3</property>
-                                            <property name="x_options">fill</property>
-                                            <property name="y_options">fill</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options">GTK_FILL</property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkComboBox" id="magMouseTrackingComboBox">
                                             <property name="visible">True</property>
-                                            <property name="add_tearoffs">False</property>
-                                            <property name="focus_on_click">True</property>
+                                            <property name="model">model6</property>
                                             <accessibility>
-                                              <relation target="magMouseTrackingLabel" type="labelled-by"/>
+                                              <relation type="labelled-by" target="magMouseTrackingLabel"/>
                                             </accessibility>
-                                            <signal handler="magMouseTrackingChanged" last_modification_time="Wed, 03 May 2006 15:55:53 GMT" name="changed"/>
-                                            <property name="model">model6</property>
+                                            <signal name="changed" handler="magMouseTrackingChanged"/>
                                             <child>
                                               <object class="GtkCellRendererText" id="renderer6"/>
                                               <attributes>
@@ -4582,104 +3285,67 @@
                                           <packing>
                                             <property name="left_attach">1</property>
                                             <property name="right_attach">2</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="bottom_attach">1</property>
-                                            <property name="x_options">fill</property>
-                                            <property name="y_options">fill</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options">GTK_FILL</property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkAlignment" id="alignment84">
                                             <property name="visible">True</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xscale">1</property>
-                                            <property name="yscale">1</property>
-                                            <property name="top_padding">0</property>
-                                            <property name="bottom_padding">0</property>
-                                            <property name="left_padding">0</property>
-                                            <property name="right_padding">0</property>
                                             <child>
                                               <object class="GtkHBox" id="magEdgeMarginHBox">
                                                 <property name="visible">True</property>
-                                                <property name="homogeneous">False</property>
                                                 <property name="spacing">3</property>
                                                 <child>
                                                   <object class="GtkLabel" id="magEdgeMarginLabel">
                                                     <property name="visible">True</property>
-                                                    <property comments="Translators: When a user chooses a tracking alignment of &quot;push&quot;, Orca moves the magnified view just enough to fit the object of interest at the very edge of the screen.  The &quot;edge margin&quot; allows the user to specify a margin so that objects are not displayed too close to the edge." name="label" translatable="yes">Edge mar_gin:</property>
+                                                    <property name="label" translatable="yes" comments="Translators: When a user chooses a tracking alignment of &quot;push&quot;, Orca moves the magnified view just enough to fit the object of interest at the very edge of the screen.  The &quot;edge margin&quot; allows the user to specify a margin so that objects are not displayed too close to the edge.">Edge mar_gin:</property>
                                                     <property name="use_underline">True</property>
-                                                    <property name="use_markup">False</property>
-                                                    <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                                                    <property name="wrap">False</property>
-                                                    <property name="selectable">False</property>
-                                                    <property name="xalign">0.5</property>
-                                                    <property name="yalign">0.5</property>
-                                                    <property name="xpad">0</property>
-                                                    <property name="ypad">0</property>
+                                                    <property name="justify">right</property>
                                                     <property name="mnemonic_widget">magEdgeMarginSpinButton</property>
-                                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                                    <property name="width_chars">-1</property>
-                                                    <property name="single_line_mode">False</property>
-                                                    <property name="angle">0</property>
                                                     <accessibility>
-                                                      <relation target="magEdgeMarginSpinButton" type="label-for"/>
+                                                      <relation type="label-for" target="magEdgeMarginSpinButton"/>
                                                     </accessibility>
                                                   </object>
                                                   <packing>
-                                                    <property name="padding">17</property>
                                                     <property name="expand">False</property>
                                                     <property name="fill">False</property>
+                                                    <property name="padding">17</property>
+                                                    <property name="position">0</property>
                                                   </packing>
                                                 </child>
                                                 <child>
                                                   <object class="GtkSpinButton" id="magEdgeMarginSpinButton">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
+                                                    <property name="invisible_char">&#x25CF;</property>
+                                                    <property name="adjustment">adjustment15</property>
                                                     <property name="climb_rate">1</property>
-                                                    <property name="digits">0</property>
                                                     <property name="numeric">True</property>
-                                                    <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                                                    <property name="snap_to_ticks">False</property>
-                                                    <property name="wrap">False</property>
-                                                    <property name="adjustment">adjustment15</property>
                                                     <accessibility>
-                                                      <relation target="magEdgeMarginUnitsLabel" type="labelled-by"/>
-                                                      <relation target="magEdgeMarginLabel" type="labelled-by"/>
+                                                      <relation type="labelled-by" target="magEdgeMarginUnitsLabel"/>
+                                                      <relation type="labelled-by" target="magEdgeMarginLabel"/>
                                                     </accessibility>
-                                                    <signal handler="magEdgeMarginValueChanged" last_modification_time="Thu, 06 Dec 2007 22:57:50 GMT" name="value_changed"/>
+                                                    <signal name="value_changed" handler="magEdgeMarginValueChanged"/>
                                                   </object>
                                                   <packing>
-                                                    <property name="padding">0</property>
                                                     <property name="expand">False</property>
                                                     <property name="fill">False</property>
+                                                    <property name="position">1</property>
                                                   </packing>
                                                 </child>
                                                 <child>
                                                   <object class="GtkLabel" id="magEdgeMarginUnitsLabel">
                                                     <property name="visible">True</property>
                                                     <property name="label" translatable="yes">%</property>
-                                                    <property name="use_underline">False</property>
-                                                    <property name="use_markup">False</property>
-                                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                                    <property name="wrap">False</property>
-                                                    <property name="selectable">False</property>
-                                                    <property name="xalign">0.5</property>
-                                                    <property name="yalign">0.5</property>
-                                                    <property name="xpad">0</property>
-                                                    <property name="ypad">0</property>
-                                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                                    <property name="width_chars">-1</property>
-                                                    <property name="single_line_mode">False</property>
-                                                    <property name="angle">0</property>
                                                     <accessibility>
-                                                      <relation target="magEdgeMarginSpinButton" type="label-for"/>
+                                                      <relation type="label-for" target="magEdgeMarginSpinButton"/>
                                                     </accessibility>
                                                   </object>
                                                   <packing>
-                                                    <property name="padding">0</property>
                                                     <property name="expand">False</property>
                                                     <property name="fill">False</property>
+                                                    <property name="position">2</property>
                                                   </packing>
                                                 </child>
                                               </object>
@@ -4690,32 +3356,22 @@
                                             <property name="right_attach">3</property>
                                             <property name="top_attach">2</property>
                                             <property name="bottom_attach">3</property>
-                                            <property name="y_options">fill</property>
+                                            <property name="y_options">GTK_FILL</property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkAlignment" id="alignment85">
                                             <property name="visible">True</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xscale">1</property>
-                                            <property name="yscale">1</property>
-                                            <property name="top_padding">0</property>
-                                            <property name="bottom_padding">0</property>
                                             <property name="left_padding">15</property>
-                                            <property name="right_padding">0</property>
                                             <child>
                                               <object class="GtkCheckButton" id="magPointerFocusCheckButton">
+                                                <property name="label" translatable="yes" comments="Translators:  if this setting is enabled, the mouse pointer will move to each menu item that the user has arrowed to and each dialog box control that the user has tabbed to.">Pointer follows focus</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
-                                                <property comments="Translators:  if this setting is enabled, the mouse pointer will move to each menu item that the user has arrowed to and each dialog box control that the user has tabbed to." name="label" translatable="yes">Pointer follows focus</property>
+                                                <property name="receives_default">False</property>
                                                 <property name="use_underline">True</property>
-                                                <property name="relief">GTK_RELIEF_NORMAL</property>
-                                                <property name="focus_on_click">True</property>
-                                                <property name="active">False</property>
-                                                <property name="inconsistent">False</property>
                                                 <property name="draw_indicator">True</property>
-                                                <signal handler="magPointerFocusChecked" last_modification_time="Mon, 17 Dec 2007 00:58:21 GMT" name="toggled"/>
+                                                <signal name="toggled" handler="magPointerFocusChecked"/>
                                               </object>
                                             </child>
                                           </object>
@@ -4724,43 +3380,31 @@
                                             <property name="right_attach">3</property>
                                             <property name="top_attach">1</property>
                                             <property name="bottom_attach">2</property>
-                                            <property name="x_options">fill</property>
-                                            <property name="y_options">fill</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options">GTK_FILL</property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkAlignment" id="alignment86">
                                             <property name="visible">True</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xscale">1</property>
-                                            <property name="yscale">1</property>
-                                            <property name="top_padding">0</property>
-                                            <property name="bottom_padding">0</property>
                                             <property name="left_padding">15</property>
-                                            <property name="right_padding">0</property>
                                             <child>
                                               <object class="GtkCheckButton" id="magPointerZoomerCheckButton">
+                                                <property name="label" translatable="yes" comments="Translators: when using magnification software, it is possible for the mouse pointer to not be visible in the &quot;zoomer,&quot; which is the magnified view of the screen.  If the &quot;pointer follows zoomer&quot; setting is enabled and the mouse is moved, the pointer will be moved so that it is visible in the zoomer.  If it is not enabled, the zoomer will be moved to display the location of the mouse pointer.">Pointer follows zoomer</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
-                                                <property comments="Translators: when using magnification software, it is possible for the mouse pointer to not be visible in the &quot;zoomer,&quot; which is the magnified view of the screen.  If the &quot;pointer follows zoomer&quot; setting is enabled and the mouse is moved, the pointer will be moved so that it is visible in the zoomer.  If it is not enabled, the zoomer will be moved to display the location of the mouse pointer." name="label" translatable="yes">Pointer follows zoomer</property>
+                                                <property name="receives_default">False</property>
                                                 <property name="use_underline">True</property>
-                                                <property name="relief">GTK_RELIEF_NORMAL</property>
-                                                <property name="focus_on_click">True</property>
-                                                <property name="active">False</property>
-                                                <property name="inconsistent">False</property>
                                                 <property name="draw_indicator">True</property>
-                                                <signal handler="magPointerZoomerChecked" last_modification_time="Mon, 17 Dec 2007 01:00:04 GMT" name="toggled"/>
+                                                <signal name="toggled" handler="magPointerZoomerChecked"/>
                                               </object>
                                             </child>
                                           </object>
                                           <packing>
                                             <property name="left_attach">2</property>
                                             <property name="right_attach">3</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="bottom_attach">1</property>
-                                            <property name="x_options">fill</property>
-                                            <property name="y_options">fill</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options">GTK_FILL</property>
                                           </packing>
                                         </child>
                                       </object>
@@ -4770,62 +3414,54 @@
                                 <child type="label">
                                   <object class="GtkLabel" id="label30">
                                     <property name="visible">True</property>
-                                    <property comments="Translators:  In the context of magnifying the contents of the screen, &quot;tracking&quot; refers to whether or not an object (mouse pointer, the caret, or the widget with focus) is of interest.  Objects of interest must always be displayed.  &quot;Alignment&quot; refers to where on the screen objects of interest should be displayed." name="label" translatable="yes">&lt;b&gt;Tracking and Alignment Settings&lt;/b&gt;</property>
-                                    <property name="use_underline">False</property>
+                                    <property name="label" translatable="yes" comments="Translators:  In the context of magnifying the contents of the screen, &quot;tracking&quot; refers to whether or not an object (mouse pointer, the caret, or the widget with focus) is of interest.  Objects of interest must always be displayed.  &quot;Alignment&quot; refers to where on the screen objects of interest should be displayed.">&lt;b&gt;Tracking and Alignment&lt;/b&gt;</property>
                                     <property name="use_markup">True</property>
-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                    <property name="wrap">False</property>
-                                    <property name="selectable">False</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                    <property name="width_chars">-1</property>
-                                    <property name="single_line_mode">False</property>
-                                    <property name="angle">0</property>
                                   </object>
                                 </child>
                               </object>
                             </child>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_options">fill</property>
+                            <property name="left_attach">2</property>
+                            <property name="right_attach">4</property>
+                            <property name="x_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkButton" id="magAdvancedButton">
+                            <property name="label" translatable="yes" context="Magnification" comments="This is a button on the Magnifier notebook page of the Preferences dialog. Pressing this button results in a dialog in which the user can fine tune more advanced settings.">Advanced...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Advanced _Settings...</property>
+                            <property name="receives_default">True</property>
                             <property name="use_underline">True</property>
-                            <property name="relief">GTK_RELIEF_NORMAL</property>
-                            <property name="focus_on_click">True</property>
-                            <signal handler="magAdvancedButtonClicked" last_modification_time="Mon, 10 Dec 2007 18:06:33 GMT" name="clicked"/>
+                            <signal name="clicked" handler="magAdvancedButtonClicked"/>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="right_attach">1</property>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                            <property name="x_options">fill</property>
-                            <property name="y_options"/>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="tab_expand">False</property>
+                    <property name="position">4</property>
                     <property name="tab_fill">False</property>
                   </packing>
                 </child>
@@ -4833,183 +3469,117 @@
                   <object class="GtkLabel" id="magnifierTabLabel">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">Magnifier</property>
-                    <property name="use_underline">False</property>
-                    <property name="use_markup">False</property>
-                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                    <property name="wrap">False</property>
-                    <property name="selectable">False</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xpad">0</property>
-                    <property name="ypad">0</property>
-                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                    <property name="width_chars">-1</property>
-                    <property name="single_line_mode">False</property>
-                    <property name="angle">0</property>
                   </object>
+                  <packing>
+                    <property name="position">4</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
                 </child>
                 <child>
                   <object class="GtkVBox" id="keyBindingsVBox">
-                    <property name="border_width">12</property>
                     <property name="visible">True</property>
-                    <property name="homogeneous">False</property>
+                    <property name="border_width">12</property>
+                    <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkHBox" id="hbox36">
                         <property name="visible">True</property>
-                        <property name="homogeneous">False</property>
                         <property name="spacing">3</property>
                         <child>
                           <object class="GtkLabel" id="orcaModKeyLabel">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Orca _Modifier Key(s):</property>
                             <property name="use_underline">True</property>
-                            <property name="use_markup">False</property>
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap">False</property>
-                            <property name="selectable">False</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
                             <property name="mnemonic_widget">orcaModKeyEntry</property>
-                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                            <property name="width_chars">-1</property>
-                            <property name="single_line_mode">False</property>
-                            <property name="angle">0</property>
                             <accessibility>
-                              <relation target="orcaModKeyEntry" type="label-for"/>
+                              <relation type="label-for" target="orcaModKeyEntry"/>
                             </accessibility>
                           </object>
                           <packing>
-                            <property name="padding">0</property>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkEntry" id="orcaModKeyEntry">
                             <property name="visible">True</property>
-                            <property name="tooltip-text" translatable="yes">Orca Modifier Keys</property>
                             <property name="can_focus">True</property>
+                            <property name="tooltip_text" translatable="yes">Orca Modifier Keys</property>
                             <property name="editable">False</property>
-                            <property name="visibility">True</property>
-                            <property name="max_length">0</property>
-                            <property name="text" translatable="yes"/>
-                            <property name="has_frame">True</property>
                             <property name="invisible_char">&#x25CF;</property>
-                            <property name="activates_default">False</property>
                           </object>
                           <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkScrolledWindow" id="scrolledwindow1">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="shadow_type">GTK_SHADOW_IN</property>
-                        <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                        <property name="hscrollbar_policy">automatic</property>
+                        <property name="vscrollbar_policy">automatic</property>
+                        <property name="shadow_type">in</property>
                         <child>
                           <object class="GtkTreeView" id="keyBindingsTreeview">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="headers_visible">True</property>
-                            <property name="rules_hint">True</property>
                             <property name="reorderable">True</property>
-                            <property name="enable_search">True</property>
-                            <property name="fixed_height_mode">False</property>
-                            <property name="hover_selection">False</property>
-                            <property name="hover_expand">False</property>
+                            <property name="rules_hint">True</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="tab_expand">False</property>
-                    <property name="tab_fill">True</property>
-                    <property name="menu_label" translatable="yes">Key Binding List</property>
+                    <property name="menu_label">Key Binding List</property>
+                    <property name="position">5</property>
                   </packing>
                 </child>
                 <child type="tab">
                   <object class="GtkLabel" id="keyBindingsTabLabel">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">Key Bindings</property>
-                    <property name="use_underline">False</property>
-                    <property name="use_markup">False</property>
-                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                    <property name="wrap">False</property>
-                    <property name="selectable">False</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xpad">0</property>
-                    <property name="ypad">0</property>
-                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                    <property name="width_chars">-1</property>
-                    <property name="single_line_mode">False</property>
-                    <property name="angle">0</property>
                   </object>
+                  <packing>
+                    <property name="position">5</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
                 </child>
                 <child>
                   <object class="GtkVBox" id="vbox29">
                     <property name="visible">True</property>
-                    <property name="homogeneous">False</property>
-                    <property name="spacing">0</property>
+                    <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkFrame" id="pronunciationFrame">
-                        <property name="border_width">5</property>
                         <property name="visible">True</property>
+                        <property name="border_width">5</property>
                         <property name="label_xalign">0</property>
-                        <property name="label_yalign">0.5</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkAlignment" id="alignment58">
                             <property name="visible">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xscale">1</property>
-                            <property name="yscale">1</property>
-                            <property name="top_padding">0</property>
-                            <property name="bottom_padding">0</property>
                             <property name="left_padding">12</property>
-                            <property name="right_padding">0</property>
                             <child>
                               <object class="GtkScrolledWindow" id="scrolledwindow3">
-                                <property name="border_width">5</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                                <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                                <property name="shadow_type">GTK_SHADOW_IN</property>
-                                <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                                <property name="border_width">5</property>
+                                <property name="shadow_type">in</property>
                                 <child>
                                   <object class="GtkTreeView" id="pronunciationTreeView">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="headers_visible">True</property>
-                                    <property name="rules_hint">False</property>
                                     <property name="reorderable">True</property>
-                                    <property name="enable_search">True</property>
-                                    <property name="fixed_height_mode">False</property>
-                                    <property name="hover_selection">False</property>
-                                    <property name="hover_expand">False</property>
                                   </object>
                                 </child>
                               </object>
@@ -5020,218 +3590,161 @@
                           <object class="GtkLabel" id="pronunciationDictFrameLabel">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">&lt;b&gt;Pronunciation Dictionary&lt;/b&gt;</property>
-                            <property name="use_underline">False</property>
                             <property name="use_markup">True</property>
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap">False</property>
-                            <property name="selectable">False</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                            <property name="width_chars">-1</property>
-                            <property name="single_line_mode">False</property>
-                            <property name="angle">0</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkHBox" id="hbox44">
-                        <property name="border_width">5</property>
                         <property name="visible">True</property>
-                        <property name="homogeneous">False</property>
-                        <property name="spacing">0</property>
+                        <property name="border_width">5</property>
                         <child>
                           <object class="GtkButton" id="pronunciationAddButton">
-                            <property name="border_width">5</property>
+                            <property name="label" translatable="yes">_New entry</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">_New entry</property>
+                            <property name="receives_default">False</property>
+                            <property name="border_width">5</property>
                             <property name="use_underline">True</property>
-                            <property name="relief">GTK_RELIEF_NORMAL</property>
-                            <property name="focus_on_click">True</property>
-                            <signal handler="pronunciationAddButtonClicked" last_modification_time="Thu, 26 Jul 2007 14:29:42 GMT" name="clicked"/>
+                            <signal name="clicked" handler="pronunciationAddButtonClicked"/>
                           </object>
                           <packing>
-                            <property name="padding">0</property>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkButton" id="pronunciationDeleteButton">
-                            <property name="border_width">5</property>
+                            <property name="label" translatable="yes">_Delete</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">_Delete</property>
+                            <property name="receives_default">False</property>
+                            <property name="border_width">5</property>
                             <property name="use_underline">True</property>
-                            <property name="relief">GTK_RELIEF_NORMAL</property>
-                            <property name="focus_on_click">True</property>
-                            <signal handler="pronunciationDeleteButtonClicked" last_modification_time="Thu, 26 Jul 2007 14:29:58 GMT" name="clicked"/>
+                            <signal name="clicked" handler="pronunciationDeleteButtonClicked"/>
                           </object>
                           <packing>
-                            <property name="padding">0</property>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="tab_expand">False</property>
-                    <property name="tab_fill">True</property>
+                    <property name="position">6</property>
                   </packing>
                 </child>
                 <child type="tab">
                   <object class="GtkLabel" id="pronunciationTabLabel">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">Pronunciation</property>
-                    <property name="use_underline">False</property>
-                    <property name="use_markup">False</property>
-                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                    <property name="wrap">False</property>
-                    <property name="selectable">False</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xpad">0</property>
-                    <property name="ypad">0</property>
-                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                    <property name="width_chars">-1</property>
-                    <property name="single_line_mode">False</property>
-                    <property name="angle">0</property>
                   </object>
+                  <packing>
+                    <property name="position">6</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
                 </child>
                 <child>
                   <object class="GtkHBox" id="textAttributesHBox">
-                    <property name="border_width">5</property>
                     <property name="visible">True</property>
-                    <property name="homogeneous">False</property>
-                    <property name="spacing">0</property>
+                    <property name="border_width">5</property>
                     <child>
                       <object class="GtkFrame" id="textAttributesFrame">
-                        <property name="border_width">5</property>
                         <property name="visible">True</property>
+                        <property name="border_width">5</property>
                         <property name="label_xalign">0</property>
-                        <property name="label_yalign">0.5</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkAlignment" id="alignment53">
                             <property name="visible">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xscale">1</property>
-                            <property name="yscale">1</property>
-                            <property name="top_padding">0</property>
-                            <property name="bottom_padding">0</property>
                             <property name="left_padding">12</property>
-                            <property name="right_padding">0</property>
                             <child>
                               <object class="GtkVBox" id="vbox24">
                                 <property name="visible">True</property>
-                                <property name="homogeneous">False</property>
-                                <property name="spacing">0</property>
+                                <property name="orientation">vertical</property>
                                 <child>
                                   <object class="GtkScrolledWindow" id="scrolledwindow2">
-                                    <property name="border_width">5</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                                    <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                                    <property name="shadow_type">GTK_SHADOW_IN</property>
-                                    <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                                    <property name="border_width">5</property>
+                                    <property name="shadow_type">in</property>
                                     <child>
                                       <object class="GtkTreeView" id="textAttributesTreeView">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="headers_visible">True</property>
-                                        <property name="rules_hint">False</property>
                                         <property name="reorderable">True</property>
-                                        <property name="enable_search">True</property>
-                                        <property name="fixed_height_mode">False</property>
-                                        <property name="hover_selection">False</property>
-                                        <property name="hover_expand">False</property>
                                       </object>
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkHBox" id="hbox41">
-                                    <property name="border_width">5</property>
                                     <property name="visible">True</property>
-                                    <property name="homogeneous">False</property>
-                                    <property name="spacing">0</property>
+                                    <property name="border_width">5</property>
                                     <child>
                                       <object class="GtkButton" id="textSelectAllButton">
-                                        <property name="border_width">5</property>
-                                        <property name="can_focus">True</property>
                                         <property name="label" translatable="yes">_Speak all</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="border_width">5</property>
                                         <property name="use_underline">True</property>
-                                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                                        <property name="focus_on_click">True</property>
-                                        <signal handler="textSelectAllButtonClicked" last_modification_time="Fri, 08 Jun 2007 17:30:59 GMT" name="clicked"/>
+                                        <signal name="clicked" handler="textSelectAllButtonClicked"/>
                                       </object>
                                       <packing>
-                                        <property name="padding">0</property>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="textUnselectAllButton">
-                                        <property name="border_width">5</property>
-                                        <property name="can_focus">True</property>
                                         <property name="label" translatable="yes">Speak _none</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="border_width">5</property>
                                         <property name="use_underline">True</property>
-                                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                                        <property name="focus_on_click">True</property>
-                                        <signal handler="textUnselectAllButtonClicked" last_modification_time="Fri, 08 Jun 2007 17:31:06 GMT" name="clicked"/>
+                                        <signal name="clicked" handler="textUnselectAllButtonClicked"/>
                                       </object>
                                       <packing>
-                                        <property name="padding">0</property>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">1</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="textResetButton">
-                                        <property name="border_width">5</property>
+                                        <property name="label" translatable="yes">_Reset</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">_Reset</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="border_width">5</property>
                                         <property name="use_underline">True</property>
-                                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                                        <property name="focus_on_click">True</property>
-                                        <signal handler="textResetButtonClicked" last_modification_time="Fri, 08 Jun 2007 17:31:13 GMT" name="clicked"/>
+                                        <signal name="clicked" handler="textResetButtonClicked"/>
                                       </object>
                                       <packing>
-                                        <property name="padding">0</property>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">2</property>
                                       </packing>
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="padding">0</property>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
@@ -5242,123 +3755,96 @@
                           <object class="GtkLabel" id="textAttributesFrameLabel">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">&lt;b&gt;Text attributes&lt;/b&gt;</property>
-                            <property name="use_underline">False</property>
                             <property name="use_markup">True</property>
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap">False</property>
-                            <property name="selectable">False</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                            <property name="width_chars">-1</property>
-                            <property name="single_line_mode">False</property>
-                            <property name="angle">0</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkVBox" id="vbox26">
                         <property name="visible">True</property>
+                        <property name="orientation">vertical</property>
                         <property name="homogeneous">True</property>
-                        <property name="spacing">0</property>
                         <child>
                           <object class="GtkFrame" id="adjustAttributesFrame">
-                            <property name="border_width">5</property>
                             <property name="visible">True</property>
+                            <property name="border_width">5</property>
                             <property name="label_xalign">0</property>
-                            <property name="label_yalign">0.5</property>
-                            <property name="shadow_type">GTK_SHADOW_NONE</property>
+                            <property name="shadow_type">none</property>
                             <child>
                               <object class="GtkAlignment" id="alignment55">
                                 <property name="visible">True</property>
-                                <property name="xalign">0.5</property>
-                                <property name="yalign">0.5</property>
-                                <property name="xscale">1</property>
-                                <property name="yscale">1</property>
-                                <property name="top_padding">0</property>
-                                <property name="bottom_padding">0</property>
                                 <property name="left_padding">12</property>
-                                <property name="right_padding">0</property>
                                 <child>
                                   <object class="GtkVBox" id="vbox25">
-                                    <property name="border_width">5</property>
                                     <property name="visible">True</property>
-                                    <property name="homogeneous">False</property>
-                                    <property name="spacing">0</property>
+                                    <property name="border_width">5</property>
+                                    <property name="orientation">vertical</property>
                                     <child>
                                       <object class="GtkButton" id="textMoveToTopButton">
-                                        <property name="border_width">5</property>
+                                        <property name="label" translatable="yes" comments="Translators:  This label is on a button on the Text Attributes pane of the Orca Preferences dialog. On that pane there is a long list of possible text attributes. The user can select one and then, by using the Move to _top button, move that attribute to the top of the list. The ordering in the list is important as Orca will speak the selected text attributes in the given order.">Move to _top</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property comments="Translators:  This label is on a button on the Text Attributes pane of the Orca Preferences dialog. On that pane there is a long list of possible text attributes. The user can select one and then, by using the Move to _top button, move that attribute to the top of the list. The ordering in the list is important as Orca will speak the selected text attributes in the given order." name="label" translatable="yes">Move to _top</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="border_width">5</property>
                                         <property name="use_underline">True</property>
-                                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                                        <property name="focus_on_click">True</property>
-                                        <signal handler="textMoveToTopButtonClicked" last_modification_time="Fri, 08 Jun 2007 17:30:14 GMT" name="clicked"/>
+                                        <signal name="clicked" handler="textMoveToTopButtonClicked"/>
                                       </object>
                                       <packing>
-                                        <property name="padding">0</property>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="textMoveUpOneButton">
-                                        <property name="border_width">5</property>
+                                        <property name="label" translatable="yes" comments="Translators: This label is on a button on the Text Attributes pane of the Orca Preferences dialog. On that pane there is a long list of possible text attributes. The user can select one and then, by using the Move _up one button, move that attribute up one line in the list. The ordering in the list is important as Orca will speak the selected text attributes in the given order.">Move _up one</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property comments="Translators: This label is on a button on the Text Attributes pane of the Orca Preferences dialog. On that pane there is a long list of possible text attributes. The user can select one and then, by using the Move _up one button, move that attribute up one line in the list. The ordering in the list is important as Orca will speak the selected text attributes in the given order." name="label" translatable="yes">Move _up one</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="border_width">5</property>
                                         <property name="use_underline">True</property>
-                                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                                        <property name="focus_on_click">True</property>
-                                        <signal handler="textMoveUpOneButtonClicked" last_modification_time="Fri, 08 Jun 2007 17:30:22 GMT" name="clicked"/>
+                                        <signal name="clicked" handler="textMoveUpOneButtonClicked"/>
                                       </object>
                                       <packing>
-                                        <property name="padding">0</property>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">1</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="textMoveDownOneButton">
-                                        <property name="border_width">5</property>
+                                        <property name="label" translatable="yes" comments="Translators: This label is on a button on the Text Attributes pane of the Orca Preferences dialog. On that pane there is a long list of possible text attributes. The user can select one and then, by using the Move _down one button, move that attribute down one line in the list. The ordering in the list is important as Orca will speak the selected text attributes in the given order.">Move _down one</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property comments="Translators: This label is on a button on the Text Attributes pane of the Orca Preferences dialog. On that pane there is a long list of possible text attributes. The user can select one and then, by using the Move _down one button, move that attribute down one line in the list. The ordering in the list is important as Orca will speak the selected text attributes in the given order." name="label" translatable="yes">Move _down one</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="border_width">5</property>
                                         <property name="use_underline">True</property>
-                                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                                        <property name="focus_on_click">True</property>
-                                        <signal handler="textMoveDownOneButtonClicked" last_modification_time="Fri, 08 Jun 2007 17:30:28 GMT" name="clicked"/>
+                                        <signal name="clicked" handler="textMoveDownOneButtonClicked"/>
                                       </object>
                                       <packing>
-                                        <property name="padding">0</property>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">2</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="textMoveToBottomButton">
-                                        <property name="border_width">5</property>
+                                        <property name="label" translatable="yes" comments="Translators: This label is on a button on the Text Attributes pane of the Orca Preferences dialog. On that pane there is a long list of possible text attributes. The user can select one and then, by using the Move to _bottom button, move that attribute to the bottom of the list. The ordering in the list is important as Orca will speak the selected text attributes in the given order.">Move to _bottom</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property comments="Translators: This label is on a button on the Text Attributes pane of the Orca Preferences dialog. On that pane there is a long list of possible text attributes. The user can select one and then, by using the Move to _bottom button, move that attribute to the bottom of the list. The ordering in the list is important as Orca will speak the selected text attributes in the given order." name="label" translatable="yes">Move to _bottom</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="border_width">5</property>
                                         <property name="use_underline">True</property>
-                                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                                        <property name="focus_on_click">True</property>
-                                        <signal handler="textMoveToBottomButtonClicked" last_modification_time="Fri, 08 Jun 2007 17:30:36 GMT" name="clicked"/>
+                                        <signal name="clicked" handler="textMoveToBottomButtonClicked"/>
                                       </object>
                                       <packing>
-                                        <property name="padding">0</property>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">3</property>
                                       </packing>
                                     </child>
                                   </object>
@@ -5370,129 +3856,96 @@
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes">&lt;b&gt;Adjust selected
 attributes&lt;/b&gt;</property>
-                                <property name="use_underline">False</property>
                                 <property name="use_markup">True</property>
-                                <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                <property name="wrap">False</property>
-                                <property name="selectable">False</property>
-                                <property name="xalign">0.5</property>
-                                <property name="yalign">0.5</property>
-                                <property name="xpad">0</property>
-                                <property name="ypad">0</property>
-                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                <property name="width_chars">-1</property>
-                                <property name="single_line_mode">False</property>
-                                <property name="angle">0</property>
                               </object>
                             </child>
                           </object>
                           <packing>
-                            <property name="padding">0</property>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkFrame" id="brailleIndicatorFrame">
-                            <property name="border_width">5</property>
                             <property name="visible">True</property>
+                            <property name="border_width">5</property>
                             <property name="label_xalign">0</property>
-                            <property name="label_yalign">0.5</property>
-                            <property name="shadow_type">GTK_SHADOW_NONE</property>
+                            <property name="shadow_type">none</property>
                             <child>
                               <object class="GtkAlignment" id="alignment56">
                                 <property name="visible">True</property>
-                                <property name="xalign">0.5</property>
-                                <property name="yalign">0.5</property>
-                                <property name="xscale">1</property>
-                                <property name="yscale">1</property>
-                                <property name="top_padding">0</property>
-                                <property name="bottom_padding">0</property>
                                 <property name="left_padding">12</property>
-                                <property name="right_padding">0</property>
                                 <child>
                                   <object class="GtkVBox" id="vbox27">
-                                    <property name="border_width">3</property>
                                     <property name="visible">True</property>
-                                    <property name="homogeneous">False</property>
-                                    <property name="spacing">0</property>
+                                    <property name="border_width">3</property>
+                                    <property name="orientation">vertical</property>
                                     <child>
                                       <object class="GtkRadioButton" id="textBrailleNoneButton">
+                                        <property name="label" translatable="yes">_None</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">_None</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
-                                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                                        <property name="focus_on_click">True</property>
-                                        <property name="active">False</property>
-                                        <property name="inconsistent">False</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal handler="brailleIndicatorChanged" last_modification_time="Wed, 20 Jun 2007 15:35:15 GMT" name="toggled"/>
+                                        <signal name="toggled" handler="brailleIndicatorChanged"/>
                                       </object>
                                       <packing>
-                                        <property name="padding">0</property>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkRadioButton" id="textBraille7Button">
+                                        <property name="label" translatable="yes">Dot _7</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Dot _7</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
-                                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                                        <property name="focus_on_click">True</property>
-                                        <property name="active">False</property>
-                                        <property name="inconsistent">False</property>
                                         <property name="draw_indicator">True</property>
                                         <property name="group">textBrailleNoneButton</property>
-                                        <signal handler="brailleIndicatorChanged" last_modification_time="Wed, 20 Jun 2007 15:35:33 GMT" name="toggled"/>
+                                        <signal name="toggled" handler="brailleIndicatorChanged"/>
                                       </object>
                                       <packing>
-                                        <property name="padding">0</property>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">1</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkRadioButton" id="textBraille8Button">
+                                        <property name="label" translatable="yes">Dot _8</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Dot _8</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
-                                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                                        <property name="focus_on_click">True</property>
-                                        <property name="active">False</property>
-                                        <property name="inconsistent">False</property>
                                         <property name="draw_indicator">True</property>
                                         <property name="group">textBrailleNoneButton</property>
-                                        <signal handler="brailleIndicatorChanged" last_modification_time="Wed, 20 Jun 2007 15:35:46 GMT" name="toggled"/>
+                                        <signal name="toggled" handler="brailleIndicatorChanged"/>
                                       </object>
                                       <packing>
-                                        <property name="padding">0</property>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">2</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkRadioButton" id="textBrailleBothButton">
+                                        <property name="label" translatable="yes">Dots 7 an_d 8</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Dots 7 an_d 8</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
-                                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                                        <property name="focus_on_click">True</property>
-                                        <property name="active">False</property>
-                                        <property name="inconsistent">False</property>
                                         <property name="draw_indicator">True</property>
                                         <property name="group">textBrailleNoneButton</property>
-                                        <signal handler="brailleIndicatorChanged" last_modification_time="Wed, 20 Jun 2007 15:35:57 GMT" name="toggled"/>
+                                        <signal name="toggled" handler="brailleIndicatorChanged"/>
                                       </object>
                                       <packing>
-                                        <property name="padding">0</property>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">3</property>
                                       </packing>
                                     </child>
                                   </object>
@@ -5503,38 +3956,24 @@ attributes&lt;/b&gt;</property>
                               <object class="GtkLabel" id="label27">
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes">&lt;b&gt;Braille Indicator&lt;/b&gt;</property>
-                                <property name="use_underline">False</property>
                                 <property name="use_markup">True</property>
-                                <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                <property name="wrap">False</property>
-                                <property name="selectable">False</property>
-                                <property name="xalign">0.5</property>
-                                <property name="yalign">0.5</property>
-                                <property name="xpad">0</property>
-                                <property name="ypad">0</property>
-                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                <property name="width_chars">-1</property>
-                                <property name="single_line_mode">False</property>
-                                <property name="angle">0</property>
                               </object>
                             </child>
                           </object>
                           <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="tab_expand">False</property>
+                    <property name="position">7</property>
                     <property name="tab_fill">False</property>
                   </packing>
                 </child>
@@ -5542,33 +3981,96 @@ attributes&lt;/b&gt;</property>
                   <object class="GtkLabel" id="textAttributesTabLabel">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">Text Attributes</property>
-                    <property name="use_underline">False</property>
-                    <property name="use_markup">False</property>
-                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                    <property name="wrap">False</property>
-                    <property name="selectable">False</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xpad">0</property>
-                    <property name="ypad">0</property>
-                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                    <property name="width_chars">-1</property>
-                    <property name="single_line_mode">False</property>
-                    <property name="angle">0</property>
                   </object>
+                  <packing>
+                    <property name="position">7</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
                 </child>
               </object>
               <packing>
                 <property name="padding">3</property>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
+                <property name="position">0</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="padding">0</property>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="helpButton">
+                <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="receives_default">False</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="helpButtonClicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="applyButton">
+                <property name="label">gtk-apply</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="applyButtonClicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="cancelButton">
+                <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="receives_default">False</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="cancelButtonClicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="okButton">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="okButtonClicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>
diff --git a/src/orca/orca_gui_prefs.py b/src/orca/orca_gui_prefs.py
index 09dc55c..736b966 100644
--- a/src/orca/orca_gui_prefs.py
+++ b/src/orca/orca_gui_prefs.py
@@ -431,7 +431,6 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
         self._populateKeyBindings()
 
         self.window = self.get_widget("orcaSetupWindow")
-        self.window.resize(790, 580)
 
         self._setKeyEchoItems()
 
@@ -1558,16 +1557,6 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
         interval = prefs["progressBarUpdateInterval"]
         self.get_widget("speakProgressBarSpinButton").set_value(interval)
 
-        # Translators: Orca has a setting which determines which progress
-        # bar updates should be announced. The options are all progress
-        # bars, only progress bars in the active application, or only
-        # progress bars in the current window.
-        #
-        label = _("Restrict progress bar updates to:")
-        # TODO - JD: I did the above because GtkBuilder translator notes
-        # (which we have for the above string) are not getting sucked in
-        # to orca.pot. :-(
-        #
         comboBox = self.get_widget("progressBarVerbosity")
         levels = []
         # Translators: Orca has a setting which determines which progress



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]