Index: /trunk/i18n/English.ts
===================================================================
--- /trunk/i18n/English.ts	(revision 26)
+++ /trunk/i18n/English.ts	(revision 27)
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="en" sourcelanguage="ru_RU">
+<TS version="2.0" language="en" sourcelanguage="en">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CTSPModel</name>
     <message>
-        <location filename="../src/tspmodel.cpp" line="51"/>
-        <source>Город %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/tspmodel.cpp" line="53"/>
+        <location filename="../src/tspmodel.cpp" line="52"/>
+        <source>City %1</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/tspmodel.cpp" line="54"/>
         <source>%1</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
@@ -19,325 +19,371 @@
     <name>MainWindow</name>
     <message>
-        <location filename="../ui/mainwindow.ce.ui" line="14"/>
-        <location filename="../ui/mainwindow.ui" line="14"/>
-        <source>Задача коммивояжера</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="74"/>
-        <location filename="../ui/mainwindow.ui" line="56"/>
-        <source>&amp;Вариант:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="97"/>
-        <location filename="../ui/mainwindow.ui" line="79"/>
-        <source>&amp;Городов:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="169"/>
-        <location filename="../ui/mainwindow.ui" line="151"/>
-        <source>Заполнить таблицу случайными значениями</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="172"/>
-        <location filename="../ui/mainwindow.ui" line="154"/>
-        <source>Случайно</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="182"/>
-        <location filename="../ui/mainwindow.ui" line="164"/>
-        <source>Решить текущую задачу</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="185"/>
-        <location filename="../ui/mainwindow.ui" line="167"/>
-        <source>Решить</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="252"/>
-        <location filename="../ui/mainwindow.ui" line="236"/>
-        <source>&amp;Файл</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="259"/>
-        <location filename="../ui/mainwindow.ui" line="243"/>
-        <source>Со&amp;хранить</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="279"/>
-        <location filename="../ui/mainwindow.ui" line="266"/>
-        <source>&amp;Настройки</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="285"/>
-        <location filename="../ui/mainwindow.ui" line="272"/>
-        <source>&amp;Помощь</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../ui/mainwindow.ui" line="315"/>
-        <source>&amp;Настройка печати</source>
-        <translation type="unfinished"></translation>
+        <source>P&amp;rint setup...</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ui" line="318"/>
+        <source>Setup printing</source>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/mainwindow.ui" line="330"/>
-        <source>&amp;Печать...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="325"/>
-        <location filename="../ui/mainwindow.ui" line="344"/>
-        <source>&amp;Ход решения</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="336"/>
-        <location filename="../ui/mainwindow.ui" line="355"/>
-        <source>&amp;Граф решения</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="362"/>
-        <location filename="../ui/mainwindow.ui" line="381"/>
-        <source>&amp;Создать</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="377"/>
-        <location filename="../ui/mainwindow.ui" line="396"/>
-        <source>&amp;Открыть</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="395"/>
-        <location filename="../ui/mainwindow.ui" line="414"/>
-        <source>&amp;Параметры</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="407"/>
-        <location filename="../ui/mainwindow.ui" line="426"/>
-        <source>&amp;Содежание</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="419"/>
-        <location filename="../ui/mainwindow.ui" line="438"/>
-        <source>&amp;Контекстная справка</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="431"/>
-        <location filename="../ui/mainwindow.ui" line="450"/>
-        <source>&amp;Про...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="443"/>
-        <location filename="../ui/mainwindow.ui" line="462"/>
-        <source>В&amp;ыход</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="446"/>
-        <location filename="../ui/mainwindow.ui" line="465"/>
-        <source>Выйти из программы</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Print...</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ui" line="333"/>
+        <source>Print solution results</source>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/mainwindow.ui" line="336"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="353"/>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="503"/>
+        <location filename="../ui/mainwindow.ui" line="519"/>
+        <source>Ctrl+S</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="383"/>
+        <location filename="../ui/mainwindow.ui" line="399"/>
+        <source>Ctrl+N</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="17"/>
+        <location filename="../ui/mainwindow.ui" line="14"/>
+        <source>Travelling salesman problem</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="56"/>
+        <location filename="../ui/mainwindow.ui" line="35"/>
+        <source>Task</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="77"/>
+        <location filename="../ui/mainwindow.ui" line="56"/>
+        <source>&amp;Variant:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="90"/>
+        <location filename="../ui/mainwindow.ui" line="69"/>
+        <source>Number of variant</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="100"/>
+        <location filename="../ui/mainwindow.ui" line="79"/>
+        <source>&amp;Cities:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="113"/>
+        <location filename="../ui/mainwindow.ui" line="92"/>
+        <source>Number of cities</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="144"/>
+        <location filename="../ui/mainwindow.ui" line="123"/>
+        <source>Cost of travel from city to city</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="172"/>
+        <location filename="../ui/mainwindow.ui" line="151"/>
+        <source>Fill table with random numbers</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="175"/>
+        <location filename="../ui/mainwindow.ui" line="154"/>
+        <source>Random</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="185"/>
+        <location filename="../ui/mainwindow.ui" line="164"/>
+        <source>Solve current task</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="188"/>
+        <location filename="../ui/mainwindow.ui" line="167"/>
+        <source>Solve</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="202"/>
+        <location filename="../ui/mainwindow.ui" line="181"/>
+        <source>Solution</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="219"/>
+        <location filename="../ui/mainwindow.ui" line="198"/>
+        <source>Solution steps</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="229"/>
+        <location filename="../ui/mainwindow.ui" line="208"/>
+        <source>Solution graph</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="255"/>
+        <location filename="../ui/mainwindow.ui" line="236"/>
+        <source>&amp;File</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="262"/>
+        <location filename="../ui/mainwindow.ui" line="243"/>
+        <source>&amp;Save</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="282"/>
+        <location filename="../ui/mainwindow.ui" line="266"/>
+        <source>&amp;Settings</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="288"/>
+        <location filename="../ui/mainwindow.ui" line="272"/>
+        <source>&amp;Help</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="328"/>
+        <location filename="../ui/mainwindow.ui" line="344"/>
+        <source>Solution st&amp;eps</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="331"/>
+        <location filename="../ui/mainwindow.ui" line="347"/>
+        <source>Save solution steps</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="334"/>
+        <location filename="../ui/mainwindow.ui" line="350"/>
+        <source>Save solution steps only</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="342"/>
+        <location filename="../ui/mainwindow.ui" line="358"/>
+        <source>Solution &amp;graph</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="345"/>
+        <location filename="../ui/mainwindow.ui" line="361"/>
+        <source>Save solution graph</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="348"/>
+        <location filename="../ui/mainwindow.ui" line="364"/>
+        <source>Save solution graph only</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="356"/>
+        <location filename="../ui/mainwindow.ui" line="372"/>
+        <source>&amp;Solution</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="359"/>
+        <location filename="../ui/mainwindow.ui" line="375"/>
+        <source>Save solution</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="362"/>
+        <location filename="../ui/mainwindow.ui" line="378"/>
+        <source>Save solution steps and graph</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="371"/>
+        <location filename="../ui/mainwindow.ui" line="387"/>
+        <source>&amp;New</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="374"/>
+        <location filename="../ui/mainwindow.ui" line="390"/>
+        <source>New</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="377"/>
+        <location filename="../ui/mainwindow.ui" line="393"/>
+        <source>New task</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="380"/>
+        <location filename="../ui/mainwindow.ui" line="396"/>
+        <source>Create new task</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="395"/>
+        <location filename="../ui/mainwindow.ui" line="411"/>
+        <source>&amp;Open...</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="398"/>
+        <location filename="../ui/mainwindow.ui" line="414"/>
+        <source>Open...</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="401"/>
+        <location filename="../ui/mainwindow.ui" line="417"/>
+        <source>Open task</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="404"/>
+        <location filename="../ui/mainwindow.ui" line="420"/>
+        <source>Open saved task</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="407"/>
+        <location filename="../ui/mainwindow.ui" line="423"/>
+        <source>Ctrl+O</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="416"/>
+        <location filename="../ui/mainwindow.ui" line="432"/>
+        <source>&amp;Preferences...</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="419"/>
+        <location filename="../ui/mainwindow.ui" line="435"/>
+        <source>Preferences...</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="422"/>
+        <location filename="../ui/mainwindow.ui" line="438"/>
+        <source>Application preferences</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="434"/>
+        <location filename="../ui/mainwindow.ui" line="450"/>
+        <source>&amp;Contents</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="437"/>
+        <location filename="../ui/mainwindow.ui" line="453"/>
+        <source>Open help contents</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="449"/>
+        <location filename="../ui/mainwindow.ui" line="465"/>
+        <source>&amp;Context help</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="452"/>
+        <location filename="../ui/mainwindow.ui" line="468"/>
+        <source>Open context help</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="461"/>
+        <location filename="../ui/mainwindow.ui" line="477"/>
+        <source>&amp;About...</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="464"/>
+        <location filename="../ui/mainwindow.ui" line="480"/>
+        <source>About...</source>
+        <translation></translation>
+    </message>
+    <message>
         <location filename="../ui/mainwindow.ce.ui" line="467"/>
-        <location filename="../ui/mainwindow.ui" line="372"/>
-        <location filename="../ui/mainwindow.ui" line="486"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="368"/>
-        <location filename="../ui/mainwindow.ui" line="387"/>
-        <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="386"/>
-        <location filename="../ui/mainwindow.ui" line="405"/>
-        <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="53"/>
-        <location filename="../ui/mainwindow.ui" line="35"/>
-        <source>Задача</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="87"/>
-        <location filename="../ui/mainwindow.ui" line="69"/>
-        <source>Номер варианта</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="141"/>
-        <location filename="../ui/mainwindow.ui" line="123"/>
-        <source>Стоимости переходов/переездов из города в город</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="199"/>
-        <location filename="../ui/mainwindow.ui" line="181"/>
-        <source>Решение</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="216"/>
-        <location filename="../ui/mainwindow.ui" line="198"/>
-        <source>Ход решения</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="226"/>
-        <location filename="../ui/mainwindow.ui" line="208"/>
-        <source>Граф решения</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="318"/>
-        <source>Настроить принтер для печати</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="333"/>
-        <source>Распечатать результаты решения</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="328"/>
-        <location filename="../ui/mainwindow.ui" line="347"/>
-        <source>Сохранить только хоод решения</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="339"/>
-        <location filename="../ui/mainwindow.ui" line="358"/>
-        <source>Сохранить только граф решения</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="347"/>
-        <location filename="../ui/mainwindow.ui" line="366"/>
-        <source>&amp;Решение</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="350"/>
-        <location filename="../ui/mainwindow.ui" line="369"/>
-        <source>Сохранить ход и граф решения</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="365"/>
-        <location filename="../ui/mainwindow.ui" line="384"/>
-        <source>Создать новую задачу</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="380"/>
-        <location filename="../ui/mainwindow.ui" line="399"/>
-        <source>Открыть задачу</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="383"/>
-        <location filename="../ui/mainwindow.ui" line="402"/>
-        <source>Открыть сохраненное условие задачи</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="398"/>
-        <location filename="../ui/mainwindow.ui" line="417"/>
-        <source>Настройка параметров программмы</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="410"/>
-        <location filename="../ui/mainwindow.ui" line="429"/>
-        <source>Вызвать справку по программе</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="422"/>
-        <location filename="../ui/mainwindow.ui" line="441"/>
-        <source>Вызвать контекстную справку</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="455"/>
-        <location filename="../ui/mainwindow.ui" line="474"/>
-        <source>&amp;Задачу</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="458"/>
-        <location filename="../ui/mainwindow.ui" line="477"/>
-        <source>Сохранить</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="461"/>
-        <location filename="../ui/mainwindow.ui" line="480"/>
-        <source>Сохранить задачу</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="464"/>
         <location filename="../ui/mainwindow.ui" line="483"/>
-        <source>Сохранить условие задачи в файл</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mainwindow.cpp" line="104"/>
-        <source>Ошибка в данных</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mainwindow.cpp" line="104"/>
-        <source>Ошибка в ячейке [Строка %1; Колонка %2]: Неверный формат данных.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mainwindow.cpp" line="113"/>
-        <source>Ошибка при решении</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mainwindow.cpp" line="113"/>
-        <source>Во время решения задачи возникла ошибка</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="434"/>
-        <location filename="../ui/mainwindow.ui" line="453"/>
-        <source>Получить информацию о программе</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="110"/>
-        <location filename="../ui/mainwindow.ui" line="92"/>
-        <source>Количество городов, которые обходит коммивояжер</source>
-        <translation type="unfinished"></translation>
+        <source>About application</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="476"/>
+        <location filename="../ui/mainwindow.ui" line="492"/>
+        <source>E&amp;xit</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="479"/>
+        <location filename="../ui/mainwindow.ui" line="495"/>
+        <source>Exit application</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="491"/>
+        <location filename="../ui/mainwindow.ui" line="507"/>
+        <source>&amp;Task...</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="494"/>
+        <location filename="../ui/mainwindow.ui" line="510"/>
+        <source>Task...</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="497"/>
+        <location filename="../ui/mainwindow.ui" line="513"/>
+        <source>Save task</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="500"/>
+        <location filename="../ui/mainwindow.ui" line="516"/>
+        <source>Save task to file</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="125"/>
+        <source>Data error</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="125"/>
+        <source>Error in cell [Row %1; Column %2]: Invalid data format.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="134"/>
+        <source>Solution error</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="134"/>
+        <source>There was an error while solving the task.</source>
+        <translation></translation>
     </message>
 </context>
@@ -345,134 +391,135 @@
     <name>SettingsDialog</name>
     <message>
+        <location filename="../ui/settingsdialog.ui" line="41"/>
+        <source>background-color: #0080C0</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ui" line="235"/>
+        <source>Print settings:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ui" line="249"/>
+        <source>&amp;Left margin:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ui" line="262"/>
+        <source>Left border margin for page</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ui" line="329"/>
+        <source>Restore main window state and position on application restart</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ui" line="332"/>
+        <source>Save main window state and position</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ui" line="403"/>
+        <source>Hover mouse pointer over dialog elements to get additional help</source>
+        <translation></translation>
+    </message>
+    <message>
         <location filename="../ui/settingsdialog.ce.ui" line="14"/>
         <location filename="../ui/settingsdialog.ui" line="14"/>
-        <source>Параметры</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ui" line="41"/>
-        <source>background-color: #0080C0</source>
-        <translation type="unfinished"></translation>
+        <source>Preferences</source>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/settingsdialog.ce.ui" line="100"/>
         <location filename="../ui/settingsdialog.ui" line="151"/>
-        <source>Случайные значения:</source>
-        <translation type="unfinished"></translation>
+        <source>Random values:</source>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/settingsdialog.ce.ui" line="114"/>
         <location filename="../ui/settingsdialog.ui" line="165"/>
-        <source>Ми&amp;нимум:</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Minimal:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="127"/>
+        <location filename="../ui/settingsdialog.ui" line="178"/>
+        <source>Minimum for random number generation</source>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/settingsdialog.ce.ui" line="150"/>
         <location filename="../ui/settingsdialog.ui" line="201"/>
-        <source>&amp;Максимум:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ui" line="235"/>
-        <source>Настройки печати:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ui" line="243"/>
-        <source>&amp;Левый отступ:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ce.ui" line="205"/>
-        <location filename="../ui/settingsdialog.ui" line="280"/>
-        <source>&amp;Шрифт...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ui" line="302"/>
-        <source>Сохранять состояние и положение главного окна</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ce.ui" line="353"/>
-        <location filename="../ui/settingsdialog.ui" line="395"/>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ce.ui" line="373"/>
-        <location filename="../ui/settingsdialog.ui" line="415"/>
-        <source>&amp;Отмена</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ce.ui" line="320"/>
-        <location filename="../ui/settingsdialog.ui" line="350"/>
-        <source>Помощь</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ce.ui" line="317"/>
-        <location filename="../ui/settingsdialog.ui" line="347"/>
-        <source>Получить помощь по настройкам</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ce.ui" line="127"/>
-        <location filename="../ui/settingsdialog.ui" line="178"/>
-        <source>Нижняя граница для генерации случайных значений</source>
-        <translation type="unfinished"></translation>
+        <source>Ma&amp;ximal:</source>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/settingsdialog.ce.ui" line="163"/>
         <location filename="../ui/settingsdialog.ui" line="214"/>
-        <source>Верхняя граница для генерации случайных значений</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ui" line="256"/>
-        <source>Размер отступа от левого края страницы</source>
-        <translation type="unfinished"></translation>
+        <source>Maximum for random number generation</source>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/settingsdialog.ce.ui" line="202"/>
-        <location filename="../ui/settingsdialog.ui" line="277"/>
-        <source>Задать параметры шрифта, используемого при печати</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ce.ui" line="252"/>
-        <source>Сохранять состояние и
-положение главного окна</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ce.ui" line="314"/>
-        <location filename="../ui/settingsdialog.ui" line="344"/>
-        <source>Справка</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ce.ui" line="350"/>
-        <location filename="../ui/settingsdialog.ui" line="392"/>
-        <source>Сохранить новые параметры</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ce.ui" line="370"/>
-        <location filename="../ui/settingsdialog.ui" line="412"/>
-        <source>Закрыть окно без сохранения параметров</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ce.ui" line="249"/>
-        <location filename="../ui/settingsdialog.ui" line="299"/>
-        <source>Восстанавливать состояние и размеры окна после перезапуска программы</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ui" line="370"/>
-        <source>Наведите указатель мыши на элемент диалога, чтоб получить подсказку</source>
-        <translation type="unfinished"></translation>
+        <location filename="../ui/settingsdialog.ui" line="288"/>
+        <source>Font color for printing</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="205"/>
+        <location filename="../ui/settingsdialog.ui" line="291"/>
+        <source>&amp;Color...</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="219"/>
+        <location filename="../ui/settingsdialog.ui" line="305"/>
+        <source>Font face for printing</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="222"/>
+        <location filename="../ui/settingsdialog.ui" line="308"/>
+        <source>&amp;Font...</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="287"/>
+        <location filename="../ui/settingsdialog.ce.ui" line="293"/>
+        <location filename="../ui/settingsdialog.ui" line="377"/>
+        <location filename="../ui/settingsdialog.ui" line="383"/>
+        <source>Help</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="290"/>
+        <location filename="../ui/settingsdialog.ui" line="380"/>
+        <source>Get preferences help</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="323"/>
+        <location filename="../ui/settingsdialog.ui" line="425"/>
+        <source>Save new preferences</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="326"/>
+        <location filename="../ui/settingsdialog.ui" line="428"/>
+        <source>&amp;OK</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="343"/>
+        <location filename="../ui/settingsdialog.ui" line="445"/>
+        <source>Close without saving preferences</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="346"/>
+        <location filename="../ui/settingsdialog.ui" line="448"/>
+        <source>&amp;Cancel</source>
+        <translation></translation>
     </message>
 </context>
