From c7f204dba40ee7cd9c43ac1aa8610ce4168c2169 Mon Sep 17 00:00:00 2001
From: ydong10 <ydong10@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 9 Dec 2010 02:18:44 +0000
Subject: [PATCH] Co-work with patch V11137 to refine the Hii menu. 1. Move the
 Mac address string from the form title to form title help for the driver Ipv4
 and VLAN. 2. Change the menu show in the device manager from "Network
 Controller Information" to "ABC Information Sample".

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11138 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../DriverSampleDxe/InventoryStrings.uni      | Bin 8334 -> 8318 bytes
 .../Ip4ConfigDxe/Ip4ConfigDxeStrings.uni      | Bin 2866 -> 2982 bytes
 .../Network/Ip4ConfigDxe/Ip4ConfigNv.c        |   6 +++---
 .../Network/VlanConfigDxe/VlanConfigImpl.c    |   4 ++--
 .../VlanConfigDxe/VlanConfigStrings.uni       | Bin 3662 -> 3824 bytes
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni b/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni
index 7b13d3a6b5843fa5b91826662333d26698f3b576..24e48f8868dc6fe257a9333fbfb806c72bed2d66 100644
GIT binary patch
delta 38
ucmeBk{O7RY75iiX9*)TZ9Adl*48aVE47m&i3^@#`ljVgfH_zkvAPxZJ3ky>K

delta 24
gcmez8(C4_}75n6MTxyd)v5QR>5USYR$MHcN0E*EHKL7v#

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxeStrings.uni b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxeStrings.uni
index 808f431617cb6b3bf5f49df4c4626d0c4ce40772..c3886dffaca5343c346548e79bfabe50153e3b18 100644
GIT binary patch
delta 20
ccmdlawoH7(5w^(zY!Z`qv6^k3$2Nrp08^m{cmMzZ

delta 16
YcmZ1`zDaDu5w^*{Sa>$OuqUwq06JC%0RR91

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
index e161b51ec5..1e8c64d8c7 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
@@ -856,12 +856,12 @@ Ip4ConfigDeviceInit (
   //
   Status = NetLibGetMacString (Instance->Controller, Instance->Image, &MacString);
   if (!EFI_ERROR (Status)) {
-    OldMenuString = HiiGetString (Instance->RegisteredHandle, STRING_TOKEN (STR_IP4_CONFIG_FORM_TITLE), NULL);
+    OldMenuString = HiiGetString (Instance->RegisteredHandle, STRING_TOKEN (STR_IP4_CONFIG_FORM_HELP), NULL);
     UnicodeSPrint (MenuString, 128, L"%s (MAC:%s)", OldMenuString, MacString);
-    HiiSetString (Instance->RegisteredHandle, STRING_TOKEN (STR_IP4_CONFIG_FORM_TITLE), MenuString, NULL);
+    HiiSetString (Instance->RegisteredHandle, STRING_TOKEN (STR_IP4_CONFIG_FORM_HELP), MenuString, NULL);
 
     UnicodeSPrint (PortString, 128, L"MAC:%s", MacString);
-    HiiSetString (Instance->RegisteredHandle, STRING_TOKEN (STR_IP4_DEVICE_FORM_TITLE), PortString, NULL);
+    HiiSetString (Instance->RegisteredHandle, STRING_TOKEN (STR_IP4_DEVICE_FORM_HELP), PortString, NULL);
     FreePool (MacString);
   }
 
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
index 57fe339129..e9e98fa225 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
+++ b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
@@ -541,7 +541,7 @@ InstallVlanConfigForm (
   StrCat (Str, L")");
   HiiSetString (
     HiiHandle,
-    STRING_TOKEN (STR_VLAN_FORM_SET_TITLE),
+    STRING_TOKEN (STR_VLAN_FORM_SET_TITLE_HELP),
     Str,
     NULL
     );
@@ -551,7 +551,7 @@ InstallVlanConfigForm (
   //
   HiiSetString (
     HiiHandle,
-    STRING_TOKEN (STR_VLAN_FORM_TITLE),
+    STRING_TOKEN (STR_VLAN_FORM_HELP),
     Str,
     NULL
     );
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigStrings.uni b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigStrings.uni
index edb6071281a5c6e940a282963d7102921ad7b037..e5a6d1620416214eea4ad7c71427187e672bfce0 100644
GIT binary patch
delta 48
zcmX>n^Fell0Q=+(tXz{#I20ydU{{*_2guH2mEu-l@L)(~$YCg8P@4RaMSZgXyB#|K
DeYy?a

delta 12
Tcmew$droG90Q=@m>~`z`B8&uZ