X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_language.pas;h=6f613826ecbe3f8fa2bb2a218c4e0a16e87b8f49;hb=80a5bd62ed15eaa7140802ab6d45da86ffa919d0;hp=06769e1f15d4e186ce3f68e0a24143e5bdf5a5c9;hpb=987c4a835a103345b59937e8e1be8524a6228712;p=d2df-sdl.git

diff --git a/src/game/g_language.pas b/src/game/g_language.pas
index 06769e1..6f61382 100644
--- a/src/game/g_language.pas
+++ b/src/game/g_language.pas
@@ -253,12 +253,18 @@ type
     I_MENU_GAME_MESSAGES,
     I_MENU_GAME_REVERT_PLAYERS,
     I_MENU_GAME_CHAT_BUBBLE,
-    I_MENU_GAME_PLAYER_INDICATOR,
     I_MENU_GAME_CHAT_TYPE_NONE,
     I_MENU_GAME_CHAT_TYPE_SIMPLE,
     I_MENU_GAME_CHAT_TYPE_ADV,
     I_MENU_GAME_CHAT_TYPE_COLOR,
     I_MENU_GAME_CHAT_TYPE_TEXTURE,
+    I_MENU_GAME_PLAYER_INDICATOR,
+    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,
@@ -387,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,
@@ -993,9 +1000,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:',
@@ -1085,8 +1092,6 @@ const
                                        'Âòîðîé èãðîê ñâåðõó:'),
     ('MENU GAME CHAT BUBBLE',          'Chat bubbles:',
                                        'Èêîíêà ÷àòà:'),
-    ('MENU GAME PLAYER INDICATOR',     'Player indicator:',
-                                       'Èíäèêàòîð èãðîêà:'),
     ('MENU GAME CHAT TYPE NONE',       'None',
                                        'Íåò'),
     ('MENU GAME CHAT TYPE SIMPLE',     'Simple',
@@ -1097,6 +1102,20 @@ const
                                        'Öâåòíàÿ'),
     ('MENU GAME CHAT TYPE TEXTURE',    'Textured',
                                        'Òåêñòóðà'),
+    ('MENU GAME PLAYER INDICATOR',     'Player indicator:',
+                                       'Èíäèêàòîð èãðîêà:'),
+    ('MENU GAME INDICATOR NONE',       'None',
+                                       'Íåò'),
+    ('MENU GAME INDICATOR OWN',        'Own',
+                                       'Ñâîé'),
+    ('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:',
                                        'Ìàñøòàá:'),
 
@@ -1108,8 +1127,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.',
                                        'Äàííûå íàñòðîéêè âèäåî âñòóïÿò â ñèëó ïîñëå ïåðåçàïóñêà èãðû.'),
 
@@ -1333,14 +1352,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.',
                                        'Íå óäàëîñü ñîåäèíèòüñÿ ñ ìàñòåðñåðâåðîì.'),
 
@@ -1648,8 +1669,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 ïîêàçûâàþòñÿ'),
@@ -1778,10 +1799,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];