From b7564c1b011a4a2aedd21af53577bf049c44ecfc Mon Sep 17 00:00:00 2001
From: "mattm@chromium.org"
 <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 3 Jun 2010 21:17:15 +0000
Subject: Win SxS: Creating a new shortcut with enable-udd-profiles uses wrong
 icon.

BUG=44847
TEST=see bug

Review URL: http://codereview.chromium.org/2557001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48871 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/app/chromium_strings.grd      | 3 ---
 chrome/app/generated_resources.grd   | 3 +++
 chrome/app/google_chrome_strings.grd | 3 ---
 3 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'chrome/app')

diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index 9aafc83..96cf50a 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -381,9 +381,6 @@ be available for now. -->
       <message name="IDS_IMPORT_BOOKMARKS" desc="Explanatory text for the importing progress dialog when importing a bookmarks.html file from the bookmark manager">
         Chromium is now importing Favorites/Bookmarks.
       </message>
-      <message name="IDS_START_IN_PROFILE_SHORTCUT_NAME" desc="Name of the desktop shortcut to start the application in a specific profile.">
-        Chromium for <ph name="profile_name">$1</ph>
-      </message>
       <message name="IDS_OEM_MAIN_SHORTCUT_NAME" desc="Name of the desktop shortcut to start the application for OEM pre-installations.">
         Internet Browser
       </message>
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index acebc64..b2eef6e 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6449,6 +6449,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_SELECT_PROFILE_DIALOG_NEW_PROFILE_ENTRY" desc="Text for an extra entry in the profiles combo box. The user can select this entry to create a new profile.">
         &lt;New Profile&gt;...
       </message>
+      <message name="IDS_START_IN_PROFILE_SHORTCUT_NAME" desc="Name of the desktop shortcut to start the application in a specific profile.">
+        <ph name="app_name">$1<ex>Google Chrome</ex></ph> for <ph name="profile_name">$2<ex>My Second Profile</ex></ph>
+      </message>
 
       <!-- User data directory new profile dialog -->
       <message name="IDS_NEW_PROFILE_DIALOG_TITLE" desc="Title of dialog that lets the user enter a new profile name to open new window.">
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index b789dda0..a4e5656 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -431,9 +431,6 @@ Chrome supports. -->
       <message name="IDS_IMPORT_BOOKMARKS" desc="Explanatory text for the importing progress dialog when importing a bookmarks.html file from the bookmark manager">
         Google Chrome is now importing Favorites/Bookmarks.
       </message>
-      <message name="IDS_START_IN_PROFILE_SHORTCUT_NAME" desc="Name of the desktop shortcut to start the application in a specific profile.">
-        Google Chrome for <ph name="profile_name">$1</ph>
-      </message>
       <message name="IDS_OEM_MAIN_SHORTCUT_NAME" desc="Name of the desktop shortcut to start the application for OEM pre-installations.">
         Internet Browser
       </message>
-- 
cgit v1.1