From 1653ebaa451fa25a6ce368886584429c3a63fcbd Mon Sep 17 00:00:00 2001
From: FearlessTobi <thm.frey@gmail.com>
Date: Sun, 3 Jan 2021 02:39:41 +0100
Subject: [PATCH] general: Fix various spelling errors
Co-Authored-By: Morph <39850852+Morph1984@users.noreply.github.com>
---
src/citra_qt/compatdb.cpp | 2 +-
src/citra_qt/main.cpp | 8 ++++----
src/citra_qt/multiplayer/message.cpp | 4 ++--
src/common/swap.h | 4 ++--
src/core/core_timing.h | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/citra_qt/compatdb.cpp b/src/citra_qt/compatdb.cpp
index 50d31a77b..948d1b8a2 100644
--- a/src/citra_qt/compatdb.cpp
+++ b/src/citra_qt/compatdb.cpp
@@ -69,7 +69,7 @@ void CompatDB::Submit() {
void CompatDB::OnTestcaseSubmitted() {
if (!testcase_watcher.result()) {
QMessageBox::critical(this, tr("Communication error"),
- tr("An error occured while sending the Testcase"));
+ tr("An error occurred while sending the Testcase"));
button(NextButton)->setEnabled(true);
button(NextButton)->setText(tr("Next"));
button(CancelButton)->setVisible(true);
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index e4a1832ee..2ba803050 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -111,7 +111,7 @@ constexpr int default_mouse_timeout = 2500;
/**
* "Callouts" are one-time instructional messages shown to the user. In the config settings, there
* is a bitfield "callout_flags" options, used to track if a message has already been shown to the
- * user. This is 32-bits - if we have more than 32 callouts, we should retire and recyle old ones.
+ * user. This is 32-bits - if we have more than 32 callouts, we should retire and recycle old ones.
*/
enum class CalloutFlag : uint32_t {
Telemetry = 0x1,
@@ -954,7 +954,7 @@ bool GMainWindow::LoadROM(const QString& filename) {
case Core::System::ResultStatus::ErrorVideoCore:
QMessageBox::critical(
this, tr("Video Core Error"),
- tr("An error has occured. Please <a "
+ tr("An error has occurred. Please <a "
"href='https://community.citra-emu.org/t/how-to-upload-the-log-file/296'>see "
"the "
"log</a> for more details. "
@@ -976,7 +976,7 @@ bool GMainWindow::LoadROM(const QString& filename) {
default:
QMessageBox::critical(
this, tr("Error while loading ROM!"),
- tr("An unknown error occured. Please see the log for more details."));
+ tr("An unknown error occurred. Please see the log for more details."));
break;
}
return false;
@@ -2134,7 +2134,7 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string det
} else {
title = tr("Fatal Error");
message =
- tr("A fatal error occured. "
+ tr("A fatal error occurred. "
"<a href='https://community.citra-emu.org/t/how-to-upload-the-log-file/296'>Check "
"the log</a> for details."
"<br/>Continuing emulation may result in crashes and bugs.");
diff --git a/src/citra_qt/multiplayer/message.cpp b/src/citra_qt/multiplayer/message.cpp
index 7bf5b7efc..beb45bbe0 100644
--- a/src/citra_qt/multiplayer/message.cpp
+++ b/src/citra_qt/multiplayer/message.cpp
@@ -38,8 +38,8 @@ const ConnectionError ErrorManager::WRONG_VERSION(
QT_TR_NOOP("Version mismatch! Please update to the latest version of Citra. If the problem "
"persists, contact the room host and ask them to update the server."));
const ConnectionError ErrorManager::WRONG_PASSWORD(QT_TR_NOOP("Incorrect password."));
-const ConnectionError ErrorManager::GENERIC_ERROR(
- QT_TR_NOOP("An unknown error occured. If this error continues to occur, please open an issue"));
+const ConnectionError ErrorManager::GENERIC_ERROR(QT_TR_NOOP(
+ "An unknown error occurred. If this error continues to occur, please open an issue"));
const ConnectionError ErrorManager::LOST_CONNECTION(
QT_TR_NOOP("Connection to room lost. Try to reconnect."));
const ConnectionError ErrorManager::HOST_KICKED(
diff --git a/src/common/swap.h b/src/common/swap.h
index 71932c2bb..f5976a09c 100644
--- a/src/common/swap.h
+++ b/src/common/swap.h
@@ -423,7 +423,7 @@ public:
template <typename S, typename T2, typename F2>
friend S operator%(const S& p, const swapped_t v);
- // Arithmetics + assignements
+ // Arithmetics + assignments
template <typename S, typename T2, typename F2>
friend S operator+=(const S& p, const swapped_t v);
@@ -480,7 +480,7 @@ S operator%(const S& i, const swap_struct_t<T, F> v) {
return i % v.swap();
}
-// Arithmetics + assignements
+// Arithmetics + assignments
template <typename S, typename T, typename F>
S& operator+=(S& i, const swap_struct_t<T, F> v) {
i += v.swap();
diff --git a/src/core/core_timing.h b/src/core/core_timing.h
index dadbe16e3..aebe5c742 100644
--- a/src/core/core_timing.h
+++ b/src/core/core_timing.h
@@ -208,7 +208,7 @@ public:
// The queue is a min-heap using std::make_heap/push_heap/pop_heap.
// We don't use std::priority_queue because we need to be able to serialize, unserialize and
// erase arbitrary events (RemoveEvent()) regardless of the queue order. These aren't
- // accomodated by the standard adaptor class.
+ // accommodated by the standard adaptor class.
std::vector<Event> event_queue;
u64 event_fifo_id = 0;
// the queue for storing the events from other threads threadsafe until they will be added