Software Updater

Merge lp:~evfool/update-manager/fix689034 into lp:update-manager

  1. fix689034
  2. Merge into main
Proposed by Robert Roth
Status: Merged
Merged at revision: 2030
Proposed branch: lp:~evfool/update-manager/fix689034
Merge into: lp:update-manager
Diff against target: 21 lines (+2/-2)
1 file modified
DistUpgrade/DistUpgradeController.py (+2/-2)
To merge this branch: bzr merge lp:~evfool/update-manager/fix689034
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+49355@code.launchpad.net

Description of the change

Fix for lp:#689034 and a simple grammar mistake fix (its was used instead of it's).

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'DistUpgrade/DistUpgradeController.py'
--- DistUpgrade/DistUpgradeController.py 2011-02-03 10:55:15 +0000
+++ DistUpgrade/DistUpgradeController.py 2011-02-11 06:21:54 +0000
@@ -274,7 +274,7 @@
274 descr += _(274 descr += _(
275 "If you run a firewall, you may need to "275 "If you run a firewall, you may need to "
276 "temporarily open this port. As this is "276 "temporarily open this port. As this is "
277 "potentially dangerous its not done automatically."277 "potentially dangerous it's not done automatically. "
278 "You can open the port with e.g.:\n'%s'") % cmd278 "You can open the port with e.g.:\n'%s'") % cmd
279 self._view.information(summary, descr)279 self._view.information(summary, descr)
280 return True280 return True
@@ -966,7 +966,7 @@
966 if user_canceled:966 if user_canceled:
967 self._view.information(_("Upgrade canceled"),967 self._view.information(_("Upgrade canceled"),
968 _("The upgrade will cancel now and the "968 _("The upgrade will cancel now and the "
969 "original system state will be restored."969 "original system state will be restored. "
970 "You can resume the upgrade at a later "970 "You can resume the upgrade at a later "
971 "time."))971 "time."))
972 else:972 else:

Subscribers

People subscribed via source and target branches

to status/vote changes: