Merge lp:~paulbrianstewart/ubuntu/oneiric/enna/840093-Spelling-Grammar-Fix into lp:ubuntu/oneiric/enna

[Paul Stewart]

* Changed "slideshows" to "slide-shows"
* Added ", and" between "media" and "retrieve"

* Changed "slideshows" to "slide-shows"
* Added ", and" between "media" and "retrieve"

[Didier Roche-Tolomelli (didrocks)]

Thanks a lot for this patch, see my comment on https://code.launchpad.net/~paulbrianstewart/ubuntu/oneiric/conduit/840709-Spelling-Grammar-Errors-Fix/+merge/73981 please :)

review: Needs Fixing

[Paul Stewart (paulbrianstewart)]

> Thanks a lot for this patch, see my comment on
> https://code.launchpad.net/~paulbrianstewart/ubuntu/oneiric/conduit/840709
> -Spelling-Grammar-Errors-Fix/+merge/73981 please :)

Hi Didier,

I have submitted the bug and the code up to debianbugs
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=641673

Please let me know if you need me to do anything else.

Thanks
Paul Stewart

review: Needs Resubmitting

[Didier Roche-Tolomelli (didrocks)]

Hey Paul, thanks a lot for your work there! As told previously, it's a little bit late for Oneiric though. Meanwhile, you would mind tracking that your change has to integrated to debian so that it's just a sync?
Please, when P… is out, do not hesitate to ping back there if it's not the case, I'll integrate it here if it's not in debian already.

Thanks again for pushing that :)

Unmerged revisions

6. By Paul Stewart on 2011-09-03

* Changed "slideshows" to "slide-shows"
* Added ", and" between "media" and "retrieve"

=== modified file 'debian/control'
--- debian/control	2011-03-14 14:15:00 +0000
+++ debian/control	2011-09-03 04:49:24 +0000
@@ -14,7 +14,7 @@
 Description: a powerful MediaCenter application based on EFL
  Enna is a Media Center application. Featuring a simple user interface, Enna 
  allows the user to browse and play music and video files, browse pictures and
- play photo slideshows, build a database of the available media retrieve 
+ play photo slide-shows, build a database of the available media, and retrieve 
  information from the Internet (such as covers, fan art, song lyrics, and much
  more). Enna is based on the powerful Enlightenment Foundations Libraries (EFL)
  for its graphical user interface and GeeXboX libraries for multimedia playback
@@ -28,7 +28,7 @@
 Description: debugging symbols for enna
  Enna is a Media Center application. Featuring a simple user interface, Enna 
  allows the user to browse and play music and video files, browse pictures and
- play photo slideshows, build a database of the available media retrieve 
+ play photo slide-shows, build a database of the available media, and retrieve 
  information from the Internet (such as covers, fan art, song lyrics, and much
  more). Enna is based on the powerful Enlightenment Foundations Libraries (EFL)
  for its graphical user interface and GeeXboX libraries for multimedia playback