soylent r185 - tags/SOYLENT_0_1_6/data



Author: treitter
Date: Sun Jun 29 05:47:45 2008
New Revision: 185
URL: http://svn.gnome.org/viewvc/soylent?rev=185&view=rev

Log:
back-port the copyright notices in the About dialog to 0.1.6

Modified:
   tags/SOYLENT_0_1_6/data/soylent.glade

Modified: tags/SOYLENT_0_1_6/data/soylent.glade
==============================================================================
--- tags/SOYLENT_0_1_6/data/soylent.glade	(original)
+++ tags/SOYLENT_0_1_6/data/soylent.glade	Sun Jun 29 05:47:45 2008
@@ -1555,32 +1555,43 @@
                                                         <property name="n_rows">3</property>
                                                         <property name="n_columns">2</property>
                                                         <child>
-                                                          <widget class="GtkEntry" id="entry_person_mail_home_locality">
+                                                          <widget class="GtkLabel" id="label13">
                                                             <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="label" translatable="yes">Street</property>
                                                           </widget>
                                                           <packing>
-                                                            <property name="left_attach">1</property>
-                                                            <property name="right_attach">2</property>
-                                                            <property name="top_attach">2</property>
-                                                            <property name="bottom_attach">3</property>
+                                                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
                                                             <property name="y_options">GTK_FILL</property>
                                                             <property name="x_padding">2</property>
-                                                            <property name="y_padding">1</property>
+                                                            <property name="y_padding">2</property>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkEntry" id="entry_person_mail_home_po">
+                                                          <widget class="GtkLabel" id="label12">
                                                             <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="label" translatable="yes">PO Box</property>
                                                           </widget>
                                                           <packing>
-                                                            <property name="left_attach">1</property>
-                                                            <property name="right_attach">2</property>
                                                             <property name="top_attach">1</property>
                                                             <property name="bottom_attach">2</property>
+                                                            <property name="x_options">GTK_FILL</property>
+                                                            <property name="y_options">GTK_FILL</property>
+                                                            <property name="x_padding">2</property>
+                                                            <property name="y_padding">1</property>
+                                                          </packing>
+                                                        </child>
+                                                        <child>
+                                                          <widget class="GtkLabel" id="label11">
+                                                            <property name="visible">True</property>
+                                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                            <property name="label" translatable="yes">City</property>
+                                                          </widget>
+                                                          <packing>
+                                                            <property name="top_attach">2</property>
+                                                            <property name="bottom_attach">3</property>
+                                                            <property name="x_options">GTK_FILL</property>
                                                             <property name="y_options">GTK_FILL</property>
                                                             <property name="x_padding">2</property>
                                                             <property name="y_padding">1</property>
@@ -1612,46 +1623,35 @@
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="label11">
+                                                          <widget class="GtkEntry" id="entry_person_mail_home_po">
                                                             <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="label" translatable="yes">City</property>
-                                                          </widget>
-                                                          <packing>
-                                                            <property name="top_attach">2</property>
-                                                            <property name="bottom_attach">3</property>
-                                                            <property name="x_options">GTK_FILL</property>
-                                                            <property name="y_options">GTK_FILL</property>
-                                                            <property name="x_padding">2</property>
-                                                            <property name="y_padding">1</property>
-                                                          </packing>
-                                                        </child>
-                                                        <child>
-                                                          <widget class="GtkLabel" id="label12">
-                                                            <property name="visible">True</property>
-                                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                            <property name="label" translatable="yes">PO Box</property>
                                                           </widget>
                                                           <packing>
+                                                            <property name="left_attach">1</property>
+                                                            <property name="right_attach">2</property>
                                                             <property name="top_attach">1</property>
                                                             <property name="bottom_attach">2</property>
-                                                            <property name="x_options">GTK_FILL</property>
                                                             <property name="y_options">GTK_FILL</property>
                                                             <property name="x_padding">2</property>
                                                             <property name="y_padding">1</property>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="label13">
+                                                          <widget class="GtkEntry" id="entry_person_mail_home_locality">
                                                             <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="label" translatable="yes">Street</property>
                                                           </widget>
                                                           <packing>
