[gevice] update es.po



commit 0e0f1663a18cf0f2e452c08e39503db2434829b6
Author: Alejandro Valdes Jimenez <avaldes utalca cl>
Date:   Thu May 14 23:08:10 2009 -0400

    update es.po
---
 ChangeLog               |   13 ++
 README                  |    2 +-
 configure.ac            |    2 +-
 data/glade/gevice.glade |  333 +++++++++++++++++++----------------------------
 po/ChangeLog            |    4 +
 po/es.po                |  224 ++++++++++++++------------------
 src/config.py.in        |    6 +-
 src/gevice.py           |   71 +++++-----
 src/gevicedevice.py     |    6 +-
 src/geviceexport.py     |    2 +-
 src/gevicefind.py       |    6 +-
 src/gevicemaintainer.py |   13 +-
 src/geviceprefer.py     |    6 +-
 13 files changed, 308 insertions(+), 380 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d978d74..a20f7d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2009-05-14  Alejandro Valdes Jimenez  <avaldes utalca cl>
 
+	* README:
+	* configure.ac: change version
+	* data/glade/gevice.glade: modify some texts and remove old window print
+	* src/config.py.in: change version
+	* src/gevice.py: add support of gettext for glade file.
+	* src/gevicedevice.py:
+	* src/geviceexport.py:
+	* src/gevicefind.py:
+	* src/gevicemaintainer.py:
+	* src/geviceprefer.py:
+
+2009-05-14  Alejandro Valdes Jimenez  <avaldes utalca cl>
+
 	* configure.ac: change es_ES to es.
 
 2009-05-12  Alejandro Valdes Jimenez  <avaldes utalca cl>
diff --git a/README b/README
index 8081d4f..78d8d74 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 Gevice: GNOME Network Device Manager.
 ====================================
 
-Version: 0.5.0
+Version: 0.5.1
 
 Gevice is a tool for the administration of network device. It is
 designed for being used in the GNOME Desktop.
diff --git a/configure.ac b/configure.ac
index 87911c5..3d13b02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(gevice, 0.5.0)
+AC_INIT(gevice, 0.5.1)
 AC_CONFIG_SRCDIR(src/gevice.py)
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
diff --git a/data/glade/gevice.glade b/data/glade/gevice.glade
index aa8dc81..e330d77 100644
--- a/data/glade/gevice.glade
+++ b/data/glade/gevice.glade
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Tue May 12 17:05:36 2009 -->
+<?xml version="1.0"?>
 <glade-interface>
+  <!-- interface-requires gtk+ 2.16 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkWindow" id="window_main">
     <property name="width_request">700</property>
     <property name="height_request">500</property>
     <property name="title" translatable="yes">Gevice</property>
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <property name="window_position">center</property>
     <child>
       <widget class="GtkVBox" id="vbox_main">
         <property name="visible">True</property>
@@ -40,6 +40,9 @@
               </packing>
             </child>
           </widget>
+          <packing>
+            <property name="position">0</property>
+          </packing>
         </child>
       </widget>
     </child>
@@ -48,9 +51,9 @@
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Device</property>
     <property name="resizable">False</property>
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <property name="window_position">center</property>
     <property name="destroy_with_parent">True</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <child>
       <widget class="GtkVBox" id="vbox4">
         <property name="visible">True</property>
@@ -223,12 +226,14 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
           </widget>
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -237,31 +242,32 @@
             <property name="spacing">5</property>
             <child>
               <widget class="GtkButton" id="button_cancel_device">
+                <property name="label" context="yes">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" context="yes">gtk-cancel</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack_type">GTK_PACK_END</property>
+                <property name="pack_type">end</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <widget class="GtkButton" id="button_accept_device">
+                <property name="label" context="yes">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" context="yes">gtk-ok</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack_type">GTK_PACK_END</property>
+                <property name="pack_type">end</property>
+                <property name="position">0</property>
               </packing>
             </child>
           </widget>
@@ -278,9 +284,9 @@
     <property name="border_width">5</property>
     <property name="title" translatable="yes" context="yes">Preferences</property>
     <property name="resizable">False</property>
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <property name="window_position">center</property>
     <property name="destroy_with_parent">True</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <child>
       <widget class="GtkVBox" id="vbox3">
         <property name="visible">True</property>
@@ -297,11 +303,11 @@
                 <property name="n_columns">2</property>
                 <child>
                   <widget class="GtkCheckButton" id="checkbutton_comments">
+                    <property name="label" translatable="yes" context="yes">Comment</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes" context="yes">Comments</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
                   </widget>
@@ -314,11 +320,11 @@
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="checkbutton_serial">
+                    <property name="label" translatable="yes" context="yes">Serial</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes" context="yes">Serial</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
                   </widget>
@@ -329,22 +335,22 @@
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="checkbutton_ip">
+                    <property name="label" translatable="yes" context="yes">IP</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes" context="yes">IP</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="checkbutton_model">
+                    <property name="label" translatable="yes" context="yes">Model</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes" context="yes">Model</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
                   </widget>
@@ -364,8 +370,8 @@
                 <property name="label" translatable="yes" context="yes">View</property>
               </widget>
               <packing>
-                <property name="type">tab</property>
                 <property name="tab_fill">False</property>
+                <property name="type">tab</property>
               </packing>
             </child>
             <child>
@@ -383,11 +389,11 @@
                 <property name="column_spacing">5</property>
                 <child>
                   <widget class="GtkButton" id="button_forecolor">
+                    <property name="label" context="yes">gtk-select-color</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" context="yes">gtk-select-color</property>
+                    <property name="receives_default">False</property>
                     <property name="use_stock">True</property>
-                    <property name="response_id">0</property>
                   </widget>
                   <packing>
                     <property name="left_attach">2</property>
@@ -400,11 +406,11 @@
                 </child>
                 <child>
                   <widget class="GtkButton" id="button_backcolor">
+                    <property name="label" context="yes">gtk-select-color</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" context="yes">gtk-select-color</property>
+                    <property name="receives_default">False</property>
                     <property name="use_stock">True</property>
-                    <property name="response_id">0</property>
                   </widget>
                   <packing>
                     <property name="left_attach">2</property>
@@ -418,7 +424,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="editable">False</property>
-                    <property name="invisible_char">â??</property>
+                    <property name="invisible_char">&#x25CF;</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
@@ -434,7 +440,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="editable">False</property>
-                    <property name="invisible_char">â??</property>
+                    <property name="invisible_char">&#x25CF;</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
@@ -446,7 +452,7 @@
                 <child>
                   <widget class="GtkLabel" id="label9">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes" context="yes">Text Color</property>
+                    <property name="label" translatable="yes" context="yes">Text color</property>
                   </widget>
                   <packing>
                     <property name="top_attach">1</property>
@@ -477,9 +483,9 @@
                 <property name="label" translatable="yes" context="yes">Colors</property>
               </widget>
               <packing>
-                <property name="type">tab</property>
                 <property name="position">3</property>
                 <property name="tab_fill">False</property>
+                <property name="type">tab</property>
               </packing>
             </child>
             <child>
@@ -489,26 +495,23 @@
                 <property name="n_rows">2</property>
                 <property name="n_columns">2</property>
                 <child>
-                  <placeholder/>
-                </child>
-                <child>
                   <widget class="GtkCheckButton" id="checkbutton_ip_diag">
+                    <property name="label" translatable="yes" context="yes">IP</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes" context="yes">IP</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="checkbutton_model_diag">
+                    <property name="label" translatable="yes" context="yes">Model</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes" context="yes">Model</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
                   </widget>
@@ -519,11 +522,11 @@
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="checkbutton_link_diag">
+                    <property name="label" translatable="yes" context="yes">Link</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes" context="yes">Link</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
                   </widget>
@@ -532,6 +535,9 @@
                     <property name="bottom_attach">2</property>
                   </packing>
                 </child>
+                <child>
+                  <placeholder/>
+                </child>
               </widget>
               <packing>
                 <property name="position">4</property>
@@ -543,9 +549,9 @@
                 <property name="label" translatable="yes" context="yes">Diagram</property>
               </widget>
               <packing>
-                <property name="type">tab</property>
                 <property name="position">4</property>
                 <property name="tab_fill">False</property>
+                <property name="type">tab</property>
               </packing>
             </child>
             <child>
@@ -558,7 +564,7 @@
                   <widget class="GtkLabel" id="label24">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes" context="yes">User Database</property>
+                    <property name="label" translatable="yes" context="yes">User database</property>
                   </widget>
                   <packing>
                     <property name="top_attach">2</property>
@@ -587,7 +593,7 @@
                   <widget class="GtkEntry" id="entry_user_dbase">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="invisible_char">â??</property>
+                    <property name="invisible_char">&#x25CF;</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
@@ -600,7 +606,7 @@
                   <widget class="GtkEntry" id="entry_dbase">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="invisible_char">â??</property>
+                    <property name="invisible_char">&#x25CF;</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
@@ -613,7 +619,7 @@
                   <widget class="GtkEntry" id="entry_host">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="invisible_char">â??</property>
+                    <property name="invisible_char">&#x25CF;</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
@@ -632,9 +638,9 @@
                 <property name="label" translatable="yes" context="yes">Database</property>
               </widget>
               <packing>
-                <property name="type">tab</property>
                 <property name="position">5</property>
                 <property name="tab_fill">False</property>
+                <property name="type">tab</property>
               </packing>
             </child>
             <child>
@@ -653,7 +659,7 @@
                   <widget class="GtkEntry" id="entry_csvseparator">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="invisible_char">â??</property>
+                    <property name="invisible_char">&#x25CF;</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
@@ -672,15 +678,16 @@
                 <property name="label" translatable="yes" context="yes">CSV</property>
               </widget>
               <packing>
-                <property name="type">tab</property>
                 <property name="position">6</property>
                 <property name="tab_fill">False</property>
+                <property name="type">tab</property>
               </packing>
             </child>
           </widget>
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -688,95 +695,17 @@
             <property name="visible">True</property>
             <child>
               <widget class="GtkButton" id="button_close_prefer">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
                 <property name="label" context="yes">gtk-close</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="pack_type">GTK_PACK_END</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkWindow" id="window_print">
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes" context="yes">Print</property>
-    <property name="resizable">False</property>
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <child>
-      <widget class="GtkVBox" id="vbox6">
-        <property name="visible">True</property>
-        <property name="spacing">15</property>
-        <child>
-          <widget class="GtkHBox" id="hbox2">
-            <property name="visible">True</property>
-            <property name="border_width">5</property>
-            <property name="spacing">5</property>
-            <child>
-              <widget class="GtkLabel" id="label18">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes" context="yes">Model</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkComboBox" id="cb_model_print">
-                <property name="visible">True</property>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkHBox" id="hbox6">
-            <property name="visible">True</property>
-            <property name="spacing">5</property>
-            <child>
-              <widget class="GtkButton" id="button_cancel_print">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" context="yes">gtk-cancel</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="pack_type">GTK_PACK_END</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkButton" id="button_print_print">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label" context="yes">gtk-print</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack_type">GTK_PACK_END</property>
+                <property name="pack_type">end</property>
+                <property name="position">0</property>
               </packing>
             </child>
           </widget>
@@ -794,7 +723,7 @@
     <property name="border_width">5</property>
     <property name="title" translatable="yes" context="yes">Generate diagram</property>
     <property name="resizable">False</property>
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <property name="window_position">center</property>
     <child>
       <widget class="GtkVBox" id="vbox8">
         <property name="visible">True</property>
@@ -811,6 +740,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -856,6 +786,7 @@ svg</property>
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -864,31 +795,32 @@ svg</property>
             <property name="spacing">5</property>
             <child>
               <widget class="GtkButton" id="button_diagram_cancel">
+                <property name="label" context="yes">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" context="yes">gtk-cancel</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack_type">GTK_PACK_END</property>
+                <property name="pack_type">end</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <widget class="GtkButton" id="button_diagram_generate">
+                <property name="label" context="yes">gtk-convert</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" context="yes">gtk-convert</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack_type">GTK_PACK_END</property>
+                <property name="pack_type">end</property>
+                <property name="position">0</property>
               </packing>
             </child>
           </widget>
@@ -905,7 +837,7 @@ svg</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes" context="yes">Find</property>
     <property name="resizable">False</property>
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <property name="window_position">center</property>
     <child>
       <widget class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
@@ -916,22 +848,25 @@ svg</property>
             <property name="spacing">5</property>
             <child>
               <widget class="GtkRadioButton" id="radiobutton_namedevice">
+                <property name="label" translatable="yes" context="yes">Device name</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" translatable="yes" context="yes">Device name</property>
+                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
-                <property name="response_id">0</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
               </widget>
+              <packing>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkRadioButton" id="radiobutton_ip">
+                <property name="label" translatable="yes" context="yes">IP</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" translatable="yes" context="yes">IP</property>
+                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
-                <property name="response_id">0</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
                 <property name="group">radiobutton_namedevice</property>
@@ -942,11 +877,11 @@ svg</property>
             </child>
             <child>
               <widget class="GtkRadioButton" id="radiobutton_serial">
+                <property name="label" translatable="yes" context="yes">Serial</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" translatable="yes" context="yes">Serial</property>
+                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
-                <property name="response_id">0</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
                 <property name="group">radiobutton_namedevice</property>
@@ -959,6 +894,7 @@ svg</property>
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -973,6 +909,7 @@ svg</property>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -980,7 +917,7 @@ svg</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="invisible_char">â??</property>
+                <property name="invisible_char">&#x25CF;</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
@@ -1001,31 +938,32 @@ svg</property>
             <property name="spacing">5</property>
             <child>
               <widget class="GtkButton" id="button_find_cancel">
+                <property name="label" context="yes">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" context="yes">gtk-cancel</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack_type">GTK_PACK_END</property>
+                <property name="pack_type">end</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <widget class="GtkButton" id="button_find_find">
+                <property name="label" context="yes">gtk-find</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" context="yes">gtk-find</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack_type">GTK_PACK_END</property>
+                <property name="pack_type">end</property>
+                <property name="position">0</property>
               </packing>
             </child>
           </widget>
@@ -1041,7 +979,7 @@ svg</property>
   <widget class="GtkWindow" id="window_database">
     <property name="title" translatable="yes" context="yes">Connect to database</property>
     <property name="modal">True</property>
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <property name="window_position">center</property>
     <child>
       <widget class="GtkVBox" id="vbox5">
         <property name="visible">True</property>
@@ -1076,7 +1014,7 @@ svg</property>
               <widget class="GtkLabel" id="label27">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes" context="yes">User Database:</property>
+                <property name="label" translatable="yes" context="yes">User database:</property>
               </widget>
               <packing>
                 <property name="top_attach">2</property>
@@ -1133,7 +1071,7 @@ svg</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="visibility">False</property>
-                <property name="invisible_char">â??</property>
+                <property name="invisible_char">&#x25CF;</property>
               </widget>
               <packing>
                 <property name="left_attach">1</property>
@@ -1143,6 +1081,9 @@ svg</property>
               </packing>
             </child>
           </widget>
+          <packing>
+            <property name="position">0</property>
+          </packing>
         </child>
         <child>
           <widget class="GtkHBox" id="hbox11">
@@ -1151,31 +1092,32 @@ svg</property>
             <property name="spacing">5</property>
             <child>
               <widget class="GtkButton" id="button_connect_cancel">
+                <property name="label" context="yes">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" context="yes">gtk-cancel</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack_type">GTK_PACK_END</property>
+                <property name="pack_type">end</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <widget class="GtkButton" id="button_connect_dbase">
+                <property name="label" context="yes">gtk-connect</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" context="yes">gtk-connect</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack_type">GTK_PACK_END</property>
+                <property name="pack_type">end</property>
+                <property name="position">0</property>
               </packing>
             </child>
           </widget>
@@ -1188,20 +1130,19 @@ svg</property>
     </child>
   </widget>
   <widget class="GtkWindow" id="window_maintainer">
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <property name="window_position">center</property>
     <property name="default_width">350</property>
     <property name="default_height">300</property>
     <child>
       <widget class="GtkVBox" id="vbox7">
         <property name="visible">True</property>
-        <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
-        <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+        <property name="orientation">vertical</property>
         <child>
           <widget 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="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
             <child>
               <widget class="GtkTreeView" id="treeview">
                 <property name="visible">True</property>
@@ -1211,6 +1152,9 @@ svg</property>
               </widget>
             </child>
           </widget>
+          <packing>
+            <property name="position">0</property>
+          </packing>
         </child>
         <child>
           <widget class="GtkHBox" id="hbox10">
@@ -1221,49 +1165,46 @@ svg</property>
             </child>
             <child>
               <widget class="GtkButton" id="button_close">
+                <property name="label" translatable="yes" context="yes">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes" context="yes">gtk-close</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack_type">GTK_PACK_END</property>
+                <property name="pack_type">end</property>
                 <property name="position">3</property>
               </packing>
             </child>
             <child>
               <widget class="GtkButton" id="button_add">
+                <property name="label" translatable="yes" context="yes">gtk-add</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes" context="yes">gtk-add</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack_type">GTK_PACK_END</property>
+                <property name="pack_type">end</property>
                 <property name="position">2</property>
               </packing>
             </child>
             <child>
               <widget class="GtkButton" id="button_rem">
+                <property name="label" translatable="yes" context="yes">gtk-remove</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes" context="yes">gtk-remove</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack_type">GTK_PACK_END</property>
+                <property name="pack_type">end</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -1278,20 +1219,19 @@ svg</property>
     </child>
   </widget>
   <widget class="GtkWindow" id="window_maintainer1">
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <property name="window_position">center</property>
     <property name="default_width">350</property>
     <property name="default_height">300</property>
     <child>
       <widget class="GtkVBox" id="vbox9">
         <property name="visible">True</property>
-        <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
-        <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+        <property name="orientation">vertical</property>
         <child>
           <widget class="GtkScrolledWindow" id="scrolledwindow2">
             <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="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
             <child>
               <widget class="GtkTreeView" id="treeview1">
                 <property name="visible">True</property>
@@ -1301,6 +1241,9 @@ svg</property>
               </widget>
             </child>
           </widget>
+          <packing>
+            <property name="position">0</property>
+          </packing>
         </child>
         <child>
           <widget class="GtkHBox" id="hbox12">
@@ -1311,49 +1254,46 @@ svg</property>
             </child>
             <child>
               <widget class="GtkButton" id="button_close1">
+                <property name="label" translatable="yes" context="yes">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes" context="yes">gtk-close</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack_type">GTK_PACK_END</property>
+                <property name="pack_type">end</property>
                 <property name="position">3</property>
               </packing>
             </child>
             <child>
               <widget class="GtkButton" id="button_add1">
+                <property name="label" translatable="yes" context="yes">gtk-add</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes" context="yes">gtk-add</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack_type">GTK_PACK_END</property>
+                <property name="pack_type">end</property>
                 <property name="position">2</property>
               </packing>
             </child>
             <child>
               <widget class="GtkButton" id="button_rem1">
+                <property name="label" translatable="yes" context="yes">gtk-remove</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes" context="yes">gtk-remove</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack_type">GTK_PACK_END</property>
+                <property name="pack_type">end</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -1370,13 +1310,12 @@ svg</property>
   <widget class="GtkWindow" id="window_model">
     <property name="title" translatable="yes" context="yes">New Model</property>
     <property name="modal">True</property>
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <property name="window_position">center</property>
     <child>
       <widget class="GtkVBox" id="vbox10">
         <property name="visible">True</property>
-        <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">5</property>
-        <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
         <child>
           <widget class="GtkTable" id="table5">
             <property name="visible">True</property>
@@ -1414,7 +1353,7 @@ svg</property>
               <widget class="GtkEntry" id="entry_model">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="invisible_char">â??</property>
+                <property name="invisible_char">&#x25CF;</property>
               </widget>
               <packing>
                 <property name="left_attach">1</property>
@@ -1453,6 +1392,7 @@ svg</property>
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -1460,33 +1400,32 @@ svg</property>
             <property name="visible">True</property>
             <child>
               <widget class="GtkButton" id="button_cancel">
