diff --git a/translations/ru.qm b/translations/ru.qm
index 3acc3ab12..e2d76b227 100644
Binary files a/translations/ru.qm and b/translations/ru.qm differ
diff --git a/translations/ru.ts b/translations/ru.ts
index 5817c4010..2719c798f 100644
--- a/translations/ru.ts
+++ b/translations/ru.ts
@@ -11,11 +11,6 @@
 </context>
 <context>
     <name>AVSettings</name>
-    <message>
-        <location filename="../src/widget/form/settings/avsettings.ui" line="14"/>
-        <source>Form</source>
-        <translation>Форма</translation>
-    </message>
     <message>
         <location filename="../src/widget/form/settings/avsettings.ui" line="98"/>
         <source>Video Settings</source>
@@ -75,79 +70,91 @@
 <context>
     <name>AddFriendForm</name>
     <message>
-        <location filename="../src/widget/form/addfriendform.cpp" line="34"/>
+        <location filename="../src/widget/form/addfriendform.cpp" line="47"/>
         <source>Add Friends</source>
         <translation>Добавить друзей</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/addfriendform.cpp" line="37"/>
+        <location filename="../src/widget/form/addfriendform.cpp" line="50"/>
         <source>Tox ID</source>
         <comment>Tox ID of the person you&apos;re sending a friend request to</comment>
         <translation>Tox ID</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/addfriendform.cpp" line="38"/>
+        <location filename="../src/widget/form/addfriendform.cpp" line="51"/>
         <source>Message</source>
         <comment>The message you send in friend requests</comment>
         <translation>Сообщение</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/addfriendform.cpp" line="39"/>
+        <location filename="../src/widget/form/addfriendform.cpp" line="52"/>
         <source>Send friend request</source>
         <translatorcomment>Мне не нравится, но другого не придумал, и фейсбук использует это</translatorcomment>
         <translation>Отправить запрос на добавление в друзья</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/addfriendform.cpp" line="40"/>
+        <location filename="../src/widget/form/addfriendform.cpp" line="53"/>
         <source>Tox me maybe?</source>
         <comment>Default message in friend requests if the field is left blank. Write something appropriate!</comment>
         <translation>Привет, добавите меня в друзья?</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/addfriendform.cpp" line="96"/>
+        <location filename="../src/widget/form/addfriendform.cpp" line="108"/>
         <source>Please fill in a valid Tox ID</source>
         <comment>Tox ID of the friend you&apos;re sending a friend request to</comment>
         <translation>Пожалуйста, введите корректный Tox ID</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/addfriendform.cpp" line="99"/>
+        <location filename="../src/widget/form/addfriendform.cpp" line="111"/>
         <source>You can&apos;t add yourself as a friend!</source>
         <comment>When trying to add your own Tox ID as friend</comment>
         <translation>Вы не можете добавить самого себя в друзья!</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/addfriendform.cpp" line="116"/>
+        <location filename="../src/widget/form/addfriendform.cpp" line="161"/>
+        <source>The connection timed out</source>
+        <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
+        <translation>Время ожидания соединения истекло</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/addfriendform.cpp" line="167"/>
         <source>This address does not exist</source>
         <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
         <translation>Нет такого адреса</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/addfriendform.cpp" line="120"/>
+        <location filename="../src/widget/form/addfriendform.cpp" line="172"/>
         <source>Error while looking up DNS</source>
         <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
         <translation>Ошибка при просмотре DNS</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/addfriendform.cpp" line="126"/>
-        <source>Unexpected number of text records</source>
+        <location filename="../src/widget/form/addfriendform.cpp" line="179"/>
+        <source>No text record found</source>
         <comment>Error with the DNS</comment>
-        <translation>Непредвиденное количество текстовых записей</translation>
+        <translation>Текстовых записей не найдено</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/addfriendform.cpp" line="132"/>
+        <location filename="../src/widget/form/addfriendform.cpp" line="186"/>
         <source>Unexpected number of values in text record</source>
         <comment>Error with the DNS</comment>
         <translation>Непредвиденное количество значений в текстовой записи</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/addfriendform.cpp" line="139"/>
+        <location filename="../src/widget/form/addfriendform.cpp" line="212"/>
+        <source>The version of Tox DNS used by this server is not supported</source>
+        <comment>Error with the DNS</comment>
+        <translation>Используемая сервером версия Tox DNS не поддерживается</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/addfriendform.cpp" line="221"/>
         <source>The DNS lookup does not contain any Tox ID</source>
         <comment>Error with the DNS</comment>
         <translation>В ответе DNS ни одного Tox ID</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/addfriendform.cpp" line="145"/>
-        <location filename="../src/widget/form/addfriendform.cpp" line="151"/>
+        <location filename="../src/widget/form/addfriendform.cpp" line="227"/>
+        <location filename="../src/widget/form/addfriendform.cpp" line="233"/>
         <source>The DNS lookup does not contain a valid Tox ID</source>
         <comment>Error with the DNS</comment>
         <translation>Ответ DNS не содержит корректных Tox ID</translation>
@@ -156,26 +163,56 @@
 <context>
     <name>ChatForm</name>
     <message>
-        <location filename="../src/widget/form/chatform.cpp" line="63"/>
+        <location filename="../src/widget/form/chatform.cpp" line="67"/>
         <source>Load History...</source>
         <translation>Загрузить историю...</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/chatform.cpp" line="115"/>
+        <location filename="../src/widget/form/chatform.cpp" line="119"/>
         <source>Send a file</source>
         <translation>Отправить файл</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/chatform.cpp" line="125"/>
+        <location filename="../src/widget/form/chatform.cpp" line="129"/>
         <source>Bad Idea</source>
         <translation>Плохая идея</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/chatform.cpp" line="125"/>
+        <location filename="../src/widget/form/chatform.cpp" line="129"/>
         <source>You&apos;re trying to send a special (sequential) file, that&apos;s not going to work!</source>
         <translatorcomment>...передаёте последовательный файл и получаете te-le-fun-ken. И переводчик работает по другой линии. По линии «Библиотека».</translatorcomment>
         <translation>Вы пытаетесь отправить специальный (последовательный) файл. Это так не работает!</translation>
     </message>
+    <message>
+        <location filename="../src/widget/form/chatform.cpp" line="235"/>
+        <source>%1 calling</source>
+        <translation>%1 звонит</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/chatform.cpp" line="304"/>
+        <source>%1 stopped calling</source>
+        <translation>%1 прекратил звонить</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/chatform.cpp" line="360"/>
+        <source>Calling to %1</source>
+        <translation>Звоним %1</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/chatform.cpp" line="501"/>
+        <source>Call rejected</source>
+        <translation>Звонок отклонён</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/chatform.cpp" line="755"/>
+        <source>Call with %1 ended. %2</source>
+        <translation>Разговор с %1 завершился. %2</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/chatform.cpp" line="775"/>
+        <source>Call duration: </source>
+        <translation>Длительность разговора:</translation>
+    </message>
 </context>
 <context>
     <name>ChatTextEdit</name>
@@ -188,101 +225,101 @@
 <context>
     <name>Core</name>
     <message>
-        <location filename="../src/core.cpp" line="250"/>
+        <location filename="../src/core.cpp" line="249"/>
         <source>Toxing on qTox</source>
         <translatorcomment>Как-то так. Может, можно ещё что-нибудь придумать?</translatorcomment>
         <translation type="unfinished">Всем привет из qTox&apos;а</translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="251"/>
+        <location filename="../src/core.cpp" line="250"/>
         <source>qTox User</source>
         <translation>Пользователь qTox</translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="1134"/>
+        <location filename="../src/core.cpp" line="1149"/>
         <source>Encryption error</source>
         <translation>Ошибка шифрования</translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="1134"/>
+        <location filename="../src/core.cpp" line="1149"/>
         <source>The .tox file is encrypted, but encryption was not checked, continuing regardless.</source>
         <translation>Файл .tox зашифрован, однако шифрование в настройках включено не было. Продолжаем вопреки.</translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="1141"/>
+        <location filename="../src/core.cpp" line="1156"/>
         <source>Tox datafile decryption password</source>
         <translation>Пароль для расшифровки файла данных Tox</translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="1143"/>
-        <location filename="../src/core.cpp" line="1155"/>
-        <location filename="../src/core.cpp" line="1220"/>
+        <location filename="../src/core.cpp" line="1158"/>
+        <location filename="../src/core.cpp" line="1170"/>
+        <location filename="../src/core.cpp" line="1235"/>
         <source>Password error</source>
         <translation>Ошибка пароля</translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="1143"/>
-        <location filename="../src/core.cpp" line="1220"/>
+        <location filename="../src/core.cpp" line="1158"/>
+        <location filename="../src/core.cpp" line="1235"/>
         <source>Failed to setup password.
 Empty password.</source>
         <translation>Не удалось установить пароль.
 Пустой пароль.</translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="1151"/>
+        <location filename="../src/core.cpp" line="1166"/>
         <source>Try Again</source>
         <translation>Попробуйте ещё</translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="1152"/>
+        <location filename="../src/core.cpp" line="1167"/>
         <source>Change profile</source>
         <translation>Сменить профиль</translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="1153"/>
+        <location filename="../src/core.cpp" line="1168"/>
         <source>Reinit current profile</source>
         <translatorcomment>Увы, никто не знает, что разработчики имели в виду. Ту би транслейтед.</translatorcomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="1156"/>
+        <location filename="../src/core.cpp" line="1171"/>
         <source>Wrong password has been entered</source>
         <translation>Введён неправильный пароль</translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="1218"/>
+        <location filename="../src/core.cpp" line="1233"/>
         <source>History Log decryption password</source>
         <translation>Пароль для расшифровки журнала переписки</translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="1225"/>
+        <location filename="../src/core.cpp" line="1240"/>
         <source>Encrypted log</source>
         <translation>Зашифрованный журнал</translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="1226"/>
+        <location filename="../src/core.cpp" line="1241"/>
         <source>Your history is encrypted with different password
 Do you want to try another password?</source>
         <translation>Ваша переписка зашифрована другим паролем
 Ходите попробовать другой пароль?</translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="1236"/>
+        <location filename="../src/core.cpp" line="1251"/>
         <source>Loggin</source>
         <translation>Журналирование</translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="1236"/>
+        <location filename="../src/core.cpp" line="1251"/>
         <source>Due to incorret password logging will be disabled</source>
         <translation>Из-за некорректного пароля журналирование будет отключено</translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="1309"/>
+        <location filename="../src/core.cpp" line="1324"/>
         <source>NO Password</source>
         <translation>БЕЗ пароля</translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="1309"/>
+        <location filename="../src/core.cpp" line="1324"/>
         <source>Will be saved without encryption!</source>
         <translation>Будет сохранено без шифрования!</translation>
     </message>
@@ -290,19 +327,19 @@ Do you want to try another password?</source>
 <context>
     <name>FileTransferInstance</name>
     <message>
-        <location filename="../src/filetransferinstance.cpp" line="234"/>
+        <location filename="../src/filetransferinstance.cpp" line="237"/>
         <source>Save a file</source>
         <comment>Title of the file saving dialog</comment>
         <translation>Сохранить файл</translation>
     </message>
     <message>
-        <location filename="../src/filetransferinstance.cpp" line="242"/>
+        <location filename="../src/filetransferinstance.cpp" line="246"/>
         <source>Location not writable</source>
         <comment>Title of permissions popup</comment>
         <translation>Нет прав на запись</translation>
     </message>
     <message>
-        <location filename="../src/filetransferinstance.cpp" line="242"/>
+        <location filename="../src/filetransferinstance.cpp" line="247"/>
         <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
         <comment>text of permissions popup</comment>
         <translation>У вас нет прав для записи в эту директорию. Выберете другую.</translation>
@@ -373,50 +410,31 @@ Do you want to try another password?</source>
 <context>
     <name>FriendWidget</name>
     <message>
-        <location filename="../src/widget/friendwidget.cpp" line="55"/>
+        <location filename="../src/widget/friendwidget.cpp" line="54"/>
         <source>Copy friend ID</source>
         <comment>Menu to copy the Tox ID of that friend</comment>
         <translation>Копировать ID друга</translation>
     </message>
     <message>
-        <location filename="../src/widget/friendwidget.cpp" line="65"/>
+        <location filename="../src/widget/friendwidget.cpp" line="67"/>
         <source>Auto accept files from this friend</source>
         <comment>context menu entry</comment>
         <translation>Автоматически принимать файлы от этого друга</translation>
     </message>
     <message>
-        <location filename="../src/widget/friendwidget.cpp" line="54"/>
+        <location filename="../src/widget/friendwidget.cpp" line="53"/>
         <source>Invite to group</source>
         <comment>Menu to invite a friend to a groupchat</comment>
         <translation>Пригласить в группу</translation>
     </message>
     <message>
-        <location filename="../src/widget/friendwidget.cpp" line="66"/>
-        <source>Manually accept files from this friend</source>
-        <comment>context menu entry</comment>
-        <translation>Вручную принимать файлы от этого друга</translation>
-    </message>
-    <message>
-        <location filename="../src/widget/friendwidget.cpp" line="67"/>
-        <source>Auto accept files from all friends</source>
-        <comment>context menu entry</comment>
-        <translation>Автоматически принимать файлы от всех друзей</translation>
-    </message>
-    <message>
-        <location filename="../src/widget/friendwidget.cpp" line="68"/>
-        <source>Disable global auto accept</source>
-        <comment>context menu entry</comment>
-        <translation>Выключить глобальное автопринятие</translation>
-    </message>
-    <message>
-        <location filename="../src/widget/friendwidget.cpp" line="74"/>
+        <location filename="../src/widget/friendwidget.cpp" line="72"/>
         <source>Remove friend</source>
         <comment>Menu to remove the friend from our friendlist</comment>
         <translation>Удалить друга</translation>
     </message>
     <message>
-        <location filename="../src/widget/friendwidget.cpp" line="96"/>
-        <location filename="../src/widget/friendwidget.cpp" line="111"/>
+        <location filename="../src/widget/friendwidget.cpp" line="102"/>
         <source>Choose an auto accept directory</source>
         <comment>popup title</comment>
         <translation>Выбрать папку для автоматического приёма</translation>
@@ -425,24 +443,30 @@ Do you want to try another password?</source>
 <context>
     <name>GeneralForm</name>
     <message>
-        <location filename="../src/widget/form/settings/generalform.cpp" line="31"/>
+        <location filename="../src/widget/form/settings/generalform.cpp" line="36"/>
         <source>General</source>
         <translation>Общие</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalform.cpp" line="55"/>
-        <location filename="../src/widget/form/settings/generalform.cpp" line="61"/>
+        <location filename="../src/widget/form/settings/generalform.cpp" line="63"/>
+        <location filename="../src/widget/form/settings/generalform.cpp" line="69"/>
         <source>None</source>
         <translation>Отсутствует</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalform.cpp" line="190"/>
+        <location filename="../src/widget/form/settings/generalform.cpp" line="198"/>
+        <source>Choose an auto accept directory</source>
+        <comment>popup title</comment>
+        <translation>Выбрать папку для автоматического приёма</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/generalform.cpp" line="255"/>
         <source>Call active</source>
         <comment>popup title</comment>
         <translation>Идёт звонок</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalform.cpp" line="191"/>
+        <location filename="../src/widget/form/settings/generalform.cpp" line="256"/>
         <source>You can&apos;t disconnect while a call is active!</source>
         <comment>popup text</comment>
         <translation>Нельзя отключиться пока идёт звонок!</translation>
@@ -450,11 +474,6 @@ Do you want to try another password?</source>
 </context>
 <context>
     <name>GeneralSettings</name>
-    <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="14"/>
-        <source>Form</source>
-        <translation>Форма</translation>
-    </message>
     <message>
         <location filename="../src/widget/form/settings/generalsettings.ui" line="56"/>
         <source>General Settings</source>
@@ -466,11 +485,6 @@ Do you want to try another password?</source>
         <source>The translation may not load until qTox restarts.</source>
         <translation>Перевод не изменится до перезапуска qTox.</translation>
     </message>
-    <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="67"/>
-        <source>Translation:</source>
-        <translation>Язык интерфейса:</translation>
-    </message>
     <message>
         <location filename="../src/widget/form/settings/generalsettings.ui" line="106"/>
         <source>Close to tray</source>
@@ -481,83 +495,84 @@ Do you want to try another password?</source>
         <source>Minimize to tray</source>
         <translation>Сворачивать в трей</translation>
     </message>
+    <message>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="135"/>
+        <source>Auto away after (0 to disable)</source>
+        <translation>Автоматически отсутствовать после (0 для отключения)</translation>
+    </message>
     <message>
         <location filename="../src/widget/form/settings/generalsettings.ui" line="148"/>
         <source>Set to 0 to disable</source>
         <translation>Укажите 0, чтобы отключить</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="180"/>
-        <source>Smiley Pack:</source>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="209"/>
+        <source>Use emoticons</source>
+        <translation>Использовать смайлики</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="218"/>
+        <source>Smiley Pack</source>
         <extracomment>Text on smiley pack label</extracomment>
-        <translation>Набор смайликов:</translation>
+        <translation>Набор смайликов</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="204"/>
-        <source>:)</source>
-        <translation>:)</translation>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="296"/>
+        <source>Style</source>
+        <translation>Стиль</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="214"/>
-        <source>;)</source>
-        <translation>;)</translation>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="317"/>
+        <source>Emoticon size</source>
+        <translation>Размер смайликов</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="224"/>
-        <source>:p</source>
-        <translation>:p</translation>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="333"/>
+        <source> px</source>
+        <translatorcomment>По аналогии с Мпикс. Хотя, может лучше принять http://ilyabirman.ru/meanwhile/all/px/?</translatorcomment>
+        <translation> пикс</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="234"/>
-        <source>:O</source>
-        <translation>:O</translation>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="353"/>
+        <source>Timestamp format</source>
+        <translation>Формат времени</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="244"/>
-        <source>:&apos;(</source>
-        <translation>:&apos;(</translation>
-    </message>
-    <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="258"/>
-        <source>Style:</source>
-        <translation>Стиль:</translation>
-    </message>
-    <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="280"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="375"/>
         <source>Connection Settings</source>
         <translation>Настройки соединения</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="292"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="387"/>
         <source>Enable IPv6 (recommended)</source>
         <extracomment>Text on a checkbox to enable IPv6</extracomment>
         <translation>Включить IPv6 (рекомендуется)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="302"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="397"/>
         <source>Enable UDP (recommended)</source>
         <extracomment>Text on checkbox to disable UDP</extracomment>
         <translation>Включить UDP (рекомендуется)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="309"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="404"/>
         <source>Use proxy (SOCKS5)</source>
         <translation>Использовать прокси (SOCKS5)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="321"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="416"/>
         <source>Address</source>
         <extracomment>Text on proxy addr label</extracomment>
         <translation>Адрес</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="331"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="426"/>
         <source>Port</source>
         <extracomment>Text on proxy port label</extracomment>
         <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="350"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="445"/>
         <source>Reconnect</source>
         <comment>reconnect button</comment>
         <translation>Переподключиться</translation>
@@ -568,6 +583,11 @@ Do you want to try another password?</source>
         <extracomment>describes makeToxPortable checkbox</extracomment>
         <translation>Сохранять настройки в рабочую директорию вместо страндартной папки настроек</translation>
     </message>
+    <message>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="67"/>
+        <source>Translation</source>
+        <translation>Язык интерфейса</translation>
+    </message>
     <message>
         <location filename="../src/widget/form/settings/generalsettings.ui" line="92"/>
         <source>Make Tox portable</source>
@@ -588,28 +608,33 @@ Do you want to try another password?</source>
         <source>Provided in minutes</source>
         <translation>Выставлено в минутах</translation>
     </message>
-    <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="135"/>
-        <source>Auto away after (0 to disable):</source>
-        <translation>Автоматически отсутствовать после (0 для отключения):</translation>
-    </message>
     <message>
         <location filename="../src/widget/form/settings/generalsettings.ui" line="154"/>
         <source> minutes</source>
         <translation> минут</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="172"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="169"/>
+        <source>Autoaccept files</source>
+        <translation>Автоматически принимать файлы</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="178"/>
+        <source>Save files in</source>
+        <translation>Сохранять в</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="191"/>
+        <source>PushButton</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="203"/>
         <source>Theme</source>
         <translation>Тема</translation>
     </message>
     <message>
-        <source>Disable UDP (not recommended)</source>
-        <extracomment>Text on checkbox to disable UDP</extracomment>
-        <translation type="vanished">Выключить UDP (не рекомендуется)</translation>
-    </message>
-    <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="299"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="394"/>
         <source>This allows, e.g., toxing over Tor. It adds load to the Tox network however, so use only when necessary.</source>
         <extracomment>force tcp checkbox tooltip</extracomment>
         <translation>Это позволяет, например, использовать tox поверх Tor. Однако это добавляет нагрузку на сеть Tox, так что используйте только в случае необходимости.</translation>
@@ -618,53 +643,53 @@ Do you want to try another password?</source>
 <context>
     <name>GenericChatForm</name>
     <message>
-        <location filename="../src/widget/form/genericchatform.cpp" line="56"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="58"/>
         <source>Send message</source>
         <translation>Отправить сообщение</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/genericchatform.cpp" line="58"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="60"/>
         <source>Smileys</source>
         <translation>Смайлики</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/genericchatform.cpp" line="62"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="64"/>
         <source>Send file(s)</source>
         <translation>Отправить файл(ы)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/genericchatform.cpp" line="65"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="67"/>
         <source>Audio call</source>
         <translation>Позвонить</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/genericchatform.cpp" line="68"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="70"/>
         <source>Video call</source>
         <translation>Видеозвонок</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/genericchatform.cpp" line="71"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="73"/>
         <source>Toggle speakers volume</source>
         <translation>Включить или выключить звук</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/genericchatform.cpp" line="74"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="76"/>
         <source>Toggle microphone</source>
         <translation>Включить или выключить микрофон</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/genericchatform.cpp" line="133"/>
-        <location filename="../src/widget/form/genericchatform.cpp" line="173"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="140"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="180"/>
         <source>Save chat log</source>
         <translation>Сохранить журнал чата</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/genericchatform.cpp" line="134"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="141"/>
         <source>Clear displayed messages</source>
         <translation>Очистить показываемые сообщения</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/genericchatform.cpp" line="253"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="287"/>
         <source>Cleared</source>
         <translation>Очищено</translation>
     </message>
@@ -672,13 +697,13 @@ Do you want to try another password?</source>
 <context>
     <name>GroupChatForm</name>
     <message>
-        <location filename="../src/widget/form/groupchatform.cpp" line="49"/>
+        <location filename="../src/widget/form/groupchatform.cpp" line="48"/>
         <source>%1 users in chat</source>
         <comment>Number of users in chat</comment>
         <translation>%1 пользователей в чате</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/groupchatform.cpp" line="85"/>
+        <location filename="../src/widget/form/groupchatform.cpp" line="94"/>
         <source>%1 users in chat</source>
         <translation>%1 пользователей в чате</translation>
     </message>
@@ -778,37 +803,37 @@ Do you want to try another password?</source>
         <translation>Вы действительно хотите удалить этот профиль?</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="186"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="187"/>
         <source>Import profile</source>
         <comment>import dialog title</comment>
         <translation>Импортировать профиль</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="186"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="189"/>
         <source>Tox save file (*.tox)</source>
         <comment>import dialog filter</comment>
         <translation>Файл Tox (*.tox)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="195"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="199"/>
         <source>Ignoring non-Tox file</source>
         <comment>popup title</comment>
         <translation>Выбран не файл Tox</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="195"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="200"/>
         <source>Warning: you&apos;ve chosen a file that is not a Tox save file; ignoring.</source>
         <comment>popup text</comment>
         <translation>Внимание: вы выбрали не файл Tox; игнорирование.</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="199"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="204"/>
         <source>Profile already exists</source>
         <comment>import confirm title</comment>
         <translation>Профиль уже существует</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="200"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="205"/>
         <source>A profile named &quot;%1&quot; already exists. Do you want to erase it?</source>
         <comment>import confirm text</comment>
         <translation>Профиль с именем «%1» уже существует. Перезаписать?</translation>
@@ -816,11 +841,6 @@ Do you want to try another password?</source>
 </context>
 <context>
     <name>IdentitySettings</name>
-    <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="14"/>
-        <source>Form</source>
-        <translation>Форма</translation>
-    </message>
     <message>
         <location filename="../src/widget/form/settings/identitysettings.ui" line="53"/>
         <source>Public Information</source>
@@ -934,11 +954,6 @@ Do you want to try another password?</source>
 </context>
 <context>
     <name>MainWindow</name>
-    <message>
-        <location filename="../src/mainwindow.ui" line="20"/>
-        <source>qTox</source>
-        <translation>qTox</translation>
-    </message>
     <message>
         <location filename="../src/mainwindow.ui" line="859"/>
         <source>Your name</source>
@@ -970,15 +985,10 @@ Do you want to try another password?</source>
         <translation>Изменить ваши настройки</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.ui" line="1761"/>
+        <location filename="../src/mainwindow.ui" line="1767"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
-    <message>
-        <location filename="../src/mainwindow.ui" line="1764"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
 </context>
 <context>
     <name>NetCamView</name>
@@ -1010,11 +1020,6 @@ Do you want to delete old history file?</source>
 </context>
 <context>
     <name>PrivacySettings</name>
-    <message>
-        <location filename="../src/widget/form/settings/privacysettings.ui" line="14"/>
-        <source>Form</source>
-        <translation>Форма</translation>
-    </message>
     <message>
         <location filename="../src/widget/form/settings/privacysettings.ui" line="50"/>
         <source>Typing Notification</source>
@@ -1043,11 +1048,6 @@ Do you want to delete old history file?</source>
 </context>
 <context>
     <name>SetPasswordDialog</name>
-    <message>
-        <location filename="../src/widget/form/setpassworddialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Диалог</translation>
-    </message>
     <message>
         <location filename="../src/widget/form/setpassworddialog.ui" line="23"/>
         <source>Type Password</source>
@@ -1087,111 +1087,126 @@ Do you want to delete old history file?</source>
         <translation>Сменить статус на:</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="153"/>
+        <location filename="../src/widget/widget.cpp" line="155"/>
         <source>Online</source>
         <comment>Button to set your status to &apos;Online&apos;</comment>
         <translation>В сети</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="155"/>
+        <location filename="../src/widget/widget.cpp" line="157"/>
         <source>Away</source>
         <comment>Button to set your status to &apos;Away&apos;</comment>
         <translatorcomment>Вероятно, это не столь долгое путешествие</translatorcomment>
         <translation>Отошёл</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="157"/>
+        <location filename="../src/widget/widget.cpp" line="159"/>
         <source>Busy</source>
         <comment>Button to set your status to &apos;Busy&apos;</comment>
         <translation>Занят</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="384"/>
+        <location filename="../src/widget/widget.cpp" line="389"/>
         <source>Choose a profile</source>
         <translation>Выберите профиль</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="385"/>
+        <location filename="../src/widget/widget.cpp" line="390"/>
         <source>Please choose which identity to use</source>
         <translation>Выберите личность, которую хотите использовать</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="411"/>
+        <location filename="../src/widget/widget.cpp" line="416"/>
         <source>Choose a profile picture</source>
         <translation>Выбрать картинку для профиля</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="418"/>
-        <location filename="../src/widget/widget.cpp" line="425"/>
-        <location filename="../src/widget/widget.cpp" line="446"/>
+        <location filename="../src/widget/widget.cpp" line="423"/>
+        <location filename="../src/widget/widget.cpp" line="430"/>
+        <location filename="../src/widget/widget.cpp" line="451"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="418"/>
+        <location filename="../src/widget/widget.cpp" line="423"/>
         <source>Unable to open this file</source>
         <translation>Невозможно открыть файл</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="425"/>
+        <location filename="../src/widget/widget.cpp" line="430"/>
         <source>Unable to read this image</source>
         <translation>Невозможно прочесть это изображение</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="446"/>
+        <location filename="../src/widget/widget.cpp" line="451"/>
         <source>This image is too big</source>
         <translation>Это изображение слишком большое</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="473"/>
+        <location filename="../src/widget/widget.cpp" line="478"/>
         <source>Toxcore failed to start, the application will terminate after you close this message.</source>
         <translation>Не удалось запустить toxcore, приложение будет завершено после того как вы закроете это сообщение.</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="482"/>
+        <location filename="../src/widget/widget.cpp" line="487"/>
         <source>toxcore failed to start with your proxy settings. qTox cannot run; please modify your settings and restart.</source>
         <comment>popup text</comment>
         <translation>Не удалось запустить toxcore с вашими настройками прокси, qTox не может работать; измените ваши настройки и перезапустите его.</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="664"/>
+        <location filename="../src/widget/widget.cpp" line="521"/>
+        <source>Add friend</source>
+        <translation>Добавить друга</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/widget.cpp" line="533"/>
+        <source>File transfers</source>
+        <translation>Передачи файлов</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/widget.cpp" line="558"/>
+        <source>Settings</source>
+        <translation>Настройки</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/widget.cpp" line="673"/>
         <source>away</source>
         <comment>contact status</comment>
         <translation>отсутствует</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="666"/>
+        <location filename="../src/widget/widget.cpp" line="675"/>
         <source>busy</source>
         <comment>contact status</comment>
         <translation>занят</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="668"/>
+        <location filename="../src/widget/widget.cpp" line="677"/>
         <source>offline</source>
         <comment>contact status</comment>
         <translation>офлайн</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="670"/>
+        <location filename="../src/widget/widget.cpp" line="679"/>
         <source>online</source>
         <comment>contact status</comment>
         <translation>в сети</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="672"/>
+        <location filename="../src/widget/widget.cpp" line="681"/>
         <source>%1 is now %2</source>
         <comment>e.g. &quot;Dubslow is now online&quot;</comment>
         <translation>%1 сейчас %2</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="876"/>
+        <location filename="../src/widget/widget.cpp" line="890"/>
         <source>&lt;Unknown&gt;</source>
         <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
         <translation>&lt;Неизвестный&gt;</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="1022"/>
-        <location filename="../src/widget/widget.cpp" line="1033"/>
+        <location filename="../src/widget/widget.cpp" line="1037"/>
+        <location filename="../src/widget/widget.cpp" line="1048"/>
         <source>Message failed to send</source>
         <translation>Не удалось отправить сообщение</translation>
     </message>