Index: /trunk/i18n/Russian.ts
===================================================================
--- /trunk/i18n/Russian.ts	(revision 27)
+++ /trunk/i18n/Russian.ts	(revision 27)
@@ -0,0 +1,526 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="ru_RU" sourcelanguage="en">
+<defaultcodec>UTF-8</defaultcodec>
+<context>
+    <name>CTSPModel</name>
+    <message>
+        <location filename="../src/tspmodel.cpp" line="52"/>
+        <source>City %1</source>
+        <translation>Город %1</translation>
+    </message>
+    <message>
+        <location filename="../src/tspmodel.cpp" line="54"/>
+        <source>%1</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="125"/>
+        <source>Data error</source>
+        <translation>Ошибка в данных</translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="125"/>
+        <source>Error in cell [Row %1; Column %2]: Invalid data format.</source>
+        <translation>Ошибка в ячейке [Строка %1; Колонка %2]: Неверный формат данных.</translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="134"/>
+        <source>Solution error</source>
+        <translation>Ошибка при решении</translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="134"/>
+        <source>There was an error while solving the task.</source>
+        <translation>Во время решения задачи возникла ошибка.</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="17"/>
+        <location filename="../ui/mainwindow.ui" line="14"/>
+        <source>Travelling salesman problem</source>
+        <translation>Задача коммивояжера</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="56"/>
+        <location filename="../ui/mainwindow.ui" line="35"/>
+        <source>Task</source>
+        <translation>Задача</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="77"/>
+        <location filename="../ui/mainwindow.ui" line="56"/>
+        <source>&amp;Variant:</source>
+        <translation>&amp;Вариант:</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="90"/>
+        <location filename="../ui/mainwindow.ui" line="69"/>
+        <source>Number of variant</source>
+        <translation>Номер варианта</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="100"/>
+        <location filename="../ui/mainwindow.ui" line="79"/>
+        <source>&amp;Cities:</source>
+        <translation>&amp;Городов:</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="113"/>
+        <location filename="../ui/mainwindow.ui" line="92"/>
+        <source>Number of cities</source>
+        <translation>Количество городов, которые обходит коммивояжер</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="144"/>
+        <location filename="../ui/mainwindow.ui" line="123"/>
+        <source>Cost of travel from city to city</source>
+        <translation>Стоимости переходов из города в город</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="172"/>
+        <location filename="../ui/mainwindow.ui" line="151"/>
+        <source>Fill table with random numbers</source>
+        <translation>Заполнить таблицу случайными значениями</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="175"/>
+        <location filename="../ui/mainwindow.ui" line="154"/>
+        <source>Random</source>
+        <translation>Случайно</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="185"/>
+        <location filename="../ui/mainwindow.ui" line="164"/>
+        <source>Solve current task</source>
+        <translation>Решить текущую задачу</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="188"/>
+        <location filename="../ui/mainwindow.ui" line="167"/>
+        <source>Solve</source>
+        <translation>Решить</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="202"/>
+        <location filename="../ui/mainwindow.ui" line="181"/>
+        <source>Solution</source>
+        <translation>Решение</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="219"/>
+        <location filename="../ui/mainwindow.ui" line="198"/>
+        <source>Solution steps</source>
+        <translation>Ход решения</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="229"/>
+        <location filename="../ui/mainwindow.ui" line="208"/>
+        <source>Solution graph</source>
+        <translation>Граф решения</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="255"/>
+        <location filename="../ui/mainwindow.ui" line="236"/>
+        <source>&amp;File</source>
+        <translation>&amp;Файл</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="262"/>
+        <location filename="../ui/mainwindow.ui" line="243"/>
+        <source>&amp;Save</source>
+        <translation>Со&amp;хранить</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="282"/>
+        <location filename="../ui/mainwindow.ui" line="266"/>
+        <source>&amp;Settings</source>
+        <translation>&amp;Настройки</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="288"/>
+        <location filename="../ui/mainwindow.ui" line="272"/>
+        <source>&amp;Help</source>
+        <translation>&amp;Помощь</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="328"/>
+        <location filename="../ui/mainwindow.ui" line="344"/>
+        <source>Solution st&amp;eps</source>
+        <translation>&amp;Ход решения</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="331"/>
+        <location filename="../ui/mainwindow.ui" line="347"/>
+        <source>Save solution steps</source>
+        <translation>Сохранить ход решения</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="334"/>
+        <location filename="../ui/mainwindow.ui" line="350"/>
+        <source>Save solution steps only</source>
+        <translation>Сохранить только ход решения</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="342"/>
+        <location filename="../ui/mainwindow.ui" line="358"/>
+        <source>Solution &amp;graph</source>
+        <translation>&amp;Граф решения</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="345"/>
+        <location filename="../ui/mainwindow.ui" line="361"/>
+        <source>Save solution graph</source>
+        <translation>Сохранить граф решения</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="348"/>
+        <location filename="../ui/mainwindow.ui" line="364"/>
+        <source>Save solution graph only</source>
+        <translation>Сохранить только граф решения</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="356"/>
+        <location filename="../ui/mainwindow.ui" line="372"/>
+        <source>&amp;Solution</source>
+        <translation>&amp;Решение</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="359"/>
+        <location filename="../ui/mainwindow.ui" line="375"/>
+        <source>Save solution</source>
+        <translation>Сохранить решение</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="362"/>
+        <location filename="../ui/mainwindow.ui" line="378"/>
+        <source>Save solution steps and graph</source>
+        <translation>Сохранить ход и граф решения</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="371"/>
+        <location filename="../ui/mainwindow.ui" line="387"/>
+        <source>&amp;New</source>
+        <translation>&amp;Создать</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="374"/>
+        <location filename="../ui/mainwindow.ui" line="390"/>
+        <source>New</source>
+        <translation>Создать</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="377"/>
+        <location filename="../ui/mainwindow.ui" line="393"/>
+        <source>New task</source>
+        <translation>Создать задачу</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="380"/>
+        <location filename="../ui/mainwindow.ui" line="396"/>
+        <source>Create new task</source>
+        <translation>Создать новую задачу</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="383"/>
+        <location filename="../ui/mainwindow.ui" line="399"/>
+        <source>Ctrl+N</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="395"/>
+        <location filename="../ui/mainwindow.ui" line="411"/>
+        <source>&amp;Open...</source>
+        <translation>&amp;Открыть...</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="398"/>
+        <location filename="../ui/mainwindow.ui" line="414"/>
+        <source>Open...</source>
+        <translation>Открыть...</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="401"/>
+        <location filename="../ui/mainwindow.ui" line="417"/>
+        <source>Open task</source>
+        <translation>Открыть задачу</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="404"/>
+        <location filename="../ui/mainwindow.ui" line="420"/>
+        <source>Open saved task</source>
+        <translation>Открыть сохраненное условие задачи</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="407"/>
+        <location filename="../ui/mainwindow.ui" line="423"/>
+        <source>Ctrl+O</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="416"/>
+        <location filename="../ui/mainwindow.ui" line="432"/>
+        <source>&amp;Preferences...</source>
+        <translation>&amp;Параметры...</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="419"/>
+        <location filename="../ui/mainwindow.ui" line="435"/>
+        <source>Preferences...</source>
+        <translation>Параметры...</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="422"/>
+        <location filename="../ui/mainwindow.ui" line="438"/>
+        <source>Application preferences</source>
+        <translation>Настройка параметров программмы</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="434"/>
+        <location filename="../ui/mainwindow.ui" line="450"/>
+        <source>&amp;Contents</source>
+        <translation>&amp;Содежание</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="437"/>
+        <location filename="../ui/mainwindow.ui" line="453"/>
+        <source>Open help contents</source>
+        <translation>Вызвать справку программы</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="449"/>
+        <location filename="../ui/mainwindow.ui" line="465"/>
+        <source>&amp;Context help</source>
+        <translation>&amp;Контекстная справка</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="452"/>
+        <location filename="../ui/mainwindow.ui" line="468"/>
+        <source>Open context help</source>
+        <translation>Вызвать контекстную справку</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="461"/>
+        <location filename="../ui/mainwindow.ui" line="477"/>
+        <source>&amp;About...</source>
+        <translation>&amp;Про...</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="464"/>
+        <location filename="../ui/mainwindow.ui" line="480"/>
+        <source>About...</source>
+        <translation>Про...</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="467"/>
+        <location filename="../ui/mainwindow.ui" line="483"/>
+        <source>About application</source>
+        <translation>О программе</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="476"/>
+        <location filename="../ui/mainwindow.ui" line="492"/>
+        <source>E&amp;xit</source>
+        <translation>В&amp;ыход</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="479"/>
+        <location filename="../ui/mainwindow.ui" line="495"/>
+        <source>Exit application</source>
+        <translation>Выйти из приложения</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="491"/>
+        <location filename="../ui/mainwindow.ui" line="507"/>
+        <source>&amp;Task...</source>
+        <translation>&amp;Задачу...</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="494"/>
+        <location filename="../ui/mainwindow.ui" line="510"/>
+        <source>Task...</source>
+        <translation>Задачу...</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="497"/>
+        <location filename="../ui/mainwindow.ui" line="513"/>
+        <source>Save task</source>
+        <translation>Сохранить задачу</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="500"/>
+        <location filename="../ui/mainwindow.ui" line="516"/>
+        <source>Save task to file</source>
+        <translation>Сохранить условие задачи в файл</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="503"/>
+        <location filename="../ui/mainwindow.ui" line="519"/>
+        <source>Ctrl+S</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ui" line="315"/>
+        <source>P&amp;rint setup...</source>
+        <translation>&amp;Настройка печати...</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ui" line="318"/>
+        <source>Setup printing</source>
+        <translation>Настроить печать</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ui" line="330"/>
+        <source>&amp;Print...</source>
+        <translation>&amp;Печать...</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ui" line="333"/>
+        <source>Print solution results</source>
+        <translation>Распечатать результаты решения</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ui" line="336"/>
+        <source>Ctrl+P</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="14"/>
+        <location filename="../ui/settingsdialog.ui" line="14"/>
+        <source>Preferences</source>
+        <translation>Параметры</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="100"/>
+        <location filename="../ui/settingsdialog.ui" line="151"/>
+        <source>Random values:</source>
+        <translation>Случайные значения:</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="114"/>
+        <location filename="../ui/settingsdialog.ui" line="165"/>
+        <source>&amp;Minimal:</source>
+        <translation>&amp;Минимум:</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="127"/>
+        <location filename="../ui/settingsdialog.ui" line="178"/>
+        <source>Minimum for random number generation</source>
+        <translation>Нижняя граница для генерации случайных значений</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="150"/>
+        <location filename="../ui/settingsdialog.ui" line="201"/>
+        <source>Ma&amp;ximal:</source>
+        <translation>М&amp;аксимум:</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="163"/>
+        <location filename="../ui/settingsdialog.ui" line="214"/>
+        <source>Maximum for random number generation</source>
+        <translation>Верхняя граница для генерации случайных значений</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="202"/>
+        <location filename="../ui/settingsdialog.ui" line="288"/>
+        <source>Font color for printing</source>
+        <translation>Цвет шрифта, используемого при печати</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="205"/>
+        <location filename="../ui/settingsdialog.ui" line="291"/>
+        <source>&amp;Color...</source>
+        <translation>&amp;Цвет...</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="219"/>
+        <location filename="../ui/settingsdialog.ui" line="305"/>
+        <source>Font face for printing</source>
+        <translation>Вид шрифта, используемого при печати</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="222"/>
+        <location filename="../ui/settingsdialog.ui" line="308"/>
+        <source>&amp;Font...</source>
+        <translation>&amp;Шрифт...</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="287"/>
+        <location filename="../ui/settingsdialog.ce.ui" line="293"/>
+        <location filename="../ui/settingsdialog.ui" line="377"/>
+        <location filename="../ui/settingsdialog.ui" line="383"/>
+        <source>Help</source>
+        <translation>Помощь</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="290"/>
+        <location filename="../ui/settingsdialog.ui" line="380"/>
+        <source>Get preferences help</source>
+        <translation>Получить помощь по настройкам</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="323"/>
+        <location filename="../ui/settingsdialog.ui" line="425"/>
+        <source>Save new preferences</source>
+        <translation>Сохранить новые параметры</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="326"/>
+        <location filename="../ui/settingsdialog.ui" line="428"/>
+        <source>&amp;OK</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="343"/>
+        <location filename="../ui/settingsdialog.ui" line="445"/>
+        <source>Close without saving preferences</source>
+        <translation>Закрыть окно без сохранения параметров</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="346"/>
+        <location filename="../ui/settingsdialog.ui" line="448"/>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Отмена</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ui" line="41"/>
+        <source>background-color: #0080C0</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ui" line="235"/>
+        <source>Print settings:</source>
+        <translation>Настройки печати:</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ui" line="249"/>
+        <source>&amp;Left margin:</source>
+        <translation>&amp;Левый отступ:</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ui" line="262"/>
+        <source>Left border margin for page</source>
+        <translation>Левый отступ от края страницы во время печати</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ui" line="329"/>
+        <source>Restore main window state and position on application restart</source>
+        <translation>Восстанавливать состояние и размеры главного окна после перезапуска приложения</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ui" line="332"/>
+        <source>Save main window state and position</source>
+        <translation>Сохранять состояние и положение главного окна</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ui" line="403"/>
+        <source>Hover mouse pointer over dialog elements to get additional help</source>
+        <translation>Наведите указатель мыши на элемент диалога, чтоб получить подсказку</translation>
+    </message>
+</context>
+</TS>
Index: /trunk/i18n/Ukrainian.ts
===================================================================
--- /trunk/i18n/Ukrainian.ts	(revision 26)
+++ /trunk/i18n/Ukrainian.ts	(revision 27)
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="uk_UA" sourcelanguage="ru_RU">
+<TS version="2.0" language="uk_UA" sourcelanguage="en">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CTSPModel</name>
     <message>
-        <location filename="../src/tspmodel.cpp" line="51"/>
-        <source>Город %1</source>
+        <location filename="../src/tspmodel.cpp" line="52"/>
+        <source>City %1</source>
         <translation>Місто %1</translation>
     </message>
     <message>
-        <location filename="../src/tspmodel.cpp" line="53"/>
+        <location filename="../src/tspmodel.cpp" line="54"/>
         <source>%1</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
@@ -19,138 +19,34 @@
     <name>MainWindow</name>
     <message>
-        <location filename="../ui/mainwindow.ce.ui" line="14"/>
-        <location filename="../ui/mainwindow.ui" line="14"/>
-        <source>Задача коммивояжера</source>
-        <translation>Задача комівояжера</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="74"/>
-        <location filename="../ui/mainwindow.ui" line="56"/>
-        <source>&amp;Вариант:</source>
-        <translation>&amp;Варіант:</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="97"/>
-        <location filename="../ui/mainwindow.ui" line="79"/>
-        <source>&amp;Городов:</source>
-        <translation>&amp;Міст:</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="169"/>
-        <location filename="../ui/mainwindow.ui" line="151"/>
-        <source>Заполнить таблицу случайными значениями</source>
-        <translation>Заповнити таблицю випадковими значеннями</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="172"/>
-        <location filename="../ui/mainwindow.ui" line="154"/>
-        <source>Случайно</source>
-        <translation>Випадково</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="182"/>
-        <location filename="../ui/mainwindow.ui" line="164"/>
-        <source>Решить текущую задачу</source>
-        <translation>Розв&apos;язати поточну задачу</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="185"/>
-        <location filename="../ui/mainwindow.ui" line="167"/>
-        <source>Решить</source>
-        <translation>Розв&apos;язати</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="252"/>
-        <location filename="../ui/mainwindow.ui" line="236"/>
-        <source>&amp;Файл</source>
-        <translation>&amp;Файл</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="259"/>
-        <location filename="../ui/mainwindow.ui" line="243"/>
-        <source>Со&amp;хранить</source>
-        <translation>&amp;Зберегти</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="279"/>
-        <location filename="../ui/mainwindow.ui" line="266"/>
-        <source>&amp;Настройки</source>
-        <translation>&amp;Налагодження</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="285"/>
-        <location filename="../ui/mainwindow.ui" line="272"/>
-        <source>&amp;Помощь</source>
-        <translation>&amp;Допомога</translation>
+        <location filename="../ui/mainwindow.ce.ui" line="90"/>
+        <location filename="../ui/mainwindow.ui" line="69"/>
+        <source>Number of variant</source>
+        <translation>Номер варіанту</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="113"/>
+        <location filename="../ui/mainwindow.ui" line="92"/>
+        <source>Number of cities</source>
+        <translation>Кількість міст, що проходить комівояжер</translation>
     </message>
     <message>
         <location filename="../ui/mainwindow.ui" line="315"/>
