s/firmwares/firmware/ in strings

This commit is contained in:
YoshiRulz 2024-10-27 01:27:14 +10:00
parent ab1f002481
commit 6955ad3591
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
9 changed files with 17 additions and 13 deletions

View File

@ -1096,7 +1096,7 @@ namespace BizHawk.Client.EmuHawk
//
// FirmwaresMenuItem
//
this.FirmwaresMenuItem.Text = "&Firmwares...";
this.FirmwaresMenuItem.Text = "&Firmware...";
this.FirmwaresMenuItem.Click += new System.EventHandler(this.FirmwaresMenuItem_Click);
//
// MessagesMenuItem
@ -2325,7 +2325,7 @@ namespace BizHawk.Client.EmuHawk
//
// toolStripMenuItem11
//
this.toolStripMenuItem11.Text = "&Firmwares...";
this.toolStripMenuItem11.Text = "&Firmware...";
this.toolStripMenuItem11.Click += new System.EventHandler(this.FirmwaresMenuItem_Click);
//
// toolStripMenuItem12

View File

@ -3841,10 +3841,10 @@ namespace BizHawk.Client.EmuHawk
if (FirmwareManager.RecentlyServed.Count > 0)
{
Console.WriteLine("Active Firmwares:");
Console.WriteLine("Active firmware:");
foreach (var f in FirmwareManager.RecentlyServed)
{
Console.WriteLine($" {f.ID} : {f.Hash}");
Console.WriteLine($"\t{f.ID} : {f.Hash}");
}
}

View File

@ -353,7 +353,7 @@ namespace BizHawk.Client.EmuHawk
this.Name = "FirmwaresConfig";
this.ShowIcon = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Firmwares";
this.Text = "Firmware";
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FirmwaresConfig_FormClosed);
this.Load += new System.EventHandler(this.FirmwaresConfig_Load);
this.lvFirmwaresContextMenuStrip.ResumeLayout(false);

View File

@ -179,8 +179,8 @@ namespace BizHawk.Client.EmuHawk
private void FirmwaresConfig_Load(object sender, EventArgs e)
{
string GetSystemGroupName(string sysID) => SystemGroupNames.TryGetValue(sysID, out var name) ? name : "FIX ME (FirmwaresConfig.cs)";
string GetSystemGroupName(string sysID)
=> SystemGroupNames.TryGetValue(sysID, out var name) ? name : $"FIX ME ({nameof(FirmwaresConfig)}.{nameof(SystemGroupNames)})";
ListViewGroup AddGroup(string sysID)
{
lvFirmwares.Groups.Add(
@ -377,7 +377,11 @@ namespace BizHawk.Client.EmuHawk
private void TbbOrganize_Click(object sender, EventArgs e)
{
if (!this.ModalMessageBox2("This is going to move/rename every automatically-selected firmware file under your configured firmwares directory to match our recommended organizational scheme (which is not super great right now). Proceed?", "Firmwares Organization Confirm", useOKCancel: true))
if (!this.ModalMessageBox2(
caption: "Organize firmware",
text: "This is going to move/rename every automatically-selected firmware file under your configured Firmware folder to match our recommended organizational scheme (which is not super great right now)."
+ "\nProceed?",
useOKCancel: true))
{
return;
}

View File

@ -146,7 +146,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
var result = names.Select(n => CoreComm.CoreFileProvider.GetFirmware(new("AmstradCPC", n))).FirstOrDefault(b => b != null && b.Length == length);
if (result == null)
{
throw new MissingFirmwareException($"At least one of these firmwares is required: {string.Join(", ", names)}");
throw new MissingFirmwareException($"At least one of these firmware options is required: {string.Join(", ", names)}");
}
return result;

View File

@ -252,7 +252,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
var result = names.Select(n => CoreComm.CoreFileProvider.GetFirmware(new("C64", n))).FirstOrDefault(b => b != null && b.Length == length);
if (result == null)
{
throw new MissingFirmwareException($"At least one of these firmwares is required: {string.Join(", ", names)}");
throw new MissingFirmwareException($"At least one of these firmware options is required: {string.Join(", ", names)}");
}
return result;

View File

@ -202,7 +202,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
var result = names.Select(n => CoreComm.CoreFileProvider.GetFirmware(new("ZXSpectrum", n))).FirstOrDefault(b => b != null && b.Length == length);
if (result == null)
{
throw new MissingFirmwareException($"At least one of these firmwares is required: {string.Join(", ", names)}");
throw new MissingFirmwareException($"At least one of these firmware options is required: {string.Join(", ", names)}");
}
return result;

View File

@ -35,7 +35,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
var (rom, biosInfo) = lp.Comm.CoreFileProvider.GetFirmwareWithGameInfoOrThrow(
new("PCECD", "Bios"),
"PCE-CD System Card not found. Please check the BIOS settings in Config->Firmwares.");
"PCE-CD System Card not found. Please check the BIOS settings in Config > Firmware...");
if (biosInfo.Status == RomStatus.BadDump)
{

View File

@ -262,7 +262,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
if (firmwareID != null)
{
// this path will be the most common PEBKAC error, so be a bit more vocal about the problem
srcdata = CoreComm.CoreFileProvider.GetFirmware(firmwareID.Value, "GPGX firmwares are usually required.");
srcdata = CoreComm.CoreFileProvider.GetFirmware(firmwareID.Value, "GPGX firmware is usually required.");
if (srcdata == null)
{
_firmwareRequestFailed = true;