Fixed deprecated GtkHBox, GtkVBox and GtkStock since GTK+ 3.10.

4 files changed, 258 insertions, 240 deletions

diff --git a/setup/python2/main.py b/setup/python2/main.py
index 98486ad..7c403b8 100644
--- a/setup/python2/main.py
+++ b/setup/python2/main.py
@@ -4,8 +4,8 @@
 #
 # Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
 # Copyright (c) 2009 Hideaki ABE <abe.sendai@gmail.com>
-# Copyright (c) 2010-2013 Takao Fujiwara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2007-2013 Red Hat, Inc.
+# Copyright (c) 2010-2014 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2014 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -1416,14 +1416,14 @@ class AnthySetup(object):
             dlg = Gtk.FileChooserDialog(title=_("Open Dictionary File"),
                                         parent=self.__builder.get_object('main'),
                                         action=Gtk.FileChooserAction.OPEN,
-                                        buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
-                                                 Gtk.STOCK_OPEN, Gtk.ResponseType.OK))
+                                        buttons=(_("_Cancel"), Gtk.ResponseType.CANCEL,
+                                                 _("_Open"), Gtk.ResponseType.OK))
         if Gtk.Buildable.get_name(widget) == 'dict:btn_edit':
             dlg = Gtk.Dialog(title=_("Edit Dictionary File"),
                              parent=self.__builder.get_object('main'),
                              flags=Gtk.DialogFlags.MODAL,
-                             buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
-                                      Gtk.STOCK_OK, Gtk.ResponseType.OK))
+                             buttons=(_("_Cancel"), Gtk.ResponseType.CANCEL,
+                                      _("_OK"), Gtk.ResponseType.OK))
 
         vbox = self.__builder.get_object('dict:add_extra_vbox')
         if Gtk.Buildable.get_name(widget) == 'dict:btn_add':
@@ -1518,7 +1518,7 @@ class AnthySetup(object):
         dlg = Gtk.Dialog(title=_("View Dictionary File"),
                          parent=self.__builder.get_object('main'),
                          flags=Gtk.DialogFlags.MODAL,
-                         buttons=(Gtk.STOCK_OK, Gtk.ResponseType.OK))
+                         buttons=(_("_OK"), Gtk.ResponseType.OK))
         buffer = Gtk.TextBuffer()
         buffer.set_text (lines)
         text_view = Gtk.TextView.new_with_buffer(buffer)
diff --git a/setup/python2/setup.ui b/setup/python2/setup.ui
index d9ec626..dc5e7e1 100644
--- a/setup/python2/setup.ui
+++ b/setup/python2/setup.ui
@@ -195,16 +195,18 @@
     <property name="type_hint">dialog</property>
     <signal handler="on_main_delete" name="delete_event"/>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkNotebook" id="notebook1">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="border_width">6</property>
             <child>
-              <object class="GtkVBox" id="vbox1">
+              <object class="GtkBox" id="vbox1">
                 <property name="visible">True</property>
+                <property name="orientation">vertical</property>
                 <property name="border_width">8</property>
                 <child>
                   <object class="GtkFrame" id="frame11">
@@ -355,8 +357,9 @@
                         <property name="bottom_padding">8</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <object class="GtkVBox" id="vbox12">
+                          <object class="GtkBox" id="vbox12">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <property name="border_width">4</property>
                             <property name="spacing">4</property>
                             <child>
@@ -409,8 +412,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox2">
+              <object class="GtkBox" id="vbox2">
                 <property name="visible">True</property>
+                <property name="orientation">vertical</property>
                 <property name="border_width">8</property>
                 <child>
                   <object class="GtkFrame" id="frame21">
@@ -637,8 +641,9 @@
                             <property name="column_spacing">8</property>
                             <property name="row_spacing">4</property>
                             <child>
-                              <object class="GtkHBox" id="hbox4">
+                              <object class="GtkBox" id="hbox4">
                                 <property name="visible">True</property>
+                                <property name="orientation">horizontal</property>
                                 <property name="spacing">8</property>
                                 <child>
                                   <object class="GtkLabel" id="label109">
@@ -773,13 +778,15 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox3">
+              <object class="GtkBox" id="vbox3">
                 <property name="visible">True</property>
+                <property name="orientation">vertical</property>
                 <property name="border_width">4</property>
                 <property name="spacing">4</property>
                 <child>
-                  <object class="GtkHBox" id="hbox1">
+                  <object class="GtkBox" id="hbox1">
                     <property name="visible">True</property>
+                    <property name="orientation">horizontal</property>
                     <property name="spacing">8</property>
                     <child>
                       <object class="GtkLabel" id="label21">
@@ -828,6 +835,7 @@
                     <property name="hscrollbar_policy">automatic</property>
                     <property name="vscrollbar_policy">automatic</property>
                     <property name="shadow_type">in</property>
+                    <property name="height_request">300</property>
                     <child>
                       <object class="GtkTreeView" id="shortcut">
                         <property name="visible">True</property>
@@ -843,53 +851,20 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHButtonBox" id="hbuttonbox31">
+                  <object class="GtkButtonBox" id="hbuttonbox31">
                     <property name="visible">True</property>
