Mention government and other sophisticated attackers in incognito text.

Mention government and other sophisticated attackers in incognito text.

BUG=70664
NOTRY=true
R=battre@chromium.org, felt@chromium.org, palmer@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=253808

[palmer, 2014-02-26 20:53:00]

LGTM.

[felt, 2014-02-26 20:54:42]

lgtm but please wait for ack from battre before landing

[battre, 2014-02-27 13:03:24]

LGTM

[Robert Sesek, 2014-02-27 14:11:39]

The CQ bit was checked by rsesek@chromium.org

[commit-bot: I haz the power, 2014-02-27 14:12:00]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rsesek@chromium.org/179763005/1

[commit-bot: I haz the power, 2014-02-27 14:12:06]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-27 14:12:06]

Failed to apply patch for chrome/app/generated_resources.grd:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/app/generated_resources.grd
  Hunk #1 FAILED at 11290.
  Hunk #2 succeeded at 11314 (offset 6 lines).
  1 out of 2 hunks FAILED -- saving rejects to file
chrome/app/generated_resources.grd.rej

Patch:       chrome/app/generated_resources.grd
Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd
b/chrome/app/generated_resources.grd
index
555b06b198483de9a1b9418c42f6acd3bb4256ee..25923396f90fe4effe637cd137a811028e7a6925
100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -11290,14 +11290,14 @@ Would you like to start <ph
name="CONTROL_PANEL_APPLET_NAME">$1<ex>Add/Remove Pr
           <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>You've gone incognito.<ph
name="END_BOLD">&lt;/strong&gt;</ph>
           Pages you view in incognito tabs won't stick around in your browser's
history, cookie store, or search history after you've closed <ph
name="BEGIN_BOLD">&lt;strong&gt;</ph>all<ph name="END_BOLD">&lt;/strong&gt;</ph>
of your incognito tabs. Any files you download or bookmarks you create will be
kept.
           <ph name="LINE_BREAK">&lt;br /&gt;&lt;br /&gt;<ex>&lt;br /&gt;&lt;br
/&gt;</ex></ph>
-          <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>However, you aren't
invisible.<ph name="END_BOLD">&lt;/strong&gt;</ph> Going incognito doesn't hide
your browsing from your employer, your internet service provider, or the
websites you visit.
+          <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>However, you aren't
invisible.<ph name="END_BOLD">&lt;/strong&gt;</ph> Going incognito doesn't hide
your browsing from your employer, your internet service provider, governments
and other sophisticated attackers, or the websites you visit.
           <ph name="BEGIN_LINK">&lt;a href="$1"&gt;</ph>Learn more<ph
name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph> about incognito browsing.
         </message>
         <message name="IDS_NEW_TAB_OTR_MESSAGE"
                  desc="Mobile: Used when a person opens an OTR tab">
           Pages you view in incognito tabs won't stick around in your browser's
history, cookie store, or search history after you've closed <ph
name="BEGIN_BOLD">&lt;strong&gt;</ph>all<ph name="END_BOLD">&lt;/strong&gt;</ph>
of your incognito tabs. Any files you download or bookmarks you create will be
kept.
           <ph name="LINE_BREAK">&lt;br /&gt;&lt;br /&gt;<ex>&lt;br /&gt;&lt;br
/&gt;</ex></ph>
-          <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>However, you aren't
invisible.<ph name="END_BOLD">&lt;/strong&gt;</ph> Going incognito doesn't hide
your browsing from your employer, your internet service provider, or the
websites you visit.
+          <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>However, you aren't
invisible.<ph name="END_BOLD">&lt;/strong&gt;</ph> Going incognito doesn't hide
your browsing from your employer, your internet service provider, governments
and other sophisticated attackers, or the websites you visit.
           <ph name="LINE_BREAK">&lt;br /&gt;&lt;br /&gt;<ex>&lt;br /&gt;&lt;br
/&gt;</ex></ph>
           <ph name="BEGIN_LINK">&lt;a href="$1"&gt;</ph>Learn more<ph
name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph> about incognito browsing.
         </message>
@@ -11308,7 +11308,7 @@ Would you like to start <ph
name="CONTROL_PANEL_APPLET_NAME">$1<ex>Add/Remove Pr
           <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>You've gone incognito.<ph
name="END_BOLD">&lt;/strong&gt;</ph>
           Pages you view in incognito tabs won't stick around in your browser's
history, cookie store, or search history after you've closed <ph
name="BEGIN_BOLD">&lt;strong&gt;</ph>all<ph name="END_BOLD">&lt;/strong&gt;</ph>
of your incognito tabs. Any files you download or bookmarks you create will be
kept.
           <ph name="LINE_BREAK">&lt;br /&gt;&lt;br /&gt;<ex>&lt;br /&gt;&lt;br
/&gt;</ex></ph>
-          <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>However, you aren't
invisible.<ph name="END_BOLD">&lt;/strong&gt;</ph> Going incognito doesn't hide
your browsing from your employer, your internet service provider, or the
websites you visit.
+          <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>However, you aren't
invisible.<ph name="END_BOLD">&lt;/strong&gt;</ph> Going incognito doesn't hide
your browsing from your employer, your internet service provider, governments
and other sophisticated attackers, or the websites you visit.
           <ph name="LINE_BREAK">&lt;br /&gt;&lt;br /&gt;<ex>&lt;br /&gt;&lt;br
/&gt;</ex></ph>
           <ph name="BEGIN_LINK">&lt;a href="$1"&gt;</ph>Learn more<ph
name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph> about incognito browsing.
         </message>

[Robert Sesek, 2014-02-27 14:26:27]

Committed patchset #2 manually as r253808 (presubmit successful).