Merge lp:~notgary-deactivatedaccount/ubuntu/natty/mountall/mountall-fix-685009 into lp:ubuntu/natty/mountall

Proposed by Chris Wilson
Status: Merged
Merged at revision: 349
Proposed branch: lp:~notgary-deactivatedaccount/ubuntu/natty/mountall/mountall-fix-685009
Merge into: lp:ubuntu/natty/mountall
Diff against target: 28 lines (+9/-1)
2 files modified
debian/changelog (+8/-0)
src/mountall.c (+1/-1)
To merge this branch: bzr merge lp:~notgary-deactivatedaccount/ubuntu/natty/mountall/mountall-fix-685009
Reviewer Review Type Date Requested Status
Paul Sladen (community) Approve
Ubuntu branches Pending
Review via email: mp+43819@code.launchpad.net

Description of the change

Fix for bug #685009

To post a comment you must log in.
351. By Chris Wilson

  (thanks, Julie Lyrae; LP: #675269).

352. By Chris Wilson

  (thanks, Julie Lyrae; LP: #685009).

Revision history for this message
Paul Sladen (sladen) wrote :

Good enough for me, thank you Chris and Julie.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-11-29 16:46:01 +0000
3+++ debian/changelog 2010-12-16 00:20:10 +0000
4@@ -1,3 +1,11 @@
5+mountall (2.20+nmu1) natty; urgency=low
6+
7+ * Non-maintainer upload.
8+ * src/mountall Change an output string to be grammatically correct;
9+ (thanks, Julie Lyrae; LP: #685009).
10+
11+ -- Chris Wilson <afrowildo@gmail.com> Wed, 15 Dec 2010 19:50:48 +0000
12+
13 mountall (2.20) natty; urgency=low
14
15 * Don't try to remove /dev/.udev/rules.d/root.rules when running inside
16
17=== modified file 'src/mountall.c'
18--- src/mountall.c 2010-11-29 16:13:28 +0000
19+++ src/mountall.c 2010-12-16 00:20:10 +0000
20@@ -3048,7 +3048,7 @@
21 plymouth_keys = "SsMm";
22 break;
23 case ERROR_FSCK_IN_PROGRESS:
24- message = NIH_MUST (nih_strdup (NULL, _("Your disk drives are being checked for errors, this may take some time")));
25+ message = NIH_MUST (nih_strdup (NULL, _("Your disk drives are being checked for errors. This may take some time")));
26 keys_message = NIH_MUST (nih_sprintf (NULL, "keys:%s",
27 _("Press C to cancel all checks currently in progress")));
28 plymouth_keys = "Cc";

Subscribers

People subscribed via source and target branches

to all changes: