New upstream version 2.9.31

diff --git a/config/io.github.insilmaril.vym.appdata.xml b/config/io.github.insilmaril.vym.appdata.xml
new file mode 100644 (file)
index 0000000..55d378a
--- /dev/null
+++ b/config/io.github.insilmaril.vym.appdata.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+    <id>io.github.insilmaril.vym</id>
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_license>LGPL-2.1-or-later</project_license>
+    <name>VYM</name>
+    <summary>Tool for generating and manipulating mind maps</summary>
+    <description>
+       <p>
+           VYM (View Your Mind) allows you to organize your ideas easily and intuitively. 
+            It is a powerful personal task manager that lets you create mind maps and export
+            them to multiple formats.
+       </p>
+    </description>
+    <screenshots>
+        <screenshot type="default">
+          <image>https://a.fsdn.com/con/app/proj/vym/screenshots/328319.jpg</image>
+        </screenshot>
+        <screenshot>
+          <image>https://a.fsdn.com/con/app/proj/vym/screenshots/328313.jpg</image>
+        </screenshot>
+    </screenshots>
+    <categories>
+        <category>Education</category>
+        <category>Office</category>
+    </categories>
+    <url type="bugtracker">https://github.com/insilmaril/vym/issues</url>
+    <url type="homepage">http://www.insilmaril.de/vym/</url>
+    <developer_name>vym</developer_name>
+    <kudos>
+        <kudo>HiDpiIcon</kudo>
+        <kudo>HighContrast</kudo>
+        <kudo>UserDocs</kudo>
+    </kudos>
+    <launchable type="desktop-id">vym.desktop</launchable>
+    <provides>
+        <binary>vym</binary>
+    </provides>
+    <translation type="gettext">vym</translation>
+    <content_rating type="oars-1.1">
+        <content_attribute id="social-info">mild</content_attribute>
+    </content_rating>
+    <releases>
+       <release version="2.9.26" date="2023-11-23"></release>
+    </releases>
+</component>

diff --git a/lang/vym.ru.ts b/lang/vym.ru.ts
index 1c8552e5a8d39ab8af7ccd504b436d1b34db1f7e..278aae38a2c6d0237db131dc8793badda3658c27 100644 (file)
--- a/lang/vym.ru.ts
+++ b/lang/vym.ru.ts
@@ -7,13 +7,13 @@
         <location filename="../src/aboutdialog.cpp" line="+136"/>
         <source>Credits</source>
         <comment>Help-&gt;About vym dialog</comment>
-        <translation type="unfinished"></translation>
+        <translation>Титры</translation>
     </message>
     <message>
         <location line="+350"/>
         <source>License</source>
         <comment>Help-&gt;About vym dialog</comment>
-        <translation type="unfinished"></translation>
+        <translation>Лицензия</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -146,25 +146,25 @@
         <location filename="../src/branchpropeditor.cpp" line="+21"/>
         <source>Property Editor</source>
         <comment>Window caption</comment>
-        <translation type="unfinished">Редактор свойств</translation>
+        <translation>Редактор свойств</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Name</source>
         <comment>Branchprop window: Attribute name</comment>
-        <translation type="unfinished">Имя</translation>
+        <translation>Имя</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Value</source>
         <comment>Branchprop window: Attribute value</comment>
-        <translation type="unfinished">Значение</translation>
+        <translation>Значение</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Type</source>
         <comment>Branchprop window: Attribute type</comment>
-        <translation type="unfinished">Тип</translation>
+        <translation>Тип</translation>
     </message>
     <message>
         <location line="+128"/>
@@ -352,7 +352,7 @@ want to allow this in your system!</source>
     <message>
         <location line="+21"/>
         <source>VYM - Export HTML to directory</source>
-        <translation type="unfinished">VYM - Экспортировать HTML в папку</translation>
+        <translation>VYM - Экспортировать HTML в папку</translation>
     </message>
 </context>
 <context>
@@ -463,7 +463,7 @@ want to allow this in your system!</source>
         <location filename="../src/findwidget.cpp" line="+24"/>
         <source>Find:</source>
         <comment>FindWidget</comment>
-        <translation type="unfinished"></translation>
+        <translation>Найти:</translation>
     </message>
 </context>
 <context>
@@ -557,12 +557,12 @@ want to allow this in your system!</source>
     <message>
         <location filename="../src/lineeditdialog.cpp" line="+16"/>
         <source>Cancel</source>
-        <translation type="unfinished">Отмена</translation>
+        <translation>Отмена</translation>
     </message>
     <message>
         <location line="-7"/>
         <source>Ok</source>
-        <translation type="unfinished">OK</translation>
+        <translation>OK</translation>
     </message>
 </context>
 <context>
@@ -583,12 +583,12 @@ want to allow this in your system!</source>
     <message>
         <location filename="../src/mainwindow.cpp" line="+2189"/>
         <source>Linkstyle Line</source>
-        <translation>Ð\9bиниÑ\8f-Ñ\81Ñ\81Ñ\8bлка</translation>
+        <translation>СÑ\82илÑ\8c линии: Ñ\82онкаÑ\8f линиÑ\8f</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Linkstyle Thick Line</source>
-        <translation type="unfinished"></translation>
+        <translation>Стиль линии: толстая линия</translation>
     </message>
     <message>
         <location line="+42"/>
@@ -635,7 +635,7 @@ want to allow this in your system!</source>
         <location line="+4"/>
         <source>Check, if updates are available</source>
         <comment>Help action</comment>
-        <translation type="unfinished"></translation>
+        <translation>Проверить наличие обновлений</translation>
     </message>
     <message>
         <location line="+552"/>
@@ -665,12 +665,12 @@ vym will create an empty map now.</source>
     <message>
         <location line="+6"/>
         <source>Import: Add vym map to selection</source>
-        <translation>Ð\98мпоÑ\80Ñ\82иÑ\80ование: Ð\94обавиÑ\82Ñ\8c vym-Ð\9aарту к выделению</translation>
+        <translation>Ð\98мпоÑ\80Ñ\82иÑ\80ование: Ð\94обавиÑ\82Ñ\8c vym-карту к выделению</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Import: Replace selection with vym map</source>
-        <translation>Ð\98мпоÑ\80Ñ\82иÑ\80ование: Ð\97амениÑ\82Ñ\8c вÑ\8bделение vym-Ð\9aартой</translation>
+        <translation>Ð\98мпоÑ\80Ñ\82иÑ\80ование: Ð\97амениÑ\82Ñ\8c вÑ\8bделение vym-картой</translation>
     </message>
     <message>
         <location line="+216"/>
@@ -681,7 +681,7 @@ Couldn&apos;t rename map to %1</source>
     <message>
         <location line="+402"/>
         <source>Save modified map before closing it</source>
-        <translation>Сохранить изменнеую Карту перед закрытием</translation>
+        <translation>Сохранить изменённую карту перед закрытием</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -783,7 +783,7 @@ Couldn&apos;t rename map to %1</source>
         <location line="+842"/>
         <source>&amp;Map</source>
         <comment>Menu for file actions</comment>
-        <translation type="unfinished">&amp;Карта</translation>
+        <translation>&amp;Карта</translation>
     </message>
     <message>
         <location line="+28"/>
@@ -800,7 +800,7 @@ Couldn&apos;t rename map to %1</source>
         <location line="+129"/>
         <source>&amp;Detach</source>
         <comment>Context menu</comment>
-        <translation type="unfinished"></translation>
+        <translation>Отделить</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -847,49 +847,49 @@ Couldn&apos;t rename map to %1</source>
     <message>
         <location line="-302"/>
         <source>Properties</source>
-        <translation type="unfinished"></translation>
+        <translation>Свойства</translation>
     </message>
     <message>
         <location line="+208"/>
         <source>Move branch up</source>
         <comment>Edit menu</comment>
-        <translation type="unfinished">Переместить вверх</translation>
+        <translation>Переместить вверх</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Move branch down</source>
         <comment>Edit menu</comment>
-        <translation type="unfinished">Переместить вниз</translation>
+        <translation>Переместить вниз</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Move branch diagonally up</source>
         <comment>Edit menu</comment>
-        <translation type="unfinished"></translation>
+        <translation>Переместить на уровень ниже (вложить в другой узел)</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Move branch diagonally down</source>
         <comment>Edit menu</comment>
-        <translation type="unfinished"></translation>
+        <translation>Переместить на уровень выше</translation>
     </message>
     <message>
         <location line="+60"/>
         <source>Grow selection</source>
         <comment>Edit menu</comment>
-        <translation type="unfinished"></translation>
+        <translation>Увеличить изображение</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Shrink selection</source>
         <comment>Edit menu</comment>
-        <translation type="unfinished"></translation>
+        <translation>Уменьшить изображение</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Reset selection size</source>
         <comment>Edit menu</comment>
-        <translation type="unfinished"></translation>
+        <translation>Вернуть исходный размер</translation>
     </message>
     <message>
         <location line="+54"/>
@@ -991,7 +991,7 @@ Couldn&apos;t rename map to %1</source>
         <location line="+1"/>
         <source>Select</source>
         <comment>Select menu</comment>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Выбрать</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -1067,7 +1067,7 @@ Couldn&apos;t rename map to %1</source>
     <message>
         <location line="+308"/>
         <source>Select color (Press Shift for more options)</source>
