Merge remote-tracking branch 'origin/master'

README.en.md

@@ -1,16 +1,29 @@
 # file-online-preview
-This project is a solution for preview of some documents.There are some similar paid products, such as 【[永中office](http://dcs.yozosoft.com/)】【[office365](http://www.officeweb365.com/)】【[idocv](https://www.idocv.com/)】,etc..After achieving the agreement of our senior management,we decide to open source to feedback with Apache License. And we specially thanks for the contributions and helps of @唐老大 and @端木详笑.
-This project is built with Spring Boot which is popular.It's easy to use and deploy.It supports the preview of mainstream office documents, such as doc,docx,Excel,pdf,txt,zip,rar,pictures,etc.
+This kekingcn kkFileView software is intended to be a solution for previewing documents online. There are some similar paid products in the industry, at present.
+Such as 【[永中office](http://dcs.yozosoft.com/)】,【[office365](http://www.officeweb365.com/)】,【[idocv](https://www.idocv.com/)】, etc..
+The kekingcn kkFileView software is an open source implementation and released under the Apache License version 2. It's aimed to feedback the community after obtaining the consent of company executives, 
+special thanks to the supports of @唐老大 and the contributions of @端木详笑. 
+
+### Advantages
+* build with the popular frame spring boot, 
+* easy to deploy and deploy, 
+* basically support online preview of mainstream office documents, such as Doc, docx, Excel, PDF, TXT, zip, rar, pictures, etc.
+
 ### The demo online
-> Please be nice to the public service, or this would stop at any time.
+> Please treat public service kindly, or this would stop at any time.
 
 URL：http://file.keking.cn/
 
-### Contact us & Join us
-> We will answer everyone's questions which are found when running this project patiently.And please Google or Baidu first before asking a question, so that we can solve then efficiently.
+### Project documentation
+1. 中文文档：https://gitee.com/kekingcn/file-online-preview/blob/master/README.md
+1. English document：https://github.com/kekingcn/kkFileView/blob/master/README.en.md
 
-![输入图片说明](https://gitee.com/uploads/images/2017/1219/173717_934cb068_492218.png "屏幕截图.png")
+### Contact us && Join us
+> We will answer everyone's questions which are found when using this project patiently.
+And please Google or Baidu first before asking a question, so that we can solve then efficiently. 
+Cherish life away from ineffective communication.
 
+![输入图片说明](https://gitee.com/uploads/images/2017/1219/173717_934cb068_492218.png "屏幕截图.png")
 QQ group：613025121
 
 ### Pictures for some samples
@@ -28,21 +41,21 @@ QQ group：613025121
 > png,jpeg,jpg,etc., support for zooming with mouse scroll, rotation, inversion,etc.
 
 ![输入图片说明](https://gitee.com/uploads/images/2017/1213/094335_657a6f60_492218.png "屏幕截图.png")
-In consideration of the length of the introduction, the pictures of other file type will not be shown.You can deploy it yourself if you are interested in our project.The way to deploy is as below.
+Considering space issues, the pictures of other types of documents will not be shown here.You can deploy it by yourself if you are interested in our project.The way to deploy is as below.
 
 ### Quick Start
-> The technologies of this project.
-- spring boot： [spring boot开发参考指南](http://www.kailing.pub/PdfReader/web/viewer.html?file=springboot)
+> Technologies in this project
+- spring boot： [spring boot Development Reference Guide](http://www.kailing.pub/PdfReader/web/viewer.html?file=springboot)
 - freemarker
 - redisson 
 - jodconverter
-> Dependent on external environment
+> Dependent External Environment
 - redis 
 - OpenOffice or LibreOffice
 
 1. First step：pull https://github.com/kekingcn/file-online-preview.git
 
-2. Second step：configurate redis address and OpenOffice endpoint，such as
+2. Second step：configure redis address and OpenOffice directory，such as
 ```
 #=============================================#Spring Redisson Configuration#===================================#
 spring.redisson.address = 192.168.1.204:6379
@@ -52,20 +65,20 @@ file.dir = C:\\Users\\yudian\\Desktop\\dev\\
 office.home = C:\\Program Files (x86)\\OpenOffice 4
 
 ```
-'file.dir' is the real storage addres, please end with '/'.
+'file.dir' is the real storage address of the converted files, please end with '/'.
 
 3. Third step：Run the main method of FilePreviewApplication.java.After starting,visit 'http://localhost:8012/'.
-If everything is ok,you will see picture below.
+If everything is ok,you will see the picture below.
 ![输入图片说明](https://gitee.com/uploads/images/2017/1213/100221_ea15202e_492218.png "屏幕截图.png")
 
 ### System Update History
 
-> 2018年01月12日 ：
+> January 12th 2018 ：
 
 1. Support for multiple images preview 
-1. Support for images preview in rar/zip
+1. Support for images rotation preview in rar/zip
 
-> 2018年01月02日 ： 
+> January 2nd 2018 ： 
 
 1. fixed gibberish issue when preview a txt document caused by the file encoding problem 
 1. fixed the issue that some module dependencies can not be found
@@ -74,4 +87,4 @@ If everything is ok,you will see picture below.
 
 ### Register Usage
 If this project is helpful for you, please register on 'https://gitee.com/kekingcn/file-online-preview/issues/IGSBV',
-If this project helps you to economize the service charge for preview of ducuments, as well as you are willing to support us, click 【donate】 below to donate a cup of coffee, we will be so appreciate that.
+If this project helps you to economize the service charge for preview of documents, as well as you are willing to support us, click 【donate】 below to donate a cup of coffee, we would appreciate it.

README.md

@@ -5,6 +5,10 @@
 
 地址：http://file.keking.cn/
 
+### 项目文档（Project documentation）
+1. 中文文档：https://gitee.com/kekingcn/file-online-preview/blob/master/README.md
+1. English document：https://github.com/kekingcn/kkFileView/blob/master/README.en.md
+
 ### 联系我们，加入组织
 > 我们会用心回答解决大家在项目使用中的问题，也请大家在提问前至少Google或baidu过，珍爱生命远离无效的交流沟通