Merge branch 'master' of https://github.com/LCTT/TranslateProject.git

published/201406/10 Linux Platforms Meant For Embedded Systems.md

@@ -1,8 +1,7 @@
 10款专为嵌入式系统打造的Linux平台
-
 ==========================================
 
-Linux 有着广泛的用途。该平台被许多简单的家用电器所使用，同时它也深受程序员和黑客们的青睐。此外，Linux 还广泛地应用在嵌入式系统中，有一系列专门适用于此类系统的发行版。我们将为大家推荐十个非常优秀的专为嵌入式系统发行的linux版本！
+Linux 有着广泛的用途。该平台用于很多家庭的简单使用，同时它也深受程序员和黑客们的青睐。此外，Linux 还广泛地应用在嵌入式系统中，有一系列专门适用于此类系统的发行版。我们将为大家推荐十个非常优秀的专为嵌入式系统发行的linux版本！
 
 
 ![] (http://www.efytimes.com/admin/useradmin/photo/UJVP24130PM532014.jpeg)
@@ -10,61 +9,49 @@ Linux 有着广泛的用途。该平台被许多简单的家用电器所使用
 
 ### 1.[Ampro 嵌入式 Linux][1] ###
 
-
-这是一个自由和开放源代码的从Ubuntu派生来的轻量级操作系统。
+这是一个自由和开放源代码的从Ubuntu精简来的轻量级操作系统。
 
 ### 2. [BlueCat Linux from Lynx][2] ###
-这个基于 Linux 的发行版是Lynx套件的一部分，并为嵌入式系统打造。
 
+这个基于 Linux 的发行版是Lynx套件的一部分，并为嵌入式系统打造。
 
 ### 3. [CacheGuard OS][3] ###
 
-CacheGuard OS 是一个从零开始建立的集成了安全解决方案的基于Linux的可自定义版本  ，专门为网络管理设计的。
-
+CacheGuard OS 是一个从零开始建立的集成了安全解决方案的基于Linux的版本，专门为网络管理设计的。
 
 ### 4. [Darma NAS OS][4] ###
 
-这个发行版有一个基于 SSL 的加密客户端服务器和基于 Java 的图形用户界面。
-
+这个发行版有一个基于 SSL 的加密客户端的服务器和基于 Java 的图形用户界面。
 
 ### 5. [DIET-PC][5] ###
 
-
-这是开源的瘦客户端软件 kitset，它允许用户建立网络设备。
-
+这是开源的瘦客户端软件 kitset，它允许用户建立网络应用。
 
 ### 6. [ELinOS][6] ###
 
 这个发行版为在嵌入式系统上工作的用户提供大量的技术。它是一个相当受欢迎的嵌入式 Linux 平台。
 
-
 ### 7. [eLux][7] ###
 
-
 这个发行版有一个非常简单和容易使用的界面，适用于用户和管理员都不具有任何有关 Linux 的知识的特殊情况下。
 
-
 ### 8. [eLux NG][8] ###
 
-
-这一个发行版为支持 eLux 的列表中的处理器添加了新的模式。
-
+这个发行版为支持 eLux 的处理器列表中添加了新的型号。
 
 ### 9. [Embedded Coyote Linux][9] ###
  
+这种基于 Coyote Linux的防火墙和 VPN 服务器一直为很多人选择的平台。
 
-这种基于 Coyote Linux的防火墙和 VPN 服务器 一直为很多人选择的平台。
-
-
-# # # 10。[嵌入式 Debian 项目][10] # # #
-
+### 10. [嵌入式 Debian 项目][10] ###
 
 这个项目的目的是使 Debian GNU/Linux 成为嵌入式系统的第一选择。
+
 --------------------------------------------------------------------------------
 
 via: http://www.efytimes.com/e1/fullnews.asp?edid=137612
 
-译者：[owen-carter](https://github.com/owen-carter) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[owen-carter](https://github.com/owen-carter) 校对：[wxy](https://github.com/wxy)
 
 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
 

published/201406/20140528 Why We Shouldn't Accept Bad Linux Ports.md

@@ -0,0 +1,33 @@
+为什么我们不应该接受低劣的Linux移植游戏
+================================================================================
+由于最近The Witcher 2的惨败，我想写下些想法，为什么我们不应该接受来自开发人员的品质低劣的移植游戏。
+
+最近几年在我们的Linux游戏库里面有如此多游戏，以至于你现在可以看到来自Linux玩家的评论“我们已经有很多游戏了！”可能这些声音来自很多像你一样的人。感谢Valve 和 Steam，之前我们从来没有得到过这么多的开发者的关注。
+
+同样由于开发者的推进，我们看见了伴随而来的各种移植游戏，坦率地说，它们的质量十分的低劣，或者说对于大多数人们来说根本不值得去看一眼。
+
+现在的问题就是，如果我们继续接受这种低水平质量的移植，Linux就会赢得一个游戏质量水平低的名声。请认真考虑一下这样的后果吧！
+
+再想象一下，如果那些AAA级的开发者给Linux推送了大量游戏，其中使用了The Witcher2 移植所用的“eON”技术。看起来就像我们有了大量开发者，突然之间Linux有很多大牌游戏了。然后你可以看见大量的人尝试Linux，却发现它们的游戏在同等硬件之下却有着糟糕的画面，就会给他们一个印象，Linux对游戏不友好。这对我们所有人都很糟糕。
+
+我已经看见许多人说“这个工具包用于移植没关系？”。这在我的眼里看来是一个非常天真的想法。当然，这有关系， 它意味Linux的游戏里面的光线和白天的不同品质。这就直接追溯到我上面关于Linux游戏的观点上了。
+
+你可以坚持说工具包没有关系，而且使用任何一个你想用的比较/类比的效果，但如果工具包是导致问题的根源，就像我们说的计算机占用了99%的处理能力的软件一样，是的，它当然有关系！
+
+如今，我已经看见许多来自其他主流网站发表的评论，“我们应该接受它们并且作感谢状，我们毕竟拥有了它们”。那些都是鼠目寸光的人们说的胡话！
+
+![](http://www.gamingonlinux.com/uploads/articles/article_images/1401025331gol2.jpg)
+
+想想，那些开发者和发行商看到那些低劣的Linux移植游戏也能被接受时，他们的脑里只有钱。消费者对Linux游戏的感知就会进一步恶化，就是因为这些低劣的移植品。
+
+我可以接受这些来自开发者的移植，毕竟是我运营着这个网站（ http://www.gamingonlinux.com/ ）。但是，如果我作为一个消费者不愿意为在windows运行挺好的游戏买单，而却为在Linux慢得像蜗牛一样的游戏买单？我会么？你会么？
+
+最后附加的一点：你绝不应该攻击一个试图在社区里面解决问题的开发者，这样是不可以的。反馈是很好，骂人却是很幼稚的，这会使得Linux看起来更糟。
+
+--------------------------------------------------------------------------------
+
+via: http://www.gamingonlinux.com/articles/why-we-shouldnt-accept-bad-linux-ports.3765
+
+译者：[Vic020](http://www.vicyu.net) 校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出

published/201406/20140529 Command Line Tuesdays--The Introductory.md

@@ -2,14 +2,13 @@
 ================================================================================
 **嗨，极客们！**
 
-今天，我们介绍给大家一个新的系列节目，它叫命令行星期二。为什么叫命令行星期二？因为在该系列节目中，就像你们这样的忠实的计算机迷们，每天将会试着走出图形用户界面（GUI）文化的藩篱，GUI文化就是让事情变得简单而大众化。
+今天，我们介绍给大家一个新的系列节目，它叫命令行星期二。为什么叫命令行星期二？因为在该系列节目中，每天坐在计算机前的你们，将会试着走出图形用户界面（GUI）文化的藩篱，从今天开始“让事情变得简单而大众化”。
 
-当然，如果你访问过任何与GNU/Linux相关的社区论坛的话，你可能耳闻目睹了一次火热的辩论，当然这是个假设，话题是哪个实际上更易用。是让GUI掌控一切，还是只是学习并享受命令行界（CLI）面带来的乐趣。
+当然，如果你访问过任何与GNU/Linux相关的社区论坛的话，你可能已经看到了，关于GUI和命令行哪个更好的讨论非常热烈。是让GUI掌控一切，还是只是学习并享受命令行界（CLI）面带来的乐趣呢？
 
 ![Terminal](http://sholva.org/assets/images/blog/2009/review-opensuse-11.2/opensuse-terminal.png)
-终端
 
-对于使用或抛弃GUI工具的争论有很多。正方最常提到的优点之一，就是我们是在点击的计算模式下长大的，所以它基本上就是我们和机器进行交互的一种语言或文化形式。我们日复一日重复着这样的模式，点击那个大按钮来让它干我们需要它干的事。
+对于使用或抛弃GUI工具的争论有很多。正方最常提到的优点之一，就是我们是在点击的计算模式下长大的，所以它基本上就是我们和机器进行交互的一种语言，或者你可以说是一种文化。我们日复一日重复着这样的模式，点击那个大按钮来让它干我们需要它干的事。
 
 而对于反方，我读到的关于命令行的优点的最有趣的评论之一，就是你可以通过命令行来更快，更简单地做更多事情，比GUI工具来得快。但你需要明白的是：你需要学习命令。是的，学习它们，就像学一首诗一样。
 
@@ -17,27 +16,28 @@
 
 ### 寓言 ###
 
-我已经用了Linux超过3年了。27岁，是个文学专业学生，我对任何形式的技术都没有太大的兴趣。我直到中学才有了一台属于自己的计算机，我想大概是17岁那年吧。对于我而言，只用了10年的计算机。我只用过三个程序，BS播放器，Winamp和足球经理，偶尔也用用MS Word。大约三年多以前，我做临时工时的一位同事，在我正和另外一位同僚谈话时告诉我说，有个新版的东西，它一下子就抓住了我的心，它看起来确实与众不同。我现在想想，它就是Ubuntu的敏捷的独角鲸。在和这位同事讨论这个新版本后，他指出了一些常见的优点，这些优点也是我们经常向新手宣传的，不需要杀毒软件，启动快捷，安全性更高，附带有软件中心等等之类。最突出的一点：它背后的自由和开源（FOSS）哲学。他用他不带侵害性和没一点孩子气的方式把我带了进去。
+我已经用了Linux超过3年了。27岁，是个文学专业学生，我对任何形式的技术都没有太大的兴趣。我直到中学才有了一台属于自己的计算机，我想大概是17岁那年吧。对于我而言，只用了10年的计算机。我只用过三个程序，BS播放器，Winamp和足球经理，偶尔也用用MS Word。大约三年多以前，我做临时工时的一位同事，在我正和另外一位同僚谈话时告诉我说，有个新版的东西，它一下子就抓住了我的心，它看起来确实与众不同。我现在想想，它就是Ubuntu的“敏捷的独角鲸”。在和这位同事讨论这个新版本后，他指出了一些常见的优点，这些优点也是我们经常向新手宣传的，不需要杀毒软件，启动快捷，安全性更高，附带有软件中心等等之类。最突出的一点：它背后的自由和开源（FOSS）哲学。他用他温和而优雅的方式把我带了进去。
 
-我决定来一次尝试，而从那以后便一发不可收拾。而至于我是怎么又从第一次对Ubuntu的浅尝辄止转而投向openSUSE 11.4的，咋们下回再讲吧。而我发现它只是一个完美而甜蜜的小插曲，那就完完全全另外一回事了。问题在于，我最终进入了Linux领域。这很有趣，感觉很不一样，它让我的计算机跑得更好，它也更稳定，我也和它相处得很好（似乎我是在不经意间买到了相当正统的硬件）。Linux似乎也远不止是桌面，所以我只是在不得不使用终端的时候也使用终端。但是这么说吧，它是Linux中一个最为讨厌的，最为可怕，最令人不爽的工具之一。如果没有GUI来进行特别的操作，我马上会诚惶诚恐，十分不安了。因为当我从论坛复制/粘贴命令的时候，我都不知道我究竟在干些什么。
+我决定来一次尝试，而从那以后便一发不可收拾。而至于我是怎么又从第一次对Ubuntu的浅尝辄止转而投向openSUSE 11.4的，咋们下回再讲吧。而我发现它只是一个完美而甜蜜的小插曲时，那就完完全全另外一回事了。问题在于，我最终进入了Linux领域。这很有趣，感觉很不一样，它让我的计算机跑得更好，它也更稳定，我也和它相处得很好（似乎我是在不经意间买到了相当普通的硬件）。似乎Linux并不是一个完全的桌面系统，所以我有时不得不使用终端。但是这么说吧，它是Linux中一个最为讨厌的，最为可怕，最令人不爽的工具之一。如果某些操作没有GUI可以做的话，我马上会诚惶诚恐，十分不安了。因为当我从论坛复制/粘贴命令的时候，我都不知道我究竟在干些什么。
 
 随着时间流逝，情况发生了变化。相对于其他以消费者为导向的系统，发生在我身上的事可能有点与一般人相反。在那三年中，我感觉不是我在玩系统，而是系统在玩我。我学会了怎样寻找基本问题，提交bug报告，怎样正确地在论坛上提问。对于碰到的每个问题，我学会了为那些更有能力帮我解决问题的人提供更有用的信息。
 
-不久以前，我女朋友发泄道，她简直不敢相信，我主要为了用计算机而用计算机，而不是用它来做一些别的事情。”你只用它来进行音乐收藏和做些Linux的乱七八糟的事情，Nenad. Gaawd“它让我想啊，使劲想。Linux，特别是openSUSE发行版它成了我的爱好之一。我不是一个专家，不管怎么说都说得通，Linux不在我的专业知识范畴内。但我有足够的知识来搞定它，搞定一些小问题，修改一些配置文件等等。但是我终于认识到，随着玩Linux日久，对系统的调整日多，我真的需要熟悉一下命令行（CLI）了。我也了解到，我在对底层的东西一无所知的情况下对系统胡作非为。我要对着ETC大喊大叫了，它究竟是个什么东西？BIN又是个什么东西？为什么会有个.sh在后面？问什么这个文件在这里？那个文件又在那里？为什么我得点击那一大堆的文件夹来找到正确的文件进行修改？然后，我读到‘你可以用一个命令来简单地列出某个地方的所有文件’时，它又变得很有趣了，我突然感到迫不及待要想试试了。
+不久以前，我女朋友发泄说，她简直不敢相信，我主要为了用计算机而用计算机，而不是用它来做一些别的事情。“你只用它来进行音乐收藏和做些Linux的乱七八糟的事情，Nenad. Gaawd”它让我想啊，使劲想。Linux，特别是openSUSE发行版它成了我的爱好之一。我不是一个专家，不管怎么看都是这样，Linux不在我的专业知识范畴内。但我有足够的知识来搞定它，搞定一些小问题，修改一些配置文件等等。但是我终于认识到，随着玩Linux日久，对系统的调整日多，我真的需要熟悉一下命令行（CLI）了。我也了解到，我在对底层的东西一无所知的情况下对系统胡作非为。我要对着etc大喊大叫了，它究竟是个什么东西？bin又是个什么东西？为什么会有个.sh在后面？问什么这个文件在这里？那个文件又在那里？为什么我得点击那一大堆的文件夹来找到正确的文件进行修改？然后，我读到“你可以用一个命令来简单地列出某个地方的所有文件”时，它又变得很有趣了，我突然感到迫不及待要想试试了。
 
 ### 好吧，让我们干吧！ ###
 
-我们来了……。作为一位新的openSUSE的新闻发布者，我会试着以我所见最有成效的方式来发表我的看法，这样的方式我想对社区中绝大多数人会奏效。该高举旗帜，一起开始学习命令行了。如果是是什么吸引你到Linux和openSUSE中来这么个态度，就想我，引领你走了这么远，那么是时候走得更远一点了。
+我们来了……。作为一位新的openSUSE的新闻发布者，我会试着以我所见最有成效的方式来发表我的看法，这样的方式我想对社区中绝大多数人会奏效。该高举旗帜，一起开始学习命令行了。如果是哲学理念吸引你到Linux和openSUSE中来的，就像我一样，那么是时候走得更远一点了。
 
 ![](http://beerepiphany.files.wordpress.com/2010/04/pinky_brain.jpg)
 
-看，我就知道在那外头有一大堆像我这样的人。我知道，你也许没有抓住90后极客们的要点，黑屏-绿字-手指在键盘上乱飞-让一切都激情澎湃。但这在很多地方都很有用。我们将以一种有趣的，而又共有的方式来学习，目录是用来干什么，什么文件放在什么地方，以及一些最常用的终端命令。在我们在控制台处理一些任务时，这将让我们更轻松一些；在碰到一些问题时，获得更大的回报。它也会让bug处理者更轻松些，如果他们从我们这头收到正确的信息的话。它也让我们的爱好变得乐趣无穷。
+看，我就知道在那外头有一大堆像我这样的人。我知道，你也许没有抓住90后极客们的要点，黑屏-绿字-手指在键盘上乱飞-让一切都激情澎湃。但这在很多地方都很有用。我们将以一种有趣的，而又通用的方式来学习，目录是用来干什么，什么文件放在什么地方，以及一些最常用的终端命令。在我们在控制台处理一些任务时，这将让我们更轻松一些；在碰到一些问题时，获得更大的回报。它也会让bug处理者更轻松些，如果他们从我们这头收到正确的信息的话。它也让我们的爱好变得乐趣无穷。
 
 我是说，我的天啊，你已经过渡到连Dilber和xkcd都感到有趣的阶段了。是时候到终端下去了。
 
 附录：
 
-要用到的一些参考资料：威廉 · 肖茨—— 《Linux命令行》,以及克罗地亚黑客韦利米尔 ·巴克沙，别名鲁塞拉斯，《关于最常用命令的简短教程》。对于你们的要求:
+要用到的一些参考资料：威廉·肖茨—— 《Linux命令行》,以及克罗地亚黑客韦利米尔·巴克沙，别名鲁塞拉斯，《关于最常用命令的简短教程》。对于你们的要求:
+
 - 每周1到2小时的空闲时间
 - 一品脱冰冻啤酒或者其它饮料
 - 有人已经指出，使用[Gedit][1]，或者手工记录本（你懂的，笔和纸，呵呵）可以让学习更简单一些。
@@ -50,7 +50,7 @@
 
 via: https://news.opensuse.org/2014/05/27/command-line-tuesdays-the-introductory/
 
-译者：[GOLinux](https://github.com/GOLinux) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[GOLinux](https://github.com/GOLinux) 校对：[wxy](https://github.com/wxy)
 
 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
 

published/201406/20140607 How To Extract Images From Videos Using ffmpeg.md

@@ -1,26 +1,25 @@
-如何使用ffmpeg从视频中提取图片（有些专业词汇不太懂可能翻译错了，各位校译幸苦了）
+如何使用ffmpeg从视频中提取图片
 ================================================================================
-嗨，unixmen的读者们，
 
-你曾想过从一个视频文件中提取图片吗？在Linux中做这件事是有可能的，教程中我将使用ffmpeg来从视频中获取图片。
+你曾想过从一个视频文件中提取图片吗？在Linux下就可以，在这个教程中我将使用ffmpeg来从视频中获取图片。
 
 ### 什么是ffmpeg？What is ffmpeg? ###
 
-ffmpeg是一个非常有用的命令行程序，它可以用来转码媒体文件。它是FFmpeg领先的多媒体框架的一部分，其有很多功能，比如解码、编码、转码、混流、分离、转化为流、过滤以及播放几乎所有的的由人和机器创建的媒体文件。
+ffmpeg是一个非常有用的命令行程序，它可以用来转码媒体文件。它是领先的多媒体框架FFmpeg的一部分，其有很多功能，比如解码、编码、转码、混流、分离、转化为流、过滤以及播放几乎所有的由人和机器创建的媒体文件。
 
-框架中包含有很多不同的工具，其中每一个都有特定的功能。例如，ffserver能够将多媒体文件转化为用于实时广播的流，ffprobe用于分析多媒体流，ffplay可以当作一个简易的媒体播放器，**ffmpeg**能够转换多媒体文件格式。
+在这个框架中包含有各种工具，每一个用于完成特定的功能。例如，ffserver能够将多媒体文件转化为用于实时广播的流，ffprobe用于分析多媒体流，ffplay可以当作一个简易的媒体播放器，**ffmpeg**则能够转换多媒体文件格式。
 
-如果你感兴趣，以下是包括在FFmpeg框架中的开发者库：
+如果你感兴趣，以下列出的是FFmpeg框架中包含的开发者库：
 
 - libavutil是一个包含简化编程功能的库，其中包括随机数生成器，数据结构，数学代码，核心多媒体工具等更多东西。
 - libavcodec是一个包含音频/视频解码器和编码器的库。
-- libavformat是一个包含了多媒体格式的解析器和产生器的库。
-- libavdevice是一个包含输入输出设备的库，用于捕捉和渲染很多公共多媒体输入/输出软件框架，包括Video4Linux，Video4Linux2，VfW和ALSA。
+- libavformat是一个包含了多媒体格式的分离器和混流器的库。
+- libavdevice是一个包含输入输出设备的库，用于捕捉和渲染很多来自常用的多媒体输入/输出软件框架的数据，包括Video4Linux，Video4Linux2，VfW和ALSA。
 - libavfilter是一个包含媒体过滤器的库。
 - libswscale是一个用于执行高度优化的图像缩放和颜色空间/像素格式转换操作的库。
-- libswresample是一个用于执行高度优化的音频重采样，重新矩阵和样本格式转换操作的库。
+- libswresample是一个用于执行高度优化的音频重采样，重新矩阵和取样格式转换操作的库。
 
-**注意**：ffmpeg和FFmpeg并不一样。FFmpeg是一个框架而ffmpeg是一个FFmpeg中的一个功能。
+**注意**：ffmpeg和FFmpeg不是同一个东西。FFmpeg是框架，而ffmpeg是一个其中的一个功能。
 
 ### 开始行动 ###
 
@@ -57,9 +56,9 @@ Fedora用户可以从源中直接安装ffmpeg。
 
 之后我使用以下命令从视频中提取图片。
 
-    ffmpeg -i "Тимати - Рентген ( Альбом '13')-C9Plztvv8ac.mp4" -r 1 -q:v 2 -f image2 image-3%d.jpeg
+    ffmpeg -i "你是我的小呀小苹果儿.mp4" -r 1 -q:v 2 -f image2 image-3%d.jpeg
 
-**-i**选项用来获取输入文件，在这里是视频文件名**Тимати – Рентген ( Альбом ’13′)-C9Plztvv8ac.mp4**，-r选项设置每秒提取图片的帧数。我想要每秒提取一帧。
+**-i**选项用来获取输入文件，在这里是视频文件名**你是我的小呀小苹果儿.mp4**，-r选项设置每秒提取图片的帧数。我想要每秒提取一帧。
 
 之后有一个重要的选项是-q:v，应该留意这个选项并且我很喜欢用它，它用来设置提取到的图片质量。我总是设置值为2来从视频中获取高质量图片。
 
@@ -67,6 +66,6 @@ Fedora用户可以从源中直接安装ffmpeg。
 
 via: http://www.unixmen.com/extract-images-videos-using-ffmpeg/
 
-译者：[linuhap](https://github.com/linuhap) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[linuhap](https://github.com/linuhap) 校对：[wxy](https://github.com/wxy)
 
 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出

published/201406/20140607 Nuvola Player 2.4.0 Released -- A Online Cloud Music Player for Linux.md

@@ -1,28 +1,30 @@
 Linux下的在线云音乐播放器 —— Nuvola Player 2.4.0发布
 ================================================================================
-**Nuvola Player**是一个开源的播放器，在它自身的web界面中运行像Amazon云播放器，Bandcamp，Deezer，8tracks，Google Play音乐，Grooveshark，Hyper Machine以及Pandora等等云音乐服务，同时它也能整合到Linux桌面中。
+**Nuvola Player**是一个开源的播放器，可以在其web界面中运行像Amazon云播放器，Bandcamp，Deezer，8tracks，Google Play音乐，Grooveshark，Hyper Machine以及Pandora等等云音乐服务，同时它也能整合到Linux桌面中。
 
 该应用程序以插件的形式提供了大量的功能特性，像桌面通知、系统托盘、多媒体键、媒体播放器小程序、停靠栏菜单、歌词、last.fm等等。
 
-**2014年5月31日**，**Nuvola Player 2.4.0**的一个新版本发布了 —— 它带来了一些新的特性，包括两个新的服务罗技媒体服务器和这是我的果酱，以及众多的bug修复。
+**2014年5月31日**，**Nuvola Player 2.4.0**的一个新版本发布了 —— 它带来了一些新的特性，包括两个新的服务“Logitech Media Server”和“This is My Jam ”，以及众多的bug修复。
 
 ### 这个发布中有什么新东西 ###
 
-- 删除了破损的隐藏Google+按钮选项，因为Google修改代码过于频繁。
+- 删除了破损的隐藏Google+按钮选项，因为Google修改代码过于频繁了。
 - 加快了服务设置的启用速度，不需要再重新加载。
 - 修复了暂停和播放/暂停动作开关。
 - 为Chrome添加了兼容问题警告桌面通知。
 - 提供了页面内导航按钮（现在用户可以在Google Play标识旁边的顶部栏中找到它）。
-- 添加了罗技媒体服务器和这是我的果酱服务。
+- 添加了“Logitech Media Server”和“This is My Jam ”服务。
 - 包含了对鼠标后退/前进按钮的支持。
 - 修复了对GNOME锁屏通知的支持。
 
 要查看完整的特性列表，请访问官方发行[声明页面][1]
 
-### 在Debian, Ubuntu和Linux Mint中安装Nuvola Player ###
+## 在Debian, Ubuntu和Linux Mint中安装Nuvola Player ##
+
 官方的Nuvola Player仓库中包含了**Ubuntu 14.04, 13.10, 12.10, 12.04**以及**Linux Mint 17, 16, 15, 14.**可用的二进制包，你可以通过添加Nuvola Player仓库到你的系统中来安装二进制包‘nuvolaplayer’。
 
-#### 在Ubuntu和Linux Mint上 ####
+### 在Ubuntu和Linux Mint上 ###
+
 打开终端并运行以下一系列命令：
 
     $ sudo add-apt-repository ppa:nuvola-player-builders/stable
@@ -36,7 +38,8 @@ Linux下的在线云音乐播放器 —— Nuvola Player 2.4.0发布
 
     $ sudo apt-get --no-install-recommends install nuvolaplayer
 
-#### 在Debian上 ####
+### 在Debian上 ###
+
 对于**Debian Wheezy**和**Debian Sid**，可以从官方仓库中获取稳定的Nuvola Player二进制包。你可以使用下面这一堆命令来安装最新的稳定版。
 
 首先，打开终端并导入公钥，然后添加仓库到‘**sources.list**‘文件，接着像下面这样进行一次系统更新来安装nuvolaplayer。
@@ -97,7 +100,7 @@ Rdio音乐服务
 
 via: http://www.tecmint.com/install-nuvola-player-in-linux/
 
-译者：[GOLinux](https://github.com/GOLinux) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[GOLinux](https://github.com/GOLinux) 校对：[wxy](https://github.com/wxy)
 
 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
 

published/201406/20140609 Open Source LDAP Solutions.md

@@ -22,7 +22,7 @@ LDAP（轻量级目录访问协议）是一个用于访问目录服务的应用
 
 via: http://www.linuxlinks.com/article/20140607022012848/LDAPSolutions.html
 
-译者：[GOLinux](https://github.com/GOLinux) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[GOLinux](https://github.com/GOLinux) 校对：[wxy](https://github.com/wxy)
 
 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
 

published/201406/20140610 How to set up Internet connection sharing with iptables on Linux.md

@@ -0,0 +1,118 @@
+怎样使用linux的iptables工具进行网络共享
+================================================================================
+
+在本教程中，我将解释多个设备怎样在linux下共享一个网络连接。目前无线路由器已经成为主流的消费品，从而解决了本文这一问题。这里假设你家中并没有一台无线路由器，不过，你却有一台已经有"猫"和有线网卡的的linux主机。"猫"是以动态公有IP地址的模式连接到互联网，主机的网卡连接到你的交换机或者集线器。其他设备（如linux或者windows的PC或者笔记本）以网桥的形式连接，并且没有连接到互联网。为了共享linux主机的互联网，你必须把主机转换成网关，以便它能实现从其他设备中传送和接受信息。
+
+### 术语字汇 ###
+
+
+- **私有IP地址**（路由不可达地址）是一个被用于本地局域网的IP地址（在互联网中不可见）。
+- **公用IP地址**（路由可达地址）是一个在互联网中可见的IP地址。
+- **IP伪装**是一项允许一系列机器通过MASQ网关连接互联网的功能。这些MASQ网关之外的机器在互联网中是不可见的。MASQ之后的机器中任何流入或流出的数据必须经过MASQ网关。
+- **网络地址转换**（NAT）是一项通过IP伪装技术可以使私有IP地址访问互联网的功能。
+
+### Hardware Requirements ###
+
+硬件要求
+
+- 一台有两个接口（一个公有IP地址和其他的私有IP地址）的linux主机，这个主机将被用作网关。
+- 一台或者多台拥有私有IP地址的linux/windows系统的PC或者笔记本。
+- 交换机/集线器（可选）。
+
+### 教程步骤 ###
+
+接下来的过程需要在linux主机（用于共享的网关）上完成。
+
+#### 1、激活IP转发 ####
+
+为了设置网络共享，你需要在linux主机上更改一个内核参数来使能IP转发功能。内核启动参数设定在/etc/sysctl.conf文件中。
+
+打开这个文件，定位到含有"# net.ipv4.ip_forward = 0"的这一行，移除#号（即取消注释），然后将其值设置为1，改好之后应该和下面的一致。
+
+    net.ipv4.ip_forward = 1
+
+你还要使激活IP转发功能生效，通过执行下面的命令：
+
+    $ sudo sysctl -w net.ipv4.ip_forward=1
+    $ sudo sysctl -p
+
+#### 2、NAT配置 ####
+
+另一个网络共享的重要部分是NAT配置，这可以通过使用iptables的命令，iptables包含四个防火墙的规则表：
+
+- FILTER (默认表格)
+- NAT
+- MANGLE
+- RAW
+
+这个教程中我们将仅使用两个表格：FILTER和NAT表格。
+
+首先，刷新所有活跃的防火墙的规则。
+
+    $ sudo iptables -X
+    $ sudo iptables -F
+    $ sudo iptables -t nat -X
+    $ sudo iptables -t nat -F
+
+
+在输入表格中，你需要设置转发链（FORWARD）成可接受的（ACCEPT）目的地，因此所有通过主机的数据包将会被正确的处理。
+
+    $ sudo iptables -I INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT
+    $ sudo iptables -I FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT
+
+
+在NAT表中，你必须为你的WAN口启用IP伪装功能，我们假设WAN口协议是ppp0。为了在ppp0接口上使能IP伪造技术，我们使用以下的命令：
+
+    $ sudo iptables -t nat -I POSTROUTING -o ppp0 -j MASQUERADE
+
+#### 3、配置私有IP地址 ####
+
+在linux主机上的所有配置完成后，你需要配置其他设备（linux/windows的PC或笔记本）的DNS服务器以及默认网关，让它们的数据流可以指向linux主机。注意你不需要在linux主机上设置一个DNS服务器，从其他设备发出的每一个DNS请求都会通过上游的ISP自动转发到linux主机上。
+
+如果你的其他设备上用的系统是linux，你可以通过以下命令来更改他们的默认网关和DNS服务器。假设你的网段是192.168.1.0/24的私有IP地址网段，linux主机上绑定的IP地址是192.168.1.1。
+
+    $ sudo ip route del default
+    $ sudo ip route add default via 192.168.1.1
+    $ sudo sh -c "echo 'nameserver 192.168.1.1' > /etc/resolv.conf"
+
+如果还有其他的linux设备，那么你可以重复以上命令。
+
+如果你有windows设备，你可以通过控制面板的网络连接属性来更改默认网关和DNS服务器。
+
+#### 4、完整的脚本 ####
+
+这是一个在linux主机上设置网络连接共享的一个完整的脚本。WAN口（ppp0协议）需要根据你具体的网络接口协议来替换。
+
+    $ sudo vi /usr/local/bin/ishare
+
+----------
+
+    #!/bin/bash
+    
+    ## Internet connection shating script
+    
+    sysctl -w net.ipv4.ip_forward=1
+    sysctl -p
+    iptables -X
+    iptables -F
+    iptables -t nat -X
+    iptables -t nat -F
+    iptables -I INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT
+    iptables -I FORWARD  -m state --state RELATED,ESTABLISHED -j ACCEPT
+    iptables -t nat -I POSTROUTING -o ppp0 -j MASQUERADE
+
+保存以上的脚本到/usr/local/bin/ishare，然后添加可执行权限通过执行下面的命令。
+
+    $ sudo chmox +x /usr/local/bin/ishare
+
+如果你需要这个脚本开机启动，你需要在/etc/rc.local文件中执行这个脚本，并在该文件中的"exit 0"之前添加下面一行。
+
+    /usr/local/bin/ishare
+
+--------------------------------------------------------------------------------
+
+via: http://xmodulo.com/2014/06/internet-connection-sharing-iptables-linux.html
+
+译者：[yujianxuechuan](https://github.com/yujianxuechuan) 校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出

published/201406/20140611 How to Prevent Other Users From Accessing Your Home Directory in Ubuntu 14.04.md

@@ -1,24 +1,24 @@
-如何在Ubuntu 14.04中阻止其它用户访问你的家目录
+[小白技巧]如何在Linux中阻止其它用户访问你的家目录
 ================================================================================
 ![](http://cdn.howtogeek.com/wp-content/uploads/2014/05/00_lead_image_home_directory.png)
 
-如果你和其他人共享Ubuntu机器，那么你可能要设置多个用户，并考虑让其他用户登录到他们自己的帐号，而只能访问他们自己的家目录。但是，默认情况下，任何一个用户都可以访问任何一个家目录。
+如果你和其他人共享Ubuntu机器，那么你可能要设置多个用户，希望其他用户登录到他们自己的帐号，并只能访问他们自己的家目录。但是，默认情况下，任何一个用户都可以访问任何一个家目录。
 
-当你在Ubuntu中添加一个新用户时，adduser工具为新的帐号添加了一个新的家目录。默认情况下，该目录位于根下面的/home/目录下，并以该帐号的用户名命名。例如，/home/lori。Ubuntu中创建的用户家目录具有全局读/写权限，这就给系统中所有其他用户可以读因外一些用户的家目录中的内容的权利。具体请阅读我们的[文件权限在Linux中是如何工作的][1]一文。
+当你在Ubuntu中添加一个新用户时，adduser工具为新的帐号添加了一个新的家目录。默认情况下，该目录位于根下面的/home/目录下，并以该帐号的用户名命名。例如，/home/lori。Ubuntu中创建的用户家目录具有其它人可读/执行权限，这就给系统中所有其他用户可以读另外外一些用户的家目录中的内容的权利。具体请阅读我们的[文件权限在Linux中是如何工作的][1]一文。
 
-**注**：当我们在文中提到输入什么时，输入的文字内容是在引号中的，不要输入引，除非我们另外指定。
+**注**：当我们在文中提到输入什么时，输入的文字内容是在引号中的，不要输入引号，除非我们另外指定。
 
-你可以很容易地修改你的家目录的权限来保护你的私人文件。要检查你家目录的权限，输入Ctrl + Alt + T打开终端窗口，并在提示符后输入以下行，然后按回车。使用你自己的用户名来替换“<username>”。
+你可以很容易地修改你的家目录的权限来保护你的私人文件。要检查你家目录的权限，输入Ctrl + Alt + T打开终端窗口，并在提示符后输入以下命令，然后按回车。使用你自己的用户名来替换下面的“用户名”。
 
-    ls –ld /home/lori
+    ls -ld /home/lori
 
-**注**：该命令使用的是小写的L，而不是数字1.
+**注**：该命令仅包含小写的L，而不是数字1。（LCTT译注：这是给完全小白的提示，绝大部分人可以无视这个备注了）
 
 在该行的开头，列出了该文件的权限。就像我们在[文章][1]中关于Linux权限部分讲的那样。
 
-> ”r表示“读”，w表示“写”，而x表示“执行”。目录权限以“d”开头，而不是“-”。你也会注意到权限值占了10个位置。你可以忽略第一个，后面是3个一组，分为3组。第一组是属主权限，第二组是属组权限，最后一组是大众权限“。
+> r表示“读”，w表示“写”，而x表示“执行”。目录权限以“d”开头，而不是“-”。你也会注意到权限值占了10个位置。你可以忽略第一个，后面是3个一组，分为3组。第一组是属主（owner）权限，第二组是属组（group）权限，最后一组是其它人（other或world）权限。
 
-因此，下面列出的家目录的属主具有读、写和执行权限，而属组和大众具有读和执行权限。
+因此，下面列出的家目录的属主具有读、写和执行权限，而属组和其它人具有读和执行权限。
 
 ![](http://cdn.howtogeek.com/wp-content/uploads/2014/05/01_permissions_for_home_folder.png)
 
@@ -32,7 +32,7 @@
 
 ![](http://cdn.howtogeek.com/wp-content/uploads/2014/05/02_changing_permissions_for_home_folder.png)
 
-按上箭头两次，再次调用“ls -ld /home/<username>“命令来检查权限。注意，全局权限现在都是破折号（-），这就意味着大众将无法读、写或执行你家目录中的任何东西了。
+按上箭头两次，再次调用“ls -ld /home/用户名”命令来检查权限。注意，其它人权限现在都是破折号（-），这就意味着其它人将无法读、写或执行你家目录中的任何东西了。
 
 然而，和你同组的用户可以读和执行你家目录中的文件和文件夹。如果你不想除你之外的任何人访问你的家目录，可以在chmod命令中输入“0700”。
 
@@ -46,7 +46,7 @@
 
 ![](http://cdn.howtogeek.com/wp-content/uploads/2014/05/04_location_could_not_be_displayed.png)
 
-你也可以在创建新用户时，甚至Ubuntu使用指定的权限。要完成此项任务，你需要编辑adduser配置文件。要编辑该文件，在提示符下输入以下命令并回车。
+甚至你也可以在创建新用户时让Ubuntu使用指定的权限。要完成此项任务，你需要编辑adduser配置文件。要编辑该文件，在提示符下输入以下命令并回车。
 
     gksudo gedit /etc/adduser.conf
 
@@ -60,7 +60,7 @@
 
 ![](http://cdn.howtogeek.com/wp-content/uploads/2014/05/06_entering_password.png)
 
-在adduser.conf文件中向下滚动到DIR_MODE命令处，这里的默认值是“0755”。修改该值来反映你想要授权给各种用户类型（用户，组，大众）的不同权限（r，w，x），如我们先前讨论过的“0750”或“0700“。点击保存（Save）。
+在adduser.conf文件中向下滚动到DIR_MODE命令处，这里的默认值是“0755”。修改该值来反映你想要授权给各种用户类型（属主，属组，其它人）的不同权限（r，w，x），如我们先前讨论过的“0750”或“0700”。点击保存（Save）。
 
 ![](http://cdn.howtogeek.com/wp-content/uploads/2014/05/07_changing_dir_mode.png)
 
@@ -72,13 +72,13 @@
 
 ![](http://cdn.howtogeek.com/wp-content/uploads/2014/05/09_closing_terminal_window_with_x.png)
 
-现在，你家目录中文件会保持私有。切记，如果有其他用户和你处于同一组中，你也需要为你的家目录权限剔除组和大众权限。
+现在，你家目录中文件会保持私有。切记，如果有其他用户和你处于同一组中，你也许要为你的家目录权限剔除组和大众权限。
 
 --------------------------------------------------------------------------------
 
 via: http://www.howtogeek.com/190084/how-to-prevent-other-users-from-accessing-your-home-directory-in-ubuntu-14.04/
 
-译者：[GOLinux](https://github.com/GOLinux) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[GOLinux](https://github.com/GOLinux) 校对：[wxy](https://github.com/wxy)
 
 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
 

published/201406/20140612 Command Line Tuesdays--Part One.md

@@ -1,26 +1,26 @@
-命令行星期二 — 第一篇
+命令行星期二 ——  第一篇
 ================================================================================
 极客们，我们又回来了！真抱歉让你们久等了，但我保证，我们又回归正轨了。我们满怀热情与大家相约，让我们激情燃烧，寻找刺激吧:)
 
-现在，整个的想法已经在两周前的开场白中告诉你们了，所以现在让我们来干点正事吧。就像Shotts先生书里讲得那样，我们需要来了解一下shell是个什么东西，终端模拟器又是个什么东西，因为我们要在这里头干活。
+现在，整个的想法已经在之前的开场白中告诉你们了，所以现在让我们来干点正事吧。就像肖茨先生书里讲得那样，我们需要来了解一下shell是个什么东西，终端模拟器又是个什么东西，因为我们要在这里头干活。
 
-Shotts在他的书中写道，shell实际上是当我们谈论命令行时所谈论的东西。shell基本上一个程序，它将你敲击键盘的动作传递给计算机；它也是某种形式的翻译器，将你所讲的东西翻译给计算机听。在这世界上活着的shell真是五花八门，但是活得最好的要数**bash**了，它在GNU/Linux中随处可见。我们也叫它Bourne Again Shell，这是一个精巧的双关语，因为自从Bourne先生创造了它的祖先**sh**后，Brian Fox又把它重写成为一个自由的sh替代品。啊哈！GUN人和他们的幽默，真的很精明。:)
+肖茨在他的书中写道，shell实际上是当我们谈论命令行时所谈论的东西。shell基本上一个程序，它将你敲击键盘的动作传递给计算机；它也是某种形式的翻译器，将你所讲的东西翻译给计算机听。在这世界上活着的shell真是五花八门，但是活得最好的要数**bash**了，它在GNU/Linux中随处可见。我们也叫它Bourne Again Shell，这是一个精巧的双关语，因为自从Bourne先生创造了它的祖先**sh**后，Brian Fox又把它重写成为一个自由的sh替代品。啊哈！GUN人和他们的幽默，真的很精明。:)
 
 ![](http://paste.opensuse.org/images/54535272.jpg)
 
-接下来我所需要，是一个让我们能和shell交互的东西，它就是终端模拟器。每个Linux发行版都自带了一个，至于长什么样就得看你使用的桌面环境了，可能是KDE的**Konsole**，也可能是Gnome的**Gnome terminal**等等。Shotts先生说了，你可以开发出你所偏爱的一个，但是大部分时间我还是用用桌面环境给我提供的那个吧。
+接下来我所需要，是一个让我们能和shell交互的东西，它就是终端模拟器。每个Linux发行版都自带了一个，至于长什么样就得看你使用的桌面环境了，可能是KDE的**Konsole**，也可能是Gnome的**Gnome terminal**等等。肖茨先生说了，你可以挖掘出你所偏爱的一个，但是大部分时间我还是用桌面环境给我提供的那个吧。
 
 现在来发动你的终端。打开后，你会见到一行字，这行字告诉你用户名和机器的主机名，它叫作shell提示符。它告诉你它准备好了，你可以输入命令了。让我们来随便玩玩，随便输入点什么东西进去，然后敲回车看看。
 
 呵呵，还记开篇我们讲过，我们需要像学诗歌一样来学习命令吗？记得就好，随意乱来可干不了啥事。
 
-现在，按那个上箭头，你会发现命令又回来了。这是啥魔法？你键盘上的上箭头用来取出历史命令。终端会保存总计500个你输入过的命令，所以别一次又一次地重复敲它们了，你可以用上/下箭头来查找它们。左右箭头用来在指定行中移动光标，这样你就可以在文本中编辑或者插入了。另外一个东西 — **ctrl+v**是用来粘贴不工作的文本的。你可以在某个地方将它设置成快捷键，但是它常常不是那么回事。检查你的模拟器的快捷键！（在Konsole中，它位于设置 > 配置快捷键）
+现在，按那个上箭头，你会发现命令又回来了。这是啥魔法？你键盘上的上箭头用来取出历史命令。终端会保存总计500个你输入过的命令，所以别一次又一次地重复敲它们了，你可以用上/下箭头来查找它们。左右箭头用来在指定行中移动光标，这样你就可以在文本中编辑或者插入了。另外注意，想用**ctrl+v**来粘贴文本是不行的。你可以在某个地方将它设置成快捷键，但是它常常不是那么回事。检查你的模拟器的快捷键！（在Konsole中，它位于设置 > 配置快捷键）
 
-现在，为了我们不在挨‘命令找不到’这一巴掌，让我们试试一些简单的。敲个**date**来试试。（是的，我不知道有这么个命令，这真着实让我兴奋了一把）:)
+现在，为了我们不再被‘命令找不到’抽一巴掌，让我们试试一些简单的。敲个**date**来试试。（是的，我不知道有这么个命令，这真着实让我兴奋了一把）:)
 
 ![](http://paste.opensuse.org/images/7123365.png)
 
-你又来了。当你能打开终端并输入date命令来查看日期时，为什么在时钟中看看内建日历会让你不胜其烦 :) 只是开个玩笑。就像Shotts书里写的那样，它确实是个简单的命令，更有用/困难的命令会在以后介绍。跟date相关的命令是cal - 它会显示当前月的日历。
+你又来了。当你能打开终端并输入date命令来查看日期时，为什么在时钟中看看内建日历会让你不胜其烦 :) 只是开个玩笑。就像肖茨书里写的那样，它确实是个简单的命令，更有用也更复杂的命令会在以后介绍。跟date相关的命令是cal - 它会显示当前月的日历。
 
 你也可以试试**df**，它会列出你驱动器上的空闲空间。
 
@@ -38,7 +38,7 @@ Shotts在他的书中写道，shell实际上是当我们谈论命令行时所谈
 - 我们需要用什么来和shell交流（终端模拟器）
 - 使用光标按钮来驾驭终端命令以及退出终端
 
-是个简单的命令：
+四个简单的命令：
 
 - **date** – 显示当前日期
 - **cal** – 显示当前月份的日历
@@ -47,7 +47,6 @@ Shotts在他的书中写道，shell实际上是当我们谈论命令行时所谈
 
 ### 下周二我们将会做什么呢？ ###
 
-We learn navigation through the file system (what are all those bin etc etc. folders, what are they used for, how to navigate through them via the terminal). Until then…
 我们会学习在文件系统中导航（bin、etc等等这所有的文件夹都是些什么东西？它们用来干什么？怎样通过终端来浏览它们）。到那时……
 
 ### 你就有得乐了！ ###
@@ -58,6 +57,6 @@ We learn navigation through the file system (what are all those bin etc etc. fol
 
 via: https://news.opensuse.org/2014/06/10/command-line-tuesdays-part-one/
 
-译者：[GOLinux](https://github.com/GOLinux) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[GOLinux](https://github.com/GOLinux) 校对：[wxy](https://github.com/wxy)
 
 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出

published/201406/20140616 How To Install Numix Icon Theme In Fedora 20.md

@@ -36,7 +36,7 @@ Numix图标主题张冠李戴，Fedora 20劲爆酷爽
 
 via: http://www.unixmen.com/install-numix-icon-theme-fedora-20/
 
-译者：[GOLinux](https://github.com/GOLinux) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[GOLinux](https://github.com/GOLinux) 校对：[wxy](https://github.com/wxy)
 
 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
 

published/201406/20140617 14 Apps To Boost Ubuntu.md

@@ -0,0 +1,82 @@
+14个可以提升Linux桌面体验的应用程序
+==============================
+
+转战到Ubuntu，或者是别的流行的Linux发行版，不仅仅是操作系统的操作方式的改变，更多的是你还需要一些能支持你完成工作的好的应用。
+
+在这篇文章中，我将分享一些我精选出来不可或缺的应用程序，并谈谈在我的日常工作中如何有效地使用它们。
+
+### 日常使用的应用程序 ###
+
+一般当说到Linux桌面上的应用，我总是将这些应用划分为两大类，频繁使用的和一些别的应用。下边我为大家介绍的是一些自己日常使用的应用。
+
+1） **Firefox** — 有时我也会使用用其他的浏览器，但最近[火狐浏览器][1]已经成为我可以长期信赖的朋友。可靠的、 安全的、 跨平台的，火狐浏览器完全满足了我的日常冲浪需求。
+
+除了访问书签和网页，我还依靠火狐浏览器来处理我的各种部署在局域网服务器上的工作，如 [Plex][2], [Zoneminder][3], 路由器/WEB应用防火墙, 及我的文件服务器。所有这些均可以使用火狐浏览器进行访问。
+
+2） **Parcelite**— 如果没有一个像样的剪贴板管理器我简直没法开始工作，至少对我来说，你无法找到在GNOME 下的[Parcelite][4]有什么不足。使用简单，易于访问而且它提供了很多的有用的选项。Parcelite选项应有尽有，包括了从热键设置到空格处理方式。尽管已经有很多的剪贴板管理器，但它们却很难击败 Parcelite。
+
+3） **Bittorrent Sync** — 我已经使用过了各种开源替代方案进行文件同步，但是他们在正式发布之前还需要进行进一步开发。应该说[Bittorrent Synchas][5]从来没有让我失望过。它运行和安装都很简单和方便，这多亏了新的GUI的实现，而且 Bittorrent Sync 允许我快速地从一台机器到另外一台机器传输巨大的视频文件，而无需浪费时间去将大量的文件同步到“云端”。
+
+我还发现它是与别人分享大型文件的最佳方法，在分享的同时能一直保持 IP 地址和目录的隐蔽。尽管有许多的替代品，我仍然坚定地成为了Bittorrent Sync的骨灰粉丝。
+
+4） **System Monitor** — 因为TOP实在是滚动地太快了，所以我个人更喜欢一个具有选项卡式的 GUI，因为它能够让我的眼睛更轻松些。使用 GNOME 的系统监视器，我可以很快地发现一个失控的进程，并且轻松地kill掉它而不需吹灰之力。与[TOP][7]这样的终端程序不同的是，我可以实时的以图形化的方式去查看我的 CPU、 内存和磁盘的使用情况。作为一个拥有正常视觉的人，很难找到一个比用条形图来展示我还拥有多少的空间的更好方式。当然这也同样适用于其它的实时资源使用情况的监视。
+
+5） **PulseAudioControl** — 每一天，我总是需要在多个声音设备之间来回穿梭。有时我需要将其中一个设为默认设备，然后却可能会从火狐浏览器音频完全切换到到另一个设备。因为我想控制我的尽可能多的音频，然后我就发现 [PulseAudioControl][8]是一个无价的工具。
+
+### 一些别的软件 ###
+
+在本节中，我将分享我使用，但可能并不一定是每天都使用的应用程序。许多这些应用程序都是开放源代码的，有一些不是，但是它们对我个人都非常具有价值。
+
+
+6） **Skype** — 无论是拨入[Jupiter Broadcasting][9] 收听每周共同主持的播客，或者只是简单联系一个业务，[Skype][10] 见证了互联网视频会议的发展史。测试完成无数的替代品后，我总是会发现自己还是终回到了Skype。即使有真的很棒的开源选择像[Ekiga][11] 和 [Jitsi][12]，而在最后Skype总是与大家同在 —— 切换到Skype是一件很幸运的事。
+
+7）**Kdenlive**  — 我使用两个不同的视频编辑器，当我要处理一个需要大量编辑的视频剪辑项目的时候，[Kdenlive][13]是我用于图片合成和编辑大型的复杂的视频的工具。我已经成功地在 Kdenlive 里边做过6个素材轨道的编辑，但同样的负载量早已经让别的视频剪辑软件崩溃了。
+
+8）**OpenShot**  — 大多数情况下，我会将[OpenShot][14]作为视频剪辑任务的首选神兵利器。快速的编辑和两个素材轨道工作区让你可以流畅而操作简单。我还发现它提供了很棒的无与伦比的特效。调制标题效果和超赞的的视频转场效果使OpenShot在我自己的视频项目上成为一款超棒的视频制作软件。
+
+9）**SpiderOak** — 在使用了无数云备份服务这么多年后， [SpiderOak][15] 已经成为了我的至爱。易于安装和使用，我超喜欢它所提供的增量选项而且使用起来是如此的简单。只需一次设置，不再操心，之后SpiderOak将会挑起你的文件搬运大任。
+
+10） **Dropbox**  — 许多年来，我已经与[Dropbox][16] 爱恨交织。尽管它的跨平台特性这意味着我可以从任何位置访问文件，我慢慢地发现我自己越来越少依赖这个基于云计算的备份解决方案。尽管如此，它允许我从任何 web 浏览器中访问文件，即使是从我不经常使用的计算机，这使得抛弃 Dropbox 更是难上加难。
+
+11） **Writer** — 自从我第一次在Windows的OpenOffice里面使用过它之后，我一直都在使用[Writer][17]。今天，我使用LibreOffice 所带的Writer来满足我的需求，它可以做一切一个文字处理器可以做的事情。现在，公正地说，一些专有的办公套件可能会提供附加功能在Writer中是没有的，但是99%的人需要的功能在Writer这里都有。就我个人而言，我会永远是一个LibreOffice Writer粉。
+
+12）**SimpleScreenRecorder**  — 多年来，我发现自己使用 [SimpleScreenRecorder][18]远超过其他同类软件，它能很好支持多监视器模式，再加上它甚至可以捕获基于 OpenGL 的应用程序的视频。易于使用和可靠的 SimpleScreenRecorder 让我的工作更加得心应手。我把它推荐给那些只是偶尔需要，懒得使用其它屏幕捕捉软件的同学们。
+
+13）**SimpleScan** — 当我需要扫描文档的时候，我一点都不想将大把大把的时间花费在配置的臃肿的程序上。 [Simple Scan][19] 可以在这方面做得很好。智能的SANE扫描数据库，Simple Scan将与市面上的任何扫描仪或多功能一体打印机/扫描仪很好的进行协作。此外还有一点好处就是它会设置成的最佳分辨率，当然你还可以很方便手动调整任何你需要的设置。
+
+14）**Baobab**（磁盘使用分析器） — 我不断听到关于如何硬盘价格已回落。这或许没错，但现实却是我却囊中羞涩。这意味着我需要充分利用我能利用的所有硬盘空间，为了实现这个目的，我使用 [Baobab][20] 来观察我在我的硬盘上的可用空间，而且还可以直观地看到到底是哪一个目录正在蚕食我宝贵的硬盘空间。
+
+### 真正的具有生产力的软件 ###
+
+谈到我所依赖的这些软件，我们真正关心的是他们能为我们完成什么样的任务，而不是它们所拥有的光辉头衔和自身的许可证。linux不需要软件的传奇时代早已过去。多数的计算机上的工作，除了有限的几个例外，大都可以在linux桌面上轻松地如我所说的那样完成。
+
+很明显有一些对于你来说是必不可少的软件，但是也许不是我必须用的。你所倚重的软件是什么？您可在下方进行评论并与我们的读者进行分享那些优秀的软件。
+
+------
+
+via: http://www.datamation.com/applications/14-apps-to-boost-ubuntu-1.html
+
+译者：[owen-carter](https://github.com/owen-carter) 校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://www.mozilla.org/en-US/firefox/new/
+[2]:https://plex.tv/
+[3]:http://www.zoneminder.com/
+[4]:http://parcellite.sourceforge.net/
+[5]:http://www.bittorrent.com/sync
+[6]:https://help.gnome.org/users/gnome-system-monitor/3.12/
+[7]:http://linux.about.com/od/commands/l/blcmdl1_top.htm
+[8]:http://freedesktop.org/software/pulseaudio/pavucontrol/
+[9]:http://en.wikipedia.org/wiki/Jupiter_Broadcasting
+[10]:http://www.skype.com/en/download-skype/skype-for-linux/
+[11]:http://ekiga.org/
+[12]:https://jitsi.org/
+[13]:http://www.kdenlive.org/
+[14]:http://www.openshot.org/
+[15]:https://spideroak.com/
+[16]:https://www.dropbox.com/
+[17]:http://www.libreoffice.org/discover/writer/
+[18]:http://www.maartenbaert.be/simplescreenrecorder/
+[19]:https://launchpad.net/simple-scan
+[20]:http://www.marzocca.net/linux/baobab/baobab-getting-started.html

published/201406/20140620 How to enable testing and unstable repository on Debian.md

@@ -0,0 +1,159 @@
+如何在Debian中启用测试版/不稳定版的软件库
+================================================================================
+为何要启用测试版/不稳定版？
+
+测试版/不稳定版的Debian给开发者提供了一个比当前稳定版更新的环境以及软件。你们注意到了么？其实这些稳定版啊不稳定版啊神马的都是别名，比方说稳定版其实就是Debian的稳定发行版，而测试版将会是下一个Debian的稳定发行版（当然那是测试后的事了）。截至发稿为止，当前Debian的稳定发行版是Wheezy 7.x，将会成为下一个稳定版的测试版则是Jessie。
+
+当你需要一款应用的最新版本的时候，启用测试版/不稳定版将会是不二的选择。当初我因为工作需要，要安装个Apache的 2.4.x到我的Debian Wheezy。测试版需要的是2.4.x的，可是我的软件库里面只有2.2.x的。所以最好的解决方案当时是将测试版下下来啦。
+
+通常来说当我们想尝试最新版本的应用时，都应该只在测试版软件库中搜索。
+
+在这篇文章里我将教大家如何在不弄坏你系统的前提下设置好测试、不稳定版的Debain系统并在上面安装软件。
+
+>     Stable < Testing < Unstable （稳定 < 测试版 < 不稳定版）
+>     Wheezy < Jessie < Sid
+
+### 1. 设置测试版/不稳定版的apt源 ###
+
+第一步是把测试版/不稳定版的源加到你的sources.list文件里。在Debian Wheezy系统上，/etc/apt/sources.list理应长得像这样：
+
+    $ cat /etc/apt/sources.list
+
+----------
+
+    ...
+    deb http://security.debian.org/ wheezy/updates main
+    deb http://http.us.debian.org/debian/ wheezy main
+    deb-src http://security.debian.org/ wheezy/updates main
+    ...
+
+把你repo服务器的链接记下来，比如：http://http.us.debian.org/debian/
+
+这个repo服务器将会是离你最近的一个服务器； 在不同的地理位置会有不同的url，这个将会用于下一步。
+
+如果想加测试/不稳定源，则需要在sources.list文件加上这些东西：
+
+    # Testing repository - main, contrib and non-free branches
+    deb http://http.us.debian.org/debian testing main non-free contrib
+    deb-src http://http.us.debian.org/debian testing main non-free contrib
+    
+    
+    # Testing security updates repository
+    deb http://security.debian.org/ testing/updates main contrib non-free
+    deb-src http://security.debian.org/ testing/updates main contrib non-free
+    
+    
+    # Unstable repo main, contrib and non-free branches, no security updates here
+    deb http://http.us.debian.org/debian unstable main non-free contrib
+    deb-src http://http.us.debian.org/debian unstable main non-free contrib
+
+格式将会是
+    
+    deb <respository server/mirror> <repository name> <sub branches of the repo>
+    (deb <上一步弄的服务器或镜像url> <repo的名字> <repo底下的分支>)
+
+当然啦，除了用testing或者unstable这么烂的词，也能使用他们的发行版代号，比如Jessie或者Sid
+    
+    deb http://http.us.debian.org/debian jessie main non-free contrib
+    deb http://security.debian.org/ jessie/updates main contrib non-free
+    deb http://http.us.debian.org/debian sid main non-free contrib
+
+### 2. 钉住 apt！这非常重要 ###
+
+> 在加了测试/不稳定的repo之后，当你更新系统的时候所有安装过并且可用的软件就会立马更新，而后你的系统就被你玩火自焚了。
+
+所以需要设置一些规则，以便选定的软件包在正常的更新时不会被更新到一个不稳定的测试版本。
+
+我们需要使用“钉住APT”的方式来告诉apt系统，除了我们希望使用测试版或不稳定版的特定软件包之外，其它的总是使用稳定版的软件包来更新。
+
+可以通过如下两个文件之一来设置如何设置APT的优先级来“钉住”。
+
+    /etc/apt/preferences
+    或
+    /etc/apt/preferences.d/my_preferences
+
+打开这两个文件之一（如果没有的话就创建一个），然后输入如下内容：
+
+    Package: *
+    Pin: release a=stable
+    Pin-Priority: 700
+    
+    Package: *
+    Pin: release a=testing
+    Pin-Priority: 650
+    
+    Package: *
+    Pin: release a=unstable
+    Pin-Priority: 600
+
+前面我们提到过，稳定版指的是你当前的debian版本，测试版是下一个，而不稳定版则是更远的将来发行版。上面的设置中最主要的是优先级（Pin-Priority）。当前的稳定版应该有最高的优先级，这就是说，正常的apt-get操作只会从当前的稳定版的软件库（现在是wheezy）里面安装软件。
+
+#### 更新包缓存 ####
+
+在增加了新的软件库和指定了优先规则后，需要更新一下包缓存。
+
+    $ sudo apt-get update
+
+#### 确认APT规则 ####
+
+我们必须确认“钉住”的设置正确，优先级也没问题。使用 apt-cache 的  policy  参数来检查：
+
+    $ apt-cache policy apache2
+    apache2:
+      Installed: (none)
+      Candidate: 2.2.22-13
+      Version table:
+         2.4.7-1 0
+            600 http://http.us.debian.org/debian/ unstable/main amd64 Packages
+         2.4.6-3 0
+            650 http://http.us.debian.org/debian/ testing/main amd64 Packages
+         2.2.22-13 0
+            700 http://http.us.debian.org/debian/ wheezy/main amd64 Packages
+
+如上的输出，确认在wheezy 稳定版中， 2.2.22 版本的Apache是选定的版本，它有最高的优先级。
+
+### 3. 从测试版/不稳定版软件库中安装软件 ###
+
+现在可以从测试版或不稳定版中选择一个特定的软件来安装它了。假如说我们要从测试版软件源中安装 apache2。
+
+有两个不同的方法，并且其结果也有所不同。
+
+#### 方式一 ####
+
+    # apt-get install apache2/testing
+
+上述命令会从测试版软件库中安装 apache2，并从稳定版软件库中安装其依赖包（稳定版通过apt规则确定）。这个命令在某些情况下会失败，比如安装的软件包（apache2）所需的依赖包在稳定版软件库中没有更新到可以支持该软件时。
+
+#### 方式二 ####
+
+    # apt-get -t testing install apache2
+
+上述命令会从测试版软件库中安装apache2，并从测试版软件库中安装其依赖包。这要比上面的命令工作的更好。
+
+所以，要安装较新的软件包，直接从测试版/不稳定版的软件库中安装就行了。注意，优先级号码不只是一个数字而已，还有其特定意义。可以查看 apt_preferences的man页面了解更多：
+
+    $ man 5 apt_preferences
+
+### 总结 ###
+
+使用“钉住”方式的测试版/不稳定版的软件库是一个获取较新版本软件包的一个好办法，不过其实并不推荐使用它们。如果弄错了，可能会从也许不兼容的分支上下载软件包，这会把你的系统搞乱。
+
+一个更好的方式是，使用向后移植的软件库来安装更新的包。它从测试版和不稳定版的软件库中获取较新版本的软件包，但是为当前的稳定版软件库而编译。所以，对于 debian wheezy来说，你可以使用wheezy-backports 软件库。访问http://backports.debian.org/ 了解更多。
+
+### 资源 ###
+
+- [https://wiki.debian.org/AptPreferences][1]
+- [https://wiki.debian.org/DebianTesting][2]
+- [https://www.debian.org/security/][3]
+
+--------------------------------------------------------------------------------
+
+via: http://www.binarytides.com/enable-testing-repo-debian/
+
+译者：[213edu](https://github.com/213edu) [wxy](https://github.com/wxy) 校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://wiki.debian.org/AptPreferences
+[2]:http://wiki.debian.org/DebianTesting
+[3]:http://www.debian.org/security/

published/201406/20140625 Canonical Debuts 'Orange Box' for Ubuntu OpenStack Cloud Demos.md

@@ -0,0 +1,42 @@
+Ubuntu的Orange Box首次亮相
+================================================================================
+
+> Orange Box现已推出，它是一个便携的服务器集群，Canonical用它来演示和培训基于Ubuntu的OpenStack云。
+
+![](http://thevarguy.com/site-files/thevarguy.com/files/imagecache/medium_img/uploads/2014/06/grayscale_7.jpg)
+
+Canonical刚刚发布的Orange Box是一个便携式服务器集群，该公司用来展示[OpenStack][1]，[MAAS][2]，[Juju][3]和其它的基于Ubuntu Linux的云服务。
+
+下面是它的介绍。
+
+对于刚刚接触到它的人来说，重要的是要了解Orange Box不是什么：它不是一台Canonical用来盈利的硬件产品。到目前为止，该公司并无表示计划大规模销售这些设备。如果你真的想[买一款][4]的话，大概价格为$12,900，这个价格来自其合同制造商[TranquilPC Limited][5]。
+
+从大的方面来说，Orange Box是一个说服企业在基于Ubuntu的云计算投入资金的工具。Canonical的创始人马克·沙特尔沃思[上个月宣布了][6]Ubuntu OpenStack的战略，这是该战略的一个关键组成部分，更是该公司提供的称作[Jumpstart][7]的OpenStack的培训计划的一部分。
+
+作为Jumpstart的一部分，Canonical会将Orange Box借给合作伙伴，以便他们的员工可以在Ubuntu集群上练习配置OpenStack和相关软件。Canonical的工作人员也将在培训期间提供咨询。
+
+不过除开培训的目的不谈，Orange Box[看起来真的很酷][8]。它装有10个[英特尔NUC][9]，总计集成了160GB的RAM，1200GB的存储空间和10个酷睿i5处理器，这种设备在一个袖珍空间内提供了相当强大的计算能力。
+
+![](http://www.intel.com/content/dam/www/public/us/en/images/product/wilson-canyon-nuc-front-angle-with-board.jpg)
+
+更好的是，Orange Box通过预装软件为启动基于Ubuntu的云技术打下了良好基础。
+
+不过，对于Canonical来说，真正的考验是确保企业能够从Orange Box中获益。借出它们不只是为了让合作伙伴们体验一下不错的硬件设备，而是为了通过一个真正令人信服的方式体验Ubuntu的云，以吸引IT决策者选择Ubuntu所建立的下一代云基础设施。
+
+--------------------------------------------------------------------------------
+
+via: http://thevarguy.com/ubuntu/062314/canonical-debuts-orange-box-ubuntu-openstack-cloud-demos
+
+译者：[乌龙茶](https://github.com/yechunxiao19) 校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://openstack.org/
+[2]:https://maas.ubuntu.com/
+[3]:http://juju.ubuntu.com/
+[4]:http://www.tranquilpcshop.co.uk/ubuntu-orange-box/
+[5]:http://www.tranquilpcshop.co.uk/
+[6]:http://thevarguy.com/ubuntu/051614/shuttleworth-highlights-ubuntu-openstack-cloud-innovations
+[7]:http://www.ubuntu.com/cloud/tools/jumpstart
+[8]:http://arstechnica.com/information-technology/2014/06/hands-on-with-canonicals-orange-box-and-a-peek-into-cloud-nirvana/
+[9]:http://www.intel.com/content/www/us/en/nuc/overview.html

published/The Linux Kernel/26 The Linux Kernel--Configuring the Kernel Part 22.md

@@ -1,6 +1,6 @@
 戴文的Linux内核专题：26 配置内核 (22)
 ================================================================================
-![](http://www.linux.org/attachments/slide-jpg.703/)
+![](http://www.linux.org/attachments/slide-jpg.703/.jpg)
 
 你好！本篇我们将继续配置"kernel hacks",接着我们会配置整个安全系统。
 
@@ -14,7 +14,7 @@ Alpha和s390处理器需要配置下一个特性(Force weak per-cpu definitions)
 
 "Latency measuring infrastructure"驱动提供了延迟检测工具LatencyTop，以找出用户空间中由于内核执行/任务而被阻碍/干扰的对象。
 
-下面，我们有一个子菜单名为"Tracers",它包含了不同追踪器的列表。追踪器是一段监视不同内核函数的代码。每次某个特定的函数启动，追踪器将被调用来检测函数。
+下面，我们有一个子菜单名为"Tracers"，它包含了不同追踪器的列表。追踪器是一段监视不同内核函数的代码。每次某个特定的函数启动，追踪器将被调用来检测函数。
 
 下面的模块用来测试红黑树库的性能(Red-Black tree test)。红黑树是一个排序和搜索算法。
 
@@ -28,9 +28,9 @@ printk()函数可以用来打印不同的调试信息，如果这个特性启用
 
 Atomic64自我测试检查系统是否支持原子操作(Perform an atomic64_t self-test at boot)。这是一个32位系统执行64位操作。
 
-这个驱动提供了对于所有可能的RAID6恢复系统的自我测试(Self test for hardware accelerated raid6 recovery)。
+这个驱动提供了对于所有可能的RAID6恢复系统的自检(Self test for hardware accelerated raid6 recovery)。
 
-注意：自我测试是底层测试并且在绝大多数系统硬件和软件开启和执行前侦查软件。自我测试搜索硬件，失败的设备等等。自我测试也可能被编成应用测试它本身。
+注意：自检是底层测试并且在绝大多数系统硬件和软件开启和执行前侦查软件。自检搜索硬件，失败的设备等等。自检也可能被编成应用以测试它本身。
 
 在"Kernel Hacking"菜单中(如果你是用的是像ncurses那样的菜单接口)，有一个名为"Sample kernel code"的子菜单。在以后的文章中，我们会讨论如何实现自定义/自制内核模块。只要记住这里是启用你自己的模块。
 
@@ -62,7 +62,7 @@ printk()打印不同的消息到dmsg的启动界面，但是在串行和控制
 
 下面的驱动提供了对"copy_from_user()"系统调用的基本测试（Strict copy size checks)。copy_fcrom_user()从用户空间拷贝数据块到内核空间中。
 
-这里还有一个自我测试；它用于NNI(NMI Selftest)。
+这里还有一个自检；它用于NMI(NMI Selftest)。
 
 现在，我们会进入"Security Options"，如果你使用像ncurses的基于菜单的接口时。第一个选项允许访问内核中存储的键和验证令牌(Enable access key retention support)。这有很多原因用到，像访问加密文件系统。
 
@@ -114,6 +114,6 @@ Yama是另外一个LSM(Yama support)。如果启用这个特性Yama可以与另
 
 via: http://www.linux.org/threads/the-linux-kernel-configuring-the-kernel-part-22.5017/
 
-译者：[geekpi](https://github.com/geekpi) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[geekpi](https://github.com/geekpi) 校对：[wxy](https://github.com/wxy)
 
 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出

published/The Linux Kernel/27 The Linux Kernel--Configuring the Kernel Part 23.md

@@ -1,8 +1,8 @@
 戴文的Linux内核专题：27 配置内核 (23)
 ================================================================================
-![](http://www.linux.org/attachments/slide-jpg.735/)
+![](http://www.linux.org/attachments/slide-jpg.735/.jpg)
 
-欢迎来到内核配置的下一章！本篇中我们会配置密码API，虚拟化和运行库。密码学指的是在需要的计算机之间加密和安全通信。用户可能加密数据以保证是收件人而不是黑客收到数据。
+欢迎来到内核配置的下一章！本篇中我们会配置密码API，虚拟化和运行库。密码学指的是在需要的计算机之间加密和安全通信的科学。用户可能加密数据以保证是收件人而不是黑客收到数据。
 
 Linux内核需要在内核中启用"Cryptographic algorithm manager"(密码算法管理器)。这个特性提供了操作内核的加密特性所需的软件。
 
@@ -93,7 +93,7 @@ CORDIC algorithm - 双曲线和三角函数。
 JEDEC DDR data - JEDEC双倍数据速率SD-RAM规范
 
 
-你猜怎么了？我们已经完成便宜内核。在23篇之后，我敢肯定这是你的感觉 -
+你猜怎么了？我们已经完成配置内核。在23篇之后，我敢肯定这是你的感觉 -
 
 视频链接:[http://www.youtube.com/embed/barWV7RWkq0?wmode=opaque][1]
 
@@ -107,7 +107,7 @@ JEDEC DDR data - JEDEC双倍数据速率SD-RAM规范
 
 via: http://www.linux.org/threads/the-linux-kernel-configuring-the-kernel-part-23.5112/
 
-译者：[geekpi](https://github.com/geekpi) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[geekpi](https://github.com/geekpi) 校对：[wxy](https://github.com/wxy)
 
 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
 

published/The Linux Kernel/28 The Linux Kernel--Compiling and Installing.md

@@ -1,32 +1,32 @@
 戴文的Linux内核专题：28 编译与安装
 ================================================================================
-![](http://www.linux.org/attachments/slide-jpg.762/)
+![](http://www.linux.org/attachments/slide-jpg.762/.jpg)
 
-你好！在花费了大量的时间在配置你需要的内核后，你现在可以编译它了。源代码是纯文本形式的C代码。这对人来可读但是对机器不这样。编译会将代码转换成计算机可理解的一种称之为二进制码的形式(1是 [开],0 是 [关])。编译同样会将所有内核代码文件变成一个内核的文件。
+你好！在花费了大量的时间在配置你需要的内核后，你现在可以编译它了。源代码是纯文本形式的C代码。这对人来可读但是对机器可不是这样。编译会将代码转换成计算机可理解的一种称之为二进制码的形式(1是 [开]，0 是 [关])。编译同样会将所有内核代码文件变成一个内核的文件。
 
-为了编译内核，在内核源代码相同目录下，在终端内输入"make"。这会花费一些时间。一旦完成，模块必须通过"make modules"来编译。为了从一开始就简化编译过程，输入"make; make modules"。这会先编译接着是模块，而不用用户再回来输入"make modules"。
+为了编译内核，在内核源代码相同目录下，在终端内输入"make"。这会花费一些时间。完成之后，必须通过"make modules"来编译模块。为了从一开始就简化编译过程，输入"make; make modules"。这会先编译接着是模块，而不用用户再回来输入"make modules"。
 
-![](http://www.linux.org/attachments/compiling_01-png.763/)
+![](http://www.linux.org/attachments/compiling_01-png.763/.jpg)
 
 警告：在你安装一个内核时，备份所有的重要数据，确保有一份/boot目录备份在FAT32的存储卡上。这可以在如果安装失败后帮助修复系统。FAT32不会存储权限，因此它更容易被用作live盘来还原数据。记住设置原始文件权限和可执行位。
 
 一旦编译已经成功完成，我们可以安装内核到本地系统中(我会马上解释如何在其他系统上安装内核[交叉编译])。在相同的终端下，在编译完成后，输入"make install"。这会在/boot目录下存放一些文件。"vmlinuz"(或者其他相似的名字)是内核自身。"initrd"是基于内存的文件系统，它被置于内存中且在启动中使用。"System-map"包含了一张内核符号列表。这些全局变量和函数用于内核代码。"config"	是内核的配置文件。grub.cfg会自动更新。然而，有些bootloder需要手动配置。内核安装器会自动配置Grub，LILO和SysLinux bootloder。像BURG这类bootloder需要手动配置。模块的安装同样需要输入"make modules install"。
 
-![](http://www.linux.org/attachments/compiling_04-png.764/)
+![](http://www.linux.org/attachments/compiling_04-png.764/.jpg)
 
 注：内核和模块的安装可以写在一行-“make install && make modules_install”。
 
-![](http://www.linux.org/attachments/compiling_05-png.765/)
+![](http://www.linux.org/attachments/compiling_05-png.765/.jpg)
 
 一旦上面的过程完成了，用户可以通过重启系统并在开机后在终端内输入"uname -r"来确保内核已经安装。如果系统无法启动或者uname报告你预期外的版本号，这个问题可能众多问题之一引起。或者是bootloader没有正确设置，特性/配置冲突，编译失败，不正确的安装，或者其他原因。找出问题源头最好的方法是查看系统日志(如果系统已经启动到足以产生日志)。"dmsg"是一个在屏幕上打印内核日志的命令。查看错误、警告或者未预料的结果。如果系统没有启动或者没有足够启动完全来生成日志，使用live linux盘来执行诊断和修复。如果所有的都失败了，再次编译内核并确保你已经用root或者"sudo"安装了内核。
 
 注：最好的修复系统的方式是使用live Linux发行版来移除新的/损坏的内核，接着手动修复Grub文件(或者复制一个备份)。
 
-一些Linux用户也喜欢安装文档，但这并不是必要。对于那些想要安装文档的用户，输入这行，这里的version是你的内核版本号 "install -d /usr/share/doc/linux-VERSION && cp -r Documentation/* /usr/share/doc/linux-VERSION"(VERSION 是内核版本号)。很明显，这需要root特权。
+一些Linux用户也喜欢安装内核文档，但这并不是必要。对于那些想要安装文档的用户，输入这行，这里的version是你的内核版本号 "install -d /usr/share/doc/linux-VERSION && cp -r Documentation/* /usr/share/doc/linux-VERSION"(VERSION 是内核版本号)。很明显，这需要root特权。
 
-为了编译一个如你目前内核一样特性的内核，输入这条命令"zcat /proc/config.gz > .config"。这个文件可能不存在，如果是这样，你可能需要询问你发行版/内核的开发者这个文件。"zcat"命令解压并写入数据到一个".config"文件中。记住在你希望的地方输入".config"。这个文件放置在Linux内核目录下并允许它替换当前的文件。接着，像往常一样编译安装你的内核。
+要是想编译一个如你目前内核一样特性的内核，输入这条命令"zcat /proc/config.gz > .config"。这个文件可能不存在，如果是这样，你可能需要询问你发行版/内核的开发者这个文件。"zcat"命令解压并写入数据到一个".config"文件中。记住把".config"放到合适的位置。这个文件应该放置在Linux内核目录下，并允许它替换当前的文件。接着，像往常一样编译安装你的内核即可。
 
-交叉编译稍微有点不同。为目标系统配置内核。确保内核配置完后，它在脑海中交叉配置过了。当交叉编译时，需要熟悉两条术语。"Host"是执行编译的系统，"Target"是接收新内核的系统。确保主机系统有合适的编译器。比如，对于ARM系统的交叉编译，用户需要在主机系统上有gcc-arm-linux-gnueabi。通常来说，开发这可以在他们的包管理器上搜寻或者Googledao合适/最好的适合他们需要的交叉编译器。特定的用于ARM系统交叉编译的命令是"make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi-"。"ARCH=arm"指的是目标处理器的类型，"CROSS_COMPILE"指明了交叉编译器。注意交叉编译器前面缺少了"gcc-"并以破折号结束。这是用户在使用交叉编译器作为参数使用时必须使用的格式。模块可以通过输入"make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- modules".交叉编译。为了在目标系统上安装内核，复制内核文件夹到目标系统上。一旦文件已在目标系统上并在该目录下打开了终端，输入"make install && make modules_install"。当然你必须是root或者使用"sudo"。
+交叉编译稍微有点不同。为目标系统配置内核。确保内核配置完后，它是以交叉编译配置的。当交叉编译时，需要熟悉两条术语。"Host"是执行编译的系统，"Target"是接收新内核的系统。确保Host主机系统有合适的编译器。比如，对于ARM系统的交叉编译，用户需要在主机系统上有gcc-arm-linux-gnueabi。通常来说，开发者可以在他们的包管理器上搜寻或者Google到合适/最好的适合他们需要的交叉编译器。比如用于ARM系统交叉编译的命令是"make ARCH=arm CROSS\_COMPILE=arm-linux-gnueabi-"。"ARCH=arm"指的是目标处理器的类型，"CROSS\_COMPILE"指明了交叉编译器。注意交叉编译器前面缺少了"gcc-"并以连字符结束。这是用户在使用交叉编译器作为参数使用时必须使用的格式。模块可以通过输入"make ARCH=arm CROSS\_COMPILE=arm-linux-gnueabi- modules"来交叉编译。为了在目标系统上安装内核，将内核文件夹复制到目标系统上。一旦文件已在目标系统上并在该目录下打开了终端，输入"make install && make modules_install"。当然你必须是root或者使用"sudo"。
 
 信息：Kernel.org放了一个支持的交叉编译器列表([https://www.kernel.org/pub/tools/crosstool/][1])。
 
@@ -36,7 +36,7 @@
 
     make && make modules && make install && make modules_install
 
-#### 做一个更新的版本或者重混你的内核: ####
+#### 做一个更新的版本或者重整你的内核: ####
 
     zcat /proc/config.gz > .config &&  make && make modules && make install && make modules_install
 
@@ -50,7 +50,7 @@
 
 via: http://www.linux.org/threads/the-linux-kernel-compiling-and-installing.5208/
 
-译者：[geekpi](https://github.com/geekpi) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[geekpi](https://github.com/geekpi) 校对：[wxy](https://github.com/wxy)
 
 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
 

sources/news/20140625 Canonical Debuts 'Orange Box' for Ubuntu OpenStack Cloud Demos.md

@@ -1,37 +0,0 @@
-Canonical Debuts 'Orange Box' for Ubuntu OpenStack Cloud Demos
-================================================================================
-> The Orange Box, a portable server cluster that Canonical will use for Ubuntu-based OpenStack cloud demonstrations and training, is now available.
-
-![](http://thevarguy.com/site-files/thevarguy.com/files/imagecache/medium_img/uploads/2014/06/grayscale_7.jpg)
-
-Canonical's Orange Box, the portable server cluster that the company intends to use to showcase [OpenStack][1], [MAAS][2], [Juju][3] and other aspects of the Ubuntu Linux-based cloud, is out. Here's what it's all about.
-
-For starters, it's important to understand what the Orange Box is not: A revenue-generating hardware product from Canonical. The company has given no indication so far that it plans to sell these devices on a large scale—although if you truly want you can [buy one][4], for the equivalent of around $12,900, from [TranquilPC Limited][5], the company that has the contract for manufacturing them.
-
-Primarily, the Orange Box is a tool for convincing enterprises to invest in the Ubuntu-based cloud. It's a key part of the Ubuntu OpenStack strategy that Canonical founder Mark Shuttleworth [outlined last month][6], especially the OpenStack training program the company is offering, called [Jumpstart][7].
-
-As part of Jumpstart, Canonical will loan an Orange Box to a participating organization so its employees can practice configuring OpenStack and related software on an Ubuntu cluster. Canonical staff also will provide consultation during the training period.
-
-But training purposes aside, the Orange Box [looks pretty cool][8]. And with 10 [Intel NUCs][9] inside—packing a collective punch of 160GB of RAM, 1,200GB of storage space and 10 i5 CPUs—the device fits quite a bit of computing power into a tiny space.
-
-Better still, the Orange Box comes preconfigured with software that provides a basis for launching Ubuntu-based cloud technologies.
-
-For Canonical, however, the real test will be making sure enterprises take advantage of the Orange Boxes that the company lends them not just to poke around an unusual hardware device, but to experience the Ubuntu cloud in a truly compelling way—compelling enough to convince IT decision-makers to ground the next-generation cloud infrastructure that they are building in Ubuntu.
-
---------------------------------------------------------------------------------
-
-via: http://thevarguy.com/ubuntu/062314/canonical-debuts-orange-box-ubuntu-openstack-cloud-demos
-
-译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:http://openstack.org/
-[2]:https://maas.ubuntu.com/
-[3]:http://juju.ubuntu.com/
-[4]:http://www.tranquilpcshop.co.uk/ubuntu-orange-box/
-[5]:http://www.tranquilpcshop.co.uk/
-[6]:http://thevarguy.com/ubuntu/051614/shuttleworth-highlights-ubuntu-openstack-cloud-innovations
-[7]:http://www.ubuntu.com/cloud/tools/jumpstart
-[8]:http://arstechnica.com/information-technology/2014/06/hands-on-with-canonicals-orange-box-and-a-peek-into-cloud-nirvana/
-[9]:http://www.intel.com/content/www/us/en/nuc/overview.html

sources/news/20140625 Google Forks Open Source OpenSSL Web Security Code.md

@@ -1,12 +1,13 @@
-Google Forks Open Source OpenSSL Web Security Code
+2q1w2007翻译中
+谷歌分支了开源的 OpenSSL 网站安全代码
 ================================================================================
-> Google's BoringSSL, a fork of the open source OpenSSL software for encrypting Web data, will spread the open source community's resources thinner.
+> 谷的 BoringSSL, 一个开源用来加盟网站数据的的OpenSSL分支，将会向开源社区提交代码
 
 ![](http://thevarguy.com/site-files/thevarguy.com/files/imagecache/medium_img/uploads/2014/06/grayscale6jpgcropdisplay.jpg)
 
-In the wake of [Heartbleed][1], there may soon be as many variants of the open source OpenSSL software for encrypting Web traffic as there are Pokemon characters—or something like that. A few days ago, Google (GOOG) became the latest organization to announce its own OpenSSL spin, which it's calling BoringSSL.
+因为[Heartbleed][1]暴露出的脆弱, 用来加密网页传输的开源OpenSSL的变种可能和口袋妖怪里的角色一样多。前两天, Google (GOOG) 成为了最早宣布自己的OpenSSL分支的组织,其分支叫做BoringSSL。
 
-Google developer Adam Langley announced BoringSSL—a name he described as "aspirational," presumably because Google hopes the new software will prove more drama-free than OpenSSL—in a [blog post][2] on June 20.
+Google的开发者Adam Langley announced BoringSSL—a name he described as "aspirational," presumably because Google hopes the new software will prove more drama-free than OpenSSL—in a [blog post][2] on June 20.
 
 Google has made its own modifications to the OpenSSL code for some time for use in Chrome and other offerings, Langley said. But going forward, the company intends to fork OpenSSL entirely to create a separate solution, a change it hopes will simplify development on Google's end.
 

sources/news/20140630 KDE Connect Adds Android File Sending, Touchpad Emulation.md

@@ -0,0 +1,51 @@
+KDE Connect Adds Android File Sending, Touchpad Emulation
+================================================================================
+**A new version of KDE Connect for Android that adds a number of new features has been released.**
+
+![KDE Connect can now share files between desktop and mobile](http://www.omgubuntu.co.uk/wp-content/uploads/2014/06/kde-connect-share-feature.jpg)
+KDE Connect can now share files between desktop and mobile
+
+KDE Connect for Android and the Plasma desktop now allow the touchscreen of a connected device to be used as a touchpad for your computer.
+
+This additional wireless input device will act just like a basic mouse, though doesn’t (yet) support multitouch features like two finger scrolling or right-clicking.
+
+Android’s share intent now supports KDE Connect, allowing you to send files from Android to your desktop and vice versa using a menu entry in the Dolphin file manager or by pushing files using a new command line option.
+
+Similar features for [iOS 8 and OS X Yosemite][1] and [Android ‘L’  and Chrome OS][2] are planned to debut this fall.
+
+The updated version also fixes a number of bugs and includes numerous improvements, including support for FreeBSD systems.
+
+Full Feature List:
+
+- Share files to/from Android and KDE
+- Touchpad emulation
+- Receive notifications from Android 4.3+ on desktop
+- Shared clipboard supports copy and paste between phone and PC
+- Multimedia remote control for select desktop media players (MPRIS)
+- Battery status
+- Wi-Fi connection sharing
+- RSA Encryption
+
+### Download KDE Connect 0.7 ###
+
+The KDE Connect Android application is free to download from the Google Play and F-Droid stores.
+
+- [Download KDE Connect from Google Play][3]
+
+To make use of the newest features you will also need to install the latest version of KDE Connect (version 0.7) for Plasma. As of writing this is not yet available as a .deb installer or through a PPA. It can, however, be installed from source on Kubuntu 14.04 LTS and above by following the instructions [provided here][4].
+
+- [Download KDE Connect 0.7 Source][5]
+
+--------------------------------------------------------------------------------
+
+via: http://www.omgubuntu.co.uk/2014/06/kde-connect-android-notifications-linux-desktop
+
+译者：[译者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/06/os-x-10-10-feature-ubuntu-already
+[2]:http://www.omgchrome.com/android-apps-notifications-call-alerts-chromebook/
+[3]:https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp
+[4]:https://albertvaka.wordpress.com/2014/06/28/awesome-contributions-to-kde-connect/#comment-1175
+[5]:http://download.kde.org/unstable/kdeconnect/0.7/src/kdeconnect-kde-0.7.tar.xz.mirrorlist

sources/news/20140630 New Linux Podcast App 'Vocal' Hits Beta, Ready for Testing.md

@@ -0,0 +1,33 @@
+New Linux Podcast App ‘Vocal’ Hits Beta, Ready for Testing
+================================================================================
+**Back in April we found ourselves enamoured by a promising new [podcast app for Ubuntu called ‘Vocal‘][1].  Well, the app has since gone from being a stylish mockup to real working code — and you can help test it.**
+
+The project’s developer, Nathan Dyer, has made beta builds — still unstable and not feature complete — available for testing through a dedicated PPA for Ubuntu 14.04 LTS and 14.10.
+
+The kicker to this (rather sweet) news is that the beta builds of the app **can only be installed if you’re using the next-gen elementary desktop**. And since elementary do not provide official pre-beta development builds for users to test, that makes it a trite difficult.
+
+Not quite as difficult as trying it out on Unity, GNOME or KDE desktops, mind. If you’re an Ubuntu user wanting to kick the tires on Vocal you will first need to add an unstable elementary desktop PPA to your systems, something we strongly advise against doing.
+
+Dyer suggests interested users wait until the first beta of the next elementary version is made available.
+
+For now we can at least look at it:
+
+![Vocal Beta running on Elementary (Image: Dyer)](http://www.omgubuntu.co.uk/wp-content/uploads/2014/06/vocal-beta.png)
+Vocal Beta running on Elementary (Image: Dyer)
+
+Since Vocal is open source there’s nothing to stop it being ported over to mainstream Linux desktop environments such as Unity.
+
+In the meantime to learn more visit [the developer’s blog][1], [check out the unstable PPA][2] or hit up [Vocal on Launchpad][3]. 
+
+--------------------------------------------------------------------------------
+
+via: http://www.omgubuntu.co.uk/2014/06/linux-podcast-app-vocal-hits-preview-kicker
+
+译者：[译者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/vocal-podcast-manager-linux
+[2]:http://nathandyer.me/2014/06/28/vocal-beta-released-daily-ppa-available/
+[3]:https://launchpad.net/~nathandyer/+archive/vocal-daily
+[4]:https://launchpad.net/vocal

sources/news/20140701 Red Hat Delivers Cloud Certification Plan, and Teams with HP.md

@@ -0,0 +1,34 @@
+Red Hat Delivers Cloud Certification Plan, and Teams with HP
+================================================================================
+![](http://farm4.static.flickr.com/3108/3191608123_67e1da2b79_o.jpg)
+
+When Red Hat [announced][1] very solid quarterly earnings a few days ago, CEO Jim Whitehurst was quick to attribute part of the strong performance to his company's new focus on cloud computing. In discussing the enterprises that pay Red Hat for subcription support and services, he said: "These are some of the most sophisticated IT organizations in the world, and many continue to increase their purchases from Red Hat to modernize their IT infrastructure with cloud enabling technologies."
+
+[I've made the point before][2] that Red is pinning its future on cloud computing and OpenStack in particular.  But for Red Hat to succeed with its OpenStack plans, it needs to be able to assure enterprise users that they are using tested and interoperable tools. With that in mind, the company has [announced][3] a new cloud management certification for Red Hat Enterprise Linux OpenStack Platform as part of the Red Hat OpenStack Cloud Infrastructure Partner Network.
+
+Red Hat has been working closely with cloud and network management solution providers, including iBMC and HP. As members of the Red Hat OpenStack Cloud Infrastructure Partner Network, these vendors are supporting Red Hat's platform certification process. 
+
+Radhesh Balakrishnan, Red Hat's general manager of virtualization and OpenStack said, in a statement: 
+
+> “As OpenStack is becoming a core element of the enterprise cloud strategy for many customers, Red Hat Enterprise Linux OpenStack Platform is architected and backed by the broadest partner ecosystem to be the preferred platform. The growth and maturity of the ecosystem reflects the evolution of the product moving from addressing infrastructure-centric alignment to help with early deployments to now be well-managed, to be part of enterprise hybrid cloud implementations.”
+
+Atul Garg, vice president and general manager of Cloud and Automation at HP added:
+
+> “We are excited to work with Red Hat to certify HP Cloud Service Automation and its solutions with Red Hat Enterprise Linux OpenStack Platform, to help our mutual customers build and manage private and hybrid cloud services. Our joint efforts are aimed at enabling customers to have choice and flexibility as they deploy cloud environments which can easily flex and adapt to business needs while supporting heterogeneity and leveraging existing investments in the datacenter.” 
+
+As enterprises deploy OpenStack, they are increasingly concerned about being able to use existing infrastructure and management tools with their deployments. The expansion of Red Hat’s certification program to include cloud management solutions is intended to help enterprises who want to deploy Red Hat Enterprise Linux OpenStack Platform in a private cloud to feel confident in using their management solutions of choice.
+
+One other notable thing about the new certification program is that it deepens Red Hat's partnership with HP, which is also focused on OpenStack. It will be worth watching what else comes from that partnership, and, without a doubt, [the cloud is the new battleground for winning enterprise users][4]. 
+
+--------------------------------------------------------------------------------
+
+via: http://ostatic.com/blog/red-hat-delivers-cloud-certification-plan-and-teams-with-hp
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://www.zdnet.com/red-hat-beats-q1-earnings-targets-as-revenue-climbs-17-percent-7000030685/
+[2]:http://ostatic.com/blog/for-red-hat-the-cloud-beckons
+[3]:http://www.marketwatch.com/story/red-hat-introduces-cloud-management-certification-for-red-hat-enterprise-linux-openstack-platform-2014-06-30
+[4]:http://ostatic.com/blog/the-cloud-is-the-new-battleground-for-winning-enterprise-users

sources/talk/20140607 Four Awesome Free Alternatives to Ubuntu One Cloud Storage.md

@@ -1,4 +1,3 @@
-Translated by Ramerzhang
 Four Awesome Free Alternatives to Ubuntu One Cloud Storage
 ================================================================================
 ![](http://www.omgubuntu.co.uk/wp-content/uploads/2014/04/ass.jpg)

sources/talk/20140607 Raspberry Pi In Schools.md

@@ -1,4 +1,3 @@
-zpl1025 translating
 Raspberry Pi In Schools
 ================================================================================
 > Teaching the world to code is a noble goal, but how is it going to work in practice?

sources/talk/20140610 The Best Linux Distribution for New Users.md

@@ -1,4 +1,3 @@
-linuhap翻译中
 The Best Linux Distribution for New Users
 ================================================================================
 This is a debate that most certainly brings out the beast in many a Linux user. The argument doesn't generally boil down to which distribution is truly best suited for new users, but which distribution is favored by those in the debate. If we set our personal preferences aside, a clearer picture can arise. But even that clarity can quickly get obscured by the needs and desires of the new users. Given that, I decided to take a different approach to finding the “best distro for new users." My criteria for best distribution must not only be easy to use, but also must appeal to a more modern design aesthetic brought about by the ever-growing thrust of the mobile interface metaphor.

sources/talk/20140611 HTG Explains--What is Unix and Why Does It Matter.md

@@ -1,4 +1,3 @@
-[translating | sailing]
 HTG Explains: What is Unix and Why Does It Matter?
 ================================================================================
 ![](http://cdn.howtogeek.com/wp-content/uploads/2014/02/ken-thompson-and-dennis-richie-at-pdp-11.jpg)

sources/talk/20140617 14 Apps To Boost Ubuntu.md

@@ -1,81 +0,0 @@
-   owen-carter translating
-14 Apps To Boost Ubuntu
-================================================================================
-Making the switch to Ubuntu – or any popular Linux distribution – is more than the mere act of changing operating systems. You must also have apps that allow you to get work done.
-
-In this article, I'll be sharing critical applications that I rely on, and I’ll talk about how I use them in my daily activities.
-
-### Apps for Daily Use ###
-
-Generally when it comes to software on the Linux desktop, I drop app titles into one of two categories. These would be stuff I use every day, and everything else. Below are applications I find myself running each and every day.
-
-1) **Firefox** – Sometimes I use other browsers, but lately [Firefox][1] has been my long trusted friend. Reliable, safe and cross platform, Firefox is generally what I use for my daily browsing needs.
-
-In addition to accessing bookmarks and webpages, I also rely on Firefox to handle my various LAN server duties as well. Duties such as: [Plex][2], [Zoneminder][3], router/WAPs, and my file server. All of these are accessed each day using Firefox.
-
-2) **Parcelite** – I can't begin to function without a decent clipboard manager, and for me, you can't beat [Parcelite][4] on the GNOME desktop. Simple to use, easy to access and it's also chalked full of useful options. Parcelite options include everything from hotkeys to white space handling. There are a ton of great clipboard managers out there, but it's tough to beat what Parcelite offers.
-
-3) **Bittorrent Sync** – I have used various open source alternatives for file syncing that needed more development before being released. That being said [Bittorrent Synchas][5] NEVER let me down. It's easy to run and install thanks to the new GUI offering, and Bittorrent Sync allows me to transfer huge video files quickly from machine to machine without wasting time syncing stuff to the "cloud."
-
-I've also found it to be a fantastic way to share large files easily with others, while maintaining IP address and directory privacy along the way. Despite the numerous alternatives available, I remain firmly grounded as a Bittorrent Sync fanboy.
-
-4) **System Monitor** – Because TOP only goes so far, I prefer a tabbed GUI as it's much easier on my eyes. Using GNOME's [System Monitor][6], I can quickly discover a runaway process and easily kill it without ever needing to break a sweat. Unlike a terminal app like [TOP][7], I can also get a visual perspective using graphs in real-time for my CPU, memory and disk usage. Being a visual person, it's difficult to beat the bar graph showing me how much space I have. Same applies to real-time resource usage as well.
-
-5) **PulseAudioControl** – Each day, I tend to bounce between multiple sound devices. Sometimes I need to make one the default, but then switch from Firefox audio to another device altogether. Because I like to have as much control over my audio as possible, I've found that [PulseAudioControl][8] is an invaluable tool.
-
-### Everything else software ###
-
-In this section, I'll share apps that I use, but may not necessarily use each and every day. Many of these apps are open source, some are not, all are of great value to me personally.
-
-6) **Skype** – Whether it's calling into [Jupiter Broadcasting][9] to co-host a weekly podcast, or simply catching up with a business contact, [Skype][10] is how Internet video conversations happen. After testing countless alternatives, I always find myself coming back to Skype. Even though there are really awesome open source options like [Ekiga][11] or [Jitsi][12], at the end of the day Skype is where everyone is at – good luck getting people to switch.
-
-7) **Kdenlive** – I use two different video editors, and when it comes to banging out a heavily edited video, [Kdenlive][13] is the tool I use for picture in picture compositing and editing really large, complex videos. I've successfully managed 6 track edits in Kdenlive that have crashed in other video editors.
-
-8) **OpenShot** – For the most part, [OpenShot][14] is my goto video editor for most of my video editing tasks. Quick edits, and two track work goes by quickly and easily using this editor. I have also found that it offers great effects that are difficult to match elsewhere. Blender title effects and great video transitions make OpenShot a fantastic editor for my own projects.
-
-9) **SpiderOak** – After using countless cloud backup services over the years, I've settled on [SpiderOak][15] as my favorite. Easy to use and setup, I love the incremental options provided and how simple it is use. Just set it and forget it, then SpiderOak does all the heavy lifting.
-
-10) **Dropbox** – I've had a love/hate relationship with [Dropbox][16] for many years now. Despite being cross platform, which means I can access files from anywhere, I'm slowly finding my self less and less reliant on this cloud-based backup solution. Still, it does allow me to access files from any web browser even if it's not from a computer I'm normally using, which makes dropping the Dropbox habit even harder.
-
-11) **Writer** – I've been relying on [Writer][17] since I first used it on Windows via OpenOffice. Today, I am using Writer with LibreOffice and for my needs, it does everything I could need a word processor to do. Now it's fair to point out that some proprietary office suites might offer additional functionality not found in Writer, however 99% of what most people need is covered here with Writer. For me personally, I'll always be a LibreOffice Writer fan.
-
-12) **SimpleScreenRecorder** – Over the years, I've come to find myself using [SimpleScreenRecorder][18] over other alternatives as it does a nice job with multiple monitor support, plus it can even capture OpenGL applications as well. Easy to use and reliable, SimpleScreenRecorder has served me well. I recommend it to anyone who is tired of playing with other screen capturing software that only works some of the time.
-
-13) **SimpleScan** – When I need to scan a document, I don't want to spend a lot of time configuring a bloated program. [Simple Scan][19] is great in this capacity. Rocking the SANE scanner database, Simple Scan will work with just about any scanner or all-in-one printer/scanner you throw at it. What's also nice is that it's setup to work with the best resolution out of the box, yet you're still free to make any manual adjustments you see fit.
-
-14) **Baobab** (Disk Usage Analyzer) – I keep hearing how hard drive prices have come down. Be that as it may, the fact is I'm not made of money and each dollar I spend is usually part of a tight budget. This means I need to make the best use of the hard drive space I have available. To help me do this, I rely on [Baobab][20] to give me both a clear view of my available space on my hard drive, but also a clearer picture of which directories are eating away at my precious hard drive space.
-
-### Apps That Really Work, Regardless ###
-
-When it comes to applications I rely on, it's really less about their titles and licenses and more about the tasks that they allow me to accomplish. The myth that Linux doesn't really have required software is becoming a thing of the past. Most computing tasks, barring a few limited exceptions, can be done easily from the Linux desktop as I've explained above.
-
-Obviously there are applications that are "must haves" for you, that I might not use myself. What applications do you rely on? Hit the Comments below and share your best applications with the readers here.
-
---------------------------------------------------------------------------------
-
-via: http://www.datamation.com/applications/14-apps-to-boost-ubuntu-1.html
-
-译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:http://www.mozilla.org/en-US/firefox/new/
-[2]:https://plex.tv/
-[3]:http://www.zoneminder.com/
-[4]:http://parcellite.sourceforge.net/
-[5]:http://www.bittorrent.com/sync
-[6]:https://help.gnome.org/users/gnome-system-monitor/3.12/
-[7]:http://linux.about.com/od/commands/l/blcmdl1_top.htm
-[8]:http://freedesktop.org/software/pulseaudio/pavucontrol/
-[9]:http://en.wikipedia.org/wiki/Jupiter_Broadcasting
-[10]:http://www.skype.com/en/download-skype/skype-for-linux/
-[11]:http://ekiga.org/
-[12]:https://jitsi.org/
-[13]:http://www.kdenlive.org/
-[14]:http://www.openshot.org/
-[15]:https://spideroak.com/
-[16]:https://www.dropbox.com/
-[17]:http://www.libreoffice.org/discover/writer/
-[18]:http://www.maartenbaert.be/simplescreenrecorder/
-[19]:https://launchpad.net/simple-scan
-[20]:http://www.marzocca.net/linux/baobab/baobab-getting-started.html

sources/talk/20140626 Joy of Programming--Fail Fast.md

@@ -0,0 +1,58 @@
+Joy of Programming: Fail Fast!
+================================================================================
+![](http://www.opensourceforu.com/wp-content/uploads/2011/12/fail-350x262.jpg)
+
+> When a problem occurs in the software, it should fail immediately, in an easily noticeable way. This “fail fast” behaviour is desirable, and we’ll discuss this important concept in this column.
+
+At first, a “fail fast” might appear to be a bad practice affecting reliability — why should a system crash (or fail), when it can continue execution? For this, we need to understand that fail fast is very relevant in the context of Heisenbugs.
+
+Consider Bohrbugs, which always crash for a given input, for example, with a null-pointer access. These bugs are easier to test, reproduce and fix. Now, all experienced programmers would have faced situations where the bug that caused the crash just disappears when the software is restarted. No matter how much time and effort is spent to reproduce the problem, the bug eludes us. These bugs are known as Heisenbugs.
+
+The effort required to find, fix and test Heisenbugs is an order of magnitude more than the effort required for Bohrbugs. One strategy to avoid Heisenbugs is to turn them into Bohrbugs. How? By anticipating the possible cases in which Heisenbugs can arise, and trying to  make them Bohrbugs. Yes, it is not easy, and it is also not always possible, but let us look at a specific example where it is useful.
+
+Concurrent programming is one paradigm where Heisenbugs are common. Our example is a concurrency-related issue in Java. While iterating over a Java collection, we are supposed to modify the collection only through the Iterator methods, such as the remove() method. During iteration, if another thread attempts to modify that underlying collection (because of a programming mistake), the underlying collection will get corrupted (i.e., result in an incorrect state).
+
+Such an incorrect state can lead to an eventual failure — or if we are fortunate (actually, unfortunate!), the program continues execution without crashing, but gives the wrong results. It is difficult to reproduce and fix these bugs, because such programming mistakes are non-deterministic. In other words, it is a Heisenbug.
+
+Fortunately, the Java Iterators try to detect such concurrent modifications, and if found, will throw a `ConcurrentModificationException`, instead of failing late — and that too, silently. In other words, the Java Iterators follow the “fail fast” approach.
+
+What if a `ConcurrentModificationException` is observed in production software? As the Javadoc for this exception observes, it “…should be used only to detect bugs.” In other words, `ConcurrentModificationExceptions` are supposed to be found and fixed during software development, and should not leak to production code.
+
+Well, if production software does get this exception, it is certainly a bug in the software, and should be reported to the developer and fixed. At least, we know that there was an attempt for concurrent modification of the underlying data structure, and that’s why the software failed (instead of getting wrong results from the software, or failing later with some other symptoms, for which it is not feasible to trace the root cause).
+
+The “fail-safe” approach is meant for developing robust code. A very good example of writing fail-safe code is using assertions. Unfortunately, there is a lot of unnecessary controversy surrounding the use of asserts. The main criticism is this: the checks are enabled in the development version, and disabled in release versions.
+
+However, this criticism is wrong: asserts are never meant to replace the defensive checks that should be put in place in the release version of the software. For example, asserts should not be used to check if the argument passed to a function is null or not. Instead, an if condition should be used to check if the argument is passed correctly, or else an exception, or a premature return, should be performed, as appropriate to the context. However, asserts can be used to do additional checks for assumptions that are made in the code, which are supposed to hold true. For example, a condition that checks that the stack is not empty after a push operation is performed on it (i.e., checking for “invariants”).
+
+So, fail fast, be assertive, and you’re on the way to developing more robust code.
+
+
+
+--------------------------------------------------------------------------------
+
+via:http://www.opensourceforu.com/2011/12/joy-of-programming-fail-fast/ 
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:
+[2]:
+[3]:
+[4]:
+[5]:
+[6]:
+[7]:
+[8]:
+[9]:
+[10]:
+[11]:
+[12]:
+[13]:
+[14]:
+[15]:
+[16]:
+[17]:
+[18]:
+[19]:
+[20]:

sources/talk/20140626 Linux Administration--A Smart Career Choice.md

@@ -0,0 +1,41 @@
+Linux Administration: A Smart Career Choice
+================================================================================
+![](http://www.opensourceforu.com/wp-content/uploads/2014/04/linux.jpeg)
+
+> This is a good year for IT professionals with a number of new jobs in emerging technologies like Big Data and Analytics, and Social Mobile Analytics and Cloud (SMAC) as employers look to strengthen their technological force.
+
+If we were to believe the reports by [Dice.com][1] and Linux foundation released in mid Feb, 2014, this year will be a high octane year for Linux professionals and aspirants particularly. Thus it only makes sense to be future-ready and find out about the details of career opportunities such as that of a Linux administrator.
+
+Dice.com, the leading job site for tech professionals and Linux Foundation did a comprehensive survey to find out about the advantage Linux professionals have in the current technology landscape. The findings were heavily skewed in favor of those who are looking for a good job opportunity on Linux platform.
+
+While seventy seven percent of hiring managers surveyed consider hiring Linux talent as one of their top priorities (up from 70 percent in 2013), 64 percent of professionals chose to work with Linux owing to its ubiquitous nature in the present day technology infrastructure. More than nine in ten recruitment manager is planning to hire a Linux professional in the next six months.  This demand is surely going to translate in form of a lot of interview calls from employers. Most hiring managers also agree to the fact that it is rather difficult to find experienced professionals, and those who have the right mix of skills, knowledge, certifications and experience are being aggressively recruited.
+
+### Why Linux administration? ###
+
+The findings of this report make it clear that Linux professionals are amongst the most sought after in the current tech market. However, a more interesting finding of the report is that amongst all the skills, the hiring managers are most actively seeking system administration, with 58 percent confirming they were on look out of professionals with good system administration skills. The reason is quite simple. There aren’t too many good system administrators out there, which is also driving the salaries of system admins northwards.
+Getting started in Linux administration
+
+Armed with all this data, it wouldn’t come as surprise if you decide right away to pursue a career in Linux administration. So, how do you become a pro Linux system admin? Well, the right mix of certification, education and experience will obviously land you the perfect Linux job, but if you are clueless about a place to start, then a degree in computers is what you should be looking at.  This could be B.Tech with Computer Science or IT as specialisation or Bachelors in Computer Application or even a Bachelor in Science with IT as specialisation will do.  This would actually make you familiar with the various aspects of computer science as a subject, likes of programming, hardware, and software. This understanding would come handy in the advancement of your career, when you climb the next ladder through certifications.
+
+### Certifications ###
+
+It is widely believed that IT certifications do help one in career advancement.  However, it ultimately boils down to selecting the right certification to gain the maximum RoI. There are many Linux based certifications, the most famous of which is Red Hat Certification Program, which teaches general Linux related skills along with specific system administration skills.
+
+In addition to the vendor sponsored certifications, there is a vendor-independent Linux Professional Institute Certification offered by Linux Professional Institute, a non-profit organisation based in Toronto, Canada.
+
+These exams can be taken by anyone irrespective of their nationalities. The LPI programs have three level hierarchies that include LPIC-1: Junior Level Linux Administration, LPIC-2: Advanced Level Linux Administration and LPIC 3: Senior Level Linux Administration. In order to be considered seriously for any system administrator job opportunity in one must possess at least one of the above described certifications.   The LPI also has partnerships with SUSE, which is the vendor for a famous enterprise operating system going by the same name. CompTIA, which is a global IT certification agency also provided a Linux+ certification which was phased out after an agreement between LPI and CompTIA.
+
+### Salaries and Benefits ###
+
+The compensations for Linux administrators are generally on the higher side. As per PayScale, the annual median salary is around INR 3 lacs for entry level professionals (as updated on 27th March, 2014). With experience, there is an exponential increase in the salary levels as individuals with 5+ years of experience getting annual packages in seven figures.
+Well, with the grass being greener for Linux professionals this year, you won’t get a better opportunity or time for pursuing career as a Linux system administrator.
+
+--------------------------------------------------------------------------------
+
+via: http://www.opensourceforu.com/2014/04/career-overview-linux-administrator/
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://dice.com/

sources/talk/20140630 Ubuntu 14.04 LTS--Customizing Unity.md

@@ -0,0 +1,62 @@
+Ubuntu 14.04 LTS: Customizing Unity
+================================================================================
+Although the Unity Desktop Manager has made HUGE performance and usability strides since the initial release in Ubuntu 11.10, some people are still put off by a number of the limitations in customizing the look and behavior of the window manager. We are going to take a look at how to customize Unity and bring back a sense of control to your desktop.
+
+### Unity Customizations Available ###
+
+In Ubuntu 14.04, Unity has several customizations that are available that were not previously. If you log into Unity, go the the “Settings” and choose “Display”, you will see the following screen:
+
+![Ubuntu 14.04 LTS Display and Unity Settings](https://linuxacademy.com/blog/wp-content/uploads/2014/06/unitysettings.png)
+Ubuntu 14.04 LTS Display and Unity Settings
+
+Most of what you see is new since the Ubuntu 11.10 Unity introduction and several are new since just the latest version of Ubuntu 13.10. New since 13.10 are the ability to scale the menu and title bars. This is useful in very high resolution screens OR as a visual impairment option. Everything scales equally.
+
+Specific to Unity we can also turn on or off that “sticky edges” option. This is the somewhat annoying “pause” your mouse does on the edge of each screen of a multi-monitor setup. It stops the mouse momentarily at the edge, like it gets stuck. Finally, we have to option to turn that off.
+
+In the “Settings” screen still, choose the “Appearance” option to see the following:
+
+![Ubuntu 14.04 LTS Appearance and Unity Settings](https://linuxacademy.com/blog/wp-content/uploads/2014/06/unityappearance.png)
+Ubuntu 14.04 LTS Appearance and Unity Settings
+
+Here we have one of the most requested options for the Unity Dock, the ability to change the Launcher size. Although it could be done in multiple ways in various versions of Ubuntu since 11.10, including it in the Appearance setting just makes it all official. I like that it allows you to change the icon size all the way down to 16 (even the tool we will talk about next only supports 24).
+
+### Unity Tweak Tool – Now Repo Strong! ###
+
+This tool has been around since the early days of Ubuntu 11.10 when Unity was first introduced, although you had to jump through a large number of hoops (and progressively smaller as the versions went on) to get it installed and it would be broken by Unity updates.
+
+Now however, it has officially been added to the default Ubuntu repositories and gets updated when Unity gets updated. There are a large number of customizations, so let’s get it installed:
+
+    sudo apt-get install unity-tweak-tool
+
+After installation, start it up and you will see the following screen:
+
+![Ubuntu 14.04 LTS Official Unity Tweak Tool](https://linuxacademy.com/blog/wp-content/uploads/2014/06/unitytweaktool.png)
+Ubuntu 14.04 LTS Official Unity Tweak Tool
+
+This tool encapsulates a large number of Unity Desktop customizations all in once convenient location. Most of these options can be had in the default Unity settings, at the command line or by editing sometimes hard to find configuration files.
+
+We can change the behavior of the dock, the panel, web applet integration, search within the Unity menu, etc. all within this one tool. Take the time to explore the options available to you – Unity Tweak Tool – learn it, live it, love it (at least if you use Unity).
+
+### Final Thoughts ###
+
+Ubuntu 14.04 LTS is shaping up more and more to be the Linux Desktop (sorry Canonical, you are still Linux) of choice for both the casual Linux user (is there such a thing) as well as the die hard professional.
+
+We now have more control than every over the Unity Desktop without resorting to tools, utilities or configuration file edits that may break with each subsequent Unity update. The desktop performance is pretty rock solid and, by adding some flavor with the Unity Tweak Tool, looks pretty cool as well! Drop us your thoughts or post links to your Unity Desktop set up in the comments below, we would be interested to see how you are using Ubuntu 14.04 LTS.
+
+----------
+
+#### Terrence T. Cox ####
+
+Developer, Linux Advocate, Open Source Junkie. Been at this whole tech thing long enough to be considered 'very experienced' but not so long as to be bored of it. 
+
+[Twitter][1]
+
+--------------------------------------------------------------------------------
+
+via: https://linuxacademy.com/blog/linux/ubuntu-14-04-lts-customizing-unity/
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:https://twitter.com/mourngrymtc/

sources/talk/20140701 Easy File Comparisons With These Great Free Diff Tools.md

@@ -0,0 +1,166 @@
+Easy File Comparisons With These Great Free Diff Tools
+================================================================================
+by Frazer Kline
+
+File comparison compares the contents of computer files, finding their common contents and their differences. The result of the comparison is often known as a diff.
+
+diff is also the name of a famous console based file comparison utility that outputs the differences between two files. The diff utility was developed in the early 1970s on the Unix operating system. diff will output the parts of the files where they are different.
+
+Linux has many good GUI tools that enable you to clearly see the difference between two files or two versions of the same file. This roundup selects 5 of my favourite GUI diff tools, with all but one released under an open source license.
+
+These utilities are an essential software development tool, as they visualize the differences between files or directories, merge files with differences, resolve conflicts and save output to a new file or patch, and assist file changes reviewing and comment production (e.g. approving source code changes before they get merged into a source tree). They help developers work on a file, passing it back and forth between each other. The diff tools are not only useful for showing differences in source code files; they can be used on many text-based file types as well. The visualisations make it easier to compare files.
+
+----------
+
+![](http://www.linuxlinks.com/portal/content2/png/Meld.png)
+
+![](http://www.linuxlinks.com/portal/content/reviews/Utilities/Screenshot-Meld.png)
+
+Meld is an open source graphical diff viewer and merge application for the Gnome desktop. It supports 2 and 3-file diffs, recursive directory diffs, diffing of directories under version control (Bazaar, Codeville, CVS, Darcs, Fossil SCM, Git, Mercurial, Monotone, Subversion), as well as the ability to manually and automatically merge file differences.
+
+Meld's focus is on helping developers compare and merge source files, and get a visual overview of changes in their favourite version control system.
+
+Features include
+
+- Edit files in-place, and your comparison updates on-the-fly
+- Perform twoand three-way diffs and merges
+- Easily navigate between differences and conflicts
+- Visualise global and local differences with insertions, changes and conflicts marked
+- Built-in regex text filtering to ignore uninteresting differences
+- Syntax highlighting (with optional gtksourceview)
+- Compare two or three directories file-by-file, showing new, missing, and altered files
+- Directly open file comparisons of any conflicting or differing files
+- Filter out files or directories to avoid seeing spurious differences
+- Auto-merge mode and actions on change blocks help make merges easier
+- Simple file management is also available
+- Supports many version control systems, including Git, Mercurial, Bazaar and SVN
+- Launch file comparisons to check what changes were made, before you commit
+- View file versioning statuses
+- Simple version control actions are also available (i.e., commit/update/add/remove/delete files)
+- Automatically merge two files using a common ancestor
+- Mark and display the base version of all conflicting changes in the middle pane
+- Visualise and merge independent modifications of the same file
+- Lock down read-only merge bases to avoid mistakes
+- Command line interface for easy integration with existing tools, including git mergetool
+- Internationalization support
+- Visualisations make it easier to compare your files
+
+- Website: [meldmerge.org][1]
+- Developer: Kai Willadsen
+- License: GNU GPL v2
+- Version Number: 1.8.5
+
+----------
+
+![](http://www.linuxlinks.com/portal/content2/png/DiffMerge.png)
+
+![](http://www.linuxlinks.com/portal/content/reviews/Utilities/Screenshot-DiffMerge.png)
+注：上面这个图访问不到，图的地址是原文地址的小图的链接地址，发布的时候在验证一下，如果还访问不到，不行先采用小图或者网上搜一下看有没有大图
+
+DiffMerge is an application to visually compare and merge files on Linux, Windows, and OS X.
+
+Features include:
+
+- Graphically shows the changes between two files. Includes intra-line highlighting and full support for editing
+- Graphically shows the changes between 3 files. Allows automatic merging (when safe to do so) and full control over editing the resulting file
+- Performs a side-by-side comparison of 2 folders, showing which files are only present in one file or the other, as well as file pairs which are identical, equivalent or different
+- Rulesets and options provide for customized appearance and behavior
+- Unicode-based application and can import files in a wide range of character encodings
+- Cross-platform tool
+
+- Website: [sourcegear.com/diffmerge][2]
+- Developer: SourceGear LLC
+- License: Licensed for use free of charge (not open source)
+- Version Number: 4.2
+
+----------
+
+![](http://www.linuxlinks.com/portal/content2/png/xxdiff.png)
+
+![](http://www.linuxlinks.com/portal/content/reviews/Utilities/Screenshot-xxdiff.png)
+
+xxdiff is an open source graphical file and directories comparator and merge tool.
+
+xxdiff can be used for viewing the differences between two or three files, or two directories, and can be used to produce a merged version. The texts of the two or three files are presented side by side with their differences highlighted with colors for easy identification.
+
+This program is an essential software development tool that can be used to visualize the differences between files or directories, merge files with differences, resolving conflicts and saving output to a new file or patch, and assist file changes reviewing and comment production (e.g. approving source code changes before they get merged into a source tree).
+
+Features include:
+
+- Compare two files, three files, or two directories (shallow and recursive)
+- Horizontal diffs highlighting
+- Files can be merged interactively and resulting output visualized and saved
+- Features to assist in performing merge reviews/policing
+- Unmerge CVS conflicts in automatically merged file and display them as two files, to help resolve conflicts
+- Uses external diff program to compute differences: works with GNU diff, SGI diff and ClearCase's cleardiff, and any other diff whose output is similar to those
+- Fully customizable with a resource file
+- Look-and-feel similar to Rudy Wortel's/SGI xdiff, it is desktop agnostic
+- Features and output that ease integration with scripts
+
+- Website: [furius.ca/xxdiff][3]
+- Developer: Martin Blais
+- License: GNU GPL
+- Version Number: 4.0
+
+----------
+
+![](http://www.linuxlinks.com/portal/content2/png/Diffuse.png)
+
+![](http://www.linuxlinks.com/portal/content/reviews/Utilities/Screenshot-Diffuse.png)
+
+Diffuse is an open source graphical tool for merging and comparing text files. Diffuse is able to compare an arbitrary number of files side-by-side and offers the ability to manually adjust line-matching and directly edit files. Diffuse can also retrieve revisions of files from bazaar, CVS, darcs, git, mercurial, monotone, Subversion and GNU Revision Control System (RCS) repositories for comparison and merging.
+
+Features include: 
+
+- Compare and merge an arbitrary number of files side-by-side (n-way merges)
+- Line matching can be manually corrected by the user
+- Directly edit files
+- Syntax highlighting
+- Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK support
+- Unicode support
+- Unlimited undo
+- Easy keyboard navigation
+
+- Website: [diffuse.sourceforge.net][]
+- Developer: Derrick Moser
+- License: GNU GPL v2
+- Version Number: 0.4.7
+
+----------
+
+![](http://www.linuxlinks.com/portal/content2/png/Kompare.png)
+
+![](http://www.linuxlinks.com/portal/content/reviews/Utilities/Screenshot-Kompare.png)
+
+Kompare is an open source GUI front-end program that enables differences between source files to be viewed and merged. Kompare can be used to compare differences on files or the contents of folders. Kompare supports a variety of diff formats and provide many options to customize the information level displayed.
+
+Whether you are a developer comparing source code, or you just want to see the difference between that research paper draft and the final document, Kompare is a useful tool.
+
+Kompare is part of the KDE desktop environment.
+
+Features include: 
+
+- Compare two text files
+- Recursively compare directories
+- View patches generated by diff
+- Merge a patch into an existing directory
+- Entertain you during that boring compile
+
+- Website: [www.caffeinated.me.uk/kompare/][5]
+- Developer: The Kompare Team
+- License: GNU GPL
+- Version Number: Part of KDE
+
+--------------------------------------------------------------------------------
+
+via: http://www.linuxlinks.com/article/2014062814400262/FileComparisons.html
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://meldmerge.org/
+[2]:https://sourcegear.com/diffmerge/
+[3]:http://furius.ca/xxdiff/
+[4]:http://diffuse.sourceforge.net/
+[5]:http://www.caffeinated.me.uk/kompare/

sources/tech/20140616 How to Rescue a Non-booting GRUB 2 on Linux.md

@@ -1,131 +0,0 @@
-
->>chenguang is translating it 
-
-How to Rescue a Non-booting GRUB 2 on Linux
-================================================================================
-![Figure 1: GRUB 2 menu with cool Apollo 17 background.](http://www.linux.com/images/stories/41373/grub-command-shell.jpg)
-Figure 1: GRUB 2 menu with cool Apollo 17 background.
-
-Once upon a time we had legacy GRUB, the Grand Unified Linux Bootloader version 0.97. Legacy GRUB had many virtues, but it became old and its developers did yearn for more functionality, and thus did GRUB 2 come into the world.
-
-GRUB 2 is a major rewrite with several significant differences. It boots removable media, and can be configured with an option to enter your system BIOS. It's more complicated to configure with all kinds of scripts to wade through, and instead of having a nice fairly simple `/boot/grub/menu.lst` file with all configurations in one place, the default is `/boot/grub/grub.cfg`. Which you don't edit directly, oh no, for this is not for mere humans to touch, but only other scripts. We lowly humans may edit `/etc/default/grub`, which controls mainly the appearance of the GRUB menu. We may also edit the scripts in `/etc/grub.d/`. These are the scripts that boot your operating systems, control external applications such as memtest and os_prober, and theming`./boot/grub/grub.cfg` is built from `/etc/default/grub` and `/etc/grub.d/*` when you run the update-grub command, which you must run every time you make changes.
-
-The good news is that the update-grub script is reliable for finding kernels, boot files, and adding all operating systems to your GRUB boot menu, so you don't have to do it manually.
-
-We're going to learn how to fix two of the more common failures. When you boot up your system and it stops at the grub> prompt, that is the full GRUB 2 command shell. That means GRUB 2 started normally and loaded the normal.mod module (and other modules which are located in /boot/grub/[arch]/), but it didn't find your grub.cfg file. If you see grub rescue> that means it couldn't find normal.mod, so it probably couldn't find any of your boot files.
-
-How does this happen? The kernel might have changed drive assignments or you moved your hard drives, you changed some partitions, or installed a new operating system and moved things around. In these scenarios your boot files are still there, but GRUB can't find them. So you can look for your boot files at the GRUB prompt, set their locations, and then boot your system and fix your GRUB configuration.
-
-### GRUB 2 Command Shell ###
-
-The GRUB 2 command shell is just as powerful as the shell in legacy GRUB. You can use it to discover boot images, kernels, and root filesystems. In fact, it gives you complete access to all filesystems on the local machine regardless of permissions or other protections. Which some might consider a security hole, but you know the old Unix dictum: whoever has physical access to the machine owns it.
-
-When you're at the `grub>` prompt, you have a lot of functionality similar to any command shell such as history and tab-completion. The `grub rescue>` mode is more limited, with no history and no tab-completion.
-
-If you are practicing on a functioning system, press C when your GRUB boot menu appears to open the GRUB command shell. You can stop the bootup countdown by scrolling up and down your menu entries with the arrow keys. It is safe to experiment at the GRUB command line because nothing you do there is permanent. If you are already staring at the `grub>` or `grub rescue>`prompt then you're ready to rock.
-
-The next few commands work with both `grub>` and `grub rescue>`. The first command you should run invokes the pager, for paging long command outputs:
-
-    grub> set pager=1
-
-There must be no spaces on either side of the equals sign. Now let's do a little exploring. Type ls to list all partitions that GRUB sees:
-
-    grub> ls
-    (hd0) (hd0,msdos2) (hd0,msdos1)
-
-What's all this msdos stuff? That means this system has the old-style MS-DOS partition table, rather than the shiny new Globally Unique Identifiers partition table (GPT). (See [Using the New GUID Partition Table in Linux (Goodbye Ancient MBR)][1]. If you're running GPT it will say (hd0,gpt1). Now let's snoop. Use the ls command to see what files are on your system:
-
-    grub> ls (hd0,1)/
-    lost+found/ bin/ boot/ cdrom/ dev/ etc/ home/  lib/
-    lib64/ media/ mnt/ opt/ proc/ root/ run/ sbin/ 
-    srv/ sys/ tmp/ usr/ var/ vmlinuz vmlinuz.old 
-    initrd.img initrd.img.old
-
-Hurrah, we have found the root filesystem. You can omit the msdos and gpt labels. If you leave off the slash it will print information about the partition. You can read any file on the system with the cat command:
-
-    grub> cat (hd0,1)/etc/issue
-    Ubuntu 14.04 LTS \n \l
-
-Reading /etc/issue could be useful on a multi-boot system for identifying your various Linuxes.
-
-### Booting From grub> ###
-
-This is how to set the boot files and boot the system from the grub> prompt. We know from running the ls command that there is a Linux root filesystem on (hd0,1), and you can keep searching until you verify where /boot/grub is. Then run these commands, using your own root partition, kernel, and initrd image:
-
-    grub> set root=(hd0,1)
-    grub> linux /boot/vmlinuz-3.13.0-29-generic root=/dev/sda1
-    grub> initrd /boot/initrd.img-3.13.0-29-generic
-    grub> boot
-
-The first line sets the partition that the root filesystem is on. The second line tells GRUB the location of the kernel you want to use. Start typing /boot/vmli, and then use tab-completion to fill in the rest. Type root=/dev/sdX to set the location of the root filesystem. Yes, this seems redundant, but if you leave this out you'll get a kernel panic. How do you know the correct partition? hd0,1 = /dev/sda1. hd1,1 = /dev/sdb1. hd3,2 = /dev/sdd2. I think you can extrapolate the rest.
-
-The third line sets the initrd file, which must be the same version number as the kernel.
-
-The fourth line boots your system.
-
-On some Linux systems the current kernels and initrds are symlinked into the top level of the root filesystem:
-
-    $ ls -l /
-    vmlinuz -> boot/vmlinuz-3.13.0-29-generic
-    initrd.img -> boot/initrd.img-3.13.0-29-generic
-
-So you could boot from grub> like this:
-
-    grub> set root=(hd0,1)
-    grub> linux /vmlinuz root=/dev/sda1
-    grub> initrd /initrd.img
-    grub> boot
-
-### Booting From grub-rescue> ###
-
-If you're in the GRUB rescue shell the commands are different, and you have to load the normal.mod andlinux.mod modules:
-
-    grub rescue> set prefix=(hd0,1)/boot/grub
-    grub rescue> set root=(hd0,1)
-    grub rescue> insmod normal
-    grub rescue> normal
-    grub rescue> insmod linux
-    grub rescue> linux /boot/vmlinuz-3.13.0-29-generic root=/dev/sda1
-    grub rescue> initrd /boot/initrd.img-3.13.0-29-generic
-    grub rescue> boot
-
-Tab-completion should start working after you load both modules.
-
-### Making Permanent Repairs ###
-
-When you have successfully booted your system, run these commands to fix GRUB permanently:
-
-    # update-grub
-    Generating grub configuration file ...
-    Found background: /usr/share/images/grub/Apollo_17_The_Last_Moon_Shot_Edit1.tga
-    Found background image: /usr/share/images/grub/Apollo_17_The_Last_Moon_Shot_Edit1.tga
-    Found linux image: /boot/vmlinuz-3.13.0-29-generic
-    Found initrd image: /boot/initrd.img-3.13.0-29-generic
-    Found linux image: /boot/vmlinuz-3.13.0-27-generic
-    Found initrd image: /boot/initrd.img-3.13.0-27-generic
-    Found linux image: /boot/vmlinuz-3.13.0-24-generic
-    Found initrd image: /boot/initrd.img-3.13.0-24-generic
-    Found memtest86+ image: /boot/memtest86+.elf
-    Found memtest86+ image: /boot/memtest86+.bin
-    done
-    # grub-install /dev/sda
-    Installing for i386-pc platform.
-    Installation finished. No error reported.
-
-When you run grub-install remember you're installing it to the boot sector of your hard drive and not to a partition, so do not use a partition number like /dev/sda1.
-
-### But It Still Doesn't Work ###
-
-If your system is so messed up that none of this works, try the [Super GRUB2 live rescue disk][2]. The official [GNU GRUB Manual 2.00][3] should also be helpful.
-
---------------------------------------------------------------------------------
-
-via: http://www.linux.com/learn/tutorials/776643-how-to-rescue-a-non-booting-grub-2-on-linux
-
-译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:http://www.linux.com/learn/tutorials/730440-using-the-new-guid-partition-table-in-linux-good-bye-ancient-mbr-
-[2]:http://www.supergrubdisk.org/
-[3]:https://www.gnu.org/software/grub/manual/grub.html

sources/tech/20140616 How to diskless boot a Linux machine.md

@@ -1,5 +1,3 @@
-zsJacky translating
-
 How to diskless boot a Linux machine
 ================================================================================
 Diskless booting implies that a client computer does not have any disk storage when booting an operating system. In that case, the computer can load the kernel as well as the root filesystem from a remote NFS server over network. It may use several different methods to load the kernel and the root filesystem from an NFS server: RARP, BOOTP or DHCP protocols. In this tutorial, I will use BOOTP/DHCP protocol because they are supported by many network cards.