StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tux3/toxgui

Browse Source
This commit is contained in:
Bill Winslow 2014-07-06 02:08:24 -04:00
commit e98ba55c56
10 changed files with 415 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core.cpp
View File

@ -1118,8 +1118,8 @@ void Core::prepareCall(int friendId, int callId, ToxAv* toxav, bool videoEnabled
calls[callId].callId = callId; calls[callId].callId = callId;
calls[callId].friendId = friendId; calls[callId].friendId = friendId;
calls[callId].codecSettings = av_DefaultSettings; calls[callId].codecSettings = av_DefaultSettings;
calls[callId].codecSettings.video_width = TOXAV_VIDEO_WIDTH; calls[callId].codecSettings.max_video_width = TOXAV_VIDEO_WIDTH;
calls[callId].codecSettings.video_height = TOXAV_VIDEO_HEIGHT; calls[callId].codecSettings.max_video_height = TOXAV_VIDEO_HEIGHT;
calls[callId].videoEnabled = videoEnabled; calls[callId].videoEnabled = videoEnabled;
toxav_prepare_transmission(toxav, callId, &calls[callId].codecSettings, videoEnabled); toxav_prepare_transmission(toxav, callId, &calls[callId].codecSettings, videoEnabled);

1
res.qrc
View File

@ -109,5 +109,6 @@
<file>ui/statusButton/dot_online.png</file> <file>ui/statusButton/dot_online.png</file>
<file>ui/statusButton/statusButton.css</file> <file>ui/statusButton/statusButton.css</file>
<file>ui/statusButton/menu_indicator.png</file> <file>ui/statusButton/menu_indicator.png</file>
<file>translations/de.qm</file>
</qresource> </qresource>
</RCC> </RCC>

3
toxgui.pro
View File

@ -13,7 +13,8 @@ FORMS += widget.ui
CONFIG += c++11 CONFIG += c++11
TRANSLATIONS = translations/fr.ts \ TRANSLATIONS = translations/fr.ts \
translations/ru.ts translations/ru.ts \
translations/de.ts
RESOURCES += res.qrc RESOURCES += res.qrc

BIN
translations/de.qm Normal file
View File

Binary file not shown.

315
translations/de.ts Normal file
View File

@ -0,0 +1,315 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0" language="de_DE">
<context>
<name>AddFriendForm</name>
<message>
<location filename="../widget/form/addfriendform.cpp" line="15"/>
<source>Add Friends</source>
<translation>Freunde hinzufügen</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>Nachricht</translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="20"/>
<source>Send friend request</source>
<translation>Freundschaftseinladung versenden</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>
<translation>Lass uns Toxen!</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>Bitte gib eine gültige Tox ID ein</translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="92"/>
<source>This address does not exist</source>
<comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="96"/>
<source>Error while looking up DNS</source>
<comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
<translation>Fehler beim Auflösen des DNS</translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="102"/>
<source>Unexpected number of text records</source>
<comment>Error with the DNS</comment>
<translation>Unererwartete Anzahl von Texteinträgen</translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="108"/>
<source>Unexpected number of values in text record</source>
<comment>Error with the DNS</comment>
<translation>Unerwartete Anzahl von Werten innerhalb des Texteintrages</translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="115"/>
<source>The DNS lookup does not contain any Tox ID</source>
<comment>Error with the DNS</comment>
<translation>Der DNS Eintrag enthält keine gültige TOX ID</translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="121"/>
<location filename="../widget/form/addfriendform.cpp" line="127"/>
<source>The DNS lookup does not contain a valid Tox ID</source>
<comment>Error with the DNS</comment>
<translation>Der DNS Eintrag enthält keine gültige TOX ID</translation>
</message>
</context>
<context>
<name>Camera</name>
<message>
<location filename="../widget/camera.cpp" line="145"/>
<source>Camera eror</source>
<translation>Kamerafehler</translation>
</message>
<message>
<location filename="../widget/camera.cpp" line="146"/>
<source>Camera format %1 not supported, can&apos;t use the camera</source>
<translation>Kameraformat %1 wird nicht unterstützt. Die Kamera kann nicht verwendet werden</translation>
</message>
</context>
<context>
<name>ChatForm</name>
<message>
<location filename="../widget/form/chatform.cpp" line="265"/>
<source>Send a file</source>
<translation>Datei versenden</translation>
</message>
<message>
<location filename="../widget/form/chatform.cpp" line="590"/>
<location filename="../widget/form/chatform.cpp" line="596"/>
<source>Save chat log</source>
<translation>Chatverlauf speichern</translation>
</message>
</context>
<context>
<name>CopyableElideLabel</name>
<message>
<location filename="../widget/tool/copyableelidelabel.cpp" line="29"/>
<source>Copy</source>
<translation>Kopieren</translation>
</message>
</context>
<context>
<name>FileTransfertWidget</name>
<message>
<location filename="../widget/filetransfertwidget.cpp" line="249"/>
<source>Save a file</source>
<comment>Title of the file saving dialog</comment>
<translation>Datei speichern</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>
<translation>Freundschaftsanfrage</translation>
</message>
<message>
<location filename="../widget/tool/friendrequestdialog.cpp" line="32"/>
<source>Someone wants to make friends with you</source>
<translation>Es möchte jemand mit dir befreundet sein</translation>
</message>
<message>
<location filename="../widget/tool/friendrequestdialog.cpp" line="33"/>
<source>User ID:</source>
<translation>Benutzer ID:</translation>
</message>
<message>
<location filename="../widget/tool/friendrequestdialog.cpp" line="37"/>
<source>Friend request message:</source>
<translation>Nachricht</translation>
</message>
<message>
<location filename="../widget/tool/friendrequestdialog.cpp" line="44"/>
<source>Accept</source>
<comment>Accept a friend request</comment>
<translation>Akzeptieren</translation>
</message>
<message>
<location filename="../widget/tool/friendrequestdialog.cpp" line="45"/>
<source>Reject</source>
<comment>Reject a friend request</comment>
<translation>Ablehnen</translation>
</message>
</context>
<context>
<name>FriendWidget</name>
<message>
<location filename="../widget/friendwidget.cpp" line="71"/>
<source>Copy friend ID</source>
<comment>Menu to copy the Tox ID of that friend</comment>
<translation>Tox ID kopieren</translation>
</message>
<message>
<location filename="../widget/friendwidget.cpp" line="72"/>
<source>Invite in group</source>
<comment>Menu to invite a friend in a groupchat</comment>
<translation>In Gruppe einladen</translation>
</message>
<message>
<location filename="../widget/friendwidget.cpp" line="82"/>
<source>Remove friend</source>
<comment>Menu to remove the friend from our friendlist</comment>
<translation>Freund entfernen</translation>
</message>
</context>
<context>
<name>GroupChatForm</name>
<message>
<location filename="../widget/form/groupchatform.cpp" line="32"/>
<source>%1 users in chat</source>
<comment>Number of users in chat</comment>
<translation>%1 Personen im Chat</translation>
</message>
<message>
<location filename="../widget/form/groupchatform.cpp" line="155"/>
<source>&lt;Unknown&gt;</source>
<translation>&lt;Unbekannt&gt;</translation>
</message>
<message>
<location filename="../widget/form/groupchatform.cpp" line="224"/>
<source>%1 users in chat</source>
<translation>%1 Personen im Chat</translation>
</message>
<message>
<location filename="../widget/form/groupchatform.cpp" line="243"/>
<source>Save chat log</source>
<translation>Chatverlauf speichern</translation>
</message>
</context>
<context>
<name>GroupWidget</name>
<message>
<location filename="../widget/groupwidget.cpp" line="38"/>
<location filename="../widget/groupwidget.cpp" line="130"/>
<source>%1 users in chat</source>
<translation>%1 Personen im Chat</translation>
</message>
<message>
<location filename="../widget/groupwidget.cpp" line="40"/>
<location filename="../widget/groupwidget.cpp" line="132"/>
<source>0 users in chat</source>
<translation>0 Personen im Chat</translation>
</message>
<message>
<location filename="../widget/groupwidget.cpp" line="73"/>
<source>Quit group</source>
<comment>Menu to quit a groupchat</comment>
<translation>Gruppe verlassen</translation>
</message>
</context>
<context>
<name>SelfCamView</name>
<message>
<location filename="../widget/selfcamview.cpp" line="16"/>
<source>Tox video test</source>
<comment>Title of the window to test the video/webcam</comment>
<translation>Tox Video testen</translation>
</message>
</context>
<context>
<name>SettingsForm</name>
<message>
<location filename="../widget/form/settingsform.cpp" line="15"/>
<source>User Settings</source>
<comment>&quot;Headline&quot; of the window</comment>
<translation>Einstellungen</translation>
</message>
<message>
<location filename="../widget/form/settingsform.cpp" line="18"/>
<source>Name</source>
<comment>Username/nick</comment>
<translation>Benutzername</translation>
</message>
<message>
<location filename="../widget/form/settingsform.cpp" line="19"/>
<source>Status</source>
<comment>Status message</comment>
<translation>Status</translation>
</message>
<message>
<location filename="../widget/form/settingsform.cpp" line="28"/>
<source>Test video</source>
<comment>Text on a button to test the video/webcam</comment>
<translation>Video testen</translation>
</message>
<message>
<location filename="../widget/form/settingsform.cpp" line="29"/>
<source>Enable IPv6 (recommended)</source>
<comment>Text on a checkbox to enable IPv6</comment>
<translation>IPv6 aktivieren (empfohlen)</translation>
</message>
<message>
<location filename="../widget/form/settingsform.cpp" line="31"/>
<source>Use translations</source>
<comment>Text on a checkbox to enable translations</comment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Widget</name>
<message>
<location filename="../widget.ui" line="26"/>
<source>Tox</source>
<translation>Tox</translation>
</message>
<message>
<location filename="../widget.ui" line="1935"/>
<source>Your name</source>
<translation>Dein Name</translation>
</message>
<message>
<location filename="../widget.ui" line="2017"/>
<source>Your status</source>
<translation>Dein Status</translation>
</message>
<message>
<location filename="../widget.ui" line="3293"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
<message>
<location filename="../widget.ui" line="3296"/>
<source>Ctrl+Q</source>
<translation>Strg+Q</translation>
</message>
<message>
<source>Online</source>
<comment>Button to set your status to &apos;Online&apos;</comment>
<translation type="obsolete">Online</translation>
</message>
<message>
<source>Away</source>
<comment>Button to set your status to &apos;Away&apos;</comment>
<translation type="obsolete">Abwesend</translation>
</message>
<message>
<source>Busy</source>
<comment>Button to set your status to &apos;Busy&apos;</comment>
<translation type="obsolete">Beschäftigt</translation>
</message>
</context>
</TS>

75
translations/fr.ts
View File

@ -38,32 +38,38 @@
<translation>Merci de remplir un ID Tox valide</translation> <translation>Merci de remplir un ID Tox valide</translation>
</message> </message>
<message> <message>
<location filename="../widget/form/addfriendform.cpp" line="90"/> <location filename="../widget/form/addfriendform.cpp" line="92"/>
<source>This address does not exist</source>
<comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="96"/>
<source>Error while looking up DNS</source> <source>Error while looking up DNS</source>
<comment>The DNS gives the Tox ID associated to toxme.se addresses</comment> <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
<translation>Erreur en consultant le serveur DNS</translation> <translation>Erreur en consultant le serveur DNS</translation>
</message> </message>
<message> <message>
<location filename="../widget/form/addfriendform.cpp" line="96"/> <location filename="../widget/form/addfriendform.cpp" line="102"/>
<source>Unexpected number of text records</source> <source>Unexpected number of text records</source>
<comment>Error with the DNS</comment> <comment>Error with the DNS</comment>
<translation>Nombre d&apos;entrées texte innatendu</translation> <translation>Nombre d&apos;entrées texte innatendu</translation>
</message> </message>
<message> <message>
<location filename="../widget/form/addfriendform.cpp" line="102"/> <location filename="../widget/form/addfriendform.cpp" line="108"/>
<source>Unexpected number of values in text record</source> <source>Unexpected number of values in text record</source>
<comment>Error with the DNS</comment> <comment>Error with the DNS</comment>
<translation>Nombre d&apos;entrées numériques dans l&apos;entrée texte innatendu</translation> <translation>Nombre d&apos;entrées numériques dans l&apos;entrée texte innatendu</translation>
</message> </message>
<message> <message>
<location filename="../widget/form/addfriendform.cpp" line="109"/> <location filename="../widget/form/addfriendform.cpp" line="115"/>
<source>The DNS lookup does not contain any Tox ID</source> <source>The DNS lookup does not contain any Tox ID</source>
<comment>Error with the DNS</comment> <comment>Error with the DNS</comment>
<translation>La réponse DNS ne contient aucun ID Tox</translation> <translation>La réponse DNS ne contient aucun ID Tox</translation>
</message> </message>
<message> <message>
<location filename="../widget/form/addfriendform.cpp" line="115"/>
<location filename="../widget/form/addfriendform.cpp" line="121"/> <location filename="../widget/form/addfriendform.cpp" line="121"/>
<location filename="../widget/form/addfriendform.cpp" line="127"/>
<source>The DNS lookup does not contain a valid Tox ID</source> <source>The DNS lookup does not contain a valid Tox ID</source>
<comment>Error with the DNS</comment> <comment>Error with the DNS</comment>
<translation>La réponse DNS ne contient pas d&apos;ID Tox valide</translation> <translation>La réponse DNS ne contient pas d&apos;ID Tox valide</translation>
@ -85,13 +91,13 @@
<context> <context>
<name>ChatForm</name> <name>ChatForm</name>
<message> <message>
<location filename="../widget/form/chatform.cpp" line="261"/> <location filename="../widget/form/chatform.cpp" line="265"/>
<source>Send a file</source> <source>Send a file</source>
<translation>Envoyer un fichier</translation> <translation>Envoyer un fichier</translation>
</message> </message>
<message> <message>
<location filename="../widget/form/chatform.cpp" line="586"/> <location filename="../widget/form/chatform.cpp" line="590"/>
<location filename="../widget/form/chatform.cpp" line="592"/> <location filename="../widget/form/chatform.cpp" line="596"/>
<source>Save chat log</source> <source>Save chat log</source>
<translation>Sauvegarder l&apos;historique de conversation</translation> <translation>Sauvegarder l&apos;historique de conversation</translation>
</message> </message>
@ -107,7 +113,7 @@
<context> <context>
<name>FileTransfertWidget</name> <name>FileTransfertWidget</name>
<message> <message>
<location filename="../widget/filetransfertwidget.cpp" line="231"/> <location filename="../widget/filetransfertwidget.cpp" line="249"/>
<source>Save a file</source> <source>Save a file</source>
<comment>Title of the file saving dialog</comment> <comment>Title of the file saving dialog</comment>
<translation>Sauvegarder un fichier</translation> <translation>Sauvegarder un fichier</translation>
@ -152,19 +158,19 @@
<context> <context>
<name>FriendWidget</name> <name>FriendWidget</name>
<message> <message>
<location filename="../widget/friendwidget.cpp" line="65"/> <location filename="../widget/friendwidget.cpp" line="71"/>
<source>Copy friend ID</source> <source>Copy friend ID</source>
<comment>Menu to copy the Tox ID of that friend</comment> <comment>Menu to copy the Tox ID of that friend</comment>
<translation>Copier l&apos;ID ami</translation> <translation>Copier l&apos;ID ami</translation>
</message> </message>
<message> <message>
<location filename="../widget/friendwidget.cpp" line="66"/> <location filename="../widget/friendwidget.cpp" line="72"/>
<source>Invite in group</source> <source>Invite in group</source>
<comment>Menu to invite a friend in a groupchat</comment> <comment>Menu to invite a friend in a groupchat</comment>
<translation>Inviter dans un groupe</translation> <translation>Inviter dans un groupe</translation>
</message> </message>
<message> <message>
<location filename="../widget/friendwidget.cpp" line="76"/> <location filename="../widget/friendwidget.cpp" line="82"/>
<source>Remove friend</source> <source>Remove friend</source>
<comment>Menu to remove the friend from our friendlist</comment> <comment>Menu to remove the friend from our friendlist</comment>
<translation>Supprimer ami</translation> <translation>Supprimer ami</translation>
@ -184,12 +190,12 @@
<translation>&lt;Inconnu&gt;</translation> <translation>&lt;Inconnu&gt;</translation>
</message> </message>
<message> <message>
<location filename="../widget/form/groupchatform.cpp" line="220"/> <location filename="../widget/form/groupchatform.cpp" line="224"/>
<source>%1 users in chat</source> <source>%1 users in chat</source>
<translation>%1 personnes</translation> <translation>%1 personnes</translation>
</message> </message>
<message> <message>
<location filename="../widget/form/groupchatform.cpp" line="239"/> <location filename="../widget/form/groupchatform.cpp" line="243"/>
<source>Save chat log</source> <source>Save chat log</source>
<translation>Sauvegarder l&apos;historique de conversation</translation> <translation>Sauvegarder l&apos;historique de conversation</translation>
</message> </message>
@ -198,18 +204,18 @@
<name>GroupWidget</name> <name>GroupWidget</name>
<message> <message>
<location filename="../widget/groupwidget.cpp" line="38"/> <location filename="../widget/groupwidget.cpp" line="38"/>
<location filename="../widget/groupwidget.cpp" line="126"/> <location filename="../widget/groupwidget.cpp" line="130"/>
<source>%1 users in chat</source> <source>%1 users in chat</source>
<translation>%1 personnes</translation> <translation>%1 personnes</translation>
</message> </message>
<message> <message>
<location filename="../widget/groupwidget.cpp" line="40"/> <location filename="../widget/groupwidget.cpp" line="40"/>
<location filename="../widget/groupwidget.cpp" line="128"/> <location filename="../widget/groupwidget.cpp" line="132"/>
<source>0 users in chat</source> <source>0 users in chat</source>
<translation>0 personnes</translation> <translation>0 personnes</translation>
</message> </message>
<message> <message>
<location filename="../widget/groupwidget.cpp" line="68"/> <location filename="../widget/groupwidget.cpp" line="73"/>
<source>Quit group</source> <source>Quit group</source>
<comment>Menu to quit a groupchat</comment> <comment>Menu to quit a groupchat</comment>
<translation>Quitter le groupe</translation> <translation>Quitter le groupe</translation>
@ -227,80 +233,83 @@
<context> <context>
<name>SettingsForm</name> <name>SettingsForm</name>
<message> <message>
<location filename="../widget/form/settingsform.cpp" line="13"/> <location filename="../widget/form/settingsform.cpp" line="15"/>
<source>User Settings</source> <source>User Settings</source>
<comment>&quot;Headline&quot; of the window</comment> <comment>&quot;Headline&quot; of the window</comment>
<translation>Configuration</translation> <translation>Configuration</translation>
</message> </message>
<message> <message>
<location filename="../widget/form/settingsform.cpp" line="16"/> <location filename="../widget/form/settingsform.cpp" line="18"/>
<source>Name</source> <source>Name</source>
<comment>Username/nick</comment> <comment>Username/nick</comment>
<translation>Nom</translation> <translation>Nom</translation>
</message> </message>
<message> <message>
<location filename="../widget/form/settingsform.cpp" line="17"/> <location filename="../widget/form/settingsform.cpp" line="19"/>
<source>Status</source> <source>Status</source>
<comment>Status message</comment> <comment>Status message</comment>
<translation>Status</translation> <translation>Status</translation>
</message> </message>
<message> <message>
<location filename="../widget/form/settingsform.cpp" line="22"/> <location filename="../widget/form/settingsform.cpp" line="28"/>
<source>Test video</source> <source>Test video</source>
<comment>Text on a button to test the video/webcam</comment> <comment>Text on a button to test the video/webcam</comment>
<translation>Tester la vidéo</translation> <translation>Tester la vidéo</translation>
</message> </message>
<message> <message>
<location filename="../widget/form/settingsform.cpp" line="23"/> <location filename="../widget/form/settingsform.cpp" line="29"/>
<source>Enable IPv6 (recommended)</source> <source>Enable IPv6 (recommended)</source>
<comment>Text on a checkbox to enable IPv6</comment> <comment>Text on a checkbox to enable IPv6</comment>
<translation>Activer IPv6 (recommandé)</translation> <translation>Activer IPv6 (recommandé)</translation>
</message> </message>
<message>
<location filename="../widget/form/settingsform.cpp" line="31"/>
<source>Use translations</source>
<comment>Text on a checkbox to enable translations</comment>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>Widget</name> <name>Widget</name>
<message> <message>
<location filename="../widget.ui" line="20"/> <location filename="../widget.ui" line="26"/>
<source>Tox</source> <source>Tox</source>
<translation>Tox</translation> <translation>Tox</translation>
</message> </message>
<message> <message>
<location filename="../widget.ui" line="1593"/> <location filename="../widget.ui" line="1935"/>
<source>Your name</source> <source>Your name</source>
<translation>Votre nom</translation> <translation>Votre nom</translation>
</message> </message>
<message> <message>
<location filename="../widget.ui" line="1675"/> <location filename="../widget.ui" line="2017"/>
<source>Your status</source> <source>Your status</source>
<translation>Votre status</translation> <translation>Votre status</translation>
</message> </message>
<message> <message>
<location filename="../widget.ui" line="2811"/> <location filename="../widget.ui" line="3293"/>
<source>Close</source> <source>Close</source>
<translation>Fermer</translation> <translation>Fermer</translation>
</message> </message>
<message> <message>
<location filename="../widget.ui" line="2814"/> <location filename="../widget.ui" line="3296"/>
<source>Ctrl+Q</source> <source>Ctrl+Q</source>
<translation>Ctrl+Q</translation> <translation>Ctrl+Q</translation>
</message> </message>
<message> <message>
<location filename="../widget/widget.cpp" line="1112"/>
<source>Online</source> <source>Online</source>
<comment>Button to set your status to &apos;Online&apos;</comment> <comment>Button to set your status to &apos;Online&apos;</comment>
<translation>Connecté</translation> <translation type="obsolete">Connecté</translation>
</message> </message>
<message> <message>
<location filename="../widget/widget.cpp" line="1113"/>
<source>Away</source> <source>Away</source>
<comment>Button to set your status to &apos;Away&apos;</comment> <comment>Button to set your status to &apos;Away&apos;</comment>
<translation>Indisponnible</translation> <translation type="obsolete">Indisponnible</translation>
</message> </message>
<message> <message>
<location filename="../widget/widget.cpp" line="1114"/>
<source>Busy</source> <source>Busy</source>
<comment>Button to set your status to &apos;Busy&apos;</comment> <comment>Button to set your status to &apos;Busy&apos;</comment>
<translation>Occupé</translation> <translation type="obsolete">Occupé</translation>
</message> </message>
</context> </context>
</TS> </TS>

67
translations/ru.ts
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS>
<TS version="2.1" language="ru_RU"> <TS version="2.0" language="ru_RU">
<context> <context>
<name>AddFriendForm</name> <name>AddFriendForm</name>
<message> <message>
@ -41,31 +41,37 @@
</message> </message>
<message> <message>
<location filename="../widget/form/addfriendform.cpp" line="92"/> <location filename="../widget/form/addfriendform.cpp" line="92"/>
<source>This address does not exist</source>
<comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="96"/>
<source>Error while looking up DNS</source> <source>Error while looking up DNS</source>
<comment>The DNS gives the Tox ID associated to toxme.se addresses</comment> <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
<translation>Ошибка при просмотре DNS</translation> <translation>Ошибка при просмотре DNS</translation>
</message> </message>
<message> <message>
<location filename="../widget/form/addfriendform.cpp" line="98"/> <location filename="../widget/form/addfriendform.cpp" line="102"/>
<source>Unexpected number of text records</source> <source>Unexpected number of text records</source>
<comment>Error with the DNS</comment> <comment>Error with the DNS</comment>
<translation>Непредвиденное количество текстовых записей</translation> <translation>Непредвиденное количество текстовых записей</translation>
</message> </message>
<message> <message>
<location filename="../widget/form/addfriendform.cpp" line="104"/> <location filename="../widget/form/addfriendform.cpp" line="108"/>
<source>Unexpected number of values in text record</source> <source>Unexpected number of values in text record</source>
<comment>Error with the DNS</comment> <comment>Error with the DNS</comment>
<translation>Непредвиденное количество значений в текстовой записи</translation> <translation>Непредвиденное количество значений в текстовой записи</translation>
</message> </message>
<message> <message>
<location filename="../widget/form/addfriendform.cpp" line="111"/> <location filename="../widget/form/addfriendform.cpp" line="115"/>
<source>The DNS lookup does not contain any Tox ID</source> <source>The DNS lookup does not contain any Tox ID</source>
<comment>Error with the DNS</comment> <comment>Error with the DNS</comment>
<translation>В ответе DNS ни одного Tox ID</translation> <translation>В ответе DNS ни одного Tox ID</translation>
</message> </message>
<message> <message>
<location filename="../widget/form/addfriendform.cpp" line="117"/> <location filename="../widget/form/addfriendform.cpp" line="121"/>
<location filename="../widget/form/addfriendform.cpp" line="123"/> <location filename="../widget/form/addfriendform.cpp" line="127"/>
<source>The DNS lookup does not contain a valid Tox ID</source> <source>The DNS lookup does not contain a valid Tox ID</source>
<comment>Error with the DNS</comment> <comment>Error with the DNS</comment>
<translation>Ответ DNS не содержит корректных Tox ID</translation> <translation>Ответ DNS не содержит корректных Tox ID</translation>
@ -87,13 +93,13 @@
<context> <context>
<name>ChatForm</name> <name>ChatForm</name>
<message> <message>
<location filename="../widget/form/chatform.cpp" line="261"/> <location filename="../widget/form/chatform.cpp" line="265"/>
<source>Send a file</source> <source>Send a file</source>
<translation type="unfinished">Отправить файл</translation> <translation type="unfinished">Отправить файл</translation>
</message> </message>
<message> <message>
<location filename="../widget/form/chatform.cpp" line="586"/> <location filename="../widget/form/chatform.cpp" line="590"/>
<location filename="../widget/form/chatform.cpp" line="592"/> <location filename="../widget/form/chatform.cpp" line="596"/>
<source>Save chat log</source> <source>Save chat log</source>
<translation>Сохранить лог чата</translation> <translation>Сохранить лог чата</translation>
</message> </message>
@ -109,7 +115,7 @@
<context> <context>
<name>FileTransfertWidget</name> <name>FileTransfertWidget</name>
<message> <message>
<location filename="../widget/filetransfertwidget.cpp" line="233"/> <location filename="../widget/filetransfertwidget.cpp" line="249"/>
<source>Save a file</source> <source>Save a file</source>
<comment>Title of the file saving dialog</comment> <comment>Title of the file saving dialog</comment>
<translation>Сохранить файл</translation> <translation>Сохранить файл</translation>
@ -188,12 +194,12 @@
<translation>&lt;Неизвестно&gt;</translation> <translation>&lt;Неизвестно&gt;</translation>
</message> </message>
<message> <message>
<location filename="../widget/form/groupchatform.cpp" line="220"/> <location filename="../widget/form/groupchatform.cpp" line="224"/>
<source>%1 users in chat</source> <source>%1 users in chat</source>
<translation>%1 пользователей в чате</translation> <translation>%1 пользователей в чате</translation>
</message> </message>
<message> <message>
<location filename="../widget/form/groupchatform.cpp" line="239"/> <location filename="../widget/form/groupchatform.cpp" line="243"/>
<source>Save chat log</source> <source>Save chat log</source>
<translation>Сохранить лог чата</translation> <translation>Сохранить лог чата</translation>
</message> </message>
@ -208,13 +214,13 @@
</message> </message>
<message> <message>
<location filename="../widget/groupwidget.cpp" line="38"/> <location filename="../widget/groupwidget.cpp" line="38"/>
<location filename="../widget/groupwidget.cpp" line="128"/> <location filename="../widget/groupwidget.cpp" line="130"/>
<source>%1 users in chat</source> <source>%1 users in chat</source>
<translation>%1 пользователей в чате</translation> <translation>%1 пользователей в чате</translation>
</message> </message>
<message> <message>
<location filename="../widget/groupwidget.cpp" line="40"/> <location filename="../widget/groupwidget.cpp" line="40"/>
<location filename="../widget/groupwidget.cpp" line="130"/> <location filename="../widget/groupwidget.cpp" line="132"/>
<source>0 users in chat</source> <source>0 users in chat</source>
<translation>Ни одного пользователя в чате</translation> <translation>Ни одного пользователя в чате</translation>
</message> </message>
@ -231,35 +237,41 @@
<context> <context>
<name>SettingsForm</name> <name>SettingsForm</name>
<message> <message>
<location filename="../widget/form/settingsform.cpp" line="13"/> <location filename="../widget/form/settingsform.cpp" line="15"/>
<source>User Settings</source> <source>User Settings</source>
<comment>&quot;Headline&quot; of the window</comment> <comment>&quot;Headline&quot; of the window</comment>
<translation>Пользовательские настройки</translation> <translation>Пользовательские настройки</translation>
</message> </message>
<message> <message>
<location filename="../widget/form/settingsform.cpp" line="16"/> <location filename="../widget/form/settingsform.cpp" line="18"/>
<source>Name</source> <source>Name</source>
<comment>Username/nick</comment> <comment>Username/nick</comment>
<translation>Имя</translation> <translation>Имя</translation>
</message> </message>
<message> <message>
<location filename="../widget/form/settingsform.cpp" line="17"/> <location filename="../widget/form/settingsform.cpp" line="19"/>
<source>Status</source> <source>Status</source>
<comment>Status message</comment> <comment>Status message</comment>
<translation>Статус</translation> <translation>Статус</translation>
</message> </message>
<message> <message>
<location filename="../widget/form/settingsform.cpp" line="22"/> <location filename="../widget/form/settingsform.cpp" line="28"/>
<source>Test video</source> <source>Test video</source>
<comment>Text on a button to test the video/webcam</comment> <comment>Text on a button to test the video/webcam</comment>
<translation>Проверить видео</translation> <translation>Проверить видео</translation>
</message> </message>
<message> <message>
<location filename="../widget/form/settingsform.cpp" line="23"/> <location filename="../widget/form/settingsform.cpp" line="29"/>
<source>Enable IPv6 (recommended)</source> <source>Enable IPv6 (recommended)</source>
<comment>Text on a checkbox to enable IPv6</comment> <comment>Text on a checkbox to enable IPv6</comment>
<translation>Включить IPv6 (рекомендуется)</translation> <translation>Включить IPv6 (рекомендуется)</translation>
</message> </message>
<message>
<location filename="../widget/form/settingsform.cpp" line="31"/>
<source>Use translations</source>
<comment>Text on a checkbox to enable translations</comment>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>Widget</name> <name>Widget</name>
@ -269,43 +281,40 @@
<translation>Tox</translation> <translation>Tox</translation>
</message> </message>
<message> <message>
<location filename="../widget.ui" line="1683"/> <location filename="../widget.ui" line="1935"/>
<source>Your name</source> <source>Your name</source>
<translation>Ваше имя</translation> <translation>Ваше имя</translation>
</message> </message>
<message> <message>
<location filename="../widget.ui" line="1759"/> <location filename="../widget.ui" line="2017"/>
<source>Your status</source> <source>Your status</source>
<translation>Ваш статус</translation> <translation>Ваш статус</translation>
</message> </message>
<message> <message>
<location filename="../widget.ui" line="3005"/> <location filename="../widget.ui" line="3293"/>
<source>Close</source> <source>Close</source>
<translation>Закрыть</translation> <translation>Закрыть</translation>
</message> </message>
<message> <message>
<location filename="../widget.ui" line="3008"/> <location filename="../widget.ui" line="3296"/>
<source>Ctrl+Q</source> <source>Ctrl+Q</source>
<translation>Ctrl+Q</translation> <translation>Ctrl+Q</translation>
</message> </message>
<message> <message>
<location filename="../widget/widget.cpp" line="1149"/>
<source>Online</source> <source>Online</source>
<comment>Button to set your status to &apos;Online&apos;</comment> <comment>Button to set your status to &apos;Online&apos;</comment>
<translation>В сети</translation> <translation type="obsolete">В сети</translation>
</message> </message>
<message> <message>
<location filename="../widget/widget.cpp" line="1150"/>
<source>Away</source> <source>Away</source>
<comment>Button to set your status to &apos;Away&apos;</comment> <comment>Button to set your status to &apos;Away&apos;</comment>
<translatorcomment>Вероятно, это не столь долгое путешествие</translatorcomment> <translatorcomment>Вероятно, это не столь долгое путешествие</translatorcomment>
<translation>Отошёл</translation> <translation type="obsolete">Отошёл</translation>
</message> </message>
<message> <message>
<location filename="../widget/widget.cpp" line="1151"/>
<source>Busy</source> <source>Busy</source>
<comment>Button to set your status to &apos;Busy&apos;</comment> <comment>Button to set your status to &apos;Busy&apos;</comment>
<translation>Занят</translation> <translation type="obsolete">Занят</translation>
</message> </message>
</context> </context>
</TS> </TS>

4
widget.ui
View File

@ -2030,7 +2030,7 @@ QSplitter:handle{
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>2</width> <width>10</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
@ -2115,7 +2115,7 @@ QSplitter:handle{
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>255</width> <width>256</width>
<height>199</height> <height>199</height>
</rect> </rect>
</property> </property>

9
widget/form/addfriendform.cpp
View File

@ -2,8 +2,9 @@
#include <QFont> #include <QFont>
#include <QMessageBox> #include <QMessageBox>
#include <tox/tox.h>
#define TOX_ID_SIZE 76 #define TOX_ID_LENGTH 2*TOX_FRIEND_ADDRESS_SIZE
AddFriendForm::AddFriendForm() : dns(this) AddFriendForm::AddFriendForm() : dns(this)
{ {
@ -50,7 +51,7 @@ void AddFriendForm::show(Ui::Widget &ui)
bool AddFriendForm::isToxId(const QString &value) const bool AddFriendForm::isToxId(const QString &value) const
{ {
const QRegularExpression hexRegExp("^[A-Fa-f0-9]+$"); const QRegularExpression hexRegExp("^[A-Fa-f0-9]+$");
return value.length() == TOX_ID_SIZE && value.contains(hexRegExp); return value.length() == TOX_ID_LENGTH && value.contains(hexRegExp);
} }
void AddFriendForm::showWarning(const QString &message) const void AddFriendForm::showWarning(const QString &message) const
@ -117,12 +118,12 @@ void AddFriendForm::handleDnsLookup()
} }
idx += idKeyWord.length(); idx += idKeyWord.length();
if (entry.length() < idx + static_cast<int>(TOX_ID_SIZE)) { if (entry.length() < idx + static_cast<int>(TOX_ID_LENGTH)) {
showWarning(tr("The DNS lookup does not contain a valid Tox ID", "Error with the DNS")); showWarning(tr("The DNS lookup does not contain a valid Tox ID", "Error with the DNS"));
return; return;
} }
const QString friendAdress = entry.mid(idx, TOX_ID_SIZE); const QString friendAdress = entry.mid(idx, TOX_ID_LENGTH);
if (!isToxId(friendAdress)) { if (!isToxId(friendAdress)) {
showWarning(tr("The DNS lookup does not contain a valid Tox ID", "Error with the DNS")); showWarning(tr("The DNS lookup does not contain a valid Tox ID", "Error with the DNS"));
return; return;

8
widget/form/chatform.cpp
View File

@ -152,6 +152,14 @@ ChatForm::ChatForm(Friend* chatFriend)
chatArea->setWidget(chatAreaWidget); chatArea->setWidget(chatAreaWidget);
//Fix for incorrect layouts on OS X as per
//https://bugreports.qt-project.org/browse/QTBUG-14591
sendButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
fileButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
emoteButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
callButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
videoButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
connect(Widget::getInstance()->getCore(), &Core::fileSendStarted, this, &ChatForm::startFileSend); connect(Widget::getInstance()->getCore(), &Core::fileSendStarted, this, &ChatForm::startFileSend);
connect(Widget::getInstance()->getCore(), &Core::videoFrameReceived, netcam, &NetCamView::updateDisplay); connect(Widget::getInstance()->getCore(), &Core::videoFrameReceived, netcam, &NetCamView::updateDisplay);
connect(sendButton, SIGNAL(clicked()), this, SLOT(onSendTriggered())); connect(sendButton, SIGNAL(clicked()), this, SLOT(onSendTriggered()));