aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer/ChangeLog6
-rw-r--r--composer/e-msg-composer.c4
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/message-browser.c2
-rw-r--r--shell/ChangeLog15
-rw-r--r--shell/e-shell-view-menu.c4
-rw-r--r--shell/e-shell-view.c12
-rw-r--r--shell/e-splash.c2
-rw-r--r--shell/main.c12
9 files changed, 44 insertions, 18 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 6ed27c9dbd..e72fe1b1cc 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-05 Ettore Perazzoli <ettore@ximian.com>
+
+ * e-msg-composer.c (autosave_manager_query_load_orphans):
+ s/Evolution/Ximian Evolution/.
+ (do_exit): Set the title to be "Warning: Modified Message".
+
2001-08-29 Jon Trowbridge <trow@ximian.com>
* e-msg-composer.c (e_msg_composer_get_message_draft): Pass
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 5dcaf73400..c3d4ec1da7 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1169,7 +1169,7 @@ autosave_manager_query_load_orphans (AutosaveManager *am, EMsgComposer *composer
closedir (dir);
if (match != NULL) {
- dialog = gnome_question_dialog_parented (_("Evolution has found unsaved files from a previous session.\n"
+ dialog = gnome_question_dialog_parented (_("Ximian Evolution has found unsaved files from a previous session.\n"
"Would you like to try to recover them?"),
autosave_query_cb, &load, GTK_WINDOW (composer));
@@ -1324,7 +1324,7 @@ do_exit (EMsgComposer *composer)
GNOME_STOCK_BUTTON_CANCEL, /* Cancel */
NULL);
- gtk_window_set_title (GTK_WINDOW (dialog), _("Evolution"));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Warning: Modified Message"));
gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (composer));
gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);
button = gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 44d73b4a8f..573d06fd1a 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-05 Ettore Perazzoli <ettore@ximian.com>
+
+ * message-browser.c (message_browser_new): s/Evolution/Ximian
+ Evolution/.
+
2001-09-04 Ettore Perazzoli <ettore@ximian.com>
[Fix #7542, "Crash Afer Closing".]
diff --git a/mail/message-browser.c b/mail/message-browser.c
index 5987eb2aae..87255efefe 100644
--- a/mail/message-browser.c
+++ b/mail/message-browser.c
@@ -214,7 +214,7 @@ message_browser_new (const GNOME_Evolution_Shell shell, const char *uri, const c
FolderBrowser *fb;
new = gtk_type_new (MESSAGE_BROWSER_TYPE);
- new = (MessageBrowser *) bonobo_window_construct (BONOBO_WINDOW (new), "Evolution", "");
+ new = (MessageBrowser *) bonobo_window_construct (BONOBO_WINDOW (new), "Ximian Evolution", "");
if (!new) {
g_warning ("Failed to construct Bonobo window!");
return NULL;
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 8bbd937ec7..eb04501571 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,18 @@
+2001-09-05 Ettore Perazzoli <ettore@ximian.com>
+
+ * main.c (development_warning): s/Evolution/Ximian Evolution/.
+ (idle_cb): Likewise.
+
+ * e-splash.c (e_splash_construct): s/Evolution/Ximian Evolution/.
+
+ * e-shell-view.c (e_shell_view_construct): s/Evolution/Ximian
+ Evolution/.
+ (update_for_current_uri): Likewise.
+ (update_offline_toggle_status): Likewise.
+
+ * e-shell-view-menu.c (command_about_box): s/Evolution/Ximian
+ Evolution/.
+
2001-09-04 Ettore Perazzoli <ettore@ximian.com>
[Fix #6474 and friends, crash when selecting things from the
diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c
index f62d443091..1d4d4c1671 100644
--- a/shell/e-shell-view-menu.c
+++ b/shell/e-shell-view-menu.c
@@ -214,11 +214,11 @@ command_about_box (BonoboUIComponent *uih,
else
version = g_strdup_printf ("%s [%s]", VERSION, SUB_VERSION);
- about_box = gnome_about_new(_("Evolution"),
+ about_box = gnome_about_new(_("Ximian Evolution"),
version,
_("Copyright 1999, 2000, 2001 Ximian, Inc."),
authors,
- _("Evolution is a suite of groupware applications\n"
+ _("Ximian Evolution is a suite of groupware applications\n"
"for mail, calendaring, and contact management\n"
"within the GNOME desktop environment."),
NULL);
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 4186427e93..4161ba727a 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -1275,7 +1275,7 @@ e_shell_view_construct (EShellView *shell_view,
priv = shell_view->priv;
- view = E_SHELL_VIEW (bonobo_window_construct (BONOBO_WINDOW (shell_view), "evolution", "Evolution"));
+ view = E_SHELL_VIEW (bonobo_window_construct (BONOBO_WINDOW (shell_view), "evolution", "Ximian Evolution"));
if (!view) {
gtk_object_unref (GTK_OBJECT (shell_view));
@@ -1499,9 +1499,9 @@ update_for_current_uri (EShellView *shell_view)
title = g_strdup (folder_name);
if (SUB_VERSION[0] == '\0')
- utf8_window_title = g_strdup_printf (_("%s - Evolution %s"), title, VERSION);
+ utf8_window_title = g_strdup_printf (_("%s - Ximian Evolution %s"), title, VERSION);
else
- utf8_window_title = g_strdup_printf (_("%s - Evolution %s [%s]"), title, VERSION, SUB_VERSION);
+ utf8_window_title = g_strdup_printf (_("%s - Ximian Evolution %s [%s]"), title, VERSION, SUB_VERSION);
gtk_window_title = e_utf8_to_gtk_string (GTK_WIDGET (shell_view), utf8_window_title);
gtk_window_set_title (GTK_WINDOW (shell_view), gtk_window_title);
@@ -1541,20 +1541,20 @@ update_offline_toggle_status (EShellView *shell_view)
icon_pixmap = online_pixmap;
icon_mask = online_mask;
sensitive = TRUE;
- tooltip = _("Evolution is currently online. "
+ tooltip = _("Ximian Evolution is currently online. "
"Click on this button to work offline.");
break;
case E_SHELL_LINE_STATUS_GOING_OFFLINE:
icon_pixmap = online_pixmap;
icon_mask = online_mask;
sensitive = FALSE;
- tooltip = _("Evolution is in the process of going offline.");
+ tooltip = _("Ximian Evolution is in the process of going offline.");
break;
case E_SHELL_LINE_STATUS_OFFLINE:
icon_pixmap = offline_pixmap;
icon_mask = offline_mask;
sensitive = TRUE;
- tooltip = _("Evolution is currently offline. "
+ tooltip = _("Ximian Evolution is currently offline. "
"Click on this button to work online.");
break;
default:
diff --git a/shell/e-splash.c b/shell/e-splash.c
index ff544d14ab..14ab3a7d37 100644
--- a/shell/e-splash.c
+++ b/shell/e-splash.c
@@ -329,7 +329,7 @@ e_splash_construct (ESplash *splash,
gtk_window_set_policy (GTK_WINDOW (splash), FALSE, FALSE, FALSE);
gtk_window_set_default_size (GTK_WINDOW (splash), image_width, image_height);
gnome_window_icon_set_from_file (GTK_WINDOW (splash), EVOLUTION_DATADIR "/pixmaps/evolution.png");
- gtk_window_set_title (GTK_WINDOW (splash), "Evolution");
+ gtk_window_set_title (GTK_WINDOW (splash), "Ximian Evolution");
}
diff --git a/shell/main.c b/shell/main.c
index 41d0156981..aaecaa5f37 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -88,14 +88,14 @@ development_warning (void)
{
GtkWidget *label, *warning_dialog;
- warning_dialog = gnome_dialog_new ("Evolution " VERSION, GNOME_STOCK_BUTTON_OK, NULL);
+ warning_dialog = gnome_dialog_new ("Ximian Evolution " VERSION, GNOME_STOCK_BUTTON_OK, NULL);
label = gtk_label_new (
/* xgettext:no-c-format */
_("Hi. Thanks for taking the time to download this preview release\n"
- "of the Evolution groupware suite.\n"
+ "of the Ximian Evolution groupware suite.\n"
"\n"
- "Evolution is not yet complete. It's getting close, but there are\n"
+ "Ximian Evolution is not yet complete. It's getting close, but there are\n"
"places where features are either missing or only half working. \n"
"\n"
"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
@@ -114,7 +114,7 @@ development_warning (void)
label = gtk_label_new (
_(
"Thanks\n"
- "The Evolution Team\n"
+ "The Ximian Evolution Team\n"
));
gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
gtk_misc_set_alignment(GTK_MISC(label), 1, .5);
@@ -170,7 +170,7 @@ idle_cb (void *data)
corba_shell = oaf_activate_from_id (E_SHELL_OAFIID, 0, NULL, &ev);
if (ev._major != CORBA_NO_EXCEPTION || corba_shell == CORBA_OBJECT_NIL) {
e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
- _("Cannot access the Evolution shell."));
+ _("Cannot access the Ximian Evolution shell."));
CORBA_exception_free (&ev);
gtk_main_quit ();
return FALSE;
@@ -181,7 +181,7 @@ idle_cb (void *data)
default:
e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
- _("Cannot initialize the Evolution shell: %s"),
+ _("Cannot initialize the Ximian Evolution shell: %s"),
e_shell_construct_result_to_string (result));
CORBA_exception_free (&ev);
gtk_main_quit ();
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 16:31:31 +0800