diff --git a/translations/deepin-draw_ru.ts b/translations/deepin-draw_ru.ts
index cb4683d3..043f409a 100644
--- a/translations/deepin-draw_ru.ts
+++ b/translations/deepin-draw_ru.ts
@@ -1,58 +1,74 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="ru" sourcelanguage="en_US">
+<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="ru">
+<context>
+    <name>AdjustmentAtrriWidget</name>
+    <message>
+        <location filename="../src/deepin-draw/attribution/adjustmentatrriwidget.cpp" line="35"/>
+        <location filename="../src/deepin-draw/attribution/adjustmentatrriwidget.cpp" line="39"/>
+        <source>Auto fit</source>
+        <translation>Автозаполнение</translation>
+    </message>
+</context>
 <context>
     <name>Application</name>
     <message>
-        <location filename="../src/application.cpp" line="427"/>
+        <location filename="../src/application.cpp" line="407"/>
+        <location filename="../src/deepin-draw/drawfiles/application.cpp" line="402"/>
         <source>OK</source>
-        <translation>Ок</translation>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../src/application.cpp" line="104"/>
-        <location filename="../src/application.cpp" line="150"/>
+        <location filename="../src/application.cpp" line="90"/>
+        <location filename="../src/application.cpp" line="136"/>
+        <location filename="../src/deepin-draw/drawfiles/application.cpp" line="78"/>
+        <location filename="../src/deepin-draw/drawfiles/application.cpp" line="124"/>
         <source>Draw</source>
         <translation>Рисование</translation>
     </message>
     <message>
-        <location filename="../src/application.cpp" line="426"/>
+        <location filename="../src/application.cpp" line="406"/>
+        <location filename="../src/deepin-draw/drawfiles/application.cpp" line="401"/>
         <source>You can import up to 30 pictures, please try again!</source>
         <translation>Вы можете импортировать до 30 изображений, пожалуйста, попробуйте ещё раз!</translation>
     </message>
 </context>
 <context>
-    <name>BlurWidget</name>
-    <message>
-        <location filename="../src/frame/AttributesWidgets/private/blurwidget.cpp" line="100"/>
-        <source>Type</source>
-        <translation>Тип</translation>
-    </message>
+    <name>BlurAttriRegister</name>
     <message>
-        <location filename="../src/frame/AttributesWidgets/private/blurwidget.cpp" line="110"/>
+        <location filename="../src/deepin-draw/attribution/attrbuionregisters/itemstyleregisters.cpp" line="243"/>
         <source>Blur</source>
         <translation>Размытие</translation>
     </message>
     <message>
-        <location filename="../src/frame/AttributesWidgets/private/blurwidget.cpp" line="123"/>
+        <location filename="../src/deepin-draw/attribution/attrbuionregisters/itemstyleregisters.cpp" line="244"/>
         <source>Mosaic</source>
         <translation>Мозаика</translation>
     </message>
     <message>
-        <location filename="../src/frame/AttributesWidgets/private/blurwidget.cpp" line="146"/>
-        <source>Width</source>
-        <translation>Ширина</translation>
+        <location filename="../src/deepin-draw/attribution/attrbuionregisters/itemstyleregisters.cpp" line="267"/>
+        <source>width</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BlurTool</name>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawtools/blurtool.cpp" line="64"/>
+        <source>Blur (B)</source>
+        <translation>Размытие (B)</translation>
     </message>
 </context>
 <context>
     <name>CAbstractProcessDialog</name>
     <message>
-        <location filename="../src/widgets/dialog/cprogressdialog.cpp" line="105"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cprogressdialog.cpp" line="117"/>
         <source>Export</source>
-        <translation>Экспортировать</translation>
+        <translation>Экспорт</translation>
     </message>
 </context>
 <context>
     <name>CAlphaControlWidget</name>
     <message>
-        <location filename="../src/frame/AttributesWidgets/private/calphacontrolwidget.cpp" line="65"/>
+        <location filename="../src/drawboard/drawboard/widgets/colorWidget/private/calphacontrolwidget.cpp" line="68"/>
         <source>Alpha</source>
         <translation>Прозрачность</translation>
     </message>
@@ -60,17 +76,17 @@
 <context>
     <name>CCutDialog</name>
     <message>
-        <location filename="../src/widgets/dialog/ccutdialog.cpp" line="41"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/ccutdialog.cpp" line="75"/>
         <source>Discard</source>
         <translation>Забыть</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/ccutdialog.cpp" line="42"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/ccutdialog.cpp" line="75"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/ccutdialog.cpp" line="47"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/ccutdialog.cpp" line="74"/>
         <source>Do you want to save the cropped image?</source>
         <translation>Сохранить обрезанное изображение?</translation>
     </message>
@@ -78,491 +94,451 @@
 <context>
     <name>CCutTool</name>
     <message>
-        <location filename="../src/drawshape/drawTools/ccuttool.cpp" line="90"/>
-        <source>Crop (C)</source>
-        <translation>Обрезать (C)</translation>
-    </message>
-</context>
-<context>
-    <name>CCutWidget</name>
-    <message>
-        <location filename="../src/frame/AttributesWidgets/private/ccutwidget.cpp" line="230"/>
-        <source>Dimensions</source>
-        <translation>Размеры</translation>
-    </message>
-    <message>
-        <location filename="../src/frame/AttributesWidgets/private/ccutwidget.cpp" line="245"/>
-        <source>x</source>
-        <translation>x</translation>
-    </message>
-    <message>
-        <location filename="../src/frame/AttributesWidgets/private/ccutwidget.cpp" line="295"/>
-        <source>Aspect ratio</source>
-        <translation>Соотношение сторон</translation>
-    </message>
-    <message>
-        <location filename="../src/frame/AttributesWidgets/private/ccutwidget.cpp" line="336"/>
-        <source>Free</source>
-        <translation>Свободно</translation>
-    </message>
-    <message>
-        <location filename="../src/frame/AttributesWidgets/private/ccutwidget.cpp" line="343"/>
-        <source>Original</source>
-        <translation>Оригинал</translation>
-    </message>
-</context>
-<context>
-    <name>CEllipseTool</name>
-    <message>
-        <location filename="../src/drawshape/drawTools/cellipsetool.cpp" line="57"/>
-        <source>Ellipse (O)</source>
-        <translation>Эллипс (O)</translation>
-    </message>
-</context>
-<context>
-    <name>CEraserTool</name>
-    <message>
-        <location filename="../src/drawshape/drawTools/cerasertool.cpp" line="98"/>
-        <source>Eraser (E)</source>
-        <translation>Ластик (E)</translation>
-    </message>
-    <message>
-        <location filename="../src/drawshape/drawTools/cerasertool.cpp" line="113"/>
-        <source>Width</source>
-        <translation>Ширина</translation>
+        <location filename="../src/deepin-draw/drawtools/ccuttool.cpp" line="102"/>
+        <source>Crop canvas (C)</source>
+        <translation>Обрезать холст (С)</translation>
     </message>
 </context>
 <context>
     <name>CExportImageDialog</name>
     <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="548"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="432"/>
         <source>Percentage</source>
         <translation>Процент</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="562"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="460"/>
         <source>Pixels</source>
         <translation>Точек</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="564"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="462"/>
         <source>Dimensions:</source>
         <translation>Размер:</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="586"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="471"/>
         <source>Lock aspect ratio</source>
         <translation>Фиксированное соотношение сторон</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="595"/>
-        <source>W:</source>
-        <translation>Ш:</translation>
-    </message>
-    <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="600"/>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="611"/>
-        <source>pixels</source>
-        <translation>точек</translation>
-    </message>
-    <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="605"/>
-        <source>H:</source>
-        <translation>В:</translation>
-    </message>
-    <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="868"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="797"/>
         <source>It supports up to 10,000 pixels</source>
         <translation>Поддерживается до 10 000 точек</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="98"/>
-        <source>Unnamed</source>
-        <translation>Безымянный</translation>
-    </message>
-    <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="173"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="185"/>
         <source>Export</source>
