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 pull request #5829

Browse Source 
jessica181920 (1):
      fix(i18n): Various English fixes
This commit is contained in:
sudden6 2019-09-28 14:25:18 +02:00
commit 0e3cd7fe6b
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
42 changed files with 144 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/audio/backend/openal.cpp
View File

@ -293,7 +293,7 @@ void OpenAL::destroySink(AlSink& sink)
const auto soundSinksErased = soundSinks.erase(&sink); const auto soundSinksErased = soundSinks.erase(&sink);
if (sinksErased == 0 && soundSinksErased == 0) { if (sinksErased == 0 && soundSinksErased == 0) {
qWarning() << "Destroying non-existant source"; qWarning() << "Destroying non-existent sink";
return; return;
} }
@ -350,7 +350,7 @@ void OpenAL::destroySource(AlSource& source)
const auto s = sources.find(&source); const auto s = sources.find(&source);
if (s == sources.end()) { if (s == sources.end()) {
qWarning() << "Destroyed non-existant source"; qWarning() << "Destroyed non-existent source";
return; return;
} }
@ -446,7 +446,7 @@ bool OpenAL::initOutput(const QString& deviceName)
alOutDev = alcOpenDevice(tmpDevName); alOutDev = alcOpenDevice(tmpDevName);
if (!alOutDev) { if (!alOutDev) {
qWarning() << "Cannot open output audio device" << deviceName; qWarning() << "Cannot open audio output device" << deviceName;
return false; return false;
} }
@ -455,7 +455,7 @@ bool OpenAL::initOutput(const QString& deviceName)
checkAlcError(alOutDev); checkAlcError(alOutDev);
if (!alcMakeContextCurrent(alOutContext)) { if (!alcMakeContextCurrent(alOutContext)) {
qWarning() << "Cannot create output audio context"; qWarning() << "Cannot create audio output context";
return false; return false;
} }
@ -475,7 +475,7 @@ void OpenAL::playMono16Sound(AlSink& sink, const IAudioSink::Sound& sound)
const uint sourceId = sink.getSourceId(); const uint sourceId = sink.getSourceId();
QFile sndFile(IAudioSink::getSound(sound)); QFile sndFile(IAudioSink::getSound(sound));
if (!sndFile.exists()) { if (!sndFile.exists()) {
qDebug() << "Trying to open non existent sound file"; qDebug() << "Trying to open non-existent sound file";
return; return;
} }
@ -600,7 +600,7 @@ void OpenAL::cleanupOutput()
if (alOutDev) { if (alOutDev) {
if (!alcMakeContextCurrent(nullptr)) { if (!alcMakeContextCurrent(nullptr)) {
qWarning("Failed to clear audio context."); qWarning("Failed to clear audio context");
} }
alcDestroyContext(alOutContext); alcDestroyContext(alOutContext);
@ -610,7 +610,7 @@ void OpenAL::cleanupOutput()
if (alcCloseDevice(alOutDev)) { if (alcCloseDevice(alOutDev)) {
alOutDev = nullptr; alOutDev = nullptr;
} else { } else {
qWarning("Failed to close output."); qWarning("Failed to close output");
} }
} }
} }

6
src/audio/backend/openal2.cpp
View File

@ -194,7 +194,7 @@ bool OpenAL2::initOutputEchoCancel()
return false; return false;
} }
qDebug() << "Echo cancelation enabled"; qDebug() << "Echo cancellation enabled";
return true; return true;
} }
@ -218,7 +218,7 @@ bool OpenAL2::initOutput(const QString& deviceName)
alOutDev = alcOpenDevice(tmpDevName); alOutDev = alcOpenDevice(tmpDevName);
if (!alOutDev) { if (!alOutDev) {
qWarning() << "Cannot open output audio device" << deviceName; qWarning() << "Cannot open audio output device" << deviceName;
return false; return false;
} }
@ -227,7 +227,7 @@ bool OpenAL2::initOutput(const QString& deviceName)
checkAlcError(alOutDev); checkAlcError(alOutDev);
if (!alcMakeContextCurrent(alOutContext)) { if (!alcMakeContextCurrent(alOutContext)) {
qWarning() << "Cannot create output audio context"; qWarning() << "Cannot create audio output context";
return false; return false;
} }

2
src/chatlog/chatmessage.cpp
View File

@ -201,7 +201,7 @@ ChatMessage::Ptr ChatMessage::createBusyNotification()
baseFont.setPixelSize(baseFont.pixelSize() + 2); baseFont.setPixelSize(baseFont.pixelSize() + 2);
baseFont.setBold(true); baseFont.setBold(true);
msg->addColumn(new Text(QObject::tr("Reformatting text in progress.."), baseFont, false, ""), msg->addColumn(new Text(QObject::tr("Reformatting text...", "Waiting for text to be reformatted"), baseFont, false, ""),
ColumnFormat(1.0, ColumnFormat::VariableSize, ColumnFormat::Center)); ColumnFormat(1.0, ColumnFormat::VariableSize, ColumnFormat::Center));
return msg; return msg;

4
src/chatlog/content/filetransferwidget.cpp
View File