-        <translation type="unfinished"></translation>
+        <translation>Выбрать цвет (нажмите Shift для настройки)</translation>
     </message>
     <message>
         <location line="+60"/>
@@ -1084,7 +1084,7 @@ Couldn&apos;t rename map to %1</source>
     <message>
         <location line="-1544"/>
         <source>(experimental)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">(экспериментально)</translation>
     </message>
     <message>
         <location line="+44"/>
@@ -1101,7 +1101,7 @@ Couldn&apos;t rename map to %1</source>
     <message>
         <location line="+637"/>
         <source>&amp;Connect</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Соединение</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1150,127 +1150,127 @@ Couldn&apos;t rename map to %1</source>
         <location line="+6"/>
         <source>Important</source>
         <comment>Freemind flag</comment>
-        <translation type="unfinished">Важно</translation>
+        <translation>Важно</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Back</source>
         <comment>Freemind flag</comment>
-        <translation type="unfinished">Назад</translation>
+        <translation>Назад</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Forward</source>
         <comment>Freemind flag</comment>
-        <translation type="unfinished">Фперёд</translation>
+        <translation>Вперёд</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Look here</source>
         <comment>Freemind flag</comment>
-        <translation type="unfinished">Посмотреть тут</translation>
+        <translation>Посмотреть тут</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Dangerous</source>
         <comment>Freemind flag</comment>
-        <translation type="unfinished">Опасность</translation>
+        <translation>Опасность</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Don&apos;t forget</source>
         <comment>Freemind flag</comment>
-        <translation type="unfinished">Не забыть</translation>
+        <translation>Не забыть</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Flag</source>
         <comment>Freemind flag</comment>
-        <translation type="unfinished">Флаг</translation>
+        <translation>Флаг</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Home</source>
         <comment>Freemind flag</comment>
-        <translation type="unfinished">Дом</translation>
+        <translation>Дом</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Telephone</source>
         <comment>Freemind flag</comment>
-        <translation type="unfinished">Телефон</translation>
+        <translation>Телефон</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Music</source>
         <comment>Freemind flag</comment>
-        <translation type="unfinished">Музыка</translation>
+        <translation>Музыка</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Mailbox</source>
         <comment>Freemind flag</comment>
-        <translation type="unfinished">Почта</translation>
+        <translation>Почта</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Mail</source>
         <comment>Freemind flag</comment>
-        <translation type="unfinished"></translation>
+        <translation>Письмо</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Password</source>
         <comment>Freemind flag</comment>
-        <translation type="unfinished">Пароль</translation>
+        <translation>Пароль</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>To be improved</source>
         <comment>Freemind flag</comment>
-        <translation type="unfinished">На улучшение</translation>
+        <translation>На улучшение</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Stop</source>
         <comment>Freemind flag</comment>
-        <translation type="unfinished">Стоп</translation>
+        <translation>Стоп</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Magic</source>
         <comment>Freemind flag</comment>
-        <translation type="unfinished">Magic</translation>
+        <translation>Магия</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>To be discussed</source>
         <comment>Freemind flag</comment>
-        <translation type="unfinished">На обсуждение</translation>
+        <translation>На обсуждение</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Reminder</source>
         <comment>Freemind flag</comment>
-        <translation type="unfinished">Напоминание</translation>
+        <translation>Напоминание</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Excellent</source>
         <comment>Freemind flag</comment>
-        <translation type="unfinished">Великолепно</translation>
+        <translation>Великолепно</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Linux</source>
         <comment>Freemind flag</comment>
-        <translation type="unfinished">Linux</translation>
+        <translation>Linux</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Sweet</source>
         <comment>Freemind flag</comment>
-        <translation type="unfinished">Мило</translation>
+        <translation>Мило</translation>
     </message>
     <message>
         <location line="+135"/>
@@ -1317,7 +1317,7 @@ Couldn&apos;t rename map to %1</source>
         <location line="-5599"/>
         <source>Open all URLs in subtree (including scrolled branches)</source>
         <comment>Edit menu</comment>
-        <translation type="unfinished"></translation>
+        <translation>Открыть все URL в поддереве, включая свёрнутые ветви</translation>
     </message>
     <message>
         <location line="+17"/>
@@ -1335,7 +1335,7 @@ Couldn&apos;t rename map to %1</source>
         <location line="-11"/>
         <source>Remove children</source>
         <comment>Edit menu</comment>
-        <translation type="unfinished"></translation>
+        <translation>Удалить вложенные узлы</translation>
     </message>
     <message>
         <location line="+328"/>
@@ -1359,7 +1359,7 @@ Couldn&apos;t rename map to %1</source>
         <location line="-3208"/>
         <source>Property Editor</source>
         <comment>PropertyEditor</comment>
-        <translation type="unfinished">Редактор свойств</translation>
+        <translation>Редактор свойств</translation>
     </message>
     <message>
         <location line="-6"/>
@@ -1423,13 +1423,13 @@ Couldn&apos;t rename map to %1</source>
     <message>
         <location line="+30"/>
         <source>CSV...</source>
-        <translation type="unfinished"></translation>
+        <translation>CSV...</translation>
     </message>
     <message>
         <location line="+69"/>
         <source>E&amp;dit</source>
         <comment>Edit menu</comment>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Редактировать</translation>
     </message>
     <message>
         <location line="+415"/>
@@ -1447,7 +1447,7 @@ Couldn&apos;t rename map to %1</source>
         <location line="+254"/>
         <source>Add image...</source>
         <comment>Edit menu</comment>
-        <translation type="unfinished"></translation>
+        <translation>Добавить изображение...</translation>
     </message>
     <message>
         <location line="+56"/>
@@ -1471,7 +1471,7 @@ Couldn&apos;t rename map to %1</source>
         <location line="+84"/>
         <source>Select default font</source>
         <comment>Branch attribute</comment>
-        <translation type="unfinished"></translation>
+        <translation>Выбрать шрифт по умолчанию</translation>
     </message>
     <message>
         <location line="+83"/>
@@ -1501,7 +1501,7 @@ Couldn&apos;t rename map to %1</source>
         <location line="+60"/>
         <source>Tree editor</source>
         <comment>View action</comment>
-        <translation type="unfinished"></translation>
+        <translation>Структура</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -1632,7 +1632,7 @@ Couldn&apos;t rename map to %1</source>
         <location line="+7"/>
         <source>Follow XLink</source>
         <comment>Context menu</comment>
-        <translation type="unfinished">Перейти по XLink</translation>
+        <translation>Перейти по XLink</translation>
     </message>
     <message>
         <location line="+130"/>
@@ -1772,36 +1772,36 @@ because of existing lockfile:
     <message>
         <location line="+88"/>
         <source>The map %1 has been modified but not saved yet. Do you want to</source>
-        <translation>Ð\9aаÑ\80Ñ\82а %1 бÑ\8bла измененеа, но изменениÑ\8f не Ñ\81оÑ\85Ñ\80аненÑ\8b. Ð\92Ñ\8b Ñ\85оÑ\82иÑ\82е</translation>
+        <translation>Карта %1 была изменена, но изменения не сохранены. Вы хотите</translation>
     </message>
     <message>
         <location line="+178"/>
         <source>Enter URL:</source>
-        <translation type="unfinished">Введите URL:</translation>
+        <translation>Введите URL:</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>HTML</source>
         <comment>Filedialog</comment>
-        <translation type="unfinished"></translation>
+        <translation>HTML</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Text</source>
         <comment>Filedialog</comment>
-        <translation type="unfinished">Текст</translation>
+        <translation>Текст</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Spreadsheet</source>
         <comment>Filedialog</comment>
-        <translation type="unfinished">Таблица</translation>
+        <translation>Таблица</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Textdocument</source>
         <comment>Filedialog</comment>
-        <translation type="unfinished">Текстовый документ</translation>
+        <translation>Текстовый документ</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1812,17 +1812,17 @@ because of existing lockfile:
     <message>
         <location line="+4"/>
         <source>Set URL to a local file</source>
-        <translation type="unfinished">Задать URL на локальный файл</translation>
+        <translation>Указать URL на локальный файл</translation>
     </message>
     <message>
         <location line="+125"/>
         <source>Couldn&apos;t open map %1</source>
-        <translation>Ð\9eÑ\88ибка пÑ\80и оÑ\82кÑ\80Ñ\8bÑ\82ии Ð\9aарты %1</translation>
+        <translation>Ð\9eÑ\88ибка пÑ\80и оÑ\82кÑ\80Ñ\8bÑ\82ии карты %1</translation>
     </message>
     <message>
         <location line="+44"/>
         <source>Link to another vym map</source>
-        <translation type="unfinished">Ссылка на другую vym-Карту</translation>
+        <translation>Ссылка на другую vym-карту</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -2152,7 +2152,7 @@ because of existing lockfile:
     <message>
         <location line="+1608"/>
         <source>Firefox Bookmarks</source>
-        <translation type="unfinished">Закладки Firefox</translation>
+        <translation>Закладки Firefox</translation>
     </message>
     <message>
         <location line="-3177"/>
@@ -2200,7 +2200,7 @@ because of existing lockfile:
         <location line="+65"/>
         <source>&amp;Close Map</source>
         <comment>File menu</comment>
-        <translation>&amp;Ð\97акÑ\80Ñ\8bÑ\82Ñ\8c Ð\9aарту</translation>
+        <translation>&amp;Ð\97акÑ\80Ñ\8bÑ\82Ñ\8c карту</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2255,7 +2255,7 @@ because of existing lockfile:
         <location line="+9"/>
         <source>Add branch (insert)</source>
         <comment>Edit menu</comment>
-        <translation>Ð\94обавиÑ\82Ñ\8c веÑ\82вÑ\8c (insert)</translation>
+        <translation>Ð\94обавиÑ\82Ñ\8c пÑ\80омежÑ\83Ñ\82оÑ\87нÑ\8bй Ñ\83зел</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -2330,13 +2330,13 @@ because of existing lockfile:
         <location line="+17"/>
         <source>Open all vym links in subtree</source>
         <comment>Edit menu</comment>
-        <translation>Открыть все  ссылки в поддереве</translation>
+        <translation>Открыть все vym-ссылки в поддереве</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Edit vym link...</source>
         <comment>Edit menu</comment>
-        <translation>Редактировать ссылку...</translation>
+        <translation>Редактировать vym-ссылку...</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -2354,13 +2354,13 @@ because of existing lockfile:
         <location line="+158"/>
         <source>Add map (insert)</source>
         <comment>Edit menu</comment>
-        <translation>Ð\94обавиÑ\82Ñ\8c Ð\9aарту (вставить)</translation>
+        <translation>Ð\94обавиÑ\82Ñ\8c карту (вставить)</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Add map (replace)</source>
         <comment>Edit menu</comment>
-        <translation>Ð\94обавиÑ\82Ñ\8c Ð\9aарту (заменить)</translation>
+        <translation>Ð\94обавиÑ\82Ñ\8c карту (заменить)</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2420,13 +2420,13 @@ because of existing lockfile:
         <location line="-1122"/>
         <source>Firefox Bookmarks</source>
         <comment>Import filters</comment>
-        <translation type="unfinished">Закладки Firefox</translation>
+        <translation>Закладки Firefox</translation>
     </message>
     <message>
         <location line="+825"/>
         <source>Remove only branch and keep its children </source>
         <comment>Edit menu</comment>
-        <translation type="unfinished"></translation>
+        <translation>Удалить этот узел и оставить его вложенные узлы</translation>
     </message>
     <message>
         <location line="+305"/>
@@ -2534,7 +2534,7 @@ because of existing lockfile:
         <location line="+314"/>
         <source>Add mapcenter</source>
         <comment>Canvas context menu</comment>
-        <translation type="unfinished"></translation>
+        <translation>Добавить центральный узел</translation>
     </message>
     <message>
         <location line="+127"/>
@@ -2557,17 +2557,17 @@ because of existing lockfile:
     <message>
         <location line="+168"/>
         <source>Linkstyle Curve</source>
-        <translation>Linkstyle Curve</translation>
+        <translation>Стиль линии: тонкая дуга</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Linkstyle Thick Curve</source>
-        <translation>Linkstyle Thick Curve</translation>
+        <translation>Стиль линии: толстая дуга</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>Set &amp;Link Color</source>
-        <translation>Установить цвет &amp;сслыки</translation>
+        <translation>Установить цвет &amp;ссылки</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -2601,13 +2601,13 @@ because of existing lockfile:
         <location line="+10"/>
         <source>Next Map</source>
         <comment>View action</comment>
-        <translation>СледÑ\83Ñ\8eÑ\89аÑ\8f Ð\9aарта</translation>
+        <translation>СледÑ\83Ñ\8eÑ\89аÑ\8f карта</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Previous Map</source>
         <comment>View action</comment>
-        <translation>Ð\9fÑ\80едÑ\8bдÑ\83Ñ\89аÑ\8f Ð\9aарта</translation>
+        <translation>Ð\9fÑ\80едÑ\8bдÑ\83Ñ\89аÑ\8f карта</translation>
     </message>
     <message>
         <location line="+52"/>
@@ -2632,7 +2632,7 @@ because of existing lockfile:
         <location line="+9"/>
         <source>Link to another vym map</source>
         <comment>SystemFlag</comment>
-        <translation>СÑ\81Ñ\8bлка на дÑ\80Ñ\83гÑ\83Ñ\8e vym-Ð\9aарту</translation>
+        <translation>СÑ\81Ñ\8bлка на дÑ\80Ñ\83гÑ\83Ñ\8e vym-карту</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -2721,7 +2721,7 @@ because of existing lockfile:
         <location line="+102"/>
         <source>References (URLs, vymLinks, ...)</source>
         <comment>Context menu name</comment>
-        <translation>Ссылки ( URLs, vym-Cсылки, ...)</translation>
+        <translation>Ссылки (URL, vym-ссылки, ...)</translation>
     </message>
     <message>
         <location line="+1164"/>
