Checkbox

Merge lp:~nathwill-deactivatedaccount-deactivatedaccount/checkbox/fix-lp-987652 into lp:checkbox

  1. fix-lp-987652
  2. Merge into trunk
Proposed by Nathan Williams
Status: Merged
Merged at revision: 1369
Proposed branch: lp:~nathwill-deactivatedaccount-deactivatedaccount/checkbox/fix-lp-987652
Merge into: lp:checkbox
Diff against target: 25 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
jobs/optical.txt.in (+1/-1)
To merge this branch: bzr merge lp:~nathwill-deactivatedaccount-deactivatedaccount/checkbox/fix-lp-987652
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+103227@code.launchpad.net

Description of the change

fix typo in jobs/optical.txt.in (lp: #987652)

To post a comment you must log in.
Revision history for this message
Nathan Williams (nathwill-deactivatedaccount-deactivatedaccount) wrote :

sorry for the earlier false-start, i didn't realize it's best not to make string changes in the translations files. that's been fixed in this merge request, and string fix is only in the source file.

Revision history for this message
Daniel Manrique (roadmr) wrote :

Hi Nathan,

Thanks so much for your contribution to checkbox. I've merged the changes and, though unfortunately it's late for them to make into Ubuntu 12.04, they'll certainly be included in upcoming releases.

One small comment: Since Checkbox 0.13.8 is the development version, your changes in changelog should go under the 0.13.8 section, instead of creating a 0.13.8ubuntu1 one. If you're using the dch command from the devscripts package, just doing "dch" does the right thing and adds a section under the current version, no need to use dch -i. This was a minor issue though, and I corrected it prior to merging.

Thanks again!

review: Approve
Revision history for this message
Nathan Williams (nathwill-deactivatedaccount-deactivatedaccount) wrote :

Hi Daniel,

Thanks for approving the merge, and I appreciate the tip on dch usage.

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 2012-04-19 13:54:07 +0000
3+++ debian/changelog 2012-04-24 06:55:21 +0000
4@@ -1,3 +1,9 @@
5+checkbox (0.13.8ubuntu1) precise; urgency=low
6+
7+ * fix typo in jobs/optical.txt.in (lp: #987652)
8+
9+ -- Nathan Williams <nathan@nathanewilliams.com> Mon, 23 Apr 2012 23:46:27 -0700
10+
11 checkbox (0.13.8) precise; urgency=low
12
13 [Jeff Lane]
14
15=== modified file 'jobs/optical.txt.in'
16--- jobs/optical.txt.in 2012-04-11 20:10:04 +0000
17+++ jobs/optical.txt.in 2012-04-24 06:55:21 +0000
18@@ -19,7 +19,7 @@
19 STEPS:
20 1. Insert appropriate non-blank media into your optical drive(s). Movie and Audio Disks may not work. Self-created data disks have the greatest chance of working.
21 2. If a file browser window opens, you can safely close or ignore that window.
22- 3. Click "Test" to being the test.
23+ 3. Click "Test" to begin the test.
24 VERIFICATION:
25 This test should automatically select "Yes" if it passes, "No" if it fails.
26

Subscribers

People subscribed via source and target branches