+                    <property name="orientation">horizontal</property>
                     <property name="spacing">4</property>
                     <property name="layout_style">end</property>
                     <child>
                       <object class="GtkButton" id="btn_default">
+                        <property name="label" translatable="yes">De_fault</property>
+                        <property name="use_underline">True</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="can_default">True</property>
                         <property name="receives_default">False</property>
                         <signal handler="on_btn_default_clicked" name="clicked"/>
-                        <child>
-                          <object class="GtkAlignment" id="alignment31">
-                            <property name="visible">True</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox5">
-                                <property name="visible">True</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkImage" id="image1">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-undo</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label27">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">De_fault</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -899,12 +874,12 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="btn_edit">
-                        <property name="label">gtk-edit</property>
+                        <property name="label" translatable="yes">_Edit</property>
+                        <property name="use_underline">True</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 handler="on_btn_edit_clicked" name="clicked"/>
                       </object>
                       <packing>
@@ -1352,8 +1327,9 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHBox" id="hbox51">
+                              <object class="GtkBox" id="hbox51">
                                 <property name="visible">True</property>
+                                <property name="orientation">horizontal</property>
                                 <property name="spacing">8</property>
                                 <child>
                                   <object class="GtkLabel" id="label30">
@@ -1393,13 +1369,14 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHBox" id="hbox52">
+                              <object class="GtkBox" id="hbox52">
                                 <property name="visible">True</property>
+                                <property name="orientation">horizontal</property>
                                 <property name="spacing">8</property>
                                 <child>
                                   <object class="GtkImage" id="image2">
                                     <property name="visible">True</property>
-                                    <property name="stock">gtk-dialog-info</property>
+                                    <property name="icon_name">dialog-information</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1429,8 +1406,9 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHBox" id="hbox11">
+                              <object class="GtkBox" id="hbox11">
                                 <property name="visible">True</property>
+                                <property name="orientation">horizontal</property>
                                 <property name="spacing">8</property>
                                 <child>
                                   <object class="GtkLabel" id="label33">
@@ -1471,13 +1449,14 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHBox" id="hbox53">
+                              <object class="GtkBox" id="hbox53">
                                 <property name="visible">True</property>
+                                <property name="orientation">horizontal</property>
                                 <property name="spacing">8</property>
                                 <child>
                                   <object class="GtkImage" id="image4">
                                     <property name="visible">True</property>
-                                    <property name="stock">gtk-dialog-info</property>
+                                    <property name="icon_name">dialog-information</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1605,8 +1584,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox6">
+              <object class="GtkBox" id="vbox6">
                 <property name="visible">True</property>
+                <property name="orientation">vertical</property>
                 <property name="border_width">8</property>
                 <property name="spacing">4</property>
                 <child>
@@ -1620,8 +1600,9 @@
                         <property name="top_padding">4</property>
                         <property name="left_padding">0</property>
                         <child>
-                          <object class="GtkVBox" id="vbox61">
+                          <object class="GtkBox" id="vbox61">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <property name="border_width">4</property>
                             <property name="spacing">4</property>
                             <child>
@@ -1777,8 +1758,9 @@
                         <property name="top_padding">4</property>
                         <property name="left_padding">0</property>
                         <child>
-                          <object class="GtkVBox" id="vbox71">
+                          <object class="GtkBox" id="vbox71">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <property name="border_width">4</property>
                             <property name="spacing">4</property>
                             <child>
@@ -1801,8 +1783,9 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHButtonBox" id="hbuttonbox71">
+                              <object class="GtkButtonBox" id="hbuttonbox71">
                                 <property name="visible">True</property>
+                                <property name="orientation">horizontal</property>
                                 <property name="spacing">4</property>
                                 <property name="layout_style">end</property>
                                 <child>
@@ -1823,12 +1806,12 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="dict:btn_add">
-                                    <property name="label">gtk-add</property>
+                                    <property name="label" translatable="yes">_Add</property>
+                                    <property name="use_underline">True</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 handler="on_btn_dict_add_clicked" name="clicked"/>
                                   </object>
                                   <packing>
@@ -1839,12 +1822,12 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="dict:btn_edit">
-                                    <property name="label">gtk-edit</property>
+                                    <property name="label" translatable="yes">_Edit</property>
+                                    <property name="use_underline">True</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 handler="on_btn_dict_add_clicked" name="clicked"/>
                                   </object>
                                   <packing>
@@ -1855,12 +1838,12 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="dict:btn_delete">
-                                    <property name="label">gtk-delete</property>
+                                    <property name="label" translatable="yes">_Delete</property>
+                                    <property name="use_underline">True</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 handler="on_btn_dict_delete_clicked" name="clicked"/>
                                   </object>
                                   <packing>
@@ -1877,19 +1860,20 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHButtonBox" id="hbuttonbox72">
+                              <object class="GtkButtonBox" id="hbuttonbox72">
                                 <property name="visible">True</property>
+                                <property name="orientation">horizontal</property>
                                 <property name="spacing">4</property>
                                 <property name="layout_style">end</property>
                                 <child>
                                   <object class="GtkButton" id="dict:btn_up">
