]> git.sven.stormbind.net Git - sven/vym.git/blobdiff - lang/vym.ru.ts
New upstream version 2.9.22
[sven/vym.git] / lang / vym.ru.ts
index 4d84c89db5a7040f197460179599c6d1073e1e30..c3df98ca9ad0e95e67af43e699bdb237d792a16a 100644 (file)
@@ -4,19 +4,19 @@
 <context>
     <name>AboutDialog</name>
     <message>
-        <location filename="../aboutdialog.cpp" line="106"/>
+        <location filename="../src/aboutdialog.cpp" line="+136"/>
         <source>Credits</source>
         <comment>Help-&gt;About vym dialog</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="221"/>
+        <location line="+350"/>
         <source>License</source>
         <comment>Help-&gt;About vym dialog</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="226"/>
+        <location line="+5"/>
         <source>Ok</source>
         <comment>Ok Button</comment>
         <translation></translation>
 <context>
     <name>AboutTextBrowser</name>
     <message>
-        <location filename="../aboutdialog.cpp" line="248"/>
+        <location line="+21"/>
         <source>Please use Settings-&gt;</source>
         <translation> Используйте пункт &quot;Настройки&quot;-&gt;</translation>
     </message>
     <message>
-        <source>Set application to open an URL</source>
-        <translation type="obsolete">Выберите приложение для открытия URL</translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="246"/>
+        <location line="-3"/>
         <source>Warning</source>
         <comment>About window</comment>
         <translation>Внимание</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="247"/>
+        <location line="+1"/>
         <source>Couldn&apos;t find a viewer to open %1.
 </source>
         <comment>About window</comment>
 </translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="248"/>
+        <location line="+3"/>
         <source>Set application to open an URL...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Attribute Dialog</name>
-    <message>
-        <source>AttributeDialog - Edit %1</source>
-        <translation type="obsolete">Редактировать %1</translation>
-    </message>
-</context>
 <context>
     <name>AttributeDialog</name>
     <message>
         <translation type="obsolete">Закрыть</translation>
     </message>
 </context>
-<context>
-    <name>AttributeWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Форма</translation>
-    </message>
-</context>
 <context>
     <name>BranchPropertyEditor</name>
     <message>
-        <location filename="../branchpropeditor.ui" line="20"/>
         <source>Branch Property Editor</source>
-        <translation type="unfinished">Редактор свойств ветви</translation>
+        <translation type="obsolete">Редактор свойств ветви</translation>
     </message>
     <message>
-        <location filename="../branchpropeditor.ui" line="30"/>
         <source>Frame</source>
-        <translation type="unfinished">Обрамление</translation>
+        <translation type="obsolete">Обрамление</translation>
     </message>
     <message>
-        <location filename="../branchpropeditor.ui" line="51"/>
         <source>Geometry</source>
-        <translation type="unfinished">Форма</translation>
+        <translation type="obsolete">Форма</translation>
     </message>
     <message>
-        <location filename="../branchpropeditor.ui" line="64"/>
         <source>No Frame</source>
-        <translation type="unfinished">Без обрамления</translation>
+        <translation type="obsolete">Без обрамления</translation>
     </message>
     <message>
-        <location filename="../branchpropeditor.ui" line="69"/>
         <source>Rectangle</source>
-        <translation type="unfinished">Прямоугольник</translation>
-    </message>
-    <message>
-        <location filename="../branchpropeditor.ui" line="74"/>
-        <source>Rounded Rectangle</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Прямоугольник</translation>
     </message>
     <message>
-        <location filename="../branchpropeditor.ui" line="79"/>
         <source>Ellipse</source>
-        <translation type="unfinished">Эллипс</translation>
-    </message>
-    <message>
-        <location filename="../branchpropeditor.ui" line="84"/>
-        <source>Cloud</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Эллипс</translation>
     </message>
     <message>
-        <location filename="../branchpropeditor.ui" line="105"/>
         <source>Padding</source>
-        <translation type="unfinished">Отступы</translation>
+        <translation type="obsolete">Отступы</translation>
     </message>
     <message>
-        <location filename="../branchpropeditor.ui" line="112"/>
         <source>Borderline width</source>
-        <translation type="unfinished">Ширина границы</translation>
-    </message>
-    <message>
-        <location filename="../branchpropeditor.ui" line="136"/>
-        <source>Include children</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ширина границы</translation>
     </message>
     <message>
-        <location filename="../branchpropeditor.ui" line="169"/>
         <source>Colors</source>
-        <translation type="unfinished">Цвета</translation>
+        <translation type="obsolete">Цвета</translation>
     </message>
     <message>
-        <location filename="../branchpropeditor.ui" line="209"/>
         <source>Borderline color</source>
-        <translation type="unfinished">Цвет границы</translation>
+        <translation type="obsolete">Цвет границы</translation>
     </message>
     <message>
-        <location filename="../branchpropeditor.ui" line="232"/>
         <source>Background color</source>
-        <translation type="unfinished">Цвет фона</translation>
+        <translation type="obsolete">Цвет фона</translation>
     </message>
     <message>
-        <location filename="../branchpropeditor.ui" line="261"/>
         <source>Layout</source>
-        <translation type="unfinished">Разметка</translation>
+        <translation type="obsolete">Разметка</translation>
     </message>
     <message>
-        <location filename="../branchpropeditor.ui" line="269"/>
         <source>Include images horizontally</source>
-        <translation type="unfinished">Размещать изображения горизонтально</translation>
+        <translation type="obsolete">Размещать изображения горизонтально</translation>
     </message>
     <message>
-        <location filename="../branchpropeditor.ui" line="276"/>
         <source>Include images vertically</source>
-        <translation type="unfinished">Размещать изображения вертикально</translation>
-    </message>
-    <message>
-        <location filename="../branchpropeditor.ui" line="283"/>
-        <source>Free positioning of children (experimental!)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Размещать изображения вертикально</translation>
     </message>
     <message>
-        <location filename="../branchpropeditor.ui" line="306"/>
         <source>Link</source>
-        <translation type="unfinished">Ссылка</translation>
+        <translation type="obsolete">Ссылка</translation>
     </message>
     <message>
-        <location filename="../branchpropeditor.ui" line="312"/>
         <source>Hide link if unselected</source>
-        <translation type="unfinished">Скрыть невыбранную ссылку</translation>
+        <translation type="obsolete">Скрыть невыбранную ссылку</translation>
     </message>
     <message>
-        <location filename="../branchpropeditor.ui" line="333"/>
         <source>Attributes</source>
-        <translation type="unfinished">Аттрибуты</translation>
+        <translation type="obsolete">Аттрибуты</translation>
     </message>
     <message>
-        <location filename="../branchpropeditor.ui" line="359"/>
         <source>+</source>
-        <translation type="unfinished">+</translation>
+        <translation type="obsolete">+</translation>
     </message>
     <message>
-        <location filename="../branchpropeditor.ui" line="366"/>
         <source>-</source>
-        <translation type="unfinished">-</translation>
+        <translation type="obsolete">-</translation>
     </message>
     <message>
-        <location filename="../branchpropeditor.cpp" line="19"/>
+        <location filename="../src/branchpropeditor.cpp" line="+21"/>
         <source>Property Editor</source>
         <comment>Window caption</comment>
         <translation type="unfinished">Редактор свойств</translation>
     </message>
-</context>
-<context>
-    <name>BranchPropertyWindow</name>
-    <message>
-        <source>Property Editor</source>
-        <comment>Window caption</comment>
-        <translation type="obsolete">Редактор свойств</translation>
-    </message>
     <message>
+        <location line="+22"/>
         <source>Name</source>
         <comment>Branchprop window: Attribute name</comment>
-        <translation type="obsolete">Имя</translation>
+        <translation type="unfinished">Имя</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Value</source>
         <comment>Branchprop window: Attribute value</comment>
-        <translation type="obsolete">Значение</translation>
+        <translation type="unfinished">Значение</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Type</source>
         <comment>Branchprop window: Attribute type</comment>
-        <translation type="obsolete">Тип</translation>
-    </message>
-    <message>
-        <source>Branch Property Editor</source>
-        <translation type="obsolete">Редактор свойств ветви</translation>
-    </message>
-    <message>
-        <source>Frame</source>
-        <translation type="obsolete">Обрамление</translation>
-    </message>
-    <message>
-        <source>Geometry</source>
-        <translation type="obsolete">Форма</translation>
-    </message>
-    <message>
-        <source>No Frame</source>
-        <translation type="obsolete">Без обрамления</translation>
-    </message>
-    <message>
-        <source>Rectangle</source>
-        <translation type="obsolete">Прямоугольник</translation>
-    </message>
-    <message>
-        <source>Ellipse</source>
-        <translation type="obsolete">Эллипс</translation>
-    </message>
-    <message>
-        <source>Padding</source>
-        <translation type="obsolete">Отступы</translation>
-    </message>
-    <message>
-        <source>Borderline width</source>
-        <translation type="obsolete">Ширина границы</translation>
-    </message>
-    <message>
-        <source>Colors</source>
-        <translation type="obsolete">Цвета</translation>
-    </message>
-    <message>
-        <source>Borderline color</source>
-        <translation type="obsolete">Цвет границы</translation>
-    </message>
-    <message>
-        <source>Background color</source>
-        <translation type="obsolete">Цвет фона</translation>
+        <translation type="unfinished">Тип</translation>
     </message>
     <message>
-        <source>Layout</source>
-        <translation type="obsolete">Разметка</translation>
+        <location line="+128"/>
+        <location line="+6"/>
+        <source>%1 days ago</source>
+        <comment>task related times</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Include images horizontally</source>
-        <translation type="obsolete">Размещать изображения горизонтально</translation>
+        <location line="+12"/>
+        <source>sleeping %1 days</source>
+        <comment>task related times</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Include images vertically</source>
-        <translation type="obsolete">Размещать изображения вертикально</translation>
+        <location line="+3"/>
+        <source>Task is awake</source>
+        <comment>task related times</comment>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ConfluenceAgent</name>
     <message>
-        <source>Link</source>
-        <translation type="obsolete">Ссылка</translation>
+        <location filename="../src/confluence-agent.cpp" line="+562"/>
+        <location line="+6"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hide link if unselected</source>
-        <translation type="obsolete">Скрыть невыбранную ссылку</translation>
+        <location line="-5"/>
+        <source>Authentication problem when contacting Confluence</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ConfluenceSettingsDialog</name>
     <message>
-        <source>Attributes</source>
-        <translation type="obsolete">Аттрибуты</translation>
+        <location filename="../src/confluence-settings-dialog.cpp" line="+12"/>
+        <source>Confluence settings</source>
+        <comment>Confluence settings dialog title</comment>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ConfluenceUserDialog</name>
     <message>
-        <source>+</source>
-        <translation type="obsolete">+</translation>
+        <location filename="../src/confluence-userdialog.cpp" line="+13"/>
+        <source>Find Confluence user</source>
+        <comment>dialog window title</comment>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DarkThemeSettingsDialog</name>
     <message>
-        <source>-</source>
-        <translation type="obsolete">-</translation>
+        <location filename="../src/darktheme-settings-dialog.cpp" line="+13"/>
+        <source>DarkThemeSettingsDialog dialog</source>
+        <comment>dialog window title</comment>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DefaultMapSettingsDialog</name>
     <message>
-        <source>Close</source>
-        <translation type="obsolete">Закрыть</translation>
+        <location filename="../src/default-map-settings-dialog.cpp" line="+58"/>
+        <source>Set vym default map to be loaded on startup</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DownloadAgent</name>
     <message>
-        <location filename="../downloadagent.cpp" line="191"/>
-        <location filename="../downloadagent.cpp" line="195"/>
+        <location filename="../src/download-agent.cpp" line="+188"/>
+        <location line="+4"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
 <context>
     <name>EditXLinkDialog</name>
     <message>
-        <location filename="../editxlinkdialog.ui" line="20"/>
         <source>Edit XLink</source>
-        <translation>Изменить XLink</translation>
-    </message>
-    <message>
-        <location filename="../editxlinkdialog.ui" line="40"/>
-        <source>Arrow begin:</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Изменить XLink</translation>
     </message>
     <message>
-        <location filename="../editxlinkdialog.ui" line="63"/>
         <source>XLink width:</source>
-        <translation>Ширина XLink:</translation>
-    </message>
-    <message>
-        <location filename="../editxlinkdialog.ui" line="79"/>
-        <source>Use color of heading</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../editxlinkdialog.ui" line="177"/>
-        <source>Line style:</source>
-        <extracomment>Linestyle in Edit XLink dialog</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../editxlinkdialog.ui" line="190"/>
-        <source>Arrow end:</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Ширина XLink:</translation>
     </message>
     <message>
-        <location filename="../editxlinkdialog.ui" line="253"/>
         <source>Close</source>
-        <translation type="unfinished">Закрыть</translation>
-    </message>
-    <message>
-        <source>Set color of heading</source>
-        <translation type="obsolete">Цвет заголовка</translation>
+        <translation type="obsolete">Закрыть</translation>
     </message>
     <message>
-        <location filename="../editxlinkdialog.ui" line="109"/>
         <source>XLink color:</source>
-        <translation>Цвет XLink:</translation>
+        <translation type="vanished">Цвет XLink:</translation>
     </message>
     <message>
-        <location filename="../editxlinkdialog.ui" line="151"/>
         <source>Use as default:</source>
-        <translation>Использовать по умолчанию:</translation>
-    </message>
-    <message>
-        <source>Quit and delete XLink</source>
-        <translation type="obsolete">Выйти и удалить XLink</translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="obsolete">OK</translation>
+        <translation type="vanished">Использовать по умолчанию:</translation>
     </message>
 </context>
 <context>
-    <name>ExportHTMLDialog</name>
-    <message>
-        <location filename="../exporthtmldialog.ui" line="26"/>
-        <source>Export HTML</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../exporthtmldialog.ui" line="61"/>
-        <source>Export to directory:</source>
-        <translation type="unfinished">Экспорт в каталог:</translation>
-    </message>
+    <name>ExportConfluenceDialog</name>
     <message>
-        <location filename="../exporthtmldialog.ui" line="90"/>
-        <location filename="../exporthtmldialog.ui" line="267"/>
-        <location filename="../exporthtmldialog.ui" line="280"/>
-        <location filename="../exporthtmldialog.ui" line="353"/>
-        <source>Browse</source>
-        <translation type="unfinished">Обзор</translation>
-    </message>
-    <message>
-        <location filename="../exporthtmldialog.ui" line="117"/>
         <source>Options</source>
-        <translation type="unfinished">Опции</translation>
-    </message>
-    <message>
-        <location filename="../exporthtmldialog.ui" line="138"/>
-        <source>Image of map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../exporthtmldialog.ui" line="145"/>
-        <source>Include images</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Опции</translation>
     </message>
     <message>
-        <location filename="../exporthtmldialog.ui" line="152"/>
-        <source>Table of contents</source>
-        <translation type="unfinished"></translation>
+        <source>Colored headings in text</source>
+        <translation type="obsolete">Цветные заголовки в тексте</translation>
     </message>
     <message>
-        <location filename="../exporthtmldialog.ui" line="159"/>
-        <source>Task flags</source>
-        <translation type="unfinished"></translation>
+        <source>Save settings in map</source>
+        <translation type="obsolete">Сохранить настройки в карте</translation>
     </message>
     <message>
-        <location filename="../exporthtmldialog.ui" line="166"/>
-        <source>General flags</source>
-        <translation type="unfinished"></translation>
+        <source>Cancel</source>
+        <translation type="obsolete">Отмена</translation>
     </message>
     <message>
-        <location filename="../exporthtmldialog.ui" line="173"/>
-        <source>Number sections</source>
-        <translation type="unfinished"></translation>
+        <source>Export</source>
+        <translation type="obsolete">Экспортировать</translation>
     </message>
+</context>
+<context>
+    <name>ExportHTMLDialog</name>
     <message>
-        <location filename="../exporthtmldialog.ui" line="231"/>
-        <source>Copy CSS from </source>
-        <translation type="unfinished"></translation>
+        <source>Export to directory:</source>
+        <translation type="obsolete">Экспорт в каталог:</translation>
     </message>
     <message>
-        <location filename="../exporthtmldialog.ui" line="251"/>
-        <source>Use CSS from</source>
-        <translation type="unfinished"></translation>
+        <source>Browse</source>
+        <translation type="obsolete">Обзор</translation>
     </message>
     <message>
-        <source>Include image</source>
-        <translation type="obsolete">Include image</translation>
+        <source>Options</source>
+        <translation type="obsolete">Опции</translation>
     </message>
     <message>
-        <location filename="../exporthtmldialog.ui" line="186"/>
         <source>Colored headings in text</source>
-        <translation type="unfinished">Цветные заголовки в тексте</translation>
+        <translation type="obsolete">Цветные заголовки в тексте</translation>
     </message>
     <message>
-        <location filename="../exporthtmldialog.ui" line="199"/>
         <source>Save settings in map</source>
-        <translation type="unfinished">Сохранить настройки в карте</translation>
-    </message>
-    <message>
-        <source>show output of external scripts</source>
-        <translation type="obsolete">показывать вывод внешних скриптов</translation>
+        <translation type="obsolete">Сохранить настройки в карте</translation>
     </message>
     <message>
-        <location filename="../exporthtmldialog.ui" line="216"/>
         <source>Stylesheets</source>
-        <translation type="unfinished">Стили</translation>
-    </message>
-    <message>
-        <source>CSS:</source>
-        <translation type="obsolete">CSS:</translation>
+        <translation type="obsolete">Стили</translation>
     </message>
     <message>
-        <location filename="../exporthtmldialog.ui" line="297"/>
         <source>Scripts</source>
-        <translation type="unfinished">Сценарии</translation>
+        <translation type="obsolete">Сценарии</translation>
     </message>
     <message>
-        <location filename="../exporthtmldialog.ui" line="327"/>
         <source>After Export:</source>
-        <translation type="unfinished">После экспорта:</translation>
+        <translation type="obsolete">После экспорта:</translation>
     </message>
     <message>
-        <location filename="../exporthtmldialog.ui" line="382"/>
         <source>Cancel</source>
-        <translation type="unfinished">Отмена</translation>
+        <translation type="obsolete">Отмена</translation>
     </message>
     <message>
-        <location filename="../exporthtmldialog.ui" line="389"/>
         <source>Export</source>
-        <translation type="unfinished">Экспортировать</translation>
+        <translation type="obsolete">Экспортировать</translation>
     </message>
     <message>
-        <location filename="../exporthtmldialog.cpp" line="99"/>
+        <location filename="../src/export-html-dialog.cpp" line="+130"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../exporthtmldialog.cpp" line="99"/>
+        <location line="+1"/>
         <source>The settings saved in the map would like to run script:
 
 %1
@@ -507,7 +348,7 @@ want to allow this in your system!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../exporthtmldialog.cpp" line="123"/>
+        <location line="+21"/>
         <source>VYM - Export HTML to directory</source>
         <translation type="unfinished">VYM - Экспортировать HTML в папку</translation>
     </message>
@@ -578,48 +419,6 @@ want to allow this in your system!</source>
         <source>Cancel</source>
         <translation type="obsolete">Отмена</translation>
     </message>
-    <message>
-        <source>Warning</source>
-        <translation type="obsolete">Предупреждение</translation>
-    </message>
-    <message>
-        <source>The settings saved in the map would like to run scripts:
-
-%1
-
-Please check, if you really
-want to allow this in your system!</source>
-        <translation type="obsolete">The settings saved in the map would like to run scripts:
-
-%1
-
-Please check, if you really
-want to allow this in your system!</translation>
-    </message>
-    <message>
-        <source>VYM - Export HTML to directory</source>
-        <translation type="obsolete">VYM - Экспортировать HTML в папку</translation>
-    </message>
-    <message>
-        <source>Could not open %1</source>
-        <translation type="obsolete">Ошибка при открытии %1</translation>
-    </message>
-    <message>
-        <source>Could not write %1</source>
-        <translation type="obsolete">Ошибка при записи %1</translation>
-    </message>
-    <message>
-        <source>Critical Error</source>
-        <translation type="obsolete">Критическая ошибка</translation>
-    </message>
-    <message>
-        <source>Could not start %1</source>
-        <translation type="obsolete">Ошибка при запуске %1</translation>
-    </message>
-    <message>
-        <source>%1 didn&apos;t exit normally</source>
-        <translation type="obsolete">%1 завершился с ошибкой</translation>
-    </message>
     <message>
         <source>show warnings of xslt processor</source>
         <translation type="obsolete">показывать предупреждения XSLT процессора</translation>
@@ -628,172 +427,138 @@ want to allow this in your system!</translation>
 <context>
     <name>ExtraInfoDialog</name>
     <message>
-        <location filename="../extrainfodialog.ui" line="15"/>
         <source>VYM - Info</source>
-        <translation>VYM - Информация</translation>
+        <translation type="vanished">VYM - Информация</translation>
     </message>
     <message>
-        <location filename="../extrainfodialog.ui" line="36"/>
         <source>Map:</source>
-        <translation>Карта:</translation>
-    </message>
-    <message>
-        <location filename="../extrainfodialog.ui" line="53"/>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Карта:</translation>
     </message>
     <message>
-        <location filename="../extrainfodialog.ui" line="63"/>
         <source>Author:</source>
-        <translation>Автор:</translation>
+        <translation type="vanished">Автор:</translation>
     </message>
     <message>
-        <location filename="../extrainfodialog.ui" line="86"/>
         <source>Comment:</source>
-        <translation>Комментарии:</translation>
+        <translation type="vanished">Комментарии:</translation>
     </message>
     <message>
-        <location filename="../extrainfodialog.ui" line="96"/>
         <source>Statistics:</source>
-        <translation>Статистика:</translation>
+        <translation type="vanished">Статистика:</translation>
     </message>
     <message>
-        <location filename="../extrainfodialog.ui" line="139"/>
         <source>Cancel</source>
-        <translation>Отмена</translation>
+        <translation type="vanished">Отмена</translation>
     </message>
     <message>
-        <location filename="../extrainfodialog.ui" line="146"/>
         <source>Close</source>
-        <translation>Закрыть</translation>
+        <translation type="vanished">Закрыть</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
-        <location filename="../findwidget.cpp" line="25"/>
+        <location filename="../src/findwidget.cpp" line="+24"/>
         <source>Find:</source>
         <comment>FindWidget</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>FindWindow</name>
+    <name>HeadingEditor</name>
     <message>
-        <source>Clear</source>
-        <translation type="obsolete">Очистить</translation>
+        <location filename="../src/headingeditor.cpp" line="+9"/>
+        <source>Heading Editor</source>
+        <comment>Name of editor shown as window title</comment>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>HistoryWindow</name>
     <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Отмена</translation>
+        <source>Dialog</source>
+        <translation type="vanished">Dialog</translation>
     </message>
     <message>
-        <source>Find</source>
-        <translation type="obsolete">Найти</translation>
+        <source>Redo</source>
+        <translation type="vanished">Вернуть</translation>
     </message>
     <message>
-        <source>Find Text</source>
-        <translation type="obsolete">Найти текст</translation>
-    </message>
-    <message>
-        <source>Text to find:</source>
-        <translation type="obsolete">Искать текст:</translation>
-    </message>
-</context>
-<context>
-    <name>Heading of mapcenter in new map</name>
-    <message>
-        <source>New map</source>
-        <translation type="vanished">Новая Карта</translation>
-    </message>
-</context>
-<context>
-    <name>HeadingEditor</name>
-    <message>
-        <location filename="../headingeditor.cpp" line="9"/>
-        <source>Heading Editor</source>
-        <comment>Window caption</comment>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HistoryWindow</name>
-    <message>
-        <location filename="../historywindow.ui" line="13"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
-        <location filename="../historywindow.ui" line="50"/>
-        <source>Redo</source>
-        <translation>Вернуть</translation>
-    </message>
-    <message>
-        <location filename="../historywindow.ui" line="72"/>
         <source>Time</source>
-        <translation>Время</translation>
+        <translation type="vanished">Время</translation>
     </message>
     <message>
-        <location filename="../historywindow.ui" line="77"/>
         <source>Comment</source>
-        <translation>Комментарий</translation>
+        <translation type="vanished">Комментарий</translation>
     </message>
     <message>
-        <location filename="../historywindow.ui" line="85"/>
         <source>Undo</source>
-        <translation>Отменить</translation>
-    </message>
-    <message>
-        <location filename="../historywindow.ui" line="122"/>
-        <source>Close</source>
-        <translation>Закрыть</translation>
+        <translation type="vanished">Отменить</translation>
     </message>
     <message>
-        <location filename="../historywindow.cpp" line="17"/>
+        <location filename="../src/historywindow.cpp" line="+16"/>
         <source>Action</source>
         <comment>Table with actions</comment>
         <translation>Действия</translation>
     </message>
     <message>
-        <location filename="../historywindow.cpp" line="20"/>
+        <location line="+3"/>
         <source>Comment</source>
         <comment>Table with actions</comment>
         <translation>Комментировать</translation>
     </message>
     <message>
-        <location filename="../historywindow.cpp" line="23"/>
+        <location line="+3"/>
         <source>Undo action</source>
         <comment>Table with actions</comment>
         <translation>Вернуть действие</translation>
     </message>
     <message>
-        <location filename="../historywindow.cpp" line="125"/>
+        <location line="+123"/>
         <source>Current state</source>
         <comment>Current bar in history hwindow</comment>
         <translation>Текущее состояние</translation>
     </message>
 </context>
 <context>
-    <name>LineEditDialog</name>
+    <name>JiraAgent</name>
     <message>
-        <location filename="../lineeditdialog.ui" line="14"/>
-        <source>Dialog</source>
+        <location filename="../src/jira-agent.cpp" line="+247"/>
+        <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lineeditdialog.ui" line="26"/>
-        <source>TextLabel</source>
+        <location line="+1"/>
+        <source>Authentication problem when contacting JIRA</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>JiraSettingsDialog</name>
+    <message>
+        <source>Add</source>
+        <translation type="obsolete">Добавить</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="obsolete">Удалить</translation>
+    </message>
+    <message>
+        <location filename="../src/jira-settings-dialog.cpp" line="+14"/>
+        <source>Jira settings</source>
+        <comment>Jira settings dialog title</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LineEditDialog</name>
     <message>
-        <location filename="../lineeditdialog.ui" line="89"/>
-        <location filename="../lineeditdialog.cpp" line="17"/>
+        <location filename="../src/lineeditdialog.cpp" line="+16"/>
         <source>Cancel</source>
         <translation type="unfinished">Отмена</translation>
     </message>
     <message>
-        <location filename="../lineeditdialog.ui" line="99"/>
-        <location filename="../lineeditdialog.cpp" line="9"/>
+        <location line="-7"/>
         <source>Ok</source>
         <translation type="unfinished">OK</translation>
     </message>
@@ -801,19 +566,12 @@ want to allow this in your system!</translation>
 <context>
     <name>LockedFileDialog</name>
     <message>
-        <location filename="../lockedfiledialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../lockedfiledialog.ui" line="116"/>
-        <location filename="../lockedfiledialog.cpp" line="7"/>
+        <location filename="../src/lockedfiledialog.cpp" line="+7"/>
         <source>Delete lockfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../lockedfiledialog.ui" line="123"/>
-        <location filename="../lockedfiledialog.cpp" line="6"/>
+        <location line="-1"/>
         <source>Open readonly</source>
         <translation type="unfinished"></translation>
     </message>
@@ -821,1080 +579,1141 @@ want to allow this in your system!</translation>
 <context>
     <name>Main</name>
     <message>
-        <source>Close Map</source>
-        <translation type="obsolete">Закрыть Карту</translation>
-    </message>
-    <message>
-        <source>Undo</source>
-        <translation type="obsolete">Отменить</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="obsolete">Копировать</translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation type="obsolete">Вырезать</translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="obsolete">Вставить</translation>
-    </message>
-    <message>
-        <source>Move branch up</source>
-        <translation type="obsolete">Переместить вверх</translation>
-    </message>
-    <message>
-        <source>Move branch down</source>
-        <translation type="obsolete">Переместить вниз</translation>
-    </message>
-    <message>
-        <source>Scroll branch</source>
-        <translation type="obsolete">Свернуть ветвь</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Найти</translation>
-    </message>
-    <message>
-        <source>Open URL</source>
-        <translation type="obsolete">Открыть URL</translation>
-    </message>
-    <message>
-        <source>Edit URL</source>
-        <translation type="obsolete">Редактировать URL</translation>
-    </message>
-    <message>
-        <source>Use heading of selected branch as URL</source>
-        <translation type="obsolete">Использовать заголовок выбранной ветви как URL</translation>
-    </message>
-    <message>
-        <source>Jump to another vym map, if needed load it first</source>
-        <translation type="obsolete">Перейти на другую vym-Карту если необходимо загрузить её первой</translation>
-    </message>
-    <message>
-        <source>Edit link to another vym map</source>
-        <translation type="obsolete">Редактировать ссылку на другую vym-Карту</translation>
-    </message>
-    <message>
-        <source>Delete link to another vym map</source>
-        <translation type="obsolete">Удалить ссылку на другую vym-Карту</translation>
-    </message>
-    <message>
-        <source>Edit Map Info</source>
-        <translation type="obsolete">Изменить данные о Карте</translation>
-    </message>
-    <message>
-        <source>edit Heading</source>
-        <translation type="obsolete">Изменить заголовок</translation>
-    </message>
-    <message>
-        <source>Delete Selection</source>
-        <translation type="obsolete">Удалить выделенное</translation>
-    </message>
-    <message>
-        <source>Add a branch as child of selection</source>
-        <translation type="obsolete">Добавить новый дочерний узел</translation>
-    </message>
-    <message>
-        <source>Add a branch above selection</source>
-        <translation type="obsolete">Новый дочерний узел до выбранного</translation>
-    </message>
-    <message>
-        <source>Add a branch below selection</source>
-        <translation type="obsolete">Новый дочерний узел после выбранного</translation>
-    </message>
-    <message>
-        <source>Add map at selection</source>
-        <translation type="obsolete">Добавить Карту к выделенному</translation>
-    </message>
-    <message>
-        <source>Replace selection with map</source>
-        <translation type="obsolete">Заменить выделенное на Карту</translation>
-    </message>
-    <message>
-        <source>Save selection</source>
-        <translation type="obsolete">Сохранить выделенное</translation>
-    </message>
-    <message>
-        <source>Select upper branch</source>
-        <translation type="obsolete">Выбрать ветвь верхнего уровня</translation>
-    </message>
-    <message>
-        <source>Select lower branch</source>
-        <translation type="obsolete">Выбрать ветвь нижнего уровня</translation>
-    </message>
-    <message>
-        <source>Select left branch</source>
-        <translation type="obsolete">Выбрать левую ветвь</translation>
-    </message>
-    <message>
-        <source>Select right branch</source>
-        <translation type="obsolete">Выбрать правую ветвь</translation>
-    </message>
-    <message>
-        <source>Select first branch</source>
-        <translation type="obsolete">Выбрать первую ветвь</translation>
-    </message>
-    <message>
-        <source>Select last branch</source>
-        <translation type="obsolete">Выбрать последнюю ветвь</translation>
-    </message>
-    <message>
-        <source>Add Image</source>
-        <translation type="obsolete">Добавить изображение</translation>
-    </message>
-    <message>
-        <source>Set Color</source>
-        <translation type="obsolete">Цвет</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1883"/>
-        <source>Set &amp;Color</source>
-        <translation>&amp;Цвет</translation>
-    </message>
-    <message>
-        <source>Pick color
-Hint: You can pick a color from another branch and color using CTRL+Left Button</source>
-        <translation type="obsolete">Выбор цвета
-Подсказка: Вы можете использовать цвет другой ветви используя CTRL+ЛеваяКлавишаМыши</translation>
-    </message>
-    <message>
-        <source>Color branch</source>
-        <translation type="obsolete">Цвет ветви</translation>
-    </message>
-    <message>
-        <source>Color Subtree</source>
-        <translation type="obsolete">Цвет поддерева</translation>
-    </message>
-    <message>
-        <source>Line</source>
-        <translation type="obsolete">Линия</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1928"/>
+        <location filename="../src/mainwindow.cpp" line="+2179"/>
         <source>Linkstyle Line</source>
         <translation>Линия-ссылка</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1942"/>
+        <location line="+14"/>
         <source>Linkstyle Thick Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use same color for links and headings</source>
-        <translation type="obsolete">Использовать один цвет для ссылок и заголовков</translation>
-    </message>
-    <message>
-        <source>Set Link Color</source>
-        <translation type="obsolete">Установить цвет сслыки</translation>
-    </message>
-    <message>
-        <source>Set Background Color</source>
-        <translation type="obsolete">Установить цвет фона</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1981"/>
+        <location line="+42"/>
         <source>Set &amp;Background Color</source>
         <translation>&amp;Установить цвет фона</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1995"/>
+        <location line="+14"/>
         <source>&amp;View</source>
         <translation>&amp;Вид</translation>
     </message>
     <message>
-        <source>Zoom reset</source>
-        <translation type="obsolete">Масштаб по-умолчанию</translation>
-    </message>
-    <message>
-        <source>Zoom in</source>
-        <translation type="obsolete">Увеличить</translation>
-    </message>
-    <message>
-        <source>Zoom out</source>
-        <translation type="obsolete">Уменьшить</translation>
-    </message>
-    <message>
-        <source>&amp;Settings</source>
-        <translation type="obsolete">&amp;Настройки</translation>
-    </message>
-    <message>
-        <source>Set application to open pdf files</source>
-        <translation type="obsolete">Установить приложение для открытия pdf</translation>
-    </message>
-    <message>
-        <source>Edit branch after adding it</source>
-        <translation type="obsolete">Редактировать ветвь после добавления</translation>
-    </message>
-    <message>
-        <source>Select branch after adding it</source>
-        <translation type="obsolete">Выбрать ветвь после добавления</translation>
-    </message>
-    <message>
-        <source>Select heading before editing</source>
-        <translation type="obsolete">Выбрать заголовок после редактирования</translation>
-    </message>
-    <message>
-        <source>&amp;Test</source>
-        <translation type="obsolete">&amp;Тест</translation>
-    </message>
-    <message>
-        <source>Open VYM Documentation (pdf)</source>
-        <translation type="obsolete">Открыть документацию VYM (pdf)</translation>
-    </message>
-    <message>
-        <source>Information about QT toolkit</source>
-        <translation type="obsolete">Информация о QT</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="3460"/>
+        <location line="+1867"/>
         <source>Overwrite</source>
         <translation>Перезаписать</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3188"/>
-        <location filename="../mainwindow.cpp" line="3235"/>
-        <location filename="../mainwindow.cpp" line="3461"/>
+        <location line="-337"/>
+        <location line="+73"/>
+        <location line="+265"/>
+        <location line="+93"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1878"/>
+        <location line="-2078"/>
         <source>Formatting</source>
         <comment>Shortcuts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1997"/>
+        <location line="+120"/>
         <source>Views</source>
         <comment>Shortcuts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2685"/>
+        <location line="+900"/>
         <source>Download and show release notes</source>
         <comment>Help action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2689"/>
+        <location line="+4"/>
         <source>Check, if updates are available</source>
         <comment>Help action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3187"/>
+        <location line="+552"/>
+        <source>Couldn&apos;t load default map:
+
+%1
+
+vym will create an empty map now.</source>
+        <comment>Mainwindow: Failed to load default map</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Open anyway</source>
         <translation>Открывать всегда</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3234"/>
+        <location line="+73"/>
         <source>Create</source>
         <translation>Создать</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3303"/>
+        <location line="+86"/>
         <source>Load vym map</source>
         <translation>Загрузить карту в формате VYM</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3306"/>
+        <location line="+6"/>
         <source>Import: Add vym map to selection</source>
         <translation>Импортирование: Добавить vym-Карту к выделению</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3309"/>
+        <location line="+4"/>
         <source>Import: Replace selection with vym map</source>
         <translation>Импортирование: Заменить выделение vym-Картой</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3775"/>
+        <location line="+211"/>
+        <source>Saving the map failed:
+Couldn&apos;t rename map to %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+402"/>
         <source>Save modified map before closing it</source>
         <translation>Сохранить изменнеую Карту перед закрытием</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3776"/>
+        <location line="+1"/>
         <source>Discard changes</source>
         <translation>Отменить изменения</translation>
     </message>
     <message>
-        <source>This map is not saved yet. Do you want to</source>
-        <translation type="obsolete">Эта карта не сохранена. Вы хотите</translation>
-    </message>
-    <message>
-        <source>Save map</source>
-        <translation type="obsolete">Сохранить Карту</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="5045"/>
+        <location line="+1411"/>
         <source>VYM -Information:</source>
         <translation>Информация VYM:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3497"/>
-        <location filename="../mainwindow.cpp" line="3503"/>
-        <location filename="../mainwindow.cpp" line="4130"/>
+        <location line="-2265"/>
+        <location line="+395"/>
+        <location line="+46"/>
+        <location line="+9"/>
+        <location line="+73"/>
+        <location line="+8"/>
+        <location line="+649"/>
         <source>Critical Error</source>
         <translation>Критическая ошибка</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5787"/>
+        <location line="+2109"/>
         <source>Critcal error</source>
         <translation>Критическая ошибка</translation>
     </message>
     <message>
-        <source>Remove only branch and keep its childs</source>
-        <translation type="obsolete">Удалить только ветвь и сохранить дочерние узлы</translation>
-    </message>
-    <message>
-        <source>Remove childs of branch</source>
-        <translation type="obsolete">Удалить потомков ветви</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2723"/>
+        <location line="-3798"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <source>Set application to open external links</source>
-        <translation type="obsolete">Выберите приложение для открытия внешних ссылок</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="238"/>
-        <source>Note Editor</source>
-        <translation type="unfinished">Редактор Заметок</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="245"/>
-        <source>Heading Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="260"/>
+        <location line="-2909"/>
         <source>Search results list</source>
         <comment>FindResultWidget</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Map</source>
-        <comment>Toolbar for file actions</comment>
-        <translation type="obsolete">&amp;Карта</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2913"/>
+        <location line="+3108"/>
         <source>File actions toolbar</source>
         <comment>Toolbar for file actions</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1067"/>
+        <location line="-2171"/>
         <source>PDF%1</source>
         <comment>File export menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1071"/>
+        <location line="+5"/>
         <source>SVG%1</source>
         <comment>File export menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1040"/>
