ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GUI/Qt: Minor text corrections, nitpicks (#8213) 

- Adding the actual corrections from #8048 that were not added by #8119.
 - Fixing typos and missing ending periods.
 - Unifying the writing of certain terms:
   - Memory Card uppercased following Sony's writing (taken from PS2 manual).
   - gamefixes/game fixes -> game fixes
   - fast forward/fastforward/fast-forward -> fast-forward (taken from Oxford)
   - slowmotion/slow motion/slow-motion -> slow-motion (following the same convention as before, as I could not find this in Oxford's)
   - framebuffer/frame buffer -> framebuffer
   - Xbox name properly uppercased (for Controller settings)
 - Correcting RA's Rich Presence to separate it from Discord's Rich Presence (after discussions in the Translations channel).
 - Unification of option names in the option area and the hint area.
 - Adding a fix for the (currently broken) Stretch Height/Vertical Stretch tooltip.
This commit is contained in:
Víctor "IlDucci 2023-03-13 01:34:20 +01:00 committed by GitHub
parent b897f367ce
commit b244136179
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 85 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2-qt/AutoUpdaterDialog.cpp
View File

@ -385,7 +385,7 @@ void AutoUpdaterDialog::getChangesComplete(QNetworkReply* reply)
if (update_will_break_save_states) if (update_will_break_save_states)
{ {
changes_html.prepend(tr("<h2>Save State Warning</h2><p>Installing this update will make your save states " changes_html.prepend(tr("<h2>Save State Warning</h2><p>Installing this update will make your save states "
"<b>incompatible</b>. Please ensure you have saved your games to memory card " "<b>incompatible</b>. Please ensure you have saved your games to a Memory Card "
"before installing this update or you will lose progress.</p>")); "before installing this update or you will lose progress.</p>"));
} }

4
pcsx2-qt/Settings/AchievementSettingsWidget.cpp
View File

@ -56,8 +56,8 @@ AchievementSettingsWidget::AchievementSettingsWidget(SettingsDialog* dialog, QWi
dialog->registerWidgetHelp(m_ui.unofficialTestMode, tr("Test Unofficial Achievements"), tr("Unchecked"), dialog->registerWidgetHelp(m_ui.unofficialTestMode, tr("Test Unofficial Achievements"), tr("Unchecked"),
tr("When enabled, PCSX2 will list achievements from unofficial sets. Please note that these achievements are " tr("When enabled, PCSX2 will list achievements from unofficial sets. Please note that these achievements are "
"not tracked by RetroAchievements, so they unlock every time.")); "not tracked by RetroAchievements, so they unlock every time."));
dialog->registerWidgetHelp(m_ui.richPresence, tr("Enable Rich Presence"), tr("Unchecked"), dialog->registerWidgetHelp(m_ui.richPresence, tr("Enable RA's Rich Presence"), tr("Unchecked"),
tr("When enabled, rich presence information will be collected and sent to the server where supported.")); tr("When enabled, rich presence information will be collected and sent to the RetroAchievements servers where supported."));
dialog->registerWidgetHelp(m_ui.challengeMode, tr("Enable Hardcore Mode"), tr("Unchecked"), dialog->registerWidgetHelp(m_ui.challengeMode, tr("Enable Hardcore Mode"), tr("Unchecked"),
tr("\"Challenge\" mode for achievements, including leaderboard tracking. Disables save state, cheats, and slowdown functions.")); tr("\"Challenge\" mode for achievements, including leaderboard tracking. Disables save state, cheats, and slowdown functions."));
dialog->registerWidgetHelp(m_ui.leaderboards, tr("Enable Leaderboards"), tr("Checked"), dialog->registerWidgetHelp(m_ui.leaderboards, tr("Enable Leaderboards"), tr("Checked"),

2
pcsx2-qt/Settings/AchievementSettingsWidget.ui
View File

@ -49,7 +49,7 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QCheckBox" name="richPresence"> <widget class="QCheckBox" name="richPresence">
<property name="text"> <property name="text">
<string>Enable Rich Presence</string> <string>Enable RA's Rich Presence</string>
</property> </property>
</widget> </widget>
</item> </item>

10
pcsx2-qt/Settings/AdvancedSettingsWidget.cpp
View File

@ -90,11 +90,11 @@ AdvancedSettingsWidget::AdvancedSettingsWidget(SettingsDialog* dialog, QWidget*
"end of the block, not on the instruction which caused the exception. Refer to the console to see the address where the invalid " "end of the block, not on the instruction which caused the exception. Refer to the console to see the address where the invalid "
"access occurred.")); "access occurred."));
dialog->registerWidgetHelp(m_ui.vu0RoundingMode, tr("Rounding Mode"), tr("Chop / Zero (Default)"), tr("")); dialog->registerWidgetHelp(m_ui.vu0RoundingMode, tr("VU0 Rounding Mode"), tr("Chop / Zero (Default)"), tr(""));
dialog->registerWidgetHelp(m_ui.vu1RoundingMode, tr("Rounding Mode"), tr("Chop / Zero (Default)"), tr("")); dialog->registerWidgetHelp(m_ui.vu1RoundingMode, tr("VU1 Rounding Mode"), tr("Chop / Zero (Default)"), tr(""));
dialog->registerWidgetHelp(m_ui.vu0ClampMode, tr("Clamping Mode"), tr("Normal (Default)"), tr("")); dialog->registerWidgetHelp(m_ui.vu0ClampMode, tr("VU0 Clamping Mode"), tr("Normal (Default)"), tr(""));
dialog->registerWidgetHelp(m_ui.vu1ClampMode, tr("Clamping Mode"), tr("Normal (Default)"), tr("")); dialog->registerWidgetHelp(m_ui.vu1ClampMode, tr("VU1 Clamping Mode"), tr("Normal (Default)"), tr(""));
dialog->registerWidgetHelp(m_ui.vu0Recompiler, tr("Enable VU0 Recompiler (Micro Mode)"), tr("Checked"), tr("Enables VU0 Recompiler.")); dialog->registerWidgetHelp(m_ui.vu0Recompiler, tr("Enable VU0 Recompiler (Micro Mode)"), tr("Checked"), tr("Enables VU0 Recompiler."));
@ -107,7 +107,7 @@ AdvancedSettingsWidget::AdvancedSettingsWidget(SettingsDialog* dialog, QWidget*
tr("Performs just-in-time binary translation of 32-bit MIPS-I machine code to x86.")); tr("Performs just-in-time binary translation of 32-bit MIPS-I machine code to x86."));
dialog->registerWidgetHelp(m_ui.gameFixes, tr("Enable Game Fixes"), tr("Checked"), dialog->registerWidgetHelp(m_ui.gameFixes, tr("Enable Game Fixes"), tr("Checked"),
tr("Automatically loads and applies gamefixes to known problematic games on game start.")); tr("Automatically loads and applies fixes to known problematic games on game start."));
dialog->registerWidgetHelp(m_ui.patches, tr("Enable Compatibility Patches"), tr("Checked"), dialog->registerWidgetHelp(m_ui.patches, tr("Enable Compatibility Patches"), tr("Checked"),
tr("Automatically loads and applies compatibility patches to known problematic games.")); tr("Automatically loads and applies compatibility patches to known problematic games."));

4
pcsx2-qt/Settings/AudioSettingsWidget.cpp
View File

@ -109,7 +109,7 @@ AudioSettingsWidget::AudioSettingsWidget(SettingsDialog* dialog, QWidget* parent
updateLatencyLabels(); updateLatencyLabels();
dialog->registerWidgetHelp(m_ui.syncMode, tr("Synchronization"), tr("TimeStretch (Recommended)"), dialog->registerWidgetHelp(m_ui.syncMode, tr("Synchronization"), tr("TimeStretch (Recommended)"),
tr("When running outside of 100% speed, adjusts the tempo on audio instead of dropping frames. Produces much nicer fast forward/slowdown audio.")); tr("When running outside of 100% speed, adjusts the tempo on audio instead of dropping frames. Produces much nicer fast-forward/slowdown audio."));
dialog->registerWidgetHelp(m_ui.expansionMode, tr("Expansion"), tr("Stereo (None, Default)"), tr("")); dialog->registerWidgetHelp(m_ui.expansionMode, tr("Expansion"), tr("Stereo (None, Default)"), tr(""));
@ -126,7 +126,7 @@ AudioSettingsWidget::AudioSettingsWidget(SettingsDialog* dialog, QWidget* parent
dialog->registerWidgetHelp(m_ui.sequenceLength, tr("Sequence Length"), tr("30 ms"), tr("")); dialog->registerWidgetHelp(m_ui.sequenceLength, tr("Sequence Length"), tr("30 ms"), tr(""));
dialog->registerWidgetHelp(m_ui.seekWindowSize, tr("Seekwindow Size"), tr("20 ms"), tr("")); dialog->registerWidgetHelp(m_ui.seekWindowSize, tr("Seek Window Size"), tr("20 ms"), tr(""));
dialog->registerWidgetHelp(m_ui.overlap, tr("Overlap"), tr("10 ms"), tr("")); dialog->registerWidgetHelp(m_ui.overlap, tr("Overlap"), tr("10 ms"), tr(""));

2
pcsx2-qt/Settings/ControllerGlobalSettingsWidget.ui
View File

@ -122,7 +122,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
<string>The XInput source provides support for XBox 360 / XBox One / XBox Series controllers, and third party controllers which implement the XInput protocol.</string> <string>The XInput source provides support for Xbox 360 / Xbox One / Xbox Series controllers, and third party controllers which implement the XInput protocol.</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>

6
pcsx2-qt/Settings/CreateMemoryCardDialog.cpp
View File

@ -122,14 +122,14 @@ void CreateMemoryCardDialog::createCard()
if (FileMcd_GetCardInfo(nameStr).has_value()) if (FileMcd_GetCardInfo(nameStr).has_value())
{ {
QMessageBox::critical(this, tr("Create Memory Card"), QMessageBox::critical(this, tr("Create Memory Card"),
tr("Failed to create the memory card, because another card with the name '%1' already exists.").arg(name)); tr("Failed to create the Memory Card, because another card with the name '%1' already exists.").arg(name));
return; return;
} }
if (!FileMcd_CreateNewCard(nameStr, m_type, m_fileType)) if (!FileMcd_CreateNewCard(nameStr, m_type, m_fileType))
{ {
QMessageBox::critical(this, tr("Create Memory Card"), QMessageBox::critical(this, tr("Create Memory Card"),
tr("Failed to create the memory card, the log may contain more information.")); tr("Failed to create the Memory Card, the log may contain more information."));
return; return;
} }
@ -141,6 +141,6 @@ void CreateMemoryCardDialog::createCard()
} }
#endif #endif
QMessageBox::information(this, tr("Create Memory Card"), tr("Memory card '%1' created.").arg(name)); QMessageBox::information(this, tr("Create Memory Card"), tr("Memory Card '%1' created.").arg(name));
accept(); accept();
} }

