From 885f7fd0c767c2b39e6b60d20b575e7e95d4638d Mon Sep 17 00:00:00 2001
From: Jaben Carsey <Jaben.carsey@intel.com>
Date: Mon, 16 Jun 2014 21:58:50 +0000
Subject: [PATCH] ShellPkg: Fix duplicate String IDs

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <Jaben.carsey@intel.com>
Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15562 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../SmbiosView/SmbiosViewStrings.uni          | Bin 98058 -> 98072 bytes
 .../UefiShellDriver1CommandsLib/DrvCfg.c      |   4 ++--
 .../UefiShellDriver1CommandsLib.uni           | Bin 69812 -> 69812 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni
index ac81add1517406c57850a3a77076193c887a08b7..a5cfddb50536d1d8fe447677b64b045707cd53fb 100644
GIT binary patch
delta 23
fcmeDB$2#L5>x2MClZ}C%izXl1WU~3dBCk6DgsTgo

delta 23
fcmbR7kG1O`>x2MCqm6-{izeS&5VM(OvB(_&g0c$W

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c
index 35ddd441b1..2ff330c38b 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c
@@ -1,7 +1,7 @@
 /** @file
   Main file for DrvCfg shell Driver1 function.
 
-  Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -1094,7 +1094,7 @@ PrintConfigInfoOnAll(
   }
 
   if (!Found) {
-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_NONE), gShellDriver1HiiHandle);
+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_NONE_FOUND), gShellDriver1HiiHandle);
     return (SHELL_SUCCESS);
   }
 
diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni
index 4354b140f69825d7ec985f2ea706683831e34643..1c6d9f6d5b29a44c0ec6aae124c967b40fe16d23 100644
GIT binary patch
delta 35
rcmdn8kY&q4mI(ojCL05fi*v^_xH0%MgfjRsxJ=%tYq&W?BH;%B)l&<n

delta 22
ecmdn8kY&q4mI(ojMjHc<i%(Lp*c>2{@&f>9FbM|$