From b47054b4c2eeefa54859d705811915c77ee76384 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 1 Apr 2020 13:56:17 +0200 Subject: [PATCH 01/11] Linguistic changes Fixed some typos, added some ending periods to tooltips, changed some terms to follow the official namings, unified one tooltip so the repeated structure is followed. --- rpcs3/Emu/Cell/Modules/cellSysutil.cpp | 8 ++--- rpcs3/Emu/Io/KeyboardHandler.cpp | 20 +++++------ rpcs3/rpcs3qt/game_compatibility.cpp | 2 +- rpcs3/rpcs3qt/main_window.ui | 50 +++++++++++++------------- rpcs3/rpcs3qt/pad_settings_dialog.ui | 6 ++-- rpcs3/rpcs3qt/settings_dialog.ui | 8 ++--- rpcs3/rpcs3qt/tooltips.h | 8 ++--- 7 files changed, 51 insertions(+), 51 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellSysutil.cpp b/rpcs3/Emu/Cell/Modules/cellSysutil.cpp index 2a14cfedea66..cb6b1f7d37c8 100644 --- a/rpcs3/Emu/Cell/Modules/cellSysutil.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSysutil.cpp @@ -88,18 +88,18 @@ void fmt_class_string::format(std::string& out, u64 arg) case CELL_SYSUTIL_LANG_GERMAN: return "German"; case CELL_SYSUTIL_LANG_ITALIAN: return "Italian"; case CELL_SYSUTIL_LANG_DUTCH: return "Dutch"; - case CELL_SYSUTIL_LANG_PORTUGUESE_PT: return "Portuguese (PT)"; + case CELL_SYSUTIL_LANG_PORTUGUESE_PT: return "Portuguese (Portugal)"; case CELL_SYSUTIL_LANG_RUSSIAN: return "Russian"; case CELL_SYSUTIL_LANG_KOREAN: return "Korean"; - case CELL_SYSUTIL_LANG_CHINESE_T: return "Chinese (Trad.)"; - case CELL_SYSUTIL_LANG_CHINESE_S: return "Chinese (Simp.)"; + case CELL_SYSUTIL_LANG_CHINESE_T: return "Chinese (Traditional)"; + case CELL_SYSUTIL_LANG_CHINESE_S: return "Chinese (Simplified)"; case CELL_SYSUTIL_LANG_FINNISH: return "Finnish"; case CELL_SYSUTIL_LANG_SWEDISH: return "Swedish"; case CELL_SYSUTIL_LANG_DANISH: return "Danish"; case CELL_SYSUTIL_LANG_NORWEGIAN: return "Norwegian"; case CELL_SYSUTIL_LANG_POLISH: return "Polish"; case CELL_SYSUTIL_LANG_ENGLISH_GB: return "English (UK)"; - case CELL_SYSUTIL_LANG_PORTUGUESE_BR: return "Portuguese (BR)"; + case CELL_SYSUTIL_LANG_PORTUGUESE_BR: return "Portuguese (Brazil)"; case CELL_SYSUTIL_LANG_TURKISH: return "Turkish"; } diff --git a/rpcs3/Emu/Io/KeyboardHandler.cpp b/rpcs3/Emu/Io/KeyboardHandler.cpp index 46bc510703dc..a54c32cace13 100644 --- a/rpcs3/Emu/Io/KeyboardHandler.cpp +++ b/rpcs3/Emu/Io/KeyboardHandler.cpp @@ -11,28 +11,28 @@ void fmt_class_string::format(std::string& out, u64 arg) { case CELL_KB_MAPPING_101: return "English keyboard (US standard)"; case CELL_KB_MAPPING_106: return "Japanese keyboard"; - case CELL_KB_MAPPING_106_KANA: return "Japanese keyboard(Kana state)"; + case CELL_KB_MAPPING_106_KANA: return "Japanese keyboard (Kana state)"; case CELL_KB_MAPPING_GERMAN_GERMANY: return "German keyboard"; case CELL_KB_MAPPING_SPANISH_SPAIN: return "Spanish keyboard"; case CELL_KB_MAPPING_FRENCH_FRANCE: return "French keyboard"; case CELL_KB_MAPPING_ITALIAN_ITALY: return "Italian keyboard"; case CELL_KB_MAPPING_DUTCH_NETHERLANDS: return "Dutch keyboard"; - case CELL_KB_MAPPING_PORTUGUESE_PORTUGAL: return "Portuguese keyboard(Portugal)"; + case CELL_KB_MAPPING_PORTUGUESE_PORTUGAL: return "Portuguese keyboard (Portugal)"; case CELL_KB_MAPPING_RUSSIAN_RUSSIA: return "Russian keyboard"; - case CELL_KB_MAPPING_ENGLISH_UK: return "English keyboard(UK standard)"; + case CELL_KB_MAPPING_ENGLISH_UK: return "English keyboard (UK standard)"; case CELL_KB_MAPPING_KOREAN_KOREA: return "Korean keyboard"; case CELL_KB_MAPPING_NORWEGIAN_NORWAY: return "Norwegian keyboard"; case CELL_KB_MAPPING_FINNISH_FINLAND: return "Finnish keyboard"; case CELL_KB_MAPPING_DANISH_DENMARK: return "Danish keyboard"; case CELL_KB_MAPPING_SWEDISH_SWEDEN: return "Swedish keyboard"; - case CELL_KB_MAPPING_CHINESE_TRADITIONAL: return "Chinese keyboard(Traditional)"; - case CELL_KB_MAPPING_CHINESE_SIMPLIFIED: return "Chinese keyboard(Simplified)"; - case CELL_KB_MAPPING_SWISS_FRENCH_SWITZERLAND: return "French keyboard(Switzerland)"; - case CELL_KB_MAPPING_SWISS_GERMAN_SWITZERLAND: return "German keyboard(Switzerland)"; - case CELL_KB_MAPPING_CANADIAN_FRENCH_CANADA: return "French keyboard(Canada)"; - case CELL_KB_MAPPING_BELGIAN_BELGIUM: return "French keyboard(Belgium)"; + case CELL_KB_MAPPING_CHINESE_TRADITIONAL: return "Chinese keyboard (Traditional)"; + case CELL_KB_MAPPING_CHINESE_SIMPLIFIED: return "Chinese keyboard (Simplified)"; + case CELL_KB_MAPPING_SWISS_FRENCH_SWITZERLAND: return "French keyboard (Switzerland)"; + case CELL_KB_MAPPING_SWISS_GERMAN_SWITZERLAND: return "German keyboard (Switzerland)"; + case CELL_KB_MAPPING_CANADIAN_FRENCH_CANADA: return "French keyboard (Canada)"; + case CELL_KB_MAPPING_BELGIAN_BELGIUM: return "French keyboard (Belgium)"; case CELL_KB_MAPPING_POLISH_POLAND: return "Polish keyboard"; - case CELL_KB_MAPPING_PORTUGUESE_BRAZIL: return "Portuguese keyboard(Brazil)"; + case CELL_KB_MAPPING_PORTUGUESE_BRAZIL: return "Portuguese keyboard (Brazil)"; case CELL_KB_MAPPING_TURKISH_TURKEY: return "Turkish keyboard"; } diff --git a/rpcs3/rpcs3qt/game_compatibility.cpp b/rpcs3/rpcs3qt/game_compatibility.cpp index 8c59da3b14c6..9f9072f83bc2 100644 --- a/rpcs3/rpcs3qt/game_compatibility.cpp +++ b/rpcs3/rpcs3qt/game_compatibility.cpp @@ -170,7 +170,7 @@ void game_compatibility::RequestCompatibility(bool online) compat_log.notice("Beginning compatibility database download from: %s", m_url); // Show Progress - m_progress_dialog = new progress_dialog(tr("Downloading Database"), tr("Please wait ..."), tr("Abort"), 0, 100, true); + m_progress_dialog = new progress_dialog(tr("Downloading Database"), tr("Please wait..."), tr("Abort"), 0, 100, true); m_progress_dialog->show(); curl_easy_setopt(m_curl->get_curl(), CURLOPT_URL, m_url.c_str()); diff --git a/rpcs3/rpcs3qt/main_window.ui b/rpcs3/rpcs3qt/main_window.ui index ada8433dd1ab..2781c0b07ce2 100644 --- a/rpcs3/rpcs3qt/main_window.ui +++ b/rpcs3/rpcs3qt/main_window.ui @@ -383,7 +383,7 @@ Install .pkg - Install application from pkg file + Install an application from a .pkg file. @@ -391,7 +391,7 @@ Install Firmware - Install firmware from PS3UPDAT.PUP + Install a firmware from PS3UPDAT.PUP. @@ -406,7 +406,7 @@ Pause - Start Emulation + Starts the emulation. @@ -421,7 +421,7 @@ Stop - Stop Emulation + Stops the emulation. @@ -445,7 +445,7 @@ CPU - Configure CPU + Configure the CPU setting. @@ -453,7 +453,7 @@ GPU - Configure Graphics + Configure the graphic settings. @@ -464,7 +464,7 @@ Pads - Configure Controls + Configure the control settings. @@ -472,7 +472,7 @@ Audio - Configure Audio + Configure the audio settings. @@ -480,7 +480,7 @@ Input/Output - Configure Input/Output + Configure the Input/Output settings. @@ -488,7 +488,7 @@ System - Configure System + Configure the system settings. @@ -499,7 +499,7 @@ Auto Pause - Configure Auto Pause + Configure the Auto Pause function. @@ -507,10 +507,10 @@ Exit - Exit RPCS3 + Exits RPCS3. - Exit the application + Exit the application. @@ -521,7 +521,7 @@ Save Data - Manage Save Data + Manage your saved data. @@ -532,7 +532,7 @@ Trophies - Manage Trophies + Manage your trophies. @@ -540,7 +540,7 @@ User Accounts - Manage User Accounts + Manage your user accounts. @@ -845,7 +845,7 @@ Start - Start emulation + Start the emulation. @@ -857,7 +857,7 @@ Stop - Stop emulation + Stop the emulation. @@ -869,7 +869,7 @@ Config - Configure the emulator + Configure the emulator. @@ -881,7 +881,7 @@ Pads - Configure controls + Configure your controls. @@ -893,7 +893,7 @@ FullScr - Toggle fullscreen + Toggle fullscreen. @@ -905,7 +905,7 @@ List - Switch to list mode + Switch to list mode. @@ -917,7 +917,7 @@ Grid - Switch to grid mode + Switch to grid mode. @@ -929,7 +929,7 @@ Refresh - Refresh gamelist + Refresh the gamelist. @@ -941,7 +941,7 @@ Open - Boot game + Boot the selected game. diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.ui b/rpcs3/rpcs3qt/pad_settings_dialog.ui index 424fca92ca59..a16a02db3741 100644 --- a/rpcs3/rpcs3qt/pad_settings_dialog.ui +++ b/rpcs3/rpcs3qt/pad_settings_dialog.ui @@ -391,7 +391,7 @@ - Left Analog + Left Stick @@ -1815,7 +1815,7 @@ - Right Analog + Right Stick @@ -2074,7 +2074,7 @@ - Analog Deadzones + Analog Stick Deadzones diff --git a/rpcs3/rpcs3qt/settings_dialog.ui b/rpcs3/rpcs3qt/settings_dialog.ui index a5bc51326fc9..e38c5eca43cb 100644 --- a/rpcs3/rpcs3qt/settings_dialog.ui +++ b/rpcs3/rpcs3qt/settings_dialog.ui @@ -1378,14 +1378,14 @@ - Enter with circle + Enter with the Circle button - Enter with cross + Enter with the Cross button @@ -2423,7 +2423,7 @@ - Reset the game window title to default + Reset the game window title to default. Reset @@ -2433,7 +2433,7 @@ - Edit the game window title + Edit the game window title. Edit diff --git a/rpcs3/rpcs3qt/tooltips.h b/rpcs3/rpcs3qt/tooltips.h index d575a98adf6c..b14cd6820b85 100644 --- a/rpcs3/rpcs3qt/tooltips.h +++ b/rpcs3/rpcs3qt/tooltips.h @@ -134,7 +134,7 @@ class Tooltips : public QObject const QString anti_aliasing = tr("Emulate PS3 multisampling layout.\nCan fix some otherwise difficult to solve graphics glitches.\nLow to moderate performance hit depending on your GPU hardware."); const QString anisotropic_filter = tr("Higher values increase sharpness of textures on sloped surfaces at the cost of GPU resources.\nModern GPUs can handle this setting just fine even at 16x.\nKeep this on Automatic if you want to use the original setting used by a real PS3."); const QString resolution_scale = tr("Scales the game's resolution by the given percentage.\nThe base resolution is always 1280x720.\nSet this value to 100% if you want to use the normal Resolution options."); - const QString minimum_scalable_dimension = tr("Only framebuffers greater than this size will be upscaled.\nIncreasing this value might fix problems with missing graphics when upscaling, especially when Write Color Buffers is enabled.\nDo not touch this setting if you are unsure."); + const QString minimum_scalable_dimension = tr("Only framebuffers greater than this size will be upscaled.\nIncreasing this value might fix problems with missing graphics when upscaling, especially when Write Color Buffers is enabled.\nIf unsure, don't change this option."); const QString dump_color = tr("Enable this option if you get missing graphics or broken lighting ingame.\nMight degrade performance and introduce stuttering in some cases.\nRequired for Demon's Souls."); const QString vsync = tr("By having this off you might obtain a higher frame rate at the cost of tearing artifacts in the game."); const QString strict_rendering_mode = tr("Enforces strict compliance to the API specification.\nMight result in degraded performance in some games.\nCan resolve rare cases of missing graphics and flickering.\nIf unsure, don't use this option."); @@ -180,8 +180,8 @@ class Tooltips : public QObject // system const QString system_language = tr("Some games may fail to boot if the system language is not available in the game itself.\nOther games will switch language automatically to what is selected here.\nIt is recommended leaving this on a language supported by the game."); - const QString keyboard_type = tr(" Sets the used keyboard layout.\nCurrently only US, Japanese and German layouts are fully supported at this moment."); - const QString enter_button_assignment = tr("The button used for enter/accept/confirm in system dialogs.\nChange this to use the circle button instead, which is the default configuration on Japanese systems and in many Japanese games.\nIn these cases having the cross button assigned can often lead to confusion."); + const QString keyboard_type = tr("Sets the used keyboard layout.\nCurrently only US, Japanese and German layouts are fully supported at this moment."); + const QString enter_button_assignment = tr("The button used for enter/accept/confirm in system dialogs.\nChange this to use the Circle button instead, which is the default configuration on Japanese systems and in many Japanese games.\nIn these cases having the cross button assigned can often lead to confusion."); const QString enable_host_root = tr("Required for some Homebrew.\nIf unsure, don't use this option."); const QString limit_cache_size = tr("Automatically removes older files from disk cache on boot if it grows larger than the specified value.\nGames can use the cache folder to temporarily store data outside of system memory. It is not used for long-term storage."); } settings; @@ -189,7 +189,7 @@ class Tooltips : public QObject const struct gamepad_settings { const QString null = tr("This controller is disabled and will appear as disconnected to software. Choose another handler to enable it."); - const QString keyboard = tr("While it is possible to use a keyboard as a pad in RPCS3, the use of an actual controller is strongly recommended. To bind mouse movement to a button or joystick, click on the desired button to activate it, then click and hold while dragging the mouse to a direction"); + const QString keyboard = tr("While it is possible to use a keyboard as a pad in RPCS3, the use of an actual controller is strongly recommended. To bind mouse movement to a button or joystick, click on the desired button to activate it, then click and hold while dragging the mouse to a direction."); const QString ds3_windows = tr("In order to use the DualShock 3 handler, you need to install the official DualShock 3 driver first.\nSee the RPCS3 Wiki for instructions."); const QString ds3_linux = tr("In order to use the DualShock 3 handler, you might need to add udev rules to let RPCS3 access the controller.\nSee the RPCS3 Wiki for instructions."); const QString ds3_other = tr("The DualShock 3 handler is recommended for official DualShock 3 controllers."); From 310e8da6fb3890a9370c5407981fb20e7ef484e6 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 1 Apr 2020 22:04:56 +0200 Subject: [PATCH 02/11] Removing the ending periods for the tooltips. --- rpcs3/rpcs3qt/main_window.ui | 48 ++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/rpcs3/rpcs3qt/main_window.ui b/rpcs3/rpcs3qt/main_window.ui index 2781c0b07ce2..9aa06143f011 100644 --- a/rpcs3/rpcs3qt/main_window.ui +++ b/rpcs3/rpcs3qt/main_window.ui @@ -383,7 +383,7 @@ Install .pkg - Install an application from a .pkg file. + Install an application from a .pkg file @@ -391,7 +391,7 @@ Install Firmware - Install a firmware from PS3UPDAT.PUP. + Install a firmware from PS3UPDAT.PUP @@ -406,7 +406,7 @@ Pause - Starts the emulation. + Starts the emulation @@ -421,7 +421,7 @@ Stop - Stops the emulation. + Stops the emulation @@ -445,7 +445,7 @@ CPU - Configure the CPU setting. + Configure the CPU settings @@ -453,7 +453,7 @@ GPU - Configure the graphic settings. + Configure the graphic settings @@ -464,7 +464,7 @@ Pads - Configure the control settings. + Configure the control settings @@ -472,7 +472,7 @@ Audio - Configure the audio settings. + Configure the audio settings @@ -480,7 +480,7 @@ Input/Output - Configure the Input/Output settings. + Configure the Input/Output settings @@ -488,7 +488,7 @@ System - Configure the system settings. + Configure the system settings @@ -499,7 +499,7 @@ Auto Pause - Configure the Auto Pause function. + Configure the Auto Pause function @@ -507,7 +507,7 @@ Exit - Exits RPCS3. + Exits RPCS3 Exit the application. @@ -521,7 +521,7 @@ Save Data - Manage your saved data. + Manage your saved data @@ -532,7 +532,7 @@ Trophies - Manage your trophies. + Manage your trophies @@ -540,7 +540,7 @@ User Accounts - Manage your user accounts. + Manage the user accounts @@ -845,7 +845,7 @@ Start - Start the emulation. + Start the emulation @@ -857,7 +857,7 @@ Stop - Stop the emulation. + Stop the emulation @@ -869,7 +869,7 @@ Config - Configure the emulator. + Configure the emulator @@ -881,7 +881,7 @@ Pads - Configure your controls. + Configure your controls @@ -893,7 +893,7 @@ FullScr - Toggle fullscreen. + Toggle fullscreen @@ -905,7 +905,7 @@ List - Switch to list mode. + Switch to list mode @@ -917,7 +917,7 @@ Grid - Switch to grid mode. + Switch to grid mode @@ -929,7 +929,7 @@ Refresh - Refresh the gamelist. + Refresh the gamelist @@ -941,7 +941,7 @@ Open - Boot the selected game. + Boot the selected game From c94aca0a6bc9e53fd1587629133015cf6f0113e0 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 1 Apr 2020 22:33:55 +0200 Subject: [PATCH 03/11] Restoring the old wording for popup tooltips. --- rpcs3/rpcs3qt/main_window.ui | 38 ++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/rpcs3/rpcs3qt/main_window.ui b/rpcs3/rpcs3qt/main_window.ui index 9aa06143f011..9a1b1e6b072f 100644 --- a/rpcs3/rpcs3qt/main_window.ui +++ b/rpcs3/rpcs3qt/main_window.ui @@ -383,7 +383,7 @@ Install .pkg - Install an application from a .pkg file + Install application from a .pkg file @@ -391,7 +391,7 @@ Install Firmware - Install a firmware from PS3UPDAT.PUP + Install firmware from PS3UPDAT.PUP @@ -406,7 +406,7 @@ Pause - Starts the emulation + Start emulation @@ -421,7 +421,7 @@ Stop - Stops the emulation + Stop emulation @@ -445,7 +445,7 @@ CPU - Configure the CPU settings + Configure CPU @@ -453,7 +453,7 @@ GPU - Configure the graphic settings + Configure graphics @@ -464,7 +464,7 @@ Pads - Configure the control settings + Configure controls @@ -472,7 +472,7 @@ Audio - Configure the audio settings + Configure audio @@ -480,7 +480,7 @@ Input/Output - Configure the Input/Output settings + Configure Input/Output @@ -488,7 +488,7 @@ System - Configure the system settings + Configure system @@ -507,7 +507,7 @@ Exit - Exits RPCS3 + Exit RPCS3 Exit the application. @@ -521,7 +521,7 @@ Save Data - Manage your saved data + Manage save data @@ -532,7 +532,7 @@ Trophies - Manage your trophies + Manage trophies @@ -540,7 +540,7 @@ User Accounts - Manage the user accounts + Manage user accounts @@ -845,7 +845,7 @@ Start - Start the emulation + Start emulation @@ -857,7 +857,7 @@ Stop - Stop the emulation + Stop emulation @@ -881,7 +881,7 @@ Pads - Configure your controls + Configure controls @@ -929,7 +929,7 @@ Refresh - Refresh the gamelist + Refresh gamelist @@ -941,7 +941,7 @@ Open - Boot the selected game + Boot selected game From ba3082fd576af8fea7d1b543faf15ce80492b7b2 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 3 Apr 2020 12:00:34 +0200 Subject: [PATCH 04/11] Fixing the Open tooltip. --- rpcs3/rpcs3qt/main_window.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/rpcs3qt/main_window.ui b/rpcs3/rpcs3qt/main_window.ui index 9a1b1e6b072f..af1a21a4184e 100644 --- a/rpcs3/rpcs3qt/main_window.ui +++ b/rpcs3/rpcs3qt/main_window.ui @@ -941,7 +941,7 @@ Open - Boot selected game + Boot a game From 796e5fd614fa1dc7d491aa99d410308cea8ac0bc Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 6 Apr 2020 13:46:30 +0200 Subject: [PATCH 05/11] Adding a new correction on the Accurate PPU FMA tooltip. --- rpcs3/rpcs3qt/tooltips.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/rpcs3qt/tooltips.h b/rpcs3/rpcs3qt/tooltips.h index b14cd6820b85..44d131a06869 100644 --- a/rpcs3/rpcs3qt/tooltips.h +++ b/rpcs3/rpcs3qt/tooltips.h @@ -78,7 +78,7 @@ class Tooltips : public QObject const QString set_daz_and_ftz = tr("Never use this."); const QString accurate_getllar = tr("Never use this."); const QString accurate_putlluc = tr("Never use this."); - const QString accurate_ppu_fma = tr("Enables extra accuracy on FMA instructions, which can be needed by some games.\nIt can impact performance negatively on CPUs without FMA acceleration support"); + const QString accurate_ppu_fma = tr("Enables extra accuracy on FMA instructions, which can be needed by some games.\nIt can impact performance negatively on CPUs without FMA acceleration support."); const QString accurate_rsx_access = tr("Never use this."); const QString hook_static_functions = tr("Allows to hook some functions like 'memcpy' replacing them with high-level implementations. May do nothing or break things. Experimental."); const QString gl_legacy_buffers = tr("Enables use of classic OpenGL buffers which allows capturing tools to work with RPCS3 e.g RenderDoc.\nIf unsure, don't use this option."); From 277fd488b40189e6b54e3ebcf40d95755e6ab5cd Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 6 Apr 2020 13:48:46 +0200 Subject: [PATCH 06/11] Undoing a missed string. --- rpcs3/rpcs3qt/main_window.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/rpcs3qt/main_window.ui b/rpcs3/rpcs3qt/main_window.ui index af1a21a4184e..bc431d4303cc 100644 --- a/rpcs3/rpcs3qt/main_window.ui +++ b/rpcs3/rpcs3qt/main_window.ui @@ -499,7 +499,7 @@ Auto Pause - Configure the Auto Pause function + Configure Auto Pause From b68f379d1d14d23845afed5f0d48db61387028c1 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 7 Apr 2020 12:30:10 +0200 Subject: [PATCH 07/11] Second attempt at fixing conflicts --- rpcs3/rpcs3qt/main_window.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/rpcs3qt/main_window.ui b/rpcs3/rpcs3qt/main_window.ui index bc431d4303cc..4eb86efb7670 100644 --- a/rpcs3/rpcs3qt/main_window.ui +++ b/rpcs3/rpcs3qt/main_window.ui @@ -383,7 +383,7 @@ Install .pkg - Install application from a .pkg file + Install an application from a .pkg file From b9692edce88e625f6f09903cf6b7817c1464a2db Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 1 Apr 2020 22:33:55 +0200 Subject: [PATCH 08/11] Third attempt at fixing the conflicts. --- rpcs3/rpcs3qt/main_window.ui | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rpcs3/rpcs3qt/main_window.ui b/rpcs3/rpcs3qt/main_window.ui index 4eb86efb7670..f18433afaad2 100644 --- a/rpcs3/rpcs3qt/main_window.ui +++ b/rpcs3/rpcs3qt/main_window.ui @@ -383,7 +383,7 @@ Install .pkg - Install an application from a .pkg file + Install application from a .pkg file @@ -941,7 +941,11 @@ Open +<<<<<<< HEAD Boot a game +======= + Boot selected game +>>>>>>> b2a2ca3c3... Restoring the old wording for popup tooltips. From 54aed6d498384b754e3cb88074a7debd95577fef Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 7 Apr 2020 12:41:07 +0200 Subject: [PATCH 09/11] Update main_window.ui --- rpcs3/rpcs3qt/main_window.ui | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rpcs3/rpcs3qt/main_window.ui b/rpcs3/rpcs3qt/main_window.ui index f18433afaad2..bc431d4303cc 100644 --- a/rpcs3/rpcs3qt/main_window.ui +++ b/rpcs3/rpcs3qt/main_window.ui @@ -941,11 +941,7 @@ Open -<<<<<<< HEAD Boot a game -======= - Boot selected game ->>>>>>> b2a2ca3c3... Restoring the old wording for popup tooltips. From 5e41aa63166e16a729fec7c925da11886f5f3767 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 7 Apr 2020 14:58:57 +0200 Subject: [PATCH 10/11] Finally solved the conflict. Also added some extra missing ending periods and one line jump. --- rpcs3/rpcs3qt/tooltips.h | 8 ++++---- rpcs3/rpcs3qt/trophy_notification_frame.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rpcs3/rpcs3qt/tooltips.h b/rpcs3/rpcs3qt/tooltips.h index 44d131a06869..ad7de60e9b0c 100644 --- a/rpcs3/rpcs3qt/tooltips.h +++ b/rpcs3/rpcs3qt/tooltips.h @@ -173,9 +173,9 @@ class Tooltips : public QObject const QString net_status = tr("If set to Connected, RPCS3 will allow programs to use your internet connection."); const QString psn_status = tr("If set to Simulated, RPCS3 will fake PSN connection as best as it can."); - const QString dns = tr("DNS used to resolve hostnames by applications"); - const QString psn_npid = tr("Identifier representing your account"); - const QString dns_swap = tr("DNS Swap List"); + const QString dns = tr("DNS used to resolve hostnames by applications."); + const QString psn_npid = tr("Identifier representing your PSN account."); + const QString dns_swap = tr("DNS Swap List."); // system @@ -189,7 +189,7 @@ class Tooltips : public QObject const struct gamepad_settings { const QString null = tr("This controller is disabled and will appear as disconnected to software. Choose another handler to enable it."); - const QString keyboard = tr("While it is possible to use a keyboard as a pad in RPCS3, the use of an actual controller is strongly recommended. To bind mouse movement to a button or joystick, click on the desired button to activate it, then click and hold while dragging the mouse to a direction."); + const QString keyboard = tr("While it is possible to use a keyboard as a pad in RPCS3, the use of an actual controller is strongly recommended.\nTo bind mouse movement to a button or joystick, click on the desired button to activate it, then click and hold while dragging the mouse to a direction."); const QString ds3_windows = tr("In order to use the DualShock 3 handler, you need to install the official DualShock 3 driver first.\nSee the RPCS3 Wiki for instructions."); const QString ds3_linux = tr("In order to use the DualShock 3 handler, you might need to add udev rules to let RPCS3 access the controller.\nSee the RPCS3 Wiki for instructions."); const QString ds3_other = tr("The DualShock 3 handler is recommended for official DualShock 3 controllers."); diff --git a/rpcs3/rpcs3qt/trophy_notification_frame.cpp b/rpcs3/rpcs3qt/trophy_notification_frame.cpp index 8c1b9a5193fe..3124f72def8f 100644 --- a/rpcs3/rpcs3qt/trophy_notification_frame.cpp +++ b/rpcs3/rpcs3qt/trophy_notification_frame.cpp @@ -50,7 +50,7 @@ trophy_notification_frame::trophy_notification_frame(const std::vector& i default: break; } - trophyName->setText(tr("You have earned the %1 trophy\n").arg(trophyType) + qstr(trophy.name)); + trophyName->setText(tr("You have earned the %1 trophy.\n").arg(trophyType) + qstr(trophy.name)); trophyName->setAutoFillBackground(true); trophyName->setPalette(black_background); From 3da53baee75052342aef27e9f50132e5afd8bcf9 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 7 Apr 2020 15:27:19 +0200 Subject: [PATCH 11/11] Restoring the original tooltips for Settings_dialog. --- rpcs3/rpcs3qt/settings_dialog.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpcs3/rpcs3qt/settings_dialog.ui b/rpcs3/rpcs3qt/settings_dialog.ui index e38c5eca43cb..f67836038d8b 100644 --- a/rpcs3/rpcs3qt/settings_dialog.ui +++ b/rpcs3/rpcs3qt/settings_dialog.ui @@ -2423,7 +2423,7 @@ - Reset the game window title to default. + Reset the game window title to default Reset @@ -2433,7 +2433,7 @@ - Edit the game window title. + Edit the game window title Edit