translations

qad/application/lang/qad_application_ru.ts

@@ -1,47 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="ru_RU">
+<context>
+    <name>AboutWindow</name>
+    <message>
+        <location filename="../aboutwindow.ui" line="14"/>
+        <source> - About</source>
+        <translation> - О программе</translation>
+    </message>
+    <message>
+        <location filename="../aboutwindow.ui" line="41"/>
+        <source>Versions</source>
+        <translation>Версии</translation>
+    </message>
+    <message>
+        <location filename="../aboutwindow.ui" line="56"/>
+        <source>Build</source>
+        <translation>Сборка</translation>
+    </message>
+    <message>
+        <location filename="../aboutwindow.ui" line="71"/>
+        <source>Authors</source>
+        <translation>Авторы</translation>
+    </message>
+    <message>
+        <location filename="../aboutwindow.ui" line="100"/>
+        <source>About Qt...</source>
+        <translation>О Qt ...</translation>
+    </message>
+    <message>
+        <location filename="../aboutwindow.ui" line="111"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../aboutwindow.cpp" line="33"/>
+        <source>About</source>
+        <translation>О программе</translation>
+    </message>
+</context>
 <context>
     <name>EMainWindow</name>
     <message>
-        <location filename="../emainwindow.cpp" line="28"/>
-        <location filename="../emainwindow.cpp" line="29"/>
+        <location filename="../emainwindow.cpp" line="12"/>
+        <source>Clear recent list</source>
+        <translation>Очистить список недавних</translation>
+    </message>
+    <message>
+        <location filename="../emainwindow.cpp" line="15"/>
+        <location filename="../emainwindow.cpp" line="16"/>
         <source>Show all</source>
         <translation>Показать все</translation>
     </message>
     <message>
-        <location filename="../emainwindow.cpp" line="30"/>
-        <location filename="../emainwindow.cpp" line="31"/>
+        <location filename="../emainwindow.cpp" line="17"/>
+        <location filename="../emainwindow.cpp" line="18"/>
         <source>Hide all</source>
         <translation>Скрыть все</translation>
     </message>
     <message>
-        <location filename="../emainwindow.cpp" line="125"/>
+        <location filename="../emainwindow.cpp" line="136"/>
         <source>Toolbars</source>
         <translation>Панели инструментов</translation>
     </message>
     <message>
-        <location filename="../emainwindow.cpp" line="150"/>
+        <location filename="../emainwindow.cpp" line="161"/>
         <source>Docks</source>
         <translation>Окна</translation>
     </message>
     <message>
-        <location filename="../emainwindow.cpp" line="309"/>
+        <location filename="../emainwindow.cpp" line="379"/>
         <source>Select file to open</source>
         <translation>Выбрать файл для открытия</translation>
     </message>
     <message>
-        <location filename="../emainwindow.cpp" line="317"/>
+        <location filename="../emainwindow.cpp" line="388"/>
+        <source>Select files to open</source>
+        <translation>Выберите файлы для открытия</translation>
+    </message>
+    <message>
+        <location filename="../emainwindow.cpp" line="398"/>
         <source>Save changes%1?</source>
         <translation>Сохранить изменения%1?</translation>
     </message>
     <message>
-        <location filename="../emainwindow.cpp" line="317"/>
+        <location filename="../emainwindow.cpp" line="398"/>
         <source> in</source>
         <translation> в</translation>
     </message>
     <message>
-        <location filename="../emainwindow.cpp" line="329"/>
+        <location filename="../emainwindow.cpp" line="411"/>
         <source>Select file to save</source>
         <translation>Выберите файл для сохранения</translation>
     </message>
@@ -49,7 +97,7 @@
 <context>
     <name>HistoryView</name>
     <message>
-        <location filename="../historyview.cpp" line="15"/>
+        <location filename="../historyview.cpp" line="16"/>
         <source>History cleared</source>
         <translation>История очищена</translation>
     </message>

qad/application/lang/update.bat

@@ -0,0 +1 @@
+lupdate ../ -ts qad_application_ru.ts

qad/blockview/lang/qad_blockview_ru.ts

@@ -4,7 +4,7 @@
 <context>
     <name>BlockBusItem</name>
     <message>
-        <location filename="../blockbusitem.cpp" line="453"/>
+        <location filename="../blockbusitem.cpp" line="499"/>
         <source>Add point: Ctrl + LeftClick
 Remove point\segment: Ctrl + RightClick
 New branch: Shift + LeftClick
@@ -18,108 +18,108 @@ Remove connection: Shift + RightClick</source>
 <context>
     <name>BlockEditor</name>
     <message>
-        <location filename="../blockeditor/blockeditor.ui" line="14"/>
+        <location filename="../blockeditor.ui" line="14"/>
         <source>Block editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../blockeditor/blockeditor.ui" line="32"/>
+        <location filename="../blockeditor.ui" line="32"/>
         <source>Block parameters</source>
-        <translation type="unfinished"></translation>
+        <translation>Параметры блока</translation>
     </message>
     <message>
-        <location filename="../blockeditor/blockeditor.ui" line="59"/>
+        <location filename="../blockeditor.ui" line="59"/>
         <source>Width:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ширина:</translation>
     </message>
     <message>
-        <location filename="../blockeditor/blockeditor.ui" line="79"/>
+        <location filename="../blockeditor.ui" line="79"/>
         <source>Heigth:</source>
-        <translation type="unfinished"></translation>
+        <translation>Высота:</translation>
     </message>
     <message>
-        <location filename="../blockeditor/blockeditor.ui" line="99"/>
+        <location filename="../blockeditor.ui" line="99"/>
         <source>Pins margin:</source>
-        <translation type="unfinished"></translation>
+        <translation>Поля пина:</translation>
     </message>
     <message>
-        <location filename="../blockeditor/blockeditor.ui" line="119"/>
+        <location filename="../blockeditor.ui" line="119"/>
         <source>Color:</source>
-        <translation type="unfinished"></translation>
+        <translation>Цвет:</translation>
     </message>
     <message>
-        <location filename="../blockeditor/blockeditor.ui" line="130"/>
+        <location filename="../blockeditor.ui" line="130"/>
         <source>Pins</source>
-        <translation type="unfinished"></translation>
+        <translation>Пины</translation>
     </message>
     <message>
-        <location filename="../blockeditor/blockeditor.ui" line="179"/>
+        <location filename="../blockeditor.ui" line="179"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../blockeditor/blockeditor.ui" line="184"/>
+        <location filename="../blockeditor.ui" line="184"/>
         <source>Bus</source>
-        <translation type="unfinished"></translation>
+        <translation>Шина</translation>
     </message>
     <message>
-        <location filename="../blockeditor/blockeditor.ui" line="194"/>
+        <location filename="../blockeditor.ui" line="194"/>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="../blockeditor/blockeditor.ui" line="205"/>
+        <location filename="../blockeditor.ui" line="205"/>
         <source>Clone</source>
-        <translation type="unfinished"></translation>
+        <translation>Клонировать</translation>
     </message>
     <message>
-        <location filename="../blockeditor/blockeditor.ui" line="232"/>
+        <location filename="../blockeditor.ui" line="232"/>
         <source>Remove selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить выбранные</translation>
     </message>
     <message>
-        <location filename="../blockeditor/blockeditor.ui" line="243"/>
+        <location filename="../blockeditor.ui" line="243"/>
         <source>Remove all</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить все</translation>
     </message>
     <message>
-        <location filename="../blockeditor/blockeditor.ui" line="330"/>
+        <location filename="../blockeditor.ui" line="346"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../blockeditor/blockeditor.ui" line="337"/>
-        <location filename="../blockeditor/blockeditor.ui" line="367"/>
+        <location filename="../blockeditor.ui" line="353"/>
+        <location filename="../blockeditor.ui" line="383"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../blockeditor/blockeditor.ui" line="360"/>
+        <location filename="../blockeditor.ui" line="376"/>
         <source>Save as ...</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить как ...</translation>
     </message>
     <message>
-        <location filename="../blockeditor/blockeditor.ui" line="390"/>
+        <location filename="../blockeditor.ui" line="406"/>
         <source>Load ...</source>
-        <translation type="unfinished"></translation>
+        <translation>Открыть ...</translation>
     </message>
     <message>
-        <location filename="../blockeditor/blockeditor.ui" line="397"/>
+        <location filename="../blockeditor.ui" line="413"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../blockeditor/blockeditor.ui" line="417"/>
+        <location filename="../blockeditor.ui" line="433"/>
         <source>Clear</source>
-        <translation type="unfinished"></translation>
+        <translation>Очистить</translation>
     </message>
     <message>
-        <location filename="../blockeditor/blockeditor.ui" line="434"/>
+        <location filename="../blockeditor.ui" line="450"/>
         <source>Remove items</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить элементы</translation>
     </message>
     <message>
-        <location filename="../blockeditor/blockeditor.ui" line="437"/>
+        <location filename="../blockeditor.ui" line="453"/>
         <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
@@ -224,141 +224,146 @@ Remove connection: Shift + RightClick</source>
         <translation>Загрузить картинку ...</translation>
     </message>
     <message>
-        <location filename="../drawtools.ui" line="624"/>
+        <location filename="../drawtools.ui" line="608"/>
+        <source>Paste image ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../drawtools.ui" line="641"/>
         <source>Scale:</source>
         <translation>Масштаб:</translation>
     </message>
     <message>
-        <location filename="../drawtools.ui" line="727"/>
+        <location filename="../drawtools.ui" line="750"/>
         <source>Top</source>
-        <translation type="unfinished"></translation>
+        <translation>Верх</translation>
     </message>
     <message>
-        <location filename="../drawtools.ui" line="735"/>
-        <location filename="../drawtools.ui" line="738"/>
-        <location filename="../drawtools.ui" line="757"/>
-        <location filename="../drawtools.ui" line="760"/>
+        <location filename="../drawtools.ui" line="758"/>
+        <location filename="../drawtools.ui" line="761"/>
+        <location filename="../drawtools.ui" line="780"/>
+        <location filename="../drawtools.ui" line="783"/>
         <source>Center</source>
-        <translation type="unfinished"></translation>
+        <translation>Центр</translation>
     </message>
     <message>
-        <location filename="../drawtools.ui" line="746"/>
-        <location filename="../drawtools.ui" line="749"/>
+        <location filename="../drawtools.ui" line="769"/>
+        <location filename="../drawtools.ui" line="772"/>
         <source>Bottom</source>
-        <translation type="unfinished"></translation>
+        <translation>Низ</translation>
     </message>
     <message>
-        <location filename="../drawtools.ui" line="768"/>
-        <location filename="../drawtools.ui" line="771"/>
+        <location filename="../drawtools.ui" line="791"/>
+        <location filename="../drawtools.ui" line="794"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Лево</translation>
     </message>
     <message>
-        <location filename="../drawtools.ui" line="779"/>
-        <location filename="../drawtools.ui" line="782"/>
+        <location filename="../drawtools.ui" line="802"/>
+        <location filename="../drawtools.ui" line="805"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Право</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="236"/>
+        <location filename="../drawtools.cpp" line="242"/>
         <source>NoPen</source>
         <translation>НетЛинии</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="236"/>
+        <location filename="../drawtools.cpp" line="242"/>
         <source>Solid</source>
         <translation>Сплошная</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="236"/>
+        <location filename="../drawtools.cpp" line="242"/>
         <source>Dash</source>
         <translation>Штриховая</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="237"/>
+        <location filename="../drawtools.cpp" line="243"/>
         <source>Dot</source>
         <translation>Пунктирная</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="237"/>
+        <location filename="../drawtools.cpp" line="243"/>
         <source>Dash-Dot</source>
         <translation>ШтрихПунктирная</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="237"/>
+        <location filename="../drawtools.cpp" line="243"/>
         <source>Dash-Dot-Dot</source>
         <translation>ШтрихПунктирПунктирная</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="257"/>
+        <location filename="../drawtools.cpp" line="267"/>
         <source>Edit text</source>
         <translation>Редактировать текст</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="264"/>
+        <location filename="../drawtools.cpp" line="274"/>
         <source>Bring
 forward</source>
         <translation>Переместить
 выше</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="265"/>
+        <location filename="../drawtools.cpp" line="275"/>
         <source>Bring
 to front</source>
         <translation>На передний
 фон</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="266"/>
+        <location filename="../drawtools.cpp" line="276"/>
         <source>Send
 backward</source>
         <translation>Переместить
 ниже</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="267"/>
+        <location filename="../drawtools.cpp" line="277"/>
         <source>Send
 to back</source>
         <translation>На задний
 фон</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="268"/>
+        <location filename="../drawtools.cpp" line="278"/>
         <source>Draw
 Rectangle</source>
         <translation>Нарисовать
 прямоугольник</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="269"/>
+        <location filename="../drawtools.cpp" line="279"/>
         <source>Draw
 Ellipse</source>
         <translation>Нарисовать
 эллипс</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="270"/>
+        <location filename="../drawtools.cpp" line="280"/>
         <source>Draw
 Line</source>
         <translation>Нарисовать
 линию</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="271"/>
+        <location filename="../drawtools.cpp" line="281"/>
         <source>Draw
 Text</source>
         <translation>Нарисовать
 текст</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="272"/>
+        <location filename="../drawtools.cpp" line="282"/>
         <source>Draw
 Image</source>
         <translation>Нарисовать
 картинку</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="778"/>
+        <location filename="../drawtools.cpp" line="810"/>
         <source>Select image</source>
         <translation>Выбрать картинку</translation>
     </message>

qad/blockview/lang/update.bat

@@ -0,0 +1 @@
+lupdate ../ -ts qad_blockview_ru.ts

qad/graphic/lang/qad_graphic_ru.ts

@@ -4,129 +4,121 @@
 <context>
     <name>Graphic</name>
     <message>
-        <location filename="../graphic.ui" line="44"/>
-        <location filename="../ui_graphic.h" line="320"/>
+        <location filename="../graphic.ui" line="53"/>
         <source>Autofit</source>
         <translation>Автомасштаб</translation>
     </message>
     <message>
-        <location filename="../graphic.ui" line="61"/>
-        <location filename="../ui_graphic.h" line="323"/>
+        <location filename="../graphic.ui" line="64"/>
         <source>Grid</source>
         <translation>Сетка</translation>
     </message>
     <message>
-        <location filename="../graphic.ui" line="84"/>
-        <location filename="../ui_graphic.h" line="326"/>
+        <location filename="../graphic.ui" line="81"/>
         <source>Cursor axis</source>
         <translation>Плавающие оси</translation>
     </message>
     <message>
-        <location filename="../graphic.ui" line="104"/>
-        <location filename="../ui_graphic.h" line="329"/>
+        <location filename="../graphic.ui" line="95"/>
         <source>Only expand Y</source>
         <translation>Только расширять Y</translation>
     </message>
     <message>
-        <location filename="../graphic.ui" line="124"/>
-        <location filename="../ui_graphic.h" line="332"/>
+        <location filename="../graphic.ui" line="109"/>
         <source>Only expand X</source>
         <translation>Только расширять X</translation>
     </message>
     <message>
-        <location filename="../graphic.ui" line="144"/>
-        <location filename="../ui_graphic.h" line="335"/>
+        <location filename="../graphic.ui" line="123"/>
         <source>Fullscreen</source>
         <translation>Во весь экран</translation>
     </message>
     <message>
-        <location filename="../graphic.ui" line="161"/>
-        <location filename="../ui_graphic.h" line="338"/>
+        <location filename="../graphic.ui" line="134"/>
         <source>Border inputs</source>
         <translation>Граничные поля ввода</translation>
     </message>
     <message>
-        <location filename="../graphic.ui" line="184"/>
-        <location filename="../ui_graphic.h" line="341"/>
+        <location filename="../graphic.ui" line="151"/>
         <source>Legend</source>
         <translation>Легенда</translation>
     </message>
     <message>
-        <location filename="../graphic.ui" line="207"/>
-        <location filename="../ui_graphic.h" line="344"/>
+        <location filename="../graphic.ui" line="168"/>
+        <source>Pause</source>
+        <translation>Пауза</translation>
+    </message>
+    <message>
+        <location filename="../graphic.ui" line="182"/>
         <source>Configure ...</source>
         <translation>Настроить ...</translation>
     </message>
     <message>
-        <location filename="../graphic.ui" line="224"/>
-        <location filename="../ui_graphic.h" line="347"/>
+        <location filename="../graphic.ui" line="193"/>
         <source>Save image ...</source>
         <translation>Сохранить изображение ...</translation>
     </message>
     <message>
-        <location filename="../graphic.ui" line="257"/>
-        <location filename="../ui_graphic.h" line="350"/>
+        <location filename="../graphic.ui" line="220"/>
         <source>Clear</source>
         <translation>Очистить</translation>
     </message>
     <message>
-        <location filename="../graphic.ui" line="274"/>
-        <location filename="../ui_graphic.h" line="353"/>
+        <location filename="../graphic.ui" line="231"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../graphic.ui" line="425"/>
-        <location filename="../ui_graphic.h" line="355"/>
+        <location filename="../graphic.ui" line="396"/>
         <source>Cursor: ( ; )</source>
         <translation>Курсор: ( ; )</translation>
     </message>
     <message>
-        <location filename="../graphic.cpp" line="205"/>
-        <location filename="../graphic.cpp" line="809"/>
+        <location filename="../graphic.cpp" line="387"/>
+        <location filename="../graphic.cpp" line="1231"/>
         <source>Cursor: </source>
         <translation>Курсор: </translation>
     </message>
     <message>
-        <location filename="../graphic.cpp" line="216"/>
+        <location filename="../graphic.cpp" line="402"/>
         <source>Selection</source>
         <translation>Выделение</translation>
     </message>
     <message>
-        <location filename="../graphic.cpp" line="217"/>
+        <location filename="../graphic.cpp" line="403"/>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
-        <location filename="../graphic.cpp" line="221"/>
-        <location filename="../graphic.cpp" line="227"/>
+        <location filename="../graphic.cpp" line="407"/>
+        <location filename="../graphic.cpp" line="413"/>
         <source>Range</source>
         <translation>Диапазон</translation>
     </message>
     <message>
-        <location filename="../graphic.cpp" line="222"/>
-        <location filename="../graphic.cpp" line="228"/>
+        <location filename="../graphic.cpp" line="408"/>
+        <location filename="../graphic.cpp" line="414"/>
         <source>Length</source>
         <translation>Длина</translation>
     </message>
     <message>
-        <location filename="../graphic.cpp" line="329"/>
-        <location filename="../graphic.cpp" line="380"/>
+        <location filename="../graphic.cpp" line="525"/>
+        <location filename="../graphic.cpp" line="566"/>
         <source>Cursor</source>
         <translation>Курсор</translation>
     </message>
     <message>
-        <location filename="../graphic.cpp" line="531"/>
+        <location filename="../graphic.cpp" line="814"/>
         <source>Save Image</source>
         <translation>Сохранить изображение</translation>
     </message>
     <message>
-        <location filename="../graphic.cpp" line="576"/>
+        <location filename="../graphic.cpp" line="865"/>
         <source>y(x)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../graphic.cpp" line="1124"/>
+        <location filename="../graphic.cpp" line="1678"/>
         <source>Check all</source>
         <translation>Выбрать все</translation>
     </message>
@@ -135,217 +127,265 @@
     <name>GraphicConf</name>
     <message>
         <location filename="../graphic_conf.ui" line="17"/>
-        <location filename="../ui_graphic_conf.h" line="450"/>
         <source>Graphic parameters</source>
         <translation>Параметры графика</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="32"/>
-        <location filename="../ui_graphic_conf.h" line="451"/>
+        <location filename="../graphic_conf.ui" line="26"/>
         <source>Appearance</source>
         <translation>Внешний вид</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="46"/>
-        <location filename="../ui_graphic_conf.h" line="452"/>
+        <location filename="../graphic_conf.ui" line="34"/>
         <source>Border inputs</source>
         <translation>Граничные поля ввода</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="53"/>
-        <location filename="../ui_graphic_conf.h" line="453"/>
+        <location filename="../graphic_conf.ui" line="41"/>
         <source>Antialiasing</source>
         <translation>Сглаживание</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="60"/>
-        <location filename="../ui_graphic_conf.h" line="454"/>
+        <location filename="../graphic_conf.ui" line="48"/>
         <source>Status bar</source>
         <translation>Панель статуса</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="67"/>
-        <location filename="../ui_graphic_conf.h" line="455"/>
+        <location filename="../graphic_conf.ui" line="55"/>
         <source>OpenGL</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="74"/>
-        <location filename="../ui_graphic_conf.h" line="456"/>
+        <location filename="../graphic_conf.ui" line="62"/>
         <source>Legend</source>
         <translation>Легенда</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="94"/>
-        <location filename="../ui_graphic_conf.h" line="457"/>
+        <location filename="../graphic_conf.ui" line="82"/>
         <source>Background color:</source>
         <translation>Цвет фона:</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="114"/>
-        <location filename="../ui_graphic_conf.h" line="458"/>
+        <location filename="../graphic_conf.ui" line="102"/>
         <source>Text color:</source>
         <translation>Цвет текста:</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="133"/>
-        <location filename="../ui_graphic_conf.h" line="459"/>
+        <location filename="../graphic_conf.ui" line="121"/>
         <source>Graphics</source>
         <translation>Графики</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="161"/>
-        <location filename="../graphic_conf.ui" line="263"/>
-        <location filename="../ui_graphic_conf.h" line="460"/>
-        <location filename="../ui_graphic_conf.h" line="466"/>
+        <location filename="../graphic_conf.ui" line="140"/>
+        <location filename="../graphic_conf.ui" line="236"/>
         <source>Color:</source>
         <translation>Цвет:</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="175"/>
-        <location filename="../graphic_conf.ui" line="277"/>
-        <location filename="../ui_graphic_conf.h" line="461"/>
-        <location filename="../ui_graphic_conf.h" line="467"/>
+        <location filename="../graphic_conf.ui" line="154"/>
+        <location filename="../graphic_conf.ui" line="250"/>
         <source>Style:</source>
         <translation>Стиль:</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="185"/>
-        <location filename="../ui_graphic_conf.h" line="462"/>
+        <location filename="../graphic_conf.ui" line="164"/>
         <source>Lines width:</source>
         <translation>Толщина линий:</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="205"/>
-        <location filename="../ui_graphic_conf.h" line="463"/>
+        <location filename="../graphic_conf.ui" line="184"/>
         <source>Points width:</source>
         <translation>Толщина точек:</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="225"/>
-        <location filename="../ui_graphic_conf.h" line="464"/>
+        <location filename="../graphic_conf.ui" line="207"/>
         <source>Fill:</source>
         <translation>Заливка:</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="245"/>