-        <source>&amp;Настройка печати</source>
-        <translation>&amp;Налагодження друку</translation>
+        <source>P&amp;rint setup...</source>
+        <translation>&amp;Налагодження друку...</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ui" line="318"/>
+        <source>Setup printing</source>
+        <translation>Налагодити друк</translation>
     </message>
     <message>
         <location filename="../ui/mainwindow.ui" line="330"/>
-        <source>&amp;Печать...</source>
+        <source>&amp;Print...</source>
         <translation>&amp;Друк...</translation>
     </message>
     <message>
-        <location filename="../ui/mainwindow.ce.ui" line="325"/>
-        <location filename="../ui/mainwindow.ui" line="344"/>
-        <source>&amp;Ход решения</source>
-        <translation>&amp;Хід розв&apos;язку</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="336"/>
-        <location filename="../ui/mainwindow.ui" line="355"/>
-        <source>&amp;Граф решения</source>
-        <translation>&amp;Граф розв&apos;язку</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="362"/>
-        <location filename="../ui/mainwindow.ui" line="381"/>
-        <source>&amp;Создать</source>
-        <translation>&amp;Створити</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="377"/>
-        <location filename="../ui/mainwindow.ui" line="396"/>
-        <source>&amp;Открыть</source>
-        <translation>&amp;Відкрити</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="395"/>
-        <location filename="../ui/mainwindow.ui" line="414"/>
-        <source>&amp;Параметры</source>
-        <translation>&amp;Параметри</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="407"/>
-        <location filename="../ui/mainwindow.ui" line="426"/>
-        <source>&amp;Содежание</source>
-        <translation>&amp;Зміст</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="419"/>
-        <location filename="../ui/mainwindow.ui" line="438"/>
-        <source>&amp;Контекстная справка</source>
-        <translation>&amp;Контекстна допомога</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="431"/>
-        <location filename="../ui/mainwindow.ui" line="450"/>
-        <source>&amp;Про...</source>
-        <translation>&amp;Про...</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="443"/>
-        <location filename="../ui/mainwindow.ui" line="462"/>
-        <source>В&amp;ыход</source>
-        <translation>В&amp;ихід</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="446"/>
-        <location filename="../ui/mainwindow.ui" line="465"/>
-        <source>Выйти из программы</source>
-        <translation>Вийти з програми</translation>
+        <location filename="../ui/mainwindow.ui" line="333"/>
+        <source>Print solution results</source>
+        <translation>Роздрукувати результат розв&apos;язку</translation>
     </message>
     <message>
@@ -160,184 +56,334 @@
     </message>
     <message>
-        <location filename="../ui/mainwindow.ce.ui" line="353"/>
+        <location filename="../ui/mainwindow.ce.ui" line="503"/>
+        <location filename="../ui/mainwindow.ui" line="519"/>
+        <source>Ctrl+S</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="383"/>
+        <location filename="../ui/mainwindow.ui" line="399"/>
+        <source>Ctrl+N</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="17"/>
+        <location filename="../ui/mainwindow.ui" line="14"/>
+        <source>Travelling salesman problem</source>
+        <translation>Задача комівояжера</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="56"/>
+        <location filename="../ui/mainwindow.ui" line="35"/>
+        <source>Task</source>
+        <translation>Завдання</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="77"/>
+        <location filename="../ui/mainwindow.ui" line="56"/>
+        <source>&amp;Variant:</source>
+        <translation>&amp;Варіант:</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="100"/>
+        <location filename="../ui/mainwindow.ui" line="79"/>
+        <source>&amp;Cities:</source>
+        <translation>&amp;Міст:</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="144"/>
+        <location filename="../ui/mainwindow.ui" line="123"/>
+        <source>Cost of travel from city to city</source>
+        <translation>Вартість переїзду з міста у місто</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="172"/>
+        <location filename="../ui/mainwindow.ui" line="151"/>
+        <source>Fill table with random numbers</source>
+        <translation>Заповнити таблицю випадковими значеннями</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="175"/>
+        <location filename="../ui/mainwindow.ui" line="154"/>
+        <source>Random</source>
+        <translation>Випадково</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="185"/>
+        <location filename="../ui/mainwindow.ui" line="164"/>
+        <source>Solve current task</source>
+        <translation>Розв&apos;язати поточну задачу</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="188"/>
+        <location filename="../ui/mainwindow.ui" line="167"/>
+        <source>Solve</source>
+        <translation>Розв&apos;язати</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="202"/>
+        <location filename="../ui/mainwindow.ui" line="181"/>
+        <source>Solution</source>
+        <translation>Розв&apos;язок</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="219"/>
+        <location filename="../ui/mainwindow.ui" line="198"/>
+        <source>Solution steps</source>
+        <translation>Хід розв&apos;язку</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="229"/>
+        <location filename="../ui/mainwindow.ui" line="208"/>
+        <source>Solution graph</source>
+        <translation>Граф розв&apos;язку</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="255"/>
+        <location filename="../ui/mainwindow.ui" line="236"/>
+        <source>&amp;File</source>
+        <translation>&amp;Файл</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="262"/>
+        <location filename="../ui/mainwindow.ui" line="243"/>
+        <source>&amp;Save</source>
+        <translation>&amp;Зберегти</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="282"/>
+        <location filename="../ui/mainwindow.ui" line="266"/>
+        <source>&amp;Settings</source>
+        <translation>&amp;Параметри</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="288"/>
+        <location filename="../ui/mainwindow.ui" line="272"/>
+        <source>&amp;Help</source>
+        <translation>&amp;Допомога</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="328"/>
+        <location filename="../ui/mainwindow.ui" line="344"/>
+        <source>Solution st&amp;eps</source>
+        <translation>&amp;Хід розв&apos;язку</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="331"/>
+        <location filename="../ui/mainwindow.ui" line="347"/>
+        <source>Save solution steps</source>
+        <translation>Зберегти хід розв&apos;язку</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="334"/>
+        <location filename="../ui/mainwindow.ui" line="350"/>
+        <source>Save solution steps only</source>
+        <translation>Зберегти тільки хід розв&apos;язку</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="342"/>
+        <location filename="../ui/mainwindow.ui" line="358"/>
+        <source>Solution &amp;graph</source>
+        <translation>&amp;Граф розв&apos;язку</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="345"/>
+        <location filename="../ui/mainwindow.ui" line="361"/>
+        <source>Save solution graph</source>
+        <translation>Зберегти граф розв&apos;язку</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="348"/>
+        <location filename="../ui/mainwindow.ui" line="364"/>
+        <source>Save solution graph only</source>
+        <translation>Зберегти тільки граф розв&apos;язку</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="356"/>
+        <location filename="../ui/mainwindow.ui" line="372"/>
+        <source>&amp;Solution</source>
+        <translation>&amp;Розв&apos;язок</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="359"/>
+        <location filename="../ui/mainwindow.ui" line="375"/>
+        <source>Save solution</source>
+        <translation>Зберегти розв&apos;язок</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="362"/>
+        <location filename="../ui/mainwindow.ui" line="378"/>
+        <source>Save solution steps and graph</source>
+        <translation>Зберегти хід та граф розв&apos;язку</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="371"/>
+        <location filename="../ui/mainwindow.ui" line="387"/>
+        <source>&amp;New</source>
+        <translation>&amp;Створити</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="374"/>
+        <location filename="../ui/mainwindow.ui" line="390"/>
+        <source>New</source>
+        <translation>Створити</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="377"/>
+        <location filename="../ui/mainwindow.ui" line="393"/>
+        <source>New task</source>
+        <translation>Нове завдання</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="380"/>
+        <location filename="../ui/mainwindow.ui" line="396"/>
+        <source>Create new task</source>
+        <translation>Створити нове завдання</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="395"/>
+        <location filename="../ui/mainwindow.ui" line="411"/>
+        <source>&amp;Open...</source>
+        <translation>&amp;Відкрити...</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="398"/>
+        <location filename="../ui/mainwindow.ui" line="414"/>
+        <source>Open...</source>
+        <translation>Відкрити...</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="401"/>
+        <location filename="../ui/mainwindow.ui" line="417"/>
+        <source>Open task</source>
+        <translation>Відкрити завдання</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="404"/>
+        <location filename="../ui/mainwindow.ui" line="420"/>
+        <source>Open saved task</source>
+        <translation>Відкрити збережене завдання</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="407"/>
+        <location filename="../ui/mainwindow.ui" line="423"/>
+        <source>Ctrl+O</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="416"/>
+        <location filename="../ui/mainwindow.ui" line="432"/>
+        <source>&amp;Preferences...</source>
+        <translation>&amp;Налагодження...</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="419"/>
+        <location filename="../ui/mainwindow.ui" line="435"/>
+        <source>Preferences...</source>
+        <translation>Налагодження...</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="422"/>
+        <location filename="../ui/mainwindow.ui" line="438"/>
+        <source>Application preferences</source>
+        <translation>Налагодження додатку</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="434"/>
+        <location filename="../ui/mainwindow.ui" line="450"/>
+        <source>&amp;Contents</source>
+        <translation>&amp;Зміст</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="437"/>
+        <location filename="../ui/mainwindow.ui" line="453"/>
+        <source>Open help contents</source>
+        <translation>Відкрити зміст допомоги</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="449"/>
+        <location filename="../ui/mainwindow.ui" line="465"/>
+        <source>&amp;Context help</source>
+        <translation>&amp;Контекстна допомога</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="452"/>
+        <location filename="../ui/mainwindow.ui" line="468"/>
+        <source>Open context help</source>
+        <translation>Відкрити контекстну допомогу</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="461"/>
+        <location filename="../ui/mainwindow.ui" line="477"/>
+        <source>&amp;About...</source>
+        <translation>&amp;Про...</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="464"/>
+        <location filename="../ui/mainwindow.ui" line="480"/>
+        <source>About...</source>
+        <translation>Про...</translation>
+    </message>
+    <message>
         <location filename="../ui/mainwindow.ce.ui" line="467"/>
