i10n: fix preferences localization

diff --git a/lang/editor.ru_RU.lng b/lang/editor.ru_RU.lng
index d3ee951e6965f634fc3dc90715ad0c82aeb797c5..76d05ab24dba666299448c10bf81d5947ed72011 100644 (file)
--- a/lang/editor.ru_RU.lng
+++ b/lang/editor.ru_RU.lng
@@ -834,8 +834,8 @@ g_language.MsgCapSets$ = "Map Properties"
 g_language.MsgCapSets  = "Свойства карты"
 g_language.MsgCapLaunch$ = "In-game test Settings"
 g_language.MsgCapLaunch  = "Настройки теста в игре"
-g_language.MsgCapEs$ = "Editor Preferences"
-g_language.MsgCapEs  = "Настройки редактора"
+g_language.MsgCapEs$ = "Preferences"
+g_language.MsgCapEs  = "Настройки"
 g_language.MsgCapPack$ = "Pack Map"
 g_language.MsgCapPack  = "Упаковать карту"
 g_language.MsgCapSave$ = "Save Map"
@@ -954,6 +954,8 @@ g_language.MsgCtrlSetsStats  = "Статистика:"
 g_language.MsgCtrlSetsSizes$ = "Map Size:"
 g_language.MsgCtrlSetsSizes  = "Размеры:"
 
+g_language.MsgCtrlEsTesting$ = "Testing"
+g_language.MsgCtrlEsTesting  = "Тестирование"
 g_language.MsgCtrlLaunchDm$ = "Deathmatch"
 g_language.MsgCtrlLaunchDm  = "Deathmatch"
 g_language.MsgCtrlLaunchTdm$ = "Team Deathmatch"
@@ -977,6 +979,8 @@ g_language.MsgCtrlLaunchClose  = "Закрыть игру после выход
 g_language.MsgCtrlLaunchOpen$ = "Select Doom 2D: Forever executable"
 g_language.MsgCtrlLaunchOpen  = "Выберите файл игры Doom 2D: Forever"
 
+g_language.MsgCtrlEsGeneral$ = "General"
+g_language.MsgCtrlEsGeneral  = "Общие"
 g_language.MsgCtrlEsGrid$ = "Show Grid"
 g_language.MsgCtrlEsGrid  = "Показывать сетку"
 g_language.MsgCtrlEsTexture$ = "Show Panel Texture"
@@ -1064,8 +1068,12 @@ g_language.MsgLabLaunchSecs$ = "seconds"
 g_language.MsgLabLaunchSecs  = "секунд"
 g_language.MsgLabLaunchScore$ = "Score Limit:"
 g_language.MsgLabLaunchScore  = "Лимит очков:"
-g_language.MsgLabLaunchPath$ = "Path to Doom2DF.exe:"
-g_language.MsgLabLaunchPath  = "Путь к Doom2DF.exe:"
+g_language.MsgLabLaunchPathWin$ = "Path to Doom2DF.exe:"
+g_language.MsgLabLaunchPathWin  = "Путь к Doom2DF.exe:"
+g_language.MsgLabLaunchPathMac$ = "Path to Doom 2D Forever.app:"
+g_language.MsgLabLaunchPathMac  = "Путь к Doom 2D Forever.app:"
+g_language.MsgLabLaunchPathUnix$ = "Path to Doom2DF:"
+g_language.MsgLabLaunchPathUnix  = "Путь к Doom2DF:"
 g_language.MsgLabLaunchArgs$ = "Launch Arguments:"
 g_language.MsgLabLaunchArgs  = "Параметры запуска:"
 
@@ -1085,6 +1093,11 @@ g_language.MsgLabEsRecent$ = "Recent Maps List Contains:"
 g_language.MsgLabEsRecent  = "Запоминать последних открытых карт:"
 g_language.MsgLabEsLanguage$ = "Language:"
 g_language.MsgLabEsLanguage  = "Язык:"
+g_language.MsgLabEsLanguageAuto$ = "System Default"
+g_language.MsgLabEsLanguageAuto  = "Системный"
+
+g_language.MsgCtrlEsFiles$ = "Files"
+g_language.MsgCtrlEsFiles  = "Файлы"
 g_language.MsgLabEsCompress$ = "Compress archive when save"
 g_language.MsgLabEsCompress  = "Сжимать архив при сохранении"
 g_language.MsgLabEsBackup$ = "Make backup before save"

diff --git a/src/editor/f_options.lfm b/src/editor/f_options.lfm
index d579158963d59ff71dfb1fda12d746d67df24634..a2ff37d5f1b3696828d4751f862d57dc4023a029 100644 (file)
--- a/src/editor/f_options.lfm
+++ b/src/editor/f_options.lfm
@@ -238,7 +238,7 @@ object OptionsForm: TOptionsForm
         Left = 304
         Height = 26
         Top = 192
-        Width = 68
+        Width = 120
         ItemHeight = 0
         Style = csDropDownList
         TabOrder = 13
@@ -252,7 +252,7 @@ object OptionsForm: TOptionsForm
         Left = 8
         Height = 21
         Top = 8
-        Width = 249
+        Width = 208
         Caption = 'Сжимать архив при сохранении'
         TabOrder = 2
       end
@@ -260,7 +260,7 @@ object OptionsForm: TOptionsForm
         Left = 8
         Height = 21
         Top = 32
-        Width = 258
+        Width = 218
         Caption = 'Резервная копия при сохранении'
         TabOrder = 3
       end
@@ -346,7 +346,7 @@ object OptionsForm: TOptionsForm
         Left = 8
         Height = 21
         Top = 104
-        Width = 103
+        Width = 91
         Caption = 'Deathmatch'
         Checked = True
         TabOrder = 0
@@ -356,7 +356,7 @@ object OptionsForm: TOptionsForm
         Left = 8
         Height = 21
         Top = 120
-        Width = 142
+        Width = 124
         Caption = 'Team Deathmatch'
         TabOrder = 1
       end
@@ -364,7 +364,7 @@ object OptionsForm: TOptionsForm
         Left = 8
         Height = 21
         Top = 136
-        Width = 131
+        Width = 114
         Caption = 'Capture the Flag'
         TabOrder = 2
       end
@@ -372,7 +372,7 @@ object OptionsForm: TOptionsForm
         Left = 8
         Height = 21
         Top = 152
-        Width = 102
+        Width = 92
         Caption = 'Cooperative'
         TabOrder = 3
       end
@@ -380,7 +380,7 @@ object OptionsForm: TOptionsForm
         Left = 168
         Height = 21
         Top = 104
-        Width = 101
+        Width = 89
         Caption = 'Два игрока'
         TabOrder = 4
       end
@@ -388,7 +388,7 @@ object OptionsForm: TOptionsForm
         Left = 168
         Height = 21
         Top = 120
-        Width = 164
+        Width = 141
         Caption = 'Урон своей команде'
         TabOrder = 5
       end
@@ -396,7 +396,7 @@ object OptionsForm: TOptionsForm
         Left = 168
         Height = 21
         Top = 136
-        Width = 141
+        Width = 122
         Caption = 'Выход из уровня'
         Checked = True
         State = cbChecked
@@ -406,7 +406,7 @@ object OptionsForm: TOptionsForm
         Left = 168
         Height = 21
         Top = 152
-        Width = 145
+        Width = 125
         Caption = 'Оружие остается'
         TabOrder = 7
       end
@@ -414,7 +414,7 @@ object OptionsForm: TOptionsForm
         Left = 168
         Height = 21
         Top = 168
-        Width = 124
+        Width = 103
         Caption = 'Монстры в DM'
         TabOrder = 8
       end
@@ -462,7 +462,7 @@ object OptionsForm: TOptionsForm
         Left = 8
         Height = 21
         Top = 256
-        Width = 287
+        Width = 241
         Caption = 'Закрыть игру после выхода из карты'
         TabOrder = 11
       end

diff --git a/src/editor/f_options.pas b/src/editor/f_options.pas
index 588d9c49a8c807e34d42960c4fdf9c762f977ff1..aebf686a6d997e511dd08db58578fb4b8e4d7f3f 100644 (file)
--- a/src/editor/f_options.pas
+++ b/src/editor/f_options.pas
@@ -171,7 +171,7 @@ begin
   try
     cbLanguage.Items.BeginUpdate;
     cbLanguage.Items.Clear;
-    cbLanguage.Items.Add('Auto');
+    cbLanguage.Items.Add(MsgLabEsLanguageAuto);
     list := g_Language_GetList();
     cbLanguage.Items.AddStrings(list);
     list.Free();

diff --git a/src/editor/g_language.pas b/src/editor/g_language.pas
index b97edfecbf4333f7fed41356fcb1911229d7d471..241660c4c2a72bb354e32a8517b2c94bf0ecd187 100644 (file)
--- a/src/editor/g_language.pas
+++ b/src/editor/g_language.pas
@@ -423,7 +423,7 @@ Interface
     MsgCapOpt = 'Optimize Map';
     MsgCapSets = 'Map Properties';
     MsgCapLaunch = 'In-game test Settings';
-    MsgCapEs = 'Editor Preferences';
+    MsgCapEs = 'Preferences';
     MsgCapPack = 'Pack Map';
     MsgCapSave = 'Save Map';
     MsgCapMini = 'Save Minimap';
@@ -487,6 +487,7 @@ Interface
     MsgCtrlSetsStats = 'Statistics:';
     MsgCtrlSetsSizes = 'Map Size:';
 
+    MsgCtrlEsTesting = 'Testing';
     MsgCtrlLaunchDm = 'Deathmatch';
     MsgCtrlLaunchTdm = 'Team Deathmatch';
     MsgCtrlLaunchCtf = 'Capture the Flag';
@@ -499,6 +500,7 @@ Interface
     MsgCtrlLaunchClose = 'Close the game after exiting the map';
     MsgCtrlLaunchOpen = 'Select Doom 2D: Forever executable';
 
+    MsgCtrlEsGeneral = 'General';
     MsgCtrlEsGrid = 'Show Grid';
     MsgCtrlEsTexture = 'Show Panel Texture';
     MsgCtrlEsPanelSize = 'Show Panel Size';
@@ -546,7 +548,9 @@ Interface
     MsgLabLaunchTime = 'Time Limit:';
     MsgLabLaunchSecs = 'seconds';
     MsgLabLaunchScore = 'Score Limit:';
-    MsgLabLaunchPath = 'Path to Doom2DF.exe:';
+    MsgLabLaunchPathWin = 'Path to Doom2DF.exe:';
+    MsgLabLaunchPathMac = 'Path to Doom 2D Forever.app:';
+    MsgLabLaunchPathUnix = 'Path to Doom2DF:';
     MsgLabLaunchArgs = 'Launch Arguments:';
 
     MsgLabEsGrid = 'Grid Step:';
@@ -557,6 +561,9 @@ Interface
     MsgLabEsMinimap = 'Mini-map Scale:';
     MsgLabEsRecent = 'Recent Maps List Contains:';
     MsgLabEsLanguage = 'Language:';
+    MsgLabEsLanguageAuto = 'System Default';
+
+    MsgCtrlEsFiles = 'Files';
     MsgLabEsCompress = 'Compress archive when save';
     MsgLabEsBackup = 'Make backup before save';
 
@@ -1144,13 +1151,14 @@ begin
     bCancel.Caption := MsgBtnCancel;
   end;
 
-// From "Editor settings":
+// Form preferences:
   with OptionsForm do
   begin
     Caption := MsgCapEs;
     bOK.Caption := MsgBtnOk;
     bCancel.Caption := MsgBtnCancel;
   // TabGeneral:
+    TabGeneral.Caption := MsgCtrlEsGeneral;
     cbShowDots.Caption := MsgCtrlEsGrid;
     cbShowTexture.Caption := MsgCtrlEsTexture;
     cbShowSize.Caption := MsgCtrlEsPanelSize;
@@ -1163,10 +1171,12 @@ begin
     LabelMinimap.Caption := MsgLabEsMinimap;
     LabelLanguage.Caption := MsgLabEsLanguage;
   // TabFiles:
+    TabFiles.Caption := MsgCtrlEsFiles;
     cbCompress.Caption := MsgLabEsCompress;
     cbBackup.Caption := MsgLabEsBackup;
     LabelRecent.Caption := MsgLabEsRecent;
   // TabTesting:
+    TabTesting.Caption := MsgCtrlEsTesting;
     rbDM.Caption := MsgCtrlLaunchDm;
     rbTDM.Caption := MsgCtrlLaunchTdm;
     rbCTF.Caption := MsgCtrlLaunchCtf;
@@ -1180,7 +1190,13 @@ begin
     LabelTime.Caption := MsgLabLaunchTime;
     LabelSecs.Caption := MsgLabLaunchSecs;
     LabelScore.Caption := MsgLabLaunchScore;
-    LabelPath.Caption := MsgLabLaunchPath;
+    {$IF DEFINED(DARWIN)}
+      LabelPath.Caption := MsgLabLaunchPathMac;
+    {$ELSEIF DEFINED(WINDOWS)}
+      LabelPath.Caption := MsgLabLaunchPathWin;
+    {$ELSE}
+      LabelPath.Caption := MsgLabLaunchPathUnix;
+    {$ENDIF}
     FindD2dDialog.Title := MsgCtrlLaunchOpen;
     LabelArgs.Caption := MsgLabLaunchArgs;
   end;