@@ -2733,7 +2733,7 @@ because of existing lockfile:
         <source>%1 items on map
 </source>
         <comment>Info about map</comment>
-        <translation type="unfinished">%1 объектов на карте
+        <translation>%1 объектов на карте
 </translation>
     </message>
     <message>
@@ -2744,7 +2744,7 @@ because of existing lockfile:
     <message>
         <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>
+        <translation>Настройки были изменены. Следующая открытая карта будет использовать &quot;%1&quot; уровней повтора/отмены</translation>
     </message>
     <message>
         <location line="+40"/>
@@ -2814,7 +2814,7 @@ because of existing lockfile:
         <location line="+5"/>
         <source>Edit heading</source>
         <comment>MapEditor</comment>
-        <translation type="unfinished">Изменить заголовок</translation>
+        <translation>Изменить заголовок</translation>
     </message>
     <message>
         <location line="+446"/>
@@ -2834,7 +2834,7 @@ because of existing lockfile:
         <location filename="../src/noteeditor.cpp" line="+13"/>
         <source>Note Editor</source>
         <comment>Name of editor shown as window title</comment>
-        <translation type="unfinished">Редактор Заметок</translation>
+        <translation>Редактор заметок</translation>
     </message>
 </context>
 <context>
@@ -2885,7 +2885,7 @@ because of existing lockfile:
     <message>
         <location filename="../src/export-csv.cpp" line="-8"/>
         <source>Export as CSV</source>
-        <translation type="unfinished">Экспортировать в CVS</translation>
+        <translation>Экспортировать в CSV</translation>
     </message>
     <message>
         <location filename="../src/export-confluence.cpp" line="-59"/>
@@ -2958,7 +2958,7 @@ because of existing lockfile:
         <location line="+10"/>
         <source>Error</source>
         <comment>ExportHTML</comment>
-        <translation type="unfinished">Ошибка</translation>
+        <translation>Ошибка</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3186,12 +3186,12 @@ Do you risk to overwrite its contents?</source>
     <message>
         <location line="+1"/>
         <source>Please use Settings-&gt;</source>
-        <translation type="unfinished"> Используйте пункт &quot;Настройки&quot;-&gt;</translation>
+        <translation>Используйте пункт &quot;Настройки&quot;-&gt;</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Set directory for vym macros</source>
-        <translation type="unfinished">Установить папку для vym-макросов</translation>
+        <translation>Указать папку для vym-макросов</translation>
     </message>
     <message>
         <location filename="../src/export-markdown.cpp" line="-10"/>
@@ -3369,12 +3369,12 @@ Do you want to overwrite it?</source>
     <message>
         <location line="+5"/>
         <source>Overwrite</source>
-        <translation type="unfinished">Перезаписать</translation>
+        <translation>Перезаписать</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cancel</source>
-        <translation type="unfinished">Отмена</translation>
+        <translation>Отмена</translation>
     </message>
     <message>
         <location line="-58"/>
@@ -3515,7 +3515,7 @@ Do you want to overwrite it?</source>
     <message>
         <location line="+8"/>
         <source>&amp;Print...</source>
-        <translation>&amp;PПечать...</translation>
+        <translation>&amp;Печать...</translation>
     </message>
     <message>
         <location line="+24"/>
@@ -3679,7 +3679,7 @@ Do you want to overwrite it?</source>
         <location line="+45"/>
         <source>Print</source>
         <comment>TextEditor</comment>
-        <translation type="unfinished">Печать</translation>
+        <translation>Печать</translation>
     </message>
     <message>
         <location line="-385"/>
@@ -3809,7 +3809,7 @@ Do you want to overwrite it?</source>
         <location line="+48"/>
         <source>Couldn&apos;t find a map (*.xml) in .vym archive.
 </source>
-        <translation type="unfinished">Ð\9dе найдена Ð\9aарта (*.xml) в .vym архиве.
+        <translation type="unfinished">Ð\9dе найдена карта (*.xml) в .vym архиве.
 </translation>
     </message>
     <message>
@@ -3848,7 +3848,7 @@ Do you want to write the map</source>
         <location line="+4"/>
         <location line="+201"/>
         <source>Cancel</source>
-        <translation type="unfinished">Отмена</translation>
+        <translation>Отмена</translation>
     </message>
     <message>
         <location line="-175"/>
@@ -3897,12 +3897,12 @@ could not be renamed before saving</source>
     <message>
         <location line="-56"/>
         <source>Load image</source>
-        <translation type="unfinished">Загрузить изображение</translation>
+        <translation>Загрузить изображение</translation>
     </message>
     <message>
         <location line="+59"/>
         <source>Save image</source>
