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

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

Issue 29445590: Issue 5255 - Advanced tab (HTML, strings and functionality) (Closed)
Left Patch Set: Addressed notes from weekly(ish) meeting and small collection fix Created June 14, 2017, 11:58 a.m.
Right Patch Set: Fixed nits Created July 14, 2017, 5:43 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 | « firstRun.js ('k') | 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 },
18 "options_tab_whitelist": {
19 "description": "Sidebar tab label and main heading inside corresponding tab" ,
20 "message": "Whitelisted websites"
17 }, 21 },
18 "options_tab_advanced": { 22 "options_tab_advanced": {
19 "description": "Sidebar tab label and main heading inside corresponding tab" , 23 "description": "Sidebar tab label and main heading inside corresponding tab" ,
20 "message": "Advanced" 24 "message": "Advanced"
21 }, 25 },
22 "options_tab_help": { 26 "options_tab_help": {
23 "description": "Name in sidebar for Help tab", 27 "description": "Sidebar tab label",
24 "message": "Help" 28 "message": "Help"
25 }, 29 },
26 "options_version": { 30 "options_version": {
27 "description": "Version label in navigation sidebar", 31 "description": "Version label in navigation sidebar",
28 "message": "Version" 32 "message": "Version"
29 }, 33 },
30 "options_tab_share": { 34 "options_tab_share": {
31 "description": "Share button in navigation sidebar", 35 "description": "Share button in navigation sidebar",
32 "message": "Share" 36 "message": "Share"
33 }, 37 },
(...skipping 20 matching lines...) Expand all
54 "options_language_title": { 58 "options_language_title": {
55 "description": "Ad blocking list option name in General tab", 59 "description": "Ad blocking list option name in General tab",
56 "message": "<strong>Adblocking</strong> for websites in..." 60 "message": "<strong>Adblocking</strong> for websites in..."
57 }, 61 },
58 "options_language_title_tooltip_1": { 62 "options_language_title_tooltip_1": {
59 "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",
60 "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."
61 }, 65 },
62 "options_language_title_tooltip_notes_1": { 66 "options_language_title_tooltip_notes_1": {
63 "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",
64 "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>."
65 }, 69 },
66 "options_language_title_tooltip_notes_2": { 70 "options_language_title_tooltip_notes_2": {
67 "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",
68 "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>."
69 }, 73 },
70 "options_language_add": { 74 "options_language_add": {
71 "description": "Add other language button in General Tab", 75 "description": "Add other language button in General Tab",
72 "message": "add other website languages" 76 "message": "add other website languages"
73 }, 77 },
74 "options_more_title": { 78 "options_more_title": {
(...skipping 20 matching lines...) Expand all
95 "options_more_privacy_tooltip_1": { 99 "options_more_privacy_tooltip_1": {
96 "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."
97 }, 101 },
98 "options_more_privacy_tooltip_2": { 102 "options_more_privacy_tooltip_2": {
99 "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."
100 }, 104 },
101 "options_more_privacy_tooltip_notes_1": { 105 "options_more_privacy_tooltip_notes_1": {
102 "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."
103 }, 107 },
104 "options_more_social_tooltip_1": { 108 "options_more_social_tooltip_1": {
105 "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. "
106 }, 110 },
107 "options_more_social_tooltip_2": { 111 "options_more_social_tooltip_2": {
108 "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."
109 }, 113 },
110 "options_exceptions_title": { 114 "options_exceptions_title": {
111 "description": "Exceptions section name in General tab", 115 "description": "Exceptions section name in General tab",
112 "message": "Exceptions" 116 "message": "Exceptions"
113 }, 117 },
114 "options_acceptableAds_title": { 118 "options_acceptableAds_title": {
115 "description": "Acceptable ads option name in General tab", 119 "description": "Acceptable ads option name in General tab",
116 "message": "Acceptable ads" 120 "message": "Acceptable ads"
117 }, 121 },
118 "options_acceptableAds_title_tooltip_1": { 122 "options_acceptableAds_title_tooltip_1": {
119 "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",
120 "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."
121 }, 125 },
122 "options_acceptableAds_title_tooltip_2": { 126 "options_acceptableAds_title_tooltip_2": {
123 "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",
124 "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."
125 }, 129 },
126 "options_acceptableAds_title_tooltip_3": { 130 "options_acceptableAds_title_tooltip_3": {
127 "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",
128 "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."
129 }, 133 },
130 "options_acceptableAds_description": { 134 "options_acceptableAds_description": {
131 "description": "Acceptable ads descriptive name in General tab", 135 "description": "Acceptable ads descriptive name in General tab",
132 "message": "Allow some non-intrusive advertising" 136 "message": "Allow some non-intrusive advertising"
133 }, 137 },
134 "options_whitelisted_add": { 138 "options_whitelist_description": {
135 "description": "Button label for adding whitelisted website", 139 "description": "Whitelist tab description",
136 "message": "add website" 140 "message": "You've turned off ad blocking on these websites. You will see ad s on these websites."
137 }, 141 },
138 "options_whitelisted_empty": { 142 "options_whitelist_add": {
139 "description": "Text shown when list of whitelisted websites is empty", 143 "description": "Add whitelisted domain button",
140 "message": "There are no websites in your whitelist." 144 "message": "Add website"
141 }, 145 },
142 "options_whitelisted_title": { 146 "options_whitelist_placeholder_example": {
143 "description": "Whitelisting option name in General tab", 147 "description": "Empty Whitelist input placeholder prefix",
144 "message": "Whitelisted websites" 148 "message": "e.g. $domain$",
145 }, 149 "placeholders": {
146 "options_whitelisted_title_tooltip_1": { 150 "domain": {
147 "description": "First top part of tooltip description for 'Whitelisted domai ns' section in General tab", 151 "content": "$1",
148 "message": "You can allow a website to display ads by adding it to your whit elist." 152 "example": "www.example.com"
149 }, 153 }
150 "options_whitelisted_title_tooltip_2": { 154 }
151 "description": "Second top part of tooltip description for 'Whitelisted doma ins' section in General tab", 155 },
152 "message": "This means that Adblock Plus is completely deactivated on the wh itelisted site. Ads and other annoyances, such as tracking scripts, may be activ ated." 156 "options_whitelist_empty_1": {
153 }, 157 "description": "Empty Whitelist placeholder",
154 "options_whitelisted_title_tooltip_notes_1": { 158 "message": "You aren't whitelisting any websites yet."
155 "description": "Bottom part of tooltip description for 'Whitelisted domains' section in General tab", 159 },
156 "message": "Note that this feature is different from whitelisted Acceptable Ads." 160 "options_whitelist_empty_2": {
161 "description": "Empty Whitelist placeholder",
162 "message": "Websites you trust and want to allow ads on will be shown here."
163 },
164 "options_whitelist_duplicate": {
165 "description": "Duplicate hostname warning of whitelist text input",
166 "message": "Website is already whitelisted"
167 },
168 "options_whitelist_description": {
169 "description": "Section description in whitelisted tab",
170 "message": "You've turned off ad blocking on these websites. You will see ad s on these websites."
157 }, 171 },
158 "options_button_add": { 172 "options_button_add": {
159 "description": "Add button label", 173 "description": "Add button label",
160 "message": "add" 174 "message": "add"
161 }, 175 },
162 "options_button_cancel": {
163 "description": "Cancel button label",
164 "message": "cancel"
165 },
166 "options_advanced_description": { 176 "options_advanced_description": {
167 "description": "Advanced tab description", 177 "description": "Advanced tab description",
168 "message": "Customize Adblock Plus, add or remove filter lists, create and m aintain your own filter lists" 178 "message": "Customize Adblock Plus, add or remove filter lists, create and m aintain your own filter lists"
169 }, 179 },
170 "options_customize_header": { 180 "options_customize_header": {
171 "description": "Section title in Advanced tab", 181 "description": "Section title in Advanced tab",
172 "message": "CUSTOMIZE ON-PAGE ACTIONS" 182 "message": "Customize on-page actions"
Thomas Greiner 2017/07/07 13:01:08 Detail: Don't capitalize the text here or otherwis
saroyanm 2017/07/10 11:37:59 My idea was to capitalize and rollback to the lowe
saroyanm 2017/07/12 15:29:00 Done.
Thomas Greiner 2017/07/14 17:36:11 Ok, as long as we don't forget to add the necessar
173 }, 183 },
174 "options_customize_blockElement": { 184 "options_customize_blockElement": {
175 "description": "Option label of customize section in Advanced tab", 185 "description": "Option label of customize section in Advanced tab",
176 "message": "Show 'Block element' right-click menu item" 186 "message": "Show 'Block element' right-click menu item"
177 }, 187 },
178 "options_customize_blockElement_tooltip_1": { 188 "options_customize_blockElement_tooltip_1": {
179 "description": "Tooltip text for Show 'Block element' option item of customi ze section in Advanced tab", 189 "description": "Tooltip text for Show 'Block element' option item of customi ze section in Advanced tab",
180 "message": "Temporarily block annoying items on a webpage, e.g. images or an imated slideshows." 190 "message": "Temporarily block annoying items on a webpage, e.g. images or an imated slideshows."
181 }, 191 },
182 "options_customize_showDevToolsPanel": { 192 "options_customize_showDevToolsPanel": {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 "message": "Last update" 226 "message": "Last update"
217 }, 227 },
218 "options_filterList_state_active": { 228 "options_filterList_state_active": {
219 "description": "State of filter list in Advanced tab", 229 "description": "State of filter list in Advanced tab",
220 "message": "Active" 230 "message": "Active"
221 }, 231 },
222 "options_filterList_state_disabled": { 232 "options_filterList_state_disabled": {
223 "description": "State of filter list in Advanced tab", 233 "description": "State of filter list in Advanced tab",
224 "message": "Disabled" 234 "message": "Disabled"
225 }, 235 },
226 "options_filterList_just": { 236 "options_filterList_now": {
Thomas Greiner 2017/07/07 13:01:08 Detail: "just" is not a time indicator. Instead I'
saroyanm 2017/07/10 11:37:59 Agree
saroyanm 2017/07/12 15:29:00 Done.
227 "description": "Text inside 'Last update' column in Advanced tab", 237 "description": "Text inside 'Last update' column in Advanced tab",
228 "message": "Just now" 238 "message": "Just now"
229 }, 239 },
230 "options_filterList_minutes": { 240 "options_filterList_minutes": {
231 "description": "Text inside 'Last update' column in Advanced tab", 241 "description": "Text inside 'Last update' column in Advanced tab",
232 "message": "minutes ago" 242 "message": "minutes ago"
Thomas Greiner 2017/07/07 13:01:08 These two texts don't contain placeholders for the
saroyanm 2017/07/10 11:37:59 I agree, I'll introduce placeholder here.
saroyanm 2017/07/12 15:29:00 Done.
233 }, 243 },
234 "options_filterList_hours": { 244 "options_filterList_hours": {
235 "description": "Text inside 'Last update' column in Advanced tab", 245 "description": "Text inside 'Last update' column in Advanced tab",
236 "message": "hours ago" 246 "message": "hours ago"
237 }, 247 },
238 "options_filterList_add": { 248 "options_filterList_add": {
239 "description": "Import button in Advanced tab", 249 "description": "Import button in Advanced tab",
240 "message": "add/import other filter list" 250 "message": "add/import other filter list"
241 }, 251 },
242 "options_filterList_update": { 252 "options_filterList_update": {
243 "description": "Update button in Advanced tab", 253 "description": "Update button in Advanced tab",
244 "message": "update all filter lists" 254 "message": "update all filter lists"
245 }, 255 },
246 "options_customFilters_title": { 256 "options_customFilters_title": {
247 "description": "Section title in Advanced tab", 257 "description": "Section title in Advanced tab",
248 "message": "CREATE AND EDIT YOUR FILTER LIST" 258 "message": "Create and edit your filter list"
249 }, 259 },
250 "options_customFilters_description": { 260 "options_customFilters_description": {
251 "description": "Custom filter lists section description in Advanced tab", 261 "description": "Custom filter lists section description in Advanced tab",
252 "message": "Write your own custom filters to further control what content Ad block PLus allows or blocks." 262 "message": "Write your own custom filters to further control what content Ad block PLus allows or blocks."
253 }, 263 },
254 "options_customFilters_widget_title": { 264 "options_customFilters_widget_title": {
255 "description": "Custom filter widget title in Advanced tab", 265 "description": "Custom filter widget title in Advanced tab",
256 "message": "My filter list" 266 "message": "My filter list"
257 }, 267 },
258 "options_customFilters_tip": { 268 "options_customFilters_tip": {
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 }, 473 },
464 "options_language_ro": { 474 "options_language_ro": {
465 "description": "Language name shown in add language modal dialog", 475 "description": "Language name shown in add language modal dialog",
466 "message": "Romanian" 476 "message": "Romanian"
467 }, 477 },
468 "options_language_ru_uk": { 478 "options_language_ru_uk": {
469 "description": "Language name shown in add language modal dialog", 479 "description": "Language name shown in add language modal dialog",
470 "message": "Russian and Ukrainian" 480 "message": "Russian and Ukrainian"
471 } 481 }
472 } 482 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld