Merge pull request #2 from LCTT/master

try to update from LCTT
translating by owen-carter
Merge branch 'master' of https://github.com/LCTT/TranslateProject

Conflicts:
	sources/news/20140619 Improve Battery Life with Laptop Mode Tools 1.65.md
adjust
Merge branch 'master' of https://github.com/LCTT/TranslateProject
translating by john
translate1
Merge pull request #1236 from jiajia9linuxer/master

Translated "Cup 2014 Brazil" and "Has Microsoft really"
[校对]20140607 How To Install iCup 2014 In Linux.md
Merge pull request #1237 from 213edu/patch-4

[校对]20140607 How To Install iCup 2014 In Linux.md
非常好，谢谢@213edu 的校对，希望你能继续参与校对！
发布：20140607 How To Install iCup 2014 In Linux

@Vic020 @213edu
发布：20140607 Cup 2014 Brazil--Watch FIFA World Cup 2014 Competition in Your Linux Desktop

@jiajia9linuxer
发布：20140620 ENCRYPT DNS TRAFFIC IN LINUX WITH DNSCRYPT (VIA OPENDNS)

@213edu
翻译完成

请校对~
Merge pull request #1238 from tenght/master

[translated]9 commands to check hard disk partitions and disk space on Linux
Signed-off-by: disylee translated OK
move to translated
Merge pull request #1235 from johnhoow/master

translating by john
先给你合并了，下回注意
move

@tenght 下回要记得将译文挪到translated里面
Merge pull request #1239 from disylee/master

 disylee translated OK