-        <location filename="../ui/mainwindow.ui" line="372"/>
-        <location filename="../ui/mainwindow.ui" line="486"/>
-        <source>Ctrl+S</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="368"/>
-        <location filename="../ui/mainwindow.ui" line="387"/>
-        <source>Ctrl+N</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="386"/>
-        <location filename="../ui/mainwindow.ui" line="405"/>
-        <source>Ctrl+O</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="53"/>
-        <location filename="../ui/mainwindow.ui" line="35"/>
-        <source>Задача</source>
-        <translation>Задача</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="87"/>
-        <location filename="../ui/mainwindow.ui" line="69"/>
-        <source>Номер варианта</source>
-        <translation>Номер варіану</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="141"/>
-        <location filename="../ui/mainwindow.ui" line="123"/>
-        <source>Стоимости переходов/переездов из города в город</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="199"/>
-        <location filename="../ui/mainwindow.ui" line="181"/>
-        <source>Решение</source>
-        <translation>Розв&apos;язок</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="216"/>
-        <location filename="../ui/mainwindow.ui" line="198"/>
-        <source>Ход решения</source>
-        <translation>Хід розв&apos;язку</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="226"/>
-        <location filename="../ui/mainwindow.ui" line="208"/>
-        <source>Граф решения</source>
-        <translation>Граф розв&apos;язку</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="318"/>
-        <source>Настроить принтер для печати</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="333"/>
-        <source>Распечатать результаты решения</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="328"/>
-        <location filename="../ui/mainwindow.ui" line="347"/>
-        <source>Сохранить только хоод решения</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="339"/>
-        <location filename="../ui/mainwindow.ui" line="358"/>
-        <source>Сохранить только граф решения</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="347"/>
-        <location filename="../ui/mainwindow.ui" line="366"/>
-        <source>&amp;Решение</source>
-        <translation>&amp;Розв&apos;язок</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="350"/>
-        <location filename="../ui/mainwindow.ui" line="369"/>
-        <source>Сохранить ход и граф решения</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="365"/>
-        <location filename="../ui/mainwindow.ui" line="384"/>
-        <source>Создать новую задачу</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="380"/>
-        <location filename="../ui/mainwindow.ui" line="399"/>
-        <source>Открыть задачу</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="383"/>
-        <location filename="../ui/mainwindow.ui" line="402"/>
-        <source>Открыть сохраненное условие задачи</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="398"/>
-        <location filename="../ui/mainwindow.ui" line="417"/>
-        <source>Настройка параметров программмы</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="410"/>
-        <location filename="../ui/mainwindow.ui" line="429"/>
-        <source>Вызвать справку по программе</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="422"/>
-        <location filename="../ui/mainwindow.ui" line="441"/>
-        <source>Вызвать контекстную справку</source>
-        <translation>Викликати контекстну довідку</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="455"/>
-        <location filename="../ui/mainwindow.ui" line="474"/>
-        <source>&amp;Задачу</source>
-        <translation>&amp;Задачу</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="458"/>
-        <location filename="../ui/mainwindow.ui" line="477"/>
-        <source>Сохранить</source>
-        <translation>Зберегти</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="461"/>
-        <location filename="../ui/mainwindow.ui" line="480"/>
-        <source>Сохранить задачу</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="464"/>
         <location filename="../ui/mainwindow.ui" line="483"/>
-        <source>Сохранить условие задачи в файл</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mainwindow.cpp" line="104"/>
-        <source>Ошибка в данных</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mainwindow.cpp" line="104"/>
-        <source>Ошибка в ячейке [Строка %1; Колонка %2]: Неверный формат данных.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mainwindow.cpp" line="113"/>
-        <source>Ошибка при решении</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mainwindow.cpp" line="113"/>
-        <source>Во время решения задачи возникла ошибка</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="434"/>
-        <location filename="../ui/mainwindow.ui" line="453"/>
-        <source>Получить информацию о программе</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ce.ui" line="110"/>
-        <location filename="../ui/mainwindow.ui" line="92"/>
-        <source>Количество городов, которые обходит коммивояжер</source>
-        <translation type="unfinished"></translation>
+        <source>About application</source>
+        <translation>Про додаток</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="476"/>
+        <location filename="../ui/mainwindow.ui" line="492"/>
+        <source>E&amp;xit</source>
+        <translation>В&amp;ихід</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="479"/>
+        <location filename="../ui/mainwindow.ui" line="495"/>
+        <source>Exit application</source>
+        <translation>Вийти з додатку</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="491"/>
+        <location filename="../ui/mainwindow.ui" line="507"/>
+        <source>&amp;Task...</source>
+        <translation>&amp;Завдання...</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="494"/>
+        <location filename="../ui/mainwindow.ui" line="510"/>
+        <source>Task...</source>
+        <translation>Завдання...</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="497"/>
+        <location filename="../ui/mainwindow.ui" line="513"/>
+        <source>Save task</source>
+        <translation>Зберегти завдання</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ce.ui" line="500"/>
+        <location filename="../ui/mainwindow.ui" line="516"/>
+        <source>Save task to file</source>
+        <translation>Зберегти завдання до файлу</translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="125"/>
+        <source>Data error</source>
+        <translation>Помилка даних</translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="125"/>
+        <source>Error in cell [Row %1; Column %2]: Invalid data format.</source>
+        <translation>Помилка у комірці  [Рядок %1; Колонка %2]: Невірний формат даних.</translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="134"/>
+        <source>Solution error</source>
+        <translation>Помилка розв&apos;язку</translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="134"/>
+        <source>There was an error while solving the task.</source>
+        <translation>Під час розв&apos;язання задачі виникла помилка.</translation>
     </message>
 </context>
@@ -345,18 +391,48 @@
     <name>SettingsDialog</name>
     <message>
+        <location filename="../ui/settingsdialog.ui" line="41"/>
+        <source>background-color: #0080C0</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ui" line="235"/>
+        <source>Print settings:</source>
+        <translation>Налагодження друку:</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ui" line="249"/>
+        <source>&amp;Left margin:</source>
+        <translation>&amp;Лівий відступ:</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ui" line="262"/>
+        <source>Left border margin for page</source>
+        <translation>Лівий відступ від межі сторінки під час друку</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ui" line="329"/>
+        <source>Restore main window state and position on application restart</source>
+        <translation>Відновлювати стан та розмір головного вікна пысля перезапуску додатку</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ui" line="332"/>
+        <source>Save main window state and position</source>
+        <translation>Зберегти стан та розміщення головного вікна</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ui" line="403"/>
+        <source>Hover mouse pointer over dialog elements to get additional help</source>
+        <translation>Наведіть покажчик миші на елемент ділогу, щоб отримати підказку</translation>
+    </message>
+    <message>
         <location filename="../ui/settingsdialog.ce.ui" line="14"/>
         <location filename="../ui/settingsdialog.ui" line="14"/>
-        <source>Параметры</source>
+        <source>Preferences</source>
         <translation>Параметри</translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ui" line="41"/>
-        <source>background-color: #0080C0</source>
-        <translation>background-color: #0080C0</translation>
     </message>
     <message>
         <location filename="../ui/settingsdialog.ce.ui" line="100"/>
         <location filename="../ui/settingsdialog.ui" line="151"/>
-        <source>Случайные значения:</source>
+        <source>Random values:</source>
         <translation>Випадкові значення:</translation>
     </message>
@@ -364,119 +440,86 @@
         <location filename="../ui/settingsdialog.ce.ui" line="114"/>
         <location filename="../ui/settingsdialog.ui" line="165"/>
-        <source>Ми&amp;нимум:</source>
-        <translation>Мі&amp;німум:</translation>
+        <source>&amp;Minimal:</source>
+        <translation>&amp;Мінімум:</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="127"/>
+        <location filename="../ui/settingsdialog.ui" line="178"/>
+        <source>Minimum for random number generation</source>
+        <translation>Нажня межа для генерації випадкових значень</translation>
     </message>
     <message>
         <location filename="../ui/settingsdialog.ce.ui" line="150"/>
         <location filename="../ui/settingsdialog.ui" line="201"/>
-        <source>&amp;Максимум:</source>
-        <translation>&amp;Максимум:</translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ui" line="235"/>
-        <source>Настройки печати:</source>
-        <translation>Налагодження друку:</translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ui" line="243"/>
-        <source>&amp;Левый отступ:</source>
-        <translation>&amp;Лівий відступ:</translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ce.ui" line="205"/>
-        <location filename="../ui/settingsdialog.ui" line="280"/>
-        <source>&amp;Шрифт...</source>
-        <translation>&amp;Шрифт...</translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ui" line="302"/>
-        <source>Сохранять состояние и положение главного окна</source>
-        <translation>Зберегти стан та розміщення головного вікна</translation>
-    </message>
-    <message>
-        <source>Подсказка</source>
-        <translation type="obsolete">Підказка</translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ce.ui" line="353"/>
-        <location filename="../ui/settingsdialog.ui" line="395"/>
-        <source>&amp;OK</source>
-        <translation>&amp;OK</translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ce.ui" line="373"/>
-        <location filename="../ui/settingsdialog.ui" line="415"/>
-        <source>&amp;Отмена</source>
-        <translation>&amp;Скасувати</translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ce.ui" line="320"/>
-        <location filename="../ui/settingsdialog.ui" line="350"/>
-        <source>Помощь</source>
-        <translation>Допомога</translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ce.ui" line="317"/>
-        <location filename="../ui/settingsdialog.ui" line="347"/>
-        <source>Получить помощь по настройкам</source>
-        <translation>Отримати допомогу по налагодженням</translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ce.ui" line="127"/>
-        <location filename="../ui/settingsdialog.ui" line="178"/>
-        <source>Нижняя граница для генерации случайных значений</source>
-        <translation type="unfinished"></translation>
+        <source>Ma&amp;ximal:</source>
+        <translation>М&amp;аксимум:</translation>
     </message>
     <message>
         <location filename="../ui/settingsdialog.ce.ui" line="163"/>
         <location filename="../ui/settingsdialog.ui" line="214"/>
-        <source>Верхняя граница для генерации случайных значений</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ui" line="256"/>
-        <source>Размер отступа от левого края страницы</source>
-        <translation type="unfinished"></translation>
+        <source>Maximum for random number generation</source>
+        <translation>Верхня межа для генерації випадкових значень</translation>
     </message>
     <message>
         <location filename="../ui/settingsdialog.ce.ui" line="202"/>
-        <location filename="../ui/settingsdialog.ui" line="277"/>
-        <source>Задать параметры шрифта, используемого при печати</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ce.ui" line="252"/>
-        <source>Сохранять состояние и
-положение главного окна</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ce.ui" line="314"/>
-        <location filename="../ui/settingsdialog.ui" line="344"/>
-        <source>Справка</source>
-        <translation>Довідка</translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ce.ui" line="350"/>
-        <location filename="../ui/settingsdialog.ui" line="392"/>
-        <source>Сохранить новые параметры</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ce.ui" line="370"/>
-        <location filename="../ui/settingsdialog.ui" line="412"/>
-        <source>Закрыть окно без сохранения параметров</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ce.ui" line="249"/>
-        <location filename="../ui/settingsdialog.ui" line="299"/>
-        <source>Восстанавливать состояние и размеры окна после перезапуска программы</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsdialog.ui" line="370"/>
-        <source>Наведите указатель мыши на элемент диалога, чтоб получить подсказку</source>
-        <translation type="unfinished"></translation>
+        <location filename="../ui/settingsdialog.ui" line="288"/>
+        <source>Font color for printing</source>
+        <translation>Колір шрифта для друку</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="205"/>
+        <location filename="../ui/settingsdialog.ui" line="291"/>
+        <source>&amp;Color...</source>
+        <translation>&amp;Колір...</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="219"/>
+        <location filename="../ui/settingsdialog.ui" line="305"/>
+        <source>Font face for printing</source>
+        <translation>Вигляд шрифта для друку</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="222"/>
+        <location filename="../ui/settingsdialog.ui" line="308"/>
+        <source>&amp;Font...</source>
+        <translation>&amp;Шрифт...</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="287"/>
+        <location filename="../ui/settingsdialog.ce.ui" line="293"/>
+        <location filename="../ui/settingsdialog.ui" line="377"/>
+        <location filename="../ui/settingsdialog.ui" line="383"/>
+        <source>Help</source>
+        <translation>Допомога</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="290"/>
+        <location filename="../ui/settingsdialog.ui" line="380"/>
+        <source>Get preferences help</source>
+        <translation>Отримати допомогу по налагодженням</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="323"/>
+        <location filename="../ui/settingsdialog.ui" line="425"/>
+        <source>Save new preferences</source>
+        <translation>Зберегти нові параметри</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="326"/>
+        <location filename="../ui/settingsdialog.ui" line="428"/>
+        <source>&amp;OK</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="343"/>
+        <location filename="../ui/settingsdialog.ui" line="445"/>
+        <source>Close without saving preferences</source>
+        <translation>Закрити вікно без збереження параметрів</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsdialog.ce.ui" line="346"/>
+        <location filename="../ui/settingsdialog.ui" line="448"/>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Скасувати</translation>
     </message>
 </context>