-        <location filename="../ui_graphic_conf.h" line="465"/>
+        <location filename="../graphic_conf.ui" line="227"/>
         <source>Grid</source>
         <translation>Сетка</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="287"/>
-        <location filename="../ui_graphic_conf.h" line="468"/>
+        <location filename="../graphic_conf.ui" line="260"/>
         <source>Width:</source>
         <translation>Толщина:</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="317"/>
-        <location filename="../ui_graphic_conf.h" line="469"/>
+        <location filename="../graphic_conf.ui" line="274"/>
         <source>Step X:</source>
         <translation>Шаг X:</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="324"/>
-        <location filename="../ui_graphic_conf.h" line="470"/>
+        <location filename="../graphic_conf.ui" line="281"/>
         <source>Step Y:</source>
         <translation>Шаг Y:</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="347"/>
-        <location filename="../ui_graphic_conf.h" line="471"/>
+        <location filename="../graphic_conf.ui" line="288"/>
         <source>Auto X</source>
         <translation>Авто X</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="357"/>
-        <location filename="../ui_graphic_conf.h" line="472"/>
+        <location filename="../graphic_conf.ui" line="298"/>
         <source>Auto Y</source>
         <translation>Авто Y</translation>
     </message>
+    <message>
+        <location filename="../graphic_conf.ui" line="308"/>
+        <location filename="../graphic_conf.ui" line="311"/>
+        <source>30</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../graphic_conf.ui" line="321"/>
+        <location filename="../graphic_conf.ui" line="324"/>
+        <source>50</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Auto step</source>
         <translation type="obsolete">Автоматический шаг</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="390"/>
-        <location filename="../ui_graphic_conf.h" line="473"/>
+        <location filename="../graphic_conf.ui" line="357"/>
         <source>Margins</source>
         <translation>Поля</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="402"/>
-        <location filename="../graphic_conf.ui" line="412"/>
-        <location filename="../graphic_conf.ui" line="432"/>
-        <location filename="../graphic_conf.ui" line="472"/>
-        <location filename="../graphic_conf.ui" line="492"/>
-        <location filename="../ui_graphic_conf.h" line="474"/>
-        <location filename="../ui_graphic_conf.h" line="475"/>
-        <location filename="../ui_graphic_conf.h" line="477"/>
-        <location filename="../ui_graphic_conf.h" line="481"/>
-        <location filename="../ui_graphic_conf.h" line="483"/>
+        <location filename="../graphic_conf.ui" line="363"/>
+        <location filename="../graphic_conf.ui" line="373"/>
+        <location filename="../graphic_conf.ui" line="393"/>
+        <location filename="../graphic_conf.ui" line="433"/>
+        <location filename="../graphic_conf.ui" line="453"/>
         <source> px</source>
         <translation> пикс</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="422"/>
-        <location filename="../ui_graphic_conf.h" line="476"/>
+        <location filename="../graphic_conf.ui" line="383"/>
         <source>All:</source>
         <translation>Все:</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="442"/>
-        <location filename="../ui_graphic_conf.h" line="478"/>
+        <location filename="../graphic_conf.ui" line="403"/>
         <source>Right:</source>
         <translation>Правое:</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="452"/>
-        <location filename="../ui_graphic_conf.h" line="479"/>
+        <location filename="../graphic_conf.ui" line="413"/>
         <source>Left:</source>
         <translation>Левое:</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="462"/>
-        <location filename="../ui_graphic_conf.h" line="480"/>
+        <location filename="../graphic_conf.ui" line="423"/>
         <source>Bottom:</source>
         <translation>Нижнее:</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.ui" line="482"/>
-        <location filename="../ui_graphic_conf.h" line="482"/>
+        <location filename="../graphic_conf.ui" line="443"/>
         <source>Top:</source>
         <translation>Верхнее:</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.cpp" line="7"/>
+        <location filename="../graphic_conf.cpp" line="13"/>
         <source>NoPen</source>
         <translation>НетЛинии</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.cpp" line="7"/>
+        <location filename="../graphic_conf.cpp" line="13"/>
         <source>Solid</source>
         <translation>Сплошная</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.cpp" line="7"/>
+        <location filename="../graphic_conf.cpp" line="13"/>
         <source>Dash</source>
         <translation>Штриховая</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.cpp" line="8"/>
+        <location filename="../graphic_conf.cpp" line="14"/>
         <source>Dot</source>
         <translation>Пунктирная</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.cpp" line="8"/>
+        <location filename="../graphic_conf.cpp" line="14"/>
         <source>Dash-Dot</source>
         <translation>ШтрихПунктирная</translation>
     </message>
     <message>
