X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_language.pas;h=8ccc8ea8a70e2eb9229530e659de6f7e7cb8af29;hb=c8d7811d45c2d34a7e297613e50570f253a0d8e9;hp=cccffd6ec8dd8dc2db47f92b6b05cef49ec13dc9;hpb=24f025e51e5faa8c8f28f6ec6614335a5977303a;p=d2df-sdl.git

diff --git a/src/game/g_language.pas b/src/game/g_language.pas
index cccffd6..8ccc8ea 100644
--- a/src/game/g_language.pas
+++ b/src/game/g_language.pas
@@ -262,6 +262,9 @@ type
     I_MENU_GAME_INDICATOR_NONE,
     I_MENU_GAME_INDICATOR_OWN,
     I_MENU_GAME_INDICATOR_ALL,
+    I_MENU_GAME_INDICATOR_STYLE,
+    I_MENU_GAME_INDICATOR_ARROW,
+    I_MENU_GAME_INDICATOR_NAME,
     I_MENU_GAME_SCALE_FACTOR,
 
     I_MENU_VIDEO_RESOLUTION,
@@ -390,6 +393,7 @@ type
     I_NET_SLIST_FETCH,
     I_NET_SLIST_RETRIEVED,
     I_NET_SLIST_CONN,
+    I_NET_SLIST_WCONN,
     I_NET_SLIST_DISC,
     I_NET_SLIST_LOST,
     I_NET_SLIST_ERROR,
@@ -567,6 +571,8 @@ type
     I_MSG_ALLOWEXIT_OFF,
     I_MSG_ALLOWMON_ON,
     I_MSG_ALLOWMON_OFF,
+    I_MSG_DMKEYS_ON,
+    I_MSG_DMKEYS_OFF,
     I_MSG_BOTSVSPLAYERS_ON,
     I_MSG_BOTSVSPLAYERS_OFF,
     I_MSG_BOTSVSMONSTERS_ON,
@@ -594,6 +600,7 @@ type
     I_MSG_TIME_LIMIT,
     I_MSG_LIVES,
     I_MSG_WARMUP,
+    I_MSG_SPAWNINVUL,
     I_MSG_WARMUP_START,
     I_MSG_NEXTMAP_SET,
     I_MSG_NEXTMAP_UNSET,
@@ -969,8 +976,8 @@ const
                                        'Ïîäîæäèòå, ïîêà ñìåíèòñÿ êàðòà íà ñåðâåðå'),
     ('MENU INTER NOTICE SPACE',        'Press [SPACE] to continue',
                                        'Íàæìèòå [ÏÐÎÁÅË], ÷òîáû ïðîäîëæèòü'),
-    ('MENU INTER NOTICE TIME',         '%d seconds till the next round',
-                                       'Îñòàëîñü %d ñåêóíä äî ñëåäóþùåãî ðàóíäà'),
+    ('MENU INTER NOTICE TIME',         '%d sec till the next round',
+                                       'Îñòàëîñü %d ñåê äî ñëåäóþùåãî ðàóíäà'),
     ('MENU LOADING',                   'Loading...',
                                        'Çàãðóçêà...'),
     ('MENU PLAYER 1',                  'Player 1',
@@ -996,9 +1003,9 @@ const
                                        '̸ðòâàÿ çîíà äæîéñòèêà %d'),
 
     ('MENU CONTROL TOUCH',             'Touchscreen Settings',
-                                       'Íàñòðîéêè ñåíñðíîãî ýêðàíà'),
+                                       'Íàñòðîéêè ñåíñîðíîãî ýêðàíà'),
     ('MENU CONTROL TOUCH ALT',         'Alternative layout:',
-                                       'Àëüòåðíàòèâíàÿ ðàñêëàäêà:'),    
+                                       'Àëüòåðíàòèâíàÿ ðàñêëàäêà:'),
     ('MENU CONTROL TOUCH FIRE',        'Shoot Up/Down:',
                                        'Ñòðåëÿòü ââåðõ/âíèç:'),
     ('MENU CONTROL TOUCH SIZE',        'Button size:',
@@ -1100,12 +1107,18 @@ const
                                        'Òåêñòóðà'),
     ('MENU GAME PLAYER INDICATOR',     'Player indicator:',
                                        'Èíäèêàòîð èãðîêà:'),
-    ('MENU GAME INDICATOR TYPE NONE',  'None',
+    ('MENU GAME INDICATOR NONE',       'None',
                                        'Íåò'),
-    ('MENU GAME INDICATOR TYPE OWN',   'Own',
+    ('MENU GAME INDICATOR OWN',        'Own',
                                        'Ñâîé'),
-    ('MENU GAME INDICATOR TYPE ALL',   'Own + Teammates',
+    ('MENU GAME INDICATOR ALL',        'Own + Teammates',
                                        'Ñâîé + Ñîþçíèêè'),
+    ('MENU GAME INDICATOR STYLE',      'Indicator Style:',
+                                       'Âèä èíäèêàòîðà:'),
+    ('MENU GAME INDICATOR ARROW',      'Arrow',
+                                       'Ñòðåëêà'),
+    ('MENU GAME INDICATOR NAME',       'Name',
+                                       'Èìÿ'),
     ('MENU GAME SCALE FACTOR',         'Scale:',
                                        'Ìàñøòàá:'),
 
@@ -1117,8 +1130,8 @@ const
                                        'Âåðòèêàëüíàÿ ñèíõðîíèçàöèÿ:'),
     ('MENU VIDEO FILTER SKY',          'Anisotropic sky',
                                        'Ôèëüòðàöèÿ íåáà:'),
-    ('MENU VIDEO LEGACY COMPATIBLE',   'Compatibility with NPOT textures:',
-                                       'Ñîâìåñòèìîñòü ñ NPOT-òåêñòóðàìè:'),
+    ('MENU VIDEO LEGACY COMPATIBLE',   'Force compatibility with NPOT textures:',
+                                       'Ýìóëÿöèÿ NPOT-òåêñòóð:'),
     ('MENU VIDEO NEED RESTART',        'Video settings will be changed after game restart.',
                                        'Äàííûå íàñòðîéêè âèäåî âñòóïÿò â ñèëó ïîñëå ïåðåçàïóñêà èãðû.'),
 
@@ -1342,14 +1355,16 @@ const
 
     ('NET SLIST FETCH',                'Fetching server list...',
                                        'Ïîëó÷àåì ñïèñîê ñåðâåðîâ...'),
-    ('NET SLIST RETRIEVED',            '%d servers retrieved.',
-                                       'Ïîëó÷åíî ñåðâåðîâ: %d'),
-    ('NET SLIST CONN',                 'Connected to masterserver.',
-                                       'Ïîäêëþ÷èëèñü ê ìàñòåðñåðâåðó.'),
-    ('NET SLIST DISC',                 'Disconnected from masterserver.',
-                                       'Îòêëþ÷èëèñü îò ìàñòåðñåðâåðà.'),
-    ('NET SLIST LOST',                 'Lost connection with masterserver.',
-                                       'Ñîåäèíåíèå ñ ìàñòåðñåðâåðîì ïîòåðÿíî.'),
+    ('NET SLIST RETRIEVED',            '%d servers retrieved from [%s].',
+                                       'Ïîëó÷åíî ñåðâåðîâ: %d, èñòî÷íèê: [%s]'),
+    ('NET SLIST CONN',                 'Connected to masterserver [%s].',
+                                       'Ïîäêëþ÷èëèñü ê ìàñòåðñåðâåðó [%s].'),
+    ('NET SLIST WCONN',                'Connecting to masterserver [%s]...',
+                                       'Ïîäêëþ÷àåìñÿ ê ìàñòåðñåðâåðó [%s]...'),
+    ('NET SLIST DISC',                 'Disconnected from masterserver [%s].',
+                                       'Îòêëþ÷èëèñü îò ìàñòåðñåðâåðà [%s].'),
+    ('NET SLIST LOST',                 'Lost connection with masterserver [%s].',
+                                       'Ñîåäèíåíèå ñ ìàñòåðñåðâåðîì ïîòåðÿíî [%s].'),
     ('NET SLIST ERROR',                'Could not connect to masterserver.',
                                        'Íå óäàëîñü ñîåäèíèòüñÿ ñ ìàñòåðñåðâåðîì.'),
 
@@ -1657,8 +1672,8 @@ const
                                        '- id Software, êîòîðûå çàâàðèëè ýòó êàøó'),
     ('CREDITS CLO 3',                  '- Everyone who helped our project',
                                        '- Âñåõ, êòî ïîìîãàë íàøåìó ïðîåêòó'),
-    ('CREDITS CLO 4',                  'www.doom2d.org, 2003-2019',
-                                       'www.doom2d.org, 2003-2019'),
+    ('CREDITS CLO 4',                  'www.doom2d.org, 2003-2020',
+                                       'www.doom2d.org, 2003-2020'),
 
     ('MSG SHOW FPS ON',                'FPS counter enabled',
                                        'FPS ïîêàçûâàþòñÿ'),
@@ -1684,6 +1699,10 @@ const
                                        'Ìîíñòðû â DM âêëþ÷åíû*'),
     ('MSG ALLOWMON OFF',               'Monsters in DM disabled*',
                                        'Ìîíñòðû â DM âûêëþ÷åíû*'),
+    ('MSG DMKEYS ON',                  'Spawning with all keys in DM enabled*',
+                                       'Ðåñïàâí ñî âñåìè êëþ÷àìè â DM âêëþ÷åí*'),
+    ('MSG DMKEYS OFF',                 'Spawning with all keys in DM disabled*',
+                                       'Ðåñïàâí ñî âñåìè êëþ÷àìè â DM âûêëþ÷åí*'),
     ('MSG BOTSVSPLAYERS ON',           'Bots attack players',
                                        'Áîòû ïðîòèâ èãðîêîâ'),
     ('MSG BOTSVSPLAYERS OFF',          'Bots ignore players',
@@ -1736,10 +1755,12 @@ const
                                        'Ëèìèò âðåìåíè - %d:%.2d:%.2d'),
     ('MSG LIVES',                      'Max lives: %d',
                                        'Ìàêñ. æèçíåé ó èãðîêîâ: %d'),
-    ('MSG WARMUP',                     'Warmup time: %d seconds*',
-                                       'Âðåìÿ íà ïîäãîòîâêó ê èãðå: %d ñåêóíä*'),
-    ('MSG WARMUP START',               '%d seconds until round start.',
-                                       '%d ñåêóíä äî íà÷àëà ðàóíäà.'),
+    ('MSG WARMUP',                     'Warmup time: %d sec*',
+                                       'Âðåìÿ íà ïîäãîòîâêó ê èãðå: %d ñåê*'),
+    ('MSG SPAWNINVUL',                 'Spawn invulnerability time: %d sec*',
+                                       'Íåóÿçâèìîñòü ïîñëå ðåñïàóíà: %d ñåê*'),
+    ('MSG WARMUP START',               '%d sec until round start.',
+                                       '%d ñåê äî íà÷àëà ðàóíäà.'),
     ('MSG NEXTMAP SET',                'Next map: %s',
                                        'Ñëåäóþùàÿ êàðòà: %s'),
     ('MSG NEXTMAP UNSET',              'Next map is not set.',
@@ -1787,10 +1808,12 @@ var
   i: LongWord;
 begin
 // Íàçâàíèÿ êëàâèø ïåðåìåùåíèÿ êóðñîðà:
+  { that was absolitely fucked idea
   e_KeyNames[IK_UP]    := _lc[I_KEY_UP] + ' ' + Chr(30);
   e_KeyNames[IK_LEFT]  := _lc[I_KEY_LEFT] + ' ' + Chr(17);
   e_KeyNames[IK_RIGHT] := _lc[I_KEY_RIGHT] + ' ' + Chr(16);
   e_KeyNames[IK_DOWN]  := _lc[I_KEY_DOWN] + ' ' + Chr(31);
+  }
 
 // Èìåíà ìîíñòðîâ â òâîðèòåëüíîì ïàäåæå:
   KilledByMonster[MONSTER_DEMON] := _lc[I_MONSTER_DEMON];