Index: /trunk/src/defines.h
===================================================================
--- /trunk/src/defines.h	(revision 26)
+++ /trunk/src/defines.h	(revision 27)
@@ -33,3 +33,15 @@
 #define DEF_FONT_COLOR Qt::black
 
+// Decided, that static array with 100 of cities maximum hard limit
+// will be enough for most cases, but the code will be simplier than
+// when using dynamic lists. If you need more, just change this value
+// and recompile the program ;-)
+#define MAX_CITIES 100
+// This value means infinity :-)
+#ifndef INFINITY
+	#define INFINITY 1.7E+308
+#endif
+// This is string, which represents infinite value in table
+#define INFSTR "-----"
+
 #endif // DEFINES_H
Index: /trunk/src/main.cpp
===================================================================
--- /trunk/src/main.cpp	(revision 26)
+++ /trunk/src/main.cpp	(revision 27)
@@ -33,17 +33,13 @@
 	app.setOrganizationDomain("www.leppsville.com");
 	app.setApplicationName("TSPSG");
-/*/ i18n
-// TODO: Make English as program's "native" language
+// i18n
+// TODO: Language selection in application.
+// TODO: Saving and restoring selected language.
 QTextCodec::setCodecForTr(QTextCodec::codecForName("utf8"));
 QString locale = QLocale::languageToString(QLocale::system().language());
 QTranslator translator;
-	// Getting current locale languge name and trying to load it
-	if (translator.load(locale,"i18n"))
+	// Getting current locale language name and trying to load it, if it's not English
+	if (locale.compare("English") && translator.load(locale,"i18n"))
 		app.installTranslator(&translator);
-	// If language loading failed and locale language is not
-	// application's "native" we're trying to load English
-	else if (locale.compare("Russian") && translator.load("English","i18n"))
-		app.installTranslator(&translator);
-//*/
 MainWindow mainwindow;
 	mainwindow.show();
Index: /trunk/src/mainwindow.cpp
===================================================================
--- /trunk/src/mainwindow.cpp	(revision 26)
+++ /trunk/src/mainwindow.cpp	(revision 27)
@@ -26,5 +26,4 @@
 	#include <QPrintDialog>
 #endif // Q_OS_WINCE
-#include "defines.h"
 #include "mainwindow.h"
 
@@ -124,5 +123,5 @@
 			row[c] = tspmodel->index(r,c).data(Qt::UserRole).toDouble(&ok);
 			if (!ok) {
-				QMessageBox(QMessageBox::Critical,trUtf8("Ошибка в данных"),QString(trUtf8("Ошибка в ячейке [Строка %1; Колонка %2]: Неверный формат данных.")).arg(r + 1).arg(c + 1),QMessageBox::Ok,this).exec();
+				QMessageBox(QMessageBox::Critical,trUtf8("Data error"),QString(trUtf8("Error in cell [Row %1; Column %2]: Invalid data format.")).arg(r + 1).arg(c + 1),QMessageBox::Ok,this).exec();
 				return;
 			}
@@ -133,5 +132,5 @@
 sStep *root = solver.solve(spinCities->value(),matrix);
 	if (!root)
-		QMessageBox(QMessageBox::Critical,trUtf8("Ошибка при решении"),trUtf8("Во время решения задачи возникла ошибка"),QMessageBox::Ok,this).exec();
+		QMessageBox(QMessageBox::Critical,trUtf8("Solution error"),trUtf8("There was an error while solving the task."),QMessageBox::Ok,this).exec();
 	// tabWidget->setCurrentIndex(1);
 }
@@ -147,5 +146,5 @@
 \n\
 TSPSG is licensed under the terms of the GNU General Public License. You should have received a copy of the GNU General Public License along with TSPSG.").arg(QDate().toString("%Y"),QT_VERSION_STR,qVersion());
-	QMessageBox(QMessageBox::Information,"About",about).exec();
+	QMessageBox(QMessageBox::Information,"About",about,QMessageBox::Ok,this).exec();
 }
 
Index: /trunk/src/tspmodel.cpp
===================================================================
--- /trunk/src/tspmodel.cpp	(revision 26)
+++ /trunk/src/tspmodel.cpp	(revision 27)
@@ -23,5 +23,4 @@
 
 #include <QtGui>
-#include "defines.h"
 #include "tspmodel.h"
 
@@ -51,5 +50,5 @@
 	if (role == Qt::DisplayRole)
 		if (orientation == Qt::Vertical)
-			return trUtf8("Город %1").arg(section + 1);
+			return trUtf8("City %1").arg(section + 1);
 		else
 			return trUtf8("%1").arg(section + 1);
Index: /trunk/src/tspmodel.h
===================================================================
--- /trunk/src/tspmodel.h	(revision 26)
+++ /trunk/src/tspmodel.h	(revision 27)
@@ -25,18 +25,7 @@
 #define TSPMODEL_H
 
-// Decided, that static array with 100 of cities maximum hard limit
-// will be enough for most cases, but the code will be simplier than
-// when using dynamic lists. If you need more, just change this value
-// and recompile the program ;-)
-#define MAX_CITIES 100
-// This value means infinity :-)
-#ifndef INFINITY
-	#define INFINITY 1.7E+308
-#endif
-// This is string, which represents infinite value in table
-#define INFSTR "---"
-
 #include <QAbstractTableModel>
 #include <QSettings>
+#include "defines.h"
 
 class CTSPModel: public QAbstractTableModel
Index: /trunk/tspsg.pri
===================================================================
--- /trunk/tspsg.pri	(revision 26)
+++ /trunk/tspsg.pri	(revision 27)
@@ -38,3 +38,4 @@
 CODECFORTR = UTF-8
 TRANSLATIONS += i18n/English.ts \
+	i18n/Russian.ts \
 	i18n/Ukrainian.ts
Index: /trunk/ui/mainwindow.ce.ui
===================================================================
--- /trunk/ui/mainwindow.ce.ui	(revision 26)
+++ /trunk/ui/mainwindow.ce.ui	(revision 27)
@@ -3,4 +3,7 @@
  <class>MainWindow</class>
  <widget class="QMainWindow" name="MainWindow">
+  <property name="enabled">
+   <bool>true</bool>
+  </property>
   <property name="geometry">
    <rect>
@@ -12,5 +15,5 @@
   </property>
   <property name="windowTitle">
-   <string>Задача коммивояжера</string>
+   <string>Travelling salesman problem</string>
   </property>
   <property name="windowIcon">
@@ -51,5 +54,5 @@
     <widget class="QWidget" name="tabTask">
      <attribute name="title">
-      <string>Задача</string>
+      <string>Task</string>
      </attribute>
      <layout class="QVBoxLayout" name="verticalLayout">
@@ -72,5 +75,5 @@
          <widget class="QLabel" name="labelVariant">
           <property name="text">
-           <string>&amp;Вариант:</string>
+           <string>&amp;Variant:</string>
           </property>
           <property name="buddy">
@@ -85,5 +88,5 @@
           </property>
           <property name="statusTip">
-           <string>Номер варианта</string>
+           <string>Number of variant</string>
           </property>
           <property name="minimum">
@@ -95,5 +98,5 @@
          <widget class="QLabel" name="labelCities">
           <property name="text">
-           <string>&amp;Городов:</string>
+           <string>&amp;Cities:</string>
           </property>
           <property name="buddy">
@@ -108,5 +111,5 @@
           </property>
           <property name="statusTip">
-           <string>Количество городов, которые обходит коммивояжер</string>
+           <string>Number of cities</string>
           </property>
           <property name="minimum">
@@ -139,5 +142,5 @@
        <widget class="QTableView" name="taskView">
         <property name="statusTip">
-         <string>Стоимости переходов/переездов из города в город</string>
+         <string>Cost of travel from city to city</string>
         </property>
         <property name="selectionMode">
@@ -167,8 +170,8 @@
           </property>
           <property name="statusTip">
-           <string>Заполнить таблицу случайными значениями</string>
+           <string>Fill table with random numbers</string>
           </property>
           <property name="text">
-           <string>Случайно</string>
+           <string>Random</string>
           </property>
          </widget>
@@ -180,8 +183,8 @@
           </property>
           <property name="statusTip">
-           <string>Решить текущую задачу</string>
+           <string>Solve current task</string>
           </property>
           <property name="text">
-           <string>Решить</string>
+           <string>Solve</string>
           </property>
           <property name="icon">
@@ -197,5 +200,5 @@
     <widget class="QWidget" name="tabSolution">
      <attribute name="title">
-      <string>Решение</string>
+      <string>Solution</string>
      </attribute>
      <layout class="QVBoxLayout" name="_4">
@@ -214,5 +217,5 @@
           </property>
           <property name="statusTip">
-           <string>Ход решения</string>
+           <string>Solution steps</string>
           </property>
           <property name="readOnly">
@@ -224,5 +227,5 @@
          <widget class="QGraphicsView" name="graphicsView">
           <property name="statusTip">
-           <string>Граф решения</string>
+           <string>Solution graph</string>
           </property>
          </widget>
@@ -250,5 +253,5 @@
     </property>
     <property name="title">
-     <string>&amp;Файл</string>
+     <string>&amp;File</string>
     </property>
     <widget class="QMenu" name="menuFileSave">
@@ -257,5 +260,5 @@
      </property>
      <property name="title">
-      <string>Со&amp;хранить</string>
+      <string>&amp;Save</string>
      </property>
      <property name="icon">
@@ -277,5 +280,5 @@
    <widget class="QMenu" name="menuSettings">
     <property name="title">
-     <string>&amp;Настройки</string>
+     <string>&amp;Settings</string>
     </property>
     <addaction name="actionSettingsSettings"/>
@@ -283,5 +286,5 @@
    <widget class="QMenu" name="menuHelp">
     <property name="title">
-     <string>&amp;Помощь</string>
+     <string>&amp;Help</string>
     </property>
     <addaction name="actionHelpContents"/>
@@ -323,8 +326,11 @@
    </property>
    <property name="text">
-    <string>&amp;Ход решения</string>
-   </property>
-   <property name="statusTip">
-    <string>Сохранить только хоод решения</string>
+    <string>Solution st&amp;eps</string>
+   </property>
+   <property name="toolTip">
+    <string>Save solution steps</string>
+   </property>
+   <property name="statusTip">
+    <string>Save solution steps only</string>
    </property>
   </action>
@@ -334,8 +340,11 @@
    </property>
    <property name="text">
-    <string>&amp;Граф решения</string>
-   </property>
-   <property name="statusTip">
-    <string>Сохранить только граф решения</string>
+    <string>Solution &amp;graph</string>
+   </property>
+   <property name="toolTip">
+    <string>Save solution graph</string>
+   </property>
+   <property name="statusTip">
+    <string>Save solution graph only</string>
    </property>
   </action>