-        <location filename="../graphic_conf.cpp" line="8"/>
+        <location filename="../graphic_conf.cpp" line="14"/>
         <source>Dash-Dot-Dot</source>
         <translation>ШтрихПунктирПунктирная</translation>
     </message>
 </context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../qpicalculator/mainwindow.ui" line="14"/>
+        <source>QPICalculator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qpicalculator/mainwindow.ui" line="29"/>
+        <source>Calculator</source>
+        <translation>Калькулятор</translation>
+    </message>
+    <message>
+        <location filename="../qpicalculator/mainwindow.ui" line="60"/>
+        <source>Expression</source>
+        <translation>Выражение</translation>
+    </message>
+    <message>
+        <location filename="../qpicalculator/mainwindow.ui" line="65"/>
+        <source>Result</source>
+        <translation>Результат</translation>
+    </message>
+    <message>
+        <location filename="../qpicalculator/mainwindow.ui" line="76"/>
+        <source>Correct</source>
+        <translation>Корректно</translation>
+    </message>
+    <message>
+        <location filename="../qpicalculator/mainwindow.ui" line="83"/>
+        <location filename="../qpicalculator/mainwindow.ui" line="100"/>
+        <source>0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qpicalculator/mainwindow.ui" line="111"/>
+        <source>Variables</source>
+        <translation>Переменные</translation>
+    </message>
+    <message>
+        <location filename="../qpicalculator/mainwindow.ui" line="139"/>
+        <source>Name</source>
+        <translation>Имя</translation>
+    </message>
+    <message>
+        <location filename="../qpicalculator/mainwindow.ui" line="144"/>
+        <source>Value</source>
+        <translation>Значение</translation>
+    </message>
+    <message>
+        <location filename="../qpicalculator/mainwindow.ui" line="169"/>
+        <location filename="../qpicalculator/mainwindow.ui" line="290"/>
+        <source>Del</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qpicalculator/mainwindow.ui" line="219"/>
+        <source>Graphics</source>
+        <translation>Графики</translation>
+    </message>
+    <message>
+        <location filename="../qpicalculator/mainwindow.ui" line="260"/>
+        <source>On</source>
+        <translation>Вкл</translation>
+    </message>
+    <message>
+        <location filename="../qpicalculator/mainwindow.ui" line="265"/>
+        <source>Function</source>
+        <translation>Функция</translation>
+    </message>
+</context>
 </TS>

qad/graphic/lang/update.bat

@@ -0,0 +1 @@
+lupdate ../ -ts qad_graphic_ru.ts

qad/sql_table/lang/qad_sql_table_ru.ts

@@ -1,25 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ru_RU">
-<context>
-    <name>SQLFilterEdit</name>
-    <message utf8="true">
-        <source>≈</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message utf8="true">
-        <source>≠</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message utf8="true">
-        <source>≥</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message utf8="true">
-        <source>≤</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
+<TS version="2.1" language="ru_RU">
 <context>
     <name>SQLTableWidget</name>
     <message>
