--- a/QTfrontend/translations/hedgewars_ru.ts	Mon Nov 13 17:43:56 2006 +0000
+++ b/QTfrontend/translations/hedgewars_ru.ts	Mon Nov 13 18:34:01 2006 +0000
@@ -1,19 +1,24 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS><TS version="1.1" language="ru">
 <context>
     <name>GameUIConfig</name>
     <message>
+        <location filename="../gameuiconfig.cpp" line="97"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
+        <location filename="" line="7602286"/>
         <source>Cannot create directory %1</source>
         <translation type="obsolete">Не могу создать папку %1</translation>
     </message>
     <message>
+        <location filename="../gameuiconfig.cpp" line="99"/>
         <source>Quit</source>
         <translation>Выйти</translation>
     </message>
     <message>
+        <location filename="../gameuiconfig.cpp" line="98"/>
         <source>Cannot save options to file %1</source>
         <translation>Ошибка при сохранении настроек в файл %1</translation>
     </message>
@@ -21,14 +26,17 @@
 <context>
     <name>HWForm</name>
     <message>
+        <location filename="../hwform.cpp" line="195"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
+        <location filename="../hwform.cpp" line="196"/>
         <source>Please, select demo from the list above</source>
         <translation>Выберите демо из списка</translation>
     </message>
     <message>
+        <location filename="../hwform.cpp" line="197"/>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
@@ -36,60 +44,81 @@
 <context>
     <name>HWGame</name>
     <message>
+        <location filename="../game.cpp" line="229"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
+        <location filename="" line="7602286"/>
         <source>Unable to start the server: %1.</source>
-        <translation>Ошибка запуска сервера: %1.</translation>
+        <translation type="obsolete">Ошибка запуска сервера: %1.</translation>
     </message>
     <message>
+        <location filename="../game.cpp" line="189"/>
         <source>en.txt</source>
         <translation>ru.txt</translation>
     </message>
     <message>
+        <location filename="../game.cpp" line="212"/>
         <source>Cannot save demo to file %1</source>
         <translation>Ошибка сохранения демо в файл %1</translation>
     </message>
     <message>
+        <location filename="../game.cpp" line="231"/>
         <source>Quit</source>
         <translation>Выход</translation>
     </message>
     <message>
+        <location filename="../game.cpp" line="230"/>
         <source>Cannot open demofile %1</source>
         <translation>Не могу открыть демо %1</translation>
     </message>
     <message>
+        <location filename="" line="7602286"/>
         <source>Unable to run engine: %1 (</source>
-        <translation>Ошибка запуска движка: %1 (</translation>
+        <translation type="obsolete">Ошибка запуска движка: %1 (</translation>
     </message>
 </context>
 <context>
     <name>HWNet</name>
     <message>
+        <location filename="../netclient.cpp" line="68"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
+        <location filename="../netclient.cpp" line="61"/>
         <source>The host was not found. Please check the host name and port settings.</source>
         <translation>Ошибка подключения. Проверьте имя сервера и номер порта.</translation>
     </message>
     <message>
+        <location filename="../netclient.cpp" line="65"/>
         <source>Connection refused</source>
         <translation>Отказано в соединении</translation>
     </message>
 </context>
 <context>
+    <name>KB</name>
+    <message>
+        <location filename="../KB.h" line="32"/>
+        <source>SDL_ttf returned error while rendering text, most propably it is related to the bug in freetype2. It&apos;s recommended to update your freetype lib.</source>
+        <translation>SDL_ttf возвратил ошибку при выводе текста, наиболее вероятно это вызвано багом в библиотеке freetype2. Рекомендуется обновить библиотеку.</translation>
+    </message>
+</context>
+<context>
     <name>QCheckBox</name>
     <message>
+        <location filename="../pages.cpp" line="345"/>
         <source>Enable sound</source>
         <translation>Включить звук</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="341"/>
         <source>Fullscreen</source>
         <translation>Полный экран</translation>
     </message>
     <message>
+        <location filename="../gamecfgwidget.cpp" line="45"/>
         <source>Forts mode</source>
         <translation>Режим фортов</translation>
     </message>
@@ -97,56 +126,113 @@
 <context>
     <name>QGroupBox</name>
     <message>
+        <location filename="../pages.cpp" line="140"/>
         <source>Team Members</source>
         <translation>Состав команды</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="121"/>
         <source>Team</source>
         <translation>Команда</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="210"/>
         <source>Fort</source>
         <translation>Форт</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="199"/>
         <source>Grave</source>
         <translation>Надгробие</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="158"/>
         <source>Key binds</source>
         <translation>Привязки клавиш</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="310"/>
         <source>Teams</source>
         <translation>Команды</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="329"/>
         <source>Audio/Graphic options</source>
         <translation>Настройки звука и графики</translation>
     </message>
     <message>
+        <location filename="" line="7602286"/>
         <source>Net nick</source>
         <translation type="obsolete">Имя игрока</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="371"/>
         <source>Net options</source>
         <translation>Настройки сети</translation>
     </message>
+    <message>
+        <location filename="../gamecfgwidget.cpp" line="28"/>
+        <source>Landscape</source>
+        <translation>Ландшафт</translation>
+    </message>
+    <message>
+        <location filename="../gamecfgwidget.cpp" line="39"/>
+        <source>Game scheme</source>
+        <translation>Настройки игры</translation>
+    </message>
 </context>
 <context>
     <name>QLabel</name>
     <message>
+        <location filename="../pages.cpp" line="378"/>
         <source>Net nick</source>
         <translation>Имя игрока</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="387"/>
         <source>Server address</source>
         <translation>Адрес сервера</translation>
     </message>
+    <message>
+        <location filename="../about.cpp" line="41"/>
+        <source>&lt;div align=&quot;center&quot;&gt;&lt;h1&gt;Hedgewars&lt;/h1&gt;&lt;h3&gt;Version 0.8&lt;/h3&gt;&lt;p&gt;&lt;a href=&quot;http://www.hedgewars.org/&quot;&gt;http://www.hedgewars.org/&lt;/a&gt;&lt;/p&gt;&lt;br&gt;This program is distributed under the GNU General Public License&lt;/div&gt;</source>
+        <translation type="obsolete">&lt;div align=&quot;center&quot;&gt;&lt;h1&gt;Hedgewars&lt;/h1&gt;&lt;h3&gt;Версия 0.8&lt;/h3&gt;&lt;p&gt;&lt;a href=&quot;http://www.hedgewars.org/&quot;&gt;http://www.hedgewars.org/&lt;/a&gt;&lt;/p&gt;&lt;br&gt;Эта программа распространяется под лицензией GNU (the GNU General Public License)&lt;/div&gt;</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="56"/>
+        <source>&lt;h2&gt;Developers:&lt;/h2&gt;&lt;p&gt;Andrey Korotaev &amp;lt;&lt;a href=&quot;mailto:unC0Rr@gmail.com&quot;&gt;unC0Rr@gmail.com&lt;/a&gt;&amp;gt;&lt;br&gt;Igor Ulyanov &amp;lt;&lt;a href=&quot;mailto:iulyanov@gmail.com&quot;&gt;iulyanov@gmail.com&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;h2&gt;Translations:&lt;/h2&gt;english: Andrey Korotaev &amp;lt;&lt;a href=&quot;mailto:unC0Rr@gmail.com&quot;&gt;unC0Rr@gmail.com&lt;/a&gt;&amp;gt;&lt;br&gt;russian: Andrey Korotaev &amp;lt;&lt;a href=&quot;mailto:unC0Rr@gmail.com&quot;&gt;unC0Rr@gmail.com&lt;/a&gt;&amp;gt;</source>
+        <translation type="obsolete">&lt;h2&gt;Разработчики:&lt;/h2&gt;&lt;p&gt;Андрей Коротаев &amp;lt;&lt;a href=&quot;mailto:unC0Rr@gmail.com&quot;&gt;unC0Rr@gmail.com&lt;/a&gt;&amp;gt;&lt;br&gt;Игорь Ульянов &amp;lt;&lt;a href=&quot;mailto:iulyanov@gmail.com&quot;&gt;iulyanov@gmail.com&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;h2&gt;Перевод:&lt;/h2&gt;английский: Андрей Коротаев &amp;lt;&lt;a href=&quot;mailto:unC0Rr@gmail.com&quot;&gt;unC0Rr@gmail.com&lt;/a&gt;&amp;gt;&lt;br&gt;русский: Андрей Коротаев &amp;lt;&lt;a href=&quot;mailto:unC0Rr@gmail.com&quot;&gt;unC0Rr@gmail.com&lt;/a&gt;&amp;gt;</translation>
+    </message>
+    <message>
+        <location filename="../pages.cpp" line="129"/>
+        <source>difficulty:</source>
+        <translation>Уровень игры:</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="38"/>
+        <source>&lt;h3&gt;Version 0.8&lt;/h3&gt;</source>
+        <translation>&lt;h3&gt;Версия 0.8&lt;/h3&gt;</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="40"/>
+        <source>This program is distributed under the GNU General Public License</source>
+        <translation>Эта программа распространяется на условиях лицензии GNU (the GNU General Public License)</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="55"/>
+        <source>&lt;h2&gt;Translations:&lt;/h2&gt;</source>
+        <translation>&lt;h2&gt;Переводы:&lt;/h2&gt;</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="50"/>
+        <source>&lt;h2&gt;Developers:&lt;/h2&gt;</source>
+        <translation>&lt;h2&gt;Разработчики:&lt;/h2&gt;</translation>
+    </message>
 </context>
 <context>
     <name>QLineEdit</name>
     <message>
+        <location filename="../pages.cpp" line="383"/>
         <source>unnamed</source>
         <translation>безымянный</translation>
     </message>
@@ -154,329 +240,465 @@
 <context>
     <name>QMainWindow</name>
     <message>
+        <location filename="" line="7602286"/>
         <source>-= by unC0Rr =-</source>
-        <translation>-= by unC0Rr =-</translation>
+        <translation type="obsolete">-= by unC0Rr =-</translation>
+    </message>
+    <message>
+        <location filename="../ui_hwform.cpp" line="31"/>
+        <source>Hedgewars</source>
+        <translation>Hedgewars</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
+        <location filename="../main.cpp" line="39"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
+        <location filename="../main.cpp" line="40"/>
         <source>Cannot create directory %1</source>
         <translation>Не могу создать папку %1</translation>
     </message>
     <message>
+        <location filename="" line="7602286"/>
         <source>Quit</source>
-        <translation>Выйти</translation>
+        <translation type="obsolete">Выйти</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="41"/>
+        <source>OK</source>
+        <translation>ОК</translation>
     </message>
 </context>
 <context>
     <name>QPushButton</name>
     <message>
+        <location filename="../pages.cpp" line="53"/>
         <source>Single Player</source>
         <translation>Одиночная игра</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="59"/>
         <source>Multiplayer</source>
         <translation>Схватка</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="65"/>
         <source>Net game</source>
         <translation>Сетевая игра</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="71"/>
         <source>Demos</source>
         <translation>Демки</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="77"/>
         <source>Setup</source>
         <translation>Настройка</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="89"/>
         <source>Exit</source>
         <translation>Выход</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="469"/>
         <source>Back</source>
         <translation>Назад</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="103"/>
         <source>Simple Game</source>
         <translation>Быстрый старт</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="154"/>
         <source>Discard</source>
         <translation>Отменить</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="352"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="296"/>
         <source>Play demo</source>
         <translation>Играть демку</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="316"/>
         <source>New team</source>
         <translation>Новая команда</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="324"/>
         <source>Edit team</source>
         <translation>Изменить</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="396"/>
         <source>Connect</source>
         <translation>Соединить</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="415"/>
         <source>Disconnect</source>
         <translation>Разъединить</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="423"/>
         <source>Join</source>
         <translation>Присоединиться</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="428"/>
         <source>Create</source>
         <translation>Создать</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="447"/>
         <source>Add Team</source>
         <translation>Добавить команду</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="452"/>
         <source>Go!</source>
         <translation>Вперёд!</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="276"/>
         <source>Start</source>
         <translation>Старт</translation>
     </message>
+    <message>
+        <location filename="../pages.cpp" line="83"/>
+        <source>About</source>
+        <translation>О программе</translation>
+    </message>
 </context>
 <context>
     <name>QToolBox</name>
     <message>
+        <location filename="../pages.cpp" line="164"/>
         <source>Actions</source>
         <translation>Действия</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="166"/>
         <source>Weapons</source>
         <translation>Оружие</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="168"/>
         <source>Weapon properties</source>
         <translation>Настройки оружия</translation>
     </message>
     <message>
+        <location filename="../pages.cpp" line="170"/>
         <source>Other</source>
         <translation>Разное</translation>
     </message>
 </context>
 <context>
+    <name>TCPBase</name>
+    <message>
+        <location filename="../tcpBase.cpp" line="92"/>
+        <source>Error</source>
+        <translation>Ошибка</translation>
+    </message>
+    <message>
+        <location filename="../tcpBase.cpp" line="41"/>
+        <source>Unable to start the server: %1.</source>
+        <translation>Ошибка запуска сервера: %1.</translation>
+    </message>
+    <message>
+        <location filename="../tcpBase.cpp" line="94"/>
+        <source>Unable to run engine: %1 (</source>
+        <translation>Ошибка запуска движка: %1 (</translation>
+    </message>
+</context>
+<context>
     <name>binds</name>
     <message>
+        <location filename="../binds.h" line="37"/>
         <source>up</source>
         <translation>вверх</translation>
     </message>
     <message>
+        <location filename="../binds.h" line="38"/>
         <source>left</source>
         <translation>влево</translation>
     </message>
     <message>
+        <location filename="../binds.h" line="39"/>
         <source>right</source>
         <translation>вправо</translation>
     </message>
     <message>
+        <location filename="../binds.h" line="40"/>
         <source>down</source>
         <translation>вниз</translation>
     </message>
     <message>
+        <location filename="../binds.h" line="42"/>
         <source>jump</source>
         <translation>прыжок</translation>
     </message>
     <message>
+        <location filename="../binds.h" line="43"/>
         <source>attack</source>
         <translation>атака</translation>
     </message>
     <message>
+        <location filename="../binds.h" line="44"/>
         <source>put</source>
         <translation>указать</translation>
     </message>
     <message>
+        <location filename="../binds.h" line="45"/>
         <source>switch</source>
         <translation>переключить</translation>
     </message>
     <message>
+        <location filename="../binds.h" line="48"/>
         <source>slot 1</source>
         <translation>слот 1</translation>
     </message>
     <message>
+        <location filename="../binds.h" line="49"/>
         <source>slot 2</source>
         <translation>слот 2</translation>
     </message>
     <message>
+        <location filename="../binds.h" line="50"/>
         <source>slot 3</source>
         <translation>слот 3</translation>
     </message>
     <message>
+        <location filename="../binds.h" line="51"/>
         <source>slot 4</source>
         <translation>слот 4</translation>
     </message>
     <message>
+        <location filename="../binds.h" line="52"/>
         <source>slot 5</source>
         <translation>слот 5</translation>
     </message>
     <message>
+        <location filename="../binds.h" line="53"/>
         <source>slot 6</source>
         <translation>слот 6</translation>
     </message>
     <message>
+        <location filename="../binds.h" line="54"/>
         <source>slot 7</source>
         <translation>слот 7</translation>
     </message>
     <message>
+        <location filename="../binds.h" line="55"/>
         <source>slot 8</source>
         <translation>слот 8</translation>
     </message>
     <message>
+        <location filename="../binds.h" line="56"/>
         <source>timer 1 sec</source>
         <translation>таймер на 1 сек</translation>
     </message>
     <message>
+        <location filename="../binds.h" line="57"/>
         <source>timer 2 sec</source>
         <translation>таймер на 2 сек</translation>
     </message>
     <message>
+        <location filename="../binds.h" line="58"/>
         <source>timer 3 sec</source>
         <translation>таймер на 3 сек</translation>
     </message>
     <message>
+        <location filename="../binds.h" line="59"/>
         <source>timer 4 sec</source>
         <translation>таймер на 4 сек</translation>
     </message>
     <message>
+        <location filename="../binds.h" line="60"/>
         <source>timer 5 sec</source>
         <translation>таймер на 5 сек</translation>
     </message>
     <message>
+        <location filename="../binds.h" line="64"/>
         <source>capture</source>
         <translation>снимок</translation>
     </message>
     <message>
+        <location filename="../binds.h" line="65"/>
         <source>quit</source>
         <translation>выход</translation>
     </message>
+    <message>
+        <location filename="../binds.h" line="46"/>
+        <source>find hedgehog</source>
+        <translation>найти ёжика</translation>
+    </message>
+    <message>
+        <location filename="../binds.h" line="47"/>
+        <source>ammo menu</source>
+        <translation>меню оружия</translation>
+    </message>
+    <message>
+        <location filename="../binds.h" line="61"/>
+        <source>volume down</source>
+        <translation>тише</translation>
+    </message>
+    <message>
+        <location filename="../binds.h" line="62"/>
+        <source>volume up</source>
+        <translation>громче</translation>
+    </message>
+    <message>
+        <location filename="../binds.h" line="63"/>
+        <source>change mode</source>
+        <translation>сменить режим</translation>
+    </message>
 </context>
 <context>
     <name>teams</name>
     <message>
+        <location filename="../predefteams.h" line="45"/>
         <source>Hedgehogs</source>
         <translation>Ёжики</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="46"/>
         <source>hedgehog 1</source>
         <translation>ёжик 1</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="47"/>
         <source>hedgehog 2</source>
         <translation>ёжик 2</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="48"/>
         <source>hedgehog 3</source>
         <translation>ёжик 3</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="49"/>
         <source>hedgehog 4</source>
         <translation>ёжик 4</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="50"/>
         <source>hedgehog 5</source>
         <translation>ёжик 5</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="51"/>
         <source>hedgehog 6</source>
         <translation>ёжик 6</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="52"/>
         <source>hedgehog 7</source>
         <translation>ёжик 7</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="53"/>
         <source>hedgehog 8</source>
         <translation>ёжик 8</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="57"/>
         <source>Goddess</source>
         <translation>Богини</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="58"/>
         <source>Isis</source>
         <translation>Изида</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="59"/>
         <source>Astarte</source>
         <translation>Астарта</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="60"/>
         <source>Diana</source>
         <translation>Диана</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="61"/>
         <source>Aphrodite</source>
         <translation>Афродита</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="62"/>
         <source>Hecate</source>
         <translation>Геката</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="63"/>
         <source>Demeter</source>
         <translation>Деметра</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="64"/>
         <source>Kali</source>
         <translation>Кали</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="65"/>
         <source>Inanna</source>
         <translation>Инанна</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="69"/>
         <source>Fruits</source>
         <translation>Фрукты</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="70"/>
         <source>Banana</source>
         <translation>Банан</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="71"/>
         <source>Apple</source>
         <translation>Яблоко</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="72"/>
         <source>Orange</source>
         <translation>Апельсин</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="73"/>
         <source>Lemon</source>
         <translation>Лимон</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="74"/>
         <source>Pineapple</source>
         <translation>Ананас</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="75"/>
         <source>Mango</source>
         <translation>Манго</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="76"/>
         <source>Peach</source>
         <translation>Персик</translation>
     </message>
     <message>
+        <location filename="../predefteams.h" line="77"/>
         <source>Plum</source>
         <translation>Слива</translation>
     </message>