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
=== modified file 'debian/changelog'
--- debian/changelog 2011-03-11 21:14:52 +0000
+++ debian/changelog 2011-03-11 21:46:17 +0000
@@ -6,6 +6,9 @@
6 [Daniel Manrique]6 [Daniel Manrique]
7 * Fixed strings in audio tests and updated pot file (LP: #691241)7 * Fixed strings in audio tests and updated pot file (LP: #691241)
88
9 [Jochen Kemnade]
10 * Fixed grammar in user-apps tests (LP: #642001)
11
9 -- Marc Tardif <marc@ubuntu.com> Fri, 11 Mar 2011 15:17:06 -050012 -- Marc Tardif <marc@ubuntu.com> Fri, 11 Mar 2011 15:17:06 -0500
1013
11checkbox (0.11.1) natty; urgency=low14checkbox (0.11.1) natty; urgency=low
1215
=== modified file 'jobs/user_apps.txt.in'
--- jobs/user_apps.txt.in 2011-02-16 14:46:15 +0000
+++ jobs/user_apps.txt.in 2011-03-11 21:46:17 +0000
@@ -112,7 +112,7 @@
112 name: `basename $0`_test112 name: `basename $0`_test
113 plugin: manual113 plugin: manual
114 description:114 description:
115 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.)115 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.)
116 .116 .
117 Click Test to begin117 Click Test to begin
118 .118 .
@@ -129,7 +129,7 @@
129 name: `basename $0`_test129 name: `basename $0`_test
130 plugin: manual130 plugin: manual
131 description:131 description:
132 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.132 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.
133 .133 .
134 Click Test to begin134 Click Test to begin
135 .135 .
@@ -146,7 +146,7 @@
146 name: `basename $0`_test146 name: `basename $0`_test
147 plugin: manual147 plugin: manual
148 description:148 description:
149 Now we will attempt to play the video '$0' with it's default player. After the video plays, close the application.149 Now we will attempt to play the video '$0' with its default player. After the video plays, close the application.
150 .150 .
151 Click Test to begin151 Click Test to begin
152 .152 .
@@ -163,7 +163,7 @@
163 name: `basename $0`_test163 name: `basename $0`_test
164 plugin: manual164 plugin: manual
165 description:165 description:
166 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.166 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.
167 .167 .
168 Click Test to begin168 Click Test to begin
169 .169 .

Subscribers

People subscribed via source and target branches