From e2fd298d68c6b793f8e0adaa7145c64454bd2184 Mon Sep 17 00:00:00 2001 From: Dubslow Date: Tue, 3 Feb 2015 11:58:37 -0600 Subject: [PATCH] chat logs -> chat history, miscellaneous rewordings --- src/coreencryption.cpp | 12 ++++++------ src/widget/form/chatform.cpp | 2 +- src/widget/form/settings/advancedsettings.ui | 2 +- src/widget/form/settings/privacyform.cpp | 12 ++++++------ src/widget/form/settings/privacysettings.ui | 8 ++++---- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/coreencryption.cpp b/src/coreencryption.cpp index 9821cac03..163a86fba 100644 --- a/src/coreencryption.cpp +++ b/src/coreencryption.cpp @@ -180,7 +180,7 @@ bool Core::loadEncryptedSave(QByteArray& data) Settings::getInstance().setEncryptTox(true); return true; } - dialogtxt = tr("The stored profile password failed. Please try another:", "used only when pw set before load() doesn't work"); + dialogtxt = tr("The profile password failed. Please try another?", "used only when pw set before load() doesn't work"); } else dialogtxt = a; @@ -216,14 +216,14 @@ void Core::checkEncryptedHistory() QByteArray salt = getSaltFromFile(path); if (exists && salt.size() == 0) { // maybe we should handle this better - Widget::getInstance()->showWarningMsgBox(tr("Encrypted History"), tr("No encrypted history file found, or it was corrupted.\nHistory will be disabled!")); + Widget::getInstance()->showWarningMsgBox(tr("Encrypted chat history"), tr("No encrypted chat history file found, or it was corrupted.\nHistory will be disabled!")); Settings::getInstance().setEncryptLogs(false); Settings::getInstance().setEnableLogging(false); HistoryKeeper::resetInstance(); return; } - QString a(tr("Please enter the password for the chat logs for the %1 profile.", "used in load() when no hist pw set").arg(Settings::getInstance().getCurrentProfile())); + QString a(tr("Please enter the password for the chat history for the %1 profile.", "used in load() when no hist pw set").arg(Settings::getInstance().getCurrentProfile())); QString b(tr("The previous password is incorrect; please try again:", "used on retries in load()")); QString dialogtxt; @@ -231,7 +231,7 @@ void Core::checkEncryptedHistory() { if (!exists || HistoryKeeper::checkPassword()) return; - dialogtxt = tr("The stored chat log password failed. Please try another:", "used only when pw set before load() doesn't work"); + dialogtxt = tr("The chat history password failed. Please try another?", "used only when pw set before load() doesn't work"); } else dialogtxt = a; @@ -241,7 +241,7 @@ void Core::checkEncryptedHistory() useOtherPassword(ptHistory); if (!exists || HistoryKeeper::checkPassword()) { - qDebug() << "Core: using main password for history"; + qDebug() << "Core: using main password for chat history"; return; } clearPassword(ptHistory); @@ -250,7 +250,7 @@ void Core::checkEncryptedHistory() bool error = true; do { - QString pw = Widget::getInstance()->passwordDialog(tr("Disable history"), dialogtxt); + QString pw = Widget::getInstance()->passwordDialog(tr("Disable chat history"), dialogtxt); if (pw.isEmpty()) { diff --git a/src/widget/form/chatform.cpp b/src/widget/form/chatform.cpp index 6ad2f5e57..86c9cce03 100644 --- a/src/widget/form/chatform.cpp +++ b/src/widget/form/chatform.cpp @@ -77,7 +77,7 @@ ChatForm::ChatForm(Friend* chatFriend) headTextLayout->addWidget(callDuration, 1, Qt::AlignCenter); callDuration->hide(); - menu.addAction(tr("Load History..."), this, SLOT(onLoadHistory())); + menu.addAction(tr("Load chat history..."), this, SLOT(onLoadHistory())); connect(Core::getInstance(), &Core::fileSendStarted, this, &ChatForm::startFileSend); connect(sendButton, &QPushButton::clicked, this, &ChatForm::onSendTriggered); diff --git a/src/widget/form/settings/advancedsettings.ui b/src/widget/form/settings/advancedsettings.ui index d4213713c..753eb4ed0 100644 --- a/src/widget/form/settings/advancedsettings.ui +++ b/src/widget/form/settings/advancedsettings.ui @@ -65,7 +65,7 @@ - History + Chat history diff --git a/src/widget/form/settings/privacyform.cpp b/src/widget/form/settings/privacyform.cpp index c11e7e67e..c84512291 100644 --- a/src/widget/form/settings/privacyform.cpp +++ b/src/widget/form/settings/privacyform.cpp @@ -68,7 +68,7 @@ bool PrivacyForm::setChatLogsPassword() { Core* core = Core::getInstance(); SetPasswordDialog* dialog; - QString body = tr("Please set your new chat log password."); + QString body = tr("Please set your new chat history password."); if (core->isPasswordSet(Core::ptMain)) dialog = new SetPasswordDialog(body, tr("Use data file password", "pushbutton text"), this); else @@ -105,7 +105,7 @@ bool PrivacyForm::setChatLogsPassword() } else { - if (!Widget::getInstance()->askQuestion(tr("Old encrypted chat log", "popup title"), tr("There is currently an unused encrypted chat log, but the password you just entered doesn't match.\nWould you like to try again?"))) + if (!Widget::getInstance()->askQuestion(tr("Old encrypted chat history", "popup title"), tr("There is currently an unused encrypted chat history, but the password you just entered doesn't match.\nWould you like to try again?", "This happens when enabling encryption after previously \"Disabling History\""))) haveEncHist = false; // logically this is really just a `break`, but conceptually this is more accurate } } while (haveEncHist); @@ -134,8 +134,8 @@ void PrivacyForm::onEncryptLogsUpdated() { QMessageBox::StandardButton button = QMessageBox::warning( Widget::getInstance(), - tr("Old encrypted chat logs", "title"), - tr("Would you like to decrypt your chat logs?\nOtherwise they will be deleted."), + tr("Old encrypted chat history", "title"), + tr("Would you like to decrypt your chat history?\nOtherwise it will be deleted."), QMessageBox::Ok | QMessageBox::No | QMessageBox::Cancel, QMessageBox::Cancel ); @@ -151,7 +151,7 @@ void PrivacyForm::onEncryptLogsUpdated() { if (QMessageBox::critical( Widget::getInstance(), - tr("Old encrypted chat logs", "title"), + tr("Old encrypted chat history", "title"), tr("Are you sure you want to lose your entire chat history?"), QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel @@ -186,7 +186,7 @@ bool PrivacyForm::setToxPassword() SetPasswordDialog* dialog; QString body = tr("Please set your new data file password."); if (core->isPasswordSet(Core::ptHistory)) - dialog = new SetPasswordDialog(body, tr("Use chat log password", "pushbutton text"), this); + dialog = new SetPasswordDialog(body, tr("Use chat history password", "pushbutton text"), this); else dialog = new SetPasswordDialog(body, QString(), this); diff --git a/src/widget/form/settings/privacysettings.ui b/src/widget/form/settings/privacysettings.ui index 8d332e561..9d0558e52 100644 --- a/src/widget/form/settings/privacysettings.ui +++ b/src/widget/form/settings/privacysettings.ui @@ -54,11 +54,11 @@ - History keeping is still in development. + Chat history keeping is still in development. Save format changes are possible, which may result in data loss. - Keep chat logs (mostly stable) + Keep chat history (mostly stable) @@ -74,7 +74,7 @@ Save format changes are possible, which may result in data loss. - All internet communication is encrypted, and this cannot be disabled. However, you may optionally password protect your local Tox files. + All Tox communications over the internet are encrypted, and this cannot be disabled. However, you may optionally password protect your local Tox files. true @@ -110,7 +110,7 @@ Save format changes are possible, which may result in data loss. true - Encrypt chat logs + Encrypt chat history true