-                                    <property name="label">gtk-go-up</property>
+                                    <property name="label" translatable="yes">_Up</property>
+                                    <property name="use_underline">True</property>
                                     <property name="tooltip_text" translatable="yes">You can change the order on language bar</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 handler="on_btn_dict_order_clicked" name="clicked"/>
                                   </object>
                                   <packing>
@@ -1900,13 +1884,13 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="dict:btn_down">
-                                    <property name="label">gtk-go-down</property>
+                                    <property name="label" translatable="yes">_Down</property>
+                                    <property name="use_underline">True</property>
                                     <property name="tooltip_text" translatable="yes">You can change the order on language bar</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 handler="on_btn_dict_order_clicked" name="clicked"/>
                                   </object>
                                   <packing>
@@ -1953,7 +1937,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="about_vbox">
+              <object class="GtkBox" id="about_vbox">
                 <property name="visible">True</property>
                 <property name="orientation">vertical</property>
                 <property name="border_width">10</property>
@@ -1979,18 +1963,19 @@
           </packing>
         </child>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
+          <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="btn_apply">
-                <property name="label">gtk-apply</property>
+                <property name="label" translatable="yes">_Apply</property>
+                <property name="use_underline">True</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</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 handler="on_btn_apply_clicked" name="clicked"/>
               </object>
               <packing>
@@ -2001,12 +1986,12 @@
             </child>
             <child>
               <object class="GtkButton" id="btn_cancel">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
+                <property name="use_underline">True</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 handler="on_btn_cancel_clicked" name="clicked"/>
               </object>
               <packing>
@@ -2017,12 +2002,12 @@
             </child>
             <child>
               <object class="GtkButton" id="btn_ok">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes">_OK</property>
+                <property name="use_underline">True</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 handler="on_btn_ok_clicked" name="clicked"/>
               </object>
               <packing>
@@ -2053,11 +2038,13 @@
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox2">
+      <object class="GtkBox" id="dialog-vbox2">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
-          <object class="GtkVBox" id="vbox101">
+          <object class="GtkBox" id="vbox101">
             <property name="visible">True</property>
+            <property name="orientation">vertical</property>
             <property name="border_width">5</property>
             <property name="spacing">6</property>
             <child>
@@ -2068,6 +2055,7 @@
                 <property name="hscrollbar_policy">automatic</property>
                 <property name="vscrollbar_policy">automatic</property>
                 <property name="shadow_type">in</property>
+                <property name="height_request">150</property>
                 <child>
                   <object class="GtkTreeView" id="es:treeview">
                     <property name="visible">True</property>
@@ -2081,8 +2069,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox101">
+              <object class="GtkBox" id="hbox101">
                 <property name="visible">True</property>
+                <property name="orientation">horizontal</property>
                 <property name="spacing">8</property>
                 <child>
                   <object class="GtkLabel" id="label1001">
@@ -2128,8 +2117,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox102">
+              <object class="GtkBox" id="hbox102">
                 <property name="visible">True</property>
+                <property name="orientation">horizontal</property>
                 <property name="spacing">8</property>
                 <child>
                   <object class="GtkLabel" id="label1002">
@@ -2143,8 +2133,9 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="hbox103">
+                  <object class="GtkBox" id="hbox103">
                     <property name="visible">True</property>
+                    <property name="orientation">horizontal</property>
                     <child>
                       <object class="GtkCheckButton" id="es:checkbutton_alt">
                         <property name="label" translatable="yes">A_lternate</property>
@@ -2197,19 +2188,20 @@
               </packing>
             </child>
             <child>
-              <object class="GtkHButtonBox" id="hbuttonbox101">
+              <object class="GtkButtonBox" id="hbuttonbox101">
                 <property name="visible">True</property>
+                <property name="orientation">horizontal</property>
                 <property name="spacing">6</property>
                 <property name="layout_style">end</property>
                 <child>
                   <object class="GtkButton" id="es:button_add">
-                    <property name="label">gtk-add</property>
+                    <property name="label" translatable="yes">_Add</property>
+                    <property name="use_underline">True</property>
                     <property name="visible">True</property>
                     <property name="sensitive">False</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 handler="on_es_button_add_clicked" name="clicked"/>
                   </object>
                   <packing>
@@ -2220,12 +2212,12 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="es:button_refresh">
-                    <property name="label">gtk-refresh</property>
+                    <property name="label" translatable="yes">_Refresh</property>
+                    <property name="use_underline">True</property>
                     <property name="sensitive">False</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 handler="on_es_button_refresh_clicked" name="clicked"/>
                   </object>
                   <packing>
@@ -2236,13 +2228,13 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="es:button_del">
-                    <property name="label">gtk-delete</property>
+                    <property name="label" translatable="yes">_Delete</property>
+                    <property name="use_underline">True</property>
                     <property name="visible">True</property>
                     <property name="sensitive">False</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 handler="on_es_button_del_clicked" name="clicked"/>
                   </object>
                   <packing>
@@ -2264,17 +2256,18 @@
           </packing>
         </child>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area2">
+          <object class="GtkButtonBox" id="dialog-action_area2">
             <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancelbutton101">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
+                <property name="use_underline">True</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>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -2284,12 +2277,12 @@
             </child>
             <child>
               <object class="GtkButton" id="okbutton101">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes">_OK</property>
+                <property name="use_underline">True</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>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -2318,13 +2311,15 @@
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox3">
+      <object class="GtkBox" id="dialog-vbox3">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <property name="border_width">5</property>
         <property name="spacing">6</property>
         <child>
-          <object class="GtkHBox" id="hbox_for_combobox_custom_key_table">
+          <object class="GtkBox" id="hbox_for_combobox_custom_key_table">
             <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
             <property name="border_width">5</property>
             <property name="spacing">6</property>
             <child>
@@ -2359,8 +2354,9 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="hbox301">
+          <object class="GtkBox" id="hbox301">
             <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
             <property name="border_width">5</property>
             <property name="spacing">6</property>
             <child>
@@ -2371,6 +2367,8 @@
                 <property name="hscrollbar_policy">automatic</property>
                 <property name="vscrollbar_policy">automatic</property>
                 <property name="shadow_type">in</property>
+                <property name="width_request">250</property>
+                <property name="height_request">300</property>
                 <child>
                   <object class="GtkTreeView" id="treeview_custom_key_table">
                     <property name="visible">True</property>
@@ -2383,8 +2381,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVButtonBox" id="vbutton301">
+              <object class="GtkButtonBox" id="vbutton301">
                 <property name="visible">True</property>
+                <property name="orientation">vertical</property>
                 <property name="layout_style">start</property>
                 <property name="spacing">6</property>
                 <child>
@@ -2470,12 +2469,12 @@
                 <child>
                   <object class="GtkButton" id="button_add_custom_key">
                     <property name="visible">True</property>
-                    <property name="label">gtk-add</property>
+                    <property name="label" translatable="yes">_Add</property>
+                    <property name="use_underline">True</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>
                   </object>
                   <packing>
                     <property name="position">8</property>
@@ -2484,12 +2483,12 @@
                 <child>
                   <object class="GtkButton" id="button_remove_custom_key">
                     <property name="visible">True</property>
-                    <property name="label">gtk-remove</property>
+                    <property name="label" translatable="yes">_Remove</property>
+                    <property name="use_underline">True</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>
                   </object>
                   <packing>
                     <property name="position">9</property>
@@ -2508,16 +2507,17 @@
           </packing>
         </child>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area3">
+          <object class="GtkButtonBox" id="dialog-action_area3">
             <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="closebutton301">
                 <property name="visible">True</property>
-                <property name="label">gtk-close</property>
+                <property name="label" translatable="yes">_Close</property>
+                <property name="use_underline">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="use_stock">True</property>
                 <property name="receives_default">True</property>
               </object>
               <packing>
@@ -2551,12 +2551,14 @@
     <property name="text">Confirmation</property>
     <property name="secondary_text">You are about to close the setup dialog, is that OK?</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox6">
+      <object class="GtkBox" id="dialog-vbox6">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area6">
+          <object class="GtkButtonBox" id="dialog-action_area6">
             <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
             <property name="layout_style">end</property>
             <child>
               <placeholder/>
@@ -2586,12 +2588,14 @@
     <property name="text">Notice!</property>
     <property name="secondary_text">You are about to close the setup dialog without saving your changes, is that OK?</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox7">
+      <object class="GtkBox" id="dialog-vbox7">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area7">
+          <object class="GtkButtonBox" id="dialog-action_area7">
             <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
             <property name="layout_style">end</property>
             <child>
               <placeholder/>
@@ -2622,12 +2626,14 @@
     <signal handler="on_key_input_dialog_key_press_event" name="key_press_event"/>
     <signal handler="on_key_input_dialog_key_release_event" name="key_release_event"/>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox8">
+      <object class="GtkBox" id="dialog-vbox8">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area8">
+          <object class="GtkButtonBox" id="dialog-action_area8">
             <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
             <property name="layout_style">end</property>
             <child>
               <placeholder/>
@@ -2657,12 +2663,14 @@
     <property name="text">Invalid keysym</property>
     <property name="secondary_text">This keysym is not valid</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox9">
+      <object class="GtkBox" id="dialog-vbox9">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area9">
+          <object class="GtkButtonBox" id="dialog-action_area9">
             <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
             <property name="layout_style">end</property>
             <child>
               <placeholder/>
@@ -2680,8 +2688,9 @@
       </object>
     </child>
   </object>
-  <object class="GtkVBox" id="dict:add_extra_vbox">
+  <object class="GtkBox" id="dict:add_extra_vbox">
     <property name="visible">True</property>
+    <property name="orientation">vertical</property>
     <property name="no_show_all">True</property>
     <property name="spacing">10</property>
     <child>
@@ -2800,8 +2809,8 @@
     <property name="program-name">IBus-Anthy</property>
     <property name="copyright">Copyright © 2007–2008 Peng Huang
 Copyright © 2009 Hideaki ABE
