diff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-11-24 22:24:40 (GMT) | 
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-11-24 22:25:15 (GMT) | 
| commit | 2aaf52c6b175533b3ee9de5d603dfaa152165d04 (patch) | |
| tree | ae6aab4ebadaca244e6780b894eba34e885f096a | |
| parent | 4ff5cc2b1f3889ba631f523d14ec2bab1092bfb4 (diff) | |
| download | swift-2aaf52c6b175533b3ee9de5d603dfaa152165d04.zip swift-2aaf52c6b175533b3ee9de5d603dfaa152165d04.tar.bz2 | |
Russian translation update.swift-2.0rc2
Change-Id: I1cb8c5a0a4bd18012505adca45959a4215b6a89e
| -rw-r--r-- | Swift/Translations/swift_ru.ts | 1506 | 
1 files changed, 1241 insertions, 265 deletions
| diff --git a/Swift/Translations/swift_ru.ts b/Swift/Translations/swift_ru.ts index 059bb69..efd155a 100644 --- a/Swift/Translations/swift_ru.ts +++ b/Swift/Translations/swift_ru.ts @@ -5,498 +5,592 @@  <context>      <name></name>      <message> -        <location filename="../Controllers/Chat/ChatController.cpp" line="46"/> +        <location filename="../Controllers/Chat/ChatController.cpp" line="59"/>          <source>Starting chat with %1% in chatroom %2%</source>          <translation>Начат чат с %1% в комнате %2%</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatController.cpp" line="49"/> +        <location filename="../Controllers/Chat/ChatController.cpp" line="62"/>          <source>Starting chat with %1% - %2%</source>          <translation>Начат чат с %1% - %2%</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatController.cpp" line="119"/> +        <location filename="../Controllers/Chat/ChatController.cpp" line="202"/> +        <source>This chat doesn't support delivery receipts.</source> +        <translation>Этот чат не поддерживает отчёты о доставке.</translation> +    </message> +    <message> +        <location filename="../Controllers/Chat/ChatController.cpp" line="204"/> +        <source>This chat may not support delivery receipts. You might not receive delivery receipts for the messages you sent.</source> +        <translation>Этот чат не поддерживает отчёты о доставке. Вы не будете получать уведомления о доставке отправленных Вами сообщений.</translation> +    </message> +    <message> +        <location filename="../Controllers/Chat/ChatController.cpp" line="216"/> +        <location filename="../Controllers/FileTransfer/FileTransferController.cpp" line="42"/>          <source>me</source>          <translation>я</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatController.cpp" line="160"/> +        <location filename="../Controllers/Chat/ChatController.cpp" line="324"/>          <source>%1% has gone offline</source>          <translation>%1% теперь отключён</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatController.cpp" line="164"/> +        <location filename="../Controllers/Chat/ChatController.cpp" line="328"/>          <source>%1% has become available</source>          <translation>%1% снова доступен</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatController.cpp" line="166"/> +        <location filename="../Controllers/Chat/ChatController.cpp" line="330"/>          <source>%1% has gone away</source>          <translation>%1% теперь 'отсутствую'</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatController.cpp" line="168"/> +        <location filename="../Controllers/Chat/ChatController.cpp" line="332"/>          <source>%1% is now busy</source>          <translation>%1% теперь 'не беспокоить'</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="56"/> +        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="74"/>          <source>The day is now %1%</source>          <translation>Сегодня %1%</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="191"/> +        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="209"/> +        <source>Couldn't send message: %1%</source> +        <translation>Ошибка отправки сообщения: %1%</translation> +    </message> +    <message> +        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="269"/>          <source>Error sending message</source>          <translation>Ошибка отправки сообщения</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="197"/> +        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="275"/>          <source>Bad request</source>          <translation>Неверный запрос</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="198"/> +        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="276"/>          <source>Conflict</source>          <translation>Конфликт</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="199"/> +        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="277"/>          <source>This feature is not implemented</source>          <translation>Эта функция не реализована</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="200"/> +        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="278"/>          <source>Forbidden</source>          <translation>Запрещено</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="201"/> +        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="279"/>          <source>Recipient can no longer be contacted</source>          <translatorcomment>wtf</translatorcomment>          <translation>Получатель недоступен</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="202"/> +        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="280"/>          <source>Internal server error</source>          <translation>Внутренняя ошибка сервера</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="203"/> +        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="281"/>          <source>Item not found</source>          <translation>Элемент не найден</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="204"/> +        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="282"/>          <source>JID Malformed</source>          <translation>Некорректный JID</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="205"/> +        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="283"/>          <source>Message was rejected</source>          <translation>Сообщение отклонено</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="206"/> +        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="284"/>          <source>Not allowed</source>          <translation>Не разрешено</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="207"/> +        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="285"/>          <source>Not authorized</source>          <translation>Не авторизован</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="208"/> +        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="286"/>          <source>Payment is required</source>          <translation>Требуется оплата</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="209"/> +        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="287"/>          <source>Recipient is unavailable</source>          <translation>Получатель недоступен</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="210"/> +        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="288"/>          <source>Redirect</source>          <translation>Перенаправление</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="211"/> +        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="289"/>          <source>Registration required</source>          <translation>Требуется регистрация</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="212"/> +        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="290"/>          <source>Recipient's server not found</source>          <translation>Сервер получателя не найден</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="213"/> +        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="291"/>          <source>Remote server timeout</source>          <translation>Таймаут сервера</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="214"/> +        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="292"/>          <source>The server is low on resources</source>          <translation>Серверу не хватает ресурсов</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="215"/> +        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="293"/>          <source>The service is unavailable</source>          <translation>Сервис недоступен</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="216"/> +        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="294"/>          <source>A subscription is required</source>          <translation>Требуется подписка</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="217"/> +        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="295"/>          <source>Undefined condition</source>          <translation>Неопределённое условие</translation>      </message>      <message> -        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="218"/> +        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="296"/>          <source>Unexpected request</source>          <translation>Неожиданный запрос</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="114"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="222"/>          <source>Room %1% is not responding. This operation may never complete.</source>          <translation>Комната %1% не отвечает. Эта операция может не завершиться.</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="125"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="233"/>          <source>Unable to enter this room</source>          <translation>Не удалось войти в комнату</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="131"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="239"/>          <source>Unable to enter this room as %1%, retrying as %2%</source>          <translation>Не удалось войти в комнату как %1%, попытка войти как %2%</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="135"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="243"/>          <source>No nickname specified</source>          <translation>Ник не указан</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="139"/>          <source>A password needed</source> -        <translation>Нужен пароль</translation> +        <translation type="obsolete">Нужен пароль</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="143"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="251"/>          <source>Only members may enter</source>          <translation>Вход только для зарегистрированных участников</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="147"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="255"/>          <source>You are banned from the room</source>          <translation>Вы забанены в этой комнате</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="151"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="259"/>          <source>The room is full</source>          <translation>Комната полная</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="155"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="263"/>          <source>The room does not exist</source>          <translation>Комната не существует</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="173"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="269"/> +        <source>Couldn't join room: %1%.</source> +        <translation>Ошибка входа в комнату: %1%.</translation> +    </message> +    <message> +        <location filename="../Controllers/Chat/MUCController.cpp" line="281"/>          <source>You have entered room %1% as %2%.</source>          <translation>Вы вошли в комнату %1% как %2%.</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="214"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="332"/>          <source>%1% has entered the room as a %2%.</source>          <translation>%1% входит как %2%.</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="217"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="335"/>          <source>%1% has entered the room.</source>          <translation>%1% входит.</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="243"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="384"/>          <source>moderator</source>          <translation>модератор</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="244"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="385"/>          <source>participant</source>          <translation>участник</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="245"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="386"/>          <source>visitor</source>          <translation>гость</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="283"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="436"/>          <source>The room subject is now: %1%</source>          <translation>Тема конференции: %1%</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="313"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="470"/>          <source>%1% is now a %2%</source>          <translation>%1% теперь %2%</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="319"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="486"/>          <source>Moderators</source>          <translation>Модераторы</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="320"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="487"/>          <source>Participants</source>          <translation>Участники</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="321"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="488"/>          <source>Visitors</source>          <translation>Гости</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="322"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="489"/>          <source>Occupants</source>          <translatorcomment>wtf</translatorcomment>          <translation>Изгои</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="336"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="503"/>          <source>Trying to enter room %1%</source>          <translation>Попытка войти в комнату %1%</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="365"/> -        <location filename="../Controllers/Chat/MUCController.cpp" line="474"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="544"/> +        <source>%1% has left the room%2%</source> +        <translation>%1% вышел из комнаты%2%</translation> +    </message> +    <message> +        <location filename="../Controllers/Chat/MUCController.cpp" line="548"/> +        <source>You have been kicked out of the room</source> +        <translation>Вас выгнали из комнаты</translation> +    </message> +    <message> +        <location filename="../Controllers/Chat/MUCController.cpp" line="549"/> +        <source>You have been banned from the room</source> +        <translation>Вас забанили в этой комнате</translation> +    </message> +    <message> +        <location filename="../Controllers/Chat/MUCController.cpp" line="550"/> +        <source>You are no longer a member of the room and have been removed</source> +        <translation>Вы больше не зарегистрированный пользователь комнаты и были удалены</translation> +    </message> +    <message> +        <location filename="../Controllers/Chat/MUCController.cpp" line="551"/> +        <source>The room has been destroyed</source> +        <translation>Комната была уничтожена</translation> +    </message> +    <message> +        <location filename="../Controllers/Chat/MUCController.cpp" line="667"/>          <source>%1% has left the room</source>          <translation>%1% вышел</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="365"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="719"/> +        <source>Room configuration failed: %1%.</source> +        <translation>Ошибка настройки комнаты: %1%.</translation> +    </message> +    <message> +        <location filename="../Controllers/Chat/MUCController.cpp" line="725"/> +        <source>Occupant role change failed: %1%.</source> +        <translation>Ошибка изменения роли: %1%.</translation> +    </message> +    <message> +        <location filename="../Controllers/Chat/MUCController.cpp" line="553"/>          <source>You have left the room</source>          <translation>Вы вышли из комнаты</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="439"/> -        <location filename="../Controllers/Chat/MUCController.cpp" line="503"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="247"/> +        <source>The correct room password is needed</source> +        <translation>Необходим правильный пароль к комнате</translation> +    </message> +    <message> +        <location filename="../Controllers/Chat/MUCController.cpp" line="632"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="696"/>          <source> and </source>          <translation> и </translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="463"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="656"/>          <source>%1% have entered the room</source>          <translation>%1% вошли в комнату</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="466"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="659"/>          <source>%1% has entered the room</source>          <translation>%1% вошёл в комнату</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="471"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="664"/>          <source>%1% have left the room</source>          <translation>%1% вышли из комнаты</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="479"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="672"/>          <source>%1% have entered then left the room</source>          <translation>%1% вошли и вышли</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="482"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="675"/>          <source>%1% has entered then left the room</source>          <translation>%1% вошёл и вышел</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="487"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="680"/>          <source>%1% have left then returned to the room</source>          <translation>%1% вышли, затем вернулись</translation>      </message>      <message> -        <location filename="../Controllers/Chat/MUCController.cpp" line="490"/> +        <location filename="../Controllers/Chat/MUCController.cpp" line="683"/>          <source>%1% has left then returned to the room</source>          <translation>%1% вышел, затем вернулся</translation>      </message>      <message> -        <location filename="../Controllers/EventNotifier.cpp" line="51"/> +        <location filename="../Controllers/EventNotifier.cpp" line="59"/>          <source>%1% wants to add you to his/her contact list</source>          <translation>%1% хочет добавить Вас в свой список контактов</translation>      </message>      <message> -        <location filename="../Controllers/EventNotifier.cpp" line="55"/> +        <location filename="../Controllers/EventNotifier.cpp" line="63"/>          <source>Error</source>          <translation>Ошибка</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="438"/> +        <location filename="../Controllers/EventNotifier.cpp" line="67"/> +        <source>%1% has invited you to enter the %2% room</source> +        <translation>%1 приглашает Вас войти в конференцию %2</translation> +    </message> +    <message> +        <location filename="../Controllers/MainController.cpp" line="466"/> +        <source>User address invalid. User address should be of the form 'alice@wonderland.lit'</source> +        <translation>Адрес пользователя недействителен. Он должен иметь вид"vasya@pup.kin"</translation> +    </message> +    <message> +        <location filename="../Controllers/MainController.cpp" line="568"/>          <source>Unknown Error</source>          <translation>Неизвестная ошибка</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="439"/> +        <location filename="../Controllers/MainController.cpp" line="569"/>          <source>Unable to find server</source>          <translation>Не удаётся найти сервер</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="440"/> +        <location filename="../Controllers/MainController.cpp" line="570"/>          <source>Error connecting to server</source>          <translation>Ошибка подключения к серверу</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="441"/> +        <location filename="../Controllers/MainController.cpp" line="571"/>          <source>Error while receiving server data</source>          <translation>Ошибка получения данных</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="442"/> +        <location filename="../Controllers/MainController.cpp" line="572"/>          <source>Error while sending data to the server</source>          <translation>Ошибка отправки данных на сервер</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="443"/> +        <location filename="../Controllers/MainController.cpp" line="573"/>          <source>Error parsing server data</source>          <translation>Ошибка обработки данных от сервера</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="444"/> +        <location filename="../Controllers/MainController.cpp" line="574"/>          <source>Login/password invalid</source>          <translation>Неверный логин/пароль</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="445"/> +        <location filename="../Controllers/MainController.cpp" line="575"/>          <source>Error while compressing stream</source>          <translation>Ошибка сжатия потока</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="446"/> +        <location filename="../Controllers/MainController.cpp" line="576"/>          <source>Server verification failed</source>          <translation>Проверка сервера не удалась</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="447"/> +        <location filename="../Controllers/MainController.cpp" line="577"/>          <source>Authentication mechanisms not supported</source>          <translation>Механизм авторизации не поддерживается</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="448"/> +        <location filename="../Controllers/MainController.cpp" line="578"/>          <source>Unexpected response</source>          <translation>Неожиданный ответ</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="449"/> +        <location filename="../Controllers/MainController.cpp" line="579"/>          <source>Error binding resource</source>          <translation>Ошибка назначения ресурса</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="450"/> +        <location filename="../Controllers/MainController.cpp" line="580"/>          <source>Error starting session</source>          <translation>Ошибка при запуске сессии</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="451"/> +        <location filename="../Controllers/MainController.cpp" line="581"/>          <source>Stream error</source>          <translation>Ошибка потока</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="452"/> +        <location filename="../Controllers/MainController.cpp" line="582"/>          <source>Encryption error</source>          <translation>Ошибка шифрования</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="453"/> +        <location filename="../Controllers/MainController.cpp" line="583"/>          <source>Error loading certificate (Invalid password?)</source>          <translation>Ошибка загрузки сертификата (неверный пароль?)</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="454"/> +        <location filename="../Controllers/MainController.cpp" line="584"/>          <source>Certificate not authorized</source>          <translation>Сертификат не авторизован</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="456"/> +        <location filename="../Controllers/MainController.cpp" line="585"/> +        <source>Certificate card removed</source> +        <translation>Сертификат удалён</translation> +    </message> +    <message> +        <location filename="../Controllers/MainController.cpp" line="587"/>          <source>Unknown certificate</source>          <translation>Неизвестный сертификат</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="457"/> +        <location filename="../Controllers/MainController.cpp" line="588"/>          <source>Certificate has expired</source>          <translation>Срок действия сертификата истек</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="458"/> +        <location filename="../Controllers/MainController.cpp" line="589"/>          <source>Certificate is not yet valid</source>          <translation>Сертификат ещё не действителен</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="459"/> +        <location filename="../Controllers/MainController.cpp" line="590"/>          <source>Certificate is self-signed</source>          <translation>Сертификат самоподписанный</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="460"/> +        <location filename="../Controllers/MainController.cpp" line="591"/>          <source>Certificate has been rejected</source>          <translation>Сертификат отклонён</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="461"/> +        <location filename="../Controllers/MainController.cpp" line="592"/>          <source>Certificate is not trusted</source>          <translation>Сертификат не является доверенным</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="462"/> +        <location filename="../Controllers/MainController.cpp" line="593"/>          <source>Certificate cannot be used for encrypting your connection</source>          <translation>Сертификат не может быть использован для шифрования Вашего соединения</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="463"/> +        <location filename="../Controllers/MainController.cpp" line="594"/>          <source>Certificate path length constraint exceeded</source>          <translation>Превышена длина пути сертификата</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="464"/> +        <location filename="../Controllers/MainController.cpp" line="595"/>          <source>Invalid certificate signature</source>          <translation>Подпись сертификата недействительна</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="465"/> +        <location filename="../Controllers/MainController.cpp" line="596"/>          <source>Invalid Certificate Authority</source>          <translation>Центр сертификации недействителен</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="466"/> +        <location filename="../Controllers/MainController.cpp" line="597"/>          <source>Certificate does not match the host identity</source>          <translation>Сертификат не соответствует серверу</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="476"/> +        <location filename="../Controllers/MainController.cpp" line="598"/> +        <source>Certificate has been revoked</source> +        <translation>Сертификат отозван</translation> +    </message> +    <message> +        <location filename="../Controllers/MainController.cpp" line="599"/> +        <source>Unable to determine certificate revocation state</source> +        <translation>Невозможно проверить состояние отзыва сертификата</translation> +    </message> +    <message> +        <location filename="../Controllers/MainController.cpp" line="609"/>          <source>Certificate error</source>          <translation>Ошибка сертификата</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="490"/> +        <location filename="../Controllers/MainController.cpp" line="616"/> +        <source>Re-enter credentials and retry</source> +        <translation>Повторно введите учётные данные и повторите</translation> +    </message> +    <message> +        <location filename="../Controllers/MainController.cpp" line="629"/> +        <source>Disconnected from %1%: %2%. To reconnect, Sign Out and provide your password again.</source> +        <translation>Разорвано соединение с %1%: %2%. Чтобы восстановить связь, отключитесь и введите пароль ещё раз.</translation> +    </message> +    <message> +        <location filename="../Controllers/MainController.cpp" line="635"/>          <source>Reconnect to %1% failed: %2%. Will retry in %3% seconds.</source>          <translation>Переподключение к %1% не удалось: %2%. Повтор через %3% секунд.</translation>      </message>      <message> -        <location filename="../Controllers/MainController.cpp" line="493"/> +        <location filename="../Controllers/MainController.cpp" line="638"/>          <source>Disconnected from %1%: %2%.</source>          <translation>Отключение от %1%: %2%.</translation>      </message>      <message> -        <location filename="../Controllers/Roster/RosterController.cpp" line="126"/> -        <location filename="../Controllers/Roster/RosterController.cpp" line="152"/> -        <location filename="../Controllers/Roster/RosterController.cpp" line="214"/> +        <location filename="../Controllers/Roster/RosterController.cpp" line="131"/> +        <location filename="../Controllers/Roster/RosterController.cpp" line="157"/> +        <location filename="../Controllers/Roster/RosterController.cpp" line="222"/>          <source>Contacts</source>          <translation>Контакты</translation>      </message>      <message> -        <location filename="../Controllers/Roster/RosterController.cpp" line="251"/> +        <location filename="../Controllers/Roster/RosterController.cpp" line="263"/>          <source>Server %1% rejected contact list change to item '%2%'</source>          <translation>Сервер %1% отклонил изменение списка контактов с элементом '%2%'</translation>      </message> @@ -527,6 +621,32 @@          <source>There was an error publishing your profile data</source>          <translation>Ошибка публикации данных Вашего профиля</translation>      </message> +    <message> +        <location filename="../Controllers/ChatMessageSummarizer.cpp" line="33"/> +        <source>%1% (%2%)</source> +        <translation>%1% (%2%)</translation> +    </message> +    <message> +        <location filename="../Controllers/ChatMessageSummarizer.cpp" line="38"/> +        <source>%1% and %2% others (%3%)</source> +        <translatorcomment>xzxz</translatorcomment> +        <translation>%1% и %2% другие (%3%)</translation> +    </message> +    <message> +        <location filename="../Controllers/ChatMessageSummarizer.cpp" line="41"/> +        <source>%1%, %2% (%3%)</source> +        <translation>%1%, %2% (%3%)</translation> +    </message> +    <message> +        <location filename="../QtUI/CAPICertificateSelector.cpp" line="63"/> +        <source>TLS Client Certificate Selection</source> +        <translation>Выбор клиентского сертификата TLS</translation> +    </message> +    <message> +        <location filename="../QtUI/CAPICertificateSelector.cpp" line="64"/> +        <source>Select a certificate to use for authentication</source> +        <translation>Выбрать сертификат для аутентификации</translation> +    </message>  </context>  <context>      <name>CloseButton</name> @@ -675,15 +795,112 @@          <translation>Комнаты не найдены</translation>      </message>      <message> -        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="63"/> +        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="68"/>          <source>%1 would like to add you to their contact list.</source>          <translation>%1 хочет добавить Вас в свой список контактов.</translation>      </message>      <message> -        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="66"/> +        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="71"/>          <source>%1 would like to add you to their contact list, saying '%2'</source>          <translation>%1 хочет добавить Вас в свой список контактов, говоря '%2'</translation>      </message> +    <message> +        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="81"/> +        <source>%1 has invited you to enter the %2 room.</source> +        <translation>%1 приглашает Вас войти в конференцию %2.</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="982"/> +        <source>You've been invited to enter the %1 room.</source> +        <translation>Вас пригласили войти в конференцию %1.</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="984"/> +        <source>Reason: %1</source> +        <translation>Причина: %1</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="987"/> +        <source>This person may not have really sent this invitation!</source> +        <translation>Этот человек, возможно, не посылал это приглашение!</translation> +    </message> +    <message> +        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="46"/> +        <source>Direction</source> +        <translatorcomment>xzxz</translatorcomment> +        <translation>Направление</translation> +    </message> +    <message> +        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="47"/> +        <source>Other Party</source> +        <translation>Другая сторона</translation> +    </message> +    <message> +        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="48"/> +        <source>State</source> +        <translation>Регион</translation> +    </message> +    <message> +        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="49"/> +        <source>Progress</source> +        <translation>Прогресс</translation> +    </message> +    <message> +        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="50"/> +        <source>Size</source> +        <translation>Размер</translation> +    </message> +    <message> +        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="65"/> +        <source>Incoming</source> +        <translation>Входящий</translation> +    </message> +    <message> +        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="65"/> +        <source>Outgoing</source> +        <translation>Исходящий</translation> +    </message> +    <message> +        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="74"/> +        <source>Waiting for start</source> +        <translation>Ожидание старта</translation> +    </message> +    <message> +        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="76"/> +        <source>Waiting for other side to accept</source> +        <translation>Ожидание принятия на другой стороне</translation> +    </message> +    <message> +        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="78"/> +        <source>Negotiating</source> +        <translation>Переговоры</translation> +    </message> +    <message> +        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="80"/> +        <source>Transferring</source> +        <translation>Передача</translation> +    </message> +    <message> +        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="82"/> +        <source>Finished</source> +        <translatorcomment>xzxz</translatorcomment> +        <translation>Завершено</translation> +    </message> +    <message> +        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="84"/> +        <source>Failed</source> +        <translation>Не удалось</translation> +    </message> +    <message> +        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="86"/> +        <source>Canceled</source> +        <translation>Отменено</translation> +    </message> +    <message> +        <location filename="../QtUI/QtLoginWindow.cpp" line="142"/> +        <source>Connection Options</source> +        <translation>Параметры подключения</translation> +    </message>  </context>  <context>      <name>QScrollBar</name> @@ -943,74 +1160,282 @@      </message>  </context>  <context> +    <name>QtAffiliationEditor</name> +    <message> +        <location filename="../QtUI/QtAffiliationEditor.ui" line="14"/> +        <source>Edit Affiliations</source> +        <translation>Редактирование рангов</translation> +    </message> +    <message> +        <location filename="../QtUI/QtAffiliationEditor.ui" line="28"/> +        <source>Affiliation:</source> +        <translation>Ранг:</translation> +    </message> +    <message> +        <location filename="../QtUI/QtAffiliationEditor.ui" line="36"/> +        <source>Owner</source> +        <translation>Владелец</translation> +    </message> +    <message> +        <location filename="../QtUI/QtAffiliationEditor.ui" line="41"/> +        <source>Administrator</source> +        <translation>Администратор</translation> +    </message> +    <message> +        <location filename="../QtUI/QtAffiliationEditor.ui" line="46"/> +        <source>Member</source> +        <translation>Зарегистрированный пользователь</translation> +    </message> +    <message> +        <location filename="../QtUI/QtAffiliationEditor.ui" line="51"/> +        <source>Outcast (Banned)</source> +        <translation>Заблокированный</translation> +    </message> +    <message> +        <location filename="../QtUI/QtAffiliationEditor.ui" line="68"/> +        <source>Add User</source> +        <translation>Добавить пользователя</translation> +    </message> +    <message> +        <location filename="../QtUI/QtAffiliationEditor.ui" line="75"/> +        <source>Remove User</source> +        <translation>Удалить пользователя</translation> +    </message> +</context> +<context>      <name>QtBookmarkDetailWindow</name>      <message> -        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/> -        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="137"/> +        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="20"/>          <source>Edit Bookmark Details</source>          <translation>Редактирование закладки</translation>      </message>      <message> -        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/> -        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="138"/> +        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="40"/>          <source>Bookmark Name:</source>          <translation>Название закладки:</translation>      </message>      <message> -        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/> -        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="139"/> +        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="50"/>          <source>Room Address:</source>          <translation>Адрес комнаты:</translation>      </message>      <message> -        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/> -        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="140"/> +        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="60"/>          <source>Your Nickname:</source>          <translation>Ваш ник:</translation>      </message>      <message> -        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/> -        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="141"/> +        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="70"/>          <source>Room password:</source>          <translation>Пароль комнаты:</translation>      </message>      <message> -        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/> -        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="142"/> -        <source>Join automatically</source> +        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="93"/> +        <source>Enter automatically</source>          <translation>Входить автоматически</translation>      </message> +    <message> +        <source>Join automatically</source> +        <translation type="obsolete">Входить автоматически</translation> +    </message> +</context> +<context> +    <name>QtCertificateViewerDialog</name> +    <message> +        <location filename="../QtUI/QtCertificateViewerDialog.ui" line="14"/> +        <source>Certificate Viewer</source> +        <translation>Просмотр сертификата</translation> +    </message> +</context> +<context> +    <name>QtConnectionSettings</name> +    <message> +        <location filename="../QtUI/QtConnectionSettings.ui" line="14"/> +        <source>Connection Options</source> +        <translation>Параметры подключения</translation> +    </message> +    <message> +        <location filename="../QtUI/QtConnectionSettings.ui" line="22"/> +        <source>Connection Method:</source> +        <translation>Метод подключения:</translation> +    </message> +    <message> +        <location filename="../QtUI/QtConnectionSettings.ui" line="36"/> +        <source>Automatic</source> +        <translation>Автоматически</translation> +    </message> +    <message> +        <location filename="../QtUI/QtConnectionSettings.ui" line="41"/> +        <source>Manual</source> +        <translation>Вручную</translation> +    </message> +    <message> +        <location filename="../QtUI/QtConnectionSettings.ui" line="46"/> +        <source>BOSH</source> +        <translation>BOSH</translation> +    </message> +    <message> +        <location filename="../QtUI/QtConnectionSettings.ui" line="99"/> +        <source>Secure connection:</source> +        <translation>Безопасное подключение:</translation> +    </message> +    <message> +        <location filename="../QtUI/QtConnectionSettings.ui" line="107"/> +        <source>Never</source> +        <translation>Никогда</translation> +    </message> +    <message> +        <location filename="../QtUI/QtConnectionSettings.ui" line="112"/> +        <source>Encrypt when possible</source> +        <translation>Шифровать соединение если возможно</translation> +    </message> +    <message> +        <location filename="../QtUI/QtConnectionSettings.ui" line="117"/> +        <source>Always encrypt</source> +        <translation>Всегда шифровать</translation> +    </message> +    <message> +        <location filename="../QtUI/QtConnectionSettings.ui" line="127"/> +        <source>Allow Compression</source> +        <translation>Разрешить сжатие</translation> +    </message> +    <message> +        <location filename="../QtUI/QtConnectionSettings.ui" line="134"/> +        <source>Allow sending password over insecure connection</source> +        <translation>Разрешить отправку пароля через незащищённое соединение</translation> +    </message> +    <message> +        <location filename="../QtUI/QtConnectionSettings.ui" line="157"/> +        <source>Manually select server</source> +        <translation>Вручную выбрать сервер</translation> +    </message> +    <message> +        <location filename="../QtUI/QtConnectionSettings.ui" line="185"/> +        <location filename="../QtUI/QtConnectionSettings.ui" line="315"/> +        <location filename="../QtUI/QtConnectionSettings.ui" line="429"/> +        <source>Hostname:</source> +        <translation>Сервер:</translation> +    </message> +    <message> +        <location filename="../QtUI/QtConnectionSettings.ui" line="208"/> +        <location filename="../QtUI/QtConnectionSettings.ui" line="338"/> +        <location filename="../QtUI/QtConnectionSettings.ui" line="452"/> +        <source>Port:</source> +        <translation>Порт:</translation> +    </message> +    <message> +        <location filename="../QtUI/QtConnectionSettings.ui" line="230"/> +        <source>Connection Proxy</source> +        <translation>Прокси для подключения</translation> +    </message> +    <message> +        <location filename="../QtUI/QtConnectionSettings.ui" line="238"/> +        <source>Proxy type:</source> +        <translation>Тип прокси:</translation> +    </message> +    <message> +        <location filename="../QtUI/QtConnectionSettings.ui" line="249"/> +        <source>None</source> +        <translation>Отсутствует</translation> +    </message> +    <message> +        <location filename="../QtUI/QtConnectionSettings.ui" line="254"/> +        <source>Use system-configured proxy</source> +        <translation>Использовать системные настройки прокси</translation> +    </message> +    <message> +        <location filename="../QtUI/QtConnectionSettings.ui" line="259"/> +        <source>SOCKS5</source> +        <translation>SOCKS5</translation> +    </message> +    <message> +        <location filename="../QtUI/QtConnectionSettings.ui" line="264"/> +        <source>HTTP Connect</source> +        <translation>HTTP Connect</translation> +    </message> +    <message> +        <location filename="../QtUI/QtConnectionSettings.ui" line="287"/> +        <source>Override system-configured proxy</source> +        <translation>Перезаписать системные настройки прокси</translation> +    </message> +    <message> +        <location filename="../QtUI/QtConnectionSettings.ui" line="382"/> +        <source>BOSH URI:</source> +        <translation>BOSH URI:</translation> +    </message> +    <message> +        <location filename="../QtUI/QtConnectionSettings.ui" line="401"/> +        <source>Manually select HTTP proxy</source> +        <translation>Вручную выбрать HTTP прокси</translation> +    </message> +</context> +<context> +    <name>QtHistoryWindow</name> +    <message> +        <location filename="../QtUI/QtHistoryWindow.ui" line="14"/> +        <source>History</source> +        <translation>История</translation> +    </message> +    <message> +        <location filename="../QtUI/QtHistoryWindow.ui" line="22"/> +        <source>Search:</source> +        <translation>Поиск:</translation> +    </message> +    <message> +        <location filename="../QtUI/QtHistoryWindow.ui" line="42"/> +        <source>Next</source> +        <translatorcomment>xzxz</translatorcomment> +        <translation>Следующий</translation> +    </message> +    <message> +        <location filename="../QtUI/QtHistoryWindow.ui" line="52"/> +        <source>Previous</source> +        <translation>Предыдущий</translation> +    </message>  </context>  <context>      <name>QtJoinMUCWindow</name>      <message> -        <location filename="../QtUI/QtJoinMUCWindow.ui"/> -        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="124"/> -        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="130"/> +        <location filename="../QtUI/QtJoinMUCWindow.ui" line="20"/> +        <location filename="../QtUI/QtJoinMUCWindow.ui" line="113"/>          <source>Enter Room</source>          <translation>Войти в комнату</translation>      </message>      <message> -        <location filename="../QtUI/QtJoinMUCWindow.ui"/> -        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="125"/> +        <location filename="../QtUI/QtJoinMUCWindow.ui" line="28"/> +        <source>Room Address:</source> +        <translation>Адрес комнаты:</translation> +    </message> +    <message> +        <location filename="../QtUI/QtJoinMUCWindow.ui" line="42"/> +        <source>Your Nickname:</source> +        <translation>Ваш ник:</translation> +    </message> +    <message> +        <location filename="../QtUI/QtJoinMUCWindow.ui" line="59"/> +        <source>Room Password:</source> +        <translation>Пароль комнаты:</translation> +    </message> +    <message> +        <location filename="../QtUI/QtJoinMUCWindow.ui" line="71"/> +        <source>Automatically configure newly created rooms</source> +        <translation>Автоматически откывать окно конфигурации комнаты при её создании</translation> +    </message> +    <message>          <source>Room:</source> -        <translation>Комната:</translation> +        <translation type="obsolete">Комната:</translation>      </message>      <message> -        <location filename="../QtUI/QtJoinMUCWindow.ui"/> -        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="126"/> +        <location filename="../QtUI/QtJoinMUCWindow.ui" line="35"/>          <source>Search ...</source>          <translation>Поиск ...</translation>      </message>      <message> -        <location filename="../QtUI/QtJoinMUCWindow.ui"/> -        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="127"/>          <source>Nickname:</source> -        <translation>Ник:</translation> +        <translation type="obsolete">Ник:</translation>      </message>      <message> -        <location filename="../QtUI/QtJoinMUCWindow.ui"/> -        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="129"/> +        <location filename="../QtUI/QtJoinMUCWindow.ui" line="106"/>          <source>Enter automatically in future</source>          <translation>Входить автоматически в будущем</translation>      </message> @@ -1018,32 +1443,27 @@  <context>      <name>QtMUCSearchWindow</name>      <message> -        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/> -        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="118"/> +        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="14"/>          <source>Search Room</source>          <translation>Поик комнаты</translation>      </message>      <message> -        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/> -        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="119"/> +        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="20"/>          <source>Service:</source>          <translation>Сервис:</translation>      </message>      <message> -        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/> -        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="121"/> +        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="74"/>          <source>Cancel</source>          <translation>Отмена</translation>      </message>      <message> -        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/> -        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="122"/> +        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="84"/>          <source>OK</source>          <translation>ОК</translation>      </message>      <message> -        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/> -        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="123"/> +        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="96"/>          <source>List rooms</source>          <translation>Список комнат</translation>      </message> @@ -1051,32 +1471,27 @@  <context>      <name>QtUserSearchFieldsPage</name>      <message> -        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/> -        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="119"/> +        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="27"/>          <source>Nickname:</source>          <translation>Ник:</translation>      </message>      <message> -        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/> -        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="120"/> +        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="37"/>          <source>First name:</source>          <translation>Имя:</translation>      </message>      <message> -        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/> -        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="121"/> +        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="47"/>          <source>Last name:</source>          <translation>Фамилия:</translation>      </message>      <message> -        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/> -        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="122"/> +        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="57"/>          <source>E-Mail:</source>          <translation>E-Mail:</translation>      </message>      <message> -        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/> -        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="124"/> +        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="74"/>          <source>Fetching search fields</source>          <translation>Получение полей поиска</translation>      </message> @@ -1084,41 +1499,43 @@  <context>      <name>QtUserSearchFirstPage</name>      <message> -        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui"/> -        <location filename="../QtUI/UserSearch/ui_QtUserSearchFirstPage.h" line="121"/> +        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui" line="17"/>          <source>Add a user</source>          <translation>Добавить пользователя</translation>      </message>      <message> -        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui"/> -        <location filename="../QtUI/UserSearch/ui_QtUserSearchFirstPage.h" line="122"/> +        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui" line="20"/>          <source>Add another user to your contact list. If you know their address you can add them directly, or you can search for them.</source>          <translation>Добавить пользователя в список контактов. Вы можете ввести его адрес или воспользоваться поиском.</translation>      </message>      <message> -        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui"/> -        <location filename="../QtUI/UserSearch/ui_QtUserSearchFirstPage.h" line="124"/> +        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui" line="35"/>          <source>I know their address:</source>          <translation>Я знаю его адрес:</translation>      </message>      <message> -        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui"/> -        <location filename="../QtUI/UserSearch/ui_QtUserSearchFirstPage.h" line="125"/> +        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui" line="49"/>          <source>I'd like to search my server</source>          <translation>Я хочу искать на моём сервере</translation>      </message>      <message> -        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui"/> -        <location filename="../QtUI/UserSearch/ui_QtUserSearchFirstPage.h" line="126"/> +        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui" line="73"/>          <source>I'd like to search another server:</source>          <translation>Я хочу искать на другом сервере:</translation>      </message>  </context>  <context> +    <name>QtUserSearchResultsPage</name> +    <message> +        <location filename="../QtUI/UserSearch/QtUserSearchResultsPage.ui" line="27"/> +        <source>No results.</source> +        <translation>Нет результатов.</translation> +    </message> +</context> +<context>      <name>QtUserSearchWizard</name>      <message> -        <location filename="../QtUI/UserSearch/QtUserSearchWizard.ui"/> -        <location filename="../QtUI/UserSearch/ui_QtUserSearchWizard.h" line="39"/> +        <location filename="../QtUI/UserSearch/QtUserSearchWizard.ui" line="14"/>          <source>Find User</source>          <translation>Поиск пользователя</translation>      </message> @@ -1126,10 +1543,20 @@  <context>      <name>Swift::ChatListModel</name>      <message> -        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="15"/> +        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="17"/>          <source>Bookmarked Rooms</source>          <translation>Закладки комнат</translation>      </message> +    <message> +        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="18"/> +        <source>Recent Chats</source> +        <translation>Последние чаты</translation> +    </message> +    <message> +        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="20"/> +        <source>Opened Whiteboards</source> +        <translation>Открытые доски</translation> +    </message>  </context>  <context>      <name>Swift::QtAboutWidget</name> @@ -1167,6 +1594,59 @@      </message>  </context>  <context> +    <name>Swift::QtAdHocCommandWindow</name> +    <message> +        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="36"/> +        <source>Cancel</source> +        <translation>Отмена</translation> +    </message> +    <message> +        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="39"/> +        <source>Back</source> +        <translation>Назад</translation> +    </message> +    <message> +        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="42"/> +        <source>Next</source> +        <translatorcomment>xzxz следующий</translatorcomment> +        <translation>Далее</translation> +    </message> +    <message> +        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="45"/> +        <source>Complete</source> +        <translatorcomment>xzxz ejabberd buggy ad-hoc</translatorcomment> +        <translation>Выполнено</translation> +    </message> +    <message> +        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="86"/> +        <source>Error: %1</source> +        <translation>Ошибка: %1</translation> +    </message> +    <message> +        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="87"/> +        <source>Warning: %1</source> +        <translation>Предупреждение: %1</translation> +    </message> +    <message> +        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="104"/> +        <source>Error executing command</source> +        <translation>Ошибка выполнения команды</translation> +    </message> +</context> +<context> +    <name>Swift::QtAffiliationEditor</name> +    <message> +        <location filename="../QtUI/QtAffiliationEditor.cpp" line="48"/> +        <source>Add User</source> +        <translation>Добавить пользователя</translation> +    </message> +    <message> +        <location filename="../QtUI/QtAffiliationEditor.cpp" line="48"/> +        <source>Added User's Address:</source> +        <translation>Введите адрес пользователя:</translation> +    </message> +</context> +<context>      <name>Swift::QtAvatarWidget</name>      <message>          <location filename="../QtUI/QtAvatarWidget.cpp" line="61"/> @@ -1190,8 +1670,12 @@      </message>      <message>          <location filename="../QtUI/QtAvatarWidget.cpp" line="81"/> +        <source>Image Files (*.png *.jpg *.jpeg *.gif)</source> +        <translation>Изображения (*.png *.jpg *.jpeg *.gif)</translation> +    </message> +    <message>          <source>Image Files (*.png *.jpg *.gif)</source> -        <translation>Изображения (*.png *.jpg *.gif)</translation> +        <translation type="obsolete">Изображения (*.png *.jpg *.gif)</translation>      </message>      <message>          <location filename="../QtUI/QtAvatarWidget.cpp" line="95"/> @@ -1218,74 +1702,368 @@      </message>  </context>  <context> +    <name>Swift::QtCertificateViewerDialog</name> +    <message> +        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="95"/> +        <source>General</source> +        <translation>Общее</translation> +    </message> +    <message> +        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="96"/> +        <source>Valid From</source> +        <translation>Действует с</translation> +    </message> +    <message> +        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="97"/> +        <source>Valid To</source> +        <translation>Действителен до</translation> +    </message> +    <message> +        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="98"/> +        <source>Serial Number</source> +        <translation>Серийный номер</translation> +    </message> +    <message> +        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="99"/> +        <source>Version</source> +        <translation>Версия</translation> +    </message> +    <message> +        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="101"/> +        <source>Subject</source> +        <translation>Тема</translation> +    </message> +    <message> +        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="102"/> +        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="124"/> +        <source>Organization</source> +        <translation>Организация</translation> +    </message> +    <message> +        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="103"/> +        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="125"/> +        <source>Common Name</source> +        <translation>Полное имя</translation> +    </message> +    <message> +        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="104"/> +        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="126"/> +        <source>Locality</source> +        <translation>Местонахождение</translation> +    </message> +    <message> +        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="105"/> +        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="127"/> +        <source>Organizational Unit</source> +        <translation>Подразделение</translation> +    </message> +    <message> +        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="106"/> +        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="128"/> +        <source>Country</source> +        <translation>Страна</translation> +    </message> +    <message> +        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="107"/> +        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="129"/> +        <source>State</source> +        <translation>Регион</translation> +    </message> +    <message> +        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="110"/> +        <source>Alternate Subject Names</source> +        <translation>Альтернативные имена субъекта</translation> +    </message> +    <message> +        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="115"/> +        <source>E-mail Address</source> +        <translation>E-Mail адрес</translation> +    </message> +    <message> +        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="117"/> +        <source>DNS Name</source> +        <translation>DNS имя</translation> +    </message> +    <message> +        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="123"/> +        <source>Issuer</source> +        <translation>Издатель</translation> +    </message> +</context> +<context>      <name>Swift::QtChatListWindow</name>      <message> -        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="62"/> -        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="66"/> +        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="82"/> +        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="86"/>          <source>Add New Bookmark</source>          <translation>Добавить закладку</translation>      </message>      <message> -        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="63"/> +        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="83"/>          <source>Edit Bookmark</source>          <translation>Редактировать закладку</translation>      </message>      <message> -        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="64"/> +        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="84"/>          <source>Remove Bookmark</source>          <translation>Удалить закладку</translation>      </message> +    <message> +        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="173"/> +        <source>Clear recents</source> +        <translation>Удалить последние</translation> +    </message>  </context>  <context>      <name>Swift::QtChatView</name>      <message> -        <location filename="../QtUI/QtChatView.cpp" line="61"/> +        <location filename="../QtUI/QtChatView.cpp" line="73"/>          <source>Clear log</source>          <translation>Очистить лог</translation>      </message>      <message> -        <location filename="../QtUI/QtChatView.cpp" line="62"/> +        <location filename="../QtUI/QtChatView.cpp" line="74"/>          <source>You are about to clear the contents of your chat log.</source>          <translation>Вы собираетесь очистить содержимое Вашего чата.</translation>      </message>      <message> -        <location filename="../QtUI/QtChatView.cpp" line="63"/> +        <location filename="../QtUI/QtChatView.cpp" line="75"/>          <source>Are you sure?</source>          <translation>Вы уверены?</translation>      </message> +    <message> +        <location filename="../QtUI/QtChatView.cpp" line="219"/> +        <source>%1 edited</source> +        <translation>%1 отредактировано</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatView.cpp" line="400"/> +        <source>Waiting for other side to accept the transfer.</source> +        <translation>Ожидание принятия на другой стороне.</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatView.cpp" line="401"/> +        <location filename="../QtUI/QtChatView.cpp" line="406"/> +        <location filename="../QtUI/QtChatView.cpp" line="417"/> +        <source>Cancel</source> +        <translation>Отмена</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatView.cpp" line="405"/> +        <source>Negotiating...</source> +        <translation>Переговоры...</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatView.cpp" line="420"/> +        <source>Transfer has been canceled!</source> +        <translation>Передача была отменена!</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatView.cpp" line="424"/> +        <source>Transfer completed successfully.</source> +        <translation>Передача успешно завершена.</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatView.cpp" line="427"/> +        <source>Transfer failed.</source> +        <translation>Передача не удалась.</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatView.cpp" line="437"/> +        <source>Started whiteboard chat</source> +        <translation>Открыта доска для рисования</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatView.cpp" line="438"/> +        <source>Show whiteboard</source> +        <translation>Показать доску для рисования</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatView.cpp" line="440"/> +        <source>Whiteboard chat has been canceled</source> +        <translation>Доска для рисования была отменена</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatView.cpp" line="442"/> +        <source>Whiteboard chat request has been rejected</source> +        <translation>Запрос порисовать был отклонён</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatView.cpp" line="451"/> +        <source>Return to room</source> +        <translation>Вернуться в комнату</translation> +    </message>  </context>  <context>      <name>Swift::QtChatWindow</name>      <message> -        <location filename="../QtUI/QtChatWindow.cpp" line="302"/> +        <location filename="../QtUI/QtChatWindow.cpp" line="157"/> +        <source>Correcting</source> +        <translation>Исправление</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="269"/> +        <source>This chat may not support message correction. If you send a correction anyway, it may appear as a duplicate message</source> +        <translation>Этот чат, возможно, не поддерживает исправление сообщений. Если Вы отправляете исправление, это может выглядеть как дубликат сообщения</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="271"/> +        <source>This chat does not support message correction.  If you send a correction anyway, it will appear as a duplicate message</source> +        <translation>Этот чат не поддерживает исправление сообщений. Если Вы отправляете исправление, это будет выглядеть как дубликат сообщения</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="546"/>          <source>This message has not been received by your server yet.</source>          <translation>Это сообщение не может быть получено.</translation>      </message>      <message> -        <location filename="../QtUI/QtChatWindow.cpp" line="304"/> +        <location filename="../QtUI/QtChatWindow.cpp" line="553"/>          <source>This message may not have been transmitted.</source>          <translation>Это сообщение не может быть передано.</translation>      </message>      <message> -        <location filename="../QtUI/QtChatWindow.cpp" line="324"/> +        <location filename="../QtUI/QtChatWindow.cpp" line="562"/> +        <source>The receipt for this message has been received.</source> +        <translation>Отчёт о доставке этого сообщения был получен.</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="565"/> +        <source>The receipt for this message has not yet been received. The recipient(s) might not have received this message.</source> +        <translation>Отчёт о доставке этого сообщения пока не получен. Получатель, возможно, не получил это сообщение.</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="613"/> +        <source>Send file</source> +        <translation>Отправить файл</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="615"/> +        <location filename="../QtUI/QtChatWindow.cpp" line="623"/> +        <location filename="../QtUI/QtChatWindow.cpp" line="660"/> +        <location filename="../QtUI/QtChatWindow.cpp" line="664"/> +        <source>Cancel</source> +        <translation>Отмена</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="616"/> +        <source>Set Description</source> +        <translation>Установка описания</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="617"/> +        <source>Send</source> +        <translation>Отправка</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="621"/> +        <source>Receiving file</source> +        <translation>Получить файл</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="624"/> +        <location filename="../QtUI/QtChatWindow.cpp" line="665"/> +        <source>Accept</source> +        <translation>Принять</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="659"/> +        <source>Starting whiteboard chat</source> +        <translation>Открывается доска для рисования</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="663"/> +        <source>%1 would like to start a whiteboard chat</source> +        <translation>%1 хочет порисовать</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="700"/> +        <source>File transfer description</source> +        <translation>Описание передачи файлов</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="701"/> +        <source>Description:</source> +        <translation>Описание:</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="715"/> +        <source>Save File</source> +        <translation>Сохранить файл</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="908"/> +        <source>Change subject…</source> +        <translation>Изменить тему…</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="909"/> +        <source>Configure room…</source> +        <translation>Настроить комнату…</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="910"/> +        <source>Edit affiliations…</source> +        <translation>Редактировать ранги…</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="911"/> +        <source>Destroy room</source> +        <translation>Уничтожить комнату</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="912"/> +        <source>Invite person to this room…</source> +        <translation>Пригласить в эту комнату…</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="922"/> +        <source>Change room subject</source> +        <translation>Изменение темы конференции</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="922"/> +        <source>New subject:</source> +        <translation>Новая тема:</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="940"/> +        <source>Confirm room destruction</source> +        <translation>Подтверждение удаления комнаты</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="941"/> +        <source>Are you sure you want to destroy the room?</source> +        <translation>Вы уверены, что хотите удалить комнату?</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="942"/> +        <source>This will destroy the room.</source> +        <translation>Комната будет уничтожена.</translation> +    </message> +    <message> +        <location filename="../QtUI/QtChatWindow.cpp" line="993"/> +        <source>Accept Invite</source> +        <translation>Принять приглашение</translation> +    </message> +    <message>          <source>Couldn't send message: %1</source> -        <translation>Ошибка отправки: %1</translation> +        <translation type="obsolete">Ошибка отправки: %1</translation>      </message>  </context>  <context>      <name>Swift::QtContactEditWidget</name>      <message> -        <location filename="../QtUI/QtContactEditWidget.cpp" line="28"/> +        <location filename="../QtUI/QtContactEditWidget.cpp" line="122"/>          <source>Name:</source>          <translation>Имя:</translation>      </message>      <message> -        <location filename="../QtUI/QtContactEditWidget.cpp" line="34"/> +        <location filename="../QtUI/QtContactEditWidget.cpp" line="42"/>          <source>Groups:</source>          <translation>Группы:</translation>      </message>      <message> -        <location filename="../QtUI/QtContactEditWidget.cpp" line="56"/> +        <location filename="../QtUI/QtContactEditWidget.cpp" line="65"/>          <source>New Group:</source>          <translation>Новая группа:</translation>      </message> @@ -1293,32 +2071,32 @@  <context>      <name>Swift::QtContactEditWindow</name>      <message> -        <location filename="../QtUI/QtContactEditWindow.cpp" line="26"/> +        <location filename="../QtUI/QtContactEditWindow.cpp" line="28"/>          <source>Edit contact</source>          <translation>Редактировать контакт</translation>      </message>      <message> -        <location filename="../QtUI/QtContactEditWindow.cpp" line="41"/> +        <location filename="../QtUI/QtContactEditWindow.cpp" line="43"/>          <source>Remove contact</source>          <translation>Удалить контакт</translation>      </message>      <message> -        <location filename="../QtUI/QtContactEditWindow.cpp" line="44"/> +        <location filename="../QtUI/QtContactEditWindow.cpp" line="46"/>          <source>OK</source>          <translation>ОК</translation>      </message>      <message> -        <location filename="../QtUI/QtContactEditWindow.cpp" line="82"/> +        <location filename="../QtUI/QtContactEditWindow.cpp" line="94"/>          <source>Confirm contact deletion</source>          <translation>Подтверждение удаления</translation>      </message>      <message> -        <location filename="../QtUI/QtContactEditWindow.cpp" line="83"/> +        <location filename="../QtUI/QtContactEditWindow.cpp" line="95"/>          <source>Are you sure you want to delete this contact?</source>          <translation>Вы уверены, что хотите удалить этот контакт?</translation>      </message>      <message> -        <location filename="../QtUI/QtContactEditWindow.cpp" line="84"/> +        <location filename="../QtUI/QtContactEditWindow.cpp" line="96"/>          <source>This will remove the contact '%1' from all groups they may be in.</source>          <translation>Это позволит удалить контакт '%1' из всех групп, где он может быть</translation>      </message> @@ -1326,15 +2104,49 @@  <context>      <name>Swift::QtEventWindow</name>      <message> -        <location filename="../QtUI/EventViewer/QtEventWindow.cpp" line="47"/> +        <location filename="../QtUI/EventViewer/QtEventWindow.cpp" line="48"/>          <source>Display Notice</source> -        <translation>Показать уведомления</translation> +        <translation>Показать уведомление</translation> +    </message> +</context> +<context> +    <name>Swift::QtFileTransferListWidget</name> +    <message> +        <location filename="../QtUI/QtFileTransferListWidget.cpp" line="39"/> +        <source>Clear Finished Transfers</source> +        <translation>Очистить завершённые передачи</translation> +    </message> +    <message> +        <location filename="../QtUI/QtFileTransferListWidget.cpp" line="44"/> +        <source>File Transfer List</source> +        <translation>Список передачи файлов</translation> +    </message> +</context> +<context> +    <name>Swift::QtHistoryWindow</name> +    <message> +        <location filename="../QtUI/QtHistoryWindow.cpp" line="57"/> +        <source>History</source> +        <translation>История</translation> +    </message> +</context> +<context> +    <name>Swift::QtInviteToChatWindow</name> +    <message> +        <location filename="../QtUI/QtInviteToChatWindow.cpp" line="25"/> +        <source>Users to invite to this chat (one per line):</source> +        <translation>Пользователи для приглашения в этот чат (один на строку):</translation> +    </message> +    <message> +        <location filename="../QtUI/QtInviteToChatWindow.cpp" line="31"/> +        <source>If you want to provide a reason for the invitation, enter it here</source> +        <translation>Если Вы хотите указать причину для приглашения, введите её здесь</translation>      </message>  </context>  <context>      <name>Swift::QtJoinMUCWindow</name>      <message> -        <location filename="../QtUI/QtJoinMUCWindow.cpp" line="15"/> +        <location filename="../QtUI/QtJoinMUCWindow.cpp" line="19"/>          <source>someroom@rooms.example.com</source>          <translation>someroom@rooms.example.com</translation>      </message> @@ -1342,122 +2154,148 @@  <context>      <name>Swift::QtLoginWindow</name>      <message> -        <location filename="../QtUI/QtLoginWindow.cpp" line="81"/> +        <location filename="../QtUI/QtLoginWindow.cpp" line="92"/>          <source>User address:</source>          <translation>Адрес пользователя:</translation>      </message>      <message> -        <location filename="../QtUI/QtLoginWindow.cpp" line="86"/> -        <location filename="../QtUI/QtLoginWindow.cpp" line="87"/> +        <location filename="../QtUI/QtLoginWindow.cpp" line="97"/> +        <location filename="../QtUI/QtLoginWindow.cpp" line="98"/>          <source>User address - looks like someuser@someserver.com</source>          <translation>Например, вася@jabber.ru/стриж</translation>      </message>      <message> -        <location filename="../QtUI/QtLoginWindow.cpp" line="91"/> +        <location filename="../QtUI/QtLoginWindow.cpp" line="102"/>          <source>Example: alice@wonderland.lit</source>          <translation>Например, ivan@jabber.ru</translation>      </message>      <message> -        <location filename="../QtUI/QtLoginWindow.cpp" line="97"/> +        <location filename="../QtUI/QtLoginWindow.cpp" line="108"/>          <source>Password:</source>          <translation>Пароль:</translation>      </message>      <message> -        <location filename="../QtUI/QtLoginWindow.cpp" line="118"/> -        <location filename="../QtUI/QtLoginWindow.cpp" line="119"/> +        <location filename="../QtUI/QtLoginWindow.cpp" line="129"/> +        <location filename="../QtUI/QtLoginWindow.cpp" line="130"/>          <source>Click if you have a personal certificate used for login to the service.</source>          <translation>Нажмите, если у Вас есть личный сертификат, используемый для входа.</translation>      </message>      <message> -        <location filename="../QtUI/QtLoginWindow.cpp" line="125"/> -        <location filename="../QtUI/QtLoginWindow.cpp" line="299"/> +        <location filename="../QtUI/QtLoginWindow.cpp" line="136"/> +        <location filename="../QtUI/QtLoginWindow.cpp" line="353"/>          <source>Connect</source>          <translation>Подключиться</translation>      </message>      <message> -        <location filename="../QtUI/QtLoginWindow.cpp" line="136"/> +        <location filename="../QtUI/QtLoginWindow.cpp" line="154"/>          <source>Remember Password?</source> -        <translation>Запомнить пароль?</translation> +        <translation>Запомнить пароль</translation>      </message>      <message> -        <location filename="../QtUI/QtLoginWindow.cpp" line="138"/> +        <location filename="../QtUI/QtLoginWindow.cpp" line="156"/>          <source>Login Automatically?</source> -        <translation>Подключаться автоматически?</translation> +        <translation>Подключаться автоматически</translation>      </message>      <message> -        <location filename="../QtUI/QtLoginWindow.cpp" line="150"/> +        <location filename="../QtUI/QtLoginWindow.cpp" line="168"/>          <source>&Swift</source>          <translation>&Swift</translation>      </message>      <message> -        <location filename="../QtUI/QtLoginWindow.cpp" line="152"/> +        <location filename="../QtUI/QtLoginWindow.cpp" line="170"/>          <source>&General</source>          <translation>&Общие</translation>      </message>      <message> -        <location filename="../QtUI/QtLoginWindow.cpp" line="160"/> +        <location filename="../QtUI/QtLoginWindow.cpp" line="178"/>          <source>&About %1</source>          <translation>&О %1</translation>      </message>      <message> -        <location filename="../QtUI/QtLoginWindow.cpp" line="165"/> +        <location filename="../QtUI/QtLoginWindow.cpp" line="183"/>          <source>&Show Debug Console</source>          <translation>&Показать консоль отладки</translation>      </message>      <message> -        <location filename="../QtUI/QtLoginWindow.cpp" line="169"/> +        <location filename="../QtUI/QtLoginWindow.cpp" line="188"/> +        <source>Show &File Transfer Overview</source> +        <translation>Показать окно передачи &файлов</translation> +    </message> +    <message> +        <location filename="../QtUI/QtLoginWindow.cpp" line="193"/>          <source>&Play Sounds</source> -        <translation>&Играть звуки</translation> +        <translation>&Воспроизводить звуки</translation>      </message>      <message> -        <location filename="../QtUI/QtLoginWindow.cpp" line="175"/> +        <location filename="../QtUI/QtLoginWindow.cpp" line="199"/>          <source>Display Pop-up &Notifications</source>          <translation>Показывать всплывающие &уведомления</translation>      </message>      <message> -        <location filename="../QtUI/QtLoginWindow.cpp" line="190"/> +        <location filename="../QtUI/QtLoginWindow.cpp" line="211"/>          <source>&Quit</source> -        <translation>&Выход</translation> +        <translation>В&ыход</translation>      </message>      <message> -        <location filename="../QtUI/QtLoginWindow.cpp" line="205"/> +        <location filename="../QtUI/QtLoginWindow.cpp" line="253"/>          <source>Remove profile</source>          <translation>Удалить профиль</translation>      </message>      <message> -        <location filename="../QtUI/QtLoginWindow.cpp" line="205"/> +        <location filename="../QtUI/QtLoginWindow.cpp" line="253"/>          <source>Remove the profile '%1'?</source>          <translation>Удалить профиль '%1'?</translation>      </message>      <message> -        <location filename="../QtUI/QtLoginWindow.cpp" line="299"/> +        <location filename="../QtUI/QtLoginWindow.cpp" line="353"/>          <source>Cancel</source>          <translation>Отмена</translation>      </message>      <message> -        <location filename="../QtUI/QtLoginWindow.cpp" line="320"/> +        <location filename="../QtUI/QtLoginWindow.cpp" line="367"/> +        <source>Confirm terms of use</source> +        <translation>Подтверждение условий использования</translation> +    </message> +    <message> +        <location filename="../QtUI/QtLoginWindow.cpp" line="410"/>          <source>Select an authentication certificate</source>          <translation>Выберите сертификат проверки подлинности</translation>      </message>      <message> -        <location filename="../QtUI/QtLoginWindow.cpp" line="420"/> +        <location filename="../QtUI/QtLoginWindow.cpp" line="410"/> +        <source>P12 files (*.cert *.p12 *.pfx);;All files (*.*)</source> +        <translation>P12 файлы (*.cert *.p12 *.pfx);;Все файлы (*.*)</translation> +    </message> +    <message> +        <location filename="../QtUI/QtLoginWindow.cpp" line="523"/>          <source>The certificate presented by the server is not valid.</source>          <translation>Сертификат, предоставленный сервером, является недопустимым.</translation>      </message>      <message> -        <location filename="../QtUI/QtLoginWindow.cpp" line="421"/> +        <location filename="../QtUI/QtLoginWindow.cpp" line="524"/>          <source>Would you like to permanently trust this certificate? This must only be done if you know it is correct.</source>          <translation>Хотели бы Вы доверять этому сертификату?</translation>      </message>      <message> -        <location filename="../QtUI/QtLoginWindow.cpp" line="423"/>          <source>Subject: %1</source> -        <translation>Тема: %1</translation> +        <translation type="obsolete">Тема: %1</translation>      </message>      <message> -        <location filename="../QtUI/QtLoginWindow.cpp" line="424"/>          <source>SHA-1 Fingerprint: %1</source> -        <translation>Отпечаток SHA-1: %1</translation> +        <translation type="obsolete">Отпечаток SHA-1: %1</translation> +    </message> +</context> +<context> +    <name>Swift::QtMUCConfigurationWindow</name> +    <message> +        <location filename="../QtUI/QtMUCConfigurationWindow.cpp" line="34"/> +        <source>Cancel</source> +        <translation>Отмена</translation> +    </message> +    <message> +        <location filename="../QtUI/QtMUCConfigurationWindow.cpp" line="37"/> +        <source>OK</source> +        <translation>ОК</translation>      </message>  </context>  <context> @@ -1472,91 +2310,164 @@  <context>      <name>Swift::QtMainWindow</name>      <message> -        <location filename="../QtUI/QtMainWindow.cpp" line="64"/> +        <location filename="../QtUI/QtMainWindow.cpp" line="79"/>          <source>&Contacts</source>          <translation>&Контакты</translation>      </message>      <message> -        <location filename="../QtUI/QtMainWindow.cpp" line="71"/> -        <location filename="../QtUI/QtMainWindow.cpp" line="137"/> +        <location filename="../QtUI/QtMainWindow.cpp" line="88"/> +        <location filename="../QtUI/QtMainWindow.cpp" line="205"/>          <source>&Notices</source>          <translation>&Уведомления</translation>      </message>      <message> -        <location filename="../QtUI/QtMainWindow.cpp" line="72"/> +        <location filename="../QtUI/QtMainWindow.cpp" line="87"/>          <source>C&hats</source> -        <translation>&Чаты</translation> +        <translation>Ч&аты</translation>      </message>      <message> -        <location filename="../QtUI/QtMainWindow.cpp" line="76"/> +        <location filename="../QtUI/QtMainWindow.cpp" line="96"/>          <source>&View</source>          <translation>&Вид</translation>      </message>      <message> -        <location filename="../QtUI/QtMainWindow.cpp" line="78"/> +        <location filename="../QtUI/QtMainWindow.cpp" line="98"/>          <source>&Show offline contacts</source>          <translation>&Показывать отключённых</translation>      </message>      <message> -        <location filename="../QtUI/QtMainWindow.cpp" line="84"/> +        <location filename="../QtUI/QtMainWindow.cpp" line="106"/> +        <source>&Show Emoticons</source> +        <translation>Показывать &смайлы</translation> +    </message> +    <message> +        <location filename="../QtUI/QtMainWindow.cpp" line="120"/>          <source>&Actions</source>          <translation>&Действия</translation>      </message>      <message> -        <location filename="../QtUI/QtMainWindow.cpp" line="86"/> +        <location filename="../QtUI/QtMainWindow.cpp" line="122"/>          <source>Edit &Profile…</source>          <translation>Редактировать &профиль…</translation>      </message>      <message> -        <location filename="../QtUI/QtMainWindow.cpp" line="89"/> +        <location filename="../QtUI/QtMainWindow.cpp" line="125"/>          <source>Enter &Room…</source>          <translation>&Войти в комнату…</translation>      </message>      <message> -        <location filename="../QtUI/QtMainWindow.cpp" line="92"/> +        <location filename="../QtUI/QtMainWindow.cpp" line="129"/> +        <source>&View History…</source> +        <translation>Просмотр &истории…</translation> +    </message> +    <message> +        <location filename="../QtUI/QtMainWindow.cpp" line="133"/>          <source>&Add Contact…</source> -        <translation>&Добавить контакт…</translation> +        <translation>До&бавить контакт…</translation>      </message>      <message> -        <location filename="../QtUI/QtMainWindow.cpp" line="95"/> +        <location filename="../QtUI/QtMainWindow.cpp" line="136"/>          <source>&Edit Selected Contact…</source>          <translation>&Редактировать выделенный контакт…</translation>      </message>      <message> -        <location filename="../QtUI/QtMainWindow.cpp" line="99"/> +        <location filename="../QtUI/QtMainWindow.cpp" line="140"/>          <source>Start &Chat…</source> -        <translation>Начать &чат</translation> +        <translation>Нач&ать чат…</translation> +    </message> +    <message> +        <location filename="../QtUI/QtMainWindow.cpp" line="143"/> +        <source>Run Server Command</source> +        <translation>Выполнить серверную команду</translation>      </message>      <message> -        <location filename="../QtUI/QtMainWindow.cpp" line="103"/> +        <location filename="../QtUI/QtMainWindow.cpp" line="146"/>          <source>&Sign Out</source>          <translation>&Отключиться</translation>      </message> +    <message> +        <location filename="../QtUI/QtMainWindow.cpp" line="150"/> +        <source>&Request Delivery Receipts</source> +        <translation>&Запрашивать уведомления о доставке</translation> +    </message> +    <message> +        <location filename="../QtUI/QtMainWindow.cpp" line="161"/> +        <source>Collecting commands...</source> +        <translation>Сбор команд...</translation> +    </message> +    <message> +        <location filename="../QtUI/QtMainWindow.cpp" line="216"/> +        <source>&Chats</source> +        <translation>&Чаты</translation> +    </message> +    <message> +        <location filename="../QtUI/QtMainWindow.cpp" line="339"/> +        <source>No Available Commands</source> +        <translation>Нет доступных комманд</translation> +    </message>  </context>  <context>      <name>Swift::QtNameWidget</name>      <message> -        <location filename="../QtUI/QtNameWidget.cpp" line="47"/> +        <location filename="../QtUI/QtNameWidget.cpp" line="48"/>          <source>Show Nickname</source>          <translation>Показывать ник</translation>      </message>      <message> -        <location filename="../QtUI/QtNameWidget.cpp" line="47"/> +        <location filename="../QtUI/QtNameWidget.cpp" line="48"/>          <source>(No Nickname Set)</source>          <translation>(ник не установлен)</translation>      </message>      <message> -        <location filename="../QtUI/QtNameWidget.cpp" line="55"/> +        <location filename="../QtUI/QtNameWidget.cpp" line="56"/>          <source>Show Address</source>          <translation>Показывать адрес</translation>      </message>      <message> -        <location filename="../QtUI/QtNameWidget.cpp" line="62"/> +        <location filename="../QtUI/QtNameWidget.cpp" line="63"/>          <source>Edit Profile</source>          <translation>Редактировать профиль</translation>      </message>  </context>  <context> +    <name>Swift::QtOccupantListWidget</name> +    <message> +        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="46"/> +        <source>No actions for this user</source> +        <translation>Нет действий для данного пользователя</translation> +    </message> +    <message> +        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="55"/> +        <source>Kick user</source> +        <translation>Выгнать</translation> +    </message> +    <message> +        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="56"/> +        <source>Kick and ban user</source> +        <translation>Выгнать и забанить</translation> +    </message> +    <message> +        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="57"/> +        <source>Make moderator</source> +        <translation>Сделать модератором</translation> +    </message> +    <message> +        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="58"/> +        <source>Make participant</source> +        <translation>Сделать участником</translation> +    </message> +    <message> +        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="59"/> +        <source>Remove voice</source> +        <translation>Лишить голоса</translation> +    </message> +    <message> +        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="60"/> +        <source>Add to contacts</source> +        <translation>Добавить в контакты</translation> +    </message> +</context> +<context>      <name>Swift::QtProfileWindow</name>      <message>          <location filename="../QtUI/QtProfileWindow.cpp" line="24"/> @@ -1575,6 +2486,58 @@      </message>  </context>  <context> +    <name>Swift::QtRosterHeader</name> +    <message> +        <location filename="../QtUI/QtRosterHeader.cpp" line="59"/> +        <source>Connection is secured</source> +        <translation>Подключение защищено</translation> +    </message> +</context> +<context> +    <name>Swift::QtRosterWidget</name> +    <message> +        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="58"/> +        <source>Edit…</source> +        <translation>Редактировать…</translation> +    </message> +    <message> +        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="59"/> +        <source>Remove</source> +        <translation>Удалить</translation> +    </message> +    <message> +        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="63"/> +        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="83"/> +        <source>Send File</source> +        <translation>Отправить файл</translation> +    </message> +    <message> +        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="69"/> +        <source>Start Whiteboard Chat</source> +        <translation>Открыть доску для рисования</translation> +    </message> +    <message> +        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="83"/> +        <source>All Files (*);;</source> +        <translation>Все файлы (*);;</translation> +    </message> +    <message> +        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="96"/> +        <source>Rename</source> +        <translation>Переименовать</translation> +    </message> +    <message> +        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="106"/> +        <source>Rename group</source> +        <translation>Переименовать группу</translation> +    </message> +    <message> +        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="106"/> +        <source>Enter a new name for group '%1':</source> +        <translation>Введите новое название группы '%1':</translation> +    </message> +</context> +<context>      <name>Swift::QtStatusWidget</name>      <message>          <location filename="../QtUI/QtStatusWidget.cpp" line="231"/> @@ -1582,7 +2545,7 @@          <translation>Соединение</translation>      </message>      <message> -        <location filename="../QtUI/QtStatusWidget.cpp" line="263"/> +        <location filename="../QtUI/QtStatusWidget.cpp" line="261"/>          <source>(No message)</source>          <translation>(нет сообщения)</translation>      </message> @@ -1596,7 +2559,7 @@  If you choose to defer this choice, you will be asked again when you next login.</source>          <translation>%1 хочет добавить Вас в свой список контактов. -Вы хотите добавить его в список контактов и обмениваться статусами, когда вы в сети? +Вы хотите добавить его в список контактов и обмениваться статусами, когда Вы в сети?  Если Вы решили отложить выбор, то запрос придёт снова при следующем подключении.</translation>      </message> @@ -1616,12 +2579,12 @@ If you choose to defer this choice, you will be asked again when you next login.          <translation>Да</translation>      </message>      <message> -        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="32"/> +        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="33"/>          <source>No</source>          <translation>Нет</translation>      </message>      <message> -        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="34"/> +        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="35"/>          <source>Defer</source>          <translation>Отложить</translation>      </message> @@ -1629,35 +2592,30 @@ If you choose to defer this choice, you will be asked again when you next login.  <context>      <name>Swift::QtTreeWidget</name>      <message> -        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="144"/>          <source>Edit</source> -        <translation>Редактировать</translation> +        <translation type="obsolete">Редактировать</translation>      </message>      <message> -        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="145"/>          <source>Remove</source> -        <translation>Удалить</translation> +        <translation type="obsolete">Удалить</translation>      </message>      <message> -        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="157"/>          <source>Rename</source> -        <translation>Переименовать</translation> +        <translation type="obsolete">Переименовать</translation>      </message>      <message> -        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="167"/>          <source>Rename group</source> -        <translation>Переименовать группу</translation> +        <translation type="obsolete">Переименовать группу</translation>      </message>      <message> -        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="167"/>          <source>Enter a new name for group '%1':</source> -        <translation>Введите новое название группы '%1':</translation> +        <translation type="obsolete">Введите новое название группы '%1':</translation>      </message>  </context>  <context>      <name>Swift::QtUserSearchDetailsPage</name>      <message> -        <location filename="../QtUI/UserSearch/QtUserSearchDetailsPage.cpp" line="17"/> +        <location filename="../QtUI/UserSearch/QtUserSearchDetailsPage.cpp" line="22"/>          <source>Please choose a name for the contact, and select the groups you want to add the contact to.</source>          <translation>Пожалуйста, выберите имя контакта и выберите группы, в которые Вы хотите добавить контакт.</translation>      </message> @@ -1683,37 +2641,37 @@ If you choose to defer this choice, you will be asked again when you next login.  <context>      <name>Swift::QtUserSearchWindow</name>      <message> -        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="32"/> +        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="35"/>          <source>Add Contact</source>          <translation>Добавить контакт</translation>      </message>      <message> -        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="32"/> +        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="35"/>          <source>Chat to User</source>          <translation>Чат с пользователем</translation>      </message>      <message> -        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="43"/> +        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="45"/>          <source>alice@wonderland.lit</source>          <translation>alice@wonderland.lit</translation>      </message>      <message> -        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="223"/> +        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="296"/>          <source>How would you like to find the user to add?</source>          <translation>Вы хотите найти пользователя чтобы его добавить?</translation>      </message>      <message> -        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="226"/> +        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="299"/>          <source>How would you like to find the user to chat to?</source>          <translation>Вы хотите найти пользователя чтобы начать с ним чат?</translation>      </message>      <message> -        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="251"/> +        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="326"/>          <source>Error while searching</source>          <translation>Ошибка поиска</translation>      </message>      <message> -        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="257"/> +        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="332"/>          <source>This server doesn't support searching for users.</source>          <translation>Этот сервер не поддерживает поиск пользователей.</translation>      </message> @@ -1721,10 +2679,28 @@ If you choose to defer this choice, you will be asked again when you next login.  <context>      <name>Swift::QtWebView</name>      <message> -        <location filename="../QtUI/QtWebView.cpp" line="61"/> +        <location filename="../QtUI/QtWebView.cpp" line="66"/>          <source>Clear</source>          <translation>Очистить</translation>      </message> +    <message> +        <location filename="../QtUI/QtWebView.cpp" line="67"/> +        <source>Increase font size</source> +        <translation>Увеличить размер шрифта</translation> +    </message> +    <message> +        <location filename="../QtUI/QtWebView.cpp" line="68"/> +        <source>Decrease font size</source> +        <translation>Уменьшить размер шрифта</translation> +    </message> +</context> +<context> +    <name>Swift::QtWhiteboardWindow</name> +    <message> +        <location filename="../QtUI/Whiteboard/QtWhiteboardWindow.cpp" line="380"/> +        <source>Closing window is equivalent closing the session. Are you sure you want to do this?</source> +        <translation>Закрытие окна эквивалентно закрытию сессии. Вы уверены, что хотите это сделать?</translation> +    </message>  </context>  <context>      <name>Swift::QtXMLConsoleWidget</name> @@ -1749,12 +2725,12 @@ If you choose to defer this choice, you will be asked again when you next login.          <translation>Консоль отладки</translation>      </message>      <message> -        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="75"/> +        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="78"/>          <source><!-- IN --></source>          <translation><!-- IN --></translation>      </message>      <message> -        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="79"/> +        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="82"/>          <source><!-- OUT --></source>          <translation><!-- OUT --></translation>      </message> | 
 Swift
 Swift