-        <translation>Экспортировать</translation>
+        <translation>Экспорт</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="186"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="203"/>
         <source>Pictures</source>
         <translation>Изображения</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="188"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="204"/>
         <source>Documents</source>
         <translation>Документы</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="189"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="205"/>
         <source>Downloads</source>
         <translation>Загрузки</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="190"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="206"/>
         <source>Desktop</source>
         <translation>Рабочий стол</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="191"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="207"/>
         <source>Videos</source>
         <translation>Видео</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="192"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="208"/>
         <source>Music</source>
         <translation>Музыка</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="193"/>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="207"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="209"/>
         <source>Select other directories</source>
         <translation>Выбрать другие папки</translation>
     </message>
     <message>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="214"/>
         <source>jpg</source>
-        <translation type="vanished">jpg</translation>
+        <translation>jpg</translation>
     </message>
     <message>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="213"/>
         <source>png</source>
-        <translation type="vanished">png</translation>
+        <translation>png</translation>
     </message>
     <message>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="215"/>
         <source>bmp</source>
-        <translation type="vanished">bmp</translation>
+        <translation>bmp</translation>
     </message>
     <message>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="216"/>
         <source>tif</source>
-        <translation type="vanished">tif</translation>
+        <translation>tif</translation>
     </message>
     <message>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="217"/>
         <source>pdf</source>
-        <translation type="vanished">pdf</translation>
+        <translation>pdf</translation>
+    </message>
+    <message>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="218"/>
+        <source>ppm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="219"/>
+        <source>xbm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="220"/>
+        <source>xpm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="265"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="252"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="266"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="253"/>
         <source>Save to:</source>
         <translation>Сохранить в:</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="268"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="254"/>
         <source>Format:</source>
         <translation>Формат:</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="269"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="256"/>
         <source>Quality:</source>
         <translation>Качество:</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="275"/>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="281"/>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="407"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="262"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="338"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="399"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="276"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="263"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="282"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="399"/>
         <source>Replace</source>
         <translation>Заменить</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="406"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="337"/>
         <source>This file will be hidden if the file name starts with a dot (.). Do you want to hide it?</source>
-        <translation>Файл станет скрытым если имя начинается с точки (.). Хотите скрыть файл?</translation>
+        <translation>Этот файл будет скрыт, если имя файла начинается с точки (.). Вы хотите скрыть его?</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="407"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="338"/>
         <source>Confirm</source>
         <translation>Подтвердить</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="421"/>
-        <source>OK</source>
-        <translation>Ок</translation>
-    </message>
-    <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="423"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="350"/>
         <source>The file name is too long</source>
         <translation>Слишком длинное имя файла</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="506"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="397"/>
         <source>%1 
  already exists, do you want to replace it?</source>
         <translation>%1 
  уже существует, хотите перезаписать?</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/cexportimagedialog.cpp" line="866"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="479"/>
+        <source>W</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="495"/>
+        <source>H</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/cexportimagedialog.cpp" line="795"/>
         <source>At least one pixel please</source>
         <translation>Не менее 1 точки</translation>
     </message>
 </context>
 <context>
-    <name>CLineTool</name>
+    <name>CloseTool</name>
     <message>
-        <location filename="../src/drawshape/drawTools/clinetool.cpp" line="58"/>
-        <source>Line (L)</source>
-        <translation>Линия (L)</translation>
+        <location filename="../src/drawboard/drawboard/drawtools/buttontool.cpp" line="172"/>
+        <source>close</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CPenTool</name>
-    <message>
-        <location filename="../src/drawshape/drawTools/cpentool.cpp" line="79"/>
-        <source>Pencil (P)</source>
-        <translation>Карандаш (P)</translation>
-    </message>
+    <name>ColorPanel</name>
     <message>
-        <location filename="../src/drawshape/drawTools/cpentool.cpp" line="96"/>
-        <source>Start</source>
-        <translation>Начало</translation>
+        <location filename="../src/drawboard/drawboard/widgets/colorWidget/private/ccolorpanel.cpp" line="84"/>
+        <source>color panel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/drawshape/drawTools/cpentool.cpp" line="124"/>
-        <source>End</source>
-        <translation>Конец</translation>
+        <location filename="../src/drawboard/drawboard/widgets/colorWidget/private/ccolorpanel.cpp" line="117"/>
+        <source>Color</source>
+        <translation>Цвет</translation>
     </message>
     <message>
-        <location filename="../src/drawshape/drawTools/cpentool.cpp" line="167"/>
-        <source>Watercolor</source>
-        <translation>Акварель</translation>
+        <location filename="../src/drawboard/drawboard/widgets/colorWidget/private/ccolorpanel.cpp" line="211"/>
+        <source>More color</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ColorStyleWidget</name>
     <message>
-        <location filename="../src/drawshape/drawTools/cpentool.cpp" line="168"/>
-        <source>Calligraphy pen</source>
-        <translation>Каллиграфическое перо</translation>
+        <location filename="../src/deepin-draw/attribution/stylewidgets/colorstylewidget.cpp" line="61"/>
+        <source>color</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/drawshape/drawTools/cpentool.cpp" line="169"/>
-        <source>Crayon</source>
-        <translation>Пастель</translation>
+        <location filename="../src/deepin-draw/attribution/stylewidgets/colorstylewidget.cpp" line="75"/>
+        <source>Fill</source>
+        <translation>Заливка</translation>
     </message>
+</context>
+<context>
+    <name>CommonAttributionRegister</name>
     <message>
-        <location filename="../src/drawshape/drawTools/cpentool.cpp" line="514"/>
-        <source>Style</source>
-        <translation>Стиль</translation>
+        <location filename="../src/deepin-draw/attribution/attrbuionregisters/commonattributionregister.cpp" line="82"/>
+        <source>Border</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CPictureTool</name>
+    <name>CutAttributionWidget</name>
     <message>
-        <location filename="../src/drawshape/drawTools/cpicturetool.cpp" line="87"/>
-        <source>Import (I)</source>
-        <translation>Импорт (I)</translation>
+        <location filename="../src/deepin-draw/attribution/stylewidgets/cutattributionwidget.cpp" line="26"/>
+        <source>scale</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/drawshape/drawTools/cpicturetool.cpp" line="114"/>
-        <source>Rotate 90° CCW</source>
-        <translation>Повернуть на 90° против часовой стрелки</translation>
+        <location filename="../src/deepin-draw/attribution/stylewidgets/cutattributionwidget.cpp" line="57"/>
+        <source>original</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/drawshape/drawTools/cpicturetool.cpp" line="132"/>
-        <source>Rotate 90° CW</source>
-        <translation>Повернуть на 90° по часовой стрелке</translation>
+        <location filename="../src/deepin-draw/attribution/stylewidgets/cutattributionwidget.cpp" line="57"/>
+        <source>free</source>
+        <translation>не занято</translation>
     </message>
     <message>
-        <location filename="../src/drawshape/drawTools/cpicturetool.cpp" line="149"/>
-        <source>Flip horizontally</source>
-        <translation>Отразить по горизонтали</translation>
+        <location filename="../src/deepin-draw/attribution/stylewidgets/cutattributionwidget.cpp" line="77"/>
+        <source>cancel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/drawshape/drawTools/cpicturetool.cpp" line="169"/>
-        <source>Flip vertically</source>
-        <translation>Отразить по вертикали</translation>
-    </message>
-    <message>
-        <location filename="../src/drawshape/drawTools/cpicturetool.cpp" line="188"/>
-        <source>Auto fit</source>
-        <translation>Автозаполнение</translation>
-    </message>
-    <message>
-        <location filename="../src/drawshape/drawTools/cpicturetool.cpp" line="232"/>
-        <source>Import Picture</source>
-        <translation>Импортировать изображение</translation>
+        <location filename="../src/deepin-draw/attribution/stylewidgets/cutattributionwidget.cpp" line="78"/>
+        <source>confirm</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CPolygonTool</name>
+    <name>DataHander</name>
     <message>
-        <location filename="../src/drawshape/drawTools/cpolygontool.cpp" line="69"/>
-        <source>Polygon (H)</source>
-        <translation>Многоугольник (H)</translation>
+        <location filename="../src/drawboard/drawboard/dataHander/datahander.cpp" line="78"/>
+        <location filename="../src/drawboard/drawboard/dataHander/datahander.cpp" line="105"/>
+        <location filename="../src/drawboard/drawboard/dataHander/datahander.cpp" line="122"/>
+        <source>Unable to open &quot;%1&quot;, unsupported file format</source>
+        <translation>Невозможно открыть &quot;%1&quot;, неподдерживаемый формат файла</translation>
     </message>
     <message>
