From 88f7e4ccb03ce2eb561b0faba1957503aae4a27a Mon Sep 17 00:00:00 2001
From: DeaDDooMER <deaddoomer@deadsoftware.ru>
Date: Mon, 29 May 2023 14:51:48 +0300
Subject: [PATCH] i10n: fix menu translations

---
 lang/editor.ru_RU.lng     |  71 +++++++++++++++----------
 src/editor/f_main.lfm     |   8 +--
 src/editor/f_main.pas     | 109 ++++++++++++++++++--------------------
 src/editor/g_language.pas | 101 ++++++++++++++++++++---------------
 4 files changed, 156 insertions(+), 133 deletions(-)

diff --git a/lang/editor.ru_RU.lng b/lang/editor.ru_RU.lng
index e3633dd..d3ee951 100644
--- a/lang/editor.ru_RU.lng
+++ b/lang/editor.ru_RU.lng
@@ -674,12 +674,22 @@ g_language.MsgHintWidth  = "Ширина: %d"
 g_language.MsgHintHeight$ = "Height: %d"
 g_language.MsgHintHeight  = "Высота: %d"
 
+; OSX specific menu
+g_language.MsgMenuAppleAbout$ = "About Editor"
+g_language.MsgMenuAppleAbout  = "О программе Editor"
+g_language.MsgMenuApplePref$  = "Preferences..."
+g_language.MsgMenuApplePref   = "Настройки..."
+
 g_language.MsgMenuFile$ = "File"
 g_language.MsgMenuFile  = "Файл"
 g_language.MsgMenuFileNew$ = "New"
 g_language.MsgMenuFileNew  = "Создать"
 g_language.MsgMenuFileOpen$ = "Open..."
 g_language.MsgMenuFileOpen  = "Открыть..."
+g_language.MsgMenuFileRecentMac$ = "Open Recent"
+g_language.MsgMenuFileRecentMac  = "Открыть недавно использованные"
+g_language.MsgMenuFileRecentClearMac$ = "Clear Recent"
+g_language.MsgMenuFileRecentClearMac  = "Отчистить меню"
 g_language.MsgMenuFileSave$ = "Save"
 g_language.MsgMenuFileSave  = "Сохранить"
 g_language.MsgMenuFileSaveAs$ = "Save As..."
@@ -687,15 +697,17 @@ g_language.MsgMenuFileSaveAs  = "Сохранить как..."
 g_language.MsgMenuFileOpenWad$ = "Select Map..."
 g_language.MsgMenuFileOpenWad  = "Выбрать карту..."
 g_language.MsgMenuFileReopen$ = "Revert to Saved"
-g_language.MsgMenuFileReopen  = "Открыть заново"
+g_language.MsgMenuFileReopen  = "Вернуться к сохраненному"
 g_language.MsgMenuFileSaveMini$ = "Save Minimap..."
 g_language.MsgMenuFileSaveMini  = "Сохранить мини-карту..."
-g_language.MsgMenuFileDelete$ = "Delete from WAD..."
+g_language.MsgMenuFileDelete$ = "Remove from WAD..."
 g_language.MsgMenuFileDelete  = "Удалить из WAD..."
 g_language.MsgMenuFilePackMap$ = "Pack to WAD..."
 g_language.MsgMenuFilePackMap  = "Упаковать в WAD..."
-g_language.MsgMenuFileExit$ = "Exit"
-g_language.MsgMenuFileExit  = "Выход"
+g_language.MsgMenuFileRecentWin$ = "Recent Files"
+g_language.MsgMenuFileRecentWin  = "Недавние файлы"
+g_language.MsgMenuFileExitWin$ = "Exit"
+g_language.MsgMenuFileExitWin  = "Выход"
 
 g_language.MsgMenuEdit$ = "Edit"
 g_language.MsgMenuEdit  = "Правка"
@@ -709,23 +721,29 @@ g_language.MsgMenuEditPaste$ = "Paste"
 g_language.MsgMenuEditPaste  = "Вставить"
 g_language.MsgMenuEditSelectAll$ = "Select All"
 g_language.MsgMenuEditSelectAll  = "Выделить всё"
+g_language.MsgMenuEditSnapGrid$ = "Snap to Grid"
+g_language.MsgMenuEditSnapGrid  = "Привязывать к сетке"
+g_language.MsgMenuEditStepGrid$ = "Switch Grid Granularity"
+g_language.MsgMenuEditStepGrid  = "Переключить шаг сетки"
 g_language.MsgMenuEditToFore$ = "Bring to Front"
 g_language.MsgMenuEditToFore  = "Передвинуть вперёд"
 g_language.MsgMenuEditToBack$ = "Send to Back"
 g_language.MsgMenuEditToBack  = "Передвинуть назад"
+g_language.MsgMenuEditMapProps$ = "Map Properties..."
+g_language.MsgMenuEditMapProps  = "Свойства карты..."
+g_language.MsgMenuEditPrefWin$ = "Preferences..."
+g_language.MsgMenuEditPrefWin  = "Настройки..."
 
-g_language.MsgMenuTools$ = "Tools"
-g_language.MsgMenuTools  = "Инструменты"
-g_language.MsgMenuToolsSnapGrid$ = "Snap to Grid"
-g_language.MsgMenuToolsSnapGrid  = "Привязка к сетке"
-g_language.MsgMenuToolsMinimap$ = "Show Minimap"
-g_language.MsgMenuToolsMinimap  = "Показать Мини-карту"
-g_language.MsgMenuToolsStepGrid$ = "Switch Grid Granularity"
-g_language.MsgMenuToolsStepGrid  = "Переключить шаг сетки"
-g_language.MsgMenuToolsShowEdges$ = "Show Map Bounds"
-g_language.MsgMenuToolsShowEdges  = "Показывать границы карты"
-g_language.MsgMenuToolsLayers$ = "Layers"
-g_language.MsgMenuToolsLayers  = "Слои"
+g_language.MsgMenuView$ = "View"
+g_language.MsgMenuView  = "Вид"
+g_language.MsgMenuViewLayers$ = "Layers"
+g_language.MsgMenuViewLayers  = "Слои"
+g_language.MsgMenuViewMinimap$ = "Show Minimap"
+g_language.MsgMenuViewMinimap  = "Показывать мини-карту"
+g_language.MsgMenuViewBounds$ = "Show Map Bounds"
+g_language.MsgMenuViewBounds  = "Показывать границы карты"
+g_language.MsgMenuViewPreview$ = "Preview Mode"
+g_language.MsgMenuViewPreview  = "Предварительный просмотр"
 
 g_language.MsgMenuServ$ = "Service"
 g_language.MsgMenuServ  = "Сервис"
@@ -733,24 +751,21 @@ g_language.MsgMenuServTest$ = "Analyse Map..."
 g_language.MsgMenuServTest  = "Проверка карты..."
 g_language.MsgMenuServOpt$ = "Optimize Map..."
 g_language.MsgMenuServOpt  = "Оптимизация карты..."
-g_language.MsgMenuServPreview$ = "Preview Mode"
-g_language.MsgMenuServPreview  = "Предварительный просмотр"
 g_language.MsgMenuServLaunch$ = "Run Test"
 g_language.MsgMenuServLaunch  = "Тест карты в игре"
 
-g_language.MsgMenuSets$ = "Settings"
-g_language.MsgMenuSets  = "Настройка"
-g_language.MsgMenuSetsMap$ = "Map Properties..."
-g_language.MsgMenuSetsMap  = "Свойства карты..."
-g_language.MsgMenuSetsEditor$ = "Preferences..."
-g_language.MsgMenuSetsEditor  = "Настройки..."
-g_language.MsgMenuSetsLaunch$ = "In-game test settings"
-g_language.MsgMenuSetsLaunch  = "Настройки теста в игре"
+; OSX specific menu
+g_language.MsgMenuWindow$ = "Window"
+g_language.MsgMenuWindow  = "Окно"
+g_language.MsgMenuWindowMinimize$ = "Minimize"
+g_language.MsgMenuWindowMinimize  = "Убрать в Dock"
+g_language.MsgMenuWindowZoom$ = "Zoom"
+g_language.MsgMenuWindowZoom  = "Изменить масштаб"
 
 g_language.MsgMenuHelp$ = "Help"
 g_language.MsgMenuHelp  = "Справка"
-g_language.MsgMenuHelpAbout$ = "About"
-g_language.MsgMenuHelpAbout  = "О программе"
+g_language.MsgMenuHelpAboutWin$ = "About Editor"
+g_language.MsgMenuHelpAboutWin  = "О программе Editor"
 
 g_language.MsgMenuLayerBack$ = "1. Background"
 g_language.MsgMenuLayerBack  = "1. Фон"
diff --git a/src/editor/f_main.lfm b/src/editor/f_main.lfm
index 7c0561f..e9cad5e 100644
--- a/src/editor/f_main.lfm
+++ b/src/editor/f_main.lfm
@@ -1,7 +1,7 @@
 object MainForm: TMainForm
-  Left = 933
+  Left = 1406
   Height = 480
-  Top = 499
+  Top = 831
   Width = 672
   AllowDropFiles = True
   Caption = '2'
@@ -227,7 +227,7 @@ object MainForm: TMainForm
     ClientHeight = 111
     ClientWidth = 672
     Constraints.MinHeight = 111
-    TabOrder = 3
+    TabOrder = 2
     object pcObjects: TPageControl
       Left = 2
       Height = 107
@@ -638,7 +638,7 @@ object MainForm: TMainForm
     ButtonWidth = 31
     Caption = 'MainToolBar'
     Images = ilToolbar
-    TabOrder = 4
+    TabOrder = 3
     object tbNewMap: TToolButton
       Left = 1
       Hint = 'Очистить карту'
diff --git a/src/editor/f_main.pas b/src/editor/f_main.pas
index 86ec6b4..3eb8946 100644
--- a/src/editor/f_main.pas
+++ b/src/editor/f_main.pas
@@ -15,33 +15,44 @@ type
   { TMainForm }
 
   TMainForm = class(TForm)
-    lLoad: TLabel;
-  // Главное меню:
+    MapTestTimer: TTimer;
+    Splitter1: TSplitter;
+    Splitter2: TSplitter;
+    StatusBar: TStatusBar;
+    OpenDialog: TOpenDialog;
+    SaveDialog: TSaveDialog;
+    ColorDialog: TColorDialog;
+
+  // Menu:
     MainMenu: TMainMenu;
+    ImageList: TImageList;
   // Apple menu:
     miApple: TMenuItem;
     miAppleAbout: TMenuItem;
     miAppleLine0: TMenuItem;
     miApplePref: TMenuItem;
     miAppleLine1: TMenuItem;
-  // "Файл":
+  // File menu:
     miMenuFile: TMenuItem;
     miNewMap: TMenuItem;
     miOpenMap: TMenuItem;
-    miSaveMap: TMenuItem;
-    miSaveMapAs: TMenuItem;
     miMacRecentSubMenu: TMenuItem;
+    miMacRecentEnd: TMenuItem;
     miMacRecentClear: TMenuItem;
+    Separator1: TMenuItem;
+    miSaveMap: TMenuItem;
+    miSaveMapAs: TMenuItem;
     miOpenWadMap: TMenuItem;
     miLine1: TMenuItem;
     miReopenMap: TMenuItem;
     miSaveMiniMap: TMenuItem;
     miDeleteMap: TMenuItem;
     miPackMap: TMenuItem;
+    miWinRecentStart: TMenuItem;
     miWinRecent: TMenuItem;
     miLine2: TMenuItem;
     miExit: TMenuItem;
-  // "Правка":
+  // Edit menu:
     miMenuEdit: TMenuItem;
     miUndo: TMenuItem;
     miLine3: TMenuItem;
@@ -51,11 +62,16 @@ type
     miLine4: TMenuItem;
     miSelectAll: TMenuItem;
     miLine5: TMenuItem;
+    miSnapToGrid: TMenuItem;
+    miSwitchGrid: TMenuItem;
+    Separator2: TMenuItem;
     miToFore: TMenuItem;
     miToBack: TMenuItem;
+    miLine6: TMenuItem;
+    miMapOptions: TMenuItem;
+    miOptions: TMenuItem;
   // View menu:
     miMenuView: TMenuItem;
-    miShowEdges: TMenuItem;
     miLayers: TMenuItem;
     miLayer1: TMenuItem;
     miLayer2: TMenuItem;
@@ -68,14 +84,10 @@ type
     miLayer9: TMenuItem;
     miViewLine1: TMenuItem;
     miMiniMap: TMenuItem;
+    miShowEdges: TMenuItem;
     miViewLine2: TMenuItem;
     miMapPreview: TMenuItem;
-    miSnapToGrid: TMenuItem;
-    miSwitchGrid: TMenuItem;
-    miLine6: TMenuItem;
-    miOptions: TMenuItem;
-    miMapOptions: TMenuItem;
-  // "Сервис":
+  // Service menu:
     miMenuService: TMenuItem;
     miCheckMap: TMenuItem;
     miOptimmization: TMenuItem;
@@ -84,22 +96,17 @@ type
     miMenuWindow: TMenuItem;
     miMacMinimize: TMenuItem;
     miMacZoom: TMenuItem;
-  // "Справка":
+  // Help Menu:
     miMenuHelp: TMenuItem;
     miAbout: TMenuItem;
-  // Скрытый пункт меню для Ctrl+Tab:
+  // HIDDEN menu:
     miMenuHidden: TMenuItem;
     minexttab: TMenuItem;
+    selectall1: TMenuItem;
 
-  // Панель инструментов:
+  // Toolbar:
+    ilToolbar: TImageList;
     MainToolBar: TToolBar;
-    pbLoad: TProgressBar;
-    pLoadProgress: TPanel;
-    RenderPanel: TOpenGLControl;
-    Separator1: TMenuItem;
-    miMacRecentEnd: TMenuItem;
-    miWinRecentStart: TMenuItem;
-    Separator2: TMenuItem;
     tbNewMap: TToolButton;
     tbOpenMap: TToolButton;
     tbSaveMap: TToolButton;
@@ -108,12 +115,6 @@ type
     tbShowMap: TToolButton;
     tbLine2: TToolButton;
     tbShow: TToolButton;
-    tbLine3: TToolButton;
-    tbGridOn: TToolButton;
-    tbGrid: TToolButton;
-    tbLine4: TToolButton;
-    tbTestMap: TToolButton;
-  // Всплывающее меню для кнопки слоев:
     pmShow: TPopupMenu;
     miLayerP1: TMenuItem;
     miLayerP2: TMenuItem;
@@ -124,29 +125,37 @@ type
     miLayerP7: TMenuItem;
     miLayerP8: TMenuItem;
     miLayerP9: TMenuItem;
+    tbLine3: TToolButton;
+    tbGridOn: TToolButton;
+    tbGrid: TToolButton;
+    tbLine4: TToolButton;
+    tbTestMap: TToolButton;
+
+  // Progress bar:
+    pLoadProgress: TPanel;
+    lLoad: TLabel;
+    pbLoad: TProgressBar;
 
-  // Панель карты:
+  // Map edit area:
     PanelMap: TPanel;
-  // Полосы прокрутки:
+    RenderPanel: TOpenGLControl;
     sbHorizontal: TScrollBar;
     sbVertical: TScrollBar;
 
-  // Панель свойств:
+  // Object propertiy editor:
     PanelProps: TPanel;
-  // Панель применения свойств:
     PanelPropApply: TPanel;
     bApplyProperty: TButton;
-    MapTestTimer: TTimer;
-  // Редактор свойств объектов:
     vleObjectProperty: TValueListEditor;
 
-  // Панель объектов - вкладки:
+  // Object palette:
     PanelObjs: TPanel;
     pcObjects: TPageControl;
-  // Вкладка "Панели":
+  // Panels Tab:
     tsPanels: TTabSheet;
+    PanelPanelType: TPanel;
+    lbPanelType: TListBox;
     lbTextureList: TListBox;
-  // Панель настройки текстур:
     PanelTextures: TPanel;
     LabelTxW: TLabel;
     lTextureWidth: TLabel;
@@ -156,43 +165,27 @@ type
     bbAddTexture: TBitBtn;
     bbRemoveTexture: TBitBtn;
     bClearTexture: TButton;
-  // Панель типов панелей:
-    PanelPanelType: TPanel;
-    lbPanelType: TListBox;
-  // Вкладка "Предметы":
+  // Items Tab:
     tsItems: TTabSheet;
     lbItemList: TListBox;
     cbOnlyDM: TCheckBox;
     cbFall: TCheckBox;
-  // Вкладка "Монстры":
+  // Monsters Tab:
     tsMonsters: TTabSheet;
     lbMonsterList: TListBox;
     rbMonsterLeft: TRadioButton;
     rbMonsterRight: TRadioButton;
-  // Вкладка "Области":
+  // Areas Tab:
     tsAreas: TTabSheet;
     lbAreasList: TListBox;
     rbAreaLeft: TRadioButton;
     rbAreaRight: TRadioButton;
-  // Вкладка "Триггеры":
+  // Triggers Tab:
     tsTriggers: TTabSheet;
     lbTriggersList: TListBox;
     clbActivationType: TCheckListBox;
     clbKeys: TCheckListBox;
 
-  // Остальные панели
-    Splitter1: TSplitter;
-    Splitter2: TSplitter;
-    StatusBar: TStatusBar;
-
-  // Специальные объекты:
-    ImageList: TImageList;
-    ilToolbar: TImageList;
-    OpenDialog: TOpenDialog;
-    SaveDialog: TSaveDialog;
-    selectall1: TMenuItem;
-    ColorDialog: TColorDialog;
-
     procedure aAboutExecute(Sender: TObject);
     procedure aCheckMapExecute(Sender: TObject);
     procedure aMoveToFore(Sender: TObject);
diff --git a/src/editor/g_language.pas b/src/editor/g_language.pas
index 4d322f2..b97edfe 100644
--- a/src/editor/g_language.pas
+++ b/src/editor/g_language.pas
@@ -339,17 +339,23 @@ Interface
     MsgHintWidth = 'Width: %d';
     MsgHintHeight = 'Height: %d';
 
+    MsgMenuAppleAbout = 'About Editor';
+    MsgMenuApplePref = 'Preferences...';
+
     MsgMenuFile = 'File';
     MsgMenuFileNew = 'New';
     MsgMenuFileOpen = 'Open...';
+    MsgMenuFileRecentMac = 'Open Recent';
+    MsgMenuFileRecentClearMac = 'Clear Recent';
     MsgMenuFileSave = 'Save';
     MsgMenuFileSaveAs = 'Save As...';
     MsgMenuFileOpenWad = 'Select Map...';
     MsgMenuFileReopen = 'Revert to Saved';
     MsgMenuFileSaveMini = 'Save Minimap...';
-    MsgMenuFileDelete = 'Delete from WAD...';
+    MsgMenuFileDelete = 'Remove from WAD...';
     MsgMenuFilePackMap = 'Pack to WAD...';
-    MsgMenuFileExit = 'Exit';
+    MsgMenuFileRecentWin = 'Recent Files';
+    MsgMenuFileExitWin = 'Exit';
 
     MsgMenuEdit = 'Edit';
     MsgMenuEditUndo = 'Undo';
@@ -357,29 +363,30 @@ Interface
     MsgMenuEditCut = 'Cut';
     MsgMenuEditPaste = 'Paste';
     MsgMenuEditSelectAll = 'Select All';
+    MsgMenuEditSnapGrid = 'Snap to Grid';
+    MsgMenuEditStepGrid = 'Switch Grid Granularity';
     MsgMenuEditToFore = 'Bring to Front';
     MsgMenuEditToBack = 'Send to Back';
+    MsgMenuEditMapProps = 'Map Properties...';
+    MsgMenuEditPrefWin = 'Preferences...';
 
-    MsgMenuTools = 'Tools';
-    MsgMenuToolsSnapGrid = 'Snap to Grid';
-    MsgMenuToolsMinimap = 'Show Minimap';
-    MsgMenuToolsStepGrid = 'Switch Grid Granularity';
-    MsgMenuToolsShowEdges = 'Show Map Bounds';
-    MsgMenuToolsLayers = 'Layers';
+    MsgMenuView = 'View';
+    MsgMenuViewLayers = 'Layers';
+    MsgMenuViewMinimap = 'Show Minimap';
+    MsgMenuViewBounds = 'Show Map Bounds';
+    MsgMenuViewPreview = 'Preview Mode';
 
     MsgMenuServ = 'Service';
     MsgMenuServTest = 'Analyse Map...';
     MsgMenuServOpt = 'Optimize Map...';
-    MsgMenuServPreview = 'Preview Mode';
     MsgMenuServLaunch = 'Run Test';
 
-    MsgMenuSets = 'Settings';
-    MsgMenuSetsMap = 'Map Properties...';
-    MsgMenuSetsEditor = 'Preferences...';
-    MsgMenuSetsLaunch = 'In-game test settings';
+    MsgMenuWindow = 'Window';
+    MsgMenuWindowMinimize = 'Minimize';
+    MsgMenuWindowZoom = 'Zoom';
 
     MsgMenuHelp = 'Help';
-    MsgMenuHelpAbout = 'About';
+    MsgMenuHelpAboutWin = 'About Editor';
 
     MsgMenuLayerBack = '1. Background';
     MsgMenuLayerWall = '2. Walls';
@@ -881,11 +888,16 @@ begin
       end
     else
       Caption := FormCaption;
-  // Главное меню:
-  // "Файл":
+
+  // Apple menu:
+    miAppleAbout.Caption := MsgMenuAppleAbout;
+    miApplePref.Caption := MsgMenuApplePref;
+  // File menu:
     miMenuFile.Caption := MsgMenuFile;
     miNewMap.Caption := MsgMenuFileNew;
     miOpenMap.Caption := MsgMenuFileOpen;
+    miMacRecentSubMenu.Caption := MsgMenuFileRecentMac;
+    miMacRecentClear.Caption := MsgMenuFileRecentClearMac;
     miSaveMap.Caption := MsgMenuFileSave;
     miSaveMapAs.Caption := MsgMenuFileSaveAs;
     miOpenWadMap.Caption := MsgMenuFileOpenWad;
@@ -893,22 +905,24 @@ begin
     miSaveMiniMap.Caption := MsgMenuFileSaveMini;
     miDeleteMap.Caption := MsgMenuFileDelete;
     miPackMap.Caption := MsgMenuFilePackMap;
-    miExit.Caption := MsgMenuFileExit;
-  // "Правка":
+    miWinRecent.Caption := MsgMenuFileRecentWin;
+    miExit.Caption := MsgMenuFileExitWin;
+  // Edit menu:
     miMenuEdit.Caption := MsgMenuEdit;
     miUndo.Caption := MsgMenuEditUndo;
     miCopy.Caption := MsgMenuEditCopy;
     miCut.Caption := MsgMenuEditCut;
     miPaste.Caption := MsgMenuEditPaste;
     miSelectAll.Caption := MsgMenuEditSelectAll;
+    miSnapToGrid.Caption := MsgMenuEditSnapGrid;
+    miSwitchGrid.Caption := MsgMenuEditStepGrid;
     miToFore.Caption := MsgMenuEditToFore;
     miToBack.Caption := MsgMenuEditToBack;
-  // "Инструменты":
-    miSnapToGrid.Caption := MsgMenuToolsSnapGrid;
-    miMiniMap.Caption := MsgMenuToolsMinimap;
-    miSwitchGrid.Caption := MsgMenuToolsStepGrid;
-    miShowEdges.Caption := MsgMenuToolsShowEdges;
-    miLayers.Caption := MsgMenuToolsLayers;
+    miMapOptions.Caption := MsgMenuEditMapProps;
+    miOptions.Caption := MsgMenuEditPrefWin;
+  // View menu:
+    miMenuView.Caption := MsgMenuView;
+    miLayers.Caption := MsgMenuViewLayers;
     miLayer1.Caption := MsgMenuLayerBack;
     miLayer2.Caption := MsgMenuLayerWall;
     miLayer3.Caption := MsgMenuLayerFore;
@@ -918,29 +932,29 @@ begin
     miLayer7.Caption := MsgMenuLayerMonster;
     miLayer8.Caption := MsgMenuLayerArea;
     miLayer9.Caption := MsgMenuLayerTrigger;
-    miMapOptions.Caption := MsgMenuSetsMap;
-    miOptions.Caption := MsgMenuSetsEditor;
-  // "Сервис":
+    miMiniMap.Caption := MsgMenuViewMinimap;
+    miShowEdges.Caption := MsgMenuViewBounds;
+    miMapPreview.Caption := MsgMenuViewPreview;
+  // Service menu:
     miMenuService.Caption := MsgMenuServ;
     miCheckMap.Caption := MsgMenuServTest;
     miOptimmization.Caption := MsgMenuServOpt;