+                <property name="label" translatable="yes" context="yes">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes" context="yes">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack_type">GTK_PACK_END</property>
+                <property name="pack_type">end</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <widget class="GtkButton" id="button_ok">
+                <property name="label" translatable="yes" context="yes">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes" context="yes">gtk-ok</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack_type">GTK_PACK_END</property>
+                <property name="pack_type">end</property>
+                <property name="position">0</property>
               </packing>
             </child>
           </widget>
diff --git a/po/ChangeLog b/po/ChangeLog
index 805e3df..f24034d 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,5 +1,9 @@
 2009-05-14  Alejandro Valdes Jimenez  <avaldes utalca cl>
 
+	* es.po: update.
+
+2009-05-14  Alejandro Valdes Jimenez  <avaldes utalca cl>
+
 	* POTFILES.in: update lists of files.
 
 2009-05-14  Alejandro Valdes Jimenez  <avaldes utalca cl>
diff --git a/po/es.po b/po/es.po
index f101fb8..424c6c1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,19 +1,18 @@
-# Spanish translations for gevice package
-# Traducciones al español para el paquete gevice.
+# Spanish translations for gevice package.
 # Copyright (C) 2009 THE gevice'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the gevice package.
 # Alejandro Valdes Jimenez <avaldes utalca cl>, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gevice 0.5.0\n"
+"Project-Id-Version: gevice 0.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-14 10:58-0400\n"
-"PO-Revision-Date: 2009-05-14 10:59-0400\n"
+"POT-Creation-Date: 2009-05-14 22:19-0400\n"
+"PO-Revision-Date: 2009-05-14 22:21-0400\n"
 "Last-Translator: Alejandro Valdes Jimenez <avaldes utalca cl>\n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=ASCII\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -35,38 +34,41 @@ msgid "Disconnect"
 msgstr "Desconectar"
 
 #: ../src/gevicedevice.py:35
-msgid "New Device"
+msgid "New device"
 msgstr "Nuevo dispositivo"
 
 #: ../src/gevicedevice.py:62
-msgid "Modify Device"
+msgid "Modify device"
 msgstr "Modificar dispositivo"
 
-#: ../src/gevicedevice.py:94
-msgid "Do you want to remove this device?"
-msgstr "Quiere realemente remover este dispositivo?"
+#: ../src/gevicedevice.py:94 ../src/gevicemaintainer.py:269
+#: ../src/gevicemaintainer.py:292
+msgid "Do you want to remove: "
+msgstr "Quiere remover: "
 
 #: ../src/geviceexport.py:18
 msgid "Save file as"
 msgstr "Guardar archivo como"
 
 #: ../src/geviceexport.py:39
-msgid "Not open file to write"
-msgstr "No se puede abrir para escritura el archivo"
+msgid "Can not write to file"
+msgstr "No puede escribir en el archivo"
 
 #: ../src/gevicemaintainer.py:32 ../src/gevicemaintainer.py:66
 msgid "ID"
 msgstr "ID"
 
-#: ../src/gevicemaintainer.py:40 gevice.glade.h:23
+#: ../src/gevicemaintainer.py:40 ../data/glade/gevice.glade.h:22
 msgid "Name"
 msgstr "Nombre"
 
-#: ../src/gevicemaintainer.py:74 ../src/gevicemodel.py:29 gevice.glade.h:9
+#: ../src/gevicemaintainer.py:74 ../src/gevicemodel.py:29
+#: ../data/glade/gevice.glade.h:8
 msgid "Device"
 msgstr "Dispositivo"
 
-#: ../src/gevicemaintainer.py:82 ../src/gevicemodel.py:37 gevice.glade.h:22
+#: ../src/gevicemaintainer.py:82 ../src/gevicemodel.py:37
+#: ../data/glade/gevice.glade.h:21
 msgid "Model"
 msgstr "Modelo"
 
@@ -74,41 +76,37 @@ msgstr "Modelo"
 msgid "Name exist: "
 msgstr "El nombre existe: "
 
-#: ../src/gevicemaintainer.py:269 ../src/gevicemaintainer.py:292
-msgid "Really delete: "
-msgstr "Quiere realmente eliminar: "
-
-#: ../src/gevicemodel.py:44 gevice.glade.h:19
+#: ../src/gevicemodel.py:44 ../data/glade/gevice.glade.h:18
 msgid "IP"
 msgstr "IP"
 
-#: ../src/gevicemodel.py:51 gevice.glade.h:30
+#: ../src/gevicemodel.py:51 ../data/glade/gevice.glade.h:28
 msgid "Serial"
 msgstr "Serial"
 
-#: ../src/gevicemodel.py:58 gevice.glade.h:5
+#: ../src/gevicemodel.py:58
 msgid "Comments"
 msgstr "Comentarios"
 
-#: ../src/geviceprefer.py:27 gevice.glade.h:17
+#: ../src/geviceprefer.py:27 ../data/glade/gevice.glade.h:16
 msgid "Host"
-msgstr "Host"
+msgstr "Servidor"
 
-#: ../src/geviceprefer.py:28
-msgid "Databse"
+#: ../src/geviceprefer.py:28 ../data/glade/gevice.glade.h:6
+msgid "Database"
 msgstr "Base de datos"
 
-#: ../src/geviceprefer.py:29 gevice.glade.h:33
-msgid "User Database"
+#: ../src/geviceprefer.py:29 ../data/glade/gevice.glade.h:31
+msgid "User database"
 msgstr "Usuario base de datos"
 
 #: ../src/geviceprefer.py:98
 msgid "Select background color"
-msgstr "Seleccionar color de fondo"
+msgstr "Seleccione color de fondo"
 
 #: ../src/geviceprefer.py:101
-msgid "Select foreground color"
-msgstr "Seleccionar color del texto"
+msgid "Select text color"
+msgstr "Seleccione color del texto"
 
 #: ../src/gevice.py:150
 msgid "_File"
@@ -136,22 +134,22 @@ msgstr "_Mantenedores"
 
 #: ../src/gevice.py:156
 msgid "_Actions"
-msgstr "A_ccion"
+msgstr "A_cciones"
 
-#: ../src/gevice.py:157 ../src/gevice.py:196 ../src/gevice.py:507
+#: ../src/gevice.py:157 ../src/gevice.py:196 ../src/gevice.py:505
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../src/gevice.py:157 ../src/gevice.py:506 gevice.glade.h:6
+#: ../src/gevice.py:157 ../src/gevice.py:504 ../data/glade/gevice.glade.h:5
 msgid "Connect to database"
-msgstr "conectar a base de datos"
+msgstr "Conectar a la base de datos"
 
-#: ../src/gevice.py:158 ../src/gevice.py:315
+#: ../src/gevice.py:158 ../src/gevice.py:313
 msgid "Local"
 msgstr "Local"
 
-#: ../src/gevice.py:158
-msgid "Open Local Terminal"
+#: ../src/gevice.py:158 ../src/gevice.py:192
+msgid "Open local terminal"
 msgstr "Abrir terminal local"
 
 #: ../src/gevice.py:159
@@ -159,23 +157,23 @@ msgid "_Quit"
 msgstr "_Salir"
 
 #: ../src/gevice.py:159
-msgid "Quit the Program"
+msgid "Quit the program"
 msgstr "Salir del programa"
 
-#: ../src/gevice.py:160 gevice.glade.h:26
+#: ../src/gevice.py:160 ../data/glade/gevice.glade.h:25
 msgid "Preferences"
 msgstr "Preferencias"
 
 #: ../src/gevice.py:160
 msgid "Setting preferences"
-msgstr "Configurar preferencias"
+msgstr "Ajustar preferencias"
 
-#: ../src/gevice.py:165 gevice.glade.h:13
+#: ../src/gevice.py:165 ../data/glade/gevice.glade.h:12
 msgid "Find"
 msgstr "Buscar"
 
 #: ../src/gevice.py:165
-msgid "Search for a device in current model"
+msgid "Search a device"
 msgstr "Buscar un dispositivo"
 
 #: ../src/gevice.py:166
@@ -191,7 +189,7 @@ msgid "Refresh"
 msgstr "Actualizar"
 
 #: ../src/gevice.py:167
-msgid "refresh model"
+msgid "Refresh model"
 msgstr "Actualizar modelo"
 
 #: ../src/gevice.py:168
@@ -203,24 +201,24 @@ msgid "Add"
 msgstr "Agregar"
 
 #: ../src/gevice.py:172
-msgid "Add a device under the one selected"
-msgstr "Agragar bajo el dispositivo seleccionado"
+msgid "Add a device"
+msgstr "Agregar un dispositivo"
 
 #: ../src/gevice.py:173
 msgid "Remove"
 msgstr "Remover"
 
 #: ../src/gevice.py:173
-msgid "Remove current device"
-msgstr "Remover dispositivo seleccionado"
+msgid "Remove device selected"
+msgstr "Remover el dispositivo seleccionado"
 
 #: ../src/gevice.py:174
 msgid "Edit"
 msgstr "Editar"
 
 #: ../src/gevice.py:174
-msgid "Edit data of device"
-msgstr "Editar datos del dispositivo"
+msgid "Edit data of device selected"
+msgstr "Editar datos del dispositivo seleccionado"
 
 #: ../src/gevice.py:175
 msgid "Expand"
@@ -228,7 +226,7 @@ msgstr "Expandir"
 
 #: ../src/gevice.py:175
 msgid "Expand tree of device selected"
-msgstr "Expandir arbol bajo el dispositivo seleccionado"
+msgstr "Expadir arbol de dispositivo seleccionado"
 
 #: ../src/gevice.py:176
 msgid "Decrease"
@@ -236,46 +234,38 @@ msgstr "Reducir"
 
 #: ../src/gevice.py:176
 msgid "Decrease tree of device selected"
-msgstr "Reducir arbol bajo el dispositivo seleccionado"
+msgstr "Reducir arbol de dispositivo seleccionado"
 
 #: ../src/gevice.py:177
 msgid "Create diagram"
 msgstr "Crear diagrama"
 
 #: ../src/gevice.py:177
-msgid "Create diagram of devices with your children"
+msgid "Create diagram of devices"
 msgstr "Crear diagrama de dispositivos"
 
-#: ../src/gevice.py:178 ../src/gevice.py:396 gevice.glade.h:21
+#: ../src/gevice.py:178 ../src/gevice.py:394 ../data/glade/gevice.glade.h:20
 msgid "Mark"
 msgstr "Marca"
 
-#: ../src/gevice.py:179
+#: ../src/gevice.py:179 ../src/gevice.py:420
 msgid "Type of link"
 msgstr "Tipo de enlace"
 
-#: ../src/gevice.py:179 ../src/gevice.py:422
-msgid "Type of Link"
-msgstr "Type de enlace"
-
-#: ../src/gevice.py:180
+#: ../src/gevice.py:180 ../src/gevice.py:407
 msgid "Type of device"
 msgstr "Tipo de dispositivo"
 
-#: ../src/gevice.py:181 ../src/gevice.py:381
+#: ../src/gevice.py:181 ../src/gevice.py:379
 msgid "Model of device"
 msgstr "Modelo de dispositivo"
 
-#: ../src/gevice.py:181
-msgid "Model of dvice"
-msgstr "Modelo de dispositivo"
-
 #: ../src/gevice.py:185
 msgid "Tree"
 msgstr "Arbol"
 
 #: ../src/gevice.py:185
-msgid "Show Tree"
+msgid "Show tree"
 msgstr "Ver arbol"
 
 #: ../src/gevice.py:186
@@ -283,7 +273,7 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../src/gevice.py:186
-msgid "Show Terminal"
+msgid "Show terminal"
 msgstr "Ver terminal"
 
 #: ../src/gevice.py:190
@@ -292,7 +282,7 @@ msgstr "ssh"
 
 #: ../src/gevice.py:190
 msgid "Use ssh protocol"
-msgstr "Usar el protocolo ssh"
+msgstr "Usar protocolo ssh"
 
 #: ../src/gevice.py:191
 msgid "telnet"
@@ -300,129 +290,113 @@ msgstr "telnet"
 
 #: ../src/gevice.py:191
 msgid "Use telnet protocol"
-msgstr "Usar el protocolo telnet"
+msgstr "Usar protocolo telnet"
 
 #: ../src/gevice.py:192
 msgid "local"
 msgstr "local"
 
-#: ../src/gevice.py:192
-msgid "Open local terminal"
-msgstr "Abrir terminal local"
-
 #: ../src/gevice.py:196
 msgid "Connect to"
-msgstr "Conectar a"
+msgstr "conectar a"
 
-#: ../src/gevice.py:409
-msgid "Type of Device"
-msgstr "Tipo de dispositivo"
+#: ../src/gevice.py:581
+msgid "[Host: "
+msgstr "[Servidor: "
 
-#: ../src/gevice.py:583
-msgid "[Database Host: "
-msgstr "[Host base de datos: "
-
-#: ../src/gevice.py:584
+#: ../src/gevice.py:582
 msgid "Database: "
 msgstr "Base de datos: "
 
-#: ../src/gevice.py:585
+#: ../src/gevice.py:583
 msgid "User: "
 msgstr "Usuario: "
 
-#: gevice.glade.h:1
+#: ../data/glade/gevice.glade.h:1
 msgid "Background"
 msgstr "Fondo"
 
-#: gevice.glade.h:2
+#: ../data/glade/gevice.glade.h:2
 msgid "CSV"
 msgstr "CSV"
 
-#: gevice.glade.h:3
+#: ../data/glade/gevice.glade.h:3
 msgid "Colors"
 msgstr "Colores"
 
-#: gevice.glade.h:4
+#: ../data/glade/gevice.glade.h:4
 msgid "Comment"
 msgstr "Comentario"
 
-#: gevice.glade.h:7
-msgid "Database"
-msgstr "Base de datos"
-
-#: gevice.glade.h:8
+#: ../data/glade/gevice.glade.h:7
 msgid "Database:"
 msgstr "Base de datos:"
 
-#: gevice.glade.h:10
+#: ../data/glade/gevice.glade.h:9
 msgid "Device name"
 msgstr "Nombre de dispositivo"
 
-#: gevice.glade.h:11
+#: ../data/glade/gevice.glade.h:10
 msgid "Diagram"
 msgstr "Diagrama"
 
-#: gevice.glade.h:12
+#: ../data/glade/gevice.glade.h:11
 msgid "Filter"
 msgstr "Filtro"
 
-#: gevice.glade.h:14
+#: ../data/glade/gevice.glade.h:13
 msgid "Format"
 msgstr "Formato"
 
-#: gevice.glade.h:15
+#: ../data/glade/gevice.glade.h:14
 msgid "Generate diagram"
 msgstr "Generar diagrama"
 
-#: gevice.glade.h:16
+#: ../data/glade/gevice.glade.h:15
 msgid "Gevice"
 msgstr "Gevice"
 
-#: gevice.glade.h:18
+#: ../data/glade/gevice.glade.h:17
 msgid "Host:"
-msgstr "Host:"
+msgstr "Servidor:"
 
-#: gevice.glade.h:20
+#: ../data/glade/gevice.glade.h:19
 msgid "Link"
 msgstr "Enlace"
 
-#: gevice.glade.h:24
+#: ../data/glade/gevice.glade.h:23
 msgid "New Model"
 msgstr "Nuevo modelo"
 
-#: gevice.glade.h:25
+#: ../data/glade/gevice.glade.h:24
 msgid "Password:"
 msgstr "Clave:"
 
-#: gevice.glade.h:27
-msgid "Print"
-msgstr "Imprimir"
-
-#: gevice.glade.h:28
+#: ../data/glade/gevice.glade.h:26
 msgid "Program"
 msgstr "Programa"
 
-#: gevice.glade.h:29
+#: ../data/glade/gevice.glade.h:27
 msgid "Separator"
 msgstr "Separador"
 
-#: gevice.glade.h:31
-msgid "Text Color"
-msgstr "Color de texto"
+#: ../data/glade/gevice.glade.h:29
+msgid "Text color"
+msgstr "Color del texto"
 
-#: gevice.glade.h:32
+#: ../data/glade/gevice.glade.h:30
 msgid "Type"
 msgstr "Tipo"
 
-#: gevice.glade.h:34
-msgid "User Database:"
-msgstr "Usuario base de datos:"
+#: ../data/glade/gevice.glade.h:32
+msgid "User database:"
+msgstr "Usuario de base de datos:"
 
-#: gevice.glade.h:35
+#: ../data/glade/gevice.glade.h:33
 msgid "View"
 msgstr "Ver"
 
-#: gevice.glade.h:36
+#: ../data/glade/gevice.glade.h:34
 msgid ""
 "dot\n"
 "neato\n"
@@ -430,27 +404,27 @@ msgid ""
 "twopi"
 msgstr ""
 
-#: gevice.glade.h:40
+#: ../data/glade/gevice.glade.h:38
 msgid "gtk-add"
 msgstr ""
 
-#: gevice.glade.h:41
+#: ../data/glade/gevice.glade.h:39
 msgid "gtk-cancel"
 msgstr ""
 
-#: gevice.glade.h:42
+#: ../data/glade/gevice.glade.h:40
 msgid "gtk-close"
 msgstr ""
 
-#: gevice.glade.h:43
+#: ../data/glade/gevice.glade.h:41
 msgid "gtk-ok"
 msgstr ""
 
-#: gevice.glade.h:44
+#: ../data/glade/gevice.glade.h:42
 msgid "gtk-remove"
 msgstr ""
 
-#: gevice.glade.h:45
+#: ../data/glade/gevice.glade.h:43
 msgid ""
 "png\n"
 "jpg\n"
diff --git a/src/config.py.in b/src/config.py.in
index 964e1ef..05b725b 100644
--- a/src/config.py.in
+++ b/src/config.py.in
@@ -1,4 +1,4 @@
-# gyrus -- IMAP administrator for GNOME
+# gevice: GNOME Network Device Manager
 #
 # This template was inspired from gnome-specimen.
 #
@@ -38,16 +38,12 @@ if exists(join(dirname(__file__), '../gevice.in')):
     PKGDATADIR  = source_datadir
     GLADEDIR    = join (source_datadir, "glade")
     ARTDIR	= join (source_datadir, "images")
-    XMLDIR	= join (source_datadir, "xml")
-    SAMPLEDIR	= join (source_datadir, "samples")
 # Normal situation: use installation paths from ./configure
 else:
     DATADIR     = "@DATADIR@"
     PKGDATADIR  = "@PKGDATADIR@"
     GLADEDIR    = "@GLADEDIR@"
     ARTDIR	= "@ARTDIR@"
-    XMLDIR	= "@XMLDIR@"
-    SAMPLEDIR	= "@SAMPLEDIR@"
 
 # struct main treestore
 COLUMN_NAME_DEV = 0
diff --git a/src/gevice.py b/src/gevice.py
index 3f570e6..aca23ae 100755
--- a/src/gevice.py
+++ b/src/gevice.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 #
 # gevice GNOME Network Device Manager.
-# Copyright (C) Alejandro Valdes Jimenez 2008 <avaldes svn gnome org>
+# Copyright (C) Alejandro Valdes Jimenez 2008 <avaldes utalca cl>
 # 
 # gevice.py is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -27,10 +27,6 @@ import gnome
 import gtk.glade
 import psycopg2
 
-import gettext
-gettext.textdomain("gevice")
-from gettext import gettext as _
-
 import config
 import gevicefind
 import gevicediagram
@@ -42,6 +38,11 @@ import gevicedatabase
 import geviceexport
 import gevicemaintainer
 