-        <location filename="../src/drawshape/drawTools/cpolygontool.cpp" line="86"/>
-        <source>Sides</source>
-        <translation>Стороны</translation>
+        <location filename="../src/drawboard/drawboard/dataHander/datahander.cpp" line="85"/>
+        <location filename="../src/drawboard/drawboard/dataHander/datahander.cpp" line="134"/>
+        <source>This file is read-only, please save with another name</source>
+        <translation>Этот файл предназначен только для чтения, пожалуйста сохраните под другим именем</translation>
     </message>
-</context>
-<context>
-    <name>CPolygonalStarTool</name>
     <message>
-        <location filename="../src/drawshape/drawTools/cpolygonalstartool.cpp" line="49"/>
-        <source>Star (F)</source>
-        <translation>Звезда (F)</translation>
+        <location filename="../src/drawboard/drawboard/dataHander/datahander.cpp" line="99"/>
+        <location filename="../src/drawboard/drawboard/dataHander/datahander.cpp" line="139"/>
+        <source>The file does not exist</source>
+        <translation>Файл не существует</translation>
     </message>
     <message>
-        <location filename="../src/drawshape/drawTools/cpolygonalstartool.cpp" line="90"/>
-        <source>Points</source>
-        <translation>Точки</translation>
+        <location filename="../src/drawboard/drawboard/dataHander/datahander.cpp" line="111"/>
+        <location filename="../src/drawboard/drawboard/dataHander/datahander.cpp" line="129"/>
+        <source>Unable to open the write-only file &quot;%1&quot;</source>
+        <translation>Невозможно открыть,  файл &quot;%1&quot;  предназначен только для записи</translation>
     </message>
     <message>
-        <location filename="../src/drawshape/drawTools/cpolygonalstartool.cpp" line="97"/>
-        <source>Radius</source>
-        <translation>Радиус</translation>
+        <location filename="../src/drawboard/drawboard/dataHander/datahander.cpp" line="146"/>
+        <source>Unable to open the broken file &quot;%1&quot;</source>
+        <translation>Невозможно открыть поврежденный файл &quot;%1&quot;</translation>
     </message>
 </context>
 <context>
-    <name>CRectTool</name>
-    <message>
-        <location filename="../src/drawshape/drawTools/crecttool.cpp" line="68"/>
-        <source>Rectangle (R)</source>
-        <translation>Прямоугольник (R)</translation>
-    </message>
+    <name>DdfHander</name>
     <message>
-        <location filename="../src/drawshape/drawTools/crecttool.cpp" line="136"/>
-        <source>Fill</source>
-        <translation>Заливка</translation>
+        <location filename="../src/drawboard/drawboard/dataHander/ddfHander/ddfhander.cpp" line="220"/>
+        <source>Opening...</source>
+        <translation>Открываю...</translation>
     </message>
     <message>
-        <location filename="../src/drawshape/drawTools/crecttool.cpp" line="142"/>
-        <source>Corner Radius</source>
-        <translation>Угловой радиус</translation>
+        <location filename="../src/drawboard/drawboard/dataHander/ddfHander/ddfhander.cpp" line="252"/>
+        <source>Saving...</source>
+        <translation>Сохранение...</translation>
     </message>
     <message>
-        <location filename="../src/drawshape/drawTools/crecttool.cpp" line="273"/>
-        <source>Width</source>
-        <translation>Ширина</translation>
+        <location filename="../src/drawboard/drawboard/dataHander/ddfHander/ddfhander.cpp" line="298"/>
+        <source>Unable to open the broken file</source>
+        <translation>Невозможно открыть поврежденный файл</translation>
     </message>
 </context>
 <context>
-    <name>CSelectTool</name>
-    <message>
-        <location filename="../src/drawshape/drawTools/cselecttool.cpp" line="90"/>
-        <source>Select (V)</source>
-        <translation>Выделить (V)</translation>
-    </message>
+    <name>DdfUnitProccessor_5_8_0_20</name>
     <message>
-        <location filename="../src/drawshape/drawTools/cselecttool.cpp" line="124"/>
-        <source>Unnamed</source>
-        <translation>Безымянный</translation>
+        <location filename="../src/drawboard/drawboard/dataHander/ddfHander/ddfProcessor/ddfproccessor_5_8_0_20.cpp" line="101"/>
+        <source>Unable to open the broken file &quot;%1&quot;</source>
+        <translation>Невозможно открыть поврежденный файл &quot;%1&quot;</translation>
     </message>
 </context>
 <context>
-    <name>CTextTool</name>
-    <message>
-        <location filename="../src/drawshape/drawTools/ctexttool.cpp" line="68"/>
-        <source>Color</source>
-        <translation>Цвет</translation>
-    </message>
-    <message>
-        <location filename="../src/drawshape/drawTools/ctexttool.cpp" line="99"/>
-        <source>Text (T)</source>
-        <translation>Текст (T)</translation>
-    </message>
+    <name>DdfUnitProccessor_5_8_0_Compatibel</name>
     <message>
-        <location filename="../src/drawshape/drawTools/ctexttool.cpp" line="229"/>
-        <source>Input text here</source>
-        <translation>Введите текст здесь</translation>
+        <location filename="../src/drawboard/drawboard/dataHander/ddfHander/ddfProcessor/ddfproccessor.cpp" line="719"/>
+        <source>The blur effect will be lost as the file is in old version. Proceed to open it?</source>
+        <translation>Эффект размытия будет утерян, так как файл создан в предыдущей версии ПО. Открыть файл?</translation>
     </message>
     <message>
-        <location filename="../src/drawshape/drawTools/ctexttool.cpp" line="328"/>
-        <source>Weight</source>
-        <translation>Ширина</translation>
+        <location filename="../src/drawboard/drawboard/dataHander/ddfHander/ddfProcessor/ddfproccessor.cpp" line="720"/>
+        <location filename="../src/drawboard/drawboard/dataHander/ddfHander/ddfProcessor/ddfproccessor.cpp" line="729"/>
+        <source>Open</source>
+        <translation>Открыть</translation>
     </message>
     <message>
-        <location filename="../src/drawshape/drawTools/ctexttool.cpp" line="344"/>
-        <source>Font</source>
-        <translation>Шрифт</translation>
+        <location filename="../src/drawboard/drawboard/dataHander/ddfHander/ddfProcessor/ddfproccessor.cpp" line="720"/>
+        <location filename="../src/drawboard/drawboard/dataHander/ddfHander/ddfProcessor/ddfproccessor.cpp" line="729"/>
+        <source>Cancel</source>
+        <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../src/drawshape/drawTools/ctexttool.cpp" line="469"/>
-        <source>Size</source>
-        <translation>Размер</translation>
+        <location filename="../src/drawboard/drawboard/dataHander/ddfHander/ddfProcessor/ddfproccessor.cpp" line="728"/>
+        <source>The pen effect will be lost as the file is in old version. Proceed to open it?</source>
+        <translation>Эффект пера будет потерян, так как файл в старой версии. Приступить к его открытию?</translation>
     </message>
 </context>
 <context>
-    <name>CTriangleTool</name>
+    <name>DdfUnitProccessor_chaos</name>
     <message>
-        <location filename="../src/drawshape/drawTools/ctriangletool.cpp" line="62"/>
-        <source>Triangle (S)</source>
-        <translation>Треугольник (S)</translation>
+        <location filename="../src/drawboard/drawboard/dataHander/ddfHander/ddfProcessor/ddfproccessor.cpp" line="376"/>
+        <source>Saving...</source>
+        <translation>Сохранение...</translation>
     </message>
-</context>
-<context>
-    <name>ColorPanel</name>
     <message>
-        <location filename="../src/frame/AttributesWidgets/private/colorpanel.cpp" line="175"/>
-        <source>Color</source>
-        <translation>Цвет</translation>
+        <location filename="../src/drawboard/drawboard/dataHander/ddfHander/ddfProcessor/ddfproccessor.cpp" line="544"/>
+        <source>Unable to save. There is not enough disk space.</source>
+        <translation>Невозможно сохранить изменения. Недостаточно места на диске.</translation>
     </message>
 </context>
 <context>
-    <name>DrawAttribution::CGroupButtonWgt</name>
+    <name>DrawBoard</name>
     <message>
-        <location filename="../src/frame/AttributesWidgets/private/cattributeitemwidget.cpp" line="487"/>
-        <location filename="../src/frame/AttributesWidgets/private/cattributeitemwidget.cpp" line="499"/>
-        <source>Group</source>
-        <translation>Группирование</translation>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/drawboard.cpp" line="214"/>
+        <source>The file does not exist</source>
+        <translation>Файл не существует</translation>
     </message>
     <message>
-        <location filename="../src/frame/AttributesWidgets/private/cattributeitemwidget.cpp" line="490"/>
-        <location filename="../src/frame/AttributesWidgets/private/cattributeitemwidget.cpp" line="507"/>
-        <source>Ungroup</source>
-        <translation>Отменить группирование</translation>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/drawboard.cpp" line="226"/>
+        <source>Unable to open the write-only file &quot;%1&quot;</source>
+        <translation>Невозможно открыть,  файл &quot;%1&quot;  предназначен только для записи</translation>
+    </message>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/drawboard.cpp" line="231"/>
+        <source>Unable to open &quot;%1&quot;, unsupported file format</source>
+        <translation>Невозможно открыть &quot;%1&quot;, неподдерживаемый формат файла</translation>
     </message>
 </context>
 <context>
     <name>DrawDialog</name>
     <message>
-        <location filename="../src/widgets/dialog/drawdialog.cpp" line="42"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/drawdialog.cpp" line="48"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/drawdialog.cpp" line="81"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/drawdialog.cpp" line="43"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/drawdialog.cpp" line="49"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/drawdialog.cpp" line="81"/>
         <source>Discard</source>
         <translation>Забыть</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/drawdialog.cpp" line="44"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/drawdialog.cpp" line="50"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/drawdialog.cpp" line="81"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/drawdialog.cpp" line="47"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/drawdialog.cpp" line="52"/>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/drawdialog.cpp" line="81"/>
         <source>Save the current contents?</source>
         <translation>Сохранить текущее содержимое?</translation>
     </message>
 </context>
+<context>
+    <name>EllipseTool</name>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawtools/ellipsetool.cpp" line="41"/>
+        <source>Ellipse (O)</source>
+        <translation>Эллипс (O)</translation>
+    </message>
+</context>
+<context>
+    <name>EraserAttriRegister</name>
+    <message>
+        <location filename="../src/deepin-draw/attribution/attrbuionregisters/itemstyleregisters.cpp" line="225"/>
+        <source>width</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EraserTool</name>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawtools/erasertool.cpp" line="57"/>
+        <source>Eraser (E)</source>
+        <translation>Ластик (E)</translation>
+    </message>
+</context>
 <context>
     <name>FileHander</name>
     <message>
-        <location filename="../src/service/filehander.cpp" line="596"/>
+        <location filename="../src/drawboard/drawboard/dataHander/DataHanderInterface.cpp" line="545"/>
+        <location filename="../src/service/filehander.cpp" line="593"/>
         <source>Opening...</source>
         <translation>Открываю...</translation>
     </message>
     <message>
-        <location filename="../src/service/filehander.cpp" line="623"/>
+        <location filename="../src/drawboard/drawboard/dataHander/DataHanderInterface.cpp" line="569"/>
+        <location filename="../src/service/filehander.cpp" line="620"/>
         <source>Saving...</source>
         <translation>Сохранение...</translation>
     </message>
     <message>
-        <location filename="../src/service/filehander.cpp" line="650"/>
+        <location filename="../src/drawboard/drawboard/dataHander/DataHanderInterface.cpp" line="602"/>
+        <location filename="../src/service/filehander.cpp" line="647"/>
         <source>Damaged file, unable to open it</source>
         <translation>Невозможно открыть файл, так как он поврежден</translation>
     </message>
@@ -573,7 +549,8 @@
         <translation>Файл не существует</translation>
     </message>
     <message>
-        <location filename="../src/service/filehander.cpp" line="724"/>
+        <location filename="../src/drawboard/drawboard/dataHander/DataHanderInterface.cpp" line="672"/>
+        <location filename="../src/service/filehander.cpp" line="721"/>
         <source>Unable to open &quot;%1&quot;, unsupported file format</source>
         <translation>Невозможно открыть &quot;%1&quot;, неподдерживаемый формат файла</translation>
     </message>
@@ -583,12 +560,15 @@
         <translation>Имя файла не должно содержать  \/:*?&quot;&lt;&gt;|</translation>
     </message>
     <message>
-        <location filename="../src/service/filehander.cpp" line="839"/>
+        <location filename="../src/drawboard/drawboard/dataHander/DataHanderInterface.cpp" line="776"/>
+        <location filename="../src/service/filehander.cpp" line="836"/>
         <source>Unable to open the write-only file &quot;%1&quot;</source>
         <translation>Невозможно открыть,  файл &quot;%1&quot;  предназначен только для записи</translation>
     </message>
     <message>
-        <location filename="../src/service/filehander.cpp" line="852"/>
+        <location filename="../src/drawboard/drawboard/dataHander/DataHanderInterface.cpp" line="789"/>
+        <location filename="../src/drawboard/drawboard/dataHander/DataHanderInterface.cpp" line="797"/>
+        <location filename="../src/service/filehander.cpp" line="849"/>
         <source>This file is read-only, please save with another name</source>
         <translation>Этот файл предназначен только для чтения, пожалуйста сохраните под другим именем</translation>
     </message>
@@ -598,12 +578,14 @@
         <translation>У вас нет разрешений на сохранение тут файлов, измените разрешения и попробуйте еще раз</translation>
     </message>
     <message>
-        <location filename="../src/service/filehander.cpp" line="881"/>
+        <location filename="../src/drawboard/drawboard/dataHander/DataHanderInterface.cpp" line="818"/>
+        <location filename="../src/service/filehander.cpp" line="878"/>
         <source>The file is incompatible with the old app, please install the latest version</source>
         <translation>Файл не совместим с предыдущей версией программного обеспечения. Пожалуйста установите последнюю версию ПО.</translation>
     </message>
     <message>
-        <location filename="../src/service/filehander.cpp" line="899"/>
+        <location filename="../src/drawboard/drawboard/dataHander/DataHanderInterface.cpp" line="834"/>
+        <location filename="../src/service/filehander.cpp" line="896"/>
         <source>Unable to open the broken file &quot;%1&quot;</source>
         <translation>Невозможно открыть поврежденный файл &quot;%1&quot;</translation>
     </message>
@@ -611,220 +593,372 @@
 <context>
     <name>FileSelectDialog</name>
     <message>
-        <location filename="../src/frame/cmultiptabbarwidget.cpp" line="202"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/drawboardtab.cpp" line="202"/>
         <source>The file name must not contain \/:*?&quot;&lt;&gt;|</source>
         <translation>Имя файла не должно содержать  \/:*?&quot;&lt;&gt;|</translation>
     </message>
     <message>
-        <location filename="../src/frame/cmultiptabbarwidget.cpp" line="204"/>
-        <source>OK</source>
-        <translation>Ок</translation>
-    </message>
-    <message>
-        <location filename="../src/frame/cmultiptabbarwidget.cpp" line="231"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/drawboardtab.cpp" line="215"/>
         <source>Cannot save it as %1, since the file in that name is open now.
 Please save it in another name or close that file and try again.</source>
         <translation>Невозможно сохранить как %1, так как файл с таким именем уже открыт. Пожалуйста сохраните файл под другим именем, или закройте файл и попробуйте заново.</translation>
     </message>
 </context>
 <context>
-    <name>IBlurTool</name>
+    <name>FillTool</name>
     <message>
