Index: addressbook/gui/contact-editor/e-contact-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/e-contact-editor.c,v
retrieving revision 1.242
diff -u -p -r1.242 e-contact-editor.c
--- addressbook/gui/contact-editor/e-contact-editor.c	24 Aug 2005 03:06:50 -0000	1.242
+++ addressbook/gui/contact-editor/e-contact-editor.c	8 Sep 2005 07:13:02 -0000
@@ -40,6 +40,7 @@
 #include <libgnome/gnome-help.h>
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdkkeysyms.h>
 #include <libedataserverui/e-categories-dialog.h>
 #include <misc/e-gui-utils.h>
 #include <text/e-entry.h>
@@ -170,8 +171,8 @@ static EContactField address_labels [] =
 };
 
 static gchar *address_name [] = {
-	"work",
 	"home",
+	"work",
 	"other"
 };
 
@@ -1639,12 +1640,34 @@ sensitize_im (EContactEditor *editor)
 	}
 }
 
+static gint
+entry_key_press (GtkWidget *widget, GdkEventKey *event, GtkWidget *next)
+{
+	g_return_val_if_fail (widget != NULL, FALSE);
+	g_return_val_if_fail (event != NULL, FALSE);
+	printf("Inside textview_key_press\n") ;
+	
+	if(event->keyval == GDK_Tab) {
+		gtk_widget_grab_focus (next);
+		gtk_signal_emit_stop_by_name (GTK_OBJECT (widget), "key_press_event");
+		return TRUE;
+	}
+	return FALSE;
+}
+
+static void
+textview_grab_focus(GtkWidget *widget, GdkEventFocus *event)
+{
+	printf("textview grab focus\n");
+}
+
 static void
 init_address_textview (EContactEditor *editor, gint record)
 {
 	gchar         *textview_name;
 	GtkWidget     *textview;
 	GtkTextBuffer *text_buffer;
+	GtkWidget *next;
 
 	textview_name = g_strdup_printf ("textview-%s-address", address_name [record]);
 	textview = glade_xml_get_widget (editor->gui, textview_name);
@@ -1652,6 +1675,310 @@ init_address_textview (EContactEditor *e
 
 	text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview));
 	g_signal_connect (text_buffer, "changed", G_CALLBACK (object_changed), editor);
+	switch (record) {
+		case 0:
+			next = glade_xml_get_widget (editor->gui, "entry-home-city");
+			gtk_signal_connect (GTK_OBJECT (textview), "key_press_event", 
+					GTK_SIGNAL_FUNC (entry_key_press), next);
+			gtk_signal_connect (GTK_OBJECT (textview), "grab_focus",
+					GTK_SIGNAL_FUNC (textview_grab_focus), NULL) ;
+			break;
+		case 1:
+			next = glade_xml_get_widget (editor->gui, "entry-work-city");
+			gtk_signal_connect (GTK_OBJECT (textview), "key_press_event", 
+					GTK_SIGNAL_FUNC (entry_key_press), next);
+			break;
+		case 2:
+			next = glade_xml_get_widget (editor->gui, "entry-other-city");
+			gtk_signal_connect (GTK_OBJECT (textview), "key_press_event", 
+					GTK_SIGNAL_FUNC (entry_key_press), next);
+			break;
+	}
+					
+}
+
+static char * countries [] = {
+	N_(""),
+	N_("India"),
+	N_("Afghanistan"),
+	N_("Albania"),
+	N_("Algeria"),
+	N_("American Samoa"),
+	N_("Andorra"),
+	N_("Angola"),
+	N_("Anguilla"),
+	N_("Antarctica"),
+	N_("Antigua And Barbuda"),
+	N_("Argentina"),
+	N_("Armenia"),
+	N_("Aruba"),
+	N_("Australia"),
+	N_("Austria"),
+	N_("Azerbaijan"),
+	N_("Bahamas"),
+	N_("Bahrain"),
+	N_("Bangladesh"),
+	N_("Barbados"),
+	N_("Belarus"),
+	N_("Belgium"),
+	N_("Belize"),
+	N_("Benin"),
+	N_("Bermuda"),
+	N_("Bhutan"),
+	N_("Bolivia"),
+	N_("Bosnia And Herzegowina"),
+	N_("Botswana"),
+	N_("Bouvet Island"),
+	N_("Brazil"),
+	N_("British Indian Ocean Territory"),
+	N_("Brunei Darussalam"),
+	N_("Bulgaria"),
+	N_("Burkina Faso"),
+	N_("Burundi"),
+	N_("Cambodia"),
+	N_("Cameroon"),
+	N_("Canada"),
+	N_("Cape Verde"),
+	N_("Cayman Islands"),
+	N_("Central African Republic"),
+	N_("Chad"),
+	N_("Chile"),
+	N_("China"),
+	N_("Christmas Island"),
+	N_("Cocos (Keeling) Islands"),
+	N_("Colombia"),
+	N_("Comoros"),
+	N_("Congo"),
+	N_("Congo, The Democratic Republic Of The"),
+	N_("Cook Islands"),
+	N_("Costa Rica"),
+	N_("Cote d'Ivoire"),
+	N_("Croatia"),
+	N_("Cuba"),
+	N_("Cyprus"),
+	N_("Czech Republic"),
+	N_("Denmark"),
+	N_("Djibouti"),
+	N_("Dominica"),
+	N_("Dominican Republic"),
+	N_("Ecuador"),
+	N_("Egypt"),
+	N_("El Salvador"),
+	N_("Equatorial Guinea"),
+	N_("Eritrea"),
+	N_("Estonia"),
+	N_("Ethiopia"),
+	N_("Falkland Islands"),
+	N_("Faroe Islands"),
+	N_("Fiji"),
+	N_("Finland"),
+	N_("France"),
+	N_("French Guiana"),
+	N_("French Polynesia"),
+	N_("French Southern Territories"),
+	N_("Gabon"),
+	N_("Gambia"),
+	N_("Georgia"),
+	N_("Germany"),
+	N_("Ghana"),
+	N_("Gibraltar"),
+	N_("Greece"),
+	N_("Greenland"),
+	N_("Grenada"),
+	N_("Guadeloupe"),
+	N_("Guam"),
+	N_("Guatemala"),
+	N_("Guernsey"),
+	N_("Guinea"),
+	N_("Guinea-bissau"),
+	N_("Guyana"),
+	N_("Haiti"),
+	N_("Heard And McDonald Islands"),
+	N_("Holy See"),
+	N_("Honduras"),
+	N_("Hong Kong"),
+	N_("Hungary"),
+	N_("Iceland"),
+	N_("Indonesia"),
+	N_("Iran"),
+	N_("Iraq"),
+	N_("Ireland"),
+	N_("Isle of Man"),
+	N_("Israel"),
+	N_("Italy"),
+	N_("Jamaica"),
+	N_("Japan"),
+	N_("Jersey"),
+	N_("Jordan"),
+	N_("Kazakhstan"),
+	N_("Kenya"),
+	N_("Kiribati"),
+	N_("Korea, Democratic People's Republic Of"),
+	N_("Korea, Republic Of"),
+	N_("Kuwait"),
+	N_("Kyrgyzstan"),
+	N_("Laos"),
+	N_("Latvia"),
+	N_("Lebanon"),
+	N_("Lesotho"),
+	N_("Liberia"),
+	N_("Libya"),
+	N_("Liechtenstein"),
+	N_("Lithuania"),
+	N_("Luxembourg"),
+	N_("Macao"),
+	N_("Macedonia"),
+	N_("Madagascar"),
+	N_("Malawi"),
+	N_("Malaysia"),
+	N_("Maldives"),
+	N_("Mali"),
+	N_("Malta"),
+	N_("Marshall Islands"),
+	N_("Martinique"),
+	N_("Mauritania"),
+	N_("Mauritius"),
+	N_("Mayotte"),
+	N_("Mexico"),
+	N_("Micronesia"),
+	N_("Moldova, Republic Of"),
+	N_("Monaco"),
+	N_("Mongolia"),
+	N_("Montserrat"),
+	N_("Morocco"),
+	N_("Mozambique"),
+	N_("Myanmar"),
+	N_("Namibia"),
+	N_("Nauru"),
+	N_("Nepal"),
+	N_("Netherlands"),
+	N_("Netherlands Antilles"),
+	N_("New Caledonia"),
+	N_("New Zealand"),
+	N_("Nicaragua"),
+	N_("Niger"),
+	N_("Nigeria"),
+	N_("Niue"),
+	N_("Norfolk Island"),
+	N_("Northern Mariana Islands"),
+	N_("Norway"),
+	N_("Oman"),
+	N_("Pakistan"),
+	N_("Palau"),
+	N_("Palestinian Territory"),
+	N_("Panama"),
+	N_("Papua New Guinea"),
+	N_("Paraguay"),
+	N_("Peru"),
+	N_("Philippines"),
+	N_("Pitcairn"),
+	N_("Poland"),
+	N_("Portugal"),
+	N_("Puerto Rico"),
+	N_("Qatar"),
+	N_("Reunion"),
+	N_("Romania"),
+	N_("Russian Federation"),
+	N_("Rwanda"),
+	N_("Saint Kitts And Nevis"),
+	N_("Saint Lucia"),
+	N_("Saint Vincent And The Grenadines"),
+	N_("Samoa"),
+	N_("San Marino"),
+	N_("Sao Tome And Principe"),
+	N_("Saudi Arabia"),
+	N_("Senegal"),
+	N_("Serbia And Montenegro"),
+	N_("Seychelles"),
+	N_("Sierra Leone"),
+	N_("Singapore"),
+	N_("Slovakia"),
+	N_("Slovenia"),
+	N_("Solomon Islands"),
+	N_("Somalia"),
+	N_("South Africa"),
+	N_("South Georgia And The South Sandwich Islands"),
+	N_("Spain"),
+	N_("Sri Lanka"),
+	N_("St. Helena"),
+	N_("St. Pierre And Miquelon"),
+	N_("Sudan"),
+	N_("Suriname"),
+	N_("Svalbard And Jan Mayen Islands"),
+	N_("Swaziland"),
+	N_("Sweden"),
+	N_("Switzerland"),
+	N_("Syria"),
+	N_("Taiwan"),
+	N_("Tajikistan"),
+	N_("Tanzania, United Republic Of"),
+	N_("Thailand"),
+	N_("Timor-Leste"),
+	N_("Togo"),
+	N_("Tokelau"),
+	N_("Tonga"),
+	N_("Trinidad And Tobago"),
+	N_("Tunisia"),
+	N_("Turkey"),
+	N_("Turkmenistan"),
+	N_("Turks And Caicos Islands"),
+	N_("Tuvalu"),
+	N_("Uganda"),
+	N_("Ukraine"),
+	N_("United Arab Emirates"),
+	N_("United Kingdom"),
+	N_("United States"),
+	N_("United States Minor Outlying Islands"),
+	N_("Uruguay"),
+	N_("Uzbekistan"),
+	N_("Vanuatu"),
+	N_("Venezuela"),
+	N_("Viet Nam"),
+	N_("Virgin Islands, British"),
+	N_("Virgin Islands, U.S."),
+	N_("Wallis And Futuna Islands"),
+	N_("Western Sahara"),
+	N_("Yemen"),
+	N_("Zambia"),
+	N_("Zimbabwe"),
+	NULL
+};
+
+static int
+compare_func (const void *voida, const void *voidb)
+{
+	char * const *stringa = voida, * const *stringb = voidb;
+
+	return strcoll (*stringa, *stringb);
+}
+
+static void
+fill_in_countries (EContactEditor *editor, const gchar *combo_name)
+{
+	GtkCombo *combo;
+	combo = (GtkCombo *) glade_xml_get_widget(editor->gui, combo_name);
+	if (combo && GTK_IS_COMBO (combo)) {
+		static gboolean sorted = FALSE;
+		static GList *country_list;
+		if (!sorted) {
+			int i;
+			char *locale;
+
+			for (i = 0; countries[i]; i++) {
+				countries[i] = _(countries[i]);
+			}
+
+			locale = setlocale (LC_COLLATE, NULL);
+			qsort (countries + 1, i - 1, sizeof (countries[0]), compare_func);
+			country_list = NULL;
+			for (i = 0; countries[i]; i++) {
+				country_list = g_list_prepend (country_list, countries[i]);
+			}
+			country_list = g_list_reverse (country_list);
+			sorted = TRUE;
+		}
+		gtk_combo_set_popdown_strings (combo, country_list);
+	}
 }
 
 static void