+import gettext
+gettext.textdomain(config.PACKAGE)
+gtk.glade.textdomain(config.PACKAGE)
+from gettext import gettext as _
+
 
 # menu and toolbar
 UI = '''<ui>
@@ -155,35 +156,35 @@ class Gevice:
             ('Maintainer', None, _('_Maintainer')),
             ('ActionsMenu', None, _('_Actions')),
             ('Open', gtk.STOCK_DISCONNECT, _('Connect'), None, _('Connect to database'), self.on_action_open),
-            ('OpenLocalTerminal', gtk.STOCK_HOME, _('Local'), None, _('Open Local Terminal'), self.on_action_open_local_terminal),
-            ('Quit', gtk.STOCK_QUIT, _('_Quit'), None, _('Quit the Program'), self.on_action_quit),
+            ('OpenLocalTerminal', gtk.STOCK_HOME, _('Local'), None, _('Open local terminal'), self.on_action_open_local_terminal),
+            ('Quit', gtk.STOCK_QUIT, _('_Quit'), None, _('Quit the program'), self.on_action_quit),
             ('Prefer', gtk.STOCK_PREFERENCES, _('Preferences'), None, _('Setting preferences'), self.on_action_preferences),
             ('About', gtk.STOCK_ABOUT, None, None, None, self.on_action_about),
         ])
 
         self.actiongroup_model.add_actions([
-            ('Find', gtk.STOCK_FIND, _('Find'),None, _('Search for a device in current model'), self.on_action_find),
+            ('Find', gtk.STOCK_FIND, _('Find'),None, _('Search a device'), self.on_action_find),
             ('Save', gtk.STOCK_SAVE, _('Save'), None, _('Save model'), self.on_action_save),
-            ('Refresh', gtk.STOCK_REFRESH, _('Refresh'), None, _('refresh model'), self.on_action_refresh),
-            ('Export', gtk.STOCK_SELECT_ALL, _('Export to CSV'), None, _('Export to CVS'), self.on_action_export),
+            ('Refresh', gtk.STOCK_REFRESH, _('Refresh'), None, _('Refresh model'), self.on_action_refresh),
+            ('Export', gtk.STOCK_SELECT_ALL, _('Export to CSV'), None, _('Export to CSV'), self.on_action_export),
             ])
 
         self.actiongroup_device.add_actions([
-            ('AddDevice', gtk.STOCK_ADD, _('Add'),None, _('Add a device under the one selected'), self.on_action_adddevice),	
-            ('RemoveDevice', gtk.STOCK_REMOVE, _('Remove'), None, _('Remove current device'), self.on_action_removedevice),
-            ('EditDevice', gtk.STOCK_EDIT, _('Edit'), None, _('Edit data of device'), self.on_action_editdevice),
+            ('AddDevice', gtk.STOCK_ADD, _('Add'),None, _('Add a device'), self.on_action_adddevice),	
+            ('RemoveDevice', gtk.STOCK_REMOVE, _('Remove'), None, _('Remove device selected'), self.on_action_removedevice),
+            ('EditDevice', gtk.STOCK_EDIT, _('Edit'), None, _('Edit data of device selected'), self.on_action_editdevice),
             ('Expand', gtk.STOCK_INDENT, _('Expand'), None, _('Expand tree of device selected'), self.on_action_expand),
             ('Decrease', gtk.STOCK_UNINDENT, _('Decrease'), None, _('Decrease tree of device selected'), self.on_action_decrease),
-            ('Diagram', gtk.STOCK_CONVERT, _('Create diagram'),None, _('Create diagram of devices with your children'), self.on_action_diagram),
+            ('Diagram', gtk.STOCK_CONVERT, _('Create diagram'),None, _('Create diagram of devices'), self.on_action_diagram),
             ('Mark', gtk.STOCK_EDIT, _('Mark'),None, _('Mark'), self.on_action_mark),
-            ('TypeOfLink', gtk.STOCK_EDIT, _('Type of link'),None, _('Type of Link'), self.on_action_typeoflink),
+            ('TypeOfLink', gtk.STOCK_EDIT, _('Type of link'),None, _('Type of link'), self.on_action_typeoflink),
             ('TypeOfDev', gtk.STOCK_EDIT, _('Type of device'),None, _('Type of device'), self.on_action_typeofdev),
-            ('Model', gtk.STOCK_EDIT, _('Model of device'),None, _('Model of dvice'), self.on_action_model),            
+            ('Model', gtk.STOCK_EDIT, _('Model of device'),None, _('Model of device'), self.on_action_model),            
         ])
 
         self.actiongroup_window.add_toggle_actions([
-            ('Tree', None, _('Tree'),None, _('Show Tree'), self.on_toggle_tree, True),
-            ('Terminal', None, _('Terminal'),None, _('Show Terminal'), self.on_toggle_terminal, True)
+            ('Tree', None, _('Tree'),None, _('Show tree'), self.on_toggle_tree, True),
+            ('Terminal', None, _('Terminal'),None, _('Show terminal'), self.on_toggle_terminal, True)
             ])
 
         self.actiongroup_window.add_radio_actions([
@@ -217,22 +218,20 @@ class Gevice:
         self.maintoolbar.set_style(gtk.TOOLBAR_ICONS)
         #self.maintoolbar.set_style(gtk.TOOLBAR_BOTH)
 
-	## create combobox user
-	self.separator_user = gtk.SeparatorToolItem()
-	self.toolitem_user = gtk.ToolItem()
-	self.maintoolbar.insert(self.toolitem_user,12)
+        ## create combobox user
+        self.separator_user = gtk.SeparatorToolItem()
+        self.toolitem_user = gtk.ToolItem()
+        self.maintoolbar.insert(self.toolitem_user,12)
 
-	self.vboxcombo = gtk.VBox(False,0)
+        self.vboxcombo = gtk.VBox(False,0)
 
-        # FIXME: management users
-	self.combobox_user = gtk.combo_box_entry_new_text()
-	self.combobox_user.append_text('root')
-	self.combobox_user.append_text('rss')
-	self.combobox_user.append_text('plataforma')
-	self.combobox_user.set_active (0)
+        # FIXME: management users with gconf?
+        self.combobox_user = gtk.combo_box_entry_new_text()
+        self.combobox_user.append_text('root')
+        self.combobox_user.set_active (0)
 
-	self.vboxcombo.pack_end (self.combobox_user,True,False)
-	self.toolitem_user.add(self.vboxcombo)
+        self.vboxcombo.pack_end (self.combobox_user,True,False)
+        self.toolitem_user.add(self.vboxcombo)
 
         self.hbox.pack_start (self.maintoolbar,True,True)
 
@@ -406,7 +405,7 @@ class Gevice:
         "update2":" where id_tipo_disp=",
         "max_id":"select max(id_tipo_disp)+1 from tipo_disp;"}
         dialogmaintainer = gevicemaintainer.GeviceMaintainer ()
-        dialogmaintainer.load_interface (gevice,_("Type of Device"),sql)
+        dialogmaintainer.load_interface (gevice,_("Type of device"),sql)
         dialogmaintainer.load_data (gevice,sql)
         dialogmaintainer.show_interface ()
 
@@ -419,7 +418,7 @@ class Gevice:
         "update2":" where id_tipo_enlace=",
         "max_id":"select max(id_tipo_enlace)+1 from tipo_enlace;"}
         dialogmaintainer = gevicemaintainer.GeviceMaintainer ()
-        dialogmaintainer.load_interface (gevice,_("Type of Link"),sql)
+        dialogmaintainer.load_interface (gevice,_("Type of link"),sql)
         dialogmaintainer.load_data (gevice,sql)
         dialogmaintainer.show_interface ()
 
@@ -549,8 +548,8 @@ class Gevice:
             gevice.notebook.hide ()
 
     def create_about_dialog (self):
-        authors = ('Alejandro Valdes Jimenez [avaldes svn gnome org]','')
-        translator_credits = ('Alejandro Valdes Jimenez [avaldes svn gnome org]')
+        authors = ('Alejandro Valdes Jimenez [avaldes utalca cl]','')
+        translator_credits = ('Alejandro Valdes Jimenez [avaldes utalca cl]')
         logo =  gtk.gdk.pixbuf_new_from_file (os.path.join (config.ARTDIR,"gevice.png"))
 
         ad = gtk.AboutDialog()
@@ -580,7 +579,7 @@ class Gevice:
         return proto
     
     def update_statusbar (self):
-        msg = _("[Database Host: ") + self.gpref.host + " "
+        msg = _("[Host: ") + self.gpref.host + " "
         msg+= _("Database: ") + self.gpref.dbase + " "
         msg+= _("User: ") + self.gpref.user_dbase + "]"
         
diff --git a/src/gevicedevice.py b/src/gevicedevice.py
index 83c2122..249462c 100644
--- a/src/gevicedevice.py
+++ b/src/gevicedevice.py
@@ -32,7 +32,7 @@ class GeviceDevice:
         self.entry_comment_device.set_text("")
         self.combo_model.set_active(0)
         self.combo_link.set_active(0)
-        self.window_device.set_title (_("New Device"))
+        self.window_device.set_title (_("New device"))
 
     def modify_device (self,gevice):
         self.action = "mod"       
@@ -59,7 +59,7 @@ class GeviceDevice:
         self.entry_comment_device.set_text(data[4])
         self.combo_link.set_active(self.index_link)
         
-        self.window_device.set_title (_("Modify Device"))
+        self.window_device.set_title (_("Modify device"))
     
     def get_index_combo_model (self,model,path,iter,gevice):
         data = model.get (iter,
@@ -91,7 +91,7 @@ class GeviceDevice:
 
         dialog.set_has_separator(False)
         dialog.vbox.set_spacing(15)
-        dialog.vbox.pack_start(gtk.Label(_("Do you want to remove this device?")))
+        dialog.vbox.pack_start(gtk.Label(_("Do you want to remove: ")))
         dialog.show_all()
 
         response = dialog.run ()
diff --git a/src/geviceexport.py b/src/geviceexport.py
index fc98d3e..5a5d2f3 100644
--- a/src/geviceexport.py
+++ b/src/geviceexport.py
@@ -36,7 +36,7 @@ class GeviceExport:
                 self.get_all_data_from_view (gevice,FILE)
                 FILE.close()    
             else:
-                gevice.show_message (_("Not open file to write"),gtk.MESSAGE_ERROR)
+                gevice.show_message (_("Can not write to file"),gtk.MESSAGE_ERROR)
 
     def get_all_data_from_view (self,gevice,FILE):
         sql = "select nom_tipo_disp,nom_marca,nom_modelo,nom_tipo_disp || ' ' || nom_marca || ' ' || nom_modelo,count(nom_tipo_disp) "
diff --git a/src/gevicefind.py b/src/gevicefind.py
index 9bdc8c7..277f7c1 100644
--- a/src/gevicefind.py
+++ b/src/gevicefind.py
@@ -3,10 +3,12 @@ pygtk.require('2.0')
 import gtk.glade
 import os
 
+import config
+
 import gettext
-gettext.textdomain("gevice")
+gettext.textdomain(config.PACKAGE)
+gtk.glade.textdomain(config.PACKAGE)
 from gettext import gettext as _
-import config
 
 class GeviceFind:
     def __init__ (self):
diff --git a/src/gevicemaintainer.py b/src/gevicemaintainer.py
index f918d00..6422006 100644
--- a/src/gevicemaintainer.py
+++ b/src/gevicemaintainer.py
@@ -4,13 +4,14 @@ import gtk
 import os
 import gobject
 
-import gettext
-gettext.textdomain("gevice")
-from gettext import gettext as _
-
 import psycopg2
 import config
 
+import gettext
+gettext.textdomain(config.PACKAGE)
+gtk.glade.textdomain(config.PACKAGE)
+from gettext import gettext as _
+
 class GeviceMaintainer:
     def __ini__ (self):
         self.list_mark = None
@@ -266,7 +267,7 @@ class GeviceMaintainer:
         delete = sql["delete"] + str(id)
         
         dialog = gtk.MessageDialog(None,gtk.DIALOG_MODAL, gtk.MESSAGE_QUESTION,
-                gtk.BUTTONS_YES_NO, _("Really delete: ") + name)
+                gtk.BUTTONS_YES_NO, _("Do you want to remove: ") + name)
 
         result = dialog.run()
 
@@ -289,7 +290,7 @@ class GeviceMaintainer:
         delete = sql["delete"] + str(id)
         
         dialog = gtk.MessageDialog(None,gtk.DIALOG_MODAL, gtk.MESSAGE_QUESTION,
-                gtk.BUTTONS_YES_NO, _("Really delete: ") + device + " " + name)
+                gtk.BUTTONS_YES_NO, _("Do you want to remove: ") + device + " " + name)
 
         result = dialog.run()
 
diff --git a/src/geviceprefer.py b/src/geviceprefer.py
index d5b2767..78aa0ea 100644
--- a/src/geviceprefer.py
+++ b/src/geviceprefer.py
@@ -25,8 +25,8 @@ class GevicePrefer:
         self.diaglink = False
         self.csvseparator = "|"
         self.host = _("Host")
-        self.dbase = _("Databse")
-        self.user_dbase = _("User Database")
+        self.dbase = _("Database")
+        self.user_dbase = _("User database")
     
     def load_interface (self,gevice):
         glade_file = gtk.glade.XML (os.path.join (config.GLADEDIR, "gevice.glade"),"window_prefer",None)
@@ -98,7 +98,7 @@ class GevicePrefer:
         self.create_color_selection_dialog(_("Select background color"),entry)
         
     def on_button_foreground_clicked (self,button,entry):
-        self.create_color_selection_dialog(_("Select foreground color"),entry)
+        self.create_color_selection_dialog(_("Select text color"),entry)
 
     def create_color_selection_dialog (self,title,entry):
         colord = gtk.ColorSelectionDialog(title)



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