diff --git a/translated/talk/20140818 Why Your Company Needs To Write More Open Source Software.md b/published/20140818 Why Your Company Needs To Write More Open Source Software.md
similarity index 76%
rename from translated/talk/20140818 Why Your Company Needs To Write More Open Source Software.md
rename to published/20140818 Why Your Company Needs To Write More Open Source Software.md
index 23ed4a63d7..12f1a6be22 100644
--- a/translated/talk/20140818 Why Your Company Needs To Write More Open Source Software.md
+++ b/published/20140818 Why Your Company Needs To Write More Open Source Software.md
@@ -1,18 +1,21 @@
-为什么你的公司需要参与更多开源软件的编写
+为什么公司需要参与更多开源软件的编写?
================================================================================
->闭关锁国是产生不了创新的。
+
+> 闭门造车是产生不了创新的。
![](http://a5.files.readwrite.com/image/upload/c_fill,h_900,q_70,w_1600/MTE5NDg0MDYxMTkxMzQxNTgz.jpg)
-**华尔街日报 [称][1],有消息表明,Zulily正在开发** 更多的内部软件,但实际上根本不是。多年前[Eric Raymond写道][2],全世界95%的软件写来用的,而不是售卖。原因很多,但是其中有一个比较突出:正如Zulily的CIO Luke Friang所说,几乎没有一个[非定制]软件解决方案能跟上我们的步伐。
+[据华尔街日报称][1],有消息表明,Zulily正在开发更多的内部软件,但实际上根本不是。多年前[Eric Raymond写道][2],全世界95%的软件写来用的,而不是售卖。原因很多,但是其中有一个比较突出:正如Zulily的CIO Luke Friang所说,几乎没有一个[非定制]软件解决方案能跟上我们的步伐。
20年前是这样,现在也是这样。
-但是有一点是不同的,这也正是华尔街日报完全忽略的地方。而这也正是历史上开发的内部软件始终保持着专有的原因了,因为她是一个公司的 核心竞争力。然而今天,越来越多的公司意识到另一面:开源内部软件将会比保持专有获益更多。
+但是有一点是不同的,这也正是华尔街日报完全忽略的地方。而这也正是历史上开发的内部软件始终保持着专有的原因了,因为它是一个公司的核心竞争力。然而今天,越来越多的公司意识到另一面:开源内部软件将会比保持专有获益更多。
这也就是为什么你的公司需要为开源项目做出更多的贡献。记住是更多。
+### 不寻常的那些年
+
我们刚刚经历了一个很不一样的20年,那时很多软件的开发都是为了内部的使用,大多数人的精力都放在由SAP和微软这样的厂商建立的应用广泛的企业级解决方案。
不管怎么说,这都是一个理论。
@@ -27,32 +30,37 @@
然而,开源的道路上,一些公司也发现,有些销售商不能很好地描述他们所想要的,即便是很好理解的产品类别,如像内容管理系统,他们需要 知道的是产品亮点,而不希望是一个模子刻出来的。
-所以顾客没了,他们中有一部分上转变变成了供应商。
+所以顾客没了,他们中有一部分转变成了供应商。
-这也是常有的事,[O'Grady指出了][4]这一点。2010年,O'Grady发现了一个有趣的现象:“软件提供商正面对着一个强有力的市场竞争者:他们 的顾客。”
+### 自己动手,丰衣足食
+
+这也是常有的事,[O'Grady指出了][4]这一点。2010年,O'Grady发现了一个有趣的现象:“软件提供商正面对着一个强有力的市场竞争者:他们的顾客。”
回想一下今天的高科技,大多数都是开源的,几乎所有的项目一开始都是某些公司的内部项目,或者仅仅是有些开发者的爱好,Linux,Git,Hadoop,Cassandra,MongDB,Android,等等。没有一个项目起初是为了售卖而产生的。
相反,这些项目通常是由一些公司维护,他们使用开源的资源来构建软件并[完善软件][5],这主要是一些Web公司。不像以前银行,医院和一些组织开发的软件只供内部使用,他们开源源码。
-虽然,[有些公司避免定制软件][6],因为他们不想自己维护它,开源(稍微)减轻了这些发展中公司来维护一个项目的压力。从而为项目发起人均摊项目的开发成本,Yahoo,开始于Hadoop,但是现在最大的贡献者是Cloudera和Hortonworks。Facebook开始于Cassandra,但是现在主要是靠DataStax在维护。等等。
+虽然,[有些公司避免定制软件][6],因为他们不想自己维护它,开源(稍微)减轻了这些发展中公司来维护一个项目的压力。从而为项目发起人均摊项目的开发成本,Yahoo,建立了 Hadoop,但是现在最大的贡献者是Cloudera和Hortonworks。Facebook 建立了 Cassandra,但是现在主要是靠DataStax在维护。等等。
+
+### 现在就走出来吧!
今天,真正的软件创新并不是闭门造车能造出来的,即便是可以,它也不会在那儿,开源项目颠覆了几十年的软件开发传统。
这不仅仅是一个人的一点点力量。
-最好的开源项目都[发展得很快][7],但是这并不意味着别人在乎你的开源代码。[开放你的源码有显著的优缺点][8],其中一个很重要的优点是 很多伟大的开发者都希望为开源做出贡献:如果你也想找一个伟大的开发者跟你一起,你需要给他们一个开放的源代码来让他们工作。([Netflix][9]说)
+最好的开源项目都[发展得很快][7],但是这并不意味着别人在乎你的开源代码。[开放你的源码有显著的优缺点][8],其中一个很重要的优点是很多伟大的开发者都希望为开源做出贡献:如果你也想找一个伟大的开发者跟你一起,你需要给他们一个开放的源代码来让他们工作。([Netflix][9]说)
-但是,我们没有理由站在一边看,现在正是时候参与开源社区了,而不是一些不清楚的社区。是的,开源最大的参与者正是你们和你们的公司。 赶紧开始吧。
+但是,我们没有理由站在一边看,现在正是时候参与开源社区了,而不是把“社区”妖魔化。是的,开源最大的参与者正是你们和你们的公司。 赶紧开始吧。
主要图片来自于Shutterstock. (注:Shutterstock是美国的一家摄影图片网站。)
+
--------------------------------------------------------------------------------
via: http://readwrite.com/2014/08/16/open-source-software-business-zulily-erp-wall-street-journal
作者:[Matt Asay][a]
译者:[barney-ro](https://github.com/barney-ro)
-校对:[校对者ID](https://github.com/校对者ID)
+校对:[wxy](https://github.com/wxy)
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
diff --git a/translated/tech/20141021 Configuring layer-two peer-to-peer VPN using n2n.md b/published/20141021 Configuring layer-two peer-to-peer VPN using n2n.md
similarity index 98%
rename from translated/tech/20141021 Configuring layer-two peer-to-peer VPN using n2n.md
rename to published/20141021 Configuring layer-two peer-to-peer VPN using n2n.md
index ae556b84e3..692f83fc15 100644
--- a/translated/tech/20141021 Configuring layer-two peer-to-peer VPN using n2n.md
+++ b/published/20141021 Configuring layer-two peer-to-peer VPN using n2n.md
@@ -76,7 +76,7 @@ via: http://www.ubuntugeek.com/configuring-layer-two-peer-to-peer-vpn-using-n2n.
作者:[ruchi][a]
译者:[GOLinux](https://github.com/GOLinux)
-校对:[校对者ID](https://github.com/校对者ID)
+校对:[wxy](https://github.com/wxy)
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
diff --git a/translated/tech/20141027 How to encrypt files and directories with eCryptFS on Linux.md b/published/20141027 How to encrypt files and directories with eCryptFS on Linux.md
similarity index 90%
rename from translated/tech/20141027 How to encrypt files and directories with eCryptFS on Linux.md
rename to published/20141027 How to encrypt files and directories with eCryptFS on Linux.md
index 655c8a27b1..48b5ae906c 100644
--- a/translated/tech/20141027 How to encrypt files and directories with eCryptFS on Linux.md
+++ b/published/20141027 How to encrypt files and directories with eCryptFS on Linux.md
@@ -27,7 +27,7 @@
### eCryptFS基础 ###
-eCrypFS是一个基于FUSE的用户空间加密文件系统,在Linux内核2.6.19及更高版本中可用(作为encryptfs模块)。eCryptFS加密的伪文件系统挂载到当前文件系统的顶部。它可以很好地工作在EXT文件系统家族和其它文件系统如JFS、XFS、ReiserFS、Btrfs,甚至是NFS/CIFS共享文件系统上。Ubuntu使用eCryptFS作为加密其家目录的默认方法,ChromeOS也是。在eCryptFS底层,默认使用的是AES算法,但是它也支持其它算法,如blowfish、des3、cast5、cast6。如果你是通过手工创建eCryptFS设置,你可以选择其中一种算法。
+eCrypFS是一个基于FUSE的用户空间加密文件系统,在Linux内核2.6.19及更高版本中可用(作为encryptfs模块)。eCryptFS加密的伪文件系统是挂载到当前文件系统顶部的。它可以很好地工作在EXT文件系统家族和其它文件系统如JFS、XFS、ReiserFS、Btrfs,甚至是NFS/CIFS共享文件系统上。Ubuntu使用eCryptFS作为加密其家目录的默认方法,ChromeOS也是。在eCryptFS底层,默认使用的是AES算法,但是它也支持其它算法,如blowfish、des3、cast5、cast6。如果你是通过手工创建eCryptFS设置,你可以选择其中一种算法。
就像我所的,Ubuntu让我们在安装过程中选择是否加密/home目录。好吧,这是使用eCryptFS的最简单的一种方法。
@@ -63,13 +63,13 @@ Arch Linux:
![](https://farm6.staticflickr.com/5608/15453440890_3b4be6d5a7_z.jpg)
-它会要求你输入登录密码和挂载密码。登录密码和你常规登录的密码一样,而挂载密码用于派生一个文件加密主密钥。留空来生成一个,这样会更安全。登出然后重新登录。
+它会要求你输入登录密码和挂载密码。登录密码和你常规登录的密码一样,而挂载密码用于派生一个文件加密主密钥。这里留空可以生成一个(复杂的),这样会更安全。登出然后重新登录。
你会注意到,eCryptFS默认在你的家目录中创建了两个目录:Private和.Private。~/.Private目录包含有加密的数据,而你可以在~/Private目录中访问到相应的解密后的数据。在你登录时,~/.Private目录会自动解密并映射到~/Private目录,因此你可以访问它。当你登出时,~/Private目录会自动卸载,而~/Private目录中的内容会加密回到~/.Private目录。
eCryptFS怎么会知道你拥有~/.Private目录,并自动将其解密到~/Private目录而不需要我们输入密码呢?这就是eCryptFS的PAM模块捣的鬼,它为我们提供了这项便利服务。
-如果你不想要~/Private目录在登录时自动挂载,只需要在运行ecryptfs-setup-private工具时添加“--noautomount”选项。同样,如果你不想要~/Private目录在登出后自动卸载,也可以自动“--noautoumount”选项。但是,那样后,你需要自己手工挂载或卸载~/Private目录:
+如果你不想让~/Private目录在登录时自动挂载,只需要在运行ecryptfs-setup-private工具时添加“--noautomount”选项。同样,如果你不想要~/Private目录在登出后自动卸载,也可以自动“--noautoumount”选项。但是,那样后,你需要自己手工挂载或卸载~/Private目录:
$ ecryptfs-mount-private ~/.Private ~/Private
$ ecryptfs-umount-private ~/Private
@@ -94,7 +94,7 @@ via: http://xmodulo.com/encrypt-files-directories-ecryptfs-linux.html
作者:[Christopher Valerio][a]
译者:[GOLinux](https://github.com/GOLinux)
-校对:[校对者ID](https://github.com/校对者ID)
+校对:[wxy](https://github.com/wxy)
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
diff --git a/translated/tech/20141112 How to Remove Music Players from Ubuntu Sound Menu.md b/published/20141112 How to Remove Music Players from Ubuntu Sound Menu.md
similarity index 62%
rename from translated/tech/20141112 How to Remove Music Players from Ubuntu Sound Menu.md
rename to published/20141112 How to Remove Music Players from Ubuntu Sound Menu.md
index f0bb652ad6..4595a3c8e5 100644
--- a/translated/tech/20141112 How to Remove Music Players from Ubuntu Sound Menu.md
+++ b/published/20141112 How to Remove Music Players from Ubuntu Sound Menu.md
@@ -1,45 +1,36 @@
-
如何从Ubuntu的声音菜单中移除音乐播放器
================================================================================
![](http://www.omgubuntu.co.uk/wp-content/uploads/2014/11/music-players.jpg)
+**自从2010年首次出现,Ubuntu 的声音菜单已经被证明是Unity 桌面上的最流行的独有特性之一。**
-**自从2010年的介绍一来,Ubuntu声音菜单已经被证明是最流行和个性的统一桌面之一.**
+把音乐播放器与音量控制程序集成到一个标准的界面里是一种看起来很聪明的做法,这样就不用到处找声音相关的各种程序。人们不禁要问,为什么其它操作系统没有效仿这种做法!
-随着音乐播放器与音量程序合成小体积的应用程序-即集成,其中一个希望找到与声音相关的蠢事-通过标准接口的灵感。人们不禁要问,为什么其它操作系统没有效仿这种做法!
-
-#### 冗长的 ####
-
-
-尽管它看起来很方便,但是这个小应用当前存在一个问题:相当多的东西集在一起看起来想一个MP3,是否真正的把想要的东西都放在里面了。虽然有用,但是一个无所不再的应用程序清单已经安装了,这让一些不经常适用的人看着很累赘和反感。
-
-
-我将要打赌上面的截图看起来一定很熟悉,你们中的很多人一定阅读过吧!不要害怕,**dconf-editor **就在这里。
+#### 臃肿 ####
+尽管它看起来很方便,但是这个小应用当前存在一个问题:很多播放器都堆在一起,像一个组合音响一样。也许你用得着,但是你安装的所有的媒体播放器都挤在这里,这会让人看着很累赘和反感。
+我将要打赌,当你读到这里时,一定发现上面的截图看起来很熟悉!不要担心,**dconf-editor**可以解决它。
### 从Ubuntu 声音菜单中移除播放器 ###
-
#### 第一部分: 基础知识 ####
-最快速和最简单地从声音菜单中移除播放器的方法就是卸载相关的应用程序。但这是极端的方式,我的意思是指你也许想要保留应用程序,但是不需要它集成。
+最快速和最简单地从声音菜单中移除播放器的方法就是卸载相关的应用程序。但这是极端的方式,我的意思是指你也许想要保留应用程序,但是不需要它集成到菜单里面。
-只删除播放器但是保留我们需要的应用程序,我们用到一个看起来令人惊讶的工具叫“dconf-editor”.
+只删除播放器但是保留我们需要的应用程序,我们用到一个看起来令人惊讶的工具叫“dconf-editor”。
你可能已经安装了,如果没有安装的话,那么你从Ubuntu软件中心找出。
-
- [在Ubuntu中点击安装Dconf-Editor][1]
-一旦安装完毕,找到Unity Dash并打开。打开的时候不要惊慌;你不会再回到2002年了,它确实是这样子的。
-
+一旦安装完毕,找到Unity Dash并打开。打开的时候不要惊慌;你没有到2002年,它确实是这种古老的样子。
使用右侧菜单栏,你需要从导航到 com > canonical > indicator > sound.下面的面板将会出现。
+
![](http://www.omgubuntu.co.uk/wp-content/uploads/2014/11/dconf-editor.jpg)
-双击靠近interested-media-players的比括号并删除你希望从声音菜单里移除掉的播放器,但需要保留在方括号中,且不要删除任何你想保留逗号或者撇号。
-
+双击“interested-media-players”旁的闭括号,并删除你希望从声音菜单里移除掉的播放器,但需要保留方括号中,且不要删除任何需要保留的逗号或者单引号。
举个例子,我移除掉这些
@@ -55,9 +46,9 @@
#### 第二部分:黑名单 ####
-等等!还不能关闭dconf-editor。尽管上面的步骤看起来把事情处理得干净利落,但是一些播放器在打开时会立即重新加载到声音菜单。为了避免重复这个过程,将它们添加到**媒体播放器黑名单**中。
+等等!还不能关闭dconf-editor。尽管上面的步骤看起来把事情处理得干净利落,但是一些播放器在打开时会立即重新加载到声音菜单。为了避免重复这个过程,将它们添加到**blacklisted-media-player**中。
-记得每个在撇括号里的播放器都用逗号分隔多个条目。他们也必须在方括号内,所以在退出之前请务必仔细检查。
+记得每个在括号里的播放器都用逗号分隔多个条目。他们也必须在方括号内,所以在退出之前请务必仔细检查。
最终结果如下:
@@ -69,7 +60,7 @@ via: http://www.omgubuntu.co.uk/2014/11/remove-players-ubuntu-sound-menu
作者:[Joey-Elijah Sneddon][a]
译者:[disylee](https://github.com/译者ID)
-校对:[校对者ID](https://github.com/校对者ID)
+校对:[wxy](https://github.com/wxy)
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
diff --git a/translated/talk/The history of Android/05 - The history of Android.md b/published/The history of Android/05 - The history of Android.md
similarity index 83%
rename from translated/talk/The history of Android/05 - The history of Android.md
rename to published/The history of Android/05 - The history of Android.md
index 42db62c193..0017ee0301 100644
--- a/translated/talk/The history of Android/05 - The history of Android.md
+++ b/published/The history of Android/05 - The history of Android.md
@@ -1,68 +1,68 @@
-The history of Android
+安卓编年史(5)
================================================================================
![闹钟主屏幕,设置一个闹钟,计算器,以及计算器高级功能。](http://cdn.arstechnica.net/wp-content/uploads/2013/12/calclockonpresszx.png)
-闹钟主屏幕,设置一个闹钟,计算器,以及计算器高级功能。
-Ron Amadeo供图
-安卓0.9第一次给我们展现了闹钟和计算器应用程序。闹钟应用的特征是有个扁平的模拟时钟,下方是一排设置的闹钟的滚动列表。不同于其它种类的开关,闹钟使用一个复选框来设置。闹钟可以设置为每周特定几天重复,以及它还有一整个列表的可选的,独特的闹钟铃声。
+*闹钟主屏幕,设置一个闹钟,计算器,以及计算器高级功能* [Ron Amadeo供图]
+
+安卓0.9第一次给我们展现了闹钟和计算器应用程序。闹钟应用的特征是有个扁平的模拟时钟,下方是一排设置的闹钟的滚动列表。不同于其它种类的开关,闹钟使用一个复选框来设置。闹钟可以设置为每周特定几天重复,以及它还有一整个列表的可选的、独特的闹钟铃声。
计算器是一个全黑色的应用,带有有光泽的圆形按钮。通过菜单,可以打开带有高级功能的附加面板。再次强调,一致性不是谷歌的强项所在。按键中的Pi键按下的高亮是红色的——在安卓0.9的其它地方,按键按下的高亮通常是橙色的。实际上,计算器中用到的所有东西是仅用于计算器的百分百定制设计。
![打开菜单的谷歌地图和新路线界面。](http://cdn.arstechnica.net/wp-content/uploads/2013/12/mps092.png)
-打开菜单的谷歌地图和新路线界面。
-Ron Amadeo供图
+
+*打开菜单的谷歌地图和新路线界面* [Ron Amadeo供图]
谷歌地图在安卓0.9中真正能够运行——客户端能够连接到谷歌地图服务器并下载地图块。(给予我们地图图像——要记住谷歌地图是个基于云的应用。连最老旧的版本也会下载更为现代的地图块,所以忽略实际的地图块的样子吧。)地图的菜单获得了和浏览器菜单相同的全灰设计待遇,缩放控件也和浏览器的相同。最重要的“我的位置”按钮最终来到了安卓0.9,这意味着该版本的地图支持GPS定位。
路线界面得到了改进。奇怪的聊天气泡附加不对齐的按钮已经被去除,换为更具交互性的书签图标,切换地点按钮移动到了左边,“go”按钮的现在被标记为“获取路线(Route)”。
![谷歌地图图层选择,搜索历史,新加入的街景视图。](http://cdn.arstechnica.net/wp-content/uploads/2013/12/maps3.png)
-谷歌地图图层选择,搜索历史,新加入的街景视图。
-Ron Amadeo供图
+
+*谷歌地图图层选择,搜索历史,新加入的街景视图* [Ron Amadeo供图]
“图层(Layers)”被重命名为“地图模式(Map Mode)”并且变成一个单选列表。一次只能选择一个地图类型——举个例子,你在卫星地图视图下不能查看交通状况。埋藏在菜单中的还有被匆忙放到一起的搜索记录界面。搜索历史看起来只是个概念验证,带着巨大的,模糊的搜索图标填充的搜索项被放置于半透明的背景之上。
街景曾经是个单独的应用(尽管它从没提供给公众),但在0.9中它被作为一个地图模式内置于谷歌地图之中。你可以拖拽小Pegman(街景小人)到地图上,它会显示一个弹出气泡来展示街景的快照。点击快照会启动那个位置的街景。这时,街景除了可滚动的360度影像之外不会显示任何东西——在显示界面上根本就没有用户界面(UI)。
![我们第一次见到谷歌地图搜索界面。这些截图展示了搜索栏,搜索结果列表,显示在地图上的搜索结果,以及一个商业页面。 ](http://cdn.arstechnica.net/wp-content/uploads/2013/12/manystarbucks.png)
-我们第一次见到谷歌地图搜索界面。这些截图展示了搜索栏,搜索结果列表,显示在地图上的搜索结果,以及一个商业页面。
-Ron Amadeo供图
+
+*我们第一次见到谷歌地图搜索界面。这些截图展示了搜索栏,搜索结果列表,显示在地图上的搜索结果,以及一个商业页面* [Ron Amadeo供图]
安卓0.9同样第一次给我们展示了信息应用,称为“信息”(Messaging)。就像一些早期的安卓设计,信息并不确定它应该是一个暗色系应用还是亮色系应用。第一眼可以看到的屏幕是信息列表,一个极力避免空白的质朴黑色界面,看起来像是建立在设置界面的设计之上。但点击“新信息”或已存在的会话后,你会被带到一个白色以及蓝色的文本信息的滚动列表这里。这两个相连的界面真是没法再更不一样一点了。
![信息应用的会话窗口,附件窗口,会话列表,以及设置。](http://cdn.arstechnica.net/wp-content/uploads/2014/03/sms09.png)
-信息应用的会话窗口,附件窗口,会话列表,以及设置。
-Ron Amadeo供图
+
+*信息应用的会话窗口,附件窗口,会话列表,以及设置* [Ron Amadeo供图]
信息支持一定范围的附件:你可以附上图片,声音,或者一个幻灯片到你的信息之中。图片和声音可以实时录制或是从手机存储中拉取。另一个奇怪的UI选择是对于附件菜单中的每一项,安卓基本都已经有现成的图标可用,但信息却全部使用了另外定制的设计。
信息是最先带有自己设置界面的应用之一。用户可以请求已读以及送达报告以及设置下载偏好。
![幻灯片制作器。右边图片显示了菜单选项。](http://cdn.arstechnica.net/wp-content/uploads/2013/12/slideshow.png)
-幻灯片制作器。右边图片显示了菜单选项。
-Ron Amadeo供图
-附件选项中的“幻灯片”选项实际上是以一个全功能的幻灯片制作器的形式到来的。你可以添加图片,选择幻灯顺序,添加音乐,修改每张幻灯片的显示时间,以及添加文字。这已经复杂到足够给它一个自己的应用图标了,但令人惊奇的是它被隐藏在信息应用的菜单之中。在纵向模式下这是为数不多的完全无用的安卓应用之一——唯一的看图片方式以及控制是在横向显示之中。奇怪的是,纵向模式它仍然能够旋转,但显示输出变得一团糟。
+*幻灯片制作器。右边图片显示了菜单选项* [Ron Amadeo供图]
+
+附件选项中的“幻灯片”选项实际上是以一个全功能的幻灯片制作器的形式到来的。你可以添加图片,选择幻灯顺序,添加音乐,修改每张幻灯片的显示时间,以及添加文字。这已经复杂到足够给它一个自己的应用图标了,但令人惊奇的是它被隐藏在信息应用的菜单之中。在纵向模式下这是为数不多的完全无法使用的安卓应用之一——唯一的看图片方式以及控制是在横向显示之中。奇怪的是,纵向模式它仍然能够旋转,但显示输出变得一团糟。
![音乐播放器的主导航页面,歌曲列表,专辑列表,以及“正在播放”界面。](http://cdn.arstechnica.net/wp-content/uploads/2013/12/music09.png)
-音乐播放器的主导航页面,歌曲列表,专辑列表,以及“正在播放”界面。
-Ron Amadeo供图
+
+*音乐播放器的主导航页面,歌曲列表,专辑列表,以及“正在播放”界面* [Ron Amadeo供图]
安卓0.9第一次将音乐应用带进了安卓。首屏基本上只是几个将你带到各个功能视图的巨大的,矮胖的导航按钮。在应用底部是一个“正在播放”栏,仅仅包含了音轨名,艺术家,以及一个播放/暂停按钮。歌曲列表仅仅有个最简的无修饰界面,仅仅显示了歌曲名,艺术家,专辑以及时长。艺术家专辑是这个应用中唯一有希望看到色彩的地方。它在专辑视图里显示为一个小快照,在正在播放界面显示为巨大的,四分之一屏的图片。
-正如安卓在这个时期的系统绝大多数部分,音乐应用的界面可能没什么好多看几眼的,但功能已经基本齐全。正在播放界面有一个让你拖动歌曲的播放列表按钮,随机播放,重复播放,搜索,以及选择背景声音按钮。
+正如安卓在这个时期的系统绝大多数部分,音乐应用的界面可能没什么值得看的,但功能已经基本齐全。正在播放界面有一个让你拖动歌曲的播放列表按钮,随机播放,重复播放,搜索,以及选择背景声音按钮。
![“相册”的所有相册视图,单个相册视图,以及单张图片视图。](http://cdn.arstechnica.net/wp-content/uploads/2013/12/pictures09.png)
-“相册”的所有相册视图,单个相册视图,以及单张图片视图。
-Ron Amadeo供图
+
+*“相册”的所有相册视图,单个相册视图,以及单张图片视图* [Ron Amadeo供图]
相册被简单地称为“图片”。初始视图显示你的所有相册。两个默认的相册是“相机”和巨大的合集相册,叫做“全部图片”。每个相册的快照由2x2的图片组成,每张图片有个白色的粗边框。
单个相册视图的样子大概是你所希望的:一个可滚动的图片方阵。你不能在单个图片大小的范围内向左右滑动来移动图片,而是应该轻点图片来移动图片。相册同样没有双指捏合缩放,你只能使用按钮来缩放图片。
![图片编缉!这些截图显示了一个打开的菜单,“更多”菜单,截取,以及设置。](http://cdn.arstechnica.net/wp-content/uploads/2013/12/pics209.png)
-图片编缉!这些截图显示了一个打开的菜单,“更多”菜单,截取,以及设置。
-Ron Amadeo供图
+
+*图片编缉!这些截图显示了一个打开的菜单,“更多”菜单,截取,以及设置* [Ron Amadeo供图]
“图片”看起来十分简单,直到你点击菜单按钮并突然看到无数的选项。图片可以截取,旋转,删除,或设置壁纸或联系人图标。就像浏览器一样,所有的这一切通过一个笨拙的二级菜单系统完成。但是,我们为何又将看起来完全不同的菜单练联系到一起?
@@ -81,7 +81,7 @@ Ron Amadeo供图
via: http://arstechnica.com/gadgets/2014/06/building-android-a-40000-word-history-of-googles-mobile-os/5/
-译者:[alim0x](https://github.com/alim0x) 校对:[校对者ID](https://github.com/校对者ID)
+译者:[alim0x](https://github.com/alim0x) 校对:[wxy](https://github.com/wxy)
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
diff --git a/sources/news/20141204 After an 18 Month Gap, Opera for Linux Returns With New Stable Release.md b/sources/news/20141204 After an 18 Month Gap, Opera for Linux Returns With New Stable Release.md
deleted file mode 100644
index 3050a8d878..0000000000
--- a/sources/news/20141204 After an 18 Month Gap, Opera for Linux Returns With New Stable Release.md
+++ /dev/null
@@ -1,64 +0,0 @@
-After an 18 Month Gap, Opera for Linux Returns With New Stable Release
-================================================================================
-**The first stable release of Opera for Linux in more than 18 months is now available for download.**
-
-![Hello again, Opera!](http://www.omgubuntu.co.uk/wp-content/uploads/2014/06/iopera.jpg)
-
-Hello again, Opera!
-
-Opera for Computers for Linux 26 (no really, that’s its name) features a complete top-to-bottom overhaul, new features, and better performance thanks to its Aura and Blink underpinnings (yes, it’s no longer based on the proprietary Presto web engine).
-
-#### Features ####
-
-The browser [wiggled its toes in tux-friendly waters back in June with the launch of a developer preview][1], but if you last tried Opera when it looked like this, you’ll want to grab some smelling salts: things have changed.
-
-注:youtube 视频,发布时可换成链接地址
-
-
-Alongside an impressive new look and blazing fast, standards-compliant rendering engine come many new and improved features.
-
-- **Discover** — Shows articles from around the web in a range of categories
-- **Speed Dial** — Supports interactive widgets, folders, and themes
-- **Tab Peek** — Preview the content of an open tab without switching back to it
-- **Opera Turbo** — Data-saving mode ideal for patchy connections
-- **Rich bookmarking** — including new sharing functionality
-- **Add-ons** — compatible with Chrome extensions, too
-- **Support for HiDPI displays on Linux**
-
-### Download Opera for Linux 26 ###
-
-Opera say those running Opera 12.6 on a 64-bit version of Ubuntu still supported by Canonical will automatically receive this new update through the Ubuntu Software Center.
-
-But in all honesty I’m not sure anyone is in that boat! So, helpfully, a Debian installer can be downloaded from the Opera website. This will also add the Opera repository to your Software Sources to enable you to receive future updates in a timely fashion.
-
-- [Download Opera for Computers for Linux 26][2]
-
-Feel free to kit your new browser out with our nifty Opera Add-On, too:
-
-- [Install OMG! Ubuntu! Opera Extension][3]
-
-#### Important Notice about Linux Support ####
-
-**Opera for Linux is 64-bit only**. The company say this decision was made based on ‘what most Linux desktop users have installed’. While annoying it is part of a larger overall trend away from 32-bit software, with Opera for Mac also being 64-bit exclusive, too.
-
-In another case of “spending limited resources wisely”, this release is only being officially supported on Ubuntu (and ‘buntu-based derivatives, including Linux Mint).
-
-Users on other distributions, from Arch to openSUSE, can still install Opera for Linux but will need to [use a (fairly simple) workaround][4] or hunt down an unofficial repository.
-
-**If you give it a spin let us know what you make of it in the comments below.**
-
---------------------------------------------------------------------------------
-
-via: http://www.omgubuntu.co.uk/2014/12/new-opera-for-linux-goes-stable-download-now
-
-作者:[Joey-Elijah Sneddon][a]
-译者:[译者ID](https://github.com/译者ID)
-校对:[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
-
-[a]:https://plus.google.com/117485690627814051450/?rel=author
-[1]:http://www.omgubuntu.co.uk/2014/06/opera-linux-chromium-download-released
-[2]:http://opera.com/computer/linux
-[3]:https://addons.opera.com/en/extensions/details/omg-ubuntu-for-opera/?display=en
-[4]:https://gist.github.com/ruario/99522c94838d0680633c#file-manual-install-of-opera-md
\ No newline at end of file
diff --git a/sources/talk/The history of Android/10 - The history of Android.md b/sources/talk/The history of Android/10 - The history of Android.md
deleted file mode 100644
index f01a0a0f7f..0000000000
--- a/sources/talk/The history of Android/10 - The history of Android.md
+++ /dev/null
@@ -1,88 +0,0 @@
-The history of Android
-================================================================================
-
-注:youtube视频地址
-
-
-### Android 2.0, Éclair—blowing up the GPS industry ###
-
-Forty-one days—that was how much time passed between Android 1.6 and 2.0. The first big version number bump for Android launched in October 2009 [on the Motorola Droid][1], the first "second generation" Android device. The Droid offered huge hardware upgrades over the G1, starting with the massive (at the time) 3.7 inch, 854×480 LCD. It brought a lot more power, too: a (still single-core) 600Mhz TI OMAP Cortex A8 with 256MB of RAM.
-
-![The Motorola Droid stares into your soul.](http://cdn.arstechnica.net/wp-content/uploads/2014/03/2181.jpg)
-The Motorola Droid stares into your soul.
-
-The most important part of the Droid, though, was the large advertising campaign around it. The Droid was the flagship device for Verizon Wireless in the US, and with that title came a ton of ad money from America's biggest carrier. Verizon licensed the word "droid" from Lucasfilm and started up the ["Droid Does" campaign][2]—a shouty, explosion-filled set of commercials that positioned the device (and by extension, Android) as the violent, ass-kicking alternative to the iPhone. The press frequently declared the T-Mobile G1 as trying to be an “iPhone Killer," but the Droid came out and owned it.
-
-Like the G1, the Droid had a hardware keyboard that slid out from the side of the phone. The trackball was gone, but some kind of d-pad was still mandatory, so Motorola placed a five-way d-pad on the right side of the keyboard. On the front, the Droid switched from hardware buttons to capacitive touch buttons, which were just paint on the glass touchscreen. Android 2.0 also finally allowed devices to do away with the “Call" and “End" buttons. So together with the demotion of the d-pad to the keyboard tray, the front buttons could all fit in a nice, neat strip. The result of all this streamlining was the best-looking Android device yet. The T-Mobile G1 looked like a Fisher-Price toy, but the Motorola Droid looked like an industrial tool that you could cut someone with.
-
-![The lock and home screens from 2.0 and 1.6.](http://cdn.arstechnica.net/wp-content/uploads/2014/01/intro202.png)
-The lock and home screens from 2.0 and 1.6.
-Photo by Ron Amadeo
-
-Some of Verizon's grungy ad campaign leaked over to the software, where the default wallpaper was changed from a calm, watery vista to a picture of dirty concrete. The boot animation used a pulsing, red, Hal 9000 eyeball and the default notification tone shouted "[DRRRRROOOOIIIIDDDD][3]" every time you received an e-mail. Éclair was Android’s angsty teenager phase.
-
-One of the first things Android 2.0 presented to the user was a new lock screen. Slide-to-unlock was patented by Apple, so Google went with a rotary-phone-inspired arc unlock gesture. Putting your finger on the lock icon and sliding right would unlock the device, and sliding left from the volume icon would silence the phone. A thumb naturally moves in an arc, so this felt like an even more natural gesture than sliding in a straight line.
-
-The default homescreen layout scrapped the redundant analog clock widget and introduced what is now an Android staple: a search bar at the top of the home screen. SMS Messaging and the Android Market were also given top billing in the new layout. The app drawer tab was given a sharp redesign, too.
-
-![The app drawers and pictures of the “Add to Home" menus.](http://cdn.arstechnica.net/wp-content/uploads/2014/01/icons.png)
-The app drawers and pictures of the “Add to Home" menus.
-Photo by Ron Amadeo
-
-Android was developed at such a breakneck pace in the early days that the Android Team could never really plan for future devices when making interface art. The Motorola Droid—with its 854×480 LCD—was a huge bump up in resolution over the 320×480 G1-era devices. Nearly everything needed to be redrawn. Starting from scratch with interface art would pretty much be the main theme of Android 2.0.
-
-Google took this opportunity to redesign almost every icon in Android, going from a cartoony look with an isometric perspective to straight-on icons done in a more serious style. The only set of icons that weren't redrawn were the status bar icons, which now look very out of place compared to the rest of the OS. These icons would hang around from Android 0.9 until 2.3.
-
-There were a few changes to the app lineup as well. Camcorder was merged into the camera, the IM app was killed, and two new Google-made apps were added: Car Home, a launcher with big buttons designed for use while driving, and Corporate Calendar, which is identical to the regular calendar except it supports Exchange instead of Google Calendar. Weirdly, Google also included two third-party apps out of the box: Facebook and Verizon's Visual VM app. (Neither works today.) The second set of pictures displays the “Add to Home screen" menu, and it received all new art, too.
-
-![A Places page, showing the “Navigate" option, the Navigation disclaimer, the actual Navigation screen, and the traffic info screen.](http://cdn.arstechnica.net/wp-content/uploads/2014/01/nav2.png)
-A Places page, showing the “Navigate" option, the Navigation disclaimer, the actual Navigation screen, and the traffic info screen.
-Photo by Ron Amadeo
-
-Beyond a redesign, the clear headline feature of Android 2.0 was Google Maps Navigation. Google updated Maps to allow for free turn-by-turn navigation, complete with a point of interest search and text to speech, which could read the names of streets aloud just like a standalone GPS unit. Turning GPS navigation from a separate product into a free smartphone feature pretty much [destroyed][4] the standalone GPS market overnight. TomTom’s stock dropped almost 40 percent during the week of Android 2.0’s launch.
-
-But navigation was pretty hard to get to at first. You had to open the search box, type in a place or address, and tap on the search result. Next, after tapping on the "Navigate" button, Google showed a warning stating that Navigation was in beta and should not be trusted. After tapping on "accept," you could jump in a car, and a harsh-sounding robot voice would guide you to your destination. Hidden behind the menu button was an option to check out the traffic and accidents for the entire route. This design of Navigation hung around forever. Even when the main Google Maps interface was updated in Android 4.0, the Android 2.0 stylings in the Navigation section hung around until almost Android 4.3.
-
-Maps would also show a route overview, which contained traffic data for your route. At first it was just licensed by the usual traffic data provider, but later, Google would use information from Android and iOS phones running Google Maps to [crowd source traffic data][5]. It was the first step in Google's dominance of the mobile map game. After all, real-time traffic monitoring is really just a matter of how many points of data you have. Today, with hundreds of millions of Google Maps users across iOS and Android, Google has become the best provider of traffic data in the world.
-
-With Maps Navigation, Android finally found its killer app. Google was offering something no one else could. There was finally an answer to the "Why should I buy this over an iPhone?" question. Google Maps didn't require PC-based updating like many GPS units did, either. It was always up-to-date thanks to the cloud, and all of those updates were free. The only downside was that you needed an Internet connection to use Google Maps.
-
-As was greatly publicized during the [Apple Maps fiasco][6], accurate maps have become one of the most important features of a smartphone, even if no one really appreciates them when they work. Mapping the world is really only solvable with tons of person power, and today, Google’s “Geo" division is the largest in the company with more than [7,000 employees][7]. For most of these people, their job is to literally drive down every road in the world with the company’s camera-filled Street View cars. After eight years of data collection, Google has more than [five million miles][8] of 360-degree Street View imagery, and Google Maps is one of the biggest, most untouchable pillars of the company.
-
-![The Car Home screen, and, because we have room, a horizontal version of Navigation.](http://cdn.arstechnica.net/wp-content/uploads/2014/01/carhome1.png)
-The Car Home screen, and, because we have room, a horizontal version of Navigation.
-Photo by Ron Amadeo
-
-Along with Google Maps Navigation came "Car Home," a large-buttoned home screen designed to help you use your phone while driving. It wasn't customizable, and each button was just a shortcut to a standard app. The Motorola Droid and its official [car dock accessory][9] had special magnets that would automatically trigger Car Home. While docked, pressing the hardware home button on the Droid would open Car Home instead of the normal home screen, and an on-screen home button led to the normal home screen.
-
-Car Home, while useful, didn’t last long—it was cut in Android 3.0 and never came back. GPS systems are almost entirely used in cars while driving, but encouraging users to do so with options like “search," which would bring up a keyboard, is something that Google’s lawyers probably weren’t very fond of. With [Apple’s CarPlay][10] and Google’s [Open Automotive Alliance][11], car computers are seeing a resurgence these days. This time, though, there is more of a focus on safety, and government organizations like the National Highway Traffic Safety Administration are on board to help out.
-
-----------
-
-![Ron Amadeo](http://cdn.arstechnica.net/wp-content//uploads/authors/ron-amadeo-sq.jpg)
-
-[Ron Amadeo][a] / Ron is the Reviews Editor at Ars Technica, where he specializes in Android OS and Google products. He is always on the hunt for a new gadget and loves to rip things apart to see how they work.
-
-[@RonAmadeo][t]
-
---------------------------------------------------------------------------------
-
-via: http://arstechnica.com/gadgets/2014/06/building-android-a-40000-word-history-of-googles-mobile-os/10/
-
-译者:[译者ID](https://github.com/译者ID) 校对:[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:http://arstechnica.com/gadgets/2009/12/review-of-the-motorola-droid/
-[2]:http://www.youtube.com/watch?v=e52TSXwj774
-[3]:http://www.youtube.com/watch?v=UBL47tHrvMA
-[4]:http://techcrunch.com/2009/10/28/googles-new-mobile-app-cuts-gps-nav-companies-at-the-knees/
-[5]:http://googleblog.blogspot.com/2009/08/bright-side-of-sitting-in-traffic.html
-[6]:http://arstechnica.com/apple/2012/09/apple-ceo-tim-cook-apologizes-for-ios-6-maps-promises-improvements/
-[7]:http://www.businessinsider.com/apple-has-7000-fewer-people-working-on-maps-than-google-2012-9
-[8]:https://developers.google.com/events/io/sessions/383278298
-[9]:http://www.amazon.com/Motorola-Generation-Vehicle-Charger-Packaging/dp/B002Y3BYQA
-[10]:http://arstechnica.com/apple/2014/03/ios-in-the-car-becomes-carplay-coming-to-select-dashboards-this-year/
-[11]:http://arstechnica.com/information-technology/2014/01/open-automotive-alliance-aims-to-bring-android-inside-the-car/
-[a]:http://arstechnica.com/author/ronamadeo
-[t]:https://twitter.com/RonAmadeo
\ No newline at end of file
diff --git a/sources/tech/20141124 Important 10 Linux ps command Practical Examples.md b/sources/tech/20141124 Important 10 Linux ps command Practical Examples.md
deleted file mode 100644
index 4c6872101f..0000000000
--- a/sources/tech/20141124 Important 10 Linux ps command Practical Examples.md
+++ /dev/null
@@ -1,189 +0,0 @@
-johnhoow translating...
-Important 10 Linux ps command Practical Examples
-================================================================================
-As an Operating System which inspired from Unix, Linux has a built-in tool to capture current processes on the system. This tool is available in command line interface.
-
-### What is PS Command ###
-
-From its manual page, PS gives a snapshots of the current process. It will “capture” the system condition at a single time. If you want to have a repetitive updates in a real time, we can use top command.
-
-PS support three (3) type of usage syntax style.
-
-1. UNIX style, which may be grouped and **must** be preceded by a dash
-2. BSD style, which may be grouped and **must not be** used with a dash
-3. GNU long options, which are preceded by two dash
-
-We can mix those style, but conflicts can appear. In this article, will use UNIX style. Here’s are some examples of PS command in a daily use.
-
-### 1. Run ps without any options ###
-
-This is a very basic **ps** usage. Just type ps on your console to see its result.
-
-![ps with no options](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_no_options.png)
-
-By default, it will show us 4 columns of information.
-
-- PID is a Process ID of the running command (CMD)
-- TTY is a place where the running command runs
-- TIME tell about how much time is used by CPU while running the command
-- CMD is a command that run as current process
-
-This information is displayed in unsorted result.
-
-### 2. Show all current processes ###
-
-To do this, we can use **-a** options. As we can guess, **-a is stand for “all”**. While x will show all process even the current process is not associated with any TTY (terminal)
-
- $ ps -ax
-
-This result might be long result. To make it more easier to read, combine it with less command.
-
- $ ps -ax | less
-
-![ps all information](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_ax.png)
-
-### 3. Filter processes by its user ###
-
-For some situation we may want to filter processes by user. To do this, we can use **-u** option. Let say we want to see what processes which run by user pungki. So the command will be like below
-
- $ ps -u pungki
-
-![filter by user](http://blog.linoxide.com/wp-content/uploads/2014/10/ps__u.png)
-
-### 4. Filter processes by CPU or memory usage ###
-
-Another thing that you might want to see is filter the result by CPU or memory usage. With this, you can grab information about which processes that consume your resource. To do this, we can use **aux options**. Here’s an example of it :
-
- $ ps -aux | less
-
-![show all information](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_aux.png)
-
-Since the result can be in a long list, we can **pipe** less command into ps command.
-By default, the result will be in unsorted form. If we want to sort by particular column, we can add **--sort** option into ps command.
-
-Sort by the highest **CPU utilization** in ascending order
-
- $ ps -aux --sort -pcpu | less
-
-![sort by cpu usage](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_aux_sort_cpu.png)
-
-Sort by the highest **Memory utilization** in ascending order
-
- $ ps -aux --sort -pmem | less
-
-![sort by memory usage](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_aux_sort_mem.png)
-
-Or we can combine itu a single command and display only the top ten of the result :
-
- $ ps -aux --sort -pcpu,+pmem | head -n 10
-
-### 5. Filter processes by its name or process ID ###
-
-To to this, we can use **-C option** followed by the keyword. Let say, we want to show processes named getty. We can type :
-
- $ ps -C getty
-
-![filter by its name or process ID](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_C.png)
-
-If we want to show more detail about the result, we can add -f option to show it on full format listing. The above command will looks like below :
-
- $ ps -f -C getty
-
-![filter by its name or process ID](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_C_f.png)
-
-### 6. Filter processes by thread of process ###
-
-If we need to know the thread of a particular process, we can use **-L option** followed by its Process ID (PID). Here’s an example of **-L option** in action :
-
- $ ps -L 1213
-
-![show processes in threaded view](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_L.png)
-
-As we can see, the PID remain the same value, but the LWP which shows numbers of thread show different values.
-
-### 7. Show processes in hierarchy ###
-
-Sometime we want to see the processes in hierarchical form. To do this, we can use **-axjf** options.
-
- $ps -axjf
-
-![show in hierarchy](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_axjf.png)
-
-Or, another command which we can use is pstree.
-
- $ pstree
-
-![show information in hierarchy](http://blog.linoxide.com/wp-content/uploads/2014/10/pstree.png)
-
-### 8. Show security information ###
-
-If we want to see who is currently logged on into your server, we can see it using the ps command. There are some options that we can use to fulfill our needs. Here’s some examples :
-
- $ ps -eo pid,user,args
-
-**Option -e** will show you all processes while **-o option** will control the output. **Pid**, **User and Args** will show you the **Process ID**, **the User who run the application** and **the running application**.
-
-![show security information](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_security_1.png)
-
-The keyword / user-defined format that can be used with **-e option** are **args, cmd, comm, command, fname, ucmd, ucomm, lstart, bsdstart and start**.
-
-### 9. Show every process running as root (real & effecitve ID) in user format ###
-
-System admin may want to see what processes are being run by root and other information related to it. Using ps command, we can do by this simple command :
-
- $ ps -U root -u root u
-
-The **-U parameter** will select by **real user ID (RUID)**. It selects the processes whose real user name or ID is in the userlist list. The real User ID identifies the user who created the process.
-
-While the **-u paramater** will select by effective user ID (EUID)
-
-The last **u** paramater, will display the output in user-oriented format which contains **User, PID, %CPU, %MEM, VSZ, RSS, TTY, STAT, START, TIME and COMMAND** columns.
-
-Here’s the output of the above command.
-
-![show real and effective User ID](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_root_real_effective_ID.png)
-
-### 10. Use PS in a realtime process viewer ###
-
-ps will display a report of what happens in your system. The result will be a static report.
-Let say, we want to filter processes by CPU and Memory usage as on the point 4 above. And we want the report is updated every 1 second. We can do it by **combining ps command with watch command** on Linux.
-
-Here’s the command :
-
- $ watch -n 1 ‘ps -aux --sort -pmem, -pcpu’
-
-![combine ps with watch](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_watch_1.png)
-
-If you feel the report is too long, **we can limit it** by - let say - the top 20 processes. We can add **head** command to do it.
-
- $ watch -n 1 ‘ps -aux --sort -pmem, -pcpu | head 20’
-
-![combine ps with watch](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_watch_2.png)
-
-This live reporter **is not** like top or htop of course. **But the advantage of using ps** to make live report is that you can custom the field. You can choose which field you want to see.
-
-For example, **if you need only the pungki user shown**, then you can change the command to become like this :
-
- $ watch -n 1 ‘ps -aux -U pungki u --sort -pmem, -pcpu | head 20’
-
-![combine ps with watch](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_watch_3.png)
-
-### Conclusion ###
-
-You may use **ps** on your daily usage to monitor about what happens your Linux system. But actually, you can generate various types of report using **ps** command with the use of appropriate paramaters.
-
-**Another ps advantage** is that **ps** are installed by default in any kind of Linux. So you can just start to use it.
-
-Don't forget to see **ps documentation** by typing **man ps** on you Linux console to explore more options.
-
---------------------------------------------------------------------------------
-
-via: http://linoxide.com/how-tos/linux-ps-command-examples/
-
-作者:[Pungki Arianto][a]
-译者:[译者ID](https://github.com/译者ID)
-校对:[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
-
-[a]:http://linoxide.com/author/pungki/
diff --git a/sources/tech/20141217 Centralized Secure Storage (iSCSI)-- 'Initiator Client' Setup on RHEL or CentOS or Fedora -Part III.md b/sources/tech/20141217 Centralized Secure Storage (iSCSI)-- 'Initiator Client' Setup on RHEL or CentOS or Fedora -Part III.md
new file mode 100644
index 0000000000..accd6907f9
--- /dev/null
+++ b/sources/tech/20141217 Centralized Secure Storage (iSCSI)-- 'Initiator Client' Setup on RHEL or CentOS or Fedora -Part III.md
@@ -0,0 +1,197 @@
+Centralized Secure Storage (iSCSI) – “Initiator Client” Setup on RHEL/CentOS/Fedora – Part III
+================================================================================
+**iSCSI** Initiator are the clients which use to authenticated with iSCSI target servers to access the LUNs shared from target server. We can deploy any kind of Operating systems in those locally mounted Disks, just a single package need to be install to get authenticate with target server.
+
+![Client Initiator Setup](http://www.tecmint.com/wp-content/uploads/2014/07/Client-Initiator-Setup.jpg)
+
+Client Initiator Setup
+
+#### Features ####
+
+- Can handle any kind of file systems in locally mounted Disk.
+- No need of restating the system after partition using fdisk.
+
+#### Requirements ####
+
+- [Create Centralized Secure Storage using iSCSI Target – Part 1][1]
+- [Create LUN’s using LVM in Target Server – Part 2][2]
+
+#### My Client Setup for Initiator ####
+
+- Operating System – CentOS release 6.5 (Final)
+- iSCSI Target IP – 192.168.0.50
+- Ports Used : TCP 3260
+
+**Warning**: Never stop the service while LUNs Mounted in Client machines (Initiator).
+
+### Initiator Client Setup ###
+
+**1.** In Client side, we need to install the package ‘**iSCSI-initiator-utils**‘, search for the package using following command.
+
+ # yum search iscsi
+
+**Sample Output**
+
+ ============================= N/S Matched: iscsi ================================
+ iscsi-initiator-utils.x86_64 : iSCSI daemon and utility programs
+ iscsi-initiator-utils-devel.x86_64 : Development files for iscsi-initiator-utils
+
+**2.** Once you locate the package, just install the initiator package using yum command as shown.
+
+ # yum install iscsi-initiator-utils.x86_64
+
+**3.** After installing the package, we need to discover the share from **Target server**. The client side commands little hard to remember, so we can use man page to get the list of commands which required to run.
+
+ # man iscsiadm
+
+![man iscsiadm](http://www.tecmint.com/wp-content/uploads/2014/07/man-iscsiadm.jpg)
+
+man iscsiadm
+
+**4.** Press **SHIFT+G** to Navigate to the Bottom of the man page and scroll little up to get the login example commands. We need to replace our **Target servers IP** address in below command Discover the Target.
+
+ # iscsiadm --mode discoverydb --type sendtargets --portal 192.168.0.200 --discover
+
+**5.** Here we got the iSCSI (iqn) qualified name from above command execution.
+
+ 192.168.0.200:3260,1 iqn.2014-07.com.tecmint:tgt1
+
+![Discover Target](http://www.tecmint.com/wp-content/uploads/2014/07/Discover-Target.jpg)
+
+Discover Target
+
+**6.** To log-in use the below command to attach the LUN to our local System, this will authenticate with target server and allow us to log-in into LUN.
+
+ # iscsiadm --mode node --targetname iqn.2014-07.com.tecmint:tgt1 --portal 192.168.0.200:3260 --login
+
+![Login To Target Server](http://www.tecmint.com/wp-content/uploads/2014/07/Login-To-Target-Server.jpg)
+
+Login To Target Server
+
+**Note**: Use the login command and replace login with logout at end of command.
+
+ # iscsiadm --mode node --targetname iqn.2014-07.com.tecmint:tgt1 --portal 192.168.0.200:3260 --logout
+
+![Logout from Target Server](http://www.tecmint.com/wp-content/uploads/2014/07/Logout-from-Target-Server.jpg)
+
+Logout from Target Server
+
+**7.** After login to the LUN, list the records of Node using.
+
+ # iscsiadm --mode node
+
+![List Node](http://www.tecmint.com/wp-content/uploads/2014/07/List-Node.jpg)
+
+List Node
+
+**8.** Display all data of a particular node.
+
+ # iscsiadm --mode node --targetname iqn.2014-07.com.tecmint:tgt1 --portal 192.168.0.200:3260
+
+**Sample Output**
+
+ # BEGIN RECORD 6.2.0-873.10.el6
+ node.name = iqn.2014-07.com.tecmint:tgt1
+ node.tpgt = 1
+ node.startup = automatic
+ node.leading_login = No
+ iface.hwaddress =
+ iface.ipaddress =
+ iface.iscsi_ifacename = default
+ iface.net_ifacename =
+ iface.transport_name = tcp
+ iface.initiatorname =
+ iface.bootproto =
+ iface.subnet_mask =
+ iface.gateway =
+ iface.ipv6_autocfg =
+ iface.linklocal_autocfg =
+ ....
+
+**9.** Then list the drive using, fdisk will list every authenticated disks.
+
+ # fdisk -l /dev/sda
+
+![List Disks](http://www.tecmint.com/wp-content/uploads/2014/07/List-Disks.jpg)
+
+List Disks
+
+**10.** Run fdisk to create a new partition.
+
+ # fdisk -cu /dev/sda
+
+![Create New Partition](http://www.tecmint.com/wp-content/uploads/2014/07/Create-New-Partition.jpg)
+
+Create New Partition
+
+**Note**: After Creating a Partition using fdisk, we don’t need to reboot, as we used to do in our local systems, Because this is a remote shared storage mounted locally.
+
+**11.** Format the newly created partition.
+
+ # mkfs.ext4 /dev/sda1
+
+![Format New Partition](http://www.tecmint.com/wp-content/uploads/2014/07/Format-New-Partition.jpg)
+
+Format New Partition
+
+**12.** Create a Directory and mount the formatted partition.
+
+ # mkdir /mnt/iscsi_share
+ # mount /dev/sda1 /mnt/iscsi_share/
+ # ls -l /mnt/iscsi_share/
+
+![Mount New Partition](http://www.tecmint.com/wp-content/uploads/2014/07/Mount-New-Partition.jpg)
+
+Mount New Partition
+
+**13.** List the Mount Points.
+
+ # df -Th
+
+- **-T** – Prints files system types.
+- **-h** – Prints in human readable format eg : Megabyte or Gigabyte.
+
+![List New Partition](http://www.tecmint.com/wp-content/uploads/2014/07/List-New-Partition.jpg)
+
+List New Partition
+
+**14.** If we need to permanently mount the Drive use fstab entry.
+
+ # vim /etc/fstab
+
+**15.**Append the following Entry in fstab.
+
+ /dev/sda1 /mnt/iscsi_share/ ext4 defaults,_netdev 0 0
+
+**Note:** Use _netdev in fstab, as this is a network device.
+
+![Auto Mount Partition](http://www.tecmint.com/wp-content/uploads/2014/07/Auto-Mount-Partition.jpg)
+
+Auto Mount Partition
+
+**16.** Finally check whether our fstab entry have any error.
+
+ # mount -av
+
+- **-a** – all mount point
+- **-v** – Verbose
+
+![Verify fstab Entries](http://www.tecmint.com/wp-content/uploads/2014/07/Verify-fstab-Entries.jpg)
+
+Verify fstab Entries
+
+We have Completed Our client side configuration Successfully. Start to use the drive as we use our local system disk.
+
+--------------------------------------------------------------------------------
+
+via: http://www.tecmint.com/iscsi-initiator-client-setup/
+
+作者:[Babin Lonston][a]
+译者:[译者ID](https://github.com/译者ID)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://www.tecmint.com/author/babinlonston/
+[1]:http://www.tecmint.com/create-centralized-secure-storage-using-iscsi-targetin-linux/
+[2]:http://www.tecmint.com/create-luns-using-lvm-in-iscsi-target/
\ No newline at end of file
diff --git a/sources/tech/20141217 Create Centralized Secure Storage using iSCSI Target on RHEL or CentOS or Fedora Part -I.md b/sources/tech/20141217 Create Centralized Secure Storage using iSCSI Target on RHEL or CentOS or Fedora Part -I.md
new file mode 100644
index 0000000000..ce32d0dc5b
--- /dev/null
+++ b/sources/tech/20141217 Create Centralized Secure Storage using iSCSI Target on RHEL or CentOS or Fedora Part -I.md
@@ -0,0 +1,148 @@
+Create Centralized Secure Storage using iSCSI Target on RHEL/CentOS/Fedora Part -I
+================================================================================
+**iSCSI** is a block level Protocol for sharing **RAW Storage Devices** over TCP/IP Networks, Sharing and accessing Storage over iSCSI, can be used with existing IP and Ethernet networks such as NICs, Switched, Routers etc. iSCSI target is a remote hard disk presented from an remote iSCSI server (or) target.
+
+![Install iSCSI Target in Linux](http://www.tecmint.com/wp-content/uploads/2014/07/Install-iSCSI-Target-in-Linux.jpg)
+Install iSCSI Target in Linux
+
+We don’t need a high resource for stable connectivity and performance in Client side’s. iSCSI Server called as Target, this share’s the storage from server. iSCSI Client’s called as Initiator, this will access the storage which shared from Target Server. There are iSCSI adapter’s available in market for Large Storage services such as SAN Storage’s.
+
+**Why we need a iSCSI adapter for Large storage Area?**
+
+Ethernet adapters (NIC) are designed to transfer packetized file level data among systems, servers and storage devices like NAS storage’s, they are not capable for transferring block level data over Internet.
+
+### Features of iSCSI Target ###
+
+- Possible to run several iSCSI targets on a single machine.
+- A single machine making multiple iscsi target available on the iSCSI SAN
+- The target is the Storage and makes it available for initiator (Client) over the network
+- These Storage’s are Pooled together to make available to the network is iSCSI LUNs (Logical Unit Number).
+- iSCSI supports multiple connections within the same session
+- iSCSI initiator discover the targets in network then authenticating and login with LUNs, to get the remote storage locally.
+- We can Install any Operating systems in those locally mounted LUNs as what we used to install in our Base systems.
+
+### Why the need of iSCSI? ###
+
+In Virtualization we need storage with high redundancy, stability, iSCSI provides those all in low cost. Creating a SAN Storage in low price while comparing to Fiber Channel SANs, We can use the standard equipment’s for building a SAN using existing hardware such as NIC, Ethernet Switched etc..
+
+Let start to get install and configure the centralized Secure Storage using iSCSI Target. For this guide, I’ve used following setups.
+
+- We need separate 1 systems to Setup the iSCSI Target Server and Initiator (Client).
+- Multiple numbers of Hard disk can be added in large storage environment, But we here using only 1 additional drive except Base installation disk.
+- Here we using only 2 drives, One for Base server installation, Other one for Storage (LUNs) which we going to create in PART-II of this series.
+
+#### Master Server Setup ####
+
+- Operating System – CentOS release 6.5 (Final)
+- iSCSI Target IP – 192.168.0.200
+- Ports Used : TCP 860, 3260
+- Configuration file : /etc/tgt/targets.conf
+
+## Installing iSCSI Target ##
+
+Open terminal and use yum command to search for the package name which need to get install for iscsi target.
+
+ # yum search iscsi
+
+#### Sample Output ####
+
+ ========================== N/S matched: iscsi =======================
+ iscsi-initiator-utils.x86_64 : iSCSI daemon and utility programs
+ iscsi-initiator-utils-devel.x86_64 : Development files for iscsi-initiator-utils
+ lsscsi.x86_64 : List SCSI devices (or hosts) and associated information
+ scsi-target-utils.x86_64 : The SCSI target daemon and utility programs
+
+We got the search result as above, choose the **Target** package and install to play around.
+
+ # yum install scsi-target-utils -y
+
+![Install iSCSI Utils](http://www.tecmint.com/wp-content/uploads/2014/07/Install-iSCSI-in-Linux.jpg)
+Install iSCSI Utils
+
+List the installed package to know the default config, service, and man page location.
+
+ # rpm -ql scsi-target-utils.x86_64
+
+![List All iSCSI Files](http://www.tecmint.com/wp-content/uploads/2014/07/List-All-ISCSI-Files.jpg)
+
+List All iSCSI Files
+
+Let’s start the iSCSI Service, and check the status of Service up and running, iSCSI service named as **tgtd**.
+
+ # /etc/init.d/tgtd start
+ # /etc/init.d/tgtd status
+
+![Start iSCSI Service](http://www.tecmint.com/wp-content/uploads/2014/07/Start-iSCSI-Service.jpg)
+
+Start iSCSI Service
+
+Now we need to configure it to start Automatically while system start-up.
+
+ # chkconfig tgtd on
+
+Next, verify that the run level configured correctly for the tgtd service.
+
+ # chkconfig --list tgtd
+
+![Enable iSCSI on Startup](http://www.tecmint.com/wp-content/uploads/2014/07/Enable-iSCSI-on-Startup.jpg)
+
+Enable iSCSI on Startup
+
+Let’s use **tgtadm** to list what targets and LUNS we currently got configured in our Server.
+
+ # tgtadm --mode target --op show
+
+The **tgtd** installed up and running, but there is no **Output** from the above command because we have not yet defined the LUNs in Target Server. For manual page, Run ‘**man**‘ command.
+
+ # man tgtadm
+
+![iSCSI Man Pages](http://www.tecmint.com/wp-content/uploads/2014/07/iSCSI-Man-Pages.jpg)
+
+iSCSI Man Pages
+
+Finally we need to add iptables rules for iSCSI if there is iptables deployed in your target Server. First, find the Port number of iscsi target using following netstat command, The target always listens on TCP port 3260.
+
+ # netstat -tulnp | grep tgtd
+
+![Find iSCSI Port](http://www.tecmint.com/wp-content/uploads/2014/07/Find-iSCSI-Port.jpg)
+
+Find iSCSI Port
+
+Next add the following rules to allow iptables to Broadcast the iSCSI target discovery.
+
+ # iptables -A INPUT -i eth0 -p tcp --dport 860 -m state --state NEW,ESTABLISHED -j ACCEPT
+ # iptables -A INPUT -i eth0 -p tcp --dport 3260 -m state --state NEW,ESTABLISHED -j ACCEPT
+
+![Open iSCSI Ports](http://www.tecmint.com/wp-content/uploads/2014/07/Open-iSCSI-Ports.jpg)
+
+Open iSCSI Ports
+
+![Add iSCSI Ports to Iptables](http://www.tecmint.com/wp-content/uploads/2014/07/Add-iSCSI-Ports-to-Iptables.jpg)
+
+Add iSCSI Ports to Iptables
+
+**Note**: Rule may vary according to your **Default CHAIN Policy**. Then save the Iptables and restart the iptables.
+
+ # iptables-save
+ # /etc/init.d/iptables restart
+
+![Restart iptables](http://www.tecmint.com/wp-content/uploads/2014/07/Restart-iptables.jpg)
+
+Restart iptables
+
+Here we have deployed a target server to share LUNs to any initiator which authenticating with target over TCP/IP, This suitable for small to large scale production environments too.
+
+In my next upcoming articles, I will show you how to [Create LUN’s using LVM in Target Server][1] and how to share LUN’s on Client machines, till then stay tuned to TecMint for more such updates and don’t forget to give valuable comments.
+
+--------------------------------------------------------------------------------
+
+via: http://www.tecmint.com/create-centralized-secure-storage-using-iscsi-targetin-linux/
+
+作者:[Babin Lonston][a]
+译者:[译者ID](https://github.com/译者ID)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://www.tecmint.com/author/babinlonston/
+[1]:http://www.tecmint.com/create-luns-using-lvm-in-iscsi-target/
\ No newline at end of file
diff --git a/sources/tech/20141217 How to Create and Setup LUNs using LVM in 'iSCSI Target Server' on RHEL or CentOS or Fedora -Part II.md b/sources/tech/20141217 How to Create and Setup LUNs using LVM in 'iSCSI Target Server' on RHEL or CentOS or Fedora -Part II.md
new file mode 100644
index 0000000000..4a8e42b772
--- /dev/null
+++ b/sources/tech/20141217 How to Create and Setup LUNs using LVM in 'iSCSI Target Server' on RHEL or CentOS or Fedora -Part II.md
@@ -0,0 +1,230 @@
+How to Create and Setup LUNs using LVM in “iSCSI Target Server” on RHEL/CentOS/Fedora – Part II
+================================================================================
+LUN is a Logical Unit Number, which shared from the iSCSI Storage Server. The Physical drive of iSCSI target server shares its drive to initiator over TCP/IP network. A Collection of drives called LUNs to form a large storage as SAN (Storage Area Network). In real environment LUNs are defined in LVM, if so it can be expandable as per space requirements.
+
+![Create LUNS using LVM in Target Server](http://www.tecmint.com/wp-content/uploads/2014/07/Create-LUNS-inLVM.png)
+Create LUNS using LVM in Target Server
+
+### Why LUNS are Used? ###
+
+LUNS used for storage purpose, SAN Storage’s are build with mostly Groups of LUNS to become a pool, LUNs are Chunks of a Physical disk from target server. We can use LUNS as our systems Physical Disk to install Operating systems, LUNS are used in Clusters, Virtual servers, SAN etc. The main purpose of Using LUNS in Virtual servers for OS storage purpose. LUNS performance and reliability will be according to which kind of disk we using while creating a Target storage server.
+
+### Requirements ###
+
+To know about creating a ISCSI Target Server follow the below link.
+
+- [Create Centralized Secure Storage using iSCSI Target – Part I][1]
+
+#### Master Server Setup ####
+
+System information’s and Network setup are same as iSCSI Target Server as shown in Part – I, As we are defining LUNs in same server.
+
+- Operating System – CentOS release 6.5 (Final)
+- iSCSI Target IP – 192.168.0.200
+- Ports Used : TCP 860, 3260
+- Configuration file : /etc/tgt/targets.conf
+
+## Creating LUNs using LVM in iSCSI Target Server ##
+
+First, find out the list of drives using **fdisk -l** command, this will manipulate a long list of information of every partitions on the system.
+
+ # fdisk -l
+
+The above command only gives the drive information’s of base system. To get the storage device information, use the below command to get the list of storage devices.
+
+ # fdisk -l /dev/vda && fdisk -l /dev/sda
+
+![List Storage Drives](http://www.tecmint.com/wp-content/uploads/2014/07/1.jpg)
+
+List Storage Drives
+
+**NOTE**: Here **vda** is virtual machines hard drive as I’m using virtual machine for demonstration, **/dev/sda** is added additionally for storage.
+
+### Step 1: Creating LVM Drive for LUNs ###
+
+We going to use **/dev/sda** drive for creating a LVM.
+
+ # fdisk -l /dev/sda
+
+![List LVM Drive](http://www.tecmint.com/wp-content/uploads/2014/07/2.jpg)
+
+List LVM Drive
+
+Now let’s Partition the drive using fdisk command as shown below.
+
+ # fdisk -cu /dev/sda
+
+- The option ‘**-c**‘ switch off the DOS compatible mode.
+- The option ‘**-u**‘ is used to listing partition tables, give sizes in sectors instead of cylinders.
+
+Choose **n** to create a New Partition.
+
+ Command (m for help): n
+
+Choose **p** to create a Primary partition.
+
+ Command action
+ e extended
+ p primary partition (1-4)
+
+Give a Partition number which we need to create.
+
+ Partition number (1-4): 1
+
+As here, we are going to setup a LVM drive. So, we need to use the default settings to use full size of Drive.
+
+ First sector (2048-37748735, default 2048):
+ Using default value 2048
+ Last sector, +sectors or +size{K,M,G} (2048-37748735, default 37748735):
+ Using default value 37748735
+
+Choose the type of partition, Here we need to setup a LVM so use **8e**. Use **l** option to see the list of type.
+
+ Command (m for help): t
+
+Choose which partition want to change the type.
+
+ Selected partition 1
+ Hex code (type L to list codes): 8e
+ Changed system type of partition 1 to 8e (Linux LVM)
+
+After changing the type, check the changes by print (**p**) option to list the partition table.
+
+ Command (m for help): p
+
+ Disk /dev/sda: 19.3 GB, 19327352832 bytes
+ 255 heads, 63 sectors/track, 2349 cylinders, total 37748736 sectors
+ Units = sectors of 1 * 512 = 512 bytes
+ Sector size (logical/physical): 512 bytes / 512 bytes
+ I/O size (minimum/optimal): 512 bytes / 512 bytes
+ Disk identifier: 0x9fae99c8
+
+ Device Boot Start End Blocks Id System
+ /dev/sda1 2048 37748735 18873344 8e Linux LVM
+
+Write the changes using **w** to exit from fdisk utility, Restart the system to make changes.
+
+For your reference, I’ve attached screen shot below that will give you a clear idea about creating LVM drive.
+
+![Create LVM Partition](http://www.tecmint.com/wp-content/uploads/2014/07/3.jpg)
+
+Create LVM Partition
+
+After system reboot, list the Partition table using the following fdisk command.
+
+ # fdisk -l /dev/sda
+
+![Verify LVM Partition](http://www.tecmint.com/wp-content/uploads/2014/07/4.jpg)
+
+Verify LVM Partition
+
+### Step 2: Creating Logical Volumes for LUNs ###
+
+Now here, we going to create Physical volume using using ‘pvcreate’ command.
+
+ # pvcreate /dev/sda1
+
+Create a Volume group with name of iSCSI to identify the group.
+
+ # vgcreate vg_iscsi /dev/sda1
+
+Here I’m defining 4 Logical Volumes, if so there will be 4 LUNs in our iSCSI Target server.
+
+ # lvcreate -L 4G -n lv_iscsi vg_iscsi
+
+ # lvcreate -L 4G -n lv_iscsi-1 vg_iscsi
+
+ # lvcreate -L 4G -n lv_iscsi-2 vg_iscsi
+
+ # lvcreate -L 4G -n lv_iscsi-3 vg_iscsi
+
+List the Physical volume, Volume group, logical volumes to confirm.
+
+ # pvs && vgs && lvs
+ # lvs
+
+For better understanding of the above command, for your reference I’ve included a screen grab below.
+
+![Creating LVM Logical Volumes](http://www.tecmint.com/wp-content/uploads/2014/07/5.jpg)
+
+Creating LVM Logical Volumes
+
+![Verify LVM Logical Volumes](http://www.tecmint.com/wp-content/uploads/2014/07/6.jpg)
+
+Verify LVM Logical Volumes
+
+### Step 3: Define LUNs in Target Server ###
+
+We have created Logical Volumes and ready to use with LUN, here we to define the LUNs in target configuration, if so only it will be available for client machines (Initiators).
+
+Open and edit Targer configuration file located at ‘/etc/tgt/targets.conf’ with your choice of editor.
+
+ # vim /etc/tgt/targets.conf
+
+Append the following volume definition in target conf file. Save and close the file.
+
+
+ backing-store /dev/vg_iscsi/lv_iscsi
+
+
+ backing-store /dev/vg_iscsi/lv_iscsi-1
+
+
+ backing-store /dev/vg_iscsi/lv_iscsi-2
+
+
+ backing-store /dev/vg_iscsi/lv_iscsi-3
+
+
+Alongside an impressive new look and blazing fast, standards-compliant rendering engine come many new and improved features.
+带来了新的外观和惊人的速度、符合标准的渲染引擎带来很多新的特性。
+
+
+- **发现** — 显示网络上同一类的网站
+- **快速拨号** — 支持交互widget、文件夹和主题
+- **Tab Peek** — 预览opera选项卡的内容而不必切换过去
+- **Opera Turbo** — 对于低速连接的省流量模式
+- **富书签** — 包含新的共享功能
+- **插件** — 也兼容Chrome插件
+- **在Linux上支持HiDPI显示器**
+
+### 下载Linux下的Opera 26 ###
+
+Opera声称那些在Ubuntu下使用64位版本Canonical仍然支持的Opera 12.6会自动通过软件中心收到更新。
+
+但是老实说我不确定所有人都在船上!因此,万幸的是,可以从Opera网站上下载Debian的安装装。也可以添加Opera仓库到你的软件源中来及时地收到更新。
+
+- [下载桌面版Opera 26][2]
+
+也请随意在你的新浏览器上安装我们的Opera插件。
+
+- [安装让人惊讶的Opera插件][3]
+
+#### Linux支持的重要提示 ####
+
+**Linux下的Opera只支持64位的**。公司说这个决定是基于‘用户安装最多的Linux桌面来的’。32位软件使用趋势下降也是一个原因。Mac下的Opera也只有64位。
+
+另一个基于”明智地使用有限资源“,这个版本官方只支持Ubuntu(和Ubuntu的衍生版本,包括Linux Minit)。
+
+其他发行版的用户,从Arch到openSUSE仍然可以安装Opera,但需要[使用简单的临时方案][4]或者搜索非官方仓库。
+
+**有任何新的看法,请在评论区留言。**
+
+--------------------------------------------------------------------------------
+
+via: http://www.omgubuntu.co.uk/2014/12/new-opera-for-linux-goes-stable-download-now
+
+作者:[Joey-Elijah Sneddon][a]
+译者:[geekpi](https://github.com/geekpi)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:https://plus.google.com/117485690627814051450/?rel=author
+[1]:http://www.omgubuntu.co.uk/2014/06/opera-linux-chromium-download-released
+[2]:http://opera.com/computer/linux
+[3]:https://addons.opera.com/en/extensions/details/omg-ubuntu-for-opera/?display=en
+[4]:https://gist.github.com/ruario/99522c94838d0680633c#file-manual-install-of-opera-md
\ No newline at end of file
diff --git a/translated/talk/The history of Android/10 - The history of Android.md b/translated/talk/The history of Android/10 - The history of Android.md
new file mode 100644
index 0000000000..adea04cb85
--- /dev/null
+++ b/translated/talk/The history of Android/10 - The history of Android.md
@@ -0,0 +1,88 @@
+安卓编年史
+================================================================================
+
+注:youtube视频地址
+
+
+### Android 2.0, Éclair——带动GPS产业 ###
+
+41天——这是从安卓1.6到安卓2.0所经历的时间。安卓的第一个大的版本号更迭发生在2009年10月的[摩托罗拉Droid][1]身上,它是第一部“第二代”安卓设备。相对于G1而言,Droid进行了大幅的硬件升级,拥有巨大的3.7英寸(在当时而言),分辨率854×480的LCD屏幕。它同样带来了更强劲的性能:一个600Mhz的德州仪器TI OMAP Cortex A8处理器(还是单核),以及256MB的RAM内存。
+
+![摩托罗拉Droid凝视着你的灵魂。](http://cdn.arstechnica.net/wp-content/uploads/2014/03/2181.jpg)
+摩托罗拉Droid凝视着你的灵魂。
+
+但Droid最重要的部分是围绕它的大型广告活动。Droid是美国运营商威瑞森Verizon的旗舰设备,这个头衔给它从美国最大运营商那里带来了不少收入。威瑞森从卢卡斯影业那获得了单词“droid”的授权,并且开始了[“Droid Does”运动][2]——通过广告将设备定位成一个敢于发声,充满突破的(由此也延伸到安卓身上)强力iPhone替代品。媒体常常说T-Mobile G1想要成为一个“iPhone杀手”,但是Droid走了出来,并拥有了这个称号。
+
+就和G1一样,Droid有个侧滑实体键盘。轨迹球已经不见了,但是还是强制性要求有类似十字方向键的东西,所以摩托罗拉把一个五键十字方向键放在了键盘右侧。Droid正面按键从实体按键变成了电容式触摸按键,它们只是被印在了玻璃触摸屏上。安卓2.0同样最终取消了必须有“呼叫”和“结束”按钮的强制要求。所以连同十字方向键移到键盘那里的变动,正面的按键可以排成漂亮又整洁的一行。所有这些精简结果带来的是有史以来最好看的安卓设备。T-Mobile G1看起来像是费雪牌的玩具,但摩托罗拉Droid看起来像个可以用来削人的工业工具。
+
+![安卓2.0和1.6的锁屏和主屏幕。](http://cdn.arstechnica.net/wp-content/uploads/2014/01/intro202.png)
+安卓2.0和1.6的锁屏和主屏幕。
+Ron Amadeo供图
+
+威瑞森的一些差劲的广告活动泄漏了这个软件,原本平静,水汪汪的远景默认壁纸变成了脏兮兮的混凝土。开机动画用了红色脉动的哈儿(HAL 9000)的眼球(译注:哈儿是英国小说家亚瑟·克拉克所著《太空漫游》小说中出现的一部拥有强人工智能的超级电脑),每当你收到邮件的时候,默认通知铃声还会高喊“[DRRRRROOOOIIIIDDDD][3]”。Éclair泡芙就像是安卓的忧郁少年阶段。
+
+安卓2.0中最先呈现给用户的事情之一就是新的锁屏。滑动解锁是苹果的专利,因此谷歌就采用了来自旋转手机的灵感,使用了弧线解锁手势。把你的手指放在锁定图标上并且向右滑动可以解锁设备,从音量图标向左滑动可以让手机静音。手指自然移动是圆弧状的,所以这手势感觉比按直线滑动更加自然。
+
+默认主屏幕布局取消了多余的模拟时钟小部件,引入了现如今安卓的一个主要部分:主屏幕顶端的一个搜索栏。短信和安卓市场同样花了大功夫在新布局上。应用抽屉页同样被经过了明显的重新设计。
+
+![应用抽屉和“添加到主屏幕”菜单截图。](http://cdn.arstechnica.net/wp-content/uploads/2014/01/icons.png)
+应用抽屉和“添加到主屏幕”菜单截图。
+Ron Amadeo供图
+
+安卓在早期的阶段以极快的步伐开发前进,而安卓团队在考虑界面设计时也从来没有对未来的设备有过真正的规划。摩托罗拉Droid——拥有854×480分辨率的LCD显示屏——相对于320×480分辨率的G1时代设备在分辨率上是个巨大的提升。几乎所有的东西都需要重绘。界面设计的“从头开始”就几乎成为了安卓2.0的主要课题。
+
+谷歌借此机会几乎重新设计了安卓的所有图标,从带有等距轴线的卡通风格图标转变为风格更为正式直观的图标。唯一一套没有重绘的图标是状态栏图标,和经过修改的系统其它部分相比显得格格不入。这些图标会从安卓0.9一直使用到安卓2.3。
+
+应用阵容上同样也有一些改变。摄像机被合并到相机中,IM应用被去除,并增加了两个新的谷歌应用:Car Home,一个被设计为在驾驶时使用的带有大按钮的启动器,还有企业日历,除了它支持Exchange而不是谷歌日历以外,它和常规的日历没什么不一样。奇怪的是,谷歌还预装了两个第三方应用程序:Facebook和Verizon的Visual VM应用 (现在都不能用了)。第二组图片显示的是“添加到主屏幕”菜单,它同样经过了全新的设计。
+
+![一个地点页面,显示“导航”选项,导航免责声明,实际的导航画面,以及交通信息。](http://cdn.arstechnica.net/wp-content/uploads/2014/01/nav2.png)
+一个地点页面,显示“导航”选项,导航免责声明,实际的导航画面,以及交通信息。
+Ron Amadeo供图
+
+除了新的设计以外,安卓2.0最突出的亮点是谷歌地图导航。谷歌更新了地图,以支持免费的逐向导航,配有兴趣点搜索和文本到语音引擎,这使得它可以像一个独立的GPS设备一样大声读出街道名称。把GPS导航从一个单独的产品变成免费的智能手机功能,这几乎一夜之间[摧毁][4]了独立GPS市场。TomTom的股票在安卓2.0推出的一周内下跌了近40%。
+
+但一开始导航非常难以找到。你必须打开搜索框,键入一个地点或地址,并点击搜索结果。接下来,点击了“导航”按钮后,谷歌会显示一个警告,声明导航正处于beta测试阶段,不应该被信任。点击“接受”后,你可以跳上车,一个粗糙的合成语音会引导你到达目的地。菜单按钮背后隐藏着一个选项,可以查看整个路线上的交通状况和突发事件。导航的设计一直徘徊不前。甚至连谷歌地图主界面都在安卓4.0时更新了,安卓2.0风格的导航部分还是那么放着,这几乎持续到了安卓4.3才有所改观。
+
+地图还会显示路线的概览,其中包含你的路线的交通数据。起初数据只是由常规的交通数据提供商授权,但后来,谷歌使用运行谷歌地图的安卓和iOS手机[收集原始交通数据][5]。这是在移动设备地图游戏中谷歌迈向霸主地位的第一步。毕竟,实时交通流量的监控确实仅仅取决于你有多少数据点来源。现在,伴随着数以亿计的iOS和安卓的谷歌地图的用户,谷歌已经成为世界上最好的交通数据提供商。
+
+地图导航,安卓终于找到了自己的杀手级应用。谷歌公司那时提供了其他人提供不了的东西。“为什么我应该买这个而不是买个iPhone?”问题终于有了个答案。谷歌地图也不需要像许多GPS设备一样通过PC更新。有了云,地图能够始终保持最新状态,所有这些更新都是免费的。唯一的缺点是,你需要一个互联网连接来使用谷歌地图。
+
+精确的地图在[苹果地图的惨败][6]中被大大宣传,它已经成为了智能手机的最重要的功能之一,即使没有人真正在它们工作的时候赞赏它们。绘制世界真的只借助无数人的力量,今天,谷歌的“地球”部门是公司最大的部门,拥有超过[7000名员工][7]。对于这里的大多数人来说,他们的工作是驾驶着公司充满相机的街景车驶过世界上的每一条道路。经过八年的数据收集,谷歌拥有超过[五百万英里][8]的360度街景视图,谷歌地图成为了公司不可撼动的支柱之一。
+
+![Car Home主屏幕,并且因为有空间,加入了一个横版的导航。](http://cdn.arstechnica.net/wp-content/uploads/2014/01/carhome1.png)
+Car Home主屏幕,并且因为有空间,加入了一个横版的导航。
+Ron Amadeo供图
+
+随着和谷歌地图导航一起到来的还有“Car Home”,一个大按钮设计的主屏幕,旨在帮助你在驾驶时使用手机。这不是定制的,每一个按钮只是一个独立应用的快捷方式。摩托罗拉Droid和其官方的[车载dock配件][9]有特殊的磁铁,二者接触将自动触发Car Home。在手机接入dock时,按压Droid的实体home键会打开Car Home主屏而不是正常的主屏幕,屏幕上的触摸Home键可以打开正常的主屏幕。
+
+Car Home,虽然很有用,但并没有存在多久——它在安卓3.0中被去掉了,再也没有回来过。GPS系统几乎全部用在汽车驾驶时,但它鼓励用户使用如“搜索”这样的功能,它会弹出一个键盘,谷歌的律师可能并不是很喜欢这种功能。随着[苹果的CarPlay][10]和谷歌的[开放汽车联盟][11]的到来,车载电脑看到了复苏的希望。这一次,重点更多的是在安全上,政府机构(如美国国家公路交通安全管理局)也在协助着这一方面的发展。
+
+----------
+
+![Ron Amadeo](http://cdn.arstechnica.net/wp-content//uploads/authors/ron-amadeo-sq.jpg)
+
+[Ron Amadeo][a] / Ron是Ars Technica的评论编缉,专注于安卓系统和谷歌产品。他总是在追寻新鲜事物,还喜欢拆解事物看看它们到底是怎么运作的。
+
+[@RonAmadeo][t]
+
+--------------------------------------------------------------------------------
+
+via: http://arstechnica.com/gadgets/2014/06/building-android-a-40000-word-history-of-googles-mobile-os/10/
+
+译者:[alim0x](https://github.com/alim0x) 校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://arstechnica.com/gadgets/2009/12/review-of-the-motorola-droid/
+[2]:http://www.youtube.com/watch?v=e52TSXwj774
+[3]:http://www.youtube.com/watch?v=UBL47tHrvMA
+[4]:http://techcrunch.com/2009/10/28/googles-new-mobile-app-cuts-gps-nav-companies-at-the-knees/
+[5]:http://googleblog.blogspot.com/2009/08/bright-side-of-sitting-in-traffic.html
+[6]:http://arstechnica.com/apple/2012/09/apple-ceo-tim-cook-apologizes-for-ios-6-maps-promises-improvements/
+[7]:http://www.businessinsider.com/apple-has-7000-fewer-people-working-on-maps-than-google-2012-9
+[8]:https://developers.google.com/events/io/sessions/383278298
+[9]:http://www.amazon.com/Motorola-Generation-Vehicle-Charger-Packaging/dp/B002Y3BYQA
+[10]:http://arstechnica.com/apple/2014/03/ios-in-the-car-becomes-carplay-coming-to-select-dashboards-this-year/
+[11]:http://arstechnica.com/information-technology/2014/01/open-automotive-alliance-aims-to-bring-android-inside-the-car/
+[a]:http://arstechnica.com/author/ronamadeo
+[t]:https://twitter.com/RonAmadeo
diff --git a/translated/tech/20141124 Important 10 Linux ps command Practical Examples.md b/translated/tech/20141124 Important 10 Linux ps command Practical Examples.md
new file mode 100644
index 0000000000..7e1ece4787
--- /dev/null
+++ b/translated/tech/20141124 Important 10 Linux ps command Practical Examples.md
@@ -0,0 +1,186 @@
+10个重要的Linux ps命令实战
+================================================================================
+Linux作为Unix的衍生操作系统,Linux拥有内建用来查看当前进程的工具。这个工具能在命令行中使用。
+
+### PS 命令是什么 ###
+
+查看它的man手册可以看到,ps命令能够给出当前系统中进程的快照。它能捕获系统在某一事件的进程状态。如果你想实时更新这个状态,可以使用top命令。
+
+ps命令支持三种使用的语法格式
+
+1. UNIX 风格,一定要被分组并且必须有Dash引导使用(可以理解为必须在dash中使用,dash是一种shell)
+2. BSD 风格,一点要被分组但不一定要在dash中使用
+3. GNU 风格,能够在两种dash中使用
+
+我们能够混用这几种风格,但是可能会发生冲突。本文使用UNIX风格的ps命令。这里有在日常生活中使用较多的ps命令的例子。
+
+### 1. 不加参数执行ps命令 ###
+
+这是一个基本的 **ps** 使用。只要在控制台中执行这个命令并查看结果。
+
+![不加选项执行ps命令](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_no_options.png)
+
+结果默认会显示4列信息。
+
+- PID: 运行命令(CMD)的进程编号
+- TTY: 命令运行的位置
+- TIME: 说明运行这个命令所用的CPU时间
+- CMD: 作为当前进程运行的命令
+
+这些信息在显示时未排序。
+
+### 2. 显示所有当前进程 ###
+
+使用 **-a** 参数。**-a 代表 all**。同时加上x参数会显示没有控制终端的进程。
+
+ $ ps -ax
+
+这个命令的结果或许会很长。为获得简练的信息,可以结合less命令和管道来使用。
+
+ $ ps -ax | less
+
+![ps all 信息](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_ax.png)
+
+### 3. 根据用户过滤进程 ###
+
+在需要查看特点用户的进程是情况下,我们可以使用 **-u** 参数。比如我们要查看用户'pungki'的进程,可以通过下面的命令
+
+ $ ps -u pungki
+
+![通过user过滤](http://blog.linoxide.com/wp-content/uploads/2014/10/ps__u.png)
+
+### 4. 通过cpu和内存使用来过滤进程 ###
+
+可以使用 **aux 参数**,来显示全面的信息:
+
+ $ ps -aux | less
+
+![显示全面信息](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_aux.png)
+
+当结果很长时,我们可以使用管道和less命令来筛选。
+默认的结果集是未排好序的。可以通过 **--sort**命令好排序。
+
+根据 **CPU 使用**来升序排序
+
+ $ ps -aux --sort -pcpu | less
+
+![根据cpu使用排序](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_aux_sort_cpu.png)
+
+根据 **内存使用** 来升序排序
+
+ $ ps -aux --sort -pmem | less
+
+![根据内存使用来排序](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_aux_sort_mem.png)
+
+我们也可以通过管道显示前10个结果:
+
+ $ ps -aux --sort -pcpu,+pmem | head -n 10
+
+### 5. 通过进程name和id过滤 ###
+
+使用 **-C 参数**,后面跟你要找的进程的name。比如想显示一个名为getty的进程的信息,就可以使用下面的命令:
+
+ $ ps -C getty
+
+![通过进程name和id过滤](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_C.png)
+
+如果想要看到更多的细节,我们可以使用-f参数来查看格式化的信息列表:
+
+ $ ps -f -C getty
+
+![通过进程name和id过滤](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_C_f.png)
+
+### 6. 根据线程来过滤进程 ###
+
+如果我们想知道特定进程的线程,可以使用**-L 参数**,后面加上特定的PID。
+
+ $ ps -L 1213
+
+![根据线程来过滤进程](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_L.png)
+
+### 7. 分层显示进程 ###
+
+使用 **-axjf** 参数。
+
+ $ps -axjf
+
+![分层显示进程](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_axjf.png)
+
+或者可以使用另一个命令。
+
+ $ pstree
+
+![分层显示进程](http://blog.linoxide.com/wp-content/uploads/2014/10/pstree.png)
+
+### 8. 显示安全信息 ###
+
+如果想要查看现在有谁登入了你的server。可以使用ps命令加上相关参数:
+
+ $ ps -eo pid,user,args
+
+**参数 -e** 显示所有进程信息 **-o 参数**控制输出。**Pid**,**User 和 Args**参数显示**PID,运行应用的用户**和**运行的应用**。
+
+![显示安全信息](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_security_1.png)
+
+能够与**-e 参数** 一起使用的关键字是**args, cmd, comm, command, fname, ucmd, ucomm, lstart, bsdstart and start**。
+
+### 9. 格式化输出root用户创建的进程 ###
+
+系统管理员想要查看由root用户运行的进程和这个进程的其他相关信息时,可以通过下面的命令:
+
+ $ ps -U root -u root u
+
+**-U 参数**用来选择特定的用户ID(在userlist中存在的用户名或ID)。用户ID用来标识创建进程的用户。
+
+While the **-u paramater** will select by effective user ID (EUID)
+**-u** 参数用来筛选有效的用户ID。
+
+
+最后的**u**参数用来确定结果的输出格式,由**User, PID, %CPU, %MEM, VSZ, RSS, TTY, STAT, START, TIME and COMMAND**这几列组成。
+
+这里有上面的命令的输出结果
+
+![show real and effective User ID](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_root_real_effective_ID.png)
+
+### 10. 使用PS实时监控进程状态 ###
+
+ps 命令会显示你系统当前的进程状态,但是这个结果是静态的。
+当有一种情况,我们需要想上面第四点中提到的通过CPU和内存的使用率来过滤进程。并且我们希望结果能够每秒更新一次。为此,我们可以**将ps命令和watch命令结合起来**。
+
+ $ watch -n 1 ‘ps -aux --sort -pmem, -pcpu’
+
+![combine ps with watch](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_watch_1.png)
+
+并且可以通过**head**命令还进行限制。
+
+ $ watch -n 1 ‘ps -aux --sort -pmem, -pcpu | head 20’
+
+![combine ps with watch](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_watch_2.png)
+
+这里的动态查看不想top或者htop命令。**但是使用ps的好处是**你能够定义显示的字段。你能够选择你想查看的字段。
+
+举个例子,**如果你只先看名为'pungki'用户的信息**,你可以使用下面的命令:
+
+ $ watch -n 1 ‘ps -aux -U pungki u --sort -pmem, -pcpu | head 20’
+
+![combine ps with watch](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_watch_3.png)
+
+### 结论 ###
+
+你可能会使用ps命令来监控你的Linux系统。但是事实上,你可以通过ps命令的参数来生成各种你需要的报表。
+
+ps命令的另一个优势是ps是系统默认安装的。因此你只要用就行了。
+
+可以通过 man ps来查看更多的参数。
+
+--------------------------------------------------------------------------------
+
+via: http://linoxide.com/how-tos/linux-ps-command-examples/
+
+作者:[Pungki Arianto][a]
+译者:[johnhoow](https://github.com/johnhoow)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译,[Linux中国](http://linux.cn/) 荣誉推出
+
+[a]:http://linoxide.com/author/pungki/