diff --git a/.github/workflows/mvn.yaml b/.github/workflows/mvn.yaml
new file mode 100644
index 00000000..64f54e44
--- /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 ad221e3c..c2ff38a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,16 @@
 *.backup
 *.exe
 /bitrock/*.run
-/.idea/dictionaries/*.xml
-/Games/*.temp
-/.idea/dictionaries/mbalanov.xml
+# Temporal
 /Games/*.temp
+# Idea
+.idea/
+# Maven
+target/
+bin/
+# Eclipse
+.project
+.classpath
+.settings/
+# NetBeans
+nb-configuration.xml
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 00000000..f564c5d1
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,112 @@
+<?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>
+        <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>
diff --git a/src/ifml2/editor/gui/ShowMemoDialog.form b/src/ifml2/editor/gui/ShowMemoDialog.form
index e9e9c4dd..ff923eb6 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 21a93934..15b1b0f6 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 2b01411c..f2a6c74a 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 252dcc0a..e4fdaad8 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 24ec44d1..9ad5c5ef 100644
--- a/src/ifml2/editor/gui/editors/HookEditor.form
+++ b/src/ifml2/editor/gui/editors/HookEditor.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>
@@ -109,7 +109,7 @@
                 </constraints>
                 <properties>
                   <selected value="true"/>
-                  <text value="д&amp;о действия"/>
+                  <text value="до действия"/>
                 </properties>
               </component>
               <component id="3fc1" class="javax.swing.JRadioButton" binding="insteadRadio">
@@ -117,7 +117,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">
@@ -126,7 +126,7 @@
                 </constraints>
                 <properties>
                   <selected value="false"/>
-                  <text value="по&amp;сле действия"/>
+                  <text value="после действия"/>
                 </properties>
               </component>
             </children>
@@ -152,7 +152,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 c9db37da..50feb7b3 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 bbd1be85..6b2fa528 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 2c05d0cc..f189e01e 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 ac52f415..4b4d4ec7 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 cb7fc6ba..0ae8cf1e 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 46e0a1d1..565537e2 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 30272409..0c392a46 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 0bc1791a..b779b924 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 960a478b..60f179cb 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 0d657942..c0925ea2 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 e8d7790d..96ec9486 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 606a0cc8..d2d7760b 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 df55f1d7..41b4479e 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 c1347244..b448e9da 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 f01af746..826b3b9d 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 e84edd69..7af1b4c0 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 ef953991..e9ab8460 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 9be7d57a..aa7c8097 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 a6126d34..cdcea695 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 a180e151..d9e0f65c 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 d92c6f5c..ff092a1e 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 828fbbab..82bacfd3 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 5bbf97b4..b64592c8 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 cec6642e..e96607a7 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>