mirror of
https://github.com/citra-mirror/citra.git
synced 2024-09-04 18:47:20 +02:00
Merge pull request #5670 from FearlessTobi/port-5277
Port yuzu-emu/yuzu#5277: "general: Fix various spelling errors"
This commit is contained in:
commit
7c6d7905a4
@ -69,7 +69,7 @@ void CompatDB::Submit() {
|
|||||||
void CompatDB::OnTestcaseSubmitted() {
|
void CompatDB::OnTestcaseSubmitted() {
|
||||||
if (!testcase_watcher.result()) {
|
if (!testcase_watcher.result()) {
|
||||||
QMessageBox::critical(this, tr("Communication error"),
|
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)->setEnabled(true);
|
||||||
button(NextButton)->setText(tr("Next"));
|
button(NextButton)->setText(tr("Next"));
|
||||||
button(CancelButton)->setVisible(true);
|
button(CancelButton)->setVisible(true);
|
||||||
|
@ -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
|
* "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
|
* 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 {
|
enum class CalloutFlag : uint32_t {
|
||||||
Telemetry = 0x1,
|
Telemetry = 0x1,
|
||||||
@ -954,7 +954,7 @@ bool GMainWindow::LoadROM(const QString& filename) {
|
|||||||
case Core::System::ResultStatus::ErrorVideoCore:
|
case Core::System::ResultStatus::ErrorVideoCore:
|
||||||
QMessageBox::critical(
|
QMessageBox::critical(
|
||||||
this, tr("Video Core Error"),
|
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 "
|
"href='https://community.citra-emu.org/t/how-to-upload-the-log-file/296'>see "
|
||||||
"the "
|
"the "
|
||||||
"log</a> for more details. "
|
"log</a> for more details. "
|
||||||
@ -976,7 +976,7 @@ bool GMainWindow::LoadROM(const QString& filename) {
|
|||||||
default:
|
default:
|
||||||
QMessageBox::critical(
|
QMessageBox::critical(
|
||||||
this, tr("Error while loading ROM!"),
|
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;
|
break;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
@ -2134,7 +2134,7 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string det
|
|||||||
} else {
|
} else {
|
||||||
title = tr("Fatal Error");
|
title = tr("Fatal Error");
|
||||||
message =
|
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 "
|
"<a href='https://community.citra-emu.org/t/how-to-upload-the-log-file/296'>Check "
|
||||||
"the log</a> for details."
|
"the log</a> for details."
|
||||||
"<br/>Continuing emulation may result in crashes and bugs.");
|
"<br/>Continuing emulation may result in crashes and bugs.");
|
||||||
|
@ -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 "
|
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."));
|
"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::WRONG_PASSWORD(QT_TR_NOOP("Incorrect password."));
|
||||||
const ConnectionError ErrorManager::GENERIC_ERROR(
|
const ConnectionError ErrorManager::GENERIC_ERROR(QT_TR_NOOP(
|
||||||
QT_TR_NOOP("An unknown error occured. If this error continues to occur, please open an issue"));
|
"An unknown error occurred. If this error continues to occur, please open an issue"));
|
||||||
const ConnectionError ErrorManager::LOST_CONNECTION(
|
const ConnectionError ErrorManager::LOST_CONNECTION(
|
||||||
QT_TR_NOOP("Connection to room lost. Try to reconnect."));
|
QT_TR_NOOP("Connection to room lost. Try to reconnect."));
|
||||||
const ConnectionError ErrorManager::HOST_KICKED(
|
const ConnectionError ErrorManager::HOST_KICKED(
|
||||||
|
@ -423,7 +423,7 @@ public:
|
|||||||
template <typename S, typename T2, typename F2>
|
template <typename S, typename T2, typename F2>
|
||||||
friend S operator%(const S& p, const swapped_t v);
|
friend S operator%(const S& p, const swapped_t v);
|
||||||
|
|
||||||
// Arithmetics + assignements
|
// Arithmetics + assignments
|
||||||
template <typename S, typename T2, typename F2>
|
template <typename S, typename T2, typename F2>
|
||||||
friend S operator+=(const S& p, const swapped_t v);
|
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();
|
return i % v.swap();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Arithmetics + assignements
|
// Arithmetics + assignments
|
||||||
template <typename S, typename T, typename F>
|
template <typename S, typename T, typename F>
|
||||||
S& operator+=(S& i, const swap_struct_t<T, F> v) {
|
S& operator+=(S& i, const swap_struct_t<T, F> v) {
|
||||||
i += v.swap();
|
i += v.swap();
|
||||||
|
@ -208,7 +208,7 @@ public:
|
|||||||
// The queue is a min-heap using std::make_heap/push_heap/pop_heap.
|
// 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
|
// 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
|
// 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;
|
std::vector<Event> event_queue;
|
||||||
u64 event_fifo_id = 0;
|
u64 event_fifo_id = 0;
|
||||||
// the queue for storing the events from other threads threadsafe until they will be added
|
// the queue for storing the events from other threads threadsafe until they will be added
|
||||||
|
Loading…
Reference in New Issue
Block a user