X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Feditor%2Fg_language.pas;h=7d4f2d83c869aca819ce76a250843520163f549d;hb=a1e98e052e6d8dbf38d45d9ef7338bfd758b9f48;hp=b97edfecbf4333f7fed41356fcb1911229d7d471;hpb=88f7e4ccb03ce2eb561b0faba1957503aae4a27a;p=d2df-editor.git

diff --git a/src/editor/g_language.pas b/src/editor/g_language.pas
index b97edfe..7d4f2d8 100644
--- a/src/editor/g_language.pas
+++ b/src/editor/g_language.pas
@@ -59,7 +59,7 @@ Interface
     MsgArrayItemRocketLauncher = 'Rocket Launcher';
     MsgArrayItemPlasmaRifle = 'Plasma Rifle';
     MsgArrayItemBfg = 'BFG9000';
-    MsgArrayItemSuperMinigun = 'Super Chaingun';
+    MsgArrayItemSuperChaingun = 'Super Chaingun';
     MsgArrayItemFlamethrower = 'Flamethrower';
     MsgArrayItemClip = 'Clip';
     MsgArrayItemAmmoBox = 'Box of Bullets';
@@ -307,19 +307,19 @@ Interface
     MsgMsgChooseTexture = 'Select Texture';
     MsgMsgChooseRes = 'Resource hasn''t been selected';
     MsgMsgExit = 'Exit';
-    MsgMsgExitPromt = 'Leaving so soon?';
+    MsgMsgExitPrompt = 'Leaving so soon?';
     MsgMsgDelTexture = 'Delete the texture';
-    MsgMsgDelTexturePromt = 'Delete the texture "%s" ?';
+    MsgMsgDelTexturePrompt = 'Delete the texture "%s" ?';
     MsgMsgDelTextureCant = 'Can''t delete texture in use. Replace it on all panels with this texture.';
     MsgMsgDelRecent = 'File does not longer exist';
-    MsgMsgDelRecentPromt = 'Remove entry from recent list?';
+    MsgMsgDelRecentPrompt = 'Remove entry from recent list?';
     MsgMsgClearMap = 'New map';
-    MsgMsgClearMapPromt = 'Clear the entire map?';
+    MsgMsgClearMapPrompt = 'Clear the entire map?';
     MsgMsgDeleteMap = 'Delete the map';
-    MsgMsgDeleteMapPromt = 'Delete the map "%s" from "%s" ?';
+    MsgMsgDeleteMapPrompt = 'Delete the map "%s" from "%s" ?';
     MsgMsgMapDeleted = 'Map is deleted';
-    MsgMsgMapDeletedPromt = 'Map "%s" is deleted';
-    MsgMsgReopenMapPromt = 'Reopen this map?';
+    MsgMsgMapDeletedPrompt = 'Map "%s" is deleted';
+    MsgMsgReopenMapPrompt = 'Reopen this map?';
     MsgMsgExecError = 'Game start error';
     MsgMsgSoundError = 'Can''t play sound';
     MsgMsgWadError = 'Can''t open WAD: %s';
@@ -364,7 +364,7 @@ Interface
     MsgMenuEditPaste = 'Paste';
     MsgMenuEditSelectAll = 'Select All';
     MsgMenuEditSnapGrid = 'Snap to Grid';
-    MsgMenuEditStepGrid = 'Switch Grid Granularity';
+    MsgMenuEditStepGrid = 'Switch Grid Step';
     MsgMenuEditToFore = 'Bring to Front';
     MsgMenuEditToBack = 'Send to Back';
     MsgMenuEditMapProps = 'Map Properties...';
@@ -372,7 +372,7 @@ Interface
 
     MsgMenuView = 'View';
     MsgMenuViewLayers = 'Layers';
-    MsgMenuViewMinimap = 'Show Minimap';
+    MsgMenuViewMinimap = 'Show Minimap Navigator';
     MsgMenuViewBounds = 'Show Map Bounds';
     MsgMenuViewPreview = 'Preview Mode';
 
@@ -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,8 +561,9 @@ Interface
     MsgLabEsMinimap = 'Mini-map Scale:';
     MsgLabEsRecent = 'Recent Maps List Contains:';
     MsgLabEsLanguage = 'Language:';
-    MsgLabEsCompress = 'Compress archive when save';
-    MsgLabEsBackup = 'Make backup before save';
+    MsgLabEsLanguageAuto = 'System Default';
+
+    MsgCtrlEsFiles = 'Files';
 
     MsgLabPackSaveTo = 'Save to:';
     MsgLabPackMapName = 'Map Resource Name:';
@@ -620,10 +625,15 @@ Interface
     MsgOptPanelsAfter = 'Panels after Optimization:';
 
     MsgWadSpecialMap = '<MAP WAD-FILE>';
-    MsgWadSpecialTexs = '<EXTRA TEXTURES>';
+    MsgWadSpecialTexs = '<COLORFILTERS>';
 
-    MsgFileFilterAll = 'Doom 2D: Forever Maps (*.dfz, *.dfzip, *.zip, *.wad)|*.dfz;*.dfzip;*.zip;*.wad|Doom 2D: Forever 0.30 Maps (*.ini)|*.ini|All Files (*.*)|*.*';
-    MsgFileFilterWad = 'Doom 2D: Forever Maps (*.dfz)|*.dfz|Doom 2D: Forever Maps (*.dfzip)|*.dfzip|Doom 2D: Forever Maps (*.zip)|*.zip|Doom 2D: Forever Maps (*.wad)|*.wad|All Files (*.*)|*.*';
+    MsgFileFilterSaveDFWAD = 'Doom 2D: Forever Maps in DFWAD packages (*.wad)|*.wad';
+    MsgFileFilterSaveDFZIP = 'Doom 2D: Forever Maps in DFZIP archives (*.dfz)|*.dfz';
+    MsgFileFilterAll = 'Doom 2D: Forever Maps (*.dfz, *.wad)|*.wad;*.dfz|Doom 2D: Forever 0.30 Maps (*.ini)|*.ini|All Files (*.*)|*.*';
+    MsgFileFilterWad = 'Doom 2D: Forever Maps (*.dfz, *.wad)|*.wad;*.dfz|All Files (*.*)|*.*';
+    MsgFileFilterExeMac = 'Doom 2D Forever.app|*.app|Doom 2D Forever (Unix Executable)|Doom2DF;*';
+    MsgFileFilterExeWin = 'Doom2DF.exe|Doom2DF.exe;*.exe';
+    MsgFileFilterExeUnix = 'Doom2DF|Doom2DF;*';
 
     MsgEditorTitle = 'Doom 2D: Forever Map Editor';
 
@@ -721,7 +731,7 @@ begin
   ItemNames[ITEM_WEAPON_ROCKETLAUNCHER] := MsgArrayItemRocketLauncher;
   ItemNames[ITEM_WEAPON_PLASMA] := MsgArrayItemPlasmaRifle;
   ItemNames[ITEM_WEAPON_BFG] := MsgArrayItemBfg;
-  ItemNames[ITEM_WEAPON_SUPERPULEMET] := MsgArrayItemSuperMinigun;
+  ItemNames[ITEM_WEAPON_SUPERCHAINGUN] := MsgArrayItemSuperChaingun;
   ItemNames[ITEM_WEAPON_FLAMETHROWER] := MsgArrayItemFlamethrower;
   ItemNames[ITEM_AMMO_BULLETS] := MsgArrayItemClip;
   ItemNames[ITEM_AMMO_BULLETS_BOX] := MsgArrayItemAmmoBox;
@@ -736,7 +746,7 @@ begin
   ItemNames[ITEM_KEY_RED] := MsgArrayItemKeyRed;
   ItemNames[ITEM_KEY_GREEN] := MsgArrayItemKeyGreen;
   ItemNames[ITEM_KEY_BLUE] := MsgArrayItemKeyBlue;
-  ItemNames[ITEM_WEAPON_KASTET] := '?';
+  ItemNames[ITEM_WEAPON_IRONFIST] := '?';
   ItemNames[ITEM_WEAPON_PISTOL] := '??';
   ItemNames[ITEM_BOTTLE] := MsgArrayItemBottle;
   ItemNames[ITEM_HELMET] := MsgArrayItemHelmet;
@@ -1144,13 +1154,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 +1174,10 @@ begin
     LabelMinimap.Caption := MsgLabEsMinimap;
     LabelLanguage.Caption := MsgLabEsLanguage;
   // TabFiles:
-    cbCompress.Caption := MsgLabEsCompress;
-    cbBackup.Caption := MsgLabEsBackup;
+    TabFiles.Caption := MsgCtrlEsFiles;
     LabelRecent.Caption := MsgLabEsRecent;
   // TabTesting:
+    TabTesting.Caption := MsgCtrlEsTesting;
     rbDM.Caption := MsgCtrlLaunchDm;
     rbTDM.Caption := MsgCtrlLaunchTdm;
     rbCTF.Caption := MsgCtrlLaunchCtf;
@@ -1180,8 +1191,19 @@ begin
     LabelTime.Caption := MsgLabLaunchTime;
     LabelSecs.Caption := MsgLabLaunchSecs;
     LabelScore.Caption := MsgLabLaunchScore;
-    LabelPath.Caption := MsgLabLaunchPath;
-    FindD2dDialog.Title := MsgCtrlLaunchOpen;
+    {$IF DEFINED(DARWIN)}
+      LabelPath.Caption := MsgLabLaunchPathMac;
+      ExeEdit.DialogTitle := MsgCtrlLaunchOpen;
+      ExeEdit.Filter := MsgFileFilterExeMac;
+    {$ELSEIF DEFINED(WINDOWS)}
+      LabelPath.Caption := MsgLabLaunchPathWin;
+      ExeEdit.DialogTitle := MsgCtrlLaunchOpen;
+      ExeEdit.Filter := MsgFileFilterExeWin;
+    {$ELSE}
+      LabelPath.Caption := MsgLabLaunchPathUnix;
+      ExeEdit.DialogTitle := MsgCtrlLaunchOpen;
+      ExeEdit.Filter := MsgFileFilterExeUnix;
+    {$ENDIF}
     LabelArgs.Caption := MsgLabLaunchArgs;
   end;
 
@@ -1323,7 +1345,7 @@ begin
   list := TStringList.Create;
   list.Duplicates := dupIgnore;
   list.Add(InSourceLanguage);
-  if FindFirst(LangDir + DirectorySeparator + langfilename + '.*.lng', faAnyFile, info) = 0 then
+  if FindFirst(LangDir + DirectorySeparator + langfilename + '.*.lng', faReadOnly, info) = 0 then
   begin
     repeat
       list.Add(Copy(ExtractFileNameWithoutExt(info.Name), Length(langfilename) + 2));