From 7c4b61653f570b22302bd4bffa04ea64f9f5a2dc 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: Fri, 4 Jul 2014 01:15:03 +0400
Subject: [PATCH 1/2] add russian translation

---
 toxgui.pro         |   3 +-
 translations/ru.ts | 293 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 295 insertions(+), 1 deletion(-)
 create mode 100644 translations/ru.ts

diff --git a/toxgui.pro b/toxgui.pro
index a6ec7d4f2..a30ca317b 100644
--- a/toxgui.pro
+++ b/toxgui.pro
@@ -12,7 +12,8 @@ TEMPLATE  = app
 FORMS    += widget.ui
 CONFIG   += c++11
 
-TRANSLATIONS = translations/fr.ts
+TRANSLATIONS = translations/fr.ts \
+               translations/ru.ts
 
 RESOURCES += \
     res.qrc
diff --git a/translations/ru.ts b/translations/ru.ts
new file mode 100644
index 000000000..eb631410c
--- /dev/null
+++ b/translations/ru.ts
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ru_RU">
+<context>
+    <name>AddFriendForm</name>
+    <message>
+        <location filename="widget/form/addfriendform.cpp" line="15"/>
+        <source>Add Friends</source>
+        <translation>Добавление друзей</translation>
+    </message>
+    <message>
+        <location filename="widget/form/addfriendform.cpp" line="18"/>
+        <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"/>
+        <source>Message</source>
+        <comment>The message you send in friend requests</comment>
+        <translation>Сообщение</translation>
+    </message>
+    <message>
+        <location filename="widget/form/addfriendform.cpp" line="20"/>
+        <source>Send friend request</source>
+        <translatorcomment>Мне не нравится, но другого не придумал, и фейсбук использует это</translatorcomment>
+        <translation>Отправить запрос на добавление в друзья</translation>
+    </message>
+    <message>
+        <location filename="widget/form/addfriendform.cpp" line="67"/>
+        <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"/>
+        <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="90"/>
+        <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="96"/>
+        <source>Unexpected number of text records</source>
+        <comment>Error with the DNS</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widget/form/addfriendform.cpp" line="102"/>
+        <source>Unexpected number of values in text record</source>
+        <comment>Error with the DNS</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widget/form/addfriendform.cpp" line="109"/>
+        <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="115"/>
+        <location filename="widget/form/addfriendform.cpp" line="121"/>
+        <source>The DNS lookup does not contain a valid Tox ID</source>
+        <comment>Error with the DNS</comment>
+        <translation>Ответе DNS не содержит корректных Tox ID</translation>
+    </message>
+</context>
+<context>
+    <name>Camera</name>
+    <message>
+        <location filename="widget/camera.cpp" line="145"/>
+        <source>Camera eror</source>
+        <translation>Ошибка камеры</translation>
+    </message>
+    <message>
+        <location filename="widget/camera.cpp" line="146"/>
+        <source>Camera format %1 not supported, can&apos;t use the camera</source>
+        <translation>Формат камеры %1 не поддерживается, невозможно использовать камеру</translation>
+    </message>
+</context>
+<context>
+    <name>ChatForm</name>
+    <message>
+        <location filename="widget/form/chatform.cpp" line="261"/>
+        <source>Send a file</source>
+        <translation>Оправить файл</translation>
+    </message>
+    <message>
+        <location filename="widget/form/chatform.cpp" line="586"/>
+        <location filename="widget/form/chatform.cpp" line="592"/>
+        <source>Save chat log</source>
+        <translation>Сохранить лог чата</translation>
+    </message>
+</context>
+<context>
+    <name>CopyableElideLabel</name>
+    <message>
+        <location filename="widget/tool/copyableelidelabel.cpp" line="29"/>
+        <source>Copy</source>
+        <translation>Копировать</translation>
+    </message>
+</context>
+<context>
+    <name>FileTransfertWidget</name>
+    <message>
+        <location filename="widget/filetransfertwidget.cpp" line="231"/>
+        <source>Save a file</source>
+        <comment>Title of the file saving dialog</comment>
+        <translation>Сохранить файл</translation>
+    </message>
+</context>
+<context>
+    <name>FriendRequestDialog</name>
+    <message>
+        <location filename="widget/tool/friendrequestdialog.cpp" line="30"/>
+        <source>Friend request</source>
+        <comment>Title of the window to aceept/deny a friend request</comment>
+        <translatorcomment>Мне не нравится, но другого не придумал, и фейсбук использует это</translatorcomment>
+        <translation>Запрос на добавление в друзья</translation>
+    </message>
+    <message>
+        <location filename="widget/tool/friendrequestdialog.cpp" line="32"/>
+        <source>Someone wants to make friends with you</source>
+        <translatorcomment>«Подружиться», вероятно, недостаточно вежливо</translatorcomment>
+        <translation>Кто-то хочет добавить вас в друзья</translation>
+    </message>
+    <message>
+        <location filename="widget/tool/friendrequestdialog.cpp" line="33"/>
+        <source>User ID:</source>
+        <translation>ID пользователя:</translation>
+    </message>
+    <message>
+        <location filename="widget/tool/friendrequestdialog.cpp" line="37"/>
+        <source>Friend request message:</source>
+        <translation>Текст запроса:</translation>
+    </message>
+    <message>
+        <location filename="widget/tool/friendrequestdialog.cpp" line="44"/>
+        <source>Accept</source>
+        <comment>Accept a friend request</comment>
+        <translation>Принять</translation>
+    </message>
+    <message>
+        <location filename="widget/tool/friendrequestdialog.cpp" line="45"/>
+        <source>Reject</source>
+        <comment>Reject a friend request</comment>
+        <translation>Отклонить</translation>
+    </message>
+</context>
+<context>
+    <name>FriendWidget</name>
+    <message>
+        <location filename="widget/friendwidget.cpp" line="65"/>
+        <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="66"/>
+        <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="76"/>
+        <source>Remove friend</source>
+        <comment>Menu to remove the friend from our friendlist</comment>
+        <translation>Удалить друга</translation>
+    </message>
+</context>
+<context>
+    <name>GroupChatForm</name>
+    <message>
+        <location filename="widget/form/groupchatform.cpp" line="155"/>
+        <source>&lt;Unknown&gt;</source>
+        <translation>&lt;Неизвестно&gt;</translation>
+    </message>
+    <message>
+        <location filename="widget/form/groupchatform.cpp" line="220"/>
+        <source>%1 users in chat</source>
+        <translation>%1 пользователей в чате</translation>
+    </message>
+    <message>
+        <location filename="widget/form/groupchatform.cpp" line="239"/>
+        <source>Save chat log</source>
+        <translation>Сохранить лог чата</translation>
+    </message>
+</context>
+<context>
+    <name>GroupWidget</name>
+    <message>
+        <location filename="widget/groupwidget.cpp" line="68"/>
+        <source>Quit group</source>
+        <comment>Menu to quit a groupchat</comment>
+        <translation>Покинуть группу</translation>
+    </message>
+    <message>
+        <location filename="widget/groupwidget.cpp" line="126"/>
+        <source>%1 users in chat</source>
+        <translation>%1 пользователей в чате</translation>
+    </message>
+    <message>
+        <location filename="widget/groupwidget.cpp" line="128"/>
+        <source>0 users in chat</source>
+        <translation>Ни одного пользователя в чате</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsForm</name>
+    <message>
+        <location filename="widget/form/settingsform.cpp" line="13"/>
+        <source>User Settings</source>
+        <comment>&quot;Headline&quot; of the window</comment>
+        <translation>Пользовательские настройки</translation>
+    </message>
+    <message>
+        <location filename="widget/form/settingsform.cpp" line="16"/>
+        <source>Name</source>
+        <comment>Username/nick</comment>
+        <translation>Имя</translation>
+    </message>
+    <message>
+        <location filename="widget/form/settingsform.cpp" line="17"/>
+        <source>Status</source>
+        <comment>Status message</comment>
+        <translation>Статус</translation>
+    </message>
+    <message>
+        <location filename="widget/form/settingsform.cpp" line="22"/>
+        <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="23"/>
+        <source>Enable IPv6 (recommended)</source>
+        <comment>Text on a checkbox to enable IPv6</comment>
+        <translation>Включить IPv6 (рекомендуется)</translation>
+    </message>
+</context>
+<context>
+    <name>Widget</name>
+    <message>
+        <location filename="widget.ui" line="20"/>
+        <source>Tox</source>
+        <translation>Tox</translation>
+    </message>
+    <message>
+        <location filename="widget.ui" line="1593"/>
+        <source>Your name</source>
+        <translation>Ваше имя</translation>
+    </message>
+    <message>
+        <location filename="widget.ui" line="1675"/>
+        <source>Your status</source>
+        <translation>Ваш статус</translation>
+    </message>
+    <message>
+        <location filename="widget.ui" line="2811"/>
+        <source>Close</source>
+        <translation>Закрыть</translation>
+    </message>
+    <message>
+        <location filename="widget.ui" line="2814"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="widget/widget.cpp" line="1112"/>
+        <source>Online</source>
+        <comment>Button to set your status to &apos;Online&apos;</comment>
+        <translation>В сети</translation>
+    </message>
+    <message>
+        <location filename="widget/widget.cpp" line="1113"/>
+        <source>Away</source>
+        <comment>Button to set your status to &apos;Away&apos;</comment>
+        <translation>Ушёл</translation>
+    </message>
+    <message>
+        <location filename="widget/widget.cpp" line="1114"/>
+        <source>Busy</source>
+        <comment>Button to set your status to &apos;Busy&apos;</comment>
+        <translation>Занят</translation>
+    </message>
+</context>
+</TS>

From d13a1d8890eee8a87a83bee2ba20f53fa4e77970 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: Fri, 4 Jul 2014 01:24:20 +0400
Subject: [PATCH 2/2] minor translation fix

---
 translations/ru.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/translations/ru.ts b/translations/ru.ts
index eb631410c..b76c17842 100644
--- a/translations/ru.ts
+++ b/translations/ru.ts
@@ -68,7 +68,7 @@
         <location filename="widget/form/addfriendform.cpp" line="121"/>
         <source>The DNS lookup does not contain a valid Tox ID</source>
         <comment>Error with the DNS</comment>
-        <translation>Ответе DNS не содержит корректных Tox ID</translation>
+        <translation type="unfinished">Ответ DNS не содержит корректных Tox ID</translation>
     </message>
 </context>
 <context>