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 'pr912'

Browse Source
This commit is contained in:
Dubslow 2014-12-08 15:16:46 -06:00
commit 91f99762a0
No known key found for this signature in database
GPG Key ID: 3DB8E05315C220AA
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widget/form/chatform.cpp
View File

@ -673,7 +673,7 @@ void ChatForm::onFileSendFailed(int FriendId, const QString &fname)
if (FriendId != f->getFriendID()) if (FriendId != f->getFriendID())
return; return;
addSystemInfoMessage("File: \"" + fname + "\" failed to send.", "red", QDateTime::currentDateTime()); addSystemInfoMessage(tr("Failed to send file \"%1\"").arg(fname), "red", QDateTime::currentDateTime());
} }
void ChatForm::onAvatarChange(int FriendId, const QPixmap &pic) void ChatForm::onAvatarChange(int FriendId, const QPixmap &pic)

25
translations/de.ts vendored
View File

@ -36,6 +36,11 @@
<source>Capture device</source> <source>Capture device</source>
<translation>Aufnahmegerät</translation> <translation>Aufnahmegerät</translation>
</message> </message>
<message>
<location filename="../src/widget/form/settings/avsettings.ui" line="95"/>
<source>Rescan audio devices</source>
<translation>Erneut nach Audiogeräten suchen</translation>
</message>
<message> <message>
<location filename="../src/widget/form/settings/avsettings.ui" line="98"/> <location filename="../src/widget/form/settings/avsettings.ui" line="98"/>
<source>Video Settings</source> <source>Video Settings</source>
@ -252,6 +257,11 @@ Soll der Proxy ignoriert und eine direkte Internetverbindung genutzt werden?</tr
<source>Call rejected</source> <source>Call rejected</source>
<translation>Anruf abgewiesen</translation> <translation>Anruf abgewiesen</translation>
</message> </message>
<message>
<location filename="../src/widget/form/chatform.cpp" line="676"/>
<source>Failed to send file</source>
<translation>Fehler beim Senden der Datei</translation>
</message>
<message> <message>
<location filename="../src/widget/form/chatform.cpp" line="804"/> <location filename="../src/widget/form/chatform.cpp" line="804"/>
<source>Call with %1 ended. %2</source> <source>Call with %1 ended. %2</source>
@ -594,22 +604,27 @@ Wollen Sie ein anderes probieren?</translation>
<translation>Mache Tox portabel</translation> <translation>Mache Tox portabel</translation>
</message> </message>
<message> <message>
<location filename="../src/widget/form/settings/generalsettings.ui" line="101"/> <location filename="../src/widget/form/settings/generalsettings.ui" line="99"/>
<source>Show system tray</source> <source>System tray integration</source>
<translation>Systemtray Integration</translation>
</message>
<message>
<location filename="../src/widget/form/settings/generalsettings.ui" line="108"/>
<source>Show system tray icon</source>
<translation>Im Systemtray zeigen</translation> <translation>Im Systemtray zeigen</translation>
</message> </message>
<message> <message>
<location filename="../src/widget/form/settings/generalsettings.ui" line="114"/> <location filename="../src/widget/form/settings/generalsettings.ui" line="123"/>
<source>Start in tray</source> <source>Start in tray</source>
<translation>Ins Tray starten</translation> <translation>Ins Tray starten</translation>
</message> </message>
<message> <message>
<location filename="../src/widget/form/settings/generalsettings.ui" line="127"/> <location filename="../src/widget/form/settings/generalsettings.ui" line="136"/>
<source>Close to tray</source> <source>Close to tray</source>
<translation>Ins Tray schließen</translation> <translation>Ins Tray schließen</translation>
</message> </message>
<message> <message>
<location filename="../src/widget/form/settings/generalsettings.ui" line="140"/> <location filename="../src/widget/form/settings/generalsettings.ui" line="149"/>
<source>Minimize to tray</source> <source>Minimize to tray</source>
<translation>Ins Tray minimieren</translation> <translation>Ins Tray minimieren</translation>
</message> </message>