diff --git a/Aaru.Gui/App.xaml b/Aaru.Gui/App.xaml index 429853010..920d6c00c 100644 --- a/Aaru.Gui/App.xaml +++ b/Aaru.Gui/App.xaml @@ -33,7 +33,7 @@ --> @@ -43,7 +43,7 @@ - diff --git a/Aaru.Gui/ViewModels/Dialogs/AboutViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/AboutViewModel.cs index 5b35f3d29..8d0c78eac 100644 --- a/Aaru.Gui/ViewModels/Dialogs/AboutViewModel.cs +++ b/Aaru.Gui/ViewModels/Dialogs/AboutViewModel.cs @@ -88,18 +88,6 @@ public sealed partial class AboutViewModel : ViewModelBase }); } - [NotNull] - public string AboutLabel => UI.Label_About; - - [NotNull] - public string LibrariesLabel => UI.Label_Libraries; - - [NotNull] - public string AuthorsLabel => UI.Label_Authors; - - [NotNull] - public string Title => UI.Title_About_Aaru; - [NotNull] public string SoftwareName => "Aaru"; diff --git a/Aaru.Gui/ViewModels/Dialogs/ConsoleViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/ConsoleViewModel.cs index 868d42009..c929d537d 100644 --- a/Aaru.Gui/ViewModels/Dialogs/ConsoleViewModel.cs +++ b/Aaru.Gui/ViewModels/Dialogs/ConsoleViewModel.cs @@ -42,7 +42,6 @@ using Aaru.Localization; using Aaru.Logging; using Avalonia.Platform.Storage; using CommunityToolkit.Mvvm.Input; -using JetBrains.Annotations; using MsBox.Avalonia; using MsBox.Avalonia.Enums; using Console = Aaru.Gui.Views.Dialogs.Console; @@ -63,27 +62,10 @@ public sealed class ConsoleViewModel : ViewModelBase ClearCommand = new RelayCommand(Clear); } - [NotNull] - public string Title => UI.Title_Console; - public ICommand ClearCommand { get; } public ICommand SaveCommand { get; } public ObservableCollection Entries => ConsoleHandler.Entries; - [NotNull] - public string DebugText => UI.Enable_debug_console; - - [NotNull] - public string SaveLabel => UI.ButtonLabel_Save; - - [NotNull] - public string ClearLabel => UI.ButtonLabel_Clear; - - public string TimeLabel => UI.Title_Time; - public string TypeLabel => UI.Title_Type; - public string ModuleLabel => UI.Title_Module; - public string MessageLabel => UI.Title_Message; - public bool DebugChecked { get => _debugChecked; diff --git a/Aaru.Gui/ViewModels/Dialogs/EncodingsViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/EncodingsViewModel.cs index 736dab2ef..fa9e2d57f 100644 --- a/Aaru.Gui/ViewModels/Dialogs/EncodingsViewModel.cs +++ b/Aaru.Gui/ViewModels/Dialogs/EncodingsViewModel.cs @@ -37,9 +37,7 @@ using System.Threading.Tasks; using System.Windows.Input; using Aaru.Gui.Models; using Aaru.Gui.Views.Dialogs; -using Aaru.Localization; using CommunityToolkit.Mvvm.Input; -using JetBrains.Annotations; namespace Aaru.Gui.ViewModels.Dialogs; @@ -74,15 +72,6 @@ public sealed class EncodingsViewModel : ViewModelBase }); } - [NotNull] - public string Title => UI.Encodings; - - [NotNull] - public string CloseLabel => UI.ButtonLabel_Close; - - public string CodeLabel => UI.Title_Code_for_encoding; - public string NameLabel => UI.Title_Name; - public ICommand CloseCommand { get; } public ObservableCollection Encodings { get; } diff --git a/Aaru.Gui/ViewModels/Dialogs/LicenseViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/LicenseViewModel.cs index ceac46e94..24c714035 100644 --- a/Aaru.Gui/ViewModels/Dialogs/LicenseViewModel.cs +++ b/Aaru.Gui/ViewModels/Dialogs/LicenseViewModel.cs @@ -34,9 +34,7 @@ using System.IO; using System.Reflection; using System.Windows.Input; using Aaru.Gui.Views.Dialogs; -using Aaru.Localization; using CommunityToolkit.Mvvm.Input; -using JetBrains.Annotations; namespace Aaru.Gui.ViewModels.Dialogs; @@ -60,12 +58,6 @@ public sealed class LicenseViewModel : ViewModelBase LicenseText = reader.ReadToEnd(); } - [NotNull] - public string Title => UI.Title_Aaru_license; - - [NotNull] - public string CloseLabel => UI.ButtonLabel_Close; - public string LicenseText { get; } public ICommand CloseCommand { get; } diff --git a/Aaru.Gui/ViewModels/Dialogs/PluginsViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/PluginsViewModel.cs index 8908c1c9f..0933c6bd4 100644 --- a/Aaru.Gui/ViewModels/Dialogs/PluginsViewModel.cs +++ b/Aaru.Gui/ViewModels/Dialogs/PluginsViewModel.cs @@ -37,9 +37,7 @@ using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; using Aaru.Gui.Models; using Aaru.Gui.Views.Dialogs; -using Aaru.Localization; using CommunityToolkit.Mvvm.Input; -using JetBrains.Annotations; namespace Aaru.Gui.ViewModels.Dialogs; @@ -166,41 +164,6 @@ public sealed class PluginsViewModel : ViewModelBase } } - [NotNull] - public string Title => UI.Title_Plugins; - - [NotNull] - public string FiltersLabel => UI.Title_Filters; - - [NotNull] - public string PartitionsLabel => UI.Title_Partitions; - - [NotNull] - public string FilesystemsLabel => UI.Title_Filesystems; - - [NotNull] - public string IdentifyLabel => UI.Title_Identify_only; - - [NotNull] - public string ImagesLabel => UI.Title_Media_images; - - [NotNull] - public string FloppyImagesLabel => UI.Title_Floppy_images; - - [NotNull] - public string ReadableLabel => UI.Title_Readable; - - [NotNull] - public string WritableLabel => UI.Title_Writable; - - [NotNull] - public string CloseLabel => UI.ButtonLabel_Close; - - public string NameLabel => UI.Title_Name; - public string UuidLabel => UI.Title_UUID; - public string VersionLabel => UI.Title_Version; - public string AuthorLabel => UI.Title_Author; - public ICommand CloseCommand { get; } public ObservableCollection Filters { get; } public ObservableCollection PartitionSchemes { get; } diff --git a/Aaru.Gui/ViewModels/Dialogs/SettingsViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/SettingsViewModel.cs index cb5877b63..b23139b6b 100644 --- a/Aaru.Gui/ViewModels/Dialogs/SettingsViewModel.cs +++ b/Aaru.Gui/ViewModels/Dialogs/SettingsViewModel.cs @@ -32,11 +32,9 @@ using System.Windows.Input; using Aaru.Gui.Views.Dialogs; -using Aaru.Localization; using Aaru.Settings; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; -using JetBrains.Annotations; namespace Aaru.Gui.ViewModels.Dialogs; @@ -105,81 +103,6 @@ public sealed partial class SettingsViewModel : ViewModelBase } // TODO: Show Preferences in macOS - [NotNull] - public string Title => UI.Title_Settings; - - [NotNull] - public string GdprLabel => UI.Title_GDPR; - - [NotNull] - public string ReportsLabel => UI.Title_Reports; - - [NotNull] - public string StatisticsLabel => UI.Title_Statistics; - - [NotNull] - public string SaveLabel => UI.ButtonLabel_Save; - - [NotNull] - public string CancelLabel => UI.ButtonLabel_Cancel; - - [NotNull] - public string GdprText1 => UI.GDPR_Compliance; - - [NotNull] - public string GdprText2 => UI.GDPR_Open_Source_Disclaimer; - - [NotNull] - public string GdprText3 => UI.GDPR_Information_sharing; - - [NotNull] - public string ReportsGloballyText => UI.Configure_Device_Report_information_disclaimer; - - [NotNull] - public string SaveReportsGloballyText => UI.Save_device_reports_in_shared_folder_of_your_computer_Q; - - [NotNull] - public string ReportsText => UI.Configure_share_report_disclaimer; - - [NotNull] - public string ShareReportsText => UI.Share_your_device_reports_with_us_Q; - - [NotNull] - public string StatisticsText => UI.Statistics_disclaimer; - - [NotNull] - public string SaveStatsText => UI.Save_stats_about_your_Aaru_usage_Q; - - [NotNull] - public string ShareStatsText => UI.Share_your_stats_anonymously_Q; - - [NotNull] - public string CommandStatsText => UI.Gather_statistics_about_command_usage_Q; - - [NotNull] - public string DeviceStatsText => UI.Gather_statistics_about_found_devices_Q; - - [NotNull] - public string FilesystemStatsText => UI.Gather_statistics_about_found_filesystems_Q; - - [NotNull] - public string FilterStatsText => UI.Gather_statistics_about_found_file_filters_Q; - - [NotNull] - public string MediaImageStatsText => UI.Gather_statistics_about_found_media_image_formats_Q; - - [NotNull] - public string MediaScanStatsText => UI.Gather_statistics_about_scanned_media_Q; - - [NotNull] - public string PartitionStatsText => UI.Gather_statistics_about_found_partitioning_schemes_Q; - - [NotNull] - public string MediaStatsText => UI.Gather_statistics_about_media_types_Q; - - [NotNull] - public string VerifyStatsText => UI.Gather_statistics_about_media_image_verifications_Q; - public ICommand CancelCommand { get; } public ICommand SaveCommand { get; } diff --git a/Aaru.Gui/ViewModels/Dialogs/StatisticsViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/StatisticsViewModel.cs index 579ac4c7c..41c6629b4 100644 --- a/Aaru.Gui/ViewModels/Dialogs/StatisticsViewModel.cs +++ b/Aaru.Gui/ViewModels/Dialogs/StatisticsViewModel.cs @@ -39,7 +39,6 @@ using Aaru.Gui.Models; using Aaru.Gui.Views.Dialogs; using Aaru.Localization; using CommunityToolkit.Mvvm.Input; -using JetBrains.Annotations; using NameCountModel = Aaru.Gui.Models.NameCountModel; namespace Aaru.Gui.ViewModels.Dialogs; @@ -712,66 +711,6 @@ public sealed class StatisticsViewModel : ViewModelBase set => SetProperty(ref _mediasVisible, value); } - [NotNull] - public string CommandsLabel => UI.Title_Commands; - - [NotNull] - public string FilterLabel => UI.Title_Filter; - - [NotNull] - public string PartitionLabel => UI.Title_Partition; - - [NotNull] - public string PartitionsLabel => UI.Title_Partitions; - - [NotNull] - public string FiltersLabel => UI.Title_Filters; - - [NotNull] - public string FormatsLabel => UI.Title_Formats; - - [NotNull] - public string FormatLabel => UI.Title_Format; - - [NotNull] - public string FilesystemsLabel => UI.Title_Filesystems; - - [NotNull] - public string FilesystemLabel => UI.Title_Filesystem; - - [NotNull] - public string TimesFoundLabel => UI.Title_Times_used; - - [NotNull] - public string DevicesLabel => UI.Title_Devices; - - [NotNull] - public string DeviceLabel => UI.Title_Device; - - [NotNull] - public string ManufacturerLabel => UI.Title_Manufacturer; - - [NotNull] - public string RevisionLabel => UI.Title_Revision; - - [NotNull] - public string BusLabel => UI.Title_Bus; - - [NotNull] - public string MediasLabel => UI.Title_Medias; - - [NotNull] - public string MediaLabel => UI.Title_Media; - - [NotNull] - public string TypeLabel => Localization.Core.Title_Type_for_media; - - [NotNull] - public string Title => UI.Encodings; - - [NotNull] - public string CloseLabel => UI.ButtonLabel_Close; - public ICommand CloseCommand { get; } public ObservableCollection Filters { get; } public ObservableCollection Formats { get; } diff --git a/Aaru.Gui/ViewModels/Panels/DeviceInfoViewModel.cs b/Aaru.Gui/ViewModels/Panels/DeviceInfoViewModel.cs index 3027c8634..f7a52c91f 100644 --- a/Aaru.Gui/ViewModels/Panels/DeviceInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Panels/DeviceInfoViewModel.cs @@ -504,76 +504,6 @@ public sealed partial class DeviceInfoViewModel : ViewModelBase public ICommand SaveUsbDescriptorsCommand { get; } - public string DeviceInformationLabel => UI.Title_Device_information; - public string GeneralLabel => UI.Title_General; - public string DeviceTypeLabel => UI.Title_Device_type; - public string ManufacturerLabel => UI.Title_Manufacturer; - public string ModelLabel => UI.Title_Model; - public string RevisionLabel => UI.Title_Revision; - public string SerialNumberLabel => UI.Title_Serial_number; - public string ScsiTypeLabel => UI.Title_Peripheral_device_type; - public string RemovableMediaLabel => UI.Title_Removable_media; - public string UsbConnectedLabel => UI.Title_Connected_by_USB; - public string UsbLabel => UI.Title_USB; - public string VendorIDLabel => UI.Title_Vendor_ID; - public string ProductIDLabel => UI.Title_Product_ID; - public string ProductLabel => UI.Title_Product; - public string SaveUsbDescriptorsLabel => UI.Save_descriptors_to_file; - public string FireWireLabel => UI.Title_FireWire; - public string ModelIDLabel => UI.Title_Model_ID; - public string GuidLabel => UI.Title_GUID; - public string PlextorLabel => UI.Title_Plextor; - public string PlextorDiscsLabel => UI.Total_loaded_discs; - public string PlextorCdReadTimeLabel => UI.Time_spent_reading_CDs; - public string PlextorCdWriteTimeLabel => UI.Time_spent_writing_CDs; - public string PlextorDvdReadTimeLabel => UI.Time_spent_reading_DVDs; - public string PlextorDvdWriteTimeLabel => UI.Time_spent_writing_DVDs; - public string PlextorPoweRecLabel => UI.Supports_PoweRec; - public string PlextorPoweRecEnabledLabel => UI.PoweRec_is_enabled; - public string PlextorPoweRecRecommendedLabel => UI.Recommended_speed; - public string PlextorPoweRecSelectedLabel => UI.Selected_PoweRec_speed_for_currently_inserted_media; - public string PlextorPoweRecMaxLabel => UI.Maximum_PoweRec_speed_for_currently_inserted_media; - public string PlextorPoweRecLastLabel => UI.Last_PoweRec_used_speed; - public string PlextorSilentModeLabel => UI.Supports_SilentMode; - public string PlextorSilentModeEnabledLabel => UI.SilentMode_is_enabled; - public string PlextorSilentModeCdReadSpeedLimitLabel => UI.CD_read_speed_limited_to; - public string PlextorSilentModeCdWriteSpeedLimitLabel => UI.CD_write_speed_limited_to; - public string PlextorSilentModeDvdReadSpeedLimitLabel => UI.DVD_read_speed_limited_to; - public string PlextorGigaRecLabel => UI.Supports_GigaRec; - public string PlextorSecuRecLabel => UI.Supports_SecuRec; - public string PlextorSpeedReadLabel => UI.Supports_SpeedRead; - public string PlextorSpeedEnabledLabel => UI.SpeedRead_is_enabled; - public string PlextorHidingLabel => UI.Supports_hiding_CD_Rs_and_sessions; - public string PlextorHidesRecordablesLabel => UI.Is_hiding_CD_Rs; - public string PlextorHidesSessionsLabel => UI.Is_forcing_only_first_session; - public string PlextorVariRecLabel => UI.Supports_VariRec; - public string PlextorVariRecDvdLabel => UI.Supports_VariRec_on_DVDs; - public string PlextorBitSettingLabel => UI.Supports_bitsetting_DVD_R_book_type; - public string PlextorBitSettingDlLabel => UI.Supports_bitsetting_DVD_R_DL_book_type; - public string PlextorDvdPlusWriteTestLabel => UI.Supports_test_writing_DVD_Plus; - public string KreonLabel => UI.Title_Kreon; - public string KreonChallengeResponseLabel => Localization.Core.Can_do_challenge_response_with_Xbox_discs; - public string KreonDecryptSsLabel => Localization.Core.Can_read_and_decrypt_SS_from_Xbox_discs; - public string KreonXtremeUnlockLabel => Localization.Core.Can_set_xtreme_unlock_state_with_Xbox_discs; - public string KreonWxripperUnlockLabel => Localization.Core.Can_set_wxripper_unlock_state_with_Xbox_discs; - public string KreonChallengeResponse360Label => Localization.Core.Can_do_challenge_response_with_Xbox_360_discs; - public string KreonDecryptSs360Label => Localization.Core.Can_read_and_decrypt_SS_from_Xbox_360_discs; - public string KreonXtremeUnlock360Label => Localization.Core.Can_set_xtreme_unlock_state_with_Xbox_360_discs; - public string KreonWxripperUnlock360Label => Localization.Core.Can_set_wxripper_unlock_state_with_Xbox_360_discs; - public string KreonSetLockedLabel => Localization.Core.Can_set_Kreon_locked_state; - public string KreonErrorSkippingLabel => Localization.Core.Kreon_Can_skip_read_errors; - public string DensitiesSupportedByDeviceLabel => UI.Densities_supported_by_device; - public string MediumTypesSupportedByDeviceLabel => UI.Medium_types_supported_by_device; - public string CIDLabel => UI.Title_CID; - public string CSDLabel => UI.Title_CSD; - public string OCRLabel => UI.Title_OCR; - public string ExtendedCSDLabel => UI.Title_Extended_CSD; - public string SCRLabel => UI.Title_SCR; - public string PcmciaLabel => UI.Title_PCMCIA; - public string ATA_ATAPILabel => UI.Title_ATA_ATAPI; - public string SCSILabel => UI.Title_SCSI; - public string Sd_MMCLabel => UI.Title_SD_MMC; - async Task SaveUsbDescriptorsAsync() { IStorageFile result = await _view.StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions diff --git a/Aaru.Gui/ViewModels/Panels/FileSystemViewModel.cs b/Aaru.Gui/ViewModels/Panels/FileSystemViewModel.cs index 419a8dc43..5a99c16ea 100644 --- a/Aaru.Gui/ViewModels/Panels/FileSystemViewModel.cs +++ b/Aaru.Gui/ViewModels/Panels/FileSystemViewModel.cs @@ -31,17 +31,12 @@ // ****************************************************************************/ using Aaru.CommonTypes.AaruMetadata; -using Aaru.Localization; using JetBrains.Annotations; namespace Aaru.Gui.ViewModels.Panels; public sealed class FileSystemViewModel([NotNull] FileSystem metadata, string information) { - public string BootableLabel => Localization.Core.Filesystem_contains_boot_code; - public string DirtyLabel => Localization.Core.Filesystem_has_not_been_unmounted_correctly_or_contains_errors; - public string DetailsLabel => UI.Title_Details; - public string TypeText { get; } = string.Format(Localization.Core.Filesystem_type_0, metadata.Type); public string VolumeNameText { get; } = string.Format(Localization.Core.Volume_name_0, metadata.VolumeName); public string SerialNumberText { get; } = string.Format(Localization.Core.Volume_serial_0, metadata.VolumeSerial); diff --git a/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs b/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs index 8c85c8289..037f39f2b 100644 --- a/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs @@ -695,8 +695,9 @@ public sealed class ImageInfoViewModel : ViewModelBase try { if(opticalMediaImage.Sessions is { Count: > 0 }) - foreach(Session session in opticalMediaImage.Sessions) - Sessions.Add(session); + { + foreach(Session session in opticalMediaImage.Sessions) Sessions.Add(session); + } } catch(Exception ex) { @@ -706,8 +707,9 @@ public sealed class ImageInfoViewModel : ViewModelBase try { if(opticalMediaImage.Tracks is { Count: > 0 }) - foreach(Track track in opticalMediaImage.Tracks) - Tracks.Add(track); + { + foreach(Track track in opticalMediaImage.Tracks) Tracks.Add(track); + } } catch(Exception ex) { @@ -800,52 +802,6 @@ public sealed class ImageInfoViewModel : ViewModelBase MediaBarcodeText != null || MediaPartNumberText != null; - public string ImageInformationLabel => UI.Title_Image_information; - public string GeneralLabel => UI.Title_General; - public string CommentsLabel => UI.Title_Comments; - public string MediaInformationLabel => UI.Title_Media_information; - public string DriveInformationLabel => UI.Title_Drive_information; - public string ReadableMediaTagsLabel => UI.Title_Readable_media_tags; - public string TagLabel => UI.Title_Readable_media_tags; - public string ReadableSectorTagsLabel => UI.Title_Readable_sector_tags; - public string SessionsLabel => UI.Title_Sessions; - public string SessionLabel => Localization.Core.Title_Session; - public string FirstTrackLabel => Localization.Core.Title_First_track; - public string LastTrackLabel => Localization.Core.Title_Last_track; - public string StartLabel => Localization.Core.Title_Start; - public string EndLabel => Localization.Core.Title_End; - public string TracksLabel => UI.Title_Tracks; - public string TrackLabel => Localization.Core.Title_Track; - public string TypeLabel => UI.Title_Type; - public string BpsLabel => Localization.Core.Title_Bps; - public string RawBpsLabel => Localization.Core.Title_Raw_bps; - public string SubchannelLabel => Localization.Core.Title_Subchannel; - public string PregapLabel => Localization.Core.Title_Pregap; - public string DumpHardwareLabel => UI.Title_Dump_hardware; - public string ManufacturerLabel => UI.Title_Manufacturer; - public string ModelLabel => UI.Title_Model; - public string RevisionLabel => UI.Title_Revision; - public string SerialLabel => UI.Serial; - public string SoftwareLabel => UI.Title_Software; - public string VersionLabel => UI.Title_Version; - public string OperatingSystemLabel => UI.Title_Operating_system; - public string SCSILabel => UI.Title_SCSI; - public string ATA_ATAPILabel => UI.Title_ATA_ATAPI; - public string CompactDiscLabel => Localization.Core.Title_CompactDisc; - public string Dvd_Hd_DvdLabel => Localization.Core.Title_DVD_HD_DVD; - public string Dvd_R_WLabel => Localization.Core.Title_DVD_Plus_Dash_R_W; - public string BluRayLabel => Localization.Core.Title_Blu_ray; - public string PcmciaLabel => UI.Title_PCMCIA; - public string Sd_MMCLabel => UI.Title_SD_MMC; - public string XboxLabel => Localization.Core.Title_Xbox; - public string EntropyLabel => UI.ButtonLabel_Calculate_entropy; - public string VerifyLabel => UI.ButtonLabel_Verify; - public string ChecksumLabel => UI.ButtonLabel_Checksum; - public string ConvertLabel => UI.ButtonLabel_Convert_to; - public string CreateSidecarLabel => UI.ButtonLabel_Create_Aaru_Metadata_sidecar; - public string ViewSectorsLabel => UI.ButtonLabel_View_sectors; - public string DecodeMediaTagLabel => UI.ButtonLabel_Decode_media_tags; - void Entropy() { if(_imageEntropy != null) diff --git a/Aaru.Gui/ViewModels/Panels/MediaInfoViewModel.cs b/Aaru.Gui/ViewModels/Panels/MediaInfoViewModel.cs index 71c8d5de7..2106a5874 100644 --- a/Aaru.Gui/ViewModels/Panels/MediaInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Panels/MediaInfoViewModel.cs @@ -138,7 +138,7 @@ public sealed partial class MediaInfoViewModel : ViewModelBase { var sbSerial = new StringBuilder(); - for(int i = 4; i < scsiInfo.MediaSerialNumber.Length; i++) + for(var i = 4; i < scsiInfo.MediaSerialNumber.Length; i++) sbSerial.Append($"{scsiInfo.MediaSerialNumber[i]:X2}"); MediaSerial = sbSerial.ToString(); @@ -255,30 +255,6 @@ public sealed partial class MediaInfoViewModel : ViewModelBase public ICommand DumpCommand { get; } public ICommand ScanCommand { get; } - public string MediaInformationLabel => UI.Title_Media_information; - public string GeneralLabel => UI.Title_General; - public string MediaTypeLabel => UI.Title_Media_type; - public string MediaSerialNumberLabel => UI.Title_Media_serial_number; - public string SaveReadMediaSerialLabel => UI.ButtonLabel_Save_READ_MEDIA_SERIAL_NUMBER_response; - public string SaveReadCapacityLabel => UI.ButtonLabel_Save_READ_CAPACITY_response; - public string SaveReadCapacity16Label => UI.ButtonLabel_Save_READ_CAPACITY_16_response; - public string MMCLabel => Localization.Core.Title_MMC; - public string SaveGetConfigurationLabel => UI.ButtonLabel_Save_GET_CONFIGURATION_response; - public string SaveRecognizedFormatLayersLabel => UI.ButtonLabel_Save_RECOGNIZED_FORMAT_LAYERS_response; - public string SaveWriteProtectionStatusLabel => UI.ButtonLabel_Save_WRITE_PROTECTION_STATUS_response; - public string SscLabel => Localization.Core.Title_SSC; - public string DensitySupportLabel => UI.Densities_supported_by_currently_inserted_media; - public string MediumSupportLabel => UI.Medium_types_currently_inserted_in_device; - public string SaveDensitySupportLabel => UI.ButtonLabel_Save_REPORT_DENSITY_SUPPORT_MEDIA_response; - public string SaveMediumSupportLabel => UI.ButtonLabel_Save_REPORT_DENSITY_SUPPORT_MEDIUM_MEDIA_response; - public string CompactDiscLabel => Localization.Core.Title_CompactDisc; - public string DvdLabel => Localization.Core.Title_DVD; - public string Dvd_R_WLabel => Localization.Core.Title_DVD_Plus_Dash_R_W; - public string XboxLabel => Localization.Core.Title_Xbox; - public string BluRayLabel => Localization.Core.Title_Blu_ray; - public string DumpLabel => UI.ButtonLabel_Dump_media_to_image; - public string ScanLabel => UI.ButtonLabel_Scan_media_surface; - async Task SaveElementAsync(byte[] data) { IStorageFile result = await _view.StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions diff --git a/Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs b/Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs index dd000e626..fcd173cf5 100644 --- a/Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs +++ b/Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs @@ -123,21 +123,6 @@ public sealed class SubdirectoryViewModel public List SelectedEntries { get; } public ICommand ExtractFilesCommand { get; } - public string ExtractFilesLabel => UI.ButtonLabel_Extract_to; - public string NameLabel => UI.Title_Name; - public string LengthLabel => UI.Title_Length; - public string CreationLabel => UI.Title_Creation; - public string LastAccessLabel => UI.Title_Last_access; - public string ChangedLabel => UI.Title_Changed; - public string LastBackupLabel => UI.Title_Last_backup; - public string LastWriteLabel => UI.Title_Last_write; - public string AttributesLabel => UI.Title_Attributes; - public string GIDLabel => UI.Title_GID; - public string UIDLabel => UI.Title_UID; - public string InodeLabel => UI.Title_Inode; - public string LinksLabel => UI.Title_Links; - public string ModeLabel => UI.Title_Mode; - async Task ExtractFiles() { if(SelectedEntries.Count == 0) return; @@ -203,7 +188,7 @@ public sealed class SubdirectoryViewModel else chars = new char[filename.Length]; - for(int ci = 0; ci < chars.Length; ci++) + for(var ci = 0; ci < chars.Length; ci++) { chars[ci] = filename[ci] switch { @@ -328,7 +313,7 @@ public sealed class SubdirectoryViewModel try { - byte[] outBuf = new byte[file.Stat.Length]; + var outBuf = new byte[file.Stat.Length]; ErrorNumber error = _model.Plugin.OpenFile(_model.Path + "/" + file.Name, out IFileNode fileNode); diff --git a/Aaru.Gui/ViewModels/Tabs/AtaInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/AtaInfoViewModel.cs index 58ed9cd0b..4a9e77e80 100644 --- a/Aaru.Gui/ViewModels/Tabs/AtaInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Tabs/AtaInfoViewModel.cs @@ -35,7 +35,6 @@ using System.IO; using System.Threading.Tasks; using System.Windows.Input; using Aaru.Decoders.ATA; -using Aaru.Localization; using Avalonia.Controls; using Avalonia.Platform.Storage; using CommunityToolkit.Mvvm.Input; @@ -82,8 +81,7 @@ public sealed class AtaInfoViewModel : ViewModelBase AtaMcptWriteProtectionChecked = (ataMcptError.Value.DeviceHead & 0x08) == 0x08; - ushort specificData = - (ushort)(ataMcptError.Value.CylinderHigh * 0x100 + ataMcptError.Value.CylinderLow); + var specificData = (ushort)(ataMcptError.Value.CylinderHigh * 0x100 + ataMcptError.Value.CylinderLow); AtaMcptSpecificDataText = string.Format(Localization.Core.Card_specific_data_0, specificData); } @@ -105,13 +103,7 @@ public sealed class AtaInfoViewModel : ViewModelBase public bool AtaMcptVisible { get; } public ICommand SaveAtaBinaryCommand { get; } public ICommand SaveAtaTextCommand { get; } - - public string AtaOrAtapiText { get; } - - public string AtaMcptLabel => Localization.Core.Device_supports_MCPT_Command_Set; - public string AtaMcptWriteProtectionLabel => Localization.Core.Media_card_is_write_protected; - public string SaveAtaBinaryLabel => UI.ButtonLabel_Save_binary_to_file; - public string SaveAtaTextLabel => UI.ButtonLabel_Save_text_to_file; + public string AtaOrAtapiText { get; } async Task SaveAtaBinaryAsync() { diff --git a/Aaru.Gui/ViewModels/Tabs/BlurayInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/BlurayInfoViewModel.cs index 9bdf0d579..5774b2e31 100644 --- a/Aaru.Gui/ViewModels/Tabs/BlurayInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Tabs/BlurayInfoViewModel.cs @@ -36,7 +36,6 @@ using System.Threading.Tasks; using System.Windows.Input; using Aaru.Decoders.Bluray; using Aaru.Decoders.SCSI.MMC; -using Aaru.Localization; using Avalonia.Controls; using Avalonia.Platform.Storage; using CommunityToolkit.Mvvm.Input; @@ -157,23 +156,6 @@ public sealed class BlurayInfoViewModel public bool SaveBlurayRawDflVisible { get; } public bool SaveBlurayPacVisible { get; } - public string DiscInformationLabel => UI.Disc_information; - public string BurstCuttingAreaLabel => UI.Burst_Cutting_Area; - public string DiscDefinitionStructureLabel => UI.Disc_Definition_Structure; - public string CartridgeStatusLabel => UI.Cartridge_Status; - public string SpareAreaInformationLabel => UI.Spare_Area_Information; - public string PseudoOverWriteResourcesLabel => UI.Pseudo_OverWrite_Resources; - public string TrackResourcesLabel => UI.Track_Resources; - public string SaveBlurayDiscInformationLabel => UI.ButtonLabel_Save_Disc_Information; - public string SaveBlurayBurstCuttingAreaLabel => UI.ButtonLabel_Save_Burst_Cutting_Area; - public string SaveBlurayDdsLabel => UI.ButtonLabel_Save_Disc_Definition_Structure; - public string SaveBlurayCartridgeStatusLabel => UI.ButtonLabel_Save_Cartridge_Status; - public string SaveBluraySpareAreaInformationLabel => UI.ButtonLabel_Save_Spare_Area_Information; - public string SaveBlurayPowResourcesLabel => UI.ButtonLabel_Save_Pseudo_OverWrite_Resources; - public string SaveBlurayTrackResourcesLabel => UI.ButtonLabel_Save_Track_Resources; - public string SaveBlurayRawDflLabel => UI.ButtonLabel_Save_raw_DFL; - public string SaveBlurayPacLabel => UI.ButtonLabel_Save_PAC; - async Task SaveElementAsync(byte[] data) { IStorageFile result = await _view.StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions diff --git a/Aaru.Gui/ViewModels/Tabs/CompactDiscInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/CompactDiscInfoViewModel.cs index 843b64fbc..65e5595ce 100644 --- a/Aaru.Gui/ViewModels/Tabs/CompactDiscInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Tabs/CompactDiscInfoViewModel.cs @@ -38,7 +38,6 @@ using System.Windows.Input; using Aaru.Decoders.CD; using Aaru.Decoders.SCSI.MMC; using Aaru.Gui.Models; -using Aaru.Localization; using Avalonia.Controls; using Avalonia.Platform.Storage; using CommunityToolkit.Mvvm.Input; @@ -129,25 +128,6 @@ public sealed class CompactDiscInfoViewModel : ViewModelBase public ICommand SaveCdPmaCommand { get; } public ObservableCollection IsrcList { get; } - public string CdInformationLabel => UI.Title_Information; - public string SaveCdInformationLabel => UI.ButtonLabel_Save_READ_DISC_INFORMATION_response; - public string CdTocLabel => UI.Title_TOC; - public string SaveCdTocLabel => UI.ButtonLabel_Save_READ_TOC_response; - public string CdFullTocLabel => UI.Title_TOC_full; - public string SaveCdFullTocLabel => UI.ButtonLabel_Save_READ_RAW_TOC_response; - public string CdSessionLabel => Localization.Core.Title_Session; - public string SaveCdSessionLabel => UI.ButtonLabel_Save_READ_SESSION_response; - public string CdTextLabel => UI.Title_CD_TEXT; - public string SaveCdTextLabel => UI.ButtonLabel_Save_Lead_In_CD_TEXT; - public string CdAtipLabel => UI.Title_ATIP; - public string SaveCdAtipLabel => UI.ButtonLabel_Save_READ_ATIP_response; - public string MiscellaneousLabel => UI.Title_Miscellaneous; - public string McnLabel => UI.Title_Media_catalog_number; - public string IsrCsLabel => UI.Title_ISRCs; - public string TrackLabel => Localization.Core.Title_Track; - public string ISRCLabel => UI.Title_ISRC; - public string SaveCdPmaLabel => UI.ButtonLabel_Save_READ_PMA_response; - async Task SaveCdInformationAsync() { IStorageFile result = await _view.StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions diff --git a/Aaru.Gui/ViewModels/Tabs/DvdInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/DvdInfoViewModel.cs index e0db117f5..61015ec2f 100644 --- a/Aaru.Gui/ViewModels/Tabs/DvdInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Tabs/DvdInfoViewModel.cs @@ -35,7 +35,6 @@ using System.IO; using System.Threading.Tasks; using System.Windows.Input; using Aaru.Decoders.DVD; -using Aaru.Localization; using Avalonia.Controls; using Avalonia.Platform.Storage; using CommunityToolkit.Mvvm.Input; @@ -117,13 +116,6 @@ public sealed class DvdInfoViewModel public bool SaveDvdBcaVisible { get; } public bool SaveDvdAacsVisible { get; } - public string SaveDvdPfiLabel => UI.ButtonLabel_Save_Physical_Format_Information; - public string SaveDvdDmiLabel => UI.ButtonLabel_Save_Disc_Manufacturer_Information; - public string SaveDvdCmiLabel => UI.ButtonLabel_Save_Copyright_Management_Information; - public string SaveHdDvdCmiLabel => UI.ButtonLabel_Save_Copyright_Management_Information; - public string SaveDvdBcaLabel => UI.ButtonLabel_Save_Burst_Cutting_Area; - public string SaveDvdAacsLabel => UI.ButtonLabel_Save_AACS_Information; - async Task SaveElementAsync(byte[] data) { IStorageFile result = await _view.StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions diff --git a/Aaru.Gui/ViewModels/Tabs/DvdWritableInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/DvdWritableInfoViewModel.cs index cc5d7619b..26959e8b3 100644 --- a/Aaru.Gui/ViewModels/Tabs/DvdWritableInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Tabs/DvdWritableInfoViewModel.cs @@ -35,7 +35,6 @@ using System.IO; using System.Threading.Tasks; using System.Windows.Input; using Aaru.Decoders.DVD; -using Aaru.Localization; using Avalonia.Controls; using Avalonia.Platform.Storage; using CommunityToolkit.Mvvm.Input; @@ -229,26 +228,6 @@ public sealed class DvdWritableInfoViewModel public ICommand SaveDvdPlusAdipCommand { get; } public ICommand SaveDvdPlusDcbCommand { get; } - public string DvdRamDdsLabel => UI.Disc_Definition_Structure; - public string DvdRamCartridgeStatusLabel => UI.Cartridge_Status; - public string DvdRamSpareAreaInformationLabel => UI.Spare_Area_Information; - public string SaveDvdRamDdsLabel => UI.ButtonLabel_Save_Disc_Definition_Structure; - public string SaveDvdRamCartridgeStatusLabel => UI.ButtonLabel_Save_Cartridge_Status; - public string SaveDvdRamSpareAreaInformationLabel => UI.ButtonLabel_Save_Spare_Area_Information; - public string SaveLastBorderOutRmdLabel => UI.ButtonLabel_Save_Last_Border_Out_RMD; - public string SaveDvdPreRecordedInfoLabel => UI.ButtonLabel_Save_Pre_Recorded_Physical_Information; - public string SaveDvdrMediaIdentifierLabel => UI.ButtonLabel_Save_Media_Identifier; - public string SaveDvdrPhysicalInformationLabel => UI.ButtonLabel_Save_Recordable_Physical_Information; - public string SaveHddvdrMediumStatusLabel => UI.ButtonLabel_Save_Medium_Status; - public string SaveHddvdrLastRmdLabel => UI.ButtonLabel_Save_Last_Border_Out_RMD; - public string SaveDvdrLayerCapacityLabel => UI.ButtonLabel_Save_Layer_Capacity; - public string SaveDvdrDlMiddleZoneStartLabel => UI.ButtonLabel_Save_Middle_Zone_Start; - public string SaveDvdrDlJumpIntervalSizeLabel => UI.ButtonLabel_Save_Jump_Interval_Size; - public string SaveDvdrDlManualLayerJumpStartLbaLabel => UI.ButtonLabel_Save_Manual_Layer_Jump_Start_LBA; - public string SaveDvdrDlRemapAnchorPointLabel => UI.ButtonLabel_Save_Remap_Anchor_Point; - public string SaveDvdPlusAdipLabel => UI.ButtonLabel_Save_ADIP; - public string SaveDvdPlusDcbLabel => UI.ButtonLabel_Save_Disc_Control_Blocks; - async Task SaveElementAsync(byte[] data) { IStorageFile result = await _view.StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions diff --git a/Aaru.Gui/ViewModels/Tabs/PcmciaInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/PcmciaInfoViewModel.cs index 99d3fb524..d086fc520 100644 --- a/Aaru.Gui/ViewModels/Tabs/PcmciaInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Tabs/PcmciaInfoViewModel.cs @@ -153,9 +153,6 @@ public sealed partial class PcmciaInfoViewModel : ViewModelBase AaruLogging.Debug(MODULE_NAME, UI.PCMCIA_CIS_returned_no_tuples); } - public string CisLabel => UI.Title_CIS; - public string SavePcmciaCisLabel => UI.ButtonLabel_Save_PCMCIA_CIS_to_file; - public ObservableCollection CisList { get; } public PcmciaCisModel SelectedCis diff --git a/Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs index 132c9f559..e2bce3397 100644 --- a/Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs @@ -442,7 +442,7 @@ public sealed partial class ScsiInfoViewModel : ViewModelBase { foreach(KeyValuePair page in scsiEvpdPages.OrderBy(t => t.Key)) { - string evpdPageTitle = ""; + var evpdPageTitle = ""; string evpdDecodedPage; switch(page.Key) @@ -637,7 +637,7 @@ public sealed partial class ScsiInfoViewModel : ViewModelBase { foreach(Features.FeatureDescriptor desc in ftr.Descriptors) { - string featureNumber = string.Format(Localization.Core.Feature_0, desc.Code); + var featureNumber = string.Format(Localization.Core.Feature_0, desc.Code); AaruLogging.Debug(MODULE_NAME, Localization.Core.Feature_0, desc.Code); string featureDescription = desc.Code switch @@ -765,20 +765,6 @@ public sealed partial class ScsiInfoViewModel : ViewModelBase } } - public string InquiryLabel => UI.Title_INQUIRY; - public string ScsiInquiryLabel => UI.Title_SCSI_INQUIRY; - public string SaveInquiryBinaryLabel => UI.ButtonLabel_Save_binary_to_file; - public string SaveInquiryTextLabel => UI.ButtonLabel_Save_text_to_file; - public string ModeSenseLabel => UI.Title_MODE_SENSE; - public string PageLabel => UI.Title_Page; - public string SaveModeSense6Label => UI.ButtonLabel_Save_MODE_SENSE_6_response_to_file; - public string SaveModeSense10Label => UI.ButtonLabel_Save_MODE_SENSE_10_response_to_file; - public string EvpdLabel => UI.Title_EVPD; - public string SaveEvpdPageLabel => UI.ButtonLabel_Save_EVPD_page_to_file; - public string MmcFeaturesLabel => UI.Title_MMC_FEATURES; - public string FeatureLabel => UI.Title_Feature; - public string SaveMmcFeaturesLabel => UI.ButtonLabel_Save_MMC_GET_CONFIGURATION_response_to_file; - async Task SaveInquiryBinaryAsync() { IStorageFile result = await _view.StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions diff --git a/Aaru.Gui/ViewModels/Tabs/SdMmcInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/SdMmcInfoViewModel.cs index 0d6c8c810..1ffa5ca94 100644 --- a/Aaru.Gui/ViewModels/Tabs/SdMmcInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Tabs/SdMmcInfoViewModel.cs @@ -31,7 +31,6 @@ // ****************************************************************************/ using Aaru.CommonTypes.Enums; -using Aaru.Localization; using JetBrains.Annotations; namespace Aaru.Gui.ViewModels.Tabs; @@ -79,10 +78,4 @@ public sealed class SdMmcInfoViewModel public string OcrText { get; } public string ExtendedCsdText { get; } public string ScrText { get; } - - public string CidLabel => UI.Title_CID; - public string CsdLabel => UI.Title_CSD; - public string OcrLabel => UI.Title_OCR; - public string ExtendedCsdLabel => UI.Title_Extended_CSD; - public string ScrLabel => UI.Title_SCR; } \ No newline at end of file diff --git a/Aaru.Gui/ViewModels/Tabs/XboxInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/XboxInfoViewModel.cs index e68390031..836cf1352 100644 --- a/Aaru.Gui/ViewModels/Tabs/XboxInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Tabs/XboxInfoViewModel.cs @@ -36,7 +36,6 @@ using System.Threading.Tasks; using System.Windows.Input; using Aaru.Core.Media.Info; using Aaru.Decoders.Xbox; -using Aaru.Localization; using Avalonia.Controls; using Avalonia.Platform.Storage; using CommunityToolkit.Mvvm.Input; @@ -91,16 +90,6 @@ public sealed class XboxInfoViewModel public string XboxDmiText { get; } public string XboxSsText { get; } - public string XboxL0VideoLabel => Localization.Core.Video_layer_zero_size; - public string XboxL1VideoLabel => Localization.Core.Video_layer_one_size; - public string XboxMiddleZoneLabel => Localization.Core.Middle_zone_size; - public string XboxGameSizeLabel => Localization.Core.Game_data_size; - public string XboxTotalSizeLabel => Localization.Core.Total_size; - public string XboxRealBreakLabel => Localization.Core.Real_layer_break; - public string XboxDmiLabel => UI.Title_Disc_Manufacturing_Information; - public string XboxSsLabel => UI.Title_Security_Sector; - public string SaveXboxSsLabel => UI.ButtonLabel_Save_Xbox_Security_Sector; - async Task SaveElementAsync(byte[] data) { IStorageFile result = await _view.StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions diff --git a/Aaru.Gui/ViewModels/Windows/DecodeMediaTagsViewModel.cs b/Aaru.Gui/ViewModels/Windows/DecodeMediaTagsViewModel.cs index 85df1102b..47aa62228 100644 --- a/Aaru.Gui/ViewModels/Windows/DecodeMediaTagsViewModel.cs +++ b/Aaru.Gui/ViewModels/Windows/DecodeMediaTagsViewModel.cs @@ -45,7 +45,6 @@ using Aaru.Decoders.SCSI.MMC; using Aaru.Decoders.Xbox; using Aaru.Gui.Models; using Aaru.Helpers; -using Aaru.Localization; using CommunityToolkit.Mvvm.ComponentModel; using JetBrains.Annotations; using BCA = Aaru.Decoders.Bluray.BCA; @@ -235,8 +234,4 @@ public sealed partial class DecodeMediaTagsViewModel : ViewModelBase if(DecodedText != null) value.Decoded = DecodedText; } } - - public string TagLabel => UI.Title_Tag; - public string HexViewLabel => UI.Title_HexView; - public string DecodedLabel => UI.Title_Decoded; } \ No newline at end of file diff --git a/Aaru.Gui/ViewModels/Windows/ImageChecksumViewModel.cs b/Aaru.Gui/ViewModels/Windows/ImageChecksumViewModel.cs index b32746c39..b36133e4d 100644 --- a/Aaru.Gui/ViewModels/Windows/ImageChecksumViewModel.cs +++ b/Aaru.Gui/ViewModels/Windows/ImageChecksumViewModel.cs @@ -168,29 +168,6 @@ public sealed partial class ImageChecksumViewModel : ViewModelBase } } - public string ChecksumMediaLabel => UI.Checksums_the_whole_disc; - public string ChecksumTracksLabel => UI.Checksums_each_track_separately; - public string Adler32Label => UI.Calculates_Adler_32; - public string Crc16Label => UI.Calculates_CRC16; - public string Crc32Label => UI.Calculates_CRC32; - public string Crc64Label => UI.Calculates_CRC64_ECMA; - public string Fletcher16Label => UI.Calculates_Fletcher_16; - public string Fletcher32Label => UI.Calculates_Fletcher_32; - public string Md5Label => UI.Calculates_MD5; - public string Sha1Label => UI.Calculates_SHA1; - public string Sha256Label => UI.Calculates_SHA256; - public string Sha384Label => UI.Calculates_SHA384; - public string Sha512Label => UI.Calculates_SHA512; - public string SpamSumLabel => UI.Calculates_SpamSum_fuzzy_hash; - public string TrackChecksumsLabel => UI.Title_Track_checksums; - public string TrackLabel => Localization.Core.Title_Track; - public string AlgorithmsLabel => UI.Title_Algorithms; - public string HashLabel => UI.Title_Hash; - public string MediaChecksumsLabel => UI.Title_Media_checksums; - public string StartLabel => UI.ButtonLabel_Start; - public string CloseLabel => UI.ButtonLabel_Close; - public string StopLabel => UI.ButtonLabel_Stop; - public ObservableCollection TrackChecksums { get; } public ObservableCollection MediaChecksums { get; } public ICommand StartCommand { get; } diff --git a/Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs b/Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs index 68713400f..2347a679e 100644 --- a/Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs +++ b/Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs @@ -261,56 +261,29 @@ public sealed partial class ImageConvertViewModel : ViewModelBase ResumeFileText = _dumpHardware == null ? "" : UI._From_image_; } - public string SourceImageLabel => UI.Source_image; - public string OutputFormatLabel => UI.Output_format; - public string ChooseLabel => UI.ButtonLabel_Choose; - public string SectorsLabel => UI.How_many_sectors_to_convert_at_once; - public string ForceLabel => UI.Continue_conversion_even_if_data_lost; - public string CreatorLabel => UI.Who_person_created_the_image; - public string GetFromSourceImageLabel => UI.ButtonLabel_Get_from_source_image; - public string MetadataLabel => UI.Title_Metadata; - public string MediaLabel => UI.Title_Media; - public string TitleLabel => UI.Title_Title; - public string ManufacturerLabel => UI.Title_Manufacturer; - public string ModelLabel => UI.Title_Model; - public string SerialNumberLabel => UI.Title_Serial_number; - public string BarcodeLabel => UI.Title_Barcode; - public string PartNumberLabel => UI.Title_Part_number; - public string NumberInSequenceLabel => UI.Title_Number_in_sequence; - public string LastMediaOfTheSequenceLabel => UI.Title_Last_media_of_the_sequence; - public string DriveLabel => UI.Title_Drive; - public string FirmwareRevisionLabel => UI.Title_Firmware_revision; - public string CommentsLabel => UI.Title_Comments; - public string AaruMetadataLabel => UI.Title_Existing_Aaru_Metadata_sidecar; - public string FromImageLabel => UI.Title_From_image; - public string ResumeFileLabel => UI.Title_Existing_resume_file; - public string StartLabel => UI.ButtonLabel_Start; - public string CloseLabel => UI.ButtonLabel_Close; - public string StopLabel => UI.ButtonLabel_Stop; - public ObservableCollection PluginsList { get; } - - public ICommand DestinationCommand { get; } - public ICommand CreatorCommand { get; } - public ICommand MediaTitleCommand { get; } - public ICommand MediaManufacturerCommand { get; } - public ICommand MediaModelCommand { get; } - public ICommand MediaSerialNumberCommand { get; } - public ICommand MediaBarcodeCommand { get; } - public ICommand MediaPartNumberCommand { get; } - public ICommand MediaSequenceCommand { get; } - public ICommand LastMediaSequenceCommand { get; } - public ICommand DriveManufacturerCommand { get; } - public ICommand DriveModelCommand { get; } - public ICommand DriveSerialNumberCommand { get; } - public ICommand DriveFirmwareRevisionCommand { get; } - public ICommand CommentsCommand { get; } - public ICommand AaruMetadataFromImageCommand { get; } - public ICommand AaruMetadataCommand { get; } - public ICommand ResumeFileFromImageCommand { get; } - public ICommand ResumeFileCommand { get; } - public ICommand StartCommand { get; } - public ICommand CloseCommand { get; } - public ICommand StopCommand { get; } + public ObservableCollection PluginsList { get; } + public ICommand DestinationCommand { get; } + public ICommand CreatorCommand { get; } + public ICommand MediaTitleCommand { get; } + public ICommand MediaManufacturerCommand { get; } + public ICommand MediaModelCommand { get; } + public ICommand MediaSerialNumberCommand { get; } + public ICommand MediaBarcodeCommand { get; } + public ICommand MediaPartNumberCommand { get; } + public ICommand MediaSequenceCommand { get; } + public ICommand LastMediaSequenceCommand { get; } + public ICommand DriveManufacturerCommand { get; } + public ICommand DriveModelCommand { get; } + public ICommand DriveSerialNumberCommand { get; } + public ICommand DriveFirmwareRevisionCommand { get; } + public ICommand CommentsCommand { get; } + public ICommand AaruMetadataFromImageCommand { get; } + public ICommand AaruMetadataCommand { get; } + public ICommand ResumeFileFromImageCommand { get; } + public ICommand ResumeFileCommand { get; } + public ICommand StartCommand { get; } + public ICommand CloseCommand { get; } + public ICommand StopCommand { get; } async Task StartAsync() { diff --git a/Aaru.Gui/ViewModels/Windows/ImageEntropyViewModel.cs b/Aaru.Gui/ViewModels/Windows/ImageEntropyViewModel.cs index 4d712318b..ab4b7dfb7 100644 --- a/Aaru.Gui/ViewModels/Windows/ImageEntropyViewModel.cs +++ b/Aaru.Gui/ViewModels/Windows/ImageEntropyViewModel.cs @@ -141,20 +141,6 @@ public sealed partial class ImageEntropyViewModel : ViewModelBase } } - public string DuplicatedSectorsLabel => UI.Calculates_how_many_sectors_are_duplicated; - public string SeparatedTracksLabel => UI.Calculates_entropy_for_each_track_separately; - public string WholeDiscLabel => UI.Calculates_entropy_for_the_whole_disc; - public string TrackEntropyLabel => UI.Title_Track_entropy; - public string TrackLabel => Localization.Core.Title_Track; - public string EntropyLabel => UI.Title_Entropy; - public string UniqueSectorsLabel => UI.Title_Unique_sectors; - public string StartLabel => UI.ButtonLabel_Start; - public string CloseLabel => UI.ButtonLabel_Close; - public string StopLabel => UI.ButtonLabel_Stop; - - [JetBrains.Annotations.NotNull] - public string Title => UI.Title_Calculating_entropy; - public ObservableCollection TrackEntropy { get; } public ICommand StartCommand { get; } public ICommand CloseCommand { get; } diff --git a/Aaru.Gui/ViewModels/Windows/ImageSidecarViewModel.cs b/Aaru.Gui/ViewModels/Windows/ImageSidecarViewModel.cs index 6f91856f9..4e75e8474 100644 --- a/Aaru.Gui/ViewModels/Windows/ImageSidecarViewModel.cs +++ b/Aaru.Gui/ViewModels/Windows/ImageSidecarViewModel.cs @@ -121,12 +121,6 @@ public sealed partial class ImageSidecarViewModel : ViewModelBase StopCommand = new RelayCommand(Stop); } - public string DestinationFileLabel => UI.Title_Destination_file; - public string ChooseLabel => UI.ButtonLabel_Choose; - public string StartLabel => UI.ButtonLabel_Start; - public string CloseLabel => UI.ButtonLabel_Close; - public string StopLabel => UI.ButtonLabel_Stop; - public string Title { get; } public ICommand DestinationCommand { get; } public ICommand StartCommand { get; } diff --git a/Aaru.Gui/ViewModels/Windows/ImageVerifyViewModel.cs b/Aaru.Gui/ViewModels/Windows/ImageVerifyViewModel.cs index ff0785bd8..b987f6c01 100644 --- a/Aaru.Gui/ViewModels/Windows/ImageVerifyViewModel.cs +++ b/Aaru.Gui/ViewModels/Windows/ImageVerifyViewModel.cs @@ -149,13 +149,6 @@ public sealed partial class ImageVerifyViewModel : ViewModelBase OptionsVisible = true; } - public string VerifyImageLabel => UI.Verify_media_image_if_supported; - public string VerifySectorsLabel => UI.Verify_all_sectors_if_supported; - public string LBALabel => UI.Title_LBA; - public string StartLabel => UI.ButtonLabel_Start; - public string CloseLabel => UI.ButtonLabel_Close; - public string StopLabel => UI.ButtonLabel_Stop; - public ObservableCollection ErrorList { get; } public ObservableCollection UnknownList { get; } public ICommand StartCommand { get; } diff --git a/Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs b/Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs index 42dbd4d82..f2fd3674e 100644 --- a/Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs +++ b/Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs @@ -165,28 +165,6 @@ public sealed class MainWindowViewModel : ViewModelBase new Bitmap(AssetLoader.Open(new Uri("avares://Aaru.Gui/Assets/Icons/oxygen/32x32/media-eject.png"))); } - public string FileLabel => UI.Menu_File; - public string OpenLabel => UI.Menu_Open; - public string SettingsLabel => UI.Menu_Settings; - public string ExitLabel => UI.Menu_Exit; - public string DevicesLabel => UI.Menu_Devices; - public string RefreshDevicesLabel => UI.Menu_Refresh; - public string WindowLabel => UI.Menu_Window; - public string ConsoleLabel => UI.Menu_Console; - public string HelpLabel => UI.Menu_Help; - public string EncodingsLabel => UI.Menu_Encodings; - public string PluginsLabel => UI.Menu_Plugins; - public string StatisticsLabel => UI.Menu_Statistics; - public string AboutLabel => UI.Menu_About; - public string RefreshDevicesFullLabel => UI.Menu_Refresh_devices; - public string CloseAllImagesLabel => UI.Menu_Close_all_images; - public string CalculateEntropyLabel => UI.ButtonLabel_Calculate_entropy; - public string VerifyImageLabel => UI.ButtonLabel_Verify; - public string ChecksumImageLabel => UI.ButtonLabel_Checksum; - public string CreateSidecarLabel => UI.ButtonLabel_Create_Aaru_Metadata_sidecar; - public string ViewImageSectorsLabel => UI.ButtonLabel_View_sectors; - public string DecodeImageMediaTagsLabel => UI.ButtonLabel_Decode_media_tags; - public bool DevicesSupported { get => _devicesSupported; @@ -609,7 +587,7 @@ public sealed class MainWindowViewModel : ViewModelBase List partitions = Core.Partitions.GetAll(imageFormat); Core.Partitions.AddSchemesToStats(partitions); - bool checkRaw = false; + var checkRaw = false; List idPlugins; PluginRegister plugins = PluginRegister.Singleton; diff --git a/Aaru.Gui/ViewModels/Windows/MediaDumpViewModel.cs b/Aaru.Gui/ViewModels/Windows/MediaDumpViewModel.cs index 8dc491e22..d452ac9f9 100644 --- a/Aaru.Gui/ViewModels/Windows/MediaDumpViewModel.cs +++ b/Aaru.Gui/ViewModels/Windows/MediaDumpViewModel.cs @@ -289,25 +289,6 @@ public sealed partial class MediaDumpViewModel : ViewModelBase _devicePath = devicePath; } - public string OutputFormatLabel => UI.Output_format; - public string ChooseLabel => UI.ButtonLabel_Choose; - public string StopOnErrorLabel => UI.Stop_media_dump_on_first_error; - public string ForceLabel => UI.Continue_dumping_whatever_happens; - public string RetriesLabel => UI.Retry_passes; - public string PersistentLabel => UI.Try_to_recover_partial_or_incorrect_data; - public string ResumeLabel => UI.Create_or_use_resume_mapfile; - public string Track1PregapLabel => UI.Try_to_read_track_1_pregap; - public string SkippedLabel => UI.Skipped_sectors_on_error; - public string SidecarLabel => UI.Create_Aaru_Metadata_sidecar; - public string TrimLabel => UI.Trim_errors_from_skipped_sectors; - public string ExistingMetadataLabel => UI.Take_metadata_from_existing_CICM_XML_sidecar; - public string EncodingLabel => UI.Encoding_to_use_on_metadata_sidecar_creation; - public string DestinationLabel => UI.Writing_image_to; - public string LogLabel => UI.Title_Log; - public string StartLabel => UI.ButtonLabel_Start; - public string CloseLabel => UI.ButtonLabel_Close; - public string StopLabel => UI.ButtonLabel_Stop; - public ICommand StartCommand { get; } public ICommand CloseCommand { get; } public ICommand StopCommand { get; } diff --git a/Aaru.Gui/ViewModels/Windows/MediaScanViewModel.cs b/Aaru.Gui/ViewModels/Windows/MediaScanViewModel.cs index 0046a1691..1161da62e 100644 --- a/Aaru.Gui/ViewModels/Windows/MediaScanViewModel.cs +++ b/Aaru.Gui/ViewModels/Windows/MediaScanViewModel.cs @@ -161,9 +161,6 @@ public sealed partial class MediaScanViewModel : ViewModelBase public string SpeedLabel => UI.ButtonLabel_Stop; public string KbsLabel => UI.Kb_s; public string BlockLabel => UI.Title_Block; - public string StartLabel => UI.ButtonLabel_Start; - public string CloseLabel => UI.ButtonLabel_Close; - public string StopLabel => UI.ButtonLabel_Stop; public ObservableCollection<(ulong block, double duration)> BlockMapList { get; } diff --git a/Aaru.Gui/ViewModels/Windows/ViewSectorViewModel.cs b/Aaru.Gui/ViewModels/Windows/ViewSectorViewModel.cs index 0b1c00abc..a8a10a2ab 100644 --- a/Aaru.Gui/ViewModels/Windows/ViewSectorViewModel.cs +++ b/Aaru.Gui/ViewModels/Windows/ViewSectorViewModel.cs @@ -33,7 +33,6 @@ using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Interfaces; using Aaru.Helpers; -using Aaru.Localization; using CommunityToolkit.Mvvm.ComponentModel; using JetBrains.Annotations; @@ -71,10 +70,6 @@ public sealed partial class ViewSectorViewModel : ViewModelBase SectorNumber = 0; } - public string SectorLabel => UI.Title_Sector; - public string LongSectorLabel => UI.Show_long_sector; - - public double SectorNumber { get => _sectorNumber; diff --git a/Aaru.Gui/Views/Dialogs/About.xaml b/Aaru.Gui/Views/Dialogs/About.xaml index f96568eec..360199ffa 100644 --- a/Aaru.Gui/Views/Dialogs/About.xaml +++ b/Aaru.Gui/Views/Dialogs/About.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:dialogs="clr-namespace:Aaru.Gui.ViewModels.Dialogs" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -44,7 +45,7 @@ x:Class="Aaru.Gui.Views.Dialogs.About" Icon="/Assets/aaru-logo.png" CanResize="False" - Title="{Binding Title}"> + Title="{x:Static localization:UI.Title_About_Aaru}"> @@ -86,7 +87,7 @@ VerticalAlignment="Stretch"> - + @@ -125,7 +126,7 @@ - + @@ -149,7 +150,7 @@ - + diff --git a/Aaru.Gui/Views/Dialogs/Console.xaml b/Aaru.Gui/Views/Dialogs/Console.xaml index b77561464..d76ec7fe2 100644 --- a/Aaru.Gui/Views/Dialogs/Console.xaml +++ b/Aaru.Gui/Views/Dialogs/Console.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:dialogs="clr-namespace:Aaru.Gui.ViewModels.Dialogs" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -43,7 +44,7 @@ Height="450" x:Class="Aaru.Gui.Views.Dialogs.Console" Icon="/Assets/aaru-logo.png" - Title="{Binding Title}"> + Title="{x:Static localization:UI.Title_Console}"> @@ -54,19 +55,19 @@ - - - - @@ -74,17 +75,17 @@ - + diff --git a/Aaru.Gui/Views/Dialogs/Encodings.xaml b/Aaru.Gui/Views/Dialogs/Encodings.xaml index a0b15506d..7bb99a3da 100644 --- a/Aaru.Gui/Views/Dialogs/Encodings.xaml +++ b/Aaru.Gui/Views/Dialogs/Encodings.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:dialogs="clr-namespace:Aaru.Gui.ViewModels.Dialogs" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -44,7 +45,7 @@ x:Class="Aaru.Gui.Views.Dialogs.Encodings" Icon="/Assets/aaru-logo.png" CanResize="False" - Title="{Binding Title}"> + Title="{x:Static localization:UI.Encodings}"> @@ -57,11 +58,11 @@ - - @@ -72,7 +73,7 @@ diff --git a/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml b/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml index 10179c196..3d5a17495 100644 --- a/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml +++ b/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:dialogs="clr-namespace:Aaru.Gui.ViewModels.Dialogs" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -44,16 +45,14 @@ x:Class="Aaru.Gui.Views.Dialogs.LicenseDialog" Icon="/Assets/aaru-logo.png" CanResize="False" - Title="{Binding Title}"> + Title="{x:Static localization:UI.Title_Aaru_license}"> - - - + VerticalAlignment="Stretch" + RowDefinitions="260,Auto"> @@ -62,7 +61,7 @@ diff --git a/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml b/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml index 1b4c54cd9..c8f0634ec 100644 --- a/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml +++ b/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:dialogs="clr-namespace:Aaru.Gui.ViewModels.Dialogs" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -43,7 +44,7 @@ Height="450" x:Class="Aaru.Gui.Views.Dialogs.PluginsDialog" Icon="/Assets/aaru-logo.png" - Title="{Binding Title}" + Title="{x:Static localization:UI.Title_Plugins}" Padding="10"> @@ -58,24 +59,24 @@ VerticalAlignment="Stretch"> - + - - - - @@ -84,24 +85,24 @@ - + - - - - @@ -110,7 +111,7 @@ - + @@ -118,50 +119,50 @@ - - - - - - - - @@ -171,7 +172,7 @@ - + @@ -179,50 +180,50 @@ - - - - - - - - @@ -232,7 +233,7 @@ - + @@ -240,50 +241,50 @@ - - - - - - - - @@ -297,7 +298,7 @@ diff --git a/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml b/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml index 75902b23f..12dca3e8c 100644 --- a/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml +++ b/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:dialogs="clr-namespace:Aaru.Gui.ViewModels.Dialogs" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -44,7 +45,7 @@ x:Class="Aaru.Gui.Views.Dialogs.SettingsDialog" Icon="/Assets/aaru-logo.png" CanResize="False" - Title="{Binding Title}"> + Title="{x:Static localization:UI.Title_Settings}"> @@ -59,73 +60,80 @@ SelectedIndex="{Binding TabControlSelectedIndex}"> - + - - - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -137,10 +145,10 @@ Orientation="Horizontal" Spacing="5"> diff --git a/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml b/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml index d0ccb2121..62b36071b 100644 --- a/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml +++ b/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:dialogs="clr-namespace:Aaru.Gui.ViewModels.Dialogs" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -44,21 +45,18 @@ x:Class="Aaru.Gui.Views.Dialogs.StatisticsDialog" Icon="/Assets/aaru-logo.png" CanResize="False" - Title="{Binding Title}"> + Title="{x:Static localization:UI.Title_Statistics}"> - - - - + - + @@ -98,17 +96,17 @@ - + - - @@ -117,17 +115,17 @@ - + - - @@ -136,17 +134,17 @@ - + - - @@ -155,17 +153,17 @@ - + - - @@ -174,25 +172,25 @@ - + - - - - @@ -201,21 +199,21 @@ - + - - - @@ -228,7 +226,7 @@ VerticalAlignment="Center" Command="{Binding CloseCommand}" Padding="10"> - + diff --git a/Aaru.Gui/Views/Panels/DeviceInfo.xaml b/Aaru.Gui/Views/Panels/DeviceInfo.xaml index 854af6ccb..986b71196 100644 --- a/Aaru.Gui/Views/Panels/DeviceInfo.xaml +++ b/Aaru.Gui/Views/Panels/DeviceInfo.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -44,116 +45,116 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -161,35 +162,35 @@ - + - + - + - + - + - + @@ -197,19 +198,19 @@ - + - + - + @@ -217,7 +218,8 @@ - + @@ -225,7 +227,8 @@ - + @@ -233,7 +236,7 @@ - + @@ -241,30 +244,30 @@ - + - + - + - + - + @@ -272,110 +275,111 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -411,35 +415,35 @@ - + - + - + - + - + @@ -448,25 +452,25 @@ - + - + - + - + diff --git a/Aaru.Gui/Views/Panels/FileSystem.xaml b/Aaru.Gui/Views/Panels/FileSystem.xaml index 3081c7131..bb0388f13 100644 --- a/Aaru.Gui/Views/Panels/FileSystem.xaml +++ b/Aaru.Gui/Views/Panels/FileSystem.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -75,12 +76,13 @@ - + - + - diff --git a/Aaru.Gui/Views/Panels/ImageInfo.xaml b/Aaru.Gui/Views/Panels/ImageInfo.xaml index a0b782b85..f6813b144 100644 --- a/Aaru.Gui/Views/Panels/ImageInfo.xaml +++ b/Aaru.Gui/Views/Panels/ImageInfo.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -49,14 +50,14 @@ HorizontalAlignment="Center" VerticalAlignment="Center" Source="{Binding MediaLogo}" /> - - + - - - - - - - @@ -146,25 +147,25 @@ - + - - - - - @@ -172,34 +173,34 @@ - + - - - - - - - - @@ -207,37 +208,37 @@ - + - - - - - - - - - @@ -245,55 +246,55 @@ - + - + - + - + - + - + - + - + - + @@ -301,25 +302,25 @@ diff --git a/Aaru.Gui/Views/Panels/MediaInfo.xaml b/Aaru.Gui/Views/Panels/MediaInfo.xaml index 0856fbe12..7d74ac658 100644 --- a/Aaru.Gui/Views/Panels/MediaInfo.xaml +++ b/Aaru.Gui/Views/Panels/MediaInfo.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -45,7 +46,7 @@ + Text="{x:Static localization:UI.Title_Media_information}" /> - + - + @@ -65,103 +66,105 @@ Text="{Binding MediaSize}" /> - + - + - + + Text="{x:Static localization:UI.Densities_supported_by_currently_inserted_media}" /> + Text="{x:Static localization:UI.Medium_types_currently_inserted_in_device}" /> - + - + - + - + - + \ No newline at end of file diff --git a/Aaru.Gui/Views/Panels/Subdirectory.xaml b/Aaru.Gui/Views/Panels/Subdirectory.xaml index 3208d2774..b4d59845d 100644 --- a/Aaru.Gui/Views/Panels/Subdirectory.xaml +++ b/Aaru.Gui/Views/Panels/Subdirectory.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -49,60 +50,60 @@ - - - - - - - - - - - - - diff --git a/Aaru.Gui/Views/Tabs/AtaInfo.xaml b/Aaru.Gui/Views/Tabs/AtaInfo.xaml index cd45de115..17118c0b6 100644 --- a/Aaru.Gui/Views/Tabs/AtaInfo.xaml +++ b/Aaru.Gui/Views/Tabs/AtaInfo.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -51,21 +52,21 @@ - + - + diff --git a/Aaru.Gui/Views/Tabs/BlurayInfo.xaml b/Aaru.Gui/Views/Tabs/BlurayInfo.xaml index 8af52daeb..64c5600e6 100644 --- a/Aaru.Gui/Views/Tabs/BlurayInfo.xaml +++ b/Aaru.Gui/Views/Tabs/BlurayInfo.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -45,75 +46,75 @@ - + - + - + - + - + - + - + \ No newline at end of file diff --git a/Aaru.Gui/Views/Tabs/CompactDiscInfo.xaml b/Aaru.Gui/Views/Tabs/CompactDiscInfo.xaml index 4364281f7..213cacd9b 100644 --- a/Aaru.Gui/Views/Tabs/CompactDiscInfo.xaml +++ b/Aaru.Gui/Views/Tabs/CompactDiscInfo.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -46,101 +47,101 @@ - + - + - + - + - + - + - + - + - + + Header="{x:Static localization:Core.Title_Track}" /> + Header="{x:Static localization:UI.Title_ISRC}" /> diff --git a/Aaru.Gui/Views/Tabs/DvdInfo.xaml b/Aaru.Gui/Views/Tabs/DvdInfo.xaml index 7bd6416aa..2ea107deb 100644 --- a/Aaru.Gui/Views/Tabs/DvdInfo.xaml +++ b/Aaru.Gui/Views/Tabs/DvdInfo.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -56,27 +57,27 @@ Text="{Binding DvdCmiText}" /> \ No newline at end of file diff --git a/Aaru.Gui/Views/Tabs/DvdWritableInfo.xaml b/Aaru.Gui/Views/Tabs/DvdWritableInfo.xaml index 18dac495c..b691d1508 100644 --- a/Aaru.Gui/Views/Tabs/DvdWritableInfo.xaml +++ b/Aaru.Gui/Views/Tabs/DvdWritableInfo.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -46,88 +47,88 @@ + Text="{x:Static localization:UI.Disc_Definition_Structure}" /> + Text="{x:Static localization:UI.Cartridge_Status}" /> + Text="{x:Static localization:UI.Spare_Area_Information}" /> \ No newline at end of file diff --git a/Aaru.Gui/Views/Tabs/PcmciaInfo.xaml b/Aaru.Gui/Views/Tabs/PcmciaInfo.xaml index 17da19426..318a8b246 100644 --- a/Aaru.Gui/Views/Tabs/PcmciaInfo.xaml +++ b/Aaru.Gui/Views/Tabs/PcmciaInfo.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -48,7 +49,7 @@ - @@ -56,7 +57,7 @@ Text="{Binding PcmciaCisText}" /> \ No newline at end of file diff --git a/Aaru.Gui/Views/Tabs/ScsiInfo.xaml b/Aaru.Gui/Views/Tabs/ScsiInfo.xaml index b2c12b859..ec45cf1c0 100644 --- a/Aaru.Gui/Views/Tabs/ScsiInfo.xaml +++ b/Aaru.Gui/Views/Tabs/ScsiInfo.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -46,26 +47,26 @@ - + - - + @@ -75,7 +76,7 @@ SelectedItem="{Binding SelectedModeSensePage}" IsReadOnly="True"> - @@ -86,17 +87,17 @@ - + @@ -106,7 +107,7 @@ SelectedItem="{Binding SelectedEvpdPage}" IsReadOnly="True"> - @@ -117,14 +118,14 @@ - + @@ -134,7 +135,7 @@ SelectedItem="{Binding SelectedMmcFeature}" IsReadOnly="True"> - @@ -145,7 +146,8 @@ diff --git a/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml b/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml index a19235021..005fb6215 100644 --- a/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml +++ b/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -46,35 +47,35 @@ - + - + - + - + - + diff --git a/Aaru.Gui/Views/Tabs/XboxInfo.xaml b/Aaru.Gui/Views/Tabs/XboxInfo.xaml index 77ece64ce..904fe0443 100644 --- a/Aaru.Gui/Views/Tabs/XboxInfo.xaml +++ b/Aaru.Gui/Views/Tabs/XboxInfo.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -47,56 +48,56 @@ - + - + - + - + - + - + - + - + diff --git a/Aaru.Gui/Views/Windows/DecodeMediaTags.xaml b/Aaru.Gui/Views/Windows/DecodeMediaTags.xaml index b9188d281..e0041a1c7 100644 --- a/Aaru.Gui/Views/Windows/DecodeMediaTags.xaml +++ b/Aaru.Gui/Views/Windows/DecodeMediaTags.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -50,7 +51,7 @@ - + @@ -63,14 +64,14 @@ - + - + diff --git a/Aaru.Gui/Views/Windows/ImageChecksum.xaml b/Aaru.Gui/Views/Windows/ImageChecksum.xaml index 223cae95f..62616d38d 100644 --- a/Aaru.Gui/Views/Windows/ImageChecksum.xaml +++ b/Aaru.Gui/Views/Windows/ImageChecksum.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -50,86 +51,86 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + - - @@ -154,17 +155,17 @@ diff --git a/Aaru.Gui/Views/Windows/ImageConvert.xaml b/Aaru.Gui/Views/Windows/ImageConvert.xaml index 35c4ce490..745b0d751 100644 --- a/Aaru.Gui/Views/Windows/ImageConvert.xaml +++ b/Aaru.Gui/Views/Windows/ImageConvert.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -46,10 +47,10 @@ - + - + @@ -65,7 +66,7 @@ - + - + - + + - + - + - + + - + - + + - + - + - + - + - + - + - + - + + - + - + - + - + - + @@ -260,16 +265,16 @@ diff --git a/Aaru.Gui/Views/Windows/ImageEntropy.xaml b/Aaru.Gui/Views/Windows/ImageEntropy.xaml index 490baa88e..cf0a24239 100644 --- a/Aaru.Gui/Views/Windows/ImageEntropy.xaml +++ b/Aaru.Gui/Views/Windows/ImageEntropy.xaml @@ -36,12 +36,13 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Windows.ImageEntropy" Icon="/Assets/aaru-logo.png" - Title="{Binding Title}"> + Title="{x:Static localization:UI.Title_Calculating_entropy}"> @@ -50,17 +51,17 @@ Orientation="Vertical"> - + - + - + - - - - @@ -102,15 +103,15 @@ \ No newline at end of file diff --git a/Aaru.Gui/Views/Windows/ImageSidecar.xaml b/Aaru.Gui/Views/Windows/ImageSidecar.xaml index 382387125..d5efecb50 100644 --- a/Aaru.Gui/Views/Windows/ImageSidecar.xaml +++ b/Aaru.Gui/Views/Windows/ImageSidecar.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -49,13 +50,13 @@ - + diff --git a/Aaru.Gui/Views/Windows/ImageVerify.xaml b/Aaru.Gui/Views/Windows/ImageVerify.xaml index 36488db23..d717848e8 100644 --- a/Aaru.Gui/Views/Windows/ImageVerify.xaml +++ b/Aaru.Gui/Views/Windows/ImageVerify.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -50,12 +51,12 @@ IsVisible="{Binding OptionsVisible}"> - + - + - @@ -76,7 +77,7 @@ - @@ -113,16 +114,16 @@ diff --git a/Aaru.Gui/Views/Windows/MainWindow.xaml b/Aaru.Gui/Views/Windows/MainWindow.xaml index bcb883151..6095d2b34 100644 --- a/Aaru.Gui/Views/Windows/MainWindow.xaml +++ b/Aaru.Gui/Views/Windows/MainWindow.xaml @@ -37,6 +37,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -48,36 +49,36 @@ - - + - - - - - - + - - + - - - @@ -95,7 +96,7 @@ - @@ -110,7 +111,7 @@ - @@ -126,19 +127,19 @@ + Header="{x:Static localization:UI.ButtonLabel_Calculate_entropy}" /> + Header="{x:Static localization:UI.ButtonLabel_Verify}" /> + Header="{x:Static localization:UI.ButtonLabel_Checksum}" /> + Header="{x:Static localization:UI.ButtonLabel_Convert_to}" /> + Header="{x:Static localization:UI.ButtonLabel_Create_Aaru_Metadata_sidecar}" /> + Header="{x:Static localization:UI.ButtonLabel_View_sectors}" /> + Header="{x:Static localization:UI.ButtonLabel_Decode_media_tags}" /> - + @@ -63,44 +64,44 @@ IsReadOnly="True" /> - + - + - - + - + - + - - + - + - + - + @@ -116,9 +117,10 @@ - + + - + diff --git a/Aaru.Gui/Views/Windows/MediaScan.xaml b/Aaru.Gui/Views/Windows/MediaScan.xaml index 7e6d2018d..07bc6f39d 100644 --- a/Aaru.Gui/Views/Windows/MediaScan.xaml +++ b/Aaru.Gui/Views/Windows/MediaScan.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -108,16 +109,16 @@ diff --git a/Aaru.Gui/Views/Windows/ViewSector.xaml b/Aaru.Gui/Views/Windows/ViewSector.xaml index e75e7326d..32fde0d87 100644 --- a/Aaru.Gui/Views/Windows/ViewSector.xaml +++ b/Aaru.Gui/Views/Windows/ViewSector.xaml @@ -36,6 +36,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" + xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -50,12 +51,12 @@ - - + + - + diff --git a/Aaru.Localization/UI.Designer.cs b/Aaru.Localization/UI.Designer.cs index 19e62064a..e68f96589 100644 --- a/Aaru.Localization/UI.Designer.cs +++ b/Aaru.Localization/UI.Designer.cs @@ -6219,5 +6219,11 @@ namespace Aaru.Localization { return ResourceManager.GetString("Converting_tag_1_for_overflow_sector_0", resourceCulture); } } + + public static string SSC_Label { + get { + return ResourceManager.GetString("SSC_Label", resourceCulture); + } + } } } diff --git a/Aaru.Localization/UI.es.resx b/Aaru.Localization/UI.es.resx index ab2b0d4ce..717571799 100644 --- a/Aaru.Localization/UI.es.resx +++ b/Aaru.Localization/UI.es.resx @@ -3110,4 +3110,7 @@ Probadores: [red]Error [orange3]{0}[/] escribiendo sector de sobrecarga [lime]{1}[/], no se continuará...[/] + + SSC + \ No newline at end of file diff --git a/Aaru.Localization/UI.resx b/Aaru.Localization/UI.resx index 7266fbaf6..3efa21e28 100644 --- a/Aaru.Localization/UI.resx +++ b/Aaru.Localization/UI.resx @@ -3186,4 +3186,7 @@ Do you want to continue? [slateblue1]Converting tag [orange3]{1}[/] for overflow sector [lime]{0}[/][/] + + SSC + \ No newline at end of file