-                                                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                                            <property name="left_attach">1</property>
+                                                            <property name="right_attach">2</property>
+                                                            <property name="top_attach">2</property>
+                                                            <property name="bottom_attach">3</property>
                                                             <property name="y_options">GTK_FILL</property>
                                                             <property name="x_padding">2</property>
-                                                            <property name="y_padding">2</property>
+                                                            <property name="y_padding">1</property>
                                                           </packing>
                                                         </child>
                                                       </widget>
@@ -1666,46 +1666,50 @@
                                                         <property name="n_rows">4</property>
                                                         <property name="n_columns">2</property>
                                                         <child>
-                                                          <widget class="GtkFixed" id="fixed12">
+                                                          <widget class="GtkLabel" id="label16">
                                                             <property name="visible">True</property>
                                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                            <property name="label" translatable="yes">Zip/Postal Code</property>
                                                           </widget>
                                                           <packing>
-                                                            <property name="left_attach">1</property>
-                                                            <property name="right_attach">2</property>
-                                                            <property name="top_attach">3</property>
-                                                            <property name="bottom_attach">4</property>
+                                                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                                            <property name="y_options">GTK_FILL</property>
+                                                            <property name="x_padding">2</property>
+                                                            <property name="y_padding">1</property>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkFixed" id="fixed13">
+                                                          <widget class="GtkLabel" id="label15">
                                                             <property name="visible">True</property>
                                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                            <property name="label" translatable="yes">State/Province</property>
                                                           </widget>
                                                           <packing>
-                                                            <property name="top_attach">3</property>
-                                                            <property name="bottom_attach">4</property>
+                                                            <property name="top_attach">1</property>
+                                                            <property name="bottom_attach">2</property>
                                                             <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                                            <property name="y_options">GTK_FILL</property>
+                                                            <property name="x_padding">2</property>
+                                                            <property name="y_padding">1</property>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkEntry" id="entry_person_mail_home_country">
+                                                          <widget class="GtkLabel" id="label14">
                                                             <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="label" translatable="yes">Country</property>
                                                           </widget>
                                                           <packing>
-                                                            <property name="left_attach">1</property>
-                                                            <property name="right_attach">2</property>
                                                             <property name="top_attach">2</property>
                                                             <property name="bottom_attach">3</property>
+                                                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
                                                             <property name="y_options">GTK_FILL</property>
                                                             <property name="x_padding">2</property>
                                                             <property name="y_padding">1</property>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkEntry" id="entry_person_mail_home_region">
+                                                          <widget class="GtkEntry" id="entry_person_mail_home_code">
                                                             <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>
@@ -1713,15 +1717,13 @@
                                                           <packing>
                                                             <property name="left_attach">1</property>
                                                             <property name="right_attach">2</property>
-                                                            <property name="top_attach">1</property>
-                                                            <property name="bottom_attach">2</property>
                                                             <property name="y_options">GTK_FILL</property>
                                                             <property name="x_padding">2</property>
                                                             <property name="y_padding">1</property>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkEntry" id="entry_person_mail_home_code">
+                                                          <widget class="GtkEntry" id="entry_person_mail_home_region">
                                                             <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>
@@ -1729,52 +1731,50 @@
                                                           <packing>
                                                             <property name="left_attach">1</property>
                                                             <property name="right_attach">2</property>
+                                                            <property name="top_attach">1</property>
+                                                            <property name="bottom_attach">2</property>
                                                             <property name="y_options">GTK_FILL</property>
                                                             <property name="x_padding">2</property>
                                                             <property name="y_padding">1</property>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="label14">
+                                                          <widget class="GtkEntry" id="entry_person_mail_home_country">
                                                             <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="label" translatable="yes">Country</property>
                                                           </widget>
                                                           <packing>
+                                                            <property name="left_attach">1</property>
+                                                            <property name="right_attach">2</property>
                                                             <property name="top_attach">2</property>
                                                             <property name="bottom_attach">3</property>
-                                                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
                                                             <property name="y_options">GTK_FILL</property>
                                                             <property name="x_padding">2</property>
                                                             <property name="y_padding">1</property>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="label15">
+                                                          <widget class="GtkFixed" id="fixed13">
                                                             <property name="visible">True</property>
                                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                            <property name="label" translatable="yes">State/Province</property>
                                                           </widget>
                                                           <packing>
-                                                            <property name="top_attach">1</property>
-                                                            <property name="bottom_attach">2</property>
+                                                            <property name="top_attach">3</property>
+                                                            <property name="bottom_attach">4</property>
                                                             <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                                                            <property name="y_options">GTK_FILL</property>
-                                                            <property name="x_padding">2</property>
-                                                            <property name="y_padding">1</property>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="label16">
+                                                          <widget class="GtkFixed" id="fixed12">
                                                             <property name="visible">True</property>
                                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                            <property name="label" translatable="yes">Zip/Postal Code</property>
                                                           </widget>
                                                           <packing>
-                                                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                                                            <property name="y_options">GTK_FILL</property>
-                                                            <property name="x_padding">2</property>
-                                                            <property name="y_padding">1</property>
+                                                            <property name="left_attach">1</property>
+                                                            <property name="right_attach">2</property>
+                                                            <property name="top_attach">3</property>
+                                                            <property name="bottom_attach">4</property>
                                                           </packing>
                                                         </child>
                                                       </widget>
@@ -1826,32 +1826,43 @@
                                                     <property name="n_rows">3</property>
                                                     <property name="n_columns">2</property>
                                                     <child>
-                                                      <widget class="GtkEntry" id="entry_person_mail_work_locality">
+                                                      <widget class="GtkLabel" id="label20">
                                                         <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="label" translatable="yes">Street</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="left_attach">1</property>
-                                                        <property name="right_attach">2</property>
-                                                        <property name="top_attach">2</property>
-                                                        <property name="bottom_attach">3</property>
+                                                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
-                                                        <property name="y_padding">1</property>
+                                                        <property name="y_padding">2</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkEntry" id="entry_person_mail_work_po">
+                                                      <widget class="GtkLabel" id="label19">
                                                         <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="label" translatable="yes">PO Box</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="left_attach">1</property>
-                                                        <property name="right_attach">2</property>
                                                         <property name="top_attach">1</property>
                                                         <property name="bottom_attach">2</property>
+                                                        <property name="x_options">GTK_FILL</property>
+                                                        <property name="y_options">GTK_FILL</property>
+                                                        <property name="x_padding">2</property>
+                                                        <property name="y_padding">1</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <widget class="GtkLabel" id="label18">
+                                                        <property name="visible">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="label" translatable="yes">City</property>
+                                                      </widget>
+                                                      <packing>
+                                                        <property name="top_attach">2</property>
+                                                        <property name="bottom_attach">3</property>
+                                                        <property name="x_options">GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
@@ -1883,46 +1894,35 @@
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkLabel" id="label18">
-                                                        <property name="visible">True</property>
-                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                        <property name="label" translatable="yes">City</property>
-                                                      </widget>
-                                                      <packing>
-                                                        <property name="top_attach">2</property>
-                                                        <property name="bottom_attach">3</property>
-                                                        <property name="x_options">GTK_FILL</property>
-                                                        <property name="y_options">GTK_FILL</property>
-                                                        <property name="x_padding">2</property>
-                                                        <property name="y_padding">1</property>
-                                                      </packing>
-                                                    </child>
-                                                    <child>
-                                                      <widget class="GtkLabel" id="label19">
+                                                      <widget class="GtkEntry" id="entry_person_mail_work_po">
                                                         <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="label" translatable="yes">PO Box</property>
                                                       </widget>
                                                       <packing>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
                                                         <property name="top_attach">1</property>
                                                         <property name="bottom_attach">2</property>
-                                                        <property name="x_options">GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkLabel" id="label20">
+                                                      <widget class="GtkEntry" id="entry_person_mail_work_locality">
                                                         <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="label" translatable="yes">Street</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
+                                                        <property name="top_attach">2</property>
+                                                        <property name="bottom_attach">3</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
-                                                        <property name="y_padding">2</property>
+                                                        <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                   </widget>
@@ -1937,46 +1937,50 @@
                                                     <property name="n_rows">4</property>
                                                     <property name="n_columns">2</property>
                                                     <child>
-                                                      <widget class="GtkFixed" id="fixed14">
+                                                      <widget class="GtkLabel" id="label23">
                                                         <property name="visible">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="label" translatable="yes">Zip/Postal Code</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="left_attach">1</property>
-                                                        <property name="right_attach">2</property>
-                                                        <property name="top_attach">3</property>
-                                                        <property name="bottom_attach">4</property>
+                                                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                                        <property name="y_options">GTK_FILL</property>
+                                                        <property name="x_padding">2</property>
+                                                        <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkFixed" id="fixed15">
+                                                      <widget class="GtkLabel" id="label22">
                                                         <property name="visible">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="label" translatable="yes">State/Province</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="top_attach">3</property>
-                                                        <property name="bottom_attach">4</property>
+                                                        <property name="top_attach">1</property>
+                                                        <property name="bottom_attach">2</property>
                                                         <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                                        <property name="y_options">GTK_FILL</property>
+                                                        <property name="x_padding">2</property>
+                                                        <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkEntry" id="entry_person_mail_work_country">
+                                                      <widget class="GtkLabel" id="label21">
                                                         <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="label" translatable="yes">Country</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="left_attach">1</property>
-                                                        <property name="right_attach">2</property>
                                                         <property name="top_attach">2</property>
                                                         <property name="bottom_attach">3</property>
+                                                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkEntry" id="entry_person_mail_work_region">
+                                                      <widget class="GtkEntry" id="entry_person_mail_work_code">
                                                         <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>
@@ -1984,15 +1988,13 @@
                                                       <packing>
                                                         <property name="left_attach">1</property>
                                                         <property name="right_attach">2</property>
-                                                        <property name="top_attach">1</property>
-                                                        <property name="bottom_attach">2</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkEntry" id="entry_person_mail_work_code">
+                                                      <widget class="GtkEntry" id="entry_person_mail_work_region">
                                                         <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>
@@ -2000,52 +2002,50 @@
                                                       <packing>
                                                         <property name="left_attach">1</property>
                                                         <property name="right_attach">2</property>
+                                                        <property name="top_attach">1</property>
+                                                        <property name="bottom_attach">2</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkLabel" id="label21">
+                                                      <widget class="GtkEntry" id="entry_person_mail_work_country">
                                                         <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="label" translatable="yes">Country</property>
                                                       </widget>
                                                       <packing>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
                                                         <property name="top_attach">2</property>
                                                         <property name="bottom_attach">3</property>
-                                                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkLabel" id="label22">
+                                                      <widget class="GtkFixed" id="fixed15">
                                                         <property name="visible">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                        <property name="label" translatable="yes">State/Province</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="top_attach">1</property>
-                                                        <property name="bottom_attach">2</property>
+                                                        <property name="top_attach">3</property>
+                                                        <property name="bottom_attach">4</property>
                                                         <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                                                        <property name="y_options">GTK_FILL</property>
-                                                        <property name="x_padding">2</property>
-                                                        <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkLabel" id="label23">
+                                                      <widget class="GtkFixed" id="fixed14">
                                                         <property name="visible">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                        <property name="label" translatable="yes">Zip/Postal Code</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                                                        <property name="y_options">GTK_FILL</property>
-                                                        <property name="x_padding">2</property>
-                                                        <property name="y_padding">1</property>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
+                                                        <property name="top_attach">3</property>
+                                                        <property name="bottom_attach">4</property>
                                                       </packing>
                                                     </child>
                                                   </widget>
@@ -2093,32 +2093,43 @@
                                                     <property name="n_rows">3</property>
                                                     <property name="n_columns">2</property>
                                                     <child>
-                                                      <widget class="GtkEntry" id="entry_person_mail_other_locality">
+                                                      <widget class="GtkLabel" id="label27">
+                                                        <property name="visible">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="label" translatable="yes">Street</property>
+                                                      </widget>
+                                                      <packing>
+                                                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                                        <property name="y_options">GTK_FILL</property>
+                                                        <property name="x_padding">2</property>
+                                                        <property name="y_padding">2</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <widget class="GtkLabel" id="label26">
                                                         <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="label" translatable="yes">PO Box</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="left_attach">1</property>
