From 1991d205daa7f5b5754ba67328996c904dc26ecd Mon Sep 17 00:00:00 2001 From: Gediminas Paulauskas Date: Tue, 10 Apr 2001 21:28:40 +0000 Subject: i18n fixes, added missing includes. 2001-04-10 Gediminas Paulauskas * AUTHORS: /me is a translator. * configure.in (EVO_CHECK_LIB): fail with AC_MSG_ERROR, not echo && exit 1. 2001-04-10 Gediminas Paulauskas * 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-10 Gediminas Paulauskas * widgets/e-summary-subwindow.c: added some missing includes. * widgets/e-summary-title-button.h: same. 2001-04-10 Gediminas Paulauskas * menus/gal-view-menus.c: convert label to utf8. svn path=/trunk/; revision=9215 --- AUTHORS | 1 + ChangeLog | 6 ++++ addressbook/ChangeLog | 12 +++++++ .../backend/ebook/evolution-gnomecard-importer.c | 1 + addressbook/contact-editor/e-contact-editor.c | 2 +- addressbook/gui/contact-editor/e-contact-editor.c | 2 +- addressbook/gui/widgets/e-addressbook-view.c | 42 +++++++++++++--------- addressbook/gui/widgets/e-minicard-view-widget.c | 1 + addressbook/gui/widgets/e-minicard-view.c | 5 +-- addressbook/gui/widgets/e-minicard.c | 12 +++---- configure.in | 8 ++--- executive-summary/ChangeLog | 5 +++ executive-summary/widgets/e-summary-subwindow.c | 4 ++- executive-summary/widgets/e-summary-title-button.h | 1 + widgets/ChangeLog | 4 +++ widgets/menus/gal-view-menus.c | 4 ++- widgets/misc/e-search-bar.c | 9 ++--- widgets/misc/test-calendar.c | 2 -- 18 files changed, 83 insertions(+), 38 deletions(-) diff --git a/AUTHORS b/AUTHORS index 1dd45c8d30..ac9da57868 100644 --- a/AUTHORS +++ b/AUTHORS @@ -51,6 +51,7 @@ Translations Arjan Scherpenisse Clara Tattoni Fatih Demir + Gediminas Paulauskas GNOME PL Team Gustavo Maciel Dias Vieira Héctor García Alvarez diff --git a/ChangeLog b/ChangeLog index 19e1622627..4c11055007 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-04-10 Gediminas Paulauskas + + * AUTHORS: /me is a translator. + * configure.in (EVO_CHECK_LIB): fail with AC_MSG_ERROR, not echo && + exit 1. + 2001-04-10 Jeffrey Stedfast * configure.in (EVOLUTION_DIR): create the makefile in 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 + + * 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 * 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 #include +#include #include #include 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; diff --git a/configure.in b/configure.in index 42ff804917..c861ef90c7 100644 --- a/configure.in +++ b/configure.in @@ -27,10 +27,10 @@ AC_DEFUN(EVO_CHECK_LIB, [ pkgvers=`echo $pkgvers | awk -F. '{ print $[]1 * 1000000 + $[]2 * 10000 + $[]3 * 100 + $[]4;}'` if test "$pkgvers" -lt $cmpvers; then - echo "" - echo "You need $dispname $dispvers or later to build Evolution" 1>&2 - echo "(If you think you already have this installed, consult the README.)" 1>&2 - exit 1 + AC_MSG_ERROR([ +"" +"You need $dispname $dispvers or later to build Evolution" +"If you think you already have this installed, consult the README."]) fi ]) diff --git a/executive-summary/ChangeLog b/executive-summary/ChangeLog index 91f0a82559..ad89791868 100644 --- a/executive-summary/ChangeLog +++ b/executive-summary/ChangeLog @@ -1,3 +1,8 @@ +2001-04-10 Gediminas Paulauskas + + * widgets/e-summary-subwindow.c: added some missing includes. + * widgets/e-summary-title-button.h: same. + 2001-04-04 Gediminas Paulauskas * component/component-factory.c: last time I've broken shortcut view. diff --git a/executive-summary/widgets/e-summary-subwindow.c b/executive-summary/widgets/e-summary-subwindow.c index 961fbd7ac4..d93e170690 100644 --- a/executive-summary/widgets/e-summary-subwindow.c +++ b/executive-summary/widgets/e-summary-subwindow.c @@ -25,10 +25,12 @@ #include #endif +#include #include #include - #include +#include +#include #include "e-summary-subwindow.h" #include "e-summary-titlebar.h" diff --git a/executive-summary/widgets/e-summary-title-button.h b/executive-summary/widgets/e-summary-title-button.h index a99a96815a..f79f986d07 100644 --- a/executive-summary/widgets/e-summary-title-button.h +++ b/executive-summary/widgets/e-summary-title-button.h @@ -26,6 +26,7 @@ #include #include +#include #define E_SUMMARY_TITLE_BUTTON_TYPE (e_summary_title_button_get_type ()) #define E_SUMMARY_TITLE_BUTTON(obj) (GTK_CHECK_CAST ((obj), E_SUMMARY_TITLE_BUTTON_TYPE, ESummaryTitleButton)) diff --git a/widgets/ChangeLog b/widgets/ChangeLog index b506006d50..bf376501c8 100644 --- a/widgets/ChangeLog +++ b/widgets/ChangeLog @@ -1,3 +1,7 @@ +2001-04-10 Gediminas Paulauskas + + * menus/gal-view-menus.c: convert label to utf8. + 2001-04-04 Kjartan Maraas * menus/gal-view-menus.c: Fix headers. diff --git a/widgets/menus/gal-view-menus.c b/widgets/menus/gal-view-menus.c index 220a2a75d8..01fbdc3b51 100644 --- a/widgets/menus/gal-view-menus.c +++ b/widgets/menus/gal-view-menus.c @@ -20,6 +20,7 @@ #include #include #include +#include struct _GalViewMenusPrivate { GalViewCollection *collection; @@ -193,7 +194,8 @@ build_menus(GalViewMenus *menus) menuitem = bonobo_ui_node_new_child(submenu, "menuitem"); bonobo_ui_node_set_attr(menuitem, "name", "DefineViews"); - bonobo_ui_node_set_attr(menuitem, "_label", "Define Views"); + bonobo_ui_node_set_attr(menuitem, "_label", + e_utf8_from_locale_string(_("Define Views"))); bonobo_ui_node_set_attr(menuitem, "verb", "DefineViews"); string = bonobo_ui_node_to_string(root, TRUE); diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index 4da78b8001..57fd114f8a 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -27,19 +27,20 @@ #include #include /* printf */ -#include #include #include #include #include + +#include +#include + #include #include + #include "e-search-bar.h" #include "e-dropdown-button.h" -#include -#include - enum { QUERY_CHANGED, diff --git a/widgets/misc/test-calendar.c b/widgets/misc/test-calendar.c index fb67e406a2..735633424f 100644 --- a/widgets/misc/test-calendar.c +++ b/widgets/misc/test-calendar.c @@ -30,8 +30,6 @@ #include #endif - -#include #include #include #include -- cgit v1.2.3