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

Browse Source
This commit is contained in:
tux3 2015-05-24 17:46:55 +02:00
commit 1178df61ef
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ ChatForm::ChatForm(Friend* chatFriend)
headTextLayout->addWidget(callDuration, 1, Qt::AlignCenter); headTextLayout->addWidget(callDuration, 1, Qt::AlignCenter);
callDuration->hide(); callDuration->hide();
menu.addAction(tr("Load chat history..."), this, SLOT(onLoadHistory())); menu.addAction(QObject::tr("Load chat history..."), this, SLOT(onLoadHistory()));
connect(Core::getInstance(), &Core::fileSendStarted, this, &ChatForm::startFileSend); connect(Core::getInstance(), &Core::fileSendStarted, this, &ChatForm::startFileSend);
connect(sendButton, &QPushButton::clicked, this, &ChatForm::onSendTriggered); connect(sendButton, &QPushButton::clicked, this, &ChatForm::onSendTriggered);

7
translations/it.ts vendored
View File

@ -2115,7 +2115,7 @@ Verrà installata al riavvio del programma.</translation>
Permettimi di aggiungerti alla mia lista contatti.</translation> Permettimi di aggiungerti alla mia lista contatti.</translation>
</message> </message>
<message> <message>
<location filename="../src/chatlog/chatmessage.cpp" line="124"/> <location filename="../src/chatlog/chatmessage.cpp" line="129"/>
<source>Resizing</source> <source>Resizing</source>
<translation>Ridimensiona</translation> <translation>Ridimensiona</translation>
</message> </message>
@ -2124,6 +2124,11 @@ Permettimi di aggiungerti alla mia lista contatti.</translation>
<source>User Profile</source> <source>User Profile</source>
<translation>Profilo Utente</translation> <translation>Profilo Utente</translation>
</message> </message>
<message>
<location filename="../src/widget/form/chatform.cpp" line="82"/>
<source>Load chat history...</source>
<translation>Carica cronologia chat...</translation>
</message>
</context> </context>
<context> <context>
<name>ScreenshotGrabber</name> <name>ScreenshotGrabber</name>