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;
i/freebsd-ports-gnome/commit/net/kdenetwork4?id=ea8ff22cff3d553574b25de8cfd89024ab2cb22e'>Add NO_STAGE all over the place in preparation for the staging support (cat: ...bapt2013-09-211-0/+1 * - Remove MAKE_JOBS_SAFE variableak2013-08-151-1/+0 * - Don't touch $HOME/.config during build stagemakc2013-07-222-20/+2 * Update the KDE Software Compilation to 4.10.5.rakuco2013-07-053-2/+13 * Update to KDE SC 4.10.4, proudly presented by the KDE on FreeBSD team.rakuco2013-07-033-70/+2 * - Add another upstream patch to fix build with Clang.avilla2013-06-061-0/+43 * Add upstream patch to fix build with clangmakc2013-05-231-0/+25 * KDE/FreeBSD team presents KDE SC 4.10.3 ports!makc2013-05-194-627/+6 * KDE/FreeBSD team presents KDE SC 4.10.1 ports!makc2013-03-272-5/+5 * Mk/bsd.kde4.mk:makc2013-03-221-1/+2 * libotr is required for kopete onlymakc2013-02-051-1/+1 * KDE/FreeBSD team presents KDE SC 4.9.5 ports!makc2013-02-046-1129/+26 * Chase boost updatebapt2013-01-311-6/+3 * Chase libktorrent updatemakc2012-09-191-2/+2 * Hook security/libotr3 up, and move ports that depend on the old versiondougb2012-09-081-1/+2 * For ports that depend on security/libotr, add the new USE_PKGCONFIG macro.dougb2012-07-261-0/+4 * KDE/FreeBSD team presents KDE SC 4.8.4, probably the last release in 4.8.x se...makc2012-06-153-68/+2 * - Convert USE_QT_VER=4 and QT_COMPONETS to USE_QT4miwi2012-06-061-2/+1 * - Bump PORTREVISION to force rebuild after giflib update.avilla2012-06-031-1/+1 * - Fix Kopete build with giflib 2.4.0.avilla2012-06-031-0/+18 * - update png to 1.5.10dinoex2012-06-011-0/+1 * KDE/FreeBSD team presents long awaited KDE SC 4.8.3!makc2012-05-255-23/+88 * Chase libktorrent updatemakc2012-03-071-2/+2 * - Bump PORTREVISION to chase the update of multimedia/libvpxashish2012-02-161-0/+1 * The KDE/FreeBSD team is pleased to announce KDE SC 4.7.4, whichavilla2012-01-251-2/+2 * The KDE on FreeBSD team is pleased to update the KDE4 ports to 4.7.3.rakuco2011-11-141-2/+2 * The KDE/FreeBSD team is pleased to announce KDE Software Compilationavilla2011-10-175-39/+139 * Update KDE Software Compilation ports to 4.6.5makc2011-07-081-2/+2 * The FreeBSD KDE Team is pleased to announce KDE SC 4.6.4. Read fullavilla2011-06-141-2/+2 * Update KDE Software Compilation ports to 4.6.3makc2011-05-175-32/+2 * Add upstream patch that further addresses CVE-2010-1000makc2011-04-102-0/+18 * The FreeBSD KDE Team is pleased to announce April updates for KDEavilla2011-04-071-2/+2 * The FreeBSD KDE Team is pleased to announce KDE SC 4.6.1 and KDE PIMavilla2011-03-257-344/+23 * - Bump PORTREVISION to chase the update of dns/libidnwen2011-03-141-2/+2 * Chase after net/openldap24-server update.delphij2011-02-251-1/+1 * Fix the shared library version number for libassuan to reflect whatdougb2011-01-141-0/+1 * - The KDE FreeBSD team is proud to announce the release of KDE 4.5.5fluffy2011-01-082-3/+2 * Chase libassuan updatemakc2010-12-251-1/+1 * - Chase security/libksba shlib version bumpglarkin2010-12-161-0/+1 * KDE FreeBSD team presents KDE SC 4.5.4.makc2010-12-033-3/+4 * - Chase telepathy-qt4 shlib bump.avilla2010-11-141-1/+2 * KDE FreeBSD team presents KDE SC 4.5.3.makc2010-11-044-22/+296 * KDE FreeBSD team presents KDE SC 4.5.2.makc2010-10-061-3/+3 * Rearrange include paths to fix build for some cases.makc2010-09-041-0/+10 * KDE FreeBSD team presents KDE SC 4.5.1.makc2010-09-034-51/+41 * - Update net-im/telepathy-qt4 to 0.3.7.avilla2010-08-241-1/+2 * Present KDE SC 4.4.5 for FreeBSD.makc2010-06-301-3/+3 * Present KDE SC 4.4.4 for FreeBSD.makc2010-06-023-217/+4 * - Allow kppp to be built on FreeBSD < 800074fluffy2010-05-162-2/+15 * - Bump PORTREVISION for vulnerability fixfluffy2010-05-131-0/+1 * - Add official fix for kget vulnerabilityfluffy2010-05-131-0/+212 * - The FreeBSD KDE team is pleased to announce KDE SC 4.4.3 for FreeBSDfluffy2010-05-114-41/+148 * Switch to use newer GMP version.ale2010-04-191-2/+2 * - update to 1.4.1dinoex2010-03-281-0/+1 * Presenting KDE 4.3.5 for FreeBSD. The official release notes for thismiwi2010-02-072-4/+3 * - update to jpeg-8dinoex2010-02-051-0/+1 * The FreeBSD KDE is please to announce the release of KDE 4.3.4,miwi2009-12-021-3/+3 * The KDE FreeBSD team is proud to announce the release of KDE 4.3.3miwi2009-11-272-5/+5 * The FreeBSD KDE is please to announce the release of KDE 4.3.1,tabthorpe2009-09-021-3/+3 * Mk/bsd.kde4.mk:makc2009-08-101-3/+0 * The KDE FreeBSD team is proud to announce the release of KDE 4.3.0miwi2009-08-053-46/+103 * - bump all port that indirectly depends on libjpeg and have not yet been bump...dinoex2009-07-311-0/+1 * - Fix cross-buildmiwi2009-07-291-4/+4 * The KDE FreeBSD team is pleased to announce KDE 4.2.4, the last bugfixmiwi2009-06-032-4/+3 * Chase libgmp and bump PORTREVISION.ale2009-05-131-1/+2 * Update KDE ports to 4.2.3makc2009-05-103-607/+616 * The KDE FreeBSD team is proud to announce the release of KDE 4.2.2miwi2009-04-022-4/+4 * bump PORTREVISION after cmake updatemakc2009-03-251-0/+1 * Update KDE to 4.2.1.makc2009-03-097-151/+3 * - Add patches from upstream to bring Yahoo support back \o/miwi2009-02-115-0/+119 * Add missing patch to fix build (noticed by beech)makc2009-02-091-0/+29 * The KDE FreeBSD team is proud to announce the release of KDE 4.2.0miwi2009-02-093-202/+202 * kde@freebsd team is pleased to announce KDE 4.1.4, the last bugfix release in...makc2009-01-142-5/+5 * Bump PORTREVISION's after OpenLDAP update.delphij2009-01-061-0/+1 * The KDE FreeBSD team is proud to announce the release of KDE 4.1.1miwi2008-09-033-5/+3 * - Fix library dependencmiwi2008-08-171-2/+3 * The KDE FreeBSD team is proud to announce the release of KDE 4.1.0miwi2008-08-105-476/+981 * Add missing dependency on libXtstarved2008-08-011-0/+2 * Update to KDE 3.5.8lofi2007-10-301-3/+3 * Update to KDE 3.5.7 / KOffice 1.6.3lofi2007-07-042-4/+3 * - Welcome X.org 7.2 \o/.flz2007-05-201-0/+1 * Update to KDE 3.5.6 / KOffice 1.6.2lofi2007-03-143-31/+4 * Security: Fix CVE-2006-6811lofi2007-01-102-0/+27