Pārlūkot izejas kodu

Merge pull request #5277 from Morph1984/fix-comments

general: Fix various spelling errors
bunnei 5 gadi atpakaļ
vecāks
revīzija
62f67df6d7

+ 1 - 1
src/common/page_table.h

@@ -90,7 +90,7 @@ struct PageTable {
     PageTable& operator=(PageTable&&) noexcept = default;
     PageTable& operator=(PageTable&&) noexcept = default;
 
 
     /**
     /**
-     * Resizes the page table to be able to accomodate enough pages within
+     * Resizes the page table to be able to accommodate enough pages within
      * a given address space.
      * a given address space.
      *
      *
      * @param address_space_width_in_bits The address size width in bits.
      * @param address_space_width_in_bits The address size width in bits.

+ 2 - 2
src/common/swap.h

@@ -394,7 +394,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);
 
 
@@ -451,7 +451,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();

+ 7 - 7
src/core/hle/kernel/memory/memory_block.h

@@ -73,12 +73,12 @@ enum class MemoryState : u32 {
     ThreadLocal =
     ThreadLocal =
         static_cast<u32>(Svc::MemoryState::ThreadLocal) | FlagMapped | FlagReferenceCounted,
         static_cast<u32>(Svc::MemoryState::ThreadLocal) | FlagMapped | FlagReferenceCounted,
 
 
-    Transfered = static_cast<u32>(Svc::MemoryState::Transfered) | FlagsMisc |
-                 FlagCanAlignedDeviceMap | FlagCanChangeAttribute | FlagCanUseIpc |
-                 FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc,
+    Transferred = static_cast<u32>(Svc::MemoryState::Transferred) | FlagsMisc |
+                  FlagCanAlignedDeviceMap | FlagCanChangeAttribute | FlagCanUseIpc |
+                  FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc,
 
 
-    SharedTransfered = static_cast<u32>(Svc::MemoryState::SharedTransfered) | FlagsMisc |
-                       FlagCanAlignedDeviceMap | FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc,
+    SharedTransferred = static_cast<u32>(Svc::MemoryState::SharedTransferred) | FlagsMisc |
+                        FlagCanAlignedDeviceMap | FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc,
 
 
     SharedCode = static_cast<u32>(Svc::MemoryState::SharedCode) | FlagMapped |
     SharedCode = static_cast<u32>(Svc::MemoryState::SharedCode) | FlagMapped |
                  FlagReferenceCounted | FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc,
                  FlagReferenceCounted | FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc,
@@ -111,8 +111,8 @@ static_assert(static_cast<u32>(MemoryState::AliasCodeData) == 0x03FFBD09);
 static_assert(static_cast<u32>(MemoryState::Ipc) == 0x005C3C0A);
 static_assert(static_cast<u32>(MemoryState::Ipc) == 0x005C3C0A);
 static_assert(static_cast<u32>(MemoryState::Stack) == 0x005C3C0B);
 static_assert(static_cast<u32>(MemoryState::Stack) == 0x005C3C0B);
 static_assert(static_cast<u32>(MemoryState::ThreadLocal) == 0x0040200C);
 static_assert(static_cast<u32>(MemoryState::ThreadLocal) == 0x0040200C);
-static_assert(static_cast<u32>(MemoryState::Transfered) == 0x015C3C0D);
-static_assert(static_cast<u32>(MemoryState::SharedTransfered) == 0x005C380E);
+static_assert(static_cast<u32>(MemoryState::Transferred) == 0x015C3C0D);
+static_assert(static_cast<u32>(MemoryState::SharedTransferred) == 0x005C380E);
 static_assert(static_cast<u32>(MemoryState::SharedCode) == 0x0040380F);
 static_assert(static_cast<u32>(MemoryState::SharedCode) == 0x0040380F);
 static_assert(static_cast<u32>(MemoryState::Inaccessible) == 0x00000010);
 static_assert(static_cast<u32>(MemoryState::Inaccessible) == 0x00000010);
 static_assert(static_cast<u32>(MemoryState::NonSecureIpc) == 0x005C3811);
 static_assert(static_cast<u32>(MemoryState::NonSecureIpc) == 0x005C3811);

+ 6 - 6
src/core/hle/kernel/memory/page_table.cpp

@@ -1007,8 +1007,8 @@ constexpr VAddr PageTable::GetRegionAddress(MemoryState state) const {
     case MemoryState::Shared:
     case MemoryState::Shared:
     case MemoryState::AliasCode:
     case MemoryState::AliasCode:
     case MemoryState::AliasCodeData:
     case MemoryState::AliasCodeData:
-    case MemoryState::Transfered:
-    case MemoryState::SharedTransfered:
+    case MemoryState::Transferred:
+    case MemoryState::SharedTransferred:
     case MemoryState::SharedCode:
     case MemoryState::SharedCode:
     case MemoryState::GeneratedCode:
     case MemoryState::GeneratedCode:
     case MemoryState::CodeOut:
     case MemoryState::CodeOut:
@@ -1042,8 +1042,8 @@ constexpr std::size_t PageTable::GetRegionSize(MemoryState state) const {
     case MemoryState::Shared:
     case MemoryState::Shared:
     case MemoryState::AliasCode:
     case MemoryState::AliasCode:
     case MemoryState::AliasCodeData:
     case MemoryState::AliasCodeData:
-    case MemoryState::Transfered:
-    case MemoryState::SharedTransfered:
+    case MemoryState::Transferred:
+    case MemoryState::SharedTransferred:
     case MemoryState::SharedCode:
     case MemoryState::SharedCode:
     case MemoryState::GeneratedCode:
     case MemoryState::GeneratedCode:
     case MemoryState::CodeOut:
     case MemoryState::CodeOut:
@@ -1080,8 +1080,8 @@ constexpr bool PageTable::CanContain(VAddr addr, std::size_t size, MemoryState s
     case MemoryState::AliasCodeData:
     case MemoryState::AliasCodeData:
     case MemoryState::Stack:
     case MemoryState::Stack:
     case MemoryState::ThreadLocal:
     case MemoryState::ThreadLocal:
-    case MemoryState::Transfered:
-    case MemoryState::SharedTransfered:
+    case MemoryState::Transferred:
+    case MemoryState::SharedTransferred:
     case MemoryState::SharedCode:
     case MemoryState::SharedCode:
     case MemoryState::GeneratedCode:
     case MemoryState::GeneratedCode:
     case MemoryState::CodeOut:
     case MemoryState::CodeOut:

+ 2 - 2
src/core/hle/kernel/svc_types.h

@@ -23,8 +23,8 @@ enum class MemoryState : u32 {
     Ipc = 0x0A,
     Ipc = 0x0A,
     Stack = 0x0B,
     Stack = 0x0B,
     ThreadLocal = 0x0C,
     ThreadLocal = 0x0C,
-    Transfered = 0x0D,
-    SharedTransfered = 0x0E,
+    Transferred = 0x0D,
+    SharedTransferred = 0x0E,
     SharedCode = 0x0F,
     SharedCode = 0x0F,
     Inaccessible = 0x10,
     Inaccessible = 0x10,
     NonSecureIpc = 0x11,
     NonSecureIpc = 0x11,

+ 3 - 3
src/core/hle/service/am/am.cpp

@@ -560,14 +560,14 @@ void ISelfController::GetAccumulatedSuspendedTickChangedEvent(Kernel::HLERequest
 
 
 AppletMessageQueue::AppletMessageQueue(Kernel::KernelCore& kernel) {
 AppletMessageQueue::AppletMessageQueue(Kernel::KernelCore& kernel) {
     on_new_message =
     on_new_message =
-        Kernel::WritableEvent::CreateEventPair(kernel, "AMMessageQueue:OnMessageRecieved");
+        Kernel::WritableEvent::CreateEventPair(kernel, "AMMessageQueue:OnMessageReceived");
     on_operation_mode_changed =
     on_operation_mode_changed =
         Kernel::WritableEvent::CreateEventPair(kernel, "AMMessageQueue:OperationModeChanged");
         Kernel::WritableEvent::CreateEventPair(kernel, "AMMessageQueue:OperationModeChanged");
 }
 }
 
 
 AppletMessageQueue::~AppletMessageQueue() = default;
 AppletMessageQueue::~AppletMessageQueue() = default;
 
 
-const std::shared_ptr<Kernel::ReadableEvent>& AppletMessageQueue::GetMesssageRecieveEvent() const {
+const std::shared_ptr<Kernel::ReadableEvent>& AppletMessageQueue::GetMessageReceiveEvent() const {
     return on_new_message.readable;
     return on_new_message.readable;
 }
 }
 
 
@@ -675,7 +675,7 @@ void ICommonStateGetter::GetEventHandle(Kernel::HLERequestContext& ctx) {
 
 
     IPC::ResponseBuilder rb{ctx, 2, 1};
     IPC::ResponseBuilder rb{ctx, 2, 1};
     rb.Push(RESULT_SUCCESS);
     rb.Push(RESULT_SUCCESS);
-    rb.PushCopyObjects(msg_queue->GetMesssageRecieveEvent());
+    rb.PushCopyObjects(msg_queue->GetMessageReceiveEvent());
 }
 }
 
 
 void ICommonStateGetter::ReceiveMessage(Kernel::HLERequestContext& ctx) {
 void ICommonStateGetter::ReceiveMessage(Kernel::HLERequestContext& ctx) {

+ 1 - 1
src/core/hle/service/am/am.h

@@ -55,7 +55,7 @@ public:
     explicit AppletMessageQueue(Kernel::KernelCore& kernel);
     explicit AppletMessageQueue(Kernel::KernelCore& kernel);
     ~AppletMessageQueue();
     ~AppletMessageQueue();
 
 
-    const std::shared_ptr<Kernel::ReadableEvent>& GetMesssageRecieveEvent() const;
+    const std::shared_ptr<Kernel::ReadableEvent>& GetMessageReceiveEvent() const;
     const std::shared_ptr<Kernel::ReadableEvent>& GetOperationModeChangedEvent() const;
     const std::shared_ptr<Kernel::ReadableEvent>& GetOperationModeChangedEvent() const;
     void PushMessage(AppletMessage msg);
     void PushMessage(AppletMessage msg);
     AppletMessage PopMessage();
     AppletMessage PopMessage();

+ 3 - 3
src/input_common/gcadapter/gc_adapter.h

@@ -120,17 +120,17 @@ private:
     /// For use in initialization, querying devices to find the adapter
     /// For use in initialization, querying devices to find the adapter
     void Setup();
     void Setup();
 
 
-    /// Resets status of all GC controller devices to a disconected state
+    /// Resets status of all GC controller devices to a disconnected state
     void ResetDevices();
     void ResetDevices();
 
 
-    /// Resets status of device connected to a disconected state
+    /// Resets status of device connected to a disconnected state
     void ResetDevice(std::size_t port);
     void ResetDevice(std::size_t port);
 
 
     /// Returns true if we successfully gain access to GC Adapter
     /// Returns true if we successfully gain access to GC Adapter
     bool CheckDeviceAccess();
     bool CheckDeviceAccess();
 
 
     /// Captures GC Adapter endpoint address
     /// Captures GC Adapter endpoint address
-    /// Returns true if the endpoind was set correctly
+    /// Returns true if the endpoint was set correctly
     bool GetGCEndpoint(libusb_device* device);
     bool GetGCEndpoint(libusb_device* device);
 
 
     /// For shutting down, clear all data, join all threads, release usb
     /// For shutting down, clear all data, join all threads, release usb

+ 1 - 1
src/input_common/motion_input.cpp

@@ -129,7 +129,7 @@ void MotionInput::UpdateOrientation(u64 elapsed_time) {
             rad_gyro += ki * integral_error;
             rad_gyro += ki * integral_error;
             rad_gyro += kd * derivative_error;
             rad_gyro += kd * derivative_error;
         } else {
         } else {
-            // Give more weight to acelerometer values to compensate for the lack of gyro
+            // Give more weight to accelerometer values to compensate for the lack of gyro
             rad_gyro += 35.0f * kp * real_error;
             rad_gyro += 35.0f * kp * real_error;
             rad_gyro += 10.0f * ki * integral_error;
             rad_gyro += 10.0f * ki * integral_error;
             rad_gyro += 10.0f * kd * derivative_error;
             rad_gyro += 10.0f * kd * derivative_error;

+ 1 - 1
src/input_common/mouse/mouse_input.h

@@ -20,7 +20,7 @@ enum class MouseButton {
     Left,
     Left,
     Wheel,
     Wheel,
     Right,
     Right,
-    Foward,
+    Forward,
     Backward,
     Backward,
     Undefined,
     Undefined,
 };
 };

+ 4 - 4
src/input_common/udp/udp.cpp

@@ -28,14 +28,14 @@ private:
     mutable std::mutex mutex;
     mutable std::mutex mutex;
 };
 };
 
 
-/// A motion device factory that creates motion devices from JC Adapter
+/// A motion device factory that creates motion devices from a UDP client
 UDPMotionFactory::UDPMotionFactory(std::shared_ptr<CemuhookUDP::Client> client_)
 UDPMotionFactory::UDPMotionFactory(std::shared_ptr<CemuhookUDP::Client> client_)
     : client(std::move(client_)) {}
     : client(std::move(client_)) {}
 
 
 /**
 /**
  * Creates motion device
  * Creates motion device
  * @param params contains parameters for creating the device:
  * @param params contains parameters for creating the device:
- *     - "port": the nth jcpad on the adapter
+ *     - "port": the UDP port number
  */
  */
 std::unique_ptr<Input::MotionDevice> UDPMotionFactory::Create(const Common::ParamPackage& params) {
 std::unique_ptr<Input::MotionDevice> UDPMotionFactory::Create(const Common::ParamPackage& params) {
     auto ip = params.Get("ip", "127.0.0.1");
     auto ip = params.Get("ip", "127.0.0.1");
@@ -90,14 +90,14 @@ private:
     mutable std::mutex mutex;
     mutable std::mutex mutex;
 };
 };
 
 
-/// A motion device factory that creates motion devices from JC Adapter
+/// A motion device factory that creates motion devices from a UDP client
 UDPTouchFactory::UDPTouchFactory(std::shared_ptr<CemuhookUDP::Client> client_)
 UDPTouchFactory::UDPTouchFactory(std::shared_ptr<CemuhookUDP::Client> client_)
     : client(std::move(client_)) {}
     : client(std::move(client_)) {}
 
 
 /**
 /**
  * Creates motion device
  * Creates motion device
  * @param params contains parameters for creating the device:
  * @param params contains parameters for creating the device:
- *     - "port": the nth jcpad on the adapter
+ *     - "port": the UDP port number
  */
  */
 std::unique_ptr<Input::TouchDevice> UDPTouchFactory::Create(const Common::ParamPackage& params) {
 std::unique_ptr<Input::TouchDevice> UDPTouchFactory::Create(const Common::ParamPackage& params) {
     auto ip = params.Get("ip", "127.0.0.1");
     auto ip = params.Get("ip", "127.0.0.1");

+ 2 - 2
src/tests/common/fibers.cpp

@@ -207,7 +207,7 @@ static void ThreadStart2_2(u32 id, TestControl2& test_control) {
 }
 }
 
 
 /** This test checks for fiber thread exchange configuration and validates that fibers are
 /** This test checks for fiber thread exchange configuration and validates that fibers are
- *  that a fiber has been succesfully transfered from one thread to another and that the TLS
+ *  that a fiber has been successfully transferred from one thread to another and that the TLS
  *  region of the thread is kept while changing fibers.
  *  region of the thread is kept while changing fibers.
  */
  */
 TEST_CASE("Fibers::InterExchange", "[common]") {
 TEST_CASE("Fibers::InterExchange", "[common]") {
@@ -299,7 +299,7 @@ static void ThreadStart3(u32 id, TestControl3& test_control) {
 }
 }
 
 
 /** This test checks for one two threads racing for starting the same fiber.
 /** This test checks for one two threads racing for starting the same fiber.
- *  It checks execution occured in an ordered manner and by no time there were
+ *  It checks execution occurred in an ordered manner and by no time there were
  *  two contexts at the same time.
  *  two contexts at the same time.
  */
  */
 TEST_CASE("Fibers::StartRace", "[common]") {
 TEST_CASE("Fibers::StartRace", "[common]") {

+ 1 - 1
src/video_core/command_classes/vic.cpp

@@ -53,7 +53,7 @@ void Vic::ProcessMethod(Method method, const std::vector<u32>& arguments) {
 
 
 void Vic::Execute() {
 void Vic::Execute() {
     if (output_surface_luma_address == 0) {
     if (output_surface_luma_address == 0) {
-        LOG_ERROR(Service_NVDRV, "VIC Luma address not set. Recieved 0x{:X}",
+        LOG_ERROR(Service_NVDRV, "VIC Luma address not set. Received 0x{:X}",
                   vic_state.output_surface.luma_offset);
                   vic_state.output_surface.luma_offset);
         return;
         return;
     }
     }

+ 1 - 1
src/video_core/renderer_vulkan/vk_device.cpp

@@ -491,7 +491,7 @@ VkFormat VKDevice::GetSupportedFormat(VkFormat wanted_format, VkFormatFeatureFla
 }
 }
 
 
 void VKDevice::ReportLoss() const {
 void VKDevice::ReportLoss() const {
-    LOG_CRITICAL(Render_Vulkan, "Device loss occured!");
+    LOG_CRITICAL(Render_Vulkan, "Device loss occurred!");
 
 
     // Wait for the log to flush and for Nsight Aftermath to dump the results
     // Wait for the log to flush and for Nsight Aftermath to dump the results
     std::this_thread::sleep_for(std::chrono::seconds{15});
     std::this_thread::sleep_for(std::chrono::seconds{15});

+ 3 - 3
src/yuzu/applets/error.cpp

@@ -19,7 +19,7 @@ QtErrorDisplay::~QtErrorDisplay() = default;
 void QtErrorDisplay::ShowError(ResultCode error, std::function<void()> finished) const {
 void QtErrorDisplay::ShowError(ResultCode error, std::function<void()> finished) const {
     callback = std::move(finished);
     callback = std::move(finished);
     emit MainWindowDisplayError(
     emit MainWindowDisplayError(
-        tr("An error has occured.\nPlease try again or contact the developer of the "
+        tr("An error has occurred.\nPlease try again or contact the developer of the "
            "software.\n\nError Code: %1-%2 (0x%3)")
            "software.\n\nError Code: %1-%2 (0x%3)")
             .arg(static_cast<u32>(error.module.Value()) + 2000, 4, 10, QChar::fromLatin1('0'))
             .arg(static_cast<u32>(error.module.Value()) + 2000, 4, 10, QChar::fromLatin1('0'))
             .arg(error.description, 4, 10, QChar::fromLatin1('0'))
             .arg(error.description, 4, 10, QChar::fromLatin1('0'))
@@ -32,7 +32,7 @@ void QtErrorDisplay::ShowErrorWithTimestamp(ResultCode error, std::chrono::secon
 
 
     const QDateTime date_time = QDateTime::fromSecsSinceEpoch(time.count());
     const QDateTime date_time = QDateTime::fromSecsSinceEpoch(time.count());
     emit MainWindowDisplayError(
     emit MainWindowDisplayError(
-        tr("An error occured on %1 at %2.\nPlease try again or contact the "
+        tr("An error occurred on %1 at %2.\nPlease try again or contact the "
            "developer of the software.\n\nError Code: %3-%4 (0x%5)")
            "developer of the software.\n\nError Code: %3-%4 (0x%5)")
             .arg(date_time.toString(QStringLiteral("dddd, MMMM d, yyyy")))
             .arg(date_time.toString(QStringLiteral("dddd, MMMM d, yyyy")))
             .arg(date_time.toString(QStringLiteral("h:mm:ss A")))
             .arg(date_time.toString(QStringLiteral("h:mm:ss A")))
@@ -46,7 +46,7 @@ void QtErrorDisplay::ShowCustomErrorText(ResultCode error, std::string dialog_te
                                          std::function<void()> finished) const {
                                          std::function<void()> finished) const {
     callback = std::move(finished);
     callback = std::move(finished);
     emit MainWindowDisplayError(
     emit MainWindowDisplayError(
-        tr("An error has occured.\nError Code: %1-%2 (0x%3)\n\n%4\n\n%5")
+        tr("An error has occurred.\nError Code: %1-%2 (0x%3)\n\n%4\n\n%5")
             .arg(static_cast<u32>(error.module.Value()) + 2000, 4, 10, QChar::fromLatin1('0'))
             .arg(static_cast<u32>(error.module.Value()) + 2000, 4, 10, QChar::fromLatin1('0'))
             .arg(error.description, 4, 10, QChar::fromLatin1('0'))
             .arg(error.description, 4, 10, QChar::fromLatin1('0'))
             .arg(error.raw, 8, 16, QChar::fromLatin1('0'))
             .arg(error.raw, 8, 16, QChar::fromLatin1('0'))

+ 1 - 1
src/yuzu/compatdb.cpp

@@ -72,7 +72,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);

+ 1 - 1
src/yuzu/main.cpp

@@ -142,7 +142,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,

+ 1 - 1
src/yuzu_cmd/yuzu.cpp

@@ -202,7 +202,7 @@ int main(int argc, char** argv) {
             const u16 loader_id = static_cast<u16>(Core::System::ResultStatus::ErrorLoader);
             const u16 loader_id = static_cast<u16>(Core::System::ResultStatus::ErrorLoader);
             const u16 error_id = static_cast<u16>(load_result) - loader_id;
             const u16 error_id = static_cast<u16>(load_result) - loader_id;
             LOG_CRITICAL(Frontend,
             LOG_CRITICAL(Frontend,
-                         "While attempting to load the ROM requested, an error occured. Please "
+                         "While attempting to load the ROM requested, an error occurred. Please "
                          "refer to the yuzu wiki for more information or the yuzu discord for "
                          "refer to the yuzu wiki for more information or the yuzu discord for "
                          "additional help.\n\nError Code: {:04X}-{:04X}\nError Description: {}",
                          "additional help.\n\nError Code: {:04X}-{:04X}\nError Description: {}",
                          loader_id, error_id, static_cast<Loader::ResultStatus>(error_id));
                          loader_id, error_id, static_cast<Loader::ResultStatus>(error_id));

+ 1 - 1
src/yuzu_tester/yuzu.cpp

@@ -242,7 +242,7 @@ int main(int argc, char** argv) {
             const u16 loader_id = static_cast<u16>(Core::System::ResultStatus::ErrorLoader);
             const u16 loader_id = static_cast<u16>(Core::System::ResultStatus::ErrorLoader);
             const u16 error_id = static_cast<u16>(load_result) - loader_id;
             const u16 error_id = static_cast<u16>(load_result) - loader_id;
             LOG_CRITICAL(Frontend,
             LOG_CRITICAL(Frontend,
-                         "While attempting to load the ROM requested, an error occured. Please "
+                         "While attempting to load the ROM requested, an error occurred. Please "
                          "refer to the yuzu wiki for more information or the yuzu discord for "
                          "refer to the yuzu wiki for more information or the yuzu discord for "
                          "additional help.\n\nError Code: {:04X}-{:04X}\nError Description: {}",
                          "additional help.\n\nError Code: {:04X}-{:04X}\nError Description: {}",
                          loader_id, error_id, static_cast<Loader::ResultStatus>(error_id));
                          loader_id, error_id, static_cast<Loader::ResultStatus>(error_id));