From 19eb2769c39afb7bb8311adeda709c5164c12685 Mon Sep 17 00:00:00 2001 From: "estade@chromium.org" Date: Fri, 2 Sep 2011 05:11:40 +0000 Subject: string fixes also, move Bookmarks menu to just below new incognito window (as per Glen) BUG=94828,95022,94785 TEST=manual Review URL: http://codereview.chromium.org/7792075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99324 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/app/generated_resources.grd | 55 ++++++++--------------- chrome/browser/resources/ntp4/new_tab.html | 2 +- chrome/browser/ui/toolbar/wrench_menu_model.cc | 9 ++-- chrome/browser/ui/webui/ntp/ntp_resource_cache.cc | 8 ++-- 4 files changed, 27 insertions(+), 47 deletions(-) (limited to 'chrome') diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 6dda5d4..a332690 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -1083,6 +1083,9 @@ are declared in build/common.gypi. &Always show bookmarks bar + + Import bookmarks and settings... + &Profiling enabled @@ -1133,6 +1136,9 @@ are declared in build/common.gypi. &Always Show Bookmarks Bar + + Import Bookmarks and Settings... + &Profiling Enabled @@ -8418,7 +8424,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Bookmarks - More... + Show all @@ -8530,8 +8536,8 @@ Keep your key file in a safe place. You will need it to create new versions of y Settings - Uninstall + desc="Text for the trash can that appears when the user drags apps."> + Remove from $1Chrome @@ -8541,10 +8547,6 @@ Keep your key file in a safe place. You will need it to create new versions of y desc="Text for the button that creates an app shortcut."> Create shortcut - - Remove from $1Chrome. - Apps, Extensions and Themes @@ -9741,26 +9743,12 @@ Keep your key file in a safe place. You will need it to create new versions of y - - - Customize sync preferences - - - - - Customize Sync Preferences - - - - - Confirm sync preferences - - - - - Confirm Sync Preferences - - + + Customize Sync Preferences + + + Confirm Sync Preferences + OK, sync everything @@ -9912,16 +9900,9 @@ Keep your key file in a safe place. You will need it to create new versions of y $1Google Chrome sync makes it easy to share your data (such as bookmarks and preferences) between your computers. $1Google Chrome synchronizes your data by storing it online with Google when you sign in with your Google Account. - - - Sign in with your Google Account - - - - - Sign In With Your Google Account - - + + Sign In With Your Google Account + Sign in with your diff --git a/chrome/browser/resources/ntp4/new_tab.html b/chrome/browser/resources/ntp4/new_tab.html index d641c19..f3e843c 100644 --- a/chrome/browser/resources/ntp4/new_tab.html +++ b/chrome/browser/resources/ntp4/new_tab.html @@ -98,7 +98,7 @@ document.documentElement.setAttribute('touchui', true);
- +
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc index b11d10e..3d5b894 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model.cc +++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc @@ -199,7 +199,7 @@ void BookmarkSubMenuModel::Build(Browser* browser) { AddCheckItemWithStringId(IDC_SHOW_BOOKMARK_BAR, IDS_SHOW_BOOKMARK_BAR); AddItemWithStringId(IDC_SHOW_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER); #if !defined(OS_CHROMEOS) - AddItemWithStringId(IDC_IMPORT_SETTINGS, IDS_IMPORT_SETTINGS_TITLE); + AddItemWithStringId(IDC_IMPORT_SETTINGS, IDS_IMPORT_SETTINGS_MENU_LABEL); #endif #if defined(OS_MACOSX) AddSeparator(); @@ -415,6 +415,10 @@ void WrenchMenuModel::Build() { AddItemWithStringId(IDC_NEW_INCOGNITO_WINDOW, IDS_NEW_INCOGNITO_WINDOW); #endif + bookmark_sub_menu_model_.reset(new BookmarkSubMenuModel(this, browser_)); + AddSubMenuWithStringId(IDC_BOOKMARKS_MENU, IDS_BOOKMARKS_MENU, + bookmark_sub_menu_model_.get()); + AddSeparator(); #if defined(OS_POSIX) && !defined(TOOLKIT_VIEWS) // WARNING: Mac does not use the ButtonMenuItemModel, but instead defines the @@ -461,9 +465,6 @@ void WrenchMenuModel::Build() { AddSeparator(); - bookmark_sub_menu_model_.reset(new BookmarkSubMenuModel(this, browser_)); - AddSubMenuWithStringId(IDC_BOOKMARKS_MENU, IDS_BOOKMARKS_MENU, - bookmark_sub_menu_model_.get()); AddItemWithStringId(IDC_SHOW_HISTORY, IDS_SHOW_HISTORY); AddItemWithStringId(IDC_SHOW_DOWNLOADS, IDS_SHOW_DOWNLOADS); AddSeparator(); diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc index 1232e14..1819771 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc @@ -337,7 +337,9 @@ void NTPResourceCache::CreateNewTabHTML() { localized_strings.SetString("appsettings", l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_SETTINGS)); localized_strings.SetString("appuninstall", - l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_UNINSTALL)); + l10n_util::GetStringFUTF16( + IDS_NEW_TAB_APP_UNINSTALL, + l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME))); localized_strings.SetString("appoptions", l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_OPTIONS)); localized_strings.SetString("appcreateshortcut", @@ -360,10 +362,6 @@ void NTPResourceCache::CreateNewTabHTML() { l10n_util::GetStringUTF16(IDS_SYNC_START_SYNC_BUTTON_LABEL)); localized_strings.SetString("syncLinkText", l10n_util::GetStringUTF16(IDS_SYNC_ADVANCED_OPTIONS)); - localized_strings.SetString("trashLabel", - l10n_util::GetStringFUTF16( - IDS_NEW_TAB_TRASH_LABEL, - l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME))); localized_strings.SetString("bookmarksManagerLinkTitle", l10n_util::GetStringUTF16(IDS_NEW_TAB_BOOKMARKS_MANAGER_LINK_TITLE)); #if defined(OS_CHROMEOS) -- cgit v1.1