chrome/app/generated_resources.grd - Issue 208683007: Update incognito and guest browsing new tab page:

Unified Diff: chrome/app/generated_resources.grd

Side-by-side diff isn't available for this file because of its large size.

Issue 208683007: Update incognito and guest browsing new tab page: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Wrap to 80 chars Created 6 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Download patch

Index: chrome/app/generated_resources.grd

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd

index 8ac342ff347aae8ed4fa81fa799e6e80cf1ddbef..c604d28a8a08ec180739f69ef446e061cb14d699 100644

--- a/chrome/app/generated_resources.grd

+++ b/chrome/app/generated_resources.grd

@@ -11258,27 +11258,25 @@ Would you like to start <ph name="CONTROL_PANEL_APPLET_NAME">$1<ex>Add/Remove Pr

</message>

<message name="IDS_NEW_TAB_OTR_MESSAGE"

desc="Used when a person opens an OTR window">

- <ph name="BEGIN_BOLD"><strong></ph>You've gone incognito.<ph name="END_BOLD"></strong></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"><strong></ph>all<ph name="END_BOLD"></strong></ph> of your incognito tabs. Any files you download or bookmarks you create will be kept.

- <ph name="LINE_BREAK"><br /><br /><ex><br /><br /></ex></ph>

- <ph name="BEGIN_BOLD"><strong></ph>However, you aren't invisible.<ph name="END_BOLD"></strong></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"><br /><br /><ex><br /><br /></ex></ph>

- <ph name="BEGIN_LINK"><a href="$1"></ph>Learn more<ph name="END_LINK"></a><ex></a></ex></ph> about incognito browsing.

+ <ph name="BEGIN_H1"><h1></ph>You’ve gone incognito<ph name="END_H1"></h1></ph>

+ <ph name="BEGIN_P"><p></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"><strong></ph>all<ph name="END_BOLD"></strong></ph> of your incognito tabs. Any files you download or bookmarks you create will be kept.

+ <ph name="BEGIN_LINK"><a href="$1"></ph>Learn more about incognito browsing<ph name="END_LINK"></a><ex></a></ex></ph>.<ph name="END_P"></p></ph>

+ <ph name="BEGIN_P"><p></ph><ph name="BEGIN_BOLD"><strong></ph>Going incognito doesn’t hide your browsing from your employer, your internet service provider, or the websites you visit.<ph name="END_BOLD"></strong></ph><ph name="END_P"></p></ph>

Evan Stade 2014/04/16 22:10:57 this is so hard to read and easy for translators t

edwardjung 2014/04/17 13:07:07 How would I achieve this, as the link is part of t

Evan Stade 2014/04/17 16:25:07 What you have looks about right. You can use i18n