-Copyright © 2009–2013 Takao Fujiwara
-Copyright © 2007–2013 Red Hat, Inc.</property>
+Copyright © 2009–2014 Takao Fujiwara
+Copyright © 2007–2014 Red Hat, Inc.</property>
     <property name="comments" translatable="yes">The Anthy engine for the IBus input platform</property>
     <property name="license">GPL</property>
     <property name="website">http://code.google.com/p/ibus/</property>
diff --git a/setup/python3/main.py b/setup/python3/main.py
index fec03a6..2073f59 100644
--- a/setup/python3/main.py
+++ b/setup/python3/main.py
@@ -1410,14 +1410,14 @@ class AnthySetup(object):
             dlg = Gtk.FileChooserDialog(title=_("Open Dictionary File"),
                                         parent=self.__builder.get_object('main'),
                                         action=Gtk.FileChooserAction.OPEN,
-                                        buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
-                                                 Gtk.STOCK_OPEN, Gtk.ResponseType.OK))
+                                        buttons=(_("_Cancel"), Gtk.ResponseType.CANCEL,
+                                                 _("_Open"), Gtk.ResponseType.OK))
         if Gtk.Buildable.get_name(widget) == 'dict:btn_edit':
             dlg = Gtk.Dialog(title=_("Edit Dictionary File"),
                              parent=self.__builder.get_object('main'),
                              flags=Gtk.DialogFlags.MODAL,
-                             buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
-                                      Gtk.STOCK_OK, Gtk.ResponseType.OK))
+                             buttons=(_("_Cancel"), Gtk.ResponseType.CANCEL,
+                                      _("_OK"), Gtk.ResponseType.OK))
 
         vbox = self.__builder.get_object('dict:add_extra_vbox')
         if Gtk.Buildable.get_name(widget) == 'dict:btn_add':
@@ -1512,7 +1512,7 @@ class AnthySetup(object):
         dlg = Gtk.Dialog(title=_("View Dictionary File"),
                          parent=self.__builder.get_object('main'),
                          flags=Gtk.DialogFlags.MODAL,
-                         buttons=(Gtk.STOCK_OK, Gtk.ResponseType.OK))
+                         buttons=(_("_OK"), Gtk.ResponseType.OK))
         buffer = Gtk.TextBuffer()
         buffer.set_text (lines)
         text_view = Gtk.TextView.new_with_buffer(buffer)
diff --git a/setup/python3/setup.ui b/setup/python3/setup.ui
index d9ec626..dc5e7e1 100644
--- a/setup/python3/setup.ui
+++ b/setup/python3/setup.ui
@@ -195,16 +195,18 @@
     <property name="type_hint">dialog</property>
     <signal handler="on_main_delete" name="delete_event"/>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkNotebook" id="notebook1">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="border_width">6</property>
             <child>
-              <object class="GtkVBox" id="vbox1">
+              <object class="GtkBox" id="vbox1">
                 <property name="visible">True</property>
+                <property name="orientation">vertical</property>
                 <property name="border_width">8</property>
                 <child>
                   <object class="GtkFrame" id="frame11">
@@ -355,8 +357,9 @@
                         <property name="bottom_padding">8</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <object class="GtkVBox" id="vbox12">
+                          <object class="GtkBox" id="vbox12">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <property name="border_width">4</property>
                             <property name="spacing">4</property>
                             <child>
@@ -409,8 +412,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox2">
+              <object class="GtkBox" id="vbox2">
                 <property name="visible">True</property>
+                <property name="orientation">vertical</property>
                 <property name="border_width">8</property>
                 <child>
                   <object class="GtkFrame" id="frame21">
@@ -637,8 +641,9 @@
                             <property name="column_spacing">8</property>
                             <property name="row_spacing">4</property>
                             <child>
-                              <object class="GtkHBox" id="hbox4">
+                              <object class="GtkBox" id="hbox4">
                                 <property name="visible">True</property>
+                                <property name="orientation">horizontal</property>
                                 <property name="spacing">8</property>
                                 <child>
                                   <object class="GtkLabel" id="label109">
@@ -773,13 +778,15 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox3">
+              <object class="GtkBox" id="vbox3">
                 <property name="visible">True</property>
+                <property name="orientation">vertical</property>
                 <property name="border_width">4</property>
                 <property name="spacing">4</property>
                 <child>
-                  <object class="GtkHBox" id="hbox1">
+                  <object class="GtkBox" id="hbox1">
                     <property name="visible">True</property>
+                    <property name="orientation">horizontal</property>
                     <property name="spacing">8</property>
                     <child>
                       <object class="GtkLabel" id="label21">
@@ -828,6 +835,7 @@
                     <property name="hscrollbar_policy">automatic</property>
                     <property name="vscrollbar_policy">automatic</property>
                     <property name="shadow_type">in</property>
+                    <property name="height_request">300</property>
                     <child>
                       <object class="GtkTreeView" id="shortcut">
                         <property name="visible">True</property>
@@ -843,53 +851,20 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHButtonBox" id="hbuttonbox31">
+                  <object class="GtkButtonBox" id="hbuttonbox31">
                     <property name="visible">True</property>
+                    <property name="orientation">horizontal</property>
                     <property name="spacing">4</property>
                     <property name="layout_style">end</property>
                     <child>
                       <object class="GtkButton" id="btn_default">