12
pcsx2-qt/Settings/CreateMemoryCardDialog.ui
View File

@ -44,7 +44,7 @@
<item> <item>
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:700;&quot;&gt;Create Memory Card&lt;/span&gt;&lt;br /&gt;Enter the name of the memory card you wish to create, and choose a size. We recommend either using 8MB memory cards, or folder memory cards for best compatibility.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:700;&quot;&gt;Create Memory Card&lt;/span&gt;&lt;br /&gt;Enter the name of the Memory Card you wish to create, and choose a size. We recommend either using 8MB Memory Cards, or folder Memory Cards for best compatibility.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>Qt::RichText</enum> <enum>Qt::RichText</enum>
@ -112,7 +112,7 @@
<item> <item>
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
<string>A typical size for third-party memory cards which should work with most games.</string> <string>A typical size for third-party Memory Cards which should work with most games.</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@ -136,7 +136,7 @@
<item> <item>
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
<string>A typical size for third-party memory cards which should work with most games.</string> <string>A typical size for third-party Memory Cards which should work with most games.</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@ -184,7 +184,7 @@
<item> <item>
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="label_8">
<property name="text"> <property name="text">
<string>Store memory card contents in the host filesystem instead of a file.</string> <string>Store Memory Card contents in the host filesystem instead of a file.</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@ -208,7 +208,7 @@
<item> <item>
<widget class="QLabel" name="label_9"> <widget class="QLabel" name="label_9">
<property name="text"> <property name="text">
<string>This is the standard Sony-provisioned size PS1 memory card, and only compatible with PS1 games.</string> <string>This is the standard Sony-provisioned size PS1 Memory Card, and only compatible with PS1 games.</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@ -235,7 +235,7 @@
<item> <item>
<widget class="QLabel" name="label_10"> <widget class="QLabel" name="label_10">
<property name="text"> <property name="text">
<string>NTFS compression is built-in, fast, and completely reliable. Typically compresses memory cards (highly recommended).</string> <string>NTFS compression is built-in, fast, and completely reliable. Typically compresses Memory Cards (highly recommended).</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>

