Update icons, README. Add zh-CN locale

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
+Install `Python <https://www.python.org/downloads/windows/>`__,
-later <https://www.python.org/downloads/windows/>`__,
+`PyQt5 <https://www.riverbankcomputing.com/software/pyqt/download5>`__
-`PyQt4 <https://www.riverbankcomputing.com/software/pyqt/download>`__
 and `install lxml <http://lxml.de/installation.html>`__.
 
 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
 ~~~~~~~~~~~~~~~~~

resources.qrc

@@ -33,5 +33,6 @@
 <file alias="verify">resources/icons/verify.png</file>
 <file alias="strings">resources/strings/strings.properties</file>
 <file alias="strings-zh-TW">resources/strings/strings-zh-TW.properties</file>
+<file alias="strings-zh-CN">resources/strings/strings-zh-CN.properties</file>
 </qresource>
 </RCC>

resources/icons/app.svg

@@ -1,19 +1,30 @@
-<svg width="64" height="64" xmlns="http://www.w3.org/2000/svg">
+<?xml version="1.0" standalone="no"?>
- <defs>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
-  <filter id="svg_10_blur">
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-   <feGaussianBlur stdDeviation="0" in="SourceGraphic"/>
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
-  </filter>
+ width="256.000000pt" height="256.000000pt" viewBox="0 0 256.000000 256.000000"
- </defs>
+ preserveAspectRatio="xMidYMid meet">
- <g>
+<metadata>
-  <title>background</title>
+Created by potrace 1.15, written by Peter Selinger 2001-2017
-  <rect fill="none" id="canvas_background" height="402" width="582" y="-1" x="-1"/>
+</metadata>
- </g>
+<g transform="translate(0.000000,256.000000) scale(0.100000,-0.100000)"
- <g>
+fill="#000000" stroke="none">
-  <title>Layer 1</title>
+<path d="M1410 1595 l0 -35 -107 -1 c-60 -1 -137 -4 -173 -8 l-65 -6 -6 -115
-  <g stroke="null" id="svg_19">
+c-4 -63 -7 -145 -8 -182 l-1 -68 -39 0 c-22 0 -43 -5 -46 -11 -4 -5 -4 -37 0
-   <path stroke="null" opacity="0.2" id="svg_5" fill="#231F20" d="m58.941458,5.713441c-0.033833,0 -0.067666,0 -0.103037,0c-0.030757,0 -0.056901,-0.003076 -0.087658,0l-23.846159,0c-0.579776,0.026144 -1.900803,0.933485 -2.071506,1.104188l-27.895362,27.904589c-1.479428,1.479428 -1.479428,3.878499 0,5.357927l21.41633,21.425557c0.744327,0.739714 1.711645,1.107264 2.678964,1.107264c0.967318,0 1.937712,-0.36755 2.677426,-1.107264l27.893824,-27.904589c0.170703,-0.170703 1.122643,-1.342558 1.122643,-2.071506l0,-23.933817c0.053825,-1.058052 -0.747403,-1.882349 -1.785463,-1.882349zm-5.900794,10.763528c-1.697805,0 -3.075733,-1.377928 -3.075733,-3.075733s1.377928,-3.075733 3.075733,-3.075733s3.075733,1.377928 3.075733,3.075733s-1.377928,3.075733 -3.075733,3.075733z"/>
+-70 l7 -59 39 0 39 0 0 -188 c0 -133 4 -192 12 -200 8 -8 64 -12 185 -12 l173
-   <path stroke="#00bf00" id="svg_8" fill="#2e6fd1" d="m58.941458,2.637708c-0.033833,0 -0.067666,0 -0.103037,0c-0.030757,0 -0.056901,-0.003076 -0.087658,0l-23.846159,0c-0.579776,0.026144 -1.900803,0.933485 -2.071506,1.104188l-27.895362,27.904589c-1.479428,1.479428 -1.479428,3.878499 0,5.357927l21.41633,21.425557c0.744327,0.739714 1.711645,1.107264 2.678964,1.107264c0.967318,0 1.937712,-0.36755 2.677426,-1.107264l27.893824,-27.904589c0.170703,-0.170703 1.122643,-1.342558 1.122643,-2.071506l0,-23.933817c0.053825,-1.058052 -0.747403,-1.882349 -1.785463,-1.882349zm-5.900794,10.763528c-1.697805,0 -3.075733,-1.377928 -3.075733,-3.075733s1.377928,-3.075733 3.075733,-3.075733s3.075733,1.377928 3.075733,3.075733s-1.377928,3.075733 -3.075733,3.075733z"/>
+0 0 -30 0 -30 65 0 65 0 0 30 0 30 185 0 185 0 0 200 0 200 40 0 40 0 0 65 0
-   <text filter="url(#svg_10_blur)" stroke="#000000" transform="matrix(0.5447929800652447,-0.5343019017094763,0.5343019017094763,0.5447929800652447,-3.424396520826477,36.238999138928264) " font-weight="bold" xml:space="preserve" text-anchor="start" font-family="Oswald, sans-serif" font-size="24" id="svg_10" y="36.27526" x="14.460123" stroke-width="0" fill="#ffffff">VOC</text>
+65 -40 0 -40 0 -2 188 -3 187 -130 6 c-71 4 -151 7 -177 8 -48 1 -48 1 -48 36
-  </g>
+l0 35 -75 0 -75 0 0 -35z m10 -225 l5 -45 60 0 60 0 3 48 3 47 114 0 c135 0
- </g>
+127 9 123 -145 l-3 -100 -37 -3 -38 -3 0 -64 0 -64 38 -3 37 -3 3 -105 c4
-</svg>
+-160 13 -150 -123 -150 l-115 0 0 50 0 50 -65 0 -65 0 0 -50 0 -50 -115 0
+-115 0 0 130 0 130 40 0 40 0 0 65 0 65 -40 0 -40 0 0 125 0 126 113 -3 112
+-3 5 -45z"/>
+<path d="M71 986 l-1 -330 32 45 c18 24 37 47 43 51 12 8 20 381 10 476 l-7
+62 -33 0 c-18 0 -36 6 -38 13 -3 6 -6 -136 -6 -317z"/>
+<path d="M284 1102 c-39 -3 -42 -5 -48 -40 -3 -20 -6 -151 -6 -291 l0 -255 24
+35 c14 19 39 52 55 75 l31 41 -1 154 c-1 85 -4 183 -8 219 l-6 65 -41 -3z"/>
+<path d="M415 959 c-3 -13 -4 -150 -3 -304 l3 -280 132 180 c73 99 138 187
+145 195 16 18 51 66 110 150 l45 65 -205 -3 c-155 -2 -207 0 -213 10 -5 8 -10
+4 -14 -13z"/>
+</g>
+</svg>

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=隐藏所有区块