-                                                        <property name="right_attach">2</property>
-                                                        <property name="top_attach">2</property>
-                                                        <property name="bottom_attach">3</property>
+                                                        <property name="top_attach">1</property>
+                                                        <property name="bottom_attach">2</property>
+                                                        <property name="x_options">GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkEntry" id="entry_person_mail_other_po">
+                                                      <widget class="GtkLabel" id="label25">
                                                         <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="label" translatable="yes">City</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="left_attach">1</property>
-                                                        <property name="right_attach">2</property>
-                                                        <property name="top_attach">1</property>
-                                                        <property name="bottom_attach">2</property>
+                                                        <property name="top_attach">2</property>
+                                                        <property name="bottom_attach">3</property>
+                                                        <property name="x_options">GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
@@ -2150,46 +2161,35 @@
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkLabel" id="label25">
-                                                        <property name="visible">True</property>
-                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                        <property name="label" translatable="yes">City</property>
-                                                      </widget>
-                                                      <packing>
-                                                        <property name="top_attach">2</property>
-                                                        <property name="bottom_attach">3</property>
-                                                        <property name="x_options">GTK_FILL</property>
-                                                        <property name="y_options">GTK_FILL</property>
-                                                        <property name="x_padding">2</property>
-                                                        <property name="y_padding">1</property>
-                                                      </packing>
-                                                    </child>
-                                                    <child>
-                                                      <widget class="GtkLabel" id="label26">
+                                                      <widget class="GtkEntry" id="entry_person_mail_other_po">
                                                         <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="label" translatable="yes">PO Box</property>
                                                       </widget>
                                                       <packing>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
                                                         <property name="top_attach">1</property>
                                                         <property name="bottom_attach">2</property>
-                                                        <property name="x_options">GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkLabel" id="label27">
+                                                      <widget class="GtkEntry" id="entry_person_mail_other_locality">
                                                         <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="label" translatable="yes">Street</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
+                                                        <property name="top_attach">2</property>
+                                                        <property name="bottom_attach">3</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
-                                                        <property name="y_padding">2</property>
+                                                        <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                   </widget>
@@ -2204,46 +2204,50 @@
                                                     <property name="n_rows">4</property>
                                                     <property name="n_columns">2</property>
                                                     <child>
-                                                      <widget class="GtkFixed" id="fixed16">
+                                                      <widget class="GtkLabel" id="label30">
                                                         <property name="visible">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="label" translatable="yes">Zip/Postal Code</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="left_attach">1</property>
-                                                        <property name="right_attach">2</property>
-                                                        <property name="top_attach">3</property>
-                                                        <property name="bottom_attach">4</property>
+                                                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                                        <property name="y_options">GTK_FILL</property>
+                                                        <property name="x_padding">2</property>
+                                                        <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkFixed" id="fixed17">
+                                                      <widget class="GtkLabel" id="label29">
                                                         <property name="visible">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="label" translatable="yes">State/Province</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="top_attach">3</property>
-                                                        <property name="bottom_attach">4</property>
+                                                        <property name="top_attach">1</property>
+                                                        <property name="bottom_attach">2</property>
                                                         <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                                        <property name="y_options">GTK_FILL</property>
+                                                        <property name="x_padding">2</property>
+                                                        <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkEntry" id="entry_person_mail_other_country">
+                                                      <widget class="GtkLabel" id="label28">
                                                         <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="label" translatable="yes">Country</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="left_attach">1</property>
-                                                        <property name="right_attach">2</property>
                                                         <property name="top_attach">2</property>
                                                         <property name="bottom_attach">3</property>
+                                                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkEntry" id="entry_person_mail_other_region">
+                                                      <widget class="GtkEntry" id="entry_person_mail_other_code">
                                                         <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>
@@ -2251,15 +2255,13 @@
                                                       <packing>
                                                         <property name="left_attach">1</property>
                                                         <property name="right_attach">2</property>
-                                                        <property name="top_attach">1</property>
-                                                        <property name="bottom_attach">2</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkEntry" id="entry_person_mail_other_code">
+                                                      <widget class="GtkEntry" id="entry_person_mail_other_region">
                                                         <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>
@@ -2267,52 +2269,50 @@
                                                       <packing>
                                                         <property name="left_attach">1</property>
                                                         <property name="right_attach">2</property>