-        <location filename="../src/drawshape/drawTools/cmasicotool.cpp" line="148"/>
-        <source>Blur (B)</source>
-        <translation>Размытие (B)</translation>
+        <location filename="../src/drawboard/toolplugins/fillTool/cfilltool.cpp" line="100"/>
+        <source>Paint bucket</source>
+        <translation>Заливка</translation>
+    </message>
+</context>
+<context>
+    <name>GroupButtonWidget</name>
+    <message>
+        <location filename="../src/deepin-draw/attribution/groupbuttonwidget.cpp" line="17"/>
+        <source>group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/attribution/groupbuttonwidget.cpp" line="26"/>
+        <source>ungroup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/attribution/groupbuttonwidget.cpp" line="32"/>
+        <source>Group</source>
+        <translation>Группировать</translation>
+    </message>
+</context>
+<context>
+    <name>ImageHander</name>
+    <message>
+        <location filename="../src/drawboard/drawboard/dataHander/datahander.cpp" line="234"/>
+        <source>Damaged file, unable to open it</source>
+        <translation>Невозможно открыть файл, так как он поврежден</translation>
+    </message>
+</context>
+<context>
+    <name>ImageLoadTool</name>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawtools/imageloadtool.cpp" line="42"/>
+        <source>Import (I)</source>
+        <translation>Импорт (I)</translation>
+    </message>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawtools/imageloadtool.cpp" line="95"/>
+        <source>Import Picture</source>
+        <translation>Импортировать изображение</translation>
+    </message>
+</context>
+<context>
+    <name>LineTool</name>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawtools/linetool.cpp" line="40"/>
+        <source>Line (L)</source>
+        <translation>Линия (L)</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/frame/mainwindow.cpp" line="105"/>
+        <location filename="../src/deepin-draw/drawfiles/mainwindow.cpp" line="135"/>
         <source>Draw</source>
         <translation>Рисование</translation>
     </message>
     <message>
-        <location filename="../src/frame/mainwindow.cpp" line="200"/>
+        <location filename="../src/deepin-draw/drawfiles/mainwindow.cpp" line="243"/>
         <source>Export successful</source>
         <translation>Экспортирование прошло успешно</translation>
     </message>
     <message>
-        <location filename="../src/frame/mainwindow.cpp" line="200"/>
+        <location filename="../src/deepin-draw/drawfiles/mainwindow.cpp" line="243"/>
         <source>Export failed</source>
         <translation>Ошибка экспортирования</translation>
     </message>
     <message>
-        <location filename="../src/frame/mainwindow.cpp" line="228"/>
+        <location filename="../src/deepin-draw/drawfiles/mainwindow.cpp" line="274"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
 </context>
+<context>
+    <name>NumberSlider</name>
+    <message>
+        <location filename="../src/drawboard/drawboard/widgets/colorWidget/private/cnumbersliderwidget.cpp" line="49"/>
+        <source>Percent</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>OpenTool</name>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawtools/buttontool.cpp" line="191"/>
+        <source>Import Picture</source>
+        <translation>Импортировать изображение</translation>
+    </message>
+</context>
+<context>
+    <name>OrderWidget</name>
+    <message>
+        <location filename="../src/deepin-draw/attribution/orderwidget.cpp" line="19"/>
+        <source>Order</source>
+        <translation>Порядок</translation>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/attribution/orderwidget.cpp" line="20"/>
+        <source>Raise layer</source>
+        <translation>На уровень выше</translation>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/attribution/orderwidget.cpp" line="21"/>
+        <source>Lower layer</source>
+        <translation>На уровень ниже</translation>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/attribution/orderwidget.cpp" line="22"/>
+        <source>Layer to Top</source>
+        <translation>На передний план</translation>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/attribution/orderwidget.cpp" line="23"/>
+        <source>Layer to Bottom</source>
+        <translation>На задний план</translation>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/attribution/orderwidget.cpp" line="25"/>
+        <source>Align left</source>
+        <translation>Выровнять по левому краю</translation>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/attribution/orderwidget.cpp" line="26"/>
+        <source>Align middle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/attribution/orderwidget.cpp" line="27"/>
+        <source>Align right</source>
+        <translation>Выровнять по правому краю</translation>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/attribution/orderwidget.cpp" line="28"/>
+        <source>Align top</source>
+        <translation>Выровнять по верхнему краю</translation>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/attribution/orderwidget.cpp" line="29"/>
+        <source>Align center</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/attribution/orderwidget.cpp" line="30"/>
+        <source>Align bottom</source>
+        <translation>Выровнять по нижнему краю</translation>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/attribution/orderwidget.cpp" line="32"/>
+        <source>Distribute horizontally</source>
+        <translation>Распределить по горизонтали</translation>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/attribution/orderwidget.cpp" line="33"/>
+        <source>Distribute vertically</source>
+        <translation>Распределить по вертикали</translation>
+    </message>
+</context>
 <context>
     <name>PageContext</name>
     <message>
-        <location filename="../src/drawshape/cdrawparamsigleton.cpp" line="66"/>
+        <location filename="../src/drawboard/drawboard/drawboard/context/pagecontext.cpp" line="78"/>
         <source>Unnamed</source>
-        <translation>Безымянный</translation>
+        <translation>Без названия</translation>
     </message>
 </context>
 <context>
     <name>PageView</name>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="322"/>
-        <location filename="../src/frame/cgraphicsview.cpp" line="666"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/pageview.cpp" line="488"/>
         <source>Layer</source>
         <translation>Слой</translation>
     </message>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="324"/>
-        <location filename="../src/frame/cgraphicsview.cpp" line="683"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/pageview.cpp" line="490"/>
         <source>Cut</source>
         <translation>Вырезать</translation>
     </message>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="329"/>
-        <location filename="../src/frame/cgraphicsview.cpp" line="684"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/pageview.cpp" line="495"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="334"/>
-        <location filename="../src/frame/cgraphicsview.cpp" line="685"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/pageview.cpp" line="500"/>
         <source>Paste</source>
         <translation>Вставить</translation>
     </message>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="341"/>
-        <location filename="../src/frame/cgraphicsview.cpp" line="686"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/pageview.cpp" line="507"/>
         <source>Select All</source>
-        <translation>Выбрать Всё</translation>
+        <translation>Выбрать всё</translation>
     </message>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="348"/>
-        <location filename="../src/frame/cgraphicsview.cpp" line="692"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/pageview.cpp" line="514"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="354"/>
-        <location filename="../src/frame/cgraphicsview.cpp" line="687"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/pageview.cpp" line="520"/>
         <source>Undo</source>
         <translation>Отменить</translation>
     </message>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="363"/>
-        <location filename="../src/frame/cgraphicsview.cpp" line="688"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/pageview.cpp" line="529"/>
         <source>Redo</source>
         <translation>Повторить</translation>
     </message>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="372"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/pageview.cpp" line="538"/>
         <source>Raise Layer</source>
         <translation>Поднять Слой</translation>
     </message>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="377"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/pageview.cpp" line="543"/>
         <source>Lower Layer</source>
         <translation>Опустить Слой</translation>
     </message>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="382"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/pageview.cpp" line="548"/>
         <source>Layer to Top</source>
-        <translation>Слой Вверх</translation>
+        <translation>На передний план</translation>
     </message>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="387"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/pageview.cpp" line="553"/>
         <source>Layer to Bottom</source>
-        <translation>Слой Вниз</translation>
+        <translation>На задний план</translation>
     </message>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="416"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/pageview.cpp" line="582"/>
         <source>Group</source>
-        <translation>Группирование</translation>
+        <translation>Группировать</translation>
     </message>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="421"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/pageview.cpp" line="587"/>
         <source>Ungroup</source>
-        <translation>Отменить группирование</translation>
+        <translation>Разгруппировать</translation>
     </message>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="427"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/pageview.cpp" line="593"/>
         <source>Align</source>
         <translation>Выравнивание</translation>
     </message>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="430"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/pageview.cpp" line="596"/>
         <source>Align left</source>
-        <translation>Выравнивание по левому краю</translation>
+        <translation>Выровнять по левому краю</translation>
     </message>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="435"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/pageview.cpp" line="601"/>
         <source>Horizontal centers</source>
         <translation>Горизонтальное центрирование</translation>
     </message>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="440"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/pageview.cpp" line="606"/>
         <source>Align right</source>
-        <translation>Выравнивание по правому краю</translation>
+        <translation>Выровнять по правому краю</translation>
     </message>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="445"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/pageview.cpp" line="611"/>
         <source>Align top</source>
-        <translation>Выравнивание по верхнему краю</translation>
+        <translation>Выровнять по верхнему краю</translation>
     </message>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="450"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/pageview.cpp" line="616"/>
         <source>Vertical centers</source>
         <translation>Вертикальное центрирование</translation>
     </message>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="455"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/pageview.cpp" line="621"/>
         <source>Align bottom</source>