-    miMapPreview.Caption := MsgMenuServPreview;
     miTestMap.Caption := MsgMenuServLaunch;
-  // "Справка":
+  // Window menu:
+    miMenuWindow.Caption := MsgMenuWindow;
+    miMacMinimize.Caption := MsgMenuWindowMinimize;
+    miMacZoom.Caption := MsgMenuWindowZoom;
+  // Help menu:
     miMenuHelp.Caption := MsgMenuHelp;
-    miAbout.Caption := MsgMenuHelpAbout;
+    miAbout.Caption := MsgMenuHelpAboutWin;
 
-  // Панель инструментов:
+  // Toolbar:
     tbNewMap.Hint := MsgMenuTbNew;
     tbOpenMap.Hint := MsgMenuTbOpen;
     tbSaveMap.Hint := MsgMenuTbSave;
     tbOpenWadMap.Hint := MsgMenuTbOpenWad;
     tbShowMap.Hint := MsgMenuTbMinimap;
     tbShow.Hint := MsgMenuTbLayers;
-    tbGridOn.Hint := MsgMenuTbGrid;
-    tbGrid.Hint := MsgMenuTbGridStep;
-    tbTestMap.Hint := MsgMenuTbLaunch;
-  // Всплывающее меню для кнопки слоев:
     miLayerP1.Caption := MsgMenuLayerBack;
     miLayerP2.Caption := MsgMenuLayerWall;
     miLayerP3.Caption := MsgMenuLayerFore;
@@ -950,18 +964,19 @@ begin
     miLayerP7.Caption := MsgMenuLayerMonster;
     miLayerP8.Caption := MsgMenuLayerArea;
     miLayerP9.Caption := MsgMenuLayerTrigger;
+    tbGridOn.Hint := MsgMenuTbGrid;
+    tbGrid.Hint := MsgMenuTbGridStep;
+    tbTestMap.Hint := MsgMenuTbLaunch;
 
-  // Кнопка применения свойств:
+  // Object property editor:
     bApplyProperty.Caption := MsgBtnApplyProps;
-  // Редактор свойств объектов:
     vleObjectProperty.TitleCaptions[0] := MsgCtrlPropKey;
     vleObjectProperty.TitleCaptions[1] := MsgCtrlPropValue;
 
-  // Вкладка "Панели":
+  // Panels Tab:
     tsPanels.Caption := MsgCtrlPanels;
     lbPanelType.Hint := MsgPropPanelType;
     lbTextureList.Hint := MsgCtrlListTexture;
-  // Панель настройки текстур:
     LabelTxW.Caption := MsgLabTexWidth;
     LabelTxH.Caption := MsgLabTexHeight;
     cbPreview.Caption := MsgCtrlPreview;
@@ -969,25 +984,25 @@ begin
     bbRemoveTexture.Hint := MsgBtnTextureDelete;
     bClearTexture.Hint := MsgBtnTextureEmpty;
 
-  // Вкладка "Предметы":
+  // Items Tab:
     tsItems.Caption := MsgCtrlItems;
     lbItemList.Hint := MsgCtrlListItem;
     cbOnlyDM.Caption := MsgCtrlItemDm;
     cbFall.Caption := MsgCtrlItemFalls;
 
-  // Вкладка "Монстры":
+  // Monters Tab:
     tsMonsters.Caption := MsgCtrlMonsters;
     lbMonsterList.Hint := MsgCtrlListMonster;
     rbMonsterLeft.Caption := MsgCtrlLeft;
     rbMonsterRight.Caption := MsgCtrlRight;
 
-  // Вкладка "Области":
+  // Areas Tab:
     tsAreas.Caption := MsgCtrlAreas;
     lbAreasList.Hint := MsgCtrlListArea;
     rbAreaLeft.Caption := MsgCtrlLeft;
     rbAreaRight.Caption := MsgCtrlRight;
 
-  // Вкладка "Триггеры":
+  // Triggers Tab:
     tsTriggers.Caption := MsgCtrlTriggers;
     lbTriggersList.Hint := MsgCtrlListTrigger;
     clbActivationType.Hint := MsgCtrlListActive;
-- 
2.29.2