+                                                        <property name="top_attach">1</property>
+                                                        <property name="bottom_attach">2</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkLabel" id="label28">
+                                                      <widget class="GtkEntry" id="entry_person_mail_other_country">
                                                         <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="label" translatable="yes">Country</property>
                                                       </widget>
                                                       <packing>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
                                                         <property name="top_attach">2</property>
                                                         <property name="bottom_attach">3</property>
-                                                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">2</property>
                                                         <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkLabel" id="label29">
+                                                      <widget class="GtkFixed" id="fixed17">
                                                         <property name="visible">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                        <property name="label" translatable="yes">State/Province</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="top_attach">1</property>
-                                                        <property name="bottom_attach">2</property>
+                                                        <property name="top_attach">3</property>
+                                                        <property name="bottom_attach">4</property>
                                                         <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                                                        <property name="y_options">GTK_FILL</property>
-                                                        <property name="x_padding">2</property>
-                                                        <property name="y_padding">1</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <widget class="GtkLabel" id="label30">
+                                                      <widget class="GtkFixed" id="fixed16">
                                                         <property name="visible">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                        <property name="label" translatable="yes">Zip/Postal Code</property>
                                                       </widget>
                                                       <packing>
-                                                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                                                        <property name="y_options">GTK_FILL</property>
-                                                        <property name="x_padding">2</property>
-                                                        <property name="y_padding">1</property>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
+                                                        <property name="top_attach">3</property>
+                                                        <property name="bottom_attach">4</property>
                                                       </packing>
                                                     </child>
                                                   </widget>
@@ -2566,32 +2566,43 @@
                                         <property name="n_rows">3</property>
                                         <property name="n_columns">2</property>
                                         <child>
-                                          <widget class="GtkEntry" id="entry_person_mail_add_locality">
+                                          <widget class="GtkLabel" id="label33">
                                             <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="label" translatable="yes">Street</property>
                                           </widget>
                                           <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
-                                            <property name="top_attach">2</property>
-                                            <property name="bottom_attach">3</property>
+                                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
                                             <property name="y_options">GTK_FILL</property>
                                             <property name="x_padding">2</property>
-                                            <property name="y_padding">1</property>
+                                            <property name="y_padding">2</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkEntry" id="entry_person_mail_add_po">
+                                          <widget class="GtkLabel" id="label34">
                                             <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="label" translatable="yes">PO Box</property>
                                           </widget>
                                           <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
                                             <property name="top_attach">1</property>
                                             <property name="bottom_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options">GTK_FILL</property>
+                                            <property name="x_padding">2</property>
+                                            <property name="y_padding">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkLabel" id="label35">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="label" translatable="yes">City</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="x_options">GTK_FILL</property>
                                             <property name="y_options">GTK_FILL</property>
                                             <property name="x_padding">2</property>
                                             <property name="y_padding">1</property>
@@ -2623,46 +2634,35 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label35">
-                                            <property name="visible">True</property>
-                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="label" translatable="yes">City</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="top_attach">2</property>
-                                            <property name="bottom_attach">3</property>
-                                            <property name="x_options">GTK_FILL</property>
-                                            <property name="y_options">GTK_FILL</property>
-                                            <property name="x_padding">2</property>
-                                            <property name="y_padding">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <widget class="GtkLabel" id="label34">
+                                          <widget class="GtkEntry" id="entry_person_mail_add_po">
                                             <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="label" translatable="yes">PO Box</property>
                                           </widget>
                                           <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
                                             <property name="top_attach">1</property>
                                             <property name="bottom_attach">2</property>
-                                            <property name="x_options">GTK_FILL</property>
                                             <property name="y_options">GTK_FILL</property>
                                             <property name="x_padding">2</property>
                                             <property name="y_padding">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label33">
+                                          <widget class="GtkEntry" id="entry_person_mail_add_locality">
                                             <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="label" translatable="yes">Street</property>
                                           </widget>
                                           <packing>
-                                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
                                             <property name="y_options">GTK_FILL</property>
                                             <property name="x_padding">2</property>
-                                            <property name="y_padding">2</property>
+                                            <property name="y_padding">1</property>
                                           </packing>
                                         </child>
                                       </widget>
@@ -2677,46 +2677,50 @@
                                         <property name="n_rows">4</property>
                                         <property name="n_columns">2</property>
                                         <child>
-                                          <widget class="GtkFixed" id="fixed24">
+                                          <widget class="GtkLabel" id="label36">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="label" translatable="yes">Zip/Postal Code</property>
                                           </widget>
                                           <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
-                                            <property name="top_attach">3</property>
-                                            <property name="bottom_attach">4</property>
+                                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                            <property name="y_options">GTK_FILL</property>
+                                            <property name="x_padding">2</property>
+                                            <property name="y_padding">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkFixed" id="fixed23">
+                                          <widget class="GtkLabel" id="label37">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="label" translatable="yes">State/Province</property>
                                           </widget>
                                           <packing>
-                                            <property name="top_attach">3</property>
-                                            <property name="bottom_attach">4</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
                                             <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                            <property name="y_options">GTK_FILL</property>
+                                            <property name="x_padding">2</property>
+                                            <property name="y_padding">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkEntry" id="entry_person_mail_add_country">
+                                          <widget class="GtkLabel" id="label38">
                                             <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="label" translatable="yes">Country</property>
                                           </widget>
                                           <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
                                             <property name="top_attach">2</property>
                                             <property name="bottom_attach">3</property>
+                                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
                                             <property name="y_options">GTK_FILL</property>
                                             <property name="x_padding">2</property>
                                             <property name="y_padding">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkEntry" id="entry_person_mail_add_region">
+                                          <widget class="GtkEntry" id="entry_person_mail_add_code">
                                             <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>
@@ -2724,15 +2728,13 @@
                                           <packing>
                                             <property name="left_attach">1</property>
                                             <property name="right_attach">2</property>
-                                            <property name="top_attach">1</property>
-                                            <property name="bottom_attach">2</property>
                                             <property name="y_options">GTK_FILL</property>
                                             <property name="x_padding">2</property>
                                             <property name="y_padding">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkEntry" id="entry_person_mail_add_code">
+                                          <widget class="GtkEntry" id="entry_person_mail_add_region">
                                             <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>
@@ -2740,52 +2742,50 @@
                                           <packing>
                                             <property name="left_attach">1</property>
                                             <property name="right_attach">2</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
                                             <property name="y_options">GTK_FILL</property>
                                             <property name="x_padding">2</property>
                                             <property name="y_padding">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label38">
+                                          <widget class="GtkEntry" id="entry_person_mail_add_country">
                                             <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="label" translatable="yes">Country</property>
                                           </widget>
                                           <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
                                             <property name="top_attach">2</property>
                                             <property name="bottom_attach">3</property>
-                                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
                                             <property name="y_options">GTK_FILL</property>
                                             <property name="x_padding">2</property>
                                             <property name="y_padding">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label37">
+                                          <widget class="GtkFixed" id="fixed23">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="label" translatable="yes">State/Province</property>
                                           </widget>
                                           <packing>
-                                            <property name="top_attach">1</property>
-                                            <property name="bottom_attach">2</property>
+                                            <property name="top_attach">3</property>
+                                            <property name="bottom_attach">4</property>
                                             <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                                            <property name="y_options">GTK_FILL</property>
-                                            <property name="x_padding">2</property>
-                                            <property name="y_padding">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label36">
+                                          <widget class="GtkFixed" id="fixed24">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="label" translatable="yes">Zip/Postal Code</property>
                                           </widget>
                                           <packing>
-                                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                                            <property name="y_options">GTK_FILL</property>
-                                            <property name="x_padding">2</property>
-                                            <property name="y_padding">1</property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">3</property>
+                                            <property name="bottom_attach">4</property>
                                           </packing>
                                         </child>
                                       </widget>
@@ -2991,7 +2991,9 @@
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
     <property name="has_separator">False</property>
     <property name="program_name">Soylent</property>
-    <property name="copyright" translatable="yes">Copyright  2007-2008 Travis Reitter</property>
+    <property name="copyright" translatable="yes">Copyright  2007-2008 Travis Reitter
+Copyright  2007-2008 Chris Lord
+Copyright  2007-2008 Rob Taylor</property>
     <property name="comments" translatable="yes">Interact with people!</property>
     <property name="website">http://live.gnome.org/Soylent</property>
     <property name="website_label" translatable="yes">http://live.gnome.org/Soylent</property>



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