diff options
author | Andre Klapper <a9016009@gmx.de> | 2005-12-30 12:15:33 +0800 |
---|---|---|
committer | Andre Klapper <aklapper@src.gnome.org> | 2005-12-30 12:15:33 +0800 |
commit | a9eaa8d3bf362b020ee07d8e26fbd97ad13627fd (patch) | |
tree | b82326adac7bca568179ecf6f0dac7b28d7296c7 | |
parent | acf3cb7653d55ce831c476983d2bc7619766467d (diff) | |
download | gsoc2013-evolution-a9eaa8d3bf362b020ee07d8e26fbd97ad13627fd.tar gsoc2013-evolution-a9eaa8d3bf362b020ee07d8e26fbd97ad13627fd.tar.gz gsoc2013-evolution-a9eaa8d3bf362b020ee07d8e26fbd97ad13627fd.tar.bz2 gsoc2013-evolution-a9eaa8d3bf362b020ee07d8e26fbd97ad13627fd.tar.lz gsoc2013-evolution-a9eaa8d3bf362b020ee07d8e26fbd97ad13627fd.tar.xz gsoc2013-evolution-a9eaa8d3bf362b020ee07d8e26fbd97ad13627fd.tar.zst gsoc2013-evolution-a9eaa8d3bf362b020ee07d8e26fbd97ad13627fd.zip |
changing "canceled" to "cancelled" to stay consistant to the rest. Fixes
2005-12-30 Andre Klapper <a9016009@gmx.de>
* evolution/mail/mail-session.c, evolution/calendar/calendar.error.xml:
changing "canceled" to "cancelled" to stay consistant to the rest.
Fixes bug 325116.
svn path=/trunk/; revision=30974
-rw-r--r-- | calendar/calendar.error.xml | 2 | ||||
-rw-r--r-- | mail/mail-session.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/calendar/calendar.error.xml b/calendar/calendar.error.xml index d51c009c0c..ab9b944452 100644 --- a/calendar/calendar.error.xml +++ b/calendar/calendar.error.xml @@ -3,7 +3,7 @@ <error id="prompt-cancel-meeting" type="question" defult="GTK_RESPONSE_YES"> <_primary>Would you like to send all the participants a cancellation notice?</_primary> - <_secondary>If you don't send a cancellation notice, the other participants may not know the meeting is canceled.</_secondary> + <_secondary>If you don't send a cancellation notice, the other participants may not know the meeting is cancelled.</_secondary> <button _label="Don't Send" response="GTK_RESPONSE_NO"/> <button _label="Send Notice" response="GTK_RESPONSE_YES"/> </error> diff --git a/mail/mail-session.c b/mail/mail-session.c index b132130616..d8ebb0ec13 100644 --- a/mail/mail-session.c +++ b/mail/mail-session.c @@ -238,7 +238,7 @@ get_password (CamelSession *session, CamelService *service, const char *domain, g_free(url); if (ret == NULL) - camel_exception_set(ex, CAMEL_EXCEPTION_USER_CANCEL, _("User canceled operation.")); + camel_exception_set(ex, CAMEL_EXCEPTION_USER_CANCEL, _("User cancelled operation.")); return ret; } |