inconsistent spelling of canceled

[Brian Murray]

Looking at update-manager dialogs I noticed that canceled is spelled cancelled and canceled - so with 2 l's and with 1. I'm not certain if one is more correct than the other but it should at least be the same.

#: ../DistUpgrade/DistUpgradeController.py:956
msgid "Upgrade canceled"
msgstr ""

#: ../DistUpgrade/DistUpgradeView.py:379
msgid ""
"There are no upgrades available for your system. The upgrade will now be "
"canceled."
msgstr ""

#: ../DistUpgrade/DistUpgradeView.py:372
msgid ""
"Fetching and installing the upgrade can take several hours. Once the "
"download has finished, the process cannot be cancelled."
msgstr ""

[Brian Murray (brian-murray)]

Matthew - could you comment on which spelling of cancelled should be used?

[Daniel Polehn (dpolehn-gmail)]

Looks like indeed neither is more correct than the other. http://www.merriam-webster.com/dictionary/cancel

Going to change all to cancelled.

[Daniel Polehn (dpolehn-gmail)]

looks like canceled is more consistent with what is there currently.

[Yann Dìnendal (yannbreliere)]

Apparently, canceled is the American spelling, and cancelled is British: http://dictionary.reference.com/browse/canceled

[Brian Murray (brian-murray)]

@Daniel - I've commented on your merge proposal.

[Launchpad Janitor (janitor)]

This bug was fixed in the package update-manager - 1:0.156.2

---------------
update-manager (1:0.156.2) precise; urgency=low

  [ Michael Vogt ]
  * DistUpgrade/removal_blacklist.cfg:
    - add unity, unity-2d

  [ Brian Murray ]
  * debian/source_update-manager.py: use attach_file for dist-upgrade log
    files rather than attach_root_command_outputs resolving the double gzipped
    apt clone attachment issue

  [ Matthew Linscott ]
  * UpdateManager/Core/utils.py
    - fixed typos in docstring for ExecutionTime

  [ Daniel Polehn ]
  * DistUpgrade/DistUpgradeView.py
    - Made usage of 'canceled' v. 'cancelled' consistent. LP: #918302
 -- Brian Murray <email address hidden> Wed, 25 Jan 2012 15:37:27 -0800