2
pcsx2-qt/Settings/DEV9DnsHostDialog.ui
View File

@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Network DNS Hosts Inport/Export</string> <string>Network DNS Hosts Import/Export</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>

18
pcsx2-qt/Settings/EmulationSettingsWidget.cpp
View File

@ -90,26 +90,26 @@ EmulationSettingsWidget::EmulationSettingsWidget(SettingsDialog* dialog, QWidget
dialog->registerWidgetHelp(m_ui.normalSpeed, tr("Normal Speed"), "100%", dialog->registerWidgetHelp(m_ui.normalSpeed, tr("Normal Speed"), "100%",
tr("Sets the target emulation speed. It is not guaranteed that this speed will be reached, " tr("Sets the target emulation speed. It is not guaranteed that this speed will be reached, "
"and if not, the emulator will run as fast as it can manage.")); "and if not, the emulator will run as fast as it can manage."));
dialog->registerWidgetHelp(m_ui.fastForwardSpeed, tr("Fast Forward Speed"), tr("User Preference"), dialog->registerWidgetHelp(m_ui.fastForwardSpeed, tr("Fast-Forward Speed"), tr("User Preference"),
tr("Sets the fast forward speed. This speed will be used when the fast forward hotkey is pressed/toggled.")); tr("Sets the fast-forward speed. This speed will be used when the fast-forward hotkey is pressed/toggled."));
dialog->registerWidgetHelp(m_ui.slowMotionSpeed, tr("Slow Motion Speed"), tr("User Preference"), dialog->registerWidgetHelp(m_ui.slowMotionSpeed, tr("Slow-Motion Speed"), tr("User Preference"),
tr("Sets the slow motion speed. This speed will be used when the slow motion hotkey is pressed/toggled.")); tr("Sets the slow-motion speed. This speed will be used when the slow-motion hotkey is pressed/toggled."));
dialog->registerWidgetHelp(m_ui.speedLimiter, tr("Speed Limiter"), tr("Checked"), dialog->registerWidgetHelp(m_ui.speedLimiter, tr("Speed Limiter"), tr("Checked"),
tr("Limits the emulation to the appropriate framerate for the currently running game.")); tr("Limits the emulation to the appropriate framerate for the currently running game."));
dialog->registerWidgetHelp(m_ui.eeCycleRate, tr("Cycle Rate"), tr("100% (Normal Speed)"), dialog->registerWidgetHelp(m_ui.eeCycleRate, tr("EE Cycle Rate"), tr("100% (Normal Speed)"),
tr("Higher values may increase internal framerate in games, but will increase CPU requirements substantially. " tr("Higher values may increase internal framerate in games, but will increase CPU requirements substantially. "
"Lower values will reduce the CPU load allowing lightweight games to run full speed on weaker CPUs.")); "Lower values will reduce the CPU load allowing lightweight games to run full speed on weaker CPUs."));
dialog->registerWidgetHelp(m_ui.eeCycleSkipping, tr("Cycle Skip"), tr("Disabled"), dialog->registerWidgetHelp(m_ui.eeCycleSkipping, tr("EE Cycle Skip"), tr("Disabled"),
tr("Makes the emulated Emotion Engine skip cycles. " tr("Makes the emulated Emotion Engine skip cycles. "
"Helps a small subset of games like SOTC. Most of the time it's harmful to performance.")); "Helps a small subset of games like SOTC. Most of the time it's harmful to performance."));
dialog->registerWidgetHelp(m_ui.affinityControl, tr("Affinity Control"), tr("Disabled"), dialog->registerWidgetHelp(m_ui.affinityControl, tr("Affinity Control"), tr("Disabled"),
tr("Sets the priority for specific threads in a specific order ignoring the system scheduler. " tr("Sets the priority for specific threads in a specific order ignoring the system scheduler. "
"May help CPUs with big (P) and little (E) cores (e.g. Intel 12th or newer generation CPUs from Intel or other vendors such as AMD)")); "May help CPUs with big (P) and little (E) cores (e.g. Intel 12th or newer generation CPUs from Intel or other vendors such as AMD)."));
dialog->registerWidgetHelp(m_ui.MTVU, tr("MTVU (Multi-threaded VU1)"), tr("Checked"), dialog->registerWidgetHelp(m_ui.MTVU, tr("Enable Multithreaded VU1 (MTVU1)"), tr("Checked"),
tr("Generally a speedup on CPUs with 3 or more threads. " tr("Generally a speedup on CPUs with 3 or more threads. "
"Safe for most games, but a few are incompatible and may hang.")); "Safe for most games, but a few are incompatible and may hang."));
dialog->registerWidgetHelp(m_ui.instantVU1, tr("Instant VU1"), tr("Checked"), dialog->registerWidgetHelp(m_ui.instantVU1, tr("Enable Instant VU1"), tr("Checked"),
tr("Runs VU1 instantly. Provides a modest speed improvement in most games. " tr("Runs VU1 instantly. Provides a modest speed improvement in most games. "
"Safe for most games, but a few games may exhibit graphical errors.")); "Safe for most games, but a few games may exhibit graphical errors."));
dialog->registerWidgetHelp(m_ui.fastCDVD, tr("Enable Fast CDVD"), tr("Unchecked"), dialog->registerWidgetHelp(m_ui.fastCDVD, tr("Enable Fast CDVD"), tr("Unchecked"),

6
pcsx2-qt/Settings/EmulationSettingsWidget.ui
View File

@ -51,14 +51,14 @@
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
<string>Slow Motion Speed:</string> <string>Slow-Motion Speed:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
<string>Fast Forward Speed:</string> <string>Fast-Forward Speed:</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -97,7 +97,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QCheckBox" name="MTVU"> <widget class="QCheckBox" name="MTVU">
<property name="text"> <property name="text">
<string>Enable Multi-Threaded VU1 (MTVU)</string> <string>Enable Multithreaded VU1 (MTVU)</string>
</property> </property>
</widget> </widget>
</item> </item>

33
pcsx2-qt/Settings/GraphicsSettingsWidget.cpp
View File

@ -416,23 +416,24 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsDialog* dialog, QWidget*
tr("Selects the quality at which screenshots will be compressed. Higher values preserve more detail for JPEG, and reduce file " tr("Selects the quality at which screenshots will be compressed. Higher values preserve more detail for JPEG, and reduce file "
"size for PNG.")); "size for PNG."));
dialog->registerWidgetHelp(m_ui.stretchY, tr("Stretch Height"), tr("100%"), dialog->registerWidgetHelp(m_ui.stretchY, tr("Vertical Stretch"), tr("100%"),
tr("Stretches (> 100%) or squashes (< 100%) the vertical component of the display")); // Characters </> need to be converted into entities in order to be shown correctly.
tr("Stretches (&lt; 100%) or squashes (&gt; 100%) the vertical component of the display."));
dialog->registerWidgetHelp(m_ui.fullscreenModes, tr("Fullscreen Mode"), tr("Borderless Fullscreen"), dialog->registerWidgetHelp(m_ui.fullscreenModes, tr("Fullscreen Mode"), tr("Borderless Fullscreen"),
tr("Chooses the fullscreen resolution and frequency.")); tr("Chooses the fullscreen resolution and frequency."));
dialog->registerWidgetHelp(m_ui.cropLeft, tr("Left"), tr("0px"), dialog->registerWidgetHelp(m_ui.cropLeft, tr("Left"), tr("0px"),
tr("Changes number of pixels cropped from the left side of the display")); tr("Changes the number of pixels cropped from the left side of the display."));
dialog->registerWidgetHelp(m_ui.cropTop, tr("Top"), tr("0px"), dialog->registerWidgetHelp(m_ui.cropTop, tr("Top"), tr("0px"),
tr("Changes number of pixels cropped from the top of the display")); tr("Changes the number of pixels cropped from the top of the display."));
dialog->registerWidgetHelp(m_ui.cropRight, tr("Right"), tr("0px"), dialog->registerWidgetHelp(m_ui.cropRight, tr("Right"), tr("0px"),
tr("Changes number of pixels cropped from the right side of the display")); tr("Changes the number of pixels cropped from the right side of the display."));
dialog->registerWidgetHelp(m_ui.cropBottom, tr("Bottom"), tr("0px"), dialog->registerWidgetHelp(m_ui.cropBottom, tr("Bottom"), tr("0px"),
tr("Changes number of pixels cropped from the bottom of the display")); tr("Changes the number of pixels cropped from the bottom of the display."));
} }
// Rendering tab // Rendering tab
@ -450,7 +451,7 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsDialog* dialog, QWidget*
m_ui.textureFiltering, tr("Texture Filtering"), tr("Bilinear (PS2)"), tr("Control the texture filtering of the emulation.")); m_ui.textureFiltering, tr("Texture Filtering"), tr("Bilinear (PS2)"), tr("Control the texture filtering of the emulation."));
dialog->registerWidgetHelp(m_ui.trilinearFiltering, tr("Trilinear Filtering"), tr("Automatic (Default)"), dialog->registerWidgetHelp(m_ui.trilinearFiltering, tr("Trilinear Filtering"), tr("Automatic (Default)"),
tr("Control the texture tri-filtering of the emulation.")); tr("Control the texture's trilinear filtering of the emulation."));
dialog->registerWidgetHelp(m_ui.anisotropicFiltering, tr("Anisotropic Filtering"), tr("Off (Default)"), dialog->registerWidgetHelp(m_ui.anisotropicFiltering, tr("Anisotropic Filtering"), tr("Off (Default)"),
tr("Reduces texture aliasing at extreme viewing angles.")); tr("Reduces texture aliasing at extreme viewing angles."));
@ -468,7 +469,7 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsDialog* dialog, QWidget*
tr("Control the accuracy level of the GS blending unit emulation.<br> " tr("Control the accuracy level of the GS blending unit emulation.<br> "
"The higher the setting, the more blending is emulated in the shader accurately, and the higher the speed penalty will " "The higher the setting, the more blending is emulated in the shader accurately, and the higher the speed penalty will "
"be.<br> " "be.<br> "
"Do note that Direct3D's blending is reduced in capability compared to OpenGL/Vulkan")); "Do note that Direct3D's blending is reduced in capability compared to OpenGL/Vulkan."));
dialog->registerWidgetHelp(m_ui.texturePreloading, tr("Texture Preloading"), tr("Full (Hash Cache)"), dialog->registerWidgetHelp(m_ui.texturePreloading, tr("Texture Preloading"), tr("Full (Hash Cache)"),
tr("Uploads entire textures at once instead of small pieces, avoiding redundant uploads when possible. " tr("Uploads entire textures at once instead of small pieces, avoiding redundant uploads when possible. "
@ -538,9 +539,9 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsDialog* dialog, QWidget*
dialog->registerWidgetHelp(m_ui.disablePartialInvalidation, tr("Disable Partial Source Invalidation"), tr("Unchecked"), dialog->registerWidgetHelp(m_ui.disablePartialInvalidation, tr("Disable Partial Source Invalidation"), tr("Unchecked"),
tr("By default, the texture cache handles partial invalidations. Unfortunately it is very costly to compute CPU wise. " tr("By default, the texture cache handles partial invalidations. Unfortunately it is very costly to compute CPU wise. "
"This hack replaces the partial invalidation with a complete deletion of the texture to reduce the CPU load. " "This hack replaces the partial invalidation with a complete deletion of the texture to reduce the CPU load. "
"It helps snowblind engine games.")); "It helps with the Snowblind engine games."));
dialog->registerWidgetHelp(m_ui.frameBufferConversion, tr("Frame Buffer Conversion"), tr("Unchecked"), dialog->registerWidgetHelp(m_ui.frameBufferConversion, tr("Framebuffer Conversion"), tr("Unchecked"),
tr("Convert 4-bit and 8-bit frame buffer on the CPU instead of the GPU. " tr("Convert 4-bit and 8-bit framebuffer on the CPU instead of the GPU. "
"Helps Harry Potter and Stuntman games. It has a big impact on performance.")); "Helps Harry Potter and Stuntman games. It has a big impact on performance."));
dialog->registerWidgetHelp(m_ui.preloadFrameData, tr("Preload Frame Data"), tr("Unchecked"), dialog->registerWidgetHelp(m_ui.preloadFrameData, tr("Preload Frame Data"), tr("Unchecked"),
@ -581,7 +582,7 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsDialog* dialog, QWidget*
"too.")); "too."));
dialog->registerWidgetHelp(m_ui.alignSprite, tr("Align Sprite"), tr("Unchecked"), dialog->registerWidgetHelp(m_ui.alignSprite, tr("Align Sprite"), tr("Unchecked"),
tr("Fixes issues with upscaling(vertical lines) in Namco games like Ace Combat, Tekken, Soul Calibur, etc.")); tr("Fixes issues with upscaling (vertical lines) in Namco games like Ace Combat, Tekken, Soul Calibur, etc."));
dialog->registerWidgetHelp(m_ui.wildHack, tr("Wild Arms Hack"), tr("Unchecked"), dialog->registerWidgetHelp(m_ui.wildHack, tr("Wild Arms Hack"), tr("Unchecked"),
tr("Lowers the GS precision to avoid gaps between pixels when upscaling. Fixes the text on Wild Arms games.")); tr("Lowers the GS precision to avoid gaps between pixels when upscaling. Fixes the text on Wild Arms games."));
@ -637,10 +638,10 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsDialog* dialog, QWidget*
tr("Shows on-screen-display messages when events occur such as save states being " tr("Shows on-screen-display messages when events occur such as save states being "
"created/loaded, screenshots being taken, etc.")); "created/loaded, screenshots being taken, etc."));
dialog->registerWidgetHelp(m_ui.osdShowFPS, tr("Show Game Frame Rate"), tr("Unchecked"), dialog->registerWidgetHelp(m_ui.osdShowFPS, tr("Show FPS"), tr("Unchecked"),
tr("Shows the internal frame rate of the game in the top-right corner of the display.")); tr("Shows the internal frame rate of the game in the top-right corner of the display."));
dialog->registerWidgetHelp(m_ui.osdShowSpeed, tr("Show Emulation Speed"), tr("Unchecked"), dialog->registerWidgetHelp(m_ui.osdShowSpeed, tr("Show Speed Percentages"), tr("Unchecked"),
tr("Shows the current emulation speed of the system in the top-right corner of the display as a percentage.")); tr("Shows the current emulation speed of the system in the top-right corner of the display as a percentage."));
dialog->registerWidgetHelp(m_ui.osdShowResolution, tr("Show Resolution"), tr("Unchecked"), dialog->registerWidgetHelp(m_ui.osdShowResolution, tr("Show Resolution"), tr("Unchecked"),
@ -654,7 +655,7 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsDialog* dialog, QWidget*
tr("Shows counters for internal graphical utilization, useful for debugging.")); tr("Shows counters for internal graphical utilization, useful for debugging."));
dialog->registerWidgetHelp(m_ui.osdShowIndicators, tr("Show Indicators"), tr("Unchecked"), dialog->registerWidgetHelp(m_ui.osdShowIndicators, tr("Show Indicators"), tr("Unchecked"),
tr("Shows OSD icon indicators for emulation states such as Pausing, Turbo, Fast Forward, and Slow Motion.")); tr("Shows OSD icon indicators for emulation states such as Pausing, Turbo, Fast-Forward, and Slow-Motion."));
dialog->registerWidgetHelp(m_ui.osdShowSettings, tr("Show Settings"), tr("Unchecked"), dialog->registerWidgetHelp(m_ui.osdShowSettings, tr("Show Settings"), tr("Unchecked"),
tr("Displays various settings and the current values of those settings, useful for debugging.")); tr("Displays various settings and the current values of those settings, useful for debugging."));
@ -699,7 +700,7 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsDialog* dialog, QWidget*
dialog->registerWidgetHelp(m_ui.disableDualSource, tr("Disable Dual Source Blending"), tr("Unchecked"), tr("")); dialog->registerWidgetHelp(m_ui.disableDualSource, tr("Disable Dual Source Blending"), tr("Unchecked"), tr(""));
dialog->registerWidgetHelp(m_ui.disableFramebufferFetch, tr("Disable Frame Buffer Fetch"), tr("Unchecked"), tr("")); dialog->registerWidgetHelp(m_ui.disableFramebufferFetch, tr("Disable Framebuffer Fetch"), tr("Unchecked"), tr(""));
dialog->registerWidgetHelp(m_ui.skipPresentingDuplicateFrames, tr("Skip Presenting Duplicate Frames"), tr("Unchecked"), dialog->registerWidgetHelp(m_ui.skipPresentingDuplicateFrames, tr("Skip Presenting Duplicate Frames"), tr("Unchecked"),
tr("Detects when idle frames are being presented in 25/30fps games, and skips presenting those frames. The frame is still " tr("Detects when idle frames are being presented in 25/30fps games, and skips presenting those frames. The frame is still "

8
pcsx2-qt/Settings/GraphicsSettingsWidget.ui
View File

@ -143,7 +143,7 @@
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="label_23"> <widget class="QLabel" name="label_23">
<property name="text"> <property name="text">
<string>De-interlacing:</string> <string>Deinterlacing:</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -338,7 +338,7 @@
<item row="1" column="1"> <item row="1" column="1">
<widget class="QCheckBox" name="integerScaling"> <widget class="QCheckBox" name="integerScaling">
<property name="text"> <property name="text">
<string>Integer Upscaling</string> <string>Integer Scaling</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -1630,7 +1630,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QCheckBox" name="osdShowMessages"> <widget class="QCheckBox" name="osdShowMessages">
<property name="text"> <property name="text">
<string>Show Notifications</string> <string>Show OSD Messages</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -1651,7 +1651,7 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QCheckBox" name="osdShowSpeed"> <widget class="QCheckBox" name="osdShowSpeed">
<property name="text"> <property name="text">
<string>Show Speed</string> <string>Show Speed Percentages</string>
</property> </property>
</widget> </widget>
</item> </item>

2
pcsx2-qt/Settings/InterfaceSettingsWidget.cpp
View File

@ -152,7 +152,7 @@ InterfaceSettingsWidget::InterfaceSettingsWidget(SettingsDialog* dialog, QWidget
m_ui.hideMainWindow, tr("Hide Main Window When Running"), tr("Unchecked"), m_ui.hideMainWindow, tr("Hide Main Window When Running"), tr("Unchecked"),
tr("Hides the main window (with the game list) when a game is running, requires Render To Separate Window to be enabled.")); tr("Hides the main window (with the game list) when a game is running, requires Render To Separate Window to be enabled."));
dialog->registerWidgetHelp(m_ui.perGameSettings, tr("Enable Per-Game Settings"), tr("Checked"), dialog->registerWidgetHelp(m_ui.perGameSettings, tr("Enable Per-Game Settings"), tr("Checked"),
tr("When enabled, custom per-game settings will be appled. Disable to always use the global configuration.")); tr("When enabled, custom per-game settings will be applied. Disable to always use the global configuration."));
dialog->registerWidgetHelp( dialog->registerWidgetHelp(
m_ui.discordPresence, tr("Enable Discord Presence"), tr("Unchecked"), m_ui.discordPresence, tr("Enable Discord Presence"), tr("Unchecked"),
tr("Shows the game you are currently playing as part of your profile in Discord.")); tr("Shows the game you are currently playing as part of your profile in Discord."));

26
pcsx2-qt/Settings/MemoryCardConvertDialog.cpp
View File

@ -49,22 +49,22 @@ MemoryCardConvertDialog::MemoryCardConvertDialog(QWidget* parent, QString select
switch (m_srcCardInfo.type) switch (m_srcCardInfo.type)
{ {
case MemoryCardType::File: case MemoryCardType::File:
SetType(MemoryCardType::Folder, MemoryCardFileType::Unknown, "Uses a folder on your PC filesystem, instead of a file. Infinite capacity, while keeping the same compatibility as an 8 MB memory card."); SetType(MemoryCardType::Folder, MemoryCardFileType::Unknown, "Uses a folder on your PC filesystem, instead of a file. Infinite capacity, while keeping the same compatibility as an 8 MB Memory Card.");
break; break;
case MemoryCardType::Folder: case MemoryCardType::Folder:
switch (m_ui.conversionTypeSelect->currentData().toInt()) switch (m_ui.conversionTypeSelect->currentData().toInt())
{ {
case 8: case 8:
SetType(MemoryCardType::File, MemoryCardFileType::PS2_8MB, "A standard, 8 MB memory card. Most compatible, but smallest capacity."); SetType(MemoryCardType::File, MemoryCardFileType::PS2_8MB, "A standard, 8 MB Memory Card. Most compatible, but smallest capacity.");
break; break;
case 16: case 16:
SetType(MemoryCardType::File, MemoryCardFileType::PS2_16MB, "2x larger than a standard memory card. May have some compatibility issues."); SetType(MemoryCardType::File, MemoryCardFileType::PS2_16MB, "2x larger than a standard Memory Card. May have some compatibility issues.");
break; break;
case 32: case 32:
SetType(MemoryCardType::File, MemoryCardFileType::PS2_32MB, "4x larger than a standard memory card. Likely to have compatibility issues."); SetType(MemoryCardType::File, MemoryCardFileType::PS2_32MB, "4x larger than a standard Memory Card. Likely to have compatibility issues.");
break; break;
case 64: case 64:
SetType(MemoryCardType::File, MemoryCardFileType::PS2_64MB, "8x larger than a standard memory card. Likely to have compatibility issues."); SetType(MemoryCardType::File, MemoryCardFileType::PS2_64MB, "8x larger than a standard Memory Card. Likely to have compatibility issues.");
break; break;
default: default:
QMessageBox::critical(this, tr("Convert Memory Card Failed"), tr("Invalid MemoryCardType")); QMessageBox::critical(this, tr("Convert Memory Card Failed"), tr("Invalid MemoryCardType"));
@ -104,7 +104,7 @@ void MemoryCardConvertDialog::onProgressUpdated(int value, int range)
void MemoryCardConvertDialog::onThreadFinished() void MemoryCardConvertDialog::onThreadFinished()
{ {
QMessageBox::information(this, tr("Conversion Complete"), tr("Memory card \"%1\" converted to \"%2\"").arg(m_selectedCard).arg(m_destCardName)); QMessageBox::information(this, tr("Conversion Complete"), tr("Memory Card \"%1\" converted to \"%2\"").arg(m_selectedCard).arg(m_destCardName));
accept(); accept();
} }
@ -151,7 +151,7 @@ bool MemoryCardConvertDialog::SetupPicklist()
{ {
case MemoryCardType::File: case MemoryCardType::File:
m_ui.conversionTypeSelect->addItems({"Folder"}); m_ui.conversionTypeSelect->addItems({"Folder"});
SetType(MemoryCardType::Folder, MemoryCardFileType::Unknown, "Uses a folder on your PC filesystem, instead of a file. Infinite capacity, while keeping the same compatibility as an 8 MB memory card."); SetType(MemoryCardType::Folder, MemoryCardFileType::Unknown, "Uses a folder on your PC filesystem, instead of a file. Infinite capacity, while keeping the same compatibility as an 8 MB Memory Card.");
break; break;
case MemoryCardType::Folder: case MemoryCardType::Folder:
// Compute which file types should be allowed. // Compute which file types should be allowed.
@ -225,7 +225,7 @@ bool MemoryCardConvertDialog::SetupPicklist()
if (!typeSet) if (!typeSet)
{ {
QMessageBox::critical(this, tr("Cannot Convert Memory Card"), tr("Your folder memory card has too much data inside it to be converted to a file memory card. The largest supported file memory card has a capacity of 64 MB. To convert your folder memory card, you must remove game folders until its size is 64 MB or less.")); QMessageBox::critical(this, tr("Cannot Convert Memory Card"), tr("Your folder Memory Card has too much data inside it to be converted to a file Memory Card. The largest supported file Memory Card has a capacity of 64 MB. To convert your folder Memory Card, you must remove game folders until its size is 64 MB or less."));
return false; return false;
} }
@ -286,25 +286,25 @@ void MemoryCardConvertDialog::SetType(MemoryCardType type, MemoryCardFileType fi
void MemoryCardConvertDialog::SetType_8() void MemoryCardConvertDialog::SetType_8()
{ {
SetType(MemoryCardType::File, MemoryCardFileType::PS2_8MB, "A standard, 8 MB memory card. Most compatible, but smallest capacity."); SetType(MemoryCardType::File, MemoryCardFileType::PS2_8MB, "A standard, 8 MB Memory Card. Most compatible, but smallest capacity.");
} }
void MemoryCardConvertDialog::SetType_16() void MemoryCardConvertDialog::SetType_16()
{ {
SetType(MemoryCardType::File, MemoryCardFileType::PS2_16MB, "2x larger as a standard memory card. May have some compatibility issues."); SetType(MemoryCardType::File, MemoryCardFileType::PS2_16MB, "2x larger as a standard Memory Card. May have some compatibility issues.");
} }
void MemoryCardConvertDialog::SetType_32() void MemoryCardConvertDialog::SetType_32()
{ {
SetType(MemoryCardType::File, MemoryCardFileType::PS2_32MB, "4x larger than a standard memory card. Likely to have compatibility issues."); SetType(MemoryCardType::File, MemoryCardFileType::PS2_32MB, "4x larger than a standard Memory Card. Likely to have compatibility issues.");
} }
void MemoryCardConvertDialog::SetType_64() void MemoryCardConvertDialog::SetType_64()
{ {
SetType(MemoryCardType::File, MemoryCardFileType::PS2_64MB, "8x larger than a standard memory card. Likely to have compatibility issues."); SetType(MemoryCardType::File, MemoryCardFileType::PS2_64MB, "8x larger than a standard Memory Card. Likely to have compatibility issues.");
} }
void MemoryCardConvertDialog::SetType_Folder() void MemoryCardConvertDialog::SetType_Folder()
{ {
SetType(MemoryCardType::Folder, MemoryCardFileType::Unknown, "Uses a folder on your PC filesystem, instead of a file. Infinite capacity, while keeping the same compatibility as an 8 MB memory card."); SetType(MemoryCardType::Folder, MemoryCardFileType::Unknown, "Uses a folder on your PC filesystem, instead of a file. Infinite capacity, while keeping the same compatibility as an 8 MB Memory Card.");
} }

2
pcsx2-qt/Settings/MemoryCardConvertDialog.ui
View File

@ -109,7 +109,7 @@
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
hr { height: 1px; border-width: 0; } hr { height: 1px; border-width: 0; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Note: Converting a memory card creates a COPY of your existing memory card. It does NOT delete, modify, or replace your existing memory card.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Note: Converting a Memory Card creates a COPY of your existing Memory Card. It does NOT delete, modify, or replace your existing Memory Card.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QTextBrowser" name="conversionTypeDescription"> <widget class="QTextBrowser" name="conversionTypeDescription">

8
pcsx2-qt/Settings/MemoryCardConvertWorker.cpp
View File

@ -84,7 +84,7 @@ bool MemoryCardConvertWorker::ConvertToFile(const std::string& srcFolderName, co
if (!writeResult) if (!writeResult)
{ {
Console.Error("%s(%s, %s, %d) Failed to write memory card contents to file", __FUNCTION__, srcPath.c_str(), destPath.c_str(), type); Console.Error("%s(%s, %s, %d) Failed to write Memory Card contents to file", __FUNCTION__, srcPath.c_str(), destPath.c_str(), type);
return false; return false;
} }
#ifdef _WIN32 #ifdef _WIN32
@ -112,7 +112,7 @@ bool MemoryCardConvertWorker::ConvertToFolder(const std::string& srcFileName, co
if (!sourceBufferOpt.has_value()) if (!sourceBufferOpt.has_value())
{ {
Console.Error("%s(%s, %s, %d) Failed to open file memory card!", __FUNCTION__, srcFileName.c_str(), destFolderName.c_str(), type); Console.Error("%s(%s, %s, %d) Failed to open file Memory Card!", __FUNCTION__, srcFileName.c_str(), destFolderName.c_str(), type);
return false; return false;
} }
@ -147,8 +147,8 @@ bool MemoryCardConvertWorker::ConvertToFolder(const std::string& srcFileName, co
targetFolderMemoryCard.Close(); targetFolderMemoryCard.Close();
// If the source file memory card was larger than 8 MB, the raw copy will have also made the superblock of // If the source file Memory Card was larger than 8 MB, the raw copy will have also made the superblock of
// the destination folder memory card larger than 8 MB. For compatibility, we always want folder memory cards // the destination folder Memory Card larger than 8 MB. For compatibility, we always want folder Memory Cards
// to report 8 MB, so we'll override that here. Don't do this on the simulated run, only the actual. // to report 8 MB, so we'll override that here. Don't do this on the simulated run, only the actual.
if (!simulateWrites && sourceBuffer.size() != FolderMemoryCard::TotalSizeRaw) if (!simulateWrites && sourceBuffer.size() != FolderMemoryCard::TotalSizeRaw)
{ {

14
pcsx2-qt/Settings/MemoryCardSettingsWidget.cpp
View File

@ -71,8 +71,8 @@ MemoryCardSettingsWidget::MemoryCardSettingsWidget(SettingsDialog* dialog, QWidg
refresh(); refresh();
dialog->registerWidgetHelp(m_ui.autoEject, tr("Auto-eject memory cards when loading save states"), tr("Checked"), dialog->registerWidgetHelp(m_ui.autoEject, tr("Auto-eject Memory Cards when loading save states"), tr("Checked"),
tr("Avoids broken memory card saves. May not work with some games such as Guitar Hero.")); tr("Avoids broken Memory Card saves. May not work with some games such as Guitar Hero."));
dialog->registerWidgetHelp(m_ui.automaticManagement, tr("Automatically manage saves based on running game"), tr("Checked"), dialog->registerWidgetHelp(m_ui.automaticManagement, tr("Automatically manage saves based on running game"), tr("Checked"),
tr("(Folder type only / Card size: Auto) Loads only the relevant booted game saves, ignoring others. Avoids running out of space for saves.")); tr("(Folder type only / Card size: Auto) Loads only the relevant booted game saves, ignoring others. Avoids running out of space for saves."));
@ -99,7 +99,7 @@ void MemoryCardSettingsWidget::setupAdditionalUi()
for (u32 i = 0; i < static_cast<u32>(m_slots.size()); i++) for (u32 i = 0; i < static_cast<u32>(m_slots.size()); i++)
createSlotWidgets(&m_slots[i], i); createSlotWidgets(&m_slots[i], i);
// button to swap memory cards // button to swap Memory Cards
QToolButton* swap_button = new QToolButton(m_ui.portGroupBox); QToolButton* swap_button = new QToolButton(m_ui.portGroupBox);
swap_button->setIcon(QIcon::fromTheme("arrow-left-right-line")); swap_button->setIcon(QIcon::fromTheme("arrow-left-right-line"));
swap_button->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding); swap_button->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
@ -156,7 +156,7 @@ void MemoryCardSettingsWidget::tryInsertCard(u32 slot, const QString& newCard)
const std::vector<AvailableMcdInfo> mcds(FileMcd_GetAvailableCards(true)); const std::vector<AvailableMcdInfo> mcds(FileMcd_GetAvailableCards(true));
if (std::none_of(mcds.begin(), mcds.end(), [&newCardStr](const AvailableMcdInfo& mcd) { return mcd.name == newCardStr; })) if (std::none_of(mcds.begin(), mcds.end(), [&newCardStr](const AvailableMcdInfo& mcd) { return mcd.name == newCardStr; }))
{ {
QMessageBox::critical(this, tr("Error"), tr("This memory card is unknown.")); QMessageBox::critical(this, tr("Error"), tr("This Memory Card is unknown."));
return; return;
} }
@ -218,7 +218,7 @@ void MemoryCardSettingsWidget::deleteCard()
return; return;
if (QMessageBox::question(QtUtils::GetRootWidget(this), tr("Delete Memory Card"), if (QMessageBox::question(QtUtils::GetRootWidget(this), tr("Delete Memory Card"),
tr("Are you sure you wish to delete the memory card '%1'?\n\n" tr("Are you sure you wish to delete the Memory Card '%1'?\n\n"
"This action cannot be reversed, and you will lose any saves on the card.") "This action cannot be reversed, and you will lose any saves on the card.")
.arg(selectedCard)) != QMessageBox::Yes) .arg(selectedCard)) != QMessageBox::Yes)
{ {
@ -228,7 +228,7 @@ void MemoryCardSettingsWidget::deleteCard()
if (!FileMcd_DeleteCard(selectedCard.toStdString())) if (!FileMcd_DeleteCard(selectedCard.toStdString()))
{ {
QMessageBox::critical(QtUtils::GetRootWidget(this), tr("Delete Memory Card"), QMessageBox::critical(QtUtils::GetRootWidget(this), tr("Delete Memory Card"),
tr("Failed to delete the memory card. The log may have more information.")); tr("Failed to delete the Memory Card. The log may have more information."));
return; return;
} }
@ -264,7 +264,7 @@ void MemoryCardSettingsWidget::renameCard()
if (!FileMcd_RenameCard(selectedCard.toStdString(), newNameStr)) if (!FileMcd_RenameCard(selectedCard.toStdString(), newNameStr))
{ {
QMessageBox::critical(QtUtils::GetRootWidget(this), tr("Rename Memory Card"), QMessageBox::critical(QtUtils::GetRootWidget(this), tr("Rename Memory Card"),
tr("Failed to rename memory card. The log may contain more information.")); tr("Failed to rename Memory Card. The log may contain more information."));
return; return;
} }

2
pcsx2-qt/Settings/MemoryCardSettingsWidget.ui
View File

@ -198,7 +198,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QCheckBox" name="autoEject"> <widget class="QCheckBox" name="autoEject">
<property name="text"> <property name="text">
<string>Auto-eject memory cards when loading save states</string> <string>Auto-eject Memory Cards when loading save states</string>
</property> </property>
</widget> </widget>
</item> </item>

6
pcsx2-qt/Settings/SettingsDialog.cpp
View File

@ -113,9 +113,9 @@ void SettingsDialog::setupUi(const GameList::Entry* game)
// Only show the game fixes for per-game settings, there's really no reason to be setting them globally. // Only show the game fixes for per-game settings, there's really no reason to be setting them globally.
if (show_advanced_settings && isPerGameSettings()) if (show_advanced_settings && isPerGameSettings())
{ {
addWidget(m_game_fix_settings_widget = new GameFixSettingsWidget(this, m_ui.settingsContainer), tr("Game Fix"), addWidget(m_game_fix_settings_widget = new GameFixSettingsWidget(this, m_ui.settingsContainer), tr("Game Fixes"),
QStringLiteral("close-line"), QStringLiteral("close-line"),
tr("<strong>Game Fix Settings</strong><hr>Gamefixes can work around incorrect emulation in some titles.<br>However, they can " tr("<strong>Game Fixes Settings</strong><hr>Game Fixes can work around incorrect emulation in some titles.<br>However, they can "
"also cause problems in games if used incorrectly.<br>It is best to leave them all disabled unless advised otherwise.")); "also cause problems in games if used incorrectly.<br>It is best to leave them all disabled unless advised otherwise."));
} }
@ -126,7 +126,7 @@ void SettingsDialog::setupUi(const GameList::Entry* game)
tr("<strong>Audio Settings</strong><hr>These options control the audio output of the console.<br><br>Mouse over an option for " tr("<strong>Audio Settings</strong><hr>These options control the audio output of the console.<br><br>Mouse over an option for "
"additional information.")); "additional information."));
// for now, memory cards aren't settable per-game // for now, Memory Cards aren't settable per-game
if (!isPerGameSettings()) if (!isPerGameSettings())
{ {
addWidget(m_memory_card_settings = new MemoryCardSettingsWidget(this, m_ui.settingsContainer), tr("Memory Cards"), addWidget(m_memory_card_settings = new MemoryCardSettingsWidget(this, m_ui.settingsContainer), tr("Memory Cards"),