Merge lp:~dpolehn-gmail/update-manager/fix-918302 into lp:update-manager

[Daniel Polehn]

changed use of cancelled to canceled.

[lp:~dpolehn-gmail/update-manager/fix-918302]

2313. By Daniel Polehn on 2012-01-25

Made usage of 'canceled' v. 'cancelled' consistent. LP: #918302

[Brian Murray (brian-murray)]

Perfect, thanks for fixing that!

review: Approve

=== modified file 'DistUpgrade/DistUpgradeView.py'
--- DistUpgrade/DistUpgradeView.py	2011-10-14 22:00:20 +0000
+++ DistUpgrade/DistUpgradeView.py	2012-01-25 22:45:34 +0000
@@ -370,7 +370,7 @@
         if (pkgs_upgrade + pkgs_inst + pkgs_remove) > 100:
           msg += "\n\n%s" % _( "Fetching and installing the upgrade "
                                "can take several hours. Once the download "
-                               "has finished, the process cannot be cancelled.")
+                               "has finished, the process cannot be canceled.")
         # Show an error if no actions are planned
         if (pkgs_upgrade + pkgs_inst + pkgs_remove) < 1:
           # FIXME: this should go into DistUpgradeController

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-25 16:59:26 +0000
+++ debian/changelog	2012-01-25 22:45:34 +0000
@@ -1,3 +1,9 @@
+update-manager (1:0.156.3) precise; urgency=low
+
+  * Made usage of 'canceled' v. 'cancelled' consistent. LP: #918302
+
+ -- Daniel Polehn <[e-mail]>  Wed, 25 Jan 2012 14:36:06 -0800
+
 update-manager (1:0.156.2) UNRELEASED; urgency=low
 
   [ Michael Vogt ]