+                        <property name="label" translatable="yes">De_fault</property>
+                        <property name="use_underline">True</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="can_default">True</property>
                         <property name="receives_default">False</property>
                         <signal handler="on_btn_default_clicked" name="clicked"/>
-                        <child>
-                          <object class="GtkAlignment" id="alignment31">
-                            <property name="visible">True</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox5">
-                                <property name="visible">True</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkImage" id="image1">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-undo</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label27">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">De_fault</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -899,12 +874,12 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="btn_edit">
-                        <property name="label">gtk-edit</property>
+                        <property name="label" translatable="yes">_Edit</property>
+                        <property name="use_underline">True</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 handler="on_btn_edit_clicked" name="clicked"/>
                       </object>
                       <packing>
@@ -1352,8 +1327,9 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHBox" id="hbox51">
+                              <object class="GtkBox" id="hbox51">
                                 <property name="visible">True</property>
+                                <property name="orientation">horizontal</property>
                                 <property name="spacing">8</property>
                                 <child>
                                   <object class="GtkLabel" id="label30">
@@ -1393,13 +1369,14 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHBox" id="hbox52">
+                              <object class="GtkBox" id="hbox52">
                                 <property name="visible">True</property>
+                                <property name="orientation">horizontal</property>
                                 <property name="spacing">8</property>
                                 <child>
                                   <object class="GtkImage" id="image2">
                                     <property name="visible">True</property>
-                                    <property name="stock">gtk-dialog-info</property>
+                                    <property name="icon_name">dialog-information</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1429,8 +1406,9 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHBox" id="hbox11">
+                              <object class="GtkBox" id="hbox11">
                                 <property name="visible">True</property>
+                                <property name="orientation">horizontal</property>
                                 <property name="spacing">8</property>
                                 <child>
                                   <object class="GtkLabel" id="label33">
@@ -1471,13 +1449,14 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHBox" id="hbox53">
+                              <object class="GtkBox" id="hbox53">
                                 <property name="visible">True</property>
+                                <property name="orientation">horizontal</property>
                                 <property name="spacing">8</property>
                                 <child>
                                   <object class="GtkImage" id="image4">
                                     <property name="visible">True</property>
-                                    <property name="stock">gtk-dialog-info</property>
+                                    <property name="icon_name">dialog-information</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1605,8 +1584,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox6">
+              <object class="GtkBox" id="vbox6">
                 <property name="visible">True</property>
+                <property name="orientation">vertical</property>
                 <property name="border_width">8</property>
                 <property name="spacing">4</property>
                 <child>
@@ -1620,8 +1600,9 @@
                         <property name="top_padding">4</property>
                         <property name="left_padding">0</property>
                         <child>
-                          <object class="GtkVBox" id="vbox61">
+                          <object class="GtkBox" id="vbox61">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <property name="border_width">4</property>
                             <property name="spacing">4</property>
                             <child>
@@ -1777,8 +1758,9 @@
                         <property name="top_padding">4</property>
                         <property name="left_padding">0</property>
                         <child>
-                          <object class="GtkVBox" id="vbox71">
+                          <object class="GtkBox" id="vbox71">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <property name="border_width">4</property>
                             <property name="spacing">4</property>
                             <child>
@@ -1801,8 +1783,9 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHButtonBox" id="hbuttonbox71">
+                              <object class="GtkButtonBox" id="hbuttonbox71">
                                 <property name="visible">True</property>
+                                <property name="orientation">horizontal</property>
                                 <property name="spacing">4</property>
                                 <property name="layout_style">end</property>
                                 <child>
@@ -1823,12 +1806,12 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="dict:btn_add">
-                                    <property name="label">gtk-add</property>
+                                    <property name="label" translatable="yes">_Add</property>
+                                    <property name="use_underline">True</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 handler="on_btn_dict_add_clicked" name="clicked"/>
                                   </object>
                                   <packing>
@@ -1839,12 +1822,12 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="dict:btn_edit">
-                                    <property name="label">gtk-edit</property>
+                                    <property name="label" translatable="yes">_Edit</property>
+                                    <property name="use_underline">True</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 handler="on_btn_dict_add_clicked" name="clicked"/>
                                   </object>
                                   <packing>
@@ -1855,12 +1838,12 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="dict:btn_delete">
-                                    <property name="label">gtk-delete</property>
+                                    <property name="label" translatable="yes">_Delete</property>
+                                    <property name="use_underline">True</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 handler="on_btn_dict_delete_clicked" name="clicked"/>
                                   </object>
                                   <packing>
@@ -1877,19 +1860,20 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHButtonBox" id="hbuttonbox72">
+                              <object class="GtkButtonBox" id="hbuttonbox72">
                                 <property name="visible">True</property>
+                                <property name="orientation">horizontal</property>
                                 <property name="spacing">4</property>
                                 <property name="layout_style">end</property>
                                 <child>
                                   <object class="GtkButton" id="dict:btn_up">
-                                    <property name="label">gtk-go-up</property>
+                                    <property name="label" translatable="yes">_Up</property>
+                                    <property name="use_underline">True</property>
                                     <property name="tooltip_text" translatable="yes">You can change the order on language bar</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 handler="on_btn_dict_order_clicked" name="clicked"/>
                                   </object>
                                   <packing>
