diff options
Diffstat (limited to 'addressbook')
-rw-r--r-- | addressbook/ChangeLog | 12 | ||||
-rw-r--r-- | addressbook/backend/ebook/evolution-gnomecard-importer.c | 1 | ||||
-rw-r--r-- | addressbook/contact-editor/e-contact-editor.c | 2 | ||||
-rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 2 | ||||
-rw-r--r-- | addressbook/gui/widgets/e-addressbook-view.c | 42 | ||||
-rw-r--r-- | addressbook/gui/widgets/e-minicard-view-widget.c | 1 | ||||
-rw-r--r-- | addressbook/gui/widgets/e-minicard-view.c | 5 | ||||
-rw-r--r-- | addressbook/gui/widgets/e-minicard.c | 12 |
8 files changed, 51 insertions, 26 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 39afc758c0..7ea6bcd9d1 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,15 @@ +2001-04-10 Gediminas Paulauskas <menesis@delfi.lt> + + * backend/ebook/evolution-gnomecard-importer.c: added missing #include. + * contact-editor/e-contact-editor.c (_arrow_pressed): popup menu items were + not translated after selecting one of them. + * gui/widgets/e-addressbook-view.c: mark popup menu items with N_(). + Updated list[] for translators. + * gui/widgets/e-minicard.c: same. + * gui/widgets/e-minicard-view-widget.c (e_minicard_view_widget_set_arg): fix warning + for "editable" arg. + * gui/widgets/e-minicard-view.c: convert "empty_message" to utf8. + 2001-04-09 Chris Toshok <toshok@ximian.com> * gui/component/addressbook-component.c (remove_folder): stubbed, diff --git a/addressbook/backend/ebook/evolution-gnomecard-importer.c b/addressbook/backend/ebook/evolution-gnomecard-importer.c index 9a5d15730b..bb5e45cdd6 100644 --- a/addressbook/backend/ebook/evolution-gnomecard-importer.c +++ b/addressbook/backend/ebook/evolution-gnomecard-importer.c @@ -3,6 +3,7 @@ #include <stdio.h> #include <liboaf/liboaf.h> +#include <bonobo/bonobo-context.h> #include <bonobo/bonobo-generic-factory.h> #include <bonobo/bonobo-main.h> diff --git a/addressbook/contact-editor/e-contact-editor.c b/addressbook/contact-editor/e-contact-editor.c index e6ccf0a64d..8c9b7519a3 100644 --- a/addressbook/contact-editor/e-contact-editor.c +++ b/addressbook/contact-editor/e-contact-editor.c @@ -1197,7 +1197,7 @@ _arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *edito GtkWidget *label_widget = glade_xml_get_widget(editor->gui, label); if (label_widget && GTK_IS_LABEL(label_widget)) { gtk_object_set(GTK_OBJECT(label_widget), - "label", g_list_nth_data(*list, menu_item), + "label", _(g_list_nth_data(*list, menu_item)), NULL); } #if 0 diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index e6ccf0a64d..8c9b7519a3 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -1197,7 +1197,7 @@ _arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *edito GtkWidget *label_widget = glade_xml_get_widget(editor->gui, label); if (label_widget && GTK_IS_LABEL(label_widget)) { gtk_object_set(GTK_OBJECT(label_widget), - "label", g_list_nth_data(*list, menu_item), + "label", _(g_list_nth_data(*list, menu_item)), NULL); } #if 0 diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 60ec90b7f9..5a340bc0a6 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -570,12 +570,12 @@ table_right_click(ETableScrolled *table, gint row, gint col, GdkEvent *event, EA CardAndBook *card_and_book; EPopupMenu menu[] = { - {"Save as VCard", NULL, GTK_SIGNAL_FUNC(save_as), NULL, 0}, - {"Send contact to other", NULL, GTK_SIGNAL_FUNC(send_as), NULL, 0}, - {"Send message to contact", NULL, GTK_SIGNAL_FUNC(send_to), NULL, 0}, - {"Print", NULL, GTK_SIGNAL_FUNC(print), NULL, 0}, - {"Print Envelope", NULL, GTK_SIGNAL_FUNC(print_envelope), NULL, 0}, - {"Delete", NULL, GTK_SIGNAL_FUNC(delete), NULL, 0}, + {N_("Save as VCard"), NULL, GTK_SIGNAL_FUNC(save_as), NULL, 0}, + {N_("Send contact to other"), NULL, GTK_SIGNAL_FUNC(send_as), NULL, 0}, + {N_("Send message to contact"), NULL, GTK_SIGNAL_FUNC(send_to), NULL, 0}, + {N_("Print"), NULL, GTK_SIGNAL_FUNC(print), NULL, 0}, + {N_("Print Envelope"), NULL, GTK_SIGNAL_FUNC(print_envelope), NULL, 0}, + {N_("Delete"), NULL, GTK_SIGNAL_FUNC(delete), NULL, 0}, {NULL, NULL, NULL, NULL, 0} }; @@ -639,21 +639,32 @@ status_message (GtkObject *object, const gchar *status, EAddressbookView *eav) #ifdef JUST_FOR_TRANSLATORS static char *list [] = { N_("* Click here to add a contact *"), - N_("Name"), + N_("File As"), + N_("Full Name"), N_("Email"), - N_("Primary"), - N_("Business"), - N_("Home"), + N_("Primary Phone"), + N_("Assistant Phone"), + N_("Business Phone"), + N_("Callback Phone"), + N_("Company Phone"), + N_("Home Phone"), N_("Organization"), - N_("Mobile"), - N_("Car"), + N_("Business Address"), + N_("Home Address"), + N_("Mobile Phone"), + N_("Car Phone"), N_("Business Fax"), N_("Home Fax"), - N_("Business 2"), - N_("Home 2"), + N_("Business Phone 2"), + N_("Home Phone 2"), N_("ISDN"), - N_("Other"), + N_("Other Phone"), + N_("Other Fax"), N_("Pager"), + N_("Radio"), + N_("Telex"), + N_("TTY"), + N_("Other Address"), N_("Email 2"), N_("Email 3"), N_("Web Site"), @@ -667,7 +678,6 @@ static char *list [] = { N_("Spouse"), N_("Note"), N_("Free-busy URL"), - N_("Click here to add a contact") }; #endif diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c index d2dc57ce40..5a4e3d2d06 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.c +++ b/addressbook/gui/widgets/e-minicard-view-widget.c @@ -168,6 +168,7 @@ e_minicard_view_widget_set_arg (GtkObject *o, GtkArg *arg, guint arg_id) break; case ARG_EDITABLE: emvw->editable = GTK_VALUE_BOOL(*arg); + if (emvw->emv) gtk_object_set (GTK_OBJECT(emvw->emv), "editable", emvw->editable, NULL); diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index 115aac6128..caa7c729d4 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -162,8 +162,9 @@ e_minicard_view_init (EMinicardView *view) GTK_SIGNAL_FUNC(selection_changed), view); gtk_object_set(GTK_OBJECT(view), - "empty_message", _("\n\nThere are no items to show in this view\n\n" - "Double-click here to create a new Contact."), + "empty_message", + e_utf8_from_locale_string(_("\n\nThere are no items to show in this view\n\n" + "Double-click here to create a new Contact.")), NULL); E_REFLOW_SORTED(view)->compare_func = (GCompareFunc) e_minicard_compare; diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 1ca1d12aad..b5c11bd27f 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -665,12 +665,12 @@ e_minicard_event (GnomeCanvasItem *item, GdkEvent *event) return ret_val; } else if (event->button.button == 3) { MinicardAndParent *mnp = g_new(MinicardAndParent, 1); - EPopupMenu menu[] = { {"Save as VCard", NULL, GTK_SIGNAL_FUNC(save_as), NULL, 0}, - {"Send contact to other", NULL, GTK_SIGNAL_FUNC(send_as), NULL, 0}, - {"Send message to contact", NULL, GTK_SIGNAL_FUNC(send_to), NULL, 0}, - {"Print", NULL, GTK_SIGNAL_FUNC(print), NULL, 0}, - {"Print Envelope", NULL, GTK_SIGNAL_FUNC(print_envelope), NULL, 0}, - {"Delete", NULL, GTK_SIGNAL_FUNC(delete), NULL, 1}, + EPopupMenu menu[] = { {N_("Save as VCard"), NULL, GTK_SIGNAL_FUNC(save_as), NULL, 0}, + {N_("Send contact to other"), NULL, GTK_SIGNAL_FUNC(send_as), NULL, 0}, + {N_("Send message to contact"), NULL, GTK_SIGNAL_FUNC(send_to), NULL, 0}, + {N_("Print"), NULL, GTK_SIGNAL_FUNC(print), NULL, 0}, + {N_("Print Envelope"), NULL, GTK_SIGNAL_FUNC(print_envelope), NULL, 0}, + {N_("Delete"), NULL, GTK_SIGNAL_FUNC(delete), NULL, 1}, {NULL, NULL, NULL, 0}}; mnp->minicard = e_minicard; mnp->parent = item->parent; |