-        <translation>Выравнивание по нижнему краю</translation>
+        <translation>Выровнять по нижнему краю</translation>
     </message>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="460"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/pageview.cpp" line="626"/>
         <source>Distribute horizontal space</source>
         <translation>Распределить горизонтальное пространство</translation>
     </message>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="462"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/pageview.cpp" line="628"/>
         <source>Distribute vertical space</source>
         <translation>Распределить пространство по вертикали</translation>
     </message>
+</context>
+<context>
+    <name>PenAttriRegister</name>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="689"/>
-        <source>Text Align Left</source>
-        <translation>Выровнять текст по левому краю</translation>
+        <location filename="../src/deepin-draw/attribution/attrbuionregisters/itemstyleregisters.cpp" line="338"/>
+        <source>Pen</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="690"/>
-        <source>Text Align Right</source>
-        <translation>Выровнять текст по правому краю</translation>
+        <location filename="../src/deepin-draw/attribution/attrbuionregisters/itemstyleregisters.cpp" line="348"/>
+        <source>Watercolor</source>
+        <translation>Акварель</translation>
     </message>
     <message>
-        <location filename="../src/frame/cgraphicsview.cpp" line="691"/>
-        <source>Text Align Center</source>
-        <translation>Выровнять текст по центру</translation>
+        <location filename="../src/deepin-draw/attribution/attrbuionregisters/itemstyleregisters.cpp" line="349"/>
+        <source>Calligraphy</source>
+        <translation>Каллиграфия</translation>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/attribution/attrbuionregisters/itemstyleregisters.cpp" line="350"/>
+        <source>Crayon</source>
+        <translation>Пастель</translation>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/attribution/attrbuionregisters/itemstyleregisters.cpp" line="371"/>
+        <source>Pen Width</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>QObject</name>
+    <name>PenTool</name>
     <message>
-        <location filename="../src/frame/mainwindow.cpp" line="75"/>
-        <location filename="../src/frame/cviewmanagement.cpp" line="202"/>
-        <source>File not saved</source>
-        <translation>Файл не сохранен</translation>
+        <location filename="../src/drawboard/drawboard/drawtools/pentool.cpp" line="273"/>
+        <source>Pencil (P)</source>
+        <translation>Карандаш (P)</translation>
+    </message>
+</context>
+<context>
+    <name>PickColorWidget</name>
+    <message>
+        <location filename="../src/drawboard/drawboard/widgets/colorWidget/private/cpickcolorwidget.cpp" line="124"/>
+        <source>Straw</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/drawshape/drawTools/ctexttool.cpp" line="355"/>
-        <source>Source Han Sans CN</source>
-        <translation>Источник имеет Sans CN</translation>
+        <location filename="../src/drawboard/drawboard/widgets/colorWidget/private/cpickcolorwidget.cpp" line="311"/>
+        <source>Color picker</source>
+        <translation>Выбор цвета</translation>
     </message>
+</context>
+<context>
+    <name>PolygonSidesAttriRegister</name>
     <message>
-        <location filename="../src/drawshape/drawTools/crecttool.cpp" line="84"/>
-        <source>Stroke</source>
-        <translation>Штрих</translation>
+        <location filename="../src/deepin-draw/attribution/attrbuionregisters/itemstyleregisters.cpp" line="140"/>
+        <source>Sides</source>
+        <translation>Стороны</translation>
     </message>
+</context>
+<context>
+    <name>PolygonTool</name>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawtools/polygontool.cpp" line="38"/>
+        <source>Polygon (H)</source>
+        <translation>Многоугольник (H)</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
         <location filename="../src/service/filehander.cpp" line="103"/>
         <source>The blur effect will be lost as the file is in old version. Proceed to open it?</source>
@@ -838,11 +972,10 @@ Please save it in another name or close that file and try again.</source>
         <translation>Открыть</translation>
     </message>
     <message>
-        <location filename="../src/service/filehander.cpp" line="104"/>
-        <location filename="../src/service/filehander.cpp" line="129"/>
-        <location filename="../src/service/filehander.cpp" line="203"/>
-        <location filename="../src/frame/ccentralwidget.cpp" line="757"/>
-        <location filename="../src/frame/AttributesWidgets/private/ccutwidget.cpp" line="385"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/drawboard.cpp" line="813"/>
+        <location filename="../src/service/filehander.cpp" line="103"/>
+        <location filename="../src/service/filehander.cpp" line="128"/>
+        <location filename="../src/service/filehander.cpp" line="202"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
@@ -859,396 +992,624 @@ Please save it in another name or close that file and try again.</source>
         <translation>Невозможно сохранить изменения. Недостаточно места на диске.</translation>
     </message>
     <message>
-        <location filename="../src/frame/ccentralwidget.cpp" line="287"/>
-        <source>Unnamed</source>
-        <translation>Безымянный</translation>
-    </message>
-    <message>
-        <location filename="../src/frame/ccentralwidget.cpp" line="300"/>
-        <source>The dimensions of %1 exceed the canvas. How to display it?</source>
-        <translation>Размеры %1 выходят за холст. Как его отобразить?</translation>
+        <location filename="../src/deepin-draw/drawfiles/mainwindow.cpp" line="76"/>
+        <source>File not saved</source>
+        <translation>Файл не сохранен</translation>
     </message>
     <message>
-        <location filename="../src/frame/ccentralwidget.cpp" line="289"/>
-        <location filename="../src/frame/ccentralwidget.cpp" line="301"/>
-        <source>Keep original size</source>
-        <translation>Сохранить исходный размер</translation>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/drawboard.cpp" line="344"/>
+        <source>Unnamed</source>
+        <translation>Без названия</translation>
     </message>
     <message>
-        <location filename="../src/frame/ccentralwidget.cpp" line="289"/>
-        <location filename="../src/frame/ccentralwidget.cpp" line="301"/>
-        <source>Auto fit</source>
-        <translation>Автозаполнение</translation>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/drawboard.cpp" line="354"/>
+        <source>Apply to all files</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/frame/ccentralwidget.cpp" line="296"/>
-        <source>Apply to all</source>
-        <translation>Применить ко всем</translation>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/drawboard.cpp" line="357"/>
+        <source>The dimensions of %1 exceed the canvas. How to display it?</source>
+        <translation>Размеры %1 выходят за холст. Как его отобразить?</translation>
     </message>
     <message>
-        <location filename="../src/frame/ccentralwidget.cpp" line="755"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/drawboard.cpp" line="811"/>
         <source>%1 has been modified in other programs. Do you want to reload it?</source>
         <translation>%1 был изменен в других приложениях. Хотите его заново загрузить?</translation>
     </message>
     <message>
-        <location filename="../src/frame/ccentralwidget.cpp" line="756"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/drawboard.cpp" line="812"/>
         <source>Reload</source>
         <translation>Загрузить заново</translation>
     </message>
     <message>
-        <location filename="../src/frame/ccentralwidget.cpp" line="1289"/>
-        <location filename="../src/frame/ccentralwidget.cpp" line="1691"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/drawboard.cpp" line="1357"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/drawboard.cpp" line="1745"/>
         <source>Import failed: no more than 10,000 pixels please</source>
         <translation>Импорт не удался: изображение больше 10 000 точек</translation>
     </message>
     <message>
-        <location filename="../src/widgets/dialog/dialog.h" line="45"/>
-        <location filename="../src/frame/AttributesWidgets/private/ccutwidget.cpp" line="374"/>
+        <location filename="../src/deepin-draw/attribution/attrbuionregisters/textattributionregister.cpp" line="62"/>
+        <location filename="../src/drawboard/drawboard/utils/global.cpp" line="195"/>
+        <source>Source Han Sans CN</source>
+        <translation>Источник имеет Sans CN</translation>
+    </message>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/drawboard.cpp" line="346"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/drawboard.cpp" line="358"/>
+        <source>Keep original size</source>
+        <translation>Сохранить исходный размер</translation>
+    </message>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/drawboard.cpp" line="346"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/drawboard.cpp" line="358"/>
+        <source>Auto fit</source>
+        <translation>Автозаполнение</translation>
+    </message>
+    <message>
+        <location filename="../src/drawboard/drawboard/widgets/dialog/dialog.h" line="61"/>
         <source>OK</source>
-        <translation>Ок</translation>
+        <translation>ОК</translation>
     </message>
     <message>
