Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #725 from mestaritonttu/patch-7

Browse Source 
Fix grammar
This commit is contained in:
csoler 2017-03-07 21:49:14 +01:00 committed by GitHub
commit 5bad3269c4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/VOIP/gui/VOIPChatWidgetHolder.cpp
View File

@ -365,7 +365,7 @@ void VOIPChatWidgetHolder::addNewAudioButtonMap(const RsPeerId &peer_id)
button_map::iterator it = buttonMapTakeCall.find(QString("a").append(buttonName)); button_map::iterator it = buttonMapTakeCall.find(QString("a").append(buttonName));
if (it == buttonMapTakeCall.end()){ if (it == buttonMapTakeCall.end()){
mChatWidget->addChatMsg(true, tr("VoIP Status"), QDateTime::currentDateTime(), QDateTime::currentDateTime() mChatWidget->addChatMsg(true, tr("VoIP Status"), QDateTime::currentDateTime(), QDateTime::currentDateTime()
, tr("%1 inviting you to start an audio conversation. Do you want Accept or Decline the invitation?").arg(buttonName), ChatWidget::MSGTYPE_SYSTEM); , tr("%1 is inviting you to start an audio conversation. Do you want to Accept or Decline the invitation?").arg(buttonName), ChatWidget::MSGTYPE_SYSTEM);
RSButtonOnText *buttonT = mChatWidget->getNewButtonOnTextBrowser(tr("Accept Audio Call")); RSButtonOnText *buttonT = mChatWidget->getNewButtonOnTextBrowser(tr("Accept Audio Call"));
buttonT->setToolTip(tr("Activate audio")); buttonT->setToolTip(tr("Activate audio"));
@ -418,7 +418,7 @@ void VOIPChatWidgetHolder::addNewVideoButtonMap(const RsPeerId &peer_id)
button_map::iterator it = buttonMapTakeCall.find(QString("v").append(buttonName)); button_map::iterator it = buttonMapTakeCall.find(QString("v").append(buttonName));
if (it == buttonMapTakeCall.end()){ if (it == buttonMapTakeCall.end()){
mChatWidget->addChatMsg(true, tr("VoIP Status"), QDateTime::currentDateTime(), QDateTime::currentDateTime() mChatWidget->addChatMsg(true, tr("VoIP Status"), QDateTime::currentDateTime(), QDateTime::currentDateTime()
, tr("%1 inviting you to start a video conversation. Do you want Accept or Decline the invitation?").arg(buttonName), ChatWidget::MSGTYPE_SYSTEM); , tr("%1 is inviting you to start a video conversation. Do you want to Accept or Decline the invitation?").arg(buttonName), ChatWidget::MSGTYPE_SYSTEM);
RSButtonOnText *buttonT = mChatWidget->getNewButtonOnTextBrowser(tr("Accept Video Call")); RSButtonOnText *buttonT = mChatWidget->getNewButtonOnTextBrowser(tr("Accept Video Call"));
buttonT->setToolTip(tr("Activate camera")); buttonT->setToolTip(tr("Activate camera"));
@ -1073,7 +1073,7 @@ void VOIPChatWidgetHolder::timerAudioRingTimeOut()
++sendAudioRingTime; ++sendAudioRingTime;
if (sendAudioRingTime == 100) sendAudioRingTime = 0; if (sendAudioRingTime == 100) sendAudioRingTime = 0;
pbAudioRing->setValue(sendAudioRingTime); pbAudioRing->setValue(sendAudioRingTime);
pbAudioRing->setToolTip(tr("Waiting your friend respond your audio call.")); pbAudioRing->setToolTip(tr("Waiting for your friend to respond to your audio call."));
pbAudioRing->setVisible(true); pbAudioRing->setVisible(true);
if (time(NULL) > lastTimePlayOccurs) { if (time(NULL) > lastTimePlayOccurs) {
@ -1131,7 +1131,7 @@ void VOIPChatWidgetHolder::timerVideoRingTimeOut()
++sendVideoRingTime; ++sendVideoRingTime;
if (sendVideoRingTime == 100) sendVideoRingTime = 0; if (sendVideoRingTime == 100) sendVideoRingTime = 0;
pbVideoRing->setValue(sendVideoRingTime); pbVideoRing->setValue(sendVideoRingTime);
pbVideoRing->setToolTip(tr("Waiting your friend respond your video call.")); pbVideoRing->setToolTip(tr("Waiting for your friend to respond to your video call."));
pbVideoRing->setVisible(true); pbVideoRing->setVisible(true);
if (time(NULL) > lastTimePlayOccurs) { if (time(NULL) > lastTimePlayOccurs) {