summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-10-07 22:00:14 (GMT)
committerTobias Markmann <tm@ayena.de>2015-10-07 22:00:14 (GMT)
commitd8946ea19cfc37df6660cebc516e86a93204def0 (patch)
tree01d4557fc9ffdccfd8c78852c59109df56a0a07e
parentdf5bfad6f032b17ee0dffe85cdaadc2c20edaae2 (diff)
downloadswift-d8946ea19cfc37df6660cebc516e86a93204def0.zip
swift-d8946ea19cfc37df6660cebc516e86a93204def0.tar.bz2
Fix wording so text is independent of sender/receiver case
Test-Information: None. Change-Id: I4e0cd54c9009bc19fdc10cd1ec2697252bd6f7f7
-rw-r--r--Swift/QtUI/QtWebKitChatView.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/QtUI/QtWebKitChatView.cpp b/Swift/QtUI/QtWebKitChatView.cpp
index 8327473..f1278b8 100644
--- a/Swift/QtUI/QtWebKitChatView.cpp
+++ b/Swift/QtUI/QtWebKitChatView.cpp
@@ -439,11 +439,11 @@ void QtWebKitChatView::setFileTransferStatus(QString id, const ChatWindow::FileT
439 return; 439 return;
440 } 440 }
441 441
442 QString newInnerHTML = ""; 442 QString newInnerHTML = "";
443 if (state == ChatWindow::Initialisation) { 443 if (state == ChatWindow::Initialisation) {
444 newInnerHTML = tr("Preparing to send.") + "<br/>" + 444 newInnerHTML = tr("Preparing to transfer.") + "<br/>" +
445 buildChatWindowButton(tr("Cancel"), ButtonFileTransferCancel, id); 445 buildChatWindowButton(tr("Cancel"), ButtonFileTransferCancel, id);
446 } 446 }
447 else if (state == ChatWindow::WaitingForAccept) { 447 else if (state == ChatWindow::WaitingForAccept) {
448 newInnerHTML = tr("Waiting for other side to accept the transfer.") + "<br/>" + 448 newInnerHTML = tr("Waiting for other side to accept the transfer.") + "<br/>" +
449 buildChatWindowButton(tr("Cancel"), ButtonFileTransferCancel, id); 449 buildChatWindowButton(tr("Cancel"), ButtonFileTransferCancel, id);