@@ -1659,11 +1986,36 @@ init_address_field (EContactEditor *edit
 {
 	gchar     *entry_name;
 	GtkWidget *entry;
+	GtkWidget *next;
+	gchar     *combo_name;
 
 	entry_name = g_strdup_printf ("entry-%s-%s", address_name [record], widget_field_name);
 	entry = glade_xml_get_widget (editor->gui, entry_name);
 	g_free (entry_name);
 
+	if(!strcmp(widget_field_name, "country")) {
+		combo_name = g_strdup_printf ("combo-%s-%s", address_name [record], widget_field_name);
+		fill_in_countries(editor, combo_name);
+		g_free(combo_name);
+		switch (record) {
+			case 0:
+				next = glade_xml_get_widget (editor->gui, "textview-work-address");
+				gtk_signal_connect (GTK_OBJECT (entry), "key_press_event", 
+						GTK_SIGNAL_FUNC (entry_key_press), next);
+				break;
+			case 1:
+				next = glade_xml_get_widget (editor->gui, "textview-other-address");
+				gtk_signal_connect (GTK_OBJECT (entry), "key_press_event", 
+						GTK_SIGNAL_FUNC (entry_key_press), next);
+				break;
+			case 2:
+				next = glade_xml_get_widget (editor->gui, "button-help");
+				gtk_signal_connect (GTK_OBJECT (entry), "key_press_event", 
+						GTK_SIGNAL_FUNC (entry_key_press), next);
+				break;
+		}
+	}
+
 	g_signal_connect (entry, "changed", G_CALLBACK (object_changed), editor);
 	g_signal_connect_swapped (entry, "activate", G_CALLBACK (entry_activated), editor);
 }
@@ -1673,10 +2025,55 @@ init_address_record (EContactEditor *edi
 {
 	init_address_textview (editor, record);
 	init_address_field (editor, record, "city");
-	init_address_field (editor, record, "state");
 	init_address_field (editor, record, "zip");
-	init_address_field (editor, record, "country");
+	init_address_field (editor, record, "state");
 	init_address_field (editor, record, "pobox");
+	init_address_field (editor, record, "country");
+}
+
+static GList *
+add_to_tab_order(GList *list, GladeXML *gui, char *name)
+{
+	GtkWidget *widget = glade_xml_get_widget(gui, name);
+	return g_list_prepend(list, widget);
+}
+
+
+static void
+setup_address_tab_order(EContactEditor *editor, gint record)
+{
+	GtkWidget *container;
+	GList *list = NULL;
+	gchar *table_name;
+	gchar *entry_name;
+
+	table_name = g_strdup_printf ("table-%s-address", address_name [record]);
+	container = glade_xml_get_widget(editor->gui, table_name);
+	g_free(table_name);
+
+	if (container) {
+		entry_name = g_strdup_printf("textview-%s-address", address_name[record]);
+		list = add_to_tab_order(list, editor->gui, entry_name);
+		g_free(entry_name);
+		entry_name = g_strdup_printf("entry-%s-city", address_name[record]);
+		list = add_to_tab_order(list, editor->gui, entry_name);
+		g_free(entry_name);
+		entry_name = g_strdup_printf("entry-%s-zip", address_name[record]);
+		list = add_to_tab_order(list, editor->gui, entry_name);
+		g_free(entry_name);
+		entry_name = g_strdup_printf("entry-%s-state", address_name[record]);
+		list = add_to_tab_order(list, editor->gui, entry_name);
+		g_free(entry_name);
+		entry_name = g_strdup_printf("entry-%s-pobox", address_name[record]);
+		list = add_to_tab_order(list, editor->gui, entry_name);
+		g_free(entry_name);
+		entry_name = g_strdup_printf("entry-%s-country", address_name[record]);
+		list = add_to_tab_order(list, editor->gui, entry_name);
+		g_free(entry_name);
+		list = g_list_reverse(list);
+		e_container_change_tab_order(GTK_CONTAINER(container), list);
+		g_list_free(list);
+	}
 }
 
 static void
@@ -1684,8 +2081,10 @@ init_address (EContactEditor *editor)
 {
 	gint i;
 
-	for (i = 0; i < ADDRESS_SLOTS; i++)
+	for (i = 0; i < ADDRESS_SLOTS; i++) {
 		init_address_record (editor, i);
+		setup_address_tab_order(editor, i) ;
+	}
 }
 
 static void
@@ -3078,43 +3477,6 @@ show_help_cb (GtkWidget *widget, gpointe
 		g_warning ("%s", error->message);
 }
 
-static GList *
-add_to_tab_order(GList *list, GladeXML *gui, char *name)
-{
-	GtkWidget *widget = glade_xml_get_widget(gui, name);
-	return g_list_prepend(list, widget);
-}
-
-static void
-setup_tab_order(GladeXML *gui)
-{
-	GtkWidget *container;
-	GList *list = NULL;
-
-	container = glade_xml_get_widget(gui, "table-contact-editor-general");
-
-	if (container) {
-		list = add_to_tab_order(list, gui, "entry-fullname");
-		list = add_to_tab_order(list, gui, "entry-jobtitle");
-		list = add_to_tab_order(list, gui, "entry-company");
-		list = add_to_tab_order(list, gui, "combo-file-as");
-		list = add_to_tab_order(list, gui, "entry-phone-1");
-		list = add_to_tab_order(list, gui, "entry-phone-2");
-		list = add_to_tab_order(list, gui, "entry-phone-3");
-		list = add_to_tab_order(list, gui, "entry-phone-4");
-
-		list = add_to_tab_order(list, gui, "entry-email1");
-		list = add_to_tab_order(list, gui, "alignment-htmlmail");
-		list = add_to_tab_order(list, gui, "entry-web");
-		list = add_to_tab_order(list, gui, "entry-homepage");
-		list = add_to_tab_order(list, gui, "button-fulladdr");
-		list = add_to_tab_order(list, gui, "text-address");
-		list = g_list_reverse(list);
-		e_container_change_tab_order(GTK_CONTAINER(container), list);
-		g_list_free(list);
-	}
-}
-
 static void
 expand_phone_toggle (EContactEditor *ce)
 {
@@ -3125,6 +3487,19 @@ expand_phone_toggle (EContactEditor *ce)
 }
 
 static void
+notebook_page_switch(GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, EContactEditor *editor)
+{
+	GtkWidget *widget;
+	if (page_num == 2) {
+		widget = glade_xml_get_widget (editor->gui, "textview-home-address");
+		if (widget) {
+			gtk_widget_grab_focus(widget);
+		}
+		gtk_signal_emit_stop_by_name (GTK_OBJECT (notebook), "switch_page");
+	}
+}
+
+static void
 e_contact_editor_init (EContactEditor *e_contact_editor)
 {
 	GladeXML *gui;
@@ -3145,7 +3520,6 @@ e_contact_editor_init (EContactEditor *e
 	gui = glade_xml_new (EVOLUTION_GLADEDIR "/contact-editor.glade", NULL, NULL);
 	e_contact_editor->gui = gui;
 
-	setup_tab_order(gui);
 
 	e_contact_editor->app = glade_xml_get_widget (gui, "contact editor");
 	widget = e_contact_editor->app;
@@ -3176,10 +3550,13 @@ e_contact_editor_init (EContactEditor *e
 	g_signal_connect (widget, "clicked", G_CALLBACK (show_help_cb), e_contact_editor);
 	widget = glade_xml_get_widget (e_contact_editor->gui, "button-phone-expand");
 	g_signal_connect_swapped (widget, "clicked", G_CALLBACK (expand_phone_toggle), e_contact_editor);
-
+	
 	widget = glade_xml_get_widget (e_contact_editor->gui, "entry-fullname");
 	if (widget)
 		gtk_widget_grab_focus (widget);
+
+	widget = glade_xml_get_widget (e_contact_editor->gui, "notebook11");
+	gtk_signal_connect_after (GTK_OBJECT(widget), "switch-page", GTK_SIGNAL_FUNC (notebook_page_switch), e_contact_editor);
 
 	/* Connect to the deletion of the dialog */
 
Index: addressbook/gui/contact-editor/contact-editor.glade
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/contact-editor.glade,v
retrieving revision 1.72
diff -u -p -r1.72 contact-editor.glade
--- addressbook/gui/contact-editor/contact-editor.glade	12 May 2005 04:13:46 -0000	1.72
+++ addressbook/gui/contact-editor/contact-editor.glade	8 Sep 2005 07:13:19 -0000
@@ -15,6 +15,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
@@ -151,6 +152,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">entry-nickname</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">2</property>
@@ -171,7 +176,7 @@
 			  <property name="max_length">0</property>
 			  <property name="text" translatable="yes"></property>
 			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
 			  <accessibility>
 			    <atkrelation target="button-fullname" type="labelled-by"/>
@@ -200,6 +205,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">entry-file-as</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -224,6 +233,10 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">2</property>
@@ -263,7 +276,7 @@
 			  <property name="max_length">0</property>
 			  <property name="text" translatable="yes"></property>
 			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
 			  <accessibility>
 			    <atkrelation target="button-categories" type="labelled-by"/>
@@ -287,7 +300,7 @@
 			  <property name="max_length">0</property>
 			  <property name="text" translatable="yes"></property>
 			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
 			</widget>
 			<packing>
@@ -320,7 +333,7 @@
 			      <property name="max_length">0</property>
 			      <property name="text" translatable="yes"></property>
 			      <property name="has_frame">True</property>
-			      <property name="invisible_char" translatable="yes">*</property>
+			      <property name="invisible_char">*</property>
 			      <property name="activates_default">False</property>
 			    </widget>
 			  </child>
@@ -513,7 +526,7 @@
 			      <property name="max_length">0</property>
 			      <property name="text" translatable="yes"></property>
 			      <property name="has_frame">True</property>
-			      <property name="invisible_char" translatable="yes">*</property>
+			      <property name="invisible_char">*</property>
 			      <property name="activates_default">False</property>
 			      <accessibility>
 				<atkrelation target="optionmenu-email-2" type="labelled-by"/>
@@ -615,7 +628,7 @@
 			      <property name="max_length">0</property>
 			      <property name="text" translatable="yes"></property>
 			      <property name="has_frame">True</property>
-			      <property name="invisible_char" translatable="yes">*</property>
+			      <property name="invisible_char">*</property>
 			      <property name="activates_default">False</property>
 			      <accessibility>
 				<atkrelation target="optionmenu-email-1" type="labelled-by"/>
@@ -639,7 +652,7 @@
 			      <property name="max_length">0</property>
 			      <property name="text" translatable="yes"></property>
 			      <property name="has_frame">True</property>
-			      <property name="invisible_char" translatable="yes">*</property>
+			      <property name="invisible_char">*</property>
 			      <property name="activates_default">False</property>
 			      <accessibility>
 				<atkrelation target="optionmenu-email-3" type="labelled-by"/>
@@ -663,7 +676,7 @@
 			      <property name="max_length">0</property>
 			      <property name="text" translatable="yes"></property>
 			      <property name="has_frame">True</property>
-			      <property name="invisible_char" translatable="yes">*</property>
+			      <property name="invisible_char">*</property>
 			      <property name="activates_default">False</property>
 			      <accessibility>
 				<atkrelation target="optionmenu-email-4" type="labelled-by"/>
@@ -715,6 +728,10 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="type">label_item</property>
@@ -766,7 +783,7 @@
 				      <property name="max_length">0</property>
 				      <property name="text" translatable="yes"></property>
 				      <property name="has_frame">True</property>
-				      <property name="invisible_char" translatable="yes">*</property>
+				      <property name="invisible_char">*</property>
 				      <property name="activates_default">False</property>
 				      <accessibility>
 					<atkrelation target="optionmenu-phone-1" type="labelled-by"/>
@@ -790,7 +807,7 @@
 				      <property name="max_length">0</property>
 				      <property name="text" translatable="yes"></property>
 				      <property name="has_frame">True</property>
-				      <property name="invisible_char" translatable="yes">*</property>
+				      <property name="invisible_char">*</property>
 				      <property name="activates_default">False</property>
 				      <accessibility>
 					<atkrelation target="optionmenu-phone-2" type="labelled-by"/>
@@ -814,7 +831,7 @@
 				      <property name="max_length">0</property>
 				      <property name="text" translatable="yes"></property>
 				      <property name="has_frame">True</property>
-				      <property name="invisible_char" translatable="yes">*</property>
+				      <property name="invisible_char">*</property>
 				      <property name="activates_default">False</property>
 				      <accessibility>
 					<atkrelation target="optionmenu-phone-4" type="labelled-by"/>
@@ -838,7 +855,7 @@
 				      <property name="max_length">0</property>
 				      <property name="text" translatable="yes"></property>
 				      <property name="has_frame">True</property>
-				      <property name="invisible_char" translatable="yes">*</property>
+				      <property name="invisible_char">*</property>
 				      <property name="activates_default">False</property>
 				      <accessibility>
 					<atkrelation target="optionmenu-phone-3" type="labelled-by"/>
@@ -1111,7 +1128,7 @@
 				      <property name="max_length">0</property>
 				      <property name="text" translatable="yes"></property>
 				      <property name="has_frame">True</property>
-				      <property name="invisible_char" translatable="yes">*</property>
+				      <property name="invisible_char">*</property>
 				      <property name="activates_default">False</property>
 				      <accessibility>
 					<atkrelation target="optionmenu-phone-5" type="labelled-by"/>
@@ -1135,7 +1152,7 @@
 				      <property name="max_length">0</property>
 				      <property name="text" translatable="yes"></property>
 				      <property name="has_frame">True</property>
-				      <property name="invisible_char" translatable="yes">*</property>
+				      <property name="invisible_char">*</property>
 				      <property name="activates_default">False</property>
 				      <accessibility>
 					<atkrelation target="optionmenu-phone-6" type="labelled-by"/>
@@ -1237,7 +1254,7 @@
 				      <property name="max_length">0</property>
 				      <property name="text" translatable="yes"></property>
 				      <property name="has_frame">True</property>
-				      <property name="invisible_char" translatable="yes">*</property>
+				      <property name="invisible_char">*</property>
 				      <property name="activates_default">False</property>
 				      <accessibility>
 					<atkrelation target="optionmenu-phone-7" type="labelled-by"/>
@@ -1261,7 +1278,7 @@
 				      <property name="max_length">0</property>
 				      <property name="text" translatable="yes"></property>
 				      <property name="has_frame">True</property>
-				      <property name="invisible_char" translatable="yes">*</property>
+				      <property name="invisible_char">*</property>
 				      <property name="activates_default">False</property>
 				      <accessibility>
 					<atkrelation target="optionmenu-phone-8" type="labelled-by"/>
@@ -1304,6 +1321,10 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -1436,7 +1457,7 @@
 			      <property name="max_length">0</property>
 			      <property name="text" translatable="yes"></property>
 			      <property name="has_frame">True</property>
-			      <property name="invisible_char" translatable="yes">*</property>
+			      <property name="invisible_char">*</property>
 			      <property name="activates_default">False</property>
 			      <accessibility>
 				<atkrelation target="optionmenu-im-service-1" type="labelled-by"/>
@@ -1508,7 +1529,7 @@
 			      <property name="max_length">0</property>
 			      <property name="text" translatable="yes"></property>
 			      <property name="has_frame">True</property>
-			      <property name="invisible_char" translatable="yes">*</property>
+			      <property name="invisible_char">*</property>
 			      <property name="activates_default">False</property>
 			      <accessibility>
 				<atkrelation target="optionmenu-im-service-2" type="labelled-by"/>
@@ -1580,7 +1601,7 @@
 			      <property name="max_length">0</property>
 			      <property name="text" translatable="yes"></property>
 			      <property name="has_frame">True</property>
-			      <property name="invisible_char" translatable="yes">*</property>
+			      <property name="invisible_char">*</property>
 			      <property name="activates_default">False</property>
 			      <accessibility>
 				<atkrelation target="optionmenu-im-service-3" type="labelled-by"/>
@@ -1652,7 +1673,7 @@
 			      <property name="max_length">0</property>
 			      <property name="text" translatable="yes"></property>
 			      <property name="has_frame">True</property>
-			      <property name="invisible_char" translatable="yes">*</property>
+			      <property name="invisible_char">*</property>
 			      <property name="activates_default">False</property>
 			      <accessibility>
 				<atkrelation target="optionmenu-im-service-4" type="labelled-by"/>
@@ -1682,6 +1703,10 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="type">label_item</property>
@@ -1721,6 +1746,10 @@
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="type">tab</property>
@@ -1765,6 +1794,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">entry-homepage</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -1790,6 +1823,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">entry-caluri</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -1815,6 +1852,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">entry-fburl</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -1840,6 +1881,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">entry-videourl</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -1937,6 +1982,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">entry-weblog</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -1982,6 +2031,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="type">label_item</property>
@@ -2026,6 +2079,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">entry-profession</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -2046,7 +2103,7 @@
 			  <property name="max_length">0</property>
 			  <property name="text" translatable="yes"></property>
 			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
 			  <accessibility>
 			    <atkrelation target="label-profession" type="labelled-by"/>
@@ -2075,6 +2132,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">entry-jobtitle</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">2</property>
@@ -2095,7 +2156,7 @@
 			  <property name="max_length">0</property>
 			  <property name="text" translatable="yes"></property>
 			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
 			  <accessibility>
 			    <atkrelation target="label-jobtitle" type="labelled-by"/>
@@ -2124,6 +2185,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">entry-company</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -2144,7 +2209,7 @@
 			  <property name="max_length">0</property>
 			  <property name="text" translatable="yes"></property>
 			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
 			  <accessibility>
 			    <atkrelation target="label-company" type="labelled-by"/>
@@ -2173,6 +2238,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">entry-department</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">2</property>
@@ -2193,7 +2262,7 @@
 			  <property name="max_length">0</property>
 			  <property name="text" translatable="yes"></property>
 			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
 			  <accessibility>
 			    <atkrelation target="label-department" type="labelled-by"/>
@@ -2222,6 +2291,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">entry-manager</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -2242,7 +2315,7 @@
 			  <property name="max_length">0</property>
 			  <property name="text" translatable="yes"></property>
 			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
 			  <accessibility>
 			    <atkrelation target="label-manager" type="labelled-by"/>
@@ -2271,6 +2344,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">entry-assistant</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">2</property>
@@ -2291,7 +2368,7 @@
 			  <property name="max_length">0</property>
 			  <property name="text" translatable="yes"></property>
 			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
 			  <accessibility>
 			    <atkrelation target="label-assistant" type="labelled-by"/>
@@ -2321,6 +2398,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="type">label_item</property>
@@ -2406,6 +2487,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">text-comments</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -2431,6 +2516,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">entry-office</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -2456,6 +2545,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">entry-spouse</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -2476,7 +2569,7 @@
 			  <property name="max_length">0</property>
 			  <property name="text" translatable="yes"></property>
 			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
 			  <accessibility>
 			    <atkrelation target="label-office" type="labelled-by"/>
@@ -2500,7 +2593,7 @@
 			  <property name="max_length">0</property>
 			  <property name="text" translatable="yes"></property>
 			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
 			  <accessibility>
 			    <atkrelation target="label-spouse" type="labelled-by"/>
@@ -2529,6 +2622,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">dateedit-birthday</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">2</property>
@@ -2554,6 +2651,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">dateedit-anniversary</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">2</property>
@@ -2618,6 +2719,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="type">label_item</property>
@@ -2650,6 +2755,10 @@
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="type">tab</property>
@@ -2671,7 +2780,7 @@
 		  <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 		  <child>
-		    <widget class="GtkTable" id="table90">
+		    <widget class="GtkTable" id="table-home-address">
 		      <property name="border_width">12</property>
 		      <property name="visible">True</property>
 		      <property name="n_rows">4</property>
@@ -2681,9 +2790,9 @@
 		      <property name="column_spacing">6</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label-home-city">
+			<widget class="GtkLabel" id="label-home-address">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_City:</property>
+			  <property name="label" translatable="yes">_Address:</property>
 			  <property name="use_underline">True</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2693,38 +2802,47 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-home-city</property>
+			  <property name="mnemonic_widget">textview-home-address</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
+			  <property name="left_attach">0</property>
+			  <property name="right_attach">1</property>
 			  <property name="top_attach">0</property>
 			  <property name="bottom_attach">1</property>
 			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
+			  <property name="y_options">fill</property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkEntry" id="entry-home-city">
+			<widget class="GtkLabel" id="label-home-city">
 			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-home-city" type="labelled-by"/>
-			  </accessibility>
+			  <property name="label" translatable="yes">_City:</property>
+			  <property name="use_underline">True</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">1</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="mnemonic_widget">entry-home-city</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
+			  <property name="left_attach">2</property>
+			  <property name="right_attach">3</property>
 			  <property name="top_attach">0</property>
 			  <property name="bottom_attach">1</property>
+			  <property name="x_options">fill</property>
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
@@ -2743,6 +2861,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">entry-home-zip</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">2</property>
@@ -2755,30 +2877,6 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkEntry" id="entry-home-zip">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-home-zip" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
 			<widget class="GtkLabel" id="label-home-state">
 			  <property name="visible">True</property>
 			  <property name="label" translatable="yes">_State/Province:</property>
@@ -2792,6 +2890,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">entry-home-state</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">2</property>
@@ -2804,33 +2906,9 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkEntry" id="entry-home-state">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-home-state" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-home-country">
+			<widget class="GtkLabel" id="label-home-pobox">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Country:</property>
+			  <property name="label" translatable="yes">_PO Box:</property>
 			  <property name="use_underline">True</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2840,11 +2918,15 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-home-country</property>
+			  <property name="mnemonic_widget">entry-home-pobox</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
+			  <property name="left_attach">0</property>
+			  <property name="right_attach">1</property>
 			  <property name="top_attach">3</property>
 			  <property name="bottom_attach">4</property>
 			  <property name="x_options">fill</property>
@@ -2853,33 +2935,9 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkEntry" id="entry-home-country">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-home-country" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-home-address">
+			<widget class="GtkLabel" id="label-home-country">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Address:</property>
+			  <property name="label" translatable="yes">_Country:</property>
 			  <property name="use_underline">True</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2889,15 +2947,19 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">textview-home-address</property>
+			  <property name="mnemonic_widget">combo-home-country</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
+			  <property name="left_attach">2</property>
+			  <property name="right_attach">3</property>
+			  <property name="top_attach">3</property>
+			  <property name="bottom_attach">4</property>
 			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
+			  <property name="y_options"></property>
 			</packing>
 		      </child>
 
@@ -2916,7 +2978,7 @@
 			      <property name="can_focus">True</property>
 			      <property name="editable">True</property>
 			      <property name="overwrite">False</property>
-			      <property name="accepts_tab">True</property>
+			      <property name="accepts_tab">False</property>
 			      <property name="justification">GTK_JUSTIFY_LEFT</property>
 			      <property name="wrap_mode">GTK_WRAP_NONE</property>
 			      <property name="cursor_visible">True</property>
@@ -2943,6 +3005,78 @@
 		      </child>
 
 		      <child>
+			<widget class="GtkEntry" id="entry-home-city">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="editable">True</property>
+			  <property name="visibility">True</property>
+			  <property name="max_length">0</property>
+			  <property name="text" translatable="yes"></property>
+			  <property name="has_frame">True</property>
+			  <property name="invisible_char">*</property>
+			  <property name="activates_default">False</property>
+			  <accessibility>
+			    <atkrelation target="label-home-city" type="labelled-by"/>
+			  </accessibility>
+			</widget>
+			<packing>
+			  <property name="left_attach">3</property>
+			  <property name="right_attach">4</property>
+			  <property name="top_attach">0</property>
+			  <property name="bottom_attach">1</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkEntry" id="entry-home-zip">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="editable">True</property>
+			  <property name="visibility">True</property>
+			  <property name="max_length">0</property>
+			  <property name="text" translatable="yes"></property>
+			  <property name="has_frame">True</property>
+			  <property name="invisible_char">*</property>
+			  <property name="activates_default">False</property>
+			  <accessibility>
+			    <atkrelation target="label-home-zip" type="labelled-by"/>
+			  </accessibility>
+			</widget>
+			<packing>
+			  <property name="left_attach">3</property>
+			  <property name="right_attach">4</property>
+			  <property name="top_attach">1</property>
+			  <property name="bottom_attach">2</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkEntry" id="entry-home-state">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="editable">True</property>
+			  <property name="visibility">True</property>
+			  <property name="max_length">0</property>
+			  <property name="text" translatable="yes"></property>
+			  <property name="has_frame">True</property>
+			  <property name="invisible_char">*</property>
+			  <property name="activates_default">False</property>
+			  <accessibility>
+			    <atkrelation target="label-home-state" type="labelled-by"/>
+			  </accessibility>
+			</widget>
+			<packing>
+			  <property name="left_attach">3</property>
+			  <property name="right_attach">4</property>
+			  <property name="top_attach">2</property>
+			  <property name="bottom_attach">3</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
+
+		      <child>
 			<widget class="GtkEntry" id="entry-home-pobox">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
@@ -2951,7 +3085,7 @@
 			  <property name="max_length">0</property>
 			  <property name="text" translatable="yes"></property>
 			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
 			  <accessibility>
 			    <atkrelation target="label-home-pobox" type="labelled-by"/>
@@ -2967,27 +3101,69 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkLabel" id="label-home-pobox">
+			<widget class="GtkCombo" id="combo-home-country">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_PO Box:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-home-pobox</property>
+			  <property name="can_focus">True</property>
+			  <property name="value_in_list">False</property>
+			  <property name="allow_empty">True</property>
+			  <property name="case_sensitive">False</property>
+			  <property name="enable_arrow_keys">True</property>
+			  <property name="enable_arrows_always">False</property>
+
+			  <child internal-child="entry">
+			    <widget class="GtkEntry" id="entry-home-country">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="editable">True</property>
+			      <property name="visibility">True</property>
+			      <property name="max_length">0</property>
+			      <property name="text" translatable="yes"></property>
+			      <property name="has_frame">True</property>
+			      <property name="invisible_char">*</property>
+			      <property name="activates_default">False</property>
+			    </widget>
+			  </child>
+
+			  <child internal-child="list">
+			    <widget class="GtkList" id="convertwidget1">
+			      <property name="visible">True</property>
+			      <property name="selection_mode">GTK_SELECTION_BROWSE</property>
+
+			      <child>
+				<widget class="GtkListItem" id="convertwidget2">
+				  <property name="visible">True</property>
+
+				  <child>
+				    <widget class="GtkLabel" id="convertwidget3">
+				      <property name="visible">True</property>
+				      <property name="label" translatable="yes"></property>
+				      <property name="use_underline">False</property>
+				      <property name="use_markup">False</property>
+				      <property name="justify">GTK_JUSTIFY_LEFT</property>
+				      <property name="wrap">False</property>
+				      <property name="selectable">False</property>
+				      <property name="xalign">0</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
+				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				      <property name="width_chars">-1</property>
+				      <property name="single_line_mode">False</property>
+				      <property name="angle">0</property>
+				    </widget>
+				  </child>
+				</widget>
+			      </child>
+			    </widget>
+			  </child>
 			</widget>
 			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
+			  <property name="left_attach">3</property>
+			  <property name="right_attach">4</property>
 			  <property name="top_attach">3</property>
 			  <property name="bottom_attach">4</property>
 			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
+			  <property name="y_options">fill</property>
 			</packing>
 		      </child>
 		    </widget>
@@ -3006,6 +3182,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="type">label_item</property>
@@ -3027,7 +3207,7 @@
 		  <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 		  <child>
-		    <widget class="GtkTable" id="table91">
+		    <widget class="GtkTable" id="table-work-address">
 		      <property name="border_width">12</property>
 		      <property name="visible">True</property>
 		      <property name="n_rows">4</property>
@@ -3050,6 +3230,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">entry-work-city</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">2</property>
@@ -3070,7 +3254,7 @@
 			  <property name="max_length">0</property>
 			  <property name="text" translatable="yes"></property>
 			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
 			  <accessibility>
 			    <atkrelation target="label-work-city" type="labelled-by"/>
@@ -3099,6 +3283,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">entry-work-state</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">2</property>
@@ -3119,7 +3307,7 @@
 			  <property name="max_length">0</property>
 			  <property name="text" translatable="yes"></property>
 			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
 			  <accessibility>
 			    <atkrelation target="label-work-state" type="labelled-by"/>
@@ -3148,6 +3336,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">entry-work-zip</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">2</property>
@@ -3168,7 +3360,7 @@
 			  <property name="max_length">0</property>
 			  <property name="text" translatable="yes"></property>
 			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
 			  <accessibility>
 			    <atkrelation target="label-work-zip" type="labelled-by"/>
@@ -3196,7 +3388,11 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-work-country</property>
+			  <property name="mnemonic_widget">combo-work-country</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">2</property>
@@ -3209,26 +3405,69 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkEntry" id="entry-work-country">
+			<widget class="GtkCombo" id="combo-work-country">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-work-country" type="labelled-by"/>
-			  </accessibility>
+			  <property name="value_in_list">False</property>
+			  <property name="allow_empty">True</property>
+			  <property name="case_sensitive">False</property>
+			  <property name="enable_arrow_keys">True</property>
+			  <property name="enable_arrows_always">False</property>
+
+			  <child internal-child="entry">
+			    <widget class="GtkEntry" id="entry-work-country">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="editable">True</property>
+			      <property name="visibility">True</property>
+			      <property name="max_length">0</property>
+			      <property name="text" translatable="yes"></property>
+			      <property name="has_frame">True</property>
+			      <property name="invisible_char">*</property>
+			      <property name="activates_default">False</property>
+			    </widget>
+			  </child>
+
+			  <child internal-child="list">
+			    <widget class="GtkList" id="convertwidget1">
+			      <property name="visible">True</property>
+			      <property name="selection_mode">GTK_SELECTION_BROWSE</property>
+
+			      <child>
+				<widget class="GtkListItem" id="convertwidget2">
+				  <property name="visible">True</property>
+
+				  <child>
+				    <widget class="GtkLabel" id="convertwidget3">
+				      <property name="visible">True</property>
+				      <property name="label" translatable="yes"></property>
+				      <property name="use_underline">False</property>
+				      <property name="use_markup">False</property>
+				      <property name="justify">GTK_JUSTIFY_LEFT</property>
+				      <property name="wrap">False</property>
+				      <property name="selectable">False</property>
+				      <property name="xalign">0</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
+				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				      <property name="width_chars">-1</property>
+				      <property name="single_line_mode">False</property>
+				      <property name="angle">0</property>
+				    </widget>
+				  </child>
+				</widget>
+			      </child>
+			    </widget>
+			  </child>
 			</widget>
 			<packing>
 			  <property name="left_attach">3</property>
 			  <property name="right_attach">4</property>
 			  <property name="top_attach">3</property>
 			  <property name="bottom_attach">4</property>
-			  <property name="y_options"></property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options">fill</property>
 			</packing>
 		      </child>
 
@@ -3246,6 +3485,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">textview-work-address</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -3272,7 +3515,7 @@
 			      <property name="can_focus">True</property>
 			      <property name="editable">True</property>
 			      <property name="overwrite">False</property>
-			      <property name="accepts_tab">True</property>
+			      <property name="accepts_tab">False</property>
 			      <property name="justification">GTK_JUSTIFY_LEFT</property>
 			      <property name="wrap_mode">GTK_WRAP_NONE</property>
 			      <property name="cursor_visible">True</property>
@@ -3307,7 +3550,7 @@
 			  <property name="max_length">0</property>
 			  <property name="text" translatable="yes"></property>
 			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
 			  <accessibility>
 			    <atkrelation target="label-work-pobox" type="labelled-by"/>
@@ -3336,6 +3579,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">entry-work-pobox</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -3362,6 +3609,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="type">label_item</property>
@@ -3383,7 +3634,7 @@
 		  <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 		  <child>
-		    <widget class="GtkTable" id="table92">
+		    <widget class="GtkTable" id="table-other-address">
 		      <property name="border_width">12</property>
 		      <property name="visible">True</property>
 		      <property name="n_rows">4</property>
@@ -3406,6 +3657,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">entry-other-city</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">2</property>
@@ -3426,7 +3681,7 @@
 			  <property name="max_length">0</property>
 			  <property name="text" translatable="yes"></property>
 			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
 			  <accessibility>
 			    <atkrelation target="label-other-city" type="labelled-by"/>
@@ -3455,6 +3710,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">textview-other-address</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -3475,7 +3734,7 @@
 			  <property name="max_length">0</property>
 			  <property name="text" translatable="yes"></property>
 			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
 			  <accessibility>
 			    <atkrelation target="label-other-state" type="labelled-by"/>
@@ -3504,6 +3763,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">entry-other-state</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">2</property>
@@ -3529,6 +3792,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">entry-other-zip</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">2</property>
@@ -3549,7 +3816,7 @@
 			  <property name="max_length">0</property>
 			  <property name="text" translatable="yes"></property>
 			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
 			  <accessibility>
 			    <atkrelation target="label-other-zip" type="labelled-by"/>
@@ -3565,6 +3832,73 @@
 		      </child>
 
 		      <child>
+			<widget class="GtkCombo" id="combo-other-country">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="value_in_list">False</property>
+			  <property name="allow_empty">True</property>
+			  <property name="case_sensitive">False</property>
+			  <property name="enable_arrow_keys">True</property>
+			  <property name="enable_arrows_always">False</property>
+
+			  <child internal-child="entry">
+			    <widget class="GtkEntry" id="entry-other-country">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="editable">True</property>
+			      <property name="visibility">True</property>
+			      <property name="max_length">0</property>
+			      <property name="text" translatable="yes"></property>
+			      <property name="has_frame">True</property>
+			      <property name="invisible_char">*</property>
+			      <property name="activates_default">False</property>
+			    </widget>
+			  </child>
+
+			  <child internal-child="list">
+			    <widget class="GtkList" id="convertwidget1">
+			      <property name="visible">True</property>
+			      <property name="selection_mode">GTK_SELECTION_BROWSE</property>
+
+			      <child>
+				<widget class="GtkListItem" id="convertwidget2">
+				  <property name="visible">True</property>
+
+				  <child>
+				    <widget class="GtkLabel" id="convertwidget3">
+				      <property name="visible">True</property>
+				      <property name="label" translatable="yes"></property>
+				      <property name="use_underline">False</property>
+				      <property name="use_markup">False</property>
+				      <property name="justify">GTK_JUSTIFY_LEFT</property>
+				      <property name="wrap">False</property>
+				      <property name="selectable">False</property>
+				      <property name="xalign">0</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
+				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				      <property name="width_chars">-1</property>
+				      <property name="single_line_mode">False</property>
+				      <property name="angle">0</property>
+				    </widget>
+				  </child>
+				</widget>
+			      </child>
+			    </widget>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="left_attach">3</property>
+			  <property name="right_attach">4</property>
+			  <property name="top_attach">3</property>
+			  <property name="bottom_attach">4</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options">fill</property>
+			</packing>
+		      </child>
+
+		      <child>
 			<widget class="GtkLabel" id="label-other-country">
 			  <property name="visible">True</property>
 			  <property name="label" translatable="yes">_Country:</property>
@@ -3577,7 +3911,11 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-other-country</property>
+			  <property name="mnemonic_widget">combo-other-country</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">2</property>
@@ -3590,30 +3928,6 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkEntry" id="entry-other-country">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="label-other-country" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
 			<widget class="GtkScrolledWindow" id="scrolledwindow44">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
@@ -3628,7 +3942,7 @@
 			      <property name="can_focus">True</property>
 			      <property name="editable">True</property>
 			      <property name="overwrite">False</property>
-			      <property name="accepts_tab">True</property>
+			      <property name="accepts_tab">False</property>
 			      <property name="justification">GTK_JUSTIFY_LEFT</property>
 			      <property name="wrap_mode">GTK_WRAP_NONE</property>
 			      <property name="cursor_visible">True</property>
@@ -3663,7 +3977,7 @@
 			  <property name="max_length">0</property>
 			  <property name="text" translatable="yes"></property>
 			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
 			  <accessibility>
 			    <atkrelation target="label-other-pobox" type="labelled-by"/>
@@ -3692,6 +4006,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">entry-other-pobox</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -3718,6 +4036,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="type">label_item</property>
@@ -3750,6 +4072,10 @@
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="type">tab</property>
