From 28e4b10fdab8615d131ee065d9422588f15de621 Mon Sep 17 00:00:00 2001
From: KamFretoZ <14798312+kamfretoz@users.noreply.github.com>
Date: Tue, 3 Sep 2024 23:09:54 +0700
Subject: [PATCH] Translation: Remove excess double quote (#11777)
* Translation: Remove excess double quote on the train controller
* Qt: Add Train Controller Icon
* Qt: Expand controller input list
* FSUI: Base Translation Update
* Qt: Update Base Translations
---
pcsx2-qt/Settings/ControllerBindingWidget.cpp | 3 +-
pcsx2-qt/Settings/ControllerSettingsWindow.ui | 30 +-
.../Settings/USBBindingWidget_RyojouhenCon.ui | 2 +-
pcsx2-qt/Translations/pcsx2-qt_en.ts | 1669 ++++++++---------
.../resources/icons/black/svg/train-line.svg | 7 +
.../resources/icons/white/svg/train-line.svg | 7 +
pcsx2-qt/resources/resources.qrc | 2 +
pcsx2/ImGui/FullscreenUI.cpp | 7 +-
pcsx2/USB/usb-pad/usb-train.cpp | 3 +-
9 files changed, 870 insertions(+), 860 deletions(-)
create mode 100644 pcsx2-qt/resources/icons/black/svg/train-line.svg
create mode 100644 pcsx2-qt/resources/icons/white/svg/train-line.svg
diff --git a/pcsx2-qt/Settings/ControllerBindingWidget.cpp b/pcsx2-qt/Settings/ControllerBindingWidget.cpp
index 331f54d0ee90c..e351a90f02fd5 100644
--- a/pcsx2-qt/Settings/ControllerBindingWidget.cpp
+++ b/pcsx2-qt/Settings/ControllerBindingWidget.cpp
@@ -1029,7 +1029,8 @@ QIcon USBDeviceWidget::getIcon() const
{"guncon2", "guncon2-line"}, // GunCon 2
{"DJTurntable", "dj-hero-line"}, // DJ Hero TurnTable
{"Gametrak", "gametrak-line"}, // Gametrak Device
- {"RealPlay", "realplay-sphere-line"} // RealPlay Device
+ {"RealPlay", "realplay-sphere-line"}, // RealPlay Device
+ {"TrainController", "train-line"} // Train Controller
};
for (size_t i = 0; i < std::size(icons); i++)
diff --git a/pcsx2-qt/Settings/ControllerSettingsWindow.ui b/pcsx2-qt/Settings/ControllerSettingsWindow.ui
index 1377b5f55db9d..ee04e8c37b21a 100644
--- a/pcsx2-qt/Settings/ControllerSettingsWindow.ui
+++ b/pcsx2-qt/Settings/ControllerSettingsWindow.ui
@@ -6,7 +6,7 @@
0
0
- 1305
+ 1318
690
@@ -35,13 +35,13 @@
- 170
+ 180
0
- 170
+ 200
16777215
@@ -51,6 +51,9 @@
32
+
+ true
+
-
@@ -64,11 +67,11 @@
-
-
+
-
-
-
+
Editing Profile:
@@ -96,8 +99,7 @@
New Profile
-
- ..
+
@@ -107,8 +109,7 @@
Apply Profile
-
- ..
+
@@ -118,8 +119,7 @@
Delete Profile
-
- ..
+
@@ -129,8 +129,7 @@
Mapping Settings
-
- ..
+
@@ -140,8 +139,7 @@
Restore Defaults
-
- ..
+
@@ -150,7 +148,7 @@
-
- QDialogButtonBox::Close
+ QDialogButtonBox::StandardButton::Close
diff --git a/pcsx2-qt/Settings/USBBindingWidget_RyojouhenCon.ui b/pcsx2-qt/Settings/USBBindingWidget_RyojouhenCon.ui
index f3d9814174a23..524a59a09463c 100644
--- a/pcsx2-qt/Settings/USBBindingWidget_RyojouhenCon.ui
+++ b/pcsx2-qt/Settings/USBBindingWidget_RyojouhenCon.ui
@@ -76,7 +76,7 @@
- Door Buttons"
+ Door Buttons
diff --git a/pcsx2-qt/Translations/pcsx2-qt_en.ts b/pcsx2-qt/Translations/pcsx2-qt_en.ts
index 050e124e3b323..7ee09aa9ff047 100644
--- a/pcsx2-qt/Translations/pcsx2-qt_en.ts
+++ b/pcsx2-qt/Translations/pcsx2-qt_en.ts
@@ -3051,22 +3051,22 @@ Not Configured/Buttons configured
-
+
-
+
-
+
-
+
@@ -3076,7 +3076,7 @@ Not Configured/Buttons configured
-
+
@@ -4926,142 +4926,142 @@ The URL was: %1
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5071,12 +5071,12 @@ The URL was: %1
-
+
-
+
@@ -5088,1212 +5088,1227 @@ Do you wish to shutdown anyways and IRREVERSIBLY DESTROY YOUR MEMORY CARD?
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -6348,337 +6363,327 @@ Do you wish to shutdown anyways and IRREVERSIBLY DESTROY YOUR MEMORY CARD?
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -6688,464 +6693,464 @@ Do you wish to shutdown anyways and IRREVERSIBLY DESTROY YOUR MEMORY CARD?
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -7155,924 +7160,924 @@ Do you want to load this save and continue?
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -8082,287 +8087,287 @@ Do you want to load this save and continue?
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -8372,57 +8377,57 @@ Do you want to load this save and continue?
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -8447,632 +8452,622 @@ Do you want to load this save and continue?
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -19722,12 +19717,12 @@ Scanning recursively takes more time, but will identify files in subdirectories.
USBBindingWidget
-
+
-
+
@@ -20344,7 +20339,7 @@ Scanning recursively takes more time, but will identify files in subdirectories.
-
+
Door buttons toggle to open or close train doors when this controller is used with Densha De GO! games.
@@ -20552,27 +20547,27 @@ Scanning recursively takes more time, but will identify files in subdirectories.
-
+
-
+
-
+
-
+
-
+
diff --git a/pcsx2-qt/resources/icons/black/svg/train-line.svg b/pcsx2-qt/resources/icons/black/svg/train-line.svg
new file mode 100644
index 0000000000000..363f927f61f19
--- /dev/null
+++ b/pcsx2-qt/resources/icons/black/svg/train-line.svg
@@ -0,0 +1,7 @@
+
+
+
\ No newline at end of file
diff --git a/pcsx2-qt/resources/icons/white/svg/train-line.svg b/pcsx2-qt/resources/icons/white/svg/train-line.svg
new file mode 100644
index 0000000000000..be5eab42b1618
--- /dev/null
+++ b/pcsx2-qt/resources/icons/white/svg/train-line.svg
@@ -0,0 +1,7 @@
+
+
+
\ No newline at end of file
diff --git a/pcsx2-qt/resources/resources.qrc b/pcsx2-qt/resources/resources.qrc
index b3225f89a7caf..b622a2a2a6819 100644
--- a/pcsx2-qt/resources/resources.qrc
+++ b/pcsx2-qt/resources/resources.qrc
@@ -87,6 +87,7 @@
icons/black/svg/shut-down-line.svg
icons/black/svg/singstar-line.svg
icons/black/svg/tools-line.svg
+ icons/black/svg/train-line.svg
icons/black/svg/trance-vibrator-line.svg
icons/black/svg/trash-fill.svg
icons/black/svg/trophy-line.svg
@@ -189,6 +190,7 @@
icons/white/svg/shut-down-line.svg
icons/white/svg/singstar-line.svg
icons/white/svg/tools-line.svg
+ icons/white/svg/train-line.svg
icons/white/svg/trance-vibrator-line.svg
icons/white/svg/trash-fill.svg
icons/white/svg/trophy-line.svg
diff --git a/pcsx2/ImGui/FullscreenUI.cpp b/pcsx2/ImGui/FullscreenUI.cpp
index bee9a9489474e..e6893440bb3d6 100644
--- a/pcsx2/ImGui/FullscreenUI.cpp
+++ b/pcsx2/ImGui/FullscreenUI.cpp
@@ -6911,6 +6911,9 @@ TRANSLATE_NOOP("FullscreenUI", "Unknown");
TRANSLATE_NOOP("FullscreenUI", "OK");
TRANSLATE_NOOP("FullscreenUI", "Select Device");
TRANSLATE_NOOP("FullscreenUI", "Details");
+TRANSLATE_NOOP("FullscreenUI", "The selected input profile will be used for this game.");
+TRANSLATE_NOOP("FullscreenUI", "Shared");
+TRANSLATE_NOOP("FullscreenUI", "Input Profile");
TRANSLATE_NOOP("FullscreenUI", "Options");
TRANSLATE_NOOP("FullscreenUI", "Copies the current global settings to this game.");
TRANSLATE_NOOP("FullscreenUI", "Clears all settings set for this game.");
@@ -7171,8 +7174,6 @@ TRANSLATE_NOOP("FullscreenUI", "If not set, this card will be considered unplugg
TRANSLATE_NOOP("FullscreenUI", "The selected memory card image will be used for this slot.");
TRANSLATE_NOOP("FullscreenUI", "Removes the current card from the slot.");
TRANSLATE_NOOP("FullscreenUI", "Configuration");
-TRANSLATE_NOOP("FullscreenUI", "Uses game-specific settings for controllers for this game.");
-TRANSLATE_NOOP("FullscreenUI", "Copies the global controller configuration to this game.");
TRANSLATE_NOOP("FullscreenUI", "Resets all configuration to defaults (including bindings).");
TRANSLATE_NOOP("FullscreenUI", "Replaces these settings with a previously saved input profile.");
TRANSLATE_NOOP("FullscreenUI", "Stores the current settings to an input profile.");
@@ -7619,8 +7620,6 @@ TRANSLATE_NOOP("FullscreenUI", "Folder Memory Card Filter");
TRANSLATE_NOOP("FullscreenUI", "Load Profile");
TRANSLATE_NOOP("FullscreenUI", "Save Profile");
TRANSLATE_NOOP("FullscreenUI", "Create");
-TRANSLATE_NOOP("FullscreenUI", "Per-Game Configuration");
-TRANSLATE_NOOP("FullscreenUI", "Copy Global Settings");
TRANSLATE_NOOP("FullscreenUI", "Enable SDL Input Source");
TRANSLATE_NOOP("FullscreenUI", "SDL DualShock 4 / DualSense Enhanced Mode");
TRANSLATE_NOOP("FullscreenUI", "SDL DualSense Player LED");
diff --git a/pcsx2/USB/usb-pad/usb-train.cpp b/pcsx2/USB/usb-pad/usb-train.cpp
index 5989dfd3b11a6..42cbaef9753f9 100644
--- a/pcsx2/USB/usb-pad/usb-train.cpp
+++ b/pcsx2/USB/usb-pad/usb-train.cpp
@@ -5,6 +5,7 @@
#include "common/Console.h"
#include "Host.h"
+#include "IconsFontAwesome5.h"
#include "IconsPromptFont.h"
#include "Input/InputManager.h"
#include "StateWrapper.h"
@@ -97,7 +98,7 @@ namespace usb_pad
{"Horn", TRANSLATE_NOOP("USB", "Horn"), ICON_PF_KEY_A, InputBindingInfo::Type::Button, CID_TC_B, GenericInputBinding::Cross},
{"LeftDoor", TRANSLATE_NOOP("USB", "Left Door"), ICON_PF_KEY_L, InputBindingInfo::Type::Button, CID_TC_L, GenericInputBinding::Square},
{"RightDoor", TRANSLATE_NOOP("USB", "Right Door"), ICON_PF_KEY_R, InputBindingInfo::Type::Button, CID_TC_R, GenericInputBinding::Triangle},
- {"Camera", TRANSLATE_NOOP("USB", "Camera Button"), ICON_PF_CAMERA, InputBindingInfo::Type::Button, CID_TC_CAMERA, GenericInputBinding::R1},
+ {"Camera", TRANSLATE_NOOP("USB", "Camera Button"), ICON_FA_CAMERA, InputBindingInfo::Type::Button, CID_TC_CAMERA, GenericInputBinding::R1},
{"Select", TRANSLATE_NOOP("USB", "Select"), ICON_PF_SELECT_SHARE, InputBindingInfo::Type::Button, CID_TC_SELECT, GenericInputBinding::Select},
{"Start", TRANSLATE_NOOP("USB", "Start"), ICON_PF_START, InputBindingInfo::Type::Button, CID_TC_START, GenericInputBinding::Start},
};