+        <location line="-63"/>
         <source>Repeat last export (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2931"/>
+        <location line="+2248"/>
         <source>Edit actions toolbar</source>
         <comment>Toolbar name</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="252"/>
-        <source>Script Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="314"/>
+        <location line="-3065"/>
         <source>Task list</source>
         <comment>TaskEditor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="273"/>
+        <location line="-51"/>
         <source>Script Editor</source>
         <comment>ScriptEditor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="218"/>
+        <location line="-49"/>
         <source>Main window</source>
         <comment>Shortcut group</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="219"/>
+        <location line="+1"/>
         <source>Map Editors</source>
         <comment>Shortcut group</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="220"/>
+        <location line="+1"/>
         <source>Text Editors</source>
         <comment>Shortcut group</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="967"/>
+        <location line="+830"/>
         <source>&amp;Map</source>
         <comment>Menu for file actions</comment>
         <translation type="unfinished">&amp;Карта</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="992"/>
+        <location line="+28"/>
         <source>&amp;Restore last session</source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1208"/>
+        <location line="+288"/>
         <source>Add attribute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1316"/>
+        <location line="+131"/>
         <source>&amp;Detach</source>
         <comment>Context menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1317"/>
+        <location line="+1"/>
         <source>Detach branch and use as mapcenter</source>
         <comment>Context menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1334"/>
+        <location line="+19"/>
         <source>Sort children backwards</source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1411"/>
+        <location line="+81"/>
         <source>Expand all branches</source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1419"/>
+        <location line="+8"/>
         <source>Expand one level</source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1389"/>
+        <location line="-33"/>
         <source>Collapse one level</source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1400"/>
+        <location line="+13"/>
         <source>Collapse unselected levels</source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1355"/>
+        <location line="-47"/>
         <source>Unscroll children</source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1083"/>
-        <source>Spreadsheet</source>
-        <translation type="unfinished">Таблица</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1101"/>
+        <location line="-304"/>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1290"/>
+        <location line="+210"/>
         <source>Move branch up</source>
         <comment>Edit menu</comment>
         <translation type="unfinished">Переместить вверх</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1303"/>
+        <location line="+13"/>
         <source>Move branch down</source>
         <comment>Edit menu</comment>
         <translation type="unfinished">Переместить вниз</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1360"/>
-        <source>Grow selection</source>
-        <comment>Edit menu</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1369"/>
-        <source>Shrink selection</source>
+        <location line="+13"/>
+        <source>Move branch diagonally up</source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1378"/>
-        <source>Reset selection size</source>
+        <location line="+13"/>
+        <source>Move branch diagonally down</source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1429"/>
-        <source>References Context menu</source>
-        <comment>Shortcuts</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1498"/>
-        <source>Bugzilla handling</source>
-        <comment>Shortcuts</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1499"/>
-        <source>Create URL to SUSE Bugzilla</source>
+        <location line="+60"/>
+        <source>Grow selection</source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1510"/>
-        <source>Get data from SUSE Bugzilla</source>
+        <location line="+9"/>
+        <source>Shrink selection</source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1519"/>
-        <source>Get data from SUSE Bugzilla for subtree</source>
+        <location line="+9"/>
+        <source>Reset selection size</source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1528"/>
-        <source>SUSE Fate tool handling</source>
+        <location line="+54"/>
+        <source>References Context menu</source>
         <comment>Shortcuts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1529"/>
-        <source>Create URL to SUSE FATE tool</source>
+        <location line="+74"/>
+        <source>Get data from JIRA for subtree</source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1537"/>
+        <location line="+20"/>
         <source>vymlinks - linking maps</source>
         <comment>Shortcuts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1574"/>
+        <location line="+44"/>
         <source>Exports</source>
         <comment>Shortcuts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1586"/>
+        <location line="+13"/>
         <source>Tasks</source>
         <comment>Shortcuts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1587"/>
+        <location line="+1"/>
         <source>Toggle task</source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1598"/>
+        <location line="+12"/>
         <source>Cycle task status</source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1609"/>
+        <location line="+21"/>
         <source>Reset sleep</source>
         <comment>Task sleep</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1620"/>
-        <location filename="../mainwindow.cpp" line="1643"/>
-        <location filename="../mainwindow.cpp" line="1654"/>
-        <location filename="../mainwindow.cpp" line="1665"/>
-        <location filename="../mainwindow.cpp" line="1676"/>
+        <location line="+12"/>
+        <location line="+23"/>
+        <location line="+11"/>
+        <location line="+11"/>
+        <location line="+11"/>
+        <location line="+11"/>
         <source>Sleep %1 days</source>
         <comment>Task sleep</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1632"/>
+        <location line="-55"/>
         <source>Sleep %1 day</source>
         <comment>Task sleep</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1687"/>
-        <location filename="../mainwindow.cpp" line="1698"/>
+        <location line="+66"/>
+        <location line="+11"/>
         <source>Sleep %1 weeks</source>
         <comment>Task sleep</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1730"/>
+        <location line="+32"/>
         <source>Removing parts of a map</source>
         <comment>Shortcuts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1753"/>
+        <location line="+24"/>
         <source>Various</source>
         <comment>Shortcuts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1765"/>
+        <location line="+12"/>
         <source>Map properties...</source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1771"/>
-        <source>Add   ...</source>
-        <comment>Edit menu</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1792"/>
+        <location line="+30"/>
         <source>Selections</source>
         <comment>Shortcuts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1793"/>
+        <location line="+1"/>
         <source>Select</source>
         <comment>Select menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1795"/>
+        <location line="+3"/>
         <source>Toggle target...</source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1804"/>
+        <location line="+10"/>
         <source>Goto target...</source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1812"/>
+        <location line="+9"/>
         <source>Move to target...</source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1840"/>
+        <location line="+39"/>
         <source>Unselect all</source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1848"/>
+        <location line="+8"/>
         <source>Search functions</source>
         <comment>Shortcuts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1864"/>
+        <location line="+16"/>
         <source>Find duplicate URLs</source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2053"/>
+        <location line="+216"/>
         <source>Note editor</source>
         <comment>View action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2064"/>
+        <location line="+12"/>
         <source>Heading editor</source>
         <comment>View action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2525"/>
-        <source>Set author for new maps</source>
-        <comment>Settings action</comment>
+        <location line="+218"/>
+        <source>Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2613"/>
-        <source>Number of visible parents in task editor</source>
-        <comment>Settings action</comment>
+        <location line="+2"/>
+        <source>All</source>
+        <comment>Filedialog</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2618"/>
-        <source>Number of visible parents in find results window</source>
-        <comment>Settings action</comment>
+        <location line="+63"/>
+        <source>URL</source>
+        <comment>SystemFlag</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Info</source>
-        <translation type="obsolete">Информация</translation>
+        <location line="+539"/>
+        <source>Show scripting commands</source>
+        <comment>Help action</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1446"/>
-        <source>Open all URLs in subtree (including scrolled branches)</source>
-        <comment>Edit menu</comment>
+        <location line="+308"/>
+        <source>Select color (Press Shift for more options)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1461"/>
-        <source>Extract URLs from note</source>
-        <comment>Edit menu</comment>
+        <location line="+60"/>
+        <source>User Flags toolbar</source>
+        <comment>user Flags Toolbar</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1754"/>
-        <source>Add timestamp</source>
-        <comment>Edit menu</comment>
+        <location line="-838"/>
+        <source>Hm...</source>
+        <comment>Standardflag</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1743"/>
-        <source>Remove children</source>
-        <comment>Edit menu</comment>
+        <location line="-1554"/>
+        <source>(experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2972"/>
-        <source>Zoom toolbar</source>
-        <comment>View Toolbar name</comment>
-        <translation type="unfinished"></translation>
+        <location line="+44"/>
+        <source>Firefox Bookmarks</source>
+        <comment>File export menu</comment>
+        <translation type="unfinished">Закладки Firefox</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2042"/>
+        <location line="+635"/>
+        <source>Reset delta priority for visible tasks</source>
+        <comment>Reset delta</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+645"/>
+        <source>&amp;Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connect</source>
+        <comment>Shortcuts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Get Confluence user data</source>
+        <comment>Connect action</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Use modifier to select and reorder objects</source>
+        <comment>Mode modifier</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Format painter: pick color from another branch and apply</source>
+        <comment>Mode modifier</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Use modifier to draw xLinks</source>
+        <comment>Mode modifier</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Use modifier to move branches without linking</source>
+        <comment>Mode modifier</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Use modifier to move view without selecting</source>
+        <comment>Mode modifier</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+205"/>
+        <location line="+6"/>
+        <source>Important</source>
+        <comment>Freemind flag</comment>
+        <translation type="unfinished">Важно</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Back</source>
+        <comment>Freemind flag</comment>
+        <translation type="unfinished">Назад</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Forward</source>
+        <comment>Freemind flag</comment>
+        <translation type="unfinished">Фперёд</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Look here</source>
+        <comment>Freemind flag</comment>
+        <translation type="unfinished">Посмотреть тут</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Dangerous</source>
+        <comment>Freemind flag</comment>
+        <translation type="unfinished">Опасность</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Don&apos;t forget</source>
+        <comment>Freemind flag</comment>
+        <translation type="unfinished">Не забыть</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Flag</source>
+        <comment>Freemind flag</comment>
+        <translation type="unfinished">Флаг</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Home</source>
+        <comment>Freemind flag</comment>
+        <translation type="unfinished">Дом</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Telephone</source>
+        <comment>Freemind flag</comment>
+        <translation type="unfinished">Телефон</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Music</source>
+        <comment>Freemind flag</comment>
+        <translation type="unfinished">Музыка</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Mailbox</source>
+        <comment>Freemind flag</comment>
+        <translation type="unfinished">Почта</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Mail</source>
+        <comment>Freemind flag</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Password</source>
+        <comment>Freemind flag</comment>
+        <translation type="unfinished">Пароль</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>To be improved</source>
+        <comment>Freemind flag</comment>
+        <translation type="unfinished">На улучшение</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Stop</source>
+        <comment>Freemind flag</comment>
+        <translation type="unfinished">Стоп</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Magic</source>
+        <comment>Freemind flag</comment>
+        <translation type="unfinished">Magic</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>To be discussed</source>
+        <comment>Freemind flag</comment>
+        <translation type="unfinished">На обсуждение</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Reminder</source>
+        <comment>Freemind flag</comment>
+        <translation type="unfinished">Напоминание</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Excellent</source>
+        <comment>Freemind flag</comment>
+        <translation type="unfinished">Великолепно</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Linux</source>
+        <comment>Freemind flag</comment>
+        <translation type="unfinished">Linux</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Sweet</source>
+        <comment>Freemind flag</comment>
+        <translation type="unfinished">Мило</translation>
+    </message>
+    <message>
+        <location line="+137"/>
+        <source>Set author for new maps</source>
+        <comment>Settings action</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Confluence Credentials</source>
+        <comment>Settings action</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>JIRA Credentials</source>
+        <comment>Settings action</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+82"/>
+        <source>Dark theme</source>
+        <comment>Settings action</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Number of visible parents in task editor</source>
+        <comment>Settings action</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Number of visible parents in find results window</source>
+        <comment>Settings action</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4155"/>
+        <source>&lt;html&gt;&lt;h3&gt;Do you allow vym to check online for updates or release notes?&lt;/h3&gt;If you allow, vym will &lt;ul&gt;&lt;li&gt;check once for release notes&lt;/li&gt;&lt;li&gt;check regulary for updates and notify you in case you should update, e.g. if there are important bug fixes available&lt;/li&gt;&lt;li&gt;receive a cookie with a random ID and send some anonymous data, like:&lt;ul&gt;&lt;li&gt;vym version&lt;/li&gt;&lt;li&gt;platform name and the ID (e.g. &quot;Windows&quot; or &quot;Linux&quot;)&lt;/li&gt;&lt;li&gt;if you are using dark theme&lt;/li&gt;&lt;/ul&gt;This data is sent to me, Uwe Drechsel.&lt;p&gt;As vym developer I am motivated to see many people using vym. Of course I am curious to see, on which system vym is used. Maintaining each of the systems requires a lot of my (spare) time.&lt;/p&gt; &lt;p&gt;No other data than above will be sent, especially no private data will be collected or sent.(Check the source code, if you don&apos;t believe.)&lt;/p&gt;&lt;/li&gt;&lt;/ul&gt;If you do not allow, &lt;ul&gt;&lt;li&gt;nothing will be downloaded and especially I will &lt;b&gt;not be motivated&lt;/b&gt; to spend some more thousands of hours on developing a free software tool.&lt;/ul&gt;Please allow vym to check for updates :-)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5574"/>
+        <source>Open all URLs in subtree (including scrolled branches)</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Extract URLs from note</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+308"/>
+        <source>Add timestamp</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <source>Remove children</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+333"/>
         <source>Center on selection</source>
         <comment>View action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2982"/>
+        <location line="+1195"/>
         <source>Editors toolbar</source>
         <comment>Editor Toolbar name</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2994"/>
+        <location line="+12"/>
         <source>Modifier modes toolbar</source>
         <comment>Modifier Toolbar name</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="280"/>
+        <location line="-3208"/>
         <source>Property Editor</source>
         <comment>PropertyEditor</comment>
         <translation type="unfinished">Редактор свойств</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="287"/>
+        <location line="-6"/>
+        <source>Script output window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>History window</source>
         <comment>HistoryWidget</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1047"/>
+        <location line="+815"/>
+        <source>Save as default map</source>
+        <comment>File menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Import Dir...</source>
+        <comment>Import Filters</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Webpage (HTML)...</source>
         <comment>File export menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1051"/>
+        <location line="+5"/>
+        <source>Confluence (HTML)...</source>
+        <comment>File export menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
         <source>Text (ASCII)...</source>
         <comment>File export menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1055"/>
+        <location line="+5"/>
+        <source>Text (Markdown)...</source>
+        <comment>File export menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Text with tasks</source>
         <comment>File export menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1059"/>
+        <location line="+7"/>
         <source>Text (A&amp;O report)...</source>
         <comment>Export format</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1135"/>
+        <location line="+30"/>
+        <source>CSV...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>E&amp;dit</source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1545"/>
+        <location line="+417"/>
+        <source>Get page name from Confluence</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
         <source>Open linked map in background tab</source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1820"/>
+        <location line="+254"/>
+        <source>Add image...</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <source>Goto linked map...</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Select previous</source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1830"/>
+        <location line="+10"/>
         <source>Select next</source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1918"/>
+        <location line="+84"/>
         <source>Select default font</source>
         <comment>Branch attribute</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1996"/>
+        <location line="+83"/>
         <source>Toolbars</source>
         <comment>Toolbars overview in view menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2018"/>
+        <location line="+8"/>
+        <source>Toggle Presentation mode</source>
+        <comment>View action</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Rotate counterclockwise</source>
         <comment>View action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2026"/>
+        <location line="+9"/>
         <source>Rotate rclockwise</source>
         <comment>View action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2076"/>
+        <location line="+64"/>
         <source>Tree editor</source>
         <comment>View action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2084"/>
+        <location line="+9"/>
         <source>Task editor</source>
         <comment>View action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2094"/>
+        <location line="+11"/>
         <source>Slide editor</source>
         <comment>View action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2102"/>
+        <location line="+9"/>
         <source>Script editor</source>
         <comment>View action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2153"/>
+        <location line="+8"/>
+        <source>Script output window</source>
+        <comment>View action</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
         <source>Next slide</source>
         <comment>View action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2160"/>
+        <location line="+7"/>
         <source>Previous slide</source>
         <comment>View action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2242"/>
-        <location filename="../mainwindow.cpp" line="2245"/>
-        <source>URL to Bugzilla </source>
+        <location line="+175"/>
+        <source>Map target</source>
         <comment>SystemFlag</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2248"/>
-        <source>Map target</source>
-        <comment>SystemFlag</comment>
+        <location line="+865"/>
+        <source>View toolbar</source>
+        <comment>View Toolbar name</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2265"/>
+        <location line="+34"/>
         <source>Standard Flags toolbar</source>
         <comment>Standard Flag Toolbar</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2279"/>
+        <location line="-874"/>
         <source>Status - ok,done</source>
         <comment>Standardflag</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2283"/>
-        <source>Status - work in progress</source>
-        <comment>Standardflag</comment>
+        <location line="-335"/>
+        <source>Fit view to selection</source>
+        <comment>View action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2287"/>
-        <source>Status - missing, not started</source>
+        <location line="+339"/>
+        <source>Status - work in progress</source>
         <comment>Standardflag</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2385"/>
-        <source>forward</source>
-        <comment>Freemind-Flag</comment>
+        <location line="+5"/>
+        <source>Status - missing, not started</source>
+        <comment>Standardflag</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2397"/>
-        <source>Don&apos;t flagrget</source>
-        <comment>Freemind-Flag</comment>
+        <location line="+328"/>
+        <source>Set path for new maps</source>
+        <comment>Settings action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2630"/>
+        <location line="+106"/>
         <source>Automatic layout</source>
         <comment>Settings action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2641"/>
+        <location line="+11"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2694"/>
+        <location line="+49"/>
         <source>Show keyboard shortcuts</source>
         <comment>Help action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2698"/>
+        <location line="+4"/>
+        <source>Show keyboard macros</source>
+        <comment>Help action</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Debug info</source>
         <comment>Option to show debugging info</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2755"/>
+        <location line="+56"/>
         <source>Tasks</source>
         <comment>Context menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2796"/>
+        <location line="+40"/>
         <source>XLinks</source>
         <comment>Menu for file actions</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2803"/>
+        <location line="+7"/>
         <source>Follow XLink</source>
         <comment>Context menu</comment>
         <translation type="unfinished">Перейти по XLink</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2922"/>
+        <location line="+130"/>
         <source>Undo and clipboard toolbar</source>
         <comment>Toolbar for redo/undo and clipboard</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2948"/>
+        <location line="+29"/>
         <source>Selection toolbar</source>
         <comment>Toolbar name</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2956"/>
+        <location line="+9"/>
         <source>URLs and vymLinks toolbar</source>
         <comment>Toolbar for URLs and vymlinks</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2964"/>
+        <location line="+6"/>
         <source>Colors toolbar</source>
         <comment>Colors toolbar name</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3126"/>
-        <source>unnamed</source>
-        <comment>MainWindow: name for new and empty file</comment>
-        <translation type="unfinished">vym-map</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="3179"/>
+        <location line="+319"/>
         <source>The map %1
 is already opened.Opening the same map in multiple editors may lead 
 to confusion when finishing working with vym.Do you want to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3228"/>
+        <location line="+75"/>
         <source>This map does not exist:
   %1
 Do you want to create a new one?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3264"/>
+        <location line="+48"/>
         <source>Loading: %1</source>
         <comment>Progress dialog while loading maps</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3314"/>
+        <location line="+60"/>
         <source>or</source>
         <comment>File Dialog</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3413"/>
+        <location line="+116"/>
         <source>Saved  %1</source>
         <translation>Сохранено %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3417"/>
+        <location line="+4"/>
         <source>Couldn&apos;t save </source>
         <translation>Ошибка при сохранении</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3444"/>
+        <location line="+23"/>
         <source>Save map as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3455"/>
+        <location line="+8"/>
+        <source>Couldn&apos;t save %1,
+because file exists and cannot be changed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+92"/>
         <source>The file %1
 exists already. Do you want to</source>
         <translation>Файл %1
 уже существует. Вы хотите</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3497"/>
+        <location line="-54"/>
+        <location line="+82"/>
         <source>Couldn&apos;t save %1,
 because of existing lockfile:
 
@@ -1902,1437 +1721,1003 @@ because of existing lockfile:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3503"/>
-        <source>Couldn&apos;t save %1</source>
+        <location line="-45"/>
+        <source>Save map as new default map</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>You have no permissions to write to </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Overwrite as new default map</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Couldn&apos;t save as default, failed to rename to
+%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3746"/>
+        <location line="+51"/>
+        <source>Import Firefox Bookmarks into new map</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Open Freemind map</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>Couldn&apos;t find configuration for export to LibreOffice
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3770"/>
+        <location line="+88"/>
         <source>The map %1 has been modified but not saved yet. Do you want to</source>
         <translation>Карта %1 была измененеа, но изменения не сохранены. Вы хотите</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3994"/>
+        <location line="+178"/>
         <source>Enter URL:</source>
         <translation type="unfinished">Введите URL:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4017"/>
+        <location line="+23"/>
         <source>HTML</source>
         <comment>Filedialog</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4018"/>
+        <location line="+1"/>
         <source>Text</source>
         <comment>Filedialog</comment>
         <translation type="unfinished">Текст</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4019"/>
+        <location line="+1"/>
         <source>Spreadsheet</source>
         <comment>Filedialog</comment>
         <translation type="unfinished">Таблица</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4020"/>
+        <location line="+1"/>
         <source>Textdocument</source>
         <comment>Filedialog</comment>
         <translation type="unfinished">Текстовый документ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4021"/>
+        <location line="+1"/>
         <source>Images</source>
         <comment>Filedialog</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4025"/>
+        <location line="+4"/>
         <source>Set URL to a local file</source>
         <translation type="unfinished">Задать URL на локальный файл</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4131"/>
+        <location line="+125"/>
         <source>Couldn&apos;t open map %1</source>
         <translation>Ошибка при открытии Карты %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5947"/>
-        <source>Please allow vym to download release notes!</source>
-        <translation type="unfinished"></translation>
+        <location line="+44"/>
+        <source>Link to another vym map</source>
+        <translation type="unfinished">Ссылка на другую vym-Карту</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5968"/>
-        <source>&lt;html&gt;&lt;h3&gt;Do you allow vym to check online for updates or release notes?&lt;/h3&gt;If you allow, vym will &lt;ul&gt;&lt;li&gt;check once for release notes&lt;/li&gt;&lt;li&gt;check regulary for updates and notify you in case you should update, e.g. if there are important bug fixes available&lt;/li&gt;&lt;li&gt;receive a cookie with a random ID and send vym version and platform name and the ID  (e.g. &quot;Windows&quot; or &quot;Linux&quot;) back to me, Uwe Drechsel.&lt;p&gt;As vym developer I am motivated to see many people using vym. Of course I am curious to see, on which system vym is used. Maintaining each of the systems requires a lot of my (spare) time.&lt;/p&gt; &lt;p&gt;No other data than above will be sent, especially no private data will be collected or sent.(Check the source code, if you don&apos;t believe.)&lt;/p&gt;&lt;/li&gt;&lt;/ul&gt;If you do not allow, &lt;ul&gt;&lt;li&gt;nothing will be downloaded and especially I will &lt;b&gt;not be motivated&lt;/b&gt; to spend some more thousands of hours on developing a free software tool.&lt;/ul&gt;Please allow vym to check for updates :-)</source>
+        <location line="+2"/>
+        <source>Set as link to vym map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5997"/>
-        <source>Allow</source>
+        <location line="+105"/>
+        <source>Enter sleep time (number of days, hours with &apos;h&apos; or date YYYY-MM-DD or DD.MM[.YYYY]</source>
+        <comment>task sleep time dialog</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5998"/>
-        <source>Do not allow</source>
+        <location line="+72"/>
+        <source>tasks total</source>
+        <comment>Info about map</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6004"/>
-        <source>Thank you for enabling downloads!</source>
+        <location line="+3"/>
+        <source>tasks in map</source>
+        <comment>Info about map</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6027"/>
-        <source>Update information</source>
+        <location line="+680"/>
+        <source>Color of selection box</source>
+        <comment>Mainwindow</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6033"/>
-        <source>vym is up to date.</source>
-        <comment>MainWindow</comment>
+        <location line="+160"/>
+        <source>Load vym script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6084"/>
-        <source>Checking for updates...</source>
-        <comment>MainWindow</comment>
+        <location line="+106"/>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6112"/>
-        <source>Please allow vym to check for updates!</source>
+        <location line="+1"/>
+        <source>Restart vym to apply the changed dark theme setting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Exit</source>
-        <translation type="obsolete">Выход</translation>
+        <location line="+51"/>
+        <location line="+20"/>
+        <source>No SSL support available for this build of vym</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Redo</source>
-        <translation type="obsolete">Вернуть</translation>
+        <location line="+1086"/>
+        <source>Please allow vym to download release notes!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hide link</source>
-        <translation type="obsolete">Скрыть ссылку</translation>
+        <location line="+62"/>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2291"/>
-        <source>Take care!</source>
-        <comment>Standardflag</comment>
-        <translation>Аккуратнее!</translation>
+        <location line="+1"/>
+        <source>Do not allow</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2295"/>
-        <source>Really?</source>
-        <comment>Standardflag</comment>
-        <translation>Уверены?</translation>
+        <location line="+5"/>
+        <source>Thank you for enabling downloads!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>That&apos;s ok, though I would be happy to see many users working with vym and also on which platforms.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Update information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>vym is up to date.</source>
+        <comment>MainWindow</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>Checking for updates...</source>
+        <comment>MainWindow</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Please allow vym to check for updates!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ok!</source>
+        <location line="-4729"/>
+        <source>Take care!</source>
         <comment>Standardflag</comment>
-        <translation type="obsolete">OK!</translation>
+        <translation>Аккуратнее!</translation>
     </message>
     <message>
-        <source>Not ok!</source>
+        <location line="+5"/>
+        <source>Really?</source>
         <comment>Standardflag</comment>
-        <translation type="obsolete">Не ОK!</translation>
+        <translation>Уверены?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2274"/>
+        <location line="-24"/>
         <source>This won&apos;t work!</source>
         <comment>Standardflag</comment>
         <translation>Не будет работать!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2299"/>
+        <location line="+38"/>
         <source>Good</source>
         <comment>Standardflag</comment>
         <translation>Хорошо</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2303"/>
+        <location line="+4"/>
         <source>Bad</source>
         <comment>Standardflag</comment>
         <translation>Плохо</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2312"/>
+        <location line="+48"/>
         <source>Time critical</source>
         <comment>Standardflag</comment>
         <translation>Временные рамки</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2318"/>
+        <location line="-58"/>
         <source>Idea!</source>
         <comment>Standardflag</comment>
         <translation>О, идея!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2322"/>
+        <location line="+25"/>
         <source>Important</source>
         <comment>Standardflag</comment>
         <translation>Важно</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2326"/>
+        <location line="+5"/>
         <source>Unimportant</source>
         <comment>Standardflag</comment>
         <translation>Неважно</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2339"/>
+        <location line="+15"/>
         <source>I like this</source>
         <comment>Standardflag</comment>
         <translation>Мне это нравится</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2343"/>
+        <location line="+3"/>
         <source>I do not like this</source>
         <comment>Standardflag</comment>
         <translation>Мне это не нравится</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2356"/>
+        <location line="-26"/>
         <source>Dangerous</source>
         <comment>Standardflag</comment>
         <translation>Опасность</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2364"/>
+        <location line="+30"/>
         <source>This will help</source>
         <comment>Standardflag</comment>
         <translation>Должно помочь</translation>
     </message>
     <message>
-        <source>About VYM</source>
-        <translation type="obsolete">О View Your Mind</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="3536"/>
-        <location filename="../mainwindow.cpp" line="3596"/>
+        <location line="+1554"/>
+        <location line="+54"/>
+        <location line="+1"/>
         <source>Import</source>
         <translation>Импортировать</translation>
     </message>
     <message>
-        <source>KDE Bookmarks</source>
-        <translation type="obsolete">Закладки KDE</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1034"/>
-        <location filename="../mainwindow.cpp" line="1055"/>
-        <location filename="../mainwindow.cpp" line="1083"/>
-        <location filename="../mainwindow.cpp" line="1087"/>
-        <location filename="../mainwindow.cpp" line="1091"/>
-        <location filename="../mainwindow.cpp" line="1095"/>
-        <location filename="../mainwindow.cpp" line="3678"/>
-        <location filename="../mainwindow.cpp" line="3707"/>
+        <location line="-3186"/>
+        <location line="+22"/>
+        <location line="+8"/>
+        <location line="+13"/>
+        <location line="+7"/>
+        <location line="+36"/>
+        <location line="+5"/>
+        <location line="+5"/>
+        <location line="+5"/>
+        <location line="+999"/>
+        <location line="+2149"/>
+        <location line="+105"/>
         <source>(still experimental)</source>
         <translation>(still experimental)</translation>
     </message>
     <message>
-        <source>Export as LaTeX</source>
-        <translation type="obsolete">Экспортировать в LaTeX</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1110"/>
+        <location line="-3237"/>
         <source>&amp;Print</source>
         <translation>&amp;Печать</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3707"/>
-        <location filename="../mainwindow.cpp" line="3724"/>
+        <location line="+3168"/>
+        <location line="+68"/>
         <source>Export to</source>
         <translation>Экспортировать в</translation>
     </message>
     <message>
-        <source>Hide object in exports</source>
-        <translation type="obsolete">Скрыть объект при экспорте</translation>
-    </message>
-    <message>
-        <source>Use hide flag during exports </source>
-        <translation type="obsolete">Не экспортировать помеченные объекты</translation>
-    </message>
-    <message>
-        <source>Open URL in new tab</source>
-        <translation type="obsolete">Открыть URL в новой закладке</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="3745"/>
-        <location filename="../mainwindow.cpp" line="3875"/>
-        <location filename="../mainwindow.cpp" line="3918"/>
-        <location filename="../mainwindow.cpp" line="4260"/>
-        <location filename="../mainwindow.cpp" line="5800"/>
-        <location filename="../mainwindow.cpp" line="5947"/>
-        <location filename="../mainwindow.cpp" line="6112"/>
+        <location line="-318"/>
+        <location line="+270"/>
+        <location line="+201"/>
+        <location line="+392"/>
+        <location line="+1053"/>
+        <location line="+20"/>
+        <location line="+880"/>
+        <location line="+206"/>
+        <location line="+183"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3876"/>
-        <location filename="../mainwindow.cpp" line="5801"/>
+        <location line="-2733"/>
+        <location line="+2345"/>
         <source>Couldn&apos;t find a viewer to open %1.
 </source>
         <translation>Не найдено приложение для открытия %1.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3877"/>
-        <location filename="../mainwindow.cpp" line="5802"/>
+        <location line="-2344"/>
+        <location line="+2345"/>
         <source>Please use Settings-&gt;</source>
         <translation> Используйте пункт &quot;Настройки&quot;-&gt;</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3877"/>
-        <location filename="../mainwindow.cpp" line="4981"/>
+        <location line="-2344"/>
+        <location line="+1260"/>
         <source>Set application to open an URL</source>
         <translation>Выберите приложение для открытия URL</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3919"/>
-        <source>Couldn&apos;t start %1 to open a new tab in %2.</source>
-        <translation>Ошибка при запуске %1 для открытия в новой закладке %2.</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="4183"/>
-        <location filename="../mainwindow.cpp" line="4185"/>
-        <source>Link to another map</source>
-        <translation type="unfinished">Ссылка на другую Карту</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="4244"/>
-        <source>Enter sleep time (number of days or date YYYY-MM-DD or DD.MM[.YYYY]</source>
-        <comment>task sleep time dialog</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="4261"/>
+        <location line="-870"/>
         <source>Couldn&apos;t set sleep time to %1.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4304"/>
+        <location line="+49"/>
         <source>branches</source>
         <comment>Info about map</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4305"/>
+        <location line="+7"/>
         <source>notes</source>
         <comment>Info about map</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4306"/>
+        <location line="+1"/>
         <source>images</source>
         <comment>Info about map</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4307"/>
-        <source>tasks</source>
-        <comment>Info about map</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="4308"/>
+        <location line="+3"/>
         <source>slides</source>
         <comment>Info about map</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4309"/>
+        <location line="+2"/>
         <source>xLinks</source>
         <comment>Info about map</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4967"/>
-        <location filename="../mainwindow.cpp" line="5802"/>
+        <location line="+796"/>
+        <location line="+1097"/>
         <source>Set application to open PDF files</source>
         <translation>Выберите приложение для открытия PDF документов</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2307"/>
+        <location line="-4311"/>
         <source>Oh no!</source>
         <comment>Standardflag</comment>
         <translation>Вот блин!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2315"/>
+        <location line="+37"/>
         <source>Call...</source>
         <comment>Standardflag</comment>
         <translation>Звонок...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2330"/>
+        <location line="-20"/>
         <source>Very important!</source>
         <comment>Standardflag</comment>
         <translation>Очень важно!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2334"/>
+        <location line="+5"/>
         <source>Very unimportant!</source>
         <comment>Standardflag</comment>
         <translation>Совсем неважно!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2347"/>
+        <location line="+24"/>
         <source>Rose</source>
         <comment>Standardflag</comment>
         <translation>Розочка</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2353"/>
+        <location line="-3"/>
         <source>Surprise!</source>
         <comment>Standardflag</comment>
         <translation>Сюрприз!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2360"/>
+        <location line="-64"/>
         <source>Info</source>
         <comment>Standardflag</comment>
         <translation>Информация</translation>
     </message>
     <message>
+        <location line="+1605"/>
         <source>Firefox Bookmarks</source>
-        <translation type="obsolete">Закладки Firefox</translation>
-    </message>
-    <message>
-        <source>Show Note Editor</source>
-        <translation type="obsolete">Показать редактор заметок</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="3533"/>
-        <location filename="../mainwindow.cpp" line="3536"/>
-        <source>Bookmarks</source>
-        <translation>Закладки</translation>
-    </message>
-    <message>
-        <source>Couldn&apos;t start %1 to open a new tab</source>
-        <translation type="obsolete">Ошибка при запуске %1 для открытия в новой закладке</translation>
-    </message>
-    <message>
-        <source>Standard Flags</source>
-        <comment>Standard Flag Toolbar</comment>
-        <translation type="obsolete">Стандартные флаги</translation>
-    </message>
-    <message>
-        <source>Couldn&apos;t find configuration for export to Open Office
-</source>
-        <translation type="vanished">Ошибка конфигурации экспорта в Open Office
-</translation>
-    </message>
-    <message>
-        <source>No matches found for &quot;%1&quot;</source>
-        <translation type="obsolete">Совпадений не найдено для &quot;%1&quot;</translation>
-    </message>
-    <message>
-        <source>&amp;Map</source>
-        <translation type="obsolete">&amp;Карта</translation>
-    </message>
-    <message>
-        <source>Open all URLs in subtree</source>
-        <translation type="obsolete">Открыть все URL в поддереве</translation>
-    </message>
-    <message>
-        <source>Open all vym links in subtree</source>
-        <translation type="obsolete">Открыть все vym-ссылки в поддереве</translation>
-    </message>
-    <message>
-        <source>Sorry, currently only Konqueror and Mozilla support tabbed browsing.</source>
-        <translation type="obsolete">Извините, в данный момент только Konwueror и Mozilla поддерживают закладки.</translation>
-    </message>
-    <message>
-        <source>New map</source>
-        <comment>Status tip File menu</comment>
-        <translation type="obsolete">Новая Карта</translation>
+        <translation type="unfinished">Закладки Firefox</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="985"/>
+        <location line="-3184"/>
         <source>&amp;Open...</source>
         <comment>File menu</comment>
         <translation>&amp;Открыть...</translation>
     </message>
     <message>
-        <source>Open</source>
-        <comment>Status tip File menu</comment>
-        <translation type="obsolete">Открыть</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1000"/>
+        <location line="+16"/>
         <source>Open Recent</source>
         <comment>File menu</comment>
         <translation>Открыть последние</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1003"/>
+        <location line="+3"/>
         <source>&amp;Save...</source>
         <comment>File menu</comment>
         <translation>&amp;Сохранить...</translation>
     </message>
     <message>
-        <source>Save</source>
-        <comment>Status tip file menu</comment>
-        <translation type="obsolete">Сохранить</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1011"/>
+        <location line="+9"/>
         <source>Save &amp;As...</source>
         <comment>File menu</comment>
         <translation>Сохранить &amp;как...</translation>
     </message>
     <message>
-        <source>Save &amp;As</source>
-        <comment>Status tip file menu</comment>
-        <translation type="obsolete">Сохранить &amp;как</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1017"/>
+        <location line="+11"/>
         <source>Import</source>
         <comment>File menu</comment>
         <translation>Импортировать</translation>
     </message>
     <message>
-        <source>Import %1</source>
-        <comment>Status tip file menu</comment>
-        <translation type="obsolete">Импортировать %1</translation>
-    </message>
-    <message>
-        <source>KDE bookmarks</source>
-        <translation type="obsolete">Закладки KDE</translation>
-    </message>
-    <message>
-        <source>Firefox Bookmarks</source>
-        <comment>File menu</comment>
-        <translation type="obsolete">Закладки Firefox</translation>
-    </message>
-    <message>
-        <source>Import %1</source>
-        <comment>status tip file menu</comment>
-        <translation type="obsolete">Импортировать %1</translation>
-    </message>
-    <message>
-        <source>Import Dir%1</source>
-        <comment>File menu</comment>
-        <translation type="obsolete">Папка для импортирования %1</translation>
-    </message>
-    <message>
-        <source>Import directory structure (experimental)</source>
-        <comment>status tip file menu</comment>
-        <translation type="obsolete">Import directory structure (experimental)</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1038"/>
+        <location line="+23"/>
         <source>Export</source>
         <comment>File menu</comment>
         <translation>Экспортировать</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1063"/>
+        <location line="+56"/>
         <source>Image%1</source>
         <comment>File export menu</comment>
         <translation>Изображение%1</translation>
     </message>
     <message>
-        <source>Export map as image</source>
-        <comment>status tip file menu</comment>
-        <translation type="obsolete">Экспортировать Карту как изображение</translation>
-    </message>
-    <message>
-        <source>Export in Open Document Format used e.g. in Open Office </source>
-        <comment>status tip file menu</comment>
-        <translation type="obsolete">Экспортировать в формат Open Document (Open Office)</translation>
-    </message>
-    <message>
-        <source>Export as %1</source>
-        <comment>status tip file menu</comment>
-        <translation type="obsolete">Экспоритровать в %1</translation>
-    </message>
-    <message>
-        <source> webpage (XHTML)</source>
-        <comment>status tip file menu</comment>
-        <translation type="obsolete">веб-страница (XHTML)</translation>
-    </message>
-    <message>
-        <source>Export as %1</source>
-        <translation type="obsolete">Экспоритровать в %1</translation>
-    </message>
-    <message>
-        <source>KDE Bookmarks</source>
-        <comment>File menu</comment>
-        <translation type="obsolete">Закладки KDE</translation>
-    </message>
-    <message>
-        <source>Print</source>
-        <comment>File menu</comment>
-        <translation type="obsolete">Печать</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1118"/>
+        <location line="+65"/>
         <source>&amp;Close Map</source>
         <comment>File menu</comment>
         <translation>&amp;Закрыть Карту</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1124"/>
+        <location line="+7"/>
         <source>E&amp;xit</source>
         <comment>File menu</comment>
         <translation>&amp;Выход</translation>
     </message>
     <message>
-        <source>&amp;Edit</source>
-        <comment>Edit menu</comment>
-        <translation type="obsolete">&amp;Правка</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1139"/>
+        <location line="+26"/>
         <source>&amp;Undo</source>
         <comment>Edit menu</comment>
         <translation>&amp;Отменить</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1150"/>
+        <location line="+11"/>
         <source>&amp;Redo</source>
         <comment>Edit menu</comment>
         <translation>&amp;Вернуть</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1161"/>
+        <location line="+11"/>
         <source>&amp;Copy</source>
         <comment>Edit menu</comment>
         <translation>&amp;Копировать</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1172"/>
+        <location line="+11"/>
         <source>Cu&amp;t</source>
         <comment>Edit menu</comment>
         <translation>Выреза&amp;ть</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1185"/>
+        <location line="+13"/>
         <source>&amp;Paste</source>
         <comment>Edit menu</comment>
         <translation>&amp;Вставить</translation>
     </message>
     <message>
-        <source>Edit heading</source>
-        <comment>Edit menu</comment>
-        <translation type="obsolete">Изменить заголовок</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1197"/>
+        <location line="+13"/>
+        <location line="+10"/>
         <source>Delete Selection</source>
         <comment>Edit menu</comment>
         <translation>Удалить выделенное</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1232"/>
+        <location line="+33"/>
         <source>Add branch as child</source>
         <comment>Edit menu</comment>
         <translation>Добавить дочернюю ветвь</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1242"/>
+        <location line="+9"/>
         <source>Add branch (insert)</source>
         <comment>Edit menu</comment>
         <translation>Добавить ветвь (insert)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1252"/>
-        <location filename="../mainwindow.cpp" line="1262"/>
+        <location line="+10"/>
+        <location line="+10"/>
         <source>Add branch above</source>
         <comment>Edit menu</comment>
         <translation>Добавить ветвь перед текущей</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1272"/>
-        <location filename="../mainwindow.cpp" line="1281"/>
+        <location line="+10"/>
+        <location line="+9"/>
         <source>Add branch below</source>
         <comment>Edit menu</comment>
         <translation>Добавить ветвь после текущей</translation>
     </message>
     <message>
-        <source>Move up</source>
-        <comment>Edit menu</comment>
-        <translation type="vanished">Переместить вверх</translation>
-    </message>
-    <message>
-        <source>Move down</source>
-        <comment>Edit menu</comment>
-        <translation type="vanished">Переместить вниз</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1343"/>
+        <location line="+91"/>
         <source>Scroll branch</source>
         <comment>Edit menu</comment>
         <translation>Свернуть ветвь</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1849"/>
-        <location filename="../mainwindow.cpp" line="1857"/>
+        <location line="+544"/>
+        <location line="+8"/>
         <source>Find...</source>
         <comment>Edit menu</comment>
         <translation>Найти...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1430"/>
+        <location line="-462"/>
         <source>Open URL</source>
         <comment>Edit menu</comment>
         <translation>Открыть URL</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="124"/>
+        <location line="-1502"/>
         <source>Main window</source>
         <comment>Shortcut scope</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1438"/>
+        <location line="+1511"/>
         <source>Open URL in new tab</source>
         <comment>Edit menu</comment>
         <translation>Открыть URL в новой закладке</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1454"/>
+        <location line="+18"/>
         <source>Open all URLs in subtree</source>
         <comment>Edit menu</comment>
         <translation>Открыть все URL в поддереве</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1470"/>
+        <location line="+17"/>
         <source>Edit URL...</source>
         <comment>Edit menu</comment>
         <translation>Изменить URL...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1488"/>
+        <location line="+18"/>
         <source>Use heading for URL</source>
         <comment>Edit menu</comment>
         <translation>Use heading for URL</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1538"/>
+        <location line="+33"/>
         <source>Open linked map</source>
         <comment>Edit menu</comment>
         <translation>Open linked map</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1552"/>
+        <location line="+17"/>
         <source>Open all vym links in subtree</source>
         <comment>Edit menu</comment>
         <translation>Открыть все  ссылки в поддереве</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1560"/>
+        <location line="+9"/>
         <source>Edit vym link...</source>
         <comment>Edit menu</comment>
         <translation>Редактировать ссылку...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1567"/>
+        <location line="+9"/>
         <source>Delete vym link</source>
         <comment>Edit menu</comment>
         <translation>Удалить ссылку</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1575"/>
+        <location line="+9"/>
         <source>Hide in exports</source>
         <comment>Edit menu</comment>
         <translation>Скрыть при экспортировании</translation>
     </message>
     <message>
-        <source>Edit Map Info...</source>
-        <comment>Edit menu</comment>
-        <translation type="vanished">Изменить данные Карты...</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1710"/>
+        <location line="+158"/>
         <source>Add map (insert)</source>
         <comment>Edit menu</comment>
         <translation>Добавить Карту (вставить)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1717"/>
+        <location line="+7"/>
         <source>Add map (replace)</source>
         <comment>Edit menu</comment>
         <translation>Добавить Карту (заменить)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1724"/>
+        <location line="+7"/>
         <source>Save selection</source>
         <comment>Edit menu</comment>
         <translation>Сохранить выделенное</translation>
     </message>
     <message>
-        <source>Remove only branch </source>
-        <comment>Edit menu</comment>
-        <translation type="obsolete">Удалить только ветвь</translation>
-    </message>
-    <message>
-        <source>Remove childs</source>
-        <comment>Edit menu</comment>
-        <translation type="obsolete">Удалить дочерние ветви</translation>
-    </message>
-    <message>
-        <source>Select left branch</source>
-        <comment>Edit menu</comment>
-        <translation type="obsolete">Выбрать левую ветвь</translation>
-    </message>
-    <message>
-        <source>Select child branch</source>
-        <comment>Edit menu</comment>
-        <translation type="obsolete">Выбрать дочернюю ветвь</translation>
-    </message>
-    <message>
-        <source>Select first branch</source>
-        <comment>Edit menu</comment>
-        <translation type="obsolete">Выбрать первую ветвь</translation>
-    </message>
-    <message>
-        <source>Select last branch</source>
-        <comment>Edit menu</comment>
-        <translation type="obsolete">Выбрать последнюю ветвь</translation>
-    </message>
-    <message>
-        <source>Add Image...</source>
-        <comment>Edit menu</comment>
-        <translation type="vanished">Добавить изображение...</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1876"/>
+        <location line="+169"/>
         <source>F&amp;ormat</source>
         <comment>Format menu</comment>
         <translation>Ф&amp;ормат</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1889"/>
+        <location line="+7"/>
         <source>Pic&amp;k color</source>
         <comment>Edit menu</comment>
         <translation>Выб&amp;рать цвет</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1898"/>
+        <location line="+10"/>
         <source>Color &amp;branch</source>
         <comment>Edit menu</comment>
         <translation>Цвет &amp;ветви</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1907"/>
+        <location line="+10"/>
         <source>Color sub&amp;tree</source>
         <comment>Edit menu</comment>
         <translation>Цвет под&amp;дерева</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1958"/>
+        <location line="+53"/>
         <source>Hide link if object is not selected</source>
         <comment>Branch attribute</comment>
         <translation>Скрыть ссылку если объект не выбран</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1964"/>
+        <location line="+6"/>
         <source>&amp;Use color of heading for link</source>
         <comment>Branch attribute</comment>
         <translation>&amp;Использовать цвет заголовка для ссылки</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2034"/>
+        <location line="+89"/>
         <source>reset Zoom</source>
         <comment>View action</comment>
         <translation>reset Zoom</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2002"/>
+        <location line="-37"/>
         <source>Zoom in</source>
         <comment>View action</comment>
         <translation>Увеличить</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1021"/>
+        <location line="-1124"/>
         <source>Firefox Bookmarks</source>
         <comment>Import filters</comment>
         <translation type="unfinished">Закладки Firefox</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1034"/>
-        <source>Import Dir%1</source>
-        <comment>Import Filters</comment>
-        <translation type="unfinished">Папка для импортирования %1</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1733"/>
+        <location line="+827"/>
         <source>Remove only branch and keep its children </source>
         <comment>Edit menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2010"/>
+        <location line="+306"/>
         <source>Zoom out</source>
         <comment>View action</comment>
         <translation>Уменьшить</translation>
     </message>
     <message>
-        <source>Show Note Editor</source>
-        <comment>View action</comment>
-        <translation type="obsolete">Редактор Заметок</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2178"/>
-        <source>Use modifier to color branches</source>
-        <comment>Mode modifier</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2194"/>
-        <source>Use modifier to draw xLinks</source>
-        <comment>Mode modifier</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2531"/>
+        <location line="+688"/>
         <source>Set application to open pdf files</source>
         <comment>Settings action</comment>
         <translation>Установить приложение для открытия pdf</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2535"/>
+        <location line="+7"/>
         <source>Set application to open external links</source>
         <comment>Settings action</comment>
         <translation>Выберите приложение для открытия внешних ссылок</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2581"/>
-        <source>Edit branch after adding it</source>
-        <comment>Settings action</comment>
-        <translation>Редактировать ветвь после добавления</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2587"/>
+        <location line="+67"/>
         <source>Select branch after adding it</source>
         <comment>Settings action</comment>
         <translation>Выбрать ветвь после добавления</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2593"/>
+        <location line="+9"/>
         <source>Select existing heading</source>
         <comment>Settings action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete key</source>
-        <comment>Settings action</comment>
-        <translation type="obsolete">Удалить</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2599"/>
+        <location line="+7"/>
         <source>Exclusive flags</source>
         <comment>Settings action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2605"/>
+        <location line="+7"/>
         <source>Use hide flags</source>
         <comment>Settings action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2673"/>
+        <location line="+78"/>
         <source>&amp;Help</source>
         <comment>Help menubar entry</comment>
         <translation>&amp;Справка</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2676"/>
+        <location line="+3"/>
         <source>Open VYM Documentation (pdf) </source>
         <comment>Help action</comment>
         <translation>Открыть документацию VYM (pdf)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2702"/>
+        <location line="+38"/>
         <source>About VYM</source>
         <comment>Help action</comment>
         <translation>Информация о программе</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2706"/>
+        <location line="-4"/>
         <source>About QT</source>
         <comment>Help action</comment>
         <translation>Информация о QT</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2735"/>
+        <location line="+34"/>
         <source>Remove</source>
         <comment>Context menu name</comment>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2798"/>
+        <location line="+61"/>
         <source>Edit XLink</source>
         <comment>Context menu name</comment>
         <translation>Изменить XLink</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2809"/>
+        <location line="+11"/>
         <source>Follow XLink</source>
         <comment>Context menu name</comment>
         <translation>Перейти по XLink</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2818"/>
+        <location line="+6"/>
         <source>Save image</source>
         <comment>Context action</comment>
         <translation>Сохранить изображение</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="971"/>
+        <location line="-2202"/>
         <source>&amp;New map</source>
         <comment>File menu</comment>
         <translation>Новая Кар&amp;та</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="978"/>
+        <location line="+9"/>
         <source>&amp;Copy to new map</source>
         <comment>File menu</comment>
         <translation>&amp;Копировать в новую карту</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1221"/>
+        <location line="+314"/>
         <source>Add mapcenter</source>
         <comment>Canvas context menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1325"/>
+        <location line="+129"/>
         <source>Sort children</source>
         <comment>Edit menu</comment>
         <translation>Сортировать дочерние ветви</translation>
     </message>
     <message>
-        <source>Unscroll childs</source>
-        <comment>Edit menu</comment>
-        <translation type="obsolete">Развернуть дочерние ветви</translation>
-    </message>
-    <message>
-        <source>Unscroll all scrolled branches in selected subtree</source>
-        <translation type="obsolete">Развернуть свернутые ветви в выбранном поддереве</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1479"/>
+        <location line="+164"/>
         <source>Edit local URL...</source>
         <comment>Edit menu</comment>
         <translation>Редактировать локальный URL...</translation>
     </message>
     <message>
-        <source>Edit local URL</source>
-        <translation type="obsolete">Редактировать локальный URL</translation>
-    </message>
-    <message>
-        <source>Create URL to Novell Bugzilla</source>
-        <comment>Edit menu</comment>
-        <translation type="vanished">Создать URL в Novell Bugzilla</translation>
-    </message>
-    <message>
-        <source>Create URL to Novell Bugzilla</source>
-        <translation type="obsolete">Создать URL в Novell Bugzilla</translation>
-    </message>
-    <message>
-        <source>Create URL to Novell FATE</source>
-        <comment>Edit menu</comment>
-        <translation type="vanished">Создать URL в Novell FATE</translation>
-    </message>
-    <message>
-        <source>Create URL to Novell FATE</source>
-        <translation type="obsolete">Создать URL в Novell FATE</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1779"/>
+        <location line="+315"/>
         <source>Property window</source>
         <comment>Dialog to edit properties of selection</comment>
         <translation>Свойства</translation>
     </message>
     <message>
-        <source>Set properties for selection</source>
-        <translation type="obsolete">Установить свойства выделения</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1935"/>
+        <location line="+168"/>
         <source>Linkstyle Curve</source>
         <translation>Linkstyle Curve</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1949"/>
+        <location line="+14"/>
         <source>Linkstyle Thick Curve</source>
         <translation>Linkstyle Thick Curve</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1971"/>
+        <location line="+25"/>
         <source>Set &amp;Link Color</source>
         <translation>Установить цвет &amp;сслыки</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1976"/>
+        <location line="+5"/>
         <source>Set &amp;Selection Color</source>
         <translation>Установить &amp;цвет выделения</translation>
     </message>
     <message>
-        <source>Set Selection Color</source>
-        <translation type="obsolete">Установить цвет выделения</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1986"/>
+        <location line="+10"/>
         <source>Set &amp;Background image</source>
         <translation>Установить фоновое &amp;изображение</translation>
     </message>
     <message>
-        <source>Set Background image</source>
-        <translation type="obsolete">Установить фоновое изображение</translation>
-    </message>
-    <message>
-        <source>Show selection</source>
-        <comment>View action</comment>
-        <translation type="obsolete">Показать выделенный узел</translation>
-    </message>
-    <message>
-        <source>Show selection</source>
-        <translation type="obsolete">Показать выделенный узел</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2110"/>
+        <location line="+166"/>
         <source>History Window</source>
         <comment>View action</comment>
         <translation>История изменений</translation>
     </message>
     <message>
-        <source>Show History Window</source>
-        <translation type="obsolete">Показать Историю Изменений</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2124"/>
+        <location line="+14"/>
         <source>Antialiasing</source>
         <comment>View action</comment>
         <translation>Сглаживание</translation>
     </message>
     <message>
-        <source>Antialiasing</source>
-        <translation type="obsolete">Сглаживание</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2131"/>
+        <location line="+7"/>
         <source>Smooth pixmap transformations</source>
         <comment>View action</comment>
         <translation>Smooth pixmap transformations</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2139"/>
+        <location line="+10"/>
         <source>Next Map</source>
         <comment>View action</comment>
         <translation>Следующая Карта</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2146"/>
+        <location line="+7"/>
         <source>Previous Map</source>
         <comment>View action</comment>
         <translation>Предыдущая Карта</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2174"/>
+        <location line="+52"/>
         <source>Modifier modes</source>
         <comment>Shortcuts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2213"/>
-        <location filename="../mainwindow.cpp" line="2216"/>
-        <location filename="../mainwindow.cpp" line="2219"/>
-        <location filename="../mainwindow.cpp" line="2223"/>
-        <location filename="../mainwindow.cpp" line="2226"/>
-        <location filename="../mainwindow.cpp" line="2229"/>
-        <location filename="../mainwindow.cpp" line="2233"/>
-        <location filename="../mainwindow.cpp" line="2236"/>
+        <location line="+101"/>
+        <location line="+4"/>
+        <location line="+4"/>
+        <location line="+5"/>
+        <location line="+4"/>
+        <location line="+4"/>
+        <location line="+5"/>
+        <location line="+4"/>
         <source>Note</source>
         <comment>SystemFlag</comment>
         <translation>Заметки</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2239"/>
-        <source>URL to Document </source>
-        <comment>SystemFlag</comment>
-        <translation>URL документа </translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2251"/>
+        <location line="+9"/>
         <source>Link to another vym map</source>
         <comment>SystemFlag</comment>
         <translation>Ссылка на другую vym-Карту</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2254"/>
+        <location line="+3"/>
         <source>subtree is scrolled</source>
         <comment>SystemFlag</comment>
         <translation>subtree is scrolled</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2257"/>
+        <location line="+4"/>
         <source>subtree is temporary scrolled</source>
         <comment>SystemFlag</comment>
         <translation>subtree is temporary scrolled</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2260"/>
+        <location line="+3"/>
         <source>Hide object in exported maps</source>
         <comment>SystemFlag</comment>
         <translation>Скрыть объект при экспорте</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2350"/>
+        <location line="+42"/>
         <source>I just love...</source>
         <comment>Standardflag</comment>
         <translation>Просто люблю...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2369"/>
-        <source>Important</source>
-        <comment>Freemind-Flag</comment>
-        <translation>Важно</translation>
+        <location line="+258"/>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2376"/>
-        <source>Priority</source>
-        <comment>Freemind-Flag</comment>
-        <translation>Приоритет</translation>
+        <location line="+5"/>
+        <source>Check for release notes and updates</source>
+        <comment>Settings action</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2381"/>
-        <source>Back</source>
-        <comment>Freemind-Flag</comment>
-        <translation>Назад</translation>
+        <location line="+27"/>
+        <source>Set application to zip/unzip files</source>
+        <comment>Settings action</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Forward</source>
-        <comment>Freemind-Flag</comment>
-        <translation type="obsolete">Фперёд</translation>
+        <location line="+22"/>
+        <source>Set path for macros</source>
+        <comment>Settings action</comment>
+        <translation>Установить папку для макросов</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2389"/>
-        <source>Look here</source>
-        <comment>Freemind-Flag</comment>
-        <translation>Ð\9fоÑ\81моÑ\82Ñ\80еÑ\82Ñ\8c Ñ\82Ñ\83Ñ\82</translation>
+        <location line="+4"/>
+        <source>Set number of undo levels</source>
+        <comment>Settings action</comment>
+        <translation>УÑ\81Ñ\82ановиÑ\82Ñ\8c ÐºÐ¾Ð»Ð¸Ñ\87еÑ\81Ñ\82во Ñ\83Ñ\80овней Ð¾Ñ\82менÑ\8b</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2393"/>
-        <source>Dangerous</source>
-        <comment>Freemind-Flag</comment>
-        <translation>Ð\9eпаÑ\81ноÑ\81Ñ\82Ñ\8c</translation>
+        <location line="+7"/>
+        <source>Autosave</source>
+        <comment>Settings action</comment>
+        <translation>Ð\90вÑ\82оÑ\81оÑ\85Ñ\80анение</translation>
     </message>
     <message>
-        <source>Don&apos;t forget</source>
-        <comment>Freemind-Flag</comment>
-        <translation type="obsolete">Не забыть</translation>
+        <location line="+6"/>
+        <source>Autosave time</source>
+        <comment>Settings action</comment>
+        <translation>Интервал автосохранения</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2401"/>
-        <source>Flag</source>
-        <comment>Freemind-Flag</comment>
-        <translation>Флаг</translation>
+        <location line="+12"/>
+        <source>Write backup file on save</source>
+        <comment>Settings action</comment>
+        <translation>СоздаÑ\82Ñ\8c Ñ\80езÑ\80внÑ\83Ñ\8e ÐºÐ¾Ð¿Ð¸Ñ\8e Ð¿Ñ\80и Ñ\81оÑ\85Ñ\80анении</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2406"/>
-        <source>Home</source>
-        <comment>Freemind-Flag</comment>
-        <translation>Дом</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2410"/>
-        <source>Telephone</source>
-        <comment>Freemind-Flag</comment>
-        <translation>Телефон</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2414"/>
-        <source>Music</source>
-        <comment>Freemind-Flag</comment>
-        <translation>Музыка</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2418"/>
-        <source>Mailbox</source>
-        <comment>Freemind-Flag</comment>
-        <translation>Почта</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2422"/>
-        <source>Maix</source>
-        <comment>Freemind-Flag</comment>
-        <translation>Maix</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2426"/>
-        <source>Password</source>
-        <comment>Freemind-Flag</comment>
-        <translation>Пароль</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2430"/>
-        <source>To be improved</source>
-        <comment>Freemind-Flag</comment>
-        <translation>На улучшение</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2434"/>
-        <source>Stop</source>
-        <comment>Freemind-Flag</comment>
-        <translation>Стоп</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2438"/>
-        <source>Magic</source>
-        <comment>Freemind-Flag</comment>
-        <translation>Magic</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2442"/>
-        <source>To be discussed</source>
-        <comment>Freemind-Flag</comment>
-        <translation>На обсуждение</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2446"/>
-        <source>Reminder</source>
-        <comment>Freemind-Flag</comment>
-        <translation>Напоминание</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2450"/>
-        <source>Excellent</source>
-        <comment>Freemind-Flag</comment>
-        <translation>Великолепно</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2454"/>
-        <source>Linux</source>
-        <comment>Freemind-Flag</comment>
-        <translation>Linux</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2458"/>
-        <source>Sweet</source>
-        <comment>Freemind-Flag</comment>
-        <translation>Мило</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2514"/>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2518"/>
-        <source>Check for release notes and updates</source>
-        <comment>Settings action</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2539"/>
-        <source>Set application to zip/unzip files</source>
-        <comment>Settings action</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2543"/>
-        <source>Set path for macros</source>
-        <comment>Settings action</comment>
-        <translation>Установить папку для макросов</translation>
-    </message>
-    <message>
-        <source>Set path for macros</source>
-        <translation type="obsolete">Установить папку для макросов</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2547"/>
-        <source>Set number of undo levels</source>
-        <comment>Settings action</comment>
-        <translation>Установить количество уровней отмены</translation>
-    </message>
-    <message>
-        <source>Set number of undo levels</source>
-        <translation type="obsolete">Установить количество уровней отмены</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2553"/>
-        <source>Autosave</source>
-        <comment>Settings action</comment>
-        <translation>Автосохранение</translation>
-    </message>
-    <message>
-        <source>Autosave</source>
-        <translation type="obsolete">Автосохранение</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2559"/>
-        <source>Autosave time</source>
-        <comment>Settings action</comment>
-        <translation>Интервал автосохранения</translation>
-    </message>
-    <message>
-        <source>Autosave time</source>
-        <translation type="obsolete">Интервал автосохранения</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2572"/>
-        <source>Write backup file on save</source>
-        <comment>Settings action</comment>
-        <translation>Создать резрвную копию при сохранении</translation>
-    </message>
-    <message>
-        <source>Write backup file on save</source>
-        <translation type="obsolete">Создать резрвную копию при сохранении</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2623"/>
+        <location line="+65"/>
         <source>Animation</source>
         <comment>Settings action</comment>
         <translation>Анимация</translation>
     </message>
     <message>
-        <source>Animation</source>
-        <translation type="obsolete">Анимация</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2680"/>
+        <location line="+53"/>
         <source>Open VYM example maps </source>
         <comment>Help action</comment>
         <translation>Открыть примеры карт</translation>
     </message>
     <message>
-        <source>Open VYM example maps </source>
-        <translation type="obsolete">Открыть примеры карт</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="2772"/>
+        <location line="+102"/>
         <source>References (URLs, vymLinks, ...)</source>
         <comment>Context menu name</comment>
         <translation>Ссылки ( URLs, vym-Cсылки, ...)</translation>
     </message>
     <message>
-        <source>&amp;%1 %2</source>
-        <translation type="obsolete">&amp;%1 %2</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="3563"/>
-        <source>Load Freemind map</source>
-        <translation>Загрузить Карту в формате FreeMind</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="3678"/>
+        <location line="+1159"/>
         <source>Export as CSV</source>
         <translation>Экспортировать в CVS</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4286"/>
+        <location line="+679"/>
         <source>%1 items on map
 </source>
         <comment>Info about map</comment>
@@ -3340,488 +2725,231 @@ because of existing lockfile:
 </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5000"/>
-        <location filename="../mainwindow.cpp" line="5010"/>
-        <source>Set application to zip/unzip files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="5028"/>
-        <source>Directory with vym macros:</source>
-        <translation>Папка с vym-макросами:</translation>
-    </message>
-    <message>
-        <source>QInputDialog::getInteger()</source>
-        <translation type="obsolete">QInputDialog::getInteger()</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="5041"/>
+        <location line="+881"/>
         <source>Number of undo/redo levels:</source>
         <translation>Количество уровней отмены/повтора:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5046"/>
+        <location line="+5"/>
         <source>Settings have been changed. The next map opened will have &quot;%1&quot; undo/redo levels</source>
         <translation>Настройки были измененеы. Следующая открытая карта будет использовать &quot;%1&quot; уровней повтора/отмены</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5066"/>
+        <location line="+40"/>
         <source>Number of seconds before autosave:</source>
         <translation>Интервал автосохранения (сек.):</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5076"/>
+        <location line="+11"/>
         <source>Set author for new maps (used in lockfile)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5077"/>
+        <location line="+3"/>
         <source>unknown user</source>
         <comment>default name for map author in settings</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5088"/>
+        <location line="+42"/>
         <source>Number of parents shown in find results:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5098"/>
+        <location line="+11"/>
         <source>Number of parents shown for a task:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3092"/>
+        <location line="-2404"/>
         <source>(readonly)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5433"/>
+        <location line="+2857"/>
         <source>History for %1</source>
         <comment>Window Caption</comment>
         <translation>История для %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5456"/>
+        <location line="+23"/>
         <source>Export in last used format (%1) to: %2</source>
         <comment>status tip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5788"/>
+        <location line="+441"/>
         <source>Couldn&apos;t find the documentation %1 in:
 %2</source>
         <translation>Не найдена документация %1 в: %2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5816"/>
+        <location line="+31"/>
         <source>Load vym example map</source>
         <translation>Загрузить примеры карт</translation>
     </message>
-    <message>
-        <source>Couldn&apos;t find a macro at  %1.
-</source>
-        <translation type="obsolete">Couldn&apos;t find a macro at  %1.
-</translation>
-    </message>
-    <message>
-        <source>Set directory for vym macros</source>
-        <translation type="obsolete">Установить папку для vym-макросов</translation>
-    </message>
 </context>
 <context>
     <name>MapEditor</name>
     <message>
-        <source>Critical Parse Error</source>
-        <translation type="obsolete">Критическая ошибка Разбора</translation>
-    </message>
-    <message>
-        <source>Overwrite</source>
-        <translation type="obsolete">Перезаписать</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Отмена</translation>
-    </message>
-    <message>
-        <source>Critical Export Error</source>
-        <translation type="obsolete">Критическая ошибка Экспорта</translation>
-    </message>
-    <message>
-        <source>Critical Error</source>
-        <translation type="obsolete">Критическая ошибка</translation>
-    </message>
-    <message>
-        <source>Enter URL:</source>
-        <translation type="obsolete">Введите URL:</translation>
-    </message>
-    <message>
-        <source>Images</source>
-        <translation type="obsolete">Изображения</translation>
-    </message>
-    <message>
-        <source>Critical Import Error</source>
-        <translation type="obsolete">Критическая ошибка Импорта</translation>
-    </message>
-    <message>
-        <source>The file %1 exists already.
-Do you want to overwrite it?</source>
-        <translation type="obsolete">Файл %1уже существует.Перезаписать?</translation>
-    </message>
-    <message>
-        <source>MapEditor::exportXML couldn&apos;t open %1</source>
-        <translation type="obsolete">MapEditor::exportXML couldn&apos;t open %1</translation>
-    </message>
-    <message>
-        <source>Cannot find the directory %1</source>
-        <translation type="obsolete">Папка %1 не найдена</translation>
-    </message>
-    <message>
-        <source>Link to another map</source>
-        <translation type="obsolete">Ссылка на другую Карту</translation>
-    </message>
-    <message>
-        <source>Load image</source>
-        <translation type="obsolete">Загрузить изображение</translation>
-    </message>
-    <message>
-        <source>Choose directory structure to import</source>
-        <translation type="obsolete">Выберите структуруа папок для экспорта</translation>
-    </message>
-    <message>
-        <source>unnamed</source>
-        <translation type="obsolete">vym-map</translation>
-    </message>
-    <message>
-        <source>Save image</source>
-        <translation type="obsolete">Сохранить изображение</translation>
-    </message>
-    <message>
-        <source>Critical Parse Error while reading %1</source>
-        <translation type="obsolete">Критическая ошибка Разбора при чтении %1</translation>
-    </message>
-    <message>
-        <source>Could not read %1</source>
-        <translation type="obsolete">Ошибка при чтении %1</translation>
-    </message>
-    <message>
-        <source>Warning</source>
-        <translation type="obsolete">Предупреждение</translation>
-    </message>
-    <message>
-        <source>Can&apos;t get color of heading,
-there&apos;s no branch selected</source>
-        <translation type="obsolete">Невозможно получить цвет заголовка
-ни одна ветвь не выбрана</translation>
-    </message>
-    <message>
-        <source>Critical Load Error</source>
-        <translation type="obsolete">Критическая ошибка Загрузки</translation>
-    </message>
-    <message>
-        <source>Couldn&apos;t create temporary directory before load
-</source>
-        <translation type="obsolete">Ошибка при создании временной папки перед загрузкой</translation>
-    </message>
-    <message>
-        <source>Couldn&apos;t find a map (*.xml) in .vym archive.
-</source>
-        <translation type="obsolete">Не найдена Карта (*.xml) в .vym архиве.
-</translation>
-    </message>
-    <message>
-        <source>The map %1
-did not use the compressed vym file format.
-Writing it uncompressed will also write images 
-and flags and thus may overwrite files in the given directory
-
-Do you want to write the map</source>
-        <translation type="obsolete">The map %1
-did not use the compressed vym file format.
-Writing it uncompressed will also write images 
-and flags and thus may overwrite files in the given directory
-
-Do you want to write the map</translation>
-    </message>
-    <message>
-        <source>compressed (vym default)</source>
-        <translation type="obsolete">compressed (vym default)</translation>
-    </message>
-    <message>
-        <source>uncompressed</source>
-        <translation type="obsolete">uncompressed</translation>
-    </message>
-    <message>
-        <source>Save Error</source>
-        <translation type="obsolete">Ошибка сохранения</translation>
-    </message>
-    <message>
-        <source>%1
-could not be removed before saving</source>
-        <translation type="obsolete">%1 не может быть удалено перед сохранением</translation>
-    </message>
-    <message>
-        <source>%1
-could not be renamed before saving</source>
-        <translation type="obsolete">%1 не может быть удалено перед сохранением</translation>
-    </message>
-    <message>
-        <source>Couldn&apos;t create temporary directory before save
-</source>
-        <translation type="obsolete">Ошибка при создании временной папки перед сохранением
-</translation>
-    </message>
-    <message>
-        <source>Export map as image</source>
-        <translation type="obsolete">Экспортировать Карту как изображение</translation>
-    </message>
-    <message>
-        <source>Export XML to directory</source>
-        <translation type="obsolete">Экспортировать XML в папку</translation>
-    </message>
-    <message>
-        <source>Autosave disabled during undo.</source>
-        <translation type="obsolete">Автосохранение отключено во время &quot;отмены&quot;.</translation>
-    </message>
-    <message>
-        <source>Load background image</source>
-        <translation type="obsolete">Загрузить фоновый рисунок</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <comment>Filedialog</comment>
-        <translation type="obsolete">Текст</translation>
-    </message>
-    <message>
-        <source>Spreadsheet</source>
-        <comment>Filedialog</comment>
-        <translation type="obsolete">Таблица</translation>
-    </message>
-    <message>
-        <source>Textdocument</source>
-        <comment>Filedialog</comment>
-        <translation type="obsolete">Текстовый документ</translation>
-    </message>
-    <message>
-        <source>Images</source>
-        <comment>Filedialog</comment>
-        <translation type="obsolete">Изображение</translation>
-    </message>
-    <message>
-        <source>Set URL to a local file</source>
-        <translation type="obsolete">Задать URL на локальный файл</translation>
-    </message>
-    <message>
-        <source>%1 items on map
-</source>
-        <comment>Info about map</comment>
-        <translation type="obsolete">%1 объектов на карте
-</translation>
-    </message>
-    <message>
-        <source>The file of the map  on disk has changed:
-
-   %1
-
-Do you want to reload that map with the new file?</source>
-        <translation type="obsolete">Файл Карты на диске был изменен:
-
-%1
-
-Вы хотите загрузить изменненую карту с диска?</translation>
-    </message>
-    <message>
-        <source>Reload</source>
-        <translation type="obsolete">Перезагрузить</translation>
-    </message>
-    <message>
-        <source>Ignore</source>
-        <translation type="obsolete">Пропустить</translation>
-    </message>
-    <message>
-        <location filename="../mapeditor.cpp" line="43"/>
+        <location filename="../src/mapeditor.cpp" line="+45"/>
         <source>Map Editor</source>
         <comment>Shortcut scope</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mapeditor.cpp" line="111"/>
-        <location filename="../mapeditor.cpp" line="116"/>
+        <location line="+80"/>
+        <location line="+5"/>
         <source>Edit heading</source>
         <comment>MapEditor</comment>
         <translation type="unfinished">Изменить заголовок</translation>
     </message>
     <message>
-        <source>Save</source>
+        <location line="+446"/>
+        <source>Print vym map</source>
         <comment>MapEditor</comment>
-        <translation type="obsolete">Сохранить</translation>
-    </message>
-    <message>
-        <source>Cu&amp;t</source>
-        <comment>Edit menu</comment>
-        <translation type="obsolete">Выреза&amp;ть</translation>
-    </message>
-    <message>
-        <source>&amp;Copy</source>
-        <comment>Edit menu</comment>
-        <translation type="obsolete">&amp;Копировать</translation>
-    </message>
-    <message>
-        <source>&amp;Undo</source>
-        <comment>Edit menu</comment>
-        <translation type="obsolete">&amp;Отменить</translation>
-    </message>
-    <message>
-        <source>&amp;Redo</source>
-        <comment>Edit menu</comment>
-        <translation type="obsolete">&amp;Вернуть</translation>
-    </message>
-    <message>
-        <source>&amp;Paste</source>
-        <comment>Edit menu</comment>
-        <translation type="obsolete">&amp;Вставить</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mapeditor.cpp" line="510"/>
-        <source>Print vym map</source>
-        <comment>MapEditor</comment>
+        <location line="+1669"/>
+        <source>%1 items selected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEditor</name>
     <message>
-        <location filename="../noteeditor.cpp" line="13"/>
+        <location filename="../src/noteeditor.cpp" line="+13"/>
         <source>Note Editor</source>
-        <comment>Window caption</comment>
+        <comment>Name of editor shown as window title</comment>
         <translation type="unfinished">Редактор Заметок</translation>
     </message>
 </context>
-<context>
-    <name>Process</name>
-    <message>
-        <source>Critical Error</source>
-        <translation type="obsolete">Критическая ошибка</translation>
-    </message>
-    <message>
-        <source>Could not start %1</source>
-        <translation type="obsolete">Ошибка при запуске %1</translation>
-    </message>
-    <message>
-        <source>%1 didn&apos;t exit normally</source>
-        <translation type="obsolete">%1 завершился с ошибкой</translation>
-    </message>
-</context>
 <context>
     <name>QObject</name>
     <message>
-        <source>This is not an image.</source>
-        <translation type="obsolete">Это не файл изображения.</translation>
-    </message>
-    <message>
-        <location filename="../exports.cpp" line="235"/>
-        <location filename="../exports.cpp" line="381"/>
-        <location filename="../exports.cpp" line="511"/>
-        <location filename="../exports.cpp" line="954"/>
-        <location filename="../exports.cpp" line="1048"/>
-        <location filename="../exports.cpp" line="1128"/>
-        <location filename="../exports.cpp" line="1236"/>
-        <location filename="../exports.cpp" line="1308"/>
-        <location filename="../exports.cpp" line="1333"/>
-        <location filename="../exports.cpp" line="1343"/>
-        <location filename="../exports.cpp" line="1362"/>
-        <location filename="../exports.cpp" line="1369"/>
-        <location filename="../exports.cpp" line="1376"/>
+        <location filename="../src/export-ao.cpp" line="+14"/>
+        <source>Export as AO report</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location filename="../src/export-ascii.cpp" line="+21"/>
+        <location filename="../src/export-confluence.cpp" line="+355"/>
+        <location filename="../src/export-csv.cpp" line="+21"/>
+        <location filename="../src/export-firefox.cpp" line="+68"/>
+        <location filename="../src/export-html.cpp" line="+350"/>
+        <location filename="../src/export-impress.cpp" line="+55"/>
+        <location line="+73"/>
+        <location line="+34"/>
+        <location line="+12"/>
+        <location line="+21"/>
+        <location line="+8"/>
+        <location line="+9"/>
+        <location filename="../src/export-latex.cpp" line="+52"/>
+        <location filename="../src/export-markdown.cpp" line="+21"/>
+        <location filename="../src/export-orgmode.cpp" line="+22"/>
         <source>Critical Export Error</source>
         <translation>Критическая ошибка Экспорта</translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="956"/>
-        <location filename="../exports.cpp" line="1308"/>
+        <location filename="../src/export-confluence.cpp" line="+2"/>
+        <location filename="../src/export-html.cpp" line="+2"/>
+        <location filename="../src/export-impress.cpp" line="-83"/>
         <source>Could not write %1</source>
         <translation>Ошибка при записи %1</translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="147"/>
+        <location filename="../src/export-base.cpp" line="+124"/>
         <source>Exporting to %1 will overwrite the existing file:
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="146"/>
+        <location line="-2"/>
         <source>Warning: Overwriting file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="503"/>
+        <location filename="../src/export-csv.cpp" line="-8"/>
         <source>Export as CSV</source>
         <translation type="unfinished">Экспортировать в CVS</translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="837"/>
+        <location filename="../src/export-confluence.cpp" line="-59"/>
+        <location filename="../src/export-html.cpp" line="-93"/>
         <source>Contents:</source>
         <comment>Used in HTML export</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="893"/>
+        <location filename="../src/export-html.cpp" line="+54"/>
         <source>Export aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not open %1</source>
-        <comment>ExportHTML</comment>
-        <translation type="obsolete">Ошибка при открытии %1</translation>
-    </message>
-    <message>
-        <source>Could not open %1</source>
-        <translation type="obsolete">Ошибка при открытии %1</translation>
-    </message>
-    <message>
-        <location filename="../exports.cpp" line="934"/>
+        <location line="+114"/>
         <source>Trying to create directory for flags:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="935"/>
+        <location line="+1"/>
         <source>Could not create %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="909"/>
-        <location filename="../exports.cpp" line="933"/>
-        <location filename="../exports.cpp" line="944"/>
+        <location line="-101"/>
+        <location line="+99"/>
         <source>Critical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="235"/>
+        <location filename="../src/export-ao.cpp" line="+1"/>
         <source>Could not export as AO to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="381"/>
+        <location filename="../src/export-ascii.cpp" line="+1"/>
         <source>Could not export as ASCII to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="511"/>
+        <location filename="../src/export-csv.cpp" line="+9"/>
         <source>Could not export as CSV to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="910"/>
+        <location filename="../src/export-html.cpp" line="-367"/>
+        <location line="+20"/>
+        <source>Flag: %1</source>
+        <comment>Alt tag in HTML export</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Flag: url</source>
+        <comment>Alt tag in HTML export</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>Image: %1</source>
+        <comment>Alt tag in HTML export</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+190"/>
         <source>Could not find stylesheet %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="920"/>
+        <location line="+10"/>
         <source>Error</source>
         <comment>ExportHTML</comment>
         <translation type="unfinished">Ошибка</translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="921"/>
+        <location line="+1"/>
         <source>Could not copy
 %1 to
 %2</source>
@@ -3829,230 +2957,192 @@ Do you want to reload that map with the new file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="945"/>
-        <source>Could not copy %1 to %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../exports.cpp" line="955"/>
+        <location filename="../src/export-confluence.cpp" line="+58"/>
+        <location filename="../src/export-html.cpp" line="+12"/>
         <source>Trying to save HTML file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="236"/>
-        <location filename="../exports.cpp" line="382"/>
-        <location filename="../exports.cpp" line="512"/>
-        <location filename="../exports.cpp" line="957"/>
-        <location filename="../exports.cpp" line="1049"/>
-        <location filename="../exports.cpp" line="1130"/>
-        <location filename="../exports.cpp" line="1309"/>
+        <location filename="../src/export-ao.cpp" line="+1"/>
+        <location filename="../src/export-ascii.cpp" line="+1"/>
+        <location filename="../src/export-csv.cpp" line="+1"/>
+        <location filename="../src/export-firefox.cpp" line="+2"/>
+        <location filename="../src/export-html.cpp" line="+2"/>
+        <location filename="../src/export-impress.cpp" line="+1"/>
+        <location filename="../src/export-latex.cpp" line="+2"/>
+        <location filename="../src/export-markdown.cpp" line="+2"/>
+        <location filename="../src/export-orgmode.cpp" line="+2"/>
         <source>Export failed.</source>
         <translation>Ошибка Экспорта.</translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="1048"/>
+        <location filename="../src/export-orgmode.cpp" line="-1"/>
         <source>Could not export as OrgMode to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="1129"/>
+        <location filename="../src/export-latex.cpp" line="-1"/>
         <source>Could not export as LaTeX to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="1189"/>
+        <location filename="../src/export-impress.cpp" line="-116"/>
         <source>Export as LibreOffice Impress presentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="1236"/>
+        <location line="+42"/>
         <source>No objects in map!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="1333"/>
+        <location line="+107"/>
         <source>Couldn&apos;t read settings from &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="1343"/>
+        <location line="+12"/>
         <source>Check &quot;%1&quot; in
 %2</source>
         <translation>Проверьте &quot;%1&quot; в %2</translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="1362"/>
-        <location filename="../exports.cpp" line="1369"/>
-        <location filename="../exports.cpp" line="1376"/>
+        <location line="+21"/>
+        <location line="+8"/>
+        <location line="+9"/>
         <source>Could not read %1</source>
         <translation>Ошибка при чтении %1</translation>
     </message>
     <message>
-        <location filename="../file.cpp" line="257"/>
-        <location filename="../file.cpp" line="272"/>
-        <location filename="../file.cpp" line="296"/>
-        <location filename="../file.cpp" line="305"/>
-        <location filename="../file.cpp" line="313"/>
-        <location filename="../file.cpp" line="323"/>
-        <location filename="../file.cpp" line="332"/>
-        <location filename="../file.cpp" line="340"/>
-        <location filename="../file.cpp" line="347"/>
-        <location filename="../file.cpp" line="356"/>
-        <location filename="../file.cpp" line="377"/>
-        <location filename="../file.cpp" line="400"/>
-        <location filename="../file.cpp" line="410"/>
-        <location filename="../file.cpp" line="423"/>
-        <location filename="../main.cpp" line="411"/>
-        <location filename="../xsltproc.cpp" line="78"/>
-        <location filename="../xsltproc.cpp" line="84"/>
+        <location filename="../src/file.cpp" line="+282"/>
+        <location line="+22"/>
+        <location line="+14"/>
+        <location line="+50"/>
+        <location line="+13"/>
+        <location line="+8"/>
+        <location line="+10"/>
+        <location line="+9"/>
+        <location line="+10"/>
+        <location line="+9"/>
+        <location line="+13"/>
+        <location line="+32"/>
+        <location line="+11"/>
+        <location filename="../src/main.cpp" line="+449"/>
+        <location line="+8"/>
+        <location filename="../src/xsltproc.cpp" line="+62"/>
+        <location line="+6"/>
         <source>Critical Error</source>
         <translation>Критическая ошибка</translation>
     </message>
     <message>
-        <location filename="../file.cpp" line="258"/>
+        <location line="-200"/>
         <source>Couldn&apos;t move existing file out of the way before saving.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../file.cpp" line="273"/>
-        <location filename="../file.cpp" line="378"/>
-        <source>Couldn&apos;t start tool to decompress data.</source>
+        <location line="+22"/>
+        <location line="+64"/>
+        <source>Couldn&apos;t start %1 tool to compress data!
+The map could not be saved, please check if backup file is available or export as XML file!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../file.cpp" line="297"/>
-        <source>Couldn&apos;t start zip to compress data.</source>
-        <translation>Ошибка при запуске zip для сжатия данных.</translation>
-    </message>
-    <message>
-        <location filename="../file.cpp" line="306"/>
+        <location line="-50"/>
+        <location line="+63"/>
         <source>zip didn&apos;t exit normally</source>
         <translation>&quot;zip&quot; завершился с ошибкой</translation>
     </message>
     <message>
-        <location filename="../file.cpp" line="324"/>
+        <location line="+18"/>
         <source>Couldn&apos;t rename %1 back to %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../file.cpp" line="333"/>
+        <location line="+9"/>
         <source>Couldn&apos;t remove target of old symbolic link %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../file.cpp" line="341"/>
+        <location line="+10"/>
         <source>Couldn&apos;t rename output to target of old symbolic link %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../file.cpp" line="348"/>
+        <location line="+9"/>
         <source>Couldn&apos;t link from %1 to target of old symbolic link %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../file.cpp" line="357"/>
+        <location line="+13"/>
         <source>Saved %1, but couldn&apos;t remove %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../file.cpp" line="401"/>
-        <source>Couldn&apos;t start unzip to decompress data.</source>
-        <translation>Ошибка при запуске unzip для распаковки данных.</translation>
-    </message>
-    <message>
-        <location filename="../file.cpp" line="411"/>
-        <source>unzip didn&apos;t exit normally</source>
-        <translation>unzip завершился с ошибкой</translation>
+        <location line="+32"/>
+        <source>Couldn&apos;t start %1 tool to decompress data!
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsltproc.cpp" line="79"/>
+        <location filename="../src/xsltproc.cpp" line="-5"/>
         <source>Could not start %1</source>
         <translation>Ошибка при запуске %1</translation>
     </message>
     <message>
-        <location filename="../xsltproc.cpp" line="85"/>
+        <location filename="../src/file.cpp" line="+11"/>
+        <location filename="../src/xsltproc.cpp" line="+6"/>
         <source>%1 didn&apos;t exit normally</source>
         <translation>%1 завершился с ошибкой</translation>
     </message>
     <message>
-        <source>The file %1 exists already.
-Do you want to overwrite it?</source>
-        <translation type="obsolete">Файл %1 уже существует.
-Перезаписать ?</translation>
-    </message>
-    <message>
-        <location filename="../file.cpp" line="90"/>
+        <location line="-389"/>
         <source>Overwrite</source>
         <translation>Перезаписать</translation>
     </message>
     <message>
-        <location filename="../file.cpp" line="91"/>
+        <location line="+1"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <source>Sorry, no preview for
-multiple selected files.</source>
-        <translation type="obsolete">Предпросмотр для нескольких выбранных файлов невозможен.</translation>
-    </message>
-    <message>
-        <location filename="../exports.cpp" line="560"/>
-        <location filename="../exports.cpp" line="590"/>
-        <source>Exporting the %1 bookmarks will overwrite
-your existing bookmarks file.</source>
-        <translation>Экспорт закладок %1 перезапишет 
-ваш существующий файл закладок.</translation>
-    </message>
-    <message>
-        <location filename="../exports.cpp" line="561"/>
-        <location filename="../exports.cpp" line="591"/>
-        <source>Warning: Overwriting %1 bookmarks</source>
-        <translation>Предупреждение: Перезапись закладок %1</translation>
-    </message>
-    <message>
-        <location filename="../exports.cpp" line="579"/>
-        <location filename="../macros.cpp" line="39"/>
-        <location filename="../main.cpp" line="377"/>
+        <location filename="../src/macros.cpp" line="+46"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="580"/>
-        <source>Couldn&apos;t find script %1
-to notifiy Browsers of changed bookmarks.</source>
-        <translation>Сценарий %1
-для уведомления браузера о изменении
-закладок не найден.</translation>
-    </message>
-    <message>
-        <location filename="../exports.cpp" line="56"/>
-        <location filename="../imports.cpp" line="18"/>
-        <location filename="../main.cpp" line="475"/>
-        <location filename="../scripteditor.cpp" line="77"/>
-        <location filename="../scripteditor.cpp" line="96"/>
+        <location filename="../src/export-base.cpp" line="-59"/>
+        <location filename="../src/file.cpp" line="+238"/>
+        <location line="+11"/>
+        <location line="+154"/>
+        <location line="+10"/>
+        <location filename="../src/imports.cpp" line="+41"/>
+        <location filename="../src/main.cpp" line="+62"/>
+        <location line="+15"/>
+        <location filename="../src/scripteditor.cpp" line="+148"/>
+        <location line="+26"/>
+        <location line="+17"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="57"/>
-        <location filename="../imports.cpp" line="19"/>
+        <location line="+1"/>
+        <location filename="../src/imports.cpp" line="+1"/>
         <source>Couldn&apos;t access temporary directory
 </source>
         <translation>Невозможно получить доступ к временной папке</translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="223"/>
-        <location filename="../exports.cpp" line="373"/>
+        <location filename="../src/export-ascii.cpp" line="-10"/>
         <source>Export as ASCII</source>
         <translation>Экспортировать в ASCII</translation>
     </message>
     <message>
-        <location filename="../exports.cpp" line="223"/>
+        <location filename="../src/export-ao.cpp" line="-14"/>
         <source>(still experimental)</source>
         <translation>(still experimental)</translation>
     </message>
     <message>
-        <location filename="../file.cpp" line="84"/>
+        <location filename="../src/file.cpp" line="-422"/>
         <source>The directory %1 is not empty.
 Do you risk to overwrite its contents?</source>
         <comment>write directory</comment>
@@ -4060,354 +3150,329 @@ Do you risk to overwrite its contents?</source>
 Возможно приведет к утере важной информации.Перезаписать? </translation>
     </message>
     <message>
-        <source>Couldn&apos;t open %1.
-</source>
-        <translation type="obsolete">Ошибка при открытии %1.</translation>
+        <location filename="../src/xml-vym.cpp" line="+77"/>
+        <source>Warning: Version Problem</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note Editor</source>
-        <comment>Shortcut group</comment>
-        <translation type="obsolete">Редактор Заметок</translation>
+        <location line="+1"/>
+        <source>&lt;h3&gt;Map is newer than VYM&lt;/h3&gt;&lt;p&gt;The map you are just trying to load was saved using vym %1. The version of this vym is %2. If you run into problems after pressing the ok-button below, updating vym should help.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="412"/>
-        <source>Couldn&apos;t find tool to unzip data. Please download and install 7z and set path in Settings menu:
- </source>
+        <location line="+9"/>
+        <source>&lt;p&gt;The map will be opened readonly, because not all information from new maps can be saved with this version of vym. Please be careful!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="476"/>
-        <location filename="../scripteditor.cpp" line="78"/>
-        <source>Couldn&apos;t open &quot;%1&quot;
-%2.</source>
+        <location filename="../src/macros.cpp" line="+1"/>
+        <source>Couldn&apos;t find macros at  %1.
+</source>
+        <comment>Macros::pathExists</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="3792"/>
-        <source>No Bugzilla client found.  For openSUSE you can install by (running as root):
-
-</source>
-        <comment>VymModel, how to install Bugzilla client module</comment>
+        <location line="+1"/>
+        <source>Please use Settings-&gt;</source>
+        <translation type="unfinished"> Используйте пункт &quot;Настройки&quot;-&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set directory for vym macros</source>
+        <translation type="unfinished">Установить папку для vym-макросов</translation>
+    </message>
+    <message>
+        <location filename="../src/export-markdown.cpp" line="-10"/>
+        <source>Export as Markdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="3797"/>
-        <source>Alternatively you can also add the repository
-and install the perl module for Bugzilla access using YaST</source>
-        <comment>VymModel, how to install Bugzilla client module</comment>
+        <location line="+9"/>
+        <source>Could not export as Markdown to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="3800"/>
-        <source>Warning: Couldn&apos;t find Bugzilla client</source>
-        <comment>VymModel</comment>
+        <location filename="../src/main.cpp" line="-84"/>
+        <source>Couldn&apos;t find tool to unzip data,or your Windows version is older than Windows 10.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xml-vym.cpp" line="80"/>
-        <source>Warning: Version Problem</source>
+        <location line="+8"/>
+        <source>Couldn&apos;t find tool to zip/unzip data. Please install on your platform and setpath in Settings menu:
+ </source>
+        <comment>zip tool missing on Linux/Mac platform</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xml-vym.cpp" line="81"/>
-        <source>&lt;h3&gt;Map is newer than VYM&lt;/h3&gt;&lt;p&gt;The map you are just trying to load was saved using vym %1. The version of this vym is %2. If you run into problems after pressing the ok-button below, updating vym should help.&lt;/p&gt;</source>
+        <location line="+62"/>
+        <location line="+15"/>
+        <source>Couldn&apos;t open &quot;%1&quot;
+.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../macros.cpp" line="40"/>
-        <source>Couldn&apos;t find a macro at  %1.
-</source>
-        <translation type="unfinished">Couldn&apos;t find a macro at  %1.
-</translation>
+        <location filename="../src/scripteditor.cpp" line="-42"/>
+        <source>Couldn&apos;t write macros to &quot;%1&quot;
+.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../macros.cpp" line="41"/>
-        <source>Please use Settings-&gt;</source>
-        <translation type="unfinished"> Используйте пункт &quot;Настройки&quot;-&gt;</translation>
+        <location line="+27"/>
+        <source>Couldn&apos;t read script from &quot;%1&quot;
+.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../macros.cpp" line="41"/>
-        <source>Set directory for vym macros</source>
-        <translation type="unfinished">Установить папку для vym-макросов</translation>
+        <location line="+16"/>
+        <source>Couldn&apos;t write script to &quot;%1&quot;
+.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../scripteditor.cpp" line="96"/>
-        <source>Couldn&apos;t save &quot;%1&quot;</source>
+        <location filename="../src/export-firefox.cpp" line="-55"/>
+        <source>Export as Firefox bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ScriptEditor</name>
     <message>
-        <location filename="../scripteditor.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished">Форма</translation>
+        <location line="+54"/>
+        <source>Could not export as Firefox bookmarks to %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../scripteditor.ui" line="49"/>
-        <source>Tab 1</source>
+        <location filename="../src/imports.cpp" line="+26"/>
+        <source>Import Firefox bookmarks</source>
+        <comment>Import dialog</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../scripteditor.ui" line="55"/>
-        <source>Save to selected slide</source>
+        <location line="+2"/>
+        <source>Loading bookmarks:</source>
+        <comment>Progress dialog while importing bookmarks</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../scripteditor.ui" line="91"/>
-        <location filename="../scripteditor.ui" line="145"/>
-        <source>Run</source>
-        <translation type="unfinished">Выполнить</translation>
+        <location line="+26"/>
+        <source>Imported %1 bookmarks</source>
+        <comment>Import dialog</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../scripteditor.ui" line="105"/>
-        <source>Tab 2</source>
+        <location filename="../src/mainwindow.cpp" line="-3021"/>
+        <source>Existing lockfiles have been ignored for the maps listed below. Please check, if the maps might be openend in another instance of vym:
+
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../scripteditor.ui" line="121"/>
-        <source>Current key:</source>
+        <location filename="../src/vymmodel.cpp" line="+4099"/>
+        <source>JIRA agent not setup.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ScriptEditor</name>
+    <message>
+        <source>Form</source>
+        <translation type="obsolete">Форма</translation>
+    </message>
+    <message>
+        <source>Reload</source>
+        <translation type="obsolete">Перезагрузить</translation>
+    </message>
+    <message>
+        <source>Save as</source>
+        <translation type="obsolete">Сохранить как</translation>
+    </message>
     <message>
-        <location filename="../scripteditor.ui" line="131"/>
-        <source>Load</source>
-        <translation type="unfinished"></translation>
+        <source>Run</source>
+        <translation type="obsolete">Выполнить</translation>
     </message>
     <message>
-        <location filename="../scripteditor.ui" line="138"/>
         <source>Save</source>
-        <translation type="unfinished">Сохранить</translation>
+        <translation type="obsolete">Сохранить</translation>
     </message>
     <message>
-        <location filename="../scripteditor.cpp" line="111"/>
-        <location filename="../scripteditor.cpp" line="117"/>
+        <location filename="../src/scripteditor.cpp" line="-88"/>
+        <location line="+7"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../scripteditor.cpp" line="45"/>
+        <location line="-42"/>
         <source>Slide</source>
         <comment>Mode in scriptEditor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../scripteditor.cpp" line="46"/>
+        <location line="+1"/>
         <source>Macro</source>
         <comment>Mode in scriptEditor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../scripteditor.cpp" line="65"/>
-        <source>Save</source>
-        <comment>ScriptEditor</comment>
-        <translation type="unfinished">Сохранить</translation>
+        <location line="+1"/>
+        <source>Script</source>
+        <comment>Mode in scriptEditor</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>No script selected</source>
+        <comment>scriptname in scriptEditor</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../scripteditor.cpp" line="111"/>
+        <location line="+31"/>
         <source>Couldn&apos;t get model to save script into slide!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../scripteditor.cpp" line="117"/>
+        <location line="+7"/>
         <source>Couldn&apos;t find slide to save script into slide!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../scripteditor.cpp" line="143"/>
+        <location line="+34"/>
+        <source>Macros saved to %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Script saved to %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>Save script</source>
         <translation type="unfinished">Сохранить сценарий</translation>
     </message>
     <message>
-        <location filename="../scripteditor.cpp" line="155"/>
+        <location line="+9"/>
         <source>The file %1
 exists already.
 Do you want to overwrite it?</source>
         <comment>dialog &apos;save as&apos;</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Файл %1 уже существует. Перезаписать?</translation>
     </message>
     <message>
-        <location filename="../scripteditor.cpp" line="160"/>
+        <location line="+5"/>
         <source>Overwrite</source>
         <translation type="unfinished">Перезаписать</translation>
     </message>
     <message>
-        <location filename="../scripteditor.cpp" line="161"/>
+        <location line="+1"/>
         <source>Cancel</source>
         <translation type="unfinished">Отмена</translation>
     </message>
     <message>
-        <location filename="../scripteditor.cpp" line="184"/>
+        <location line="-58"/>
         <source>Load script</source>
         <translation type="unfinished">Загрузить сценарий</translation>
     </message>
-    <message>
-        <location filename="../scripteditor.cpp" line="194"/>
-        <source>Error</source>
-        <translation type="unfinished">Ошибка</translation>
-    </message>
-    <message>
-        <location filename="../scripteditor.cpp" line="195"/>
-        <source>Couldn&apos;t open %1.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>ShowTextDialog</name>
     <message>
-        <location filename="../showtextdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation>Форма ввода</translation>
+        <translation type="vanished">Форма ввода</translation>
     </message>
     <message>
-        <location filename="../showtextdialog.ui" line="50"/>
         <source>Close</source>
-        <translation>Закрыть</translation>
+        <translation type="vanished">Закрыть</translation>
     </message>
 </context>
 <context>
-    <name>SimpleScriptEditor</name>
-    <message>
-        <source>Save script</source>
-        <translation type="obsolete">Сохранить сценарий</translation>
-    </message>
-    <message>
-        <source>The file %1
-exists already.
-Do you want to overwrite it?</source>
-        <comment>dialog &apos;save as&apos;</comment>
-        <translation type="obsolete">Файл %1
-уже существует.
-Перезаписать?</translation>
-    </message>
-    <message>
-        <source>Overwrite</source>
-        <translation type="obsolete">Перезаписать</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Отмена</translation>
-    </message>
-    <message>
-        <source>Load script</source>
-        <translation type="obsolete">Загрузить сценарий</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="obsolete">Ошибка</translation>
-    </message>
-    <message>
-        <source>Couldn&apos;t open %1.
-</source>
-        <translation type="obsolete">Ошибка при открытии %1.
-</translation>
-    </message>
-    <message>
-        <source>Simple Script Editor</source>
-        <translation type="obsolete">Простой редактор сценариев</translation>
-    </message>
-    <message>
-        <source>Save as</source>
-        <translation type="obsolete">Сохранить как</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Сохранить</translation>
-    </message>
-    <message>
-        <source>Qt::CTRL + Qt::Key_S</source>
-        <translation type="obsolete">Qt::CTRL + Qt::Key_S</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Открыть</translation>
-    </message>
-    <message>
-        <source>Qt::CTRL +Qt::Key_O</source>
-        <translation type="obsolete">Qt::CTRL +Qt::Key_O</translation>
-    </message>
-    <message>
-        <source>Run</source>
-        <translation type="obsolete">Выполнить</translation>
-    </message>
+    <name>TaskEditor</name>
     <message>
-        <source>Qt::CTRL + Qt::Key_R</source>
-        <translation type="obsolete">Qt::CTRL + Qt::Key_R</translation>
+        <location filename="../src/taskeditor.cpp" line="+46"/>
+        <source>Show only tasks from current map</source>
+        <comment>Filters in task Editor</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="obsolete">Закрыть</translation>
+        <location line="+10"/>
+        <source>Show only active tasks</source>
+        <comment>Filters in task Editor</comment>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TaskEditor</name>
     <message>
-        <location filename="../taskeditor.cpp" line="38"/>
-        <source>Current map</source>
-        <comment>TaskEditor</comment>
+        <location line="+9"/>
+        <source>Show only new tasks</source>
+        <comment>Filters in task Editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../taskeditor.cpp" line="45"/>
-        <source>Active tasks</source>
-        <comment>TaskEditor</comment>
+        <location line="+9"/>
+        <source>Show only blocker tasks</source>
+        <comment>Filters in task Editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../taskeditor.cpp" line="52"/>
-        <source>New tasks</source>
-        <comment>TaskEditor</comment>
+        <location line="+9"/>
+        <location line="+10"/>
+        <source>Show only tasks marked with this arrow-up flag</source>
+        <comment>Filters in task Editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../taskeditor.cpp" line="68"/>
-        <location filename="../taskeditor.cpp" line="73"/>
-        <source>Edit heading</source>
-        <comment>TaskEditor</comment>
-        <translation type="unfinished">Изменить заголовок</translation>
+        <location line="+10"/>
+        <source>Show only tasks marked without any arrow-up flag</source>
+        <comment>Filters in task Editor</comment>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskModel</name>
     <message>
-        <location filename="../taskmodel.cpp" line="127"/>
+        <location filename="../src/taskmodel.cpp" line="+208"/>
         <source>Prio</source>
         <comment>TaskEditor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../taskmodel.cpp" line="129"/>
+        <location line="+2"/>
+        <source>Delta</source>
+        <comment>TaskEditor</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Status</source>
         <comment>TaskEditor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../taskmodel.cpp" line="131"/>
+        <location line="+2"/>
         <source>Age total</source>
         <comment>TaskEditor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../taskmodel.cpp" line="133"/>
+        <location line="+2"/>
         <source>Age mod.</source>
         <comment>TaskEditor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../taskmodel.cpp" line="135"/>
+        <location line="+2"/>
         <source>Sleep</source>
         <comment>TaskEditor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../taskmodel.cpp" line="137"/>
+        <location line="+2"/>
         <source>Map</source>
         <comment>TaskEditor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../taskmodel.cpp" line="139"/>
+        <location line="+2"/>
+        <source>Flags</source>
+        <comment>TaskEditor</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Task</source>
         <comment>TaskEditor</comment>
         <translation type="unfinished"></translation>
@@ -4416,328 +3481,257 @@ Do you want to overwrite it?</source>
 <context>
     <name>TextEditor</name>
     <message>
-        <location filename="../texteditor.cpp" line="273"/>
+        <location filename="../src/texteditor.cpp" line="+301"/>
         <source>&amp;Import...</source>
         <translation>&amp;Импортировать...</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="283"/>
+        <location line="+10"/>
         <source>&amp;Export...</source>
         <translation>&amp;Экспортировать...</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="293"/>
+        <location line="+10"/>
         <source>Export &amp;As... (HTML)</source>
         <translation>Экспортировать &amp;как... (HTML)</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="298"/>
+        <location line="+5"/>
         <source>Export &amp;As...(ASCII)</source>
         <translation>Экспортировать &amp;как... (ASСII)</translation>
     </message>
     <message>
-        <source>Print Note</source>
-        <translation type="obsolete">Печать Заметки</translation>
-    </message>
-    <message>
-        <location filename="../texteditor.cpp" line="308"/>
+        <location line="+10"/>
         <source>&amp;Print...</source>
         <translation>&amp;PПечать...</translation>
     </message>
     <message>
-        <source>&amp;Edit</source>
-        <translation type="vanished">&amp;Правка</translation>
-    </message>
-    <message>
-        <location filename="../texteditor.cpp" line="332"/>
+        <location line="+24"/>
         <source>&amp;Undo</source>
         <translation>&amp;Отменить</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="341"/>
+        <location line="+9"/>
         <source>&amp;Redo</source>
         <translation>&amp;Вернуть</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="351"/>
+        <location line="+10"/>
         <source>Select and copy &amp;all</source>
         <translation>Выбрать и копировать &amp;всё</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="359"/>
+        <location line="+8"/>
         <source>&amp;Copy</source>
         <translation>&amp;Копировать</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="368"/>
+        <location line="+9"/>
         <source>Cu&amp;t</source>
         <translation>Выреза&amp;ть</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="377"/>
+        <location line="+9"/>
         <source>&amp;Paste</source>
         <translation>&amp;Вставить</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="316"/>
+        <location line="-61"/>
         <source>&amp;Delete All</source>
         <translation>&amp;Удалить всё</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="49"/>
-        <source>Text Editor</source>
-        <comment>Text Editor Window caption</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../texteditor.cpp" line="271"/>
-        <location filename="../texteditor.cpp" line="325"/>
-        <location filename="../texteditor.cpp" line="389"/>
+        <location line="-45"/>
+        <location line="+54"/>
+        <location line="+64"/>
         <source>Texteditor</source>
         <comment>Shortcuts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="329"/>
+        <location line="-60"/>
         <source>Edi&amp;t</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="390"/>
+        <location line="+62"/>
         <source>Font hints</source>
         <comment>toolbar in texteditor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="396"/>
+        <location line="+6"/>
         <source>&amp;Font hint</source>
         <translation>&amp;Font hint</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="407"/>
+        <location line="+12"/>
         <source>&amp;Richtext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="417"/>
+        <location line="+10"/>
         <source>Fonts</source>
         <comment>toolbar in texteditor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="443"/>
+        <location line="+25"/>
         <source>Format</source>
         <comment>toolbar in texteditor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="448"/>
+        <location line="+5"/>
         <source>&amp;Color...</source>
         <translation>&amp;Цвет...</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="454"/>
+        <location line="+6"/>
         <source>&amp;Bold</source>
         <translation>&amp;Полужирный</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="464"/>
+        <location line="+10"/>
         <source>&amp;Italic</source>
         <translation>&amp;Курсив</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="474"/>
+        <location line="+10"/>
         <source>&amp;Underline</source>
         <translation>&amp;Подчеркивание</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="512"/>
+        <location line="+39"/>
         <source>&amp;Left</source>
         <translation>&amp;Слева</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="518"/>
+        <location line="+6"/>
         <source>C&amp;enter</source>
         <translation>&amp;Центр</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="524"/>
+        <location line="+6"/>
         <source>&amp;Right</source>
         <translation>&amp;Справа</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="530"/>
+        <location line="+6"/>
         <source>&amp;Justify</source>
         <translation>&amp;Растянуть</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="540"/>
+        <location line="+10"/>
         <source>&amp;Settings</source>
         <translation>&amp;Настройки</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="543"/>
+        <location line="+3"/>
         <source>Set &amp;fixed font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="548"/>
+        <location line="+5"/>
         <source>Set &amp;variable font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="553"/>
+        <location line="+5"/>
         <source>&amp;fixed font is default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="704"/>
+        <location line="+198"/>
         <source>Export Note to single file</source>
         <translation>Экспортировать заметки в один файл</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="724"/>
-        <location filename="../texteditor.cpp" line="800"/>
+        <location line="+15"/>
+        <location line="+76"/>
         <source>Overwrite</source>
         <translation>Перезаписать</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="725"/>
-        <location filename="../texteditor.cpp" line="801"/>
+        <location line="-75"/>
+        <location line="+76"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="785"/>
+        <location line="-16"/>
         <source>Export Note to single file (ASCII)</source>
         <translation>Экспортировать Заметку в один файл (ASCII)</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="828"/>
+        <location line="+45"/>
         <source>Print</source>
         <comment>TextEditor</comment>
         <translation type="unfinished">Печать</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="488"/>
+        <location line="-385"/>
         <source>Subs&amp;cript</source>
         <translation>Под&amp;строчный</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="498"/>
+        <location line="+10"/>
         <source>Su&amp;perscript</source>
         <translation>На&amp;дстрочный</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="566"/>
+        <location line="+65"/>
+        <source>Set RichText default background color</source>
+        <comment>TextEditor</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Set RichText default font color</source>
+        <comment>TextEditor</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Note Editor</source>
         <translation>Редактор Заметок</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="392"/>
+        <location line="-186"/>
         <source>F&amp;ormat</source>
         <translation>Ф&amp;ормат</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="326"/>
+        <location line="-67"/>
         <source>Edit Actions</source>
         <translation>Edit Actions</translation>
     </message>
     <message>
-        <source>Format Actions</source>
-        <translation type="obsolete">Format Actions</translation>
-    </message>
-    <message>
-        <location filename="../texteditor.cpp" line="267"/>
+        <location line="-59"/>
         <source>Note Actions</source>
         <translation>Note Actions</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="48"/>
+        <location line="-244"/>
         <source>Ready</source>
         <comment>Statusbar message</comment>
         <translation>Готово</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="174"/>
+        <location line="+161"/>
         <source>No filename available for this note.</source>
         <comment>Statusbar message</comment>
         <translation>Не задано имя файла для текущей заметки.</translation>
     </message>
     <message>
-        <source>Note Editor</source>
-        <comment>Window caption</comment>
-        <translation type="obsolete">Редактор Заметок</translation>
-    </message>
-    <message>
-        <location filename="../texteditor.cpp" line="269"/>
+        <location line="+85"/>
         <source>&amp;Note</source>
         <comment>Menubar</comment>
         <translation>Заме&amp;тка</translation>
     </message>
     <message>
-        <source>Import</source>
-        <comment>Status tip for Note menu</comment>
-        <translation type="obsolete">Импортировать</translation>
-    </message>
-    <message>
-        <source>Export Note (HTML)</source>
-        <comment>Status tip for Note menu</comment>
-        <translation type="obsolete">Экспортировать заметки (HTML)</translation>
-    </message>
-    <message>
-        <source>Export Note As (HTML) </source>
-        <comment>Status tip for Note Menu</comment>
-        <translation type="obsolete">Экспортировать заметки как (HTML)</translation>
-    </message>
-    <message>
-        <source>Export Note As (ASCII) </source>
-        <comment>Status tip for note menu</comment>
-        <translation type="obsolete">Экспортировать заметки как (ASCII)</translation>
-    </message>
-    <message>
-        <source>Print Note</source>
-        <comment>Status tip for note menu</comment>
-        <translation type="obsolete">Печать Заметок</translation>
-    </message>
-    <message>
-        <source>Undo</source>
-        <comment>Status tip for note menu</comment>
-        <translation type="obsolete">Отменить</translation>
-    </message>
-    <message>
-        <source>Redo</source>
-        <comment>Status tip for note menu</comment>
-        <translation type="obsolete">Вернуть</translation>
-    </message>
-    <message>
-        <source>Select and copy all</source>
-        <comment>Status tip for note menu</comment>
-        <translation type="obsolete">Выбрать и копировать всё</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <comment>Status tip for note menu</comment>
-        <translation type="obsolete">Копировать</translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <comment>Status tip for note menu</comment>
-        <translation type="obsolete">Вырезать</translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <comment>Status tip for note menu</comment>
-        <translation type="obsolete">Вставить</translation>
-    </message>
-    <message>
-        <source>Delete all</source>
-        <comment>Status tip for note menu</comment>
-        <translation type="obsolete">Удалить всё</translation>
-    </message>
-    <message>
-        <location filename="../texteditor.cpp" line="719"/>
-        <location filename="../texteditor.cpp" line="795"/>
+        <location line="+494"/>
+        <location line="+76"/>
         <source>The file %1
 exists already.
 Do you want to overwrite it?</source>
@@ -4745,7 +3739,7 @@ Do you want to overwrite it?</source>
         <translation type="unfinished">Файл %1 уже существует. Перезаписать?</translation>
     </message>
     <message>
-        <location filename="../texteditor.cpp" line="743"/>
+        <location line="-51"/>
         <source>Couldn&apos;t export note </source>
         <comment>dialog &apos;save note as&apos;</comment>
         <translation>Ошибка при экспорте Заметок</translation>
@@ -4754,13 +3748,13 @@ Do you want to overwrite it?</source>
 <context>
     <name>TreeEditor</name>
     <message>
-        <location filename="../treeeditor.cpp" line="27"/>
+        <location filename="../src/treeeditor.cpp" line="+34"/>
         <source>Select upper object</source>
         <comment>Tree Editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../treeeditor.cpp" line="33"/>
+        <location line="+6"/>
         <source>Select lower object</source>
         <comment>Tree Editor</comment>
         <translation type="unfinished"></translation>
@@ -4769,142 +3763,137 @@ Do you want to overwrite it?</source>
 <context>
     <name>VymModel</name>
     <message>
-        <location filename="../vymmodel.cpp" line="126"/>
+        <location filename="../src/vymmodel.cpp" line="-3958"/>
         <source>unknown user</source>
         <comment>default name for map author in settings</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="149"/>
+        <location line="+25"/>
         <source>unnamed</source>
         <translation type="unfinished">vym-map</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="445"/>
-        <location filename="../vymmodel.cpp" line="481"/>
-        <location filename="../vymmodel.cpp" line="566"/>
-        <location filename="../vymmodel.cpp" line="622"/>
+        <location line="+324"/>
+        <location line="+33"/>
+        <location line="+82"/>
+        <location line="+61"/>
         <source>Critical Parse Error</source>
         <translation type="unfinished">Критическая ошибка Разбора</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="501"/>
-        <location filename="../vymmodel.cpp" line="551"/>
+        <location line="-124"/>
+        <location line="+48"/>
         <source>Critical Load Error</source>
         <translation type="unfinished">Критическая ошибка Загрузки</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="502"/>
+        <location line="-47"/>
         <source>Couldn&apos;t create temporary directory before load
 </source>
         <translation type="unfinished">Ошибка при создании временной папки перед загрузкой</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="552"/>
+        <location line="+48"/>
         <source>Couldn&apos;t find a map (*.xml) in .vym archive.
 </source>
         <translation type="unfinished">Не найдена Карта (*.xml) в .vym архиве.
 </translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="980"/>
+        <location line="+122"/>
+        <source>The map %1
+did not use the compressed vym file format.
+Writing it uncompressed will also write images 
+and flags and thus may overwrite files into the given directory
+
+Do you want to write the map</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>uncompressed, potentially overwrite existing data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+325"/>
         <source>unknown user</source>
         <comment>Default for lockfiles of maps</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="1003"/>
+        <location line="+37"/>
         <source>Warning: Map already opended</source>
         <comment>VymModel</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="671"/>
-        <source>The map %1
-did not use the compressed vym file format.
-Writing it uncompressed will also write images 
-and flags and thus may overwrite files in the given directory
-
-Do you want to write the map</source>
-        <translation type="unfinished">The map %1
-did not use the compressed vym file format.
-Writing it uncompressed will also write images 
-and flags and thus may overwrite files in the given directory
-
-Do you want to write the map</translation>
-    </message>
-    <message>
-        <location filename="../vymmodel.cpp" line="679"/>
+        <location line="-365"/>
         <source>compressed (vym default)</source>
         <translation type="unfinished">compressed (vym default)</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="680"/>
-        <source>uncompressed</source>
-        <translation type="unfinished">uncompressed</translation>
-    </message>
-    <message>
-        <location filename="../vymmodel.cpp" line="681"/>
-        <location filename="../vymmodel.cpp" line="864"/>
+        <location line="+4"/>
+        <location line="+201"/>
         <source>Cancel</source>
         <translation type="unfinished">Отмена</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="710"/>
-        <location filename="../vymmodel.cpp" line="715"/>
+        <location line="-175"/>
+        <location line="+7"/>
         <source>Save Error</source>
         <translation type="unfinished">Ошибка сохранения</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="711"/>
+        <location line="-6"/>
         <source>%1
 could not be removed before saving</source>
         <translation type="unfinished">%1 не может быть удалено перед сохранением</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="716"/>
+        <location line="+7"/>
         <source>%1
 could not be renamed before saving</source>
         <translation type="unfinished">%1 не может быть удалено перед сохранением</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="728"/>
+        <location line="+13"/>
         <source>Critical Save Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="729"/>
+        <location line="+1"/>
         <source>Couldn&apos;t create temporary directory before save
 </source>
         <translation type="unfinished">Ошибка при создании временной папки перед сохранением
 </translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="787"/>
-        <location filename="../vymmodel.cpp" line="840"/>
-        <location filename="../vymmodel.cpp" line="5783"/>
+        <location line="+71"/>
+        <location line="+61"/>
+        <location line="+4218"/>
         <source>Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="787"/>
-        <location filename="../vymmodel.cpp" line="840"/>
+        <location line="-4276"/>
+        <location line="+60"/>
         <source>All</source>
         <comment>Filedialog</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="792"/>
+        <location line="-56"/>
         <source>Load image</source>
         <translation type="unfinished">Загрузить изображение</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="844"/>
+        <location line="+59"/>
         <source>Save image</source>
         <translation type="unfinished">Сохранить изображение</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="856"/>
+        <location line="+7"/>
         <source>The file %1 exists already.
 Do you want to overwrite it?</source>
         <translation type="unfinished">Файл %1
@@ -4912,45 +3901,39 @@ Do you want to overwrite it?</source>
 Перезаписать? {1 ?}</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="863"/>
+        <location line="+8"/>
         <source>Overwrite</source>
         <translation type="unfinished">Перезаписать</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="878"/>
-        <location filename="../vymmodel.cpp" line="880"/>
-        <location filename="../vymmodel.cpp" line="5200"/>
+        <location line="+13"/>
+        <location line="+3543"/>
         <source>Critical Error</source>
         <translation type="unfinished">Критическая ошибка</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="878"/>
-        <source>Unsupported format in %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../vymmodel.cpp" line="880"/>
+        <location line="-3542"/>
         <source>Couldn&apos;t save %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="910"/>
+        <location line="+28"/>
         <source>Critical Import Error</source>
         <translation type="unfinished">Критическая ошибка Импорта</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="910"/>
+        <location line="+1"/>
         <source>Cannot find the directory %1</source>
         <translation type="unfinished">Папка %1 не найдена</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="962"/>
-        <location filename="../vymmodel.cpp" line="965"/>
+        <location line="+50"/>
+        <location line="+4"/>
         <source>Choose directory structure to import</source>
         <translation type="unfinished">Выберите структуруа папок для экспорта</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="999"/>
+        <location line="+55"/>
         <source>Map seems to be already opened in another vym instance!
 
  Map is locked by &quot;%1&quot; on &quot;%2&quot;
@@ -4959,30 +3942,42 @@ Please only delete the lockfile, if you are sure nobody else is currently workin
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="1008"/>
+        <location line="+3052"/>
+        <source>Could not find Jira ticket pattern in %1</source>
+        <comment>VymModel</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Contacting Jira...</source>
+        <comment>VymModel</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-3104"/>
         <source>Removed lockfile for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="1014"/>
+        <location line="+56"/>
         <source>Couldn&apos;t remove lockfile for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="1021"/>
+        <location line="+14"/>
         <source>Cannot create lockfile of map! It will be opened in readonly mode.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="1024"/>
+        <location line="+3"/>
         <source>Warning</source>
         <comment>VymModel</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="1116"/>
+        <location line="+104"/>
         <source>The file of the map  on disk has changed:
 
    %1
@@ -4995,141 +3990,93 @@ Do you want to reload that map with the new file?</source>
 Вы хотите загрузить изменненую карту с диска?</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="1123"/>
+        <location line="+8"/>
         <source>Reload</source>
         <translation type="unfinished">Перезагрузить</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="1124"/>
+        <location line="+1"/>
         <source>Ignore</source>
         <translation type="unfinished">Пропустить</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="1013"/>
-        <location filename="../vymmodel.cpp" line="1239"/>
-        <location filename="../vymmodel.cpp" line="5148"/>
+        <location line="-131"/>
+        <location line="+3009"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="1239"/>
-        <source>Redo failed:
-%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../vymmodel.cpp" line="1274"/>
+        <location line="-2684"/>
         <source>Autosave disabled during undo.</source>
         <translation type="unfinished">Автосохранение отключено во время &quot;отмены&quot;.</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="2001"/>
+        <location line="+748"/>
         <source>Note</source>
         <comment>FindAll in VymModel</comment>
         <translation type="unfinished">Заметки</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="2725"/>
-        <source>Image</source>
-        <comment>Default name for new image</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../vymmodel.cpp" line="2958"/>
+        <location line="+1026"/>
         <source>New map</source>
         <comment>New map</comment>
         <translation type="unfinished">Новая Карта</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="5148"/>
-        <source>Script aborted:
-%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter URL:</source>
-        <translation type="obsolete">Введите URL:</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <comment>Filedialog</comment>
-        <translation type="obsolete">Текст</translation>
-    </message>
-    <message>
-        <source>Spreadsheet</source>
-        <comment>Filedialog</comment>
-        <translation type="obsolete">Таблица</translation>
-    </message>
-    <message>
-        <source>Textdocument</source>
-        <comment>Filedialog</comment>
-        <translation type="obsolete">Текстовый документ</translation>
-    </message>
-    <message>
-        <source>Set URL to a local file</source>
-        <translation type="obsolete">Задать URL на локальный файл</translation>
-    </message>
-    <message>
-        <location filename="../vymmodel.cpp" line="3822"/>
-        <source>Contacting Bugzilla...</source>
-        <comment>VymModel</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link to another map</source>
-        <translation type="obsolete">Ссылка на другую Карту</translation>
-    </message>
-    <message>
-        <location filename="../vymmodel.cpp" line="5185"/>
+        <location line="+1273"/>
         <source>Export map as image</source>
         <translation type="unfinished">Экспортировать Карту как изображение</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="5200"/>
+        <location line="+19"/>
         <source>Couldn&apos;t save QImage %1 in format %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="5225"/>
+        <location line="+24"/>
         <source>Export map as PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="5280"/>
+        <location line="+55"/>
         <source>Export map as SVG</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="5314"/>
+        <location line="+33"/>
         <source>Export map as XML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="5321"/>
+        <location line="+7"/>
         <source>Export XML to directory</source>
         <translation type="unfinished">Экспортировать XML в папку</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="5367"/>
+        <location line="+47"/>
         <source>Critical Export Error</source>
         <translation type="unfinished">Критическая ошибка Экспорта</translation>
     </message>
     <message>
-        <source>Export as LaTeX</source>
-        <translation type="obsolete">Экспортировать в LaTeX</translation>
-    </message>
-    <message>
-        <location filename="../vymmodel.cpp" line="5449"/>
+        <location line="+84"/>
+        <location line="+27"/>
         <source>(still experimental)</source>
         <translation type="unfinished">(still experimental)</translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="5449"/>
+        <location line="-28"/>
+        <location line="+27"/>
         <source>Export as csv</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../vymmodel.cpp" line="5786"/>
+        <location line="-531"/>
+        <source>Received Jira data.</source>
+        <comment>VymModel</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+900"/>
         <source>Load background image</source>
         <translation type="unfinished">Загрузить фоновый рисунок</translation>
     </message>
@@ -5137,18 +4084,18 @@ Do you want to reload that map with the new file?</source>
 <context>
     <name>VymProcess</name>
     <message>
-        <location filename="../vymprocess.cpp" line="43"/>
-        <location filename="../vymprocess.cpp" line="48"/>
+        <location filename="../src/vymprocess.cpp" line="+40"/>
+        <location line="+5"/>
         <source>Critical Error</source>
         <translation type="unfinished">Критическая ошибка</translation>
     </message>
     <message>
-        <location filename="../vymprocess.cpp" line="44"/>
+        <location line="-4"/>
         <source>Could not start %1</source>
         <translation type="unfinished">Ошибка при запуске %1</translation>
     </message>
     <message>
-        <location filename="../vymprocess.cpp" line="49"/>
+        <location line="+5"/>
         <source>%1 didn&apos;t exit normally</source>
         <translation type="unfinished">%1 завершился с ошибкой</translation>
     </message>
@@ -5156,13 +4103,13 @@ Do you want to reload that map with the new file?</source>
 <context>
     <name>VymView</name>
     <message>
-        <location filename="../vymview.cpp" line="34"/>
+        <location filename="../src/vymview.cpp" line="+34"/>
         <source>Tree Editor</source>
         <comment>Title of dockable editor widget</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../vymview.cpp" line="52"/>
+        <location line="+19"/>
         <source>Slide Editor</source>
         <comment>Title of dockable editor widget</comment>
         <translation type="unfinished"></translation>
@@ -5171,39 +4118,75 @@ Do you want to reload that map with the new file?</source>
 <context>
     <name>WarningDialog</name>
     <message>
-        <source>VYM - Warning : Foo...</source>
-        <translation type="obsolete">VYM - Предупреждение: Фyy...</translation>
-    </message>
-    <message>
-        <location filename="../warningdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../warningdialog.ui" line="91"/>
         <source>showAgainBox</source>
-        <translation>showAgainBox</translation>
+        <translation type="vanished">showAgainBox</translation>
     </message>
     <message>
-        <location filename="../warningdialog.ui" line="117"/>
-        <location filename="../warningdialog.cpp" line="45"/>
+        <location filename="../src/warningdialog.cpp" line="+51"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../warningdialog.ui" line="124"/>
         <source>Ok</source>
-        <translation>OK</translation>
+        <translation type="vanished">OK</translation>
     </message>
     <message>
-        <location filename="../warningdialog.cpp" line="10"/>
+        <location line="-41"/>
         <source>Proceed</source>
         <translation>Продолжить</translation>
     </message>
     <message>
-        <location filename="../warningdialog.cpp" line="12"/>
+        <location line="+2"/>
         <source>Show this message again</source>
         <translation>Показывать это сообщение</translation>
     </message>
+    <message>
+        <location line="+4"/>
+        <source>Warning</source>
+        <comment>Warning dialog default window name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ZipSettingsDialog</name>
+    <message>
+        <source>Close</source>
+        <translation type="obsolete">Закрыть</translation>
+    </message>
+    <message>
+        <location filename="../src/zip-settings-dialog.cpp" line="+22"/>
+        <source>zip settings</source>
+        <comment>dialog window title</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Path to 7z.exe</source>
+        <comment>zip tool settings dialog</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Set path to 7z to zip/unzip files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Set path to zip files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Set path to unzip files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <location line="+2"/>
+        <location line="+5"/>
+        <location line="+2"/>
+        <source>Status: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>