Merging changes:

2001-12-04  Christopher James Lahey  <clahey@ximian.com>

	* gui/contact-editor/contact-editor.glade: Fixed up the
	accelerators and such here.

	* gui/contact-editor/e-contact-editor.c (file_save_as_cb):
	Translate this string.
	(pixmaps): Added a pixmap for the ContactEditorSaveClose command.
	(setup_tab_order): Fixed up the tab order here.

	* gui/contact-editor/fulladdr.glade: Made the country combo
	focusable here.

svn path=/trunk/; revision=14895

3 files changed, 23 insertions, 21 deletions

diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade
index 54fea0864a..7d9e7b1f7d 100644
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ b/addressbook/gui/contact-editor/contact-editor.glade
@@ -493,7 +493,7 @@
 	  <class>GtkButton</class>
 	  <name>button-fullname</name>
 	  <can_focus>True</can_focus>
-	  <label>_Full Name...</label>
+	  <label>Full _Name...</label>
 	  <relief>GTK_RELIEF_NORMAL</relief>
 	  <child>
 	    <left_attach>1</left_attach>
@@ -894,7 +894,7 @@
 
 	<widget>
 	  <class>GtkAlignment</class>
-	  <name>alignment10</name>
+	  <name>alignment-htmlmail</name>
 	  <xalign>0.5</xalign>
 	  <yalign>0</yalign>
 	  <xscale>1</xscale>
@@ -917,6 +917,7 @@
 	  <widget>
 	    <class>GtkCheckButton</class>
 	    <name>checkbutton-htmlmail</name>
+	    <can_focus>True</can_focus>
 	    <label>Wants to receive _HTML mail</label>
 	    <active>False</active>
 	    <draw_indicator>True</draw_indicator>
@@ -977,7 +978,7 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label-phone1</name>
-	    <label>_Business</label>
+	    <label>Business</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>0</xalign>
@@ -1009,7 +1010,7 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label-phone2</name>
-	    <label>_Home</label>
+	    <label>Home</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>0</xalign>
@@ -1041,7 +1042,7 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label-phone3</name>
-	    <label>Business _Fax</label>
+	    <label>Business Fax</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>0</xalign>
@@ -1073,7 +1074,7 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label-phone4</name>
-	    <label>_Mobile</label>
+	    <label>Mobile</label>
 	    <justify>GTK_JUSTIFY_LEFT</justify>
 	    <wrap>False</wrap>
 	    <xalign>0</xalign>
@@ -1137,7 +1138,7 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label-address</name>
-	    <label>B_usiness</label>
+	    <label>Business</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>0</xalign>
@@ -1174,7 +1175,7 @@
 	    <class>GtkCheckButton</class>
 	    <name>checkbutton-mailingaddress</name>
 	    <visible>False</visible>
-	    <label>_This is the mailing address</label>
+	    <label>This is the _mailing address</label>
 	    <active>False</active>
 	    <draw_indicator>True</draw_indicator>
 	  </widget>
@@ -1244,7 +1245,7 @@
 	    <class>GtkButton</class>
 	    <name>button-contacts</name>
 	    <can_focus>True</can_focus>
-	    <label>_Contacts...</label>
+	    <label>C_ontacts...</label>
 	    <relief>GTK_RELIEF_NORMAL</relief>
 	  </widget>
 	</widget>
@@ -1551,7 +1552,7 @@
 	  <class>GtkButton</class>
 	  <name>button-fulladdr</name>
 	  <can_focus>True</can_focus>
-	  <label>_Address...</label>
+	  <label>Add_ress...</label>
 	  <relief>GTK_RELIEF_NORMAL</relief>
 	  <child>
 	    <left_attach>5</left_attach>
@@ -1683,7 +1684,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-department</name>
-	  <label>_Department:</label>
+	  <label>D_epartment:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>0</xalign>
@@ -1737,7 +1738,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-profession</name>
-	  <label>_Profession:</label>
+	  <label>P_rofession:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>0</xalign>
@@ -1791,7 +1792,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-spouse</name>
-	  <label>_Spouse:</label>
+	  <label>S_pouse:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>0</xalign>
@@ -1818,7 +1819,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-birthday</name>
-	  <label>_Birthday:</label>
+	  <label>Birthda_y:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>0</xalign>
@@ -1845,7 +1846,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-assistant</name>
-	  <label>_Assistant's name:</label>
+	  <label>A_ssistant's name:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>0</xalign>
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 5abc4af8f7..90c81edef5 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -21,6 +21,8 @@
 
 #include <config.h>
 
+#include "e-contact-editor.h"
+
 #include <time.h>
 #include <gtk/gtkcheckbutton.h>
 #include <gtk/gtkcheckmenuitem.h>
@@ -51,7 +53,6 @@
 
 #include "e-card-merging.h"
 
-#include "e-contact-editor.h"
 #include "e-contact-editor-address.h"
 #include "e-contact-editor-fullname.h"
 #include "e-contact-save-as.h"
@@ -974,7 +975,7 @@ file_save_as_cb (GtkWidget *widget, gpointer data)
 	e_card_simple_sync_card (ce->simple);
 
 	card = ce->card;
-	e_contact_save_as("Save as VCard", card);
+	e_contact_save_as(_("Save Contact as VCard"), card);
 }
 
 static void
@@ -1128,6 +1129,7 @@ BonoboUIVerb verbs [] = {
 
 EPixmap pixmaps[] = {
 	E_PIXMAP ("/commands/ContactEditorSave", "save-16.png"),
+	E_PIXMAP ("/commands/ContactEditorSaveClose", "save-16.png"),
 	E_PIXMAP ("/commands/ContactEditorSaveAs", "save-as-16.png"),
 	E_PIXMAP ("/commands/ContactEditorDelete", "evolution-trash-mini.png"),
 	E_PIXMAP ("/commands/ContactEditorPrint", "print.xpm"),
@@ -1196,13 +1198,11 @@ setup_tab_order(GladeXML *gui)
 		list = add_to_tab_order(list, gui, "entry-phone2");
 		list = add_to_tab_order(list, gui, "entry-phone3");
 		list = add_to_tab_order(list, gui, "entry-phone4");
-		list = g_list_reverse(list);
-		e_container_change_tab_order(GTK_CONTAINER(container), list);
-		g_list_free(list);
 
-		list = NULL;
 		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, "button-fulladdr");
 		list = add_to_tab_order(list, gui, "text-address");
 		list = add_to_tab_order(list, gui, "alignment-contacts");
 		list = g_list_reverse(list);
diff --git a/addressbook/gui/contact-editor/fulladdr.glade b/addressbook/gui/contact-editor/fulladdr.glade
index 68b715a1cc..432e081c60 100644
--- a/addressbook/gui/contact-editor/fulladdr.glade
+++ b/addressbook/gui/contact-editor/fulladdr.glade
@@ -354,6 +354,7 @@
 	<class>GtkCombo</class>
 	<name>combo-country</name>
 	<width>100</width>
+	<can_focus>True</can_focus>
 	<value_in_list>False</value_in_list>
 	<ok_if_empty>True</ok_if_empty>
 	<case_sensitive>False</case_sensitive>