-        <location filename="../src/widgets/progresslayout.cpp" line="37"/>
-        <location filename="../src/frame/ccentralwidget.cpp" line="1224"/>
+        <location filename="../src/drawboard/drawboard/widgets/progresslayout.cpp" line="41"/>
         <source>Opening...</source>
         <translation>Открываю...</translation>
     </message>
     <message>
-        <location filename="../src/widgets/progresslayout.cpp" line="158"/>
+        <location filename="../src/drawboard/drawboard/widgets/progresslayout.cpp" line="168"/>
         <source>%1/%2</source>
         <translation>%1/%2</translation>
     </message>
     <message>
-        <source>Select All</source>
-        <translation type="vanished">Выбрать Всё</translation>
+        <location filename="../src/drawboard/drawboard/utils/setting.cpp" line="13"/>
+        <location filename="../src/drawboard/drawboard/utils/setting.cpp" line="22"/>
+        <source>DDF Drawings</source>
+        <translation>Рисунки DDF</translation>
     </message>
     <message>
-        <source>Cut</source>
-        <translation type="vanished">Вырезать</translation>
+        <location filename="../src/drawboard/drawboard/widgets/thicknessbuttonswidget.cpp" line="50"/>
+        <source>thickness</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Undo</source>
-        <translation type="vanished">Отменить</translation>
+        <location filename="../src/drawboard/example/main.cpp" line="185"/>
+        <location filename="../src/drawboard/test/main.cpp" line="150"/>
+        <source>Start</source>
+        <translation>Начало</translation>
     </message>
     <message>
-        <source>Copy</source>
-        <translation type="vanished">Копировать</translation>
+        <location filename="../src/drawboard/example/main.cpp" line="214"/>
+        <location filename="../src/drawboard/test/main.cpp" line="179"/>
+        <source>End</source>
+        <translation>Конец</translation>
     </message>
     <message>
-        <source>Paste</source>
-        <translation type="vanished">Вставить</translation>
+        <location filename="../src/drawboard/example/main.cpp" line="243"/>
+        <location filename="../src/drawboard/test/main.cpp" line="208"/>
+        <source>radius</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>RectRadiusStyleWidget</name>
     <message>
-        <source>Delete</source>
-        <translation type="vanished">Удалить</translation>
+        <location filename="../src/deepin-draw/attribution/stylewidgets/rectradiusstylewidget.cpp" line="70"/>
+        <source>Rounded corners</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Group</source>
-        <translation type="vanished">Группирование</translation>
+        <location filename="../src/deepin-draw/attribution/stylewidgets/rectradiusstylewidget.cpp" line="74"/>
+        <source>Same radius</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Ungroup</source>
-        <translation type="vanished">Отменить группирование</translation>
+        <location filename="../src/deepin-draw/attribution/stylewidgets/rectradiusstylewidget.cpp" line="83"/>
+        <source>Different radius</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>pdf</source>
-        <translation type="vanished">pdf</translation>
+        <location filename="../src/deepin-draw/attribution/stylewidgets/rectradiusstylewidget.cpp" line="121"/>
+        <source>left radius</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/application.cpp" line="72"/>
-        <location filename="../src/application.cpp" line="80"/>
-        <source>DDF Drawings</source>
-        <translation>Рисунки DDF</translation>
+        <location filename="../src/deepin-draw/attribution/stylewidgets/rectradiusstylewidget.cpp" line="129"/>
+        <source>right radius</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/attribution/stylewidgets/rectradiusstylewidget.cpp" line="137"/>
+        <source>left bottom radius</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/attribution/stylewidgets/rectradiusstylewidget.cpp" line="145"/>
+        <source>right bottom radius</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/attribution/stylewidgets/rectradiusstylewidget.cpp" line="165"/>
+        <source>radius</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RectTool</name>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawtools/recttool.cpp" line="40"/>
+        <source>Rectangle (R)</source>
+        <translation>Прямоугольник (R)</translation>
+    </message>
+</context>
+<context>
+    <name>RotateAttriWidget</name>
+    <message>
+        <location filename="../src/deepin-draw/attribution/rotateattriwidget.cpp" line="78"/>
+        <source>Rotate</source>
+        <translation>Повернуть</translation>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/attribution/rotateattriwidget.cpp" line="104"/>
+        <source>Flip horizontally</source>
+        <translation>Отразить по горизонтали</translation>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/attribution/rotateattriwidget.cpp" line="113"/>
+        <source>Flip vertically</source>
+        <translation>Отразить по вертикали</translation>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/attribution/rotateattriwidget.cpp" line="202"/>
+        <source>Please enter a value between -360 and 360</source>
+        <translation>Пожалуйста, введите значение от -360 до 360</translation>
+    </message>
+</context>
+<context>
+    <name>SaveTool</name>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawtools/buttontool.cpp" line="151"/>
+        <location filename="../src/drawboard/drawboard/drawtools/buttontool.cpp" line="153"/>
+        <source>save</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SelectTool</name>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawtools/selecttool.cpp" line="100"/>
+        <source>Select (V)</source>
+        <translation>Выделить (V)</translation>
     </message>
 </context>
 <context>
     <name>Shortcut</name>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="34"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="31"/>
         <source>Files</source>
         <translation>Файлы</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="35"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="32"/>
         <source>Drawing</source>
         <translation>Рисование</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="36"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="33"/>
         <source>Shapes/Images</source>
         <translation>Фигуры/Изображения</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="37"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="34"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="38"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="35"/>
         <source>Align</source>
         <translation>Выравнивание</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="42"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="39"/>
         <source>New</source>
         <translation>Новый</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="43"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="40"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="44"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="41"/>
         <source>Export</source>
         <translation>Экспортировать</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="45"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="42"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="46"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="43"/>
         <source>Save as</source>
         <translation>Сохранить как</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="47"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="44"/>
         <source>Print</source>
         <translation>Печать</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="50"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="47"/>
         <source>Select</source>
         <translation>Выбрать</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="51"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="48"/>
         <source>Import</source>
         <translation>Импортировать</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="52"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="49"/>
         <source>Rectangle</source>
         <translation>Прямоугольник</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="53"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="50"/>
         <source>Ellipse</source>
         <translation>Элипс</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="54"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="51"/>
         <source>Triangle</source>
         <translation>Треугольник</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="55"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="52"/>
         <source>Star</source>
         <translation>Звезда</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="56"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="53"/>
         <source>Polygon</source>
         <translation>Многоугольник</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="57"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="54"/>
         <source>Line</source>
         <translation>Линия</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="59"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="56"/>
         <source>Pencil</source>
         <translation>Карандаш</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="58"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="55"/>
         <source>Text</source>
         <translation>Текст</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="60"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="57"/>
         <source>Eraser</source>
         <translation>Ластик</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="61"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="58"/>
         <source>Blur</source>
         <translation>Размытие</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="62"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="59"/>
         <source>Crop</source>
         <translation>Обрезать</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="63"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="60"/>
         <source>Expand canvas</source>
         <translation>Расширить холст</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="64"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="61"/>
         <source>Shrink canvas</source>
         <translation>Сжать холст</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="69"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="66"/>
         <source>Cut</source>
         <translation>Вырезать</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="70"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="67"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="71"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="68"/>
         <source>Paste</source>
         <translation>Вставить</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="72"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="69"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="73"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="70"/>
         <source>Undo</source>
         <translation>Отменить</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="74"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="71"/>
         <source>Redo</source>
         <translation>Повторить</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="75"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="72"/>
         <source>Group</source>
-        <translation>Группа</translation>
+        <translation>Группировать</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="76"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="73"/>
         <source>Ungroup</source>
-        <translation>Отменить группирование</translation>
+        <translation>Разгруппировать</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="77"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="74"/>
         <source>Raise Layer</source>
         <translation>Поднять Слой</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="78"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="75"/>
         <source>Lower Layer</source>
         <translation>Опустить Слой</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="79"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="76"/>
         <source>Layer to Top</source>
         <translation>Слой Вверх</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="80"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="77"/>
         <source>Layer to Bottom</source>
         <translation>Слой Вниз</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="84"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="81"/>
         <source>Help</source>
         <translation>Помощь</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="85"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="82"/>
         <source>Display shortcuts</source>
         <translation>Показать сочетания клавиш</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="87"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="84"/>
         <source>Align left</source>
