Apport

Merge lp:~mpt/apport/1448636-occured into lp:~apport-hackers/apport/trunk

  1. 1448636-occured
  2. Merge into trunk
Proposed by Matthew Paul Thomas
Status: Merged
Merged at revision: 2951
Proposed branch: lp:~mpt/apport/1448636-occured
Merge into: lp:~apport-hackers/apport/trunk
Diff against target: 15 lines (+2/-2)
1 file modified
data/apportcheckresume (+2/-2)
To merge this branch: bzr merge lp:~mpt/apport/1448636-occured
Reviewer Review Type Date Requested Status
Martin Pitt (community) Approve
Review via email: mp+257476@code.launchpad.net

Description of the change

Fixes bug 1448636 (Suspend/resume failure misspells 'occurred').

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks! Merged with updating po/*.po as well (to avoid breaking all translations) and with a NEWS entry.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/apportcheckresume'
2--- data/apportcheckresume 2014-05-16 16:54:57 +0000
3+++ data/apportcheckresume 2015-04-26 10:14:22 +0000
4@@ -70,9 +70,9 @@
5
6 # Generate a sensible report message.
7 if pr.get('Failure') == 'suspend/resume':
8- pr['Annotation'] = _('This occured during a previous suspend and prevented it from resuming properly.')
9+ pr['Annotation'] = _('This occurred during a previous suspend, and prevented the system from resuming properly.')
10 else:
11- pr['Annotation'] = _('This occured during a previous hibernate and prevented it from resuming properly.')
12+ pr['Annotation'] = _('This occurred during a previous hibernation, and prevented the system from resuming properly.')
13
14 # If we had a late hang make sure the dialog is clear that they may
15 # not have noticed. Also update the bug title so we notice.

Subscribers

People subscribed via source and target branches