diff options
| -rw-r--r-- | shell/ChangeLog | 9 | ||||
| -rw-r--r-- | shell/e-component-info.c | 7 | ||||
| -rw-r--r-- | shell/e-shell-settings-dialog.c | 4 |
3 files changed, 11 insertions, 9 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 4a9d3dbdca..97dcec3383 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,12 @@ +2002-11-25 Dan Winship <danw@ximian.com> + + * e-shell-settings-dialog.c (page_new): e_get_language_list now + returns language codes that actually work with oaf, making the + _()s here redundant. + + * e-component-info.c (get_i18n_value): Remove code to turn "fr_FR" + into "fr", since e_get_language_list will return both now. + 2002-11-25 Ettore Perazzoli <ettore@ximian.com> * apps_evolution_shell.schemas: Fix <key> -> <applyto> typo. diff --git a/shell/e-component-info.c b/shell/e-component-info.c index 8cb93d5c09..a89647c8a1 100644 --- a/shell/e-component-info.c +++ b/shell/e-component-info.c @@ -115,13 +115,6 @@ get_i18n_value (xmlNode *parent_node, language_id = (const char *) p->data; node = lookup_node_for_language (parent_node, node_name, language_id); - if (node == NULL && language_id[2] == '_') { - char short_language_id[3]; - - strncpy (short_language_id, language_id, 2); - node = lookup_node_for_language (parent_node, node_name, short_language_id); - } - if (node != NULL) { xmlChar *xml_value; char *glib_value; diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c index a99a0dfc54..4161cba791 100644 --- a/shell/e-shell-settings-dialog.c +++ b/shell/e-shell-settings-dialog.c @@ -94,8 +94,8 @@ page_new (const char *title, gdk_pixbuf_ref (icon); page = g_new (Page, 1); - page->title = g_strdup (_(title)); - page->description = g_strdup (_(description)); + page->title = g_strdup (title); + page->description = g_strdup (description); page->icon = icon; page->type = type; page->priority = priority; |