@@ -345,8 +354,11 @@
    </property>
    <property name="text">
-    <string>&amp;Решение</string>
-   </property>
-   <property name="statusTip">
-    <string>Сохранить ход и граф решения</string>
+    <string>&amp;Solution</string>
+   </property>
+   <property name="toolTip">
+    <string>Save solution</string>
+   </property>
+   <property name="statusTip">
+    <string>Save solution steps and graph</string>
    </property>
   </action>
@@ -357,8 +369,14 @@
    </property>
    <property name="text">
-    <string>&amp;Создать</string>
-   </property>
-   <property name="statusTip">
-    <string>Создать новую задачу</string>
+    <string>&amp;New</string>
+   </property>
+   <property name="iconText">
+    <string>New</string>
+   </property>
+   <property name="toolTip">
+    <string>New task</string>
+   </property>
+   <property name="statusTip">
+    <string>Create new task</string>
    </property>
    <property name="shortcut">
@@ -367,4 +385,7 @@
   </action>
   <action name="actionFileOpen">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
    <property name="icon">
     <iconset resource="../resources/tspsg.qrc">
@@ -372,11 +393,14 @@
    </property>
    <property name="text">
-    <string>&amp;Открыть</string>
+    <string>&amp;Open...</string>
+   </property>
+   <property name="iconText">
+    <string>Open...</string>
    </property>
    <property name="toolTip">
-    <string>Открыть задачу</string>
-   </property>
-   <property name="statusTip">
-    <string>Открыть сохраненное условие задачи</string>
+    <string>Open task</string>
+   </property>
+   <property name="statusTip">
+    <string>Open saved task</string>
    </property>
    <property name="shortcut">
@@ -390,11 +414,17 @@
    </property>
    <property name="text">
-    <string>&amp;Параметры</string>
-   </property>
-   <property name="statusTip">
-    <string>Настройка параметров программмы</string>
+    <string>&amp;Preferences...</string>
+   </property>
+   <property name="iconText">
+    <string>Preferences...</string>
+   </property>
+   <property name="statusTip">
+    <string>Application preferences</string>
    </property>
   </action>
   <action name="actionHelpContents">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
    <property name="icon">
     <iconset resource="../resources/tspsg.qrc">
@@ -402,11 +432,14 @@
    </property>
    <property name="text">
-    <string>&amp;Содежание</string>
-   </property>
-   <property name="statusTip">
-    <string>Вызвать справку по программе</string>
+    <string>&amp;Contents</string>
+   </property>
+   <property name="statusTip">
+    <string>Open help contents</string>
    </property>
   </action>
   <action name="actionHelpContextual">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
    <property name="icon">
     <iconset resource="../resources/tspsg.qrc">
@@ -414,8 +447,8 @@
    </property>
    <property name="text">
-    <string>&amp;Контекстная справка</string>
-   </property>
-   <property name="statusTip">
-    <string>Вызвать контекстную справку</string>
+    <string>&amp;Context help</string>
+   </property>
+   <property name="statusTip">
+    <string>Open context help</string>
    </property>
   </action>
@@ -426,8 +459,11 @@
    </property>
    <property name="text">
-    <string>&amp;Про...</string>
-   </property>
-   <property name="statusTip">
-    <string>Получить информацию о программе</string>
+    <string>&amp;About...</string>
+   </property>
+   <property name="iconText">
+    <string>About...</string>
+   </property>
+   <property name="statusTip">
+    <string>About application</string>
    </property>
   </action>
@@ -438,11 +474,14 @@
    </property>
    <property name="text">
-    <string>В&amp;ыход</string>
-   </property>
-   <property name="statusTip">
-    <string>Выйти из программы</string>
+    <string>E&amp;xit</string>
+   </property>
+   <property name="statusTip">
+    <string>Exit application</string>
    </property>
   </action>
   <action name="actionFileSaveTask">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
    <property name="icon">
     <iconset resource="../resources/tspsg.qrc">
@@ -450,14 +489,14 @@
    </property>
    <property name="text">
-    <string>&amp;Задачу</string>
+    <string>&amp;Task...</string>
    </property>
    <property name="iconText">
-    <string>Сохранить</string>
+    <string>Task...</string>
    </property>
    <property name="toolTip">
-    <string>Сохранить задачу</string>
-   </property>
-   <property name="statusTip">
-    <string>Сохранить условие задачи в файл</string>
+    <string>Save task</string>
+   </property>
+   <property name="statusTip">
+    <string>Save task to file</string>
    </property>
    <property name="shortcut">
Index: /trunk/ui/mainwindow.ui
===================================================================
--- /trunk/ui/mainwindow.ui	(revision 26)
+++ /trunk/ui/mainwindow.ui	(revision 27)
@@ -12,5 +12,5 @@
   </property>
   <property name="windowTitle">
-   <string>Задача коммивояжера</string>
+   <string>Travelling salesman problem</string>
   </property>
   <property name="windowIcon">
@@ -33,5 +33,5 @@
       <widget class="QWidget" name="tabTask">
        <attribute name="title">
-        <string>Задача</string>
+        <string>Task</string>
        </attribute>
        <layout class="QVBoxLayout">
@@ -54,5 +54,5 @@
            <widget class="QLabel" name="labelVariant">
             <property name="text">
-             <string>&amp;Вариант:</string>
+             <string>&amp;Variant:</string>
             </property>
             <property name="buddy">
@@ -67,5 +67,5 @@
             </property>
             <property name="statusTip">
-             <string>Номер варианта</string>
+             <string>Number of variant</string>
             </property>
             <property name="minimum">
@@ -77,5 +77,5 @@
            <widget class="QLabel" name="labelCities">
             <property name="text">
-             <string>&amp;Городов:</string>
+             <string>&amp;Cities:</string>
             </property>
             <property name="buddy">
@@ -90,5 +90,5 @@
             </property>
             <property name="statusTip">
-             <string>Количество городов, которые обходит коммивояжер</string>
+             <string>Number of cities</string>
             </property>
             <property name="minimum">
@@ -121,5 +121,5 @@
          <widget class="QTableView" name="taskView">
           <property name="statusTip">
-           <string>Стоимости переходов/переездов из города в город</string>
+           <string>Cost of travel from city to city</string>
           </property>
           <property name="selectionMode">
@@ -149,8 +149,8 @@
             </property>
             <property name="statusTip">
-             <string>Заполнить таблицу случайными значениями</string>
+             <string>Fill table with random numbers</string>
             </property>
             <property name="text">
-             <string>Случайно</string>
+             <string>Random</string>
             </property>
            </widget>
@@ -162,8 +162,8 @@
             </property>
             <property name="statusTip">
-             <string>Решить текущую задачу</string>
+             <string>Solve current task</string>
             </property>
             <property name="text">
-             <string>Решить</string>
+             <string>Solve</string>
             </property>
             <property name="icon">
@@ -179,5 +179,5 @@
       <widget class="QWidget" name="tabSolution">
        <attribute name="title">
-        <string>Решение</string>
+        <string>Solution</string>
        </attribute>
        <layout class="QVBoxLayout">
@@ -196,5 +196,5 @@
             </property>
             <property name="statusTip">
-             <string>Ход решения</string>
+             <string>Solution steps</string>
             </property>
             <property name="readOnly">
@@ -206,5 +206,5 @@
            <widget class="QGraphicsView" name="graphicsView">
             <property name="statusTip">
-             <string>Граф решения</string>
+             <string>Solution graph</string>
             </property>
            </widget>
@@ -234,5 +234,5 @@
     </property>
     <property name="title">
-     <string>&amp;Файл</string>
+     <string>&amp;File</string>
     </property>
     <widget class="QMenu" name="menuFileSave">
@@ -241,5 +241,5 @@
      </property>
      <property name="title">
-      <string>Со&amp;хранить</string>
+      <string>&amp;Save</string>
      </property>
      <property name="icon">
@@ -264,5 +264,5 @@
    <widget class="QMenu" name="menuSettings">
     <property name="title">
-     <string>&amp;Настройки</string>
+     <string>&amp;Settings</string>
     </property>
     <addaction name="actionSettingsSettings"/>
@@ -270,5 +270,5 @@
    <widget class="QMenu" name="menuHelp">
     <property name="title">
-     <string>&amp;Помощь</string>
+     <string>&amp;Help</string>
     </property>
     <addaction name="actionHelpContents"/>
@@ -313,8 +313,8 @@
    </property>
    <property name="text">
-    <string>&amp;Настройка печати</string>
-   </property>
-   <property name="statusTip">
-    <string>Настроить принтер для печати</string>
+    <string>P&amp;rint setup...</string>
+   </property>
+   <property name="statusTip">
+    <string>Setup printing</string>
    </property>
   </action>
@@ -328,8 +328,8 @@
    </property>
    <property name="text">
-    <string>&amp;Печать...</string>
-   </property>
-   <property name="statusTip">
-    <string>Распечатать результаты решения</string>
+    <string>&amp;Print...</string>
+   </property>
+   <property name="statusTip">
+    <string>Print solution results</string>
    </property>
    <property name="shortcut">
@@ -342,8 +342,11 @@
    </property>
    <property name="text">
-    <string>&amp;Ход решения</string>
-   </property>
-   <property name="statusTip">
-    <string>Сохранить только хоод решения</string>
+    <string>Solution st&amp;eps</string>
+   </property>
+   <property name="toolTip">
+    <string>Save solution steps</string>
+   </property>
+   <property name="statusTip">
+    <string>Save solution steps only</string>
    </property>
   </action>
@@ -353,8 +356,11 @@
    </property>
    <property name="text">
-    <string>&amp;Граф решения</string>
-   </property>
-   <property name="statusTip">
-    <string>Сохранить только граф решения</string>
+    <string>Solution &amp;graph</string>
+   </property>
+   <property name="toolTip">
+    <string>Save solution graph</string>
+   </property>
+   <property name="statusTip">
+    <string>Save solution graph only</string>
    </property>
   </action>
@@ -364,8 +370,11 @@
    </property>
    <property name="text">
-    <string>&amp;Решение</string>
-   </property>
-   <property name="statusTip">
-    <string>Сохранить ход и граф решения</string>
+    <string>&amp;Solution</string>
+   </property>
+   <property name="toolTip">
+    <string>Save solution</string>
+   </property>
+   <property name="statusTip">
+    <string>Save solution steps and graph</string>
    </property>
   </action>
@@ -376,8 +385,14 @@
    </property>
    <property name="text">
-    <string>&amp;Создать</string>
-   </property>
-   <property name="statusTip">
-    <string>Создать новую задачу</string>
+    <string>&amp;New</string>
+   </property>
+   <property name="iconText">
+    <string>New</string>
+   </property>
+   <property name="toolTip">
+    <string>New task</string>
+   </property>
+   <property name="statusTip">
+    <string>Create new task</string>
    </property>
    <property name="shortcut">
@@ -386,4 +401,7 @@
   </action>
   <action name="actionFileOpen">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
    <property name="icon">
     <iconset resource="../resources/tspsg.qrc">
@@ -391,11 +409,14 @@
    </property>
    <property name="text">
-    <string>&amp;Открыть</string>
+    <string>&amp;Open...</string>
+   </property>
+   <property name="iconText">
+    <string>Open...</string>
    </property>
    <property name="toolTip">
-    <string>Открыть задачу</string>
-   </property>
-   <property name="statusTip">
-    <string>Открыть сохраненное условие задачи</string>
+    <string>Open task</string>
+   </property>
+   <property name="statusTip">
+    <string>Open saved task</string>
    </property>
    <property name="shortcut">