-        <translation type="unfinished">Сохранить изображение</translation>
+        <translation>Сохранить изображение</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -3915,7 +3915,7 @@ Do you want to overwrite it?</source>
     <message>
         <location line="+8"/>
         <source>Overwrite</source>
-        <translation type="unfinished">Перезаписать</translation>
+        <translation>Перезаписать</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -3995,21 +3995,21 @@ Please only delete the lockfile, if you are sure nobody else is currently workin
    %1
 
 Do you want to reload that map with the new file?</source>
-        <translation type="unfinished">Файл Ð\9aаÑ\80Ñ\82Ñ\8b на диÑ\81ке бÑ\8bл изменен:
+        <translation type="unfinished">Файл каÑ\80Ñ\82Ñ\8b на диÑ\81ке бÑ\8bл изменÑ\91н:
 
 %1
 
-Вы хотите загрузить изменненую карту с диска?</translation>
+Вы хотите загрузить изменённую карту с диска?</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Reload</source>
-        <translation type="unfinished">Перезагрузить</translation>
+        <translation>Перезагрузить</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ignore</source>
-        <translation type="unfinished">Пропустить</translation>
+        <translation>Пропустить</translation>
     </message>
     <message>
         <location line="-131"/>
@@ -4032,12 +4032,12 @@ Do you want to reload that map with the new file?</source>
         <location line="+1026"/>
         <source>New map</source>
         <comment>New map</comment>
-        <translation type="unfinished">Новая Карта</translation>
+        <translation>Новая карта</translation>
     </message>
     <message>
         <location line="+1273"/>
         <source>Export map as image</source>
-        <translation type="unfinished">Экспортировать Карту как изображение</translation>
+        <translation>Экспортировать карту как изображение</translation>
     </message>
     <message>
         <location line="+21"/>
@@ -4062,7 +4062,7 @@ Do you want to reload that map with the new file?</source>
     <message>
         <location line="+7"/>
         <source>Export XML to directory</source>
-        <translation type="unfinished">Экспортировать XML в папку</translation>
+        <translation>Экспортировать XML в папку</translation>
     </message>
     <message>
         <location line="+47"/>
@@ -4090,7 +4090,7 @@ Do you want to reload that map with the new file?</source>
     <message>
         <location line="+906"/>
         <source>Load background image</source>
-        <translation type="unfinished">Загрузить фоновый рисунок</translation>
+        <translation>Загрузить фоновый рисунок</translation>
     </message>
 </context>
 <context>

diff --git a/src/aboutdialog.cpp b/src/aboutdialog.cpp
index 5662d434c9e5b51dcec480e108c84cab0e0aa02d..67ff08a3796d957510bbbcc8cb31b7161a086531 100644 (file)
--- a/src/aboutdialog.cpp
+++ b/src/aboutdialog.cpp
@@ -65,6 +65,7 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent)
             "  </ul>"
             "</li>"
             "<li>Translations"
+            "  <p> Note: Some translations are outdated since years, any help to update them is welcome!</p>"
             "  <ul>"
             "    <li>Brasilian: Amadeu Júnior</li>"
             "    <li>Chinese (simplified): Moligaloo</li>"
@@ -76,7 +77,7 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent)
             "    <li>Interlingua: Giovanni Sora</li>"
             "    <li>Italian: Albano Battistella, Giovanni Sora, Seyed Puria Nafisi Azizi </li>"
             "    <li>Japanese: Tsuren Tsuchiya</li>"
-            "    <li>Russian: Anton Olenev</li>"
+            "    <li>Russian: Evgeniy Nochevnov, Anton Olenev</li>"
             "    <li>Spanish: <a "
             "href=\"http://ieee.udistrital.edu.co/aclibre\">"
             "                 ACLibre (Academia y Conocimiento Libre)</a> and "

diff --git a/src/flagrowmaster.cpp b/src/flagrowmaster.cpp
index 2b446dafec55c94215d9fde1085632e6eb1ed518..040738e68305c707f31120283fd0fd95b98df1ab 100644 (file)
--- a/src/flagrowmaster.cpp
+++ b/src/flagrowmaster.cpp
@@ -105,8 +105,10 @@ void FlagRowMaster::saveDataToDir(const QString &tmpdir, WriteMode mode)
     // Userflags are written anyway (if master flagrow)
 
     for (int i = 0; i < flags.size(); ++i)
