diff --git a/README.rst b/README.rst
index 41ece50c..0c4dad44 100644
--- a/README.rst
+++ b/README.rst
@@ -1,18 +1,16 @@
LabelImg
========
-.. image:: logo/logomark.png
- :width: 250px
- :align: center
-
-========
-
.. image:: https://img.shields.io/pypi/v/labelimg.svg
:target: https://pypi.python.org/pypi/labelimg
.. image:: https://img.shields.io/travis/tzutalin/labelImg.svg
:target: https://travis-ci.org/tzutalin/labelImg
+.. image:: /resources/icons/app.png
+ :width: 200px
+ :align: center
+
LabelImg is a graphical image annotation tool.
It is written in Python and uses Qt for its graphical interface.
@@ -58,7 +56,7 @@ Python 2 + Qt4
python labelImg.py
python labelImg.py [IMAGE_PATH] [PRE-DEFINED CLASS FILE]
-Python 3 + Qt5
+Python 3 + Qt5 (Recommanded)
.. code::
@@ -80,28 +78,29 @@ Python 2 + Qt4
python labelImg.py
python labelImg.py [IMAGE_PATH] [PRE-DEFINED CLASS FILE]
-Python 3 + Qt5 (Works on macOS High Sierra)
+Python 3 + Qt5 (Recommanded)
.. code::
- brew install qt # will install qt-5.x.x
+ brew install qt # Install qt-5.x.x by Homebrew
brew install libxml2
+
+ or
+
+ pip3 install pyqt5 lxml # Install qt and lxml by pip
+
make qt5py3
python3 labelImg.py
python3 labelImg.py [IMAGE_PATH] [PRE-DEFINED CLASS FILE]
- As a side note, if mssing pyrcc5 or lxml, try
- pip3 install pyqt5 lxml
-
**NEW** Python 3 Virtualenv + Binary
-This avoids a lot of the QT / Python version issues,
-and gives you a nice .app file with a new SVG Icon
+
+This can avoid a lot of the QT / Python version issues, and gives you a nice .app file with a new SVG Icon
in your /Applications folder. You can consider this script: build-tools/build-for-macos.sh
.. code::
-
brew install python3
pip install pipenv
pipenv --three
@@ -112,25 +111,13 @@ in your /Applications folder. You can consider this script: build-tools/build-fo
rm -rf build dist
python setup.py py2app -A
mv "dist/labelImg.app" /Applications
-
-Alternate
-Mac OS easiest way to install and run
-STEPS
-
-git clone https://github.com/tzutalin/labelImg
-pip install PyQt5 lxml
-cd labelImg ##(enter the labelImg directory)
-make qt5py3
-python3 labelImg.py
-
Windows
^^^^^^^
-Download and setup `Python 2.6 or
-later `__,
-`PyQt4 `__
+Install `Python `__,
+`PyQt5 `__
and `install lxml `__.
Open cmd and go to the `labelImg <#labelimg>`__ directory
@@ -269,7 +256,7 @@ This is used when creating a dataset automatically, the user can then through al
**Difficult:**
The difficult field being set to 1 indicates that the object has been annotated as "difficult", for example an object which is clearly visible but difficult to recognize without substantial use of context.
-According to your deep neural network implementation, you can include or exclude difficult objects during training.
+According to your deep neural network implementation, you can include or exclude difficult objects during training.
How to contribute
~~~~~~~~~~~~~~~~~
diff --git a/logo/horizontal.png b/logo/horizontal.png
deleted file mode 100644
index e667ff80..00000000
Binary files a/logo/horizontal.png and /dev/null differ
diff --git a/logo/logomark.png b/logo/logomark.png
deleted file mode 100644
index b02b2620..00000000
Binary files a/logo/logomark.png and /dev/null differ
diff --git a/logo/vertical.png b/logo/vertical.png
deleted file mode 100644
index 1c7af5e3..00000000
Binary files a/logo/vertical.png and /dev/null differ
diff --git a/resources.qrc b/resources.qrc
index 1c757d95..37d2f2d2 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -33,5 +33,6 @@
resources/icons/verify.pngresources/strings/strings.propertiesresources/strings/strings-zh-TW.properties
+resources/strings/strings-zh-CN.properties
diff --git a/resources/icons/app.icns b/resources/icons/app.icns
index 3cfa8ed3..9409991b 100644
Binary files a/resources/icons/app.icns and b/resources/icons/app.icns differ
diff --git a/resources/icons/app.png b/resources/icons/app.png
index 94345add..f2dc33e3 100644
Binary files a/resources/icons/app.png and b/resources/icons/app.png differ
diff --git a/resources/icons/app.svg b/resources/icons/app.svg
index bcb03e3b..b691a2e9 100644
--- a/resources/icons/app.svg
+++ b/resources/icons/app.svg
@@ -1,19 +1,30 @@
-
\ No newline at end of file
+
+
+
diff --git a/resources/strings/strings-zh-CN.properties b/resources/strings/strings-zh-CN.properties
new file mode 100644
index 00000000..5459a0ee
--- /dev/null
+++ b/resources/strings/strings-zh-CN.properties
@@ -0,0 +1,65 @@
+saveAsDetail=將标签保存到其他文件
+changeSaveDir=改变存放目录
+openFile=打开文件
+shapeLineColorDetail=更改线条颜色
+resetAll=全部重置
+crtBox=创建区块
+crtBoxDetail=创建一个新的区块
+dupBoxDetail=复制区块
+verifyImg=验证图像
+zoominDetail=放大
+verifyImgDetail=验证图像
+saveDetail=保存标签文件
+openFileDetail=打开图像文件
+fitWidthDetail=调整宽度适应到窗口宽度
+tutorial=YouTube教学
+editLabel=编辑标签
+openAnnotationDetail=打开标签文件
+quit=退出
+shapeFillColorDetail=更改填充颜色
+closeCurDetail=关闭当前文件
+closeCur=关闭文件
+fitWin=调整到窗口大小
+delBox=删除选择的区块
+boxLineColorDetail=选择线框颜色
+originalsize=原始大小
+resetAllDetail=重置所有设定
+zoomoutDetail=放大画面
+save=保存
+saveAs=另存为
+fitWinDetail=缩放到当前窗口大小
+openDir=打开目录
+showHide=显示/隐藏标签
+changeSaveFormat=更改存储格式
+shapeFillColor=填充颜色
+quitApp=退出程序
+dupBox=复制区块
+delBoxDetail=删除区块
+zoomin=放大画面
+info=信息
+openAnnotation=开启标签
+prevImgDetail=上一个图像
+fitWidth=缩放到跟当前画面一样宽
+zoomout=缩小画面
+changeSavedAnnotationDir=更改保存标签文件的预设目录
+nextImgDetail=下一个图像
+originalsizeDetail=放大到原始大小
+prevImg=上一个图像
+tutorialDetail=显示示范内容
+shapeLineColor=形状线条颜色
+boxLineColor=区块线条颜色
+editLabelDetail=修改当前所选的区块颜色
+nextImg=下一个图片
+useDefaultLabel=使用预设标签
+useDifficult=有难度的
+boxLabelText=区块的标签
+labels=标签
+autoSaveMode=自动保存模式
+singleClsMode=单一类别模式
+displayLabel=显示类别
+fileList=文件列表
+files=文件
+advancedMode=专家模式
+advancedModeDetail=切换到专家模式
+showAllBoxDetail=显示所有区块
+hideAllBoxDetail=隐藏所有区块