Converted more strings into resources

Author: Digitoxin1

DiskImageTool/DiskImage/DirectoryBase.vb

@@ -215,7 +215,7 @@
             Dim Index As UInteger = 1
 
             Do While FindFileName(NewFileName, True, CurrentIndex) > -1
-                NewFileName = CombineFileParts(FileParts.Name & " (" & Index & ")", FileParts.Extension)
+                NewFileName = CombineFileParts(FileParts.Name & " " & InParens(Index), FileParts.Extension)
                 Index += 1
             Loop
 

DiskImageTool/DiskImage/Modules/EnumDescriptions.vb

@@ -3,23 +3,23 @@
         Public Function BootSectorDescription(Offset As BootSector.BootSectorOffsets) As String
             Select Case Offset
                 Case BootSector.BootSectorOffsets.JmpBoot
-                    Return "Bootstrap Jump"
+                    Return My.Resources.BootSector_JmpBoot
                 Case BootSector.BootSectorOffsets.OEMName
-                    Return "OEM Name"
+                    Return My.Resources.BootSector_OEMName
                 Case BootSector.BootSectorOffsets.DriveNumber
-                    Return "Drive Number"
+                    Return My.Resources.BootSector_DriveNumber
                 Case BootSector.BootSectorOffsets.Reserved
-                    Return "Reserved"
+                    Return My.Resources.BootSector_Reserved
                 Case BootSector.BootSectorOffsets.ExtendedBootSignature
-                    Return "Extended Boot Signature"
+                    Return My.Resources.BootSector_ExtendedBootSignature
                 Case BootSector.BootSectorOffsets.VolumeSerialNumber
-                    Return "Volume Serial Number"
+                    Return My.Resources.BootSector_VolumeSerialNumber
                 Case BootSector.BootSectorOffsets.VolumeLabel
-                    Return "Volume Label"
+                    Return My.Resources.BootSector_VolumeLabel
                 Case BootSector.BootSectorOffsets.FileSystemType
-                    Return "File System ID"
+                    Return My.Resources.BootSector_FileSystemType
                 Case BootSector.BootSectorOffsets.BootStrapSignature
-                    Return "Boot Sector Signature"
+                    Return My.Resources.BootSector_BootStrapSignature
                 Case Else
                     Return Offset.ToString
             End Select
@@ -28,27 +28,27 @@
         Public Function BPBDescription(Offset As BiosParameterBlock.BPBOoffsets) As String
             Select Case Offset
                 Case BiosParameterBlock.BPBOoffsets.BytesPerSector
-                    Return "Bytes per Sector"
+                    Return My.Resources.BPB_BytesPerSector
                 Case BiosParameterBlock.BPBOoffsets.SectorsPerCluster
-                    Return "Sectors per Cluster"
+                    Return My.Resources.BPB_SectorsPerCluster
                 Case BiosParameterBlock.BPBOoffsets.ReservedSectorCount
-                    Return "Reserved Sectors"
+                    Return My.Resources.BPB_ReservedSectorCount
                 Case BiosParameterBlock.BPBOoffsets.NumberOfFATs
-                    Return "Number of FATs"
+                    Return My.Resources.BPB_NumberOfFATs
                 Case BiosParameterBlock.BPBOoffsets.RootEntryCount
-                    Return "Root Directory Entries"
+                    Return My.Resources.BPB_RootEntryCount
                 Case BiosParameterBlock.BPBOoffsets.SectorCountSmall
-                    Return "Total Sector Count"
+                    Return My.Resources.BPB_SectorCountSmall
                 Case BiosParameterBlock.BPBOoffsets.MediaDescriptor
-                    Return "Media Descriptor"
+                    Return My.Resources.BPB_MediaDescriptor
                 Case BiosParameterBlock.BPBOoffsets.SectorsPerFAT
-                    Return "Sectors per FAT"
+                    Return My.Resources.BPB_SectorsPerFAT
                 Case BiosParameterBlock.BPBOoffsets.SectorsPerTrack
-                    Return "Sectors per Track"
+                    Return My.Resources.BPB_SectorsPerTrack
                 Case BiosParameterBlock.BPBOoffsets.NumberOfHeads
-                    Return "Number of Heads"
+                    Return My.Resources.BPB_NumberOfHeads
                 Case BiosParameterBlock.BPBOoffsets.HiddenSectors
-                    Return "Hidden Sectors"
+                    Return My.Resources.BPB_HiddenSectors
                 Case Else
                     Return Offset.ToString
             End Select
@@ -57,31 +57,31 @@
         Public Function DirectorytEntryDescription(Offset As DirectoryEntry.DirectoryEntryOffsets) As String
             Select Case Offset
                 Case DirectoryEntry.DirectoryEntryOffsets.FileName
-                    Return "Name"
+                    Return My.Resources.DirectorytEntry_FileName
                 Case DirectoryEntry.DirectoryEntryOffsets.Extension
-                    Return "Extension"
+                    Return My.Resources.DirectorytEntry_Extension
                 Case DirectoryEntry.DirectoryEntryOffsets.Attributes
-                    Return "Attributes"
+                    Return My.Resources.DirectorytEntry_Attributes
                 Case DirectoryEntry.DirectoryEntryOffsets.ReservedForWinNT
-                    Return "Reserved For Windows NT"
+                    Return My.Resources.DirectorytEntry_ReservedForWinNT
                 Case DirectoryEntry.DirectoryEntryOffsets.CreationMillisecond
-                    Return "Creation Time Tenths"
+                    Return My.Resources.DirectorytEntry_CreationMillisecond
                 Case DirectoryEntry.DirectoryEntryOffsets.CreationTime
-                    Return "Creation Time"
+                    Return My.Resources.DirectorytEntry_CreationTime
                 Case DirectoryEntry.DirectoryEntryOffsets.CreationDate
-                    Return "Creation Date"
+                    Return My.Resources.DirectorytEntry_CreationDate
                 Case DirectoryEntry.DirectoryEntryOffsets.LastAccessDate
-                    Return "Last Access Date"
+                    Return My.Resources.DirectorytEntry_LastAccessDate
                 Case DirectoryEntry.DirectoryEntryOffsets.ReservedForFAT32
-                    Return "Reserved for FAT 32"
+                    Return My.Resources.DirectorytEntry_ReservedForFAT32
                 Case DirectoryEntry.DirectoryEntryOffsets.LastWriteTime
-                    Return "Last Write Time"
+                    Return My.Resources.DirectorytEntry_LastWriteTime
                 Case DirectoryEntry.DirectoryEntryOffsets.LastWriteDate
-                    Return "Last Write Date"
+                    Return My.Resources.DirectorytEntry_LastWriteDate
                 Case DirectoryEntry.DirectoryEntryOffsets.StartingCluster
-                    Return "Starting Cluster"
+                    Return My.Resources.DirectorytEntry_StartingCluster
                 Case DirectoryEntry.DirectoryEntryOffsets.FileSize
-                    Return "Size"
+                    Return My.Resources.DirectorytEntry_FileSize
                 Case Else
                     Return Offset.ToString
             End Select
@@ -90,21 +90,21 @@
         Public Function DirectorytEntryLFNDescription(Offset As DirectoryEntry.LFNOffsets) As String
             Select Case Offset
                 Case DirectoryEntry.LFNOffsets.Sequence
-                    Return "LFN Sequence"
+                    Return My.Resources.DirectorytEntryLFN_Sequence
                 Case DirectoryEntry.LFNOffsets.FilePart1
-                    Return "LFN Name 1"
+                    Return My.Resources.DirectorytEntryLFN_FilePart1
                 Case DirectoryEntry.LFNOffsets.Attributes
-                    Return "LFN Attributes"
+                    Return My.Resources.DirectorytEntryLFN_Attributes
                 Case DirectoryEntry.LFNOffsets.Type
-                    Return "LFN Type"
+                    Return My.Resources.DirectorytEntryLFN_Type
                 Case DirectoryEntry.LFNOffsets.Checksum
-                    Return "LFN Checksum"
+                    Return My.Resources.DirectorytEntryLFN_Checksum
                 Case DirectoryEntry.LFNOffsets.FilePart2
-                    Return "LFN Name 2"
+                    Return My.Resources.DirectorytEntryLFN_FilePart2
                 Case DirectoryEntry.LFNOffsets.StartingCluster
-                    Return "LFN Starting Cluster"
+                    Return My.Resources.DirectorytEntryLFN_StartingCluster
                 Case DirectoryEntry.LFNOffsets.FilePart3
-                    Return "LFN Name 3"
+                    Return My.Resources.DirectorytEntryLFN_FilePart3
                 Case Else
                     Return Offset.ToString
             End Select
@@ -113,23 +113,23 @@
         Public Function GetImageTypeName(ImageType As FloppyImageType) As String
             Select Case ImageType
                 Case FloppyImageType.BasicSectorImage
-                    Return "Basic Sector Image"
+                    Return My.Resources.FloppyImageType_BasicSectorImage
                 Case FloppyImageType.HFEImage
-                    Return "HxC HFE Image"
+                    Return My.Resources.FloppyImageType_HFEImage
                 Case FloppyImageType.MFMImage
-                    Return "HxC MFM Image"
+                    Return My.Resources.FloppyImageType_MFMImage
                 Case FloppyImageType.PSIImage
-                    Return "PCE Sector Image"
+                    Return My.Resources.FloppyImageType_PSIImage
                 Case FloppyImageType.PRIImage
-                    Return "PCE Bitstream Image"
+                    Return My.Resources.FloppyImageType_PRIImage
                 Case FloppyImageType.TranscopyImage
-                    Return "Transcopy Image"
+                    Return My.Resources.FloppyImageType_TranscopyImage
                 Case FloppyImageType.D86FImage
-                    Return "86Box 86F Image"
+                    Return My.Resources.FloppyImageType_D86FImage
                 Case FloppyImageType.IMDImage
-                    Return "ImageDisk Sector Image"
+                    Return My.Resources.FloppyImageType_IMDImage
                 Case Else
-                    Return "Unknown"
+                    Return My.Resources.FloppyImageType_Unknown
             End Select
         End Function
     End Module

DiskImageTool/DiskImageTool.vbproj

@@ -293,6 +293,7 @@
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="CopyProtection.vb" />
+    <Compile Include="Lib\ListViewColumns.vb" />
     <Compile Include="LoadedFiles.vb" />
     <Compile Include="SummaryPanel.vb" />
     <Compile Include="Testing\DebugScript.vb" />

DiskImageTool/Filters/ComboFilter.vb

@@ -115,7 +115,7 @@
             Dim Name As String
             Dim Count As String
             If Item.AllItems Then
-                Name = "(ALL)"
+                Name = InParens(My.Resources.Filter_AllItems)
                 Count = ""
             Else
                 Name = Item.Name
@@ -148,7 +148,7 @@ Public Class ComboFilterItem
 
     Public Overrides Function ToString() As String
         If AllItems Then
-            Return "(ALL)"
+            Return InParens(My.Resources.Filter_AllItems)
         Else
             Return Name & "  [" & _Count & "]"
         End If

DiskImageTool/Filters/ImageFilters.vb

@@ -20,67 +20,67 @@
 
             Select Case ID
                 Case FilterTypes.ModifiedFiles
-                    Caption = "Modified Files"
+                    Caption = My.Resources.Filter_ModifiedFiles
                 Case FilterTypes.Disk_UnknownFormat
-                    Caption = "Disk - Unknown Format"
+                    Caption = My.Resources.Filter_Disk_UnknownFormat
                 Case FilterTypes.Disk_CustomFormat
-                    Caption = "Disk - Custom Format"
+                    Caption = My.Resources.Filter_Disk_CustomFormat
                 Case FilterTypes.Disk_NOBPB
