[Pidgin] #12130: Inconsistent usage of "cancelled" and "canceled"

[Pidgin]

#12130: Inconsistent usage of "cancelled" and "canceled"
--------------------------+-------------------------------------------------
 Reporter:  dwc           |     Owner:  rekkanoryo
     Type:  patch         |    Status:  new       
Component:  unclassified  |   Version:  2.7.1     
 Keywords:                |  
--------------------------+-------------------------------------------------
 Hello,

 I sent a file to someone recently. They canceled the file transfer, which
 displayed the expected message.

 However, under an en_US locale, the spelling was inconsistent. In the chat
 window, the message read "cancelled the transfer". In the file transfer
 window, the status read "Canceled".

 I'm attaching a screenshot and a patch that makes the spelling consistent.
 The en_AU, en_CA, and en_GB locales use the British spelling (cancelled).
 I'm not entirely sure I updated the .po file correctly, but everything
 built correctly on my system.

 There were two places in code that I did not change:

  * pidgin/gtkblist.c - lines 407 and 5697 -
 gtk_blist_renderer_editing_cancelled_cb
  * pidgin/gtksession.c - lines 214, 216, 315, 320, 331 - shutdown
 cancelled callback

 For more information:

 http://wiki.answers.com/Q/Is_the_correct_spelling_of_the_following_word_'cancelled'_or_'canceled'

 {{{
 $ echo $LANG
 en_US.utf8
 $ aspell -a
 @(#) International Ispell Version 3.1.20 (but really Aspell 0.60.6)
 cancelled
 & cancelled 13 0: can celled, can-celled, cancel led, cancel-led,
 canceled, concealed, canceler, cancelers, cancels, cancel, counseled,
 candled, canceler's
 }}}

-- 
Ticket URL: <http://developer.pidgin.im/ticket/12130>
Pidgin <http://pidgin.im>
Pidgin