@@ -409,11 +430,17 @@
    </property>
    <property name="text">
-    <string>&amp;Параметры</string>
-   </property>
-   <property name="statusTip">
-    <string>Настройка параметров программмы</string>
+    <string>&amp;Preferences...</string>
+   </property>
+   <property name="iconText">
+    <string>Preferences...</string>
+   </property>
+   <property name="statusTip">
+    <string>Application preferences</string>
    </property>
   </action>
   <action name="actionHelpContents">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
    <property name="icon">
     <iconset resource="../resources/tspsg.qrc">
@@ -421,11 +448,14 @@
    </property>
    <property name="text">
-    <string>&amp;Содежание</string>
-   </property>
-   <property name="statusTip">
-    <string>Вызвать справку по программе</string>
+    <string>&amp;Contents</string>
+   </property>
+   <property name="statusTip">
+    <string>Open help contents</string>
    </property>
   </action>
   <action name="actionHelpContextual">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
    <property name="icon">
     <iconset resource="../resources/tspsg.qrc">
@@ -433,8 +463,8 @@
    </property>
    <property name="text">
-    <string>&amp;Контекстная справка</string>
-   </property>
-   <property name="statusTip">
-    <string>Вызвать контекстную справку</string>
+    <string>&amp;Context help</string>
+   </property>
+   <property name="statusTip">
+    <string>Open context help</string>
    </property>
   </action>
@@ -445,8 +475,11 @@
    </property>
    <property name="text">
-    <string>&amp;Про...</string>
-   </property>
-   <property name="statusTip">
-    <string>Получить информацию о программе</string>
+    <string>&amp;About...</string>
+   </property>
+   <property name="iconText">
+    <string>About...</string>
+   </property>
+   <property name="statusTip">
+    <string>About application</string>
    </property>
   </action>
@@ -457,11 +490,14 @@
    </property>
    <property name="text">
-    <string>В&amp;ыход</string>
-   </property>
-   <property name="statusTip">
-    <string>Выйти из программы</string>
+    <string>E&amp;xit</string>
+   </property>
+   <property name="statusTip">
+    <string>Exit application</string>
    </property>
   </action>
   <action name="actionFileSaveTask">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
    <property name="icon">
     <iconset resource="../resources/tspsg.qrc">
@@ -469,14 +505,14 @@
    </property>
    <property name="text">
-    <string>&amp;Задачу</string>
+    <string>&amp;Task...</string>
    </property>
    <property name="iconText">
-    <string>Сохранить</string>
+    <string>Task...</string>
    </property>
    <property name="toolTip">
-    <string>Сохранить задачу</string>
-   </property>
-   <property name="statusTip">
-    <string>Сохранить условие задачи в файл</string>
+    <string>Save task</string>
+   </property>
+   <property name="statusTip">
+    <string>Save task to file</string>
    </property>
    <property name="shortcut">
Index: /trunk/ui/settingsdialog.ce.ui
===================================================================
--- /trunk/ui/settingsdialog.ce.ui	(revision 26)
+++ /trunk/ui/settingsdialog.ce.ui	(revision 27)
@@ -7,10 +7,10 @@
     <x>0</x>
     <y>0</y>
-    <width>214</width>
-    <height>207</height>
+    <width>235</width>
+    <height>190</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Параметры</string>
+   <string>Preferences</string>
   </property>
   <property name="windowIcon">
@@ -98,9 +98,9 @@
        <widget class="QGroupBox" name="groupRandomSettings">
         <property name="title">
-         <string>Случайные значения:</string>
+         <string>Random values:</string>
         </property>
-        <layout class="QVBoxLayout">
+        <layout class="QVBoxLayout" name="_5">
          <item>
-          <layout class="QHBoxLayout">
+          <layout class="QHBoxLayout" name="_6">
            <item>
             <widget class="QLabel" name="labelRandMin">
@@ -112,5 +112,5 @@
              </property>
              <property name="text">
-              <string>Ми&amp;нимум:</string>
+              <string>&amp;Minimal:</string>
              </property>
              <property name="buddy">
@@ -125,5 +125,5 @@
              </property>
              <property name="statusTip">
-              <string>Нижняя граница для генерации случайных значений</string>
+              <string>Minimum for random number generation</string>
              </property>
              <property name="maximum">
@@ -138,5 +138,5 @@
          </item>
          <item>
-          <layout class="QHBoxLayout">
+          <layout class="QHBoxLayout" name="_7">
            <item>
             <widget class="QLabel" name="labelRandMax">
@@ -148,5 +148,5 @@
              </property>
              <property name="text">
-              <string>&amp;Максимум:</string>
+              <string>Ma&amp;ximal:</string>
              </property>
              <property name="buddy">
@@ -161,5 +161,5 @@
              </property>
              <property name="statusTip">
-              <string>Верхняя граница для генерации случайных значений</string>
+              <string>Maximum for random number generation</string>
              </property>
              <property name="minimum">
@@ -196,9 +196,12 @@
         <item>
          <widget class="QPushButton" name="buttonColor">
+          <property name="cursor">
+           <cursorShape>PointingHandCursor</cursorShape>
+          </property>
           <property name="statusTip">
-           <string>Задать цвет шрифта, используемого при печати</string>
+           <string>Font color for printing</string>
           </property>
           <property name="text">
-           <string>&amp;Цвет...</string>
+           <string>&amp;Color...</string>
           </property>
           <property name="icon">
@@ -214,8 +217,8 @@
           </property>
           <property name="statusTip">
-           <string>Задать параметры шрифта, используемого при печати</string>
+           <string>Font face for printing</string>
           </property>
           <property name="text">
-           <string>&amp;Шрифт...</string>
+           <string>&amp;Font...</string>
           </property>
           <property name="icon">
@@ -274,16 +277,19 @@
      </property>
      <item>
-      <widget class="QToolButton" name="toolButton">
+      <widget class="QToolButton" name="buttonHelp">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
        <property name="cursor">
         <cursorShape>PointingHandCursor</cursorShape>
        </property>
        <property name="toolTip">
-        <string>Справка</string>
+        <string>Help</string>
        </property>
        <property name="statusTip">
-        <string>Получить помощь по настройкам</string>
+        <string>Get preferences help</string>
        </property>
        <property name="text">
-        <string>Помощь</string>
+        <string>Help</string>
        </property>
        <property name="icon">
@@ -315,5 +321,5 @@
        </property>
        <property name="statusTip">
-        <string>Сохранить новые параметры</string>
+        <string>Save new preferences</string>
        </property>
        <property name="text">
@@ -335,8 +341,8 @@
        </property>
        <property name="statusTip">
-        <string>Закрыть окно без сохранения параметров</string>
+        <string>Close without saving preferences</string>
        </property>
        <property name="text">
-        <string>&amp;Отмена</string>
+        <string>&amp;Cancel</string>
        </property>
        <property name="icon">
Index: /trunk/ui/settingsdialog.ui
===================================================================
--- /trunk/ui/settingsdialog.ui	(revision 26)
+++ /trunk/ui/settingsdialog.ui	(revision 27)
@@ -7,10 +7,10 @@
     <x>0</x>
     <y>0</y>
-    <width>498</width>
-    <height>188</height>
+    <width>448</width>
+    <height>174</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Параметры</string>
+   <string>Preferences</string>
   </property>
   <property name="windowIcon">
@@ -149,5 +149,5 @@
            <widget class="QGroupBox" name="groupRandomSettings">
             <property name="title">
-             <string>Случайные значения:</string>
+             <string>Random values:</string>
             </property>
             <layout class="QVBoxLayout">
@@ -163,5 +163,5 @@
                  </property>
                  <property name="text">
-                  <string>Ми&amp;нимум:</string>
+                  <string>&amp;Minimal:</string>
                  </property>
                  <property name="buddy">
@@ -176,5 +176,5 @@
                  </property>
                  <property name="statusTip">
-                  <string>Нижняя граница для генерации случайных значений</string>
+                  <string>Minimum for random number generation</string>
                  </property>
                  <property name="maximum">
@@ -199,5 +199,5 @@
                  </property>
                  <property name="text">
-                  <string>&amp;Максимум:</string>
+                  <string>Ma&amp;ximal:</string>
                  </property>
                  <property name="buddy">
@@ -212,5 +212,5 @@
                  </property>
                  <property name="statusTip">
-                  <string>Верхняя граница для генерации случайных значений</string>
+                  <string>Maximum for random number generation</string>
                  </property>
                  <property name="minimum">
@@ -233,5 +233,5 @@
            <widget class="QGroupBox" name="groupPrintSetup">
             <property name="title">
-             <string>Настройки печати:</string>
+             <string>Print settings:</string>
             </property>
             <layout class="QVBoxLayout" name="verticalLayout">
@@ -247,5 +247,5 @@
                  </property>
                  <property name="text">
-                  <string>&amp;Левый отступ:</string>
+                  <string>&amp;Left margin:</string>
                  </property>
                  <property name="buddy">
@@ -260,5 +260,5 @@
                  </property>
                  <property name="statusTip">
-                  <string>Размер отступа от левого края страницы</string>
+                  <string>Left border margin for page</string>
                  </property>
                  <property name="maximum">
@@ -286,8 +286,8 @@
                  </property>
                  <property name="statusTip">
-                  <string>Задать цвет шрифта, используемого при печати</string>
+                  <string>Font color for printing</string>
                  </property>
                  <property name="text">
-                  <string>&amp;Цвет...</string>
+                  <string>&amp;Color...</string>
                  </property>
                  <property name="icon">
@@ -303,8 +303,8 @@
                  </property>
                  <property name="statusTip">
-                  <string>Задать параметры шрифта, используемого при печати</string>
+                  <string>Font face for printing</string>
                  </property>
                  <property name="text">
-                  <string>&amp;Шрифт...</string>
+                  <string>&amp;Font...</string>
                  </property>
                  <property name="icon">
@@ -327,8 +327,8 @@
           </property>
           <property name="statusTip">
-           <string>Восстанавливать состояние и размеры окна после перезапуска программы</string>
+           <string>Restore main window state and position on application restart</string>
           </property>
           <property name="text">
-           <string>Сохранять состояние и положение главного окна</string>
+           <string>Save main window state and position</string>
           </property>
          </widget>
@@ -367,16 +367,19 @@
      </property>
      <item>
-      <widget class="QToolButton" name="toolButton">
+      <widget class="QToolButton" name="buttonHelp">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
        <property name="cursor">
         <cursorShape>PointingHandCursor</cursorShape>
        </property>
        <property name="toolTip">
-        <string>Справка</string>
+        <string>Help</string>
        </property>
        <property name="statusTip">
-        <string>Получить помощь по настройкам</string>
+        <string>Get preferences help</string>
        </property>
        <property name="text">
-        <string>Помощь</string>
+        <string>Help</string>
        </property>
        <property name="icon">
@@ -398,5 +401,5 @@
        </property>
        <property name="statusTip">
-        <string>Наведите указатель мыши на элемент диалога, чтоб получить подсказку</string>
+        <string>Hover mouse pointer over dialog elements to get additional help</string>
        </property>
        <property name="text">
@@ -420,5 +423,5 @@
        </property>
        <property name="statusTip">
-        <string>Сохранить новые параметры</string>
+        <string>Save new preferences</string>
        </property>
        <property name="text">
@@ -440,8 +443,8 @@
        </property>
        <property name="statusTip">
-        <string>Закрыть окно без сохранения параметров</string>
+        <string>Close without saving preferences</string>
        </property>
        <property name="text">
-        <string>&amp;Отмена</string>
+        <string>&amp;Cancel</string>
        </property>
        <property name="icon">
