changed license to GPLv3 only; sorry, no trust to FSF anymore

[d2df-sdl.git] / src / game / g_language.pas

diff --git a/src/game/g_language.pas b/src/game/g_language.pas
index 267fcd0fd8b3b083b28365bdc8de3a3e58e68d03..06769e1f15d4e186ce3f68e0a24143e5bdf5a5c9 100644 (file)
--- 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
@@ -350,6 +349,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,6 +381,8 @@ 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,
@@ -989,7 +992,7 @@ const
     ('MENU CONTROL DEADZONE',          'Joystick %d Deadzone',
                                        '̸ðòâàÿ çîíà äæîéñòèêà %d'),
 
-    ('MENU CONTROL TOCUH',             'Touchscreen Settings',
+    ('MENU CONTROL TOUCH',             'Touchscreen Settings',
                                        'Íàñòðîéêè ñåíñðíîãî ýêðàíà'),
     ('MENU CONTROL TOUCH ALT',         'Alternative layout:',
                                        'Àëüòåðíàòèâíàÿ ðàñêëàäêà:'),    
@@ -1263,6 +1266,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,6 +1326,10 @@ 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...',
                                        'Ïîëó÷àåì ñïèñîê ñåðâåðîâ...'),
@@ -1402,8 +1413,8 @@ const
                                        '*** %s ñòàùèë %s ôëàã!'),
     ('PLAYER FLAG RETURN',             '*** %s returned the %s flag!',
                                        '*** %s âåðíóë %s ôëàã!'),
-    ('PLAYER FLAG CAPTURE',            '*** %s captured the %s flag! (%s ms)',
-                                       '*** %s ïðèí¸ñ %s ôëàã! (%s ìñ)'),
+    ('PLAYER FLAG CAPTURE',            '*** %s captured the %s flag! (%s sec)',
+                                       '*** %s ïðèí¸ñ %s ôëàã! (%s ñåê)'),
     ('PLAYER FLAG DROP',               '*** %s dropped the %s flag!',
                                        '*** %s ïîòåðÿë %s ôëàã!'),
     ('PLAYER FLAG RED',                'red',