diff --git a/translated/tech/20140528 Install Webmin On Ubuntu 14.04.md b/published/20140528 Install Webmin On Ubuntu 14.04.md
similarity index 95%
rename from translated/tech/20140528 Install Webmin On Ubuntu 14.04.md
rename to published/20140528 Install Webmin On Ubuntu 14.04.md
index e4065f5a1e..641ae465b4 100644
--- a/translated/tech/20140528 Install Webmin On Ubuntu 14.04.md
+++ b/published/20140528 Install Webmin On Ubuntu 14.04.md
@@ -45,11 +45,12 @@

就是这样简单。现在你就可以图形化地管理和配置你的Ubuntu服务器了。欢呼吧!
+
--------------------------------------------------------------------------------
via: http://www.unixmen.com/install-webmin-ubuntu-14-04/
-译者:[KayGuoWhu](https://github.com/KayGuoWhu) 校对:[校对者ID](https://github.com/校对者ID)
+译者:[KayGuoWhu](https://github.com/KayGuoWhu) 校对:[wxy](https://github.com/wxy)
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
diff --git a/published/20140607 Got Linux--Add Proprietary Code.md b/published/20140607 Got Linux--Add Proprietary Code.md
new file mode 100644
index 0000000000..1f93099ef5
--- /dev/null
+++ b/published/20140607 Got Linux--Add Proprietary Code.md
@@ -0,0 +1,113 @@
+为什么不要在Linux上只运行开源软件?
+================================================================================
+
+
+> 对于一些产业来讲,在开源的Linux发行版上运行专属(proprietary)软件并不是个例,--相反这很常见。例如,在华尔街,“华尔街上百分之九十九的应用依赖于专属软件。在那些运行在Linux上而有专属许可证的产品中,Oracle是我们非常喜欢的一款”, FSMLabs 的总裁 Victor Yodaiken这样说。
+
+迁移到Linux平台并不是一个非此即彼的提议。linux作为一个灵活开放的计算平台为用户在软件选择上提供了更多的选项。
+
+第一个方法是Linux的桌面环境,个人计算用户,小型办公室和企业都可以从众多的企业级Linux发行版中选择。在Windows和被限定在其昂贵硬件的基于unix的苹果OS X之外,Linux桌面系统为用户提供了另外一种零成本或者低成本的选择。
+
+另一个迁移的办法是,让员工放弃Linux桌面办公,取而代之,企业可以在Linux服务器上运行后台办公系统。在网络应用和云计算领域遍布Linux的足迹,Linux服务器能在各种企业设定中寻找到自己的位置。
+
+第三个方法是运行一个完整的Linux商店,常用的办公计算、网上浏览、图片编辑工作软件都存放在开源的软件包中。开源的数据库程序连接着后台的软件和服务器,而且Linux不需要特殊的硬件和多余的花销。
+
+培训员工使用Linux桌面应用仅需要很少的投入。这要感谢职员们对跨平台软件的熟悉,例如LibreOffice 和 Open Office, 当然还有 google Chrome和 Firefox浏览器。先前的办公交流工具真的面临着威胁。
+
+Linux很灵活。一种新的趋势是编写第三方的特定软件来满足自己的商业需求,商业软件公司可以重新编译打包那些必备的windows或者其他平台的软件。他们也可以结合开源的组件用他们自己特定的代码来编写特定需求的linux应用程序。
+
+Dayan Jeremiah,[Icewarp Pacific][1]的CEO告诉linuxinsider:“我相信这将是一个新的趋势,企业正在使用可以运行在Linux系统上的第三方软件。让企业走向定制化软件的一个因素就是购买微软授权的经济负担太重。”
+
+### Linux 上运行专属软件 ###
+
+很多公司转向其他操作系统面临的问题就是软件和应用程序的兼容性问题,比如转向Linux,那么这家企业必须保证它用的软件必须是兼容Linux操作系统的,jeremiah补充道。
+
+Linux操作系统有着数量巨大的软件,它们运行在数量众多的linux发行版和桌面环境当中。考虑到行业的特殊性,广大的开源团体或许并没有提供替代一个特定计算任务的替代品。这样的情况下,就不得不花费精力寻找第三方软件开发者的帮助。
+
+ “通过第三方厂商帮助来保证兼容性的问题,比如,我们可以混合和匹配各种软件组件在一起,以便让一个应用程序可以运行在Linux上。”jeremiah这样说。
+
+### 旧貌换新颜 ###
+
+越来越多的专属软件公司,比如Icewarp,开发特定的软件来满足企业特定的业务需求,他们将许多开源组件混合在一起使用。
+
+相比在微软框架下,这样不仅节约了授权费用,也节省了开发代码的费用。
+
+“我们可以使用现成的软件组件为Linux构建完整的软件解决方案,这个方案非常节省,高效而且稳定。”jeremiah补充道。
+
+Icewarp开发的特定软件并不是免费的开源项目,并不提供免费版本,需要订购并支付费用,而且售后支持也是收费的。
+
+### 代码移植的混乱 ###
+
+[Lucera][2]的CEO Jacob Loveless提到,把一个来自其它平台的软件变成Linux兼容的,一个很大的障碍就是Linux的多样性。Linux操作系统有一个通用的内核,但是不同的发行版有很多不同的特点。
+
+“当软件公司不得不在多个Linux系统中交叉编译时,问题进一步加深。”除了微软的Exchange数据库之外(LCTT译注:此处疑为笔误,可能是“MS SQL Server”),大部分数据库都在linux上运行的很好,MySQL和PostSQL是其中非常出名的两个开源软件(LCTT译注:此处PostSQL应该是Postgresql)。”
+
+在软件移植到Linux时的最大挑战,是需要重新编译代码,通常你必须要完成一些平台特定的修改才能让它工作,他说。
+
+比如,你有特定的基于.Net的代码或者其他的针对Windows的语言代码,Linux上开源的编译器并不总是兼容,所以你有很多的软件工作必须重做,loveless解释说。
+
+另外一个例子就是数据库,你往往不得不改用其他的数据库或者不同的网页服务器。
+
+ “这确实需要一些工作”loveless说道。
+
+### 多但不足够 ###
+
+另外一个转向Linux的兼容性问题就是公司需要的开源软件类型。
+
+ “对于公司特定的计算需求开源软件方案并不完善”ICeWarp的Jeremiah补充说“但是,通常对于Linux来说都是足够的,开源团体无法做到的特定的应用程序可以由第三方来实现。”
比如说,IceWarp最近完成的一个特定的Linux兼容的应用程序就不需要采购额外的硬件也没产生多余的授权费用。
+
+这个特定的软件包含一个负载均衡的集群,一个运行数据库的集群,另外一个是IP服务器的集群。所有的都运行在RHEL或者CentOS linux发行版当中。
+
+### 跟钱走! ###
+
+在一些情况下,有钱才有Linux操作系统的应用,有时候Linux服务器在一个领域很流行,又有些时候只是一个特定的Linux桌面应用程序,有时候两者都有。
+
+举个例子,例如在华尔街,在金融市场中时间同步是关键。金融网络依靠分布式网络,用户必须在截止时间内完成交易。其它的应用需要在交易前进行精确的计时。[FSMLabs][3] 的总裁 Victor Yodaiken 说,这些功能需要精确的时间同步控制。
+
+当FSMLabs开始开发时间同步软件时,Yodaiken觉得他们只需要开发一个Windows版本。
+
+然而,事实证明每一个在使用自动交易或者高频交易的人,甚至以高精度采集数据的人,都运行的是Linux系统,他告诉LinuxInsider。
+
+### 惜时如金 ###
+
+FSMLabs在Linux上运行他们的专属代码,Linux上的互联网时间协议(NTP)并不适用于同步时间在纳秒级别的应用,比如那些追踪股票变动,或者交易需求。 windows的不足有另一个原因。
+
+Yodaiken说道:“(在这方面,)Linux比Windows流行是因为windows没有一个标准的API可以让你在毫秒级之下获取时间,所以Window并不是真的都好,你必须得有特定的API才行。而在Linux下。你不需要在你的应用程序上费力了。”
+
+金融市场是第一个拥抱Linux的,很多早期的系统管理员来自20世纪80年代的[贝尔实验室][4],因此这是一个很成熟的市场,他补充到。
+
+### 满足需求 ###
+
+在某些领域,在开源的Linux发行版上运行有专利的软件并不意外,这是很常见的。
+
+“华尔街99%的应用都运行在有专利的产品上。在我们在Linux上运行的有专属许可证的产品中,我们很喜欢Oracle。”FSMLab 的 Yodaiken说。
+
+一些使用Linux的市场需要更多特定的软件,现有的开源软件并不能满足他们,这就是为什么软件开发者们为企业Linux应用提供了商业的解决方案。他补充道。
+
+ “这很平常,开源软件很适合大的市场,这就是为什么他有广泛而且通用的需求,不是很多人需要绝对的微秒级的时间,而且如果没有市场就会发出信号。”他指出。
+
+### Linux纯粹主义是没有意义的 ###
+
+在Linux上运行完全免费开源的软件的观念是欠缺的,有时候你要运行专属软件。对于任何特定的行业都是这样。
+
+当一个专业的计算不需要进入广泛市场时,第三方的软件开发者可以提供特定的,商业的或者闭源的软件解决方案。由于商业需求不断进入Linux系统,绝对的开源将成为过去的事情。
+
+“在Linux上拥有商业软件是相当普遍的”,Yodaiken说,“商人都不是纯粹主义者,他们只想解决问题。”
+
+Jack M.Genmain从Apple II和PC时代就开始报道电脑科技,他还有原始的IBM PC-Jr和运行DOS的机器。他留着共享软件和开源软件的linux桌面。他运行着好几种版本的Windows和Linux,经常不能决定是用他的tablet还是netbook还是android智能机,而不是用他的桌面电脑或者笔记本。你可以在google+上联系他。
+
+
+--------------------------------------------------------------------------------
+
+via: http://www.linuxinsider.com/story/80555.html
+
+作者:Jack M. Germain
+译者:[jiajia9linuxer](https://github.com/jiajia9linuxer)
+校对:[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://www.icewarp.com/
+[2]:https://lucerahq.com
+[3]:http://www.fsmlabs.com/
+[4]:http://www.bell-labs.com/
diff --git a/translated/tech/20140616 How to diskless boot a Linux machine.md b/published/20140616 How to diskless boot a Linux machine.md
similarity index 100%
rename from translated/tech/20140616 How to diskless boot a Linux machine.md
rename to published/20140616 How to diskless boot a Linux machine.md
diff --git a/published/20140607 How to turn Vim into a full-fledged IDE.md b/published/201407/20140607 How to turn Vim into a full-fledged IDE.md
similarity index 100%
rename from published/20140607 How to turn Vim into a full-fledged IDE.md
rename to published/201407/20140607 How to turn Vim into a full-fledged IDE.md
diff --git a/published/20140609 Has Microsoft really changed its attitude toward open source.md b/published/201407/20140609 Has Microsoft really changed its attitude toward open source.md
similarity index 100%
rename from published/20140609 Has Microsoft really changed its attitude toward open source.md
rename to published/201407/20140609 Has Microsoft really changed its attitude toward open source.md
diff --git a/published/20140610 The Best Linux Distribution for New Users.md b/published/201407/20140610 The Best Linux Distribution for New Users.md
similarity index 100%
rename from published/20140610 The Best Linux Distribution for New Users.md
rename to published/201407/20140610 The Best Linux Distribution for New Users.md
diff --git a/published/20140611 HTG Explains--What is Unix and Why Does It Matter.md b/published/201407/20140611 HTG Explains--What is Unix and Why Does It Matter.md
similarity index 100%
rename from published/20140611 HTG Explains--What is Unix and Why Does It Matter.md
rename to published/201407/20140611 HTG Explains--What is Unix and Why Does It Matter.md
diff --git a/published/20140612 What is a good text editor on Linux.md b/published/201407/20140612 What is a good text editor on Linux.md
similarity index 100%
rename from published/20140612 What is a good text editor on Linux.md
rename to published/201407/20140612 What is a good text editor on Linux.md
diff --git a/published/20140616 How to Rescue a Non-booting GRUB 2 on Linux.md b/published/201407/20140616 How to Rescue a Non-booting GRUB 2 on Linux.md
similarity index 100%
rename from published/20140616 How to Rescue a Non-booting GRUB 2 on Linux.md
rename to published/201407/20140616 How to Rescue a Non-booting GRUB 2 on Linux.md
diff --git a/published/20140616 Linux Screenshot App Shutter Updates with Bug Fixes, New Icon.md b/published/201407/20140616 Linux Screenshot App Shutter Updates with Bug Fixes, New Icon.md
similarity index 100%
rename from published/20140616 Linux Screenshot App Shutter Updates with Bug Fixes, New Icon.md
rename to published/201407/20140616 Linux Screenshot App Shutter Updates with Bug Fixes, New Icon.md
diff --git a/published/20140616 Managing Vim extensions with NeoBundle.md b/published/201407/20140616 Managing Vim extensions with NeoBundle.md
similarity index 100%
rename from published/20140616 Managing Vim extensions with NeoBundle.md
rename to published/201407/20140616 Managing Vim extensions with NeoBundle.md
diff --git a/published/20140617 9 Good Ways To Protect Your Linux System.md b/published/201407/20140617 9 Good Ways To Protect Your Linux System.md
similarity index 100%
rename from published/20140617 9 Good Ways To Protect Your Linux System.md
rename to published/201407/20140617 9 Good Ways To Protect Your Linux System.md
diff --git a/published/20140617 9 commands to check hard disk partitions and disk space on Linux.md b/published/201407/20140617 9 commands to check hard disk partitions and disk space on Linux.md
similarity index 100%
rename from published/20140617 9 commands to check hard disk partitions and disk space on Linux.md
rename to published/201407/20140617 9 commands to check hard disk partitions and disk space on Linux.md
diff --git a/published/20140617 How to Share Files Between Windows, Mac, and Linux PCs on a Network.md b/published/201407/20140617 How to Share Files Between Windows, Mac, and Linux PCs on a Network.md
similarity index 100%
rename from published/20140617 How to Share Files Between Windows, Mac, and Linux PCs on a Network.md
rename to published/201407/20140617 How to Share Files Between Windows, Mac, and Linux PCs on a Network.md
diff --git a/published/20140617 How to use Linux lsblk Command to List Block Device Information.md b/published/201407/20140617 How to use Linux lsblk Command to List Block Device Information.md
similarity index 100%
rename from published/20140617 How to use Linux lsblk Command to List Block Device Information.md
rename to published/201407/20140617 How to use Linux lsblk Command to List Block Device Information.md
diff --git a/published/20140617 Make Ubuntu 14.04 Look Like Mac With Zukimac Theme.md b/published/201407/20140617 Make Ubuntu 14.04 Look Like Mac With Zukimac Theme.md
similarity index 100%
rename from published/20140617 Make Ubuntu 14.04 Look Like Mac With Zukimac Theme.md
rename to published/201407/20140617 Make Ubuntu 14.04 Look Like Mac With Zukimac Theme.md
diff --git a/published/20140618 20 things to do after installing Linux Mint 17 Qiana Cinnamon.md b/published/201407/20140618 20 things to do after installing Linux Mint 17 Qiana Cinnamon.md
similarity index 100%
rename from published/20140618 20 things to do after installing Linux Mint 17 Qiana Cinnamon.md
rename to published/201407/20140618 20 things to do after installing Linux Mint 17 Qiana Cinnamon.md
diff --git a/published/20140619 How To Flush Linux or UNIX DNS Cache.md b/published/201407/20140619 How To Flush Linux or UNIX DNS Cache.md
similarity index 100%
rename from published/20140619 How To Flush Linux or UNIX DNS Cache.md
rename to published/201407/20140619 How To Flush Linux or UNIX DNS Cache.md
diff --git a/published/20140620 How Many Languages Do Developers Need To Know.md b/published/201407/20140620 How Many Languages Do Developers Need To Know.md
similarity index 100%
rename from published/20140620 How Many Languages Do Developers Need To Know.md
rename to published/201407/20140620 How Many Languages Do Developers Need To Know.md
diff --git a/published/20140620 Tips to Push Your Git Skills to the Next Level.md b/published/201407/20140620 Tips to Push Your Git Skills to the Next Level.md
similarity index 100%
rename from published/20140620 Tips to Push Your Git Skills to the Next Level.md
rename to published/201407/20140620 Tips to Push Your Git Skills to the Next Level.md
diff --git a/published/20140623 Advanced Directory Navigations Tips and Tricks in Linux.md b/published/201407/20140623 Advanced Directory Navigations Tips and Tricks in Linux.md
similarity index 100%
rename from published/20140623 Advanced Directory Navigations Tips and Tricks in Linux.md
rename to published/201407/20140623 Advanced Directory Navigations Tips and Tricks in Linux.md
diff --git a/published/20140623 How to disable Ipv6 on Ubuntu or Linux Mint or Debian.md b/published/201407/20140623 How to disable Ipv6 on Ubuntu or Linux Mint or Debian.md
similarity index 100%
rename from published/20140623 How to disable Ipv6 on Ubuntu or Linux Mint or Debian.md
rename to published/201407/20140623 How to disable Ipv6 on Ubuntu or Linux Mint or Debian.md
diff --git a/published/20140623 How to speed up directory navigation in a Linux terminal.md b/published/201407/20140623 How to speed up directory navigation in a Linux terminal.md
similarity index 100%
rename from published/20140623 How to speed up directory navigation in a Linux terminal.md
rename to published/201407/20140623 How to speed up directory navigation in a Linux terminal.md
diff --git a/published/20140624 How to sync Microsoft OneDrive on Linux.md b/published/201407/20140624 How to sync Microsoft OneDrive on Linux.md
similarity index 100%
rename from published/20140624 How to sync Microsoft OneDrive on Linux.md
rename to published/201407/20140624 How to sync Microsoft OneDrive on Linux.md
diff --git a/published/20140624 Open Source Multimedia Converter Curlew 0.1.22.3 Is Out.md b/published/201407/20140624 Open Source Multimedia Converter Curlew 0.1.22.3 Is Out.md
similarity index 100%
rename from published/20140624 Open Source Multimedia Converter Curlew 0.1.22.3 Is Out.md
rename to published/201407/20140624 Open Source Multimedia Converter Curlew 0.1.22.3 Is Out.md
diff --git a/translated/talk/20140624 Performance benchmarks--KVM vs. Xen.md b/published/201407/20140624 Performance benchmarks--KVM vs. Xen.md
similarity index 60%
rename from translated/talk/20140624 Performance benchmarks--KVM vs. Xen.md
rename to published/201407/20140624 Performance benchmarks--KVM vs. Xen.md
index e6abc80fe0..9e24af52f4 100644
--- a/translated/talk/20140624 Performance benchmarks--KVM vs. Xen.md
+++ b/published/201407/20140624 Performance benchmarks--KVM vs. Xen.md
@@ -1,26 +1,26 @@
-KVM和Xen的性能基准测试
+性能基准测试:KVM大战Xen
================================================================================
-在上周,我们讨论了 KVM 和 Xen 的性能上一些令人感兴趣的话题后,我打算自己做一些这方面的研究。我能找到的最新的资料,是来自[2013年 Phoronix Haswell 性能评测][1]上的基准测试。当然,还有[2011年的评测][2],由于 Xen 已经被收录进 Kernel 3.0,这些曾经都是热门话题。
+在上周,我们对 KVM 和 Xen 近几年里在性能上的改进进行了一些有趣的探讨后,我打算自己做一些这方面的小研究。我能找到的最新的资料,是来自[2013年 Phoronix Haswell 性能评测][1]上的基准测试。当然,还有[其它一些2011年的评测][2],不过由于 Xen 被收录进 Kernel 3.0,它们都已被热烈地讨论过。
-2011年的测试提供了[许多很好的基准报表][3],我尽最大努力把它们列出的属性重新测试一遍,但少测了两三个基准测试,原因是它们在未经特定优化的配置后跑出来的数据不是很好,或者它们需要跑很长时间才能得到结果。
+2011年的测试提供了[许多很好的基准报表][3],在三年后的现在,我尽最大努力把它们列出的属性重新测试一遍。但我删减了其中两三个基准测试,原因是它们在未经特定优化的配置后跑出来的数据不是很好,或者它们需要跑很长时间才能得到结果。
### 测试环境 ###
-测试环境由两台一模一样的超微服务器组成,都配备一颗[Intel 至强 E3-1220][4](4核,3.10GHz),24G 金士顿 DDR3 内存,4块西数 RE-3 160G 磁盘(组成 RAID10 阵列)。另外 BIOS 也是一模一样。
+测试环境由两台一模一样的超微服务器组成,分别都配备一颗[Intel 至强 E3-1220][4](4核,3.10GHz),24G 金士顿 DDR3 内存,4块西数 RE-3 160G 磁盘(组成 RAID10 阵列)。另外 BIOS 也是一模一样。
-所有测试项目(即实体机和虚拟机)都在 Fedora 20 (开 SELinux)上进行,并且测试过程中没有跑很多的不相关的服务。这里列一下相关服务的版本:
+所有测试项目(即实体机和虚拟机)都在 Fedora 20 (开 SELinux)上进行,并且测试过程中几乎没有运行的不相关的服务。这里列一下相关服务的版本:
- Kernel: 3.14.8
- For KVM: qemu-kvm 1.6.2
- For Xen: xen 4.3.2
-根文件系统是 XFS,使用默认配置。虚拟机使用 virt-manager 来创建(virt-mamager 也使用默认配置)。虚拟磁盘使用 raw 镜像,容量为 8GB,虚拟4颗 CPU。Xen 虚拟机使用 [PVHVM][5] 建立虚拟磁盘。
+根文件系统都是使用默认配置的 XFS。虚拟机使用 virt-manager 来创建(virt-mamager 也使用默认配置)。虚拟磁盘使用 raw 镜像,容量为 8GB,虚拟4颗 CPU。Xen 虚拟机使用 [PVHVM][5] 建立虚拟磁盘。
-### 警告 ###
+### 附加说明 ###
-也许有人会考虑到 Fedora 是红帽公司所有,红帽一直在维护 KVM,而 Xen 则自从[在2009年红帽重新选择 KVM 作为虚拟化产品][6]后,再没得到这个公司的维护。在本测试中这个因素不会对结果产生任何影响,不过可以在心里稍微注意一下。
+也许有人会考虑到 Fedora 是红帽公司所有,红帽一直在维护 KVM,而 Xen 则自从[在2009年红帽重新选择 KVM 作为虚拟化产品][6]后,再没得到这个公司的重要改进。我将这个因素排除在了测试所考虑的范围之外,不过仍然可以在心里稍微注意一下。
-不考虑资源竞争产生的影响。在大多数虚拟服务器上,你可以跑多个虚拟机,而这些虚拟机会争用 CPU 时间片、磁盘 IO、网络带宽等等资源。在本测试中也不考虑这些因素。一台虚拟机抢到资源少,性能就差,而另一台抢得多,性能就好(LCTT:它们的性能总和,就可以大致当作是 KVM 或 Xen 的性能了)。
+并且,资源竞争产生的影响也有被严格控制并最小化。在大多数虚拟服务器上,你可以跑多个虚拟机,而这些虚拟机会争用 CPU 时间片、磁盘 IO、网络带宽等等资源。在本测试中也不考虑这些因素。一台虚拟机抢到资源少,性能就差,而另一台抢得多,性能就好(LCTT译注:它们的性能总和,就可以大致当作是 KVM 或 Xen 的性能了)。
本测试运行在 Intel 的 CPU 上。如果使用的是 AMD 或 ARM,可能有些数据会不一样。
@@ -28,11 +28,11 @@ KVM和Xen的性能基准测试
本测试使用裸机作为虚拟服务测试的基准设备。在不跑虚拟机的情况下,两台裸机的性能偏差不会大于0.51%
-在所有测试中,KVM 的性能相比宿主机而言下降了1.5%以内,除了两个测试。第一个是 7-zip 压缩,比宿主机慢了 2.79%。第二个就奇怪了,我们搭了一个邮件服务器,用 PostMark 测试其性能,结果表明 KVM 竟比宿主机快了4.11%。然后我在两台服务器中重新跑了几遍 PostMark 测试,结果性能差异基本不变,浮动在1%以内。由于我对 virtio 的内部机制没有很深的理解,我只能在以后再对这个怪现象进行进一步了解。
+在几乎所有测试中,KVM 的性能相比宿主机而言下降了1.5%以内,只有两项测试例外。第一个是 7-zip 压缩,比宿主机慢了 2.79%。第二个就奇怪了,我们搭了一个邮件服务器,用 PostMark 测试其性能,结果表明 KVM 竟比宿主机快了4.11%。然后我在两台服务器中重新跑了几遍 PostMark 测试,结果性能差异基本不变,浮动都在最初测试结果的1%以内。由于我对 virtio 的内部机制没有很深的理解,我只能在以后再对这个怪现象进行进一步了解。
-Xen 的性能相对宿主机而言差异就比较大了。有3个测试性能下降在2.5%以内,剩下的性能下降率都是 KVM 的2~4倍。PostMark 测试的性能比 KVM 慢了14.41%,这结果令我大吃一惊。重新跑了下测试,性能差还是在14%左右。KVM 表现最好的两个测试:CPU 测试和 MAFFT 对齐测试,是 Xen 表现最差的。
+Xen 的性能相对宿主机而言差异就比较大了。有3项测试性能下降在2.5%以内,剩下的性能下降率都是 KVM 的2~4倍。PostMark 测试的性能比 KVM 慢了14.41%,这结果令我大吃一惊。重新跑了下测试,性能差还是几乎不变,浮动都在最初结果的2%以内。KVM 表现最好的 CPU 测试:MAFFT 对齐测试,是 Xen 表现倒数第二差的。
-现在奉上一个总结表:
+现在奉上一个简短得总结表:
@@ -67,19 +67,19 @@ Xen 的性能相对宿主机而言差异就比较大了。有3个测试性能下
### 结论 ###
-基于上面的测试环境,KVM 的性能损耗在2%以内,Xen 则只有3项损耗在2.5%以内,其他几项损耗都在5~7%之间。虽然 KVM 在 PostMark 测试中性能表现优异,但这个测试只是众多测试中的一项,如果想证明 KVM 确实在 I/O 处理方面很强悍,就需要更多测试。
+基于上面的测试环境,KVM 的性能损耗几乎都在2%以内,Xen 则在十多项测试中有3项损耗在2.5%以内,而其他几项损耗都在5~7%之间。虽然 KVM 在 PostMark 测试中性能表现优异,但这是众多测试中仅有的一项 I/O 测试,如果想证明 KVM 确实在 I/O 处理方面很强悍,就需要更多测试。
-对我来说,我需要深入理解 KVM 和 Xen 在 I/O 处理上为什么会有这么大的差别。并且还需要跑一些压力测试,来证明虚拟机是否真的比宿主机表现得更出色。
+对我来说,我想要深入了解一下 KVM 和 Xen 在 I/O 方面的处理,以及它们之间为什么会有这么大的差别。我也许还会跑一些有竞争的测试,来看看虚拟机在有压力的条件下是否真的能比宿主机表现得更出色。
我鼓励读者通过使用[Phoronix 测试套件][8]来进行一些基准测试,你们可以找到一些能模仿你们工作环境的用例。如果你的工作环境是低 CPU 高 I/O,你可以找找套件里面的 I/O 压力测试。另一方面,如果你的工作是音频、视频转码,你可以试试套件里面的 x264 或 mp3 测试。
-更新:[Chris Behrens 指出][9],我忘了提到 Xen 虚拟机类型了。这里补充下,我使用的是 PVHVM 模型(LCTT:目前支持的模型包括 PV、HVM 和 PVHVM),因为在 Xen 4.3 中这个选拥有最好的性能。另外需要注意的是在 Xen 4.4 中可以使用 PVH,但是在 Fedora 20 中还没有使用 Xen 4.4。
+更新:[Chris Behrens 指出][9],我忘了提到 Xen 虚拟机类型了。这里补充下,我使用的是 PVHVM 模型(LCTT译注:目前支持的模型包括 PV、HVM 和 PVHVM),因为在 Xen 4.3 中这个选拥有最好的性能。另外需要注意的是在 Xen 4.4 中可以使用 PVH,但是在 Fedora 20 中还没有使用 Xen 4.4。
--------------------------------------------------------------------------------
via: http://major.io/2014/06/22/performance-benchmarks-kvm-vs-xen/
-译者:[bazz2](https://github.com/bazz2) 校对:[校对者ID](https://github.com/校对者ID)
+译者:[bazz2](https://github.com/bazz2) 校对:[ReiNoir](https://github.com/reinoir)
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
diff --git a/published/20140624 Top500 Supercomputer Remains Stuck at 33.86 Petaflops Each s - 翻译.md b/published/201407/20140624 Top500 Supercomputer Remains Stuck at 33.86 Petaflops Each s - 翻译.md
similarity index 100%
rename from published/20140624 Top500 Supercomputer Remains Stuck at 33.86 Petaflops Each s - 翻译.md
rename to published/201407/20140624 Top500 Supercomputer Remains Stuck at 33.86 Petaflops Each s - 翻译.md
diff --git a/published/20140625 Betty--Translate English Phrases Into Linux Commands.md b/published/201407/20140625 Betty--Translate English Phrases Into Linux Commands.md
similarity index 100%
rename from published/20140625 Betty--Translate English Phrases Into Linux Commands.md
rename to published/201407/20140625 Betty--Translate English Phrases Into Linux Commands.md
diff --git a/published/20140625 Create A '.deb Pacakge Repository' at Sourceforge.net Using 'Reprepro' Tool in Ubuntu.md b/published/201407/20140625 Create A '.deb Pacakge Repository' at Sourceforge.net Using 'Reprepro' Tool in Ubuntu.md
similarity index 100%
rename from published/20140625 Create A '.deb Pacakge Repository' at Sourceforge.net Using 'Reprepro' Tool in Ubuntu.md
rename to published/201407/20140625 Create A '.deb Pacakge Repository' at Sourceforge.net Using 'Reprepro' Tool in Ubuntu.md
diff --git a/published/20140625 Keep an eye on these 5 new features in RHEL 7.md b/published/201407/20140625 Keep an eye on these 5 new features in RHEL 7.md
similarity index 100%
rename from published/20140625 Keep an eye on these 5 new features in RHEL 7.md
rename to published/201407/20140625 Keep an eye on these 5 new features in RHEL 7.md
diff --git a/published/20140626 Joy of Programming--Fail Fast.md b/published/201407/20140626 Joy of Programming--Fail Fast.md
similarity index 100%
rename from published/20140626 Joy of Programming--Fail Fast.md
rename to published/201407/20140626 Joy of Programming--Fail Fast.md
diff --git a/published/20140630 How to access popular search engines from the command line on Linux.md b/published/201407/20140630 How to access popular search engines from the command line on Linux.md
similarity index 100%
rename from published/20140630 How to access popular search engines from the command line on Linux.md
rename to published/201407/20140630 How to access popular search engines from the command line on Linux.md
diff --git a/published/20140630 KDE Connect Adds Android File Sending, Touchpad Emulation.md b/published/201407/20140630 KDE Connect Adds Android File Sending, Touchpad Emulation.md
similarity index 100%
rename from published/20140630 KDE Connect Adds Android File Sending, Touchpad Emulation.md
rename to published/201407/20140630 KDE Connect Adds Android File Sending, Touchpad Emulation.md
diff --git a/published/20140630 New Linux Podcast App 'Vocal' Hits Beta, Ready for Testing.md b/published/201407/20140630 New Linux Podcast App 'Vocal' Hits Beta, Ready for Testing.md
similarity index 100%
rename from published/20140630 New Linux Podcast App 'Vocal' Hits Beta, Ready for Testing.md
rename to published/201407/20140630 New Linux Podcast App 'Vocal' Hits Beta, Ready for Testing.md
diff --git a/published/20140630 Ubuntu 14.04 LTS--Customizing Unity.md b/published/201407/20140630 Ubuntu 14.04 LTS--Customizing Unity.md
similarity index 100%
rename from published/20140630 Ubuntu 14.04 LTS--Customizing Unity.md
rename to published/201407/20140630 Ubuntu 14.04 LTS--Customizing Unity.md
diff --git a/published/20140701 Command Line Tuesdays--Part Two.md b/published/201407/20140701 Command Line Tuesdays--Part Two.md
similarity index 100%
rename from published/20140701 Command Line Tuesdays--Part Two.md
rename to published/201407/20140701 Command Line Tuesdays--Part Two.md
diff --git a/published/20140701 Here Are 5 Amazing Ascii Art Generators.md b/published/201407/20140701 Here Are 5 Amazing Ascii Art Generators.md
similarity index 100%
rename from published/20140701 Here Are 5 Amazing Ascii Art Generators.md
rename to published/201407/20140701 Here Are 5 Amazing Ascii Art Generators.md
diff --git a/published/20140701 How To Add Multiple Timezones In Ubuntu 14.04 [Quick Tip].md b/published/201407/20140701 How To Add Multiple Timezones In Ubuntu 14.04 [Quick Tip].md
similarity index 100%
rename from published/20140701 How To Add Multiple Timezones In Ubuntu 14.04 [Quick Tip].md
rename to published/201407/20140701 How To Add Multiple Timezones In Ubuntu 14.04 [Quick Tip].md
diff --git a/published/20140702 Automotive Grade Linux Released for Open Source Cars.md b/published/201407/20140702 Automotive Grade Linux Released for Open Source Cars.md
similarity index 100%
rename from published/20140702 Automotive Grade Linux Released for Open Source Cars.md
rename to published/201407/20140702 Automotive Grade Linux Released for Open Source Cars.md
diff --git a/published/20140702 Command Line Tuesdays--Part Three.md b/published/201407/20140702 Command Line Tuesdays--Part Three.md
similarity index 100%
rename from published/20140702 Command Line Tuesdays--Part Three.md
rename to published/201407/20140702 Command Line Tuesdays--Part Three.md
diff --git a/published/20140702 How to check MySQL storage engine type on Linux.md b/published/201407/20140702 How to check MySQL storage engine type on Linux.md
similarity index 100%
rename from published/20140702 How to check MySQL storage engine type on Linux.md
rename to published/201407/20140702 How to check MySQL storage engine type on Linux.md
diff --git a/published/20140702 How to create sosreport in linux (RHEL 5.X or RHEL 6.X).md b/published/201407/20140702 How to create sosreport in linux (RHEL 5.X or RHEL 6.X).md
similarity index 100%
rename from published/20140702 How to create sosreport in linux (RHEL 5.X or RHEL 6.X).md
rename to published/201407/20140702 How to create sosreport in linux (RHEL 5.X or RHEL 6.X).md
diff --git a/published/20140703 How to find and kill misbehaving MySQL queries.md b/published/201407/20140703 How to find and kill misbehaving MySQL queries.md
similarity index 100%
rename from published/20140703 How to find and kill misbehaving MySQL queries.md
rename to published/201407/20140703 How to find and kill misbehaving MySQL queries.md
diff --git a/published/20140709 Command Line Tuesdays--Part Four.md b/published/201407/20140709 Command Line Tuesdays--Part Four.md
similarity index 100%
rename from published/20140709 Command Line Tuesdays--Part Four.md
rename to published/201407/20140709 Command Line Tuesdays--Part Four.md
diff --git a/published/20140709 How To Disable Overlay Scrollbars in Ubuntu 14.04.md b/published/201407/20140709 How To Disable Overlay Scrollbars in Ubuntu 14.04.md
similarity index 100%
rename from published/20140709 How To Disable Overlay Scrollbars in Ubuntu 14.04.md
rename to published/201407/20140709 How To Disable Overlay Scrollbars in Ubuntu 14.04.md
diff --git a/published/20140709 Red Hat Announces Availability of its OpenStack Platform 5.md b/published/201407/20140709 Red Hat Announces Availability of its OpenStack Platform 5.md
similarity index 100%
rename from published/20140709 Red Hat Announces Availability of its OpenStack Platform 5.md
rename to published/201407/20140709 Red Hat Announces Availability of its OpenStack Platform 5.md
diff --git a/published/20140711 Linux Basics--How To Find Size of Directory Commands.md b/published/201407/20140711 Linux Basics--How To Find Size of Directory Commands.md
similarity index 100%
rename from published/20140711 Linux Basics--How To Find Size of Directory Commands.md
rename to published/201407/20140711 Linux Basics--How To Find Size of Directory Commands.md
diff --git a/published/20140711 ncdu--NCurses Disk Usage Analyzer.md b/published/201407/20140711 ncdu--NCurses Disk Usage Analyzer.md
similarity index 100%
rename from published/20140711 ncdu--NCurses Disk Usage Analyzer.md
rename to published/201407/20140711 ncdu--NCurses Disk Usage Analyzer.md
diff --git a/published/20140714 Canonical and Ubuntu Helped Munich Save Millions of Dollars by Ditching Microsoft Products.md b/published/201407/20140714 Canonical and Ubuntu Helped Munich Save Millions of Dollars by Ditching Microsoft Products.md
similarity index 100%
rename from published/20140714 Canonical and Ubuntu Helped Munich Save Millions of Dollars by Ditching Microsoft Products.md
rename to published/201407/20140714 Canonical and Ubuntu Helped Munich Save Millions of Dollars by Ditching Microsoft Products.md
diff --git a/translated/tech/20140714 Fix No Sound In Ubuntu 14.04 As HDMI Enabled BY Default.md b/published/201407/20140714 Fix No Sound In Ubuntu 14.04 As HDMI Enabled BY Default.md
similarity index 100%
rename from translated/tech/20140714 Fix No Sound In Ubuntu 14.04 As HDMI Enabled BY Default.md
rename to published/201407/20140714 Fix No Sound In Ubuntu 14.04 As HDMI Enabled BY Default.md
diff --git a/translated/tech/20140716 Simple Dock GNOME Shell Extension Puts Your Fave Apps On The Desktop.md b/published/201407/20140716 Simple Dock GNOME Shell Extension Puts Your Fave Apps On The Desktop.md
similarity index 68%
rename from translated/tech/20140716 Simple Dock GNOME Shell Extension Puts Your Fave Apps On The Desktop.md
rename to published/201407/20140716 Simple Dock GNOME Shell Extension Puts Your Fave Apps On The Desktop.md
index 187aa61777..000d1b19d7 100644
--- a/translated/tech/20140716 Simple Dock GNOME Shell Extension Puts Your Fave Apps On The Desktop.md
+++ b/published/201407/20140716 Simple Dock GNOME Shell Extension Puts Your Fave Apps On The Desktop.md
@@ -1,14 +1,14 @@
“Simple Dock” GNOME Shell扩展乾坤大挪移,钟爱应用桌面展现
================================================================================

+
+**我爱GNOME Shell,但是我痛恨的是费力从隐藏屏幕中找到我所钟爱的应用或者在我正运行的应用间切换。**
-**我爱GNOME Shell,但是我痛恨的是话费力气从隐藏屏幕中找到我所钟爱的应用或者在我正运行的应用间切换。**
+这么说,听起来就像我是个老古董,像是一个UX勒德分子,也像是某个过分沉溺于Unity可用性瘾君子,但我,像阅读本文的许多人一样,喜欢将app启动器/切换器放到桌面上。这是一个用户所熟悉并且快捷的工作方式。
-这么说,好像听起来我是个老古董,像是一个UX勒德分子,也像是某个过分沉溺于Unity可用性瘾君子,但我,像阅读本文的许多人一样,喜欢将app启动器/切换器放到桌面上。这是一个熟悉、快速的工作方式。
+而GNOME Shell,从设计上看,却完全是个不同的世界。它将所有这一切隐藏起来 —— 从消息中心和通知,到工作区和应用列表。它弱化了审美效果,包含了这样的道理:帮助用户专注于最重要的部分。
-而GNOME Shell,从设计上看,却完全是个不同的世界。它将所有这一切隐藏起来 —— 从消息中心和通知,到工作区和应用列表。它是最小美学,包含这样的道理:帮助用户专注于最重要的部分。
-
-但是对我而言,我的桌面需要比一个美化的相框更多的东西。
+但是对我而言,我的桌面需要的不仅仅是一个美化的相框。
### GNOME Shell之美 ###
@@ -23,7 +23,7 @@
- 拖放收藏
- 覆盖活动启动按钮
-想要吗?如果你正在Ubuntu 13.10或更高版本上使用GNOME Shell,那么你可以使用它。只需在支持的浏览器(Firefox, GNOME Web之类)中访问下面的链接就可以导航到GNOME扩展页面,然后将页面上开个从“off”拖动到“on”上。
+你也想要吗?如果你正在Ubuntu 13.10或更高版本上使用GNOME Shell,那么你可以使用它。只需在支持的浏览器(Firefox, GNOME Web之类)中访问下面的链接就可以导航到GNOME扩展页面,然后将页面上开个从“off”拖动到“on”上。
- [GNOME Shell扩展中的Simple Dock][1]
@@ -33,7 +33,7 @@
via: http://www.omgubuntu.co.uk/2014/07/simple-dock-gnome-shell-extension
-译者:[GOLinux](https://github.com/GOLinux) 校对:[校对者ID](https://github.com/校对者ID)
+译者:[GOLinux](https://github.com/GOLinux) 校对:[Caroline](https://github.com/carolinewuyan)
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
diff --git a/published/20140718 Display Song Lyrics On Desktop In Ubuntu 14.04.md b/published/201407/20140718 Display Song Lyrics On Desktop In Ubuntu 14.04.md
similarity index 100%
rename from published/20140718 Display Song Lyrics On Desktop In Ubuntu 14.04.md
rename to published/201407/20140718 Display Song Lyrics On Desktop In Ubuntu 14.04.md
diff --git a/published/20140718 Git 2.0.2 Version Control System Now Available for Download.md b/published/201407/20140718 Git 2.0.2 Version Control System Now Available for Download.md
similarity index 100%
rename from published/20140718 Git 2.0.2 Version Control System Now Available for Download.md
rename to published/201407/20140718 Git 2.0.2 Version Control System Now Available for Download.md
diff --git a/published/201407/20140718 Time to Upgrade--Ubuntu 13.10 Support Ends Today.md b/published/201407/20140718 Time to Upgrade--Ubuntu 13.10 Support Ends Today.md
new file mode 100644
index 0000000000..3b1e35b2b2
--- /dev/null
+++ b/published/201407/20140718 Time to Upgrade--Ubuntu 13.10 Support Ends Today.md
@@ -0,0 +1,37 @@
+小伙伴们,该更新系统啦:Ubuntu 13.10的支持到今天结束
+================================================================================
+
+
+
+**尽管目前运行良好,在经历了9个月的折腾后,今天官方对Ubuntu 13.10(俏皮蝾螈)的支持正式寿终正寝。**
+
+> 尽管它的名字叫'俏皮蝾螈',但它所提供的新功能却无比的乏味。
+
+那些仍然在使用它的用户应该看看最新的发行的稳定版了,Ubuntu 14.04 LTS。在四月推出的这个版本,提供良好的图形化支持,支持期限是到2019年的4月中旬。
+
+对于Ubuntu 13.10的服务器版的支持,也到今天正式停止。
+
+### 俏皮蝾螈已然失宠 ###
+
+Ubuntu 13.10于去年10月发布,Canonical对其桌面版本承诺提供时长9个月的安全和Bug修复更新。截至今年7月17日,所有更新将停止,未来也不再提供。
+
+Canonical[推荐的升级方案][1]是升级到14.04版本,目前可以直接通过图形化工具去升级,包括使用升级程序,或者在命令行运行‘`do-release-upgrade`‘命令。
+
+俏皮蝾螈,它的名字非常的好听,但表现平平,13.10在Ubuntu所有的发行版中也不是一个取得卓越成功的版本,[这一点已经被很多网络评论预言到了][2]。
+
+然而,它曾经让人眼前一亮的是,强加提供了键盘指示符来快速的选择安装语言,这可以让用户简便的在该智能域操作,这也是第一个在安装程序中整合了`Ubuntu One Single Sign-on`的发行版。
+
+查看13.10版本的所有新功能,请查看完整视频:
+Youtobe 视频地址:[http://www.youtube.com/embed/1EiRQ-znEcI?feature=oembed][3]
+
+--------------------------------------------------------------------------------
+
+via: http://www.omgubuntu.co.uk/2014/07/ubuntu-13-10-support-ends-today
+
+译者:[nd0104](https://github.com/nd0104) 校对:[ReiNoir](https://github.com/reinoir)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:https://help.ubuntu.com/community/TrustyUpgrades
+[2]:http://www.omgubuntu.co.uk/2013/10/ubuntu-13-10-press-reaction
+[3]:http://www.youtube.com/embed/1EiRQ-znEcI?feature=oembed
\ No newline at end of file
diff --git a/published/20140722 The Native Dropbox Linux Client Debuts New Qt Interface.md b/published/201407/20140722 The Native Dropbox Linux Client Debuts New Qt Interface.md
similarity index 100%
rename from published/20140722 The Native Dropbox Linux Client Debuts New Qt Interface.md
rename to published/201407/20140722 The Native Dropbox Linux Client Debuts New Qt Interface.md
diff --git a/translated/tech/20140724 How to Merge Directory Trees in Linux using cp Command.md b/published/201407/20140724 How to Merge Directory Trees in Linux using cp Command.md
similarity index 76%
rename from translated/tech/20140724 How to Merge Directory Trees in Linux using cp Command.md
rename to published/201407/20140724 How to Merge Directory Trees in Linux using cp Command.md
index 2f9beebd09..dda688d0d0 100644
--- a/translated/tech/20140724 How to Merge Directory Trees in Linux using cp Command.md
+++ b/published/201407/20140724 How to Merge Directory Trees in Linux using cp Command.md
@@ -1,8 +1,9 @@
-在linux中怎样使用cp命令合并目录树
+在 Linux 中怎样使用cp命令合并目录树
================================================================================
-怎样将布局相似的两个目录树合并成新的目录树? 为理解该问题让我们思考下面的例子.
-假设dir1和dir2目录中分别有3个子目录a,b和c.目录布局如下所示:
+怎样将两个布局相似的目录树合并成一个新的目录树?为理解该问题让我们思考下面的例子.
+
+假设 dir1 和 dir2 目录中分别有3个子目录a,b和c.目录布局如下所示:

输入目录布局
@@ -14,16 +15,14 @@
### 1. 使用cp命令创建合并: ###
-现在我们将这两个目录合并成一个新的目录,如"merged".完成上述操作最简单的方式就是递归
-复制目录,如下图所示:
+现在我们将这两个目录合并成一个名为"merged"新的目录中.完成上述操作最简单的方式就是递归复制目录,如下图所示:

递归复制完成新的合并
#### 1.1 cp命令和替换带来的问题: ####
-这种方式所带来的问题是该合并目录中所创建的文件为原文件的副本,并非原文件本身. 别急, (你可能正在问自己) 如果不是原文件又有什么问题? 为了回答你的问题,考虑下你有很多大文件的情况
-.那种情形下,复制所有的文件可能消耗数小时.
+这种方式所带来的问题是该合并目录中所创建的文件为原文件的副本,并非原文件本身.别急, (你可能正在问自己) 如果不是原文件又有什么问题? 要回答你的问题,考虑下你有很多大文件的情况.那种情形下,复制所有的文件可能花费数小时.
现在让我们回到刚那问题上,且尝试使用mv命令而不是cp命令.
@@ -33,7 +32,7 @@
这些目录不能被合并.因此我们不能像这样使用mv命令去合并目录.
现在你该怎样将原文件保存到"merged"目录中?
-### 2. 方法: ###
+### 2. 解决方法: ###
cp命令有一个非常有用的选项来帮助我们摆脱这种状况.
cp命令的-l 或 --link选项能够创建硬链接而非原文件副本.让我们尝试一下.
@@ -59,7 +58,7 @@ Verify Inodes
#### 2.2 清除: ####
-正如你所看到的,这些文件的inodes和原文件的一样.现在 那问题已经被解决,且
+正如你所看到的,这些文件的inodes和原文件的一样.现在问题已经被解决,且
原文件已被复制到合并目录中.现在我们能够移除dir1和dir2目录.

@@ -71,8 +70,8 @@ via: http://linoxide.com/linux-command/merge-directory-trees-linux/
原文作者:[Raghu][a]
-译者:[hunanchenxingyu](https://github.com/hunanchenxingyu) 校对:[校对者ID](https://github.com/校对者ID)
+译者:[hunanchenxingyu](https://github.com/hunanchenxingyu) 校对:[Caroline](https://github.com/carolinewuyan)
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
-[a]:http://linoxide.com/author/raghu/
\ No newline at end of file
+[a]:http://linoxide.com/author/raghu/
diff --git a/published/20140724 Oracle Linux 7.0 OS Has XFS as Default File System and Unbreakable Enterprise Kernel Release 3.md b/published/201407/20140724 Oracle Linux 7.0 OS Has XFS as Default File System and Unbreakable Enterprise Kernel Release 3.md
similarity index 100%
rename from published/20140724 Oracle Linux 7.0 OS Has XFS as Default File System and Unbreakable Enterprise Kernel Release 3.md
rename to published/201407/20140724 Oracle Linux 7.0 OS Has XFS as Default File System and Unbreakable Enterprise Kernel Release 3.md
diff --git a/published/201407/20140728 CoreOS Stable Release.md b/published/201407/20140728 CoreOS Stable Release.md
new file mode 100644
index 0000000000..d072238861
--- /dev/null
+++ b/published/201407/20140728 CoreOS Stable Release.md
@@ -0,0 +1,44 @@
+CoreOS 稳定版发布
+================================================================================
+
+随着CoreOS稳定版的发布,我们相信我们已经为SysAdmin节准备好了一个不错的惊喜。从现在起,用户可以在产品环境中运行CoreOS了。这个版本对于想运行CoreOS的用户来说,是最经考验的、最安全的、最可靠的CoreOS版本。这对我们来说,是一个重大的里程碑。自从2013年八月我们第一个alpha版本发布以来,我们做了:
+
+- 191个发布版本
+- 通过alpha和beta频道测试了成千上万的服务器
+- 支持10个以上平台,从裸机到Rackspace和Google云平台的主要镜像
+
+对我们来说这是一个极为重要的日子,因为我们为了稳定版的发布付出了努力的工作。当然,如果没有社区的帮助,我们完成不了这些工作,感谢你们所有对项目的支持和贡献。
+
+[CoreOS 367.1.0][2], 这是我们在稳定频道上的第一个版本, 包括以下内容:
+
+- Linux 3.15.2
+- Docker 1.0.1
+- 所有主流的云服务商的支持, 包括 Rackspace Cloud, Amazon EC2 (包括 HVM) 和 Google Compute Engine
+- 通过 [CoreOS Managed Linux][3] 的商业支持
+
+如果你还没有阅读我们的[Update Philosophy][4],我们建议您先看看。
+
+请注意:稳定发布版本为了保持稳定性而不包括etcd和fleet ,此发布版仅针对基本的操作系统和Docker1.0。etcd和fleet的稳定版本支持会在随后的发布版本中。
+
+如果想开始在产品中运行CoreOS,请确保阅读我们的快速指南“[切换到发布频道][5]”。如果你正在装新的机器,请确保在一开始就把他们建立在你想要的更新频道上。
+
+最后,感谢社区的支持,我们迫不及待地想听到你们的反馈。对那些在产品环境中运行CoreOS上,希望得到额外支持的用户,请确保查看我们的[Managed Linux][6] 建议,因为我们已经有了一个完整的支持团队,他们正在准备回答你遇到的任何问题。
+
+SysAdmin节快乐,感谢你们让互联网变得如此令人惊叹。
+
+--------------------------------------------------------------------------------
+
+via: https://coreos.com/blog/stable-release/
+
+作者:Alex Polvi
+译者:[lfzark](https://github.com/lfzark)
+校对:[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://sysadminday.com/
+[2]:https://coreos.com/releases/#367.1.0
+[3]:https://coreos.com/products/managed-linux/
+[4]:https://coreos.com/using-coreos/updates/
+[5]:https://coreos.com/docs/cluster-management/setup/switching-channels/
+[6]:https://coreos.com/products/managed-linux/
diff --git a/published/Command Line Tuesdays – Part Five.md b/published/201407/Command Line Tuesdays – Part Five.md
similarity index 100%
rename from published/Command Line Tuesdays – Part Five.md
rename to published/201407/Command Line Tuesdays – Part Five.md
diff --git a/published/Encrypting Your Cat Photos.md b/published/201407/Encrypting Your Cat Photos.md
similarity index 100%
rename from published/Encrypting Your Cat Photos.md
rename to published/201407/Encrypting Your Cat Photos.md
diff --git a/published/Raspberry Pi s Eben Upton--How We're Turning Everyone Into DIY Hackers.md b/published/201407/Raspberry Pi s Eben Upton--How We're Turning Everyone Into DIY Hackers.md
similarity index 100%
rename from published/Raspberry Pi s Eben Upton--How We're Turning Everyone Into DIY Hackers.md
rename to published/201407/Raspberry Pi s Eben Upton--How We're Turning Everyone Into DIY Hackers.md
diff --git a/translated/tech/20140714 Set Default Browser on Debian or Ubuntu Using Terminal.md b/published/20140714 Set Default Browser on Debian or Ubuntu Using Terminal.md
similarity index 95%
rename from translated/tech/20140714 Set Default Browser on Debian or Ubuntu Using Terminal.md
rename to published/20140714 Set Default Browser on Debian or Ubuntu Using Terminal.md
index 48d209653a..1131b1958c 100644
--- a/translated/tech/20140714 Set Default Browser on Debian or Ubuntu Using Terminal.md
+++ b/published/20140714 Set Default Browser on Debian or Ubuntu Using Terminal.md
@@ -10,9 +10,9 @@
虽然,使用浏览器主界面来设置默认浏览器很方便,但是有时,你需要远程来操作。
要做到这一点,你只需打开终端,然后执行下述命令:
-```
-sudo update-alternatives --config x-www-browser
-```
+
+ sudo update-alternatives --config x-www-browser
+
之后输入你想设置为默认浏览器的号码,这样就搞定了!
截图如下:
diff --git a/translated/tech/20140722 10 Useful Interview Questions and Answers on Linux Commands.md b/published/20140722 10 Useful Interview Questions and Answers on Linux Commands.md
similarity index 63%
rename from translated/tech/20140722 10 Useful Interview Questions and Answers on Linux Commands.md
rename to published/20140722 10 Useful Interview Questions and Answers on Linux Commands.md
index 20a8ac5f78..8a0f099032 100644
--- a/translated/tech/20140722 10 Useful Interview Questions and Answers on Linux Commands.md
+++ b/published/20140722 10 Useful Interview Questions and Answers on Linux Commands.md
@@ -1,16 +1,16 @@
-关于Linux命令的10个有用的面试问题及其答案
+10个有用的Linux命令面试问题及答案
==================================================================================================================================================
-Linux命令行,以及用户使用Linux命令进行Linux shell交互,是Linux最吸引人的地方,也是面试中最普遍的话题之一。在这篇文章中,我们将提出10个面试中很重要问题,这肯定能拓宽你的知识面
+Linux命令行,以及用户使用Linux命令进行Linux shell交互,是Linux最吸引人的地方,也是面试中最普遍的话题之一。在这篇文章中,我们将提出10个面试中很重要问题,这肯定能拓宽你的知识面。
 Linux Command Questions
-### 1. 如何停止一个正在运行的进程 ###
+### 1. 如何暂停一个正在运行的进程,让其在后台运行? ###
-**答案**:为了停止正在运行的进程,我们可以使用组合键 Ctrl+Z
+**答案**:为了停止正在运行的进程,让其在后台运行,我们可以使用组合键 Ctrl+Z。
### 2. 什么是安装Linux所需的最小分区数量,以及如何查看系统启动信息? ###
-**答案**:单独一个/root分区足以执行所有的系统任务,但是强烈建议安装Linux时,需要至少三个分区:/root,/boot,/swap。一个IDE硬盘驱动器支持高达63个分区,SCSI硬盘驱动器支持超过15个分区
+**答案**:单独一个/root分区足以执行所有的系统任务,但是强烈建议安装Linux时,需要至少三个分区:/root,/boot,/swap。一个IDE硬盘驱动器支持高达63个分区,SCSI硬盘驱动器支持超过15个分区。
为了检查启动信息,我们可以使用cat或者dmesg命令,如下所示:
@@ -20,39 +20,39 @@ OR
#dmesg
-### 3. 在你的Linux机器上更踪系统事件的守护进程名是什么?###
+### 3. 在你的Linux机器上跟踪系统事件的守护进程名是什么?###
-**答案**:'syslogd',它负责更踪系统信息,并将更踪日志存储在特定的日志文件里
+**答案**:'syslogd',它负责跟踪系统信息,并将跟踪日志存储在特定的日志文件里。
### 4. 在/root分区运行'fsck'命令的最低要求是什么?###
**答案**:/root分区必须挂载为只读模式,而不是读写模式
-### 5. 如何分层复制/home目录到另一个目录,你有什么办法?###
+### 5. 如何分层复制/home目录到另一个目录?###
-**答案**:Linux的'cpio'命令起到了效果。'cpio'可以分层地复制文件和目录层次结构到另一个位置
+**答案**:Linux的'cpio'命令起到了效果。'cpio'可以分层地复制文件和目录层次结构到另一个位置。
### 6. 在Linux中,怎样实现日志文件的自动替换?###
-**答案**:'logrotate'提供日志自动替换功能
+**答案**:'logrotate'提供日志自动替换功能。
-### 7. 你知道Linux中是谁在安排工作吗?###
+### 7. 怎样知道Linux中是谁在安排工作?###
-**答案**:使用'at'命令加上'-l'选项,就可以查出
+**答案**:使用'at'命令加上'-l'选项,就可以查出。
-### 8. 如何在不解压tar包的前提下,查看包里的内容 ###
+### 8. 如何在不解压tar包的前提下,查看包里的内容? ###
**答案**:使用'tar -tvf'。选项‘t’(显示内容),‘v’(详细报告tar处理的文件信息),‘f’(使用档案文件或者设备)
### 9. 什么是页面错误,它是怎么发生的?###
-**答案**:当一个程序请求内存中不存在的数据时,就会产生页面错误,导致的结果就是程序停止
+**答案**:当一个程序请求内存中不存在的数据时,就会产生页面错误,导致的结果就是程序停止。
-### 10. 什么叫在程序中返回代码?###
+### 10. 什么是在程序中返回代码?###
-**答案**:返回代码是shell的特性。返回代码显示了程序的状态,一个成功的程序执行后返回‘0’,&&可以用来决定那个应用程序先执行
+**答案**:返回代码是shell的特性。返回代码显示了程序的状态,一个成功的程序执行后返回‘0’,&&可以用来决定那个应用程序先执行。
-好了,文章要结束了。不久以后,我还会在这分享其余有趣文章的,记得和我们保持联系。还有,别忘了在评论栏里面向我们提供您的宝贵意见
+好了,文章要结束了。不久以后,我还会在这分享其余有趣文章的,记得和我们保持联系。还有,别忘了在评论栏里面向我们提供您的宝贵意见。
-----------------------------------------------------------------------------------------------------------------
@@ -60,9 +60,9 @@ via: http://www.tecmint.com/10-useful-interview-questions-and-answers-on-linux-c
原文作者:[Avishek Kumar][a]
-译者:[su-kaiyao](https://github.com/su-kaiyao) 校对:[校对者ID](https://github.com/校对者ID)
+译者:[su-kaiyao](https://github.com/su-kaiyao) 校对:[Caroline](https://github.com/carolinewuyan)
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
-[a]:http://www.tecmint.com/author/avishek/
+[a]:http://www.tecmint.com/author/avishek/
diff --git a/published/20140729 Use Pushbullet Indicator In Ubuntu To Send Files To Android Or iOS Devices.md b/published/20140729 Use Pushbullet Indicator In Ubuntu To Send Files To Android Or iOS Devices.md
new file mode 100644
index 0000000000..f04a97c4dd
--- /dev/null
+++ b/published/20140729 Use Pushbullet Indicator In Ubuntu To Send Files To Android Or iOS Devices.md
@@ -0,0 +1,80 @@
+在 ubuntu 下使用 Pushbullet Indicator 向 Android/iOS 设备推送文件
+================================================================================
+
+
+[Pushbullet][1]是一款iOS和Android设备与桌面系统互相传输文件、链接、图片的APP应用,Pushbullet可以在任何装有Firefox或Chrome
+浏览器的操作系统上安装使用。
+
+如果你不是浏览器扩展插件的粉丝,却依然想使用桌面应用**Pushbullet in Ubuntu 14.04**的话,你可以使用由 [Atareao][2]开发
+的**Pushbullet Indicator**。 Pushbullet Indicator 小应用正在开发阶段,并不具备官方windows桌面版应用的所有功能,
+但是已经足够大家入门使用了。
+
+### 在Ubuntu 14.04 和 Linux Mint 17 下安装Pushbullet Indicator小应用 ###
+
+打开一个终端,并且使用以下命令
+
+ sudo add-apt-repository ppa:atareao/atareao
+ sudo apt-get update
+ sudo apt-get install pushbullet-indicator
+
+以上个人软件包不支持运行在Ubuntu 13.10.版本
+
+### 在Ubuntu 14.04 和 Linux Mint 17 下使用Pushbullet Indicator小应用 ###
+
+
+- 创建一个[Pushbullet][3]账号
+
+- 在Android/iOS设备上安装Pushbullet
+
+- 在Ubuntu 或者Linux Mint系统安装Pushbullet Indicator小应用以后,运行。第一次启动时,会提供一些Pushbullet账号连接的选项。如图:
+
+
+
+- 当连接完成时,你也应该从下图设备标签中命名你的设备。如果你想Pushbullet在每次开机时自动启动,你可以在从preference设备中
+- 点击打开Autostart按钮自动启动(如上图所示)
+
+- 当你做完这一步,你会看见 Pushbullet indicator 小应用出现在Unity panel。
+
+
+
+- 点击indicator,选择想要向其发送数据的智能手机(已经连接到你的Pushbullet的设备)
+
+
+
+
+- 你将会在其他设备上接收到一个接收文件的通知。然后,你可以通过Pushbullet app应用获取所有的通知消息。
+
+- 安卓设备也可以接到来电、短信和其他类型的通知。
+
+- 如果你从你的移动设备向桌面发送一个文件的话,你将会接到以下通知。
+
+
+
+- 这些文件不会自动的保存在某个目录下。获取其他设备发送来的文件,可以去indicator目录查看最后推送(Show last push),显示你最后推送的。点击下载文件到你选择的目录中。
+
+### 为Pushbullet安装Nautilus扩展 ###
+
+另一个可选的建议,你可以为Pushbullet安装Nautilus扩展,使它可以通过右键目录直接发送文件。使用以下命令安装。
+
+ sudo apt-get install nautilus-pushbullet
+
+但是,在重启后你必须重新授权。
+
+请在评论区分享你使用Pushbullet Indicator小应用的经验,朋友们,再见.
+
+
+
+--------------------------------------------------------------------------------
+
+via: http://itsfoss.com/pushbullet-indicator-ubuntu/
+
+作者:[Abhishek][a]
+译者:[lfzark](https://github.com/lfzark)
+校对:[Caroline](https://github.com/carolinewuyan)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://itsfoss.com/author/Abhishek/
+[1]:https://www.pushbullet.com/
+[2]:http://www.atareao.es/
+[3]:https://www.pushbullet.com/
diff --git a/published/20140731 Command Line Somedays--Part Six.md b/published/20140731 Command Line Somedays--Part Six.md
new file mode 100644
index 0000000000..72260d7161
--- /dev/null
+++ b/published/20140731 Command Line Somedays--Part Six.md
@@ -0,0 +1,59 @@
+命令行星期二——第六部分
+================================================================================
+
+不管怎样,让我们继续我们今天的日程吧:输入/输出重定向。
+
+我们已经用过的大多数命令,都把他们的结果张贴到了终端显示中。然而,我们也可以让这些命令的显示放进一个文件、设备中,或者作为其它命令的输入,一切都在**重定向**。
+
+### 标准输出 ###
+
+那么,命令行程序主要是怎么工作的呢?它们会将命令的结果丢给一个叫做标准输出的设备,然后,标准输出会将这些结果发送到你的显示设备上,这样你就可以畅快地阅读这些信息了。然而,你也可以让命令的结果显示到一个文本文件中,像这样,用“>”字符(我的例子):
+
+ man zypper > man.txt
+
+这儿我所干的是, 我想要获得zypper的一个帮助页。但是,我想要把它放到一个文本文件中去,因而我可以在我需要他们的时候(例如,在论坛、IRC寻求帮助时)很方便地读取这些结果。所以,这个命令做的是,保存man zypper输出结果到我的家目录中的man.txt,这样你可以看到,我可以用gedit来打开它:
+
+
+
+如果我重复了该命令,或者使用不同的命令重定向到了同名文件,那么它就会被一次又一次地覆盖。所以,在那种情况下,如果我想要把输出结果重定向并附加到现存文件中,我唯一能做的事情就是下一次使用“>>”来替换“>”。
+
+### 标准输入 ###
+
+许多命令也可以接受来自称之为标准输入的设备的输入。默认情况下,输入来自键盘,然而也可以来自一个文件。要重定向它,使用跟前面相反的字符:‘**<**’。
+
+请看下面的例子:
+
+ sort < man.txt
+
+### 管道 ###
+
+要想把多个命令连接到一起,你可以使用管道。管道所要做的是,将一个命令的标准输出注入到另一个命令的标准输入。肖茨先生的最爱:
+
+ ls – l | less
+
+通过使用‘| less’这个小把戏,你可以让任何命令滚动输出。
+过滤器
+
+### 过滤器 ###
+
+过滤器是管道中常用的程序。过滤器获取标准输入,对它进行操作,然后把结果发送到标准输出。它们可以以一种相当强大的方式处理信息。这儿提供了一个程序列表,大多数都是用作过滤器的。它们可以用于执行、查询,或者将帮助页重定向到它们,然后再重定向到一个文件!
+
+过滤器:sort, uniq, grep (我们发现这一个东西遍布论坛,因此我建议大家深入研究一下), fmt, pr, head, tail, tr, sed, awk。
+
+### 结束 ###
+
+我们只剩下几个课程来阐述CLI的基本用法了,到成熟期的时候,我希望大家都会对CLI兴趣会增多一点了,也希望大家在萧条期也进行一些探索!而在你们动手干的时候,我希望你们……
+**玩得不亦乐乎!**
+
+--------------------------------------------------------------------------------
+
+via: https://news.opensuse.org/2014/07/30/command-line-somedays-part-six/
+
+作者:[Nenad Latinović][a]
+译者:[GOLinux](https://github.com/GOLinux)
+校对:[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:https://news.opensuse.org/author/holden87/
+[1]:https://news.opensuse.org/2014/07/29/factory-rolling-release/
diff --git a/published/20140731 Minimal Linux Live.md b/published/20140731 Minimal Linux Live.md
new file mode 100644
index 0000000000..f8a8529887
--- /dev/null
+++ b/published/20140731 Minimal Linux Live.md
@@ -0,0 +1,60 @@
+最精简Linux Live CD版本:Minimal Linux Live
+================================================================================
+
+最精简Linux Live是一系列基于[linux内核][1] 和 [BusyBox][2]的自动生成最精简 Live Linux 系统linux shell脚本。所有所需的源码已经自动地被下载,而且所有的生成操作已经完全被封装在脚本中了。
+
+如果你想定制属于自己的最精简Linux Live 的ISO镜像文件,以下是你需要做的:
+
+- 从[下载][3]区域获得最新的脚本。
+
+- 把脚本解压到文件夹下。
+
+- 确保所有的脚本都可执行(可以使用命令chmod +x *.sh 添加可执行属性)
+
+- 在开始生成过程之前,取决于你使用什么Linux系统,可能会有一个或者多个依赖库(也可能不需要,或者更多)需要处理.如果使用Ubuntu的话,以下命令应该足以生成所有需要的依赖库:
+
+----------
+
+ sudo apt-get install wget
+ sudo apt-get install make
+ sudo apt-get install gcc
+ sudo apt-get install bc
+ sudo apt-get install syslinux
+ sudo apt-get install genisoimage
+
+- 执行脚本 **build_minimal_linux_live.sh** 然后等待完成。如果你已经处理好所有的生成依赖库,那么在一台现代计算机上全部的过程耗费时间应该不超过30分钟。如果由于某些原因生成失败,最可能的应该是没有处理好生成依赖库。一些用户反应到生成所必需的包将会处理所有ubuntu上未知的生成依赖问题。如果使用Linux Mint 而且正在尝试安装 g++ 包,如果你依然遇到很多问题,那么你可以尝试安装必需包。在Fedora系统上你可能需要安装 glibc-static包。
+
+ 请记得所有的生成依赖库由于你使用的Linux操作系统和已经安装的软件不同将会发生很大的变化。
+
+ 如果依然有问题,请检查失败信息然后在google上搜索一下。如果你找不到解决方案,你可以询问一些更有经验的linux专家(如果你认识的话),或者另外一个选择是联系我们。请确保在发送给我们之前,你已经提前研究过这个问题。
+
+- 当脚本完成它们的工作,你将会在执行脚本的同目录下发现一个新创建的**minimal_linux_live.iso** 文件。你可以烧录iso镜像到CD/DVD,通过[Universal USB Installer][4]工具安装到USB闪存设备,或者直接在PC的虚拟机上运行,例如[VirtualBox][5]。
+
+生成的ISO镜像文件包括使用默认选项编译的linux内核,使用默认选项编译的BusyBox和非常轻量级的initramfs。这意味着你不需要 另辟蹊径去获得windows支持,也不需要使用任何花哨的桌面环境。你所需要的只是一个支持BusyBox applets 的shell控制台,和……好吧。这些就够了。这就是为什么称它为 "最精简"。
+
+最好的消息是不仅操作系统很小很简单,而且生成脚本也同样的小巧玲珑。你可以很轻松地从脚本学习,并且修改他们去包含更多内容(我是很鼓励你这样做).在你学习完这些基础以后你将会拥有所有所必须的工具和技能去创造你自己功能完善的linux操作系统!完全从零开始!是不是帅呆了!?:)
+
+这篇教程提供了更详细的脚本内部结构以及全部的生成过程,我鼓励你们如果有时间的话就去通读这个文档。
+
+下面你会看到一些屏幕截图,它们展示了当你启动你的新一代 Minimal Linux Live 操作系统时的环境情况。
+
+
+
+
+
+
+
+--------------------------------------------------------------------------------
+
+via: http://minimal.linux-bg.org/
+
+译者:[lfzark](https://github.com/lfzark)
+校对:[Caroline](https://github.com/carolinewuyan)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://kernel.org/
+[2]:http://busybox.net/
+[3]:http://minimal.linux-bg.org/#
+[4]:http://www.pendrivelinux.com/
+[5]:http://virtualbox.org/
diff --git a/sources/news/20140702 CoreOS Linux ending the upgrade cycle.md b/sources/news/20140702 CoreOS Linux ending the upgrade cycle.md
deleted file mode 100644
index ca6dea9964..0000000000
--- a/sources/news/20140702 CoreOS Linux ending the upgrade cycle.md
+++ /dev/null
@@ -1,50 +0,0 @@
-CoreOS Linux ending the upgrade cycle
-CoreOS Linux结束升级周期
-================================================================================
-> CoreOS发布了他的Linux发行版的商用支持版,并且宣称将废除手动更新。
-
-国际数据集团新闻社消息——CoreOS发布了商用Linux发行版,以期能简化系统管理员的生活。这个Linux发行版可持续进行自动更新,不需要进行重大升级。
-
-CoreOS提供其同名的Linux发行版做为商业服务,开始为一个月100美元。
-
-“商家现在可以开始考虑将CoreOS作为他们系统团队的延伸,对于企业Linux客户,这将是他们会需要的最后一次迁移。”CoreOS的创始人和CEO在一份声明中这样说。
-
-商业Linux订阅并不是什么新鲜事:[Red Hat][2]和[Suse][3]都在为他们各自的发行版提供商业订阅。
-
-因为这些以Linux为基础的公司使用的应用程序和库都是开源和免费提供的,所以订阅的费用不包括软件本身,而收费来自更新,漏洞修复,集成以及发生问题时的技术支持。
-
-CoreOS公司声称,CoreOS将会和这些发行版不同,它将不会有重大更新,而这些更新通常需要一次更新更新所有的包。它的更新和新特征将会在就绪后自动。。。。CoreOS will be different from these distributions, the company asserted, in that there will be no major updates, which typically require updating all the packages in the distribution at once. Instead, updates and new features will be streamed automatically to the copy of the OS and applied as soon as they are ready.
-
-The service offers a dashboard, called CoreUpdate, that provides controls for designating which software packages should get updated, should the administrator not want all the packages to be updated automatically.
-
-CoreUpdate can manage multiple machines at once, and offers a roll-back capability should an update cause issues.
-
-Launched last December, CoreOS was designed to [focus][4] on an emerging use of the open-source OS kernel -- that of powering lots of cloud-based virtual servers.
-
-The average CoreOS instance was designed to consume only less than half of what other Linux distributions typically consume. All applications that run on the distribution run in Docker virtualized containers, so they can be started almost instantaneously.
-
-The distribution can be updated more easily [due to its novel use of two partitions][5]. One can contain the current version of the OS while the OS is being updated in the other, smoothing the process of upgrading a package, or the entire distribution.
-
-The CoreOS service can be run on-premises, or through Amazon, Google and Rackspace cloud services.
-
-CoreOS also announced Monday that it received $8 million in backing from the Kleiner Perkins Caulfield and Byers venture capital firm. The company has previously gotten investment from Sequoia Capital and Fuel Capital.
-
-----------
-
-Joab Jackson covers enterprise software and general technology breaking news for The IDG News Service. Follow Joab on Twitter at [@Joab_Jackson][6]. Joab's e-mail address is [Joab_Jackson@idg.com][7]
-
---------------------------------------------------------------------------------
-
-via: http://www.computerworld.com/s/article/9249460/CoreOS_Linux_ending_the_upgrade_cycle?taxonomyId=122
-
-译者:[译者ID](https://github.com/译者ID) 校对:[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:https://coreos.com/products/managed-linux/plans/
-[2]:http://www.redhat.com/about/subscription/
-[3]:https://www.suse.com/support/programs/subscriptions/
-[4]:http://www.networkworld.com/article/2177120/cloud-computing/coreos-linux-distro-lands-on-the-google-cloud-platform.html
-[5]:https://coreos.com/using-coreos/updates/
-[6]:http://twitter.com/Joab_Jackson
-[7]:Joab_Jackson@idg.com
diff --git a/sources/news/20140709 Dwarf Fortress Sees First New Release In 2 Years.md b/sources/news/20140709 Dwarf Fortress Sees First New Release In 2 Years.md
deleted file mode 100644
index f958f829a7..0000000000
--- a/sources/news/20140709 Dwarf Fortress Sees First New Release In 2 Years.md
+++ /dev/null
@@ -1,25 +0,0 @@
-Dwarf Fortress Sees First New Release In 2 Years
-================================================================================
-
-
-[Dwarf Fortress][1] is a single-player fantasy game. You can control a dwarven outpost or an adventurer in a randomly generated, persistent world. The kicker is that the graphics are all text, no actual graphics. There are of course mods to make it graphical however.
-
-I have to say I don't get the fuss at all with this one. The interface is confusing and it's not nice to look at, but I am guessing with plenty of graphical mods it could get pretty good considering everything you can do in it. I understand it will have a massive amount of replayability due to generating a new world each time, but it just doesn't look inviting to someone who hasn't played a game like it before.
-
-This new release is the first in 2 years and has massive changes as you might imagine. See the [full rundown here][1].
-
-What do people see in it exactly? I know plenty of you play it as the amount of people to email it in was crazy. I'm just going to sit back and let the "omg your crazy" comments come in.
-
-
-
-
-
---------------------------------------------------------------------------------
-
-via: http://www.gamingonlinux.com/articles/dwarf-fortress-sees-first-new-release-in-2-years.3997
-
-译者:[译者ID](https://github.com/译者ID) 校对:[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:http://www.bay12games.com/dwarves/index.html
\ No newline at end of file
diff --git a/sources/news/20140714 IPFire 2.13 Core 77 Linux Firewall Distro Brings Major OpenVPN Improvements.md b/sources/news/20140714 IPFire 2.13 Core 77 Linux Firewall Distro Brings Major OpenVPN Improvements.md
deleted file mode 100644
index cae86c7be8..0000000000
--- a/sources/news/20140714 IPFire 2.13 Core 77 Linux Firewall Distro Brings Major OpenVPN Improvements.md
+++ /dev/null
@@ -1,38 +0,0 @@
-IPFire 2.13 Core 77 Linux Firewall Distro Brings Major OpenVPN Improvements
-================================================================================
-
-
-**Michael Tremer, a developer for the ipfire.org team, has announced that IPFire 2.13 Core 79, a new stable build of the popular Linux-based firewall distribution, is now out with some exciting new features.**
-
-IPFire is a modular Linux distribution, which means that it can be deployed as a firewall, a proxy server, or a VPN gateway. The main concern of the developers is security and every step has been taken in order to ensure that users can feel really safe when using this operation system.
-
-The developers are saying in the official [announcement][1] that the “Core Update 79 is finally arriving with many bug fixes and enhancements. Among the big changes with this update are lots feature enhancements that massively increase the security level of OpenVPN connections, some enhancements of the web user interface and a lot more awesome stuff under the hood.”
-
-The IPFire devs had another huge release a few months ago and it looks like they have made another one, this time focusing on the improvement of the OpenVPN features and a few other aspects.
-
-“The certificate authority that can be created on the OpenVPN page now uses much better hashes to protect the integrity of itself. The CA root certificate uses a SHA512 hash and a RSA key with length of 4096 bit. All new created host certificates use a RSA key with 2048 bit length and a SHA256 hash. Additionally, a set of Diffie-Hellman parameters can be generated for better protection of the session keys. The length of the pregenerated DH parameters can be chosen in the web interface,” also noted the devs.
-
-According to the changelog, the cipher that is used for each net-to-net connection can now be changed, the hash function is now configurable with a few options like SHA2 (512, 384, and 256-bit), Whirpool (512 bit), and SHA1 (160 bit), and the tls-auth option can be enabled, which uses a HMAC function.
-
-The Linux kernel used by the distribution has also been updated in this release and the OS now packs the 3.10.44 version. This should bring support for new hardware, a number of security fixes, and more stability.
-
-Also, snort (the Intrusion Detection System) has been updated to version 2.9.6.1, the new firewall GUI now supports blocking access to the GREEN firewall interface, the PIE packet scheduler has been added, and the default size of the root partition has been increased.
-
-The developers recommend all users of IPFire to upgrade their distributions. More details can be found on the official website.
-
-Download IPFire 2.13 Core 79:
-
-- [IPFire 2.15 Core 79][1] (ISO)[iso] [126 MB]
-- [IPFire 3.0 Alpha 1][2] (ISO)[iso] [76 MB]
-
---------------------------------------------------------------------------------
-
-via: http://news.softpedia.com/news/IPFire-2-13-Core-77-Linux-Firewall-Distro-Brings-Major-OpenVPN-Improvements-450605.shtml
-
-译者:[译者ID](https://github.com/译者ID) 校对:[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:http://www.ipfire.org/news/ipfire-2-15-core-update-79-released
-[2]:http://downloads.ipfire.org/releases/ipfire-2.x/2.15-core79/ipfire-2.15.i586-full-core79.iso
-[3]:http://www.rowie.at/ipfire/iso/ipfire-3.0-alpha1.i686.iso
\ No newline at end of file
diff --git a/sources/news/20140714 LFTP 4.5.3 File Transfer Software Is for People Who Love the Terminal.md b/sources/news/20140714 LFTP 4.5.3 File Transfer Software Is for People Who Love the Terminal.md
deleted file mode 100644
index bd30878420..0000000000
--- a/sources/news/20140714 LFTP 4.5.3 File Transfer Software Is for People Who Love the Terminal.md
+++ /dev/null
@@ -1,28 +0,0 @@
-LFTP 4.5.3 File Transfer Software Is for People Who Love the Terminal
-================================================================================
-
-
-**LFTP 4.5.3, a sophisticated file transfer program with a command-line interface that supports FTP, HTTP, FISH, SFTP, HTTPS, and FTPS protocols, has been released and is ready for download.**
-
-Every operation made with LFTP is reliable, which means that, if any non-fatal error occurs, the operation is retried automatically. The software supports numerous protocols, but it can also handle a few other tasks, such as BitTorrent downloads, SRV DNS records, job queuing, bookmarks, aliases, and many more.
-
-“lftp has shell-like command syntax allowing you to launch several commands in parallel in background (&). It is also possible to group commands within () and execute them in background. All background jobs are executed in the same single process. You can bring a foreground job to background with ^Z (c-z) and back with command ‘wait’ (or ‘fg’ which is alias to ‘wait’),” reads the official website.
-
-According to the changelog, a new setting ftp:site has been added, the http body is not uncompressed when the Contrent-Type is compressed, the source address of DHT replies is now checked, and the disconnected torrent peers are now discarded after only a timeout.
-
-A complete list of changes and improvements can be found in the official [announcement][1].
-
-Download LFTP 4.5.3:
-
-- [LFTP 4.5.3 tar.xz][2][sources] [1.40 MB]
-
---------------------------------------------------------------------------------
-
-via: http://news.softpedia.com/news/LFTP-4-5-3-File-Transfer-Software-Is-for-People-Who-Love-the-Terminal-450596.shtml
-
-译者:[译者ID](https://github.com/译者ID) 校对:[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:http://lftp.yar.ru/news.html
-[2]:http://lftp.yar.ru/ftp/lftp-4.4.15.tar.xz
\ No newline at end of file
diff --git a/sources/news/20140718 Time to Upgrade--Ubuntu 13.10 Support Ends Today.md b/sources/news/20140718 Time to Upgrade--Ubuntu 13.10 Support Ends Today.md
deleted file mode 100644
index 68dbc2d138..0000000000
--- a/sources/news/20140718 Time to Upgrade--Ubuntu 13.10 Support Ends Today.md
+++ /dev/null
@@ -1,38 +0,0 @@
-nd0104 is translate
-Time to Upgrade: Ubuntu 13.10 Support Ends Today
-================================================================================
-
-
-**It’s had a fair old run, but after 9 months basking in the sun today marks the end of official support for Ubuntu 13.10 ‘Saucy Salamander’.**
-
-> Despite the name ‘Saucy’, the changes on offer were rather bland
-
-Those still running it should look at upgrading to the most recent stable release, Ubuntu 14.04 LTS. Launched back in April, it will be supported with updates on the desktop all the way until mid-April 2019.
-
-Support for the server version of Ubuntu 13.10 also formally ends today.
-
-### Saucy Loses Flavour ###
-
-Ubuntu 13.10 came out last October with Canonical pledging to provide a full 9 months of ongoing security and bug fixes on the desktop. As of July 17 these updates will cease and no further updates or backported packages will be provided.
-
-Canonical’s [recommended upgrade path][1] is to 14.04, a transition that can be handled directly on the desktop itself through the Software Updater application or via the command line through the ‘`do-release-upgrade`‘ command.
-
-Saucy in name, but bland in nature, 13.10 is far from being one of Ubuntu’s more remarkable releases — [as evidenced by many of the online reviews at the time][2].
-
-It was, however, notable for inflicting(注:这个单词原文有删除线) introducing Smart Scopes to the Unity Dash, adding a keyboard indicator for faster language layout switching, and being the first release to integrate `Ubuntu One Single Sign-on` into the installation experience.
-
-For a natty visual rundown of all that debuted with it you can watch the compilation video below.
-
-Youtobe 视频地址:[http://www.youtube.com/embed/1EiRQ-znEcI?feature=oembed][3]
-
---------------------------------------------------------------------------------
-
-via: http://www.omgubuntu.co.uk/2014/07/ubuntu-13-10-support-ends-today
-
-译者:[译者ID](https://github.com/译者ID) 校对:[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:https://help.ubuntu.com/community/TrustyUpgrades
-[2]:http://www.omgubuntu.co.uk/2013/10/ubuntu-13-10-press-reaction
-[3]:http://www.youtube.com/embed/1EiRQ-znEcI?feature=oembed
\ No newline at end of file
diff --git a/sources/news/20140725 GOG.com Now Supports Linux.md b/sources/news/20140725 GOG.com Now Supports Linux.md
deleted file mode 100644
index a20343e2dd..0000000000
--- a/sources/news/20140725 GOG.com Now Supports Linux.md
+++ /dev/null
@@ -1,145 +0,0 @@
-GOG.com Now Supports Linux!
-================================================================================
-> 50 games for the free OS available right NOW!
-
-[][1]
-
-A while ago, [we've announced our plans][2] to add Linux support as one of the features of our digital platform, with 100 games on the launch day sometime this fall. We've put much time and effort into this project and now we've found ourselves with over 50 titles, classic and new, prepared for distribution, site infrastructure ready, support team trained and standing by, and absolutely no reason to wait until October or November. We're still aiming to have at least 100 Linux games in the coming months, but we've decided not to delay the launch just for the sake of having a nice-looking number to show off to the press. It's not about them, after all, it's about you. So, one of the most popular site feature requests on our [community wishlist][3] is granted today: Linux support has officially arrived on GOG.com!
-
-The first 50+ titles we've have in store for you come from all the corners of our DRM-Free catalog. Note that we've got many classic titles coming officially to Linux for the very first time, thanks to the custom builds prepared by our dedicated team of penguin tamers. That's over twenty fan-favorite GOG.com classics, like [FlatOut][4]&[Flatout 2][5], , [Darklands][6], or [Realms of the Haunting][7] we've personally ushered one by one into the welcoming embrace of Linux gamers. That's already quite a nice chunk of our back-catalog, and you can expect more from our dedicated Linux team soon!
-
-Now, for the recent titles. We've got some indie games with native Linux versions that finally find their well-deserved spot in our store. Among them, debuting on Linux, [CLARC][8] - a well received original comedic Sci-Fi puzzler. On top of that, be on the lookout for two new additions to the GOG.com catalog: [Gods Will Be Watching][9] (coming in a couple of hours) and [Unrest:Special Edition][10] (Linux build coming right up!), both of them very fresh and intriguing. This is the very first time we can provide you with all the PC versions of a premiere game, and we will continue to do so in the future. If there's a Linux version of a title we're releasing, our aim is to deliver it to you Day-1. But enough about us, let's talk about the games. Here's what you can be playing on Linux today:
-
-- [**Anomaly Warzone Earth**][11]
-- [**Ascendant**][12]
-- [**Bionic Dues**][13]
-- [**Blake Stone: Aliens of Gold**][14] - first time on Linux!
-- [**Blake Stone: Planet Strike**][15] - first time on Linux!
-- [**Bloodnet**][16] - first time on Linux!
-- [**Braveland**][17]
-- [**CLARC**][18] - first time on Linux!
-- [**Darklands**][19] - first time on Linux!
-- [**Darwinia**][20]
-- [**Defcon**][21]
-- [**Don't Starve + DLC**][22]
-- [**Dragonsphere**][23] - first time on Linux!
-- [**Duke Nukem 3D: Atomic Edition**][24]
-- [**FlatOut**][25] - first time on Linux!
-- [**Flatout 2**][26] - first time on Linux!
-- [**Fragile Allegiance**][27] - first time on Linux!
-- [**Gemini Rue**][28]
-- [**Gods Will Be Watching**][29]
-- [**Hammerwatch**][30]
-- [**Hocus Pocus**][31] - first time on Linux!
-- [**Kentucky Route Zero**][32]
-- [**The Last Federation**][33]
-- [**Legend of Grimrock**][34]
-- [**Litil Divil**][35] - first time on Linux!
-- [**Long Live the Queen**][36]
-- [**MouseCraft**][37]
-- [**Multiwinia**][38]
-- [**Normality**][39] - first time on Linux!
-- [**Pinball Gold Pack**][40] - first time on Linux!
-- [**Pinball World**][41] - first time on Linux!
-- [**Pirates! Gold Plus**][42] - first time on Linux!
-- [**Realms of the Haunting**][43] - first time on Linux!
-- [**Rex Nebular and the Cosmic Gender Bender**][44] - first time on Linux!
-- [**Rise of the Triad: Dark War**][45] - first time on Linux!
-- [**Shattered Haven**][46]
-- [**The Shivah HD**][47]
-- [**Sid Meier's Colonization**][48] - first time on Linux!
-- [**Sid Meier's Covert Action**][49] - first time on Linux!
-- [**Sir, You Are Being Hunted**][50]
-- [**Slipstream 5000**][51] - first time on Linux!
-- [**Space Pirates and Zombies**][52]
-- [**Spacechem**][53]
-- [**Stargunner**][54] - first time on Linux!
-- [**SteamWorld Dig**][55]
-- [**Super Hexagon**][56]
-- [**Surgeon Simulator 2013**][57]
-- [**Sword of the Samurai**][58] - first time on Linux!
-- [**Teslagrad**][59]
-- [**Unrest:Special Edition**][60] (Linux build on the way!)
-- [**Uplink**][61]
-- [**VVVVVV**][62]
-
-As if this wasn't exciting enough, we've put more than half of these titles on a [special promo][63]! Head out to the [promo page][64] and find out which of them you can get up to 75% off until Tuesday, 9:59AM GMT. Of course, all of the games from the list above that you already own will be updated with Linux versions with no additional cost for you, just as you might have expected from GOG.com.
-
-"OK, but how will Linux support actually work on GOG.com" - you might ask. For both native Linux versions, as well as special builds prepared by our team, GOG.com will provide distro-independent tar.gz archives and support convenient DEB installers for the two most popular Linux distributions: Ubuntu and Mint, in their current and future LTS editions. Helpful and responsive customer support has always been an important part of the GOG.com gaming experience. We wouldn't have it any other way when it comes to Linux, and starting today our helpdesk offers support for our official Linux releases on Ubuntu and Mint systems.
-
-Diversity and freedom of choice have always been an important part of the GOG.com way. We're very glad that we could improve our service with the addition of the free (and DRM-Free) alternative to the commercial operating systems. Talking with gamers is just as important, so we're counting on your feedback! If you've got any questions, suggestions, or run into any trouble, just tell us in the forum thread below this post. Just please be gentle, this is [our very first time][65] with Linux. Happy launch day, everyone!
-
---------------------------------------------------------------------------------
-
-via: http://www.gog.com/news/gogcom_now_supports_linux
-
-译者:[译者ID](https://github.com/译者ID)
-校对:[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:http://www.gog.com/promo/linux_launch_promo_240714
-[2]:http://www.gog.com/news/gogcom_soon_on_more_platforms
-[3]:http://www.gog.com/wishlist/site#search=linux
-[4]:http://www.gog.com/game/flatout
-[5]:http://www.gog.com/game/flatout_2
-[6]:http://www.gog.com/game/darklands
-[7]:http://www.gog.com/game/realms_of_the_haunting
-[8]:http://www.gog.com/game/clarc
-[9]:http://www.gog.com/game/gods_will_be_watching
-[10]:http://www.gog.com/game/unrest_special_edition
-[11]:http://www.gog.com/game/anomaly_warzone_earth
-[12]:http://www.gog.com/game/ascendant
-[13]:http://www.gog.com/game/bionic_dues
-[14]:http://www.gog.com/game/blake_stone_aliens_of_gold
-[15]:http://www.gog.com/game/blake_stone_planet_strike
-[16]:http://www.gog.com/game/bloodnet
-[17]:http://www.gog.com/game/braveland
-[18]:http://www.gog.com/game/clarc
-[19]:http://www.gog.com/game/darklands
-[20]:http://www.gog.com/game/darwinia
-[21]:http://www.gog.com/game/defcon
-[22]:http://www.gog.com/game/dont_starve
-[23]:http://www.gog.com/game/dragonsphere
-[24]:http://www.gog.com/game/duke_nukem_3d_atomic_edition
-[25]:http://www.gog.com/game/flatout
-[26]:http://www.gog.com/game/flatout_2
-[27]:http://www.gog.com/game/fragile_allegiance
-[28]:http://www.gog.com/game/gemini_rue
-[29]:http://www.gog.com/game/gods_will_be_watching
-[30]:http://www.gog.com/game/hammerwatch
-[31]:http://www.gog.com/game/hocus_pocus
-[32]:http://www.gog.com/game/kentucky_route_zero_season_pass
-[33]:http://www.gog.com/game/last_federation_the
-[34]:http://www.gog.com/game/legend_of_grimrock
-[35]:http://www.gog.com/game/litil_divil
-[36]:http://www.gog.com/game/long_live_the_queen
-[37]:http://www.gog.com/game/mousecraft
-[38]:http://www.gog.com/game/multiwinia
-[39]:http://www.gog.com/game/normality
-[40]:http://www.gog.com/game/pinball_gold_pack
-[41]:http://www.gog.com/game/pinball_world
-[42]:http://www.gog.com/game/pirates_gold_plus
-[43]:http://www.gog.com/game/realms_of_the_haunting
-[44]:http://www.gog.com/game/rex_nebular_and_the_cosmic_gender_bender
-[45]:http://www.gog.com/game/rise_of_the_triad__dark_war
-[46]:http://www.gog.com/game/shattered_haven
-[47]:http://www.gog.com/game/the_shivah
-[48]:http://www.gog.com/game/sid_meiers_colonization
-[49]:http://www.gog.com/game/sid_meiers_covert_action
-[50]:http://www.gog.com/game/sir_you_are_being_hunted
-[51]:http://www.gog.com/game/slipstream_5000
-[52]:http://www.gog.com/game/space_pirates_and_zombies
-[53]:http://www.gog.com/game/spacechem
-[54]:http://www.gog.com/game/stargunner
-[55]:http://www.gog.com/game/steamworld_dig
-[56]:http://www.gog.com/game/super_hexagon
-[57]:http://www.gog.com/game/surgeon_simulator_2013
-[58]:http://www.gog.com/game/sword_of_the_samurai
-[59]:http://www.gog.com/game/teslagrad
-[60]:http://www.gog.com/game/unrest_special_edition
-[61]:http://www.gog.com/game/uplink_hacker_elite
-[62]:http://www.gog.com/game/vvvvvv
-[63]:http://www.gog.com/promo/linux_launch_promo_240714
-[64]:http://www.gog.com/promo/linux_launch_promo_240714
-[65]:http://youtu.be/qBxbPts5tOk
\ No newline at end of file
diff --git a/sources/news/20140728 CoreOS Stable Release.md b/sources/news/20140728 CoreOS Stable Release.md
deleted file mode 100644
index 49880f3a4b..0000000000
--- a/sources/news/20140728 CoreOS Stable Release.md
+++ /dev/null
@@ -1,44 +0,0 @@
-Translating by lfzark
-CoreOS Stable Release
-================================================================================
-First off, [Happy SysAdmin Day][1]. We think we have a pretty good SysAdmin surprise in store for you today as we are announcing the CoreOS stable release channel. Starting today, you can begin running CoreOS in production. This version is the most tested, secure and reliable version available for users wanting to run CoreOS. This is a huge milestone for us. Since our first alpha release in August 2013:
-
-- 191 releases have been tagged
-- Tested on hundreds of thousands of servers on the alpha and beta channels
-- Supported on 10+ platforms, ranging from bare metal to being primary images on Rackspace and Google
-
-It is a big day for us here at CoreOS, as we have been working hard to deliver the stable release. Of course, we couldn’t do this without the community so thank you for all of your support and contributions to the project.
-
-[CoreOS 367.1.0][2], our first version on the stable channel, includes the following:
-
-- Linux 3.15.2
-- Docker 1.0.1
-- Support on all major cloud providers, including Rackspace Cloud, Amazon EC2 (including HVM), and Google Compute Engine
-- Commercial support via [CoreOS Managed Linux][3]
-
-This is a great opportunity to read about our [Update Philosophy][4] if you haven't already done so.
-
-Please note: The stable release is not including etcd and fleet as stable, this release is only targeted at the base OS and Docker 1.0. etcd/fleet stable support will be in subsequent releases.
-
-For those of you who want to start running CoreOS in production be sure to review our quick [Switching Release Channels][5] guide. As you're booting new machines, be sure to base them off your desired channel from the beginning.
-
-Finally, thanks to the community for your support. We can’t wait to hear your feedback. For those looking for additional support of running CoreOS in production, be sure to check out our [Managed Linux][6] offerings, as we have a full support team in place ready to answer any questions you may have.
-
-Happy SysAdmin Day, and thank you for making the web awesome.
-
---------------------------------------------------------------------------------
-
-via: https://coreos.com/blog/stable-release/
-
-作者:Alex Polvi
-译者:[译者ID](https://github.com/译者ID)
-校对:[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:http://sysadminday.com/
-[2]:https://coreos.com/releases/#367.1.0
-[3]:https://coreos.com/products/managed-linux/
-[4]:https://coreos.com/using-coreos/updates/
-[5]:https://coreos.com/docs/cluster-management/setup/switching-channels/
-[6]:https://coreos.com/products/managed-linux/
diff --git a/sources/news/20140731 Red Hat aims to standardize Linux for 64-bit ARM servers.md b/sources/news/20140731 Red Hat aims to standardize Linux for 64-bit ARM servers.md
new file mode 100644
index 0000000000..12ebd4657a
--- /dev/null
+++ b/sources/news/20140731 Red Hat aims to standardize Linux for 64-bit ARM servers.md
@@ -0,0 +1,52 @@
+Red Hat aims to standardize Linux for 64-bit ARM servers
+================================================================================
+> Red Hat wants Linux for ARM servers to avoid the fragmentation that plagued Unix in decades past
+
+DG News Service - Red Hat has developed a version of the Linux operating system that can be used to test chips and associated hardware based on the ARMv8-A 64-bit architecture for servers with the aim of standardizing that market.
+
+Based on the company's Red Hat Enterprise Linux (RHEL), the Linux distribution is part of a [partner program][1] that Red Hat launched Wednesday for potential [ARM hardware vendors][2].
+
+"We don't call it RHEL, but it is a functional, unsupported, operating system for partners to use in their development activities," said Mark Coggin, Red Hat senior director of platform product marketing.
+
+Red Hat designed the program to get the hardware manufacturers to settle on a standard implementation of the ARMv8-A specification. ARM does not manufacture its own processors, licensing its designs to chip manufacturers instead.
+
+A standard implementation would mean that customers could purchase ARMv8-A servers from any manufacturer, knowing that their ARM 64-bit operating systems and software will work no matter who created the chip, Coggin said. Red Hat would like Linux ARM to avoid the fate of AT&T's Unix operating system, which fragmented into a number of different and incompatible versions.
+
+"We see the importance of stepping in early and ensure that we don't end up with a fragmented approach, where if you wanted to run an AMD implementation of ARM, you'd need one version of Linux, and if you wanted to run a Broadcom implementation of ARM, you'd need another version," Coggin said.
+
+Some of the work of standardizing ARM for servers has been done through an industry consortium started earlier this year, called the [Server Base System Architecture][3] (SBSA) specification, as well as through ongoing work from the Linaro Enterprise Group. Red Hat's unnamed ARM Linux distribution uses specifications from both groups.
+
+Red Hat hopes to influence not only the companies that make the chips but also hardware vendors, original equipment manufacturers and original design manufacturers.
+
+Thus far, manufacturers such as Advanced Micro Devices, American Megatrends, AppliedMicro, Broadcom, Cavium, Dell and Hewlett-Packard have all pledged support to Red Hat's standardization efforts.
+
+"If ARM is to be a viable competitor in the server space, [hardware providers] have to comply to the common understanding of what is possible to run on this type of server. Customers and users demand that from manufacturers today in the x86 world," said Yan Fisher, Red Hat technical product marketing manager.
+
+Through the program, Red Hat will learn more about what the manufacturers need from an enterprise Linux distribution for 64-bit ARM, Coggin said. The operating system may one day become the basis for an ARM version of RHEL.
+
+"We're trying to understand the platform dependencies from a technology requirements perspective," Coggin said. "We don't know if or when this will ever become a product, but we are positioning ourselves in a way that at some point we could enter the market."
+
+Red Hat's Fedora project has offered an ARM distribution for the past several years and this release, though based on the Fedora work, is configured more toward ARM server use.
+
+Although ARM processors are used in most mobile devices, only recently [has there been a movement in the industry][4] to use them in data-center servers as well, where their low-power design could cut energy costs.
+
+Only a handful of ARMv8-A processors and associated hardware are currently available, mostly as early previews for developers or packaged in proprietary systems.
+
+AMD Opteron A1100-Series ARM processors, designed specifically for servers, were released Wednesday to developers. AMD also offers the ARM Cortex-A57 ARMv8 which was designed for system-on-a-chip architectures.
+
+AppliedMicro offers production-ready ARM servers, under the X-Gene brand and Hewlett-Packard is prepping its Moonshot line of ARM servers. Motherboard manufacturer American Megatrends offers a BIOS chip to boot ARM processors.
+
+--------------------------------------------------------------------------------
+
+via: http://www.computerworld.com/s/article/9250061/Red_Hat_aims_to_standardize_Linux_for_64_bit_ARM_servers?taxonomyId=122
+
+作者:Joab Jackson
+译者:[译者ID](https://github.com/译者ID)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://connect.redhat.com/early-access-programs/red-hat-and-64-bit-arm-ecosystem
+[2]:https://engage.redhat.com/arm-s-201407291033
+[3]:http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.den0029/index.html
+[4]:http://www.networkworld.com/article/2171235/servers/arm-servers-with-64-bit-calxeda-chips-to-ship-next-year.html
\ No newline at end of file
diff --git a/sources/news/20140801 French City Toulouse Saved 1 Million Euro With LibreOffice.md b/sources/news/20140801 French City Toulouse Saved 1 Million Euro With LibreOffice.md
new file mode 100644
index 0000000000..a7ad8d7af1
--- /dev/null
+++ b/sources/news/20140801 French City Toulouse Saved 1 Million Euro With LibreOffice.md
@@ -0,0 +1,34 @@
+French City Toulouse Saved 1 Million Euro With LibreOffice
+================================================================================
+
+
+[Toulouse][1], France’s 4th largest city located in south-west France, has saved one million Euro by migrating to Open Source office suite [LibreOffice][2].
+
+Migrating to LibreOffice was one of the key project of city’s new digital policy. The migration started in 2012 after the political decision for the switch was taken in 2011. It took one and a half-year for the migration to complete and as of today, 90% of the desktops (used by around 10,000 people working for the city) run LibreOffice.
+
+As per the city officials, software licenses for office suite costs around 1.8 million Euro every three years. The migration cost about 800,000 Euro. The city already saved around a million Euro.
+
+It all started after Pierre Cohen was elected as the mayor of Toulouse in 2008. Cohen, an IT professional, started working on a digital policy with special focus on Open Source. It was his and his associate Erwane Monthubert’s efforts that city of Toulouse decided to switch to Open Source in 2011.
+
+It’s not just LibreOffice. Most of the official web portals of Toulouse like toulouse.fr, toulouse-metropole.fr, data.grandtoulouse.fr are supported by free software. Alfresco is the choice for collaborative tools.
+
+Switching to Open Source seems to be a trend in European cities. In neighboring Spain Valencia and [Canary Islands ditched Microsoft Office and saved in millions][3]. [French Metropolitan Police developed its own Linux OS][4] based on Ubuntu. List is endless and I hope my current city, Cote de Azur joins this list soon.
+
+Read full report [here][5].
+
+--------------------------------------------------------------------------------
+
+via: http://itsfoss.com/french-city-toulouse-saved-1-million-euro-libreoffice/
+
+作者:[Abhishek][a]
+译者:[译者ID](https://github.com/译者ID)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://itsfoss.com/author/Abhishek/
+[1]:http://en.wikipedia.org/wiki/Toulouse
+[2]:http://www.libreoffice.org/
+[3]:http://itsfoss.com/canary-islands-saves-700000-euro-open-source/
+[4]:http://itsfoss.com/french-national-police-switch-37000-desktops-to-linux/
+[5]:https://joinup.ec.europa.eu/elibrary/case/toulouse-saves-1-million-euro-libreoffice
\ No newline at end of file
diff --git a/sources/news/20140804 Open-Source Media Center 'XBMC' Announces New Name.md b/sources/news/20140804 Open-Source Media Center 'XBMC' Announces New Name.md
new file mode 100644
index 0000000000..e3ba08ec20
--- /dev/null
+++ b/sources/news/20140804 Open-Source Media Center 'XBMC' Announces New Name.md
@@ -0,0 +1,57 @@
+Open-Source Media Center ‘XBMC’ Announces New Name
+================================================================================
+
+Beginnings: the project began life as an Xbox video player
+
+**One of the most popular open-source media center applications that’s available on Linux (and other platforms) is getting a new name.**
+
+XBMC is no more; as of the next major release, version 14, the project will be known as ‘Kodi’.
+
+The community project was created back in 2002 as a means to play digital media on the original Xbox console. Since then the project has, by and large, always used a variation of its Xbox-branded roots. Early releases were titled ‘**Xbox Media Player**’, later changed to ‘**Xbox Media Center**’ to represent the growing feature set. After being ported to run on more than just Microsoft’s game console, the project settled on the acronym ‘XBMC’ in 2008.
+
+Or ‘XMBC’ as I would repeatedly type it as during the early days of this site.
+
+Why the change of name? Why now? And what does ‘Kodi’ mean, if anything?
+
+> ‘The software only barely runs on the original Xbox…’
+
+“*The software only barely runs on the original Xbox, and then only because some clever developers are still hacking on that platform. It has never run on the Xbox 360 or Xbox One,*” explains project manager **Nathan Betzen** on the XBMC blog.
+
+And with the software now far more featured than ever before, with a diverse market of add-ons, gaming features and streaming support, it’s more encompassing than ‘*a simple Media Center.*’
+
+For this reason, Betzen concludes, “**XB**” and “**MC**” simply don’t make a whole lot of sense any more.”
+
+Justifiably to XBMC faithful, the name change also **nixes a number of long standing legal problems** facing the project. “*[We] never had any sort of legal control over the use of its name…*” Betzen notes, adding that the XBMC Foundation, set up in 2009 to better aid and manage development, operated under ‘potential legal threat from other companies’ owning similar trademarks.
+
+### And so, Kodi ###
+
+
+The (temporary) new logo
+
+As of the upcoming release of XBMC 14 the project will formally transition over to the new name of ‘Kodi’. It doesn’t appear to have any specific meaning other than sounding quite cool.
+
+Migration won’t be easy, and XMBC/Kodi developers have a lot of handwork ahead; code has to be adjusted to use the new title throughout, and this has to be tested and double-checked on every platform it supports. Websites, contracts and artwork have to be changed, as will e-mail addresses, developer accounts and more.
+
+“But,” Betzen concludes, “we believe that with your support and the support of the whole community, Kodi, the media center or entertainment platform or whatever you choose to call it that we’ve all come to love will be even stronger than it was before.”
+
+Quite right. For the full musings on the moniker migration you can mosey on over to the official website, linked to below.
+
+- [‘Introducing Kodi 14′ (Official Announcement Post)][1]
+
+To take the current stable release of the entertainment centre for a whirl you’ll need to add the official project PPA to your software sources.
+
+- [XBMC Team PPA on Launchpad][2]
+
+--------------------------------------------------------------------------------
+
+via: http://www.omgubuntu.co.uk/2014/08/xbmc-renamed-lodi-starting-version-14
+
+作者:[Joey-Elijah Sneddon][a]
+译者:[译者ID](https://github.com/译者ID)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:https://plus.google.com/117485690627814051450/?rel=author
+[1]:http://xbmc.org/introducing-kodi-14/
+[2]:https://launchpad.net/~team-xbmc/+archive/ppa
\ No newline at end of file
diff --git a/sources/talk/20140607 Four Awesome Free Alternatives to Ubuntu One Cloud Storage.md b/sources/talk/20140607 Four Awesome Free Alternatives to Ubuntu One Cloud Storage.md
deleted file mode 100644
index e699df2cae..0000000000
--- a/sources/talk/20140607 Four Awesome Free Alternatives to Ubuntu One Cloud Storage.md
+++ /dev/null
@@ -1,126 +0,0 @@
-Four Awesome Free Alternatives to Ubuntu One Cloud Storage
-================================================================================
-
-
-Be honest: news that [Canonical is shuttering its Ubuntu One cloud storage service][1] came as a shock, right?
-
-After four years of serving each and every Ubuntu user with a few gigabytes of free space in which to store their documents, music and photos, Canonical have decided to close it down. The service will cease operating as normal from June, and all files will be deleted permanently this July.
-
-While the reasons behind its closure make sense for the company in lieu of it broader ambitions elsewhere, there’s no getting away from the fact that if you used it daily, you’re going to be left a little peeved.
-
-> ‘…there is an army of alternatives able to pick up where Ubuntu One has left off’
-
-Thankfully there is an army of alternatives able to pick up where Ubuntu One has left off. Most, if not all, offer more space, better features and are generally more reliable than Canonical’s aged offering. In fact, it seems like everyone and their pet cat now offers free cloud storage.
-
-It’s partly because of the fierce competition between these services, what CEO Jane Silber refers to as the “free storage wars”, that the Ubuntu One offering wasn’t able to find its footing.
-
-But the promise of some free space and a means of syncing to it through the desktop does not mean they’re all equal, or worthy of entrusting with your data. Which alternatives are worth pursuing? Let’s take a look.
-
-
-Dropbox Indicator on Ubuntu – Comes In Handy
-
-### Dropbox ###
-
-#### Best all rounder ####
-
-Who hasn’t heard of Dropbox? As the granddaddy of cloud storage, it was the first service to both popularise and implement desktop-to-server syncing in a way that felt productive and not cumbersome.
-
-Its success was buoyed by a generous referral scheme offering you extra space for signing others up, and extensive cross-platform support. Dropbox makes it easy to hop between devices and OSes and retain access to your files. Other features include public folders that let you share items with other people, regardless of whether they use the service, and near-instantaneous syncing of files as and when they’re changed.
-
-256-bit AES encryption and two-step verification mean your files are pretty safe and secure.
-
-For Ubuntu users Dropbox provides a native application that integrates tightly with the default file manager Nautilus. It offers an indicator applet for monitoring, sharing and managing sync; file and folder emblems; and some handy right-click menu options for quick sharing.
-
-- **2GB** Free Space
-- Referral Scheme
-- Paid plans start from $9.99/m for 100GB
-- **Multi-platform support** (Windows, Mac, iOS, Android, Blackberry & Linux)
-
-> - [Learn More on the Dropbox Website][2]
-
-
-Insync Integrates Google Drive on Linux
-
-### Google Drive ###
-
-#### Best for space and features ####
-
-If you use Gmail or Google Docs then you’ll have, at some point or another, interacted with Google Drive. The search giant’s cloud service offers 15GB of free space in which to store your files, folders, photos and the like. These can be accessed from virtually any device with internet access and a fairly recent web browser or through dedicated mobile and desktop apps.
-
-One of the neat things about Drive is that certain files do not count towards your free space quota; e.g., Google Docs files. Neither do files others have shared with you. Better still, any photos you upload to Google+ that have a resolution less than 2048 x 2048 are also hosted and synced gratis.
-
-But Drive offers more than just space for your stuff. You also gain tight integration with Google’s own services, like Gmail, Google Docs and Google+.
-
-While it’s not the easiest alternative to use on Ubuntu owing to a lack of official native support, there are a number of third party tools that allow you to sync your files locally and have all changes made uploaded back. The most popular third part app is InSync. It’s not free (costing a one-off fee of $15 for the basic account) but it is by far the best way to use it.
-
-- 15GB Free Space
-- Paid plans start from $2.99/m for 100GB
-- Official apps for Windows, Mac, iOS and Android
-- Integrated into Chrome OS
-- Unofficial applications for Linux
-
-> - [Learn More on the Google Drive Website][3]
-
-
-Copy running on Ubuntu
-
-### Copy ###
-
-#### Best for Security Conscious ####
-
-If popularity was based solely on the number of referral links that are posted in our comments section, then Copy would win the title hands down.
-
-It may be less well known than other entrants on this list, but Copy, which is run by cloud enterprise giant Barracuda Networks, touts its robust security benefits the loudest.
-
-Like Dropbox, Copy uses AES 256-bit encryption on all files but, unlike Dropbox, doesn’t not rely on third-party servers as all files are stored on the company’s own servers.
-
-“With advanced features like secure sharing, source validation, and identity verification, you can breathe easy knowing your content can only be seen by the people you want,” they promise on their website.
-
-Another of its unique advantages is that shared files and folders can be assigned to a single user so that they don’t count against the data storage limit for other users. Or, if preferred, the load can be shared between parties so that, for example, a 10GB file shared between 4 people would count as 2.5GB/each, rather than, as on Dropbox, 10GB each.
-
-Google Drive offers something similar in that only the ‘sharer’ of a file has it count against their storage.
-
-For desktop integration Copy spoil Linux users. The service supports native integration with **Nautilus, Thunar** and **Caja**, including sync folders and right-click options. An indicator applet/system tray item provides further control options, including a handy list of recently changed files.
-
-- 15GB Free Space
-- Referral scheme
-- Paid plans start from $9.99/m for 250GB
-- Multi-platform support (Windows, Mac, iOS, Android & Linux)
-
-> - [Learn More on the Copy Website][4]
-
-
-Manage File Sync Yourself
-
-### ownCloud ###
-
-#### Best for privacy ####
-
-If you’d rather not trust your data in other people’s hands but still want the convenience of a “personal cloud”, ownCloud is a free and open source cloud storage platform you can host yourself.
-
-Like with other cloud storage services, ownCloud lets you sync and share your files across Windows, OS X, Linux, Android, and iOS. It also comes with calendar integration, photo gallery sharing, built-in support for (mounting) additional storage devices/services – e.g., FTP servers, Dropbox and Amazon S3 – and a slew of “apps” that can be added for additional features in the web interface, including a PDF viewer, text editor, and version control.
-
-Packages are available for a number of distributions, including Ubuntu from 12.04 to 13.10.
-
-> - [Learn More on the ownCloud Website][5]
-
-Chances are some of you reading this will have you own favourite, so don’t take the four picks above as set in stone. Other options worth exploring before committing include [SpiderOak][6], Microsoft [OneDrive][7] and [Box][8].
-
-
-
---------------------------------------------------------------------------------
-
-via: http://www.omgubuntu.co.uk/2014/04/three-alternatives-ubuntu-one
-
-译者:[译者ID](https://github.com/译者ID) 校对:[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:http://www.omgubuntu.co.uk/2014/04/canonical-axe-ubuntu-one-file-music-services-grab-data-now
-[2]:http://dropbox.com/
-[3]:http://drive.google.com/
-[4]:https://www.copy.com/home/
-[5]:http://owncloud.org/
-[6]:https://spideroak.com/
-[7]:https://onedrive.live.com/
-[8]:https://www.box.com/
diff --git a/sources/talk/20140607 Raspberry Pi In Schools.md b/sources/talk/20140607 Raspberry Pi In Schools.md
deleted file mode 100644
index 131a046d42..0000000000
--- a/sources/talk/20140607 Raspberry Pi In Schools.md
+++ /dev/null
@@ -1,178 +0,0 @@
-Raspberry Pi In Schools
-================================================================================
-> Teaching the world to code is a noble goal, but how is it going to work in practice?
-
-Two years ago, when the Raspberry Pi launched, it was with the intention of improving IT education in the UK. Since then more powerful, better connected or cheaper boards have come onto the market, but the Pi retains its position as the white knight of ICT teaching.
-
-Why? Because of the community of users that has grown up around it. To find out more we travelled west to Manchester, venue for the second annual Jamboree – a festival of educators, makers and messer-abouters focussed on highlighting how engaging the Pi can be. There, we met 75% of the Raspberry Pi Foundation’s education team – Ben Nuttall, Clive Beale and Carrie Anne Philbin – to discuss IT teaching in the UK.
-
-
-
-**LV**: So, Raspberry Pi education team, we were saying earlier that the obvious place to start is with the UK government’s Year of Code initiative, but that seems far too negative to being with!
-
-**Carrie Anne**: Yeah, but there’s so much to say about it!
-
-**Clive**: I think it’s a fantastic initiative, which just represents everything we stand for, blah, blah, blah, blah, blah!
-
-**LV**: Should we just leave that then?
-
-**Clive**: I mean the main issue is how the media portray computing, which is a brilliant, creative, rigorous, hard, challenging, fun thing, to just reduced to ‘this code’. ‘We must learn to code.’ ‘You better learn code or you’re a rubbish teacher.’ Which of course is not the case at all, it’s so much more than that. And so the teachers are running around now thinking the sky’s falling because they think that by September 2014, if they can’t code, then they’ve failed and they’ll think their kids have failed, and it’s a really bad message. There hasn’t been a simple message to say this is not the case, get out into the playground with some chalk and make a maze and do some computing, to teach them how to use a computer. No politician has stepped in to say this is not the case and they haven’t asked teachers who would tell them this isn’t the case. And that’s the problem. Where are the teachers? Where are the people that are actually teaching?
-
-**LV**: As you’ve just left teaching to join the Raspberry Pi Foundation, what are your thought Carrie Anne?
-
-**Carrie Anne**: It feels like a lot longer than two months, it feels like an eternity!
-
-**Clive**: Is that bad?
-
-**Carrie Anne**: No no, not at all! Because teachings so fast paced in that you’re seeing the results of what you’re doing in class straight away, whereas being out of the classroom for the past two months and working the Foundation, I can’t actually see the impact I’m having, but obviously people are talking to me and saying I am having an impact. It’s just very different to what I was seeing before. Clive always said there’s a massive difference between teaching and being a teacher. There are a lot of people we talk to who run Raspberry Jams, workshops, CoderDoJos and that kind of thing, and they always say ‘Oh, it’s really easy, you just do this, this and this.’ And it’s like, great, but you’ve got kids coming to you that *want* to learn this stuff. Imagine a class where you’ve got a bunch of kids who aren’t interested or engaged by this subject and actually teaching is much harder…
-
-**Clive**: Maybe 15 year olds on a Friday afternoon…
-
-**Carrie Anne**: Yes, a six-period day, end of the week…
-
-**Clive**: Ofsted saying, ‘Why haven’t your kids developed after 20 minutes in your lesson? Why haven’t they progressed?’. It’s very different.
-
-**Carrie Anne**: It’s very different, yep.
-
-**LV**: So you have some idea of how things should be done because of your recent experience?
-
-**Carrie Anne**: Yes.
-
-> The Raspberry Jams have done an excellent job of bringing people together from all walks of life
-
-**LV**: Are we, in general as a society, doing the right things?
-
-**Carrie Anne**: I think so. I think what’s been really nice about the Raspberry Pi community is that is gives back to the community. So there are experts, there are people who love what they do, who are reaching out to teachers and reaching out to children by running workshops and clubs and things. And it’s actually that collaboration that produces the best materials and produces the best way to move forward with the new curriculum. I mean, the work I did as a teacher producing the Sonic Pi was a team of work. That was because I worked with, yes an academic, but he was an expert. He wanted to develop a teaching environment that I could use with my students to teach tech-based programing in a fun and engaging way, that engaged both genders and engaged both low ability students and high ability students. It’s a tech-based programming language, which is important at Key Stage 3 where you need to not just be able to teach Scratch, you need to teach a tech-based language that’s nice bridge between Starch and something like Python, which we can teach later on. So, yeah, I think we are moving in the right direction. It would be nicer if the powers that be…
-
-**Clive**: It would be nice to see that as a microcosm of how these things actually happen. So as an academic has a brilliant idea and they’re very good at what they do, and then they come to a teacher and say ‘How can we make this useful in the classroom?’, ‘How can we get assessment in there?’, which schools needs frankly, ‘How do we make it robust?’, ‘How can we test it?’. And isn’t that a weird idea, to actually ask the people that teach how we should do that? It hasn’t happened really. But, yes, as Carrie says, we’re going in the right direction, certainly. The community and third parties are doing more to push it along.
-
-**LV**: From someone outside a little bit, it kind of looks like this community has sort of spontaneously developed around the Raspberry Pi. Has this always been there or has it just become more obvious now?
-
-**Carrie Anne**: I think it’s always been there. I was a teacher so when Raspberry Pi first came out I got one. It got it and then I was like, this is brilliant! Someone’s developed something for education. A Linux box that we can use in the classroom. It’s cheap, it’s brilliant!
-
-**Clive**: And mess about with.
-
-**Carrie Anne**: Yeah, it’s going to be great! And then I was like, right, so where are the resources to go with it? Ah, there aren’t any. Then I was like, so where can I go and find some? The first obvious place was Raspberry Jam. There are people running events where they’re doing stuff. So I thought I’ll go along and speak to some people, and see what’s available. And it was through that that I met people to work with, and they’d formed that themselves, the enthusiasts from throughout the community around the Raspberry Pi.
-
-**Clive**: It’s been a focus, hasn’t it? There’s been a lot of people sort of hanging around, saying ‘Look, I like tinkering, I like messing, I like coding, I like making’, and this thing appeared which was cheap and cheerful and fantastic to play around with, and I think it was a focus. It was waiting to happen really.
-
-
-Carrie Ann Philbin, The Raspberry Pi Foundation’s Education Pioneer
-
-**LV**: Was there anything equivalent to Raspberry Jams before the Raspberry Pi came along for people and teachers to come together?
-
-**Carrie Anne**: Well teachers tend to generally get together through things like TeachMeets and through Twitter, and those kinds of chat tools. There are ways that you can get together, but that’s more talking about teaching practice. Like the different ways you can use a sentence. It’s very teachery, it wasn’t specific to teaching computing.
-
-**Clive**: I think hardware-wise, Raspberry Pi was in the right place and the right time.
-
-**Ben**: The Jams done a really good job of bringing people together. The people, like myself, who were attending user groups that are interested in tech and really passionate about it, have got a chance to share that interest with the wider community. There were families coming in, teachers coming in, and they were just sharing what they were doing. And the skills they already had, and I was already programming in Python and things like that just on the desktop, and the Pi came along and it opened up this way of plugging into the real world and all the other things the Pi brings with it. Just being about to use those skills and pass them on, I got myself involved in Education through that.
-
-**LV**: So you weren’t a teacher before then?
-
-**Ben**: No, I was a software developer.
-
-**Carrie Anne**: This is what’s great about the education team at Raspberry Pi. It’s 50% ex-teachers and 50% software developers. We need people like Ben and Dave (Honess).
-
-**Ben**: Yes, some people have ideas for things and think this could be an engaging exercise, but they may not know exactly how to deliver it, or how it’s going to work. They might not know how exactly a teacher is supposed to produce something to use that, but they have an end goal and working with someone else can help achieve that.
-
-**Clive**: Yeah, you’re right, the real key is the mix. So you’re getting teachers and engineers and developers and families. Before, they might have been on a Linux user group, they might have been a teacher group, and you’re just bringing a bunch of different people together and that just (to use a horrible word!) synergizes stuff.
-(Everyone LOL)
-
-**Clive**: Yes, I did it! I said synergizes! I’m buying a copy of the magazine now.
-
-**Carrie Anne**: There’s something that comes about from getting all those different types of people together is that it breeds this wonderful learning environment that you cannot reproduce. Like, you were running a Picamera workshop this morning. So that was run by people who run Jams who are from industry. And what was really nice is that there were teachers and there were people who had come for the Jamboree from industry that were helping the teachers do stuff. And there was this environment that was like, it’s ok to not know something, it’s ok to ask a question, it’s ok to get it wrong and make mistakes. And that’s really powerful because sometimes teachers are afraid perhaps of saying they don’t know.
-
-**Ben**: So at this workshop, we gave people an intro to building a real application around the camera. So it’s not just ‘Oh, there’s a camera and you can take pictures’. It was ‘Ok, let’s plug in a button, and attach that to the Pi and let’s make that be the button for the camera’. And just a simple intro like that opens up a world of possibilities. Sometimes a lot of these things like the Jam, just gives you a lot of inspiration. Or if you see something in a magazine or online, or on Twitter, and you think somebody’s done that with the Pi, I’d really like to do that project in my garden or I’d like to do that myself and twist it and use some of the libraries they’ve used or used some of the codebase they’ve used and take it in their own direction.
-
-**Clive**: Like it’s not a button, it’s a sensor for when your parents walk into your bedroom, it then tweets it as they walk in.
-
-**Ben**: And everyone’s got a different way of thinking. If you’re in classroom of 30 kids and you show them how to make a button do this, each of them is thinking ‘Oh I can make a such and such’. They’ll all have a different idea. And some of them will just go straight home and make one. And some of them would need a lot more guidance.
-
-> Every teacher needs more time off their timetable to develop their skills
-
-**LV**: Are there some kids that just don’t get it at all?
-
-**Ben**: I think there’s something for everyone, but they might not find it straight away. If you delivered a term’s worth of content for a class, with a good scope of different projects, I’d be surprised if there was one kid that wasn’t interested in any of it or didn’t find any of it engaging.
-
-**Clive**: It’s almost an antidote for kids not getting it. With teaching music, you’ll have people that are level 5 or 6 while others can’t read music. Because computing is creative and engaging, we don’t all have to become master coders. With Scratch, it’s a visual language and you’ll find that quite often you’ll get what are classed as low ability kids that just rip into that and do fantastic things because it’s the first time they’ve been allowed to get ideas out of their heads and make something with it. And before, if they’ve had problems with writing and numeracy, they haven’t been able to do that. There are case studies with young boys that aren’t very good at reading and writing but they start telling stories when you give them an environment where they can actually do these things. So it’s brilliant tool to actually fight the opposite. It’s not that they don’t get it. There’s something for everybody.
-
-
-Linux Voice’s Andrew Gregory asks Clive Beale a tough question
-
-**LV**: Pre-Raspberry Pi, in the dark ages of about 5 years ago, before the ICT revolution, what would those children be doing? Would they have responded to ICT at all?
-
-**Carrie Anne**: In a classroom, you have a network of computers that are all on lockdown. You’ve got your network administrator and team of technicians, and they do a wonderful job and I certainly wouldn’t slate them – I was a technician once. But we were living in a time where you had to lock down the internet, which I disagree with, I think it should be open. And all the computers, you can’t execute any files on them, so you can’t actually teach any programming on them. So that was a problem for me.
-
-**LV**: Is that changing?
-
-**Carrie Anne**: I think it is changing, and will change with the new curriculum. For me as a teacher, what was great when the Raspberry Pi came along is that I don’t actually need those computers around the outside any more.
-
-**LV**: So you don’t need permission.
-
-**Carrie Anne**: Here’s my box full of Pis, let’s just get them out.
-
-**Clive**: I’ll install what you want, do what I want.
-
-**Carrie Anne**: Yeah, you can break it. And that’s ok, you just flash it and start again.
-
-**Clive**: In 1997, they put the C back in ICT and suddenly it became this thing that you had to teach. The curriculum wasn’t really that bad. A lot of people moan about it, but if you actually sat down and read it, it was quite flexible and did let you do take control and make programming and coding interesting. But because resources are so important to schools, you just ended up doing the easy things.
-
-**LV**: But when you said about kids using Scratch and becoming motivated to do other things, that would never have happened before the Raspberry Pi came along.
-
-**Clive**: Yes, it was more just following what the teacher said, ‘And now we’re going to write a letter to the cinema’ or something. That’s like giving someone a Ferrari and saying you’ve just got to drive in this room for half an hour. So you’ve given them this fantastic tool for exploration and creativity, and you’re saying we’ve got to do this. Whereas with the computing thing, especially things like Scratch, just lets them think, ‘Ok, I can do a movie, I can do a little flip frame animation, or you know what, I can actually make a game’. And then suddenly they’re doing stuff that they haven’t had the opportunity to do.
-
-**Carrie Anne**: Yeah, and I think that ICT curriculum was about 12 years out of date. It was created and it wasn’t updated.
-
-> you can break it. And that’s ok, you just flash it and start again
-
-**LV**: Obviously quite a lot has changed in computing education according to the media over the last couple of years in the UK. Broadly speaking, it is getting better?
-
-**Carrie Anne**: Yes.
-
-**LV**: What are the parts that pushed it to be better.
-
-**Carrie Anne**: I think the teachers. They’re the ones in the classroom that have to teach the curriculum. When I became a teacher, I was already working in a school and I kept putting it off becoming a teacher because the curriculum bored me. But then I realised that, when I actually got into the classroom, I was able to put my own spin on it. I think it started with the teachers. Those people saying we want a new curriculum, we want to teach this and it’s engaging the kids and they’re learning something. I think it started there and then I think industry picked up on the fact that that was happening and they wanted more industry experts. And then the government got involved and it snowballed really.
-
-**Clive**: Scratch was a big word-of-mouth thing wasn’t it. It was about mid-2000 when it came out, and suddenly you just found that any teacher worth their salt was using it for their ICT curriculum because it taught about control.
-
-**Carrie Anne**: HTML as well. HTML has been on the curriculum for years. We’ve been teaching HTML in Notepad for years.
-
-**LV**: What are going to be the big things pushing it forward over the next few years?
-
-**Carrie Anne**: I think more of the same really. It’ll be teachers, it’s always the teachers. They’re the ones that come to the Jamboree and this kind of thing, and learn from people like Ben and that sort of collaboration. That’s where it starts. The teachers see what can be done, and they start doing it, and they’ll be more of that. And there are initiatives like code clubs and the Master Teachers are great.
-
-**Clive**: Teachers are meeting up more when before may not have been getting together.
-
-**Ben**: And as well as there being a more content, I think they’ll be convergence of a lot of this stuff. So, because the Raspberry Pi doesn’t have any official resources right now, some people are going off and writing their own. I think they’ll be a convergence of people pulling their ideas together and there’ll be a more centralised system for that. And we’ll be helping the community out with that.
-
-**Clive**: ‘We’ll be at the forefront of that’, is that quote!
-
-**LV**: You haven’t mentioned government policy, or anything like that at all. Is that a negative thing or just by-the-by?
-
-**Clive**: I was at the Westminster forum yesterday and they had a chap from the DFE there, and I couldn’t resist it, so I got the mic and said you haven’t really taken it seriously have you? He turned round and said, we have *really* take it seriously. This idea that we can just bring in a new program of study and saying ‘Oh, aren’t we wonderful’, because Eric Schmidt’s speech and going over that, and suddenly we’re made it all better for you. But you haven’t, you just seemed to have done something that a lot of teachers are now scared of. So there’s a lot of work to do, and we’re really positive. But no, the government have not, in my personal opinion, given the money or the support or the thought behind this. If you go to Jersey, it’s such a great contrast. 6 million pounds, 100 thousand people on the island – the size of Cambridge. Compared to the 53 million in England and parts of the UK. This is in England initially, it’s not in Scotland and Wales. They’re got the infrasture, fibre to the door in every school, linking into businesses, £2 million CPD for teachers, well that’s practically what the government pay for the whole of England. So, have you taken it seriously, no. I think they’ve completing underestimated what’s involved. They thought the teachers would just pick it up and have the time and resources, which we don’t have the time for.
-
-**Carrie Anne**: Maggie Philbin has been leading a UK digital skills taskforce, of which I’m part the team. We’re looking at where the skill shortages are and what are digital skills. Because there’s going to a whole group of kids who are now 14 to 16 who are going to leave the education system who haven’t had new programs like these. They were on the old program, so we’re looking at who will be deskilled and what we can do about that. So hopefully that report will inform government policy.
-
-**Ben**: There must be a generation of people that don’t have their own website.
-
-**LV**: If there’s one thing you could change about government policy, what would it be?
-
-**Clive**: It really is to do with support for teachers. This idea that teachers would be able to, especially primary school teachers where you have to teach a range of subjects, suddenly go off, and even the guy yesterday said, well there’s loads of third party resources, but you’ve still got to go out and get them and try them out and learn and bring them all together.
-
-**Carrie Anne**: Time. One of the biggest recommendations that I would say is time. Every teacher needs more time off their timetable to develop their skills, especially in an area like this that they perhaps think they’re weak. Because it takes a while to set things up and start your learning. As a teacher, you get like a 30 period timetable, you’re teaching for about 22 lessons of that with about 7 free periods, but some of those you’ll be covering for another lesson and some of those I need to plan my lesson and mark. They need time.
-
-**Clive**: If you look at science, so if you’re a chemistry or biology teacher at secondary, there’s a scheme where you can re-skill to physics and they will give you free periods, huge bursary, and they’ll also take you off timetable one day a week to go off and go to other schools and retrain, and maybe pay for the cover. And this is the government doing this, and if you do this, this and this, you come out as an accredited physics teacher. So they took that seriously, but yet here’s a brand new subject and they’re expecting people just to pick up and run with it, and it’s completely inadequate.
-
-**Carrie Anne**: But it’s not just time to learn something, it’s also time to go and meet industry people. Like go to a company and be in there and work and learn from them, and see what the world is like. Because some people, they went through education, went to university and became a teacher, so they’ve never left this school environment and they’ve got no idea of what the world of work is like.
-
-**Ben**: I think there are some people in the current government that seem to think there should just be this package, and this is what you should deliver as your syllabus this year. Everyone is treated the same. Each teacher has their own class, and they’re all different, with different ways of engaging their interest. It needs to be tailored, so the teacher needs to take that material, and perhaps look on our site in the next year and say, well this one looks quite suitable for my class, or this one might be a good one to do.
-
-**Clive**: It’s so long term. The government also do not understand that this is long term. So if you’re going to start teaching at 5 about algorithms and a bit of code and Scratch, what happens further down the line. The secondary school teacher will be saying, I can’t teach them Scratch anymore, which is what we do in Year 7 at the moment. So it’s actually quite a long term thing and things will continue to change over the next several years until that pipeline becomes full. And they’ve unbelievably said here’s £2 million, do some training for September 2014. What’s 2014 got to do with it? This is five, six, seven years down the line.
-
---------------------------------------------------------------------------------
-
-via: http://www.linuxvoice.com/education-education-education/
-
-译者:[译者ID](https://github.com/译者ID) 校对:[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
diff --git a/sources/talk/20140609 Out in the Open--The Little-Known Open Source OS That Rules the Internet of Things.md b/sources/talk/20140609 Out in the Open--The Little-Known Open Source OS That Rules the Internet of Things.md
deleted file mode 100644
index 3f70d6cd07..0000000000
--- a/sources/talk/20140609 Out in the Open--The Little-Known Open Source OS That Rules the Internet of Things.md
+++ /dev/null
@@ -1,49 +0,0 @@
-Translating by toknow-gh Out in the Open: The Little-Known Open Source OS That Rules the Internet of Things
-================================================================================
-
-Image: Adnk/[Wikipedia][1]
-
-You can connect almost anything to a computer network. Light bulbs. Thermostats. Coffee makers. Even badgers. Yes, badgers.
-
-Badgers spend a lot of time underground, which make it difficult for biologists and zoologists to track their whereabouts and activities. GPS, for example, doesn’t work well underground or in enclosed areas. But about five years ago, University of Oxford researchers Andrew Markham and Niki Trigoni [solved that problem][2] by inventing a wireless tracking system that can work underground. Their system is clever, but they didn’t do it alone. Like many other scientists, they turned to open source to avoid having to rebuild fundamental components from scratch. One building block they used is an open source operating system called [Contiki][3].
-
-“Contiki was a real enabler as it allowed us to do rapid prototyping and easily shift between different hardware platforms,” says Markham, now an associate professor at the University of Oxford.
-
-Contiki isn’t nearly so well-known as Windows or OS X or even Linux, but for more than a decade, it has been the go-to operating system for hackers, academics, and companies building network-connected devices like sensors, trackers, and web-based automation systems. Developers love it because it’s lightweight, it’s free, and it’s mature. It provides a foundation for developers and entrepreneurs eager to bring us all the internet-connected gadgets the internet of things promises, without having to develop the underlying operating system those gadgets will need.
-
-Perhaps the biggest thing Contiki has going for it is that it’s small. Really small. While Linux requires one megabyte of RAM, Contiki needs just a few kilobytes to run. Its inventor, Adam Dunkels, has managed to fit an entire operating system, including a graphical user interface, networking software, and a web browser into less than 30 kilobytes of space. That makes it much easier to run on small, low powered chips–exactly the sort of things used for connected devices–but it’s also been ported to many older systems like the Apple IIe and the Commodore 64.
-
-
-Adam Dunkels. Photo: Sara Arnald
-
-Contiki will soon face competition from the likes of Microsoft, which recently [announced Windows for the Internet of Things][4]. But while Microsoft’s new operating system will be free for devices less than 9 inches in size, it won’t be open source. And Contiki has an 11-year head start.
-
-Contiki started in 2003, but its roots stretch to Dunkels’ days as a computer science student at Mälardalen University in Sweden. In 2000, he was working on a project to use wireless sensors to track hockey players’ vital signs and display them on a screen the crowd could see. “We convinced them to have this thing up their nose so we could measure their breathing rates,” Dunkels recalls.
-
-To make the sensors work correctly, Dunkels had to write software would enable them to interact with a computer network. He called the resulting code [LwIP][5], for “light weight internet protocol.” Although LwIP is still used in many microcontrollers and other products today, Dunkels decided it wasn’t quite lightweight enough. In 2003, he created microIP, which evolved into Contiki. The OS was an immediate hit with researchers and hobbyists, and has in recent years attracted commercial users including [Rad-DX][6] radiation detection devices and [Zolertia][7] noise monitoring system.
-
-While Nest, the web connected thermostat company [Google acquired for $3.2 billion][8] in January, has come to define the Internet of Things, Dunkels notes that many companies have been using network-connected devices for years in applications including industrial and building automation. “With something like CES you see all the consumer stuff, but there are just so many different aspects of this,” Dunkel says.
-
-But consumer technology companies are beginning to embrace Contiki as well. The [LiFX][9] “smart light bulb” is using the operating system, for example, as is the Nest competitor [Tado][10].
-
-To help support the burgeoning commercial usage of Contiki, Dunkels left his job as a professor at the Swedish Institute of Computer Science and founded [Thingsquare][11], a startup focused on providing a cloud-based back-end for Contiki devices. The idea is to make it easy for developers to connect their hardware devices with smartphones and the web. Thingsquare manages the servers, and provides all the software necessary to manage a device over the web.
-
---------------------------------------------------------------------------------
-
-via: http://www.wired.com/2014/06/contiki/
-
-译者:[译者ID](https://github.com/译者ID) 校对:[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:http://en.wikipedia.org/wiki/File:Contiki-ipv6-rpl-cooja-simulation.png
-[2]:http://www.cs.ox.ac.uk/projects/WILDSENSING/
-[3]:http://www.contiki-os.org/
-[4]:http://www.wired.com/2014/04/free-windows/
-[5]:https://savannah.nongnu.org/projects/lwip/
-[6]:http://www.dtectsystems.com/rad-DX_page.html
-[7]:http://zolertia.com/home
-[8]:http://www.wired.com/2014/01/googles-3-billion-nest-buy-finally-make-internet-things-real-us/
-[9]:http://lifx.co/
-[10]:http://www.tado.com/de-en/
-[11]:http://www.thingsquare.com/
diff --git a/sources/talk/20140610 GitHub redesigns its Windows app to put your work front and center, adds emoji and gif support.md b/sources/talk/20140610 GitHub redesigns its Windows app to put your work front and center, adds emoji and gif support.md
deleted file mode 100644
index 7ee2f2f2c1..0000000000
--- a/sources/talk/20140610 GitHub redesigns its Windows app to put your work front and center, adds emoji and gif support.md
+++ /dev/null
@@ -1,39 +0,0 @@
-GitHub redesigns its Windows app to put your work front and center, adds emoji and gif support
-================================================================================
-
-
-GitHub today [released][1] version 2.0 of its Windows app, which it markets as “the easiest way to use Git and GitHub on Windows.” The new version features a more streamlined design, new GitHub local features, and some general speed improvements. You can grab the new version now directly form [windows.github.com][2] (if you already have GitHub for Windows, it will update automatically).
-
-GitHub released its Windows app back in [May 2012][3], and has made improvements in three minor releases since. Today’s major 2.0 release comes more than two years after the app’s debut, and aims to inject new life into the app.
-
-GitHub executives told me they saw a major bump in terms of interest for the client with the 1.3 release that was more of an overall increase rather than just a spike associated with new versions. They are naturally hoping for a repeat of this jump with the 2.0 release.
-
-GitHub 2.0 for Windows is supposed to be simpler and cleaner, and aims to put more focus and the developer and their work. For the sake of comparison, here’s how the previous 1.3 version looked like:
-
-
-
-Here is the 2.0 release (the company emphasizes that your work is now ” front and center”):
-
-
-
-Previously, there were two different views available. The company has slimmed that down so developers no longer need to move back and forth between their projects.
-
-This is largely accomplished by adding a sidebar that reduces the need to navigate through menus and options. In short, your local repositories are always available on the left, plus you can create, clone, and publish repositories without having to navigate to a new screen. Your repositories are also grouped by where they originated from, so work projects (think GitHub Enterprise) are easy to distinguish from personal ones, and you can easily switch between them.
-
-The new design aside, GitHub for Windows now lets you pick an ignore file template for your project when you create a repository. It also supports including emoji and gifs in your commit messages.
-
-It’s worth noting that the aforementioned performance improvements should be felt around the app in general. Unfortunately, GitHub wasn’t able to share any benchmarks regarding the speed bumps.
-
-All in all, this is a big redesign aimed at improving the user experience. GitHub executives tell TNW the new design language aims is a “GitHub Metro style” that takes the “best parts of Metro as well as Android and iOS.” Whether or not that’s a good thing will likely come down to personal preference.
-
---------------------------------------------------------------------------------
-
-via: http://thenextweb.com/dd/2014/06/09/github-redesigns-windows-app-put-work-front-center-adds-emoji-gif-support/?tnw_rfl=tw
-
-译者:[译者ID](https://github.com/译者ID) 校对:[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:https://github.com/blog/1844-say-hello-to-github-for-windows-2-0
-[2]:http://windows.github.com/
-[3]:http://thenextweb.com/apps/2012/05/21/github-releases-its-windows-app-at-last/
\ No newline at end of file
diff --git a/sources/talk/20140617 Does Linux Lack a Killer App.md b/sources/talk/20140617 Does Linux Lack a Killer App.md
deleted file mode 100644
index dce3b05415..0000000000
--- a/sources/talk/20140617 Does Linux Lack a Killer App.md
+++ /dev/null
@@ -1,113 +0,0 @@
-(翻译中 by runningwater)
-Does Linux Lack a Killer App?
-================================================================================
-
-
-**What Linux needs most is games, said Hyperlogos blogger Martin Espinoza. However, "if you were trying to narrow it down to one app, it would probably still be Photoshop. For all the talk of how great GIMP has become, usability is still an abject nightmare, and in spite of the OSS community's self-back-patting regarding documentation, there is no documentation for GIMP which is not pathetic."**
-
-Well the days are heating up here in the Linux blogosphere, and FOSS fans are flocking to the Broken Windows Lounge as much for the frosty air-conditioning as for the conversation.
-
-Even Linux Girl, whose days generally involve far more pavement-pounding than she'd like, has found herself seeking solace in the blogobar's arctic climes far more often than she probably should.
-
-It's a good thing she has been, though, or she might have missed the latest juicy debate. "What killer app is Linux missing?" was the question that [kicked things off][1], and the discussion has been escalating ever since.
-
-"The Free Software world is incredibly rich, and covers pretty much all bases," **Linux Voice's** Mike Saunders began. "We have a wealth of desktop, server, development and multimedia tools to choose from -- some of which are the best in their field.
-
-"But what is missing?" Sanders went on provocatively. "Is there a killer app that prevents you from running Linux 24x7 on your main machine?"
-
-There was a momentary lull in the conversation around the bar as patrons pondered the suggestion. Linux Girl tried to enjoy the fleeting peace, but it didn't last for more than an instant.
-
-### 'Depends on What You Do' ###
-
-
-
-"A long time ago Linux needed a lot of things," Google+ blogger Alessandro Ebersol offered. "These days, when every software and the kitchen sink are migrating to the cloud, everything is going to be multiplatform.
-
-"I would say we lacked games, but that also is being taken care of," Ebersol said. "So I don't feel that we desperately need a killer app anymore."
-
-The killer app "depends on what you do with your computer," consultant and [Slashdot][2] blogger Gerhard Mack opined. "If you are drafting, then the killer app is Autocad. But for other industries the killer app will be something else."
-
-### 'The Enterprise Space' ###
-
-Google+ blogger Kevin O'Brien had a similar view.
-
-"There isn't much left on the consumer level," O'Brien said. "I could maybe gripe about games or Nvidia drivers, and I don't really see anything that can replace Quicken. But for me the big difference maker is in the enterprise space.
-
-"Microsoft owns that, and there is nothing that compares to Outlook/Exchange server, Sharepoint, etc.," he asserted. "I suspect part of the reason is that there are not a lot of open source developers who really care about that stuff."
-
-### 'The Tide Is Changing' ###
-
-It's not so much a "missing app" situation as a "not-enough-critical-mass" kind of problem, Google+ blogger Gonzalo Velasco C. suggested.
-
-Many more people use Linux today than did five years ago, he noted; at the same time, many are tied to non-Linux-friendly applications.
-
-"'Everybody' uses $kype, but we have half a dozen apps for that in GNU/Linux, from the simple and very useful Pidgin (my favorite) to Ekiga and similar VoIP apps," Gonzalo Velasco C. explained. "Some users still claim they need Photo$hop and don't take the time to master and suggest improvements for GIMP, Inkscape, Bender and others."
-
-Games used to be missing, "but the tide is changing, mainly -- but not only -- because of Valve's brave SteamOS movement," he added.
-
-### 'Retail Shelf Space' ###
-
-"I don't think there are any 'killer' apps these days," blogger [Robert Pogson][3] agreed. "In Debian GNU/Linux, there are 40K packages. My main PC has only 3K installed and I lack nothing. I have multiple browsers, editors, compilers/interpreters, platforms, and with virtual machinery like KVM, I can play with multiple operating systems and different versions of software as needed.
-
-"I can treat multiple machines as if they were a single machine from anywhere on the LAN," Pogson added. "I can access resources on any node on the LAN from any machine. What more do I need?"
-
-That said, "several professionals have told me that video and image editors in GNU/Linux are a bit weak," he noted. "GIMP is being improved in bit-depth, so that should be covered. Lightworks will eventually be released as FLOSS, so video should be covered."
-
-Nevertheless, "these are tiny niches in IT," he pointed out. "Many ordinary folks go decades without using those other special applications, so I don't think this is anything holding GNU/Linux back."
-
-The real killer in the market, however, is lack of shelf space in retail stores, Pogson asserted. "Where that is covered, GNU/Linux thrives."
-
-### 'Linux Has Lost Out to OS X' ###
-
-Chris Travers, a [blogger][4] who works on the [LedgerSMB][5] project, had a different perspective.
-
-"I don't think that it is a question of killer apps," he began. "The real issue is that on the desktop, Linux has generally lost out to OS X, while it is increasingly dominating the server market along with the BSDs. People who use Linux on the desktop tend to be looking for openness."
-
-What Linux needs is either "the momentum of Microsoft or the smooth UI and attention to detail of OS X," Travers said. "These may come over time."
-
-### The Documentation Problem ###
-
-Linux isn't missing one killer app -- "what it's missing is polish, as always," [Hyperlogos][6] blogger Martin Espinoza opined. "No desktop environment for Linux has the polish of Windows XP, let alone Windows 7.
-
-"Move away from the bloat and oversimplicity of GNOME or from the widget salad of [KDE][7] to what, Xfce or LXDE, with their perfectly horrible file managers and primitive panels?" Espinoza added. "GNOME is the only DE that ever got close, and then they decided to remove all the complexity and eliminate their reason to exist."
-
-Windows is just "a nicer place to hang out," he asserted.
-
-Still, if Linux is missing anything for broader acceptance, "that is games," Espinoza said. "If you were trying to narrow it down to one app, it would probably still be Photoshop. For all the talk of how great GIMP has become, usability is still an abject nightmare, and in spite of the OSS community's self-back-patting regarding documentation, there is no documentation for GIMP which is not pathetic."
-
-GIMP "might be able to do most of the things Photoshop can do, but I'll probably never know," Espinoza concluded. "I suppose if I spent hours trolling fora I could find out how to use GIMP. This failing is shared by most OSS projects, including the ones that think they're really well-documented."
-
-### 'Ease of Use and Support' ###
-
-Ease of use and support are the "killer app" SoylentNews blogger hairyfeet named.
-
-"Oh, a freshly installed Linux distro LOOKS nice, it works great; the problem is it doesn't CONTINUE to look nice or work great," he explained. "First update and whoops! Wireless no longer can use WPA V2. Second update? Whoops, say goodbye to sound, as Pulse has puked. First 'upgrade'? Uh oh, hope you didn't need that!
-
-"THIS is what Windows and OS X have that Linux doesn't: the ease of use and support," hairyfeet concluded. "As long as it takes 15+ Linux releases to equal the same support cycle a single Windows release gets? Then I'm sorry, but your product is just not in the same league -- you are comparing HS baseball to the majors."
-
-### 'Windows 8' ###
-
-Last but not least, [Linux Rants][8] blogger Mike Stone had a surprising suggestion.
-
-"The killer app that Linux has been missing all these years is Windows 8," Stone quipped.
-
-"Seriously, I don't think there is a particular app that can be the 'killer app,'" he said. "Linux needs to have more mainstream application support, and that's going to mean Photoshop and Microsoft Office at the minimum. Thankfully, Microsoft has done their best to make Office less relevant, and most people don't need Photoshop."
-
-Linux "could be reaching critical mass, and I was only partially joking when I said Windows 8 earlier," he concluded. "The application base in Linux is starting to arrive, and the current version of Windows is remarkably unpopular. Fingers crossed we see some motion here soon."
-
---------------------------------------------------------------------------------
-
-via:
-
-译者:[runningwater](https://github.com/runningwater) 校对:[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:http://www.linuxvoice.com/voice-of-the-masses-what-killer-app-is-linux-missing/
-[2]:http://slashdot.org/
-[3]:http://mrpogson.com/
-[4]:http://ledgersmbdev.blogspot.com/
-[5]:http://www.ledgersmb.org/
-[6]:http://hyperlogos.org/
-[7]:http://www.kde.org/
-[8]:http://linuxrants.com/
\ No newline at end of file
diff --git a/sources/talk/20140723 Linux System Administration Skills are Changing.md b/sources/talk/20140723 Linux System Administration Skills are Changing.md
index 87ce32c6a1..1617d65af5 100644
--- a/sources/talk/20140723 Linux System Administration Skills are Changing.md
+++ b/sources/talk/20140723 Linux System Administration Skills are Changing.md
@@ -1,3 +1,5 @@
+[translated by blueabysm]
+
Linux System Administration Skills are Changing
================================================================================
When was the last time you compiled a kernel? For many of the latest generation of Linux admins, the answer is really simple: never. I am one of those, provided we don't count a few times I tried it just for fun, then couldn't see why I would need a custom kernel and went back to my out-of-the-box kernel.
@@ -47,4 +49,4 @@ via: http://www.linux.com/news/enterprise/systems-management/780956-linux-system
[1]:http://olindata.com/
[2]:http://puppetlabs.com/
[3]:http://jenkins.org/
-[4]:http://www.olindata.com/training/upcoming?technology=295
\ No newline at end of file
+[4]:http://www.olindata.com/training/upcoming?technology=295
diff --git a/sources/talk/20140724 Best Linux Browsers.md b/sources/talk/20140724 Best Linux Browsers.md
deleted file mode 100644
index fe3960a89a..0000000000
--- a/sources/talk/20140724 Best Linux Browsers.md
+++ /dev/null
@@ -1,82 +0,0 @@
-Love-xuan翻译中
-Best Linux Browsers
-================================================================================
-> Pros and cons of the best browsers for the Linux desktop, including Firefox, Chrome and other browsers.
-
-Choosing the best Linux browser for your needs requires just a bit of homework: Web browsers for the Linux desktop have evolved over the years, just as they have for other popular desktop platforms. With this evolution, both good and bad revelations have been discovered. Revelations from new functionality, to broken extensions, and so forth. In this article, I'll serve as your guide through these murky waters to help you discover the best in Linux browsers.
-
-### **Firefox** ###
-
-– [Firefox][1] has long been a friendly browser for Linux users. Accessible on both 32bit and 64bit Linux installs, Firefox also offers extensive extensions to choose from. It's a fast loading, easy to navigate Web browser that has found itself in a popular place with Linux users.
-
-**The good**: It's easily installed from most common Linux software repositories, if not already installed on the distro by default. Thousands of extensions to choose from to make your Firefox browser more fully featured. Nearly every website on the Web (including government and banking sites) render properly.
-
-Also important: Firefox respects your privacy. In addition to a straight forward privacy policy, they're not in the "same business" as Google. Therefore, most users feel more comfortable allowing Firefox to see their daily browsing activities whereas other browsers, might have more profit-driven interests. Firefox is also great for web developers, thanks to its element inspection tool, built right into the browser.
-
-**The bad**: Not too long ago, I was finding that Firefox's frequent updates were breaking my extensions. This meant I needed to verify that my favorite extensions were compatible with new Firefox updates BEFORE I updated my browser.
-
-To be blunt, this caused me to rethink which browser would be my default tool to browse the Internet. In fairness, Mozilla does post a blog post with each browser update for extension developers. In these posts, developers are told what has changed and what needs to be done to keep things working smoothly.
-
-### **Chrome/Chromium** ###
-
-– Google promotes its browser named [Chrome][2], however I tend to put [Chromium][3] into the same group as Chrome since Chromium is used as its base for development. Unlike Firefox, Chrome/Chromium was late to the game for Linux. Linux users only considered it worth trying at the time due to the fact that Chrome/Chromium was perceived by many as being the fastest browser.
-
-**The good**: Even today, Chrome/Chromium is considered pretty fast. Even with the recent updates made to other competing browsers, Chrome/Chromium hasn't lost its speed. Extensions for Chrome/Chromium are plentiful and even better, updates to the browser have no affect on said extensions. This means that, unlike Firefox, I haven't dealt with extension incompatibilities. Like Firefox, Chrome/Chromium also has an element inspection tool, built right into the browser. After trying syncing options with other browsers, only Chrome/Chromium has proven itself to be truly idiot-proof. Without question, Chrome/Chromium syncing is the best in the browser space, from my perspective.
-
-**The bad**: Chrome/Chromium doesn't always render pages correctly. Be it rare, some sites like Ebay don't always render correctly. Case in point, if I create a new Ebay submission, I find there are buttons missing in some cases. I've also found that sometimes Chrome/Chromium can lockup completely if an open tab is rendering heavy script. Sites like Google Plus and Facebook are the most common offenders.
-
-### **Qupzilla** ###
-
-– When it comes to lightweight browsers, I've found [Qupzilla][4] to be among the most awesome. Based on Webkit, it provides decent rendering support while maintaining a very small resource footprint.
-
-**The good**: Qupzilla is ideal for lightweight desktop environments where you need a modern browser capable of rendering pages correctly and generally providing a solid web browser experience. It's extremely lightweight and will run on older PCs without missing a beat. Access Keys and [GreaseMonkey][5] extensions are installed (but disabled) by default.
-
-Like Firefox and Chrome/Chromium, Qupzilla provides access to an element inspection tool as well. And finally, having [Adblock][6] installed by default makes this a clear lightweight winner for me.
-
-**The bad**: HTML5 video doesn't seem to work reliably. Also, in order to watch Flash videos, you must visit the preferences and uncheck Click to Flash in the Extensions, Webkit plugins area. This is a poorly thought out decision to essentially disable Flash out of the box, while HTML5 video remains completely broken.
-
-### **Midori** ###
-
-– I like to call [Midori][7] the lightweight Chrome alternative. Like Google's browser(s), Midori offers a minimalist experience with its "hamburger menu," which is nice as it takes up less browser space. Not only do you get a solid browsing experience without the usual browser politics found elsewhere, Midori is also quite fast.
-
-**The good**: Midori is fast, lightweight and feels familiar out of the box. I'm also happy to report that it renders pages correctly and works great with sites like YouTube. The best part, in my opinion, is the built-in functionality for creating browser profiles and actual launchable links for Web apps. For example, you can easily create a web app on your desktop for Gmail or Facebook. You can also setup user specific browser profiles as well, without creating new Linux user accounts.
-
-**The bad**: Despite mentioning user extensions for this browser, the selection available is less than impressive. Also, the browser layout takes a bit of getting used to. A trash can for previously visited websites – seriously?
-
-### **Opera** ###
-
-– [Opera][8] has long been one of the misunderstood browsers out there. Very early on, Opera provided Linux support despite being dismissed by the overall Linux community. In addition to being a compatible, fast web browser that has been nothing but good to Linux users, it's also a full of configurable options.
-
-**The good**: It's fast and it's full of user controllable settings. You can import and export everything from RSS feeds to email, and skin Opera with easy access to breathtaking themes. Plus, Opera offers an extensive library of extensions to choose from. Not to mention the ability to read RSS feeds and email, from your browser! Relive the days of the Mozilla Suite by using Opera's extended suite functionality. And perhaps best of all, Opera Turbo – super-charge your browser speed with selective compression to provide a faster experience.
-
-**The bad**: A nag for the Terms of Service on its first run. Also, Opera Turbo can slightly alter your browsing experience – YouTube for example, may not show a video's thumbnail. Opera also provides so many options that it can feel a bit overwhelming to the casual user. And lastly, it's a closed source browser that hasn't been well recognized for desktop use. Most folks think of Opera as a mobile browser only these days.
-
-### Which browser is right for you? ###
-
-With so many great choices, it can be a tough call to say which browser is right for you. Speaking for myself, I've found that I rely heavily on Firefox and Chromium due to specific extensions I put to work each day. For someone with a lower end system or netbook, my suggestion is to try Midori first and if that's not a fit, fallback to Qupzilla.
-
-So what about other web browsers for Linux? Such as the [Epiphany][9] browser or [Konqueror][10]? Browsers like these are great, but I feel strongly about the browsers I've shared above specifically. Each of the options listed above are browsers I use often and have found to be something I feel good about recommending to friends and family.
-
-That said, by all means, share any browsers you're passionate about in the Comments below so others can benefit from your preferred method of browsing the Web.
-
---------------------------------------------------------------------------------
-
-via: http://www.datamation.com/open-source/best-linux-browsers-1.html
-
-原文作者:[Matt Hartley][a]
-
-译者:[译者ID](https://github.com/译者ID) 校对:[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
-
-[a]:http://www.datamation.com/author/Matt-Hartley-3080.html
-[1]:https://www.mozilla.org/en-US/firefox/new/
-[2]:https://www.google.com/intl/en_us/chrome/browser/
-[3]:http://www.chromium.org/
-[4]:http://www.qupzilla.com/
-[5]:https://addons.mozilla.org/en-US/firefox/addon/greasemonkey/
-[6]:https://adblockplus.org/
-[7]:http://midori-browser.org/
-[8]:http://www.opera.com/
-[9]:https://wiki.gnome.org/Apps/Web
-[10]:http://www.konqueror.org/
\ No newline at end of file
diff --git a/sources/talk/20140724 What are useful online tools for Linux.md b/sources/talk/20140724 What are useful online tools for Linux.md
deleted file mode 100644
index 75aed3d17a..0000000000
--- a/sources/talk/20140724 What are useful online tools for Linux.md
+++ /dev/null
@@ -1,151 +0,0 @@
-[translating by KayGuoWhu]
-What are useful online tools for Linux
-================================================================================
-As you know, GNU Linux is much more than just an OS. There is literally a whole sphere on the Internet dedicated to the penguin OS. If you read this post, you are probably inclined towards reading about Linux online. Among all the pages that you can find on the subject, there are a couple of websites that every Linux adventurer should have in his bookmarks. These websites are more than just tutorials or reviews. They are real tools that you can access from anywhere and share with everyone. So today I shall propose you a non-exhaustive list of sixteen websites that should be in your bookmarks. Some of them can also be useful for Windows or Mac users: that's the extent of their reach.
-
-### 1. [ExplainShell.com][1] ###
-
-[][2]
-
-If you are interested in Linux command line, you should use this website. If you are not interested in Linux command line, you should use it even more as it will explain in detail how a command works. This could prevent you from launching a command detrimental to your computer, and is a good way to learn with a great interface.
-
-### 2. [BashrcGenerator.com][3] ###
-
-[][4]
-
-If you want to begin with Linux command line, or if you want to quickly get a customized shell prompt but not sure how, this website will generate for you PS1 prompt code to place your .bashrc file in your home directory. You can drag and drop the elements that you would like to see in your prompt, like your username and the current time, and the website will write the code for you. It's easy and very readable. Definitely a must for the lazy.
-
-### 3. [Vim-adventures.com][5] ###
-
-[][6]
-
-I only recently discovered this website, but it already sucked in many hours of my life. In short: a RPG game with Vim commands. Move your character in the isometric levels with the 'h,j,k,l' keys, gain new commands/abilities, collect keys, and learn how to use Vim proficiently very quickly.
-
-### 4. [Try Github][7] ###
-
-[][8]
-
-The pitch is simple: learn Git in 15 minutes. This website simulates a console, and walks you though the steps of collaborative editing. The interface is very stylish and the intention is worthy. The only downside is for the Git allergic. But it is definitely a good skill to have, and a good place to learn it.
-
-### 5. [Shortcutfoo.com][9] ###
-
-[][10]
-
-Another shortcut database, shortcutfoo is a bit more standard in its way to present its content to the user, but definitely more straight-forward than funny mini-games. The shortcuts of several programs are available and grouped by categories. As it might not be super complete for software like Vim, which is completely reliant on shortcuts, it is perfect for giving a quick tip or a general overview.
-
-### 6. [GitHub Free Programming Books][11] ###
-
-[][12]
-
-As you might guess from the URL, this is a collection of free online books about programming, written collaboratively using Git. The content is awesome and the authors deserve to be praised for such work. It might not be the easiest read at first, but it is one of the most instructive for sure. We can only hope that the movement will keep growing.
-
-### 7. [Collabedit.com][13] ###
-
-[][14]
-
-If you ever plan on giving a phone interview, you should check out collabedit beforehand. It allows you to create a document, select the programming language that you want to write in, and then share that document via the URL. The people opening the link will be able to freely interact in real time with the text, allowing you to judge their programming skills or just exchange snippets. It even comes with the proper syntax highlighting and a chat widget. In other words, it is the instant-Google Document of programmers.
-
-### 8. [Cpp.sh][15] ###
-
-[][16]
-
-This is one of those websites that extend beyond just Linux, but it is so useful that it deserves its place here. In short, an online development environment for C++. Just write your code in your navigator and run it. As a bonus, you get an auto-indentation feature, Ctrl+Z, and the possibility to share the URL with your buddy. This is just one of those crazy things that you can do from a simple browser.
-
-### 9. [Copy.sh][17] ###
-
-[][18]
-
-In continuation with crazy things that you can do from your browser, copy.sh lets you run a virtual machine online. Just that. It gained fame relatively recently, but the idea is just insane. From the navigator you can select among the defaults virtual images to run, or upload your own iso file. The code for that feat has been shared on [GitHub][19]. Just amazing.
-
-### 10. [Commandlinefu.com][20] ###
-
-[][21]
-
-We all keep a big snippet of command-line "gems" on our computer. commandlinefu's goal is to release those snippets to the world. As a collaborative database, it resembles the Wikipedia of the command line. Everyone is free to register and post their favorite command on the website for everyone else to see. You will then be able to access that knowledge from everywhere and share it with everyone. If you are interested in mastering the shell, commandlinefu also proposes great features like random commands and a news feed to learn something new every day.
-
-### 11. [Alias.sh][22] ###
-
-[][23]
-
-Another collaborative database, alias.sh (I love the URL) is a bit like commandlinefu but for shell aliases. You can share and discover useful aliases which will make your CLI experience so much better. I personally like the alias to get the dimensions of a picture.
-
- function dim(){ sips $1 -g pixelWidth -g pixelHeight }
-
-All the seconds you save with alias.sh probably accumulate with time, and turn to years by the end of your life.
-
-### 12. [Distrowatch.com][24] ###
-
-[][25]
-
-Who does not know Distrowatch? Besides giving a precise ranking of Linux distributions based on their website popularity, Distrowatch is also a very useful database. Whether you are looking for a new distribution to try, or just curious, it presents an exhaustive account of every Linux you can find, with information like which default desktop environment it uses, or package system, or its default applications. And all the versions, and with easily accessible download links. In a word, the Linux database.
-
-### 13. [Linuxmanpages.com][26] ###
-
-[][27]
-
-Everything is in the URL: access the manual pages for popular commands from anywhere. Not really sure if this would actually be useful for Linux users as you can access that from your actual terminal, but the intent is remarkable.
-
-### 14. [AwesomeCow.com][28] ###
-
-[][29]
-
-This is maybe a bit less hardcore Linux, but definitely useful to some. Awesomecow is a search engine for finding alternatives to Windows software on Linux. It can be helpful for anyone migrating to the penguin, or nostalgic of a Windows program. I see this as a strength, showing that Linux can compete with the professional spheres when it comes sot software quality. Or at least try to.
-
-### 15. [PenguSpy.com][30] ###
-
-[][31]
-
-Before Steam started to show up on Linux, gaming was probably one of the penguin's weakness. But the website penguspy made the effort of fighting that weakness by collecting all Linux compatible games in a database with a sexy interface. Games can be sorted by categories, release dates, ratings, etc. I really hope that websites like this are not going to disappear because of Steam as it remains one of my favorites of this list.
-
-### 16. [Linux Cross Reference by Free Electrons][32] ###
-
-[][33]
-
-Finally, for all the experts and the curious, lxr is the anagram from Linux Cross Reference, and allows us to interactively view the Linux Kernel code online. The navigation is made easy via identifiers, and you can compare the different versions of the files with a standard diff markup. The interface is sober and straight-forward, and this is just a website that perfectly illustrates the concept of open source.
-
-To conclude, there are a lot more websites which deserve to be listed, and this might be a topic for a part two to this post. But this is a good start. It serves as an appetizer to what can be found online as tools for Linux users. If you have any other pages that you would like to share, following this thematic, do so in the comments. And maybe contribute to a sequel to this list.
-
---------------------------------------------------------------------------------
-
-via: http://xmodulo.com/2014/07/useful-online-tools-linux.html
-
-原文作者:[Adrien Brochard][a](I am a Linux aficionado from France. After trying multiple distributions, I finally settled for Archlinux. But I am always trying to improve my system by stacking up tips and tricks.)
-
-译者:[译者ID](https://github.com/译者ID) 校对:[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
-
-[a]:http://xmodulo.com/author/adrien
-[1]:http://explainshell.com/
-[2]:https://www.flickr.com/photos/xmodulo/14517716647/
-[3]:http://bashrcgenerator.com/
-[4]:https://www.flickr.com/photos/xmodulo/14703872782/
-[5]:http://vim-adventures.com/
-[6]:https://www.flickr.com/photos/xmodulo/14681149696/
-[7]:https://try.github.io/
-[8]:https://www.flickr.com/photos/xmodulo/14517499739/
-[9]:https://www.shortcutfoo.com/
-[10]:https://www.flickr.com/photos/xmodulo/14517499799/
-[11]:https://github.com/vhf/free-programming-books/blob/master/free-programming-books.md
-[12]:https://www.flickr.com/photos/xmodulo/14517499989/
-[13]:http://collabedit.com/
-[14]:https://www.flickr.com/photos/xmodulo/14681150086/
-[15]:http://cpp.sh/
-[16]:https://www.flickr.com/photos/xmodulo/14700981001/
-[17]:http://copy.sh/v24/
-[18]:https://www.flickr.com/photos/xmodulo/14517479870/
-[19]:https://github.com/copy/v86
-[20]:http://www.commandlinefu.com/
-[21]:https://www.flickr.com/photos/xmodulo/14517495938/
-[22]:http://alias.sh/
-[23]:https://www.flickr.com/photos/xmodulo/14701762124/
-[24]:http://distrowatch.com/
-[25]:https://www.flickr.com/photos/xmodulo/14681149996/
-[26]:http://www.linuxmanpages.com/
-[27]:https://www.flickr.com/photos/xmodulo/14704165765/
-[28]:http://awesomecow.com/
-[29]:https://www.flickr.com/photos/xmodulo/14704165965/
-[30]:http://www.penguspy.com/
-[31]:https://www.flickr.com/photos/xmodulo/14517495728/
-[32]:http://lxr.free-electrons.com/
-[33]:https://www.flickr.com/photos/xmodulo/14712049464/
\ No newline at end of file
diff --git a/sources/talk/20140724 diff -u--What is New in Kernel Development.md b/sources/talk/20140724 diff -u--What is New in Kernel Development.md
deleted file mode 100644
index 5089d370ff..0000000000
--- a/sources/talk/20140724 diff -u--What is New in Kernel Development.md
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -u: What's New in Kernel Development
-================================================================================
-Once in a while someone points out a POSIX violation in Linux. Often the answer is to fix the violation, but sometimes Linus Torvalds decides that the POSIX behavior is broken, in which case they keep the Linux behavior, but they might build an additional POSIX compatibility layer, even if that layer is slower and less efficient.
-
-This time, *Michael Kerrisk* reported a POSIX violation that affected file operations. Apparently, reading and writing to files during multithreaded operations could hit race conditions and overwrite each other's changes.
-
-There was some discussion over whether this was really a violation of POSIX, but ultimately, who cares? Data clobbering is bad. After Michael posted some code to reproduce the problem, the conversation focused on what to do to fix it. But Michael did make an argument that "Linux isn't consistent with UNIX since early times. (E.g., page 191 of the 1992 edition of Stevens APUE discusses the sharing of the file offset between the parent and child after fork(). Although Stevens didn't explicitly spell out the atomicity guarantee, the discussion there would be a bit nonsensical without the presumption of that guarantee.)"
-
-Al Viro joined Linus in trying to come up with a fix. Linus tried introducing a simple mutex to lock files so that write operations couldn't clobber each other, and Al offered his own refinements that improved on Linus' patch.
-
-At one point, Linus explained the history of the bug itself. Apparently, once upon a time the file pointer, which told the system where to write into the file, had been locked in a semaphore so only one process could do anything to it at a time. But, they took it out of the semaphore in order to accommodate device files and other non-regular files that ran into race conditions when users were barred from writing to them whenever they pleased.
-
-That was what introduced the bug. At the time, it slipped through undetected, because that actual reading and writing to regular files was still handled atomically by the kernel. It was only the file pointer itself that could get out of sync. And, because high-speed threaded file operations are a pretty rare need, it took a long time for anyone to run into the problem and report it.
-
-An interesting little detail is that, while Linus and Al were hunting for a fix, Al at one point complained that the approach Linus was taking wouldn't support certain architectures, including *ARM* and *PowerPC*. Linus' response was, "I doubt it's worth caring about. [...] If the ARM/PPC people end up caring, they could add the struct-return support to gcc."
-
-It's always interesting to see how corner cases crop up and get dealt with. In some cases, part of the fix has to happen in the kernel, part in GCC and part elsewhere. In this particular instance, Al felt the whole thing could be done in the kernel, and he was inspired to write his own version of the patch, which Linus accepted.
-
-*Andi Kleen* wanted to add low-level CPU event support to *perf*. The problem was that there could be tons of low-level events, and it varied widely from CPU to CPU. Even storing the possible events in memory for all CPUs would significantly increase the kernel's running size. So, hard-coding this information into the kernel would be problematic.
-
-He pointed out that the *OProfile* tool relied on publicly available lists of these events, though he said the OProfile developers didn't always keep their lists up to date with the latest available versions.
-
-To solve these issues, Andi submitted a patch that allowed perf to identify which event-list was needed for the particular CPU on the given system, and automatically download the latest version of that list from its home location. Then perf could interpret the list and analyze the events, without overburdening the kernel.
-
-There was various feedback to Andi's code, mostly to do with which directory should house the event-lists, and what the filenames should be called. The behavior of the code itself seemed to get a good reception. One detail that may turn out to be more controversial than the others was Andi's decision to download the lists to a subdirectory of the user's own home directory. Andi said that otherwise users might be encouraged to download the event-lists as the root user, which would be bad security practice.
-
-Sasha Levin recently posted a script to translate the *hexadecimal offsets *from stack dumps into meaningful line numbers that pointed into the kernel's source files. So something like "ffffffff811f0ec8" might be translated into "fs/proc/generic.c:445".
-
-However, it turned out that Linus Torvalds was planning to remove the hex offsets from the stack dumps for exactly the reason that they were unreadable. So Sasha's code was about to go out of date.
-
-They went back and forth a bit on it. At first Sasha decided to rely on data stored in the System.map file to compensate, but Linus pointed out that some people, including him, didn't keep their System.map file around. Linus recommended using /usr/bin/nm to extract the symbols from the compiled kernel files.
-
-So, it seems as though Sasha's script may actually provide meaningful file and line numbers for debugging stack dumps, assuming the stack dumps provide enough information to do the calculations.
-
---------------------------------------------------------------------------------
-
-via: http://www.linuxjournal.com/content/diff-u-whats-new-kernel-development-0
-
-原文作者:[Zack Brown][a]
-
-译者:[译者ID](https://github.com/译者ID) 校对:[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
-
-[a]:http://www.linuxjournal.com/user/801501
\ No newline at end of file
diff --git a/sources/talk/20140729 Don't Fear The Command Line.md b/sources/talk/20140729 Don't Fear The Command Line.md
new file mode 100644
index 0000000000..8a9c4acb68
--- /dev/null
+++ b/sources/talk/20140729 Don't Fear The Command Line.md
@@ -0,0 +1,138 @@
+Love-xuan 翻译中
+Don't Fear The Command Line
+================================================================================
+
+
+> Embrace your computer's most useful tool.
+
+You've probably seen it in movies, even if you haven't ever called it up on your own computer: a blank screen with a simple text prompt and a cursor, just waiting for you to enter the appropriate arcane commands to do your bidding.
+
+This is the command line. It's a text-based interface that predates the far more familiar windows, icons and tiles of today's major computer operating systems, from Windows to Mac OS X to Linux.
+
+The command line is an extremely powerful tool for accessing basic functions of your computer. For most people, it's also a confusing, complicated and seemingly irrelevant distraction. It doesn't have to be.
+
+### Computers Under Your Command ###
+
+Typing text instructions and hitting Return to get a computer to do something sounds like a major step back compared to the swipe-and-tap touch-sensitive interfaces of mobile devices. Even a toddler can use an iPad, right? Yet the command line can save you time and aggravation, if you know when to use it.
+
+If you're serious about learning to code—or just understanding computer technology—you absolutely need to get to know your command line.
+
+Diving into the command line will teach you a lot about how your computer works and organizes information. You might find that some tasks you perform every day with a mouse are actually faster when you type a command or two instead.
+
+Most important, you’ll be better prepared to learn [languages like Python][1] and [programs like Git][2] that require some command-line setup. By getting familiar with the command line, you’ll break down barriers that may have kept you from learning to program in the past.
+
+So here's a quick, basic guide to getting around on the command line. It's focused on Mac OS X's Unix-based environment, simply because that's what I'm familiar with. Linux users probably know the command line well already, although newcomers might also find these tips useful. If you're running a Chromebook, Google has some helpful instructions for getting to its [version of the command line][3], which is similar to Mac and Linux systems. Windows users, unfortunately, are stuck with a command language derived from MS-DOS that just barely overlaps with Unix, so this guide isn't going to be much use to you; you might check out [this dosprompt.info tutorial][4].
+
+### How To Find Your Way Around ###
+
+The very first thing you’ll need to do is figure out how to access the command line, which is typically done through a program called a "shell." On any Mac running OS X, you'll need to start the Terminal application. You can do this through the Finder (it's in the Utilities folder under Applications), or just click the magnifying glass in the upper right hand corner of your screen and type “terminal,” then select it from the drop-down.
+
+
+
+You’re in, but all you see is a blank box with a space to type prompts. This is the command line! Let’s get to know this window a little bit better.
+
+Type pwd, which stands for Print Working Directory. In computer parlance, “printing” something has nothing to do with paper. It really just means spitting it out on the screen. The command should result in the computer returning the directory you are currently working in.
+
+
+
+And indeed, /Users/laurenorsini is my home directory. Advanced tip: You can use the tilde symbol (~) as a shortcut for your home directory—it means the same thing as /Users/yourusername. So you can reference your Downloads subdirectory, for instance, as ~/Downloads. (If you look closely at the command prompt above, you'll see a tilde there. That indicates that I'm in my home directory.)
+
+We don’t want to muddy up our main directory with all our command-line experimenting, so let’s make a new directory with the mkdir command. This is the same as creating a new folder on your desktop operating system. Let's call it "experiments":
+
+
+
+Now we have a new directory. Using the graphic interface, we can visually verify that we actually created a new one. Sure enough, if I open the Finder and go into my home directory—here marked with a little house icon—I now see a folder named “experiments.” I made that on the command line! (The reverse works, too: You can create a folder on your desktop, and see it in the command line. They're just two different ways of looking at the same system.)
+
+
+
+Now I need to change directories and enter the ~/experiments directory with the **cd** (change directory) command.
+
+
+
+I have my command prompt on the default setting, so it automatically shows where my working directory is. But if yours looks different, here's how to make sure “experiments” is truly your working directory: type **pwd** again. It should tell you that your working directory is “experiments.”
+
+### Getting Filed Away ###
+
+I create and edit files on the command line every day that I code. It's faster than using the graphical user interface because I can test out my programs on the command line as soon as I finish editing them. And if I also happen to be pushing things to [GitHub][5] at the same time, well, it's even more convenient.
+
+Now you have a new directory (also called a repository or folder) on your computer to mess around with. Let's start by creating a new file that contains only the words, "Hello World." There are a lot of ways to do this; here I'm using the echo command.
+
+Now you have a new directory (also called a repository or folder) on your computer to mess around with. Let's start by creating a new file that contains only the words, "Hello World." There are a [lot of ways][6] to do this; here I'm using the **echo** command.
+
+
+
+Oh no! I spelled "newfile" incorrectly. That happens. Let's fix it in two steps. First, I'll create a new file with the correct spelling...
+
+
+
+And then, I'll use the **mv** (move) command to replace my old, misspelled file with my new file. This always takes the form "**mv oldfile newfile**."
+
+
+
+A note about **mv**: like many commands, it's a deceptively powerful one. When we're "moving" newfil.txt into newfile.txt, what we're actually doing is completely overwriting the first file and replacing it with the second. So the text I wrote into newfil.txt is gone forever, replaced by what I wrote into newfile.txt.
+
+To prove that I only have one file in my directory, I can use **ls** , the list command, to get a list of all the files in this directory.
+
+
+
+See? Just the one. And if I look inside the folder using my computer's graphical user interface, I can see the file there, too.
+
+
+
+But it's just a blank text file. Let's put something inside it using a text editor. On the command line, I tend to use the nano editor since it's simple and it works on just about every type of computer.
+
+This should immediately bring up a new editing screen right inside your command line window. The basic commands are all laid out for you.
+
+
+
+Write what you want, and then exit with CTRL + X. If it asks you to save and you'd like to, type "Y."
+
+
+
+As you've probably guessed by now, it's possible to also see these changes by using the operating system and navigating to newfile.txt with your mouse. Here you can open and edit the file you've created in any text editor of your choice.
+
+If you want to delete the file forever, do that with the **rm** (remove) command:
+
+
+
+Keep in mind that the **rm** command is very powerful! A [common trick][7] on hacker forums is to convince a command-line newbie to type **rm -rf** / so she ends up deleting her whole computer. The "/" means the very top-level directory of your computer—and everything underneath it. NEVER type that command!
+
+### Further Reading ###
+
+This is just the beginning of the endless possibilities of the command line. You can use this tool to control every aspect of your computer, which is what makes it as dangerous as it is powerful. Make sure to always read up on new command-line prompts before you use them, and never blindly input a prompt that a stranger suggests to you online.
+
+I've outlined the commands I use every day so I can code, but there are a lot more reasons to master the command line than that. If you're looking for a more thorough overview, you might want to try:
+
+[The Command Line Crash Course][8]. A free, extended course that covers the basics of command line usage.
+
+[A Command Line Primer For Beginners][9]. Lifehacker’s collection of helpful commands for first time users.
+
+[Introduction to the Mac OS X Command Line][10]. Online-education site Treehouse covers the very basics in extreme detail.
+
+Now that you've finished reading, you're better prepared for any code tutorial I've written in the past, since it's impossible to do any of them without typing in some commands. If you're ready to go, I suggest you check out ReadWrite's [Git tutorial][11], which utilizes the command line to introduce you to collaborative coding. Happy computing!
+
+*Lead photo by [Jason Scott][12]; all other screenshots by Lauren Orsini for ReadWrite*
+
+--------------------------------------------------------------------------------
+
+via: http://readwrite.com/2014/07/18/command-line-tutorial-intro
+
+作者:[Lauren Orsini][a]
+译者:[译者ID](https://github.com/译者ID)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://readwrite.com/author/lauren-orsini
+[1]:http://readwrite.com/2014/07/08/what-makes-python-easy-to-learn
+[2]:http://readwrite.com/2013/09/30/understanding-github-a-journey-for-beginners-part-1
+[3]:http://www.chromium.org/chromium-os/poking-around-your-chrome-os-device
+[4]:http://dosprompt.info/
+[5]:http://www.github.com/
+[6]:http://www.cyberciti.biz/faq/unix-create-file-from-terminal-window-shell-prompt/
+[7]:http://www.urbandictionary.com/define.php?term=rm+-rf+%2F
+[8]:http://cli.learncodethehardway.org/book/
+[9]:http://lifehacker.com/5633909/who-needs-a-mouse-learn-to-use-the-command-line-for-almost-anything
+[10]:http://blog.teamtreehouse.com/introduction-to-the-mac-os-x-command-line
+[11]:http://readwrite.com/2013/09/30/understanding-github-a-journey-for-beginners-part-1
+[12]:http://en.wikipedia.org/wiki/Computer_terminal#mediaviewer/File:DEC_VT100_terminal.jpg
\ No newline at end of file
diff --git a/sources/talk/20140731 Top 10 Free Linux Games.md b/sources/talk/20140731 Top 10 Free Linux Games.md
new file mode 100644
index 0000000000..4112cf895e
--- /dev/null
+++ b/sources/talk/20140731 Top 10 Free Linux Games.md
@@ -0,0 +1,486 @@
+Top 10 Free Linux Games
+================================================================================
+If the term “Can I game on it?” has been bothering you while thinking to switch on Linux from Windows platform, then here is an answer for that – “Go for it!”. Thanks to the Open source community who has been consistently developing different genre games for Linux OS and the online content distribution platform – Steam, there is no dearth of good commercial games which are as fun to play on Linux as on its other counterparts (like Windows).
+
+We present to you the list of 10 best free games for Linux for this year which have been selected based on their popularity, their free-to-play title, and easy installation.
+
+**NOTE** – Interested in First Person Shooter games, read our article on [10 popular first person shooter Linux games][1].
+
+### 1. Team Fortress 2 ###
+
+
+
+Team Fortress 2 is a team-based first-person shooter multiplayer video game developed by Valve Corporation, and is a sequel to the original 1996 Quake modification, Team Fortress. The game was first released on October 10, 2007 for Windows and the Xbox 360, and was later released as a standalone package for Linux on February 14, 2013. The game was announced in 1998, and was initially powered by Valve’s GoldSrc engine but the launch was much delayed due to updates in its design during its 9 years long development cycle. The game became a free-to-play title on June 23, 2011.
+
+It has received critical acclaim and many awards, mainly due to its artistic direction, balanced gameplay, humour, and graphical style. Unlike other games with ultra-realistic graphics such as Call of Duty, Half-Life franchises, this game’s set up looks like cartoons brought to life.
+
+**Gameplay**: Like the original game, Team Fortress 2 is set around 2 opposing teams; RED (Reliable Excavation & Demolition) and BLU (Builders League United), both competing for a combat-based primary objective.
+Players can opt out of 9 character classes namely, Scout, Soldier, Pyro, Demoman, Heavy, Engineer, Medic, Sniper, and Spy, each one with its own unique weapons, strengths and weaknesses.
+
+#### System Requirements: ####
+
+
+
+ | |
+ Recommended Requirements |
+ Minimum requirements |
+
+
+ | CPU |
+ Pentium 4 or Athlon XP or better |
+ Pentium 4 or Athlon XP or better |
+
+
+ | CPU Speed |
+ 3.0 GHz processor |
+ 1.7 GHz |
+
+
+ | RAM |
+ 1 GB |
+ 512 MB |
+
+
+ | Video Card |
+ DirectX 9 compatible video card (NVIDIA GeForce 7900+ / ATI Radeon X1900+) |
+ DirectX 8.1 compatible video Card (NVIDIA GeForce4+ / ATI Radeon 8500+) |
+
+
+ | Sound Card |
+ Yes |
+ Yes |
+
+
+ | Free disk space |
+ 5 GB |
+ 5 GB |
+
+
+
+### 2. Dota 2 ###
+
+
+
+Dota 2, a sequel to the Defence of the Ancients, is a multiplayer online battle arena video game developed by Valve Corporation. Dota 2 was released as a free-to-play title for Windows on July 9, 2013 and for Linux on July 18, 2013, and is available exclusively through Valve’s online content-distribution platform Steam. The game was applauded by video game critics, who praised it for its pleasing gameplay, improved production quality. Though it was also criticized for its steep learning curve.
+
+**Gameplay**: A standard match of Dota 2 is independent and involves 2 opposing groups, the Radiant and the Dire, each team having 5 players. Both the teams occupy a stronghold at a corner of the map and located at each stronghold is a building named “Ancient”. In order to win, a team must destroy the opponent’s Ancient. There are 9 game modes and 107 “Heroes” in Dota 2 to choose from. Each player controls a “Hero” character and aims on levelling up, acquiring items, collecting gold, and fighting against enemy team to gain victory.
+
+#### System Requirements: ####
+
+
+
+
+ | |
+ Recommended Requirements |
+ Minimum requirements |
+
+
+ | CPU |
+ Intel core 2 duo 2.4GHz |
+ Pentium 4 3.0GHz |
+
+
+ | CPU Speed |
+ 2.4 GHz processor |
+ 3.0 GHz |
+
+
+ | RAM |
+ 1 GB |
+ 1 GB |
+
+
+ | Video Card |
+ DirectX 9 compatible video card with Shader model 3.0. NVidia 7600, ATI X1600 or better |
+ DirectX 9 compatible video card with 128 MB, Shader model 2.0. ATI X800, NVidia 6600 or better |
+
+
+ | Sound Card |
+ Yes |
+ Yes |
+
+
+ | Free disk space |
+ 2.5 GB |
+ 2.5 GB |
+
+
+
+
+### 3. Urban Terror ###
+
+
+
+Urban Terror, abbreviated as UrT, is a free-to-play multi-player FPS video game developed by FrozenSand. It was released as a free standalone game in 2007 utilizing ioquake3 (a game engine project to act as a clean base package for more advanced graphical and audio features) as an engine.
+
+The official game motto’s ‘Fun over realism’ is true to its word as it is a well packaged product with simple installation, adequate graphics, low requirements, and a balanced gameplay, which makes it a unique, enjoyable and addictive game. Urban Terror was nominated to the 2007 Mod DB’s Mod of the Year Award.
+
+**Gameplay**: The game billed as “Hollywood tactical shooter”, blends elements from games such as Quake III Arena, Unreal Tournament, and Counter-Strike. The realism in the mod is introduced through a number of changes like the weapons available are real-life, have recoil, are less accurate if fired while movement, and require reloading when a magazine has been utilized. Damage is also realistic such as wounds require bandaging, leg or feet wounds slow down the player.
+
+#### System Requirements: ####
+
+
+
+
+ | |
+ Recommended Requirements |
+ Minimum requirements |
+
+
+ | CPU |
+ Pentium 4 1.2 GHz or higher |
+ Pentium 4 1.2 GHz |
+
+
+ | CPU Speed |
+ 1.2 GHz |
+ 1.2 GHz |
+
+
+ | RAM |
+ 512 MB |
+ 256 MB |
+
+
+ | Video Card |
+ NVidia or ATI card with 256MB or more |
+ NVidia or ATI card with 128MB RAM |
+
+
+ | HDD |
+ 50 GB or more |
+ 50 GB |
+
+
+
+
+### 4. Alien Arena 2008 ###
+
+
+
+Alien Arena is a standalone 3D first-person online deathmatch shooter video game based on source code of Quake II and Quake III, released by id software. The game developed by COR entertainment was released in October 2004, and has been free-to-play title since its commencement, with currently no plans to change it to pay-to-play format.
+
+Features comprising new particle engine and effects, 32 bit graphics, reflective water, light blooms, high resolution textures and skins, stain maps, and more, make up for it to be an addictive game. This game has come a long way from its original version “CodeRED: Alien Arena”, with all new player characters, nearly 2 dozen new maps, new weapon models, and many substantial engine enhancements and optimizations.
+
+**Gameplay**: Alien Arena features 37 levels, has fast and smooth gameplay with a high-tech atmosphere. The players can play online against one another or against the built in CodeRED bots, which feature multiple skill levels like rocket jumping and strafe jumping. The game also offers CTF (Capture The Flag), AOA (All Out Assault) modes, in which players can climb into vehicles to do battle, Deathball, and Team Core Assault.
+
+#### System Requirements: ####
+
+
+
+
+ | |
+ Recommended Requirements |
+ Minimum requirements |
+
+
+ | CPU |
+ Intel Pentium 4 1.7 GHz or AMD Athlon XP 1800 |
+ Pentium 3 @ 800MHz |
+
+
+ | CPU Speed |
+ 1.7 GHz |
+ 800MHz (or 1 GHz) |
+
+
+ | RAM |
+ 512 MB |
+ 256 MB |
+
+
+ | Video Card |
+ BFG GeForce 7800 GS OC |
+ NVIDIA GeForce 4400+ or ATI Radeon 8500+ (32 MB) |
+
+
+ | Video Memory |
+ 64 MB |
+ 32 MB |
+
+
+ | Sound Card |
+ DirectX compatible |
+ DirectX compatible |
+
+
+ | DirectX |
+ 9.0c |
+ 9.0c |
+
+
+ | HDD |
+ 500 MB |
+ 500 MB |
+
+
+
+
+### 5. Nexuiz ###
+
+
+
+Nexuiz is an Arena first-person shooter 3D deathmatch video game developed and published by Alientrap on May 31, 2005, and is build on a modified Quake 1 Engine named DarkPlaces, whose features include Quake3bsp support, coronas, new particle effects, real time World and Dynamic lighting and shadowing, advanced menu system, and Md3 model support. It is intended to be played on the Internet or over a local network.
+
+**Gameplay**: The gameplay is deathmatch with the most exorbitant possible speeds and weapons, providing extremely fast paced action. Other than deathmatch, there are several game modes like team deathmatch, domination, capture the flag, multiple mutators, and weapon options like rocket arena and instagib. Although, Nexuiz is mainly multiplayer but it includes a full single-player campaign, which lets one to play through various multiplayer game types and maps with bots.
+
+#### System Requirements: ####
+
+
+
+
+ |
+ Recommended Requirements |
+ Minimum requirements |
+
+
+ | CPU |
+ Intel Core 2 Duo at 2Ghz, or AMD Athlon 64 x2 2ghz, or better |
+ 1 Ghz Pentium III or AMD Athlon |
+
+
+ | RAM |
+ 2 GB |
+ 512 MB |
+
+
+ | Video Card |
+ NVidia 8800GT with 512Mb RAM, ATI 3850HD with 512Mb RAM, or better |
+ GeForce 2 or equivalent |
+
+
+ | HDD |
+ 3 GB |
+ 400 MB |
+
+
+
+
+### 6. Tremulous ###
+
+
+
+Tremulous is a free and open source game that incorporates a team-based FPS game with real-time strategy elements. The game developed by Dark Legion Development, released on August 11, 2005 and is based on the ioquake2 game engine. Although it originated as a mod for Quake 3, but ultimately went standalone.
+
+Tremulous won the Mod Database “Mod of the Year” 2006 competition under the category of “Player’s Choice Standalone Game of the year”, and also came in first in a “Best free game based on GPL Quake source?” poll on the Planet Quake website.
+
+**Gameplay**: The game is presumably set in the future, where humans fight against spider-like aliens. Players can choose from 2 unique races, aliens and humans, and each of the team players can build working structures during the game like a Real Time Strategy game. The most significant structure is ‘spawn’, which provides each team with supplements to replace players who have been killed.
+
+#### System Requirements: ####
+
+
+
+
+ | |
+ Recommended Requirements |
+ Minimum requirements |
+
+
+ | CPU |
+ Pentium 4 3.46GHz or Athlon 64 3800+ |
+ Pentium 4 1.8GHz or Athlon XP 1700+ |
+
+
+ | RAM |
+ 2 GB |
+ 256 MB |
+
+
+ | Video Card |
+ Nvidia GeForce GT 120 , AMD Radeon HD 4550 |
+ Nvidia GeForce 210 , AMD Radeon X600 Series |
+
+
+ | DirectX version |
+ DX 9.0c |
+ DX 9.0c |
+
+
+ | HDD space |
+ 4 GB |
+ 125 MB |
+
+
+
+
+### 7. Warsow ###
+
+
+
+Warsow is a First Person Shooter (FPS) video game designed for online play, inspired by the fast paced shooters of the late 1990’s and early millennium. Warsow’s codebase is free and open source software, distributed under the terms of General Public License, and is built upon Qfusion, an advanced modification of the Quake II engine. Warsow stands out as a unique experience as its development team has strived to create a fun, fast, and action-packed game focused on speed, trickjumps, art of movement. This title uses cell-shaded graphics in a cartoon-ish style to fuse themes including cyberpunk, industrial, and sci-fi.
+
+**Gameplay**: This fast-paced 3D ego-shooter focuses heavily on movement and trickjumps, where many of the tricks originate from the Quake series, including circle-jumping, bunny hopping, strafe-jumping, double jumping, ramp-sliding, and rocket jumping. Apart from these tricks, Warsow also allows the players to dash, dodge or wall jump, which were originally possible in the Urban Terror.
+
+### System Requirements: ###
+
+
+
+
+ |
+ Minimum Requirements |
+
+
+ | CPU |
+ Pentium II 300 Mhz or greater |
+
+
+ | RAM |
+ 64 MB |
+
+
+ | Video Card |
+ 16 MB (Riva TNT or better) |
+
+
+ | HDD |
+ 400 MB |
+
+
+
+
+**Note** – The recommended requirements for this game weren’t directly available. This is what we got from some discussion forums:
+
+- CPU – Intel Pentium 4 (3.00 GHz)
+- RAM - 512 MB
+- Video Card - 256 MB (nVidia GeForce 5500 FX)
+- HDD - 2 GB
+
+### 8. Open Arena (OA) ###
+
+
+
+Open Arena is an open-source multiplayer FPS game based on the ioquake3 fork of the id tech 3 engine. It is developed by the OpenArena Team and released under the GNU General Public License V2.0 (GPLv2). The game’s official site includes downloads for GNU/Linux, Microsoft Windows and Mac OS X Operating systems and is also available from the default repositories of Linux distributions, like Debian, Gentoo, Fedora, Arch, Mandriva, and Ubuntu. OpenArena can be played freely, offline or online, and users are also able to run their own LAN or internet server.
+
+**Gameplay**: OpenArena’s gameplay is precisely same as Quake III Arena: Win the game by scoring frags with the help of a balanced set of weapons designed for different situations. Every match happens in an “arena”, a map where players try to kill each other; arenas are designed for gametypes such as deathmatch, Tournament, Team Deathmatch, and Capture the Flag. Due to violent and mature content, it’s unsuitable for children under the age of 17.
+
+#### System Requirements: ####
+
+
+
+
+ |
+ Recommended Requirements |
+ Minimum Requirements |
+
+
+ | CPU |
+ Pentium III 700MHz / AMD Athlon XP 2800+ |
+ Pentium II 233MHz / AMD K6-2 300MHz or equally powerful processor |
+
+
+ | RAM |
+ 256 MB |
+ 64 MB |
+
+
+ | Video Card |
+ Geforce 4 Ti 4400 |
+ 16 MB (with OpenGL acceleration) |
+
+
+ | Free Disk Space |
+ 270 MB |
+ 50 MB |
+
+
+
+
+### 9. Freecol ###
+
+
+
+FreeCol is a free and open source turn-based strategy video game, which is imitation of the old game Colonization, and is similar to Civilization. The game was initially released on January 2, 2003, but its stable release came out 17 months ago, on January 7, 2013. It remains same in terms of mechanics and gameplay as the original game, but with newly added set of redesigned graphics.
+
+**Gameplay**: The objective of the game is to colonize the New World. The game starts in 1492 with a vessel and some colonists, and the player builds up colonies in the New World, struggling for power with other colonies from rival Europeans. The expansion of colonies continues with help from the European king until no help is required from Europe, meaning that colonies can stand alone without any exterior help, and declares independence from the King. If the colonies are able to resist attacks of the King’s forces, then victory is obtained.
+
+#### System Requirements: ####
+
+
+
+
+ |
+ Recommended Requirements |
+ Minimum Requirements |
+
+
+ | CPU |
+ Intel(R) Core(TM)2 Duo CPU P8700 2.53 GHz |
+ Pentium 3 1GHz |
+
+
+ | RAM |
+ 512 MB |
+ 256 MB |
+
+
+ | Java Version |
+ Java Runtime Environment 7 |
+ Java Runtime Environment 5 (or JRE 6) |
+
+
+ | Resolution |
+ 1024 X 768 |
+ 1024 X 768 |
+
+
+
+
+### 10. Extreme Tux Racer ###
+
+
+
+Extreme Tux Racer, originally named Tux Racer, is a free software 3D computer game which lets a player take on the role of the Linux mascot, Tux the penguin. The game was released on October 2, 2000 by Jasmin Patry, a student studying at the University of Waterloo in Ontario, Canada. An original Linux game, it is a very fun and simple racing game, without any complexity or violence, which makes it suitable for all age groups.
+
+**Gameplay**: In the game, Tux slides down various courses of steep, snow- and ice- covered mountains, to achieve the best time and the best score. The score can be increased by collecting herring while racing and sliding down the course. Sliding on snow allows more manoeuvrability, sliding on ice makes Tux go faster and sliding on rocky patches slows down Tux.
+
+### System Requirements: ###
+
+
+
+
+ |
+ Recommended Requirements |
+ Minimum Requirements |
+
+
+ | CPU |
+ 400 MHz CPU or better |
+ Pentium 200MMX |
+
+
+ | RAM |
+ 128 MB |
+ 64 MB |
+
+
+ | Video Card |
+ TNT2/Voodoo3-class 3D graphics card or better |
+ 3D graphics card with full OpenGL support |
+
+
+ | Sound Card |
+ 16-bit |
+ 16-bit |
+
+
+ | HDD |
+ 20 MB |
+ 20 MB |
+
+
+
+
+Have something to say? Leave a comment below.
+
+--------------------------------------------------------------------------------
+
+via: http://mylinuxbook.com/top-10-free-linux-games/
+
+作者:[Himanshu Arora][a]
+译者:[译者ID](https://github.com/译者ID)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://mylinuxbook.com/author/himanshuc/
+[1]:http://mylinuxbook.com/10-popular-fps-linux-games/
\ No newline at end of file
diff --git a/sources/talk/20140801 $2400 Valued Introduction To Linux Course Is Available For Free On edX.md b/sources/talk/20140801 $2400 Valued Introduction To Linux Course Is Available For Free On edX.md
new file mode 100644
index 0000000000..3eafcb4fe0
--- /dev/null
+++ b/sources/talk/20140801 $2400 Valued Introduction To Linux Course Is Available For Free On edX.md
@@ -0,0 +1,37 @@
+$2400 Valued Introduction To Linux Course Is Available For Free On edX
+================================================================================
+
+
+Probably you have already heard it. [Linux Foundation][1] has tied up with [edX][2] (a major online learning platform founded by MIT and Harvard University) to provide its Introduction to Linux course, which usually costs $2400, for free.
+
+edX has over 200 courses from over 50 elite universities, corporations and organizations worldwide. Over 2.5 million users attend these online courses across the globe.
+
+**Introduction to Linux course is starting from 1st August**. There are three ways one can take this course (or most other edX courses):
+
+- **Audit the course**: Simple register for **free** and get access to study material. Participate in course as per your own pace. There is no compulsion or penalty if you cannot complete the course.
+- **Honor code certificate**: It certifies that you have successfully completed the course, however, it doesn’t verify your identity. This too is for free.
+- **Verified certificate of achievement**: This certificates validates your identity and costs $250 for **Introduction to Linux** course.
+
+Introduction to Linux requires a working knowledge of computers and common software. Program aims to provide experienced computer users, who may or may not have previous Linux experience, a good working knowledge of Linux, from both a graphical and command line perspective. It consists a course work of 40 to 60 hours and is designed by Dr. Jerry Cooperstein, who manages training content at Linux Foundation.
+
+If you are planning to attend Introduction to Linux, it is advised to have Linux installed on your computer beforehand. Linux Foundation has [prepared a guide to set up the computer][3] to help users out.
+
+What are you waiting for? If you ever wanted to learn Linux, this is the time and best of all, it’s FREE! Sign up to the course with the link below:
+
+- [Introduction to Linux course at edX][4]
+
+--------------------------------------------------------------------------------
+
+via: http://itsfoss.com/introduction-linux-free-edx/
+
+作者:[Abhishek][a]
+译者:[译者ID](https://github.com/译者ID)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://itsfoss.com/author/Abhishek/
+[1]:http://www.linuxfoundation.org/
+[2]:https://www.edx.org/
+[3]:https://training.linuxfoundation.org/images/pdfs/Preparing_Your_Computer_for_LFS101x.pdf
+[4]:https://www.edx.org/course/linuxfoundationx/linuxfoundationx-lfs101x-introduction-1621#.U9gJ5nWSyb8
\ No newline at end of file
diff --git a/sources/talk/20140801 20 Amazing Linux Blogs For Beginners.md b/sources/talk/20140801 20 Amazing Linux Blogs For Beginners.md
new file mode 100644
index 0000000000..7fcef1751a
--- /dev/null
+++ b/sources/talk/20140801 20 Amazing Linux Blogs For Beginners.md
@@ -0,0 +1,74 @@
+[translating sailing]
+20 Amazing Linux Blogs For Beginners!
+================================================================================
+Whether you're a newbie looking to venture into the world of Linux and open source or a pro in search for some inspiration, well, blogs are the one stop shop to all your needs. Blogs are an excellent resource of information coming in from real time users like you and me who are looking to help other fellow users grasp concepts in simple language and easy format.
+
+1.[Ubuntux][1]
+
+2.[Mark shuttleworth's Official Blog][2]
+
+3.[Ubuntu Living][3]
+
+4.[Planet Gnome][4]
+
+5.[Planet KDE][5]
+
+6.[Linux Tracker][6]
+
+7.[Linux Watch][7]
+
+8.[Mandriva Blog][8]
+
+9.[Linux Security][9]
+
+10.[Linux on Desktop][10]
+
+11.[LinuxBSDos][11]
+
+12.[All for Linux][12]
+
+13.[Linux from Scratch][13]
+
+14.[RootPrompt][14]
+
+15.[Linux Home Networking][15]
+
+16.[YoLinux][16]
+
+17.[Librenix][17]
+
+18.[Linux Journal][18]
+
+19.[Linux Street][19]
+
+20.[Linux Hub][20]
+
+--------------------------------------------------------------------------------
+
+via: http://www.efytimes.com/e1/fullnews.asp?edid=144715
+
+译者:[译者ID](https://github.com/译者ID)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://www.ubuntux.org/
+[2]:http://www.markshuttleworth.com/
+[3]:http://ubuntuliving.blogspot.in/
+[4]:http://planet.gnome.org/
+[5]:http://planetkde.org/
+[6]:http://linuxtracker.org/
+[7]:http://efytimes.com/e1/www.linux-watch.com
+[8]:http://blog.mandriva.com/en/
+[9]:http://www.linuxsecurity.com/
+[10]:http://linuxondesktop.blogspot.in/
+[11]:http://www.linuxbsdos.com/
+[12]:http://allforlinux.com/
+[13]:http://www.linuxfromscratch.org/
+[14]:http://rootprompt.org/
+[15]:http://www.linuxhomenetworking.com/
+[16]:http://www.yolinux.com/TUTORIALS/
+[17]:http://librenix.com/
+[18]:http://www.linuxjournal.com/
+[19]:http://www.linuxstreet.net/
+[20]:http://linuxhub.net/
diff --git a/sources/talk/20140804 Group Test--Linux Text Editors.md b/sources/talk/20140804 Group Test--Linux Text Editors.md
new file mode 100644
index 0000000000..b1f2846a0e
--- /dev/null
+++ b/sources/talk/20140804 Group Test--Linux Text Editors.md
@@ -0,0 +1,318 @@
+Group Test: Linux Text Editors
+================================================================================
+> Mayank Sharma tests five supercharged text editors that can crunch more than just words.
+
+If you’ve been using Linux long, you know that whether you want to edit an app’s configuration file, hack together a shell script, or write/review bits of code, the likes of LibreOffice just won’t cut it. Although the words mean almost the same thing, you don’t need a word processor for these tasks; you need a text editor.
+
+In this group test we’ll be looking at five humble text editors that are more than capable of heavy-lifting texting duties. They can highlight syntax and auto-indent code just as effortlessly as they can spellcheck documents. You can use them to record macros and manage code snippets just as easily as you can copy/paste plain text.
+
+Some simple text editors even exceed their design goals thanks to plugins that infuse them with capabilities to rival text-centric apps from other genres. They can take on the duties of a source code editor and even an Integrated Development Environment.
+
+Two of most popular and powerful plain text editors are Emacs and Vim. However, we didn’t include them in this group test for a couple of reasons. Firstly, if you are using either, congratulations: you don’t need to switch. Secondly, both of these have a steep learning curve, especially to the GUI-oriented desktop generation who have access to alternatives that are much more inviting.
+
+### The contenders: ###
+
+#### Gedit ####
+
+- URL:http://projects.gnome.org/gedit/
+- Version: 3.10
+- Licence: GPL
+- Is Gnome’s default text editor up to the challenge?
+
+#### Kate ####
+
+- URL: www.kate-editor.org
+- Version: 3.11
+- Licence: LGPL/GPL
+- Will Kate challenge fate?
+
+#### Sublime Text ####
+
+- URL: www.sublimetext.com
+- Version: 2.0.2
+- Licence: Proprietary
+- Proprietary software in the land of free with the heart of gold.
+
+#### UltraEdit ####
+
+- URL: www.ultraedit.com
+- Version: 4.1.0.4
+- Licence: Proprietary
+- Does it do enough to justify its price?
+
+#### jEdit ####
+
+- URL: www.jedit.org
+- Version: 5.1.0
+- Licence: GPL
+- Will the Java-based editor spoil the party for the rest?
+
+
+There’s a fine balance between stuffing an app with features and exposing all of them to the user. Geddit keeps most of its features hidden.
+
+### The crucial criteria ###
+
+All the tools, except Gedit and jEdit, were installed on Fedora and Ubuntu via their recommended installation method. The former already shipped with the default Gnome desktop and the latter stubbornly refused to install on Fedora. Since these are relatively simple apps, they have no esoteric dependencies, the only exception being jEdit, which requires Oracle Java.
+
+Thanks to the continued efforts of both Gnome and KDE, all editors look great and function properly irrespective of the desktop environment they are running on. That not only rules it out as an evaluation criterion, it also means that you are no longer bound by the tools that ship with your favourite desktop environment.
+
+In addition to their geekier functionality, we also tested all our candidates for general-purpose text editing. However, they are not designed to mimic all the functionality of a modern-day word processor and weren’t evaluated as such.
+
+
+
+Kate can double up as a versatile can capable integrated development environment (IDE).
+
+### Programming language support ###
+
+UltraEdit does syntax highlighting, can fold code and has project management capabilities. There’s also a function list, which is supposed to list all the functions in the source file, but it didn’t work for any of our test code files. UltraEdit also supports HTML5, and has a HTML toolbar with which you can add commonly-used HTML tags.
+
+Even Gnome’s default text editor, Gedit, has several code-oriented features such as bracket matching, automatic indentation, and will also highlight syntax for various programming languages including C, C++, Java, HTML, XML, Python, Perl, and many others.
+
+If you’re looking for more programming assistance, look at Sublime and Kate. Sublime supports several programming languages and (as well as the popular ones) is able to highlight syntax for C#, D, Dylan, Erlang, Groovy, Haskell, Lisp, Lua, MATLAB, OCaml, R, and even SQL. If that isn’t enough for you, you can download add-ons to support even more languages.
+
+Furthermore, its syntax highlighting ability offers several customisable options. The app will also match braces, to ensure they are all properly rounded off, and the auto-complete function in Sublime works with variables created by the user.
+
+Just like Komodo IDE, sublime also displays a scrollable preview of the full source code, which is really handy for navigating long code files and lets you jump between different parts of the file.
+
+One of the best features of Sublime is its ability to run code for certain languages like C++, Python, Ruby, etc from within the editor itself, assuming of course you have the compiler and other build system tools installed on your computer. This helps save time and eliminates the need to switch out to the command line.
+
+You can also enable the build system in Kate with plugins. Furthermore, you can add a simple front-end to the GDB debugger. Kate will work with Git, Subversion and Mercurial version control systems, and also provides some functionality for project management.
+
+It does all this in addition to highlighting syntax for over 180 languages, along with other assistance like bracket matching, auto-completion and auto-indentation. It also supports code folding and can even collapse functions within a program.
+
+The only disappointment is jEdit, which bills itself as a programmer’s text editor, but it struggled with other basic functions such as code folding and wouldn’t even suggest or complete functions.
+
+**Verdict:**
+
+- Gedit:3/5
+- Kate:5/5
+- Sublime:5/5
+- UltraEdit3/5
+- jEdit:1/5
+
+
+
+If you don’t like Sublime’s Charcoal appearance, you can choose one of the other 22 themes included with ti.
+
+### Keyboard control ###
+
+Users of an advanced text editor expect to control and operate it exclusively via the keyboard. Furthermore, some apps even allow their users to further customise the key bindings for the shortcuts.
+
+You can easily work with Gedit using its extensive keyboard shortcut keys. There are keys for working with and editing files as well as invoke tools for common tasks such as spellchecking a document. You can access a list of default shortcut keys from within the app, but there’s no graphical way to customise them. Similarly, to customise the keybindings in Sublime, you need to make modifications in its XML keymap files. Sublime has been criticised for its lack of a graphical interface to define keyboard shortcuts, but long-term users have defended the current file-based mechanism, which gives them more control.
+
+UltraEdit is proud of its “everything is customisable” motto, which it extend to keyboard shortcuts. You can define custom hotkeys for navigating the menus and also define your own multi-key key-mappings for accessing its plethora of functions.
+
+In addition to its fully customisable keyboard shortcuts, jEdit also has pre-defined keymaps for Emacs. Kate is equally impressive in this respect. It has an easily accessible window to customise the key bindings. You can change the default keys, as well as define alternate ones. Furthermore, Kate also has a Vi mode which will let users operate Kate using Vi keys.
+
+**Verdict:**
+
+- Gedit:2/5
+- Kate:5/5
+- Sublime:3/5
+- UltraEdit:4/5
+- jEdit:5/5
+
+### Snippets and macros ###
+
+Macros help you cut down the time spent on editing and organising data by automating repetitive steps, while Snippets of code extend a similar functionality to programmers by creating reusable chunks of source code. Both have the ability to save you time.
+
+The vanilla Gedit installation doesn’t have either of these functionalities, but you can enable them via separate plugins. While the Snippets plugin ships with Gedit, you’ll have to manually download and install the macro plugin (it’s called gedit-macropy and is hosted on GitHub) before you can enable it from within Gedit.
+
+Kate takes the same plugins route to enable the snippets feature. Once added, the plugin also adds a repository of snippets for PHP, Bash and Java. You can display the list of snippets in the sidebar for easier access. Right-click on a snippet to edit its contents as well as its shortcut key combination. However, very surprisingly, it doesn’t support macros – despite repeated hails from users since 2002!
+
+jEdit too has a plugin for enabling snippets. But it can record macros from user actions and you can also write them in the BeanShell scripting language (BeanShell supports scripted objects as simple method closures like those in Perl and JavaScript). jEdit also has a plugin that will download several macros from jEdit’s website.
+
+Sublime ships with inbuilt ability to create both snippets and macros, and ships with several snippets of frequently used functions for most popular programming languages.
+
+Snippets in UltraEdit are called Smart Templates and just like with Sublime you can insert them based upon the kind of source file you’re editing. To complement the Macro recording function, UltraEdit also has an integrated javascript-based scripting language to automate tasks. You can also download user-submitted macros and scripts from the editor’s website.
+
+**Verdict:**
+
+- Gedit:3/5
+- Kate:1/5
+- Sublime:5/5
+- UltraEdit:5/5
+- jEdit:5/5
+
+
+
+UltraEdit’s UI is highly configurable — you can customise the layout of the toolbars and menus just as easily as you can change many other aspects.
+
+### Ease of use ###
+
+Unlike a bare-bones text editor, the text editors in this feature are brimming with features to accommodate a wide range of users — from document writers to programmers. Instead of stripping features from the apps, their developers are looking for avenues to add more functionality.
+
+Although at first glance most apps in this group test have a very similar layout, upon closer inspection, you’ll notice several usability differences. We have a weak spot for apps that expose their functionality and features by making judicious use of the user interface, instead of just overwhelming the user.
+
+### Gedit: 4/5 ###
+
+Gedit wears a very vanilla look. It has an easy interface with minimal menus and buttons. This is a two-edged sword though, as some users might fail to realise its true potential.
+
+The app can open multiple files in tabs that can be rearranged and moved between windows. Users can optionally enable panels on the side and bottom for displaying a file browser and the output of a tool enabled by a plugin. The app will detect when an open file is modified by another application and offers to reload that file.
+
+The UI has been given a major overhaul in the latest version of the app yet to make its way into Gnome. However it isn’t yet stable, and while it maintains all features, several plugins that interact with the menu will need to be updated.
+
+### Kate: 5/5 ###
+
+Although a major part of its user interface resembles Gedit, Kate tucks in tabs at either side and its menus are much fuller. The app is approachable and invites users to explore other features.
+
+Kate can transparently open and save files over all protocols supported by KDE’s KIO including HTTP, FTP, SSH, SMB and WebDAV. You can use the app to work with multiple files at the same time. But unlike the traditional horizontal tab switching bar in most app, Kate has tabs on either side of the screen. The left sidebar will display an index of open files. Programmers who need to see different parts of the same file at the same time will also appreciate its ability to split the interface horizontally as well as vertically.
+
+### Sublime: 5/5 ###
+
+Sublime lets you view up to four files at the same time in various arrangements. There’s also a full-screen distraction free mode that just displays the file and the menu, for when you’re in the zone.
+
+The editor also has a minimap on the right, which is useful for navigating long files. The app ships with several snippets for popular functions in several programming languages, which makes it very usable for developers. Another neat editing feature, whether you are working with text documents or code, is the ability to swap and shuffle selections.
+
+### UltraEdit: 3/5 ###
+
+UltraEdit’s interface is loaded with several toolbars at the top and bottom of the interface. Along with the tabs to switch between documents, panes on either side and the gutter area, these leave little room for the editor window.
+
+Web developers working with HTML files have lots of assistance at their fingertips. You can also access remote files via FTP and SFTP. Advanced features such as recording a macro and comparing files are also easily accessible.
+
+Using the app’s Preferences window you can tweak various aspects of the app, including the colour scheme and other features like syntax highlighting.
+
+### jEdit: 3/5 ###
+
+In terms of usability, one of the first red-flags was jEdit’s inability to install on RPM-based distros. Navigating the editor takes some getting used to, since its menus aren’t in the same order as in other popular apps and some have names that won’t be familiar to the average desktop user. However, the app include detailed inbuilt help, which will help ease the learning curve.
+
+jEdit highlights the current line you are on and enables you to split windows in multiple viewing modes. You can easily install and manage plugins from within the app, and in addition to full macros, jEdit also lets you record quick temporary ones.
+
+
+
+Thanks to its Java underpinnings, jEdit doesn’t really feel at home on any desktop environment
+
+### Availability and support ###
+
+There are several similarities between Gedit and Kate. Both apps take advantage of their respective parent project, Gnome and KDE, and are bundled with several mainstream distros. Yet both projects are cross-platform and have Windows and Mac OS X ports as well as native Linux versions.
+
+Gedit is hosted on Gnome’s web infrastructure and has a brief user guide, information about the various plugins, and the usual channels of getting in touch including a mailing list and IRC channel. You’ll also find usage information on the websites of other Gnome-based distros such as Ubuntu. Similarly, Kate gets the benefit of KDE’s resources and hosts detailed user information as well as a mailing list and IRC channel. You can access their respective user guides offline from within the app as well.
+
+UltraEdit is also available for Windows and Mac OS X besides Linux, and has detailed user guides on getting started, though there’s none included within the app. To assist users, UltraEdit hosts a database of frequently asked questions, a bunch of power tips that have detailed information about several specific features, and users can engage with one another other on forum boards. Additionally, paid users can also seek support from the developers via email.
+
+Sublime supports the same number of platforms, however you don’t need to buy a separate licence for each platform. The developer keeps users abreast with ongoing development via a blog and also participates actively in the hosted forums. The highlight of the project’s support infrastructure is the freely available detailed tutorial and video course. Sublime is lovely.
+
+Because it’s written in Java, jEdit is available on several platforms. On its website you’ll find a detailed user guide and links to documentation of some plugins. However, there are no avenues for users to engage with other users or the developer.
+
+**Verdict:**
+
+- Gedit: 4/5
+- Kate: 4/5
+- Sublime: 5/5
+- UltraEdit: 3/5
+- jEdit: 2/5
+
+### Add-on and plugins ###
+
+Different users have different requirements, and a single lightweight app can only do as much. This is where plugins come into the picture. The apps rely on these small pluggable widgets to extend their feature set and be of use to even more number of users.
+
+The one exception is UltraEdit. The app has no third-party plugins, but its developers do point out that third-party tools such as HtmlTidy are already installed with UltraEdit.
+
+Gedit ships with a number of plugins installed, and you can download more with the gedit-plugins package. The project’s website also points to several third-party plugins based on their compatibility with the Gedit versions.
+
+Three useful plugins for programmers are Code Comment, Terminal Plugin, which adds a terminal in the bottom panel, and the Session Saver. The Session Saver is really useful when you’re working on a project with multiple files. You can open all the files in tabs, save your session and when you restore it with a single click it’ll open all the files in the same tab order as you saved them.
+
+Similarly, you can extend Kate by adding plugins using its built-in plugin manager. In addition to the impressive projects plugins, some others that will be of use to developers include an embedded terminal, ability to compile and debug code and execute SQL queries on databases.
+
+Plugins for Sublime are written in Python, and the text editor includes a tool called Package Control, which is a little bit like apt-get in that it enables the user to find, install, upgrade and remove plugin packages. With plugins, you can bring the Git version control to Sublime, as well as the JSLint tool to improve JavaScript. The Sublime Linter plugin is a must have for coders and will point out any errors in your code.
+
+jEdit boasts the most impressive plugin infrastructure. The app has over 200 plugins, which can be browsed in the dedicated site of their own. The website lists plugins under various categories such as File Management, Version Control, Text, etc. You’ll find lots of plugins housed under each category.
+
+Some of the best plugins are the Android plugin, which provides utilities to work on Android projects; the TomcatSwitch plugin, using which you can create and control an external Jakarta Tomcat server process; and the Vimulator plugin, for Vi-like capabilities. You can install these plugins using jEdit’s using its plugin manager.
+
+**Verdict**
+
+- Gedit: 3/5
+- Kate: 4/5
+- Sublime: 4/5
+- UltraEdit: 1/5
+- jEdit: 5/5
+
+### Plain ol’ text editing ###
+
+Despite all their powerful extra-curricular activities that might even displace full-blown apps across several genres, there will be times when you just need to use these text editing behemoths to read, write, or edit plain and simple text. While you can use all of them to enter text, we are evaluating them for access to common text-editing conveniences.
+
+Gedit which is Gnome’s default text editor, supports an undo and redo mechanism as well as search and replace. It can spellcheck documents in multiple languages and can also access and edit remote files using Gnome GVFS libraries.
+
+You can spellcheck documents with Kate as well, which also lets you perform a Google search on any highlighted text. It’s also got a line modification system which visually alerts users of lines which have modified and unsaved changes in a file. In addition, it enables users to set bookmarks within a file to ease navigation of lengthy documents.
+
+Sublime has a wide selection of editing commands, such as indenting text and formatting paragraphs. Its auto-save feature helps prevent users from losing their work. Advanced users will appreciate the regex-based recursive find and replace feature, as well as the ability to select multiple non-contiguous spans of text and act on them collectively.
+
+UltraEdit also enables the use of regular expressions for its search and replace feature and can edit remote files via FTP. One unique feature of jEdit is its support for an unlimited number of clipboard which it calls registers. You can copy snippets of text to these registers which are available across editing sessions.
+
+**Verdict:**
+
+- Gedit: 4/5
+- Kate: 5/5
+- Sublime: 5/5
+- UltraEdit: 4/5
+- jEdit: 4/5
+
+### Our verdict ###
+
+All the editors in this feature are good enough to replace your existing text editor for editing text files and tweaking configuration files. In fact, chances are they’ll even double up as your IDE. These apps are chock full of bells and whistles, and their developers aren’t thinking of stripping features, but adding more and more and more.
+
+At the tail end of this test we have jEdit. Not only does it insist on using the proprietary Oracle Java Runtime Environment, it failed to install on our Fedora machine, and the developer doesn’t actively engage with its users.
+
+UltraEdit does little better. This commercial proprietary tool focuses on web developers, and doesn’t offer anything to non-developer power users that makes it worth recommending over free software alternatives.
+
+On the third podium position we have Gedit. There’s nothing inherently wrong with Gnome’s default editor, but despite all its positive aspects, it’s simply outclassed by Sublime and Kate. Out of the box, Kate is a more versatile editor than Gedit, and outscores Gnome’s default editor even after taking their respective plugin systems into consideration.
+
+Both Sublime and Kate are equally good. They performed equally well in most of our tests. Whatever ground it lost to Sublime for not supporting macros, it gained for its keyboard friendliness and its ease of use in defining custom keybindings.
+
+Kate’s success can be drawn from the fact that it offers the maximum number of features with minimal learning curve. Just fire it up and use it as a simple text editor, or easily edit configuration file with syntax highlighting, or even use it to collaborate and work on a complex programming project thanks to its project management capabilities.
+
+We aren’t pitching Kate to replace a full-blown integrated development environment such as [insert your favourite specialised tool here]. But it’s an ideal all-rounder and a perfect stepping stone to a specialised tool.
+
+Kate is designed for moments when you need something that’s quick to respond, doesn’t overwhelm you with its interface and is just as useful as something that might otherwise be overkill.
+
+### 1st Kate ###
+
+- Licence LGPL/GPL Version 3.11
+- www.kate-editor.org
+- The ultimate mild-mannered text editor with super powers.
+- Kate is one of the best apps to come out of the KDE project.
+
+### 2nd Sublime Text ###
+
+- Licence Proprietary Version 2.0.2
+- www.sublimetext.com
+- A professionally done text editor that’s worth every penny – easy to use, full of features and it looks great.
+
+### 3rd Gedit ###
+
+- Licence GPL Version 3.10
+- http://projects.gnome.org/gedit
+- Gets it done from Gnome. It’s a wonderful text editor and does an admirable job, but the competition here is too great.
+
+### 4th UltraEdit ###
+
+- Licence Proprietary Version 4.1.0.4
+- www.ultraedit.com
+- Focuses on bundling conveniences for web developers without offering anything special for general users.
+
+### 5th jEdit ###
+
+- Licence GPL Version 5.1.0
+- www.jedit.org
+- A lack of support, lack of working on Fedora and a lack of looking nice relegate jEdit to the bottom slot.
+
+### You may also wish to try… ###
+
+The default text editor that ships with your distro will also be able to assist you with some advanced tasks. There’s KDE’s KWrite and Raspbian’s Nano, for instance. KWrite inherits some of Kate’s features thanks to KDE’s katepart component, and Nano has sprung back into limelight thanks to its availability for Raspberry Pi.
+
+If you wish to follow the steps of Linux gurus, you could always try the revered text editors Emacs and Vim. First time users who want to get a taste for the power of Vim might want to consider gVim, which exposes Vim’s power via a graphical interface.
+
+Besides jEdit and Kate, there are other editors that mimic the usability of veteran advanced editors like Emacs and Vim, such as the JED editor and Joe’s Own Editor, both of which have an emulation mode for Emacs. On the other hand, if you are looking for lightweight code editors check out Bluefish and Geany. They exist to fill the niche between text editors and full-fledged integrated development platforms.
+
+--------------------------------------------------------------------------------
+
+via: http://www.linuxvoice.com/text-editors/
+
+作者:[Ben Everard][a]
+译者:[译者ID](https://github.com/译者ID)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://www.linuxvoice.com/author/ben_everard/
\ No newline at end of file
diff --git a/sources/talk/20140804 Microsoft's Raspberry Pi Will Cost $300.md b/sources/talk/20140804 Microsoft's Raspberry Pi Will Cost $300.md
new file mode 100644
index 0000000000..3192f039a4
--- /dev/null
+++ b/sources/talk/20140804 Microsoft's Raspberry Pi Will Cost $300.md
@@ -0,0 +1,28 @@
+Microsoft’s Raspberry Pi Will Cost $300
+================================================================================
+
+
+I presume that you have heard of [Raspberry Pi][1]. A $35 microcomputer that has revolutionized the low cost computing and has cult following among hardware hobbyist and do-it-yourself enthusiasts. Several other followed in the footsteps of Raspberry Pi to provide low cost micro computers, [Arduino][2] is one of the successful examples.
+
+Microsoft has decided to enter the world of “System on Chip” and to come up with its “own Raspberry Pi”. Teamed up with Intel and [CircuitCo][3], [Microsoft will be launching a micro computer named “Sharks Cove“][4].
+
+Sharks Cove boasts of Intel Atom Z3735G, a quad-core chip with speeds up to 1.83GHz, 1GB of RAM, 16GB of flash storage and a MicroSD slot among many other things. You can read the full specifications [here][5]. The main aim of Shark Cove is to provide a platform to develop hardware and drivers for Windows and Android.
+
+Everything sounds fine till it comes to price. Sharks Cove will cost $299 with a Windows 8.1 license. While Arduino costs around $55 and Raspberry Pi $35, I don’t think there will be many buyers for such a high price in a domain which is dominated by low cost Linux based devices. What do you think?
+
+--------------------------------------------------------------------------------
+
+via: http://itsfoss.com/microsofts-raspberry-pi/
+
+作者:[Abhishek][a]
+译者:[译者ID](https://github.com/译者ID)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://itsfoss.com/author/Abhishek/
+[1]:http://www.raspberrypi.org/
+[2]:http://www.arduino.cc/
+[3]:http://www.circuitco.com/
+[4]:http://blogs.msdn.com/b/windows_hardware_and_driver_developer_blog/archive/2014/07/26/the-sharks-cove-is-now-available-for-pre-order.aspx
+[5]:http://www.sharkscove.org/docs/
\ No newline at end of file
diff --git a/sources/talk/20140804 Nostalgic Gaming On Linux With Good Old Games.md b/sources/talk/20140804 Nostalgic Gaming On Linux With Good Old Games.md
new file mode 100644
index 0000000000..afc461446d
--- /dev/null
+++ b/sources/talk/20140804 Nostalgic Gaming On Linux With Good Old Games.md
@@ -0,0 +1,94 @@
+Nostalgic Gaming On Linux With Good Old Games
+================================================================================
+
+
+**Thanks to the recent Linux support provided by DRM-free classic games provider, GOG.com, getting that nostalgic kick on Linux has never been easier. In this article I'll also detail a few of my favourite classic games that are now available to play in Linux.**
+
+It's not all nostalgia, though. Some of the classic games you might think of are genuinely classic, amazing games no matter their age. Others, you might need to imagine you're back in, say, 1995 and look at the game from that point of view to appreciate how good it must have seemed at that time. Whatever the case though, there's no shortage of these old games out there to enjoy and thankfully it's recently gotten even easier with [GOG.com][1] recently announcing Linux support.
+
+A lot of these old classic games actually run in [DOSBox][2], so a seasoned Linux gamer who has experience with such games may bring up the point that you could play a lot of these games provided by services such as GOG.com for years already, well before that recent announcement. Which is correct, I've done the same thing myself, but it does involve a bit of fiddling with files, so at the very least we now have a "turn-key" solution even with the DOSBox powered games - you download them, you launch them, they should just work. If you just want to purchase a game and play it right away, that's no bad thing.
+
+Then there's the non-DOS games. A lot of old Windows 95/98 games do often work fine in WINE, but not always, or perhaps need workarounds to be manually applied or even a special version of WINE itself. Some old games just won't work at all no matter what you try, even on modern versions of Windows itself! So again, having an alternative available that is designed to work out-of-the-box (and DRM-free, no less) is a nice thing.
+
+GOG.com initially provided 50 Linux compatible games on their penguin-friendly launch, but that number is and will keep growing. In coming months they say they hope to reach 100 games, and who knows how many thereafter, but it should grow to be a fairly considerable library.
+
+Here are a few of my favourites so far, that are available right now:
+
+### Rise Of The Triads Dark War (1994) ###
+
+
+
+If you crave some 90's style shoot-em-up action where you get to blow the hell out of, well, everything and everyone, Rise Of The Triads (ROTT) is one of the best choices and a favourite to many.
+
+If you know these kinds of shooters, you probably know what to expect. There is a storyline, but really it's about blowing everything up and/or riddling enemies full of bullet holes. As a member of an elite group of operatives you are sent to a remote island to stop a mad cult leader, where typically everything goes pear-shaped and you have to kill everything and successfully navigate levels to save the day and get out alive in the process.
+
+True to the arcade-style shooter of this vintage, weapons are all about being big, high-tech and fun. You might be in an elite operations group, but you ain't stuck with peashooters and standard rifles - no there's duel pistols all the way to heat seeking missiles and the Flamewall cannon and many more. It's all about genuine fun and doesn't take itself too seriously.
+
+*Verdict: A blast (literally)*
+
+### Realms Of The Haunting (1996) ###
+
+
+
+This one is actually fairly new to me and isn't a game I remember from years back. Which is my loss really, as I can imagine this game must have seemed pretty incredible all the way back in 1996.
+
+Realms Of The Haunting is something of a first-person shooter/point-and-click adventure combination. The controls at first seem a bit strange because of this (keyboard to control movement and attack etc. Mouse to move the context indicator/cursor around the screen and interact with objects) but you soon get used to it. The storyline, although I have not experienced all of it yet myself, is apparently very good and certainly my impressions of it have been good. This is also one of those classic games that uses good old FMV (Full Motion Video) for cutscenes.
+
+
+
+Basically you play as a young man who receives a suitably vague letter from your recently deceased father about a strange deserted mansion and it's curious happenings inside. Naturally, said young man decides to visit the mansion and discovers his father's spirit being held captive by the forces of evil and then sets out to try free him. That sounds like a pretty standard storyline at first but the difference lays in the execution and how it progresses.
+
+From the moment the main character picks up a lantern and gazes around the dark, creepy surroundings of the mansion, it actually reminds me a bit of Amnesia: The Dark Descent. Sure, the gameplay and amount of actual combat means the comparison somewhat ends after that, but ROTH does also have it's fair share of exploration and puzzles. Despite a very dated looking graphics engine (it is based on the DOOM engine after all!) it strikes me how much attention to detail the game creators managed to pack into the environment, which further adds to the atmosphere and immersion despite the constant pixel party happening on screen.
+
+All in all, Realms Of The Haunting is a creepy but very intriguing old game that is very much worth checking out. And if you love games that feature old-school FMV, there is heaps on offer here too.
+
+*Verdict: Ahead of it's time?*
+
+### Sid Meier's Colonization (1994) ###
+
+
+
+Think Civilization, but with a colonial twist. Instead of building a nation from a mound of dirt in the middle of nowhere, Colonization tasks you with controlling either the forces of England, France, Spain or The Netherlands as you set about managing expansion across the Atlantic for your nation of choice. The aim of the game, as far as winning goes, is to achieve independence from your mother country and defeat the angry Royal Expeditionary Force that comes your way.
+
+If big chunky pixels, even in text, is something that hurts your eyes you may want to avoid this one but the simple old graphics belie the actual gameplay and depth available here. If you have experience with the more modern Sid Meier turn-based strategy games like the Civilization series, you may be surprised just how much familiar elements and gameplay there is in this old game.
+
+It may appear ancient and a little clunky, but like most of the classic Sid Meier games, you can sink hours upon hours into this game. Which considering it's price nowadays, no more than a piece of cake and a coffee, is fantastic value that is hard to beat. Do try it.
+
+*Verdict: Superb turn-based strategy, all the way from 1994*
+
+### Sword Of The Samurai (1989) ###
+
+
+
+This one is a little more obscure and may surprise. For me, and this will sound a little cliché given the Japanese theme and setting, but there is something rather Zen about Sword Of The Samurai. A product in the year 1989, the graphics are obviously simple and have a very limited colour palette. Yet, I think even today the graphics work for this particular game and add to its charm and, again, the Zen.
+
+Describing SOTS is difficult though. It's sort of... a strategy, war, dating, stealth, melee, dueling, diplomacy, choose-your-own adventure Samurai sim.
+
+Seriously.
+
+Somehow this old game, which weighs in less than 20 megabytes, fits in an incredible amount of different gameplay (and surprisingly smart artificial intelligence) and approaches you can take to achieve your goal. The core goal is get a very important thing called Honor. In the world of feudal Japan, Honor is a big, big thing and you must get more Honor any way you can in order to achieve the goal of unifying Japan under your rule, as Shogun.
+
+While you can of course be the "good guy" and do everything you think is right to get Honor, the game is inherently deep and clever enough to allow you to achieve Honor even with, shall we say, more underhanded tactics.
+
+It's difficult to truly describe all the ways you can play this game but my advice is to simply do so - play it, let it wash over you and soak in the Japanese culture and atmosphere that the game exudes in a really classy way, without being over-the-top. And yes, the game can also be educational! You can't beat that.
+
+*Verdict: An under-appreciated masterpiece*
+
+### Get your game on ###
+
+So there we have it, there's some of my favourites that I've been (re)playing recently, on my Fedora 20 system no less. Some of these games may be older than Linux (the kernel) itself, but thanks to the likes of GOG.com and especially emulators like DOSBox, you can still enjoy the classic titles you remember from years gone by.
+
+What are some of your favourite classic games? Are you also playing them now in your favourite Linux distro? Let us know in the comments!
+
+--------------------------------------------------------------------------------
+
+via: http://thelinuxrain.com/articles/nostalgic-gaming-on-linux-with-good-old-games
+
+作者:Andrew Powell
+译者:[译者ID](https://github.com/译者ID)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://gog.com/
+[2]:http://www.dosbox.com/
\ No newline at end of file
diff --git a/sources/talk/The history of Android/03 - The history of Android.md b/sources/talk/The history of Android/03 - The history of Android.md
deleted file mode 100644
index 298fdef0eb..0000000000
--- a/sources/talk/The history of Android/03 - The history of Android.md
+++ /dev/null
@@ -1,66 +0,0 @@
-alim0x translating
-
-The history of Android
-================================================================================
-
-From left to right: Android 0.9’s home screen, add drawer, and shortcut deletion interfaces.
-Photo by Ron Amadeo
-
-### Android 0.9, Beta—hey, this looks familiar! ###
-
-Six months after Milestone 5, in August 2008, [Android 0.9 was released][1]. While the Android 0.5 milestone builds were "early looks," by now 1.0 was only two months away. Thus, Android 0.9 was labeled "beta." On the other side of the aisle, Apple already released its second version of the iPhone—the iPhone 3G—a month prior. The second-gen iPhone brought a second-gen iPhone OS. Apple also launched the App Store and was already taking app submissions. Google had a lot of catching up to do.
-
-Google threw out a lot of the UI introduced in Milestone 5. All the artwork was redone again in full-color, and the white square icon backgrounds were tossed. While still an emulator build, 0.9 offered something that looked familiar when compared to a released version of Android. Android 0.9 had a working desktop-style home screen, a proper app drawer, multiple home screens, a lot more apps, and fully functional (first-party only) widgets.
-
-Milestone 5 seemingly had no plan for someone installing more than 21 apps, but Android 0.9 had a vertically scrolling app drawer accessible via a gray tab at the bottom of the screen. Back then, the app drawer was actually a drawer. Besides acting as a button, the gray tab could be pulled up the screen and would follow your finger, just like how the notification panel can be pulled down. There were additional apps like Alarm Clock, Calculator, Music, Pictures, Messaging, and Camera.
-
-This was the first build with a fully customizable home screen. Long pressing on an app or widget allowed you to drag it around. You could drag an app out of the app drawer and make a home screen shortcut or long press on an existing home screen shortcut to move it.
-
-0.9 is a reminder that Google was not the design powerhouse it is today. In fact, some of the design work for Android was farmed out to other companies at the time. You can see one sign of this in the clock widget, which contains the text “MALMO," the home town of design firm [The Astonishing Tribe][2].
-
-
-The “Add to Home" dialog in Android 0.9.
-Photo by Ron Amadeo
-
-There were only three widgets: Clock, Picture frame, and Search. The Search widget didn't even have a proper icon in the list—it used the Picture icon. Perhaps the most interesting item here was a "Purchased pictures" option in the wallpaper choices—a leftover from the days when purchasing ringtones on a dumbphone was a common occurrence. Google was either planning on selling wallpapers, or it was already adding a carrier at some point. The company never went through with the plan.
-
-
-A collection of widgets, an open folder, renaming a folder, and the copy/paste menu.
-Photo by Ron Amadeo
-
-The left screen, above, shows the widgets for Google Search and pictures. Search didn't do anything other than give you a box to type in—there was no auto complete or additional UI. Typing in the box and hitting "Go" would launch the browser. The bottom row of icons revealed a few options for "shortcuts" from the long press menu, which created icons that opened an app to a certain screen. Individual contacts, browser bookmarks, and music playlists were all shortcuts that could all be added to the home screen in 0.9.
-
-"Folders" was an option under the shortcuts heading despite not being a shortcut to anything. Once a blank folder was created, icons could be dragged into it and rearranged. Unlike today, there was no indication of what was in a folder; it was always a plain, white, empty-looking icon.
-
-0.9 was also the first Android version to have OS-level copy/paste support. Long pressing on any text box would bring up a dialog allowing you to save or recall text from the clipboard. iOS didn't support copy/paste until almost two years later, so for a while, this was one of Android's big differentiators—and the source of many Internet arguments.
-
-
-From left to right: Android 0.9’s new menu, recent apps, power options, and lock screen.
-Photo by Ron Amadeo
-
-Android 0.9 was really starting to show its maturity. The home screen had a full set of menu items, including a settings option (although it didn't work yet) and a search button (because Google likes it when you search). The menu design was already in the final form that would last until Android 2.3 swapped it to black.
-
-Long pressing on the hardware home button brought up a 3x2 grid of recent apps, a design that would stick around until the release of Android 3.0. Recent Apps blurred the exposed background, but that was strangely applied here and not on other popups like the "Add to home" dialog or the home screen folder view. The power menu was at least included in the blurry background club, and it was redesigned with icons and more commonly accepted names for functions. The power menu icons lacked padding, though, appearing cramped and awkward.
-
-Android 0.9 featured a lock screen, albeit a very basic one. The black and gray lock screen had no on-screen method of unlocking—you needed to hit the hardware menu button.
-
-----------
-
-
-
-[Ron Amadeo][a] / Ron is the Reviews Editor at Ars Technica, where he specializes in Android OS and Google products. He is always on the hunt for a new gadget and loves to rip things apart to see how they work.
-
-[@RonAmadeo][t]
-
---------------------------------------------------------------------------------
-
-via: http://arstechnica.com/gadgets/2014/06/building-android-a-40000-word-history-of-googles-mobile-os/3/
-
-译者:[译者ID](https://github.com/译者ID) 校对:[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:http://arstechnica.com/information-technology/2008/08/robotripping-hands-on-with-the-android-sdk-beta/
-[2]:http://www.tat.se/
-[a]:http://arstechnica.com/author/ronamadeo
-[t]:https://twitter.com/RonAmadeo
diff --git a/sources/talk/The history of Android/04 - The history of Android.md b/sources/talk/The history of Android/04 - The history of Android.md
index d6b2090654..0c2be3a0e0 100644
--- a/sources/talk/The history of Android/04 - The history of Android.md
+++ b/sources/talk/The history of Android/04 - The history of Android.md
@@ -1,3 +1,5 @@
+alim0x translating
+
The history of Android
================================================================================

@@ -72,4 +74,4 @@ via: http://arstechnica.com/gadgets/2014/06/building-android-a-40000-word-histor
[1]:http://www.tat.se/
[a]:http://arstechnica.com/author/ronamadeo
-[t]:https://twitter.com/RonAmadeo
\ No newline at end of file
+[t]:https://twitter.com/RonAmadeo
diff --git a/sources/tech/20140714 Test read or write speed of usb and ssd drives with dd command on Linux.md b/sources/tech/20140714 Test read or write speed of usb and ssd drives with dd command on Linux.md
index 43ca1aa34e..6eb0617afa 100644
--- a/sources/tech/20140714 Test read or write speed of usb and ssd drives with dd command on Linux.md
+++ b/sources/tech/20140714 Test read or write speed of usb and ssd drives with dd command on Linux.md
@@ -1,3 +1,4 @@
+(translated by runningwater)
Test read/write speed of usb and ssd drives with dd command on Linux
================================================================================
### Drive speed ###
@@ -129,7 +130,7 @@ Php developer, blogger and Linux enthusiast. He can be reached at [m00n.silv3r@g
via: http://www.binarytides.com/linux-test-drive-speed/
-译者:[译者ID](https://github.com/译者ID) 校对:[校对者ID](https://github.com/校对者ID)
+译者:[runningwater](https://github.com/runningwater) 校对:[校对者ID](https://github.com/校对者ID)
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
diff --git a/sources/tech/20140723 Fix Missing Speaker Icon From Moka Icon Theme.md b/sources/tech/20140723 Fix Missing Speaker Icon From Moka Icon Theme.md
deleted file mode 100644
index 28afbba227..0000000000
--- a/sources/tech/20140723 Fix Missing Speaker Icon From Moka Icon Theme.md
+++ /dev/null
@@ -1,36 +0,0 @@
-Fix Missing Speaker Icon From Moka Icon Theme [Quick Tip]
-================================================================================
-[Moka][1] is a beautiful icon theme. It has been constantly featured among the [best icon themes available for Ubuntu][2]. But there is little issue with Moka in Ubuntu 14.04. If you use Moka icons in Ubuntu 14.04 with Unity, you’ll find that speaker icon used for sound is missing:
-
-
-
-### Fix missing sound icon while using Moka icon theme ###
-
-Though you might have already added official Moka PPA but for the sake of checking, add it again:
-
- sudo add-apt-repository ppa:moka/stable
- sudo apt-get update
-
-Now, next step is to install monochrome panel icons. Use the following command to install it:
-
- sudo apt-get install faba-mono-icons
-
-Once you have installed the Faba monochrome icons, change your icon theme from Moka to Faba. This will give you Moka icon theme along with beautiful monochrome icons in the top panel in Unity:
-
-
-
-I hope this helped you to fix the missing sound icon. Enjoy every bit and every sip of the Moka.
-
---------------------------------------------------------------------------------
-
-via: http://itsfoss.com/fix-missing-speaker-icon-from-moka/
-
-原文作者:[Abhishek][a]
-
-译者:[译者ID](https://github.com/译者ID) 校对:[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
-
-[a]:http://itsfoss.com/author/Abhishek/
-[1]:http://mokaproject.com/
-[2]:http://itsfoss.com/best-icon-themes-ubuntu-1404/
\ No newline at end of file
diff --git a/sources/tech/20140723 How to access SoundCloud from the command line in Linux.md b/sources/tech/20140723 How to access SoundCloud from the command line in Linux.md
deleted file mode 100644
index d664593e6e..0000000000
--- a/sources/tech/20140723 How to access SoundCloud from the command line in Linux.md
+++ /dev/null
@@ -1,89 +0,0 @@
-How to access SoundCloud from the command line in Linux
-================================================================================
-If you enjoy music streaming and originally-created sounds, you cannot have missed [SoundCloud][1]. Based in Germany, this cloud streaming service is now famous and well-established for any music adventurer. And naturally, as a Linux enthusiast, you might wonder how to join your passion for Linux with your love for music. As a solution, I advise you to check out Soundcloud2000, **a command line client for SoundCloud** born out of the [Music Hack Day Stockholm '13][2].
-
-### Installation ###
-
-For Debian or Ubuntu users, install via:
-
- $ sudo apt-get install portaudio19-dev libmpg123-dev libncurses-dev ruby1.9.1-dev
- $ sudo gem install soundcloud2000
-
-For Archlinux users, the package is available in [AUR][3].
-
-For Fedora users, install via:
-
- $ sudo yum install portaudio-devel libmpg123-devel ncurses-devel ruby-devel
- $ sudo gem install soundcloud2000
-
-For CentOS users, install or upgrade to the [latest Ruby/RubyGems][4] (1.9 and higher), enable [Repoforge repo][5], and install via:
-
- $ sudo yum install portaudio-devel mpg123-devel
- $ sudo gem install curses soundcloud2000
-
-And finally, go to the official github page for the sources.
-
-### Usage ###
-
-Soundcloud2000 is very easy to pick up. Some might even say simplistic. I like it for that sobriety and the effort of the three authors and contributors. Launch it via:
-
- $ soundcloud2000
-
-From there, you will be welcomed with a splash screen:
-
-
-
-and then a list of songs:
-
-
-
-You can scroll through the list via the up and down keys, play a song with enter, pause/resume with the space bar, and fast forward/rewind with the right and left arrow keys. As you can see, nothing groundbreaking but definitely ergonomic.
-
-If the random list is too long to scroll through, you have an option to see all the tracks for a particular user by hitting the 'u' key and then typing his name.
-
-
-
-That is probably one of the major defaults of Soundcloud2000. While the navigation is not optimized, I have high hopes for improvements and support as the software is still very young.
-
-### Bonus ###
-
-Another alternative as a bonus: if you like the idea of using SoundCloud from a terminal, but do not want to install any additional software (or maybe you cannot), I advise you to go to [cmd.fm][6]. The website is a kind of camouflage for SoundCloud, as it hides it behind a shell interface.
-
-[][7]
-
-Type "help" for a list of commands, which is a lot longer than for Soundcloud2000. As examples, I noticed:
-
-- _genres to list all genres
-- _play random to play a random track
-- _pause to pause the current track
-- _playlist new to make a new playlist
-- _loop to loop current track
-- _cinema to watch and ASCII version of Star Wars which completely blew my mind.
-
-And it even supports auto-completion via the tabulation key for genres.
-
-To conclude, Soundcloud2000 is a neat program that does exactly what it is supposed to. We can forgive its current flaws as they are surely tied to its youth. I really hope that it will grow and include more features (and potentially get inspiration from cmd.fm).
-
-If you like the idea, I invite you to support the programmers, and if you like these kinds of initiatives, support [Music Hack Day][8] which mixes software development and music.
-
-What do you think of using SoundCloud from the command line? Please let us know in the comments.
-
---------------------------------------------------------------------------------
-
-via: http://xmodulo.com/2014/07/access-soundcloud-command-line-linux.html
-
-原文作者:[Adrien Brochard][a]
-
-译者:[译者ID](https://github.com/译者ID) 校对:[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
-
-[a]:http://xmodulo.com/author/adrien
-[1]:https://soundcloud.com/
-[2]:https://www.hackerleague.org/hackathons/music-hack-day-stockholm-13/
-[3]:https://aur.archlinux.org/packages/ruby-soundcloud2000/
-[4]:http://ask.xmodulo.com/upgrade-ruby-centos.html
-[5]:http://xmodulo.com/2013/01/how-to-set-up-rpmforge-repoforge-repository-on-centos.html
-[6]:https://cmd.fm/
-[7]:https://www.flickr.com/photos/xmodulo/14494448218/
-[8]:http://new.musichackday.org/
\ No newline at end of file
diff --git a/sources/tech/20140723 Top 10 Fun On The Command Line.md b/sources/tech/20140723 Top 10 Fun On The Command Line.md
index c31d807dd5..b2468f1e56 100644
--- a/sources/tech/20140723 Top 10 Fun On The Command Line.md
+++ b/sources/tech/20140723 Top 10 Fun On The Command Line.md
@@ -1,3 +1,4 @@
+disylee来占坑~~
Top 10! Fun On The Command Line
================================================================================
**If you just love making 'top 10'-type lists but are a little embarrassed to say so, tell people you're passionate about data exploration. To impress them even more, explain that you do your data exploration on the command line. But don't ruin the impression by telling them how easy that is!**
@@ -113,4 +114,4 @@ via: http://thelinuxrain.com/articles/top-10-fun-on-the-command-line
[3]:http://www.rinkworks.com/words/letterfreq.shtml
[4]:http://www.thelinuxrain.com/articles/building-a-gazetteer-table-from-kml-files
[5]:https://zenodo.org/record/10481
-[6]:http://parlinfo.aph.gov.au/parlInfo/search/display/display.w3p;db=CHAMBER;id=chamber%2Fhansards%2F232fa1a8-d7e8-4b22-9018-1a99b5a96812%2F0025;query=Id%3A%22chamber%2Fhansards%2F232fa1a8-d7e8-4b22-9018-1a99b5a96812%2F0000%22
\ No newline at end of file
+[6]:http://parlinfo.aph.gov.au/parlInfo/search/display/display.w3p;db=CHAMBER;id=chamber%2Fhansards%2F232fa1a8-d7e8-4b22-9018-1a99b5a96812%2F0025;query=Id%3A%22chamber%2Fhansards%2F232fa1a8-d7e8-4b22-9018-1a99b5a96812%2F0000%22
diff --git a/sources/tech/20140729 10 Useful 'Squid Proxy Server' Interview Questions and Answers in Linux.md b/sources/tech/20140729 10 Useful 'Squid Proxy Server' Interview Questions and Answers in Linux.md
new file mode 100644
index 0000000000..7ded06d38d
--- /dev/null
+++ b/sources/tech/20140729 10 Useful 'Squid Proxy Server' Interview Questions and Answers in Linux.md
@@ -0,0 +1,131 @@
+10 Useful “Squid Proxy Server” Interview Questions and Answers in Linux
+================================================================================
+It’s not only to System Administrator and Network Administrator, who listens the phrase Proxy Server every now and then but we too. Proxy Server is now a corporate culture and is the need of the hour. Proxy server now a days is implemented from small schools, cafeteria to large MNCs. Squid (also known as proxy) is such an application which acts as proxy server and one of the most widely used tool of its kind.
+
+This Interview article aims at strengthening your base from Interview point on the ground of proxy server and squid.
+
+
+Squid Interview Questions
+
+### 1. What do you mean by Proxy Server? What is the use of Proxy Server in Computer Networks? ###
+
+> **Answer** : A Proxy Server refers to physical machine or Application which acts intermediate between client and resource provider or server. A client seeks for file, page or data from the the proxy server and proxy server manages to get the requested demand of client fulfilled by handling all the complexities in between.
+
+Proxy servers are the backbone of WWW (World Wide Web). Most of the proxies of today are web proxies. A proxy server handles the complexity in between the Communication of client and Server. Moreover it provides anonymity on the web which simply means your identity and digital footprints are safe. Proxies can be configured to allow which sites client can see and which sites are blocked.
+
+### 2. What is Squid? ###
+
+> **Answer** : Squid is an Application software released under GNU/GPL which acts as a proxy server as well as web cache Daemon. Squid primarily supports Protocol like HTTP and FTP however other protocols like HTTPS, SSL,TLS, etc are well supported. The feature web cache Daemon makes web surfing faster by caching web and DNS for frequently visited websites. Squid is known to support all major platforms including Linux, UNIX, Microsoft Windows and Mac.
+
+### 3. What is the default port of squid and how to change its operating port? ###
+
+> **Answer** : The default port on which squid runs is 3128. We can change the operating port of squid from default to any custom unused port by editing its configuration file which is located at /etc/squid/squid.conf as suggested below.
+
+Open ‘/etc/squid/squid.conf’ file and with your choice of editor.
+
+ # nano /etc/squid/squid.conf
+
+Now change this port to any other unused port. Save the editor and exit.
+
+ http_port 3128
+
+Restart the squid service as shown below.
+
+ # service squid restart
+
+### 4. You works for a company the management of which ask you to block certain domains through squid proxy server. What are you going to do? ###
+
+> **Answer** : Blocking domain is a module which is implemented well in the configuration file. We just need to perform a little manual configuration as suggested below.
+
+a. Create a file say ‘blacklist’ under directory ‘/etc/squid’.
+
+ # touch /etc/squid/blacklist
+
+b. Open the file ‘/etc/squid/blacklist’ with nano editor.
+
+ # nano /etc/squid/blacklist
+
+c. Add all the domains to the file blacklist with one domain per line.
+
+ .facebook.com
+ .twitter.com
+ .gmail.com
+ .yahoo.com
+ ...
+
+d. Save the file and exit. Now open the Squid configuration file from location ‘/etc/squid/squid.conf’.
+
+ # nano /etc/squid/squid.conf
+
+e. Add the lines below to the Squid configuration file.
+
+ acl BLACKLIST dstdom_regex -i “/etc/squid/blacklist”
+ http_access deny blacklist
+
+f. Save the configuration file and exit. Restart Squid service to make the changes effective.
+
+ # service squid restart
+
+### 5. What is Media Range Limitation and partial download in Squid? ###
+
+> **Answer** : Media Range Limitation is a special feature of squid in which just the required data is requested from the server and not the whole file. This feature is very well implemented in various videos streaming websites like Youtube and Metacafe where a user can click on the middle of progress bar hence whole video need not be fetched except for the requested part.
+
+The squid’s feature of partial download is implemented well within windows update where downloads are requested in the form of small packets which can be paused. Because of this feature a update downloading windows machine can be restarted without any fear of data loss. Squid makes the Media Range Limitation and Partial Download possible only after storing a copy of whole data in it. Moreover the partial download gets deleted and not cached when user points to another page until Squid is specially configured somehow.
+
+### 6. What is reverse proxy in squid? ###
+
+> **Answer** : Reverse proxy is a feature of Squid which is used to accelerate the web surfing for end user. Say the Real server ‘RS’ contains the resource and ‘PS’ is the proxy Server. The client seek some data which is available at RS. It will rely on RS for the specified data for the first time and the copy of that specified data gets stored on PS for configurable amount of time. For every request for that data from now PS becomes the real source. This results in Less traffic, Lesser CPU usages, Lesser web resource utilization and hence lesser load to actual server RS. But RS has no statistics for the total traffic since PS acted as actual server and no Client reached RS. ‘X-Forwarded-For HTTP’ can be used to log the client IP although on RS.
+
+Technically it is feasible to use single squid server to act both as normal proxy server and reverse proxy server at the same point of time.
+
+### 7. Since Squid can be used as web-cache Daemon, is it possible to Clear its Cache? How? ###
+
+> **Answer** : No Doubt! Squid acts as web-cache Daemon which is used to accelerate web surfing still it is possible to clear its cache and that too very easily.
+
+a. First stop Squid proxy server and delete cache from the location ‘/var/lib/squid/cache’ directory.
+
+ # service squid stop
+ # rm -rf /var/lib/squid/cache/*<
+
+b. Create Swap directories.
+
+ # squid -z
+
+### 8. A client approaches you, who is working. They want the web access time be restricted for their children. How will you achieve this scenario? ###
+
+Say the web access allow time be 4′o clock to 7′o clock in the evening for three hours, sharply form Monday to Friday.
+
+a. To restrict web access between 4 to 7 from Monday to Friday, open the Squid configuration file.
+
+ # nano /etc/squid/squid.conf
+
+b. Add the following lines and save the file and exit.
+
+ acl ALLOW_TIME time M T W H F 16:00-19:00
+ shttp_access allow ALLOW_TIME
+
+c. Restart the Squid Service.
+
+ # service squid restart
+
+### 9. Squid stores data in which file format? ###
+
+> **Answer** : Data stored by Squid is in ufs format. Ufs is the old well-known Squid storage format.
+
+### 10. Where do cache gets stored by squid? ###
+
+> **Answer** : A squid stores cache in special folder at the location ‘/var/spool/squid’.
+
+That’s all for now. I’ll be here again with another interesting article soon. Till then stay tuned and connected to Tecmint. Don’t forget to provide us with your valuable feedback the comment section below.
+
+--------------------------------------------------------------------------------
+
+via: http://www.tecmint.com/squid-interview-questions/
+
+作者:[Avishek Kumar][a]
+译者:[译者ID](https://github.com/译者ID)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://www.tecmint.com/author/avishek/
\ No newline at end of file
diff --git a/sources/tech/20140730 How to use variables in shell Scripting.md b/sources/tech/20140730 How to use variables in shell Scripting.md
new file mode 100644
index 0000000000..130c86c8b3
--- /dev/null
+++ b/sources/tech/20140730 How to use variables in shell Scripting.md
@@ -0,0 +1,199 @@
+How to use variables in shell Scripting
+================================================================================
+In every **programming** language **variables** plays an important role , in Linux shell scripting we are using two types of variables : **System Defined Variables** & **User Defined Variables**.
+
+A variable in a shell script is a means of **referencing** a **numeric** or **character value**. And unlike formal programming languages, a shell script doesn't require you to **declare a type** for your variables
+
+In this article we will discuss variables, its types and how to set & use variables in shell scripting.
+
+### System Defined Variables : ###
+
+These are the variables which are created and maintained by **Operating System(Linux) itself**. Generally these variables are defined in **CAPITAL LETTERS**. We can see these variables by using the command "**$ set**". Some of the system defined variables are given below :
+
+
+
+
+ | System Defined Variables |
+ Meaning |
+
+
+ | BASH=/bin/bash |
+ Shell Name |
+
+
+ | BASH_VERSION=4.1.2(1) |
+ Bash Version |
+
+
+ | COLUMNS=80 |
+ No. of columns for our screen |
+
+
+ | HOME=/home/linuxtechi |
+ Home Directory of the User |
+
+
+ | LINES=25 |
+ No. of columns for our screen |
+
+
+ | LOGNAME=LinuxTechi |
+ LinuxTechi Our logging name |
+
+
+ | OSTYPE=Linux |
+ OS type |
+
+
+ | PATH=/usr/bin:/sbin:/bin:/usr/sbin |
+ Path Settings |
+
+
+ | PS1=[\u@\h \W]\$ |
+ Prompt Settings |
+
+
+ | PWD=/home/linuxtechi |
+ Current Working Directory |
+
+
+ | SHELL=/bin/bash |
+ Shell Name |
+
+
+ | USERNAME=linuxtechi |
+ User name who is currently login to system |
+
+
+
+
+To Print the value of above variables, use **echo command** as shown below :
+
+ # echo $HOME
+ # echo $USERNAME
+
+We can tap into these environment variables from within your scripts by using the environment variable's name preceded by a dollar sign. This is demonstrated in the following script:
+
+ $ cat myscript
+
+ #!/bin/bash
+ # display user information from the system.
+ echo “User info for userid: $USER”
+ echo UID: $UID
+ echo HOME: $HOME
+
+Notice that the **environment variables** in the echo commands are replaced by their current values when the script is run. Also notice that we were able to place the **$USER** system variable within the double quotation marks in the first string, and the shell script was still able to figure out what we meant. There is a **drawback** to using this method, however. Look at what happens in this example:
+
+ $ echo “The cost of the item is $15”
+ The cost of the item is 5
+
+That is obviously not what was intended. Whenever the script sees a dollar sign within quotes, it assumes you're referencing a variable. In this example the script attempted to display the **variable $1** (which was not defined), and then the number 5. To display an actual dollar sign, you **must precede** it with a **backslash character**:
+
+ $ echo “The cost of the item is \$15”
+ The cost of the item is $15
+
+That's better. The backslash allowed the shell script to interpret the **dollar sign** as an actual dollar sign, and not a variable.
+
+### User Defined Variables: ###
+
+These variables are defined by **users**. A shell script allows us to set and use our **own variables** within the script. Setting variables allows you to **temporarily store data** and use it throughout the script, making the shell script more like a real computer program.
+
+**User variables** can be any text string of up to **20 letters, digits**, or **an underscore character**. User variables are case sensitive, so the variable Var1 is different from the variable var1. This little rule often gets novice script programmers in trouble.
+
+Values are assigned to user variables using an **equal sign**. No spaces can appear between the variable, the equal sign, and the value (another trouble spot for novices). Here are a few examples of assigning values to user variables:
+
+ var1=10
+ var2=-57
+ var3=testing
+ var4=“still more testing”
+
+The shell script **automatically determines the data type** used for the variable value. Variables defined within the shell script maintain their values throughout the life of the shell script but are deleted when the shell script completes.
+
+Just like system variables, user variables can be referenced using the dollar sign:
+
+ $ cat test3
+ #!/bin/bash
+ # testing variables
+ days=10
+ guest="Katie"
+ echo "$guest checked in $days days ago"
+ days=5
+ guest="Jessica"
+ echo "$guest checked in $days days ago"
+ $
+
+Running the script produces the following output:
+
+ $ chmod u+x test3
+ $ ./test3
+ Katie checked in 10 days ago
+ Jessica checked in 5 days ago
+ $
+
+Each time the variable is **referenced**, it produces the value currently assigned to it. It's important to remember that when referencing a variable value you use the **dollar sign**, but when referencing the variable to assign a value to it, you do not use the dollar sign. Here's an example of what I mean:
+
+ $ cat test4
+ #!/bin/bash
+ # assigning a variable value to another variable
+ value1=10
+ value2=$value1
+ echo The resulting value is $value2
+ $
+
+When you use the **value** of the **value1** variable in the assignment statement, you must still use the dollar sign. This code produces the following output:
+
+ $ chmod u+x test4
+ $ ./test4
+ The resulting value is 10
+ $
+
+If you forget the dollar sign, and make the value2 assignment line look like:
+
+value2=value1
+you get the following output:
+
+ $ ./test4
+ The resulting value is value1
+ $
+
+Without the dollar sign the **shell interprets** the variable name as a **normal text string**, which is most likely not what you wanted.
+
+### Use of Backtick symbol (`) in shell variables : ###
+
+The **backtick allows** you to assign the output of a shell command to a variable. While this doesn't seem like much, it is a major building block in **script programming**.You must surround the entire command line command with backtick characters:
+
+ **testing=`date`**
+
+The shell runs the command within the **backticks** and assigns the output to the variable testing. Here's an example of creating a variable using the output from a normal shell command:
+
+ $ cat test5
+ #!/bin/bash
+ # using the backtick character
+ testing=`date`
+ echo "The date and time are: " $testing
+ $
+
+The variable testing receives the output from the date command, and it is used in the echo statement to display it. Running the shell script produces the following output:
+
+ $ chmod u+x test5
+ $ ./test5
+ The date and time are: Mon Jan 31 20:23:25 EDT 2011
+
+**Note** : In bash you can also use the alternative $(…) syntax in place of backtick (`),which has the advantage of being re-entrant.
+
+Example :
+
+ $ echo " Today’s date & time is :" $(date)
+ Today’s date & time is : Sun Jul 27 16:26:56 IST 2014
+
+--------------------------------------------------------------------------------
+
+via: http://www.linuxtechi.com/variables-in-shell-scripting/
+
+作者:[Pradeep Kumar][a]
+译者:[译者ID](https://github.com/译者ID)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://www.linuxtechi.com/author/pradeep/
\ No newline at end of file
diff --git a/sources/tech/20140801 What are better alternatives to basic command line utilities.md b/sources/tech/20140801 What are better alternatives to basic command line utilities.md
new file mode 100644
index 0000000000..e36d0200a9
--- /dev/null
+++ b/sources/tech/20140801 What are better alternatives to basic command line utilities.md
@@ -0,0 +1,106 @@
+What are better alternatives to basic command line utilities
+================================================================================
+The command line can be scary especially at the beginning. You might even experience some command-line-induced nightmare. Over time, however, we all realize that the command line is actually not that scary, but extremely useful. In fact, the lack of shell is what gives me an ulcer every time I have to use Windows. The reason for the change in perception is that the command line tools are actually smart. The basic utilities, what you are given to work with on any Linux terminal, are very powerful. But very powerful is never enough. If you want to make your command line experience even more pleasant, here are a few applications that you can download to replace the default ones, and will provide you with far more features than the originals.
+
+### dfc ###
+
+As an LVM user, I really like to keep an eye on my hard drive memory usage. I also never really understood why in Windows we have to open the file explorer to know this basic information. Hopefully on Linux, we can use the command.
+
+ $ df -h
+
+
+
+which gives you the size, usage, free space, ratio, and mount point of every volume on your computer. Notice that you have to pass in the "-h" argument to get all the data in human readable format (gigabytes instead of kilobytes). But you can replace completely df with [dfc][1], which can, without any additional arguments, get you everything that df showed, and throw in a usage graph for each device, and a color code, which makes it a lot easier to read.
+
+
+
+As a bonus, you can sort the volumes using the argument "-q", define the units that you want to see with "-u", and even export to csv or html format with "-e"
+
+### dog ###
+
+Dog is better than cat. At least that is what this program declares. You have to give it credit for once. Everything that the cat command does, [dog][2] does it better. Beyond just outputting some text stream to the console, dog is capable of filtering that stream. You can for example find all images in a web page by using the syntax:
+
+ $ dog --images [URL]
+
+
+
+Or all the links with:
+
+ dog --links [URL]
+
+
+
+Besides, dog commands can also do other smaller tasks, like convert to upper or lower case, use different encoding, display the line numbers, and deal with hexadecimal. In short, dog is a must-have to replace cat.
+
+### advcp ###
+
+One of the most basic command in Linux is the copy command: cp. It is probably as basic as cd. Yet it cruelly lacks feedback. You can enable the verbose mode to see which files are being copied in real time, but if one of the files is very big, you will be left waiting in front of your screen with no idea of what is really happening behind the scenes. An easy way to fix that is to add a progress bar: what advcp (short for advanced cp) does! Available as a [patched version][3] of the [GNU coreutils][4], advcopy provides you with the acp and amv commands, which are "advanced" versions of cp and mv. Use the syntax:
+
+ $ acp -g [file] [copy]
+
+to copy a file to another location, and display a progress bar.
+
+
+
+I also advise using an alias in your .barshrc or .zshrc
+
+ alias cp="acp -g"
+ alias mv="amv -g"
+
+### The Silver Searcher ###
+
+Behind this atypical name, [the silver searcher][5] is a utility designed as a replacement for grep and [ack][6]. Intended to be faster than ack, and capable of ignoring files unlike grep, the silver searcher scrolls through your text file looking for the piece that you want. Among other features, it can spit out a colored output, follow symlink, use regular expressions, and even ignore some patterns.
+
+
+
+The developers' website provides us with some benchmark statistic on the search speed which, if they are still true, are quite impressive. And cherry on the cake: you can include the utility in Vim in order to call it with a simple shortcut. In two words, smart and fast.
+
+### plowshare ###
+
+All fans of the command line like to use wget or one of its alternatives to download things from the internet. But if you use a lot of file sharing websites, like mediafire or rapidshare, you will be glad to know that there is an equivalent to wget dedicated to those websites, which is called [plowshare][7]. Once you install it, you can download files with:
+
+ $ plowdown [URL]
+
+or upload them with:
+
+ $ plowup [website name] [file]
+
+given that you have an account for that file sharing website.
+
+Finally, it is possible to gather information, such as a list of links contained in a shared folder with:
+
+ $ plowlist [URL]
+
+or the filename, size, hash, etc, with:
+
+ $ plowprobe [URL]
+
+plowshare is also a good alternative to the slow and excruciating jDownloader for those of you who are familiar with these services.
+
+### htop ###
+
+If you use top command regularly, chances are you will love [htop][8] command. Both top and htop offer a real-time view of running processes, but htop boasts of a number of user-friendly features lacking in top command. For example, with htop, you can scroll process list vertically or horizontally to see full command lines of every process, and can do basic process management (e.g., kill, (re)nice) using mouse clicks and arrow keys (without entering numeric PIDs).
+
+
+
+To conclude, these kinds of tools, which efficiently replace basic command line utilities, are like little pearl of usefulness. They are not always easy to find, but once you've got one, you always wonder how you survived for so long without it. If you know any other utility fitting this description, please share in the comments.
+
+--------------------------------------------------------------------------------
+
+via: http://xmodulo.com/2014/07/better-alternatives-basic-command-line-utilities.html
+
+作者:[Adrien Brochard][a]
+译者:[译者ID](https://github.com/译者ID)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://xmodulo.com/author/adrien
+[1]:http://projects.gw-computing.net/projects/dfc
+[2]:http://archive.debian.org/debian/pool/main/d/dog/
+[3]:http://zwicke.org/web/advcopy/
+[4]:http://www.gnu.org/software/coreutils/
+[5]:https://github.com/ggreer/the_silver_searcher
+[6]:http://xmodulo.com/2014/01/search-text-files-patterns-efficiently.html
+[7]:https://code.google.com/p/plowshare/
+[8]:http://hisham.hm/htop/
\ No newline at end of file
diff --git a/sources/tech/20140804 Cheat--An Ultimate Command Line 'Cheat-Sheet' for Linux Beginners and Administrators.md b/sources/tech/20140804 Cheat--An Ultimate Command Line 'Cheat-Sheet' for Linux Beginners and Administrators.md
new file mode 100644
index 0000000000..38cbbd3bc7
--- /dev/null
+++ b/sources/tech/20140804 Cheat--An Ultimate Command Line 'Cheat-Sheet' for Linux Beginners and Administrators.md
@@ -0,0 +1,175 @@
+[su-kaiyao]翻译中
+
+Cheat – An Ultimate Command Line ‘Cheat-Sheet’ for Linux Beginners and Administrators
+================================================================================
+What you do when you are not sure of the command you are running especially in case of complex commands which uses a lot of options. We use man pages to get some help in such situation. Some of the other options may include commands like ‘**help**‘, ‘**whereis**‘ and ‘**whatis**‘. But all has their Pros and Cons.
+
+While going through **man pages** for options and help, the description in man pages are too lengthy to understand specially in short span of time.
+
+
+Linux Man Pages
+
+Similarly, ‘**help**‘ command may not give you desired output.
+
+
+Help Command
+
+A ‘**whereis**‘ command hardly tells anything other than the location of Installed Binaries (May be Important at time).
+
+
+Whereis Command
+
+A ‘**whatis**‘ command gives strict and one liner answer which is not much helpful other than acknowledging the purpose of the command, Moreover it never says a single word about the available options.
+
+
+Whatis Command
+
+We have used all these options till date to solve our issue in the dilemma but here comes an interactive cheat-sheet application ‘**cheat**‘ which is going to lead all the rest.
+
+### What is cheat? ###
+
+**Cheat** is an interactive cheat-sheet application released under GNU General Public License for Linux Command line users which serves the purpose of showing, use cases of a Linux command with all the options and their short yet understandable function.
+
+
+Cheat: Provides Easy Command Options
+
+### Installing ‘Cheat’ in Linux Systems ###
+
+‘**Cheat**‘ has two major dependency – ‘**python**‘ and ‘**pip**‘. Make sure you have installed python and pip before installing ‘**cheat**‘ on the system.
+
+#### Install Python ####
+
+ # apt-get install Python (On Debian based Systems)
+ # yum install python (On RedHat based Systems)
+
+Install Pip
+
+ # apt-get install python-pip (On Debian based Systems)
+ # yum install python-pip (On RedHat based Systems)
+
+**NOTE**: pip is an easy install replacement and is intended to be an improved Python package installer.
+
+### Download and Install Cheat ###
+
+We will be downloading ‘cheat’ from Git. Make sure you have package ‘git’ installed, if not better install this first.
+
+ # apt-get install git (On Debian based Systems)
+ # yum install git (On RedHat based Systems)
+
+Next, install the required python dependencies by running following command.
+
+ # pip install docopt pygments
+
+Now, clone the [Git repository][1] of cheat.
+
+ # git clone https://github.com/chrisallenlane/cheat.git
+
+Move to the cheat directory and run ‘**setup.py**‘ (a python script).
+
+ # cd cheat
+ # python setup.py install
+
+If installation goes smoothly, you should be able to see a cheat version installed on the system.
+
+ # cheat -v
+ cheat 2.0.9
+
+### Required Configuration for Cheat ###
+
+You must have an ‘**EDITOR**‘ environment variable set in ‘~/.bashrc’ file. Open the user ‘**.bashrc**‘ file and add the following line to it.
+
+ export EDITOR =/usr/bin/nano
+
+You can use your favourite editor here in place of ‘**nano**‘. Save the file and logout. Again Login to make the changes taken into effect.
+
+Next, add the cheat autocompletion feature to enable command-line autocompletion for different shells. To enable autocompletion, simply clone the ‘**cheat.bash**‘ script and copy the script to the appropriate path in your system.
+
+ # wget https://github.com/chrisallenlane/cheat/raw/master/cheat/autocompletion/cheat.bash
+ # mv cheat.bash /etc/bash_completion.d/
+
+**NOTE**: The team has uploaded other shell’s auto completion scrip to Git, which may be cloned and used in case of respective Shell. Use the following link for other shell’s auto completion script.
+
+- [Auto Completion Script for Various Shells][2]
+
+Optionally, you can also enable syntax highlighting, if desired. To active syntax highlighting feature, add a **CHEATCOLORS** environment variable in your ‘**.bashrc**‘ file.
+
+ export CHEATCOLORS=true
+
+The Cheat application default program only serves the basic and most used commands. The content of cheat-sheet resides at location **~/.cheat/.** Manual Cheatsheets can be added to this location to make the application rich.
+
+ # cheat -e xyz
+
+This will open xyz cheat-sheet if available. If not it will create one. The cheat-sheet will be opened in the default **EDITOR**, we set in **.bashrc** in the configuration stage, above.
+
+### Usage of Cheat with Some Commands ###
+
+A tarball may be *.gz or *.bz2 or *.zip or *.xz. So, what option to be used where?
+
+
+tar command options
+
+I never run **dd** command, no matter how much sure I am about the command before consulting and cross checking it at more than one location. The things seems to be easy now.
+
+
+dd command options
+
+A ‘**uname**‘ command help.
+
+
+uname command options
+
+A short **ifconfig** command line tutorial, in action.
+
+
+ifconfig command options
+
+A ‘top‘ command, one of the most important command for Admin and Normal User.
+
+
+top command options
+
+How about Cheating the cheat command (though the other sense)? Get a list of available commands, the cheat-sheet of which is installed in the System.
+
+
+List All Linux Commands
+
+Search Cheat-sheet with specific keyword.
+
+
+Search Cheat Sheet
+
+See the location of built-in cheat-sheets for all the commands.
+
+ $ cheat -d
+
+ /home/avi/.cheat
+ /usr/local/lib/python2.7/dist-packages/cheat/cheatsheets
+
+Copy the in-built cheat-sheet to your native directory.
+
+ # cp /usr/local/lib/python2.7/dist-packages/cheat/cheatsheets/* /home/avi/.cheat/
+
+### Conclusion ###
+
+This wonderful project is a life Saviour in many-a-situation. It just gives you information that is required, nothing extra, nothing vague and to the point. This is a must tool for everyone. Easy to build, easy to install, easy to run and easy to understand, this project seems promising.
+
+This Git project has added a wonderful **gag** which I am not going to explain but leave on you to interpret.
+
+
+Linux Gag
+
+That’s all for now. I’ll be here again with another interesting article you people will love to read. Till then stay tuned and connected to Tecmint. Don’t forget to provide us with your valuable feedback in the comment section below.
+
+--------------------------------------------------------------------------------
+
+via: http://www.tecmint.com/cheat-command-line-cheat-sheet-for-linux-users/
+
+作者:[Avishek Kumar][a]
+译者:[译者ID](https://github.com/译者ID)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://www.tecmint.com/author/avishek/
+[1]:http://www.tecmint.com/install-git-to-create-and-share-your-own-projects-on-github-repository/
+[2]:https://github.com/chrisallenlane/cheat/tree/master/cheat/autocompletion
diff --git a/sources/tech/20140804 How to install and configure Nvidia Optimus driver on Ubuntu.md b/sources/tech/20140804 How to install and configure Nvidia Optimus driver on Ubuntu.md
new file mode 100644
index 0000000000..75a0bc16a4
--- /dev/null
+++ b/sources/tech/20140804 How to install and configure Nvidia Optimus driver on Ubuntu.md
@@ -0,0 +1,109 @@
+[translating by KayGuoWhu]
+How to install and configure Nvidia Optimus driver on Ubuntu
+================================================================================
+Nvidia Optimus is a hybrid GPU system which utilises what is known as "discrete switching" and has been long associated with headaches and limitations on Linux systems. After years of wait, Ubuntu 14.04 with its shiny new kernel finally shipped with proprietary driver compatibility that can be installed easily. This article will guide you through the installation process after quick background of Nvidia Optimus for the unfamiliar readers. For the seasoned destroyer of Xorg configuration, you can quickly jump to the installation section below.
+
+### Background ###
+
+To those who aren't aware of Nvidia Optimus, it essentially alternates between using the onboard Intel graphics chipset and the more powerful NVIDIA card on demand using a process referred to as "GPU switching". Its purpose is to prolong battery life in notebooks, allowing the Nvidia GPU to switch off when there is no need for it. The benefits are obvious, allowing say 8 hours of battery life if simply typing in a word processor, or 3 hours if watching HD videos. That is if you are using Windows.
+
+
+
+A couple of years ago I purchased a netbook (Asus VX6), and made the stupid mistake of not checking for Linux driver compatibility because it had never really been an issue before - especially for a netbook sized device. Even if a driver didn't work straight out of the box, I could always get it working one way or another whether installing a proprietary module or using backports. This was a first for me - my device came equipped with an Nvidia ION2 graphics card.
+
+At the time Nvidia's Optimus hybrid GPU hardware was a relatively new thing, and I did not foresee the limitations I encountered running Linux on this machine. If you're reading this, are experienced with Linux systems and have purchased a notebook in the past for years, you might be familiar with this pain also.
+
+The [Bumblebee][1] project was until recently as good as it gets in terms of Linux support for hybrid graphics. It was actually possible if configured correctly to utilise the Nvidia card for a desired application via CLI (i.e. 'optirun vlc'), but getting things like HDMI to work was a different story.
+
+I used the phrase 'if configured correctly' because actually getting it working more often than not just broke your Xorg configuration on first few attempts. If you hadn't used ppa-purge or run 'dpkg-reconfigure -phigh xserver-xorg' before, then I can assure you that tinkering with Bumblebee taught them to you pretty quickly.
+
+[][2]
+
+It's been a very long wait for Nvidia to release Linux driver support for Optimus, and we still don't have the actual support for discrete switching. However, now with Ubuntu 14.04, nvidia-prime and the nvidia-331 driver, one can choose between the Intel or Nvidia card easily. Unfortunately it is still limited further by requiring restarting X11 (achieved by logout and login) for the change to take effect.
+
+To make this slightly less inconvenient, there is an applet for quick switching, which can I'll get to later, but installation of the driver is a breeze and HDMI works so that's enough to satisfy me.
+
+### Install Nvidia Optimus Driver ###
+
+To run through the process quickly, I'll be assuming you've got a fresh install of Ubuntu 14.04 or Mint 17 ready to go.
+
+Working as a sysadmin, I find 90% of Linux tasks these days quicker via CLI, but this time I recommend simply using the 'Additional Drivers' application that you're probably familiar with for installing proprietary NIC or sound drivers.
+
+
+
+**NOTE: All commands shown below preceded by ~# need to be run as root. Be sure to either 'sudo su' before running commands, or run with sudo at beginning of command.**
+
+You can also do it via CLI by installing:
+
+ ~# apt-get install nvidia-331 nvidia-settings nvidia-prime
+
+followed by a reboot. Make sure you don't have any packages like Bumblebee or other loaded Nvidia drivers, otherwise it'll probably just break your X11. In case you aren't working with a clean install and did previously install Bumblebee etc, run the following before installing nvidia-331 and nvidia-prime:
+
+ ~# apt-get purge libvdpau-va-gl1 bumblebee* nvidia*
+
+### Switch between Nvidia non-Nvidia Cards ###
+
+You can switch between Nvidia and non-Nvidia (e.g., Intel) cards by pressing Alt+F2 or typing from terminal:
+
+ ~$ nvidia-settings
+
+#### NOTE: ~$ means do not run as root user. ####
+
+Chose the desired card, then log out and log back in.
+
+
+
+You can also use CLI to set which card to use as default:
+
+ ~# prime-select intel (or nvidia)
+
+As well as switch cards using:
+
+ ~# prime-switch intel (or nvidia)
+
+Both commands require restarting X11 to take effect, which can also be achieved by simply logging out and back in. A reboot will also suffice.
+
+For Ubuntu users:
+
+ ~# service lightdm restart
+
+For Mint users:
+
+ ~# service mdm restart
+
+To verify which card is running:
+
+ ~# prime-select query
+
+And lastly you can install the prime-indicator package from ppa:nilarimogard/webupd8 which allows for a quick switch from the tool bar which restarts your Xserver session for you as well. To install it, simply run:
+
+ ~# add-apt-repository ppa:nilarimogard/webupd8
+ ~# apt-get update
+ ~# apt-get install mesa-utils prime-indicator
+
+### Summary ###
+
+In conclusion, it's still not ideal, but at least it's nice and simple with proper proprietary support. Many people often still opt for Bumblebee over this setup because they find using the Nvidia driver only runs their battery dead in no time. For my personal usage this setup is the better way to go as I only use the Nvidia card for HDMI out, which implies that I will have it plugged into power. Otherwise Intel suffices for my portable usage as I don't require anything beyond LibreOffice, Chromium and Terminator on the go.
+
+If you would prefer the idea of running Intel as default and specifying to run specific applications utilising Nvidia card, instead direct your reading to the many Bumblebee tutorials out there. I advise in the instance of Bumblebee once you finally get it working properly to document the commands and process used to configure for your device as there is nothing worse than doing a clean install 9 months later and forgetting what was done to get it working last time.
+
+It may also be worthwhile checking out [this script][3] I stumbled across, which serves to easily switch between Bumblebee and Nvidia-Prime, but I must stress that I have not tested it myself.
+
+Finally, I feel it is a massive shame that it's taken this long to get proprietary support for this cards on Linux and still no support for discrete switching, considering that hybrid graphics appear to be the future for portable devices. Normally AMD are associated with dropping the ball for driver support on Linux, but in my eyes Optimus is by far the worse hardware support issue I have encountered.
+
+Regardless of whether this is ideal for your usage, it is the easiest way to go utilising that NVIDIA card. Try running the newest Unity on the Intel card alone and decide for yourself whether 2-3 hours battery life is worthy trade off.
+
+--------------------------------------------------------------------------------
+
+via: http://xmodulo.com/2014/08/install-configure-nvidia-optimus-driver-ubuntu.html
+
+作者:[Christopher Ward][a]
+译者:[译者ID](https://github.com/译者ID)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://xmodulo.com/author/christopher
+[1]:http://bumblebee-project.org/
+[2]:http://xkcd.com/963
+[3]:https://devtalk.nvidia.com/default/topic/705993/easy-switch-between-bumblebee-and-nvidia-prime/
\ No newline at end of file
diff --git a/translated/news/20140702 CoreOS Linux ending the upgrade cycle.md b/translated/news/20140702 CoreOS Linux ending the upgrade cycle.md
new file mode 100644
index 0000000000..ba2b6ea1d3
--- /dev/null
+++ b/translated/news/20140702 CoreOS Linux ending the upgrade cycle.md
@@ -0,0 +1,50 @@
+CoreOS Linux结束升级周期
+================================================================================
+> CoreOS发布了他的Linux发行版的商用支持版,并且宣称将废除手动更新。
+
+国际数据集团新闻社消息——CoreOS发布了商用Linux发行版,以期能简化系统管理员的生活。这个Linux发行版可持续进行自动更新,不需要进行重大升级。
+
+CoreOS提供其同名的Linux发行版做为商业服务,开始为一个月100美元。
+
+“商家现在可以开始考虑将CoreOS作为他们系统团队的延伸,对于企业Linux客户,这将是他们会需要的最后一次迁移。”CoreOS的创始人和CEO在一份声明中这样说。
+
+商业Linux订阅并不是什么新鲜事:[Red Hat][2]和[Suse][3]都在为他们各自的发行版提供商业订阅。
+
+因为这些以Linux为基础的公司使用的应用程序和库都是开源和免费提供的,所以订阅的费用不包括软件本身,而收费来自更新,漏洞修复,集成以及发生问题时的技术支持。
+
+CoreOS公司声称,CoreOS将会和这些发行版不同,它将不会有重大更新,而在那些发行版中这些更新通常需要一次更新所有的包。在CoreOS中,它的更新和新特征将会在就绪后自动安装入操作系统中。
+
+服务中提供了一个叫做CoreUpdate的仪表盘,如果管理员不想自动更新所有包,它可用于标明选取哪些软件包获取更新。
+
+CoreUpdate可以同时管理多个机器,而且提供了滚回功能——在更新引起问题可使用。
+
+CoreOS于去年十二月发布,它的设计旨在[关注][4]开源操作系统内核的新兴使用——用于大量基于云计算的虚拟服务器。
+
+CoreOS的设计使其平均消耗要少于其他Linux发行版通常消耗的一半。系统中所有的程序运行在Docker虚拟化容器中,所以它们几乎可以在瞬间就开始运行。
+
+[由于CoreOS分为两部分的新用法][5]使其更新更为容易。一部分放置当前版本的系统,而另一部分系统来进行升级,平滑地进行升级包或者整个系统。
+
+CoreOS服务可以运行在本地,或者在Amazon,Google和Rackspace云服务上。
+
+CoreOS周一还宣布他们收到了来自Kleiner Perkins Caulfield and Byers风险投资公司的800万美元的支持。他们此前还收到了红杉资本和斐然资本的投资。
+
+----------
+
+Joab Jackson负责IDG新闻服务机构中企业软件和通用技术的新闻。Twitter上关注Joab[@Joab_Jackson][6]。Joab的电子邮箱地址是[Joab_Jackson@idg.com][7]
+
+
+--------------------------------------------------------------------------------
+
+via: http://www.computerworld.com/s/article/9249460/CoreOS_Linux_ending_the_upgrade_cycle?taxonomyId=122
+
+译者:[linuhap](https://github.com/linuhap) 校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:https://coreos.com/products/managed-linux/plans/
+[2]:http://www.redhat.com/about/subscription/
+[3]:https://www.suse.com/support/programs/subscriptions/
+[4]:http://www.networkworld.com/article/2177120/cloud-computing/coreos-linux-distro-lands-on-the-google-cloud-platform.html
+[5]:https://coreos.com/using-coreos/updates/
+[6]:http://twitter.com/Joab_Jackson
+[7]:Joab_Jackson@idg.com
diff --git a/translated/talk/20 Amazing Linux Blogs For Beginners.md b/translated/talk/20 Amazing Linux Blogs For Beginners.md
new file mode 100644
index 0000000000..3de1c1b846
--- /dev/null
+++ b/translated/talk/20 Amazing Linux Blogs For Beginners.md
@@ -0,0 +1,73 @@
+初学者福利 —— 20 个超赞的 Linux 博客
+================================================================================
+你是刚刚开启 Linux 开源世界奇幻旅程的新人还是寻求灵感的老鸟?不论你是谁,博客都能给你提供一站式服务,满足你的所有需要。博客是一种言辞简洁格式清晰的信息来源,这些信息都源于现实世界里像你我一样乐于帮助他人掌握知识的人。
+
+1.[Ubuntux][1]
+
+2.[Mark shuttleworth's Official Blog][2]
+
+3.[Ubuntu Living][3]
+
+4.[Planet Gnome][4]
+
+5.[Planet KDE][5]
+
+6.[Linux Tracker][6]
+
+7.[Linux Watch][7]
+
+8.[Mandriva Blog][8]
+
+9.[Linux Security][9]
+
+10.[Linux on Desktop][10]
+
+11.[LinuxBSDos][11]
+
+12.[All for Linux][12]
+
+13.[Linux from Scratch][13]
+
+14.[RootPrompt][14]
+
+15.[Linux Home Networking][15]
+
+16.[YoLinux][16]
+
+17.[Librenix][17]
+
+18.[Linux Journal][18]
+
+19.[Linux Street][19]
+
+20.[Linux Hub][20]
+
+--------------------------------------------------------------------------------
+
+via: http://www.efytimes.com/e1/fullnews.asp?edid=144715
+
+译者:[sailing](https://github.com/blueabysm)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://www.ubuntux.org/
+[2]:http://www.markshuttleworth.com/
+[3]:http://ubuntuliving.blogspot.in/
+[4]:http://planet.gnome.org/
+[5]:http://planetkde.org/
+[6]:http://linuxtracker.org/
+[7]:http://efytimes.com/e1/www.linux-watch.com
+[8]:http://blog.mandriva.com/en/
+[9]:http://www.linuxsecurity.com/
+[10]:http://linuxondesktop.blogspot.in/
+[11]:http://www.linuxbsdos.com/
+[12]:http://allforlinux.com/
+[13]:http://www.linuxfromscratch.org/
+[14]:http://rootprompt.org/
+[15]:http://www.linuxhomenetworking.com/
+[16]:http://www.yolinux.com/TUTORIALS/
+[17]:http://librenix.com/
+[18]:http://www.linuxjournal.com/
+[19]:http://www.linuxstreet.net/
+[20]:http://linuxhub.net/
diff --git a/translated/talk/20140607 Got Linux--Add Proprietary Code.md b/translated/talk/20140607 Got Linux--Add Proprietary Code.md
deleted file mode 100644
index 667962c302..0000000000
--- a/translated/talk/20140607 Got Linux--Add Proprietary Code.md
+++ /dev/null
@@ -1,115 +0,0 @@
-
-Got Linux? Add Proprietary Code
-================================================================================
-
-
-> 对于一些产业来讲,在开源的Linux发行版上运行商业版的软件并不类外。--这很常见,例如,在华尔街,“华尔街上百分之九十九的应用依赖于商业版的软件。在我们运行在Linux上的产品中,Oracle是我们最喜欢的一种商业软件”, FSMLabs' President Victor Yodaiken说。
-
-迁移到Linux平台并不是一个非此即彼的提议。作为一个计算机平台,Linux是非常灵活的。它提供给用户一个自定义的软件菜单选项。
-
-一种选择是Linux桌面。家庭个人用户,SOHO 和 SMB 操作可以从众多的企业级Linux发行版中选择。Linux桌面系统提供了一个0成本或者成本很低的替代,相对于微软系统来讲,或者是基于Unix的苹果OS X系统依赖苹果硬件的局限性。
-
-另一个替换的办法是,让员工放弃linux桌面办公,取而代之,企业可以运行后台办公系统在Linux服务器上。Linux服务器在网络化和云计算领域有一个缜密和强大的空间。Linux服务器在很多企业中应用很广。
-
-第三个方法是运行一个完整的Linux商店,斯坦达德办公中心运作的软件在开源包,网络浏览,图形产生方面非常有用。开源的数据库应用和和后台软件及服务器连接相当频繁,在此方面,Linux不需要购入特殊硬件来支持。
-
-培训员工使用Linux桌面应用需求量很小。感谢工作者对跨平台软件的友好支持。例如LibreOffice 和 Open Office, 同样的,Chrome和 Firefox浏览器。前端办公交互很少漏掉。
-
-Linux很灵活。一个新的趋势是生产适合你企业需要的第三方软件。商业软件公司可以再编译必要的WIndow或者其它平台软件。他们也可以生产Linux任务应用将现成的资源和他们自己的代码结合到一起。
-
-“我相信这将是一个新的趋势,企业可以用第三方软件在Linux系统上进行开发。推动企业向Linux迁移并使用定制的软件的一个因素便是支付微软的专利费用的财政负担”,Dayan Jeremiah ,[Icewarp Pacific][1] 的 CEO 说。
-
-
-### Linux Does Proprietary ###
-
-一个公司向任何一个系统迁移的时候所面临的最大障碍是监测应用的通用性。在迁移到Linux上时,企业不得不保证软件在Liunx上通用。Jeremiah强调
-
-Linux操作系统有一个多类型和Linux桌面系统软件库。根据不同的行业,大量的开源社区可能没有为每一个特殊的任务指定一种方案。在这种情况下, 借助于第三方软件来推出自己的应用往往更节约成本。
-
-“使用第三方软件有助于保证兼容性,例如,我们可以混合和匹配软件组件来保证应用在Linux上运行” ,Jeremiah 说。
-
-### 旧的模型产生新模型 ###
-
-越来越多的专有软件公司,例如爱思华宝,建立特殊的软件来满足企业特殊的业务需求,他们将许多开源组件混合在一起使用。
-
-与微软的基础设施相比,不仅节省了许可成本,还节省了编码成本。
-
-“我们可以建立一个完整的软件方案,使用现成的Linux软件组件,整个解决方案往往更节省成本,高效,稳定。” Jermaih强调。
-
-Icewarp不开发专门的软件作为免费的开源项目,它不提供免费版,需要付费支持。你需要付费购买它。
-
-### 代码移植 ###
-
-把软件从一个平台移植到另一个平台并与Liunx兼容的一个障碍是Liunx的多样化,依据Jacob Loveless, CEO of [Lucera][2]的观点。Linux操作系统拥有一个通用kernel,但是有很多多样化。
-
-“当软件公司不得不在多个Linux系统中交叉编译时,问题进一步加深。”伴随着微软Exchange 服务器的类外,大多数数据库运行良好。Mysql和postSql可能是最突出的两个开源版本。
-
-在软件移植到Linux的最大挑战,是需要重新编译代码,通常有平台相关的事情你不得不去做。他说。
-
-例如,如果你有特殊的代码底层依赖,对于window来讲,.net 或者其它语言,运行在Linux的开源编译器并不总是兼容,因此你有很多软件工作需要重做,Loveless说道。
-
-另一个例子是使用数据库。你经常不得不连接到一个不同的数据库和一个不同的web服务器。
-
-有明确的工作要做,Loverless说道。
-
-### 许多还不够 ###
-
-在移植到Linux上时,另一个兼容性问题是开源软件公司的需求。
-
-没有足够的开源方案来解决企业的专业需求, IceWarp 的Jeremiah说,通常来讲,我们认为是足够的,目前还没有被专门的软件应用来提供,而第三方不能提供的软件。
-
-例如,IceWarp最近建立了一个特殊的Linux兼容应用,不需要额外的硬件采购,没有额外的许可费用。
-
-特殊的软件包括一个集群负载均衡。集群数据库和集群IP服务器,所有的这一切都运行在一个标准的红帽企业版Linux或者CentOS Linux.
-
-
-### 跟着钱走 ###
-
-在一些情况下,你可以跟着前找到Linux。有时它是Linux服务器在工业中有很高的用途。另一些时候,它是Linux桌面应用,或者两者都有。
-
-例如,在金融市场中,时间同步是关键。金融依靠分布式网络,用户不得不在指定的时间内完成交易。其它的应用需要在交易前进行精确的计时。这些功能需要精确的时间同步控制。Victor Yodaiken 说,[FSMLabs][3] 的总裁。
-
-当FSMLabs 开始开发时间同步软件,Yodaiken期待很快会拥有一个Windows版本。
-
-然而,被证实每一个在使用自动交易或者低延迟交易,甚至是采集高精度数据软件的人,都运行的是Linux系统,他告诉LinuxInsider.
-
-### 时间是昂贵的 ###
-
-FSMLabs 将专有的代码运行在Linux上,建立在Linux上的软件时间协议不适用同步时间在纳秒级别的应用,比如那些追踪股票,或者交易的需求。
-
-“我认为Linux的在Windows之上,因为Windows没有一个标准的API让你获取时间在毫秒级别以下。”所以Window并不是真的都好。你不得不拥有特殊的API,在Linux下。你不需要费力在你的应用程序上。Yodaiken 说。
-
-金融市场是第一个拥抱Linux的。许多早期的系统管理者来自80年代的[贝尔实验室][4],因此这是一个很成熟的市场,他说。
-
-### 满足需求 ###
-
-对于一些产业来说,在开源的Linux发型版上运行有专利的软件并不意外,这是很常见的。
-
-“华尔街99%的应用都运行在有专利的产品上。在我们运行在Linux的产品中,我们很喜欢Oracle,它有一个专利许可。”FSMLabs' Yodaiken说。
-
-一些市场运行Linux需要跟更多专业的软件,相比开源的产品,现存的开源软件不能满足他们的需求。这也就是为什么软件开发者为企业Linux提供商业的产品。他补充道。
-
-“这是很常见的,开源最适合大市场,这就是为什么他们具有广泛的需求。没有几人总是对的。如果他们不对,需要告诉他们” 他指出。
-
-### Linux纯粹主义是没有意义的 ###
-
-在Linux上运行完全免费开源的软件的观念是欠缺的,有时候你要运行专利软件。
-
-当一个专业的计算不需要进入广泛市场时,第三方软件开发者提供一个专有的,商业的或者闭源的解决方案。由于商业持续地适应Linux系统,绝对的开源将成为过去的事情。
-
-在Linux上拥有商业软件是相当普遍的,Yodaiken说,商人都不是纯粹主义者,他们只想解决问题。
-
-Jack M. Germain从早期的苹果二和PC的时候就一直在写计算机技术。他保留着一些原始的IBM PC和一些传统的DOC系统,和Windows盒子,他抛弃了共享程序,走向开源Linux世界.他运行一些Windows系统和Linux系统,经常不能决定是否用他的平板电脑或者安卓智能手机替代他的桌面系统或者便携式电脑。你可以在Google+上联系到他。
-
---------------------------------------------------------------------------------
-
-via: http://www.linuxinsider.com/story/80555.html
-
-译者:[jiajia9linuxer](https://github.com/jiajia9linuxer) 校对:[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:http://www.icewarp.com/
-[2]:https://lucerahq.com
-[3]:http://www.fsmlabs.com/
-[4]:http://www.bell-labs.com/
diff --git a/translated/talk/20140617 Does Linux Lack a Killer App.md b/translated/talk/20140617 Does Linux Lack a Killer App.md
new file mode 100644
index 0000000000..c199d7faea
--- /dev/null
+++ b/translated/talk/20140617 Does Linux Lack a Killer App.md
@@ -0,0 +1,113 @@
+Linux 缺乏一款杀手级应用程序吗?
+================================================================================
+
+
+**Linux 最需要的就是游戏, Hyperlogos 的博主 Martin Espinoza 如是说。然而,“如果您把它限定到一款应用程序的话,最需要的很可能仍是 Photoshop 。尽管大家都在谈论 GIMP 已经变得多么多么强大,但它的易用性仍然是个悲催的噩梦;虽然开源社区有些相关的文档,但 GIMP 仍是处在缺乏文档的可怜状态。”**
+
+这些日子这儿越来越热了,Linux 博客世界和 FOSS 论坛的粉丝们都蜂拥入带有破窗的休息室,边吹着冷空调,边讨论此话题。
+
+甚至是 [Linux Girl][9],这些天也被这些越来越多的潮流所冲击,正在 blogobar 上寻求能使其降温的慰籍,而且越来越频繁。
+
+虽然她们这样做比较正确,但或许她们已经错过了最鲜最美味可口的辩论大餐。“Linux 缺少什么样的杀手级应用程序?”这个问题[已经扩大化了][1],关于此的讨论越演越烈,已经超出以往任何时候。
+
+开源软件世界的软件是如此令人难以置信的丰富,几乎涵盖了所有的领域,” **Linux Voice** 的 Mike Saunders 开头说到。“我们有桌面端的、服务端的、开发相关的及多媒体工具等一大笔来自开源世界的财富可以选择 -- 其中的某些还是在相关领域中最好的呢。”
+
+“但还缺少什么吗?” Sanders 接下来提出可争议的话题。“是不是存在一款杀手级应用程序,它会使你的主机不能 24x7 小时的在运行?”
+
+参与者围绕着吧台考虑这话题的时候,出现了短暂的间歇。Linux Girl 也享受着这短暂的平静,但并没有持续多久。
+
+### '取决于您的所需' ###
+
+
+
+“很久以前,Linux 需要很多东西,” Google+ 的博主 Alessandro Ebersol 发言了。“当任何软件和厨房水槽都迁移到云端的那些日子,做任何的事情都得考虑多平台兼容性。”
+
+“我想说的是我们缺少游戏,但这种情况也正在被开改变,” Ebersol 说道。“所以我觉得我们并不是那么迫切的需要一个杀手级应用了。”
+
+杀手级应用程序“取决于你想用计算机做什么,” consultant 和 [Slashdot][2] 博客的 Gerhard Mack 认为。“如果您正准备拟稿做设计,那么杀手级应用程序就是 AUTOCAD 。但对其它行业来说杀手级应用程序将是别的。”
+
+### '企业平台空间' ###
+
+Google+ 博客的 Kevin O'Brien 有相似的观点。
+
+“在消费级别存在的应用程序不算太多,” O'Brien 说。“我虽然会抱怨游戏或者 Nvidia 驱动程序,并且我看还没有任何东西能真正替代 Quicken。(译者注:Quicken 是一款家庭及个人财务管理软件,可管理个人及家庭的日常收支、银行卡、支票、信用卡及税务等财务信息,有着丰富的功能和简单快捷的操作。)但对我来说最大的不同是企业平台空间。”
+
+“微软就拥有企业平台空间,没有什么比得过 Outlook/Exchange 服务, Sharepoint 等这些应用的,”他断言到。“我猜测部分原因可能是真正关心这些的开源开发者很少很少。”
+
+### '浪潮正发生改变' ###
+
+与其说是“缺乏应用程序”这种情况,不如说是“临界的质量不够”的问题,Google+ 博客 Gonzalo Velasco C. 建议说。
+
+比起五年前,现在用 Linux 的人已经越来越多了,他指出;但同时很人都依赖于非 Linux 友好的应用程序。
+
+“虽然每个人都在使用 Skype ,但一大半半的应用程序都是基于 GNU/Linux 协议的,从简单易用的 Pidgin(我的最爱)到 Ekiga 和通用 voIP 等等,” Gonzalo Velasco C. 解释说。“一些用户仍宣称他们需要 PhotoShop,并不想花时间来掌握和改进 GIMP、Inkscape、Bender 及其它的。”
+
+曾经是很缺乏游戏,“但这状况正发生改变,主要是--但并不是唯一--因为 Valve 的勇敢开创 SteamOS 之举,”他增加道。
+
+### '零售货架空间' ###
+
+“我认为这段时期根本就没有‘杀手级’应用程序,”[Robert Pogson][3] 博客上的观点。“在 Debian GNU/Linux 系统上,有 40K 的软件包,虽然我的 PC 只安装了 3K 的东西,但我一样都不缺。我有多个浏览器、编辑器、编译器/解释器、多个操作平台和像 KVM 这样的虚拟机,我可以根据需要在多个操作系统和不同版本的软件中尽情玩乐。”
+
+“在局域网内,我可以把多台机器当做一台机器来使用,” Pogson 增加到。“在局域网内我能从任何机器上访问存储在任意节点的资源。还有什么不能满足的吗?”
+
+"有些说法,“几个专业人士告诉我,在 GNU/Linux 上的视频和图像编辑是有点弱,”他说。 “GIMP 正在比特级别的图像上改进,所以应该不算了。Lightworks(译者注:好莱坞级专业电影编辑软件) 最终会被当做 FLOSS(译者注:自由/开源软件:世界影响研究) 发布,所以视频应该不算。”
+
+"尽管如此,“在 IT 行业中还有特少数的专业功能软件,”他指出。“很多普通用户几十年都不会使用那些极其特殊的应用程序软件,所有我认为 GNU/Linux 系统已经不不需要什么了。”
+
+但是真正的杀手在市场上,在零售商店缺乏货架空间,Pogson 断言到。“只要解决这问题,GNU/Linux 必定蓬勃发展。”
+
+### 'Linux 已经输给 OS X' ###
+
+Chris Travers,一名工作于 [LedgerSMB][5] 的[博主][4],有不同的观点。
+
+“我认为杀手级应用程序并不是关键问题,”他开始说到。“真正的问题是,虽然跟 BSD 系统一样,Linux 正在占据服务器市场,但在桌面市场 Linux 已经普遍输于 OS X 了。Linux 用户正在寻找开放的桌面系统。”
+
+Linux “既需要微软的增长势头,又需要 OS X 系统的精致用户界面和引人入胜的细节设计,”Travers 说到。“这些迟早会来有的。”
+
+### 文档问题 ###
+
+“Linux 并不是缺少杀手级应用程序” -- "缺少的是一如既往的打磨抛光," [Hyperlogos][6] 的博主 Martin Espinoza 认为。“根本就没有 Linux 的桌面环境能像 Windows XP 系统那样精雕细琢,更别说是 Windows 7 系统了。”
+
+"除了可以用臃肿复杂的 GNOME 或 [KDE][7] 的色拉一样的小部件,难道还要用拥有极其可怕的文件管理器和非常原始的面板的 Xface 或 LXDE 吗?" Espinoza 增加道。"GNOME 仅仅只是非常接近 DE。真正的 DE 是十分简洁的,还会隐藏他们的存在。"
+
+Windows 也仅仅是“表现的比较好,”他断言说。
+
+不过,如果 Linux 要获得广泛的接受的话,“最缺的正是游戏,”Espinoza 说到。“如果您把它限定到一款应用程序的话,最需要的很可能仍是 Photoshop 。尽管大家都在谈论 GIMP 已经变得多么多么强大,但它的易用性仍然是个悲催的噩梦;虽然开源社区有些相关的文档,但 GIMP 仍是处在缺乏文档的可怜状态。”
+
+"GIMP “也许能做 Photoshop 能做的大部分事情,但我很可能并不知道,”Espinoza 的结论。“我想,如果我花了几个小时逛论坛就可以找出如何使用 GIMP 了。这就是大多数开源软件项目失败的地方,包括那些认为他们是真的是有了足够多的说明文档的。”
+
+### '易用和有技术支持' ###
+
+SoylentNews 的博主 hairyfeet 定义说易用和有技术支持就是 “杀手级应用”。
+
+“嗯,一个新手安装好一个看起来很漂亮的 Linux 发行版系统,它工作得也很正常;但问题是它不会一直正常工作或一直都让人赏心悦目,”他解释到。“第一个更新,哎哟!WPA V2 无线网用不了了。第二个更新呢,像脉冲呕吐一样,声音没了。还有第一个‘升级’?呃,都不需要往下了!”
+
+“这正是 Linux 欠缺而 Windows 和 OS X 已经具有的:易用性及技术支持,”hairyfeet 结束道。“相同的时段有 15 款以上的 Linux 发行版本跟仅仅只是一款 Windows 发行版本所获得的技术支持生命周期能一样吗?不好意思的说,您们的产品不是同一重量级的 -- 您是拿高中棒球赛跟职业联赛在比较。”
+
+### 'Windows 8' ###
+
+最后但并非是不重要的,[Linux Rants][8] 的博主 Mike Stone 提供了一个让人惊讶的建议。
+
+“这些年 Linux 缺乏的杀手级应用是 Windows 8,”Stone 打趣说。
+
+"说真的,我认为并没有一个特定的应用程序可以被称为'杀手级应用',“他说,”Linux 需要有更多的主流应用的支持,而这将意味着 Photoshop 和微软的 Office 是必须具有的。值得庆幸的是,微软已经做了最大的努力以使 Office 可以跨平台,至于 Photoshop 的话大多数人并不需要的。"
+
+Linux "应该是很争议性的话题,上面我所说的 windows 8 仅仅只是个玩笑,"他总结说。“基于 Linux 的应用程序正如火如荼,而当前的 Windows 系统明显不受欢迎。祈祷我们能很快就看到这一变化。”
+
+--------------------------------------------------------------------------------
+
+via:
+
+译者:[runningwater](https://github.com/runningwater) 校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://www.linuxvoice.com/voice-of-the-masses-what-killer-app-is-linux-missing/
+[2]:http://slashdot.org/
+[3]:http://mrpogson.com/
+[4]:http://ledgersmbdev.blogspot.com/
+[5]:http://www.ledgersmb.org/
+[6]:http://hyperlogos.org/
+[7]:http://www.kde.org/
+[8]:http://linuxrants.com/
+[9]:http://www.linux-girl.com
\ No newline at end of file
diff --git a/translated/talk/20140723 110 Fun Open Source Games and Apps.md b/translated/talk/20140723 110 Fun Open Source Games and Apps.md
index eb158faca7..496f1b8abf 100644
--- a/translated/talk/20140723 110 Fun Open Source Games and Apps.md
+++ b/translated/talk/20140723 110 Fun Open Source Games and Apps.md
@@ -1,197 +1,193 @@
translating by disylee 20140701
110 Fun Open Source Games and Apps
-110款开源游戏和应用
+110款有趣的开源游戏和应用
================================================================================
-再次庆祝,伴随着一系列最好的开源游戏,我们庆祝这个夏天的到来。我们已经更新了[去年的列表][1]把新开发的添加进来,这样更好地把一些不再积极开发之中的旧游戏从列表中剔除。你会发现街机、平板、休闲、拼图、益智和第一人称射击游戏,音乐,赛车,角色扮演,冒险,模拟器和战略游戏等,它们也像一些应用程序一样并非真正的游戏但是仍然非常有趣。
+让我们再次庆祝,这个夏天伴随着一系列最好的开源游戏到来。我们已经更新了[去年的列表][1],把新开发的添加进来,与此同时把一些不再处于积极开发之中的旧游戏从列表中剔除。你能从其中找到街机、棋盘、休闲、拼图、益智、第一人称射击游戏、音乐、赛车、角色扮演、冒险、模拟器和战略游戏等,也有少量其实并非真正的游戏的应用程序,但它们同样非常有趣。
-今年,比以往有更多的开源游戏可用于移动设备上,主要是安卓设备上。希望未来几年,这种趋势一直保存下去。
+今年,有比以往有更多的开源游戏可用于移动设备上,主要是安卓设备。这种趋势,很有希望在未来几年一直保存下去。
-请注意,这个列表是不按排名的。这些应用程序被放在目录中并按照字母顺序放在每个类别里。
+请注意,这个列表并不是排行榜。这些应用程序被分别归类,并在每个类别中按照字母顺序排列。
-如果你想建议明年游戏列表的版本,请随时注意在下面的评论区提出。
+如果你想给明年的游戏列表推荐一个游戏,请随时在下面的评论区中留言。
-### Arcade Games ###
+### 街机游戏 ###
>
#### 1. [安迪的超级大公园][2] ####
-当你乘坐过山车时,你需要抓到气球并且避开障碍物。里面有25个等级,加上18个你可以解锁的等级以获取高分。可使用操作系统:Windows,Linux或者安卓。
+你乘坐在过山车上躲避着障碍物,同时去抓取气球。其中有25个基础关卡,加上18个你可以通过获得高分来解锁的额外关卡。可使用操作系统:Windows,Linux或者安卓。
#### 2. [Armagetron Advanced][3] ####
-一个3D电子争霸克隆,这个游戏激起你去指导一个光周期直到你撞上一堵墙。它支持单机模式和16人参与的网络模式。可使用操作系统:Windows,Linux,OS X或者安卓。
+一个3D复刻电影《创(Tron)》的游戏,这个游戏的挑战是让你操控你的轻型摩托,让对手们比你自己更早地撞上墙。它支持单机模式和最多可16人参与的网络模式。适用操作系统:Windows,Linux,OS X或者安卓。
-#### 3. 塔克大战夺取旗帜 ####
+#### 3. [BZFlag][4] ####
-众所周知的“战场夺旗”,“BZflag是一个流行的在线坦克游戏。自1992年开发以来,它具备3D图形化特征,多种游戏模式和多人竞争比赛等特征。可使用操作系统:Windows,Linux,OS X或者安卓。
+也就是众所周知的“战场夺旗”,BZflag是一个热门的在线坦克游戏。它自1992年开始开发,现在具备了3D画面、多种游戏模式和多人竞争比赛等特性。适用操作系统:Windows,Linux,OS X或者安卓。
-#### 4. [纵向卷轴射击游戏] [5] ####
+#### 4. [Chromium B.S.U.] [5] ####
-别让这个名字就把你愚弄了,这和Chromium browser浏览器无关。这是一款快节奏、顶部滚动射击的游戏,其难度在于设置,而且这个游戏不回超过15分钟。可使用操作系统:Windows,Linux。
+别被这个名字骗过了,它和Chromium浏览器没有任何关系。这是一款快节奏的纵向卷轴射击游戏,它的难点在于如何进行合理的设置,以让游戏中的战斗能在15分钟内结束。适用操作系统:Windows,Linux。
#### 5. [埃德加的传说][6] ####
-埃德加的传说是一个旧派的游戏平台,主角必须通过克服障碍和敌人来完成他的任务。它包含了很多不同的武器、很多不同等级。适用操作系统:Windows,Linux和OS X。
+埃德加的传说是一个老式平台的游戏,主角必须通过克服障碍、打倒敌人来完成他的任务。它包含了许多不同的武器和大量的关卡。适用操作系统:Windows,Linux和OS X。
#### 6. [JVGS][7] ####
-取代非常详细的图形,JVGS只要一个最低限度方法使其中画中人物跨越景观,看起来就像使用铅笔的手工绘制。在这个不寻常的游戏中,主角是一个失去记忆的诗人。适用操作系统:Windows,Linux和OS X。
+比起非常精细的画面,JVGS选择了采用最抽象的方式,用简笔画风格贯穿全部画面,看起来就像使用铅笔手工绘制而成。在这个不寻常的游戏中,主角是一个失去记忆的诗人。适用操作系统:Windows,Linux和OS X。
-#### 7. [失重力][8] ####
+#### 7. [失重][8] ####
-这是基于空间的街机射击游戏,玩家需要在8002年份中,他们必须完成各种各样的任务。但是,这个游戏不是免费的,游戏也可以在安卓和IOS中使用。适用操作系统有:Windows,Linux和OS X。
+这个以太空为背景的街机射击游戏,带领玩家前往8002年的未来,在未来世界中他们必须完成各种各样的任务。可以一提的是,这个游戏也可以在安卓和IOS中使用,但并不是免费的。适用操作系统有:Windows,Linux和OS X。
-#### 8. [Open Sonic][9] ####
+#### 8. [开源索尼克][9] ####
-
-基于刺猬索尼克游戏,Open Sonic提供了合作的游戏,用户可以同时控制3个字符。其中只有2个级别可以在原始游戏中使用,但是很多游戏粉丝们已经建立了mods提供额外的发挥。适用操作系统:Windows, Linux和OS X.
+在刺猬索尼克游戏的基础上,开源索尼克新增了协作的玩法,即玩家用户可以同时控制3个角色。原始的游戏版本只有两个关卡,但是很多游戏粉丝们已经创建了不少可玩的额外模组。适用操作系统:Windows, Linux和OS X.
#### 9. [Powermanga][10] ####
-类是于旧街机游戏Galaga,Powermanga是一款2D,顶部滚动的空间射击游戏。它拥有超过41个等级,并能够在旧的硬件上运行。适用操作系统:Linux。
+类似于老式街机游戏《小蜜蜂》,Powermanga是一款2D的、纵向卷轴的太空射击游戏。它拥有超过41个关卡,并能够在更旧的硬件环境上运行。适用操作系统:Linux。
-#### 10. [Scorched3D][11] ####
+#### 10. [焦土战争3D][11] ####
-Scorched3D是一款现代的基于DOS的游戏Scorched星球,最引人瞩目的是它出色的图形。你可以适用单机模式或者连接到许多网络服务器使用多玩家行动。适用操作系统:Windows, Linux和 OS X.
+焦土战争3D是DOS游戏《焦土战争》的一个现代重制版,最引人瞩目的是它出色的画面。你可以玩单机模式,或者连接到它的许多网络服务器之一,来进行多玩家联机模式。适用操作系统:Windows, Linux和 OS X.
-#### 11. [音速机器人大爆炸][12] ####
+#### 11. [索尼克机器大战 2][12] ####
-另一款声波风格的平台游戏,SRB2是一种采用了Doom引擎内置的3D平台游戏。它包括了2个不同的游戏角色和超过20个等级。适用操作系统:Linux。
+另一款基于刺猬索尼克的平台游戏,SRB2是一款采用了Doom引擎创建的3D平台游戏。它包括了3个不同的可操控角色和超过20个关卡。适用操作系统:Linux。
-#### 12. [SuperTux][13] ####
+#### 12. [超级Tux][13] ####
-SuperTux很像旧款的马里奥兄弟游戏,但是是以Linux的小企鹅成为主人公。这是一个2D横向卷轴的平台游戏,有9个不同的敌人和26个等级可以玩。适用操作系统:Windows, Linux和OS X.
+超级Tux很像经典的马里奥兄弟游戏,不过是以Linux的小企鹅Tux作为主人公。这是一个2D横向卷轴的平台游戏,其中有9种不同的敌人和26个关卡可以玩。适用操作系统:Windows, Linux和OS X.
#### 13. [Those Funny Funguloids][14] ####
-这是一款挑战玩家在太空手机蘑菇的游戏。该网站称:“在此之前从未听说过手机蘑菇。至少不是在外太空。真的,它更是一种生活而不是一个游戏。适用操作系统:Windows和Linux.
+这个独一无二的游戏让玩家挑战在太空中收集蘑菇。该网站称:“此前从未有收集蘑菇的游戏能如此有趣。至少不是在外太空。它比起游戏更像是一种生活方式,相信我。”适用操作系统:Windows和Linux.
#### 14. [Teeworlds][15] ####
-这个在线游戏把自己描述成一个“复古的多人射击游戏”。它是一个横向卷轴的2D游戏,支持多达16名选手和几个不同的游戏模式。适用操作系统:Windows, Linux和 OS X.
+这个在线游戏将自己描述成一个“怀旧多人射击游戏”。它是一个横向卷轴的2D游戏,可支持多达16名玩家和许多不同的游戏模式。适用操作系统:Windows, Linux和 OS X.
#### 15. [X摩托][16] ####
-在这个游戏中,你骑着一辆摩托车通过一个侧面滚动的风景区,同时收集草莓并避免高低不平的“破坏者”。这看起来是比较难!适用操作系统:Windows, Linux和 OS X.
+在这个游戏中,你要骑着一辆摩托车闯过一个横向卷轴地图,同时收集草莓并躲开凶残的“肇事者”。它玩起来比看起来要难!适用操作系统:Windows, Linux和 OS X.
-#### 16. [Yo Frankie!][17] ####
+#### 16. [鼯鼠弗兰基!][17] ####
-通过混合开源3D动画工具创造的,呦羊羊特征角色是从开源电影Peach来的。玩家必须指导羊羊,糖滑翔机或者Momo,一只猴子,来回或者环绕并通过一个非常细致的3D环境中的障碍物。适用操作系统: Windows, Linux和 OS X.
+使用Blender开源3D动画工具开发,鼯鼠弗兰基的特色是角色来源于开源电影Peach。玩家必须操控弗兰基——一只蜜袋鼯鼠,或者Momo——一只猴子,在非常精美的3D环境中跳过、绕过或者穿过各种障碍物。适用操作系统: Windows, Linux和 OS X.
-### 棋类游戏 ###
+### 棋盘游戏 ###
-#### 17. [Domination][18] ####
+#### 17. [统治][18] ####
-基于Java支配带来的棋牌游戏可能会对你的PC或者安卓设备造成风险。最新版本中可以让你实时与你Google+的朋友通过谷歌游戏服务发挥多人游戏服务功能。适用操作系统:Windows, Linux, OS X和 Android.
+基于Java的《统治》为你的PC或安卓设备带来了棋盘游戏《Risk》。最新版本中通过谷歌游戏服务的支持,让你能与你的Google+好友们进行实时的多人游戏。适用操作系统:Windows, Linux, OS X和 Android.
-#### 18. [GNU 十五子棋][19] ####
+#### 18. [GNU 西洋双陆棋][19] ####
-这个“世界级”十五子棋引擎让你每一次都更好地挑战它,并且它会分析你的战况来帮助你玩得更好。这个借口是非常好的图形化定制。适用操作系统:Windows,Linux和OS X。
+这个“世界级”的西洋双陆棋引擎,当你每次挑战它的时候,它都会变得更强,并且它能够分析你的战术来帮助你玩得更好。它的界面很棒,并且还支持个性化定制。适用操作系统:Windows,Linux和OS X。
#### 19. [3D 拼字游戏][20] ####
-随着拼字游戏的变化,你可以选择自己的电路板——经典版本。Superscrabble是一款3D的拼字游戏,您可以通过它定制你自己的电路板。玩家可以对战AI或者连到在线服务器上进行多人游戏。适用操作系统:Windows, Linux和 OS X.
+在这个拼字游戏的变体版本中,你可以选择自己的图板——经典版、超级拼字版、3D拼字版或者你自定义的图板。玩家可以与AI对战,或者连接到在线服务器上进行多人游戏。适用操作系统:Windows, Linux和 OS X.
#### 20. [PokerTH][21] ####
-这是一个高质量的德州扑克牌应用程序,拥有优秀的、可定制的界面。想要在线玩或者看看你和其它对手的排名,只需要在Poker-Heroes.com在线注册。适用操作系统:Windows,Linux和OS X,Android系统。
+这个高品质的德州扑克应用程序拥有优秀的、可定制的界面。想要在线玩并看看你相对于其他玩家的排名,可以前往[Poker-Heroes.com][112]在线注册。适用操作系统:Windows,Linux和OS X,Android系统。
#### 21. [PySolFC][22] ####
-你知道吗,接龙有1000多种类型?这个强大的集合功能“使用52张国际格局甲板模式,比赛为78张Tarock夹板,8和10套装备,Ganjiafa游戏,花札游戏,棋牌游戏、麻将游戏和原始十六进制为基础的平台”。适用操作系统: Windows, Linux和 OS X.
+你知道单人纸牌游戏有超过1000种玩法吗?这个大合辑包含“使用52张纸牌的国际标准纸牌游戏、使用78张纸牌的塔罗纸牌游戏、8张或10张一套的印度双骰游戏、花札游戏、矩阵游戏、麻将游戏和一种原创的基于十六进制的纸牌游戏”。适用操作系统: Windows, Linux和 OS X.
### 休闲益智游戏 ###
#### 22. [2048][23] ####
-
-这个简单而上瘾的益智游戏,玩家围绕着方格里喜欢的数字组合。当你将组合数字累加到2048时,你就赢了。适用操作系统:在线,IOS或者安卓。
+在这个简单却容易上瘾的益智游戏中,玩家需要来回挪动方块来合并数字等。当你将数字累加到2048时,你就赢了。适用操作系统:在线,IOS或者安卓。
#### 23. [台球][24] ####
-台球游戏的主要目的是当你不能够拥有一张可用的台球桌时,给现实中能够让你练习球杆运动。它拥有一个好看的3D界面,同时也可以在不具备良好图形界面的2D系统中运行。适用操作系统:Linux。
+《台球》这个游戏的目标是希望做到足够真实,让你在没有一张可用的台球桌时也够能进行台球杆的运动练习。它拥有一个好看的3D界面,同时也可以在没有良好图形处理能力的系统中以2D形式运行。适用操作系统:Linux。
-#### 24. [立方火车][25] ####
+#### 24. [立方体列车][25] ####
-
-躺在连接隧道和桥梁的铁轨,然后机动绕过障碍物。你可以万很多内置等级的或者创建你属于自己的等级。适用操作系统:Windows,Linux或者OS X。
+铺设铁轨来连接隧道和桥梁,同时采取各种策略绕过障碍物。你可以挑战其中大量的内置关卡,或者自己创建一个。适用操作系统:Windows,Linux或者OS X。
#### 25. [谜语][26] ####
-类似于旧Oxyd和摇滚乐的游戏,谜语挑战者在相同的石头中找到迷宫,陷进,激光束和其他障碍。这个游戏拥有1000多个等级,这也是一款益智游戏,可能占用你一段很长时间。适用操作系统:Windows,Linux和OS X。
-
+类似于以前《Oxyd and Rock'n'Roll》系列游戏,Enigma让玩家挑战从迷宫、陷阱、激光束和其它障碍之间找出配对的石头。这个游戏拥有1000多个关卡,这是一款能让你沉迷很长很长时间的解密游戏。适用操作系统:Windows,Linux和OS X。
#### 26. [Fish Fillets NG][27] ####
-在这个益智游戏中,玩家必须尝试分别在这70个等级中各找到一条安全路径。一路上,鱼类和其它水下居民提供相关用户的幽默解说。适用操作系统:Windows, Linux和 OS X.
+在这个解谜游戏中,玩家必须尝试在70个关卡中分别找到一条安全的通关路径。一路上,鱼类和其它水下居民会对玩家的操作提出幽默的解说。适用操作系统:Windows, Linux和 OS X.
#### 27. [冰冻泡泡][28] ####
-这是最古老的泡沫射击游戏中的一个,冰冻泡沫是以Linux小企鹅和多于100多个级别为特征的单机游戏。你也可以通过局域网或者互联网对阵2~5个玩家。适用操作系统:Windows和Linux。
+作为最古老的泡泡射击游戏之一,冰冻泡沫以Linux小企鹅Tux和超过100个单人游戏关卡为特色。你也可以通过局域网或者互联网对阵2~5个玩家。适用操作系统:Windows和Linux。
#### 28. [GnomeGames][29] ####
-这个集合汇聚了15个不同的休闲游戏,你可以在5分钟以内玩。它包括了数独,一个扫雷游戏,麻将,一个黑白棋版本等等。适用操作系统:Linux。
+这个合辑包含了15个不同的休闲游戏,这些游戏你都可以只花五分钟或更少的时间来玩。它包括了数独、一个扫雷游戏、麻将和一个版本的黑白棋等等。适用操作系统:Linux。
-#### 29. [切番茄][30] ####
+#### 29. [番茄炸弹超人][30] ####
-10分钟内,你可以粉碎多少个西红柿?这种“极端闲暇时间的活动”来自同一个叫做Those Funny Funguloids的团队。适用操作系统: Windows和 Linux.
+10分钟内,你能够粉碎多少个西红柿?这个“特别闲的时候玩的东西”和《Those Funny Funguloids》由同一个的团队打造。适用操作系统: Windows和 Linux.
#### 30. [KDE 游戏][31] ####
-这是为KDE桌面准备的休闲游戏的集合。它包含了一个游戏纸牌的变化,一个高尔夫游戏,一个风险版本,扫雷艇,数度等等。适用操作系统:Windows和Linux。
+这是一个KDE桌面上的休闲游戏合辑。它包含了一个变体纸牌游戏、一个版本的打砖块、一个高尔夫游戏、一个版本的Risk、一个扫雷,还有数独等等。适用操作系统:Windows和Linux。
-#### 31. [平衡球][32] ####
+#### 31. [Neverball][32] ####
-在这个游戏中,玩家必须倾斜地板去引导球通过障碍球场。这个游戏包括很多级别,并且你可以设计自己的级别。适用操作系统:Windows, Linux和 OS X。
+在这个游戏中,玩家必须倾斜地板去引导球通过障碍场地。这个游戏包括许多关卡,并且你可以设计自己的关卡。适用操作系统:Windows, Linux和 OS X。
-#### 32. [Pingus][33] ####
+#### 32. [疯狂小企鹅][33] ####
-你是否还话费数个小时玩旅鼠总动员来追忆的你90年代?如果这样的话,Pingus会更适合你。这是旅鼠的翻拍(企鹅取代了旅鼠)有77个级别。适用操作系统:Windows, Linux和 OS X.
+在90年代时,你是否曾经花费数个小时去玩《疯狂小旅鼠》?如果是这样的话,Pingus就是为你而设计的。它是《疯狂小旅鼠》的一个复刻版(使用企鹅替代了旅鼠),有77个关卡。适用操作系统:Windows, Linux和 OS X.
-#### 33. [易如反掌][34] ####
+#### 33. [推倒][34] ####
-这个益智游戏的特点是蚂蚁来推排成各种团的多米若骨牌。玩家必须让所有多米诺骨牌倒下,并通过出口,为的是发送一个特别的触发信号来进入新的等级。适用操作系统:Windows。
+这个解谜游戏的特色是,让蚂蚁来推倒具有各种不同图案的多米诺骨牌。玩家必须让所有多米诺骨牌倒下,并将一个特殊的触发信号发送至出口,这样才能进入下一关。适用操作系统:Windows。
#### 34. [Zaz][35] ####
-这是另一款泡沫射手游戏,Zaz挑战你沿着他们设定的路径击中球。其转折点是你的枪炮只能沿着一条路径移动,这样使事情变得有点难度了。适用操作系统:Windows和Linux。
+这是另一款泡泡射击游戏,Zaz让你挑战射击一些沿着预定路线前进的小球。其独到之处是你的发射器也是沿着一条预定路径移动着的,这样就让各种操作变得更难一些了。适用操作系统:Windows和Linux。
-### 教育类游戏 ###
+### 益智游戏 ###
#### 35. [ChildsPlay][36] ####
-这个游戏专门有5岁及一下的小孩设计,ChildsPlay帮助教一些发音,字母,数字和基础键盘技巧。它也包括了一些游戏,例如记忆,乒乓球和吃豆豆。适用操作系统:Windows,Linux和OS X。
+ChildsPlay专为5岁及以下的儿童设计,能够帮助指导他们发音、字母、数字和基础的键盘技巧。它也包括了一些游戏,例如记忆游戏、打砖块和吃豆豆。适用操作系统:Windows,Linux和OS X。
#### 36. [GBrainy][37] ####
-通过GBrainy的逻辑,训练你的词汇、数学和记忆游戏的意识。它充满了乐趣和教育意义,适合所有年龄段的人群。适用操作系统:Windows和 Linux.
+通过GBrainy中的逻辑、词汇、数学和记忆游戏,来锻炼你的思维。它对于所有年龄段的玩家来说,都会十分有趣并且有益头脑。适用操作系统:Windows和 Linux.
#### 37. [GCompris][38] ####
-专为2~10岁的儿童射击, GCompris 包括了超过100多种but的活动,其中大多数是教育类的。它包括数学,地理,科学,阅读,敲键盘和艺术游戏,再加上国际象棋,数独,记忆法等等。适用操作系统:Wwindows和Linux。
+专为2~10岁的儿童设计,GCompris包含了超过100种不同的游戏,其中大多数是教育性质的。它包括数学、地理、科学、阅读、敲键盘和艺术游戏,再加上国际象棋、数独、记忆游戏等等。适用操作系统:Wwindows和Linux。
#### 38. [TuxMath][39] ####
-在即将到来的彗星杀死企鹅之前迅速解决算数问题。这是一个简单的游戏用于强化小学学龄的数学真相。适用操作系统:Windows, Linux和 OS X.
+在即将到来的彗星杀死企鹅之前迅速地解决数学问题。这个简单的游戏能够强化小学年龄段学生们的数学能力。适用操作系统:Windows, Linux和 OS X.
### 第一人称射击游戏 ###
#### 39. [外星人竞技场][40] ####
-内置的“专为手榴弹攻击者的手榴弹,”外星人竞技场是一个激烈的充满复古题材的死亡争斗射击者。许多不同的网站为线上游戏提供了托管服务器,也有很多粉丝网站和玩家技巧等等。适用操作系统:Linux, Windows和 OS X.
+被设计为“以弹药对抗弹药”,《外星人竞技场》是有着复古科幻主题的一场紧张的死亡竞争射击枪战。许多不同的网站为联机游戏提供了托管服务器,也有很多记录了各种游戏技巧等等的粉丝网站。适用操作系统:Linux, Windows和 OS X.
#### 40. [AssaultCube][41] ####
-由于它的轻量级,AssaultCube也可以在旧硬件上运行,除了拥有不错的真实感图形之外。它还支持单机模式和多玩家游戏模式,包括了26张不同的地图和12种不同的游戏模式。适用操作系统:Linux,Wwindows和OS X。
+因其轻量级,即使拥有非常不错的真实感画面,AssaultCube仍然能在更旧的硬件设备上运行。它支持单人和多人游戏,包括了26张不同的地图和12种不同的游戏模式。适用操作系统:Linux,Wwindows和OS X。
#### 41. [经典 Nexuiz][42] ####
@@ -498,7 +494,7 @@ Tux Paint可以让学龄前儿童很容易地在电脑上创建自己的“图
via: http://www.datamation.com/open-source/110-fun-open-source-games-and-apps-1.html
-译者:[disylee](https://github.com/译者ID) 校对:[校对者ID](https://github.com/校对者ID)
+译者:[disylee](https://github.com/译者ID) 校对:[ReiNoir](https://github.com/reinoir)
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
@@ -613,3 +609,4 @@ via: http://www.datamation.com/open-source/110-fun-open-source-games-and-apps-1.
[109]:http://lcars24.com/
[110]:http://stellarium.org/
[111]:http://tuxpaint.org/
+[112]:http://www.poker-heroes.com/register.html
\ No newline at end of file
diff --git a/translated/talk/20140724 Best Linux Browsers.md b/translated/talk/20140724 Best Linux Browsers.md
new file mode 100644
index 0000000000..874a68d4a3
--- /dev/null
+++ b/translated/talk/20140724 Best Linux Browsers.md
@@ -0,0 +1,80 @@
+Linux中一些最优秀的浏览器
+================================================================================
+> 讨论Linux桌面上一些最优秀浏览器的优缺点,讨论对象包括Firefox,Chrome和其它浏览器。
+
+选择满足你的需要的最棒的一款Linux浏览器仅费些许功夫:网页浏览器在Linux桌面上就和在其他流行的桌面上一样已经发展了多年,随着它们的发展,其优点和缺点都被慢慢发现。优缺点涉及从新功能到被破坏的扩展程序等各方面。本文中,我将在迷茫之中充当你的向导来帮助你发现适合你的最棒的Linux浏览器。
+
+### **Firefox** ###
+
+– [Firefox][1]已经成为Linux用户的一款友好的浏览器很长时间。 它在32位和64位的Linux上都可用,同时Firefox提供丰富的扩展程序供选择。firefix是一款装载快速,易于使用的浏览器,在Linux用户中很流行。
+
+**优点**: 如果Firefox没有被预装在某个Linux发行版的话,它也能很方便地从大多数常见Linux软件仓库中安装。上千种供选择的扩展程序可以能让你的firedox极富个性化。几乎所有的网站都能正确地被Firefox渲染(包括政府网站和银行网站)。
+
+另外很重要的事:Firefox尊重你的隐私。Firefox有一项直白的隐私政策,他们同谷歌可不是一回事。因此,大多数用户能放心地让Firefox查看他们的日常浏览记录,然而,其他的某些浏览器可能会对用户的隐私有一些受利益驱使的兴趣。Firefox也非常适用于web开发者,这得感谢內嵌入Firefox的元素检查工具。
+
+**缺点**: 不久之前,我发现Firefox的频繁更新会破坏我的扩展程序。这就意味着每次在我更新Firefox前我得检查我最喜欢的一些扩展程序是否与新的Firefox兼容。
+
+老实说,这让我重新考虑该把谁作为我的默认上网浏览器。为了做到合理,Mozilla在每次更新Firefox时都会向扩展程序开发者发出邮件通知。在这些邮件中,开发者会被告知改动了些什么以及怎样做来使Firefox和这些扩展程序一起流畅地工作。
+
+### **Chrome/Chromium** ###
+
+– Google提醒大家它的的浏览器叫[Chrome][2],然而自从[Chromium][3]被作为Chrome的开发基础后我就倾向于把Chromium和Chrome视为一类。不像Firefox,Chrome/Chromium进入Linux比较晚,直到Chrome被大多数人意识到是最快的浏览器后Linux使用者才觉得它值得一试。
+
+**优点**: 即使是在今天,Chrome也是超快的。虽然最近很多浏览器的升级使它有了竞争对手,但在速度方面Chrome/Chrommium还从未输过。Chromr/Chromium支持的扩展程序数量丰富甚至质量更好,而且升级Chrome/Chromium对它的扩展程序并没有影响。这就意味着,不像Firefox,我不需要去处理扩展程序的不兼容性。和Firefox一样,Chrome/Chromium也有内嵌入浏览器的元素检查工具。和其它浏览器一起试验同步功能后,只有Chrome/Chromium 证明了它是安全可靠的。在我看来,Chrome/Chromium的同步功能毫无疑问是众多浏览器中最好的。
+
+**缺点**: Chrome/Chromium有时候不能正确地渲染网页。有这样一些很少见的情形,一些网站比如Ebay不能被正确地渲染。举个例子,假如我在新建一个Ebay提交,有时候会缺少某些网页按钮。我还发现有时候当一个打开的标签页正在执行大型脚本时Chrome/Chromium会整个卡住。比如Goole Plus 和 Facebook这样的网站就是最常见的例子。
+
+### **Qupzilla** ###
+
+– 当说到轻量级浏览器时,我认为[Qupzilla][4]是最棒的。基于webkit,它能在很小的资源占用下提供相当好的网页渲染支持。
+
+**优点**: 如果你需要一款现代化的能正确渲染网页,并大体上能提供可靠的网络浏览体验的浏览器,那么对于轻量的桌面环境来说,Qupzilla是你的理想选择。它相当轻巧,能够在老的计算机上非常稳定地运行。Qupzilla预装了Access keys 和 [GreaseMonkey][5]插件(但没有被启用)。
+
+和Firefox和Chrome/Chromium一样,Qupzilla也提供元素检查工具。最后,由于Qupzilla预装了[Adblock][6]插件,这就明确地使得它成为我心中的轻量级浏览器冠军。
+
+**缺点**: HTML5 “视频”标签在Qupzilla上好像无法可靠地工作。而且,为了观看Flash视频,你得进入首选项并且在Webkit插件区域的扩展程序中钩去Click to Flash选项, 在HTML5 “视频”标签还是完全损坏的情况下,这个没有经过好好考虑的设计实质上使得Flash无法直接播放。
+
+### **Midori** ###
+
+– 我喜欢把[Midori][7]叫做轻量级的Chrome。和Goolge的浏览器一样,Midori通过它的“汉堡式”菜单给用户提供极简风格的体验,汉堡式菜单相当棒因为它占用的浏览器空间更少。在没有其它浏览器信条的情况下你不仅能获得稳定的上网体验,而且Midori也很快速。
+
+**优点**: Midori快速,轻量,接近于开箱即用。它能够正确地渲染网页而且能够很好的浏览像YOUTUBE一样的网站。我认为Midori最棒的地方就是内嵌入浏览器的浏览器设置功能和网页应用快捷方式。举个例子,你可以很简单地在你的桌面上建立一个Gmail或Facebook的快捷方式。你也可以创建另外的浏览器设置,而不用新建立一个Linux用户帐号。
+
+**缺点**: 虽然也提到过Midori的用户扩展程序,但可用的扩展程序并不出色。另外,用户得费些许功夫来习惯Midora的布局。 比如它给浏览过的网站还弄个垃圾桶-有没有搞错?
+
+### **Opera** ###
+
+– [Opera][8]长时间是被误解的浏览器之一。很早以前,Opera浏览器在所有Linux社区的反对下提供了Linux平台下的支持。不过后来还好,Opera成为了服务Linux用户的一个快速,和谐的浏览器,它也有很丰富的设置选项。
+
+**优点**: 快速,自定性选项丰富。你可以在浏览器中发送和接收从RSS 订阅到电子邮件等等,skin Opera 可以让你很方便得获取炫丽的浏览器主题。Opera提供一个丰富的拓展仓库来供你选择扩展程序。我们不仅能从Opera阅读RSS 订阅和电子邮件,我们还能使用Opera的扩展套件功来能重温使用Mozilla Suite的日子。但也许最重要的是,Opera Turbo -能极大提高你的上网速度,它通过对浏览内容的选择性压缩来给用户提供一个更快的上网体验。
+
+**缺点**: 首次运行要麻烦地配置很多服务. Opera Turbo对你的上网体验有些许影响----比如YouTube,可能无法显示视频的缩略图。Opera提供的如此之多设置选项可能令业余使用者手足无措。最后,Opera是闭源软件,作为桌面浏览器它不是被很认可。大多数爱好者仅把它当作一款手机浏览器。
+
+### 哪款浏览器适合你? ###
+
+有这么多棒极了的选择,很难说哪个适合你。对我来说,由于我每天工作需的一些特定扩展程序,所以我很依赖于Firefox和Chromium。对于一些使用低端机子或是上网本,我的建议是先试试Midori,如果不合适的话,再回头看看Qupzilla。
+
+那么Linux上的其它浏览器怎么样呢?比如[Epiphany][9]或是[Konqueror][10]?像这样的浏览器也很棒,但是我对我上面所提到的浏览器印象深刻。上面所列举的都是我经常使用的浏览器,我觉得它们有些地方很出色并且我很开心地向朋友和家人都推荐它们。
+
+请务必在下面的评论区域中和我们分享你喜欢什么浏览器,这样其他人也许可以从你的上网方式中得到启发。
+--------------------------------------------------------------------------------
+
+via: http://www.datamation.com/open-source/best-linux-browsers-1.html
+
+原文作者:[Matt Hartley][a]
+
+译者:[Love-xuan](https://github.com/译者ID) 校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://www.datamation.com/author/Matt-Hartley-3080.html
+[1]:https://www.mozilla.org/en-US/firefox/new/
+[2]:https://www.google.com/intl/en_us/chrome/browser/
+[3]:http://www.chromium.org/
+[4]:http://www.qupzilla.com/
+[5]:https://addons.mozilla.org/en-US/firefox/addon/greasemonkey/
+[6]:https://adblockplus.org/
+[7]:http://midori-browser.org/
+[8]:http://www.opera.com/
+[9]:https://wiki.gnome.org/Apps/Web
+[10]:http://www.konqueror.org/
\ No newline at end of file
diff --git a/translated/talk/20140724 What are useful online tools for Linux.md b/translated/talk/20140724 What are useful online tools for Linux.md
new file mode 100644
index 0000000000..b01b5b189a
--- /dev/null
+++ b/translated/talk/20140724 What are useful online tools for Linux.md
@@ -0,0 +1,148 @@
+适用于Linux的在线工具
+================================================================================
+众所周知,GNU Linux不仅仅只是一款操作系统。看起来通过互联网全球许多人都在致力于这款企鹅图标(即Linux)的操作系统。如果你读到这篇文章,你可能倾向于读到关于Linux联机的内容。在可以找到的所有关于这个主题的网页中,有一些网站是每个Linux爱好者都应该收藏起来的。这些网站不仅仅只是教程或回顾,更是可以随时随地访问并与他人共享的实用工具。所以,今天我会建议一份包含16个应该收藏的网址清单。它们中的一些对Windows或Mac用户同样有用:这是在他们的能力范围内可以做到的。(译者注:Windows和Mac一样可以很好地体验Linux)
+### 1. [ExplainShell.com][1] ###
+
+[][2]
+
+如果你对Linux命令行感兴趣,那就试试这个网站。如果你对Linux命令行不感兴趣,那就更应该试试它,因为它会详尽地告诉你一个命令是如何工作的。这会防止你无意执行一个对电脑有害的命令,而且通过一个非常赞的界面来学习是一个好方法。
+
+### 2. [BashrcGenerator.com][3] ###
+
+[][4]
+
+如果你想开始学习Linux命令行,或者想快速地得到一个自定义的shell命令提示符,但不知道从何下手,这个网站会为你生成PS1提示代码,在家目录下放置.bashrc文件。你可以拖拽任何你想在提示符里看到的元素,譬如用户名和当前时间,这个网站都会为你编写易懂可读的代码。绝对是懒人必备!
+
+### 3. [Vim-adventures.com][5] ###
+
+[][6]
+
+我是最近才发现这个网站的,但我的生活已经深陷其中。简而言之:它就是一个使用Vim命令的RPG游戏。在等距的水平上使用‘h,j,k,l’四个键移动字母,获取新的命令/能力,收集关键词,非常快速地学习高效地使用Vim。
+
+### 4. [Try Github][7] ###
+
+[][8]
+
+目标很简单:15分钟学会Git。这个网站模拟一个控制台,带你遍历这种协作编辑的每一步。界面非常时尚,目的十分有用。唯一不足的是对Git敏感,但Git绝对是一项不错的技能,这里也是学习Git的绝佳之处。
+
+### 5. [Shortcutfoo.com][9] ###
+
+[][10]
+
+又一个包含众多快捷键数据库的网站,shortcutfoo以更标准的方式将其内容呈现给用户,但绝对比有趣的迷你游戏更直截了当。这里有许多软件的快捷键,并按类别分组。虽然它不像Vim一类完全依赖快捷键的软件那么全面,但也足以提供快速的提示或一般性的概述。
+
+### 6. [GitHub Free Programming Books][11] ###
+
+[][12]
+
+正如你从URL上猜到的一样,这个网站就是免费在线编程书籍的集合,使用Git协作方式编写。上面的内容非常好,作者们应该为做出这些工作受到表扬。它可能不是最容易阅读的,但一定是最有启发性的之一。我们只希望这项运动能持续进行。
+
+### 7. [Collabedit.com][13] ###
+
+[][14]
+
+如果你曾经准备过电话面试,你应该先试试collabedit。它让你创建文件,选择你想使用的编程语言,然后通过URL共享文档。打开链接的人可以免费地实时使用文本交互,使你可以评判他们的编程水平或只是交换一些程序片段。这里甚至还提供合适的语法高亮和聊天功能。换句话说,这就是程序员的即时Google文档。
+
+### 8. [Cpp.sh][15] ###
+
+[][16]
+
+尽管这个网站超出了Linux范围,但因为它非常有用,所以值得将它放在这里。简单地说,这是一个C++在线开发环境。只需在导航栏里编写程序,然后运行它。作为奖励,你可以使用自动补全、Ctrl+Z,以及和你的小伙伴共享URL。这些有趣的事情,你只需要通过一个简单的浏览器就能做到。
+
+### 9. [Copy.sh][17] ###
+
+[][18]
+
+如果想继续在浏览器上做一些疯狂的事情,你可以试试在copy.sh上在线运行一个虚拟机。就是这么简单。这个网站最近小有名气,但这个点子确实有些疯狂。从导航栏里,你可以选择运行默认的虚拟机镜像,或者上传你自己的iso文件。这项壮举的代码已经共享在[GitHub][19]。尽情尖叫吧!
+
+### 10. [Commandlinefu.com][20] ###
+
+[][21]
+
+我们总是在自己的电脑上保存着一大段类似于“gems”的命令行【翻译得不准确,麻烦校正】,commandlinefu的目标是把这些片段释放给全世界。作为一个协作式数据库,它就像是命令行里的维基百科。每个人可以免费注册,把自己最钟爱的命令提交到这个网站上给其他人看。你将能够获取来自四面八方的知识并与人分享。如果你对精通shell饶有兴趣,commandlinefu也可以提供一些优秀的特性,比如随机命令和每天学习新知识的新闻订阅。
+
+### 11. [Alias.sh][22] ###
+
+[][23]
+
+另一协作式数据库,alias.sh(我爱死这个URL了)有点像commandlinefu,但是为shell别名开发的。你可以共享和发现一些有用的别名,来使你的CLI(命令行界面)体验更加舒服。我个人喜欢这个获取图片维度的别名。
+
+ function dim(){ sips $1 -g pixelWidth -g pixelHeight }
+
+你通过alias.sh节省下来的时间会积少成多,当你走到人生尽头的时候,会发现省下了许多年。(译者注:珍爱生命,多用别名!)
+
+### 12. [Distrowatch.com][24] ###
+
+[][25]
+
+有谁不知道Distrowatch?除了基于这个网站流行度给出一个精确的Linux发行版排名,Distrowatch也是一个非常有用的数据库。无论你正苦苦寻找一个新的发行版,还是只是出于好奇,它都能为你能找到的每个Linux版本呈现一个详尽的描述,包含默认的桌面环境,包管理系统,默认应用程序等信息,还有所有的版本号,以及可用的下载链接。总而言之,这就是个Linux宝库。
+
+### 13. [Linuxmanpages.com][26] ###
+
+[][27]
+
+一切都在URL中:随时随地获取主流命令的手册页面。尽管不确信对于Linux用户是否真的有用,因为他们可以从真实的终端中获取这些信息,但这里的内容还是值得关注的。
+
+### 14. [AwesomeCow.com][28] ###
+
+[][29]
+
+这里可能少一些核心的Linux内容,但肯定是有一些用的。Awesomecow是一个搜索引擎,来寻找Windows软件在Linux上的替代品。它对那些迁移到企鹅操作系统(Linux)或习惯Windows软件的人很有帮助。我认为这个网站代表一种能力,表明了在谈到软件质量时Linux也可以适用于专业领域。大家至少可以尝试一下。
+
+### 15. [PenguSpy.com][30] ###
+
+[][31]
+
+Steam在Linux上崭露头角之前,游戏性可能是Linux的软肋。但这个名为“pengsupy”的网站不遗余力地弥补这个软肋,通过使用漂亮的接口在数据库中收集所有兼容Linux的游戏。游戏按照类别、发行日期、评分等指标分类。我真心希望这一类的网站不会因为Steam的存在走向衰亡,毕竟这是我在这个列表里最喜爱的网站之一。
+
+### 16. [Linux Cross Reference by Free Electrons][32] ###
+
+[][33]
+
+最后,对所有的专家和好奇的用户,lxr是源自Linux Cross Reference的回文构词法,使我们能交互地在线查看Linux内核代码。通过标识符可以很方便地使用导航栏,你可以使用标准的diff标记对比文件的不同版本。这个网站的界面看起来严肃直接,毕竟这只是一个希望完美阐述开源观点的网站。
+
+总而言之,应该列出更多这一类的网站,作为这篇文章第二部分的主题。但这篇文章是一个好的开始,是一道为Linux用户寻找在线工具的开胃菜。如果你有其它任何想要分享的页面,而且是紧跟这个主题的,在评论里写出来。这将有助于续写这个列表。
+--------------------------------------------------------------------------------
+
+via: http://xmodulo.com/2014/07/useful-online-tools-linux.html
+
+原文作者:[Adrien Brochard][a](我是一名来自法国的Linux狂热爱好者。在尝试过众多的发行版后,我最终选择了Archlinux。但我一直会通过叠加技巧和窍门来优化我的系统。)
+
+译者:[KayGuoWhu](https://github.com/KayGuoWhu) 校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://xmodulo.com/author/adrien
+[1]:http://explainshell.com/
+[2]:https://www.flickr.com/photos/xmodulo/14517716647/
+[3]:http://bashrcgenerator.com/
+[4]:https://www.flickr.com/photos/xmodulo/14703872782/
+[5]:http://vim-adventures.com/
+[6]:https://www.flickr.com/photos/xmodulo/14681149696/
+[7]:https://try.github.io/
+[8]:https://www.flickr.com/photos/xmodulo/14517499739/
+[9]:https://www.shortcutfoo.com/
+[10]:https://www.flickr.com/photos/xmodulo/14517499799/
+[11]:https://github.com/vhf/free-programming-books/blob/master/free-programming-books.md
+[12]:https://www.flickr.com/photos/xmodulo/14517499989/
+[13]:http://collabedit.com/
+[14]:https://www.flickr.com/photos/xmodulo/14681150086/
+[15]:http://cpp.sh/
+[16]:https://www.flickr.com/photos/xmodulo/14700981001/
+[17]:http://copy.sh/v24/
+[18]:https://www.flickr.com/photos/xmodulo/14517479870/
+[19]:https://github.com/copy/v86
+[20]:http://www.commandlinefu.com/
+[21]:https://www.flickr.com/photos/xmodulo/14517495938/
+[22]:http://alias.sh/
+[23]:https://www.flickr.com/photos/xmodulo/14701762124/
+[24]:http://distrowatch.com/
+[25]:https://www.flickr.com/photos/xmodulo/14681149996/
+[26]:http://www.linuxmanpages.com/
+[27]:https://www.flickr.com/photos/xmodulo/14704165765/
+[28]:http://awesomecow.com/
+[29]:https://www.flickr.com/photos/xmodulo/14704165965/
+[30]:http://www.penguspy.com/
+[31]:https://www.flickr.com/photos/xmodulo/14517495728/
+[32]:http://lxr.free-electrons.com/
+[33]:https://www.flickr.com/photos/xmodulo/14712049464/
\ No newline at end of file
diff --git a/translated/talk/20140724 diff -u--What is New in Kernel Development.md b/translated/talk/20140724 diff -u--What is New in Kernel Development.md
new file mode 100644
index 0000000000..f97f22695e
--- /dev/null
+++ b/translated/talk/20140724 diff -u--What is New in Kernel Development.md
@@ -0,0 +1,44 @@
+diff -u: 内核开发里的新鲜事儿
+================================================================================
+偶尔总会有人指出Linux中的POSIX违规(注:violation此处暂译为违规,若不妥,请修正),通常的回答是修复违规问题,但有时李纳斯·托瓦兹认为POSIX特性是不完整的,至少他们维护Linux特性的情形下是这样的。因此,他们或许应该构建一层POSIX兼容层,即便这个分层会相对较慢和低效。
+
+这一次,*迈克尔·凯利斯克*报告了一个影响文件操作的POSIX违规。显然,在多线程操作期间读写文件会导致竞争出现,重写其它操作的改变。
+
+关于这是否是POSIX的一个违规存在一些讨论,但到最后又有谁关心呢?数据重写是很糟糕的。在迈克尔提交部分代码去重现这个问题后,讨论的问题集中到该做什么去修复它。但迈克尔确实提出了“Linux从早期开始就与UNIX不一致。(如在1992年版的史蒂夫的APUE的191页讨论到fork()操作后在父进程与子进程之间文件偏移量的共享问题。尽管史蒂夫没有显式地讲清楚一致性的保证,但缺乏这个保证的推论这里的讨论可能有些没意义。)”的观点。
+
+艾尔·维洛和李纳斯一起设法解决这个修复。李纳斯尝试引入一个简单的互斥量去锁住文件,以便写操作无法互相重写。艾尔提出了自己的改进以改善李纳斯的补丁。
+
+李纳斯一度解释过这个故障自身的历史。显然,从前这个用来告诉系统去哪里写文件的文件指针已经被锁在一个信号量中,所以只有一个进程可以在某一时刻对这个文件做任何操作。但是,他们从中拿走了这个信号量,以便在任何时候可以适应设备文件和其它非常规文件,因为当用户被禁止写入其中时它们就会陷入竞争状态。
+
+这就是错误的由来。那时候,它悄悄通过了检查,未被发现。因为实际上对常规文件的读写仍然由内核自动处理。只有文件指针自身可以避免同步。而且,因为高速线程化的文件操作是一个非常罕见的需求,所以对任何人来说都需要很长时间才能遇到这个问题并报告它。
+
+一个有趣的小细节是当李纳斯和艾尔在寻找一个修复方案时,艾尔一度抱怨李纳斯采用的方法并不能支持确定的架构,包括*ARM*和*PowerPC*。李纳斯的回应是“我怀疑关心这个是否有意义。[...]如果使用ARM/PPC架构的人停止抱怨,他们可以往gcc中加入struct-return的支持。”
+
+看到这些问题突然产生并得到处理通常是很有趣的。在某些情况下,这个修复的部分工作必须在内核中进行,部分在GCC中,部分在其它地方。在这个特例里,艾尔认为整个事情都应该在内核里处理,他在灵感的激发下往补丁中写入了自己的版本,李纳斯也接受了。
+
+*安迪·克伦*则想为*perf*增加底层CPU事件支持。问题在于这可能会导致大量的底层事件,而且会因CPU的变化而改变。即使为了所有类型的CPU把可能的时间都存储在内存里,也可能会显著地增加内核的运行大小。因此,把这个信息硬编码进内核的方法是有问题的。
+
+他也指出*OProfile*工具依赖于这些时间的公开可用列表,尽管他表示OProfile开发者并非总维持他们的列表与最新的可用版本一致。
+
+为了解决这些问题,安迪提交了一个补丁,允许perf识别在给定的系统上为特定的CPU需要那种事件列表,并自动从起始位置下载这个列表的最新版本。然后perf可以解释这个列表并分析其中的事件,不会使内核负载过重。
+
+有各种各样对安迪代码的反馈,其中大部分涉及到应该在哪个目录下保存事件列表和文件如何命名。这份代码本身的特性似乎得到了很好的回应。一处细节证明了安迪的代码比其他人的更有争议,就是将列表下载到用户家目录下的一个子目录。安迪表示如果不这样做的话,用户可能会以系统管理员的身份去下载事件列表,这会是危害安全的操作。
+
+萨沙·莱文最近发布了一个脚本来从堆栈转储中把*十六进制的偏移量*翻译成有意义的指向内核源码文件的行号。因此诸如“ffffffff811f0ec8”形式的十六进制表示可以被翻译成“fs/proc/generic.c:445”。
+
+然而,结果表明李纳斯·托瓦兹正打算从堆栈转储中移除十六进制偏移量,具体原因是他们难以理解。所以萨沙的代码看起来过时了。【译者注:程序媛,伤不起!】
+
+他们在这个问题上纠结了一番。起初,萨沙打算依赖存储在System.map文件里的数据区补偿,但李纳斯指出包括他在内的有些人并不会保留System.map文件。李纳斯推荐使用/usr/bin/nm从编译好的内核文件中提取符号表。
+
+所以,似乎萨沙的脚本可能确实为调试堆栈转储提供了有意义的文件和行号,假设堆栈转储提供足够的信息去完成计算。
+--------------------------------------------------------------------------------
+
+via: http://www.linuxjournal.com/content/diff-u-whats-new-kernel-development-0
+
+原文作者:[Zack Brown][a]
+
+译者:[KayGuoWhu](https://github.com/KayGuoWhu) 校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://www.linuxjournal.com/user/801501
\ No newline at end of file
diff --git a/translated/talk/20140731 LibreOffice 4.3 Goes Live, Includes Fix for 11 Year Old Bug.md b/translated/talk/20140731 LibreOffice 4.3 Goes Live, Includes Fix for 11 Year Old Bug.md
new file mode 100644
index 0000000000..01dd0d2a93
--- /dev/null
+++ b/translated/talk/20140731 LibreOffice 4.3 Goes Live, Includes Fix for 11 Year Old Bug.md
@@ -0,0 +1,68 @@
+LibreOffice 4.3发布,包括修复了11年的Bug
+===============================================================================
+
+> 如果你长时间地在开源办公套件中写'怪物段落',此次的发行版本正是你需要的
+
+
+
+** 新的一个月,新发行版本的LibreOffice开源办公套件将默认的安装在Ubuntu中 **
+
+LibreOffic 4.3是2010年从OpenOffice分离以来的第八个主要发行版本软件,也是4.x发行版本系列的第三个次要版本
+
+### 有那些新功能? ###
+
+每一个主要的办公套件发行版本都有着巨大的变化,包括修复和更新,如果你有很多的空余时间,你可以在文档基金会查看最新更新的所有变更日志
+[wiki at wiki.documentfoundation.org/ReleaseNotes/4.3][1]
+
+为了节省您的时间,关于这次更新,我们已经将更多面向用户和头条的新特性整理成了一个简短的摘要
+
+
+### 文档的互操作性 ###
+
+作为许多办公套件之一的LibreOffice,在处理,打开,保存其他办公文件格式的功能方面有着很大的改进
+
+在LibreOffice 4.3中,这将导致一系列的OOXML改进,包括DrawingML特性,主题字体,文件嵌套。字体,段落,表格单元格的主题颜色现在将被保存,同样的,4.3也支持给图片和形状增加样式,填补和其他一些操作
+
+Microsoft Office**用户会发现微软office支持30个额外的Excel公式**,Mac用户会很高兴地发现老的ClarisWorks, MacWorks and SuperPaint文件现在可以在LibreOffice中打开
+
+在文档中的嵌套注释得益于格式化的整理,而且现在可以同时导入导出为.doc,.rft,和.docs文件(等等)
+
+### 其他值得注意的变化 ###
+
+- 支持3D动画模型
+- 支持Collada和.kmz文件
+- 在Windows和Linux中支持初始化HiDPI
+- 启动中心现已预览所有文件,而不只是.odf
+- .docx导入时的进度条
+- PDF导入时的调整,包括旋转的的文本支持
+
+最后,一个11年的bug:阻止超过65,000字符的‘怪物’段落的输入,最后被修复了。TDF说这个归结于“*LibreOffice
+*的一个专有功能---OOo源码的现代化”
+
+### 下载LibreOffice 4.3 ###
+
+LibreOffice 4.3可以从官方网站上下载 [libreoffice.org/download][2], 或者直接通过下面的链接:
+
+ - [Linux x64 (.deb)][3] // [Torrent][4]
+ - [Linux x86 (.deb)][5] // [Torrent][6]
+
+ 如果你不喜欢升级,你可以找到包含在Ubuntu 14.10中的发行版本,这将于今年晚些时候发布
+
+ --------------------------------------------------------------------------------
+
+via: http://www.omgubuntu.co.uk/2014/07/libreoffice-4-3-released-includes-fix-11-year-old-bug
+
+作者:[Joey-Elijah Sneddon][a]
+译者:[su-kaiyao](https://github.com/su-kaiyao)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:https://plus.google.com/117485690627814051450/?rel=author
+[1]:https://wiki.documentfoundation.org/ReleaseNotes/4.3
+[2]:http://www.libreoffice.org/download/
+[3]:http://www.libreoffice.org/download/libreoffice-fresh/?type=deb-x86_64&version=4.3.0&lang=en-US
+[4]:http://download.documentfoundation.org/libreoffice/stable/4.3.0/deb/x86_64/LibreOffice_4.3.0_Linux_x86-64_deb.tar.gz.torrent
+[5]:http://www.libreoffice.org/download/libreoffice-fresh/?type=deb-x86&version=4.3.0&lang=en-US
+[6]:http://download.documentfoundation.org/libreoffice/stable/4.3.0/deb/x86/LibreOffice_4.3.0_Linux_x86_deb.tar.gz.torrent
+
diff --git a/translated/talk/Linux System Administration Skills are Changing.md b/translated/talk/Linux System Administration Skills are Changing.md
new file mode 100644
index 0000000000..2f2a836c9d
--- /dev/null
+++ b/translated/talk/Linux System Administration Skills are Changing.md
@@ -0,0 +1,49 @@
+正在经历变革的 Linux 系统管理员技能
+================================================================================
+你上次编译内核是多久以前的事儿了?新生代 Linux 管理员的答案很简单:我压根儿没编译过内核。我也从没编译过内核,当然自己弄着玩儿的不算。我实在想不到我为啥需要自定义内核,所以我就用我的“开箱即用”内核了。
+
+Linux 老鸟们可能会笑话我们,但你不能否认:随着越来越多的企业采用 Linux,新生代的 Linux 管理员虽然生就一身相当不错的技术实力,却因缺乏编译内核这类简单却基础的技能而和一个优秀的 Linux 管理员之间存在差距。我们能用时下最前沿的技术搭建一套高性能、高可用的 Web 基础设施,但你别让我们修理一台无法启动的 Linux 机器——我们会建议你扔了它,然后换个新的虚拟机。
+
+过去的十来年里发生了很多有意思的事儿:Linux 不但变成了商品,而且其层出不穷的发行版也越来越强大和灵活。如今,一个普通的系统管理员完全不必掌握编译内核这类底层技能了。
+
+然后,我们又见证了虚拟机技术的商品化。使用 Amazon 云主机或者 VPS 的用户也许永远不用在裸机上部署 Linux。随着混合云和私有云的日益普及,甚至很多企业级的系统管理员都不需要在裸机上部署 Linux——登录 Web 管理界面,一次性就能搞定不止 5 台 Apache 虚拟机。
+
+时下最新的两个趋势(一个是配置管理,另一个看起来很前沿(其实一点儿都不前沿)—— 像 docker 这样的部署工具包)隐藏了更多 Linux 底层技术细节。每当客户要求我们在 [OlinData][1] 上配置 Linux 机器时,我们的第一个动作就是安装配置 [Puppet][2]。有了功能强大值得信赖的 Puppet 模块,手工配置也更快更简单了。
+
+例如,我可以这样使用 Puppet 在新机器上安装 Apache:
+
+ node 'web01.olindata.com' {
+ include apache
+ apache::vhost{ 'www.olindata.com':
+ docroot => '/var/www/olindata'
+ }
+ }
+
+在这种环境下,我甚至都不用在机器上打日志。通过 [Jenkins][3] 这样的不间断部署工具,我可以完全自动化部署我的基础设施代码,并确保它们通过了我预置的测试。
+
+### 系统管理员技能日益升级 ###
+
+就算有更新的工具对我们隐藏更多的技术细节,坚持 Linux 训练对系统管理员来说仍然很有价值。了解基础知识很关键,这些抽象高级工具把管理员从旧的任务中解放了出来,那么系统管理员就应该强化自己使用这些高级工具的能力。熟悉高级工具对系统管理员提升层次来说很关键,这会迫使系统管理员不断练习编写代码一类的能力,并借此发挥这些新玩意儿更大的潜力。
+
+底层 Linux 技能需求会完全消失么?当然不会。除了商业服务器部署之外,Linux 还有大量其他用途。同时,人们也从底层操作知识中获益颇丰。最重要的是,如果你的简历上体现出了这些技能,我(还有很多其他老板)总是会优先选择你,而不是那些尚未掌握这些技能的候选人。因为你也不知道啥时候你就用上这些技能了!
+
+----------
+
+
+Walter Heck 是 Olindata 公司(一个 Linux 基金会授权的培训机构)的创始人兼 CEO,这里是计划中[由 OlinData 提供的 Linux 基金会官方培训课程单][4].
+
+--------------------------------------------------------------------------------
+
+via: http://www.linux.com/news/enterprise/systems-management/780956-linux-system-administration-skills-are-changing
+
+原文作者:[Walter Heck][a]
+
+译者:[sailing](https://github.com/blueabysm) 校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://www.linux.com/community/forums/person/59207
+[1]:http://olindata.com/
+[2]:http://puppetlabs.com/
+[3]:http://jenkins.org/
+[4]:http://www.olindata.com/training/upcoming?technology=295
diff --git a/translated/talk/The history of Android/03 - The history of Android.md b/translated/talk/The history of Android/03 - The history of Android.md
new file mode 100644
index 0000000000..59bff6a71c
--- /dev/null
+++ b/translated/talk/The history of Android/03 - The history of Android.md
@@ -0,0 +1,64 @@
+安卓编年史
+================================================================================
+
+从左到右:安卓0.9的主屏幕,添加的应用抽屉,以及快捷方式删除界面。
+Ron Amadeo供图
+
+### Android 0.9, Beta——嘿,这看起来很眼熟! ###
+
+Milestone 5发布后六个月,2008年8月, [安卓0.9发布][1]。尽管安卓0.5 milestone版看起来“很早期”,到现在距离1.0发布也只有两个月时间了。因此,安卓0.9被打上了“beta”的标签。在移动操作系统之路的另一边,苹果在一个月前已经发布了iPhone的第二代产品——iPhone 3G。第二代的iPhone搭载了第二代iPhone OS。苹果同样发布了App Store应用商店并且已经开始接受应用提交。谷歌在追赶的道路上还有很多事情要做。
+
+谷歌抛弃了很多在Milestone 5中引入的UI设计。所有设计都回炉重造进入全彩,白色方形图标背景被抛弃。尽管0.9还是一个模拟器版本,相比与安卓发布版来说看起来还是有点熟悉。安卓0.9有一个可用的桌面式主屏幕,一个特有的应用抽屉,多主屏,更多的应用程序,以及全功能(暂仅限第一方)小部件。
+
+Milestone 5中似乎没有计划支持安装21个以上的应用,但在安卓0.9中有一个垂直滚动的应用抽屉,可以通过屏幕底部的灰色标签打开。那时候,应用抽屉真的只是个抽屉。除了作为一个按钮使用,灰色标签还可以跟随你的手指被向上拉起,就像通知面板被拉下来那样。还额外添加了一些应用,像闹钟,计算器,图片,信息,以及照相机。
+
+这是第一个可以完全自定义主屏幕的版本。长按应用或小部件可以拖动它们。你可以把应用从抽屉中拖出到主屏幕快捷方式或长按一个已经存在的主屏幕快捷方式来移动它。
+
+安卓0.9提醒我们谷歌那时候并不像今天这样优于设计。实际上,当时安卓的部分设计工作外包给了其它公司。你可以从时钟小插件看出一点端倪,它包含了“MALMO”字样,它是设计公司[The Astonishing Tribe][2]的所在地。
+
+
+安卓0.9的“添加到主屏幕”对话框。
+Ron Amadeo供图
+
+安卓0.9中只有三个小部件:时钟,相框和搜索。搜索小部件在列表中甚至没有一个自己的图标——它用的是图片的图标。也许这里面最有趣的选项是壁纸选项中的“购买的图片”——一个“在非智能机时购买铃声是个普遍的现象”的遗留产物。谷歌要么准备出售壁纸,要么在某时已经加入了一个运营商。这家公司最终从未实现这个计划。
+
+
+小部件集合,打开的文件夹,重命名文件夹,以及一个复制/粘贴菜单。
+Ron Amadeo供图
+
+在上面左侧的截图展示了谷歌搜索和图片小部件。除了给你一个框进行输入之外搜索小部件做不了其它事情——它没有自动补全或是附加的UI界面。在框里输入并点击“Go”会启动浏览器。底部的一排图标显示了一些菜单中长按得到的“快捷方式”,它创建了图标并将应用启动到特定屏幕。独立的联系人,浏览器书签,以及音乐播放列表都是0.9中可以被添加到主屏幕上的快捷方式。
+
+“文件夹”是快捷方式标题下的一个选项,尽管它并不是任何东西的快捷方式。一旦创建了一个空文件夹,图标就可以被移动进去并重新排列。不像今天,那时候的文件夹里有什么并不反映在文件夹图标上,它一直是一个简单的,白色的,看起来空空的文件夹图标。
+
+0.9同样是第一个拥有系统级别复制/粘贴支持的安卓版本。长按任意文本框会唤出一个对话框,从而让你保存或撤销剪贴板中的文本。iOS直到近两年后才支持复制/粘贴,所以在一段时间内,这是安卓的特色之一——以及许多网络争议的源头。
+
+
+从左到右:安卓0.9的新菜单,最近使用应用,电源选项,以及锁屏。
+Ron Amadeo供图
+
+安卓0.9真正地开始显示出了它的成熟。主屏幕有完整的菜单选项,包括设置(尽管它还不能正常运作)以及搜索按钮(因为当你搜索的时候谷歌喜欢)。从那时起菜单的设计便已经最终成型,直到安卓2.3它转变成了黑色。
+
+长按实体Home键会唤出一个3x2方格的最近使用应用菜单,这是一个一直持续到安卓3.0的设计。最近使用应用菜单会将背景显示模糊化,但这个设计用在这里显得有些奇怪,在其它弹窗比如“添加到主屏幕”对话框或是主屏幕文件夹视图之中并没有用到该设计。电源菜单至少包含在了背景模糊设计组之中,它的图标经过了重新设计,并且功能的对应名称更改得更容易让人接受。不过电源菜单图标缺乏填充,显得有些拥挤和不雅观。
+
+安卓0.9以其锁屏为特色,虽然是非常基础的样子。黑色和灰色的锁屏没有任何屏幕解锁的选项——你需要点击实体菜单键。
+
+----------
+
+
+
+[Ron Amadeo][a] / Ron是Ars Technica的评论编缉,专注于安卓系统和谷歌产品。他总是在追寻新鲜事物,还喜欢拆解事物看看它们到底是怎么运作的。
+
+[@RonAmadeo][t]
+
+--------------------------------------------------------------------------------
+
+via: http://arstechnica.com/gadgets/2014/06/building-android-a-40000-word-history-of-googles-mobile-os/3/
+
+译者:[alim0x](https://github.com/alim0x) 校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://arstechnica.com/information-technology/2008/08/robotripping-hands-on-with-the-android-sdk-beta/
+[2]:http://www.tat.se/
+[a]:http://arstechnica.com/author/ronamadeo
+[t]:https://twitter.com/RonAmadeo
diff --git a/sources/tech/20140714 Linux slabtop command--Display Kernel Slab Cache Information.md b/translated/tech/20140714 Linux slabtop command--Display Kernel Slab Cache Information.md
similarity index 54%
rename from sources/tech/20140714 Linux slabtop command--Display Kernel Slab Cache Information.md
rename to translated/tech/20140714 Linux slabtop command--Display Kernel Slab Cache Information.md
index 8bb4e1f626..9cb4ac5888 100644
--- a/sources/tech/20140714 Linux slabtop command--Display Kernel Slab Cache Information.md
+++ b/translated/tech/20140714 Linux slabtop command--Display Kernel Slab Cache Information.md
@@ -1,130 +1,131 @@
-Linux slabtop command - Display Kernel Slab Cache Information
+Linux slabtop命令——显示内核片缓存信息
================================================================================
-The Linux kernel needs to allocate memory for temporary objects such as task or device structures and inodes. The caching memory allocator manages caches of these types of objects. The modern Linux kernel implements this caching memory allocator to hold the caches called the slabs. Different types of slab caches are maintained by the slab allocator. This article concentrates on the slabtop command which shows real-time kernel slab cache information.
-### 1. Command Usage: ###
+Linux内核需要为临时对象如任务或者设备结构和节点分配内存,缓存分配器管理着这些对象类型的缓存。现代Linux内核部署了该缓存分配器以持有缓存,称之为片。不同类型的片缓存由片分配器维护。本文集中讨论slabtop命令,该命令显示了实时内核片缓存信息。
-The command is simple to use. Default execution does not mandate any arguments to the command. But it does require root privileges to access the kernel slab information. Executing the command as normal user gives following error:
+### 1. 命令用法: ###
+
+该命令用起来很简单,默认执行时不要求任何参数。但是它要求root特权来读取内核片信息。以普通用户执行该命令会出现以下错误:

-You can run it by prepending “sudo” with slabtop. The default output looks like:
+你可以在前面设置“sudo”来运行该命令,默认输出见下图:

-To quit from slabtop, just hit ‘q’ like you do for top command.
+要退出slabtop,只需敲‘q’,就像在top命令中那样。
-### 2. Slabtop options: ###
+### 2. Slabtop选项: ###
-#### 2.1 Display Interval: ####
+#### 2.1 显示间隔: ####
-By default slabtop refreshes every 3 seconds. But if you want, you can provide the refreshing interval in seconds with -d or --delay=N option:
+默认情况下,slabtop每隔3秒刷新一次。但是,如果你想要调整,可以使用-d或者--delay=N选项来调整刷新间隔,以秒为单位:


-#### 2.2 Sort criteria: ####
+#### 2.2 排序标准: ####
-There are many fields in slabtop output. The -s or --sort=S option sorts the output according to the mentioned sort criteria. This option will be discussed in detail in the next section.
+在slabtop输出中有很多字段,-s或--sort=S选项可以根据指定的排序标准对这些字段排序。该选项将在下一节中详细讲述。
-#### 2.3 Output once: ####
+#### 2.3 输出一次: ####
-The -o or --once option does not refresh the output, instead it just throws the output once on STDOUT and exits.
+-o或--once选项不会刷新输出,它仅仅将一次输出结果丢给STDOUT,然后退出。

-#### 2.4 Version info: ####
+#### 2.4 版本信息: ####
-The -V or --version displays the version of the command and exits.
+-V或--version选项显示命令的版本并退出。

-#### 2.5 Help: ####
+#### 2.5 帮助: ####
-The common option, -h or --help displays usage of the command.
+常见选项,-h或--help显示命令的使用帮助。

-### 3. Sort Criteria: ###
+### 3. 排序标准: ###
-The sort criteria determines which slab caches are displayed on top. Following are the sort criteria for slabtop:
+排序标准确定了哪个片缓存显示在顶部,下面是slabtop的排序标准:
-#### 3.1 ACTIVE: ####
+#### 3.1 活跃: ####
-Caches can be sorted by number of active objects with “a”.
+缓存可以通过‘a’来对活跃对象编号进行排序。


-#### 3.2 OBJ/SLAB: ####
+#### 3.2 对象/分片: ####
-The Objects per Slab can be selected with “b”.
+每分片对象数可以使用“b”来选择。


-#### 3.3 CACHE SIZE: ####
+#### 3.3 缓存大小: ####
-For selecting cache size, you need to provide “c”.
+要选择缓存大小,你需要提供“c”选项。


-#### 3.4 SLABS: ####
+#### 3.4 分片: ####
-The number of slabs. Select it with “l”
+分片数量,使用“l”来选择。


-#### 3.5 Active Slabs: ####
+#### 3.5 活跃分片: ####
-The number of Active Slabs. (Note that this is different from number of Active Objects described above.) Use “v” to sort according to this criteria.
+活跃分片数量。(注意:这不同于上面讲得活跃对象数量。)使用“v”来根据该标准排序。


-#### 3.6 NAME: ####
+#### 3.6 名称: ####
-Name of cache. Corresponding character is “n”
+缓存名称。相关字符是“n”。


-#### 3.7 OBJS: ####
+#### 3.7 对象: ####
-To sort by number of objects, use “o”
+要根据对象数量排序,使用“o”。


-#### 3.8 Pages Per Slab: ####
+#### 3.8 每分片页面数: ####
-“p” will sort by pages per slab
+“p”将根据每分片页面数排序。


-#### 3.9 OBJ SIZE: ####
+#### 3.9 对象大小: ####
-The object size is sorted by “s”
+对象大小排序由“s”来指定。


-#### 3.10 USE: ####
+#### 3.10 使用: ####
-“u” sorts by the cache utilization.
+“u”选项根据缓存使用量排序。

@@ -134,6 +135,6 @@ The object size is sorted by “s”
via: http://linoxide.com/linux-command/kernel-slab-cache-information/
-译者:[译者ID](https://github.com/译者ID) 校对:[校对者ID](https://github.com/校对者ID)
+译者:[GOLinux](https://github.com/GOLinux) 校对:[校对者ID](https://github.com/校对者ID)
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
\ No newline at end of file
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
diff --git a/translated/tech/20140718 Need Microsoft Office on Ubuntu--Install the Official Web Apps b/translated/tech/20140718 Need Microsoft Office on Ubuntu--Install the Official Webapps.md
similarity index 100%
rename from translated/tech/20140718 Need Microsoft Office on Ubuntu--Install the Official Web Apps
rename to translated/tech/20140718 Need Microsoft Office on Ubuntu--Install the Official Webapps.md
diff --git a/translated/tech/20140723 Fix Missing Speaker Icon From Moka Icon Theme.md b/translated/tech/20140723 Fix Missing Speaker Icon From Moka Icon Theme.md
new file mode 100644
index 0000000000..acb26ba47a
--- /dev/null
+++ b/translated/tech/20140723 Fix Missing Speaker Icon From Moka Icon Theme.md
@@ -0,0 +1,37 @@
+修复Moka图标主题丢失的扬声器图标【快速提示】
+================================================================================
+
+[Moka][1]是一个漂亮的图标主题,它在[Ubuntu可用的最佳图标主题][2]中扮演着重要的角色。但在Ubuntu 14.04中,Moka有那么点小缺憾。如果你在Ubuntu 14.04的Unity中使用摩卡,你会发现用于调节声音的扬声器图标不见了:
+
+
+
+### 使用Moka图标主题时修复丢失的声音图标 ###
+
+虽然你可能已经添加的官方Moka PPA源,但为了检查起见,再次添加它吧:
+
+ sudo add-apt-repository ppa:moka/stable
+ sudo apt-get update
+
+现在,接下来要做的是安装单色面板图标。使用下面的命令来安装:
+
+ sudo apt-get install faba-mono-icons
+
+一旦你安装完Faba单色图标后,将你的图标主题从Moka修改为Faba。这会给你Unity中的Moka图标主题的顶部面板配上漂亮的单色图标:
+
+
+
+我希望这会帮助你修复丢失的声音图标。享受Moka带来的点点滴滴吧。
+
+--------------------------------------------------------------------------------
+
+via: http://itsfoss.com/fix-missing-speaker-icon-from-moka/
+
+原文作者:[Abhishek][a]
+
+译者:[GOLinux](https://github.com/GOLinux) 校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://itsfoss.com/author/Abhishek/
+[1]:http://mokaproject.com/
+[2]:http://itsfoss.com/best-icon-themes-ubuntu-1404/
diff --git a/translated/tech/20140723 How to access SoundCloud from the command line in Linux.md b/translated/tech/20140723 How to access SoundCloud from the command line in Linux.md
new file mode 100644
index 0000000000..6027cffd0a
--- /dev/null
+++ b/translated/tech/20140723 How to access SoundCloud from the command line in Linux.md
@@ -0,0 +1,89 @@
+如何在Linux命令行下访问SoundCloud
+================================================================================
+如果你喜欢流媒体音乐和原创音乐,你不能错过[SoundCloud][1]。这家云流媒体服务总部设在德国,这对任何音乐爱好者都非常有名且完善。自然,作为一个Linux爱好者,你可能想知道如何在Linux中加入你对音乐的热情。作为一个解决方案,我建议你使用Soundcloud2000,**SoundCloud的命令行客户端**脱胎于[Music Hack Day Stockholm '13][2]。
+
+### 安装 ###
+
+对于Debian或者Ubuntu用户,如下安装:
+
+ $ sudo apt-get install portaudio19-dev libmpg123-dev libncurses-dev ruby1.9.1-dev
+ $ sudo gem install soundcloud2000
+
+对于Archlinux用户,在[AUR][3]仓库中可以获取到包
+
+对于Fedora用户,如下安装:
+
+ $ sudo yum install portaudio-devel libmpg123-devel ncurses-devel ruby-devel
+ $ sudo gem install soundcloud2000
+
+对于CentOS用户,安装或者升级到[最新 Ruby/RubyGems][4] (1.9或更高),启用[Repoforge repo][5],如下安装:
+
+ $ sudo yum install portaudio-devel mpg123-devel
+ $ sudo gem install curses soundcloud2000
+
+最后,到官方的github页面获取源码
+
+### 使用 ###
+
+Soundcloud2000非常容易使用。有些人甚至会说简单。我喜欢它的庄重以及三位作者和贡献者的努力。如下启动它:
+
+ $ soundcloud2000
+
+这里,你将看到一个闪屏:
+
+
+
+接着是歌曲列表:
+
+
+
+您可以通过上下键滚动列表,回车播放一首歌曲,空格键是暂停/恢复,左右箭头键是快进/快退。正如你所看到的,没有什么突破性的但绝对符合人体工程学。
+
+如果随机列表太长无法滚动完,你有一个选项来查看所有曲目,用户通过点击'u'键接着输入自己的名字。
+
+
+
+这可能是Soundcloud2000的主要默认之一。而导航没有优化过,我寄予厚望的改善和支持的软件还是很年轻的。
+
+### 红利 ###
+
+另外一个额外的红利:如果你喜欢在终端上使用SoundCloud的想法,但不想安装任何额外的软件(也许你不能),我劝你去[cmd.fm][6]。该网站是一个伪装的SoundCloud,因为它隐藏在一个shell接口后。
+
+[][7]
+
+输入“help”可以得到命令列表,这比Soundcloud2000长很多。比如,我看到:
+
+- _genres to list all genres
+- _play random to play a random track
+- _pause to pause the current track
+- _playlist new to make a new playlist
+- _loop to loop current track
+- _cinema to watch and ASCII version of Star Wars which completely blew my mind.
+
+它甚至支持通过tab键自动完成流派
+
+最后,Soundcloud2000的确是一个整洁的程序。我们可以原谅其目前的缺陷,因为它还年轻。我真的希望它会成长,并包含更多的功能(并从潜在的cmd.fm得到的灵感)。
+
+如果您喜欢这个主意,我邀请你支持程序员,如果你喜欢这类举措,请支持[Music Hack Day][8],这其中混合了软件开发和音乐。
+
+你认为在命令行下使用SoundCloud怎么样?让我们在评论中知道你的想法。
+
+--------------------------------------------------------------------------------
+
+via: http://xmodulo.com/2014/07/access-soundcloud-command-line-linux.html
+
+原文作者:[Adrien Brochard][a]
+
+译者:[geekpi](https://github.com/geekpi) 校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://xmodulo.com/author/adrien
+[1]:https://soundcloud.com/
+[2]:https://www.hackerleague.org/hackathons/music-hack-day-stockholm-13/
+[3]:https://aur.archlinux.org/packages/ruby-soundcloud2000/
+[4]:http://ask.xmodulo.com/upgrade-ruby-centos.html
+[5]:http://xmodulo.com/2013/01/how-to-set-up-rpmforge-repoforge-repository-on-centos.html
+[6]:https://cmd.fm/
+[7]:https://www.flickr.com/photos/xmodulo/14494448218/
+[8]:http://new.musichackday.org/
\ No newline at end of file
diff --git a/translated/tech/20140729 How To Easily Install Tor Browser In Ubuntu 14.04 And Linux Mint 17.md b/translated/tech/20140729 How To Easily Install Tor Browser In Ubuntu 14.04 And Linux Mint 17.md
new file mode 100644
index 0000000000..ee8985483e
--- /dev/null
+++ b/translated/tech/20140729 How To Easily Install Tor Browser In Ubuntu 14.04 And Linux Mint 17.md
@@ -0,0 +1,44 @@
+简捷安装Tor浏览器到Ubuntu 14.04和Linux Mint 17中
+================================================================================
+
+
+牢记[美国国家安全局对全世界政府和国民的窥视][1]的尴尬结局吧,隐私日益成为许多人关心的焦点。如果你也关注在线安全性并想要保护自己不受网络监视,[Tor项目][2]是当前可用的最佳选择。
+
+Tor项目有它自己的[Tor浏览器][3],该浏览器基于Firefox并开启了用户隐私保护配置,并通过捆绑Tor和[Vidalia][4]工具进行匿名访问。虽然你可以[下载Tor浏览器并使用源码安装][5],但是我们将介绍一种更为便捷的方式,来将它安装到Ubuntu 14.04和Linux Mint 17中。
+
+### 如何在Ubuntu 14.04和Linux Mint 17中安装Tor浏览器 ###
+
+多亏了[Webupd8][6],我们可以方便地通过PPA将Tor浏览器到Ubuntu和其它基于Ubuntu的OS中(如果你对源代码安装很感冒)。打开终端(Ctrl+Alt+T)并使用以下命令进行安装:
+
+ sudo add-apt-repository ppa:webupd8team/tor-browser
+ sudo apt-get update
+ sudo apt-get install tor-browser
+
+以上PPA在Ubuntu 12.04和其它基于该版本的Linux发行版中可合法使用。
+
+#### 卸载Tor浏览器 ####
+
+如果你想要卸载Tor浏览器,使用下面的命令即可:
+
+ sudo apt-get remove tor-browser
+ rm -r ~/.tor-browser-en
+
+我希望这个快速测试对你**在Ubuntu 14.04和Linux Mint 17中便捷安装Tor浏览器**有所帮助。欢迎您在提问或者提供建议。
+
+--------------------------------------------------------------------------------
+
+via: http://itsfoss.com/install-tar-browser-ubuntu-linux-mint-17/
+
+作者:[Abhishek][a]
+译者:[GOLinux](https://github.com/GOLinux)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://itsfoss.com/author/Abhishek/
+[1]:http://projects.propublica.org/nsa-grid/
+[2]:https://www.torproject.org/
+[3]:https://www.torproject.org/projects/torbrowser.html.en
+[4]:https://www.torproject.org/projects/vidalia.html.en
+[5]:https://www.torproject.org/projects/torbrowser.html.en#linux
+[6]:http://www.webupd8.org/
diff --git a/translated/tech/20140729 How to access Linux command cheat sheets from the command line.md b/translated/tech/20140729 How to access Linux command cheat sheets from the command line.md
new file mode 100644
index 0000000000..b1914563fa
--- /dev/null
+++ b/translated/tech/20140729 How to access Linux command cheat sheets from the command line.md
@@ -0,0 +1,96 @@
+从命令行访问Linux命令小抄
+================================================================================
+Linux命令行的强大在于其灵活及多样化,各个Linux命令都带有它自己那部分命令行选项和参数。混合并匹配它们,甚至还可以通过管道和重定向来联结不同的命令。理论上讲,你可以借助几个基本的命令来产生数以百计的使用案例。甚至对于浸淫多年的管理员而言,也难以完全使用它们。那正是命令行小抄成为我们救命稻草的一刻。
+
+[][1]
+
+我知道联机手册页仍然是我们的良师益友,但我们想通过我们能自行支配的快速参考卡让这一切更为高效和有目的性。最终极的小抄可能被自豪地挂在你的办公室里,也可能作为PDF文件隐秘地存储在你的硬盘上,或者甚至设置成了你的桌面背景图。
+
+最为一个选择,也可以通过另外一个命令来访问你最爱的命令行小抄。那就是,使用[cheat][2]。这是一个命令行工具,它可以让你从命令行读取、创建或更新小抄。这个想法很简单,不过cheat经证明是十分有用的。本教程主要介绍Linux下cheat命令的使用方法。你不需要为cheat命令做个小抄了,它真的很简单。
+
+### 安装Cheat到Linux ###
+
+首先,如果你还没有Git,那么就安装一个吧:
+
+ $ sudo apt-get install git (Debian-based system)
+ $ sudo yum install git (RedHat-based system)
+
+同时,安装[Python包安装器pip][3]。
+
+最后,使用下列命令来安装cheat。
+
+ $ sudo pip install docopt pygments
+ $ git clone https://github.com/chrisallenlane/cheat.git
+ $ cd cheat
+ $ sudo python setup.py install
+
+### 配置Cheat ###
+
+cheat命令并不需要太多配置。
+
+一个推荐的配置是启用命令行补全功能。那样,当你查询一个小抄时,就可以使用[TAB]键来自动补全你想要查看的命令名称了。以下操作可以启用bash下的自动补全功能。
+
+ $ wget https://github.com/chrisallenlane/cheat/raw/master/cheat/autocompletion/cheat.bash
+ $ sudo cp cheat.bash /etc/bash_completion.d/
+
+他们也提供了用于其它shell的自动补全脚本,像zsh和fish也有。
+
+另外一个要做的事是定义EDITOR环境变量。该变量应该指向创建或更新小抄时你想要用的文本编辑器。例如,如果你想要使用Vim编辑器,那就把下面的内容放进~/.bashrc。
+
+ export EDITOR=/usr/bin/vim
+
+注销并重新登录进来,以激活自动补全功能并更新.bashrc。
+
+### Cheat基本用法 ###
+
+cheat命令一个很酷的事是,它自带有超过90个的常用Linux命令的内建小抄。查看可用的小抄列表:
+
+ $ cheat -l
+
+
+
+要访问某个指定命令的小抄,只要运行cheat命令,后面跟上该命令的名称:
+
+ $ cheat
+
+
+
+你可以通过使用“-s”选项,在所有小抄中搜索包含有指定关键词的内容:
+
+ $ cheat -s
+
+在许多情况下,小抄适用于那些正派的人,而对其他某些人却没什么帮助。要想让内建的小抄更具个性化,cheat命令也允许你创建新的小抄,或者更新现存的那些。要这么做的话,cheat命令也会帮你在本地~/.cheat目录中保存一份小抄的副本。
+
+要使用cheat的编辑功能,首先确保EDITOR环境变量设置为了你默认编辑器所在位置的完整路径。然后,复制(不可编辑)内建小抄到~/.cheat目录。你可以通过下面的命令找到内建小抄所在的位置。一旦你找到了它们的位置,只不过是将它们拷贝到~/.cheat目录。
+
+ $ cheat -d
+
+----------
+
+ /usr/lib/python2.6/site-packages/cheat/cheatsheets
+
+----------
+
+ $ cp /usr/lib/python2.6/site-packages/cheat/cheatsheets/* ~/.cheat
+
+现在,你可以使用“-e”选项来创建或更新一个小抄了:
+
+ $ cheat -e openssl
+
+正如你所能想象的,cheat的编辑功能十分有用,可以帮助你剪裁本地小抄库以满足你的需要。如果你深信知识分享,贡献你的小抄到cheat命令的[官方Git仓库][4]中,你会更加受欢迎,这样大家都能从中受益。
+
+--------------------------------------------------------------------------------
+
+via: http://xmodulo.com/2014/07/access-linux-command-cheat-sheets-command-line.html
+
+作者:[Dan Nanni][a]
+译者:[GOLinux](https://github.com/GOLinux)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://xmodulo.com/author/nanni
+[1]:http://xkcd.com/1168/
+[2]:https://github.com/chrisallenlane/cheat
+[3]:http://ask.xmodulo.com/install-pip-linux.html
+[4]:https://github.com/chrisallenlane/cheat
diff --git a/translated/tech/20140729 How to use awk command in Linux.md b/translated/tech/20140729 How to use awk command in Linux.md
new file mode 100644
index 0000000000..6208316dc9
--- /dev/null
+++ b/translated/tech/20140729 How to use awk command in Linux.md
@@ -0,0 +1,121 @@
+如何在Linux中使用awk命令
+================================================================================
+文本处理是Unix的核心。从管道到/proc子系统,“一切都是文件”的理念贯穿于操作系统和所有基于它构造的工具。正因为如此,轻松地处理文本是一个期望成为Linux系统管理员甚至是资深用户的最重要的技能之一,awk是通用编程语言之外最强大的文本处理工具之一。
+
+最简单的awk的任务是从标准输入中选择字段;如果你对awk除了这个没有学习过其他的,它还是会是你身边一个非常有用的工具。
+
+默认情况下,awk通过空格分隔输入。如果您想选择输入的第一个字段,你只需要告诉awk输出$ 1:
+
+ $ echo 'one two three four' | awk '{print $1}'
+
+> one
+
+(是的,大括号语法是有点古怪,但我保证这是我们这节课一直会遇到。)
+
+你能猜出如何选择第二,第三或第四个字段么?是的,分别用$2,$ 3,$ 4。
+
+ $ echo 'one two three four' | awk '{print $3}'
+
+> three
+
+通常在文本改写时,你需要创建一个特定的数据格式,并且它覆盖不止一个单词。好消息是,awk中可以很容易地打印多个字段,甚至包含静态字符串:
+
+ $ echo 'one two three four' | awk '{print $3,$1}'
+
+> three one
+
+----------
+
+ $ echo 'one two three four' | awk '{print "foo:",$3,"| bar:",$1}'
+
+> foo: three | bar: one
+
+好吧,如果你的输入不是由空格分隔怎么办?只需用awk中的'-F'标志后带上你的分隔符:
+
+ $ echo 'one mississippi,two mississippi,three mississippi,four mississippi' | awk -F , '{print $4}'
+
+> four mississippi
+
+偶尔间,你会发现自己正在处理拥有不同的字段数量的数据,但你只知道你想要的*最后*字段。 awk中内置的$NF变量代表*字段的数量*,这样你就可以用它来抓取最后一个元素:
+
+ $ echo 'one two three four' | awk '{print $NF}'
+
+> four
+
+你也可以用$NF做简单的数学,假如你需要倒数第二个字段:
+
+ $ echo 'one two three four' | awk '{print $(NF-1)}'
+
+> three
+
+甚至是中间的字段:
+
+ $ echo 'one two three four' | awk '{print $((NF/2)+1)}'
+
+> three
+
+而且这一切都非常有用,同样你可以摆脱强制使用sed,cut,和grep来得到这些结果(尽管有大量的工作)。
+
+因此,我将为你留下awk的最后介绍特性,维护跨行状态。
+
+ $ echo -e 'one 1\ntwo 2' | awk '{print $2}'
+
+> 1
+>
+> 2
+
+ $ echo -e 'one 1\ntwo 2' | awk '{sum+=$2} END {print sum}'
+
+> 3
+
+(END代表的是我们在执行完每行的处理**之后**只处理下面的代码块
+
+这里我使用的例子是统计web服务器请求日志的字节大小。想象一下我们有如下这样的日志:
+
+ $ cat requests.log
+
+> Jul 23 18:57:12 httpd[31950]: "GET /foo/bar HTTP/1.1" 200 344
+>
+> Jul 23 18:57:13 httpd[31950]: "GET / HTTP/1.1" 200 9300
+>
+> Jul 23 19:01:27 httpd[31950]: "GET / HTTP/1.1" 200 9300
+>
+> Jul 23 19:01:55 httpd[31950]: "GET /foo/baz HTTP/1.1" 200 6401
+>
+> Jul 23 19:02:31 httpd[31950]: "GET /foo/baz?page=2 HTTP/1.1" 200 6312
+
+我们知道最后一个字段是响应的字节大小。我们已经学习了如何使用$NF来抽取他们:
+
+ $ < requests.log awk '{print $NF}'
+
+> 344
+>
+> 9300
+>
+> 9300
+>
+> 6401
+>
+> 6312
+
+接着我们可以将它们累加到一个变量中来收集我们的web服务其在日志中这段时间内的响应客户端的字节数量
+
+ $ < requests.log awk '{totalBytes+=$NF} END {print totalBytes}'
+
+> 31657
+
+如果你正在寻找关于awk的更多资料,你可以在Amazon中在15美元内找到[原始awk手册][1]的副本。你同样可以使用Eric Pement的[单行awk命令收集][2]这本书
+
+--------------------------------------------------------------------------------
+
+via: http://xmodulo.com/2014/07/use-awk-command-linux.html
+
+作者:[James Pearson][a]
+译者:[geekpi](https://github.com/geekpi)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://xmodulo.com/author/james
+[1]:http://www.amazon.com/gp/product/020107981X/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=020107981X&linkCode=as2&tag=xmodulo-20&linkId=6NW62B2WBRBXRFJB
+[2]:http://www.pement.org/awk/awk1line.txt
\ No newline at end of file
diff --git a/translated/tech/20140729 Linux FAQs with Answers--How to check which fonts are used in a PDF document.md b/translated/tech/20140729 Linux FAQs with Answers--How to check which fonts are used in a PDF document.md
new file mode 100644
index 0000000000..6b4f9c57bb
--- /dev/null
+++ b/translated/tech/20140729 Linux FAQs with Answers--How to check which fonts are used in a PDF document.md
@@ -0,0 +1,39 @@
+Linux常见问题及答案——如何检查PDF文档中使用了哪种字体
+================================================================================
+
+>**问题**:我想要知道PDF文件中使用了什么字体,或者嵌入了什么字体。Linux中有工具可以检查PDF文档中使用了哪种字体吗?
+
+要检查PDF文件中包含了,或者使用了什么字体,你可以使用命令行工具:pdffonts,它是一个PDF字体分析工具。pdffonts是Poppler PDF工具集包中的一个部分。
+
+### 安装PDF工具集到Linux ###
+
+要安装Poppler到Debian,Ubuntu或Linux Mint:
+
+ $ sudo apt-get install poppler-utils
+
+要安装PDF工具集到Fedora,CentOS或RHEL:
+
+ $ sudo yum install poppler-utils
+
+### 检查PDF字体 ###
+
+**pdffonts**可以列出PDF文档中使用的所有字体。pdffonts的基本用法如下。
+
+ $ pdffonts doc.pdf
+
+
+
+**pdffonts**工具显示了各个已使用的字体的各种信息,如字体名称/类型,或者字体是否内嵌等等。
+
+如果一个PDF文档有多页,你可以使用“-f”(首页)和“-l”(末页)选项来限制字体扫描页面范围。例如,如果你想要找出某个文档中的5-10页中使用了哪种字体,运行该命令:
+
+ $ pdffonts -f 5 -l 10 doc.pdf
+
+--------------------------------------------------------------------------------
+
+via: http://ask.xmodulo.com/check-which-fonts-are-used-pdf-document.html
+
+译者:[GOLinux](https://github.com/GOLinux)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
diff --git a/translated/tech/20140731 Easy Steps to Make GNOME 3 More Efficient.md b/translated/tech/20140731 Easy Steps to Make GNOME 3 More Efficient.md
new file mode 100644
index 0000000000..629e04cdfa
--- /dev/null
+++ b/translated/tech/20140731 Easy Steps to Make GNOME 3 More Efficient.md
@@ -0,0 +1,80 @@
+轻而易举提升GNOME 3效率
+================================================================================
+极少Linux桌面像GNOME 3一样饱受争议。自发布以来,它被奚落,被挖苦,还被痛恨。事情是,它实际上是一个很不错的桌面。它牢固、可靠、稳定、优雅、简洁……而且带有一些小的调整和附加的东西,它可以做成市面上最高效、最友好的桌面之一。
+
+当然,什么才是高效而又/或者是用户友好的桌面呢?那取决于观念——每个人都有的东西。归根到底,我的目标是帮助你快速访问你要用到的应用和文件。简单吧。不管你信不信,将GNOME 3一步一步变成更为高效而又用户友好的世界是一项十分容易的任务——你只需要知道哪里去查看以及做些什么即可。在这里,我会引领你去往正确的方向。
+
+我决定从这里开始着手这个事情,首先安装一个干净的[Ubuntu GNOME][1]发行版开始,该安装包含有一个GNOME 3.12桌面。在以GNOME为中心的桌面准备好后,就该开始对它进行微调了。
+
+### 添加窗口按钮 ###
+
+处于一些未知的原因,GNOME的开发者们决定对标准的窗口按钮(关闭,最小化,最大化)不屑一顾,而支持只有单个关闭按钮的窗口了。我缺少了最大化按钮(虽然你可以简单地拖动窗口到屏幕顶部来将它最大化),然而也可以通过在标题栏右击选择最小化或者最大化来进行最小化/最大化操作。这种变化仅仅增加了操作步骤,因此缺少最小化按钮实在搞得人云里雾里。所幸的是,有个简单的修复工具可以解决这个问题,下面说说怎样做吧:
+
+默认情况下,你应该安装了GNOME优化工具。通过该工具,你可以打开最大化或最小化按钮(图1)。
+
+
+Figure 1: 添加回最小化按钮到GNOME 3窗口
+
+添加完后,你就可以看到最小化按钮了,它在关闭按钮的左边,等着为你服务呢。你的窗口现在管理起来更方便了。
+
+同样在这个优化工具中,你也可以对GNOME进行大量其它有帮助的配置:
+
+- 设置窗口聚焦模式
+- 设置系统字体
+- 设置GNOME主题
+- 添加启动应用
+- 添加扩展
+
+### 添加扩展 ###
+
+GNOME 3的最佳特性之一,就是shell扩展,这些扩展为GNOME带来了全部种类的有用的特性。关于shell扩展,没必要从包管理器去安装。你可以访问[GNOME Shell扩展][2]站点,搜索你想要添加的扩展,点击扩展列表,点击打开按钮,然后扩展就安装完成了;或者你也可以从GNOME优化工具中添加它们(你在网站上会找到更多可用的扩展)。
+
+注:你可能需要在浏览器中允许扩展安装。如果出现这样的情况,你会在第一次访问GNOME Shell扩展站点时见到警告信息。当出现提示时,只要点击允许即可。
+
+令人印象更为深刻的(而又得心应手的扩展)之一,就是[Dash to Dock][3]。
+该扩展将Dash移出应用程序概览,并将它转变为相当标准的停靠栏(图2)。
+
+
+Figure 2: Dash to Dock添加一个停靠栏到GNOME 3.
+
+当你添加应用程序到Dash后,他们也将被添加到Dash to Dock。你也可以通过点击Dock底部的6点图标访问应用程序概览。
+
+还有大量其它扩展聚焦于讲GNOME 3打造成一个更为高效的桌面,在这些更好的扩展中,包括以下这些:
+
+- [最近项目][4]: 添加一个最近使用项目的下拉菜单到面板。
+- [搜索Firefox书签提供者][5]: 从概览搜索(并启动)书签。
+- [跳转列表][6]: 添加一个跳转列表弹出菜单到Dash图标(该扩展可以让你快速打开和程序关联的新文档,甚至更多)
+- [待办列表][7]: 添加一个下拉列表到面板,它允许你添加项目到该列表。
+- [网页搜索对话框][8]: 允许你通过敲击Ctrl+空格来快速搜索网页并输入一个文本字符串(结果在新的浏览器标签页中显示)。
+
+### 添加一个完整停靠栏 ###
+
+如果Dash to dock对于而言功能还是太有限(你想要通知区域,甚至更多),那么向你推荐我最喜爱的停靠栏之一[Cairo Dock][9](图3)。
+
+
+Figure 3: Cairo Dock待命
+
+在Cairo Dock添加到GNOME 3后,你的体验将成倍地增长。从你的发行版的包管理器中安装这个优秀的停靠栏吧。
+
+不必将GNOME 3看作是一个效率不高的,用户不友好的桌面。只要稍作调整,GNOME 3可以成为和其它可用的桌面一样强大而用户友好的桌面。
+
+--------------------------------------------------------------------------------
+
+via: http://www.linux.com/learn/tutorials/781916-easy-steps-to-make-gnome-3-more-efficient
+
+作者:[Jack Wallen][a]
+译者:[GOLinux](https://github.com/GOLinux)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://www.linux.com/community/forums/person/93
+[1]:http://ubuntugnome.org/
+[2]:https://extensions.gnome.org/
+[3]:https://extensions.gnome.org/extension/307/dash-to-dock/
+[4]:https://extensions.gnome.org/extension/72/recent-items/
+[5]:https://extensions.gnome.org/extension/149/search-firefox-bookmarks-provider/
+[6]:https://extensions.gnome.org/extension/322/quicklists/
+[7]:https://extensions.gnome.org/extension/162/todo-list/
+[8]:https://extensions.gnome.org/extension/549/web-search-dialog/
+[9]:http://glx-dock.org/index.php
diff --git a/translated/tech/20140801 How To Install Java On Ubuntu 14.04.md b/translated/tech/20140801 How To Install Java On Ubuntu 14.04.md
new file mode 100644
index 0000000000..5679645529
--- /dev/null
+++ b/translated/tech/20140801 How To Install Java On Ubuntu 14.04.md
@@ -0,0 +1,78 @@
+怎样在Ubuntu 14.04中安装Java
+=====================================================================================================
+
+
+
+想知道**如何在Ubuntu 14.04中安装Java**?安装Java肯定是[安装Ubuntu 14.04后首先要做的几件事情之一](1),而且这也很简单
+
+许多人比较厌恶Java,但是很有可能因为某些原因,你需要安装Java,尽管你很讨厌它。在这篇文章中,我们将展示如何在Ubuntu 14.04安装Java(也可能在Linux Mint 17同样适用)
+
+### JRE vs OpenJDK vs Oracle JDK ###
+
+在我们继续了解如何安装Java之前,让我们快速地了解JRE,OpenJDK和Oracle JDK之间的不同之处
+
+- JRE(Java Runtime Environment),它是你运行一个基于Java语言应用程序的所正常需要的环境。如果你不是一个程序员的话,这些足够你的需要
+- JDK代表Java开发工具包,如果你想做一些有关Java的开发(阅读程序),这正是你所需要的
+- OpenJDK是Java开发工具包的开源实现,Oracle JDK是Java开发工具包的官方Oracle版本。尽管OpenJDK已经足够满足大多数的案例,但是许多程序比如[Android Studio](2)建议使用Oracle JDK,以避免UI/性能问题
+
+### 检查Java是否已经安装在Ubuntu上 ###
+
+打开终端,使用下面的命令:
+
+ java -version
+
+如果你看到像下面的输出,这就意味着你并没有安装过Java:
+
+ The program ‘java’ can be found in the following packages:
+ * default-jre
+ * gcj-4.6-jre-headless
+ * openjdk-6-jre-headless
+ * gcj-4.5-jre-headless
+ * openjdk-7-jre-headless
+ Try: sudo apt-get install
+
+### 在Ubuntu和Linux Mint上安装Java ###
+
+看了各种类型‘Java’的不同之后,让我们看如何安装他们
+
+#### 在Ubuntu和Linux Mint上安装JRE ####
+
+打开终端,使用下面的命令安装JRE:
+
+ sudo apt-get install default-jre
+
+#### 在Ubuntu和Linux Mint上安装OpenJDK ####
+
+在终端,使用下面的命令安装OpenJDK Java开发工具包:
+
+ sudo apt-get install default-jdk
+
+特殊地,如果你想要安装Java 7或者Java 6等等,你可以使用openjdk-7-jdk/openjdk-6jdk,但是记住在此之前安装openjdk-7-jre/openjdk-6-jre
+
+#### 在Ubuntu和Linux Mint上安装Oracle JDK ####
+
+使用下面的命令安装,只需一些时间,它就会下载许多的文件,所及你要确保你的网络环境良好:
+
+ sudo add-apt-repository ppa:webupd8team/java
+ sudo apt-get update
+ sudo apt-get install oracle-java8-installer
+ sudo apt-get install oracle-java8-set-default
+
+如果你想安装Java 7(i.e Java 1.7),在上面的命令中用java7代替java8
+
+我希望这篇文章能够帮助你学会在Ubuntu,Linux Mint和其它基于Ubuntu的Linux发行版本上安装Java,我们欢迎所有问题或者建议
+
+------------------------------------------------------------------------------------------------------------------
+
+via:
+
+作者:[Abhishek][a]
+译者:[su-kaiyao](https://github.com/su-kaiyao)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://itsfoss.com/author/Abhishek/
+[1]:http://itsfoss.com/things-to-do-after-installing-ubuntu-14-04/
+[2]:http://itsfoss.com/install-android-studio-ubuntu-linux/
+
diff --git a/translated/tech/20140801 How to Create an Ubuntu Kiosk Computer.md b/translated/tech/20140801 How to Create an Ubuntu Kiosk Computer.md
new file mode 100644
index 0000000000..0999dd477e
--- /dev/null
+++ b/translated/tech/20140801 How to Create an Ubuntu Kiosk Computer.md
@@ -0,0 +1,40 @@
+如何创建Ubuntu信息端计算机
+================================================================================
+
+**Linux发行版可以作为全功能打包,也可以按需分解,驱动了从市内标示牌到市议会桌面系统在内的所有设备。**
+
+正是这种多样化,几乎可塑的质量,让Linux发行版,包括Ubuntu在内,在众多不同领域如此成功。
+### 信息端和单功能计算机 ###
+
+Ubuntu更为流行的使用之一,是在**信息端类计算机**中。这些设备趋向于运行功能剥离的,或者功能有限的OS版本,只允许**一个单一应用运行**。
+
+信息端计算机可以设置提供短暂的或者被动的访问,对于网吧或者对于任何要求只有特定功能——如网页浏览器——可以让用户访问的机器十分理想。
+
+### 构建Ubuntu信息端 ###
+
+但你会怎样来创建这样一台计算机?好吧,保存你的Google。Linux开发者Oli Warner最近发布了两篇文章,介绍了使用Ubuntu 14.04和Google Chrome来创建单一功能的设备。
+
+他的第一篇指南从零开始,使用Ubuntu Server和少量的软件包来创建一个轻量级的X和Openbox的组合,开机启动Chrome。该安装需要最多2GB的磁盘空间和仅仅512MB的内存来运行。
+
+- [从零开始构建信息端计算机][1]
+
+第二篇教程反其道而行,一步一步介绍了将一个现存的Ubuntu桌面安装转变为一个更轻巧的单一功能的变形版本。
+
+- [将Ubuntu转换成信息端计算机][2]
+
+Neither guide is for the faint-hearted, but are simple enough for most intermediate-level users to follow. Follow the guides to get a functional setup, but don’t be afraid to strip out further packages and processes or double down on security, especially if intending to use an instance in a public space.
+两个指南都不是给那些胆小的新手的,而对于大多数中级水平的用户而言却是简单易行的。跟着指南来获得一次实用的安装体验,不要畏首畏尾,大胆去剥离一些深层次的包和进程,或者加固安全吧,特别是如果想要在公共空间中使用一个实例。
+
+--------------------------------------------------------------------------------
+
+via: http://www.omgubuntu.co.uk/2014/07/create-ubuntu-kiosk
+
+作者:[Joey-Elijah Sneddon][a]
+译者:[GOLinux](https://github.com/GOLinux)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:https://plus.google.com/117485690627814051450/?rel=author
+[1]:http://thepcspy.com/read/building-a-kiosk-computer-ubuntu-1404-chrome
+[2]:http://thepcspy.com/read/converting-ubuntu-desktop-to-kiosk/
diff --git a/translated/tech/20140804 Linux FAQs with Answers--How to check if I am in a running screen session.md b/translated/tech/20140804 Linux FAQs with Answers--How to check if I am in a running screen session.md
new file mode 100644
index 0000000000..d2d2f59da3
--- /dev/null
+++ b/translated/tech/20140804 Linux FAQs with Answers--How to check if I am in a running screen session.md
@@ -0,0 +1,24 @@
+Linux常见问题与答案——如何检查我是否处于一个运行着的screen会话中
+================================================================================
+>**问题**:我经常使用screen命令来运行多个伪终端会话。好多次,我发现都记不得自己是否在一个screen会话中,还是在一个常规终端中。是否有一种简便的方法来检查我是否在一个运行着的screen会话中?
+
+一个快捷而又简单的方法来检查你是否处于一个screen伪终端中,还是在一个常规终端中,就是检查STY环境变量。当调用了screen,就会把STY变量值设置为会话名。因此,如果STY环境变量被设置为任何非空字符串,就意味着你正处于一个screen会话中。
+
+ $ echo $STY
+
+> 2858.pts-3.my_host
+
+然而,请注意,上面的方法**只有当**你是在本地计算机上运行screen命令的时候。如果你从本地计算机的screen会话中SSH到任何远程计算机上,远程计算机上的STY变量不会被设置,尽管在技术上看,你仍然处于一个screen会话中。
+
+事实上,一个更为可靠的检查你是否处于一个screen会话中的方法,是按“Ctrl-a”+“Ctrl-t”。如果你处于screen会话中,终端会在底部显示时间信息。
+
+
+
+--------------------------------------------------------------------------------
+
+via: http://ask.xmodulo.com/check-running-screen-session.html
+
+译者:[GOLinux](https://github.com/GOLinux)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
diff --git a/translated/tech/20140804 Linux FAQs with Answers--How to enable and configure desktop sharing on Linux Mint Cinnamon desktop.md b/translated/tech/20140804 Linux FAQs with Answers--How to enable and configure desktop sharing on Linux Mint Cinnamon desktop.md
new file mode 100644
index 0000000000..36bb9cb141
--- /dev/null
+++ b/translated/tech/20140804 Linux FAQs with Answers--How to enable and configure desktop sharing on Linux Mint Cinnamon desktop.md
@@ -0,0 +1,54 @@
+Linux常见问题及答案——如何在Linux Mint Cinnamon桌面启用并配置桌面共享
+================================================================================
+
+>**问题**:我试着在Linux Mint 17 Cinnamon桌面上通过Vino VNC服务器(vino-server)启用桌面共享。但是,我发现用来配置vino-server(如,共享选项,安全,通知开/关)的vino首选项工具已经不复存在了。同时,我也的Cinnamon桌面上也找不到共享菜单。我怎样才能在最新的Linux Mint 17 Cinnamon桌面上通过vino-server配置桌面共享?
+
+最新的Linux Mint 17 Cinnamon桌面附带了预安装用于VNC桌面共享的vino-server,但是它报告说桌面共享菜单丢失了。
+
+一个配置vino-server并启用桌面共享的可选方式,是使用dconf-editor的图形界面。
+
+首先安装dconf-editor:
+
+ $ sudo apt-get install dconf-editor
+
+启动dconf-editor。
+
+ $ dconf-editor
+
+在dconf-editor的左边面板中导航到“org->gnome->desktop->remote-access”,然后你将会看到各种各样的桌面共享选项。
+
+
+
+最重要的是,点击“enabled”来激活桌面远程访问。除此之外,你还可以自定义其它选项。
+For example, you can enable VNC password authentication by changing the following fields:
+例如,你可以通过修改以下字段来启用VNC密码验证:
+
+- **authentication-methods**: 设置为 ['vnc']
+- **vnc-password**: 将你喜欢的密码修改为Base64编码的字符串。
+
+在本例中,我们选择“password”为VNC密码,它的Base64编码字符串为“cGFzc3dvcmQ=”。
+
+你也可以选择启用其它选项:
+
+- notify-on-connect: 当vino-server接收到连接请求时显示桌面通知。
+- prompt-enabled: 远程用户不允许通过VNC工具访问桌面,除非VNC请求被该桌面的拥有者许可。
+
+### 排障 ###
+
+1. 当启动vino-server时,我碰到了下面的错误。
+
+ ** (vino-server:4280): WARNING **: The desktop sharing service is not enabled, so it should not be run.
+
+要启用桌面共享服务,请使用上面讲过的dconf-editor。
+也可以选择运行以下命令:
+
+ # gsettings set org.gnome.Vino enabled true
+
+--------------------------------------------------------------------------------
+
+via: http://ask.xmodulo.com/enable-configure-desktop-sharing-linux-mint-cinnamon-desktop.html
+
+译者:[GOLinux](https://github.com/GOLinux)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出