document/TranslateProject
2
0
Fork 0
mirror of https://github.com/LCTT/TranslateProject.git synced 2025-01-07 22:11:09 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,016 Commits 3 Branches 6 Tags 179 MiB
36b6e49e90
Commit Graph

540 Commits

Author SHA1 Message Date
Xingyu.Wang
026bc5c5d0 Merge pull request #152 from Vic020/master 
翻译完成“How to Install the iOS..”
没事，还是要以工作为重，谢谢您。
 2013-10-12 18:28:49 -07:00
Vic___
797d15b6aa Translated 'How to Install the iOS..' 2013-10-13 08:55:40 +08:00
flsf
f99974e5fe translated 2013-10-12 22:48:47 +08:00
l3b2w1
df4a961932 Delete Open source is brutal- an interview with Google's Chris DiBona.md 2013-10-12 21:42:41 +08:00
wxy
7af1142b7e 选题20131012 2013-10-12 20:27:53 +08:00
vito-L
b4ada187fd Merge pull request #145 from chenjintao/master 
translating by chenjintao
 2013-10-12 04:23:08 -07:00
chenjintao_ii
c048a2a6d7 translating by chenjintao 2013-10-12 18:59:32 +08:00
vito-L
ec4b34c057 Translated 2013-10-12 17:52:33 +08:00
vito-L
72d7f7465f translating by Vito 2013-10-12 17:00:29 +08:00
DeadFire
169317be98 20131012-2 选题 2013-10-12 16:25:33 +08:00
wxy
8c8dfb7f73 修改了文末的翻译申明格式，直接采用GITHUB的ID作为译者链接 2013-10-12 10:48:21 +08:00
woodboow
96f499f1f4 Flower Coil翻译完毕 2013-10-12 10:01:39 +08:00
woodboow
17382152f3 Flower Coil翻译完毕 2013-10-12 09:59:52 +08:00
l3b2w1
69c991e689 Delete Ubuntu 13.10 vs. Ubuntu 13.04--Reasons to Upgrade.md 2013-10-12 09:29:19 +08:00
vito-L
65acc4e627 Merge pull request #134 from scusjs/master 
翻译完毕
 2013-10-11 09:35:14 -07:00
DeadFire
2ea44564d5 20131012-1 选题 2013-10-11 23:58:30 +08:00
DeadFire
973501bb24 20131011 选题 2013-10-11 23:36:11 +08:00
Jinsheng Shen
e1972a5e7d 翻译完毕 
翻译Banshee，修改Jitsi的译者信息
 2013-10-11 23:18:08 +08:00
Xingyu.Wang
11b727f20f Merge pull request #131 from scusjs/master 
DOGGED翻译完毕
 2013-10-11 07:17:25 -07:00
Jinsheng Shen
78d1363fe3 DOGGED翻译完毕 2013-10-11 22:13:43 +08:00
Timeszoro
2e70f4eeac 完成翻译 2013-10-11 21:28:52 +08:00
wgj,Lab
ce24a4d830 翻译完成 2013-10-11 20:57:26 +08:00
wgj,Lab
9df5874b36 Merge branch 'LCTT/master' 2013-10-11 19:53:44 +08:00
tinyeyeser
bdbc3992e5 Merge pull request #125 from flsf/master 
待校对
 2013-10-11 04:10:18 -07:00
flsf
5078446bd0 待校对 2013-10-11 19:00:55 +08:00
vito-L
c988f9a93e Merge pull request #122 from flsf/master 
翻译中Music\ App\ ‘Musique’\ Adds\ Album\ Sorting,\ Gapless\ Playback\ and\...
 2013-10-11 04:00:32 -07:00
flsf
7a6a1751c0 待校对 2013-10-11 18:59:50 +08:00
Luoxcat
2ce75dd469 Ttranslating by Luox 2013-10-11 18:53:35 +08:00
flsf
b2baa44a98 翻译中 2013-10-11 18:27:16 +08:00
scusjs
a4c2252b08 DOGGED翻译完毕 2013-10-11 17:48:36 +08:00
flsf
b4c07a3888 翻译中Music\ App\ ‘Musique’\ Adds\ Album\ Sorting,\ Gapless\ Playback\ and\ Playlist\ Tweaks.md 2013-10-11 17:30:45 +08:00
Xingyu.Wang
cf72c3dbaf Merge pull request #119 from tinyeyeser/master 
已翻译 by Mr小眼儿。开始翻译Are We Witnessing the Decline of Ubuntu.md
 2013-10-11 01:33:21 -07:00
tinyeyeser
80cbdff52d 翻译中 by Mr小眼儿 2013-10-11 16:31:08 +08:00
wxy
08751a0cd5 重点选题：NoSQL comparison 2013-10-11 16:29:25 +08:00
tinyeyeser
b2f001b1de 已翻译 by 小眼儿 
Signed-off-by: tinyeyeser <tinyeyeser@gmail.com>
 2013-10-11 16:20:51 +08:00
Xingyu.Wang
7fdf59863b Merge pull request #117 from woodboow/master 
翻译完成Add vitality to your desktop with Saucy Salamander Wallpaper pack和GParted 0.16.2 Review
 2013-10-11 00:10:00 -07:00
woodboow
5efb40f323 Delete GParted 0.16.2 Review.md 2013-10-11 14:53:22 +08:00
woodboow
558ee88717 Delete GParted 0.16.2 Review.md~ 2013-10-11 14:53:02 +08:00
wxy
6013a76ab9 毁灭一些过期的孤儿:< 2013-10-11 13:51:18 +08:00
tinyeyeser
6cae1f794f 翻译中 by Mr小眼儿 2013-10-11 12:58:18 +08:00
tinyeyeser
193bfec9b6 Merge pull request #4 from LCTT/master 
从LCTT同步
 2013-10-10 21:57:26 -07:00
tinyeyeser
1e052794f2 已翻译 by 小眼儿 
Signed-off-by: tinyeyeser <tinyeyeser@gmail.com>
 2013-10-11 12:52:05 +08:00
wxy
805f2924ee 修正翻译：Ubuntu Touch--Ubuntu OS for Smartphone is Almost Ready 2013-10-11 11:40:55 +08:00
woodboow
4d7d471e7d new update 2013-10-11 11:07:58 +08:00
woodboow
7fa27a5db6 Merge remote-tracking branch 'upstream/master' 2013-10-11 11:06:46 +08:00
Xingyu.Wang
6c84d803bc Merge pull request #112 from Luoxcat/master 
Translating by Luox
 2013-10-10 18:34:31 -07:00
wxy
d78b66ef19 选题：Open source is brutal: an interview with Google's Chris DiBona 2013-10-10 23:04:11 +08:00
wxy
1c9f522e06 选题：The Linux Backdoor Attempt of 2003 2013-10-10 22:54:25 +08:00
Luoxcat
38c898ae19 Translating by Luox 2013-10-10 22:47:04 +08:00
Xingyu.Wang
6ab0a0f16c Merge pull request #109 from tinyeyeser/master 
已翻译 by Mr小眼儿。开始翻译The Utilite Linux Mini PC.md
 2013-10-10 05:24:54 -07:00
tinyeyeser
79172ddcbc 翻译中 by Mr小眼儿 2013-10-10 20:18:13 +08:00
tinyeyeser
5d8f7eab7f 已翻译 by 小眼儿 
Signed-off-by: tinyeyeser <tinyeyeser@gmail.com>
 2013-10-10 19:49:36 +08:00
wxy
4f4136189d 修正了巴斯的翻译格式 
1、请保持原文段落等格式
2、以.md为扩展名
3、提交时应该删除source里面原文，并在translated里面建立译文
 2013-10-10 19:13:48 +08:00
flsf
75497b5ead translated 2013-10-10 17:24:01 +08:00
woodboow
3b4899a70f Merge branch 'master' of https://github.com/woodboow/TranslateProject 2013-10-10 16:11:00 +08:00
woodboow
c46ec9b703 翻译未完GParted 2013-10-10 16:09:56 +08:00
woodboow
818431226c Delete Add vitality to your desktop with Saucy Salamander Wallpaper pack.md 2013-10-10 15:02:56 +08:00
Timeszoro
89feead5a4 Update Ubuntu 13.10 vs. Ubuntu 13.04--Reasons to Upgrade.md 2013-10-10 14:10:43 +08:00
Timeszoro
0a7c0fcadc 翻译中 by times 2013-10-10 14:09:50 +08:00
tinyeyeser
9e8d44e763 翻译中 by Mr小眼儿 2013-10-10 10:35:23 +08:00
tinyeyeser
24bf65dabd Merge pull request #3 from LCTT/master 
从LCTT同步
 2013-10-09 19:34:28 -07:00
tinyeyeser
4cd8f4ba35 已翻译 by Mr小眼儿 
Signed-off-by: tinyeyeser <tinyeyeser@gmail.com>
 2013-10-10 10:28:11 +08:00
Xingyu.Wang
52a2479fc2 Merge pull request #104 from chenjintao/patch-1 
【翻译中】Red Hat Enterprise Linux 6.5 Beta Can Remotely Control Windows 8.md
 2013-10-09 18:39:48 -07:00
Xingyu.Wang
0e823825bc Merge pull request #103 from woodboow/master 
[翻译]Gparted 0.16.2 Review
 2013-10-09 18:39:19 -07:00
Xingyu.Wang
3bef2eb369 Merge pull request #101 from vito-L/master 
[翻译中]Install Cinnamon 1.8 in Ubuntu 13.04
 2013-10-09 18:38:52 -07:00
chenjintao
b43e8cd711 【翻译中】Red Hat Enterprise Linux 6.5 Beta Can Remotely Control Windows 8.md 2013-10-10 09:11:21 +08:00
woodboow
f45c255b07 Update GParted 0.16.2 Review.md 2013-10-10 08:05:04 +08:00
DeadFire
a2cf4d69cf 20131010-1 选题 2013-10-10 00:53:08 +08:00
vito-L
7e9785ff4e 翻译完成 2013-10-10 00:26:42 +08:00
vito-L
434c2e4f82 翻译中 2013-10-09 23:18:27 +08:00
Xingyu.Wang
fc94140edf Merge pull request #98 from tinyeyeser/master 
已翻译 by Mr小眼儿。开始翻译First impressions of Semplice Linux 5
 2013-10-08 20:48:54 -07:00
tinyeyeser
5c02ec5573 翻译中 by Mr小眼儿 2013-10-09 11:11:54 +08:00
tinyeyeser
fbb459dafc 已翻译 by Mr小眼儿 
Signed-off-by: tinyeyeser <tinyeyeser@gmail.com>
 2013-10-09 11:09:56 +08:00
woodboow
b924c40f81 Translate... 2013-10-09 10:37:31 +08:00
DeadFire
756d7417af 20131009-1 选题 2013-10-09 00:09:44 +08:00
tinyeyeser
71942bc650 翻译中 by Mr小眼儿 2013-10-08 21:42:38 +08:00
tinyeyeser
41ff0b7fe4 Merge pull request #2 from LCTT/master 
从LCTT同步
 2013-10-08 06:34:24 -07:00
tinyeyeser
7bdb422ddb 已翻译 by Mr小眼儿 
Signed-off-by: tinyeyeser <tinyeyeser@gmail.com>
 2013-10-08 21:32:34 +08:00
woodboow
a2bcd4fe63 Translating... 2013-10-08 16:09:58 +08:00
woodboow
504677f632 Delete 3 Good CD And DVD Burning Tools For Ubuntu.md 2013-10-08 16:04:32 +08:00
woodboow
5fa6823ab9 Translating... 2013-10-08 09:19:29 +08:00
Xingyu.Wang
6b1e354c31 Merge pull request #94 from flsf/master 
补充翻译Choosing a Journaling File System
 2013-10-07 17:56:30 -07:00
DeadFire
8a0aedb316 20131008-1 选题 2013-10-08 00:02:14 +08:00
flsf
597a352550 补充翻译Choosing a Journaling File System 2013-10-07 20:58:25 +08:00
wxy
09aab0dc07 补充内容:Choosing a Journaling File System 2013-10-07 16:37:37 +08:00
wxy
d1f4fb0cc0 需要补充内容：Choosing a Journaling File System 2013-10-07 16:29:28 +08:00
vito-L
c0a2d96863 翻译完成 2013-10-05 23:48:18 +08:00
vito-L
7db43bc236 翻译中 2013-10-05 21:54:55 +08:00
wxy
a616fd3683 清除过期的文章 2013-10-05 21:33:42 +08:00
theo-l
4127aa5512 翻译中theo 2013-10-05 18:51:18 +08:00
Xingyu.Wang
3cc24d20b4 Merge pull request #89 from Linchenguang/master 
[翻译完成] Ubuntu extends its Windows Azure availability with full Juju support
 2013-10-03 22:13:57 -07:00
wxy
3cd6decfb1 发布：lmctfy - Let Me Contain That For You 2013-10-04 12:51:21 +08:00
Linchenguang
5e75ee3184 Update and rename sources/Ubuntu extends its Windows Azure availability with full Juju support.md to translated/Ubuntu extends its Windows Azure availability with full Juju support.md 2013-10-04 12:27:58 +08:00
vito-L
5df6f6c24e delete 2013-10-04 00:47:15 +08:00
Chilledheart
9785230219 Chilledheart's reserve 2013-10-03 20:33:42 +08:00
wxy
bd303e9529 添加选题：lmctfy - Let Me Contain That For You 2013-10-03 20:23:37 +08:00
Xingyu.Wang
2ad87d8aaa Merge pull request #83 from woodboow/master 
Add Metallic 翻译完毕
 2013-10-02 01:34:33 -07:00
Xingyu.Wang
d65030d1c1 Merge pull request #82 from vito-L/master 
翻译完成并正在翻译--Travel support applications to attend openSUSE Summit opened!
 2013-10-02 01:33:55 -07:00
Xingyu.Wang
76b28c23bc Merge pull request #81 from flsf/master 
translate
 2013-10-02 01:33:17 -07:00
woodboow
8a0be8b2a0 Translating 2013-10-02 16:24:02 +08:00
woodboow
cc90800f57 Delete Add a metallic variation to Saucy's default wall with Aqua Graphite wallpaper.md 2013-10-02 16:12:10 +08:00
woodboow
71ad5d3c6a Add a metallic variation to Saucy's default wall with Aqua Graphite wallpaper.md 翻译完毕 2013-10-02 16:05:45 +08:00
vito-L
5cf6314002 翻译中 2013-10-02 00:45:00 +08:00
flsf
410e73723c translate 2013-10-02 00:09:17 +08:00
tinyeyeser
523fb1f648 翻译中 by Mr小眼儿 2013-10-01 21:47:09 +08:00
tinyeyeser
919908c8d4 Merge pull request #1 from LCTT/master 
从LCTT同步
 2013-10-01 06:44:42 -07:00
tinyeyeser
bcf2264676 已翻译 by Mr小眼儿 
Signed-off-by: tinyeyeser <tinyeyeser@gmail.com>
 2013-10-01 21:32:03 +08:00
Xingyu.Wang
78e24230fc Merge pull request #76 from vito-L/master 
翻译完成《Nautilus Gksu Plugin – Add ‘Open As Administrator’ Option To Your Right Click Menu》
翻译中《Glances – An All In One System Monitoring Tool》
 2013-09-30 17:55:33 -07:00
vito-L
98e69fea8f Delete Nautilus Gksu Plugin – Add ‘Open As Administrator’ Option To Your Right Click Menu.md 2013-10-01 00:05:20 +08:00
vito-L
29f7961c96 翻译中 2013-10-01 00:04:22 +08:00
flsf
cf0dace4d4 translated 2013-09-30 17:35:50 +08:00
DeadFire
d3e9dabf37 20130930-1 选题 2013-09-30 11:43:10 +08:00
Xingyu.Wang
17f60965fb Merge pull request #72 from woodboow/master 
翻译中 Add a metallic variation to Saucy's default wall with Aqua Graphite wallpaper
 2013-09-29 17:39:53 -07:00
woodboow
014dfa1693 Translating 2013-09-30 08:38:16 +08:00
vito-L
52d9055a38 Delete Multimedia Production Studio ArtistX 1.5 Distro Is Based on Ubuntu 13.04.md 2013-09-30 00:22:16 +08:00
vito-L
2ee3f7031e Delete Embedded Terminal – A Gedit Plugin To Access The Command Line Terminal From Within The Editor Window.md 2013-09-30 00:21:58 +08:00
vito-L
483c2534b5 翻译中 2013-09-30 00:20:30 +08:00
wxy
8c0705f93e 修改提交的PR 2013-09-29 21:58:43 +08:00
wxy
0a90af7160 清除已经翻译的 2013-09-29 20:42:46 +08:00
vito-L
e0102365f8 翻译中 2013-09-29 16:02:10 +08:00
woodboow
ae4052d20c Delete Quick-n-easy command-line tips.md 2013-09-29 15:34:27 +08:00
Xingyu.Wang
538a9625d8 Merge pull request #63 from tinyeyeser/master 
已翻译 by Mr小眼儿。开始翻译Red Hat Expands Virtualization Options With Open-Source Docker
 2013-09-28 22:29:56 -07:00
tinyeyeser
2c3e854535 翻译中 by Mr小眼儿 2013-09-29 11:55:56 +08:00
tinyeyeser
b20d4dd07d 已翻译 by Mr小眼儿 
Signed-off-by: tinyeyeser <tinyeyeser@gmail.com>
 2013-09-29 11:49:58 +08:00
flsf
d981dccdb5 translate 2013-09-28 21:24:41 +08:00
woodboow
bf695a0862 Quick-n-easy command-line tips翻译中markvv 2013-09-28 17:54:49 +08:00
wxy
88e1f35bea 删除已经翻译的 2013-09-28 16:54:11 +08:00
woodboow
483e44cff6 Delete Removing Applications Using Terminal in Ubuntu.md 2013-09-28 16:15:44 +08:00
woodboow
22173a9fa1 Translating 2013-09-28 14:20:54 +08:00
Xingyu.Wang
bea4b8f56d Merge pull request #52 from vito-L/master 
翻译完成
 2013-09-27 17:00:41 -07:00
vito-L
f7d0a1ddc2 translating 2013-09-28 00:28:32 +08:00
flsf
3c21c6e99e translated 2013-09-27 22:27:43 +08:00
Xingyu.Wang
4e84dc1821 Merge pull request #49 from tinyeyeser/master 
已翻译 by Mr小眼儿。开始翻译Linus Torvalds Talks Linux Development at LinuxCon
 2013-09-27 05:38:33 -07:00
Xingyu.Wang
23f699cb56 Merge pull request #47 from woodboow/master 
Lightweight Markup Languages翻译完毕，已移到translated中
 2013-09-27 05:37:13 -07:00
Xingyu.Wang
71c4a570f5 Merge pull request #46 from flsf/master 
translated
 2013-09-27 05:36:45 -07:00
Xingyu.Wang
73861673e8 Merge pull request #45 from vito-L/master 
翻译完成
 2013-09-27 05:36:18 -07:00
tinyeyeser
d4ed20dc85 翻译中 by Mr小眼儿 2013-09-27 17:39:43 +08:00
tinyeyeser
65e5837f00 已翻译 by Mr小眼儿 
Signed-off-by: tinyeyeser <tinyeyeser@gmail.com>
 2013-09-27 17:29:52 +08:00
DeadFire
ec711730e5 20130927-2 选题 2013-09-27 15:54:12 +08:00
vito-L
61a802f934 翻译中 2013-09-27 15:00:59 +08:00
vito-L
a99950b4e9 翻译中 2013-09-27 14:03:10 +08:00
DeadFire
9131355db2 20130927-1 选题 2013-09-27 11:25:52 +08:00
woodboow
2dfd24979b 删除本文件，移到translated中 2013-09-27 09:15:45 +08:00
woodboow
4d2b3d54f4 翻译完毕 2013-09-27 09:11:17 +08:00
flsf
0ebbe86a96 translated 2013-09-27 02:12:39 +08:00
tinyeyeser
327fe6a8f4 翻译中 by Mr小眼儿 2013-09-26 17:19:45 +08:00
tinyeyeser
e8a4974a93 已翻译 by Mr小眼儿 2013-09-26 17:08:07 +08:00
woodboow
51bfefbe10 Lightweight Markup Languages翻译完毕 2013-09-26 16:05:03 +08:00
tinyeyeser
7002302808 翻译中 by Mr小眼儿 2013-09-26 13:43:52 +08:00
tinyeyeser
9f4d40cc1d 已翻译 by Mr小眼儿 
Signed-off-by: tinyeyeser <tinyeyeser@gmail.com>
 2013-09-26 13:42:26 +08:00
王兴宇
2532da8bd1 修改文件名，去掉"?" 2013-09-26 11:57:59 +08:00
王兴宇
30d868db7b 选题：Are We Witnessing the Decline of Ubuntu? 2013-09-26 10:44:35 +08:00
Xingyu.Wang
6a2566a148 Merge pull request #36 from boredivan/master 
....话说pull only是个什么权限啊
 2013-09-25 06:33:53 -07:00
Ivan Zhou
eab8aa5286 欧了，校对吧 2013-09-25 21:06:23 +08:00
Xingyu.Wang
49cd32d57b Merge pull request #33 from tinyeyeser/master 
已翻译 by Mr小眼儿
 2013-09-25 06:01:48 -07:00
Ivan Zhou
ffeb3ad34e translated: "How Linux defenders attack bad software patents before they\342\200\231re approved.md" 
I need someone help me translate it more accurate
 2013-09-25 20:48:04 +08:00
tinyeyeser
5acf6018b7 已翻译 by Mr小眼儿 
Signed-off-by: tinyeyeser <tinyeyeser@gmail.com>
 2013-09-25 20:33:21 +08:00
DeadFire
a897631073 20130925-2 选题 2013-09-25 17:33:57 +08:00
Xingyu.Wang
7f787fc203 Merge pull request #32 from tinyeyeser/master 
完成一篇（Google Android Is Open Source- LinuxCon），另开始翻译一篇
 2013-09-25 02:18:44 -07:00
tinyeyeser
176f12f0e3 翻译中 by Mr小眼儿 2013-09-25 17:13:06 +08:00
tinyeyeser
8889fcd0a4 已翻译 by Mr小眼儿 
Signed-off-by: tinyeyeser <tinyeyeser@gmail.com>
 2013-09-25 17:07:19 +08:00
DeadFire
f40a062612 20130925-1 选题 2013-09-25 16:10:40 +08:00
theo-L
bf253153af 翻译中 theo 2013-09-24 22:08:05 +08:00
DeadFire
b4467c5316 删除了一个已经转载的文章 2013-09-24 20:27:10 +08:00
王兴宇
72103a03c8 删除已经发布的 2013-09-24 16:14:45 +08:00
王兴宇
fd19623fb1 待校对 2013-09-24 16:01:18 +08:00
Xingyu.Wang
1ff5c587c0 Merge pull request #21 from vito-L/master 
翻译中
 2013-09-23 23:18:48 -07:00
Xingyu.Wang
b3caa2651f Merge pull request #20 from lijhg/patch-2 
3是Canonical's 运行咨询小组最新成员吗？
 2013-09-23 23:17:17 -07:00
DeadFire
53cb9eb398 20130923-3 选题 2013-09-24 14:15:30 +08:00
vito-L
88e6786fe0 翻译中 2013-09-24 13:33:00 +08:00
lijhg
82c2eccf02 3是Canonical's 运行咨询小组最新成员吗？ 
移动网络
 2013-09-24 12:48:18 +08:00
DeadFire
c40c986cf3 20130624-2 选题 2013-09-24 11:40:10 +08:00
王兴宇
ccd6066f40 从sources删除已经翻译的 2013-09-24 11:06:34 +08:00
woodboow
b6b7a0d0ea Translating... 2013-09-24 11:01:21 +08:00
DeadFire
3ebc9c5812 20130924-1 选题 2013-09-24 10:57:20 +08:00
tinyeyeser
22ac54ef32 已翻译 by Mr小眼儿 
Signed-off-by: tinyeyeser <tinyeyeser@gmail.com>
 2013-09-24 10:52:21 +08:00
王兴宇
649917a1f4 继续恢复，这下应该恢复完了，5555~~ 2013-09-24 01:38:58 +08:00
王兴宇
e838939e22 补充恢复 2013-09-24 00:32:26 +08:00
王兴宇
273c8cc771 艰难的恢复了 
看来之后还是不能将master的提交开放给所有人，一旦出现了错误，恢复麻烦极了。
 2013-09-24 00:07:53 +08:00
王兴宇
2425dd3f31 rev 2013-09-24 00:00:06 +08:00
王兴宇
2c4bcce040 Revert "asyn" 
This reverts commit 8ab60bd060, reversing
changes made to 412cca7e48.
 2013-09-23 23:58:42 +08:00
王兴宇
6ea8a80b3a Revert "翻译中 theo" 
This reverts commit 4340936eba, reversing
changes made to 8ab60bd060.

Conflicts:
	sources/Meet StartUbuntu, interesting open-for-participation project aimed at further spreading Ubuntu's adoption.md
	translated/Glances – An All In One System Monitoring Tool.md
 2013-09-23 23:57:36 +08:00
王兴宇
71ccdef92f rev 2013-09-23 23:52:12 +08:00
王兴宇
4e58fd75cb Revert "恢复" 
This reverts commit aa47211100.
 2013-09-23 23:50:37 +08:00
王兴宇
5397ba404e Revert "Revert af409a0..aa47211" 
This reverts commit c9008303b7.
 2013-09-23 23:49:55 +08:00
王兴宇
6cf65c9f11 Revert "Revert 37dcfa8..c900830" 
This reverts commit a1da2edf70.
 2013-09-23 23:49:27 +08:00
王兴宇
a1da2edf70 Revert 37dcfa8..c900830 
This rolls back to commit 37dcfa8739.
 2013-09-23 23:37:38 +08:00
王兴宇
c9008303b7 Revert af409a0..aa47211 
This rolls back to commit af409a0e19.
 2013-09-23 23:35:07 +08:00
王兴宇
aa47211100 恢复 2013-09-23 23:34:01 +08:00
王兴宇
6851d02d9e Revert "asyn" 
This reverts commit 8ab60bd060, reversing
changes made to 412cca7e48.
 2013-09-23 23:29:49 +08:00
王兴宇
a593690f62 Revert "翻译中 theo" 
This reverts commit 4340936eba, reversing
changes made to 8ab60bd060.

Conflicts:
	sources/Glances – An All In One System Monitoring Tool.md
	sources/Lightweight Markup Languages.md
 2013-09-23 23:25:04 +08:00
theo-L
56c3403818 翻译中 theo 2013-09-23 20:40:26 +08:00
theo-L
ad5686d74f 翻译中 theo 2013-09-23 20:20:49 +08:00
theo-l
4340936eba 翻译中 theo 2013-09-23 20:17:01 +08:00
theo-l
8ab60bd060 asyn 2013-09-23 20:05:02 +08:00
theo-L
8a0761741c Delete hello.txt 2013-09-23 19:34:45 +08:00
theo-l
24116c791d asyn 2013-09-23 19:28:27 +08:00
theo-l
af409a0e19 asyn 2013-09-23 19:20:45 +08:00
Xingyu.Wang
37dcfa8739 Merge pull request #15 from woodboow/master 
Meet StartUbuntu翻译完，请校对拍砖，下次请不用保留英文了。
 2013-09-23 01:02:15 -07:00
woodboow
dd5384aafb MeetUbuntu完成 2013-09-23 15:57:53 +08:00