some proofreading

diff --git a/lang/editor.ru_RU.lng b/lang/editor.ru_RU.lng
index 164410cf824ab9504bc800fec4290fd21c7a4e66..f4d184c31b345c57b2098c17331e567dfdfe6bf6 100644 (file)
--- a/lang/editor.ru_RU.lng
+++ b/lang/editor.ru_RU.lng
@@ -6,7 +6,7 @@ imaginggif        = true
 imagingcanvases   = true
 imagingnetworkgraphics = true
 
-; don't care about rtl, lazarus libraris and standard libraries
+; don't care about rtl, lazarus libraries and standard libraries
 math              = true
 custapp           = true
 rtlconsts         = true
@@ -122,7 +122,7 @@ g_language.MsgArrayItemChaingun  = "Пулемёт"
 g_language.MsgArrayItemRocketLauncher$ = "Rocket Launcher"
 g_language.MsgArrayItemRocketLauncher  = "Ракетница"
 g_language.MsgArrayItemPlasmaRifle$ = "Plasma Rifle"
-g_language.MsgArrayItemPlasmaRifle  = "Ð\9fлазмаган"
+g_language.MsgArrayItemPlasmaRifle  = "Ð\9fлазмопÑ\83Ñ\88ка"
 g_language.MsgArrayItemBfg$ = "BFG9000"
 g_language.MsgArrayItemBfg  = "BFG9000"
 g_language.MsgArrayItemSuperMinigun$ = "Super Chaingun"
@@ -691,7 +691,7 @@ g_language.MsgMenuFileOpen  = "Открыть..."
 g_language.MsgMenuFileRecentMac$ = "Open Recent"
 g_language.MsgMenuFileRecentMac  = "Открыть недавно использованные"
 g_language.MsgMenuFileRecentClearMac$ = "Clear Recent"
-g_language.MsgMenuFileRecentClearMac  = "Ð\9eÑ\82Ñ\87иÑ\81Ñ\82иÑ\82Ñ\8c менÑ\8e"
+g_language.MsgMenuFileRecentClearMac  = "Очистить меню"
 g_language.MsgMenuFileSave$ = "Save"
 g_language.MsgMenuFileSave  = "Сохранить"
 g_language.MsgMenuFileSaveAs$ = "Save As..."
@@ -725,7 +725,7 @@ 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$ = "Switch Grid Step"
 g_language.MsgMenuEditStepGrid  = "Переключить шаг сетки"
 g_language.MsgMenuEditToFore$ = "Bring to Front"
 g_language.MsgMenuEditToFore  = "Передвинуть вперёд"
@@ -740,8 +740,8 @@ g_language.MsgMenuView$ = "View"
 g_language.MsgMenuView  = "Вид"
 g_language.MsgMenuViewLayers$ = "Layers"
 g_language.MsgMenuViewLayers  = "Слои"
-g_language.MsgMenuViewMinimap$ = "Show Minimap"
-g_language.MsgMenuViewMinimap  = "Ð\9fоказÑ\8bваÑ\82Ñ\8c мини-каÑ\80Ñ\82Ñ\83"
+g_language.MsgMenuViewMinimap$ = "Show Minimap Navigator"
+g_language.MsgMenuViewMinimap  = "Ð\9fоказÑ\8bваÑ\82Ñ\8c навигаÑ\82оÑ\80 (мини-каÑ\80Ñ\82Ñ\83)"
 g_language.MsgMenuViewBounds$ = "Show Map Bounds"
 g_language.MsgMenuViewBounds  = "Показывать границы карты"
 g_language.MsgMenuViewPreview$ = "Preview Mode"
@@ -1219,13 +1219,13 @@ g_language.MsgOptPanelsAfter  = "Панелей после оптимизаци
 
 g_language.MsgWadSpecialMap$ = "<MAP WAD-FILE>"
 g_language.MsgWadSpecialMap  = "<WAD-ФАЙЛ КАРТЫ>"
-g_language.MsgWadSpecialTexs$ = "<EXTRA TEXTURES>"
+g_language.MsgWadSpecialTexs$ = "<COLORFILTERS>"
 g_language.MsgWadSpecialTexs  = "<СПЕЦТЕКСТУРЫ>"
 
