[education/rkward] rkward: Fix minor typos
Yuri Chornoivan
null at kde.org
Thu Mar 10 07:48:36 GMT 2022
Git commit 273b00dd6e74d585f867446fa042b9b0169dafd9 by Yuri Chornoivan.
Committed on 10/03/2022 at 07:48.
Pushed by yurchor into branch 'master'.
Fix minor typos
M +1 -1 rkward/agents/rksaveagent.cpp
M +5 -5 rkward/misc/rkoutputdirectory.cpp
M +3 -3 rkward/rbackend/rkrinterface.cpp
M +1 -1 rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp
M +1 -1 rkward/rkward.cpp
https://invent.kde.org/education/rkward/commit/273b00dd6e74d585f867446fa042b9b0169dafd9
diff --git a/rkward/agents/rksaveagent.cpp b/rkward/agents/rksaveagent.cpp
index b9b8e0e3..0e953a37 100644
--- a/rkward/agents/rksaveagent.cpp
+++ b/rkward/agents/rksaveagent.cpp
@@ -98,7 +98,7 @@ bool RKSaveAgent::saveWorkspace(const QUrl& _url) {
control.doModal(false);
RKGlobals::rInterface()->closeChain(save_chain);
- if (!success) KMessageBox::error(RKWardMainWindow::getMain(), i18n("Save failed"), i18n("An error occured while trying to save the workspace. You data was <b>not</b> saved."));
+ if (!success) KMessageBox::error(RKWardMainWindow::getMain(), i18n("Save failed"), i18n("An error occurred while trying to save the workspace. You data was <b>not</b> saved."));
RKWorkplace::mainWorkplace()->setWorkspaceURL(url, true);
return success;
diff --git a/rkward/misc/rkoutputdirectory.cpp b/rkward/misc/rkoutputdirectory.cpp
index f5acab02..469a5f4c 100644
--- a/rkward/misc/rkoutputdirectory.cpp
+++ b/rkward/misc/rkoutputdirectory.cpp
@@ -153,7 +153,7 @@ GenericRRequestResult RKOutputDirectory::exportAs (const QString& _dest, RKOutpu
dialog.setOption(QFileDialog::DontConfirmOverwrite, true); // custom handling below
if (dialog.exec () != QDialog::Accepted) {
- return GenericRRequestResult::makeError(i18n("File selection cancelled"));
+ return GenericRRequestResult::makeError(i18n("File selection canceled"));
}
dest = QDir::cleanPath(dialog.selectedFiles().value(0));
@@ -165,7 +165,7 @@ GenericRRequestResult RKOutputDirectory::exportAs (const QString& _dest, RKOutpu
const QString warning = i18n("Are you sure you want to overwrite the existing file '%1'?", dest);
KMessageBox::ButtonCode res = KMessageBox::warningContinueCancel(RKWardMainWindow::getMain(), warning, i18n("Overwrite?"), KStandardGuiItem::overwrite(),
KStandardGuiItem::cancel(), QString(), KMessageBox::Options(KMessageBox::Notify | KMessageBox::Dangerous));
- if (KMessageBox::Continue != res) return GenericRRequestResult::makeError(i18n("User cancelled"));
+ if (KMessageBox::Continue != res) return GenericRRequestResult::makeError(i18n("User canceled"));
} else if (overwrite != Force) {
return GenericRRequestResult::makeError(i18n("Not overwriting existing file"));
}
@@ -194,7 +194,7 @@ GenericRRequestResult RKOutputDirectory::exportZipInternal(const QString &dest)
}
if (QFile(dest).exists()) {
- if (!QFile(dest).remove()) return GenericRRequestResult::makeError(i18n("Failure to remove existing file %1. Missing permissions?s", dest));
+ if (!QFile(dest).remove()) return GenericRRequestResult::makeError(i18n("Failure to remove existing file %1. Missing permissions?", dest));
}
ok = QFile(tempname).copy(dest);
QFile(tempname).remove();
@@ -255,7 +255,7 @@ GenericRRequestResult RKOutputDirectory::revert(OverwriteBehavior discard) {
}
}
if (discard != Force) {
- return GenericRRequestResult::makeError(i18n("User cancelled."));
+ return GenericRRequestResult::makeError(i18n("User canceled."));
}
return importZipInternal(save_filename);
@@ -352,7 +352,7 @@ GenericRRequestResult RKOutputDirectory::purge(RKOutputDirectory::OverwriteBehav
if (discard == Ask) {
auto res = KMessageBox::questionYesNoCancel(RKWardMainWindow::getMain(), i18n("The output has been modified, and closing it will discard all changes. What do you want to do?"), i18n("Discard unsaved changes?"), KStandardGuiItem::discard(), KStandardGuiItem::save(), KStandardGuiItem::cancel());
if (res == KMessageBox::Cancel) {
- return GenericRRequestResult::makeError(i18n("User cancelled"));
+ return GenericRRequestResult::makeError(i18n("User canceled"));
}
if (res == KMessageBox::No) {
auto ret = save();
diff --git a/rkward/rbackend/rkrinterface.cpp b/rkward/rbackend/rkrinterface.cpp
index c2812929..6bacdbe9 100644
--- a/rkward/rbackend/rkrinterface.cpp
+++ b/rkward/rbackend/rkrinterface.cpp
@@ -569,11 +569,11 @@ GenericRRequestResult RInterface::processPlainGenericRequest(const QStringList &
return GenericRRequestResult(RKCommandHighlighter::commandToHTML(calllist.value(1)));
} else if (call == "quit") {
RKWardMainWindow::getMain ()->close ();
- // if we're still alive, quitting was cancelled
- return GenericRRequestResult::makeError(i18n("Quitting was cancelled"));
+ // if we're still alive, quitting was canceled
+ return GenericRRequestResult::makeError(i18n("Quitting was canceled"));
} else if (call == "preLocaleChange") {
int res = KMessageBox::warningContinueCancel (0, i18n ("A command in the R backend is trying to change the character encoding. While RKWard offers support for this, and will try to adjust to the new locale, this operation may cause subtle bugs, if data windows are currently open. Also the feature is not well tested, yet, and it may be advisable to save your workspace before proceeding.\nIf you have any data editor opened, or in any doubt, it is recommended to close those first (this will probably be auto-detected in later versions of RKWard). In this case, please choose 'Cancel' now, then close the data windows, save, and retry."), i18n ("Locale change"));
- if (res != KMessageBox::Continue) return GenericRRequestResult::makeError(i18n("Changing the locale was cancelled by user"));
+ if (res != KMessageBox::Continue) return GenericRRequestResult::makeError(i18n("Changing the locale was canceled by user"));
} else if (call == "listPlugins") {
RK_ASSERT (calllist.count () == 1);
return GenericRRequestResult(RKComponentMap::getMap()->listPlugins());
diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp
index e3cf7382..e17f4817 100644
--- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp
+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp
@@ -197,7 +197,7 @@ void RKGraphicsDeviceFrontendTransmitter::newData () {
if (devnum) device = RKGraphicsDevice::devices.value (devnum);
if (!device) {
if (opcode == RKDCancel) {
- RK_DEBUG (GRAPHICS_DEVICE, DL_WARNING, "Graphics operation cancelled");
+ RK_DEBUG (GRAPHICS_DEVICE, DL_WARNING, "Graphics operation canceled");
emit (stopInteraction());
} else if (opcode == RKDQueryResolution) {
QDesktopWidget *desktop = QApplication::desktop ();
diff --git a/rkward/rkward.cpp b/rkward/rkward.cpp
index f5238cad..c826986f 100644
--- a/rkward/rkward.cpp
+++ b/rkward/rkward.cpp
@@ -499,7 +499,7 @@ void RKWardMainWindow::initActions() {
new_output = actionCollection ()->addAction("new_output", this, SLOT(slotNewOutput()));
new_output->setText(i18n("Output document"));
new_output->setIcon(RKStandardIcons::getIcon(RKStandardIcons::WindowOutput));
- new_output->setStatusTip(i18n("Creates and activates a new output docuemnt"));
+ new_output->setStatusTip(i18n("Creates and activates a new output document"));
fileOpenScript = actionCollection()->addAction(KStandardAction::Open, "file_open_script", this, SLOT(slotOpenCommandEditor()));
actionCollection()->setDefaultShortcut(fileOpenScript, Qt::ControlModifier + Qt::AltModifier + Qt::Key_O);
More information about the rkward-tracker
mailing list