Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: locale/en_US/desktop-options.json

Issue 29609587: Issue 6031 - Implement Acceptable Ads notification (Closed)
Left Patch Set: Addressed Thomas comments Created Nov. 17, 2017, 4:03 p.m.
Right Patch Set: Created Nov. 21, 2017, 6:15 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « desktop-options.js ('k') | skin/desktop-options.css » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 { 1 {
2 "options_page_title": { 2 "options_page_title": {
3 "description": "Options page title", 3 "description": "Options page title",
4 "message": "Adblock Plus Options" 4 "message": "Adblock Plus Options"
5 }, 5 },
6 "options_page_title": { 6 "options_page_title": {
7 "description": "Page title in navigation sidebar", 7 "description": "Page title in navigation sidebar",
8 "message": "Settings" 8 "message": "Settings"
9 }, 9 },
10 "options_tab_general": { 10 "options_tab_general": {
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 "options_acceptableAds_header": { 62 "options_acceptableAds_header": {
63 "description": "Section title in General tab", 63 "description": "Section title in General tab",
64 "message": "Acceptable Ads" 64 "message": "Acceptable Ads"
65 }, 65 },
66 "options_acceptableAds_description": { 66 "options_acceptableAds_description": {
67 "description": "Acceptable Ads section description in General tab", 67 "description": "Acceptable Ads section description in General tab",
68 "message": "Acceptable Ads are nonintrusive ads. They are the middle ground between ad blocking and supporting online content because they generate revenue for website owners." 68 "message": "Acceptable Ads are nonintrusive ads. They are the middle ground between ad blocking and supporting online content because they generate revenue for website owners."
69 }, 69 },
70 "options_tracking_warning_1": { 70 "options_tracking_warning_1": {
71 "description": "Text of the tracking notification (being shown when both 'Ac ceptable Ads' and 'EasyPrivacy' are enabled) in General tab", 71 "description": "Text of the tracking notification (being shown when both 'Ac ceptable Ads' and 'EasyPrivacy' are enabled) in General tab",
72 "message": "We noticed you have both <strong>'$easy-privacy$'</strong> and ' <strong>$acceptable-ads$</strong>' enabled.", 72 "message": "We noticed you have both '<strong>$tracking$</strong>' and '<str ong>$acceptableAds$</strong>' enabled.",
saroyanm 2017/11/17 16:13:26 Detail: <strong> should go inside of "'" for consi
Thomas Greiner 2017/11/20 18:36:05 Might be a personal preference but I agree. In any
saroyanm 2017/11/21 14:58:33 I agree that this should be documented somewhere,
73 "placeholders": { 73 "placeholders": {
74 "easy-privacy": { 74 "tracking": {
Thomas Greiner 2017/11/20 18:36:05 Detail: I'd recommend avoiding special characters
Thomas Greiner 2017/11/20 18:36:05 Detail: The filter list behind the "privacy" featu
saroyanm 2017/11/21 14:58:33 Agree, done.
saroyanm 2017/11/21 14:58:33 Okey, I use "tracking" now.
75 "content": "$1" 75 "content": "$1",
Thomas Greiner 2017/11/20 18:36:05 Detail: Let's also include the "example" property
saroyanm 2017/11/21 14:58:33 Done.
76 "example": "Block additional tracking"
76 }, 77 },
77 "acceptable-ads": { 78 "acceptableAds": {
78 "content": "$2" 79 "content": "$2",
80 "example": "Allow Acceptable Ads"
79 } 81 }
80 } 82 }
81 }, 83 },
82 "options_tracking_warning_2": { 84 "options_tracking_warning_2": {
83 "description": "Text of the tracking notification (being shown when both 'Ac ceptable Ads' and 'EasyPrivacy' are enabled) in General tab", 85 "description": "Text of the tracking notification (being shown when both 'Ac ceptable Ads' and 'EasyPrivacy' are enabled) in General tab",
84 "message": "We want you to know that in order for advertisers to show you mo re relevant ads, there <strong>may</strong> be some tracking with Acceptable Ads ." 86 "message": "We want you to know that in order for advertisers to show you mo re relevant ads, there <strong>may</strong> be some tracking with Acceptable Ads ."
85 }, 87 },
86 "options_tracking_warning_3": { 88 "options_tracking_warning_3": {
87 "description": "Text of the tracking notification (being shown when both 'Ac ceptable Ads' and 'EasyPrivacy' are enabled) in General tab", 89 "description": "Text of the tracking notification (being shown when both 'Ac ceptable Ads' and 'EasyPrivacy' are enabled) in General tab",
88 "message": "If you prefer extra privacy, select the '<strong>$privacy-friend ly-acceptable-ads$</strong>' checkbox below.", 90 "message": "If you prefer extra privacy, select the '<strong>$acceptableAdsP rivacy$</strong>' checkbox below.",
89 "placeholders": { 91 "placeholders": {
90 "privacy-friendly-acceptable-ads": { 92 "acceptableAdsPrivacy": {
91 "content": "$1" 93 "content": "$1",
94 "example": "Only allow ads without third-party tracking"
92 } 95 }
93 } 96 }
94 }, 97 },
95 "options_tracking_warning_acknowledgment": { 98 "options_tracking_warning_acknowledgment": {
96 "description": "Text in the tracking notification (being shown when both 'Ac ceptable Ads' and 'EasyPrivacy' are enabled) in General tab", 99 "description": "Text in the tracking notification (being shown when both 'Ac ceptable Ads' and 'EasyPrivacy' are enabled) in General tab",
97 "message": "OK, got it" 100 "message": "OK, got it"
98 }, 101 },
99 "options_acceptableAds_ads_label": { 102 "options_acceptableAds_ads_label": {
100 "description": "Acceptable Ads section option label in General tab", 103 "description": "Acceptable Ads section option label in General tab",
101 "message": "Allow Acceptable Ads" 104 "message": "Allow Acceptable Ads"
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 "content": "$1", 451 "content": "$1",
449 "example": "example.com" 452 "example": "example.com"
450 } 453 }
451 } 454 }
452 }, 455 },
453 "options_notification_hide": { 456 "options_notification_hide": {
454 "description": "Hidden text attached to the close button for screen readers of Notification", 457 "description": "Hidden text attached to the close button for screen readers of Notification",
455 "message": "Close notification" 458 "message": "Close notification"
456 } 459 }
457 } 460 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld