From 4a3924cc6730b12a3ae931415774f7d3c1d1093b Mon Sep 17 00:00:00 2001
From: Christopher James Lahey <clahey@ximian.com>
Date: Tue, 14 Aug 2001 09:03:40 +0000
Subject: Got rid of an extraneous _ here.

2001-08-14  Christopher James Lahey  <clahey@ximian.com>

	* gui/merging/e-card-merging-book-commit-duplicate-detected.glade:
	Got rid of an extraneous _ here.

	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
	Changed Canceled to Cancelled here.  Fixes Ximian bug #2465.

svn path=/trunk/; revision=12002
---
 addressbook/ChangeLog                                             | 8 ++++++++
 .../merging/e-card-merging-book-commit-duplicate-detected.glade   | 2 +-
 addressbook/gui/widgets/e-addressbook-util.c                      | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'addressbook')

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index b744cf9779..3c4aed7fc2 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+2001-08-14  Christopher James Lahey  <clahey@ximian.com>
+
+	* gui/merging/e-card-merging-book-commit-duplicate-detected.glade:
+	Got rid of an extraneous _ here.
+
+	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
+	Changed Canceled to Cancelled here.  Fixes Ximian bug #2465.
+
 2001-08-14  Christopher James Lahey  <clahey@ximian.com>
 
 	* backend/pas/pas-book.c (pas_book_respond_get_vcard): Oops,
diff --git a/addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade b/addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade
index 2008fb7757..0bc60ba13a 100644
--- a/addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade
+++ b/addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade
@@ -64,7 +64,7 @@
 	<name>button3</name>
 	<can_default>True</can_default>
 	<can_focus>True</can_focus>
-	<label>_Change Anyway</label>
+	<label>Change Anyway</label>
 	<stock_pixmap>GNOME_STOCK_PIXMAP_ADD</stock_pixmap>
       </widget>
 
diff --git a/addressbook/gui/widgets/e-addressbook-util.c b/addressbook/gui/widgets/e-addressbook-util.c
index 9aaa554547..24a2ab93c0 100644
--- a/addressbook/gui/widgets/e-addressbook-util.c
+++ b/addressbook/gui/widgets/e-addressbook-util.c
@@ -38,7 +38,7 @@ e_addressbook_error_dialog (const gchar *msg, EBookStatus status)
 		N_("Card not found"),
 		N_("Card ID already exists"),
 		N_("Protocol not supported"),
-		N_("Canceled"),
+		N_("Cancelled"),
 		N_("Other error")
 	};
 	char *error_msg;
-- 
cgit v1.2.3