The following commit has been merged in the master branch:
commit 94673f311b38d2f0b2a3928bffa11ffa5a69117b
Author: Franklin <[email protected]>
Date: Sun Jan 18 20:19:46 2015 +0800
Remove oracle-java7-installer, add google chrome
diff --git a/ezgo-misc/media_pak_install/media_pak_install.py
b/ezgo-misc/media_pak_install/media_pak_install.py
index 903e8e3..0c6caa4 100755
--- a/ezgo-misc/media_pak_install/media_pak_install.py
+++ b/ezgo-misc/media_pak_install/media_pak_install.py
@@ -26,7 +26,7 @@ gettext.bindtextdomain('media_pak_install', MY_PATH+'locales')
_ = gettext.gettext
third_party_software = [ 'ubuntu-restricted-extras',
'pepperflashplugin-nonfree', 'skype', 'google-chrome-stable' ]
-third_party_sw_desc = [ _('Necessary tools for multimedia, like flash and
codecs.\nWith this you can watch youtube video or many other video format
files.'), _('Flash plugin for Google Chrome and Chromium.\nIf you are using
Google chrome or Chromium, you need to\ninstall this to use Flash.'), _('A
famous instant messages and voice communication software.'), _('Google chrome
browser') ]
+third_party_sw_desc = [ _('Necessary tools for multimedia, like flash and
codecs.\nWith this you can watch youtube video or many other video format
files.'), _('Flash plugin for Google Chrome and Chromium.\nIf you are using
Google chrome or Chromium, you need to\ninstall this to use Flash.'), _('A
famous instant messages and voice communication software.'), _('A famous
browser developed by Google.') ]
third_party_icon = [ MY_PATH+'ubuntu.png', MY_PATH+'flash.png',
MY_PATH+'skype.png', MY_PATH+'chrome.png' ]
current_check_button = 0
--
Blend for educatipn with asian specific adaptations
_______________________________________________
Blends-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
