aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@ximian.com>2001-08-14 17:03:40 +0800
committerChris Lahey <clahey@src.gnome.org>2001-08-14 17:03:40 +0800
commit4a3924cc6730b12a3ae931415774f7d3c1d1093b (patch)
tree2434d3449367dbb98149b2ecc9bd0f32921983f4
parent8b88aaa021b82bac2f29934aafc1bd6d8ad0b8a9 (diff)
downloadgsoc2013-evolution-4a3924cc6730b12a3ae931415774f7d3c1d1093b.tar.gz
gsoc2013-evolution-4a3924cc6730b12a3ae931415774f7d3c1d1093b.tar.zst
gsoc2013-evolution-4a3924cc6730b12a3ae931415774f7d3c1d1093b.zip
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
-rw-r--r--addressbook/ChangeLog8
-rw-r--r--addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade2
-rw-r--r--addressbook/gui/widgets/e-addressbook-util.c2
3 files changed, 10 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index b744cf9779..3c4aed7fc2 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,13 @@
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,
forgot to write this function.
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;