Merge lp:~roadmr/checkbox/642001 into lp:checkbox

Proposed by Daniel Manrique
Status: Merged
Merged at revision: 891
Proposed branch: lp:~roadmr/checkbox/642001
Merge into: lp:checkbox
Diff against target: 53 lines (+7/-4)
2 files modified
debian/changelog (+3/-0)
jobs/user_apps.txt.in (+4/-4)
To merge this branch: bzr merge lp:~roadmr/checkbox/642001
Reviewer Review Type Date Requested Status
Marc Tardif (community) Approve
Review via email: mp+53097@code.launchpad.net

Description of the change

Grammar fix as described in bug 642001. I basically verified and merged the attached patch, original submitter has credit in the changelog.

To post a comment you must log in.
Revision history for this message
Marc Tardif (cr3) wrote :

Looks good though, merging.

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 2011-03-11 21:14:52 +0000
3+++ debian/changelog 2011-03-11 21:46:17 +0000
4@@ -6,6 +6,9 @@
5 [Daniel Manrique]
6 * Fixed strings in audio tests and updated pot file (LP: #691241)
7
8+ [Jochen Kemnade]
9+ * Fixed grammar in user-apps tests (LP: #642001)
10+
11 -- Marc Tardif <marc@ubuntu.com> Fri, 11 Mar 2011 15:17:06 -0500
12
13 checkbox (0.11.1) natty; urgency=low
14
15=== modified file 'jobs/user_apps.txt.in'
16--- jobs/user_apps.txt.in 2011-02-16 14:46:15 +0000
17+++ jobs/user_apps.txt.in 2011-03-11 21:46:17 +0000
18@@ -112,7 +112,7 @@
19 name: `basename $0`_test
20 plugin: manual
21 description:
22- Now we will attempt to open the file '$0' with it's default viewer. After the viewer opens, check out the file that was opened and then close the application (OpenOffice, Doc Viewer, etc.)
23+ Now we will attempt to open the file '$0' with its default viewer. After the viewer opens, check out the file that was opened and then close the application (OpenOffice, Doc Viewer, etc.)
24 .
25 Click Test to begin
26 .
27@@ -129,7 +129,7 @@
28 name: `basename $0`_test
29 plugin: manual
30 description:
31- Now we will attempt to open the audio file '$0' with it's default player. After the player opens, listen to the sound and then close the application.
32+ Now we will attempt to open the audio file '$0' with its default player. After the player opens, listen to the sound and then close the application.
33 .
34 Click Test to begin
35 .
36@@ -146,7 +146,7 @@
37 name: `basename $0`_test
38 plugin: manual
39 description:
40- Now we will attempt to play the video '$0' with it's default player. After the video plays, close the application.
41+ Now we will attempt to play the video '$0' with its default player. After the video plays, close the application.
42 .
43 Click Test to begin
44 .
45@@ -163,7 +163,7 @@
46 name: `basename $0`_test
47 plugin: manual
48 description:
49- Now we will attempt to open the image '$0' with it's default viewer. After the viewer opens, check out the file that was opened and then close the application.
50+ Now we will attempt to open the image '$0' with its default viewer. After the viewer opens, check out the file that was opened and then close the application.
51 .
52 Click Test to begin
53 .

Subscribers

People subscribed via source and target branches