Software Updater

Merge lp:~brian-murray/update-manager/upgrade-canceled-wording into lp:update-manager

  1. upgrade-canceled-wording
  2. Merge into main
Proposed by Brian Murray
Status: Merged
Merged at revision: 1969
Proposed branch: lp:~brian-murray/update-manager/upgrade-canceled-wording
Merge into: lp:update-manager
Diff against target: 17 lines (+4/-3)
1 file modified
DistUpgrade/DistUpgradeController.py (+4/-3)
To merge this branch: bzr merge lp:~brian-murray/update-manager/upgrade-canceled-wording
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+41121@code.launchpad.net

Description of the change

This branch changes the wording of the Upgrade canceled dialog to the present tense.

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
1=== modified file 'DistUpgrade/DistUpgradeController.py'
2--- DistUpgrade/DistUpgradeController.py 2010-11-12 09:04:40 +0000
3+++ DistUpgrade/DistUpgradeController.py 2010-11-18 01:04:56 +0000
4@@ -958,9 +958,10 @@
5 # maximum fetch-retries reached without a successful commit
6 if user_canceled:
7 self._view.information(_("Upgrade canceled"),
8- _("The upgrade cancels now and the original "
9- "system state is restored. You can resume "
10- "the upgrade at a later time."))
11+ _("The upgrade will cancel now and the "
12+ "original system state will be restored."
13+ "You can resume the upgrade at a later "
14+ "time."))
15 else:
16 logging.error("giving up on fetching after maximum retries")
17 self._view.error(_("Could not download the upgrades"),

Subscribers

People subscribed via source and target branches

to status/vote changes: