From 12c74f98c8fe5df6d8405a45a0a112ba411bb38d Mon Sep 17 00:00:00 2001
From: struggling <630441839@qq.com>
Date: Wed, 28 Oct 2015 08:21:30 +0800
Subject: [PATCH 1/2] Delete 20151020 Five Years of LibreOffice Evolution
(2010-2015).md
---
...rs of LibreOffice Evolution (2010-2015).md | 84 -------------------
1 file changed, 84 deletions(-)
delete mode 100644 sources/talk/20151020 Five Years of LibreOffice Evolution (2010-2015).md
diff --git a/sources/talk/20151020 Five Years of LibreOffice Evolution (2010-2015).md b/sources/talk/20151020 Five Years of LibreOffice Evolution (2010-2015).md
deleted file mode 100644
index bce2f812b6..0000000000
--- a/sources/talk/20151020 Five Years of LibreOffice Evolution (2010-2015).md
+++ /dev/null
@@ -1,84 +0,0 @@
-translation by strugglingyouth
-Five Years of LibreOffice Evolution (2010-2015)
-================================================================================
-注:youtube 视频
-
-
-[LibreOffice][1] – amazing free and open source office suite from The Document Foundation. LO was forked from [OpenOffice.org][2] in September 28, 2010 and OOo is an open-source version of the earlier [StarOffice][3]. The LibreOffice support word processing, the creation and editing of spreadsheets, slideshows, diagrams and drawings, databases, mathematical formulae.
-
-### Core applications: ###
-
-- **Writer** – word processor
-- **Calc** – spreadsheet app, similar to Excel
-- **Impress** – application for presentations, support Microsoft PowerPoint’s format
-- **Draw** – vector graphics editor
-- **Math** – special application for writing and editing mathematical formulae
-- **Base** – database management
-
-![LibreOffice 3.3, 2011](https://github.com/paulcarroty/Articles/raw/master/LO_History/3.3/Help-License-Info.png)
-
-LibreOffice 3.3, 2011
-
-First version of LibreOffice – fork of OpenOffice.org
-
-![LibreOffice 3.4](https://github.com/paulcarroty/Articles/raw/master/LO_History/3.4/1cc80d1cada204a061402785b2048f7clibreoffice-3.4.3.png)
-
-LibreOffice 3.4
-
-![LibreOffice 3.5](https://raw.githubusercontent.com/paulcarroty/Articles/master/LO_History/3.5/libreoffice35-large_001.jpg)
-
-LibreOffice 3.5
-
-![LibreOffice 3.6](https://github.com/paulcarroty/Articles/raw/master/LO_History/3.6/libreoffice-3.6.0.png)
-
-LibreOffice 3.6
-
-![Libre Office 4.0](https://github.com/paulcarroty/Articles/raw/master/LO_History/4.0/libreoffice-writer.png)
-
-LibreOffice 4.0
-
-![Libre Office 4.1](https://github.com/paulcarroty/Articles/raw/master/LO_History/4.1/Writer1.png)
-
-LibreOffice 4.1
-
-![Libre Office 4.2](https://github.com/paulcarroty/Articles/raw/master/LO_History/4.2/libreoffice-4.2.png)
-
-Libre Office 4.2
-
-![LibreOffice 4.3](https://github.com/paulcarroty/Articles/raw/master/LO_History/4.3/libreoffice.jpg)
-
-LibreOffice 4.3
-
-![LibreOffice 4.4](https://github.com/paulcarroty/Articles/raw/master/LO_History/4.4/LibreOffice_Writer_4_4_2.png)
-
-LibreOffice 4.4
-
-![Libre Office 5.0](https://github.com/paulcarroty/Articles/raw/master/LO_History/5.0/LibreOffice_Writer_5.0.png)
-
-LibreOffice 5.0
-
-### History of Libre Office from Wikipedia ###
-
-![StarOffice major derivatives](https://commons.wikimedia.org/wiki/File%3AStarOffice_major_derivatives.svg)
-
-
-### LibreOffice 5.0 Review ###
-
-注:youtube 视频
-
-
-
---------------------------------------------------------------------------------
-
-via: https://tlhp.cf/libreoffice-5years-evolution/
-
-作者:[Pavlo Rudyi][a]
-译者:[译者ID](https://github.com/译者ID)
-校对:[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译,[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:https://tlhp.cf/author/paul/
-[1]:http://www.libreoffice.org/
-[2]:https://www.openoffice.org/
-[3]:http://www.staroffice.org/
From bf16e09b01f2e7ce872b37b5c2467ee74a3a87d3 Mon Sep 17 00:00:00 2001
From: struggling <630441839@qq.com>
Date: Wed, 28 Oct 2015 08:23:08 +0800
Subject: [PATCH 2/2] Create 20151020 Five Years of LibreOffice Evolution
(2010-2015).md
---
...rs of LibreOffice Evolution (2010-2015).md | 85 +++++++++++++++++++
1 file changed, 85 insertions(+)
create mode 100644 translated/talk/20151020 Five Years of LibreOffice Evolution (2010-2015).md
diff --git a/translated/talk/20151020 Five Years of LibreOffice Evolution (2010-2015).md b/translated/talk/20151020 Five Years of LibreOffice Evolution (2010-2015).md
new file mode 100644
index 0000000000..6d65849678
--- /dev/null
+++ b/translated/talk/20151020 Five Years of LibreOffice Evolution (2010-2015).md
@@ -0,0 +1,85 @@
+
+LibreOffice(2010-2015) 五年的演变
+================================================================================
+注:youtube 视频
+
+
+
+[LibreOffice][1] – 文档基金会(The Document Foundation)一个免费和开源的办公套件。OOo 是[StarOffice][3] 早期的开源版本,LO 在2010年9月28日从 [OpenOffice.org][2] 中被独立出来。LibreOffice 支持文字处理,电子表格,幻灯片,图表和图形,数据库,数学公式的创建和编辑。
+
+### 核心应用: ###
+
+- **Writer** – 文字处理器
+- **Calc** – 电子表格应用程序,类似于 Excel
+- **Impress** – 应用演示,支持 Microsoft PowerPoint 的格式
+- **Draw** – 矢量图形编辑器
+- **Math** – 用于编写和编辑数学公式的特殊应用
+- **Base** – 数据库管理
+
+![LibreOffice 3.3, 2011](https://github.com/paulcarroty/Articles/raw/master/LO_History/3.3/Help-License-Info.png)
+
+LibreOffice 3.3, 2011
+
+LibreOffice 的第一个版本 - OpenOffice.org 的一个分支
+
+![LibreOffice 3.4](https://github.com/paulcarroty/Articles/raw/master/LO_History/3.4/1cc80d1cada204a061402785b2048f7clibreoffice-3.4.3.png)
+
+LibreOffice 3.4
+
+![LibreOffice 3.5](https://raw.githubusercontent.com/paulcarroty/Articles/master/LO_History/3.5/libreoffice35-large_001.jpg)
+
+LibreOffice 3.5
+
+![LibreOffice 3.6](https://github.com/paulcarroty/Articles/raw/master/LO_History/3.6/libreoffice-3.6.0.png)
+
+LibreOffice 3.6
+
+![Libre Office 4.0](https://github.com/paulcarroty/Articles/raw/master/LO_History/4.0/libreoffice-writer.png)
+
+LibreOffice 4.0
+
+![Libre Office 4.1](https://github.com/paulcarroty/Articles/raw/master/LO_History/4.1/Writer1.png)
+
+LibreOffice 4.1
+
+![Libre Office 4.2](https://github.com/paulcarroty/Articles/raw/master/LO_History/4.2/libreoffice-4.2.png)
+
+Libre Office 4.2
+
+![LibreOffice 4.3](https://github.com/paulcarroty/Articles/raw/master/LO_History/4.3/libreoffice.jpg)
+
+LibreOffice 4.3
+
+![LibreOffice 4.4](https://github.com/paulcarroty/Articles/raw/master/LO_History/4.4/LibreOffice_Writer_4_4_2.png)
+
+LibreOffice 4.4
+
+![Libre Office 5.0](https://github.com/paulcarroty/Articles/raw/master/LO_History/5.0/LibreOffice_Writer_5.0.png)
+
+LibreOffice 5.0
+
+### Libre Office 的发展,出自 Wikipedia ###
+
+![StarOffice major derivatives](https://commons.wikimedia.org/wiki/File%3AStarOffice_major_derivatives.svg)
+
+
+### 回顾 LibreOffice 5.0 ###
+
+注:youtube 视频
+
+
+
+--------------------------------------------------------------------------------
+
+via: https://tlhp.cf/libreoffice-5years-evolution/
+
+作者:[Pavlo Rudyi][a]
+译者:[strugglingyouth](https://github.com/strugglingyouth)
+校对:[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译,[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://tlhp.cf/author/paul/
+[1]:http://www.libreoffice.org/
+[2]:https://www.openoffice.org/
+[3]:http://www.staroffice.org/