Merge pull request #5 from koush/master

update base
Update strings.xml
Update strings.xml
Update strings.xml
Merge pull request #104 from alvinhkh/master

update Traditional Chinese translation
Merge remote-tracking branch 'upstream/master'