apport-hackers team mailing list archive

[Matthew Paul Thomas <mpt@xxxxxxxxxxxxx>]

Matthew Paul Thomas has proposed merging lp:~mpt/apport/1448636-occured into lp:apport.

Requested reviews:
  Apport upstream developers (apport-hackers)
Related bugs:
  Bug #1448636 in apport (Ubuntu): "Suspend/resume failure misspells "occurred""
  https://bugs.launchpad.net/ubuntu/+source/apport/+bug/1448636

For more details, see:
https://code.launchpad.net/~mpt/apport/1448636-occured/+merge/257476

Fixes bug 1448636 (Suspend/resume failure misspells 'occurred').
-- 
Your team Apport upstream developers is requested to review the proposed merge of lp:~mpt/apport/1448636-occured into lp:apport.

=== modified file 'data/apportcheckresume'
--- data/apportcheckresume	2014-05-16 16:54:57 +0000
+++ data/apportcheckresume	2015-04-26 10:08:18 +0000
@@ -70,9 +70,9 @@
 
         # Generate a sensible report message.
         if pr.get('Failure') == 'suspend/resume':
-            pr['Annotation'] = _('This occured during a previous suspend and prevented it from resuming properly.')
+            pr['Annotation'] = _('This occurred during a previous suspend, and prevented the system from resuming properly.')
         else:
-            pr['Annotation'] = _('This occured during a previous hibernate and prevented it from resuming properly.')
+            pr['Annotation'] = _('This occurred during a previous hibernation, and prevented the system from resuming properly.')
 
         # If we had a late hang make sure the dialog is clear that they may
         # not have noticed.  Also update the bug title so we notice.