From 547b6a3d8f8e4d0ab9df5b611faeacf13d699a2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?=
 <suhr@i2pmail.org>
Date: Sun, 13 Jul 2014 06:40:08 +0400
Subject: [PATCH] update russian translation

---
 translations/ru.qm | Bin 4506 -> 5393 bytes
 translations/ru.ts | 146 ++++++++++++++++++++++++++++++---------------
 2 files changed, 99 insertions(+), 47 deletions(-)

diff --git a/translations/ru.qm b/translations/ru.qm
index 6f4aee656e79354150d684b10e769465619ab94b..c772943133073ce31997eb21dd0a3a5bdfb10569 100644
GIT binary patch
delta 1303
zcmZvaU2GIp6vxl9XZEAroo>rg&=$FrLRu2YQo8-JY};+^2gNkOR$@%l>F%^U={mES
znQHgNjZu=48Vihkgpz<tc#uR$N{C_=h(4I|SbWe#eeeOFe8H$`BKn_QvSLCuJNM4H
z=lt&f{Lh@*aboxJXyG%Wmor2)OT?G+M80*BhT}w4DcW^s2T??$)`v_Kc#HaG9U}J8
z!M0OG)xXkM*Y`NTOG|&>Lwzk>cvV7Om3O3W9r?d`SI-<JqA$GPoqRy#zs33UHsVP>
zJO2Su<twGN5W36fIuQsr^OZ#pKssNodx=P1;+4kVi8fs1KbL+1XiVC<=O?02Txvh~
zF)pr<dNPfO{~^6sd5I`EA}uZ+LtUfv$->tV^1gKA(mf*YQQyqdx4}Q@GeXay!5cnf
zU;=_Vefbx+QGu%N_&r-(MPK<VcAh~(rnH9U{HyohfuIKg&)e@p$c8}S&__hlL~#E6
zIFY9i{ATzjQAJ(w=P-m;%vAh!x)lyxsEn^+_3jD{HQ}O~TOsQR8VH2L>1#RU-45H=
zPk?hO{B6V9FsvNH1{Oi%>Jkcq$K?96X$Y#759eTc^@4nO;VOWi%P-WgLHWFVZR$F*
zf6$0F?(w3qful~ZchmBx9@#tCz*{-aNfMmo7<X}k_j3YoF>d8vob+)l;NIrLzivFE
zSwcytP1UkQ+E6W_8@5pAG^gNwYI%jdT!`>y)b2-ZKevO|QLYXS7;oxXLrGhHu!4hH
zR<#BV^L3A_N$@sY=3dx}@&ovdavaeCymj)kJX*#?#!W@Hrc_f+iz4HHw6+p1!ZiRq
zNritR_XG{gHv{*j*OJtPi(}lz-P{2`TmkJ6<hpPO`ys><ypKn*?<;!MgS=kET2Pfl
zPIFmiv?-O<QZph0p~5yq%E;xNhw^6UL)lI=pxXorUCWa|v=sa81lDz+4Uz6LsQP(j
zMit}6oX8obtxRTB=O6jYk-aS7aNi>xW6(JYeXeaTrUN_Z2W|k*PVOt?A`=$$xE5v=
zTQhVEv|4ASYO*kh?z>Qz;2x|oP~Zig{|&??cjLSpOz?{takS7?ZX))W19eT4v$k#M
zLerI$t-Ya&)U0W$x}D88yEF40(bChZT^#>29F+my2UrWl!%F9hr@m#%)KtCny*!@1
zm$#tbl8Rz7l(-WZ<__n_s;!%%{TW4{Rz=>JHHD?xwx&;8&SWGpyqmY<8h56pd5K5g
qNDq2;r<f?ZH{_m{9oyJ%s*0@&MNFH<Y)+&yitQYa9B|en7ykvME)qik

delta 541
zcmYL@OK1~e6ot=Z?mzFD)Ecqa`k;@XLLrN`TEy0b6r%{iq89B!Dv35IZN(Iw)hH@N
zs%ROtrO8618mwT0DK4}NOI?(#bt67N7w+6BQ3S;s1zr3c?z!hb_nX{0({dx^odX7k
zfnW-B?F!)JK!pdaWzc;WQ1TFoPQdmMUTR@KjE-LfsA)vUeLyZ^Z`UpM-^hC!f3W{b
zu1sA9@QmC-mgg-rox2GbeSg(_Of%g)TXppCx&(MZgXS9#^8u3<TfYK<JM=C8kqeTd
zt^FNfHi_QhR-UUO9qD7xZQ`mq3uqBBH?hqB=ERfPmkbhCPOf{-#jY}HaZVXfM&k!r
zUn}mRjhuU{N)0uTd#cek#lHSWJ(x$;%BPE5yr@YRE-^qr^Y+~ZsH*1*2LQ>_UnHIa
zdO&|~GoapYe81hn`(4)V&3qu3vs0xp_KS9QVG<Bs_Db^?28Lb9^IjWsnx<2{|LOEk
z%roc_r*wRQL6<W8S*yyNY^IQZUS3oFEID#{P{>qnFg^(XbY0f(URCsa>yO1P+CVYt
zp#<%x9a^nk;YZQ4L#|pI1~RD=>8w<1GiWVEXeT8p_CFXKKjZq3R`>YvQ2Tm|>amHU
V)XA0G|7Dcq$f?Xo+8+v)eglMFctQXG

diff --git a/translations/ru.ts b/translations/ru.ts
index d340f5e80..2ce21d900 100644
--- a/translations/ru.ts
+++ b/translations/ru.ts
@@ -1,77 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ru_RU">
+<TS version="2.1" language="ru_RU">
 <context>
     <name>AddFriendForm</name>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="15"/>
+        <location filename="../widget/form/addfriendform.cpp" line="32"/>
         <source>Add Friends</source>
         <translation>Добавление друзей</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="18"/>
+        <location filename="../widget/form/addfriendform.cpp" line="35"/>
         <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="../widget/form/addfriendform.cpp" line="19"/>
+        <location filename="../widget/form/addfriendform.cpp" line="36"/>
         <source>Message</source>
         <comment>The message you send in friend requests</comment>
         <translation>Сообщение</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="20"/>
+        <location filename="../widget/form/addfriendform.cpp" line="37"/>
         <source>Send friend request</source>
         <translatorcomment>Мне не нравится, но другого не придумал, и фейсбук использует это</translatorcomment>
         <translation>Отправить запрос на добавление в друзья</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="67"/>
+        <location filename="../widget/form/addfriendform.cpp" line="84"/>
         <source>Tox me maybe?</source>
         <comment>Default message in friend requests if the field is left blank. Write something appropriate!</comment>
         <translatorcomment>Вот таким нехитрым и незамысловатым образом решаются сложные переводчиские проблемы</translatorcomment>
         <translation>Добавь меня, а?</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="75"/>
+        <location filename="../widget/form/addfriendform.cpp" line="92"/>
         <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="../widget/form/addfriendform.cpp" line="92"/>
+        <location filename="../widget/form/addfriendform.cpp" line="109"/>
         <source>This address does not exist</source>
         <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
-        <translation type="unfinished"></translation>
+        <translation>Нет такого адреса</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="96"/>
+        <location filename="../widget/form/addfriendform.cpp" line="113"/>
         <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="../widget/form/addfriendform.cpp" line="102"/>
+        <location filename="../widget/form/addfriendform.cpp" line="119"/>
         <source>Unexpected number of text records</source>
         <comment>Error with the DNS</comment>
         <translation>Непредвиденное количество текстовых записей</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="108"/>
+        <location filename="../widget/form/addfriendform.cpp" line="125"/>
         <source>Unexpected number of values in text record</source>
         <comment>Error with the DNS</comment>
         <translation>Непредвиденное количество значений в текстовой записи</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="115"/>
+        <location filename="../widget/form/addfriendform.cpp" line="132"/>
         <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="../widget/form/addfriendform.cpp" line="121"/>
-        <location filename="../widget/form/addfriendform.cpp" line="127"/>
+        <location filename="../widget/form/addfriendform.cpp" line="138"/>
+        <location filename="../widget/form/addfriendform.cpp" line="144"/>
         <source>The DNS lookup does not contain a valid Tox ID</source>
         <comment>Error with the DNS</comment>
         <translation>Ответ DNS не содержит корректных Tox ID</translation>
@@ -80,12 +80,12 @@
 <context>
     <name>Camera</name>
     <message>
-        <location filename="../widget/camera.cpp" line="145"/>
+        <location filename="../widget/camera.cpp" line="161"/>
         <source>Camera eror</source>
         <translation>Ошибка камеры</translation>
     </message>
     <message>
-        <location filename="../widget/camera.cpp" line="146"/>
+        <location filename="../widget/camera.cpp" line="162"/>
         <source>Camera format %1 not supported, can&apos;t use the camera</source>
         <translation>Формат камеры %1 не поддерживается, невозможно использовать камеру</translation>
     </message>
@@ -93,13 +93,13 @@
 <context>
     <name>ChatForm</name>
     <message>
-        <location filename="../widget/form/chatform.cpp" line="265"/>
+        <location filename="../widget/form/chatform.cpp" line="291"/>
         <source>Send a file</source>
-        <translation type="unfinished">Отправить файл</translation>
+        <translation>Отправить файл</translation>
     </message>
     <message>
-        <location filename="../widget/form/chatform.cpp" line="590"/>
-        <location filename="../widget/form/chatform.cpp" line="596"/>
+        <location filename="../widget/form/chatform.cpp" line="616"/>
+        <location filename="../widget/form/chatform.cpp" line="622"/>
         <source>Save chat log</source>
         <translation>Сохранить лог чата</translation>
     </message>
@@ -115,12 +115,31 @@
 <context>
     <name>FileTransfertWidget</name>
     <message>
-        <location filename="../widget/filetransfertwidget.cpp" line="249"/>
+        <location filename="../widget/filetransfertwidget.cpp" line="270"/>
         <source>Save a file</source>
         <comment>Title of the file saving dialog</comment>
         <translation>Сохранить файл</translation>
     </message>
 </context>
+<context>
+    <name>FilesForm</name>
+    <message>
+        <location filename="../widget/form/filesform.cpp" line="25"/>
+        <source>Transfered Files</source>
+        <comment>&quot;Headline&quot; of the window</comment>
+        <translation>Переданные файлы</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/filesform.cpp" line="30"/>
+        <source>Downloads</source>
+        <translation>Загрузки</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/filesform.cpp" line="31"/>
+        <source>Uploads</source>
+        <translation>Выгрузки</translation>
+    </message>
+</context>
 <context>
     <name>FriendRequestDialog</name>
     <message>
@@ -162,19 +181,19 @@
 <context>
     <name>FriendWidget</name>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="71"/>
+        <location filename="../widget/friendwidget.cpp" line="87"/>
         <source>Copy friend ID</source>
         <comment>Menu to copy the Tox ID of that friend</comment>
         <translation>Копировать ID друга</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="72"/>
+        <location filename="../widget/friendwidget.cpp" line="88"/>
         <source>Invite in group</source>
         <comment>Menu to invite a friend in a groupchat</comment>
         <translation>Пригласить в группу</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="82"/>
+        <location filename="../widget/friendwidget.cpp" line="98"/>
         <source>Remove friend</source>
         <comment>Menu to remove the friend from our friendlist</comment>
         <translation>Удалить друга</translation>
@@ -183,23 +202,23 @@
 <context>
     <name>GroupChatForm</name>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="32"/>
+        <location filename="../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="../widget/form/groupchatform.cpp" line="155"/>
+        <location filename="../widget/form/groupchatform.cpp" line="173"/>
         <source>&lt;Unknown&gt;</source>
         <translation>&lt;Неизвестно&gt;</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="224"/>
+        <location filename="../widget/form/groupchatform.cpp" line="242"/>
         <source>%1 users in chat</source>
         <translation>%1 пользователей в чате</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="243"/>
+        <location filename="../widget/form/groupchatform.cpp" line="261"/>
         <source>Save chat log</source>
         <translation>Сохранить лог чата</translation>
     </message>
@@ -207,20 +226,20 @@
 <context>
     <name>GroupWidget</name>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="73"/>
+        <location filename="../widget/groupwidget.cpp" line="89"/>
         <source>Quit group</source>
         <comment>Menu to quit a groupchat</comment>
         <translation>Покинуть группу</translation>
     </message>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="38"/>
-        <location filename="../widget/groupwidget.cpp" line="130"/>
+        <location filename="../widget/groupwidget.cpp" line="54"/>
+        <location filename="../widget/groupwidget.cpp" line="146"/>
         <source>%1 users in chat</source>
         <translation>%1 пользователей в чате</translation>
     </message>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="40"/>
-        <location filename="../widget/groupwidget.cpp" line="132"/>
+        <location filename="../widget/groupwidget.cpp" line="56"/>
+        <location filename="../widget/groupwidget.cpp" line="148"/>
         <source>0 users in chat</source>
         <translation>Ни одного пользователя в чате</translation>
     </message>
@@ -228,7 +247,7 @@
 <context>
     <name>SelfCamView</name>
     <message>
-        <location filename="../widget/selfcamview.cpp" line="16"/>
+        <location filename="../widget/selfcamview.cpp" line="32"/>
         <source>Tox video test</source>
         <comment>Title of the window to test the video/webcam</comment>
         <translation>Проверка видео</translation>
@@ -237,66 +256,99 @@
 <context>
     <name>SettingsForm</name>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="15"/>
+        <location filename="../widget/form/settingsform.cpp" line="31"/>
         <source>User Settings</source>
         <comment>&quot;Headline&quot; of the window</comment>
         <translation>Пользовательские настройки</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="18"/>
+        <location filename="../widget/form/settingsform.cpp" line="34"/>
         <source>Name</source>
         <comment>Username/nick</comment>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="19"/>
+        <location filename="../widget/form/settingsform.cpp" line="35"/>
         <source>Status</source>
         <comment>Status message</comment>
         <translation>Статус</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="28"/>
+        <location filename="../widget/form/settingsform.cpp" line="36"/>
+        <source>(click here to copy)</source>
+        <comment>Click on this text to copy TID to clipboard</comment>
+        <translation>(нажмите здесь чтобы скопировать)</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settingsform.cpp" line="44"/>
         <source>Test video</source>
         <comment>Text on a button to test the video/webcam</comment>
         <translation>Проверить видео</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="29"/>
+        <location filename="../widget/form/settingsform.cpp" line="45"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
         <translation>Включить IPv6 (рекомендуется)</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="31"/>
+        <location filename="../widget/form/settingsform.cpp" line="47"/>
         <source>Use translations</source>
         <comment>Text on a checkbox to enable translations</comment>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Так гораздо понятнее, чем «использовать переводы»</translatorcomment>
+        <translation>Русскоязычный интерфейс</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settingsform.cpp" line="49"/>
+        <source>Make Tox portable</source>
+        <comment>Text on a checkbox to make qTox a portable application</comment>
+        <translation>Портативный режим</translation>
     </message>
 </context>
 <context>
     <name>Widget</name>
     <message>
-        <location filename="../widget.ui" line="26"/>
+        <location filename="../widget.ui" line="42"/>
         <source>Tox</source>
         <translation>Tox</translation>
     </message>
     <message>
-        <location filename="../widget.ui" line="1935"/>
+        <location filename="../widget.ui" line="1951"/>
         <source>Your name</source>
         <translation>Ваше имя</translation>
     </message>
     <message>
-        <location filename="../widget.ui" line="2017"/>
+        <location filename="../widget.ui" line="2033"/>
         <source>Your status</source>
         <translation>Ваш статус</translation>
     </message>
     <message>
-        <location filename="../widget.ui" line="3293"/>
+        <location filename="../widget.ui" line="2610"/>
+        <source>Add friends</source>
+        <translation>Добавить друзей</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="2652"/>
+        <source>Create a group chat</source>
+        <translation>Создать групповой чат</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="2700"/>
+        <source>(button inactive currently)</source>
+        <translation>(кнопка на данный момент неактивна)</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="2748"/>
+        <source>Change your settings</source>
+        <translation>Изменить ваши настройки</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="3321"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../widget.ui" line="3296"/>
+        <location filename="../widget.ui" line="3324"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>