Refine the strings on the Incognito NTP and improve the descriptions

components/new_or_sad_tab_strings.grdp

Index: components/new_or_sad_tab_strings.grdp
diff --git a/components/new_or_sad_tab_strings.grdp b/components/new_or_sad_tab_strings.grdp
index 696464b8db6d353f8bc7ce5bed4454bada8954df..d70376d5c8e2c1c733bd96f3d8f4181670216cb5 100644
--- a/components/new_or_sad_tab_strings.grdp
+++ b/components/new_or_sad_tab_strings.grdp
@@ -143,19 +143,16 @@
       <!-- Incognito Tab redesign strings -->
       <!-- TODO(msramek): Merge with the above section once this is fully launched. -->
 
-      <message name="IDS_NEW_TAB_OTR_TITLE" desc="Title of the Incognito new tab page." formatter_data="android_java">
+      <message name="IDS_NEW_TAB_OTR_TITLE" desc="Title of the Incognito new tab page. The Incognito mode provides private browsing experience by hiding browsing activity from other people using the same device. However, it does not make the user completely invisible or anonymous; please don't translate it as such." formatter_data="android_java">
         You’ve gone incognito
       </message>
-      <message name="IDS_NEW_TAB_OTR_SUBTITLE" desc="Subtitle of the Incognito new tab page, explaining to the user that the Incognito mode hides their browsing activity from other people using the device." formatter_data="android_java">
-        Now you can browse in private, and other people who use this device won’t see your activity.
+      <message name="IDS_NEW_TAB_OTR_SUBTITLE" desc="Subtitle of the Incognito new tab page, explaining to the user that the Incognito mode hides their browsing activity from other people using the same device. The second sentence clarifies that there are two important exceptions from this rule - downloaded files and added bookmarks will be persisted even after the Incognito session is closed." formatter_data="android_java">
+        Now you can browse privately, and other people who use this device won’t see your activity. Downloads and bookmarks will be kept.

[srahim, 2017/03/27 22:51:50]

Recommended: However, downloads and bookmarks will be saved. 

Add "however" to call this out because the paragraph begins by saying what won't
be seen.
We should avoid using the word "kept" and stick to familiar language like
"saved." 

[msramek, 2017/03/28 12:50:37]

Done.

       </message>
-      <message name="IDS_NEW_TAB_OTR_DISCLAIMER" desc="A disclaimer on the Incognito new tab page, explaining to the user that downloaded files and added bookmarks will be persisted even after the Incognito session is closed." formatter_data="android_java">
-        Downloaded files and bookmarks will be kept.
+      <message name="IDS_NEW_TAB_OTR_NOT_SAVED_BULLET_POINTS" desc="Bullet points listing data that are not saved in the Incognito mode. The '#' character in this text represents a bullet point. Please keep it unchanged and do not add additional spaces around it. The text between the pair of '|' characters will be highlighted. 'Browsing history' means a history of visited websites. 'Searches' means searches done in the address bar. 'Cookies and site data' refers to data saved by websites on the user's device (e.g. sign-in state, preferences, etc.)." formatter_data="android_java">

[srahim, 2017/03/27 22:51:50]

We need to delete "Your searches" per legal review so should also delete the
corresponding sentence in the desc

[srahim, 2017/03/27 22:51:50]

Change "highlighted" to "boldfaced or otherwise emphasized in the style
appropriate for your language.

[msramek, 2017/03/28 12:50:37]

Done, but I want to clarify what you mean.

The string will be post-processed in the code. I will replace the section
between || with <b></b> or <em></em> or something such. It is possible that for
different alphabets that will look differently, but in general, it will be
boldfaced.

Was your intention to ask translators to choose their own way of emphasis, e.g.
boldface vs. italics? I'm not sure if we want to do that. If a translator
misunderstands, they might accidentally replace || with invalid HTML tag, or
*hypothetically* insert malicious JavaScript code :)

[msramek, 2017/03/28 12:50:37]

Done.

[srahim, 2017/03/28 23:03:43]

No, the reason I suggested a change was because I was afraid they would
interpret "highlighted" to mean highlighting format, e.g. yellow. We could just
say "the text between the pair of || characters will be formatted
programmatically to emphasize those words." To avoid the misunderstanding of
replacing || with invalid HTML.

[msramek, 2017/03/29 09:56:39]

Done. Makes sense, thanks!

+        Chrome |won’t save| the following information:#Your browsing history#Your searches#Cookies and site data

[srahim, 2017/03/27 22:51:50]

Delete the bullet "#Your searches" per legal review

[msramek, 2017/03/28 12:50:37]

Done.

       </message>
-      <message name="IDS_NEW_TAB_OTR_NOT_SAVED_BULLET_POINTS" desc="Bullet points listing data that are not saved in the Incognito mode. The '#' character in this text represents a bullet point. Please keep it unchanged and do not add additional spaces around it. The text between the pair of '|' characters will be highlighted." formatter_data="android_java">
-        This information |won’t be saved|:#Your browsing history#Your searches#Cookie data
-      </message>
-      <message name="IDS_NEW_TAB_OTR_VISIBLE" desc="Bullet points listing entities that might be able to see the user's Incognito activity. The '#' character in this text represents a bullet point. Please keep it unchanged and do not add additional spaces around it. The text between the pair of '|' characters will be highlighted." formatter_data="android_java">
+      <message name="IDS_NEW_TAB_OTR_VISIBLE" desc="Bullet points listing entities that might be able to see the user's Incognito activity. The '#' character in this text represents a bullet point. Please keep it unchanged and do not add additional spaces around it. The text between the pair of '|' characters will be highlighted. The bullet points elaborate on the fact that Incognito only provides privacy with respect to other users on the same device. Websites you visit still know that you visited them. Your employer and internet service provider can still monitor network traffic, even if it comes from the Incognito mode." formatter_data="android_java">

[srahim, 2017/03/27 22:51:49]

Change "highlighted" to "boldfaced or otherwise emphasized in the style
appropriate for your language"

[msramek, 2017/03/28 12:50:37]

Done. (But please see my clarification question as above)

[srahim, 2017/03/28 23:03:44]

I was afraid they would
interpret "highlighted" to mean highlighting format, e.g. yellow. We could just
say "the text between the pair of || characters will be formatted
programmatically to emphasize those words." To avoid the misunderstanding of
replacing || with invalid HTML.

[msramek, 2017/03/29 09:56:39]

Done, as above.

         Your activity |might still be visible| to:#Websites you visit#Your employer#Your internet service provider

[srahim, 2017/03/27 22:51:49]

Chelsea agreed that we should add "your school" to more clearly convey the
meaning that any entity that manages your network may be able to see your
activity.

So the 2nd bullet would read: "Your employer or school" 

[msramek, 2017/03/28 12:50:37]

Done (here and in the description).

       </message>