diff --git a/core.cpp b/core.cpp index 15a4ae7d9..ac14b8ff1 100644 --- a/core.cpp +++ b/core.cpp @@ -1118,8 +1118,8 @@ void Core::prepareCall(int friendId, int callId, ToxAv* toxav, bool videoEnabled calls[callId].callId = callId; calls[callId].friendId = friendId; calls[callId].codecSettings = av_DefaultSettings; - calls[callId].codecSettings.video_width = TOXAV_VIDEO_WIDTH; - calls[callId].codecSettings.video_height = TOXAV_VIDEO_HEIGHT; + calls[callId].codecSettings.max_video_width = TOXAV_VIDEO_WIDTH; + calls[callId].codecSettings.max_video_height = TOXAV_VIDEO_HEIGHT; calls[callId].videoEnabled = videoEnabled; toxav_prepare_transmission(toxav, callId, &calls[callId].codecSettings, videoEnabled); diff --git a/res.qrc b/res.qrc index 793d63c22..1281585db 100644 --- a/res.qrc +++ b/res.qrc @@ -109,5 +109,6 @@ ui/statusButton/dot_online.png ui/statusButton/statusButton.css ui/statusButton/menu_indicator.png + translations/de.qm diff --git a/toxgui.pro b/toxgui.pro index 76495e197..0366f5ef4 100644 --- a/toxgui.pro +++ b/toxgui.pro @@ -13,7 +13,8 @@ FORMS += widget.ui CONFIG += c++11 TRANSLATIONS = translations/fr.ts \ - translations/ru.ts + translations/ru.ts \ + translations/de.ts RESOURCES += res.qrc diff --git a/translations/de.qm b/translations/de.qm new file mode 100644 index 000000000..c5132443e Binary files /dev/null and b/translations/de.qm differ diff --git a/translations/de.ts b/translations/de.ts new file mode 100644 index 000000000..63b4dada9 --- /dev/null +++ b/translations/de.ts @@ -0,0 +1,315 @@ + + + + + AddFriendForm + + + Add Friends + Freunde hinzufügen + + + + Tox ID + Tox ID of the person you're sending a friend request to + Tox ID + + + + Message + The message you send in friend requests + Nachricht + + + + Send friend request + Freundschaftseinladung versenden + + + + Tox me maybe? + Default message in friend requests if the field is left blank. Write something appropriate! + Lass uns Toxen! + + + + Please fill in a valid Tox ID + Tox ID of the friend you're sending a friend request to + Bitte gib eine gültige Tox ID ein + + + + This address does not exist + The DNS gives the Tox ID associated to toxme.se addresses + + + + + Error while looking up DNS + The DNS gives the Tox ID associated to toxme.se addresses + Fehler beim Auflösen des DNS + + + + Unexpected number of text records + Error with the DNS + Unererwartete Anzahl von Texteinträgen + + + + Unexpected number of values in text record + Error with the DNS + Unerwartete Anzahl von Werten innerhalb des Texteintrages + + + + The DNS lookup does not contain any Tox ID + Error with the DNS + Der DNS Eintrag enthält keine gültige TOX ID + + + + + The DNS lookup does not contain a valid Tox ID + Error with the DNS + Der DNS Eintrag enthält keine gültige TOX ID + + + + Camera + + + Camera eror + Kamerafehler + + + + Camera format %1 not supported, can't use the camera + Kameraformat %1 wird nicht unterstützt. Die Kamera kann nicht verwendet werden + + + + ChatForm + + + Send a file + Datei versenden + + + + + Save chat log + Chatverlauf speichern + + + + CopyableElideLabel + + + Copy + Kopieren + + + + FileTransfertWidget + + + Save a file + Title of the file saving dialog + Datei speichern + + + + FriendRequestDialog + + + Friend request + Title of the window to aceept/deny a friend request + Freundschaftsanfrage + + + + Someone wants to make friends with you + Es möchte jemand mit dir befreundet sein + + + + User ID: + Benutzer ID: + + + + Friend request message: + Nachricht + + + + Accept + Accept a friend request + Akzeptieren + + + + Reject + Reject a friend request + Ablehnen + + + + FriendWidget + + + Copy friend ID + Menu to copy the Tox ID of that friend + Tox ID kopieren + + + + Invite in group + Menu to invite a friend in a groupchat + In Gruppe einladen + + + + Remove friend + Menu to remove the friend from our friendlist + Freund entfernen + + + + GroupChatForm + + + %1 users in chat + Number of users in chat + %1 Personen im Chat + + + + <Unknown> + <Unbekannt> + + + + %1 users in chat + %1 Personen im Chat + + + + Save chat log + Chatverlauf speichern + + + + GroupWidget + + + + %1 users in chat + %1 Personen im Chat + + + + + 0 users in chat + 0 Personen im Chat + + + + Quit group + Menu to quit a groupchat + Gruppe verlassen + + + + SelfCamView + + + Tox video test + Title of the window to test the video/webcam + Tox Video testen + + + + SettingsForm + + + User Settings + "Headline" of the window + Einstellungen + + + + Name + Username/nick + Benutzername + + + + Status + Status message + Status + + + + Test video + Text on a button to test the video/webcam + Video testen + + + + Enable IPv6 (recommended) + Text on a checkbox to enable IPv6 + IPv6 aktivieren (empfohlen) + + + + Use translations + Text on a checkbox to enable translations + + + + + Widget + + + Tox + Tox + + + + Your name + Dein Name + + + + Your status + Dein Status + + + + Close + Schließen + + + + Ctrl+Q + Strg+Q + + + Online + Button to set your status to 'Online' + Online + + + Away + Button to set your status to 'Away' + Abwesend + + + Busy + Button to set your status to 'Busy' + Beschäftigt + + + diff --git a/translations/fr.ts b/translations/fr.ts index 2ba83d433..3851b7684 100644 --- a/translations/fr.ts +++ b/translations/fr.ts @@ -38,32 +38,38 @@ Merci de remplir un ID Tox valide - + + This address does not exist + The DNS gives the Tox ID associated to toxme.se addresses + + + + Error while looking up DNS The DNS gives the Tox ID associated to toxme.se addresses Erreur en consultant le serveur DNS - + Unexpected number of text records Error with the DNS Nombre d'entrées texte innatendu - + Unexpected number of values in text record Error with the DNS Nombre d'entrées numériques dans l'entrée texte innatendu - + The DNS lookup does not contain any Tox ID Error with the DNS La réponse DNS ne contient aucun ID Tox - + The DNS lookup does not contain a valid Tox ID Error with the DNS La réponse DNS ne contient pas d'ID Tox valide @@ -85,13 +91,13 @@ ChatForm - + Send a file Envoyer un fichier - - + + Save chat log Sauvegarder l'historique de conversation @@ -107,7 +113,7 @@ FileTransfertWidget - + Save a file Title of the file saving dialog Sauvegarder un fichier @@ -152,19 +158,19 @@ FriendWidget - + Copy friend ID Menu to copy the Tox ID of that friend Copier l'ID ami - + Invite in group Menu to invite a friend in a groupchat Inviter dans un groupe - + Remove friend Menu to remove the friend from our friendlist Supprimer ami @@ -184,12 +190,12 @@ <Inconnu> - + %1 users in chat %1 personnes - + Save chat log Sauvegarder l'historique de conversation @@ -198,18 +204,18 @@ GroupWidget - + %1 users in chat %1 personnes - + 0 users in chat 0 personnes - + Quit group Menu to quit a groupchat Quitter le groupe @@ -227,80 +233,83 @@ SettingsForm - + User Settings "Headline" of the window Configuration - + Name Username/nick Nom - + Status Status message Status - + Test video Text on a button to test the video/webcam Tester la vidéo - + Enable IPv6 (recommended) Text on a checkbox to enable IPv6 Activer IPv6 (recommandé) + + + Use translations + Text on a checkbox to enable translations + + Widget - + Tox Tox - + Your name Votre nom - + Your status Votre status - + Close Fermer - + Ctrl+Q Ctrl+Q - Online Button to set your status to 'Online' - Connecté + Connecté - Away Button to set your status to 'Away' - Indisponnible + Indisponnible - Busy Button to set your status to 'Busy' - Occupé + Occupé diff --git a/translations/ru.ts b/translations/ru.ts index fb4a178ce..d340f5e80 100644 --- a/translations/ru.ts +++ b/translations/ru.ts @@ -1,6 +1,6 @@ - + AddFriendForm @@ -41,31 +41,37 @@ + This address does not exist + The DNS gives the Tox ID associated to toxme.se addresses + + + + Error while looking up DNS The DNS gives the Tox ID associated to toxme.se addresses Ошибка при просмотре DNS - + Unexpected number of text records Error with the DNS Непредвиденное количество текстовых записей - + Unexpected number of values in text record Error with the DNS Непредвиденное количество значений в текстовой записи - + The DNS lookup does not contain any Tox ID Error with the DNS В ответе DNS ни одного Tox ID - - + + The DNS lookup does not contain a valid Tox ID Error with the DNS Ответ DNS не содержит корректных Tox ID @@ -87,13 +93,13 @@ ChatForm - + Send a file Отправить файл - - + + Save chat log Сохранить лог чата @@ -109,7 +115,7 @@ FileTransfertWidget - + Save a file Title of the file saving dialog Сохранить файл @@ -188,12 +194,12 @@ <Неизвестно> - + %1 users in chat %1 пользователей в чате - + Save chat log Сохранить лог чата @@ -208,13 +214,13 @@ - + %1 users in chat %1 пользователей в чате - + 0 users in chat Ни одного пользователя в чате @@ -231,35 +237,41 @@ SettingsForm - + User Settings "Headline" of the window Пользовательские настройки - + Name Username/nick Имя - + Status Status message Статус - + Test video Text on a button to test the video/webcam Проверить видео - + Enable IPv6 (recommended) Text on a checkbox to enable IPv6 Включить IPv6 (рекомендуется) + + + Use translations + Text on a checkbox to enable translations + + Widget @@ -269,43 +281,40 @@ Tox - + Your name Ваше имя - + Your status Ваш статус - + Close Закрыть - + Ctrl+Q Ctrl+Q - Online Button to set your status to 'Online' - В сети + В сети - Away Button to set your status to 'Away' Вероятно, это не столь долгое путешествие - Отошёл + Отошёл - Busy Button to set your status to 'Busy' - Занят + Занят diff --git a/widget.ui b/widget.ui index 4ba689f74..9a3adb30e 100644 --- a/widget.ui +++ b/widget.ui @@ -2030,7 +2030,7 @@ QSplitter:handle{ - 2 + 10 20 @@ -2115,7 +2115,7 @@ QSplitter:handle{ 0 0 - 255 + 256 199 diff --git a/widget/form/addfriendform.cpp b/widget/form/addfriendform.cpp index 06f1c4cc0..dc47c769b 100644 --- a/widget/form/addfriendform.cpp +++ b/widget/form/addfriendform.cpp @@ -2,8 +2,9 @@ #include #include +#include -#define TOX_ID_SIZE 76 +#define TOX_ID_LENGTH 2*TOX_FRIEND_ADDRESS_SIZE AddFriendForm::AddFriendForm() : dns(this) { @@ -50,7 +51,7 @@ void AddFriendForm::show(Ui::Widget &ui) bool AddFriendForm::isToxId(const QString &value) const { 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 @@ -117,12 +118,12 @@ void AddFriendForm::handleDnsLookup() } idx += idKeyWord.length(); - if (entry.length() < idx + static_cast(TOX_ID_SIZE)) { + if (entry.length() < idx + static_cast(TOX_ID_LENGTH)) { showWarning(tr("The DNS lookup does not contain a valid Tox ID", "Error with the DNS")); return; } - const QString friendAdress = entry.mid(idx, TOX_ID_SIZE); + const QString friendAdress = entry.mid(idx, TOX_ID_LENGTH); if (!isToxId(friendAdress)) { showWarning(tr("The DNS lookup does not contain a valid Tox ID", "Error with the DNS")); return; diff --git a/widget/form/chatform.cpp b/widget/form/chatform.cpp index 041181282..2afbc6fe6 100644 --- a/widget/form/chatform.cpp +++ b/widget/form/chatform.cpp @@ -152,6 +152,14 @@ ChatForm::ChatForm(Friend* chatFriend) 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::videoFrameReceived, netcam, &NetCamView::updateDisplay); connect(sendButton, SIGNAL(clicked()), this, SLOT(onSendTriggered()));