X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_language.pas;h=af65be7947f8374dd5fbf046ba79388446d89ea3;hp=207285566c378dec0f5a5eba1a20cd8965934b2d;hb=3ef8e8c536c444b9e8a0adf38908d25082584e92;hpb=3350868dc4d3a87bb4b1c54c8bdc2f1e4cba03a0

diff --git a/src/game/g_language.pas b/src/game/g_language.pas
index 2072855..af65be7 100644
--- a/src/game/g_language.pas
+++ b/src/game/g_language.pas
@@ -2,8 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -254,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,
@@ -350,6 +355,8 @@ type
     I_NET_MSG_CLIENT_DONE,
     I_NET_MSG_CLIENT_DISC,
     I_NET_MSG_KICK,
+    I_NET_MSG_PORTS,
+    I_NET_MSG_TIMEOUT_WARN,
 
     I_NET_MAP_DL,
     I_NET_WAD_DL,
@@ -380,10 +387,13 @@ type
     I_NET_SLIST_WAIT,
     I_NET_SLIST_PING_MS,
     I_NET_SLIST_NO_ACCESS,
+    I_NET_SLIST_URGENT,
+    I_NET_SLIST_URGENT_CONT,
 
     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,
@@ -992,7 +1002,7 @@ const
     ('MENU CONTROL TOUCH',             'Touchscreen Settings',
                                        'Íàñòðîéêè ñåíñðíîãî ýêðàíà'),
     ('MENU CONTROL TOUCH ALT',         'Alternative layout:',
-                                       'Àëüòåðíàòèâíàÿ ðàñêëàäêà:'),    
+                                       'Àëüòåðíàòèâíàÿ ðàñêëàäêà:'),
     ('MENU CONTROL TOUCH FIRE',        'Shoot Up/Down:',
                                        'Ñòðåëÿòü ââåðõ/âíèç:'),
     ('MENU CONTROL TOUCH SIZE',        'Button size:',
@@ -1082,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',
@@ -1094,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:',
                                        'Ìàñøòàá:'),
 
@@ -1263,6 +1285,10 @@ const
                                        'Îòêëþ÷åíèå âûïîëíåíî.'),
     ('NET MSG KICK',                   'You were dropped from the game! Reason: ',
                                        'Âàñ âûáðîñèëî ñ ñåðâåðà! Ïðè÷èíà: '),
+    ('NET MSG PORTS',                  'Make sure ports %d and %d are forwarded on the server.',
+                                       'Ñïðîñèòå àäìèíà, ïðîáðîñèë ëè îí ïîðòû %d è %d íà ðîóòåðå.'),
+    ('NET MSG TIMEOUT WARN',           'Connection is taking too long.',
+                                       'Ñåðâåð íå îòâå÷àåò óæå äîâîëüíî äîëãî.'),
 
     ('NET MAP DL',                     'Map %s not found. Downloading from the server...',
                                        'Êàðòà %s íå íàéäåíà. Ñêà÷èâàåì ñ ñåðâåðà...'),
@@ -1319,17 +1345,23 @@ const
                                        ' ìñ'),
     ('NET SLIST NO ACCESS',            'N/A',
                                        'Í/Ä'),
+    ('NET SLIST URGENT',               'Message from master server',
+                                       'Ñîîáùåíèå ñ ìàñòåðñåðâåðà'),
+    ('NET SLIST URGENT CONT',          'Press [ENTER] to continue',
+                                       'Íàæìèòå [ENTER] äëÿ ïðîäîëæåíèÿ'),
 
     ('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.',
                                        'Íå óäàëîñü ñîåäèíèòüñÿ ñ ìàñòåðñåðâåðîì.'),