-g_language.MsgFileFilterSaveDFWAD$ = "DFWAD Packed Doom 2D: Forever Maps (*.wad)|*.wad"
-g_language.MsgFileFilterSaveDFWAD  = "Карты Doom 2D: Forever упакованные в DFWAD (*.wad)|*.wad"
-g_language.MsgFileFilterSaveDFZIP$ = "DFZIP Packed Doom 2D: Forever Maps (*.dfz)|*.dfz"
-g_language.MsgFileFilterSaveDFZIP  = "Карты Doom 2D: Forever упакованные в DFZIP (*.dfz)|*.dfz"
+g_language.MsgFileFilterSaveDFWAD$ = "Doom 2D: Forever Maps in DFWAD packages (*.wad)|*.wad"
+g_language.MsgFileFilterSaveDFWAD  = "Карты Doom 2D: Forever в DFWAD-сборках (*.wad)|*.wad"
+g_language.MsgFileFilterSaveDFZIP$ = "Doom 2D: Forever Maps in DFZIP archives (*.dfz)|*.dfz"
+g_language.MsgFileFilterSaveDFZIP  = "Карты Doom 2D: Forever в DFZIP-архивах (*.dfz)|*.dfz"
 g_language.MsgFileFilterAll$ = "Doom 2D: Forever Maps (*.dfz, *.wad)|*.wad;*.dfz|Doom 2D: Forever 0.30 Maps (*.ini)|*.ini|All Files (*.*)|*.*"
 g_language.MsgFileFilterAll  = "Карты Doom 2D: Forever Maps (*.dfz, *.wad)|*.wad;*.dfz|Старые карты Doom 2D: Forever 0.30 (*.ini)|*.ini|Все файлы (*.*)|*.*"
 g_language.MsgFileFilterWad$ = "Doom 2D: Forever Maps (*.dfz, *.wad)|*.wad;*.dfz|All Files (*.*)|*.*"
@@ -1379,4 +1379,4 @@ rsWin32Warning  = "Предупреждение:"
 rsWin32Error$   = "Error:"
 rsWin32Error    = "Ошибка:"
 
-; probably need more strings to translatate
+; probably need more strings to translate

diff --git a/src/editor/f_main.lfm b/src/editor/f_main.lfm
index 79d039a252cdbedeefd5193501b79a03c3d3dbd6..8340abb5ae1771f68d6574829012d554870f6045 100644 (file)
--- a/src/editor/f_main.lfm
+++ b/src/editor/f_main.lfm
@@ -1064,7 +1064,7 @@ object MainForm: TMainForm
         OnClick = miSnapToGridClick
       end
       object miSwitchGrid: TMenuItem
-        Caption = 'Switch Grid Granularity'
+        Caption = 'Switch Grid Step'
         ImageIndex = 19
         ShortCut = 16453
         OnClick = miSwitchGridClick
@@ -1159,7 +1159,7 @@ object MainForm: TMainForm
         Caption = '-'
       end
       object miMiniMap: TMenuItem
-        Caption = 'Show Minimap'
+        Caption = 'Show Minimap Navigator'
         ImageIndex = 14
         ShortCut = 16471
         OnClick = miMiniMapClick

diff --git a/src/editor/f_savemap.pas b/src/editor/f_savemap.pas
index a78e6009a44a3dd6d6c165eadb50f7a7c3299155..15ddd506f09e6260c48c0550ddb0c636e8324b31 100644 (file)
--- a/src/editor/f_savemap.pas
+++ b/src/editor/f_savemap.pas
@@ -107,7 +107,7 @@ begin
   end
   else
   begin
-    // format specified -> appned using exactly this format (overwrite if not compatible)
+    // format specified -> append using exactly this format (overwrite if not compatible)
     WAD := gWADEditorFactory.CreateEditor(ArchiveFormat);
     if WAD.ReadFile(FileName) = False then
       WAD.FreeWAD();

diff --git a/src/editor/g_language.pas b/src/editor/g_language.pas
index a443502a77cfc0ecc2f2fbdb37908354941f9fe2..f30ffea457fffb28d9a186efe2b3deb5030e0f67 100644 (file)
--- a/src/editor/g_language.pas
+++ b/src/editor/g_language.pas
@@ -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';
 
@@ -625,10 +625,10 @@ Interface
     MsgOptPanelsAfter = 'Panels after Optimization:';
 
     MsgWadSpecialMap = '<MAP WAD-FILE>';
-    MsgWadSpecialTexs = '<EXTRA TEXTURES>';
+    MsgWadSpecialTexs = '<COLORFILTERS>';
 
-    MsgFileFilterSaveDFWAD = 'DFWAD Packed Doom 2D: Forever Maps (*.wad)|*.wad';
-    MsgFileFilterSaveDFZIP = 'DFZIP Packed Doom 2D: Forever Maps (*.dfz)|*.dfz';
+    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;*';

diff --git a/src/editor/g_map.pas b/src/editor/g_map.pas
index d2067915aede48ffc8beed0fd5633a89a9d0cbdd..e63e97479d133e20df090a6228fc8e8576907c22 100644 (file)
--- a/src/editor/g_map.pas
+++ b/src/editor/g_map.pas
@@ -1097,7 +1097,7 @@ begin
     end
     else
     begin
-      // format specified -> appned using exactly this format (overwrite if not compatible)
+      // format specified -> append using exactly this format (overwrite if not compatible)
       WAD := gWADEditorFactory.CreateEditor(ArchiveFormat);
       if WAD.ReadFile(FileName) = False then
         WAD.FreeWAD();