components/data_reduction_proxy_strings.grdp - Issue 830503004: Data Reduction Proxy blocking page and resources

Side by Side Diff

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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: components/data_reduction_proxy_strings.grdp

Issue 830503004: Data Reduction Proxy blocking page and resources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@interstitalStep1

Patch Set: Test resources fix Created 5 years, 10 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:

View unified diff | Download patch

« components/data_reduction_proxy/content/resources/interstitial.html ('K') | « components/data_reduction_proxy/core/browser/data_reduction_proxy_debug_ui_manager_base.h ('k') | components/resources/OWNERS » ('j') | components/resources/OWNERS » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
(Empty)
	1 <?xml version="1.0" encoding="utf-8"?>

	2 <grit-part>

	3

	4 <!-- Data Reduction Proxy interstitals -->

	5 <if expr="is_android">

	6 <message name="IDS_DATA_REDUCTION_PROXY_TITLE" desc="The tab title for the C hrome Mobile Data Pack interstitials.">

	7 Title

	8 </message>

	9 <message name="IDS_DATA_REDUCTION_PROXY_BACK_BUTTON" desc="The text for the button that takes the user back to the previous page.">

	10 Back

	11 </message>

	12 <message name="IDS_DATA_REDUCTION_PROXY_CONTINUE_BUTTON" desc="The text for the button that takes the user to the requested page.">

	13 Continue

	14 </message>

	15

	16 <!-- Unproxyable interstitial -->

	17 <message name="IDS_UNPROXYABLE_HEADING" desc="The large heading at the top o f the unproxyable interstitial.">

	18 This page is unproxyable by Data Saver.
	bengr 2015/02/05 01:30:09 Is "unproxyable" a word? How about "This page cann Is "unproxyable" a word? How about "This page cannot be proxied by Data Saver." megjablon 2015/02/13 01:48:09 Done. Show quoted text On 2015/02/05 01:30:09, bengr wrote: > Is "unproxyable" a word? How about "This page cannot be proxied by Data Saver." Done.
	19 </message>

	20 <message name="IDS_UNPROXYABLE_PRIMARY_PARAGRAPH" desc="The primary explanat ory paragraph for the unproxyable interstitial.">

	21 You are trying to reach <ph name="BEGIN_BOLD"><strong></ph><ph name= "SITE">$1<ex>example.com</ex></ph><ph name="END_BOLD"></strong></ph>. This page is unproxyable by Data Saver at this time.
	bengr 2015/02/05 01:30:09 See above about unproxyable. See above about unproxyable. megjablon 2015/02/13 01:48:09 Done. Show quoted text On 2015/02/05 01:30:09, bengr wrote: > See above about unproxyable. Done.
	22 </message>

	23 <message name="IDS_UNPROXYABLE_SECONDARY_PARAGRAPH" desc="The secondary expl anatory paragraph for the unproxyable interstitial.">

	24 You may continue. If you continue to the page, this warning will not appea r again for five minutes.
	bengr 2015/02/05 01:30:09 What if you don't continue? If you don't continue, What if you don't continue? If you don't continue, will the next bypass trigger the interstitial again? megjablon 2015/02/13 01:48:09 Yep. As long as you don't say you're ok with bypas Show quoted text On 2015/02/05 01:30:09, bengr wrote: > What if you don't continue? If you don't continue, will the next bypass trigger > the interstitial again? Yep. As long as you don't say you're ok with bypassing, then we warn you every time a bypass happens.
	25 </message>

	26 </if>

	27

	28 </grit-part>

OLD	NEW