Merge pull request #2834 from preco21/master
authorCheng Zhao <zcbenz@gmail.com>
Mon, 21 Sep 2015 03:35:37 +0000 (11:35 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Mon, 21 Sep 2015 03:35:37 +0000 (11:35 +0800)
commita69121fc24a5a14010895313c06089badd94e1c3
tree2c9c897e5a7d2e5860f3607a32e8eb8e25aca697
parentbe600fda553f7c3b6af75aba3428f56e5970a282
parent6cf6cb9a79e02a93efe09ba7738c1bffb1b48999
Merge pull request #2834 from preco21/master

Update as upstream, change name the translation folder