aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog11
-rw-r--r--addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in10
-rw-r--r--addressbook/gui/component/addressbook-component.c2
-rw-r--r--addressbook/gui/component/addressbook-config.c4
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/importers/pine-importer.c2
-rw-r--r--plugins/exchange-operations/ChangeLog6
-rw-r--r--plugins/exchange-operations/exchange-user-dialog.c2
8 files changed, 33 insertions, 10 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 8f254e2325..3d8c627907 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,14 @@
+2006-02-05 Karsten Bräckelmann <guenther@rudersport.de>
+
+ * gui/component/GNOME_Evolution_Addressbook.server.in.in:
+ Correcting "Addressbook" to properly read "Address Book".
+ Fixes bug #326256.
+
+ * gui/component/addressbook-config.c (addressbook_config_edit_source):
+ * gui/component/addressbook-component.c (impl_upgradeFromVersion):
+ Correcting "Addressbook" to properly read "Address Book".
+ Fixes bug #326256.
+
2006-02-05 Andre Klapper <a9016009@gmx.de>
* gui/component/ldap-config.glade: fixing one typo.
diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
index eccb7d2e05..ec2b88c1d2 100644
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
+++ b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
@@ -9,7 +9,7 @@
</oaf_attribute>
<oaf_attribute name="name" type="string"
- _value="Evolution Addressbook"/>
+ _value="Evolution Address Book"/>
</oaf_server>
@@ -28,7 +28,7 @@
</oaf_attribute>
<oaf_attribute name="name" type="string"
- _value="Evolution Addressbook card viewer"/>
+ _value="Evolution Address Book card viewer"/>
</oaf_server>
@@ -41,7 +41,7 @@
</oaf_attribute>
<oaf_attribute name="name" type="string"
- _value="Evolution Addressbook component"/>
+ _value="Evolution Address Book component"/>
<oaf_attribute name="evolution:component_alias" type="string" value="contacts"/>
@@ -64,7 +64,7 @@
</oaf_attribute>
<oaf_attribute name="name" type="string"
- _value="Evolution Addressbook address viewer"/>
+ _value="Evolution Address Book address viewer"/>
</oaf_server>
@@ -78,7 +78,7 @@
</oaf_attribute>
<oaf_attribute name="name" type="string"
- _value="Evolution Addressbook address pop-up"/>
+ _value="Evolution Address Book address pop-up"/>
</oaf_server>
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index 9c3fae50c5..476220afed 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -379,7 +379,7 @@ impl_upgradeFromVersion (PortableServer_Servant servant, short major, short mino
GNOME_Evolution_Component_UpgradeFailed *failedex;
failedex = GNOME_Evolution_Component_UpgradeFailed__alloc();
- failedex->what = CORBA_string_dup(_("Failed upgrading Addressbook settings or folders."));
+ failedex->what = CORBA_string_dup(_("Failed upgrading Address Book settings or folders."));
failedex->why = CORBA_string_dup(err->message);
CORBA_exception_set(ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Component_UpgradeFailed, failedex);
}
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
index c7605e1163..3f80c40604 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/addressbook/gui/component/addressbook-config.c
@@ -979,7 +979,7 @@ eabc_details_limit(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, st
static EConfigItem eabc_items[] = {
{ E_CONFIG_BOOK, "", },
{ E_CONFIG_PAGE, "00.general", N_("General") },
- { E_CONFIG_SECTION, "00.general/10.display", N_("Addressbook") },
+ { E_CONFIG_SECTION, "00.general/10.display", N_("Address Book") },
{ E_CONFIG_ITEM, "00.general/10.display/10.name", "hbox122", eabc_general_name },
{ E_CONFIG_ITEM, "00.general/10.display/20.offline", NULL, eabc_general_offline },
#ifdef HAVE_LDAP
@@ -1158,7 +1158,7 @@ addressbook_config_edit_source (GtkWidget *parent, ESource *source)
sdialog->source_list = e_source_list_new_for_gconf(gconf, "/apps/evolution/addressbook/sources");
l = e_source_list_peek_groups(sdialog->source_list);
if (!l) {
- g_warning ("Addressbook source groups are missing! Check your GConf setup.");
+ g_warning ("Address Book source groups are missing! Check your GConf setup.");
g_free (sdialog);
return NULL;
}
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 0b6eae3641..82fee62410 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-05 Karsten Bräckelmann <guenther@rudersport.de>
+
+ * importers/pine-importer.c (pine_getwidget):
+ Correcting "Addressbook" to properly read "Address Book".
+ Fixes bug #326256.
+
2006-02-02 Parthasarathi Susarla <sparthasarathi@novell.com>
* em-composer-utils.c: (em_utils_handle_receipt):
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index 05f893f678..b01caa04b9 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -389,7 +389,7 @@ pine_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im)
g_signal_connect(w, "toggled", G_CALLBACK(checkbox_mail_toggle_cb), target);
gtk_box_pack_start((GtkBox *)box, w, FALSE, FALSE, 0);
- w = gtk_check_button_new_with_label(_("Addressbook"));
+ w = gtk_check_button_new_with_label(_("Address Book"));
gtk_toggle_button_set_active((GtkToggleButton *)w, !done_addr);
g_signal_connect(w, "toggled", G_CALLBACK(checkbox_addr_toggle_cb), target);
gtk_box_pack_start((GtkBox *)box, w, FALSE, FALSE, 0);
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index 05a6035e00..80a84cc338 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-05 Karsten Bräckelmann <guenther@rudersport.de>
+
+ * exchange-user-dialog.c (e2k_user_dialog_construct):
+ Correcting "Addressbook" to properly read "Address Book".
+ Fixes bug #326256.
+
2006-02-03 Sushma Rai <rsushma@novell.com>
* exchange-folder.c (org_gnome_exchange_folder_subscription): Moved
diff --git a/plugins/exchange-operations/exchange-user-dialog.c b/plugins/exchange-operations/exchange-user-dialog.c
index da80a1244c..cfb9a4559b 100644
--- a/plugins/exchange-operations/exchange-user-dialog.c
+++ b/plugins/exchange-operations/exchange-user-dialog.c
@@ -179,7 +179,7 @@ e2k_user_dialog_construct (E2kUserDialog *dialog,
gtk_box_pack_start (GTK_BOX (vbox), priv->entry, TRUE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 6);
- button = gtk_button_new_with_label (_("Addressbook..."));
+ button = gtk_button_new_with_label (_("Address Book..."));
g_signal_connect (button, "clicked",
G_CALLBACK (addressbook_clicked_cb),
dialog);