-        <translation>Выравнивание по левому краю</translation>
+        <translation>Выровнять по левому краю</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="88"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="85"/>
         <source>Align right</source>
-        <translation>Выравнивание по правому краю</translation>
+        <translation>Выровнять по правому краю</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="89"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="86"/>
         <source>Horizontal centers</source>
         <translation>Горизонтальное центрирование</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="90"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="87"/>
         <source>Align top</source>
-        <translation>Выравнивание по верхнему краю</translation>
+        <translation>Выровнять по верхнему краю</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="91"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="88"/>
         <source>Align bottom</source>
-        <translation>Выравнивание по нижнему краю</translation>
+        <translation>Выровнять по нижнему краю</translation>
     </message>
     <message>
-        <location filename="../src/utils/shortcut.cpp" line="92"/>
+        <location filename="../src/drawboard/drawboard/utils/shortcut.cpp" line="89"/>
         <source>Vertical centers</source>
         <translation>Вертикальное центрирование</translation>
     </message>
 </context>
+<context>
+    <name>SprayGunTool</name>
+    <message>
+        <location filename="../src/drawboard/toolplugins/sprayGunTool/sprayguntool.cpp" line="150"/>
+        <source>spray gun</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>StarAnchorAttriRegister</name>
+    <message>
+        <location filename="../src/deepin-draw/attribution/attrbuionregisters/itemstyleregisters.cpp" line="100"/>
+        <source>Vertices</source>
+        <translation>Вершины</translation>
+    </message>
+</context>
+<context>
+    <name>StarTool</name>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawtools/startool.cpp" line="39"/>
+        <source>Star (F)</source>
+        <translation>Звезда (F)</translation>
+    </message>
+</context>
+<context>
+    <name>StartAttriRegister</name>
+    <message>
+        <location filename="../src/deepin-draw/attribution/attrbuionregisters/itemstyleregisters.cpp" line="120"/>
+        <source>Radius</source>
+        <translation>Радиус</translation>
+    </message>
+</context>
+<context>
+    <name>StyleAttriWidget</name>
+    <message>
+        <location filename="../src/deepin-draw/attribution/stylewidgets/styleattriwidget.cpp" line="53"/>
+        <source>Style</source>
+        <translation>Стиль</translation>
+    </message>
+</context>
 <context>
     <name>TabBarWgt</name>
     <message>
-        <location filename="../src/frame/cmultiptabbarwidget.cpp" line="120"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/drawboardtab.cpp" line="127"/>
         <source>Close tab</source>
         <translation>Закрыть вкладку</translation>
     </message>
     <message>
-        <location filename="../src/frame/cmultiptabbarwidget.cpp" line="125"/>
+        <location filename="../src/drawboard/drawboard/drawboard/gui/drawboardtab.cpp" line="132"/>
         <source>Close other tabs</source>
         <translation>Закрыть другие вкладки</translation>
     </message>
 </context>
+<context>
+    <name>TextAttributionRegister</name>
+    <message>
+        <location filename="../src/deepin-draw/attribution/attrbuionregisters/textattributionregister.cpp" line="23"/>
+        <source>Color</source>
+        <translation>Цвет</translation>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/attribution/attrbuionregisters/textattributionregister.cpp" line="50"/>
+        <source>Font</source>
+        <translation>Шрифт</translation>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/attribution/attrbuionregisters/textattributionregister.cpp" line="187"/>
+        <source>Font size</source>
+        <translation>Размер шрифта</translation>
+    </message>
+</context>
+<context>
+    <name>TextEdit</name>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawItems/items/commonItems/ctextedit.cpp" line="61"/>
+        <source>Cut</source>
+        <translation>Вырезать</translation>
+    </message>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawItems/items/commonItems/ctextedit.cpp" line="62"/>
+        <source>Copy</source>
+        <translation>Копировать</translation>
+    </message>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawItems/items/commonItems/ctextedit.cpp" line="63"/>
+        <source>Paste</source>
+        <translation>Вставить</translation>
+    </message>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawItems/items/commonItems/ctextedit.cpp" line="64"/>
+        <source>Select All</source>
+        <translation>Выбрать всё</translation>
+    </message>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawItems/items/commonItems/ctextedit.cpp" line="65"/>
+        <source>Undo</source>
+        <translation>Отменить</translation>
+    </message>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawItems/items/commonItems/ctextedit.cpp" line="66"/>
+        <source>Redo</source>
+        <translation>Повторить</translation>
+    </message>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawItems/items/commonItems/ctextedit.cpp" line="67"/>
+        <source>Text Align Left</source>
+        <translation>Выровнять текст по левому краю</translation>
+    </message>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawItems/items/commonItems/ctextedit.cpp" line="68"/>
+        <source>Text Align Right</source>
+        <translation>Выровнять текст по правому краю</translation>
+    </message>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawItems/items/commonItems/ctextedit.cpp" line="69"/>
+        <source>Text Align Center</source>
+        <translation>Выровнять текст по центру</translation>
+    </message>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawItems/items/commonItems/ctextedit.cpp" line="70"/>
+        <source>Delete</source>
+        <translation>Удалить</translation>
+    </message>
+</context>
+<context>
+    <name>TextTool</name>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawtools/texttool.cpp" line="106"/>
+        <source>Text (T)</source>
+        <translation>Текст (T)</translation>
+    </message>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawtools/texttool.cpp" line="192"/>
+        <source>Input text here</source>
+        <translation>Введите текст здесь</translation>
+    </message>
+</context>
 <context>
     <name>TopTilte</name>
     <message>
-        <location filename="../src/frame/toptoolbar.cpp" line="173"/>
+        <location filename="../src/deepin-draw/widgets/toptoolbar.cpp" line="183"/>
         <source>New</source>
         <translation>Новый</translation>
     </message>
     <message>
-        <location filename="../src/frame/toptoolbar.cpp" line="178"/>
+        <location filename="../src/deepin-draw/widgets/toptoolbar.cpp" line="188"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
-        <location filename="../src/frame/toptoolbar.cpp" line="199"/>
-        <location filename="../src/frame/toptoolbar.cpp" line="225"/>
+        <location filename="../src/deepin-draw/widgets/toptoolbar.cpp" line="204"/>
         <source>Export</source>
-        <translation>Экспортировать</translation>
+        <translation>Экспорт</translation>
     </message>
     <message>
-        <location filename="../src/frame/toptoolbar.cpp" line="189"/>
+        <location filename="../src/deepin-draw/widgets/toptoolbar.cpp" line="194"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../src/frame/toptoolbar.cpp" line="194"/>
+        <location filename="../src/deepin-draw/widgets/toptoolbar.cpp" line="66"/>
+        <source>Crop canvas (C)</source>
+        <translation>Обрезать холст (С)</translation>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/widgets/toptoolbar.cpp" line="70"/>
+        <source>Unnamed</source>
+        <translation>Без названия</translation>
+    </message>
+    <message>
+        <location filename="../src/deepin-draw/widgets/toptoolbar.cpp" line="199"/>
         <source>Save as</source>
         <translation>Сохранить как</translation>
     </message>
     <message>
-        <location filename="../src/frame/toptoolbar.cpp" line="209"/>
+        <location filename="../src/deepin-draw/widgets/toptoolbar.cpp" line="209"/>
         <source>Print</source>
         <translation>Печать</translation>
     </message>
     <message>
-        <location filename="../src/frame/toptoolbar.cpp" line="242"/>
+        <location filename="../src/deepin-draw/widgets/toptoolbar.cpp" line="232"/>
         <source>Draw</source>
         <translation>Рисование</translation>
     </message>
     <message>
-        <location filename="../src/frame/toptoolbar.cpp" line="245"/>
+        <location filename="../src/deepin-draw/widgets/toptoolbar.cpp" line="235"/>
         <source>Draw is a lightweight drawing tool for users to freely draw and simply edit images. </source>
         <translation>Draw - это легкий инструмент для рисования, позволяющий пользователям свободно рисовать и просто редактировать изображения.</translation>
     </message>
 </context>
+<context>
+    <name>TriangleTool</name>
+    <message>
+        <location filename="../src/drawboard/drawboard/drawtools/triangletool.cpp" line="39"/>
+        <source>Triangle (S)</source>
+        <translation>Треугольник (S)</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file