summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authormirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-01 00:19:05 +0000
committermirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-01 00:19:05 +0000
commit646b596a65d4e70ec63b80d0e0f6ef50a96a7b4b (patch)
tree087738991f1fd8a51e62058b8849c93f3b004990 /chrome
parent561b90ed703cd49da7e5c9ed4b19060ed4342e61 (diff)
downloadchromium_src-646b596a65d4e70ec63b80d0e0f6ef50a96a7b4b.zip
chromium_src-646b596a65d4e70ec63b80d0e0f6ef50a96a7b4b.tar.gz
chromium_src-646b596a65d4e70ec63b80d0e0f6ef50a96a7b4b.tar.bz2
This is only for 195; will be reverted immediately.
Review URL: http://codereview.chromium.org/179052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/chromium_strings.grd4
-rw-r--r--chrome/app/generated_resources.grd4
-rw-r--r--chrome/app/google_chrome_strings.grd4
-rw-r--r--chrome/browser/dom_ui/new_tab_ui.cc2
4 files changed, 5 insertions, 9 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index a9cbeee..b61d19a 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -223,10 +223,6 @@ be available for now. -->
desc="Displayed to explain the Most Visited concept when there aren't enough most visited items.">
The "Most visited" area shows the websites that you use most often. After using Chromium for a while, you will see your most visited sites whenever you open a new tab. You can learn more about this and other features on the <ph name="BEGIN_LINK">&lt;a href="$1"&gt;</ph>Getting Started page<ph name="END_LINK">&lt;/a&gt;</ph>.
</message>
- <message name="IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE"
- desc="Title for the hard-coded thumbnail that represents the Google Chrome Welcome page. This is used on the NTP when there aren't enough thumbnails to show.">
- Welcome to Chromium
- </message>
<message name="IDS_EXTERNAL_PROTOCOL_INFORMATION" desc="General information about what Chrome is trying to do when opening this external protocol">
Chromium needs to launch an external application to handle <ph name="SCHEME">$1<ex>acrobat:</ex></ph> links. The link requested is <ph name="PROTOLINK">$2<ex>acrobat:yourpdf</ex></ph>.
</message>
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index a5bc387..dd56273 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3948,6 +3948,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
desc="Action text for link that closes the first run notification.">
Close
</message>
+ <message name="IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE"
+ desc="Title for the hard coded thumbnail that represents the Google Chrome Welcome page. This is used on the NTP when there aren't enough thumbnails to show.">
+ Google Chrome
+ </message>
<!-- TODO: Should this be something none Chrome for Chromium? -->
<message name="IDS_NEW_TAB_THEMES_GALLERY_PAGE_TITLE"
desc="Title for the hard coded thumbnail that represents the Google Chrome Themes Gallery page. This is used on the NTP when there aren't enough thumbnails to show.">
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index e0124b2..5548e28 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -271,10 +271,6 @@ Chrome supports. -->
desc="Displayed to explain the Most Visited concept when there aren't enough most visited items.">
The "Most visited" area shows the websites that you use most often. After using Google Chrome for a while, you will see your most visited sites whenever you open a new tab. You can learn more about this and other features on the <ph name="BEGIN_LINK">&lt;a href="$1"&gt;</ph>Getting Started page<ph name="END_LINK">&lt;/a&gt;</ph>.
</message>
- <message name="IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE"
- desc="Title for the hard-coded thumbnail that represents the Google Chrome Welcome page. This is used on the NTP when there aren't enough thumbnails to show.">
- Welcome to Chrome
- </message>
<message name="IDS_EXTERNAL_PROTOCOL_INFORMATION" desc="General information about what Chrome is trying to do when opening this external protocol">
Google Chrome needs to launch an external application to handle <ph name="SCHEME">$1<ex>acrobat:</ex></ph> links. The link requested is <ph name="PROTOLINK">$2<ex>acrobat:yourpdf</ex></ph>.
</message>
diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc
index 3f495bc..2707453 100644
--- a/chrome/browser/dom_ui/new_tab_ui.cc
+++ b/chrome/browser/dom_ui/new_tab_ui.cc
@@ -864,7 +864,7 @@ std::vector<MostVisitedPage> MostVisitedHandler::GetPrePopulatedPages() {
std::vector<MostVisitedPage> pages;
MostVisitedPage welcome_page = {
- l10n_util::GetString(IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE),
+ l10n_util::GetString(IDS_FIRSTRUN_DLG_TITLE),
GURL(WideToUTF8(l10n_util::GetString(IDS_CHROME_WELCOME_URL))),
GURL("chrome://theme/newtab_chrome_welcome_page_thumbnail"),
GURL("chrome://theme/newtab_chrome_welcome_page_favicon")};