Clean up English language files

Remove unused strings and hardcode some that don't need translation

include/lang.h

@@ -4,7 +4,6 @@
 // list of localized string ids
 enum _STR_IDS {
     _STR_LOCALE = 0, // Localized language name
-    _STR_OPL_VER,
     _STR_SAVE_CHANGES,
     _STR_BACK,
     _STR_NETCONFIG,
@@ -15,7 +14,7 @@ enum _STR_IDS {
     _STR_EXIT,
     _STR_SETTINGS,
     _STR_MENU,
-    _STR_USB_GAMES,
+    _STR_BDM_GAMES,
     _STR_HDD_GAMES,
     _STR_NET_GAMES,
     _STR_APPS,
@@ -45,7 +44,6 @@ enum _STR_IDS {
     _STR_GAMES_LIST,
     _STR_COMPAT_SETTINGS,
     _STR_REMOVE_ALL_SETTINGS,
-    _STR_REMOVED_ALL_SETTINGS,
     _STR_SCROLLING,
     _STR_SLOW,
     _STR_MEDIUM,
@@ -79,7 +77,6 @@ enum _STR_IDS {
     _STR_EXITTO,
     _STR_BGCOLOR,
     _STR_TXTCOLOR,
-    _STR_CAT_PS2,
     _STR_CAT_SMB_SERVER,
     _STR_IP_ADDRESS_TYPE,
     _STR_IP_ADDRESS_TYPE_STATIC,
@@ -116,8 +113,6 @@ enum _STR_IDS {
     _STR_HINT_MODE4,
     _STR_HINT_MODE5,
     _STR_HINT_MODE6,
-    _STR_HINT_MODE7,
-    _STR_HINT_MODE8,
     _STR_HINT_VMC_SIZE,
     _STR_CREATE,
     _STR_START,
@@ -167,8 +162,6 @@ enum _STR_IDS {
     _STR_MODE4,
     _STR_MODE5,
     _STR_MODE6,
-    _STR_MODE7,
-    _STR_MODE8,
     _STR_GSCONFIG,
     _STR_ETH_OPMODE,
     _STR_ETH_100MFDX,
@@ -178,7 +171,6 @@ enum _STR_IDS {
     _STR_GSM_SETTINGS,
     _STR_ENABLEGSM,
     _STR_HINT_ENABLEGSM,
-    _STR_GSMVMODE,
     _STR_HINT_GSMVMODE,
     _STR_XOFFSET,
     _STR_HINT_XOFFSET,
@@ -283,9 +275,10 @@ enum _STR_IDS {
     _STR_INFO_RELEASE,
     _STR_INFO_DEVELOPER,
     _STR_INFO_DESCRIPTION,
-    _STR_BDM_GAMES,
     _STR_BLOCKDEVICE_SETTINGS,
     _STR_CONTROLLER_SETTINGS,
+    _STR_HINT_BDM_START,
+    _STR_HINT_BLOCK_DEVICES,
 
     LANG_STR_COUNT
 };

lng/lang_English.lng

@@ -21,7 +21,6 @@
 #
 # Put here the English name of your language (will be displayed in the OPL Settings menu), in standard latin characters.
 English template
-Open PS2 Loader %s
 Save Changes
 Back
 Network Settings
@@ -32,7 +31,7 @@ Error writing settings!
 Exit
 Settings
 Menu
-USB Games
+BDM Games
 HDD Games
 ETH Games
 Apps
@@ -62,7 +61,6 @@ Cross
 Games List
 Game Settings
 Remove Settings
-Removed all keys for the game.
 Scrolling Speed
 Slow
 Medium
@@ -75,14 +73,14 @@ Automatic Sorting
 Error loading the language file.
 Debug Colors
 No controller detected, waiting...
-Enable Cover Art
+Cover Art
 Widescreen
 Power Off
 Loading config...
 Saving config...
 Start Device
 Refresh
-BDM Device Start Mode
+BDM Start Mode
 HDD Device Start Mode
 ETH Device Start Mode
 Applications Start Mode
@@ -96,7 +94,6 @@ NBD Server unloading...
 IGR Path
 Background Color
 Text Color
-- PS2 -
 - SMB Server -
 IP Address Type
 Static
@@ -120,7 +117,7 @@ Rename
 Delete
 Run
 Display Settings
-Enable Write Operations
+Write Operations
 Remember Last Played Game
 Select Button
 Error, the game is fragmented.
@@ -133,8 +130,6 @@ Unhook Syscalls
 Skip Videos
 Emulate DVD-DL
 Disable IGR
-Unused
-Unused
 Changing the size will reformat the VMC.
 Create
 Start
@@ -184,18 +179,15 @@ Mode 3
 Mode 4
 Mode 5
 Mode 6
-Mode 7
-Mode 8
 Configure GSM
 Ethernet Link Mode
 100Mbit Full-duplex
 100Mbit Half-duplex
 10Mbit Full-duplex
 10Mbit Half-duplex
 GSM Settings
-Enable GSM
+GSM Selector
 Toggles GSM on/off.
-VMODE
 Forced custom display mode.
 H-POS
 Horizontal adjustment.
@@ -206,7 +198,7 @@ Overscan adjustment.
 FMV Skip
 Skips full motion videos.
 Cheat Settings
-Enable PS2RD Cheat Engine
+PS2RD Cheat Engine
 Lets PS2RD Cheat Engine patch your game.
 PS2RD Cheat Engine Mode
 Auto select or select game cheats.
@@ -231,17 +223,17 @@ PS2 Logo
 Displayed for a valid disc logo matching the console's region.
 Configure PADEMU
 Pad Emulator Settings
-Enable Pad Emulator
+Pad Emulator
 Turns on/off Pad Emulator for selected game.
 Pad Emulator Mode
 Select Pad Emulator mode.
 DualShock3/4 USB
 DualShock3/4 BT
 Settings For Port:
 Select Pad Emulator port for settings.
-Enable Emulation
+Emulation
 Turns on/off Pad Emulator for selected port.
-Enable Vibration
+Vibration
 Turns on/off vibration for Pad Emulator selected port.
 USB Bluetooth Adapter MAC Address:
 DS Controller Paired To MAC Address:
@@ -259,7 +251,7 @@ Yes
 No
 Bluetooth adapter should be fully compatible with DS3/DS4 controllers.
 Bluetooth adapter may not work correctly with DS3/DS4 controllers.
-Enable Multitap Emulation
+Multitap Emulation
 Turns on/off Multitap emulation for selected game.
 Multitap Emulator On Port:
 Select port for Multitap emulation.
@@ -277,13 +269,13 @@ Build Options:
 Error - this password cannot be used.
 VMC %s file is fragmented. Continue with Memory Card in slot %d?
 Audio Settings
-Enable Sound Effects
-Enable Boot Sound
+Sound Effects
+Boot Sound
 Sound Effects Volume
 Boot Sound Volume
 Confirm video mode change?
 Cache Game List (HDD)
-Enable Notifications
+Notifications
 %s loaded from %s
 Options
 Game settings saved.
@@ -300,6 +292,7 @@ Genre
 Release
 Developer
 Description
-BDM Games
-Select Block Devices
+Block Devices
 Controller Settings
+Turn on/off Block Device Manager.
+Turn on/off Block Devices (e.g. USB).

src/dialogs.c

@@ -24,7 +24,7 @@ struct UIItem diaNetConfig[] = {
 
     {UI_BREAK},
 
-    {UI_LABEL, 0, 1, 1, -1, 0, 0, {.label = {NULL, _STR_CAT_PS2}}},
+    {UI_LABEL, 0, 1, 1, -1, 0, 0, {.label = {"- PS2 -", -1}}},
     {UI_BREAK},
 
     // ---- IP address type ----
@@ -218,9 +218,9 @@ struct UIItem diaConfig[] = {
 
     {UI_LABEL, 0, 1, 1, -1, -40, 0, {.label = {NULL, _STR_BDMMODE}}},
     {UI_SPACER},
-    {UI_ENUM, CFG_BDMMODE, 1, 1, -1, 0, 0, {.intvalue = {0, 0}}},
+    {UI_ENUM, CFG_BDMMODE, 1, 1, _STR_HINT_BDM_START, 0, 0, {.intvalue = {0, 0}}},
     {UI_SPACER},
-    {UI_BUTTON, BLOCKDEVICE_BUTTON, 1, 1, -1, 0, 0, {.label = {NULL, _STR_BLOCKDEVICE_SETTINGS}}},
+    {UI_BUTTON, BLOCKDEVICE_BUTTON, 1, 1, _STR_HINT_BLOCK_DEVICES, 0, 0, {.label = {NULL, _STR_BLOCKDEVICE_SETTINGS}}},
     {UI_BREAK},
 
     {UI_LABEL, 0, 1, 1, -1, -40, 0, {.label = {NULL, _STR_HDDMODE}}},
@@ -475,7 +475,7 @@ struct UIItem diaGSConfig[] = {
     {UI_BOOL, GSMCFG_ENABLEGSM, 1, 1, _STR_HINT_ENABLEGSM, 0, 0, {.intvalue = {1, 1}}},
     {UI_BREAK},
 
-    {UI_LABEL, 0, 1, 1, -1, -40, 0, {.label = {NULL, _STR_GSMVMODE}}},
+    {UI_LABEL, 0, 1, 1, -1, -40, 0, {.label = {NULL, _STR_VMODE}}},
     {UI_SPACER},
     {UI_ENUM, GSMCFG_GSMVMODE, 1, 1, _STR_HINT_GSMVMODE, 0, 0, {.intvalue = {0, 0}}},
     {UI_BREAK},

src/gui.c

@@ -201,7 +201,7 @@ void guiShowAbout()
     char OPLVersion[40];
     char OPLBuildDetails[40];
 
-    snprintf(OPLVersion, sizeof(OPLVersion), _l(_STR_OPL_VER), OPL_VERSION);
+    snprintf(OPLVersion, sizeof(OPLVersion), "Open PS2 Loader %s", OPL_VERSION);
     diaSetLabel(diaAbout, ABOUT_TITLE, OPLVersion);
 
     snprintf(OPLBuildDetails, sizeof(OPLBuildDetails), "GSM %s"