document/TranslateProject
2
0
Fork 0
mirror of https://github.com/LCTT/TranslateProject.git synced 2025-02-19 00:30:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1186 from jiajia9linuxer/master

Browse Source 
jiajia translating...
This commit is contained in:
Xingyu.Wang 2014-06-15 21:48:44 +08:00
commit a198032eca
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sources/talk/20140607 Got Linux--Add Proprietary Code.md
View File

@ -1,3 +1,5 @@
jiajia translating...
Got Linux? Add Proprietary Code Got Linux? Add Proprietary Code
================================================================================ ================================================================================
![](http://www.linuxinsider.com/images/rw661226/linux-enterprise-proprietary-code.jpg) ![](http://www.linuxinsider.com/images/rw661226/linux-enterprise-proprietary-code.jpg)
@ -109,4 +111,4 @@ via: http://www.linuxinsider.com/story/80555.html
[1]:http://www.icewarp.com/ [1]:http://www.icewarp.com/
[2]:https://lucerahq.com [2]:https://lucerahq.com
[3]:http://www.fsmlabs.com/ [3]:http://www.fsmlabs.com/
[4]:http://www.bell-labs.com/ [4]:http://www.bell-labs.com/

3
sources/talk/20140609 Has Microsoft really changed its attitude toward open source.md
View File

@ -1,3 +1,4 @@
jiajia translating...
Has Microsoft really changed its attitude toward open source? Has Microsoft really changed its attitude toward open source?
================================================================================ ================================================================================
> **In today's open source roundup: Microsoft may or may not have a new attitude toward open source. Plus: Android versus Windows, and Cinnamon versus Unity in Ubuntu 14.04** > **In today's open source roundup: Microsoft may or may not have a new attitude toward open source. Plus: Android versus Windows, and Cinnamon versus Unity in Ubuntu 14.04**
@ -78,4 +79,4 @@ via: http://www.itworld.com/open-source/421894/has-microsoft-really-changed-its-
[4]:http://www.zdnet.com/the-five-most-popular-end-user-linux-distributions-7000030058/http://www.zdnet.com/the-five-most-popular-end-user-linux-distributions-7000030058/ [4]:http://www.zdnet.com/the-five-most-popular-end-user-linux-distributions-7000030058/http://www.zdnet.com/the-five-most-popular-end-user-linux-distributions-7000030058/
[5]:http://www.amazon.com/Best-Sellers-Electronics-Desktop-Computers/zgbs/electronics/565098/?_encoding=UTF8&camp=1789&creative=390957&linkCode=ur2&tag=fnh-20&linkId=REWXUPB7SQXPDSOL [5]:http://www.amazon.com/Best-Sellers-Electronics-Desktop-Computers/zgbs/electronics/565098/?_encoding=UTF8&camp=1789&creative=390957&linkCode=ur2&tag=fnh-20&linkId=REWXUPB7SQXPDSOL
[6]:http://www.amazon.com/Best-Sellers-Computers-Accessories-Laptop/zgbs/pc/565108/?_encoding=UTF8&camp=1789&creative=390957&linkCode=ur2&tag=fnh-20&linkId=POG3J2CFBHDWBAVL [6]:http://www.amazon.com/Best-Sellers-Computers-Accessories-Laptop/zgbs/pc/565108/?_encoding=UTF8&camp=1789&creative=390957&linkCode=ur2&tag=fnh-20&linkId=POG3J2CFBHDWBAVL
[7]:http://www.techrepublic.com/article/is-cinnamon-a-worthy-replacement-for-ubuntu-unity/ [7]:http://www.techrepublic.com/article/is-cinnamon-a-worthy-replacement-for-ubuntu-unity/