Merge pull request #3476 from preco21/master
authorCheng Zhao <zcbenz@gmail.com>
Wed, 18 Nov 2015 05:18:44 +0000 (13:18 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Wed, 18 Nov 2015 05:18:44 +0000 (13:18 +0800)
commit9e67dc385b6b6632251de98a35bdfda4e343639b
treeede0513c41e1ce7de7a481700367a4942130d01e
parent45e3d4ea6bd853bdbf0685432921e0cac9dbc6f8
parent25e5c385561e7ebf625f7534c024b78239f41b26
Merge pull request #3476 from preco21/master

Update as upstream, add new translation and some fixes