What you have looks about right. You can use i18n-content="FOOBAR" instead of i18n-values=".innerHTML:FOOBAR", assuming there's just plaintext and no markup in FOOBAR. One issue is that you have a period after the link. If it's possible to either linkify that period, or remove it completely, that would simplify things (then you don't need markup in the grd file). I think you can remove it because in chrome://settings, links don't have periods at the end, except in the case where there's a sentence that is only partially linkified. For example, "Set which search engine is used when searching from the |omnibox|." but "[ ] Offer to save your passwords. |Manage saved passwords|" (bars = linkified) The second paragraph is all strong, so you can handle that in CSS and remove the markup here. The first <p> is only partly strong unfortunately, so you have to leave a little bit of markup in the grd.

edwardjung 2014/04/22 14:24:35 Done.

On 2014/04/17 16:25:07, Evan Stade wrote: > On 2014/04/17 13:07:07, edwardjung wrote: > > On 2014/04/16 22:10:57, Evan Stade wrote: > > >For example it looks like the > > > link text can just be text, and the <a href="..."> bit can be part of the > html > > > file. (It seems like we should be able to use the same link for all locales > > > given that the UI language should be sent to the google support server via > an > > > HTML header). > > > > How would I achieve this, as the link is part of the paragraph. Would I need > to > > create multiple new message IDs? > > > > So for example the HTML could be like the following with hardcoded link text: > > > > <div class="content" > > i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"> > > <div class="icon"></div> > > <h1 i18n-values=".innerHTML:heading"></h1> > > <p> > > <span i18n-values=".innerHTML:content1"></span> > > <a href="https://support.google.com/chrome/answer/95464" > > i18n-values=".innerHTML:learnMore"></a> > > </p> > > <p i18n-values=".innerHTML:content2"></p> > > </div> > > > > Then in ntp_resource_cache.cc I would set these individually. > > > > localized_strings.SetString("content1", ); > > localized_strings.SetString("learnMore", ); > > … > > > > Any guidance appreciated, I'm new to the code base. > > What you have looks about right. > > You can use i18n-content="FOOBAR" instead of i18n-values=".innerHTML:FOOBAR", > assuming there's just plaintext and no markup in FOOBAR. > > One issue is that you have a period after the link. If it's possible to either > linkify that period, or remove it completely, that would simplify things (then > you don't need markup in the grd file). I think you can remove it because in > chrome://settings, links don't have periods at the end, except in the case where > there's a sentence that is only partially linkified. For example, "Set which > search engine is used when searching from the |omnibox|." but "[ ] Offer to save > your passwords. |Manage saved passwords|" (bars = linkified) > > The second paragraph is all strong, so you can handle that in CSS and remove the > markup here. The first <p> is only partly strong unfortunately, so you have to > leave a little bit of markup in the grd.

Done.

</message>

<message name="IDS_NEW_TAB_GUEST_SESSION_MESSAGE"

desc="Used when a person enters Guest Session">

- <ph name="BEGIN_BOLD"><strong></ph>You're browsing as a Guest<ph name="END_BOLD"></strong></ph>. Pages you view in this window won't appear in the browser history and they won't leave other traces, like cookies, on the computer after you sign out. Files you download and bookmarks you create won't be preserved.

- <ph name="LINE_BREAK"><br /><br /><ex><br /><br /></ex></ph>

- <ph name="BEGIN_LINK"><a href="$1"></ph>Learn more<ph name="END_LINK"></a><ex></a></ex></ph> about Guest browsing.

+ <ph name="BEGIN_H1"><h1></ph>You’re browsing as a Guest<ph name="END_H1"></h1></ph>

+ <ph name="BEGIN_P"><p></ph>Pages you view in this window won’t appear in the browser history and they won’t leave other traces, like cookies, on the computer after you sign out. Files you download and bookmarks you create won’t be preserved.

+ <ph name="BEGIN_LINK"><a href="$1"></ph>Learn more about Guest browsing<ph name="END_LINK"></a><ex></a></ex></ph>.<ph name="END_P"></p></ph>

</message>

</if>

<message name="IDS_NEW_TAB_GUEST_SESSION_MESSAGE"

desc="Used when a person enters Guest Session">

- <ph name="BEGIN_BOLD"><strong></ph>You're browsing as a Guest<ph name="END_BOLD"></strong></ph>. Pages you view in this window won't appear in the browser history and they won't leave other traces, like cookies, on the computer after you close all open Guest windows. Any files you download will be preserved, however.

- <ph name="LINE_BREAK"><br /><br /><ex><br /><br /></ex></ph>

- <ph name="BEGIN_LINK"><a href="$1"></ph>Learn more<ph name="END_LINK"></a><ex></a></ex></ph> about Guest browsing.

+ <ph name="BEGIN_H1"><h1></ph>You’re browsing as a Guest<ph name="END_H1"></h1></ph>

+ <ph name="BEGIN_P"><p></ph>Pages you view in this window won’t appear in the browser history and they won’t leave other traces, like cookies, on the computer after you close all open Guest windows. Any files you download will be preserved, however.

+ <ph name="BEGIN_LINK"><a href="$1"></ph>Learn more about Guest browsing<ph name="END_LINK"></a><ex></a></ex></ph>.<ph name="BEGIN_P"></p></ph>

</message>

</if>

<message name="IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW_SINGLE"

« no previous file with comments | « no previous file | chrome/browser/resources/ntp4/guest_tab.css » ('j') | chrome/browser/resources/ntp4/incognito_tab.css » ('J')