After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 342163 - change "cancelled" to "canceled"
change "cancelled" to "canceled"
Status: RESOLVED FIXED
Product: evolution-data-server
Classification: Platform
Component: general
1.8.x (obsolete)
Other Linux
: Normal minor
: ---
Assigned To: Harish Krishnaswamy
Evolution QA team
Depends on:
Blocks:
 
 
Reported: 2006-05-17 18:56 UTC by André Klapper
Modified: 2013-09-14 16:49 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
patch. have phun. (32.57 KB, patch)
2006-06-15 15:51 UTC, André Klapper
rejected Details | Review
second try (25.47 KB, patch)
2006-06-15 16:21 UTC, André Klapper
committed Details | Review

Description André Klapper 2006-05-17 18:56:08 UTC
(same like bug 325116, but for e-d-s)

#: ../addressbook/libebook/e-book.c:2698
#, c-format
msgid "%s: cancelled"

#: ../calendar/libecal/e-cal.c:5133
msgid "Operation has been cancelled"

#: ../camel/camel-gpg-context.c:828 ../camel/camel-gpg-context.c:1032
#: ../camel/providers/nntp/camel-nntp-store.c:1272
msgid "Cancelled."

#: ../camel/camel-net-utils.c:497 ../camel/camel-net-utils.c:659
#: ../camel/camel-net-utils.c:790
#: ../camel/providers/pop3/camel-pop3-store.c:446
#: ../camel/providers/pop3/camel-pop3-store.c:527
msgid "Cancelled"

#: ../camel/providers/groupwise/camel-groupwise-folder.c:128
#: ../camel/providers/imap4/camel-imap4-folder.c:788
#: ../camel/providers/nntp/camel-nntp-folder.c:155
#: ../camel/providers/nntp/camel-nntp-folder.c:231
#: ../camel/providers/nntp/camel-nntp-folder.c:370
#: ../camel/providers/pop3/camel-pop3-folder.c:263
#: ../camel/providers/pop3/camel-pop3-folder.c:431
#: ../camel/providers/pop3/camel-pop3-folder.c:492
#: ../camel/providers/pop3/camel-pop3-folder.c:510
msgid "User cancelled"

(hmm... who canceled the user? /me wonders...)

#: ../camel/providers/imap/camel-imap-command.c:223
#: ../camel/providers/imap/camel-imap-command.c:265
#: ../camel/providers/imap/camel-imap-command.c:472
#: ../camel/providers/imap/camel-imap-store.c:3004
msgid "Operation cancelled"

#: ../camel/providers/imap/camel-imap-store.c:591
#: ../camel/providers/imap/camel-imap-store.c:865
#: ../camel/providers/imap4/camel-imap4-store.c:272
#: ../camel/providers/imap4/camel-imap4-store.c:341
#: ../camel/providers/imapp/camel-imapp-store.c:248
#: ../camel/providers/nntp/camel-nntp-store.c:197
#: ../camel/providers/nntp/camel-nntp-store.c:216
#: ../camel/providers/pop3/camel-pop3-store.c:179
#: ../camel/providers/smtp/camel-smtp-transport.c:266
msgid "Connection cancelled"

#: ../camel/providers/local/camel-maildir-folder.c:215
msgid "Maildir append message cancelled"

#: ../camel/providers/local/camel-mbox-folder.c:276
msgid "Mail append cancelled"

#: ../camel/providers/local/camel-mh-folder.c:175
msgid "MH append message cancelled"
Comment 1 André Klapper 2006-06-15 15:51:25 UTC
Created attachment 67432 [details] [review]
patch. have phun.
Comment 2 Karsten Bräckelmann 2006-06-15 16:08:35 UTC
ChangeLog files need to be fixed, otherwise looks good...
Comment 3 André Klapper 2006-06-15 16:21:01 UTC
Created attachment 67436 [details] [review]
second try
Comment 4 Karsten Bräckelmann 2006-06-15 16:37:51 UTC
Looks good. Please commit to HEAD. :)
Comment 5 André Klapper 2006-06-15 16:43:25 UTC
thanks. :-)
patch committed to HEAD. fix will be included in unstable evolution 2.7.4.