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

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

Issue 29333819: Issue 2375 - Implement "Blocking lists" section in new options page (Closed)
Left Patch Set: Addressed Thomas comments Created Jan. 22, 2016, 9:53 a.m.
Right Patch Set: Fixed the progress indicator and small fixes Created Feb. 4, 2016, 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
« background.js ('K') | « i18n.js ('k') | messageResponder.js » ('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": {
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 }, 69 },
70 "options_furtherBlocking_title_tooltip": { 70 "options_furtherBlocking_title_tooltip": {
71 "description": "Tooltip description for 'More blocking options' section in G eneral tab", 71 "description": "Tooltip description for 'More blocking options' section in G eneral tab",
72 "message": "By default, Adblock Plus blocks all annoying ads, including vide o ads, animated ads, noisy ads, flashy banners, pop-ups, pop-unders and much mor e. In addition to ads, Adblock Plus can also block tracking, malware, social med ia buttons and more to increase your safety and privacy online." 72 "message": "By default, Adblock Plus blocks all annoying ads, including vide o ads, animated ads, noisy ads, flashy banners, pop-ups, pop-unders and much mor e. In addition to ads, Adblock Plus can also block tracking, malware, social med ia buttons and more to increase your safety and privacy online."
73 }, 73 },
74 "options_popular": { 74 "options_popular": {
75 "description": "Popular label in further blocking options table", 75 "description": "Popular label in further blocking options table",
76 "message": "popular" 76 "message": "popular"
77 }, 77 },
78 "options_furtherBlocking_add": { 78 "options_furtherBlocking_add": {
79 "description": "Button name for adding other blocking list in General tab", 79 "description": "Button name for adding other filter list in General tab",
80 "message": "add other blocking list" 80 "message": "add other filter list"
81 }, 81 },
82 "options_exceptions_title": { 82 "options_exceptions_title": {
83 "description": "Exceptions section name in General tab", 83 "description": "Exceptions section name in General tab",
84 "message": "Exceptions" 84 "message": "Exceptions"
85 }, 85 },
86 "options_acceptableAds_title": { 86 "options_acceptableAds_title": {
87 "description": "Acceptable ads option name in General tab", 87 "description": "Acceptable ads option name in General tab",
88 "message": "Acceptable ads" 88 "message": "Acceptable ads"
89 }, 89 },
90 "options_acceptableAds_title_tooltip_1": { 90 "options_acceptableAds_title_tooltip_1": {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 }, 129 },
130 "options_button_add": { 130 "options_button_add": {
131 "description": "Add button label", 131 "description": "Add button label",
132 "message": "add" 132 "message": "add"
133 }, 133 },
134 "options_button_cancel": { 134 "options_button_cancel": {
135 "description": "Cancel button label", 135 "description": "Cancel button label",
136 "message": "cancel" 136 "message": "cancel"
137 }, 137 },
138 "options_tweaks_title": { 138 "options_tweaks_title": {
139 "description": "Tweaks section name in Advanced tab", 139 "description": "Section title in Advanced tab",
140 "message": "Tweaks" 140 "message": "Tweaks"
141 }, 141 },
142 "options_tweaks_blockElement": { 142 "options_tweaks_blockElement": {
143 "description": "Show block Element option in Advanced tab", 143 "description": "Show block Element option in Advanced tab",
144 "message": "Show <a>Block Element</a> right-click menu item" 144 "message": "Show <a>Block Element</a> right-click menu item"
145 }, 145 },
146 "options_blockingList_title": { 146 "options_filterList_title": {
147 "description": "Blocking list section title in Advanced tab", 147 "description": "Section title in Advanced tab",
148 "message": "Blocking list" 148 "message": "Filter lists"
149 }, 149 },
150 "options_tab_overview": { 150 "options_tab_overview": {
151 "description": "Tab name in Advanced tab", 151 "description": "Tab name in Advanced tab",
152 "message": "Overview" 152 "message": "Overview"
153 }, 153 },
154 "options_tab_ownList": { 154 "options_tab_ownList": {
155 "description": "Tab name in Advanced tab", 155 "description": "Tab name in Advanced tab",
156 "message": "Edit or create own filter list" 156 "message": "Edit or create own filter list"
157 }, 157 },
158 "options_tableCol_name": { 158 "options_column_name": {
Thomas Greiner 2016/01/25 15:40:30 Detail: I just noticed that "column" is abbreviate
saroyanm 2016/01/26 18:36:17 Done.
159 "description": "Name of column of subscription list table in Advanced tab", 159 "description": "Name of column of subscription list table in Advanced tab",
160 "message": "Name" 160 "message": "Name"
161 }, 161 },
162 "options_tableCol_date": { 162 "options_column_date": {
163 "description": "Name of column of subscription list table in Advanced tab", 163 "description": "Name of column of subscription list table in Advanced tab",
164 "message": "Last update" 164 "message": "Last update"
165 }, 165 },
166 "options_blockingList_add": { 166 "options_filterList_add": {
167 "description": "Import button in Advanced tab", 167 "description": "Import button in Advanced tab",
168 "message": "add/import other blocking list" 168 "message": "add/import other filter list"
169 }, 169 },
170 "options_blockingList_update": { 170 "options_filterList_update": {
171 "description": "Update button in Advanced tab", 171 "description": "Update button in Advanced tab",
172 "message": "update all blocking lists" 172 "message": "update all filter lists"
173 }, 173 },
174 "options_customFilters_empty": { 174 "options_customFilters_empty": {
175 "description": "Text shown when list of custom filters is empty", 175 "description": "Text shown when list of custom filters is empty",
176 "message": "There are no custom filters." 176 "message": "There are no custom filters."
177 }, 177 },
178 "options_subscription_lastDownload_invalidURL": { 178 "options_filterList_lastDownload_invalidURL": {
179 "description": "Error message in advanced tab", 179 "description": "Error message in advanced tab",
180 "message": "Failed, not a valid address" 180 "message": "Failed, not a valid address"
181 }, 181 },
182 "options_subscription_lastDownload_connectionError": { 182 "options_filterList_lastDownload_connectionError": {
183 "description": "Error message in advanced tab", 183 "description": "Error message in advanced tab",
184 "message": "Failed, download failure" 184 "message": "Failed, download failure"
185 }, 185 },
186 "options_subscription_lastDownload_invalidData": { 186 "options_filterList_lastDownload_invalidData": {
187 "description": "Error message in advanced tab", 187 "description": "Error message in advanced tab",
188 "message": "Failed, not a valid filter list" 188 "message": "Failed, not a valid filter list"
189 }, 189 },
190 "options_subscription_lastDownload_checksumMismatch": { 190 "options_filterList_lastDownload_checksumMismatch": {
191 "description": "Error message in advanced tab", 191 "description": "Error message in advanced tab",
192 "message": "Failed, checksum mismatch" 192 "message": "Failed, checksum mismatch"
193 }, 193 },
194 "options_blockingList_updateNow": { 194 "options_filterList_lastDownload_inProgress": {
195 "description": "Progress message in advanced tab",
196 "message": "Downloading…"
197 },
198 "options_filterList_updateNow": {
195 "description": "Context menu item in advanced tab, appears after click on su bscription", 199 "description": "Context menu item in advanced tab, appears after click on su bscription",
196 "message": "update now" 200 "message": "update now"
197 }, 201 },
198 "options_blockingList_website": { 202 "options_filterList_website": {
199 "description": "Context menu item in advanced tab, appears after click on su bscription", 203 "description": "Context menu item in advanced tab, appears after click on su bscription",
200 "message": "website" 204 "message": "website"
201 }, 205 },
202 "options_blockingList_source": { 206 "options_filterList_source": {
203 "description": "Context menu item in advanced tab, appears after click on su bscription", 207 "description": "Context menu item in advanced tab, appears after click on su bscription",
204 "message": "source" 208 "message": "source"
205 }, 209 },
206 "options_blockingList_delete": { 210 "options_filterList_delete": {
207 "description": "Context menu item in advanced tab, appears after click on su bscription", 211 "description": "Context menu item in advanced tab, appears after click on su bscription",
208 "message": "delete" 212 "message": "delete"
209 }, 213 },
210 "options_blockingList_own_list": { 214 "options_filterList_own_list": {
211 "description": "Name of custom subscription entry in blocking list section i n Advanced tab", 215 "description": "Name of custom subscription entry in filter list section in Advanced tab",
212 "message": "Own filter list" 216 "message": "Own filter list"
213 }, 217 },
214 "options_blockingList_edit_own_list": { 218 "options_filterList_edit_own_list": {
215 "description": "Entry in blocking list section in Advanced tab", 219 "description": "Entry in filter list section in Advanced tab",
216 "message": "edit your filter list" 220 "message": "edit your filter list"
217 }, 221 },
218 "options_customFilters_title": { 222 "options_customFilters_title": {
219 "description": "Custom filters option name in Advanced tab", 223 "description": "Custom filters option name in Advanced tab",
220 "message": "Blocking rules" 224 "message": "Blocking rules"
221 }, 225 },
222 "options_customFilters_textbox_placeholder": { 226 "options_customFilters_textbox_placeholder": {
223 "description": "Adding custom filter textbox placeholder text in Advanced ta b", 227 "description": "Adding custom filter textbox placeholder text in Advanced ta b",
224 "message": "add your blocking rule here" 228 "message": "add your blocking rule here"
225 }, 229 },
226 "options_customFilter_edit": { 230 "options_customFilter_edit": {
227 "description": "Label for editing custom filter in Advanced tab", 231 "description": "Label for editing custom filter in Advanced tab",
228 "message": "edit rules" 232 "message": "edit rules"
229 }, 233 },
230 "options_customFilter_list": { 234 "options_customFilter_list": {
231 "description": "Label for editing custom filter in Advanced tab", 235 "description": "Label for editing custom filter in Advanced tab",
232 "message": "list view" 236 "message": "list view"
233 }, 237 },
234 "options_customFilter_save": { 238 "options_customFilter_save": {
235 "description": "Label for editing custom filter in Advanced tab", 239 "description": "Label for editing custom filter in Advanced tab",
236 "message": "save" 240 "message": "save"
237 }, 241 },
238 "options_faq_title": { 242 "options_faq_title": {
239 "description": "FAQ section name in Help tab and link label in same section" , 243 "description": "FAQ section name in Help tab and link label in same section" ,
240 "message": "Frequently asked questions" 244 "message": "Frequently asked questions"
241 }, 245 },
242 "options_faq_description": { 246 "options_faq_description": {
243 "description": "FAQ section description in Help tab", 247 "description": "FAQ section description in Help tab",
244 "message": "You only need to refresh your blocking list in \"Advanced\" very often, but there are also other known problems." 248 "message": "You only need to refresh your filter list in \"Advanced\" very o ften, but there are also other known problems."
245 }, 249 },
246 "options_forum_title": { 250 "options_forum_title": {
247 "description": "Forum section name in Help tab", 251 "description": "Forum section name in Help tab",
248 "message": "Forum" 252 "message": "Forum"
249 }, 253 },
250 "options_forum_description": { 254 "options_forum_description": {
251 "description": "Forum section description in Help tab", 255 "description": "Forum section description in Help tab",
252 "message": "If the frequently asked questions helped you can reach us in our forum." 256 "message": "If the frequently asked questions helped you can reach us in our forum."
253 }, 257 },
254 "options_forum_link": { 258 "options_forum_link": {
255 "description": "Forum section link in Help tab", 259 "description": "Forum section link in Help tab",
256 "message": "Adblock Plus support forum" 260 "message": "Adblock Plus support forum"
257 }, 261 },
258 "options_media_title": { 262 "options_media_title": {
259 "description": "Social media Section name in Help tab", 263 "description": "Social media Section name in Help tab",
260 "message": "Social media" 264 "message": "Social media"
261 }, 265 },
262 "options_media_description": { 266 "options_media_description": {
263 "description": "Social media section description in Help tab", 267 "description": "Social media section description in Help tab",
264 "message": "If there are major problems with Adblock Plus which affects all of our users, we tell you in our social media channels." 268 "message": "If there are major problems with Adblock Plus which affects all of our users, we tell you in our social media channels."
265 }, 269 },
266 "options_dialog_predefined_confirm": { 270 "options_dialog_predefined_confirm": {
267 "description": "Confirming to add a predefined subscription when asked in a dialog", 271 "description": "Confirming to add a predefined subscription when asked in a dialog",
268 "message": "Yes, use this blocking list" 272 "message": "Yes, use this filter list"
269 }, 273 },
270 "options_dialog_predefined_title": { 274 "options_dialog_predefined_title": {
271 "description": "Dialog title for adding a predefined subscription", 275 "description": "Dialog title for adding a predefined subscription",
272 "message": "Do you really want to use this blocking list?" 276 "message": "Do you really want to use this filter list?"
273 }, 277 },
274 "options_dialog_custom_title": { 278 "options_dialog_custom_title": {
275 "description": "Title of custom subscription modal dialog", 279 "description": "Title of custom subscription modal dialog",
276 "message": "Add other blocking list" 280 "message": "Add other filter list"
277 }, 281 },
278 "options_close": { 282 "options_close": {
279 "description": "Close modal button", 283 "description": "Close modal button",
280 "message": "close" 284 "message": "close"
281 }, 285 },
282 "options_dialog_custom_subscription_title": { 286 "options_dialog_custom_subscription_title": {
283 "description": "Add custom subscription modal import hint message", 287 "description": "Add custom subscription modal import hint message",
284 "message": "Via URL/Link" 288 "message": "Via URL/Link"
285 }, 289 },
286 "options_dialog_custom_import": { 290 "options_dialog_custom_import": {
287 "description": "Button in add custom subscription modal dialog", 291 "description": "Button in add custom subscription modal dialog",
288 "message": "import blocking list with this URL" 292 "message": "import filter list with this URL"
289 }, 293 },
290 "options_dialog_edit_own_list": { 294 "options_dialog_edit_own_list": {
291 "description": "Edit own blocking list section name in custom subscription m odal dialog", 295 "description": "Edit own filter list section name in custom subscription mod al dialog",
292 "message": "edit own blocking list" 296 "message": "edit own filter list"
293 }, 297 },
294 "options_dialog_create_own_list": { 298 "options_dialog_create_own_list": {
295 "description": "Button in custom subscription modal dialog", 299 "description": "Button in custom subscription modal dialog",
296 "message": "create own blocking rules" 300 "message": "create own blocking rules"
297 }, 301 },
298 "options_dialog_language_title": { 302 "options_dialog_language_title": {
299 "description": "Button in gerenal tab", 303 "description": "Button in gerenal tab",
300 "message": "Add other website language" 304 "message": "Add other website language"
301 }, 305 },
302 "options_dialog_language_find": { 306 "options_dialog_language_find": {
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 }, 377 },
374 "options_language_ro": { 378 "options_language_ro": {
375 "description": "Language name shown in add language modal dialog", 379 "description": "Language name shown in add language modal dialog",
376 "message": "Romanian" 380 "message": "Romanian"
377 }, 381 },
378 "options_language_ru_uk": { 382 "options_language_ru_uk": {
379 "description": "Language name shown in add language modal dialog", 383 "description": "Language name shown in add language modal dialog",
380 "message": "Russian and Ukrainian" 384 "message": "Russian and Ukrainian"
381 } 385 }
382 } 386 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld