diff --git a/res.qrc b/res.qrc
index bec7d5077..4c199f21f 100644
--- a/res.qrc
+++ b/res.qrc
@@ -6,14 +6,28 @@
res/DejaVuSans.ttf
- img/icon.png
+ audio/notification.pcm
+ audio/ToxicIncomingCall.pcm
+ img/add.png
+ img/avatar_mask.png
img/contact.png
img/contact_dark.png
img/group.png
+ img/group_2x.png
img/group_button.png
+ img/group_dark.png
+ img/icon.png
+ img/settings.png
+ img/settings/av.png
+ img/settings/general.png
+ img/settings/identity.png
+ img/settings/privacy.png
img/status/dot_away.png
img/status/dot_away_2x.png
img/status/dot_away_notification.png
+ img/status/dot_busy.png
+ img/status/dot_busy_2x.png
+ img/status/dot_busy_notification.png
img/status/dot_groupchat.png
img/status/dot_groupchat_newmessages.png
img/status/dot_groupchat_notification.png
@@ -23,142 +37,7 @@
img/status/dot_online.png
img/status/dot_online_2x.png
img/status/dot_online_notification.png
- img/add.png
- img/settings.png
img/transfer.png
- ui/acceptFileButton/default.png
- ui/acceptFileButton/hover.png
- ui/acceptFileButton/pressed.png
- ui/acceptFileButton/style.css
- ui/callButton/callButton.css
- ui/callButton/callButton.png
- ui/callButton/callButtonDisabled.png
- ui/callButton/callButtonHover.png
- ui/callButton/callButtonPressed.png
- ui/callButton/callButtonRed.png
- ui/callButton/callButtonRedHover.png
- ui/callButton/callButtonRedPressed.png
- ui/callButton/callButtonYellow.png
- ui/callButton/callButtonYellowHover.png
- ui/callButton/callButtonYellowPressed.png
- ui/chatArea/chatArea.css
- ui/chatArea/innerStyle.css
- ui/chatArea/scrollBarDownArrow.png
- ui/chatArea/scrollBarDownArrowHover.png
- ui/chatArea/scrollBarDownArrowPressed.png
- ui/chatArea/scrollBarHandle.png
- ui/chatArea/scrollBarUpArrow.png
- ui/chatArea/scrollBarUpArrowHover.png
- ui/chatArea/scrollBarUpArrowPressed.png
- ui/emoteButton/emoteButton.css
- ui/emoteButton/emoteButton.png
- ui/emoteButton/emoteButtonHover.png
- ui/emoteButton/emoteButtonPressed.png
- ui/fileButton/fileButton.css
- ui/fileButton/fileButton.png
- ui/fileButton/fileButtonHover.png
- ui/fileButton/fileButtonPressed.png
- ui/fileButton/fileButtonDisabled.png
- ui/msgEdit/msgEdit.css
- ui/pauseFileButton/default.png
- ui/pauseFileButton/hover.png
- ui/pauseFileButton/pressed.png
- ui/pauseFileButton/style.css
- ui/sendButton/sendButton.css
- ui/sendButton/sendButton.png
- ui/sendButton/sendButtonHover.png
- ui/sendButton/sendButtonPressed.png
- ui/stopFileButton/default.png
- ui/stopFileButton/hover.png
- ui/stopFileButton/pressed.png
- ui/stopFileButton/style.css
- ui/videoButton/videoButton.css
- ui/videoButton/videoButton.png
- ui/videoButton/videoButtonDisabled.png
- ui/videoButton/videoButtonHover.png
- ui/videoButton/videoButtonPressed.png
- ui/videoButton/videoButtonRed.png
- ui/videoButton/videoButtonRedHover.png
- ui/videoButton/videoButtonRedPressed.png
- ui/videoButton/videoButtonYellow.png
- ui/videoButton/videoButtonYellowHover.png
- ui/videoButton/videoButtonYellowPressed.png
- img/group_dark.png
- ui/window/applicationIcon.png
- ui/friendList/friendList.css
- ui/window/window.css
- img/status/dot_busy.png
- img/status/dot_busy_2x.png
- img/status/dot_busy_notification.png
- translations/fr.qm
- translations/ru.qm
- ui/fileTransferWidget/fileTransferWidget.css
- ui/statusButton/dot_away.png
- ui/statusButton/dot_busy.png
- ui/statusButton/dot_idle.png
- ui/statusButton/dot_online.png
- ui/statusButton/statusButton.css
- ui/statusButton/menu_indicator.png
- translations/de.qm
- translations/it.qm
- ui/emoticonWidget/dot_page.png
- ui/emoticonWidget/dot_page_current.png
- ui/emoticonWidget/emoticonWidget.css
- ui/emoticonWidget/dot_page_hover.png
- ui/volButton/volButton.png
- ui/volButton/volButtonHover.png
- ui/volButton/volButtonPressed.png
- ui/micButton/micButton.png
- ui/micButton/micButtonDisabled.png
- ui/micButton/micButtonHover.png
- ui/micButton/micButtonPressed.png
- ui/micButton/micButton.css
- ui/volButton/volButton.css
- ui/fileTransferInstance/acceptFileButton.png
- ui/fileTransferInstance/pauseFileButton.png
- ui/fileTransferInstance/pauseGreyFileButton.png
- ui/fileTransferInstance/resumeFileButton.png
- ui/fileTransferInstance/stopFileButton.png
- ui/fileTransferInstance/emptyLGreenFileButton.png
- ui/fileTransferInstance/emptyLRedFileButton.png
- ui/fileTransferInstance/emptyRGreenFileButton.png
- ui/fileTransferInstance/emptyRRedFileButton.png
- audio/notification.pcm
- audio/ToxicIncomingCall.pcm
- img/settings/general.png
- img/settings/identity.png
- img/settings/privacy.png
- img/settings/av.png
- translations/pl.qm
- translations/fi.qm
- translations/mannol.qm
- translations/uk.qm
- img/avatar_mask.png
- img/group_2x.png
- ui/chatroomWidgets/genericChatroomWidget.css
- ui/fileTransferInstance/sliverRTEdge.png
- ui/window/statusPanel.css
- ui/settings/mainContent.css
- ui/settings/mainHead.css
- translations/pirate.qm
- ui/chatArea/chatHead.css
- smileys/krepa098/angry.png
- smileys/krepa098/cool.png
- smileys/krepa098/crying.png
- smileys/krepa098/emoticons.xml
- smileys/krepa098/happy.png
- smileys/krepa098/Kappa.png
- smileys/krepa098/laugh_closed_eyes.png
- smileys/krepa098/laugh.png
- smileys/krepa098/plain.png
- smileys/krepa098/raw.svg
- smileys/krepa098/sad.png
- smileys/krepa098/scared.png
- smileys/krepa098/smile.png
- smileys/krepa098/stunned.png
- smileys/krepa098/tongue.png
- smileys/krepa098/uncertain.png
- smileys/krepa098/wink.png
smileys/cylgom/angel.png
smileys/cylgom/angry.png
smileys/cylgom/beer.png
@@ -214,7 +93,128 @@
smileys/cylgom/XD.png
smileys/cylgom/XP.png
smileys/cylgom/yawn.png
+ smileys/krepa098/angry.png
+ smileys/krepa098/cool.png
+ smileys/krepa098/crying.png
+ smileys/krepa098/emoticons.xml
+ smileys/krepa098/happy.png
+ smileys/krepa098/Kappa.png
+ smileys/krepa098/laugh_closed_eyes.png
+ smileys/krepa098/laugh.png
+ smileys/krepa098/plain.png
+ smileys/krepa098/raw.svg
+ smileys/krepa098/sad.png
+ smileys/krepa098/scared.png
+ smileys/krepa098/smile.png
+ smileys/krepa098/stunned.png
+ smileys/krepa098/tongue.png
+ smileys/krepa098/uncertain.png
+ smileys/krepa098/wink.png
translations/bg.qm
+ translations/de.qm
+ translations/fi.qm
+ translations/fr.qm
+ translations/it.qm
+ translations/mannol.qm
+ translations/pirate.qm
+ translations/pl.qm
+ translations/ru.qm
translations/sv.qm
+ translations/uk.qm
+ ui/acceptFileButton/default.png
+ ui/acceptFileButton/hover.png
+ ui/acceptFileButton/pressed.png
+ ui/acceptFileButton/style.css
+ ui/callButton/callButton.css
+ ui/callButton/callButton.png
+ ui/callButton/callButtonDisabled.png
+ ui/callButton/callButtonHover.png
+ ui/callButton/callButtonPressed.png
+ ui/callButton/callButtonRed.png
+ ui/callButton/callButtonRedHover.png
+ ui/callButton/callButtonRedPressed.png
+ ui/callButton/callButtonYellow.png
+ ui/callButton/callButtonYellowHover.png
+ ui/callButton/callButtonYellowPressed.png
+ ui/chatArea/chatArea.css
+ ui/chatArea/chatHead.css
+ ui/chatArea/innerStyle.css
+ ui/chatArea/scrollBarDownArrow.png
+ ui/chatArea/scrollBarDownArrowHover.png
+ ui/chatArea/scrollBarDownArrowPressed.png
+ ui/chatArea/scrollBarHandle.png
+ ui/chatArea/scrollBarUpArrow.png
+ ui/chatArea/scrollBarUpArrowHover.png
+ ui/chatArea/scrollBarUpArrowPressed.png
+ ui/chatroomWidgets/genericChatroomWidget.css
+ ui/emoteButton/emoteButton.css
+ ui/emoteButton/emoteButton.png
+ ui/emoteButton/emoteButtonHover.png
+ ui/emoteButton/emoteButtonPressed.png
+ ui/emoticonWidget/dot_page.png
+ ui/emoticonWidget/dot_page_current.png
+ ui/emoticonWidget/dot_page_hover.png
+ ui/emoticonWidget/emoticonWidget.css
+ ui/fileButton/fileButton.css
+ ui/fileButton/fileButton.png
+ ui/fileButton/fileButtonHover.png
+ ui/fileButton/fileButtonPressed.png
+ ui/fileButton/fileButtonDisabled.png
+ ui/fileTransferInstance/acceptFileButton.png
+ ui/fileTransferInstance/emptyLGreenFileButton.png
+ ui/fileTransferInstance/emptyLRedFileButton.png
+ ui/fileTransferInstance/emptyRGreenFileButton.png
+ ui/fileTransferInstance/emptyRRedFileButton.png
+ ui/fileTransferInstance/pauseFileButton.png
+ ui/fileTransferInstance/pauseGreyFileButton.png
+ ui/fileTransferInstance/resumeFileButton.png
+ ui/fileTransferInstance/stopFileButton.png
+ ui/fileTransferInstance/sliverRTEdge.png
+ ui/fileTransferWidget/fileTransferWidget.css
+ ui/friendList/friendList.css
+ ui/micButton/micButton.css
+ ui/micButton/micButton.png
+ ui/micButton/micButtonDisabled.png
+ ui/micButton/micButtonHover.png
+ ui/micButton/micButtonPressed.png
+ ui/msgEdit/msgEdit.css
+ ui/pauseFileButton/default.png
+ ui/pauseFileButton/hover.png
+ ui/pauseFileButton/pressed.png
+ ui/pauseFileButton/style.css
+ ui/sendButton/sendButton.css
+ ui/sendButton/sendButton.png
+ ui/sendButton/sendButtonHover.png
+ ui/sendButton/sendButtonPressed.png
+ ui/settings/mainContent.css
+ ui/settings/mainHead.css
+ ui/statusButton/dot_away.png
+ ui/statusButton/dot_busy.png
+ ui/statusButton/dot_idle.png
+ ui/statusButton/dot_online.png
+ ui/statusButton/menu_indicator.png
+ ui/statusButton/statusButton.css
+ ui/stopFileButton/default.png
+ ui/stopFileButton/hover.png
+ ui/stopFileButton/pressed.png
+ ui/stopFileButton/style.css
+ ui/videoButton/videoButton.css
+ ui/videoButton/videoButton.png
+ ui/videoButton/videoButtonDisabled.png
+ ui/videoButton/videoButtonHover.png
+ ui/videoButton/videoButtonPressed.png
+ ui/videoButton/videoButtonRed.png
+ ui/videoButton/videoButtonRedHover.png
+ ui/videoButton/videoButtonRedPressed.png
+ ui/videoButton/videoButtonYellow.png
+ ui/videoButton/videoButtonYellowHover.png
+ ui/videoButton/videoButtonYellowPressed.png
+ ui/volButton/volButton.png
+ ui/volButton/volButtonHover.png
+ ui/volButton/volButtonPressed.png
+ ui/volButton/volButton.css
+ ui/window/applicationIcon.png
+ ui/window/statusPanel.css
+ ui/window/window.css
diff --git a/src/autoupdate.cpp b/src/autoupdate.cpp
index f8ffdf9c7..8c2a2ef02 100644
--- a/src/autoupdate.cpp
+++ b/src/autoupdate.cpp
@@ -428,7 +428,7 @@ void AutoUpdater::checkUpdatesAsyncInteractiveWorker()
return;
if (Widget::getInstance()->askMsgboxQuestion(QObject::tr("Update", "The title of a message box"),
- QObject::tr("An update is available, do you want to download it now ?\nIt will be installed when qTox restarts.")))
+ QObject::tr("An update is available, do you want to download it now?\nIt will be installed when qTox restarts.")))
{
downloadUpdate();
}
diff --git a/src/widget/form/addfriendform.cpp b/src/widget/form/addfriendform.cpp
index beef7c853..e0623efa7 100644
--- a/src/widget/form/addfriendform.cpp
+++ b/src/widget/form/addfriendform.cpp
@@ -98,7 +98,7 @@ void AddFriendForm::onSendTriggered()
if (Settings::getInstance().getUseProxy())
{
QMessageBox::StandardButton btn = QMessageBox::warning(main, "qTox", tr("qTox needs to use the Tox DNS, but can't do it through a proxy.\n\
-Ignore the proxy and connect to the Internet directly ?"), QMessageBox::Ok|QMessageBox::No, QMessageBox::No);
+Ignore the proxy and connect to the Internet directly?"), QMessageBox::Ok|QMessageBox::No, QMessageBox::No);
if (btn != QMessageBox::Ok)
return;
}
diff --git a/src/widget/toxuri.cpp b/src/widget/toxuri.cpp
index 62f221e44..a3f08d53e 100644
--- a/src/widget/toxuri.cpp
+++ b/src/widget/toxuri.cpp
@@ -79,7 +79,7 @@ ToxURIDialog::ToxURIDialog(QWidget *parent, const QString &userId, const QString
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
setWindowTitle(tr("Add a friend","Title of the window to add a friend through Tox URI"));
- QLabel *friendsLabel = new QLabel(tr("Do you want to add %1 as a friend ?").arg(userId), this);
+ QLabel *friendsLabel = new QLabel(tr("Do you want to add %1 as a friend?").arg(userId), this);
QLabel *userIdLabel = new QLabel(tr("User ID:"), this);
QLineEdit *userIdEdit = new QLineEdit(userId, this);
userIdEdit->setCursorPosition(0);