From e6a938812e9b27ca7b639b9812e8c641fe78494c Mon Sep 17 00:00:00 2001
From: Madzi <eliseevsan@gmail.com>
Date: Thu, 8 Sep 2022 22:28:16 +0200
Subject: [PATCH 1/8] Initial implementation

---
 .github/workflows/mvn.yaml | 23 +++++++++++
 .gitignore                 |  7 +++-
 pom.xml                    | 78 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/mvn.yaml
 create mode 100644 pom.xml

diff --git a/.github/workflows/mvn.yaml b/.github/workflows/mvn.yaml
new file mode 100644
index 0000000..64f54e4
--- /dev/null
+++ b/.github/workflows/mvn.yaml
@@ -0,0 +1,23 @@
+---
+name: mvn
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+jobs:
+  test:
+    name: Tests
+    strategy:
+      matrix:
+        os: [ubuntu-20.04, windows-2022, macos-12]
+        java: [1.8]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+      - run: mvn clean install --errors --batch-mode
diff --git a/.gitignore b/.gitignore
index 39cc8c1..3446b03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,9 @@
 *.bak
 *.backup
 *.exe
-/bitrock/*.run
\ No newline at end of file
+/bitrock/*.run
+target/
+.project
+.classpath
+.settings/
+nb-configuration.xml
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..89bbcd9
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>ifml2</groupId>
+    <artifactId>ifml2</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>IFML2</name>
+
+    <properties>
+        <encoding>UTF-8</encoding>
+        <java.version>1.8</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.17</version>
+        </dependency>
+        <dependency>
+            <groupId>net.java.dev.glazedlists</groupId>
+            <artifactId>glazedlists_java15</artifactId>
+            <version>1.9.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun</groupId>
+            <artifactId>rt</artifactId>
+            <version>1.8</version>
+            <scope>system</scope>
+            <systemPath>${java.home}/../jre/lib/rt.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>23.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>4.5.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.2.11</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>2.2.11</version>
+        </dependency>
+        <dependency>
+            <groupId>com.intellij</groupId>
+            <artifactId>forms_rt</artifactId>
+            <version>4.5.4</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+        <testSourceDirectory>unittests</testSourceDirectory>
+    </build>
+</project>

From 37e79bb6bb0cd5f56210f0709d70826c44166ef6 Mon Sep 17 00:00:00 2001
From: Madzi <eliseevsan@gmail.com>
Date: Thu, 8 Sep 2022 22:47:54 +0200
Subject: [PATCH 2/8] Fix #45 and #46 issues

---
 src/ifml2/editor/gui/ShowMemoDialog.form       |  2 +-
 src/ifml2/editor/gui/editors/ActionEditor.form |  4 ++--
 .../editor/gui/editors/ActionsEditor.form      |  4 ++--
 .../editor/gui/editors/DictionaryEditor.form   |  8 ++++----
 src/ifml2/editor/gui/editors/HookEditor.form   | 12 ++++++------
 .../InheritedSystemProceduresEditor.form       |  8 ++++----
 .../editor/gui/editors/InstructionsEditor.form | 14 +++++++-------
 src/ifml2/editor/gui/editors/ItemEditor.form   | 10 +++++-----
 .../gui/editors/LiteralElementEditor.form      | 12 ++++++------
 .../editor/gui/editors/LocationEditor.form     | 18 +++++++++---------
 .../gui/editors/ObjectAttributesEditor.form    |  4 ++--
 .../gui/editors/ObjectElementEditor.form       |  8 ++++----
 .../editor/gui/editors/ProcedureEditor.form    |  4 ++--
 .../editor/gui/editors/ProceduresEditor.form   |  4 ++--
 .../editor/gui/editors/RestrictionEditor.form  |  6 +++---
 src/ifml2/editor/gui/editors/RoleEditor.form   |  4 ++--
 .../editor/gui/editors/StoryOptionsEditor.form |  6 +++---
 .../editor/gui/editors/TemplateEditor.form     |  4 ++--
 .../editor/gui/editors/UsedLibsEditor.form     |  8 ++++----
 .../editor/gui/editors/WordLinksEditor.form    |  8 ++++----
 .../gui/instructions/GoToLocInstrEditor.form   |  8 ++++----
 .../editor/gui/instructions/IfInstrEditor.form |  4 ++--
 .../gui/instructions/MoveItemInstrEditor.form  | 10 +++++-----
 .../gui/instructions/ReturnInstrEditor.form    |  4 ++--
 .../gui/instructions/RollDiceInstrEditor.form  |  4 ++--
 .../instructions/RunProcedureInstrEditor.form  |  4 ++--
 .../gui/instructions/SetVarInstrEditor.form    |  6 +++---
 .../instructions/ShowMessageInstrEditor.form   | 14 +++++++-------
 .../instructions/ShowPictureInstrEditor.form   |  6 +++---
 29 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/src/ifml2/editor/gui/ShowMemoDialog.form b/src/ifml2/editor/gui/ShowMemoDialog.form
index e9e9c4d..ff923eb 100644
--- a/src/ifml2/editor/gui/ShowMemoDialog.form
+++ b/src/ifml2/editor/gui/ShowMemoDialog.form
@@ -37,7 +37,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
             </children>
diff --git a/src/ifml2/editor/gui/editors/ActionEditor.form b/src/ifml2/editor/gui/editors/ActionEditor.form
index 21a9393..15b1b0f 100644
--- a/src/ifml2/editor/gui/editors/ActionEditor.form
+++ b/src/ifml2/editor/gui/editors/ActionEditor.form
@@ -36,7 +36,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
               <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
@@ -44,7 +44,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="Cancel"/>
+                  <text value="Отменить"/>
                 </properties>
               </component>
             </children>
diff --git a/src/ifml2/editor/gui/editors/ActionsEditor.form b/src/ifml2/editor/gui/editors/ActionsEditor.form
index 2b01411..f2a6c74 100644
--- a/src/ifml2/editor/gui/editors/ActionsEditor.form
+++ b/src/ifml2/editor/gui/editors/ActionsEditor.form
@@ -36,7 +36,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
               <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
@@ -44,7 +44,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="Cancel"/>
+                  <text value="Отменить"/>
                 </properties>
               </component>
             </children>
diff --git a/src/ifml2/editor/gui/editors/DictionaryEditor.form b/src/ifml2/editor/gui/editors/DictionaryEditor.form
index 252dcc0..e4fdaad 100644
--- a/src/ifml2/editor/gui/editors/DictionaryEditor.form
+++ b/src/ifml2/editor/gui/editors/DictionaryEditor.form
@@ -3,7 +3,7 @@
   <grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>
-      <xy x="48" y="54" width="476" height="316"/>
+      <xy x="48" y="54" width="480" height="316"/>
     </constraints>
     <properties>
       <preferredSize width="450" height="200"/>
@@ -36,7 +36,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
             </children>
@@ -197,14 +197,14 @@
                 <constraints/>
                 <properties>
                   <icon value="ifml2/editor/gui/images/Add24.gif"/>
-                  <text value="&amp;Новое..."/>
+                  <text value="Новое..."/>
                 </properties>
               </component>
               <component id="e6c8d" class="javax.swing.JButton" binding="delWordButton">
                 <constraints/>
                 <properties>
                   <icon value="ifml2/editor/gui/images/Delete24.gif"/>
-                  <text value="&amp;Удалить..."/>
+                  <text value="Удалить..."/>
                 </properties>
               </component>
             </children>
diff --git a/src/ifml2/editor/gui/editors/HookEditor.form b/src/ifml2/editor/gui/editors/HookEditor.form
index 3642309..b6533db 100644
--- a/src/ifml2/editor/gui/editors/HookEditor.form
+++ b/src/ifml2/editor/gui/editors/HookEditor.form
@@ -36,7 +36,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
               <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
@@ -44,7 +44,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;Cancel"/>
+                  <text value="Отменить"/>
                 </properties>
               </component>
             </children>
@@ -111,7 +111,7 @@
                 </constraints>
                 <properties>
                   <selected value="true"/>
-                  <text value="д&amp;о действия"/>
+                  <text value="до действия"/>
                 </properties>
               </component>
               <component id="3fc1" class="javax.swing.JRadioButton" binding="insteadRadio">
@@ -119,7 +119,7 @@
                   <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;вместо действия"/>
+                  <text value="вместо действия"/>
                 </properties>
               </component>
               <component id="63e81" class="javax.swing.JRadioButton" binding="afterRadio">
@@ -128,7 +128,7 @@
                 </constraints>
                 <properties>
                   <selected value="false"/>
-                  <text value="по&amp;сле действия"/>
+                  <text value="после действия"/>
                 </properties>
               </component>
             </children>
@@ -154,7 +154,7 @@
                   <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;Редактировать инструкции..."/>
+                  <text value="Редактировать инструкции..."/>
                 </properties>
               </component>
               <scrollpane id="2c216">
diff --git a/src/ifml2/editor/gui/editors/InheritedSystemProceduresEditor.form b/src/ifml2/editor/gui/editors/InheritedSystemProceduresEditor.form
index c9db37d..50feb7b 100644
--- a/src/ifml2/editor/gui/editors/InheritedSystemProceduresEditor.form
+++ b/src/ifml2/editor/gui/editors/InheritedSystemProceduresEditor.form
@@ -36,7 +36,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
               <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
@@ -44,7 +44,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;Cancel"/>
+                  <text value="Отменить"/>
                 </properties>
               </component>
             </children>
@@ -84,7 +84,7 @@
                 </constraints>
                 <properties>
                   <icon value="Add24.gif"/>
-                  <text value="&amp;Создать..."/>
+                  <text value="Создать..."/>
                 </properties>
               </component>
               <component id="97a43" class="javax.swing.JButton" binding="parseErrorHandlerOpenButton">
@@ -93,7 +93,7 @@
                 </constraints>
                 <properties>
                   <icon value="Edit24.gif"/>
-                  <text value="&amp;Редактировать..."/>
+                  <text value="Редактировать..."/>
                 </properties>
               </component>
               <component id="20cd7" class="javax.swing.JLabel">
diff --git a/src/ifml2/editor/gui/editors/InstructionsEditor.form b/src/ifml2/editor/gui/editors/InstructionsEditor.form
index bbd1be8..6b2fa52 100644
--- a/src/ifml2/editor/gui/editors/InstructionsEditor.form
+++ b/src/ifml2/editor/gui/editors/InstructionsEditor.form
@@ -36,7 +36,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
               <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
@@ -44,7 +44,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;Cancel"/>
+                  <text value="Отменить"/>
                 </properties>
               </component>
             </children>
@@ -89,13 +89,13 @@
               <component id="e9816" class="javax.swing.JButton" binding="upButton">
                 <constraints/>
                 <properties>
-                  <text value="&amp;Вверх"/>
+                  <text value="Вверх"/>
                 </properties>
               </component>
               <component id="ea3b" class="javax.swing.JButton" binding="downButton">
                 <constraints/>
                 <properties>
-                  <text value="В&amp;низ"/>
+                  <text value="Вниз"/>
                 </properties>
               </component>
             </children>
@@ -116,19 +116,19 @@
           <component id="a053f" class="javax.swing.JButton" binding="addInstrButton">
             <constraints/>
             <properties>
-              <text value="&amp;Добавить..."/>
+              <text value="Добавить..."/>
             </properties>
           </component>
           <component id="df2f5" class="javax.swing.JButton" binding="editInstrButton">
             <constraints/>
             <properties>
-              <text value="&amp;Изменить..."/>
+              <text value="Изменить..."/>
             </properties>
           </component>
           <component id="e48b6" class="javax.swing.JButton" binding="delInstrButton">
             <constraints/>
             <properties>
-              <text value="&amp;Удалить..."/>
+              <text value="Удалить..."/>
             </properties>
           </component>
         </children>
diff --git a/src/ifml2/editor/gui/editors/ItemEditor.form b/src/ifml2/editor/gui/editors/ItemEditor.form
index 2c05d0c..f189e01 100644
--- a/src/ifml2/editor/gui/editors/ItemEditor.form
+++ b/src/ifml2/editor/gui/editors/ItemEditor.form
@@ -37,7 +37,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
               <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
@@ -45,7 +45,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;Cancel"/>
+                  <text value="Отменить"/>
                 </properties>
               </component>
             </children>
@@ -161,7 +161,7 @@
                       <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                     </constraints>
                     <properties>
-                      <text value="&amp;В инвентаре"/>
+                      <text value="В инвентаре"/>
                     </properties>
                   </component>
                   <scrollpane id="757aa">
@@ -201,7 +201,7 @@
                     </constraints>
                     <properties>
                       <icon value="Edit24.gif"/>
-                      <text value="Из&amp;менить..."/>
+                      <text value="Изменить..."/>
                     </properties>
                   </component>
                 </children>
@@ -239,7 +239,7 @@
                 </constraints>
                 <properties>
                   <icon value="Edit24.gif"/>
-                  <text value="И&amp;зменить..."/>
+                  <text value="Изменить..."/>
                 </properties>
               </component>
             </children>
diff --git a/src/ifml2/editor/gui/editors/LiteralElementEditor.form b/src/ifml2/editor/gui/editors/LiteralElementEditor.form
index ac52f41..4b4d4ec 100644
--- a/src/ifml2/editor/gui/editors/LiteralElementEditor.form
+++ b/src/ifml2/editor/gui/editors/LiteralElementEditor.form
@@ -36,7 +36,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
               <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
@@ -44,7 +44,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;Cancel"/>
+                  <text value="Отменить"/>
                 </properties>
               </component>
             </children>
@@ -88,19 +88,19 @@
           <component id="2cfb3" class="javax.swing.JButton" binding="addButton">
             <constraints/>
             <properties>
-              <text value="&amp;Добавить..."/>
+              <text value="Добавить..."/>
             </properties>
           </component>
           <component id="a7130" class="javax.swing.JButton" binding="editButton">
             <constraints/>
             <properties>
-              <text value="&amp;Редактировать..."/>
+              <text value="Редактировать..."/>
             </properties>
           </component>
           <component id="657a0" class="javax.swing.JButton" binding="delButton">
             <constraints/>
             <properties>
-              <text value="&amp;Удалить"/>
+              <text value="Удалить"/>
             </properties>
           </component>
         </children>
@@ -133,7 +133,7 @@
               <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="&amp;Передавать значение элемента в процедуру как параметр"/>
+              <text value="Передавать значение элемента в процедуру как параметр"/>
             </properties>
           </component>
         </children>
diff --git a/src/ifml2/editor/gui/editors/LocationEditor.form b/src/ifml2/editor/gui/editors/LocationEditor.form
index cb7fc6b..0ae8cf1 100644
--- a/src/ifml2/editor/gui/editors/LocationEditor.form
+++ b/src/ifml2/editor/gui/editors/LocationEditor.form
@@ -37,7 +37,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
               <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
@@ -45,7 +45,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;Cancel"/>
+                  <text value="Отменить"/>
                 </properties>
               </component>
             </children>
@@ -273,19 +273,19 @@
                       <component id="108bd" class="javax.swing.JButton" binding="addItemButton">
                         <constraints/>
                         <properties>
-                          <text value="&amp;Добавить..."/>
+                          <text value="Добавить..."/>
                         </properties>
                       </component>
                       <component id="feb6b" class="javax.swing.JButton" binding="editItemButton">
                         <constraints/>
                         <properties>
-                          <text value="Р&amp;едактировать..."/>
+                          <text value="Редактировать..."/>
                         </properties>
                       </component>
                       <component id="725c" class="javax.swing.JButton" binding="delItemButton">
                         <constraints/>
                         <properties>
-                          <text value="&amp;Удалить..."/>
+                          <text value="Удалить..."/>
                         </properties>
                       </component>
                     </children>
@@ -414,7 +414,7 @@
                       <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                     </constraints>
                     <properties>
-                      <text value="Из&amp;менить..."/>
+                      <text value="Изменить..."/>
                     </properties>
                   </component>
                 </children>
@@ -443,19 +443,19 @@
                   <component id="33349" class="javax.swing.JButton" binding="addHookButton">
                     <constraints/>
                     <properties>
-                      <text value="&amp;Добавить..."/>
+                      <text value="Добавить..."/>
                     </properties>
                   </component>
                   <component id="7102a" class="javax.swing.JButton" binding="editHookButton">
                     <constraints/>
                     <properties>
-                      <text value="Изм&amp;енить..."/>
+                      <text value="Изменить..."/>
                     </properties>
                   </component>
                   <component id="1bb0d" class="javax.swing.JButton" binding="deleteHookButton">
                     <constraints/>
                     <properties>
-                      <text value="&amp;Удалить"/>
+                      <text value="Удалить"/>
                     </properties>
                   </component>
                 </children>
diff --git a/src/ifml2/editor/gui/editors/ObjectAttributesEditor.form b/src/ifml2/editor/gui/editors/ObjectAttributesEditor.form
index 46e0a1d..565537e 100644
--- a/src/ifml2/editor/gui/editors/ObjectAttributesEditor.form
+++ b/src/ifml2/editor/gui/editors/ObjectAttributesEditor.form
@@ -37,7 +37,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
               <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
@@ -45,7 +45,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;Cancel"/>
+                  <text value="Отменить"/>
                 </properties>
               </component>
             </children>
diff --git a/src/ifml2/editor/gui/editors/ObjectElementEditor.form b/src/ifml2/editor/gui/editors/ObjectElementEditor.form
index 3027240..0c392a4 100644
--- a/src/ifml2/editor/gui/editors/ObjectElementEditor.form
+++ b/src/ifml2/editor/gui/editors/ObjectElementEditor.form
@@ -3,7 +3,7 @@
   <grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>
-      <xy x="48" y="54" width="372" height="246"/>
+      <xy x="48" y="54" width="430" height="246"/>
     </constraints>
     <properties>
       <preferredSize width="400" height="200"/>
@@ -36,7 +36,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
               <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
@@ -44,7 +44,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;Cancel"/>
+                  <text value="Отменить"/>
                 </properties>
               </component>
             </children>
@@ -87,7 +87,7 @@
                   <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;Передавать значение элемента в процедура как параметр"/>
+                  <text value="Передавать значение элемента в процедура как параметр"/>
                 </properties>
               </component>
             </children>
diff --git a/src/ifml2/editor/gui/editors/ProcedureEditor.form b/src/ifml2/editor/gui/editors/ProcedureEditor.form
index 0bc1791..b779b92 100644
--- a/src/ifml2/editor/gui/editors/ProcedureEditor.form
+++ b/src/ifml2/editor/gui/editors/ProcedureEditor.form
@@ -36,7 +36,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
               <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
@@ -44,7 +44,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;Cancel"/>
+                  <text value="Отменить"/>
                 </properties>
               </component>
             </children>
diff --git a/src/ifml2/editor/gui/editors/ProceduresEditor.form b/src/ifml2/editor/gui/editors/ProceduresEditor.form
index 960a478..60f179c 100644
--- a/src/ifml2/editor/gui/editors/ProceduresEditor.form
+++ b/src/ifml2/editor/gui/editors/ProceduresEditor.form
@@ -36,7 +36,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
             </children>
@@ -101,7 +101,7 @@
                       <component id="d00eb" class="javax.swing.JButton" binding="delProcedureButton">
                         <constraints/>
                         <properties>
-                          <text value="&amp;Удалить..."/>
+                          <text value="Удалить..."/>
                         </properties>
                       </component>
                     </children>
diff --git a/src/ifml2/editor/gui/editors/RestrictionEditor.form b/src/ifml2/editor/gui/editors/RestrictionEditor.form
index 0d65794..c0925ea 100644
--- a/src/ifml2/editor/gui/editors/RestrictionEditor.form
+++ b/src/ifml2/editor/gui/editors/RestrictionEditor.form
@@ -34,7 +34,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="OK"/>
+                  <text value="Подвтердить"/>
                 </properties>
               </component>
               <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
@@ -42,7 +42,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="Cancel"/>
+                  <text value="Отменить"/>
                 </properties>
               </component>
             </children>
@@ -95,7 +95,7 @@
                   <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;Редактировать инструкции..."/>
+                  <text value="Редактировать инструкции..."/>
                 </properties>
               </component>
               <scrollpane id="a5fb6">
diff --git a/src/ifml2/editor/gui/editors/RoleEditor.form b/src/ifml2/editor/gui/editors/RoleEditor.form
index e8d7790..96ec948 100644
--- a/src/ifml2/editor/gui/editors/RoleEditor.form
+++ b/src/ifml2/editor/gui/editors/RoleEditor.form
@@ -36,7 +36,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
               <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
@@ -44,7 +44,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;Cancel"/>
+                  <text value="Отменить"/>
                 </properties>
               </component>
             </children>
diff --git a/src/ifml2/editor/gui/editors/StoryOptionsEditor.form b/src/ifml2/editor/gui/editors/StoryOptionsEditor.form
index 606a0cc..d2d7760 100644
--- a/src/ifml2/editor/gui/editors/StoryOptionsEditor.form
+++ b/src/ifml2/editor/gui/editors/StoryOptionsEditor.form
@@ -34,7 +34,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
               <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
@@ -42,7 +42,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;Cancel"/>
+                  <text value="Отменить"/>
                 </properties>
               </component>
             </children>
@@ -145,7 +145,7 @@
                       <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                     </constraints>
                     <properties>
-                      <text value="Показывать &amp;описание стартовой локации в начале игры"/>
+                      <text value="Показывать описание стартовой локации в начале игры"/>
                     </properties>
                   </component>
                 </children>
diff --git a/src/ifml2/editor/gui/editors/TemplateEditor.form b/src/ifml2/editor/gui/editors/TemplateEditor.form
index df55f1d..41b4479 100644
--- a/src/ifml2/editor/gui/editors/TemplateEditor.form
+++ b/src/ifml2/editor/gui/editors/TemplateEditor.form
@@ -36,7 +36,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
               <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
@@ -44,7 +44,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="Cancel"/>
+                  <text value="Отменить"/>
                 </properties>
               </component>
             </children>
diff --git a/src/ifml2/editor/gui/editors/UsedLibsEditor.form b/src/ifml2/editor/gui/editors/UsedLibsEditor.form
index c134724..b448e9d 100644
--- a/src/ifml2/editor/gui/editors/UsedLibsEditor.form
+++ b/src/ifml2/editor/gui/editors/UsedLibsEditor.form
@@ -34,7 +34,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;Cancel"/>
+                  <text value="Отменить"/>
                 </properties>
               </component>
               <component id="79e6b" class="javax.swing.JButton" binding="buttonOK">
@@ -42,7 +42,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
             </children>
@@ -87,14 +87,14 @@
                 <constraints/>
                 <properties>
                   <icon value="ifml2/editor/gui/images/Add24.gif"/>
-                  <text value="&amp;Добавить..."/>
+                  <text value="Добавить..."/>
                 </properties>
               </component>
               <component id="4df39" class="javax.swing.JButton" binding="delButton">
                 <constraints/>
                 <properties>
                   <icon value="ifml2/editor/gui/images/Delete24.gif"/>
-                  <text value="&amp;Удалить..."/>
+                  <text value="Удалить..."/>
                 </properties>
               </component>
             </children>
diff --git a/src/ifml2/editor/gui/editors/WordLinksEditor.form b/src/ifml2/editor/gui/editors/WordLinksEditor.form
index f01af74..826b3b9 100644
--- a/src/ifml2/editor/gui/editors/WordLinksEditor.form
+++ b/src/ifml2/editor/gui/editors/WordLinksEditor.form
@@ -3,7 +3,7 @@
   <grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>
-      <xy x="48" y="54" width="508" height="245"/>
+      <xy x="48" y="54" width="508" height="280"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -159,13 +159,13 @@
               <component id="1c464" class="javax.swing.JButton" binding="newWordButton">
                 <constraints/>
                 <properties>
-                  <text value="&amp;Новое..."/>
+                  <text value="Новое..."/>
                 </properties>
               </component>
               <component id="e6c8d" class="javax.swing.JButton" binding="delWordButton">
                 <constraints/>
                 <properties>
-                  <text value="&amp;Удалить..."/>
+                  <text value="Удалить..."/>
                 </properties>
               </component>
             </children>
@@ -211,7 +211,7 @@
                       <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                     </constraints>
                     <properties>
-                      <text value="&amp;OK"/>
+                      <text value="Подтвердить"/>
                     </properties>
                   </component>
                 </children>
diff --git a/src/ifml2/editor/gui/instructions/GoToLocInstrEditor.form b/src/ifml2/editor/gui/instructions/GoToLocInstrEditor.form
index e84edd6..7af1b4c 100644
--- a/src/ifml2/editor/gui/instructions/GoToLocInstrEditor.form
+++ b/src/ifml2/editor/gui/instructions/GoToLocInstrEditor.form
@@ -34,7 +34,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
               <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
@@ -42,7 +42,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;Cancel"/>
+                  <text value="Отменить"/>
                 </properties>
               </component>
             </children>
@@ -93,7 +93,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;локация:"/>
+                  <text value="локация:"/>
                 </properties>
               </component>
               <component id="8006" class="javax.swing.JRadioButton" binding="exprRadio">
@@ -101,7 +101,7 @@
                   <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;выражение:"/>
+                  <text value="выражение:"/>
                 </properties>
               </component>
             </children>
diff --git a/src/ifml2/editor/gui/instructions/IfInstrEditor.form b/src/ifml2/editor/gui/instructions/IfInstrEditor.form
index ef95399..e9ab846 100644
--- a/src/ifml2/editor/gui/instructions/IfInstrEditor.form
+++ b/src/ifml2/editor/gui/instructions/IfInstrEditor.form
@@ -36,7 +36,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
               <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
@@ -44,7 +44,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="Cancel"/>
+                  <text value="Отменить"/>
                 </properties>
               </component>
             </children>
diff --git a/src/ifml2/editor/gui/instructions/MoveItemInstrEditor.form b/src/ifml2/editor/gui/instructions/MoveItemInstrEditor.form
index 9be7d57..aa7c809 100644
--- a/src/ifml2/editor/gui/instructions/MoveItemInstrEditor.form
+++ b/src/ifml2/editor/gui/instructions/MoveItemInstrEditor.form
@@ -3,7 +3,7 @@
   <grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>
-      <xy x="48" y="54" width="536" height="297"/>
+      <xy x="48" y="54" width="625" height="297"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -34,7 +34,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
               <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
@@ -42,7 +42,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;Cancel"/>
+                  <text value="Отменить"/>
                 </properties>
               </component>
             </children>
@@ -100,7 +100,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;предмет:"/>
+                  <text value="предмет:"/>
                 </properties>
               </component>
               <component id="5997f" class="javax.swing.JRadioButton" binding="itemExprRadio">
@@ -108,7 +108,7 @@
                   <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;выражение:"/>
+                  <text value="выражение:"/>
                 </properties>
               </component>
               <component id="4d472" class="javax.swing.JTextField" binding="itemExprText">
diff --git a/src/ifml2/editor/gui/instructions/ReturnInstrEditor.form b/src/ifml2/editor/gui/instructions/ReturnInstrEditor.form
index a6126d3..cdcea69 100644
--- a/src/ifml2/editor/gui/instructions/ReturnInstrEditor.form
+++ b/src/ifml2/editor/gui/instructions/ReturnInstrEditor.form
@@ -34,7 +34,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
               <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
@@ -42,7 +42,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="Cancel"/>
+                  <text value="Отменить"/>
                 </properties>
               </component>
             </children>
diff --git a/src/ifml2/editor/gui/instructions/RollDiceInstrEditor.form b/src/ifml2/editor/gui/instructions/RollDiceInstrEditor.form
index a180e15..d9e0f65 100644
--- a/src/ifml2/editor/gui/instructions/RollDiceInstrEditor.form
+++ b/src/ifml2/editor/gui/instructions/RollDiceInstrEditor.form
@@ -34,7 +34,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
               <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
@@ -42,7 +42,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;Cancel"/>
+                  <text value="Отменить"/>
                 </properties>
               </component>
             </children>
diff --git a/src/ifml2/editor/gui/instructions/RunProcedureInstrEditor.form b/src/ifml2/editor/gui/instructions/RunProcedureInstrEditor.form
index d92c6f5..ff092a1 100644
--- a/src/ifml2/editor/gui/instructions/RunProcedureInstrEditor.form
+++ b/src/ifml2/editor/gui/instructions/RunProcedureInstrEditor.form
@@ -34,7 +34,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
               <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
@@ -42,7 +42,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="Cancel"/>
+                  <text value="Отменить"/>
                 </properties>
               </component>
             </children>
diff --git a/src/ifml2/editor/gui/instructions/SetVarInstrEditor.form b/src/ifml2/editor/gui/instructions/SetVarInstrEditor.form
index 828fbba..82bacfd 100644
--- a/src/ifml2/editor/gui/instructions/SetVarInstrEditor.form
+++ b/src/ifml2/editor/gui/instructions/SetVarInstrEditor.form
@@ -3,7 +3,7 @@
   <grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>
-      <xy x="48" y="54" width="469" height="204"/>
+      <xy x="48" y="54" width="575" height="230"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -34,7 +34,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
               <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
@@ -42,7 +42,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;Cancel"/>
+                  <text value="Отменить"/>
                 </properties>
               </component>
             </children>
diff --git a/src/ifml2/editor/gui/instructions/ShowMessageInstrEditor.form b/src/ifml2/editor/gui/instructions/ShowMessageInstrEditor.form
index 5bbf97b..b64592c 100644
--- a/src/ifml2/editor/gui/instructions/ShowMessageInstrEditor.form
+++ b/src/ifml2/editor/gui/instructions/ShowMessageInstrEditor.form
@@ -3,7 +3,7 @@
   <grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>
-      <xy x="48" y="54" width="424" height="370"/>
+      <xy x="48" y="54" width="491" height="370"/>
     </constraints>
     <properties>
       <preferredSize width="640" height="480"/>
@@ -36,7 +36,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
               <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
@@ -44,7 +44,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;Cancel"/>
+                  <text value="Отменить"/>
                 </properties>
               </component>
             </children>
@@ -97,7 +97,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;Текст"/>
+                  <text value="Текст"/>
                 </properties>
               </component>
               <component id="10c01" class="javax.swing.JRadioButton" binding="exprTypeRadio">
@@ -105,7 +105,7 @@
                   <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="&amp;Выражение"/>
+                  <text value="Выражение"/>
                 </properties>
               </component>
             </children>
@@ -123,7 +123,7 @@
               <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="&amp;Сделать первую букву заглавной при выводе на экран"/>
+              <text value="Сделать первую букву заглавной при выводе на экран"/>
             </properties>
           </component>
           <component id="3ff9f" class="javax.swing.JCheckBox" binding="carriageReturnCheck">
@@ -131,7 +131,7 @@
               <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="&amp;Добавить перевод строки в конце при выводе на экран"/>
+              <text value="Добавить перевод строки в конце при выводе на экран"/>
             </properties>
           </component>
         </children>
diff --git a/src/ifml2/editor/gui/instructions/ShowPictureInstrEditor.form b/src/ifml2/editor/gui/instructions/ShowPictureInstrEditor.form
index cec6642..e96607a 100644
--- a/src/ifml2/editor/gui/instructions/ShowPictureInstrEditor.form
+++ b/src/ifml2/editor/gui/instructions/ShowPictureInstrEditor.form
@@ -3,7 +3,7 @@
   <grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>
-      <xy x="48" y="54" width="494" height="322"/>
+      <xy x="48" y="54" width="542" height="324"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -34,7 +34,7 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="OK"/>
+                  <text value="Подтвердить"/>
                 </properties>
               </component>
               <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
@@ -42,7 +42,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="Cancel"/>
+                  <text value="Отменить"/>
                 </properties>
               </component>
             </children>

From b8160de6e4ed1781fa13d28ef9be3ad40eb543cb Mon Sep 17 00:00:00 2001
From: Madzi <eliseevsan@gmail.com>
Date: Fri, 9 Sep 2022 00:30:14 +0200
Subject: [PATCH 3/8] Provide all dependencies into one jar file - fat jar

---
 .gitignore |  1 +
 pom.xml    | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/.gitignore b/.gitignore
index 3446b03..f80a1b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 *.exe
 /bitrock/*.run
 target/
+bin/
 .project
 .classpath
 .settings/
diff --git a/pom.xml b/pom.xml
index 89bbcd9..f564c5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,5 +74,39 @@
     <build>
         <sourceDirectory>src</sourceDirectory>
         <testSourceDirectory>unittests</testSourceDirectory>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.10.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>3.4.2</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>

From f3f5f1fb8a9968d37bf4071e8b49b0d6e9adb372 Mon Sep 17 00:00:00 2001
From: Madzi <eliseevsan@gmail.com>
Date: Fri, 9 Sep 2022 01:21:14 +0200
Subject: [PATCH 4/8] setup exec plugin

---
 pom.xml                  | 75 ++++++++++++++++++++++++++++++++++++++++
 src/META-INF/MANIFEST.MF |  3 --
 2 files changed, 75 insertions(+), 3 deletions(-)
 delete mode 100644 src/META-INF/MANIFEST.MF

diff --git a/pom.xml b/pom.xml
index f564c5d..b0fe5aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,7 @@
         <java.version>1.8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
+        <exec.mainClass>ifml2.Launcher</exec.mainClass>
     </properties>
 
     <dependencies>
@@ -74,6 +75,11 @@
     <build>
         <sourceDirectory>src</sourceDirectory>
         <testSourceDirectory>unittests</testSourceDirectory>
+        <resources>
+            <resource>
+                <directory>${project.basedir}/src/ifml2/editor/gui/images</directory>
+            </resource>
+        </resources>
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -86,6 +92,21 @@
                     <artifactId>maven-assembly-plugin</artifactId>
                     <version>3.4.2</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>3.2.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>3.3.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <version>3.1.0</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -107,6 +128,60 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <index>true</index>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <mainClass>ifml2.Launcher</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <executable>${java.home}/bin/java</executable>
+                    <mainClass>ifml2.Launcher</mainClass>
+                    <arguments>
+                        <argument>-cp</argument>
+                        <argument>target/${project.build.finalName}-jar-with-dependencies.jar</argument>
+                        <argument>${exec.mainClass}</argument>
+                    </arguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <outputDirectory>target/classes/ifml2/editor/gui/images</outputDirectory>
+                    <resources>
+                        <resource>
+                            <directory>${project.basedir}/src/ifml2/editor/gui/images</directory>
+                        </resource>
+                    </resources>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF
deleted file mode 100644
index 5076332..0000000
--- a/src/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: ifml2.Launcher
-

From 95c7b1a7a88c662194e8a32fbe3957058a33dee7 Mon Sep 17 00:00:00 2001
From: Madzi <eliseevsan@gmail.com>
Date: Fri, 9 Sep 2022 01:27:34 +0200
Subject: [PATCH 5/8] Improve CI/CD

---
 .github/workflows/mvn.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/mvn.yaml b/.github/workflows/mvn.yaml
index 64f54e4..e206a9e 100644
--- a/.github/workflows/mvn.yaml
+++ b/.github/workflows/mvn.yaml
@@ -4,9 +4,12 @@ on:
   push:
     branches:
       - master
+      - develop
+      - feature/**
   pull_request:
     branches:
       - master
+      - develop
 jobs:
   test:
     name: Tests

From fdba949ca11dd66514efffb5ba013fa495a2fed3 Mon Sep 17 00:00:00 2001
From: Madzi <eliseevsan@gmail.com>
Date: Fri, 9 Sep 2022 01:32:19 +0200
Subject: [PATCH 6/8] Add gitflow plugin

---
 pom.xml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/pom.xml b/pom.xml
index b0fe5aa..b719e05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,6 +107,11 @@
                     <artifactId>exec-maven-plugin</artifactId>
                     <version>3.1.0</version>
                 </plugin>
+                <plugin>
+                    <groupId>com.amashchenko.maven.plugin</groupId>
+                    <artifactId>gitflow-maven-plugin</artifactId>
+                    <version>1.18.0</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -182,6 +187,24 @@
                     </resources>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.amashchenko.maven.plugin</groupId>
+                <artifactId>gitflow-maven-plugin</artifactId>
+                <configuration>
+                    <gitFlowConfig>
+                        <productionBranch>master</productionBranch>
+                        <developmentBranch>develop</developmentBranch>
+                        <featureBranchPrefix>feature/</featureBranchPrefix>
+                        <releaseBranchPrefix>release/</releaseBranchPrefix>
+                        <hotfixBranchPrefix>hotfix/</hotfixBranchPrefix>
+                        <supportBranchPrefix>support/</supportBranchPrefix>
+                        <versionTagPrefix>v</versionTagPrefix>
+                        <origin>origin</origin>
+                    </gitFlowConfig>
+                    <fetchRemote>true</fetchRemote>
+                    <pushRemote>true</pushRemote>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

From 90b69e819e43d22bee084cd89c96a96390455af5 Mon Sep 17 00:00:00 2001
From: Madzi <eliseevsan@gmail.com>
Date: Fri, 9 Sep 2022 01:36:33 +0200
Subject: [PATCH 7/8] Update versions for feature branch

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b719e05..b15e793 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>ifml2</groupId>
     <artifactId>ifml2</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-move-to-java-17-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>IFML2</name>

From 46e1ef8e1947b482b50976debcea7a6ca758586d Mon Sep 17 00:00:00 2001
From: Madzi <eliseevsan@gmail.com>
Date: Fri, 9 Sep 2022 01:45:06 +0200
Subject: [PATCH 8/8] Update versions for development branch

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b15e793..b719e05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>ifml2</groupId>
     <artifactId>ifml2</artifactId>
-    <version>1.0-move-to-java-17-SNAPSHOT</version>
+    <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>IFML2</name>