@ -233,7 +233,7 @@ void FileTransferWidget::paintEvent(QPaintEvent*)
QString FileTransferWidget::getHumanReadableSize(qint64 size) QString FileTransferWidget::getHumanReadableSize(qint64 size)
{ {
static const char* suffix[] = {"B", "kiB", "MiB", "GiB", "TiB"}; static const char* suffix[] = {"B", "KiB", "MiB", "GiB", "TiB"};
int exp = 0; int exp = 0;
if (size > 0) { if (size > 0) {
@ -287,7 +287,7 @@ void FileTransferWidget::updateWidgetText(ToxFile const& file)
if (file.pauseStatus.localPaused()) { if (file.pauseStatus.localPaused()) {
ui->progressLabel->setText(tr("Paused", "file transfer widget")); ui->progressLabel->setText(tr("Paused", "file transfer widget"));
} else { } else {
ui->progressLabel->setText(tr("Remote Paused", "file transfer widget")); ui->progressLabel->setText(tr("Remote paused", "file transfer widget"));
} }
break; break;
case ToxFile::TRANSMITTING: case ToxFile::TRANSMITTING:

42
src/core/core.cpp
View File

@ -176,14 +176,14 @@ ToxCorePtr Core::makeToxCore(const QByteArray& savedata, const ICoreSettings* co
{ {
QThread* thread = new QThread(); QThread* thread = new QThread();
if (thread == nullptr) { if (thread == nullptr) {
qCritical() << "could not allocate Core thread"; qCritical() << "Could not allocate Core thread";
return {}; return {};
} }
thread->setObjectName("qTox Core"); thread->setObjectName("qTox Core");
auto toxOptions = ToxOptions::makeToxOptions(savedata, settings); auto toxOptions = ToxOptions::makeToxOptions(savedata, settings);
if (toxOptions == nullptr) { if (toxOptions == nullptr) {
qCritical() << "could not allocate Tox Options data structure"; qCritical() << "Could not allocate ToxOptions data structure";
if (err) { if (err) {
*err = ToxCoreErrors::ERROR_ALLOC; *err = ToxCoreErrors::ERROR_ALLOC;
} }
@ -206,7 +206,7 @@ ToxCorePtr Core::makeToxCore(const QByteArray& savedata, const ICoreSettings* co
break; break;
case TOX_ERR_NEW_LOAD_BAD_FORMAT: case TOX_ERR_NEW_LOAD_BAD_FORMAT:
qCritical() << "failed to parse Tox save data"; qCritical() << "Failed to parse Tox save data";
if (err) { if (err) {
*err = ToxCoreErrors::BAD_PROXY; *err = ToxCoreErrors::BAD_PROXY;
} }
@ -223,7 +223,7 @@ ToxCorePtr Core::makeToxCore(const QByteArray& savedata, const ICoreSettings* co
} }
} }
qCritical() << "can't to bind the port"; qCritical() << "Can't to bind the port";
if (err) { if (err) {
*err = ToxCoreErrors::FAILED_TO_START; *err = ToxCoreErrors::FAILED_TO_START;
} }
@ -232,42 +232,42 @@ ToxCorePtr Core::makeToxCore(const QByteArray& savedata, const ICoreSettings* co
case TOX_ERR_NEW_PROXY_BAD_HOST: case TOX_ERR_NEW_PROXY_BAD_HOST:
case TOX_ERR_NEW_PROXY_BAD_PORT: case TOX_ERR_NEW_PROXY_BAD_PORT:
case TOX_ERR_NEW_PROXY_BAD_TYPE: case TOX_ERR_NEW_PROXY_BAD_TYPE:
qCritical() << "bad proxy, error code:" << tox_err; qCritical() << "Bad proxy, error code:" << tox_err;
if (err) { if (err) {
*err = ToxCoreErrors::BAD_PROXY; *err = ToxCoreErrors::BAD_PROXY;
} }
return {}; return {};
case TOX_ERR_NEW_PROXY_NOT_FOUND: case TOX_ERR_NEW_PROXY_NOT_FOUND:
qCritical() << "proxy not found"; qCritical() << "Proxy not found";
if (err) { if (err) {
*err = ToxCoreErrors::BAD_PROXY; *err = ToxCoreErrors::BAD_PROXY;
} }
return {}; return {};
case TOX_ERR_NEW_LOAD_ENCRYPTED: case TOX_ERR_NEW_LOAD_ENCRYPTED:
qCritical() << "attempted to load encrypted Tox save data"; qCritical() << "Attempted to load encrypted Tox save data";
if (err) { if (err) {
*err = ToxCoreErrors::INVALID_SAVE; *err = ToxCoreErrors::INVALID_SAVE;
} }
return {}; return {};
case TOX_ERR_NEW_MALLOC: case TOX_ERR_NEW_MALLOC:
qCritical() << "memory allocation failed"; qCritical() << "Memory allocation failed";
if (err) { if (err) {
*err = ToxCoreErrors::ERROR_ALLOC; *err = ToxCoreErrors::ERROR_ALLOC;
} }
return {}; return {};
case TOX_ERR_NEW_NULL: case TOX_ERR_NEW_NULL:
qCritical() << "a parameter was null"; qCritical() << "A parameter was null";
if (err) { if (err) {
*err = ToxCoreErrors::FAILED_TO_START; *err = ToxCoreErrors::FAILED_TO_START;
} }
return {}; return {};
default: default:
qCritical() << "Tox core failed to start, unknown error code:" << tox_err; qCritical() << "Toxcore failed to start, unknown error code:" << tox_err;
if (err) { if (err) {
*err = ToxCoreErrors::FAILED_TO_START; *err = ToxCoreErrors::FAILED_TO_START;
} }
@ -436,7 +436,7 @@ void Core::bootstrapDht()
int listSize = bootstrapNodes.size(); int listSize = bootstrapNodes.size();
if (!listSize) { if (!listSize) {
qWarning() << "no bootstrap list?!?"; qWarning() << "No bootstrap node list";
return; return;
} }
@ -582,7 +582,7 @@ void Core::onGroupPeerNameChange(Tox*, uint32_t groupId, uint32_t peerId, const
size_t length, void* vCore) size_t length, void* vCore)
{ {
const auto newName = ToxString(name, length).getQString(); const auto newName = ToxString(name, length).getQString();
qDebug() << QString("Group %1, Peer %2, name changed to %3").arg(groupId).arg(peerId).arg(newName); qDebug() << QString("Group %1, peer %2, name changed to %3").arg(groupId).arg(peerId).arg(newName);
auto* core = static_cast<Core*>(vCore); auto* core = static_cast<Core*>(vCore);
auto peerPk = core->getGroupPeerPk(groupId, peerId); auto peerPk = core->getGroupPeerPk(groupId, peerId);
emit core->groupPeerNameChanged(groupId, peerPk, newName); emit core->groupPeerNameChanged(groupId, peerPk, newName);
@ -626,20 +626,20 @@ QString Core::getFriendRequestErrorMessage(const ToxId& friendId, const QString&
QMutexLocker ml{&coreLoopLock}; QMutexLocker ml{&coreLoopLock};
if (!friendId.isValid()) { if (!friendId.isValid()) {
return tr("Invalid Tox ID", "Error while sending friendship request"); return tr("Invalid Tox ID", "Error while sending friend request");
} }
if (message.isEmpty()) { if (message.isEmpty()) {
return tr("You need to write a message with your request", return tr("You need to write a message with your request",
"Error while sending friendship request"); "Error while sending friend request");
} }
if (message.length() > static_cast<int>(tox_max_friend_request_length())) { if (message.length() > static_cast<int>(tox_max_friend_request_length())) {
return tr("Your message is too long!", "Error while sending friendship request"); return tr("Your message is too long!", "Error while sending friend request");
} }
if (hasFriendWithPublicKey(friendId.getPublicKey())) { if (hasFriendWithPublicKey(friendId.getPublicKey())) {
return tr("Friend is already added", "Error while sending friendship request"); return tr("Friend is already added", "Error while sending friend request");
} }
return QString{}; return QString{};
@ -661,10 +661,10 @@ void Core::requestFriendship(const ToxId& friendId, const QString& message)
uint32_t friendNumber = uint32_t friendNumber =
tox_friend_add(tox.get(), friendId.getBytes(), cMessage.data(), cMessage.size(), nullptr); tox_friend_add(tox.get(), friendId.getBytes(), cMessage.data(), cMessage.size(), nullptr);
if (friendNumber == std::numeric_limits<uint32_t>::max()) { if (friendNumber == std::numeric_limits<uint32_t>::max()) {
qDebug() << "Failed to request friendship"; qDebug() << "Failed to send friend request";
emit failedToAddFriend(friendPk); emit failedToAddFriend(friendPk);
} else { } else {
qDebug() << "Requested friendship of " << friendNumber; qDebug() << "Requested friendship from " << friendNumber;
emit friendAdded(friendNumber, friendPk); emit friendAdded(friendNumber, friendPk);
emit requestSent(friendPk, message); emit requestSent(friendPk, message);
} }
@ -1116,7 +1116,7 @@ bool Core::parsePeerQueryError(Tox_Err_Conference_Peer_Query error) const
return false; return false;
default: default:
qCritical() << "Unknow error code:" << error; qCritical() << "Unknown error code:" << error;
return false; return false;
} }
} }
@ -1289,7 +1289,7 @@ bool Core::parseConferenceJoinError(Tox_Err_Conference_Join error) const
return false; return false;
default: default:
qCritical() << "Unknow error code:" << error; qCritical() << "Unknown error code:" << error;
return false; return false;
} }
} }
@ -1312,7 +1312,7 @@ uint32_t Core::joinGroupchat(const GroupInvite& inviteInfo)
uint32_t groupNum{std::numeric_limits<uint32_t>::max()}; uint32_t groupNum{std::numeric_limits<uint32_t>::max()};
switch (confType) { switch (confType) {
case TOX_CONFERENCE_TYPE_TEXT: { case TOX_CONFERENCE_TYPE_TEXT: {
qDebug() << QString("Trying to join text groupchat invite sent by friend %1").arg(friendId); qDebug() << QString("Trying to accept invite for text group chat sent by friend %1").arg(friendId);
Tox_Err_Conference_Join error; Tox_Err_Conference_Join error;
groupNum = tox_conference_join(tox.get(), friendId, cookie, cookieLength, &error); groupNum = tox_conference_join(tox.get(), friendId, cookie, cookieLength, &error);
if (!parseConferenceJoinError(error)) { if (!parseConferenceJoinError(error)) {

7
src/core/coreav.cpp
View File

@ -126,7 +126,7 @@ CoreAV::CoreAVPtr CoreAV::makeCoreAV(Tox* core)
case TOXAV_ERR_NEW_OK: case TOXAV_ERR_NEW_OK:
break; break;
case TOXAV_ERR_NEW_MALLOC: case TOXAV_ERR_NEW_MALLOC:
qCritical() << "Failed to allocate ressources for ToxAV"; qCritical() << "Failed to allocate resources for ToxAV";
return {}; return {};
case TOXAV_ERR_NEW_MULTIPLE: case TOXAV_ERR_NEW_MULTIPLE:
qCritical() << "Attempted to create multiple ToxAV instances"; qCritical() << "Attempted to create multiple ToxAV instances";
@ -260,7 +260,7 @@ bool CoreAV::answerCall(uint32_t friendNum, bool video)
return ret; return ret;
} }
qDebug() << QString("answering call %1").arg(friendNum); qDebug() << QString("Answering call %1").arg(friendNum);
auto it = calls.find(friendNum); auto it = calls.find(friendNum);
assert(it != calls.end()); assert(it != calls.end());
TOXAV_ERR_ANSWER err; TOXAV_ERR_ANSWER err;
@ -544,8 +544,7 @@ VideoSource* CoreAV::getVideoSourceFromCall(int friendNum) const
{ {
auto it = calls.find(friendNum); auto it = calls.find(friendNum);
if (it == calls.end()) { if (it == calls.end()) {
qWarning() << "CoreAV::getVideoSourceFromCall: No such call, did it die before we finished " qWarning() << "CoreAV::getVideoSourceFromCall: No such call, possibly cancelled";
"answering?";
return nullptr; return nullptr;
} }

9
src/core/corefile.cpp
View File

@ -124,7 +124,7 @@ void CoreFile::sendAvatarFile(uint32_t friendId, const QByteArray& data)
qCritical() << "Send null"; qCritical() << "Send null";
return; return;
case TOX_ERR_FILE_SEND_TOO_MANY: case TOX_ERR_FILE_SEND_TOO_MANY:
qCritical() << "To many ougoing transfer"; qCritical() << "Too many outgoing transfers";
return; return;
default: default:
return; return;
@ -368,7 +368,7 @@ void CoreFile::handleAvatarOffer(uint32_t friendId, uint32_t fileId, bool accept
{ {
if (!accept) { if (!accept) {
// If it's an avatar but we already have it cached, cancel // If it's an avatar but we already have it cached, cancel
qDebug() << QString("Received avatar request %1:%2, reject, since we have it in cache.") qDebug() << QString("Received avatar request %1:%2. Rejected since it is in cache.")
.arg(friendId) .arg(friendId)
.arg(fileId); .arg(fileId);
tox_file_control(tox, friendId, fileId, TOX_FILE_CONTROL_CANCEL, nullptr); tox_file_control(tox, friendId, fileId, TOX_FILE_CONTROL_CANCEL, nullptr);
@ -376,8 +376,7 @@ void CoreFile::handleAvatarOffer(uint32_t friendId, uint32_t fileId, bool accept
} }
// It's an avatar and we don't have it, autoaccept the transfer // It's an avatar and we don't have it, autoaccept the transfer
qDebug() << QString("Received avatar request %1:%2, accept, since we don't have it " qDebug() << QString("Received avatar request %1:%2. Accepted.")
"in cache.")
.arg(friendId) .arg(friendId)
.arg(fileId); .arg(fileId);
tox_file_control(tox, friendId, fileId, TOX_FILE_CONTROL_RESUME, nullptr); tox_file_control(tox, friendId, fileId, TOX_FILE_CONTROL_RESUME, nullptr);
@ -404,7 +403,7 @@ void CoreFile::onFileControlCallback(Tox*, uint32_t friendId, uint32_t fileId,
if (control == TOX_FILE_CONTROL_CANCEL) { if (control == TOX_FILE_CONTROL_CANCEL) {
if (file->fileKind != TOX_FILE_KIND_AVATAR) if (file->fileKind != TOX_FILE_KIND_AVATAR)
qDebug() << "File tranfer" << friendId << ":" << fileId << "cancelled by friend"; qDebug() << "File transfer" << friendId << ":" << fileId << "cancelled by friend";
file->status = ToxFile::CANCELED; file->status = ToxFile::CANCELED;
emit coreFile->fileTransferCancelled(*file); emit coreFile->fileTransferCancelled(*file);
coreFile->removeFile(friendId, fileId); coreFile->removeFile(friendId, fileId);

8
src/core/toxencrypt.cpp
View File

@ -120,7 +120,7 @@ QByteArray ToxEncrypt::encryptPass(const QString& password, const QByteArray& pl
QByteArray ToxEncrypt::decryptPass(const QString& password, const QByteArray& ciphertext) QByteArray ToxEncrypt::decryptPass(const QString& password, const QByteArray& ciphertext)
{ {
if (!isEncrypted(ciphertext)) { if (!isEncrypted(ciphertext)) {
qWarning() << "The data was not encrypted using this module or it's corrupted."; qWarning() << "The data was not encrypted using this module, or it's corrupted.";
return QByteArray{}; return QByteArray{};
} }
@ -182,7 +182,7 @@ std::unique_ptr<ToxEncrypt> ToxEncrypt::makeToxEncrypt(const QString& password)
std::unique_ptr<ToxEncrypt> ToxEncrypt::makeToxEncrypt(const QString& password, const QByteArray& toxSave) std::unique_ptr<ToxEncrypt> ToxEncrypt::makeToxEncrypt(const QString& password, const QByteArray& toxSave)
{ {
if (!isEncrypted(toxSave)) { if (!isEncrypted(toxSave)) {
qWarning() << "The data was not encrypted using this module or it's corrupted."; qWarning() << "The data was not encrypted using this module, or it's corrupted.";
return std::unique_ptr<ToxEncrypt>{}; return std::unique_ptr<ToxEncrypt>{};
} }
@ -218,7 +218,7 @@ std::unique_ptr<ToxEncrypt> ToxEncrypt::makeToxEncrypt(const QString& password,
QByteArray ToxEncrypt::encrypt(const QByteArray& plaintext) const QByteArray ToxEncrypt::encrypt(const QByteArray& plaintext) const
{ {
if (!passKey) { if (!passKey) {
qCritical() << "The passKey is invalid."; qCritical() << "The passkey is invalid.";
return QByteArray{}; return QByteArray{};
} }
@ -245,7 +245,7 @@ QByteArray ToxEncrypt::encrypt(const QByteArray& plaintext) const
QByteArray ToxEncrypt::decrypt(const QByteArray& ciphertext) const QByteArray ToxEncrypt::decrypt(const QByteArray& ciphertext) const
{ {
if (!isEncrypted(ciphertext)) { if (!isEncrypted(ciphertext)) {
qWarning() << "The data was not encrypted using this module or it's corrupted."; qWarning() << "The data was not encrypted using this module, or it's corrupted.";
return QByteArray{}; return QByteArray{};
} }

8
src/core/toxoptions.cpp
View File

@ -72,7 +72,7 @@ std::unique_ptr<ToxOptions> ToxOptions::makeToxOptions(const QByteArray& savedat
Tox_Options* tox_opts = tox_options_new(nullptr); Tox_Options* tox_opts = tox_options_new(nullptr);
if (!tox_opts) { if (!tox_opts) {
qWarning() << "failed to create Tox_Options"; qWarning() << "Failed to create Tox_Options";
return {}; return {};
} }
@ -119,9 +119,9 @@ std::unique_ptr<ToxOptions> ToxOptions::makeToxOptions(const QByteArray& savedat
if (proxyType != ICoreSettings::ProxyType::ptNone) { if (proxyType != ICoreSettings::ProxyType::ptNone) {
if (static_cast<uint32_t>(proxyAddr.length()) > tox_max_hostname_length()) { if (static_cast<uint32_t>(proxyAddr.length()) > tox_max_hostname_length()) {
qWarning() << "proxy address" << proxyAddr << "is too long"; qWarning() << "Proxy address" << proxyAddr << "is too long";
} else if (!proxyAddr.isEmpty() && proxyPort > 0) { } else if (!proxyAddr.isEmpty() && proxyPort > 0) {
qDebug() << "using proxy" << proxyAddr << ":" << proxyPort; qDebug() << "Using proxy" << proxyAddr << ":" << proxyPort;
// protection against changings in Tox_Proxy_Type enum // protection against changings in Tox_Proxy_Type enum
if (proxyType == ICoreSettings::ProxyType::ptSOCKS5) { if (proxyType == ICoreSettings::ProxyType::ptSOCKS5) {
tox_options_set_proxy_type(*toxOptions, TOX_PROXY_TYPE_SOCKS5); tox_options_set_proxy_type(*toxOptions, TOX_PROXY_TYPE_SOCKS5);
@ -133,7 +133,7 @@ std::unique_ptr<ToxOptions> ToxOptions::makeToxOptions(const QByteArray& savedat
tox_options_set_proxy_port(*toxOptions, proxyPort); tox_options_set_proxy_port(*toxOptions, proxyPort);
if (!forceTCP) { if (!forceTCP) {
qDebug() << "Proxy and UDP enabled, this is a security risk, forcing TCP only"; qDebug() << "Proxy and UDP enabled. This is a security risk. Forcing TCP only.";
forceTCP = true; forceTCP = true;
} }
} }

8
src/net/toxme.cpp
View File

@ -225,13 +225,13 @@ QString Toxme::getErrorMessage(int errorCode)
case ToxmeData::NoPassword: case ToxmeData::NoPassword:
return "No password in response"; return "No password in response";
case ToxmeData::ServerError: case ToxmeData::ServerError:
return "Server doesn't support Toxme"; return "Server doesn't support ToxMe";
case -1: case -1:
return "You must send POST requests to /api"; return "You must send POST requests to /api";
case -2: case -2:
return "Problem with HTTPS connection"; return "Problem with HTTPS connection";
case -3: case -3:
return "I was unable to read your encrypted payload"; return "Unable to read encrypted payload";
case -4: case -4:
return "You're making too many requests. Wait an hour and try again"; return "You're making too many requests. Wait an hour and try again";
case -25: case -25:
@ -253,7 +253,7 @@ QString Toxme::getErrorMessage(int errorCode)
case -42: case -42:
return "That user does not exist"; return "That user does not exist";
case -43: case -43:
return "Internal lookup error. Please file a bug"; return "Internal lookup error. Please file a bug report.";
default: default:
return QString("Unknown error (%1)").arg(errorCode); return QString("Unknown error (%1)").arg(errorCode);
} }
@ -268,7 +268,7 @@ QString Toxme::translateErrorMessage(int errorCode)
{ {
switch (errorCode) { switch (errorCode) {
case ToxmeData::ServerError: case ToxmeData::ServerError:
return QObject::tr("Server doesn't support Toxme"); return QObject::tr("Server doesn't support ToxMe");
case -2: case -2:
return QObject::tr("Problem with HTTPS connection"); return QObject::tr("Problem with HTTPS connection");
case -4: case -4:

2
src/net/toxuri.cpp
View File

@ -68,7 +68,7 @@ bool handleToxURI(const QString& toxURI)
if (!toxId.isValid()) { if (!toxId.isValid()) {
toxId = Toxme::lookup(toxaddr); toxId = Toxme::lookup(toxaddr);
if (!toxId.isValid()) { if (!toxId.isValid()) {
error = QMessageBox::tr("%1 is not a valid Toxme address.").arg(toxaddr); error = QMessageBox::tr("%1 is not a valid ToxMe address.").arg(toxaddr);
} }
} else if (toxId == core->getSelfId()) { } else if (toxId == core->getSelfId()) {
error = QMessageBox::tr("You can't add yourself as a friend!", error = QMessageBox::tr("You can't add yourself as a friend!",

2
src/persistence/paths.cpp
View File

@ -109,7 +109,7 @@ Paths* Paths::makePaths(Portable mode)
QString basePath = portable ? basePortable : baseNonPortable; QString basePath = portable ? basePortable : baseNonPortable;
if (basePath.isEmpty()) { if (basePath.isEmpty()) {
qCritical() << "Couldn't find writeable path"; qCritical() << "Couldn't find writable path";
return nullptr; return nullptr;
} }

6
src/persistence/profile.cpp
View File

@ -170,7 +170,7 @@ bool logLoadToxDataError(const LoadToxDataError& error, const QString& path)
qWarning() << "The tox save file " << path << " was not found"; qWarning() << "The tox save file " << path << " was not found";
break; break;
case LoadToxDataError::COULD_NOT_READ_FILE: case LoadToxDataError::COULD_NOT_READ_FILE:
qCritical() << "The tox save file " << path << " couldn't' be opened"; qCritical() << "The tox save file " << path << " couldn't be opened";
break; break;
case LoadToxDataError::FILE_IS_EMPTY: case LoadToxDataError::FILE_IS_EMPTY:
qWarning() << "The tox save file" << path << " is empty!"; qWarning() << "The tox save file" << path << " is empty!";
@ -257,7 +257,7 @@ void Profile::initCore(const QByteArray& toxsave, const ICoreSettings& s, bool i
emit failedToStart(); emit failedToStart();
} }
qDebug() << "failed to start ToxCore"; qDebug() << "Failed to start Toxcore";
return; return;
} }
@ -941,7 +941,7 @@ QString Profile::setPassword(const QString& newPassword)
QString error{}; QString error{};
if (!dbSuccess) { if (!dbSuccess) {
error = tr("Couldn't change password on the database, it might be corrupted or use the old " error = tr("Couldn't change database password, it may be corrupted or use the old "
"password."); "password.");
} }

4
src/persistence/settings.cpp
View File

@ -349,7 +349,7 @@ bool Settings::verifyProxySettings(const QCommandLineParser& parser)
} }
if (activeProxyType && LANSettingString == ON) { if (activeProxyType && LANSettingString == ON) {
qCritical() << "Cannot set LAN discovery on with proxy."; qCritical() << "Cannot use LAN discovery with proxy.";
return false; return false;
} }
@ -1412,7 +1412,7 @@ QNetworkProxy Settings::getProxy() const
break; break;
default: default:
proxy.setType(QNetworkProxy::NoProxy); proxy.setType(QNetworkProxy::NoProxy);
qWarning() << "Invalid Proxy type, setting to NoProxy"; qWarning() << "Invalid proxy type, setting to NoProxy";
break; break;
} }

2
src/platform/camera/directshow.cpp
View File

@ -171,7 +171,7 @@ static IBaseFilter* getDevFilter(QString devName)
classenum->Release(); classenum->Release();
if (!devFilter) if (!devFilter)
qWarning() << "Could't find the device " << devName; qWarning() << "Couldn't find the device " << devName;
return devFilter; return devFilter;
} }

4
src/platform/install_osx.cpp
View File

@ -60,7 +60,7 @@ void osx::moveToAppFolder()
if ((appdir_noqtox + "qtox.app") != appdir) // quick safety check if ((appdir_noqtox + "qtox.app") != appdir) // quick safety check
{ {
qDebug() << "OS X: Attmepted to delete non qTox directory!"; qDebug() << "OS X: Attempted to delete non-qTox directory!";
exit(EXIT_UPDATE_MACX_FAIL); exit(EXIT_UPDATE_MACX_FAIL);
} }
@ -72,7 +72,7 @@ void osx::moveToAppFolder()
if (old_app.removeRecursively()) // We've just deleted the running program if (old_app.removeRecursively()) // We've just deleted the running program
qDebug() << "OS X: Cleaned up old directory"; qDebug() << "OS X: Cleaned up old directory";
else else
qDebug() << "OS X: This should never happen, the directory failed to delete"; qDebug() << "OS X: The directory failed to delete (this should never happen)";
if (fork() != 0) // Forking is required otherwise it won't actually cleanly launch if (fork() != 0) // Forking is required otherwise it won't actually cleanly launch
exit(EXIT_UPDATE_MACX); exit(EXIT_UPDATE_MACX);

2
src/video/cameradevice.cpp
View File

@ -225,7 +225,7 @@ CameraDevice* CameraDevice::open(QString devName, VideoMode mode)
} }
#endif #endif
else if (mode) { else if (mode) {
qWarning() << "Video mode-setting not implemented for input " << iformat->name; qWarning().nospace() << "No known options for " << iformat->name << ", using defaults.";
Q_UNUSED(mode); Q_UNUSED(mode);
} }

4
src/video/genericnetcamview.cpp
View File

@ -110,12 +110,12 @@ QSize GenericNetCamView::getSurfaceMinSize()
void GenericNetCamView::setShowMessages(bool show, bool notify) void GenericNetCamView::setShowMessages(bool show, bool notify)
{ {
if (!show) { if (!show) {
toggleMessagesButton->setText(tr("Hide Messages")); toggleMessagesButton->setText(tr("Hide messages"));
toggleMessagesButton->setIcon(QIcon()); toggleMessagesButton->setIcon(QIcon());
return; return;
} }
toggleMessagesButton->setText(tr("Show Messages")); toggleMessagesButton->setText(tr("Show messages"));
if (notify) { if (notify) {
toggleMessagesButton->setIcon(QIcon(Style::getImagePath("chatArea/info.svg"))); toggleMessagesButton->setIcon(QIcon(Style::getImagePath("chatArea/info.svg")));

4
src/widget/about/aboutfriendform.cpp
View File

@ -73,7 +73,7 @@ AboutFriendForm::AboutFriendForm(std::unique_ptr<IAboutFriend> _about, QWidget*
static QString getAutoAcceptDir(const QString& dir) static QString getAutoAcceptDir(const QString& dir)
{ {
//: popup title //: popup title
const QString title = AboutFriendForm::tr("Choose an auto accept directory"); const QString title = AboutFriendForm::tr("Choose an auto-accept directory");
return QFileDialog::getExistingDirectory(Q_NULLPTR, title, dir); return QFileDialog::getExistingDirectory(Q_NULLPTR, title, dir);
} }
@ -95,7 +95,7 @@ void AboutFriendForm::onAutoAcceptDirChanged(const QString& path)
const bool enabled = path.isNull(); const bool enabled = path.isNull();
ui->autoacceptfile->setChecked(enabled); ui->autoacceptfile->setChecked(enabled);
ui->selectSaveDir->setEnabled(enabled); ui->selectSaveDir->setEnabled(enabled);
ui->selectSaveDir->setText(enabled ? path : tr("Auto accept for this contact is disabled")); ui->selectSaveDir->setText(enabled ? path : tr("Auto-accept for this contact is disabled"));
} }

10
src/widget/about/aboutfriendform.ui
View File

@ -173,7 +173,7 @@
<string>Automatically accept files from contact if set</string> <string>Automatically accept files from contact if set</string>
</property> </property>
<property name="text"> <property name="text">
<string>Auto accept files</string> <string>Auto-accept files</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -187,7 +187,7 @@
<item row="8" column="1"> <item row="8" column="1">
<widget class="QPushButton" name="selectSaveDir"> <widget class="QPushButton" name="selectSaveDir">
<property name="text"> <property name="text">
<string>Auto accept for this contact is disabled</string> <string>Auto-accept for this contact is disabled</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -196,7 +196,7 @@
<item> <item>
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>Auto accept call:</string> <string>Auto-accept call:</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -227,7 +227,7 @@
<string>Automatically accept group chat invitations from this contact if set.</string> <string>Automatically accept group chat invitations from this contact if set.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Auto accept group invites</string> <string>Auto-accept group invites</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -255,7 +255,7 @@
<string/> <string/>
</property> </property>
<property name="placeholderText"> <property name="placeholderText">
<string>You can save comment about this contact here.</string> <string>You can save comments about this contact here.</string>
</property> </property>
</widget> </widget>
</item> </item>

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

@ -220,7 +220,7 @@ void ChatForm::onFileNameChanged(const ToxPk& friendPk)
QMessageBox::warning(this, tr("Filename contained illegal characters"), QMessageBox::warning(this, tr("Filename contained illegal characters"),
tr("Illegal characters have been changed to _ \n" tr("Illegal characters have been changed to _ \n"
"so you can save the file on windows.")); "so you can save the file on Windows."));
} }
void ChatForm::onTextEditChanged() void ChatForm::onTextEditChanged()

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

@ -101,7 +101,7 @@ void FilesForm::onFileActivated(QListWidgetItem* item)
void FilesForm::retranslateUi() void FilesForm::retranslateUi()
{ {
headLabel.setText(tr("Transferred Files", "\"Headline\" of the window")); headLabel.setText(tr("Transferred files", "\"Headline\" of the window"));
main.setTabText(0, tr("Downloads")); main.setTabText(0, tr("Downloads"));
main.setTabText(1, tr("Uploads")); main.setTabText(1, tr("Uploads"));
} }

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

@ -783,7 +783,7 @@ void GenericChatForm::clearChatArea(bool confirm, bool inform)
if (confirm) { if (confirm) {
QMessageBox::StandardButton mboxResult = QMessageBox::StandardButton mboxResult =
QMessageBox::question(this, tr("Confirmation"), QMessageBox::question(this, tr("Confirmation"),
tr("You are sure that you want to clear all displayed messages?"), tr("Are you sure that you want to clear all displayed messages?"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No); QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
if (mboxResult == QMessageBox::No) { if (mboxResult == QMessageBox::No) {
return; return;

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

@ -77,7 +77,7 @@ LoadHistoryDialog::LoadType LoadHistoryDialog::getLoadType()
void LoadHistoryDialog::enableSearchMode() void LoadHistoryDialog::enableSearchMode()
{ {
setWindowTitle(tr("Select Date Dialog")); setWindowTitle(tr("Select date dialog"));
ui->fromLabel->setText(tr("Select a date")); ui->fromLabel->setText(tr("Select a date"));
ui->loadTypeComboBox->setVisible(false); ui->loadTypeComboBox->setVisible(false);
ui->infoLabel->setVisible(false); ui->infoLabel->setVisible(false);

2
src/widget/form/loadhistorydialog.ui
View File

@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Load History Dialog</string> <string>Load history dialog</string>
</property> </property>
<property name="modal"> <property name="modal">
<bool>true</bool> <bool>true</bool>

24
src/widget/form/profileform.cpp
View File

@ -79,23 +79,23 @@ static const QMap<IProfileInfo::RenameResult, QPair<QString, QString>> RENAME_ER
static const QMap<IProfileInfo::SaveResult, QPair<QString, QString>> SAVE_ERROR = { static const QMap<IProfileInfo::SaveResult, QPair<QString, QString>> SAVE_ERROR = {
{ IProfileInfo::SaveResult::NoWritePermission, { IProfileInfo::SaveResult::NoWritePermission,
{ ProfileForm::tr("Location not writable", "Title of permissions popup"), { ProfileForm::tr("Location not writable", "Title of permissions popup"),
ProfileForm::tr("You do not have permission to write that location. Choose " ProfileForm::tr("You do not have permission to write to that location. Choose "
"another, or cancel the save dialog.", "text of permissions popup") }, "another, or cancel the save dialog.", "text of permissions popup") },
}, },
{ IProfileInfo::SaveResult::Error, { IProfileInfo::SaveResult::Error,
{ ProfileForm::tr("Failed to copy file"), { ProfileForm::tr("Failed to save file"),
ProfileForm::tr("The file you chose could not be written to.") } ProfileForm::tr("The file you chose could not be saved.") }
}, },
{ IProfileInfo::SaveResult::EmptyPath, { IProfileInfo::SaveResult::EmptyPath,
{ ProfileForm::tr("Empty path"), { ProfileForm::tr("Empty path"),
ProfileForm::tr("Empty path is unavaliable") } ProfileForm::tr("Empty path is unavaliable.") }
}, },
}; };
static const QPair<QString, QString> CAN_NOT_CHANGE_PASSWORD = { static const QPair<QString, QString> CAN_NOT_CHANGE_PASSWORD = {
ProfileForm::tr("Couldn't change password"), ProfileForm::tr("Couldn't change password"),
ProfileForm::tr("Couldn't change password on the database, " ProfileForm::tr("Couldn't change database password, "
"it might be corrupted or use the old password.") "it may be corrupted or use the old password.")
}; };
ProfileForm::ProfileForm(IProfileInfo* profileInfo, QWidget* parent) ProfileForm::ProfileForm(IProfileInfo* profileInfo, QWidget* parent)
@ -378,7 +378,7 @@ void ProfileForm::onExportClicked()
void ProfileForm::onDeleteClicked() void ProfileForm::onDeleteClicked()
{ {
const QString title = tr("Really delete profile?", "deletion confirmation title"); const QString title = tr("Delete profile", "deletion confirmation title");
const QString question = tr("Are you sure you want to delete this profile?", const QString question = tr("Are you sure you want to delete this profile?",
"deletion confirmation text"); "deletion confirmation text");
if (!GUI::askQuestion(title, question)) { if (!GUI::askQuestion(title, question)) {
@ -449,9 +449,9 @@ void ProfileForm::onDeletePassClicked()
return; return;
} }
const QString title = tr("Really delete password?", "deletion confirmation title"); const QString title = tr("Remove password", "deletion confirmation title");
//: deletion confirmation text //: deletion confirmation text
const QString body = tr("Are you sure you want to delete your password?"); const QString body = tr("Are you sure you want to remove your password?");
if (!GUI::askQuestion(title, body)) { if (!GUI::askQuestion(title, body)) {
return; return;
} }
@ -481,8 +481,8 @@ void ProfileForm::retranslateUi()
setPasswordButtonsText(); setPasswordButtonsText();
// We have to add the toxId tooltip here and not in the .ui or Qt won't know how to translate it // We have to add the toxId tooltip here and not in the .ui or Qt won't know how to translate it
// dynamically // dynamically
toxId->setToolTip(tr("This bunch of characters tells other Tox clients how to contact " toxId->setToolTip(tr("This ID allows other Tox users to add and contact you.\n"
"you.\nShare it with your friends to communicate.\n\n" "Share it with your friends to begin chatting.\n\n"
"This ID includes the NoSpam code (in blue), and the checksum (in gray).")); "This ID includes the NoSpam code (in blue), and the checksum (in gray)."));
} }
@ -554,7 +554,7 @@ void ProfileForm::onRegisterButtonClicked()
break; break;
case ToxmeData::Ok: case ToxmeData::Ok:
GUI::showInfo(tr("Done!"), GUI::showInfo(tr("Done!"),
tr("Successfully added %1@%2 to the database. Save your password") tr("Successfully added %1@%2 to the database. Save your password.")
.arg(name, server)); .arg(name, server));
Settings::getInstance().setToxme(name, server, bio, privacy, response); Settings::getInstance().setToxme(name, server, bio, privacy, response);
showExistingToxme(); showExistingToxme();

6
src/widget/form/profileform.ui
View File

@ -138,7 +138,7 @@
<item> <item>
<widget class="QGroupBox" name="publicGroup"> <widget class="QGroupBox" name="publicGroup">
<property name="title"> <property name="title">
<string>Public Information</string> <string>Public information</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
@ -197,8 +197,8 @@
<item> <item>
<widget class="CroppingLabel" name="toxIdLabel"> <widget class="CroppingLabel" name="toxIdLabel">
<property name="toolTip"> <property name="toolTip">
<string comment="Tox ID tooltip">This bunch of characters tells other Tox clients how to contact you. <string comment="Tox ID tooltip">This ID allows other Tox users to add and contact you.
Share it with your friends to communicate.</string> Share it with your friends to begin chatting.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Your Tox ID (click to copy)</string> <string>Your Tox ID (click to copy)</string>

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

@ -63,7 +63,7 @@ void SetPasswordDialog::onPasswordEdit()
ui->body->setText(body); ui->body->setText(body);
} else if (pswd.length() < 6) { } else if (pswd.length() < 6) {
ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
ui->body->setText(body + tr("The password is too short")); ui->body->setText(body + tr("The password is too short."));
} else if (pswd != ui->repasswordlineEdit->text()) { } else if (pswd != ui->repasswordlineEdit->text()) {
ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
ui->body->setText(body + tr("The password doesn't match.")); ui->body->setText(body + tr("The password doesn't match."));

2
src/widget/form/settings/aboutform.cpp
View File

@ -111,7 +111,7 @@ void AboutForm::replaceVersions()
bodyUI->gitVersion->setText( bodyUI->gitVersion->setText(
tr("Commit hash: %1").arg(createLink(commitLink, QString(GIT_VERSION)))); tr("Commit hash: %1").arg(createLink(commitLink, QString(GIT_VERSION))));
bodyUI->toxCoreVersion->setText(tr("toxcore version: %1").arg(TOXCORE_VERSION)); bodyUI->toxCoreVersion->setText(tr("Toxcore version: %1").arg(TOXCORE_VERSION));
bodyUI->qtVersion->setText(tr("Qt version: %1").arg(QT_VERSION_STR)); bodyUI->qtVersion->setText(tr("Qt version: %1").arg(QT_VERSION_STR));
QString issueBody = QString("##### Brief Description\n\n" QString issueBody = QString("##### Brief Description\n\n"

2
src/widget/form/settings/aboutsettings.ui
View File

@ -360,7 +360,7 @@ p, li { white-space: pre-wrap; }
</size> </size>
</property> </property>
<property name="title"> <property name="title">
<string>Known Issues</string> <string>Known issues</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_8"> <layout class="QVBoxLayout" name="verticalLayout_8">
<item> <item>

2
src/widget/form/settings/advancedform.cpp
View File

@ -100,7 +100,7 @@ void AdvancedForm::on_cbMakeToxPortable_stateChanged()
void AdvancedForm::on_btnExportLog_clicked() void AdvancedForm::on_btnExportLog_clicked()
{ {
QString savefile = QString savefile =
QFileDialog::getSaveFileName(Q_NULLPTR, tr("Save File"), QString{}, tr("Logs (*.log)")); QFileDialog::getSaveFileName(Q_NULLPTR, tr("Save file"), QString{}, tr("Logs (*.log)"));
if (savefile.isNull() || savefile.isEmpty()) { if (savefile.isNull() || savefile.isEmpty()) {
qDebug() << "Debug log save file was not properly chosen"; qDebug() << "Debug log save file was not properly chosen";

6
src/widget/form/settings/advancedsettings.ui
View File

@ -83,7 +83,7 @@
<item> <item>
<widget class="QPushButton" name="btnCopyDebug"> <widget class="QPushButton" name="btnCopyDebug">
<property name="text"> <property name="text">
<string>Copy Debug Log</string> <string>Copy debug log</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -93,7 +93,7 @@
<item> <item>
<widget class="QGroupBox" name="connectionGroup"> <widget class="QGroupBox" name="connectionGroup">
<property name="title"> <property name="title">
<string>Connection Settings</string> <string>Connection settings</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@ -114,7 +114,7 @@
<item> <item>
<widget class="QCheckBox" name="cbEnableUDP"> <widget class="QCheckBox" name="cbEnableUDP">
<property name="toolTip"> <property name="toolTip">
<string extracomment="force tcp checkbox tooltip">Disabling this allows, e.g., toxing over Tor. It adds load to the Tox network however, so uncheck only when necessary.</string> <string extracomment="force tcp checkbox tooltip">Disabling this allows, e.g., Tox over Tor. It adds load to the Tox network however, so uncheck only when necessary.</string>
</property> </property>
<property name="text"> <property name="text">
<string extracomment="Text on checkbox to disable UDP">Enable UDP (recommended)</string> <string extracomment="Text on checkbox to disable UDP">Enable UDP (recommended)</string>

10
src/widget/form/settings/avform.ui
View File

@ -38,7 +38,7 @@
<item> <item>
<widget class="QGroupBox" name="audioGroup"> <widget class="QGroupBox" name="audioGroup">
<property name="title"> <property name="title">
<string>Audio Settings</string> <string>Audio settings</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<property name="bottomMargin"> <property name="bottomMargin">
@ -64,7 +64,7 @@
<item row="1" column="1"> <item row="1" column="1">
<widget class="QSlider" name="playbackSlider"> <widget class="QSlider" name="playbackSlider">
<property name="toolTip"> <property name="toolTip">
<string>Use slider to set volume of your speakers.</string> <string>Use slider to set the volume of your speakers.</string>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>100</number> <number>100</number>
@ -155,7 +155,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Transmitted audio quality. Lower this setting if your bandwidth is not high enough or if you want to lower the internet usage.</string> <string>Transmitted audio quality. Lower this setting if your bandwidth is not high enough or if you want to reduce bandwidth usage.</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -178,7 +178,7 @@
<item> <item>
<widget class="QGroupBox" name="videoGroup"> <widget class="QGroupBox" name="videoGroup">
<property name="title"> <property name="title">
<string>Video Settings</string> <string>Video settings</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
@ -215,7 +215,7 @@ which may lead to problems with video calls.</string>
<property name="toolTip"> <property name="toolTip">
<string>Set resolution of your camera. <string>Set resolution of your camera.
The higher values, the better video quality your friends may get. The higher values, the better video quality your friends may get.
Note though that with better video quality there is needed better internet connection. Note that with better video quality, you use more bandwidth.
Sometimes your connection may not be good enough to handle higher video quality, Sometimes your connection may not be good enough to handle higher video quality,
which may lead to problems with video calls.</string> which may lead to problems with video calls.</string>
</property> </property>

16
src/widget/form/settings/generalsettings.ui
View File

@ -104,7 +104,7 @@
<string>Start qTox on operating system startup (current profile).</string> <string>Start qTox on operating system startup (current profile).</string>
</property> </property>
<property name="text"> <property name="text">
<string>Autostart</string> <string>Auto-start</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -188,7 +188,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string comment="toolTip for minimize to tray setting">After pressing minimize (_) qTox will minimize itself to tray, <string comment="toolTip for minimize to tray setting">After pressing minimize (_) qTox will minimize to tray,
instead of system taskbar.</string> instead of system taskbar.</string>
</property> </property>
<property name="text"> <property name="text">
@ -205,8 +205,8 @@ instead of system taskbar.</string>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string comment="toolTip for close to tray setting">After pressing close (X) qTox will minimize to tray, <string comment="toolTip for close to tray setting">After pressing close (X) qTox will close to tray,
instead of closing itself.</string> instead of closing entirely.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Close to tray</string> <string>Close to tray</string>
@ -235,7 +235,7 @@ instead of closing itself.</string>
<enum>Qt::LeftToRight</enum> <enum>Qt::LeftToRight</enum>
</property> </property>
<property name="text"> <property name="text">
<string>Auto away after (0 to disable):</string> <string>Auto-away after (0 to disable):</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -300,17 +300,17 @@ instead of closing itself.</string>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string comment="autoaccept cb tooltip">You can set this on a per-friend basis by right clicking them.</string> <string comment="autoaccept cb tooltip">You can set this on a per-friend basis by right clicking individual friends.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Autoaccept files</string> <string>Auto-accept files</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="4" column="0">
<widget class="QLabel" name="maxAutoAcceptSizeLabel"> <widget class="QLabel" name="maxAutoAcceptSizeLabel">
<property name="text"> <property name="text">
<string>Max autoaccept file size (0 to disable):</string> <string>Max auto-accept file size (0 to disable):</string>
</property> </property>
</widget> </widget>
</item> </item>

4
src/widget/form/settings/privacysettings.ui
View File

@ -123,13 +123,13 @@ If you are getting spammed with friend requests, change the NoSpam.</string>
<string/> <string/>
</property> </property>
<property name="title"> <property name="title">
<string>BlackList</string> <string>Blacklist</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<widget class="QTextEdit" name="blackListTextEdit"> <widget class="QTextEdit" name="blackListTextEdit">
<property name="toolTip"> <property name="toolTip">
<string>Filter group message by group member's public key. Put public key here, one per line.</string> <string>Filter group messages by group members' public keys. Put public keys here, one per line.</string>
</property> </property>
</widget> </widget>
</item> </item>

2
src/widget/form/settings/userinterfaceform.h
View File

@ -37,7 +37,7 @@ public:
~UserInterfaceForm(); ~UserInterfaceForm();
virtual QString getFormName() final override virtual QString getFormName() final override
{ {
return tr("User Interface"); return tr("User interface");
} }
private slots: private slots:

14
src/widget/form/settings/userinterfacesettings.ui
View File

@ -111,7 +111,7 @@
<string>New text styling preference may not load until qTox restarts.</string> <string>New text styling preference may not load until qTox restarts.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Text Style format:</string> <string>Text style format:</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@ -152,7 +152,7 @@
<item row="2" column="1"> <item row="2" column="1">
<widget class="QCheckBox" name="useNameColors"> <widget class="QCheckBox" name="useNameColors">
<property name="text"> <property name="text">
<string>Use colored nicknames in chats</string> <string>Use colored nicknames in group chats</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -186,7 +186,7 @@
<item> <item>
<widget class="QCheckBox" name="groupOnlyNotfiyWhenMentioned"> <widget class="QCheckBox" name="groupOnlyNotfiyWhenMentioned">
<property name="toolTip"> <property name="toolTip">
<string comment="toolTip for Group chats only notify when mentioned">Onlys notify about new messages in groupchats when mentioned.</string> <string comment="toolTip for Group chats only notify when mentioned">Only notify about new messages in group chats when mentioned.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Group chats only notify when mentioned</string> <string>Group chats only notify when mentioned</string>
@ -252,7 +252,7 @@
<item> <item>
<widget class="QCheckBox" name="cbGroupchatPosition"> <widget class="QCheckBox" name="cbGroupchatPosition">
<property name="toolTip"> <property name="toolTip">
<string comment="toolTip for groupchat positioning">If checked, groupchats will be placed at the top of the friends list, otherwise, they'll be placed below online friends.</string> <string comment="toolTip for groupchat positioning">If checked, group chats will be placed at the top of the friends list, otherwise, they'll be placed below online friends.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Place groupchats at top of friend list</string> <string>Place groupchats at top of friend list</string>
@ -302,7 +302,7 @@
<item> <item>
<widget class="QCheckBox" name="cbShowIdenticons"> <widget class="QCheckBox" name="cbShowIdenticons">
<property name="toolTip"> <property name="toolTip">
<string comment="toolTip for show identicons">If enabled every contact without an avatar set will have a generated avatar based on their Tox ID instead of a default picture. Requires restart to apply.</string> <string comment="toolTip for show identicons">If enabled, every contact without an avatar will have a generated icon based on their Tox ID instead of the default picture. Requires restart to apply.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Use identicons instead of empty avatars</string> <string>Use identicons instead of empty avatars</string>
@ -328,7 +328,7 @@
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="smileyPackLabel"> <widget class="QLabel" name="smileyPackLabel">
<property name="text"> <property name="text">
<string extracomment="Text on smiley pack label">Smiley Pack:</string> <string extracomment="Text on smiley pack label">Smiley pack:</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -532,7 +532,7 @@
<item> <item>
<widget class="QLabel" name="timeExample"> <widget class="QLabel" name="timeExample">
<property name="text"> <property name="text">
<string notr="true">Time Example</string> <string notr="true">Time example</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

2
src/widget/friendlistwidget.cpp
View File

@ -209,7 +209,7 @@ void FriendListWidget::sortByMode(SortingMode mode)
{ Time::Yesterday, tr("Yesterday", COMMENT) }, { Time::Yesterday, tr("Yesterday", COMMENT) },
{ Time::ThisWeek, tr("Last 7 days", COMMENT) }, { Time::ThisWeek, tr("Last 7 days", COMMENT) },
{ Time::ThisMonth, tr("This month", COMMENT) }, { Time::ThisMonth, tr("This month", COMMENT) },
{ Time::LongAgo, tr("Older than 6 Months", COMMENT) }, { Time::LongAgo, tr("Older than 6 months", COMMENT) },
{ Time::Never, tr("Never", COMMENT) }, { Time::Never, tr("Never", COMMENT) },
{ Time::Month1Ago, ql.monthName(today.addMonths(-1).month()) }, { Time::Month1Ago, ql.monthName(today.addMonths(-1).month()) },
{ Time::Month2Ago, ql.monthName(today.addMonths(-2).month()) }, { Time::Month2Ago, ql.monthName(today.addMonths(-2).month()) },

4
src/widget/friendwidget.cpp
View File

@ -146,7 +146,7 @@ void FriendWidget::onContextMenuCalled(QContextMenuEvent* event)
circleMenu->addSeparator(); circleMenu->addSeparator();
for (const auto circle : chatroom->getOtherCircles()) { for (const auto circle : chatroom->getOtherCircles()) {
QAction* action = new QAction(tr("Move to circle \"%1\"").arg(circle.name), circleMenu); QAction* action = new QAction(tr("Move to circle \"%1\"").arg(circle.name), circleMenu);
connect(action, &QAction::triggered, [=]() { moveToCircle(circle.circleId); }); connect(action, &QAction::triggered, [=]() { moveToCircle(circle.circleId); });
circleMenu->addAction(action); circleMenu->addAction(action);
} }
@ -165,7 +165,7 @@ void FriendWidget::onContextMenuCalled(QContextMenuEvent* event)
if (chatroom->friendCanBeRemoved()) { if (chatroom->friendCanBeRemoved()) {
const auto friendPk = chatroom->getFriend()->getPublicKey(); const auto friendPk = chatroom->getFriend()->getPublicKey();
const auto removeAction = const auto removeAction =
menu.addAction(tr("Remove friend", "Menu to remove the friend from our friendlist")); menu.addAction(tr("Remove friend", "Menu to remove the friend from the friend list"));
connect(removeAction, &QAction::triggered, this, [=]() { emit removeFriend(friendPk); }, connect(removeAction, &QAction::triggered, this, [=]() { emit removeFriend(friendPk); },
Qt::QueuedConnection); Qt::QueuedConnection);
} }

2
src/widget/loginscreen.cpp
View File

@ -170,7 +170,7 @@ void LoginScreen::onCreateNewProfile()
if (ui->newPassConfirm->text() != pass) { if (ui->newPassConfirm->text() != pass) {
QMessageBox::critical(this, tr("Couldn't create a new profile"), QMessageBox::critical(this, tr("Couldn't create a new profile"),
tr("The passwords you've entered are different.\nPlease make sure to " tr("The passwords you've entered are different.\nPlease make sure to "
"enter same password twice.")); "enter the same password twice."));
return; return;
} }

2
src/widget/tool/friendrequestdialog.cpp
View File

@ -34,7 +34,7 @@ FriendRequestDialog::FriendRequestDialog(QWidget* parent, const QString& userId,
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
setWindowTitle(tr("Friend request", "Title of the window to aceept/deny a friend request")); setWindowTitle(tr("Friend request", "Title of the window to aceept/deny a friend request"));
QLabel* friendsLabel = new QLabel(tr("Someone wants to make friends with you"), this); QLabel* friendsLabel = new QLabel(tr("Someone wants to add you as a friend"), this);
QLabel* userIdLabel = new QLabel(tr("User ID:"), this); QLabel* userIdLabel = new QLabel(tr("User ID:"), this);
QLineEdit* userIdEdit = new QLineEdit(userId, this); QLineEdit* userIdEdit = new QLineEdit(userId, this);
userIdEdit->setCursorPosition(0); userIdEdit->setCursorPosition(0);

32
src/widget/widget.cpp
View File

@ -712,7 +712,7 @@ void Widget::onFailedToStartCore()
{ {
QMessageBox critical(this); QMessageBox critical(this);
critical.setText(tr( critical.setText(tr(
"toxcore failed to start, the application will terminate after you close this message.")); "Toxcore failed to start, the application will terminate after you close this message."));
critical.setIcon(QMessageBox::Critical); critical.setIcon(QMessageBox::Critical);
critical.exec(); critical.exec();
qApp->exit(EXIT_FAILURE); qApp->exit(EXIT_FAILURE);
@ -722,7 +722,7 @@ void Widget::onBadProxyCore()
{ {
settings.setProxyType(Settings::ProxyType::ptNone); settings.setProxyType(Settings::ProxyType::ptNone);
QMessageBox critical(this); QMessageBox critical(this);
critical.setText(tr("toxcore failed to start with your proxy settings. " critical.setText(tr("Toxcore failed to start with your proxy settings. "
"qTox cannot run; please modify your " "qTox cannot run; please modify your "
"settings and restart.", "settings and restart.",
"popup text")); "popup text"));
@ -1213,7 +1213,7 @@ void Widget::addFriend(uint32_t friendId, const ToxPk& friendPk)
void Widget::addFriendFailed(const ToxPk&, const QString& errorInfo) void Widget::addFriendFailed(const ToxPk&, const QString& errorInfo)
{ {
QString info = QString(tr("Couldn't request friendship")); QString info = QString(tr("Couldn't send friend request"));
if (!errorInfo.isEmpty()) { if (!errorInfo.isEmpty()) {
info = info + QStringLiteral(": ") + errorInfo; info = info + QStringLiteral(": ") + errorInfo;
} }
@ -2586,7 +2586,7 @@ void Widget::friendRequestsUpdate()
} }
if (friendRequestsButton) { if (friendRequestsButton) {
friendRequestsButton->setText(tr("%n New Friend Request(s)", "", unreadFriendRequests)); friendRequestsButton->setText(tr("%n new friend request(s)", "", unreadFriendRequests));
} }
} }
@ -2604,7 +2604,7 @@ void Widget::groupInvitesUpdate()
} }
if (groupInvitesButton) { if (groupInvitesButton) {
groupInvitesButton->setText(tr("%n New Group Invite(s)", "", unreadGroupInvites)); groupInvitesButton->setText(tr("%n new group invite(s)", "", unreadGroupInvites));
} }
} }
@ -2632,22 +2632,22 @@ void Widget::retranslateUi()
setUsername(core->getUsername()); setUsername(core->getUsername());
setStatusMessage(core->getStatusMessage()); setStatusMessage(core->getStatusMessage());
filterDisplayName->setText(tr("By Name")); filterDisplayName->setText(tr("By name"));
filterDisplayActivity->setText(tr("By Activity")); filterDisplayActivity->setText(tr("By activity"));
filterAllAction->setText(tr("All")); filterAllAction->setText(tr("All"));
filterOnlineAction->setText(tr("Online")); filterOnlineAction->setText(tr("Online"));
filterOfflineAction->setText(tr("Offline")); filterOfflineAction->setText(tr("Offline"));
filterFriendsAction->setText(tr("Friends")); filterFriendsAction->setText(tr("Friends"));
filterGroupsAction->setText(tr("Groups")); filterGroupsAction->setText(tr("Groups"));
ui->searchContactText->setPlaceholderText(tr("Search Contacts")); ui->searchContactText->setPlaceholderText(tr("Search contacts"));
updateFilterText(); updateFilterText();
ui->searchContactText->setPlaceholderText(tr("Search Contacts")); ui->searchContactText->setPlaceholderText(tr("Search contacts"));
statusOnline->setText(tr("Online", "Button to set your status to 'Online'")); statusOnline->setText(tr("Online", "Button to set your status to 'Online'"));
statusAway->setText(tr("Away", "Button to set your status to 'Away'")); statusAway->setText(tr("Away", "Button to set your status to 'Away'"));
statusBusy->setText(tr("Busy", "Button to set your status to 'Busy'")); statusBusy->setText(tr("Busy", "Button to set your status to 'Busy'"));
actionLogout->setText(tr("Logout", "Tray action menu to logout user")); actionLogout->setText(tr("Logout", "Tray action menu to logout user"));
actionQuit->setText(tr("Exit", "Tray action menu to exit tox")); actionQuit->setText(tr("Exit", "Tray action menu to exit Tox"));
actionShow->setText(tr("Show", "Tray action menu to show qTox window")); actionShow->setText(tr("Show", "Tray action menu to show qTox window"));
if (!settings.getSeparateWindow() && (settingsWidget && settingsWidget->isShown())) { if (!settings.getSeparateWindow() && (settingsWidget && settingsWidget->isShown())) {
@ -2666,12 +2666,12 @@ void Widget::retranslateUi()
fileMenu->setText(tr("File")); fileMenu->setText(tr("File"));
editMenu->setText(tr("Edit")); editMenu->setText(tr("Edit"));
contactMenu->setText(tr("Contacts")); contactMenu->setText(tr("Contacts"));
changeStatusMenu->menuAction()->setText(tr("Change Status")); changeStatusMenu->menuAction()->setText(tr("Change status"));
editProfileAction->setText(tr("Edit Profile")); editProfileAction->setText(tr("Edit profile"));
logoutAction->setText(tr("Log out")); logoutAction->setText(tr("Logout"));
addContactAction->setText(tr("Add Contact...")); addContactAction->setText(tr("Add contact..."));
nextConversationAction->setText(tr("Next Conversation")); nextConversationAction->setText(tr("Next conversation"));
previousConversationAction->setText(tr("Previous Conversation")); previousConversationAction->setText(tr("Previous conversation"));
#endif #endif
} }