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

chat logs -> chat history, miscellaneous rewordings

Browse Source
This commit is contained in:
Dubslow 2015-02-03 11:58:37 -06:00
parent a572ccff27
commit e2fd298d68
No known key found for this signature in database
GPG Key ID: 3DB8E05315C220AA
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/coreencryption.cpp
View File

@ -180,7 +180,7 @@ bool Core::loadEncryptedSave(QByteArray& data)
Settings::getInstance().setEncryptTox(true); Settings::getInstance().setEncryptTox(true);
return 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 else
dialogtxt = a; dialogtxt = a;
@ -216,14 +216,14 @@ void Core::checkEncryptedHistory()
QByteArray salt = getSaltFromFile(path); QByteArray salt = getSaltFromFile(path);
if (exists && salt.size() == 0) if (exists && salt.size() == 0)
{ // maybe we should handle this better { // 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().setEncryptLogs(false);
Settings::getInstance().setEnableLogging(false); Settings::getInstance().setEnableLogging(false);
HistoryKeeper::resetInstance(); HistoryKeeper::resetInstance();
return; 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 b(tr("The previous password is incorrect; please try again:", "used on retries in load()"));
QString dialogtxt; QString dialogtxt;
@ -231,7 +231,7 @@ void Core::checkEncryptedHistory()
{ {
if (!exists || HistoryKeeper::checkPassword()) if (!exists || HistoryKeeper::checkPassword())
return; 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 else
dialogtxt = a; dialogtxt = a;
@ -241,7 +241,7 @@ void Core::checkEncryptedHistory()
useOtherPassword(ptHistory); useOtherPassword(ptHistory);
if (!exists || HistoryKeeper::checkPassword()) if (!exists || HistoryKeeper::checkPassword())
{ {
qDebug() << "Core: using main password for history"; qDebug() << "Core: using main password for chat history";
return; return;
} }
clearPassword(ptHistory); clearPassword(ptHistory);
@ -250,7 +250,7 @@ void Core::checkEncryptedHistory()
bool error = true; bool error = true;
do do
{ {
QString pw = Widget::getInstance()->passwordDialog(tr("Disable history"), dialogtxt); QString pw = Widget::getInstance()->passwordDialog(tr("Disable chat history"), dialogtxt);
if (pw.isEmpty()) if (pw.isEmpty())
{ {

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

@ -77,7 +77,7 @@ ChatForm::ChatForm(Friend* chatFriend)
headTextLayout->addWidget(callDuration, 1, Qt::AlignCenter); headTextLayout->addWidget(callDuration, 1, Qt::AlignCenter);
callDuration->hide(); 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(Core::getInstance(), &Core::fileSendStarted, this, &ChatForm::startFileSend);
connect(sendButton, &QPushButton::clicked, this, &ChatForm::onSendTriggered); connect(sendButton, &QPushButton::clicked, this, &ChatForm::onSendTriggered);

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

@ -65,7 +65,7 @@
<item alignment="Qt::AlignTop"> <item alignment="Qt::AlignTop">
<widget class="QGroupBox" name="historyGroup"> <widget class="QGroupBox" name="historyGroup">
<property name="title"> <property name="title">
<string>History</string> <string>Chat history</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
<item> <item>

12
src/widget/form/settings/privacyform.cpp
View File

@ -68,7 +68,7 @@ bool PrivacyForm::setChatLogsPassword()
{ {
Core* core = Core::getInstance(); Core* core = Core::getInstance();
SetPasswordDialog* dialog; 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)) if (core->isPasswordSet(Core::ptMain))
dialog = new SetPasswordDialog(body, tr("Use data file password", "pushbutton text"), this); dialog = new SetPasswordDialog(body, tr("Use data file password", "pushbutton text"), this);
else else
@ -105,7 +105,7 @@ bool PrivacyForm::setChatLogsPassword()
} }
else 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 haveEncHist = false; // logically this is really just a `break`, but conceptually this is more accurate
} }
} while (haveEncHist); } while (haveEncHist);
@ -134,8 +134,8 @@ void PrivacyForm::onEncryptLogsUpdated()
{ {
QMessageBox::StandardButton button = QMessageBox::warning( QMessageBox::StandardButton button = QMessageBox::warning(
Widget::getInstance(), Widget::getInstance(),
tr("Old encrypted chat logs", "title"), tr("Old encrypted chat history", "title"),
tr("Would you like to decrypt your chat logs?\nOtherwise they will be deleted."), tr("Would you like to decrypt your chat history?\nOtherwise it will be deleted."),
QMessageBox::Ok | QMessageBox::No | QMessageBox::Cancel, QMessageBox::Ok | QMessageBox::No | QMessageBox::Cancel,
QMessageBox::Cancel QMessageBox::Cancel
); );
@ -151,7 +151,7 @@ void PrivacyForm::onEncryptLogsUpdated()
{ {
if (QMessageBox::critical( if (QMessageBox::critical(
Widget::getInstance(), 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?"), tr("Are you sure you want to lose your entire chat history?"),
QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Yes | QMessageBox::Cancel,
QMessageBox::Cancel QMessageBox::Cancel
@ -186,7 +186,7 @@ bool PrivacyForm::setToxPassword()
SetPasswordDialog* dialog; SetPasswordDialog* dialog;
QString body = tr("Please set your new data file password."); QString body = tr("Please set your new data file password.");
if (core->isPasswordSet(Core::ptHistory)) 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 else
dialog = new SetPasswordDialog(body, QString(), this); dialog = new SetPasswordDialog(body, QString(), this);

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

@ -54,11 +54,11 @@
<item> <item>
<widget class="QCheckBox" name="cbKeepHistory"> <widget class="QCheckBox" name="cbKeepHistory">
<property name="toolTip"> <property name="toolTip">
<string comment="toolTip for Keep History setting">History keeping is still in development. <string comment="toolTip for Keep History setting">Chat history keeping is still in development.
Save format changes are possible, which may result in data loss.</string> Save format changes are possible, which may result in data loss.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Keep chat logs (mostly stable)</string> <string>Keep chat history (mostly stable)</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -74,7 +74,7 @@ Save format changes are possible, which may result in data loss.</string>
<item> <item>
<widget class="QLabel" name="encryptStatement"> <widget class="QLabel" name="encryptStatement">
<property name="text"> <property name="text">
<string>All internet communication is encrypted, and this cannot be disabled. However, you may optionally password protect your local Tox files.</string> <string>All Tox communications over the internet are encrypted, and this cannot be disabled. However, you may optionally password protect your local Tox files.</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
@ -110,7 +110,7 @@ Save format changes are possible, which may result in data loss.</string>
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text"> <property name="text">
<string>Encrypt chat logs</string> <string>Encrypt chat history</string>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>