-                    Caption = "Disk - No BPB"
+                    Caption = My.Resources.Filter_Disk_NOBPB
                 Case FilterTypes.Disk_NoBootLoader
-                    Caption = "Disk - No Boot Loader"
+                    Caption = My.Resources.Filter_Disk_NoBootLoader
                 Case FilterTypes.DIsk_CustomBootLoader
-                    Caption = "Disk - Custom Boot Loader"
+                    Caption = My.Resources.Filter_Disk_CustomBootLoader
                 Case FilterTypes.Disk_MismatchedImageSize
-                    Caption = "Disk - Mismatched Image Size"
+                    Caption = My.Resources.Filter_Disk_MismatchedImageSize
                 Case FilterTypes.Disk_MismatchedMediaDescriptor
-                    Caption = "Disk - Mismatched Media Descriptor"
+                    Caption = My.Resources.Filter_Disk_MismatchedMediaDescriptor
                 Case FilterTypes.Disk_FreeClustersWithData
-                    Caption = "Disk - Free Clusters with Data"
+                    Caption = My.Resources.Filter_Disk_FreeClustersWithData
                 Case FilterTypes.Bootstrap_Unknown
-                    Caption = "Bootstrap - Unknown"
+                    Caption = My.Resources.Filter_Bootstrap_Unknown
                 Case FilterTypes.OEMName_Unknown
-                    Caption = "OEM Name - Unknown"
+                    Caption = My.Resources.Filter_OEMName_Unknown
                 Case FilterTypes.OEMName_Mismatched
-                    Caption = "OEM Name - Mismatched"
+                    Caption = My.Resources.Filter_OEMName_Mismatched
                 Case FilterTypes.OEMName_Windows9x
-                    Caption = "OEM Name - Windows 9x"
+                    Caption = My.Resources.Filter_OEMName_Windows9x
                 Case FilterTypes.OEMName_Verified
-                    Caption = "OEM Name - Verified"
+                    Caption = My.Resources.Filter_OEMName_Verified
                 Case FilterTypes.OEMName_Unverified
-                    Caption = "OEM Name - Unverified"
+                    Caption = My.Resources.Filter_OEMName_Unverified
                 Case FilterTypes.FileSystem_HasCreationDate
-                    Caption = "File System - Has Creation Date"
+                    Caption = My.Resources.Filter_FileSystem_HasCreationDate
                 Case FilterTypes.FileSystem_HasLastAccessDate
-                    Caption = "File System - Has Last Access Date"
+                    Caption = My.Resources.Filter_FileSystem_HasLastAccessDate
                 Case FilterTypes.FileSystem_HasReservedBytesSet
-                    Caption = "File System - Has Reserved Bytes Set"
+                    Caption = My.Resources.Filter_FileSystem_HasReservedBytesSet
                 Case FilterTypes.FileSystem_HasLongFileNames
-                    Caption = "File System - Has Long File Names"
+                    Caption = My.Resources.Filter_FileSystem_HasLongFileNames
                 Case FilterTypes.FileSystem_InvalidDirectoryEntries
-                    Caption = "File System - Invalid Directory Entries"
+                    Caption = My.Resources.Filter_FileSystem_InvalidDirectoryEntries
                 Case FilterTypes.FileSystem_DirectoryHasAdditionalData
-                    Caption = "File System - Directory has Additional Data"
+                    Caption = My.Resources.Filter_FileSystem_DirectoryHasAdditionalData
                 Case FilterTypes.FileSystem_DirectoryHasBootSector
-                    Caption = "File System - Directory has Boot Sector"
+                    Caption = My.Resources.Filter_FileSystem_DirectoryHasBootSector
                 Case FilterTypes.FAT_BadSectors
-                    Caption = "FAT - Bad Sectors"
+                    Caption = My.Resources.Filter_FAT_BadSectors
                 Case FilterTypes.FAT_LostClusters
-                    Caption = "FAT - Lost Clusters"
+                    Caption = My.Resources.Filter_FAT_LostClusters
                 Case FilterTypes.FAT_MismatchedFATs
-                    Caption = "FAT - Mismatched FATs"
+                    Caption = My.Resources.Filter_FAT_MismatchedFATs
                 Case FilterTypes.FAT_ChainingErrors
-                    Caption = "FAT - Chaining Errors"
+                    Caption = My.Resources.Filter_FAT_ChainingErrors
                 Case FilterTypes.Image_InDatabase
-                    Caption = "Image - In Database"
+                    Caption = My.Resources.Filter_Image_InDatabase
                 Case FilterTypes.Image_NotInDatabase
-                    Caption = "Image - Not in Database"
+                    Caption = My.Resources.Filter_Image_NotInDatabase
                 Case FilterTypes.Image_Verified
-                    Caption = "Image - Verified"
+                    Caption = My.Resources.Filter_Image_Verified
                 Case FilterTypes.Image_Unverified
-                    Caption = "Image - Unverified"
+                    Caption = My.Resources.Filter_Image_Unverified
                 Case FilterTypes.Database_MismatchedStatus
-                    Caption = "Database - Mismatched Status"
+                    Caption = My.Resources.Filter_Database_MismatchedStatus
                 Case Else
                     Caption = ""
             End Select

DiskImageTool/FloppyDiskIO.vb

@@ -86,7 +86,7 @@ Module FloppyDiskIO
         Dim DriveInfo = New IO.DriveInfo(DriveName)
         Dim IsReady = DriveInfo.IsReady
         Dim NewDiskFormat = GetFloppyDiskFormat(Disk.BPB, False)
-        Dim NewFormatName = GetFloppyDiskFormatName(NewDiskFormat) & " Floppy"
+        Dim NewFormatName = GetFloppyDiskFormatName(NewDiskFormat) & " " & My.Resources.Label_Floppy
         Dim DetectedFormat As FloppyDiskFormat = 255
         Dim DoFormat = Not IsReady
 
@@ -114,7 +114,7 @@ Module FloppyDiskIO
                 Msg = String.Format(My.Resources.Dialog_DiskNotEmptyWarning_UnknownFormat, DriveLetter, Environment.NewLine, NewFormatName)
             Else
                 DoFormat = True
-                Dim DetectedFormatName = GetFloppyDiskFormatName(DetectedFormat) & " Floppy"
+                Dim DetectedFormatName = GetFloppyDiskFormatName(DetectedFormat) & " " & My.Resources.Label_Floppy
                 Msg = String.Format(My.Resources.Dialog_DiskNotEmptyWarning_Mismatched, DriveLetter, DetectedFormatName, Environment.NewLine, NewFormatName)
             End If
             MsgBoxResult = MsgBox(Msg, MsgBoxStyle.Exclamation Or MsgBoxStyle.OkCancel Or MsgBoxStyle.DefaultButton2)

DiskImageTool/Forms/HexViewForm.vb

@@ -471,7 +471,7 @@ Public Class HexViewForm
         RefreshSelectors()
         DataGridDataInspector.ClearSelection()
 
-        ToolStripStatusBytes.Text = Format(_CurrentHexViewData.SectorBlock.Size, "N0") & " bytes"
+        ToolStripStatusBytes.Text = FormatThousands(_CurrentHexViewData.SectorBlock.Size) & " bytes"
     End Sub
     Private Sub FillSelected(Value As Byte)
         Dim ChangeList As New List(Of HexChange)
@@ -885,7 +885,7 @@ Public Class HexViewForm
                 ToolStripStatusBlock.Visible = True
                 ToolStripStatusBlock.Text = "Block(h): " & OffsetStart.ToString("X") & "-" & OffsetEnd.ToString("X")
                 ToolStripStatusLength.Visible = True
-                ToolStripStatusLength.Text = "Length(h): " & SelectionLength.ToString("X") & "  (" & SelectionLength & ")"
+                ToolStripStatusLength.Text = "Length(h): " & SelectionLength.ToString("X") & "  " & InParens(SelectionLength)
             End If
 
             If _CurrentSector <> Sector Or ForceUpdate Then