From 9044d2cffcdc94e4a22a21e434c698beb7ad55c4 Mon Sep 17 00:00:00 2001 From: Miguel de Icaza Date: Thu, 1 Jun 2000 04:30:29 +0000 Subject: Added accelerators for the remaining items. 2000-05-31 Miguel de Icaza * contact-editor/contact-editor.glade: Added accelerators for the remaining items. Add spacing, beautify the dialogs. svn path=/trunk/; revision=3325 --- addressbook/ChangeLog | 7 + addressbook/contact-editor/contact-editor.glade | 387 ++++++++------------- .../contact-editor/e-contact-editor-strings.h | 36 +- .../gui/contact-editor/contact-editor.glade | 387 ++++++++------------- .../gui/contact-editor/e-contact-editor-strings.h | 36 +- 5 files changed, 319 insertions(+), 534 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index f10c26c2fc..1ba0c5f034 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,10 @@ +2000-05-31 Miguel de Icaza + + * contact-editor/contact-editor.glade: Added accelerators for + the remaining items. + + Add spacing, beautify the dialogs. + 2000-06-01 Ettore Perazzoli * gui/component/addressbook.c (control_activate): Put the toolbar diff --git a/addressbook/contact-editor/contact-editor.glade b/addressbook/contact-editor/contact-editor.glade index af77945c56..21ad4fd265 100644 --- a/addressbook/contact-editor/contact-editor.glade +++ b/addressbook/contact-editor/contact-editor.glade @@ -15,12 +15,6 @@ False False False - interface.c - interface.h - callbacks.c - callbacks.h - support.c - support.h True e-contact-editor-strings.h @@ -28,7 +22,6 @@ GtkWindow contact editor - True False Contact Editor GTK_WINDOW_TOPLEVEL @@ -41,7 +34,6 @@ GtkNotebook notebook-contact-editor - True True True True @@ -55,7 +47,6 @@ GtkTable table-contact-editor-general 7 - True 14 8 False @@ -65,7 +56,6 @@ GtkEntry entry-phone1 - True True True True @@ -90,7 +80,6 @@ GtkEntry entry-phone2 - True True True True @@ -115,7 +104,6 @@ GtkEntry entry-phone3 - True True True True @@ -140,7 +128,6 @@ GtkEntry entry-phone4 - True True True True @@ -167,7 +154,6 @@ text-address 1 1 - True True True @@ -190,7 +176,6 @@ GtkButton button-fullname - True True @@ -209,37 +194,9 @@ - - GtkAccelLabel - accellabel-company - True - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 1 - 3 - 2 - 3 - 0 - 0 - False - False - False - False - True - True - - - GtkAccelLabel accellabel-fileas - True GTK_JUSTIFY_CENTER False @@ -266,7 +223,6 @@ GtkAccelLabel accellabel-web - True GTK_JUSTIFY_LEFT False @@ -293,7 +249,6 @@ GtkAlignment alignment3 - True 1 0.5 0 @@ -316,7 +271,6 @@ GtkButton button-email1 - True Placeholder @@ -327,7 +281,6 @@ GtkAlignment alignment5 - True 1 0.5 0 @@ -350,7 +303,6 @@ GtkButton button-phone4 - True Placeholder @@ -361,7 +313,6 @@ GtkAlignment alignment7 - True 1 0.5 0 @@ -384,7 +335,6 @@ GtkButton button-phone2 - True Placeholder @@ -395,7 +345,6 @@ GtkAlignment alignment8 - True 1 0.5 0 @@ -418,7 +367,6 @@ GtkButton button-phone1 - True Placeholder @@ -429,7 +377,6 @@ GtkHSeparator hseparator4 - True 4 8 @@ -449,7 +396,6 @@ GtkAlignment alignment6 - True 1 0.5 0 @@ -472,7 +418,6 @@ GtkButton button-phone3 - True Placeholder @@ -483,8 +428,9 @@ GtkEntry entry-fullname - True + True True + True True True 0 @@ -508,7 +454,6 @@ GtkEntry entry-jobtitle - True True True True @@ -533,7 +478,6 @@ GtkEntry entry-company - True True True True @@ -558,7 +502,6 @@ GtkEntry entry-email1 - True True True True @@ -583,7 +526,6 @@ GtkEntry entry-web - True True True True @@ -608,7 +550,6 @@ GtkHSeparator hseparator5 - True 0 4 @@ -628,7 +569,6 @@ GtkCombo combo-file-as - True False True True @@ -654,7 +594,6 @@ GtkEntry GtkCombo:entry entry-file-as - True True True True @@ -666,7 +605,6 @@ GtkHSeparator hseparator6 - True 0 4 @@ -686,7 +624,6 @@ GtkAlignment alignment10 - True 0.5 0 1 @@ -709,7 +646,6 @@ GtkCheckButton checkbutton-htmlmail - True False True @@ -719,7 +655,6 @@ GtkAlignment alignment4 - True 1 0.5 0 @@ -742,7 +677,6 @@ GtkButton button-address - True Placeholder @@ -753,7 +687,6 @@ GtkLabel address-label - True GTK_JUSTIFY_CENTER False @@ -781,7 +714,6 @@ GtkEventBox eventbox1 - True 5 6 @@ -800,7 +732,6 @@ GtkLabel label-phone1 - True GTK_JUSTIFY_CENTER False @@ -815,7 +746,6 @@ GtkEventBox eventbox2 - True 5 6 @@ -834,7 +764,6 @@ GtkLabel label-phone2 - True GTK_JUSTIFY_CENTER False @@ -849,7 +778,6 @@ GtkEventBox eventbox3 - True 5 6 @@ -868,7 +796,6 @@ GtkLabel label-phone3 - True GTK_JUSTIFY_CENTER False @@ -883,7 +810,6 @@ GtkEventBox eventbox4 - True 5 6 @@ -902,7 +828,6 @@ GtkLabel label-phone4 - True GTK_JUSTIFY_LEFT False @@ -917,7 +842,6 @@ GtkEventBox eventbox5 - True 1 2 @@ -936,7 +860,6 @@ GtkLabel label-email1 - True GTK_JUSTIFY_CENTER False @@ -951,7 +874,6 @@ GtkEventBox eventbox-business - True 5 6 @@ -970,8 +892,7 @@ GtkLabel label-address - True - + GTK_JUSTIFY_CENTER False 0 @@ -985,7 +906,6 @@ GtkAlignment alignment2 - True 0 0 0 @@ -1008,8 +928,7 @@ GtkCheckButton checkbutton-mailingaddress - True - + False True @@ -1018,7 +937,6 @@ GtkHSeparator hseparator9 - True 0 4 @@ -1038,7 +956,6 @@ GtkHSeparator hseparator10 - True 4 8 @@ -1058,7 +975,6 @@ GtkAlignment alignment12 - True 0.5 0.5 1 @@ -1081,16 +997,14 @@ GtkButton button-contacts - True True - + GtkAlignment alignment15 - True 0.5 0.5 1 @@ -1113,7 +1027,6 @@ GtkEntry entry-categories - True True True True @@ -1125,7 +1038,6 @@ GtkAlignment alignment14 - True 0.5 0.5 1 @@ -1148,7 +1060,6 @@ GtkEntry entry-contacts - True True True True @@ -1160,7 +1071,6 @@ GtkAlignment alignment16 - True 0.5 0.5 1 @@ -1183,7 +1093,6 @@ GtkButton button-categories - True True @@ -1192,7 +1101,6 @@ GtkEventBox eventbox7 - True 1 3 @@ -1209,23 +1117,22 @@ - GtkAccelLabel - accellabel-jobtitle - True - + GtkLabel + label34 + GTK_JUSTIFY_CENTER False 0 0.5 0 0 + entry-jobtitle Custom custom1 - True e_create_image_widget malehead.png @@ -1251,7 +1158,6 @@ Custom custom2 - True e_create_image_widget cellphone.png @@ -1277,7 +1183,6 @@ Custom custom3 - True e_create_image_widget envelope.png @@ -1303,7 +1208,6 @@ Custom custom4 - True e_create_image_widget house.png @@ -1329,7 +1233,6 @@ Custom custom5 - True e_create_image_widget evolution-contacts.png @@ -1355,7 +1258,6 @@ Custom custom6 - True e_create_image_widget briefcase.png @@ -1381,7 +1283,6 @@ Custom custom10 - True e_create_image_widget globe.png @@ -1403,13 +1304,39 @@ True + + + GtkLabel + label35 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + entry-company + + 1 + 3 + 2 + 3 + 0 + 0 + False + False + False + False + True + True + + GtkLabel Notebook:tab label15 - True GTK_JUSTIFY_CENTER False @@ -1423,7 +1350,6 @@ GtkTable table-contact-editor-details 7 - True 9 6 False @@ -1433,14 +1359,14 @@ GtkLabel label21 - True - + GTK_JUSTIFY_CENTER False 0 0.5 0 0 + entry-department 1 2 @@ -1460,14 +1386,14 @@ GtkLabel label22 - True - + GTK_JUSTIFY_CENTER False 0 0.5 0 0 + entry-office 1 2 @@ -1487,14 +1413,14 @@ GtkLabel label23 - True - + GTK_JUSTIFY_CENTER False 0 0.5 0 0 + entry-profession 1 2 @@ -1514,14 +1440,14 @@ GtkLabel label24 - True - + GTK_JUSTIFY_CENTER False 0 0.5 0 0 + entry-nickname 1 2 @@ -1541,14 +1467,14 @@ GtkLabel label25 - True - + GTK_JUSTIFY_CENTER False 0 0.5 0 0 + entry-spouse 1 2 @@ -1568,8 +1494,7 @@ GtkLabel label31 - True - + GTK_JUSTIFY_CENTER False 0 @@ -1595,14 +1520,14 @@ GtkLabel label30 - True - + GTK_JUSTIFY_CENTER False 0 0.5 0 0 + entry-assistant 3 4 @@ -1622,14 +1547,14 @@ GtkLabel label29 - True - + GTK_JUSTIFY_CENTER False 0 0.5 0 0 + entry-manager 3 4 @@ -1649,8 +1574,7 @@ GtkLabel label32 - True - + GTK_JUSTIFY_CENTER False 0 @@ -1676,7 +1600,6 @@ GtkEntry entry-spouse - True True True True @@ -1701,7 +1624,6 @@ GtkEntry entry-department - True True True True @@ -1726,7 +1648,6 @@ GtkEntry entry-office - True True True True @@ -1751,7 +1672,6 @@ GtkEntry entry-profession - True True True True @@ -1776,7 +1696,6 @@ GtkEntry entry-nickname - True True True True @@ -1801,7 +1720,6 @@ GnomeDateEdit dateedit-anniversary - True False False False @@ -1826,7 +1744,6 @@ GnomeDateEdit dateedit-birthday - True False False False @@ -1851,7 +1768,6 @@ GtkEntry entry-assistant - True True True True @@ -1876,7 +1792,6 @@ GtkEntry entry-manager - True True True True @@ -1901,7 +1816,6 @@ GtkHSeparator hseparator7 - True 0 6 @@ -1921,8 +1835,7 @@ GtkLabel label33 - True - + GTK_JUSTIFY_CENTER False 0 @@ -1948,7 +1861,6 @@ GtkHSeparator hseparator8 - True 0 6 @@ -1968,7 +1880,6 @@ Custom custom7 - True e_create_image_widget briefcase.png @@ -1994,7 +1905,6 @@ Custom custom8 - True e_create_image_widget malehead.png @@ -2020,7 +1930,6 @@ GtkScrolledWindow scrolledwindow2 - True GTK_POLICY_AUTOMATIC GTK_POLICY_AUTOMATIC GTK_UPDATE_CONTINUOUS @@ -2043,7 +1952,6 @@ GtkText text-comments - True True True @@ -2053,7 +1961,6 @@ Custom custom9 - True e_create_image_widget globe.png @@ -2081,7 +1988,6 @@ GtkLabel Notebook:tab label16 - True GTK_JUSTIFY_CENTER False @@ -2096,7 +2002,7 @@ GnomeDialog dialog2 - True + 2 False GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE @@ -2111,24 +2017,64 @@ GtkVBox GnomeDialog:vbox dialog-vbox2 - True False - 8 + 4 4 True True + + GtkHButtonBox + GnomeDialog:action_area + dialog-action_area2 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 + + 0 + False + True + GTK_PACK_END + + + + GtkButton + button28 + True + True + GNOME_STOCK_BUTTON_OK + + + + GtkButton + button29 + True + True + GNOME_STOCK_BUTTON_APPLY + + + + GtkButton + button30 + True + True + GNOME_STOCK_BUTTON_CANCEL + + + GtkTable table2 - True 2 2 False 0 - 0 + 2 0 True @@ -2138,7 +2084,6 @@ GtkEntry entry2 - True True True True @@ -2163,9 +2108,8 @@ GtkVBox vbox1 - True False - 0 + 2 1 2 @@ -2184,9 +2128,9 @@ GtkButton button31 - True + 2 True - + 0 False @@ -2197,9 +2141,9 @@ GtkButton button32 - True + 2 True - + 0 False @@ -2212,7 +2156,6 @@ GtkScrolledWindow scrolledwindow1 200 - True GTK_POLICY_ALWAYS GTK_POLICY_ALWAYS GTK_UPDATE_CONTINUOUS @@ -2235,7 +2178,6 @@ GtkCList clist1 - True True 1 80 @@ -2247,7 +2189,6 @@ GtkLabel CList:title label20 - True GTK_JUSTIFY_CENTER False @@ -2259,12 +2200,39 @@ + + + + + GnomeDialog + dialog-add-phone + False + New phone type + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + False + False + False + False + False + + + GtkVBox + GnomeDialog:vbox + vbox2 + False + 8 + + 4 + True + True + GtkHButtonBox GnomeDialog:action_area - dialog-action_area2 - True + hbuttonbox1 GTK_BUTTONBOX_END 8 85 @@ -2280,67 +2248,27 @@ GtkButton - button28 - True - True - True - GNOME_STOCK_BUTTON_OK - - - - GtkButton - button29 - True + button43 True + True True - GNOME_STOCK_BUTTON_APPLY + + GNOME_STOCK_PIXMAP_ADD GtkButton - button30 - True + button44 True True GNOME_STOCK_BUTTON_CANCEL - - - - - GnomeDialog - dialog-add-phone - True - False - New phone type - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - False - False - False - False - - - GtkVBox - GnomeDialog:vbox - vbox2 - True - False - 8 - - 4 - True - True - GtkFrame frame-add-phone 4 - True 0 GTK_SHADOW_ETCHED_IN @@ -2354,7 +2282,6 @@ GtkAlignment alignment9 9 - True 0.5 0.5 1 @@ -2363,8 +2290,8 @@ GtkEntry entry-add-phone - True True + True True True 0 @@ -2372,44 +2299,6 @@ - - - GtkHButtonBox - GnomeDialog:action_area - hbuttonbox1 - True - GTK_BUTTONBOX_END - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - - - - GtkButton - button43 - True - True - True - - GNOME_STOCK_PIXMAP_ADD - - - - GtkButton - button44 - True - True - True - GNOME_STOCK_BUTTON_CANCEL - - diff --git a/addressbook/contact-editor/e-contact-editor-strings.h b/addressbook/contact-editor/e-contact-editor-strings.h index 40c2ee85a5..d5f1983573 100644 --- a/addressbook/contact-editor/e-contact-editor-strings.h +++ b/addressbook/contact-editor/e-contact-editor-strings.h @@ -6,7 +6,6 @@ gchar *s = N_("Contact Editor"); gchar *s = N_("_Full Name..."); -gchar *s = N_("Company:"); gchar *s = N_("File As:"); gchar *s = N_("Web page address:"); gchar *s = N_("Wants to receive _HTML mail"); @@ -16,26 +15,27 @@ gchar *s = N_("_Home"); gchar *s = N_("Business _Fax"); gchar *s = N_("_Mobile"); gchar *s = N_("Primary Email"); -gchar *s = N_("Business"); -gchar *s = N_("This is the _mailing address"); -gchar *s = N_("_Contacts..."); +gchar *s = N_("B_usiness"); +gchar *s = N_("_This is the mailing address"); +gchar *s = N_("C_ontacts..."); gchar *s = N_("Ca_tegories..."); -gchar *s = N_("Job Title"); +gchar *s = N_("_Job title:"); +gchar *s = N_("_Company:"); gchar *s = N_("General"); -gchar *s = N_("Department:"); -gchar *s = N_("Office:"); -gchar *s = N_("Profession:"); -gchar *s = N_("Nickname:"); -gchar *s = N_("Spouse:"); -gchar *s = N_("Birthday:"); -gchar *s = N_("Assistant's name:"); -gchar *s = N_("Manager's Name:"); -gchar *s = N_("Anniversary:"); -gchar *s = N_("Notes:"); +gchar *s = N_("_Department:"); +gchar *s = N_("_Office:"); +gchar *s = N_("_Profession:"); +gchar *s = N_("_Nickname:"); +gchar *s = N_("_Spouse:"); +gchar *s = N_("_Birthday:"); +gchar *s = N_("_Assistant's name:"); +gchar *s = N_("_Manager's Name:"); +gchar *s = N_("Anni_versary:"); +gchar *s = N_("No_tes:"); gchar *s = N_("Details"); -gchar *s = N_("Add"); -gchar *s = N_("Delete"); +gchar *s = N_("_Add"); +gchar *s = N_("_Delete"); gchar *s = N_("Phone Types"); gchar *s = N_("New phone type"); -gchar *s = N_("New phone type"); gchar *s = N_("Add"); +gchar *s = N_("New phone type"); diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade index af77945c56..21ad4fd265 100644 --- a/addressbook/gui/contact-editor/contact-editor.glade +++ b/addressbook/gui/contact-editor/contact-editor.glade @@ -15,12 +15,6 @@ False False False - interface.c - interface.h - callbacks.c - callbacks.h - support.c - support.h True e-contact-editor-strings.h @@ -28,7 +22,6 @@ GtkWindow contact editor - True False Contact Editor GTK_WINDOW_TOPLEVEL @@ -41,7 +34,6 @@ GtkNotebook notebook-contact-editor - True True True True @@ -55,7 +47,6 @@ GtkTable table-contact-editor-general 7 - True 14 8 False @@ -65,7 +56,6 @@ GtkEntry entry-phone1 - True True True True @@ -90,7 +80,6 @@ GtkEntry entry-phone2 - True True True True @@ -115,7 +104,6 @@ GtkEntry entry-phone3 - True True True True @@ -140,7 +128,6 @@ GtkEntry entry-phone4 - True True True True @@ -167,7 +154,6 @@ text-address 1 1 - True True True @@ -190,7 +176,6 @@ GtkButton button-fullname - True True @@ -209,37 +194,9 @@ - - GtkAccelLabel - accellabel-company - True - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 1 - 3 - 2 - 3 - 0 - 0 - False - False - False - False - True - True - - - GtkAccelLabel accellabel-fileas - True GTK_JUSTIFY_CENTER False @@ -266,7 +223,6 @@ GtkAccelLabel accellabel-web - True GTK_JUSTIFY_LEFT False @@ -293,7 +249,6 @@ GtkAlignment alignment3 - True 1 0.5 0 @@ -316,7 +271,6 @@ GtkButton button-email1 - True Placeholder @@ -327,7 +281,6 @@ GtkAlignment alignment5 - True 1 0.5 0 @@ -350,7 +303,6 @@ GtkButton button-phone4 - True Placeholder @@ -361,7 +313,6 @@ GtkAlignment alignment7 - True 1 0.5 0 @@ -384,7 +335,6 @@ GtkButton button-phone2 - True Placeholder @@ -395,7 +345,6 @@ GtkAlignment alignment8 - True 1 0.5 0 @@ -418,7 +367,6 @@ GtkButton button-phone1 - True Placeholder @@ -429,7 +377,6 @@ GtkHSeparator hseparator4 - True 4 8 @@ -449,7 +396,6 @@ GtkAlignment alignment6 - True 1 0.5 0 @@ -472,7 +418,6 @@ GtkButton button-phone3 - True Placeholder @@ -483,8 +428,9 @@ GtkEntry entry-fullname - True + True True + True True True 0 @@ -508,7 +454,6 @@ GtkEntry entry-jobtitle - True True True True @@ -533,7 +478,6 @@ GtkEntry entry-company - True True True True @@ -558,7 +502,6 @@ GtkEntry entry-email1 - True True True True @@ -583,7 +526,6 @@ GtkEntry entry-web - True True True True @@ -608,7 +550,6 @@ GtkHSeparator hseparator5 - True 0 4 @@ -628,7 +569,6 @@ GtkCombo combo-file-as - True False True True @@ -654,7 +594,6 @@ GtkEntry GtkCombo:entry entry-file-as - True True True True @@ -666,7 +605,6 @@ GtkHSeparator hseparator6 - True 0 4 @@ -686,7 +624,6 @@ GtkAlignment alignment10 - True 0.5 0 1 @@ -709,7 +646,6 @@ GtkCheckButton checkbutton-htmlmail - True False True @@ -719,7 +655,6 @@ GtkAlignment alignment4 - True 1 0.5 0 @@ -742,7 +677,6 @@ GtkButton button-address - True Placeholder @@ -753,7 +687,6 @@ GtkLabel address-label - True GTK_JUSTIFY_CENTER False @@ -781,7 +714,6 @@ GtkEventBox eventbox1 - True 5 6 @@ -800,7 +732,6 @@ GtkLabel label-phone1 - True GTK_JUSTIFY_CENTER False @@ -815,7 +746,6 @@ GtkEventBox eventbox2 - True 5 6 @@ -834,7 +764,6 @@ GtkLabel label-phone2 - True GTK_JUSTIFY_CENTER False @@ -849,7 +778,6 @@ GtkEventBox eventbox3 - True 5 6 @@ -868,7 +796,6 @@ GtkLabel label-phone3 - True GTK_JUSTIFY_CENTER False @@ -883,7 +810,6 @@ GtkEventBox eventbox4 - True 5 6 @@ -902,7 +828,6 @@ GtkLabel label-phone4 - True GTK_JUSTIFY_LEFT False @@ -917,7 +842,6 @@ GtkEventBox eventbox5 - True 1 2 @@ -936,7 +860,6 @@ GtkLabel label-email1 - True GTK_JUSTIFY_CENTER False @@ -951,7 +874,6 @@ GtkEventBox eventbox-business - True 5 6 @@ -970,8 +892,7 @@ GtkLabel label-address - True - + GTK_JUSTIFY_CENTER False 0 @@ -985,7 +906,6 @@ GtkAlignment alignment2 - True 0 0 0 @@ -1008,8 +928,7 @@ GtkCheckButton checkbutton-mailingaddress - True - + False True @@ -1018,7 +937,6 @@ GtkHSeparator hseparator9 - True 0 4 @@ -1038,7 +956,6 @@ GtkHSeparator hseparator10 - True 4 8 @@ -1058,7 +975,6 @@ GtkAlignment alignment12 - True 0.5 0.5 1 @@ -1081,16 +997,14 @@ GtkButton button-contacts - True True - + GtkAlignment alignment15 - True 0.5 0.5 1 @@ -1113,7 +1027,6 @@ GtkEntry entry-categories - True True True True @@ -1125,7 +1038,6 @@ GtkAlignment alignment14 - True 0.5 0.5 1 @@ -1148,7 +1060,6 @@ GtkEntry entry-contacts - True True True True @@ -1160,7 +1071,6 @@ GtkAlignment alignment16 - True 0.5 0.5 1 @@ -1183,7 +1093,6 @@ GtkButton button-categories - True True @@ -1192,7 +1101,6 @@ GtkEventBox eventbox7 - True 1 3 @@ -1209,23 +1117,22 @@ - GtkAccelLabel - accellabel-jobtitle - True - + GtkLabel + label34 + GTK_JUSTIFY_CENTER False 0 0.5 0 0 + entry-jobtitle Custom custom1 - True e_create_image_widget malehead.png @@ -1251,7 +1158,6 @@ Custom custom2 - True e_create_image_widget cellphone.png @@ -1277,7 +1183,6 @@ Custom custom3 - True e_create_image_widget envelope.png @@ -1303,7 +1208,6 @@ Custom custom4 - True e_create_image_widget house.png @@ -1329,7 +1233,6 @@ Custom custom5 - True e_create_image_widget evolution-contacts.png @@ -1355,7 +1258,6 @@ Custom custom6 - True e_create_image_widget briefcase.png @@ -1381,7 +1283,6 @@ Custom custom10 - True e_create_image_widget globe.png @@ -1403,13 +1304,39 @@ True + + + GtkLabel + label35 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + entry-company + + 1 + 3 + 2 + 3 + 0 + 0 + False + False + False + False + True + True + + GtkLabel Notebook:tab label15 - True GTK_JUSTIFY_CENTER False @@ -1423,7 +1350,6 @@ GtkTable table-contact-editor-details 7 - True 9 6 False @@ -1433,14 +1359,14 @@ GtkLabel label21 - True - + GTK_JUSTIFY_CENTER False 0 0.5 0 0 + entry-department 1 2 @@ -1460,14 +1386,14 @@ GtkLabel label22 - True - + GTK_JUSTIFY_CENTER False 0 0.5 0 0 + entry-office 1 2 @@ -1487,14 +1413,14 @@ GtkLabel label23 - True - + GTK_JUSTIFY_CENTER False 0 0.5 0 0 + entry-profession 1 2 @@ -1514,14 +1440,14 @@ GtkLabel label24 - True - + GTK_JUSTIFY_CENTER False 0 0.5 0 0 + entry-nickname 1 2 @@ -1541,14 +1467,14 @@ GtkLabel label25 - True - + GTK_JUSTIFY_CENTER False 0 0.5 0 0 + entry-spouse 1 2 @@ -1568,8 +1494,7 @@ GtkLabel label31 - True - + GTK_JUSTIFY_CENTER False 0 @@ -1595,14 +1520,14 @@ GtkLabel label30 - True - + GTK_JUSTIFY_CENTER False 0 0.5 0 0 + entry-assistant 3 4 @@ -1622,14 +1547,14 @@ GtkLabel label29 - True - + GTK_JUSTIFY_CENTER False 0 0.5 0 0 + entry-manager 3 4 @@ -1649,8 +1574,7 @@ GtkLabel label32 - True - + GTK_JUSTIFY_CENTER False 0 @@ -1676,7 +1600,6 @@ GtkEntry entry-spouse - True True True True @@ -1701,7 +1624,6 @@ GtkEntry entry-department - True True True True @@ -1726,7 +1648,6 @@ GtkEntry entry-office - True True True True @@ -1751,7 +1672,6 @@ GtkEntry entry-profession - True True True True @@ -1776,7 +1696,6 @@ GtkEntry entry-nickname - True True True True @@ -1801,7 +1720,6 @@ GnomeDateEdit dateedit-anniversary - True False False False @@ -1826,7 +1744,6 @@ GnomeDateEdit dateedit-birthday - True False False False @@ -1851,7 +1768,6 @@ GtkEntry entry-assistant - True True True True @@ -1876,7 +1792,6 @@ GtkEntry entry-manager - True True True True @@ -1901,7 +1816,6 @@ GtkHSeparator hseparator7 - True 0 6 @@ -1921,8 +1835,7 @@ GtkLabel label33 - True - + GTK_JUSTIFY_CENTER False 0 @@ -1948,7 +1861,6 @@ GtkHSeparator hseparator8 - True 0 6 @@ -1968,7 +1880,6 @@ Custom custom7 - True e_create_image_widget briefcase.png @@ -1994,7 +1905,6 @@ Custom custom8 - True e_create_image_widget malehead.png @@ -2020,7 +1930,6 @@ GtkScrolledWindow scrolledwindow2 - True GTK_POLICY_AUTOMATIC GTK_POLICY_AUTOMATIC GTK_UPDATE_CONTINUOUS @@ -2043,7 +1952,6 @@ GtkText text-comments - True True True @@ -2053,7 +1961,6 @@ Custom custom9 - True e_create_image_widget globe.png @@ -2081,7 +1988,6 @@ GtkLabel Notebook:tab label16 - True GTK_JUSTIFY_CENTER False @@ -2096,7 +2002,7 @@ GnomeDialog dialog2 - True + 2 False GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE @@ -2111,24 +2017,64 @@ GtkVBox GnomeDialog:vbox dialog-vbox2 - True False - 8 + 4 4 True True + + GtkHButtonBox + GnomeDialog:action_area + dialog-action_area2 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 + + 0 + False + True + GTK_PACK_END + + + + GtkButton + button28 + True + True + GNOME_STOCK_BUTTON_OK + + + + GtkButton + button29 + True + True + GNOME_STOCK_BUTTON_APPLY + + + + GtkButton + button30 + True + True + GNOME_STOCK_BUTTON_CANCEL + + + GtkTable table2 - True 2 2 False 0 - 0 + 2 0 True @@ -2138,7 +2084,6 @@ GtkEntry entry2 - True True True True @@ -2163,9 +2108,8 @@ GtkVBox vbox1 - True False - 0 + 2 1 2 @@ -2184,9 +2128,9 @@ GtkButton button31 - True + 2 True - + 0 False @@ -2197,9 +2141,9 @@ GtkButton button32 - True + 2 True - + 0 False @@ -2212,7 +2156,6 @@ GtkScrolledWindow scrolledwindow1 200 - True GTK_POLICY_ALWAYS GTK_POLICY_ALWAYS GTK_UPDATE_CONTINUOUS @@ -2235,7 +2178,6 @@ GtkCList clist1 - True True 1 80 @@ -2247,7 +2189,6 @@ GtkLabel CList:title label20 - True GTK_JUSTIFY_CENTER False @@ -2259,12 +2200,39 @@ + + + + + GnomeDialog + dialog-add-phone + False + New phone type + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + False + False + False + False + False + + + GtkVBox + GnomeDialog:vbox + vbox2 + False + 8 + + 4 + True + True + GtkHButtonBox GnomeDialog:action_area - dialog-action_area2 - True + hbuttonbox1 GTK_BUTTONBOX_END 8 85 @@ -2280,67 +2248,27 @@ GtkButton - button28 - True - True - True - GNOME_STOCK_BUTTON_OK - - - - GtkButton - button29 - True + button43 True + True True - GNOME_STOCK_BUTTON_APPLY + + GNOME_STOCK_PIXMAP_ADD GtkButton - button30 - True + button44 True True GNOME_STOCK_BUTTON_CANCEL - - - - - GnomeDialog - dialog-add-phone - True - False - New phone type - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - False - False - False - False - - - GtkVBox - GnomeDialog:vbox - vbox2 - True - False - 8 - - 4 - True - True - GtkFrame frame-add-phone 4 - True 0 GTK_SHADOW_ETCHED_IN @@ -2354,7 +2282,6 @@ GtkAlignment alignment9 9 - True 0.5 0.5 1 @@ -2363,8 +2290,8 @@ GtkEntry entry-add-phone - True True + True True True 0 @@ -2372,44 +2299,6 @@ - - - GtkHButtonBox - GnomeDialog:action_area - hbuttonbox1 - True - GTK_BUTTONBOX_END - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - - - - GtkButton - button43 - True - True - True - - GNOME_STOCK_PIXMAP_ADD - - - - GtkButton - button44 - True - True - True - GNOME_STOCK_BUTTON_CANCEL - - diff --git a/addressbook/gui/contact-editor/e-contact-editor-strings.h b/addressbook/gui/contact-editor/e-contact-editor-strings.h index 40c2ee85a5..d5f1983573 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-strings.h +++ b/addressbook/gui/contact-editor/e-contact-editor-strings.h @@ -6,7 +6,6 @@ gchar *s = N_("Contact Editor"); gchar *s = N_("_Full Name..."); -gchar *s = N_("Company:"); gchar *s = N_("File As:"); gchar *s = N_("Web page address:"); gchar *s = N_("Wants to receive _HTML mail"); @@ -16,26 +15,27 @@ gchar *s = N_("_Home"); gchar *s = N_("Business _Fax"); gchar *s = N_("_Mobile"); gchar *s = N_("Primary Email"); -gchar *s = N_("Business"); -gchar *s = N_("This is the _mailing address"); -gchar *s = N_("_Contacts..."); +gchar *s = N_("B_usiness"); +gchar *s = N_("_This is the mailing address"); +gchar *s = N_("C_ontacts..."); gchar *s = N_("Ca_tegories..."); -gchar *s = N_("Job Title"); +gchar *s = N_("_Job title:"); +gchar *s = N_("_Company:"); gchar *s = N_("General"); -gchar *s = N_("Department:"); -gchar *s = N_("Office:"); -gchar *s = N_("Profession:"); -gchar *s = N_("Nickname:"); -gchar *s = N_("Spouse:"); -gchar *s = N_("Birthday:"); -gchar *s = N_("Assistant's name:"); -gchar *s = N_("Manager's Name:"); -gchar *s = N_("Anniversary:"); -gchar *s = N_("Notes:"); +gchar *s = N_("_Department:"); +gchar *s = N_("_Office:"); +gchar *s = N_("_Profession:"); +gchar *s = N_("_Nickname:"); +gchar *s = N_("_Spouse:"); +gchar *s = N_("_Birthday:"); +gchar *s = N_("_Assistant's name:"); +gchar *s = N_("_Manager's Name:"); +gchar *s = N_("Anni_versary:"); +gchar *s = N_("No_tes:"); gchar *s = N_("Details"); -gchar *s = N_("Add"); -gchar *s = N_("Delete"); +gchar *s = N_("_Add"); +gchar *s = N_("_Delete"); gchar *s = N_("Phone Types"); gchar *s = N_("New phone type"); -gchar *s = N_("New phone type"); gchar *s = N_("Add"); +gchar *s = N_("New phone type"); -- cgit v1.2.3