@@ -1900,13 +1884,13 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="dict:btn_down">
-                                    <property name="label">gtk-go-down</property>
+                                    <property name="label" translatable="yes">_Down</property>
+                                    <property name="use_underline">True</property>
                                     <property name="tooltip_text" translatable="yes">You can change the order on language bar</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 handler="on_btn_dict_order_clicked" name="clicked"/>
                                   </object>
                                   <packing>
@@ -1953,7 +1937,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="about_vbox">
+              <object class="GtkBox" id="about_vbox">
                 <property name="visible">True</property>
                 <property name="orientation">vertical</property>
                 <property name="border_width">10</property>
@@ -1979,18 +1963,19 @@
           </packing>
         </child>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
+          <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="btn_apply">
-                <property name="label">gtk-apply</property>
+                <property name="label" translatable="yes">_Apply</property>
+                <property name="use_underline">True</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</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 handler="on_btn_apply_clicked" name="clicked"/>
               </object>
               <packing>
@@ -2001,12 +1986,12 @@
             </child>
             <child>
               <object class="GtkButton" id="btn_cancel">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
+                <property name="use_underline">True</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 handler="on_btn_cancel_clicked" name="clicked"/>
               </object>
               <packing>
@@ -2017,12 +2002,12 @@
             </child>
             <child>
               <object class="GtkButton" id="btn_ok">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes">_OK</property>
+                <property name="use_underline">True</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 handler="on_btn_ok_clicked" name="clicked"/>
               </object>
               <packing>
@@ -2053,11 +2038,13 @@
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox2">
+      <object class="GtkBox" id="dialog-vbox2">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
-          <object class="GtkVBox" id="vbox101">
+          <object class="GtkBox" id="vbox101">
             <property name="visible">True</property>
+            <property name="orientation">vertical</property>
             <property name="border_width">5</property>
             <property name="spacing">6</property>
             <child>
@@ -2068,6 +2055,7 @@
                 <property name="hscrollbar_policy">automatic</property>
                 <property name="vscrollbar_policy">automatic</property>
                 <property name="shadow_type">in</property>
+                <property name="height_request">150</property>
                 <child>
                   <object class="GtkTreeView" id="es:treeview">
                     <property name="visible">True</property>
@@ -2081,8 +2069,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox101">
+              <object class="GtkBox" id="hbox101">
                 <property name="visible">True</property>
+                <property name="orientation">horizontal</property>
                 <property name="spacing">8</property>
                 <child>
                   <object class="GtkLabel" id="label1001">
@@ -2128,8 +2117,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox102">
+              <object class="GtkBox" id="hbox102">
                 <property name="visible">True</property>
+                <property name="orientation">horizontal</property>
                 <property name="spacing">8</property>
                 <child>
                   <object class="GtkLabel" id="label1002">
@@ -2143,8 +2133,9 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="hbox103">
+                  <object class="GtkBox" id="hbox103">
                     <property name="visible">True</property>
+                    <property name="orientation">horizontal</property>
                     <child>
                       <object class="GtkCheckButton" id="es:checkbutton_alt">
                         <property name="label" translatable="yes">A_lternate</property>
@@ -2197,19 +2188,20 @@
               </packing>
             </child>
             <child>
-              <object class="GtkHButtonBox" id="hbuttonbox101">
+              <object class="GtkButtonBox" id="hbuttonbox101">
                 <property name="visible">True</property>
+                <property name="orientation">horizontal</property>
                 <property name="spacing">6</property>
                 <property name="layout_style">end</property>
                 <child>
                   <object class="GtkButton" id="es:button_add">
-                    <property name="label">gtk-add</property>
+                    <property name="label" translatable="yes">_Add</property>
+                    <property name="use_underline">True</property>
                     <property name="visible">True</property>
                     <property name="sensitive">False</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 handler="on_es_button_add_clicked" name="clicked"/>
                   </object>
                   <packing>
@@ -2220,12 +2212,12 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="es:button_refresh">
-                    <property name="label">gtk-refresh</property>
+                    <property name="label" translatable="yes">_Refresh</property>
+                    <property name="use_underline">True</property>
                     <property name="sensitive">False</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 handler="on_es_button_refresh_clicked" name="clicked"/>
                   </object>
                   <packing>
@@ -2236,13 +2228,13 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="es:button_del">
-                    <property name="label">gtk-delete</property>
+                    <property name="label" translatable="yes">_Delete</property>
+                    <property name="use_underline">True</property>
                     <property name="visible">True</property>
                     <property name="sensitive">False</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 handler="on_es_button_del_clicked" name="clicked"/>
                   </object>
                   <packing>
@@ -2264,17 +2256,18 @@
           </packing>
         </child>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area2">
+          <object class="GtkButtonBox" id="dialog-action_area2">
             <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancelbutton101">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
+                <property name="use_underline">True</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>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -2284,12 +2277,12 @@
             </child>
             <child>
               <object class="GtkButton" id="okbutton101">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes">_OK</property>
