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

Delta Between Two Patch Sets: locale/en-US/new-options.json

Issue 29411555: Issue 5169 - Add whitelisted tab to the new options page (Closed)
Left Patch Set: Addressed Thomas comments Created May 16, 2017, 8:10 p.m.
Right Patch Set: Fixed the TYPO Created July 3, 2017, 4:10 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 | « no previous file | new-options.html » ('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_header_1": { 6 "options_page_header_1": {
7 "description": "Page title in navigation sidebar", 7 "description": "Page title in navigation sidebar",
8 "message": "Options" 8 "message": "Options"
9 }, 9 },
10 "options_page_header_2": { 10 "options_page_header_2": {
11 "description": "Name of extension in navigation sidebar", 11 "description": "Name of extension in navigation sidebar",
12 "message": "Adblock <strong>Plus</strong>" 12 "message": "Adblock <strong>Plus</strong>"
13 }, 13 },
14 "options_tab_general": { 14 "options_tab_general": {
15 "description": "Name in sidebar for General tab", 15 "description": "Sidebar tab label",
16 "message": "General" 16 "message": "General"
17 }, 17 },
18 "options_tab_whitelist": { 18 "options_tab_whitelist": {
19 "description": "Name in sidebar for Whitelisted websites tab", 19 "description": "Sidebar tab label and main heading inside corresponding tab" ,
20 "message": "Whitelisted websites" 20 "message": "Whitelisted websites"
21 }, 21 },
22 "options_tab_advanced": { 22 "options_tab_advanced": {
23 "description": "Name in sidebar for Advanced tab", 23 "description": "Sidebar tab label",
24 "message": "Advanced" 24 "message": "Advanced"
25 }, 25 },
26 "options_tab_help": { 26 "options_tab_help": {
27 "description": "Name in sidebar for Help tab", 27 "description": "Sidebar tab label",
28 "message": "Help" 28 "message": "Help"
29 }, 29 },
30 "options_version": { 30 "options_version": {
31 "description": "Version label in navigation sidebar", 31 "description": "Version label in navigation sidebar",
32 "message": "Version" 32 "message": "Version"
33 }, 33 },
34 "options_tab_share": { 34 "options_tab_share": {
35 "description": "Share button in navigation sidebar", 35 "description": "Share button in navigation sidebar",
36 "message": "Share" 36 "message": "Share"
37 }, 37 },
(...skipping 20 matching lines...) Expand all
58 "options_language_title": { 58 "options_language_title": {
59 "description": "Ad blocking list option name in General tab", 59 "description": "Ad blocking list option name in General tab",
60 "message": "<strong>Adblocking</strong> for websites in..." 60 "message": "<strong>Adblocking</strong> for websites in..."
61 }, 61 },
62 "options_language_title_tooltip_1": { 62 "options_language_title_tooltip_1": {
63 "description": "Top part of tooltip description for 'Adblocking' section in General tab", 63 "description": "Top part of tooltip description for 'Adblocking' section in General tab",
64 "message": "The default filter list is based on your browser's language sett ings. If you live in Germany, your default filter list is German+English. Howeve r, if you live in Germany and frequently visit Italian websites, you need to sub scribe to the Italian filter list. To maintain optimal performance, it is recomm ended to select only the language that you need." 64 "message": "The default filter list is based on your browser's language sett ings. If you live in Germany, your default filter list is German+English. Howeve r, if you live in Germany and frequently visit Italian websites, you need to sub scribe to the Italian filter list. To maintain optimal performance, it is recomm ended to select only the language that you need."
65 }, 65 },
66 "options_language_title_tooltip_notes_1": { 66 "options_language_title_tooltip_notes_1": {
67 "description": "First bottom part of tooltip description for 'Adblocking' se ction in General tab", 67 "description": "First bottom part of tooltip description for 'Adblocking' se ction in General tab",
68 "message": "Consider: Sometimes ads appear because your filter lists are not up to date. If this is the case, its recommended to manually update all your f ilter lists. You can do that by going to <strong>Advanced > Update all filter li sts</strong>." 68 "message": "Consider: Sometimes ads appear because your filter lists are not up to date. If this is the case, it's recommended to manually update all your f ilter lists. You can do that by going to <strong>Advanced > Update all filter li sts</strong>."
69 }, 69 },
70 "options_language_title_tooltip_notes_2": { 70 "options_language_title_tooltip_notes_2": {
71 "description": "Second bottom part of tooltip description for 'Adblocking' s ection in General tab", 71 "description": "Second bottom part of tooltip description for 'Adblocking' s ection in General tab",
72 "message": "If you still see ads, please report them in our Adblock Plus sub -forum under <strong>Help > Forum > Filters for Adblock Plus</strong>." 72 "message": "If you still see ads, please report them in our Adblock Plus sub -forum under <strong>Help > Forum > Filters for Adblock Plus</strong>."
73 }, 73 },
74 "options_language_add": { 74 "options_language_add": {
75 "description": "Add other language button in General Tab", 75 "description": "Add other language button in General Tab",
76 "message": "add other website languages" 76 "message": "add other website languages"
77 }, 77 },
78 "options_more_title": { 78 "options_more_title": {
(...skipping 20 matching lines...) Expand all
99 "options_more_privacy_tooltip_1": { 99 "options_more_privacy_tooltip_1": {
100 "message": "Adblock Plus can disable tracking (e.g. from ad agencies) to fur ther protect your privacy on the web." 100 "message": "Adblock Plus can disable tracking (e.g. from ad agencies) to fur ther protect your privacy on the web."
101 }, 101 },
102 "options_more_privacy_tooltip_2": { 102 "options_more_privacy_tooltip_2": {
103 "message": "Companies such as ad agencies are tracking your online activity and browsing history every time you surf the web. According to Stanford Universi ty research, Adblock Plus is the most efficient solution available against third -party tracking companies." 103 "message": "Companies such as ad agencies are tracking your online activity and browsing history every time you surf the web. According to Stanford Universi ty research, Adblock Plus is the most efficient solution available against third -party tracking companies."
104 }, 104 },
105 "options_more_privacy_tooltip_notes_1": { 105 "options_more_privacy_tooltip_notes_1": {
106 "message": "Note that this feature may conflict with Acceptable Ads, which a llows some nonintrusive ads to be displayed, as well as the tracking that is nee ded to measure the performance of those ads. This is necessary because some webs ites only earn revenue from ads if their impact can be measured." 106 "message": "Note that this feature may conflict with Acceptable Ads, which a llows some nonintrusive ads to be displayed, as well as the tracking that is nee ded to measure the performance of those ads. This is necessary because some webs ites only earn revenue from ads if their impact can be measured."
107 }, 107 },
108 "options_more_social_tooltip_1": { 108 "options_more_social_tooltip_1": {
109 "message": "Adblock Plus can disable social media buttons on websites, ensur ing that social networks cant create a profile based on the websites you visit. " 109 "message": "Adblock Plus can disable social media buttons on websites, ensur ing that social networks can't create a profile based on the websites you visit. "
110 }, 110 },
111 "options_more_social_tooltip_2": { 111 "options_more_social_tooltip_2": {
112 "message": "Buttons used to share content on social media platforms such as Facebook, Twitter, Google Plus and others are placed on almost every website tha t you visit. Even if you don't click them, these buttons send requests to the se rvers of the social network which use information to create a profile based on y our browsing habits." 112 "message": "Buttons used to share content on social media platforms such as Facebook, Twitter, Google Plus and others are placed on almost every website tha t you visit. Even if you don't click them, these buttons send requests to the se rvers of the social network which use information to create a profile based on y our browsing habits."
113 }, 113 },
114 "options_exceptions_title": { 114 "options_exceptions_title": {
115 "description": "Exceptions section name in General tab", 115 "description": "Exceptions section name in General tab",
116 "message": "Exceptions" 116 "message": "Exceptions"
117 }, 117 },
118 "options_acceptableAds_title": { 118 "options_acceptableAds_title": {
119 "description": "Acceptable ads option name in General tab", 119 "description": "Acceptable ads option name in General tab",
120 "message": "Acceptable ads" 120 "message": "Acceptable ads"
121 }, 121 },
122 "options_acceptableAds_title_tooltip_1": { 122 "options_acceptableAds_title_tooltip_1": {
123 "description": "First part of tooltip description for 'Acceptable Ads' secti on in General tab", 123 "description": "First part of tooltip description for 'Acceptable Ads' secti on in General tab",
124 "message": "Since many websites rely on advertising revenue, we encourage th e use of noninstrusive advertising." 124 "message": "Since many websites rely on advertising revenue, we encourage th e use of noninstrusive advertising."
125 }, 125 },
126 "options_acceptableAds_title_tooltip_2": { 126 "options_acceptableAds_title_tooltip_2": {
127 "description": "Second part of tooltip description for 'Acceptable Ads' sect ion in General tab", 127 "description": "Second part of tooltip description for 'Acceptable Ads' sect ion in General tab",
128 "message": "The Acceptable Ads initiative, which supports both users and web site owners, is a set of strict guidelines that identifies acceptable ads. Ads m eeting these criteria are displayed to users." 128 "message": "The Acceptable Ads initiative, which supports both users and web site owners, is a set of strict guidelines that identifies acceptable ads. Ads m eeting these criteria are displayed to users."
129 }, 129 },
130 "options_acceptableAds_title_tooltip_3": { 130 "options_acceptableAds_title_tooltip_3": {
131 "description": "Third part of tooltip description for 'Acceptable Ads' secti on in General tab", 131 "description": "Third part of tooltip description for 'Acceptable Ads' secti on in General tab",
132 "message": "You can, however, disable this feature at any time and browse ad -free." 132 "message": "You can, however, disable this feature at any time and browse ad -free."
133 }, 133 },
134 "options_acceptableAds_description": { 134 "options_acceptableAds_description": {
135 "description": "Acceptable ads descriptive name in General tab", 135 "description": "Acceptable ads descriptive name in General tab",
136 "message": "Allow some non-intrusive advertising" 136 "message": "Allow some non-intrusive advertising"
137 }, 137 },
138 "options_whitelist_title": {
139 "description": "Whitelist tab headline",
140 "message": "Whitelisted websites"
saroyanm 2017/05/17 13:15:16 I think we can reuse, options_tab_whitelist here ?
saroyanm 2017/05/18 16:21:52 This is a duplication, we should reuse the string.
saroyanm 2017/05/22 09:38:23 Done.
141 },
142 "options_whitelist_description": { 138 "options_whitelist_description": {
143 "description": "Whitelist tab description", 139 "description": "Whitelist tab description",
144 "message": "Youve turned off ad blocking on these websites. You will see ad s on these websites." 140 "message": "You've turned off ad blocking on these websites. You will see ad s on these websites."
145 }, 141 },
146 "options_whitelist_add": { 142 "options_whitelist_add": {
147 "description": "Add whitelisted domain button", 143 "description": "Add whitelisted domain button",
148 "message": "Add website" 144 "message": "Add website"
149 }, 145 },
150 "options_whitelist_placeholder_example": { 146 "options_whitelist_placeholder_example": {
151 "description": "Empty Whitelist input placeholder prefix", 147 "description": "Empty Whitelist input placeholder prefix",
152 "message": "e.g. $domain$", 148 "message": "e.g. $domain$",
153 "placeholders": { 149 "placeholders": {
154 "domain": { 150 "domain": {
155 "content": "www.example.com" 151 "content": "$1",
saroyanm 2017/05/16 20:20:07 Is this solution fine, or we might want to pass th
saroyanm 2017/05/18 16:21:52 We will move this placeholder into JS code to make
saroyanm 2017/05/22 09:38:23 Done.
152 "example": "www.example.com"
156 } 153 }
157 } 154 }
158 }, 155 },
159 "options_whitelist_empty_1": { 156 "options_whitelist_empty_1": {
160 "description": "Empty Whitelist placeholder", 157 "description": "Empty Whitelist placeholder",
161 "message": "You aren't whitelisting any websites yet." 158 "message": "You aren't whitelisting any websites yet."
162 }, 159 },
163 "options_whitelist_empty_2": { 160 "options_whitelist_empty_2": {
164 "description": "Empty Whitelist placeholder", 161 "description": "Empty Whitelist placeholder",
165 "message": "Websites you trust and want to allow ads on will be shown here." 162 "message": "Websites you trust and want to allow ads on will be shown here."
166 }, 163 },
167 "options_whitelist_duplicate": { 164 "options_whitelist_duplicate": {
168 "description": "Duplicate hostname warning of whitelist text input", 165 "description": "Duplicate hostname warning of whitelist text input",
169 "message": "Website is already whitelisted" 166 "message": "Website is already whitelisted"
170 }, 167 },
171 "options_whitelist_description": { 168 "options_whitelist_description": {
172 "description": "Section description in whitelisted tab", 169 "description": "Section description in whitelisted tab",
173 "message": "Youve turned off ad blocking on these websites. You will see ad s on these websites." 170 "message": "You've turned off ad blocking on these websites. You will see ad s on these websites."
174 }, 171 },
175 "options_button_add": { 172 "options_button_add": {
176 "description": "Add button label", 173 "description": "Add button label",
177 "message": "add" 174 "message": "add"
178 }, 175 },
179 "options_tweaks_title": { 176 "options_tweaks_title": {
180 "description": "Section title in Advanced tab", 177 "description": "Section title in Advanced tab",
181 "message": "Tweaks" 178 "message": "Tweaks"
182 }, 179 },
183 "options_tweaks_blockElement": { 180 "options_tweaks_blockElement": {
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 }, 439 },
443 "options_language_ro": { 440 "options_language_ro": {
444 "description": "Language name shown in add language modal dialog", 441 "description": "Language name shown in add language modal dialog",
445 "message": "Romanian" 442 "message": "Romanian"
446 }, 443 },
447 "options_language_ru_uk": { 444 "options_language_ru_uk": {
448 "description": "Language name shown in add language modal dialog", 445 "description": "Language name shown in add language modal dialog",
449 "message": "Russian and Ukrainian" 446 "message": "Russian and Ukrainian"
450 } 447 }
451 } 448 }
LEFTRIGHT
« no previous file | new-options.html » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld