Ubuntu
videoporama package

Merge lp:~reversiblean/ubuntu/utopic/videoporama/fix-for-1345565 into lp:ubuntu/utopic/videoporama

  1. Utopic (14.10)
  2. fix-for-1345565
  3. Merge into utopic
Proposed by Gayan Weerakutti
Status: Merged
Merged at revision: 12
Proposed branch: lp:~reversiblean/ubuntu/utopic/videoporama/fix-for-1345565
Merge into: lp:ubuntu/utopic/videoporama
Diff against target: 17 lines (+2/-2)
1 file modified
debian/control (+2/-2)
To merge this branch: bzr merge lp:~reversiblean/ubuntu/utopic/videoporama/fix-for-1345565
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+234868@code.launchpad.net

Description of the change

Fix typos:
(wav, ogg ou mp3) >> (wav, ogg or mp3)
(VCD, SVCD et DVD) >> (VCD, SVCD and DVD)

To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Thank you for the fixes, sponsored into utopic!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2013-11-24 15:01:46 +0000
3+++ debian/control 2014-09-16 19:02:31 +0000
4@@ -31,11 +31,11 @@
5 * Image geometries: 4:3 or 16:9.
6 * Display time is set image by image.
7 * Transition type is defined image by image.
8- * Add a sound to slideshow (wav, ogg ou mp3).
9+ * Add a sound to slideshow (wav, ogg or mp3).
10 * Output in PAL (720x576), NTSC (720x480), SECAM (720x576), Web (384x288),
11 HD 720 (1280x720) or HD 1080 (1920x1080).
12 * Output file format : Raw dv (.dv), AVI (codec dv),
13- MPEG (VCD, SVCD et DVD), FLV (Flash video format) and
14+ MPEG (VCD, SVCD and DVD), FLV (Flash video format) and
15 H264 (MPEG4 part 10 AVC).
16 * Add a background image (For images which are in portrait) or add a
17 background color. (Notice : The image should have the same geometry than

Subscribers

People subscribed via source and target branches