2006-02-09 [wwp] 2.0.0cvs40

[claws.git] / src / editaddress.c

diff --git a/src/editaddress.c b/src/editaddress.c
index 2a4349b9b6fab3b5dae2a18ee91a033e8abe31b0..53823a73f91a31cde3aa27d56a06d5533eac1e67 100644 (file)
--- a/src/editaddress.c
+++ b/src/editaddress.c
@@ -313,7 +313,7 @@ static ItemEMail *edit_person_email_edit( gboolean *error, ItemEMail *email ) {
                *error = FALSE;
        }
        else {
-               edit_person_status_show( _( "An E-Mail address must be supplied." ) );
+               edit_person_status_show( _( "An Email address must be supplied." ) );
        }
 
        g_free( sEmail );
@@ -593,8 +593,8 @@ static void addressbook_edit_person_dialog_create( gboolean *cancelled ) {
        gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
 
        /* Button panel */
-       gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
-                                     &cancel_btn, GTK_STOCK_CANCEL,
+       gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
+                                     &ok_btn, GTK_STOCK_OK,
                                      NULL, NULL);
        gtk_box_pack_end(GTK_BOX(vnbox), hbbox, FALSE, FALSE, 0);
        gtk_widget_grab_default(ok_btn);
@@ -643,7 +643,7 @@ static void addressbook_edit_person_page_basic( gint pageNum, gchar *pageLbl ) {
        gtk_container_add( GTK_CONTAINER( personeditdlg.notebook ), vbox );
        gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
 
-       label = gtk_label_new( pageLbl );
+       label = gtk_label_new_with_mnemonic( pageLbl );
        gtk_widget_show( label );
        gtk_notebook_set_tab_label(
                GTK_NOTEBOOK( personeditdlg.notebook ),
@@ -756,7 +756,7 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
        gchar *titles[ EMAIL_N_COLS ];
        gint i;
 
-       titles[ EMAIL_COL_EMAIL   ] = _("E-Mail Address");
+       titles[ EMAIL_COL_EMAIL   ] = _("Email Address");
        titles[ EMAIL_COL_ALIAS   ] = _("Alias");
        titles[ EMAIL_COL_REMARKS ] = _("Remarks");
 
@@ -765,7 +765,7 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
        gtk_container_add( GTK_CONTAINER( personeditdlg.notebook ), vbox );
        gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
 
-       label = gtk_label_new( pageLbl );
+       label = gtk_label_new_with_mnemonic( pageLbl );
        gtk_widget_show( label );
        gtk_notebook_set_tab_label(
                GTK_NOTEBOOK( personeditdlg.notebook ),
@@ -804,7 +804,7 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
 
        /* First row */
        top = 0;
-       label = gtk_label_new(_("E-Mail Address"));
+       label = gtk_label_new(_("Email Address"));
        gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 
@@ -958,7 +958,7 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
        gtk_container_add( GTK_CONTAINER( personeditdlg.notebook ), vbox );
        gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
 
-       label = gtk_label_new( pageLbl );
+       label = gtk_label_new_with_mnemonic( pageLbl );
        gtk_widget_show( label );
        gtk_notebook_set_tab_label(
                GTK_NOTEBOOK( personeditdlg.notebook ),
@@ -1067,9 +1067,9 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
 
 static void addressbook_edit_person_create( gboolean *cancelled ) {
        addressbook_edit_person_dialog_create( cancelled );
-       addressbook_edit_person_page_basic( PAGE_BASIC, _( "User Data" ) );
-       addressbook_edit_person_page_email( PAGE_EMAIL, _( "E-Mail Addresses" ) );
-       addressbook_edit_person_page_attrib( PAGE_ATTRIBUTES, _( "Other Attributes" ) );
+       addressbook_edit_person_page_basic( PAGE_BASIC, _( "_User Data" ) );
+       addressbook_edit_person_page_email( PAGE_EMAIL, _( "_Email Addresses" ) );
+       addressbook_edit_person_page_attrib( PAGE_ATTRIBUTES, _( "O_ther Attributes" ) );
        gtk_widget_show_all( personeditdlg.window );
 }