diff options
| author | nyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-08 23:15:35 +0000 |
|---|---|---|
| committer | nyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-08 23:15:35 +0000 |
| commit | 3397840ea47f28888232b58b93a11bf808a586e9 (patch) | |
| tree | 73b9a7d56d93720f0886fa7119da8f306cf7b115 | |
| parent | 2942e90d3fd3581e91d6ba3e79a5e4bb7d128dc8 (diff) | |
| download | chromium_src-3397840ea47f28888232b58b93a11bf808a586e9.zip chromium_src-3397840ea47f28888232b58b93a11bf808a586e9.tar.gz chromium_src-3397840ea47f28888232b58b93a11bf808a586e9.tar.bz2 | |
Merge 125042 - Add short version of incognito NTP for mobile.
This adds a short version of the incognito NTP to be used by smaller
mobile devices.
It also changes to singular 'mobile device' for the current Android
incognito NTP.
BUG=114046
TEST=Verify that strings show up correctly in Android build.
Review URL: http://codereview.chromium.org/9585021
TBR=nyquist@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9646012
git-svn-id: svn://svn.chromium.org/chrome/branches/1025/src@125716 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/generated_resources.grd | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index dc1a071..444996c 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -9182,9 +9182,20 @@ experiment id: "<ph name="EXPERIMENT_ID">$5<ex>ar1</ex></ph>" Recently closed </message> <if expr="pp_ifdef('android')"> + <message name="IDS_NEW_TAB_OTR_MESSAGE_MOBILE" + desc="Mobile: Used when a person opens an OTR tab"> + <ph name="BEGIN_BOLD"><strong></ph>You've gone incognito.<ph name="END_BOLD"></strong></ph> + <ph name="LINE_BREAK"><br /><br /></ph> + Pages you view in this tab won't appear in your browser history or search history, and they won't leave other traces, like cookies, on your mobile device after you close <ph name="BEGIN_BOLD"><strong></ph>all<ph name="END_BOLD"></strong></ph> incognito tabs. Any files you download or bookmarks you create will be preserved, however. + <ph name="LINE_BREAK"><br /><br /></ph> + <ph name="BEGIN_BOLD"><strong></ph>Going incognito doesn't affect the behavior of other people, servers, or software.<ph name="END_BOLD"></strong></ph> + Be wary of surveillance by secret agents or people standing behind you. + <ph name="LINE_BREAK"><br /><br /></ph> + <ph name="BEGIN_LINK"><a href="$1"></ph>Learn more<ph name="END_LINK"></a></ph> about incognito browsing. + </message> <message name="IDS_NEW_TAB_OTR_MESSAGE" desc="Mobile: Used when a person opens an OTR tab"> - <ph name="BEGIN_BOLD"><strong></ph>You've gone incognito<ph name="END_BOLD">"</strong></ph>. Pages you view in this tab won't appear in your browser history or search history, and they won't leave other traces, like cookies, on your mobile devices after you close <strong>all</strong> open incognito tabs. Any bookmarks you create will be preserved, however. + <ph name="BEGIN_BOLD"><strong></ph>You've gone incognito<ph name="END_BOLD">"</strong></ph>. Pages you view in this tab won't appear in your browser history or search history, and they won't leave other traces, like cookies, on your mobile device after you close <ph name="BEGIN_BOLD"><strong></ph>all<ph name="END_BOLD"></strong></ph> open incognito tabs. Any bookmarks you create will be preserved, however. <ph name="LINE_BREAK"><br /><br /></ph> <ph name="BEGIN_BOLD"><strong></ph>Going incognito doesn't affect the behavior of other people, servers, or software. Be wary of:<ph name="END_BOLD"></strong></ph> <ph name="BEGIN_LIST"><ul></ph> |