-        if ((mode == AllFlags) || (mode == UsedFlags && flags.at(i)->isUsed()))
+        if ((mode == AllFlags) || (mode == UsedFlags && flags.at(i)->isUsed())) {
+            qDebug() << "Writing flag " << flags.at(i)->getName() << " to " << tmpdir;
             flags.at(i)->saveDataToDir(tmpdir);
+        }
 }
 
 void FlagRowMaster::setName(const QString &n) { rowName = n; }

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index f999dd6cd62ca513bd3aad1798e085a00bb6bd6d..caa5848a5e432d969f26e54cd77ff47f92e3f58d 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -2979,7 +2979,7 @@ void Main::setupSettingsActions()
         tr("Set application to zip/unzip files", "Settings action") + "...",
         this);
     connect(a, SIGNAL(triggered()), this, SLOT(settingsZipTool()));
-    // FIXME-2 Disabled for now  settingsMenu->addAction(a);
+    // FIXME-2 zipSettings Disabled for now  settingsMenu->addAction(a);
 
     a = new QAction(tr("Confluence Credentials", "Settings action") + "...",
                     this);

diff --git a/src/mapitem.cpp b/src/mapitem.cpp
index 66dc81e6431fa8d732521d81b13ace674f50b524..c6399281511541683d17e697bf926f4e172eebcd 100644 (file)
--- a/src/mapitem.cpp
+++ b/src/mapitem.cpp
@@ -81,26 +81,27 @@ QString MapItem::getMapAttr()
     if (parentItem == rootItem)
         posMode = Absolute;
     else {
-        if (type == TreeItem::Image || depth() == 1 || lmo->getUseRelPos())
+        if (type == TreeItem::Image || depth() == 1 || (lmo && lmo->getUseRelPos()))
             posMode = Relative; // FiXME-2 shouldn't this be replaced by relPos?
         else
             posMode = Unused;
     }
+
     switch (posMode) {
-    case Relative:
-        if (lmo)
-            pos = lmo->getRelPos();
-        s = attribut("relPosX", QString().setNum(pos.x())) +
-            attribut("relPosY", QString().setNum(pos.y()));
-        break;
-    case Absolute:
-        if (mo)
-            pos = mo->getAbsPos();
-        s = attribut("absPosX", QString().setNum(pos.x())) +
-            attribut("absPosY", QString().setNum(pos.y()));
-        break;
-    default:
-        break;
+        case Relative:
+            if (lmo)
+                pos = lmo->getRelPos();
+            s = attribut("relPosX", QString().setNum(pos.x())) +
+                attribut("relPosY", QString().setNum(pos.y()));
+            break;
+        case Absolute:
+            if (mo)
+                pos = mo->getAbsPos();
+            s = attribut("absPosX", QString().setNum(pos.x())) +
+                attribut("absPosY", QString().setNum(pos.y()));
+            break;
+        default:
+            break;
     }
     if (hideLinkUnselected)
         s += attribut("hideLink", "true");

diff --git a/src/version.h b/src/version.h
index 2b89fd56ad49a76b07775e2135577a7c907e948f..03e2dc6b85d94cc28e4f94c433bf629493148bb7 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -1,8 +1,8 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define __VYM_VERSION "2.9.28"
-#define __VYM_BUILD_DATE "2024-05-10"
+#define __VYM_VERSION "2.9.31"
+#define __VYM_BUILD_DATE "2024-10-09"
 
 #define __VYM_CODE_QUALITY "Production"
 #define __VYM_CODENAME ""

diff --git a/src/vymmodel.cpp b/src/vymmodel.cpp
index f1378219f6b909e45e5c5c9564246c3763e3b4c2..cdf4888cd1465e7eafeb6a3c5025ff1f15572c86 100644 (file)
--- a/src/vymmodel.cpp
+++ b/src/vymmodel.cpp
@@ -385,14 +385,13 @@ QString VymModel::saveToDir(const QString &tmpdir, const QString &prefix,
     QString flags;
 
     // Write images and definitions of used user flags
+    standardFlagsMaster->saveDataToDir(tmpdir + "/flags/standard/", FlagRowMaster::UsedFlags);
     if (flagMode != FlagRowMaster::NoFlags) {
         // First find out, which flags are used
         // Definitions
         flags += userFlagsMaster->saveDef(flagMode);
 
-        userFlagsMaster->saveDataToDir(tmpdir + "flags/user/", flagMode);
-        standardFlagsMaster->saveDataToDir(tmpdir + "flags/standard/",
-                                           flagMode);
+        userFlagsMaster->saveDataToDir(tmpdir + "/flags/user/", flagMode);
     }
 
     QString footer;
@@ -4649,7 +4648,8 @@ void VymModel::exportXML(QString fpath, QString dpath, bool useDialog)
 
     // write to directory   //FIXME-3 check totalBBox here...
     QString saveFile =
-        saveToDir(dpath, mname + "-", FlagRowMaster::NoFlags, offset, NULL);
+        saveToDir(dpath, mname + "-", FlagRowMaster::AllFlags, offset, nullptr);
+
     QFile file;
 
     file.setFileName(fpath);