Merge pull request #1 from LCTT/master

try to update according to the wiki
翻译中 by runningwater
Merge pull request #1205 from runningwater/master

【翻译中】 20140617 Make Ubuntu 14.04 Look Like Mac With Zukimac Theme.md
选题：7 Improvements The Linux Desktop Needs
选题改名
发布：Making Linux Feel at Home

@GOLinux 明早发布
Create 20140610 IPFire 2.13 Core 78 Linux Firewall OS Receives OpenSSL Fixes.md
Delete 20140610 IPFire 2.13 Core 78 Linux Firewall OS Receives OpenSSL Fixes.md
Update 20140610 IPFire 2.13 Core 78 Linux Firewall OS Receives OpenSSL Fixes.md
Update 20140610 IPFire 2.13 Core 78 Linux Firewall OS Receives OpenSSL Fixes.md
发布：20140609 OpenELEC 4.0.4 现已发布, 基于 XBMC 13.1 “Gotham”

@owen-carter  文件名不用翻译的哈
发布：20140610 Open Source SDN Project OpenDaylight Adds New Members

@2q1w2007
Merge pull request #9 from LCTT/master

Update My Repository
Update 20140610 IPFire 2.13 Core 78 Linux Firewall OS Receives OpenSSL Fixes.md
Merge pull request #1207 from GOLinux/master

Translating:20140610 IPFire 2.13 Core 78 Linux Firewall OS Receives OpenSSL Fixes.md
Merge pull request #2 from LCTT/master

update
[translating]How to Rescue a Non-booting GRUB 2
Merge pull request #1208 from Linchenguang/master

[translating]How to Rescue a Non-booting GRUB 2
Merge branch 'master' of https://github.com/2q1w2007/TranslateProject into 2q1w2007-master

Conflicts:
	sources/news/20140610 IPFire 2.13 Core 78 Linux Firewall OS Receives OpenSSL Fixes.md
	deleted:    sources/news/20140610 IPFire 2.13 Core 78 Linux Firewall OS Receives OpenSSL Fixes.md