diff --git a/SandboxiePlus/SandMan/SandMan.cpp b/SandboxiePlus/SandMan/SandMan.cpp index da1176d2..a2a75e1a 100644 --- a/SandboxiePlus/SandMan/SandMan.cpp +++ b/SandboxiePlus/SandMan/SandMan.cpp @@ -1094,7 +1094,7 @@ void CSandMan::closeEvent(QCloseEvent *e) if (PortableStop == 1) { SB_RESULT(void*) Status = StopSbie(true); - // don't care for Status we quit here anyways + // don't care for Status we quit here anyway } } @@ -2790,8 +2790,8 @@ void CSandMan::OnEditIni() if (theConf->GetBool("Options/NoEditWarn", true)) { bool State = false; CCheckableMessageBox::question(this, "Sandboxie-Plus", - tr("You are about to edit the Templates.ini, thsi is generally not recommeded.\n" - "This file is part of Sandboxie and all changed done to it will be reverted next time Sandboxie is updated.") + tr("You are about to edit the Templates.ini, this is generally not recommended.\n" + "This file is part of Sandboxie and all change done to it will be reverted next time Sandboxie is updated.") , tr("Don't show this message again."), &State, QDialogButtonBox::Ok, QDialogButtonBox::Ok, QMessageBox::Warning); if (State) diff --git a/SandboxiePlus/SandMan/SandManRecovery.cpp b/SandboxiePlus/SandMan/SandManRecovery.cpp index 783d46f3..662075d3 100644 --- a/SandboxiePlus/SandMan/SandManRecovery.cpp +++ b/SandboxiePlus/SandMan/SandManRecovery.cpp @@ -170,7 +170,7 @@ void CSandMan::RecoverFilesAsync(const CSbieProgressPtr& pProgress, const QStrin int retVal = 0; QMetaObject::invokeMethod(theGUI, "ShowQuestion", Qt::BlockingQueuedConnection, // show this question using the GUI thread Q_RETURN_ARG(int, retVal), - Q_ARG(QString, tr("The file %1 failed a security check, do you want to recover it anyways?\r\n\r\n%2").arg(BoxPath).arg(Output)), + Q_ARG(QString, tr("The file %1 failed a security check, do you want to recover it anyway?\r\n\r\n%2").arg(BoxPath).arg(Output)), Q_ARG(QString, tr("Do this for all files!")), Q_ARG(bool*, &forAll), Q_ARG(int, QDialogButtonBox::Yes | QDialogButtonBox::No), diff --git a/SandboxiePlus/SandMan/Views/SbieView.cpp b/SandboxiePlus/SandMan/Views/SbieView.cpp index f3d7756a..44642b7a 100644 --- a/SandboxiePlus/SandMan/Views/SbieView.cpp +++ b/SandboxiePlus/SandMan/Views/SbieView.cpp @@ -1454,7 +1454,7 @@ void CSbieView::OnProcessAction(QAction* Action, const QList& return; bool State = false; - if(CCheckableMessageBox::question(this, "Sandboxie-Plus", tr("Do you want to %1 %2?").arg(((QAction*)sender())->text().toLower()).arg(Processes.count() == 1 ? Processes[0]->GetProcessName() : tr("the selected processes")) + if(CCheckableMessageBox::question(this, "Sandboxie-Plus", tr("Do you want to terminate %1?").arg(Processes.count() == 1 ? Processes[0]->GetProcessName() : tr("the selected processes")) , tr("Terminate without asking"), &State, QDialogButtonBox::Yes | QDialogButtonBox::No, QDialogButtonBox::Yes) != QDialogButtonBox::Yes) return; diff --git a/SandboxiePlus/SandMan/Wizards/NewBoxWizard.cpp b/SandboxiePlus/SandMan/Wizards/NewBoxWizard.cpp index f02a8f55..51b52cb5 100644 --- a/SandboxiePlus/SandMan/Wizards/NewBoxWizard.cpp +++ b/SandboxiePlus/SandMan/Wizards/NewBoxWizard.cpp @@ -123,9 +123,9 @@ SB_STATUS CNewBoxWizard::TryToCreateBox() if (theConf->GetBool("Options/WarnDeleteV2", true)) { bool State = false; CCheckableMessageBox::question(this, "Sandboxie-Plus", - tr("The new sandbox has been created using the new Virtualization Scheme Version 2, if you expirience any unecpected issues with this box," + tr("The new sandbox has been created using the new Virtualization Scheme Version 2, if you experience any unexpected issues with this box," " please switch to the Virtualization Scheme to Version 1 and report the issue," - " the option to change this preset can be found in the Box Options in the Box Structure groupe.") + " the option to change this preset can be found in the Box Options in the Box Structure group.") , tr("Don't show this message again."), &State, QDialogButtonBox::Ok, QDialogButtonBox::Ok, QMessageBox::Information); if (State) @@ -187,7 +187,7 @@ CBoxTypePage::CBoxTypePage(bool bAlowTemp, QWidget *parent) registerField("boxName", m_pBoxName); - layout->addWidget(new QLabel(tr("Sellect box type:")), row++, 0); + layout->addWidget(new QLabel(tr("Select box type:")), row++, 0); m_pBoxType = new QComboBox(); m_pBoxType->addItem(theGUI->GetBoxIcon(CSandBoxPlus::eHardenedPlus), tr("Hardened Sandbox with Data Protection"), (int)CSandBoxPlus::eHardenedPlus); @@ -284,8 +284,8 @@ bool CBoxTypePage::validatePage() CFilesPage::CFilesPage(QWidget *parent) : QWizardPage(parent) { - setTitle(tr("Sandbox location and behavioure")); - setSubTitle(tr("On this page the sandbox location and its behaviorue can be customized.\nYou can use %USER% to save each users sandbox to an own fodler.")); + setTitle(tr("Sandbox location and behavior")); + setSubTitle(tr("On this page the sandbox location and its behavior can be customized.\nYou can use %USER% to save each users sandbox to an own folder.")); int row = 0; QGridLayout *layout = new QGridLayout; @@ -384,17 +384,17 @@ bool CFilesPage::validatePage() wizard()->setField("boxLocation", ""); else { if (Location.mid(2).contains(QRegularExpression("[ <>:\"/\\|?*\\[\\]]"))){ - QMessageBox::critical(this, "Sandboxie-Plus", tr("The sellected box location is not a valid path.")); + QMessageBox::critical(this, "Sandboxie-Plus", tr("The selected box location is not a valid path.")); return false; } QDir Dir(Location); if (Dir.exists() && !Dir.entryList(QDir::NoDotAndDotDot | QDir::AllEntries).isEmpty()) { - if(QMessageBox::warning(this, "Sandboxie-Plus", tr("The sellected box location exists and is not empty, it is recomended to pick a new or empty folder. " + if(QMessageBox::warning(this, "Sandboxie-Plus", tr("The selected box location exists and is not empty, it is recommended to pick a new or empty folder. " "Are you sure you want to use an existing folder?"), QDialogButtonBox::Yes, QDialogButtonBox::No) != QDialogButtonBox::Yes) return false; } if (!QDir().exists(Location.left(3))) { - QMessageBox::critical(this, "Sandboxie-Plus", tr("The sellected box location not placed on a currently available drive.")); + QMessageBox::critical(this, "Sandboxie-Plus", tr("The selected box location not placed on a currently available drive.")); return false; } wizard()->setField("boxLocation", Location); @@ -432,8 +432,8 @@ CAdvancedPage::CAdvancedPage(QWidget *parent) layout->addWidget(pNetAccess, row++, 1, 1, 3); registerField("blockNetwork", pNetAccess); - m_pShareAccess = new QCheckBox(tr("Allow access to network files and fodlers")); - m_pShareAccess->setToolTip(tr("This option is not recomended for Hardened boxes")); + m_pShareAccess = new QCheckBox(tr("Allow access to network files and folders")); + m_pShareAccess->setToolTip(tr("This option is not recommended for Hardened boxes")); m_pShareAccess->setChecked(theConf->GetBool("BoxDefaults/ShareAccess", false)); layout->addWidget(m_pShareAccess, row++, 1, 1, 3); registerField("shareAccess", m_pShareAccess); @@ -449,7 +449,7 @@ CAdvancedPage::CAdvancedPage(QWidget *parent) registerField("fakeAdmin", pFakeAdmin); m_pMSIServer = new QCheckBox(tr("Allow MSIServer to run with a sandboxed system token")); - m_pMSIServer->setToolTip(tr("This option is not recomended for Hardened boxes")); + m_pMSIServer->setToolTip(tr("This option is not recommended for Hardened boxes")); m_pMSIServer->setChecked(theConf->GetBool("BoxDefaults/MsiExemptions", false)); layout->addWidget(m_pMSIServer, row++, 1, 1, 3); registerField("msiServer", m_pMSIServer); @@ -541,7 +541,7 @@ void CSummaryPage::initializePage() m_pSummary->append(tr("\nThis Sandbox will be saved to: %1").arg(Location)); if (field("autoRemove").toBool()) - m_pSummary->append(tr("\nThis box's content will be DISCARDED when its closed, and the box will be removed.")); + m_pSummary->append(tr("\nThis box's content will be DISCARDED when it's closed, and the box will be removed.")); else if (field("autoDelete").toBool()) m_pSummary->append(tr("\nThis box will DISCARD its content when its closed, its suitable only for temporary data.")); if (field("blockNetwork").toInt()) diff --git a/SandboxiePlus/version.h b/SandboxiePlus/version.h index bd410553..94f3ddc7 100644 --- a/SandboxiePlus/version.h +++ b/SandboxiePlus/version.h @@ -3,7 +3,7 @@ #define VERSION_MJR 1 #define VERSION_MIN 7 #define VERSION_REV 1 -#define VERSION_UPD 0 +#define VERSION_UPD 1 #ifndef STR #define STR2(X) #X