From d50cbb6eed9afaeb11db590d4aabe05122a772a4 Mon Sep 17 00:00:00 2001 From: Dmitry Borisov Date: Wed, 23 Sep 2020 01:58:58 +0600 Subject: [PATCH] [INF] Remove duplicated manufacturer names (#3173) [BOOTDATA] Change the computer name to ensure naming consistency --- boot/bootdata/txtsetup.sif | 2 +- media/inf/msmouse.inf | 37 ++++++++----------------------------- 2 files changed, 9 insertions(+), 30 deletions(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 5e3134d4ab4..5e2f0376e97 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -226,7 +226,7 @@ pci_up = "Standard PC Uniprocessor" acpi_up = "ACPI PC Uniprocessor" ;acpi_mp = "ACPI PC Multiprocessor" xbox = "Original Xbox (x86 based)" -pc98_up = "Uniprocessor NEC PC-98" +pc98_up = "NEC PC-98 Uniprocessor" [Computer.NTamd64] x64_up = "Standard x64 Uniprocessor" diff --git a/media/inf/msmouse.inf b/media/inf/msmouse.inf index 996e9ee9492..fdace56f06b 100644 --- a/media/inf/msmouse.inf +++ b/media/inf/msmouse.inf @@ -162,14 +162,11 @@ PS2_MOUSE.DeviceDesc = "Standardní PS/2 myš" HID_MOUSE.DeviceDesc = "HID myš" *PNP0F13.DeviceDesc = "PS/2 port pro PS/2 myši" -IbmMfg = "IBM" *IBM3780.DeviceDesc = "IBM PS/2 Trackpoint" -LogMfg = "Logitech" *PNP0F08.DeviceDesc = "Logitech sériová myš" *PNP0F12.DeviceDesc = "Logitech PS/2 myš" -MSMfg = "Microsoft" *PNP0F01.DeviceDesc = "Microsoft sériová myš" *PNP0F03.DeviceDesc = "Microsoft PS/2 myš" @@ -198,14 +195,11 @@ PS2_MOUSE.DeviceDesc = "Πρότυπο PS/2 Ποντίκι" HID_MOUSE.DeviceDesc = "Ποντίκι HID" *PNP0F13.DeviceDesc = "PS/2 θύρα για PS/2 ποντίκια" -IbmMfg = "IBM" *IBM3780.DeviceDesc = "IBM PS/2 Trackpoint" -LogMfg = "Logitech" *PNP0F08.DeviceDesc = "Logitech Σειριακό Ποντίκι" *PNP0F12.DeviceDesc = "Logitech PS/2 Ποντίκι" -MSMfg = "Microsoft" *PNP0F01.DeviceDesc = "Microsoft Σειριακό Ποντίκι" *PNP0F03.DeviceDesc = "Microsoft PS/2 Ποντίκι" @@ -220,14 +214,11 @@ PS2_MOUSE.DeviceDesc = "Ratón PS/2 estándar" HID_MOUSE.DeviceDesc = "Ratón oculto" *PNP0F13.DeviceDesc = "Puerto PS/2 para ratón PS/2" -IbmMfg = "IBM" *IBM3780.DeviceDesc = "Trackpoint PS/2 de IBM" -LogMfg = "Logitech" *PNP0F08.DeviceDesc = "Ratón serie de Logitech" *PNP0F12.DeviceDesc = "Ratón PS/2 de Logitech" -MSMfg = "Microsoft" *PNP0F01.DeviceDesc = "Ratón serie de Microsoft" *PNP0F03.DeviceDesc = "Ratón PS/2 de Microsoft" @@ -244,7 +235,6 @@ HID_MOUSE.DeviceDesc = "Souris HID" *PNP0F08.DeviceDesc = "Souris série Logitech" *PNP0F12.DeviceDesc = "Souris PS/2 Logitech" -MSMfg = "Microsoft" *PNP0F01.DeviceDesc = "Souris série Microsoft" *PNP0F03.DeviceDesc = "Souris PS/2 Microsoft" @@ -257,14 +247,11 @@ PS2_MOUSE.DeviceDesc = "スタンダード PS/2 マウス" HID_MOUSE.DeviceDesc = "HID マウス" *PNP0F13.DeviceDesc = "PS/2接続マウス用のPS/2 ポート" -IbmMfg = "IBM" *IBM3780.DeviceDesc = "IBM PS/2 トラックポイント" -LogMfg = "Logitech" *PNP0F08.DeviceDesc = "Logitech シリアル マウス" *PNP0F12.DeviceDesc = "Logitech PS/2接続マウス" -MSMfg = "Microsoft" *PNP0F01.DeviceDesc = "Microsoft シリアル マウス" *PNP0F03.DeviceDesc = "Microsoft PS/2接続マウス" @@ -279,14 +266,11 @@ PS2_MOUSE.DeviceDesc = "Standardowa mysz PS/2" HID_MOUSE.DeviceDesc = "Mysz zgodna z HID" *PNP0F13.DeviceDesc = "Port PS/2 dla myszy" -IbmMfg = "IBM" *IBM3780.DeviceDesc = "Trackpoint PS/2 IBM" -LogMfg = "Logitech" *PNP0F08.DeviceDesc = "Mysz szeregowa Logitech" *PNP0F12.DeviceDesc = "Mysz PS/2 Logitech" -MSMfg = "Microsoft" *PNP0F01.DeviceDesc = "Mysz szeregowa Microsoft" *PNP0F03.DeviceDesc = "Mysz PS/2 Microsoft" @@ -299,16 +283,13 @@ PS2_MOUSE.DeviceDesc = "Mouse PS/2 padrão" HID_MOUSE.DeviceDesc = "Mouse interno" *PNP0F13.DeviceDesc = "Porta PS/2 para mouse PS/2" -IbmMfg = "IBM" *IBM3780.DeviceDesc = "Trackpoint PS/2 IBM" -LogMfg = "Logitech" *PNP0F08.DeviceDesc = "Mouse serial Logitech" *PNP0F12.DeviceDesc = "Mouse PS/2 Logitech" -MSMfg = "Microsoft" *PNP0F01.DeviceDesc = "Mouse serial Microsoft" -*PNP0F03.DeviceDesc = Mouse PS/2 Microsoft" +*PNP0F03.DeviceDesc = "Mouse PS/2 Microsoft" [Strings.0418] ReactOS = "Echipa ReactOS" @@ -319,17 +300,19 @@ SERIAL_MOUSE.DeviceDesc = "Șoricel serial standard" PS2_MOUSE.DeviceDesc = "Șoricel PS/2 standard" HID_MOUSE.DeviceDesc = "Șoricel HID" *PNP0F13.DeviceDesc = "Port pentru șoricel PS/2" -IbmMfg = "IBM" + *IBM3780.DeviceDesc = "Rotulă IBM PS/2" -LogMfg = "Logitech" + *PNP0F08.DeviceDesc = "Șoricel serial Logitech" *PNP0F12.DeviceDesc = "Șoricel PS/2 Logitech" -MSMfg = "Microsoft" + *PNP0F01.DeviceDesc = "Șoricel serial Microsoft" *PNP0F03.DeviceDesc = "Șoricel PS/2 Microsoft" [Strings.0419] +ReactOS = "Команда ReactOS" MouseClassName = "Мыши и другие указывающие устройства" +LocationOverride = "подключено в PS/2 порт мыши" StdMfg = "(Стандартная мышь)" SERIAL_MOUSE.DeviceDesc = "Стандартная последовательная мышь" @@ -369,14 +352,11 @@ PS2_MOUSE.DeviceDesc = "Ölçünlü PS/2 Fâre" HID_MOUSE.DeviceDesc = "HID Fâre" *PNP0F13.DeviceDesc = "PS/2 Türünde Fâre İçin PS/2 Girişi" -IbmMfg = "IBM" *IBM3780.DeviceDesc = "IBM PS/2 Trackpoint" -LogMfg = "Logitech" *PNP0F08.DeviceDesc = "Logitech Dizilik Fâre" *PNP0F12.DeviceDesc = "Logitech PS/2 Türünde Fâre" -MSMfg = "Microsoft" *PNP0F01.DeviceDesc = "Microsoft Dizilik Fâre" *PNP0F03.DeviceDesc = "Microsoft PS/2 Türünde Fâre" @@ -408,14 +388,11 @@ PS2_MOUSE.DeviceDesc = "Standartinė PS/2 pelė" HID_MOUSE.DeviceDesc = "HID pelė" *PNP0F13.DeviceDesc = "PS/2 jungtis PS/2 tipo pelei" -IbmMfg = "IBM" *IBM3780.DeviceDesc = "IBM PS/2 rutulinis manipuliatorius" -LogMfg = "Logitech" *PNP0F08.DeviceDesc = "Logitech nuoseklioji pelė" *PNP0F12.DeviceDesc = "Logitech PS/2 tipo pelė" -MSMfg = "Microsoft" *PNP0F01.DeviceDesc = "Microsoft nuoseklioji pelė" *PNP0F03.DeviceDesc = "Microsoft PS/2 tipo pelė" @@ -425,7 +402,9 @@ SERIAL_MOUSE.DeviceDesc = "标准串口鼠标" PS2_MOUSE.DeviceDesc = "标准 PS/2 鼠标" HID_MOUSE.DeviceDesc = "HID 鼠标" *PNP0F13.DeviceDesc = "用于 PS/2 风格鼠标的 PS/2 端口" + *PNP0F08.DeviceDesc = "Logitech 串口鼠标" *PNP0F12.DeviceDesc = "Logitech PS/2 风格鼠标" + *PNP0F01.DeviceDesc = "Microsoft 串口鼠标" *PNP0F03.DeviceDesc = "Microsoft PS/2 风格鼠标"