X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_language.pas;h=1b05ddd7a5bbdd92bbf285bedb7051bc492ee85e;hb=e979719019322a78e7fded8fd96130c18cf31972;hp=1aad7c6823c3cc7fcb061768556076f6b1de918d;hpb=6f5375e6179294fde838bcf61f0dafeb4e018ee7;p=d2df-sdl.git

diff --git a/src/game/g_language.pas b/src/game/g_language.pas
index 1aad7c6..1b05ddd 100644
--- a/src/game/g_language.pas
+++ b/src/game/g_language.pas
@@ -80,6 +80,7 @@ type
     I_GAME_SECRETS,
     I_GAME_MONSTERS_TOTAL,
     I_GAME_SECRETS_TOTAL,
+    I_GAME_WARMUP,
 
     I_GAME_CHEAT_GODMODE,
     I_GAME_CHEAT_WEAPONS,
@@ -162,7 +163,13 @@ type
     I_MENU_GOAL_LIMIT,
     I_MENU_MAX_LIVES,
     I_MENU_TEAM_DAMAGE,
-    I_MENU_RESPAWN_ITEMS,
+    I_MENU_TEAM_HIT,
+    I_MENU_TEAM_HIT_BOTH,
+    I_MENU_TEAM_HIT_TRACE,
+    I_MENU_TEAM_HIT_PROJECTILE,
+    I_MENU_TEAM_HIT_NOTHING,
+    I_MENU_ITEM_RESPAWN_TIME,
+    I_MENU_DEATHMATCH_KEYS,
     I_MENU_ENABLE_EXITS,
     I_MENU_WEAPONS_STAY,
     I_MENU_ENABLE_MONSTERS,
@@ -273,6 +280,7 @@ type
     I_MENU_VIDEO_VSYNC,
     I_MENU_VIDEO_FILTER_SKY,
     I_MENU_VIDEO_LEGACY_COMPATIBLE,
+    I_MENU_VIDEO_INTERPOLATION,
     I_MENU_VIDEO_NEED_RESTART,
 
     I_MENU_RESOLUTION_SELECT,
@@ -574,8 +582,6 @@ type
     I_MSG_ALLOWMON_OFF,
     I_MSG_DMKEYS_ON,
     I_MSG_DMKEYS_OFF,
-    I_MSG_RESPAWNITEMS_ON,
-    I_MSG_RESPAWNITEMS_OFF,
     I_MSG_BOTSVSPLAYERS_ON,
     I_MSG_BOTSVSPLAYERS_OFF,
     I_MSG_BOTSVSMONSTERS_ON,
@@ -612,6 +618,7 @@ type
     I_MSG_NOT_DEBUG,
     I_MSG_GM_UNAVAIL,
     I_MSG_SERVERONLY,
+    I_MSG_NOT_NETGAME,
     I_MSG_NOCLIENTS,
     I_MSG_UNBAN_OK,
     I_MSG_UNBAN_FAIL,
@@ -648,7 +655,7 @@ procedure g_Language_Dump(fileName: String);
 implementation
 
 uses
-  SysUtils, g_gui, g_basic, e_log, e_input;
+  SysUtils, {g_gui,} g_basic, e_log, e_input;
 
 const
   g_lang_default: Array [TStrings_Locale] of Array [1..3] of String = (
@@ -764,6 +771,8 @@ const
                                        'Âñåãî ìîíñòðîâ óáèòî:'),
     ('GAME SECRETS TOTAL',             'Total secrets found:',
                                        'Âñåãî ñåêðåòîâ íàéäåíî:'),
+    ('GAME WARMUP',                    'Warmup',
+                                       'Ïîäãîòîâêà'),
 
     ('GAME CHEAT GODMODE',             'MACLEOD',
                                        'ÃÎÐÅÖ'),
@@ -923,8 +932,20 @@ const
                                        'Æèçíè:'),
     ('MENU TEAM DAMAGE',               'Friendly Fire:',
                                        'Óðîí ñâîèõ:'),
-    ('MENU RESPAWN ITEMS',             'Respawn Items:',
-                                       'Ðåñïàâíèòü ïðåäìåòû:'),
+    ('MENU TEAM HIT',                  'Hit friendlies with:',
+                                       'Ïîïàäàíèÿ ïî ñâîèì:'),
+    ('MENU TEAM HIT BOTH',             'Everything',
+                                       'Ïóëÿìè è ñíàðÿäàìè'),
+    ('MENU TEAM HIT TRACE',            'Hitscan only',
+                                       'Òîëüêî ïóëÿìè'),
+    ('MENU TEAM HIT PROJECTILE',       'Projectiles only',
+                                       'Òîëüêî ñíàðÿäàìè'),
+    ('MENU TEAM HIT NONE',             'Nothing',
+                                       'Íè÷åì'),
+    ('MENU ITEM RESPAWN TIME',         'Item respawn time:',
+                                       'Âðåìÿ ðåñïàâíà ïðåäìåòîâ:'),
+    ('MENU DEATHMATCH KEYS',           'Give all keys in DM:',
+                                       'Âñå êëþ÷è â DM:'),
     ('MENU ENABLE EXITS',              'Enable Exit:',
                                        'Âêëþ÷èòü âûõîä:'),
     ('MENU WEAPONS STAY',              'Weapons stay:',
@@ -1137,8 +1158,10 @@ const
                                        'Ôèëüòðàöèÿ íåáà:'),
     ('MENU VIDEO LEGACY COMPATIBLE',   'Force compatibility with NPOT textures:',
                                        'Ýìóëÿöèÿ NPOT-òåêñòóð:'),
-    ('MENU VIDEO NEED RESTART',        'Video settings will be changed after game restart.',
-                                       'Äàííûå íàñòðîéêè âèäåî âñòóïÿò â ñèëó ïîñëå ïåðåçàïóñêà èãðû.'),
+    ('MENU VIDEO INTERPOLATION',       'Motion interpolation:',
+                                       'Èíòåðïîëÿöèÿ äâèæåíèÿ:'),
+    ('MENU VIDEO NEED RESTART',        'Some video settings will be changed after game restart.',
+                                       'Íåêîòîðûå íàñòðîéêè âèäåî âñòóïÿò â ñèëó ïîñëå ïåðåçàïóñêà èãðû.'),
 
     ('MENU RESOLUTION SELECT',         'SET VIDEO MODE',
                                        'ÓÑÒÀÍÎÂÊÀ ÂÈÄÅÎÐÅÆÈÌÀ'),
@@ -1677,8 +1700,8 @@ const
                                        '- id Software, êîòîðûå çàâàðèëè ýòó êàøó'),
     ('CREDITS CLO 3',                  '- Everyone who helped our project',
                                        '- Âñåõ, êòî ïîìîãàë íàøåìó ïðîåêòó'),
-    ('CREDITS CLO 4',                  'www.doom2d.org, 2003-2020',
-                                       'www.doom2d.org, 2003-2020'),
+    ('CREDITS CLO 4',                  'www.doom2d.org, 2003-2021',
+                                       'www.doom2d.org, 2003-2021'),
 
     ('MSG SHOW FPS ON',                'FPS counter enabled',
                                        'FPS ïîêàçûâàþòñÿ'),
@@ -1708,10 +1731,6 @@ const
                                        'Ðåñïàâí ñî âñåìè êëþ÷àìè â DM âêëþ÷åí'),
     ('MSG DMKEYS OFF',                 'Spawning with all keys in DM disabled',
                                        'Ðåñïàâí ñî âñåìè êëþ÷àìè â DM âûêëþ÷åí'),
-    ('MSG RESPAWNITEMS ON',            'Respawning items enabled',
-                                       'Ðåñïàâí ïðåäìåòîâ âêëþ÷åí'),
-    ('MSG RESPAWNITEMS OFF',           'Respawning items disabled',
-                                       'Ðåñïàâí ïðåäìåòîâ âûêëþ÷åí'),
     ('MSG BOTSVSPLAYERS ON',           'Bots attack players',
                                        'Áîòû ïðîòèâ èãðîêîâ'),
     ('MSG BOTSVSPLAYERS OFF',          'Bots ignore players',
@@ -1776,14 +1795,16 @@ const
                                        'Ñëåäóþùàÿ êàðòà íå çàäàíà.'),
     ('MSG ONMAPCHANGE',                '* Changes to this variable will be applied upon next map change',
                                        '* Èçìåíåíèÿ âñòóïÿò â ñèëó ïîñëå ñëåäóþùåé ñìåíû êàðòû'),
-    ('MSG NOT GAME',                   'Command can be accepted in a game only.',
+    ('MSG NOT GAME',                   'This command is only available in-game.',
                                        'Êîìàíäà ïðèìåíèìà òîëüêî â èãðå.'),
-    ('MSG NOT DEBUG',                  'Command can be accepted in debug mode only.',
+    ('MSG NOT DEBUG',                  'This command is only available in debug mode.',
                                        'Êîìàíäà ïðèìåíèìà òîëüêî â ðåæèìå îòëàäêè.'),
     ('MSG GM UNAVAIL',                 'This command is unavailable in the current game mode.',
-                                       'Ýòà êîìàíäà íåäîñòóïíà â òåêóùåì ðåæèìå èãðû.'),
-    ('MSG SERVERONLY',                 'This command is for server only.',
-                                       'Ýòà êîìàíäà äîñòóïíà òîëüêî â ðåæèìå ñåðâåðà.'),
+                                       'Êîìàíäà íåäîñòóïíà â òåêóùåì ðåæèìå èãðû.'),
+    ('MSG SERVERONLY',                 'This command is only available to servers.',
+                                       'Êîìàíäà äîñòóïíà òîëüêî â ðåæèìå ñåðâåðà.'),
+    ('MSG NOT NETGAME',                'This command is unavailable during a net game.',
+                                       'Êîìàíäà íåäîñòóïíà âî âðåìÿ ñåòåâîé èãðû.'),
     ('MSG NOCLIENTS',                  'No clients connected.',
                                        'Íåò ïîäêëþ÷¸ííûõ êëèåíòîâ.'),
     ('MSG UNBAN OK',                   'Client %s was unbanned.',