+                <property name="use_underline">True</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>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -2318,13 +2311,15 @@
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox3">
+      <object class="GtkBox" id="dialog-vbox3">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <property name="border_width">5</property>
         <property name="spacing">6</property>
         <child>
-          <object class="GtkHBox" id="hbox_for_combobox_custom_key_table">
+          <object class="GtkBox" id="hbox_for_combobox_custom_key_table">
             <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
             <property name="border_width">5</property>
             <property name="spacing">6</property>
             <child>
@@ -2359,8 +2354,9 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="hbox301">
+          <object class="GtkBox" id="hbox301">
             <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
             <property name="border_width">5</property>
             <property name="spacing">6</property>
             <child>
@@ -2371,6 +2367,8 @@
                 <property name="hscrollbar_policy">automatic</property>
                 <property name="vscrollbar_policy">automatic</property>
                 <property name="shadow_type">in</property>
+                <property name="width_request">250</property>
+                <property name="height_request">300</property>
                 <child>
                   <object class="GtkTreeView" id="treeview_custom_key_table">
                     <property name="visible">True</property>
@@ -2383,8 +2381,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVButtonBox" id="vbutton301">
+              <object class="GtkButtonBox" id="vbutton301">
                 <property name="visible">True</property>
+                <property name="orientation">vertical</property>
                 <property name="layout_style">start</property>
                 <property name="spacing">6</property>
                 <child>
@@ -2470,12 +2469,12 @@
                 <child>
                   <object class="GtkButton" id="button_add_custom_key">
                     <property name="visible">True</property>
-                    <property name="label">gtk-add</property>
+                    <property name="label" translatable="yes">_Add</property>
+                    <property name="use_underline">True</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>
                   </object>
                   <packing>
                     <property name="position">8</property>
@@ -2484,12 +2483,12 @@
                 <child>
                   <object class="GtkButton" id="button_remove_custom_key">
                     <property name="visible">True</property>
-                    <property name="label">gtk-remove</property>
+                    <property name="label" translatable="yes">_Remove</property>
+                    <property name="use_underline">True</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>
                   </object>
                   <packing>
                     <property name="position">9</property>
@@ -2508,16 +2507,17 @@
           </packing>
         </child>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area3">
+          <object class="GtkButtonBox" id="dialog-action_area3">
             <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="closebutton301">
                 <property name="visible">True</property>
-                <property name="label">gtk-close</property>
+                <property name="label" translatable="yes">_Close</property>
+                <property name="use_underline">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="use_stock">True</property>
                 <property name="receives_default">True</property>
               </object>
               <packing>
@@ -2551,12 +2551,14 @@
     <property name="text">Confirmation</property>
     <property name="secondary_text">You are about to close the setup dialog, is that OK?</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox6">
+      <object class="GtkBox" id="dialog-vbox6">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area6">
+          <object class="GtkButtonBox" id="dialog-action_area6">
             <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
             <property name="layout_style">end</property>
             <child>
               <placeholder/>
@@ -2586,12 +2588,14 @@
     <property name="text">Notice!</property>
     <property name="secondary_text">You are about to close the setup dialog without saving your changes, is that OK?</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox7">
+      <object class="GtkBox" id="dialog-vbox7">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area7">
+          <object class="GtkButtonBox" id="dialog-action_area7">
             <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
             <property name="layout_style">end</property>
             <child>
               <placeholder/>
@@ -2622,12 +2626,14 @@
     <signal handler="on_key_input_dialog_key_press_event" name="key_press_event"/>
     <signal handler="on_key_input_dialog_key_release_event" name="key_release_event"/>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox8">
+      <object class="GtkBox" id="dialog-vbox8">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area8">
+          <object class="GtkButtonBox" id="dialog-action_area8">
             <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
             <property name="layout_style">end</property>
             <child>
               <placeholder/>
@@ -2657,12 +2663,14 @@
     <property name="text">Invalid keysym</property>
     <property name="secondary_text">This keysym is not valid</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox9">
+      <object class="GtkBox" id="dialog-vbox9">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area9">
+          <object class="GtkButtonBox" id="dialog-action_area9">
             <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
             <property name="layout_style">end</property>
             <child>
               <placeholder/>
@@ -2680,8 +2688,9 @@
       </object>
     </child>
   </object>
-  <object class="GtkVBox" id="dict:add_extra_vbox">
+  <object class="GtkBox" id="dict:add_extra_vbox">
     <property name="visible">True</property>
+    <property name="orientation">vertical</property>
     <property name="no_show_all">True</property>
     <property name="spacing">10</property>
     <child>
@@ -2800,8 +2809,8 @@
     <property name="program-name">IBus-Anthy</property>
     <property name="copyright">Copyright © 2007–2008 Peng Huang
 Copyright © 2009 Hideaki ABE
-Copyright © 2009–2013 Takao Fujiwara
-Copyright © 2007–2013 Red Hat, Inc.</property>
+Copyright © 2009–2014 Takao Fujiwara
+Copyright © 2007–2014 Red Hat, Inc.</property>
     <property name="comments" translatable="yes">The Anthy engine for the IBus input platform</property>
     <property name="license">GPL</property>
     <property name="website">http://code.google.com/p/ibus/</property>