Merge branch 'master' of gitorious@git.sugarlabs.org:jukebox/mainline

3 files changed, 207 insertions, 1 deletions

diff --git a/MANIFEST b/MANIFEST
index 9a7dafe..a7e772d 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -9,5 +9,206 @@ activity/activity-jukebox.svg
 TODO
 po/Jukebox.pot
 po/bn_IN.po
+po/mvo.po
+po/fa.po
+po/he.po
+po/sv.po
+po/ne.po
+po/sk.po
+po/nl.po
+po/tr.po
+po/pt_BR.po
+po/ko.po
+po/hi.po
+po/ay.po
+po/km.po
+po/tpi.po
+po/de.po
+po/is.po
+po/te.po
+po/fi.po
+po/mn.po
+po/th.po
+po/gu.po
+po/qu.po
+po/yo.po
+po/pt.po
+po/ml.po
+po/mk.po
+po/bi.po
+po/nb.po
+po/fa_AF.po
+po/pl.po
+po/ff.po
+po/sd.po
+po/sw.po
+po/ru.po
+po/am.po
+po/pis.po
+po/sl.po
+po/vi.po
+po/en.po
+po/zh_TW.po
+po/pap.po
+po/ar.po
+po/si.po
+po/zh_CN.po
+po/dz.po
+po/cs.po
+po/ps.po
+po/af.po
+po/bg.po
+po/wa.po
+po/el.po
+po/ht.po
+po/fr.po
+po/pa.po
+po/ja.po
+po/rw.po
+po/en_US.po
+po/es.po
+po/ur.po
+po/bn.po
+po/ha.po
+po/hu.po
+po/ig.po
+po/mr.po
+po/ca.po
+po/ro.po
+po/it.po
 locale/bn_IN/activity.linfo
 locale/bn_IN/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/de/activity.linfo
+locale/de/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/sk/activity.linfo
+locale/sk/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/mr/activity.linfo
+locale/mr/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/km/activity.linfo
+locale/km/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/pl/activity.linfo
+locale/pl/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/fa_AF/activity.linfo
+locale/fa_AF/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/ja/activity.linfo
+locale/ja/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/ht/activity.linfo
+locale/ht/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/bg/activity.linfo
+locale/bg/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/mk/activity.linfo
+locale/mk/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/pt_BR/activity.linfo
+locale/pt_BR/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/ml/activity.linfo
+locale/ml/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/si/activity.linfo
+locale/si/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/sw/activity.linfo
+locale/sw/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/ps/activity.linfo
+locale/ps/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/yo/activity.linfo
+locale/yo/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/nl/activity.linfo
+locale/nl/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/ro/activity.linfo
+locale/ro/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/sd/activity.linfo
+locale/sd/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/ig/activity.linfo
+locale/ig/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/hi/activity.linfo
+locale/hi/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/nb/activity.linfo
+locale/nb/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/fi/activity.linfo
+locale/fi/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/pis/activity.linfo
+locale/pis/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/es/activity.linfo
+locale/es/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/ca/activity.linfo
+locale/ca/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/cs/activity.linfo
+locale/cs/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/is/activity.linfo
+locale/is/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/rw/activity.linfo
+locale/rw/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/bi/activity.linfo
+locale/bi/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/ne/activity.linfo
+locale/ne/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/ur/activity.linfo
+locale/ur/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/ko/activity.linfo
+locale/ko/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/en_US/activity.linfo
+locale/en_US/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/wa/activity.linfo
+locale/wa/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/mvo/activity.linfo
+locale/mvo/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/ha/activity.linfo
+locale/ha/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/bn/activity.linfo
+locale/bn/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/pt/activity.linfo
+locale/pt/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/el/activity.linfo
+locale/el/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/he/activity.linfo
+locale/he/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/ar/activity.linfo
+locale/ar/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/gu/activity.linfo
+locale/gu/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/sv/activity.linfo
+locale/sv/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/fa/activity.linfo
+locale/fa/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/ru/activity.linfo
+locale/ru/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/zh_CN/activity.linfo
+locale/zh_CN/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/tpi/activity.linfo
+locale/tpi/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/pa/activity.linfo
+locale/pa/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/hu/activity.linfo
+locale/hu/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/tr/activity.linfo
+locale/tr/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/sl/activity.linfo
+locale/sl/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/en/activity.linfo
+locale/en/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/th/activity.linfo
+locale/th/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/te/activity.linfo
+locale/te/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/qu/activity.linfo
+locale/qu/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/am/activity.linfo
+locale/am/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/mn/activity.linfo
+locale/mn/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/fr/activity.linfo
+locale/fr/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/it/activity.linfo
+locale/it/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/ff/activity.linfo
+locale/ff/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/dz/activity.linfo
+locale/dz/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/ay/activity.linfo
+locale/ay/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/pap/activity.linfo
+locale/pap/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/af/activity.linfo
+locale/af/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/vi/activity.linfo
+locale/vi/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
+locale/zh_TW/activity.linfo
+locale/zh_TW/LC_MESSAGES/org.laptop.sugar.Jukebox.mo
diff --git a/NEWS b/NEWS
index 2ebb982..5436f15 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
+6
+* ObjectPicker option added while directly running the activity
+* 67 languages added :)
+
 5
 * Encoding error fixed for bn_IN.po
+
 4
 * bn_IN translation support
 
diff --git a/activity/activity.info b/activity/activity.info
index 94f74cb..2b03bad 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -5,6 +5,6 @@ license = GPLv2+
 icon = activity-jukebox
 class = jukeboxactivity.JukeboxActivity
 show_launcher = yes
-activity_version = 5
+activity_version = 6
 mime_types = video/x-theora;audio/x-vorbis;audio/x-flac;audio/x-speex;application/x-ogm-video;application/x-ogm-audio;video/x-mng;audio/x-aiff;audio/x-wav;audio/x-m4a;video/mpeg4;video/mpeg-stream;video/mpeg;application/ogg;video/mpegts;video/mpeg2;video/mpeg1;audio/mpeg;audio/x-ac3;video/x-cdxa;audio/x-au;audio/mpegurl;audio/x-mpegurl;audio/x-vorbis+ogg;audio/x-scpls