@@ -54,5 +35,9 @@
         <source>Table &quot;%1&quot; doesn`t exists!</source>
         <translation>Таблица &quot;%1&quot; не существует!</translation>
     </message>
+    <message>
+        <source>SQLTableWidget</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

qad/sql_table/lang/update.bat

@@ -0,0 +1 @@
+lupdate ../ -ts qad_sql_table_ru.ts

qad/widgets/lang/qad_widgets_ru.ts

@@ -4,8 +4,8 @@
 <context>
     <name>CLineEdit</name>
     <message>
-        <location filename="../clineedit.cpp" line="8"/>
-        <location filename="../clineedit.cpp" line="35"/>
+        <location filename="../clineedit.cpp" line="9"/>
+        <location filename="../clineedit.cpp" line="44"/>
         <source>Clear</source>
         <translation>Сбросить</translation>
     </message>
@@ -230,11 +230,53 @@
 <context>
     <name>EComboBox</name>
     <message>
-        <location filename="../ecombobox.cpp" line="42"/>
+        <location filename="../ecombobox.cpp" line="44"/>
         <source>Filter</source>
         <translation>Фильтр</translation>
     </message>
 </context>
+<context>
+    <name>EvalSpinBox</name>
+    <message>
+        <location filename="../evalspinbox.cpp" line="28"/>
+        <location filename="../evalspinbox.cpp" line="92"/>
+        <source>Clear</source>
+        <translation>Очистить</translation>
+    </message>
+</context>
+<context>
+    <name>MatrixEdit</name>
+    <message>
+        <location filename="../matrixedit.ui" line="33"/>
+        <source>Cols:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../matrixedit.ui" line="47"/>
+        <source>Rows:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../matrixedit.ui" line="76"/>
+        <source>Null</source>
+        <translation>Обнулить</translation>
+    </message>
+    <message>
+        <location filename="../matrixedit.ui" line="79"/>
+        <source>0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../matrixedit.ui" line="86"/>
+        <source>Identity</source>
+        <translation>Единичная</translation>
+    </message>
+    <message>
+        <location filename="../matrixedit.ui" line="89"/>
+        <source>I</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>PathEdit</name>
     <message>
@@ -243,18 +285,18 @@
         <translation>Все файлы(*)</translation>
     </message>
     <message>
-        <location filename="../qvariantedit.cpp" line="111"/>
-        <location filename="../qvariantedit.cpp" line="123"/>
+        <location filename="../qvariantedit.cpp" line="112"/>
+        <location filename="../qvariantedit.cpp" line="124"/>
         <source>Choose</source>
         <translation>Выберите</translation>
     </message>
     <message>
-        <location filename="../qvariantedit.cpp" line="132"/>
+        <location filename="../qvariantedit.cpp" line="139"/>
         <source>Select directory</source>
         <translation>Выберите директорию</translation>
     </message>
     <message>
-        <location filename="../qvariantedit.cpp" line="133"/>
+        <location filename="../qvariantedit.cpp" line="140"/>
         <source>Select file</source>
         <translation>Выберите файл</translation>
     </message>
@@ -262,10 +304,80 @@
 <context>
     <name>QCodeEdit</name>
     <message>
-        <location filename="../qcodeedit.cpp" line="40"/>
+        <location filename="../qcodeedit.cpp" line="53"/>
         <source>Press F1 for details</source>
         <translation>Нажмите F1 для справочной информации</translation>
     </message>
+    <message>
+        <location filename="../qcodeedit.ui" line="122"/>
+        <source>Search:</source>
+        <translation>Поиск:</translation>
+    </message>
+    <message>
+        <location filename="../qcodeedit.ui" line="140"/>
+        <source>Case sensitive</source>
+        <translation>Учитывать регистр</translation>
+    </message>
+    <message>
+        <location filename="../qcodeedit.ui" line="143"/>
+        <source>Aa</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qcodeedit.ui" line="159"/>
+        <source>Whole words</source>
+        <translation>Слова целиком</translation>
+    </message>
+    <message>
+        <location filename="../qcodeedit.ui" line="162"/>
+        <source>W</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qcodeedit.ui" line="178"/>
+        <source>Previous</source>
+        <translation>Предыдущее</translation>
+    </message>
+    <message>
+        <location filename="../qcodeedit.ui" line="195"/>
+        <source>Next</source>
+        <translation>Следующее</translation>
+    </message>
+    <message>
+        <location filename="../qcodeedit.ui" line="208"/>
+        <source>Replace:</source>
+        <translation>Заменить:</translation>
+    </message>
+    <message>
+        <location filename="../qcodeedit.ui" line="226"/>
+        <source>Replace</source>
+        <translation>Заменить</translation>
+    </message>
+    <message>
+        <location filename="../qcodeedit.ui" line="229"/>
+        <source>R</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qcodeedit.ui" line="242"/>
+        <source>Replace and search</source>
+        <translation>Заменить и продолжить поиск</translation>
+    </message>
+    <message>
+        <location filename="../qcodeedit.ui" line="245"/>
+        <source>Rs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qcodeedit.ui" line="258"/>
+        <source>Replace all</source>
+        <translation>Заменить всё</translation>
+    </message>
+    <message>
+        <location filename="../qcodeedit.ui" line="261"/>
+        <source>Ra</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPIConfigNewDialog</name>
@@ -277,7 +389,7 @@
     <message>
         <location filename="../qpiconfignewdialog.ui" line="26"/>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Тип</translation>
     </message>
     <message>
         <location filename="../qpiconfignewdialog.ui" line="32"/>
@@ -563,11 +675,19 @@
 <context>
     <name>QVariantEdit</name>
     <message>
-        <location filename="../qvariantedit.cpp" line="176"/>
+        <location filename="../qvariantedit.cpp" line="186"/>
         <source>Invalid value</source>
         <translation>Неверное значение</translation>
     </message>
 </context>
+<context>
+    <name>ScrollSpinBox</name>
+    <message>
+        <location filename="../scroll_spin_box.ui" line="51"/>
+        <source>Grab and scroll</source>
+        <translation>Зажать и крутить</translation>
+    </message>
+</context>
 <context>
     <name>Shortcuts</name>
     <message>

qad/widgets/lang/update.bat

@@ -0,0 +1 @@
+lupdate ../ -ts qad_widgets_ru.ts