diff --git a/rpcs3/Emu/Cell/Modules/cellMic.cpp b/rpcs3/Emu/Cell/Modules/cellMic.cpp index cf5bf8edef..18747ef8de 100644 --- a/rpcs3/Emu/Cell/Modules/cellMic.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMic.cpp @@ -17,8 +17,8 @@ void fmt_class_string::format(std::string& out, u64 arg) { case microphone_handler::null: return "Null"; case microphone_handler::standard: return "Standard"; - case microphone_handler::singstar: return "Singstar"; - case microphone_handler::real_singstar: return "Real Singstar"; + case microphone_handler::singstar: return "SingStar"; + case microphone_handler::real_singstar: return "Real SingStar"; case microphone_handler::rocksmith: return "Rocksmith"; } @@ -160,11 +160,11 @@ s32 microphone_device::open_microphone(const u8 type, const u32 dsp_r, const u32 break; case microphone_handler::singstar: case microphone_handler::real_singstar: - // Singstar mic has always 2 channels, each channel represent a physical microphone + // SingStar mic has always 2 channels, each channel represent a physical microphone ASSERT(num_channels >= 2); if (num_channels > 2) { - cellMic.error("Tried to open a singstar-type device with num_channels = %d", num_channels); + cellMic.error("Tried to open a SingStar-type device with num_channels = %d", num_channels); num_channels = 2; } break; @@ -177,7 +177,7 @@ s32 microphone_device::open_microphone(const u8 type, const u32 dsp_r, const u32 { case 1: num_al_channels = AL_FORMAT_MONO16; break; case 2: - // If we're using singstar each device needs to be mono + // If we're using SingStar each device needs to be mono if (device_type == microphone_handler::singstar) num_al_channels = AL_FORMAT_MONO16; else @@ -224,7 +224,7 @@ s32 microphone_device::open_microphone(const u8 type, const u32 dsp_r, const u32 if (alcGetError(device) != ALC_NO_ERROR) { // Ignore it and move on - cellMic.error("Error opening 2nd singstar capture device %s", device_name[1]); + cellMic.error("Error opening 2nd SingStar capture device %s", device_name[1]); } else { @@ -714,7 +714,7 @@ s32 cellMicSetDeviceAttr(u32 dev_num, CellMicDeviceAttr deviceAttributes, u32 ar switch (deviceAttributes) { case CELLMIC_DEVATTR_CHANVOL: - // Used by Singstar to set the volume of each mic + // Used by SingStar to set the volume of each mic if (arg1 > 2) return CELL_MIC_ERROR_PARAM; device.attr_chanvol[arg1] = arg2; diff --git a/rpcs3/Json/tooltips.json b/rpcs3/Json/tooltips.json index 7ebf77ad2d..b963623485 100644 --- a/rpcs3/Json/tooltips.json +++ b/rpcs3/Json/tooltips.json @@ -22,7 +22,7 @@ "audioBufferDuration": "Target buffer duration in milliseconds.\nHigher values make the buffering algorithm's job easier, but may introduce noticeable audio latency.", "enableTimeStretching": "Enables time stretching - requires buffering to be enabled.\nReduces crackle/stutter further, but may cause a very noticeable reduction in audio quality on slower CPUs.", "timeStretchingThreshold": "Buffer fill level (in percentage) below which time stretching will start.", - "microphoneBox": "Standard should be used for most games.\nSingstar emulates a singstar device and should be used with Singstar games.\nReal Singstar should only be used with a REAL Singstar device with Singstar games.\nRocksmith should be used with a Rocksmith dongle." + "microphoneBox": "Standard should be used for most games.\nSingStar emulates a SingStar device and should be used with SingStar games.\nReal SingStar should only be used with a REAL SingStar device with SingStar games.\nRocksmith should be used with a Rocksmith dongle." }, "cpu": { "PPU": { diff --git a/rpcs3/rpcs3qt/update_manager.cpp b/rpcs3/rpcs3qt/update_manager.cpp index 76a1f21f1c..a6b732c56f 100644 --- a/rpcs3/rpcs3qt/update_manager.cpp +++ b/rpcs3/rpcs3qt/update_manager.cpp @@ -38,7 +38,7 @@ void update_manager::check_for_updates(bool automatic, QWidget* parent) LOG_ERROR(GENERAL, "Unable to update RPCS3!Please make sure your system supports SSL. Visit our quickstart guide for more information: https://rpcs3.net/quickstart"); if (!automatic) { - const QString message = tr("Unable to update RPCS3!
Please make sure your system supports SSL.
Visit our quickstart guide for more information."); + const QString message = tr("Unable to update RPCS3!
Please make sure your system supports SSL.
Visit our Quickstart guide for more information."); QMessageBox box(QMessageBox::Icon::Warning, tr("Auto-updater"), message, QMessageBox::StandardButton::Ok, parent); box.setTextFormat(Qt::RichText); box.exec(); @@ -69,7 +69,7 @@ void update_manager::check_for_updates(bool automatic, QWidget* parent) connect(reply_json, QOverload::of(&QNetworkReply::error), this, &update_manager::handle_error); connect(reply_json, &QNetworkReply::finished, [=]() { - handle_reply(reply_json, &update_manager::handle_json, automatic, "Retrieved Json Info"); + handle_reply(reply_json, &update_manager::handle_json, automatic, "Retrieved JSON Info"); }); // clang-format on } @@ -108,7 +108,7 @@ bool update_manager::handle_reply(QNetworkReply* reply, std::functionclose(); if (!automatic) - QMessageBox::warning(m_parent, tr("Auto-updater"), tr("An error occured during the auto-updating process.\nCheck the log for more information.")); + QMessageBox::warning(m_parent, tr("Auto-updater"), tr("An error occurred during the auto-updating process.\nCheck the log for more information.")); } return true; @@ -141,7 +141,7 @@ bool update_manager::handle_json(const QByteArray& data, bool automatic) // If a user clicks "Check for Updates" with a custom build ask him if he's sure he wants to update to latest version if (!automatic && return_code == -1) { - if (QMessageBox::question(m_progress_dialog, tr("Auto-updater"), tr("You're currently using a custom or PR build.\n\nDo you want to update to the latest official rpcs3 version?"), + if (QMessageBox::question(m_progress_dialog, tr("Auto-updater"), tr("You're currently using a custom or PR build.\n\nDo you want to update to the latest official RPCS3 version?"), QMessageBox::Yes | QMessageBox::No) == QMessageBox::No) { m_progress_dialog->close(); @@ -159,7 +159,7 @@ bool update_manager::handle_json(const QByteArray& data, bool automatic) const auto& latest = json_data["latest_build"]; if (!latest.isObject()) { - LOG_ERROR(GENERAL, "[Auto-updater] Json doesn't contain latest_build section"); + LOG_ERROR(GENERAL, "[Auto-updater] JSON doesn't contain latest_build section"); return false; } @@ -170,7 +170,7 @@ bool update_manager::handle_json(const QByteArray& data, bool automatic) #elif defined(__linux__) os = "linux"; #else - LOG_ERROR(GENERAL, "[Auto-updater] Your os isn't currently supported by the auto-updater"); + LOG_ERROR(GENERAL, "[Auto-updater] Your OS isn't currently supported by the auto-updater"); return false; #endif @@ -299,7 +299,7 @@ bool update_manager::handle_rpcs3(const QByteArray& rpcs3_data, bool /*automatic if (appimage_path != nullptr) { replace_path = appimage_path; - LOG_NOTICE(GENERAL, "[Auto-updater] Found appimage path: %s", appimage_path); + LOG_NOTICE(GENERAL, "[Auto-updater] Found AppImage path: %s", appimage_path); } else { @@ -470,7 +470,7 @@ bool update_manager::handle_rpcs3(const QByteArray& rpcs3_data, bool /*automatic { if (temp_u16[index] > 0xFF) { - LOG_ERROR(GENERAL, "[Auto-updater] 7z decoder error: Failed to convert utf-16 to utf-8"); + LOG_ERROR(GENERAL, "[Auto-updater] 7z decoder error: Failed to convert UTF-16 to UTF-8"); error_free7z(); return false; }