| OLD | NEW |
| 1 title=Adblock Plus preferences | 1 title=Adblock Plus preferences |
| 2 | 2 |
| 3 {# | 3 {# |
| 4 # This file is part of the Adblock Plus website, | 4 # This file is part of the Adblock Plus website, |
| 5 # Copyright (C) 2006-2017 eyeo GmbH | 5 # Copyright (C) 2006-2017 eyeo GmbH |
| 6 # | 6 # |
| 7 # Adblock Plus is free software: you can redistribute it and/or modify | 7 # Adblock Plus is free software: you can redistribute it and/or modify |
| 8 # it under the terms of the GNU General Public License version 3 as | 8 # it under the terms of the GNU General Public License version 3 as |
| 9 # published by the Free Software Foundation. | 9 # published by the Free Software Foundation. |
| 10 # | 10 # |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 {{"3 — entire site"|translate("composer_default-s5")}} | 155 {{"3 — entire site"|translate("composer_default-s5")}} |
| 156 {% endmacro %} | 156 {% endmacro %} |
| 157 | 157 |
| 158 {% macro sendReport_keyDescription() %} | 158 {% macro sendReport_keyDescription() %} |
| 159 {{"Defines the keyboard shortcut to be used to send issue reports."|translate("s
endReport_key-s1")}} {{"For\ndescription of possible values see <a href=\"#sideb
ar_key\"><fix>sidebar_key</fix></a>."|translate("sendReport_key-s2")}} | 159 {{"Defines the keyboard shortcut to be used to send issue reports."|translate("s
endReport_key-s1")}} {{"For\ndescription of possible values see <a href=\"#sideb
ar_key\"><fix>sidebar_key</fix></a>."|translate("sendReport_key-s2")}} |
| 160 <br><br> | 160 <br><br> |
| 161 | 161 |
| 162 {{"<em>Note</em>: This setting will only apply after the browser is restarted."|
translate("sendReport_key-s3")}} | 162 {{"<em>Note</em>: This setting will only apply after the browser is restarted."|
translate("sendReport_key-s3")}} |
| 163 {% endmacro %} | 163 {% endmacro %} |
| 164 | 164 |
| 165 {% macro data_directoryDescription() %} | |
| 166 {{"The directory where Adblock Plus should store its data. This can be either a
n\nabsolute path, or it can a directory location relative to the user's profile.
\nIf <a href=\"#patternsfile\"><fix>patternsfile</fix></a> preference is set it
will override\nthe location for patterns.ini file while other files stay in this
directory."|translate("data_directory-s1")}} | |
| 167 {% endmacro %} | |
| 168 | |
| 169 {% macro subscriptions_exceptionscheckboxDescription() %} | 165 {% macro subscriptions_exceptionscheckboxDescription() %} |
| 170 {{"If <code><fix>true</fix></code>, the filter list for <a href=\"acceptable-ads
\">non-intrusive ads</a>\nwill get special treatment and will be displayed as a
checkbox in the user\ninterface."|translate("subscriptions_exceptionscheckbox-s1
")}} | 166 {{"If <code><fix>true</fix></code>, the filter list for <a href=\"acceptable-ads
\">non-intrusive ads</a>\nwill get special treatment and will be displayed as a
checkbox in the user\ninterface."|translate("subscriptions_exceptionscheckbox-s1
")}} |
| 171 {% endmacro %} | 167 {% endmacro %} |
| 172 | 168 |
| 173 {% macro subscriptions_autoupdateDescription() %} | 169 {% macro subscriptions_autoupdateDescription() %} |
| 174 {{"Defines whether filters in filter subscriptions will be updated\nautomaticall
y."|translate("subscriptions_autoupdate-s1")}}<br><br> | 170 {{"Defines whether filters in filter subscriptions will be updated\nautomaticall
y."|translate("subscriptions_autoupdate-s1")}}<br><br> |
| 175 | 171 |
| 176 {{"<em>Note</em>: Disabling updates is not recommended."|translate("subscription
s_autoupdate-s2")}} | 172 {{"<em>Note</em>: Disabling updates is not recommended."|translate("subscription
s_autoupdate-s2")}} |
| 177 {% endmacro %} | 173 {% endmacro %} |
| 178 | 174 |
| 179 {% macro please_kill_startup_performanceDescription() %} | |
| 180 {{"If set to <code><fix>true</fix></code> processing filters on startup will hap
pen synchronously and delay browser startup."|translate("please_kill_startup_per
formance-s1")}} {{"Changing this setting is not recommended but it makes it less
likely that ads will appear on the first page loaded by the browser."|translate
("please_kill_startup_performance-s2")}} | |
| 181 {% endmacro %} | |
| 182 | |
| 183 {% macro fastcollapseDescription() %} | 175 {% macro fastcollapseDescription() %} |
| 184 {{"If set to <code><fix>true</fix></code> blocked elements will no longer be hid
den."|translate("fastcollapse-s1")}} {{"This might have the effect that\nplaceho
lders will show up for blocked images for example, unless hidden by other means.
"|translate("fastcollapse-s2")}} {{"This functionality was available\nas \"Hide
placeholders of blocked elements\" before Adblock Plus 2.6.7."|translate("fastco
llapse-s3")}} | 176 {{"If set to <code><fix>true</fix></code> blocked elements will no longer be hid
den."|translate("fastcollapse-s1")}} {{"This might have the effect that\nplaceho
lders will show up for blocked images for example, unless hidden by other means.
"|translate("fastcollapse-s2")}} {{"This functionality was available\nas \"Hide
placeholders of blocked elements\" before Adblock Plus 2.6.7."|translate("fastco
llapse-s3")}} |
| 185 {% endmacro %} | 177 {% endmacro %} |
| 186 | 178 |
| 187 {% macro currentVersionDescription() %} | 179 {% macro currentVersionDescription() %} |
| 188 {{"Stores the last used Adblock Plus version, this will trigger actions that nee
d to be done on upgrade or first install"|translate("currentVersion-s1")}} | 180 {{"Stores the last used Adblock Plus version, this will trigger actions that nee
d to be done on upgrade or first install"|translate("currentVersion-s1")}} |
| 189 {% endmacro %} | 181 {% endmacro %} |
| 190 | 182 |
| 191 {% macro detachsidebarDescription() %} | 183 {% macro detachsidebarDescription() %} |
| 192 {{"Stores state of the list of blockable items — <code><fix>true</fix></code> me
ans detached"|translate("detachsidebar-s1")}} | 184 {{"Stores state of the list of blockable items — <code><fix>true</fix></code> me
ans detached"|translate("detachsidebar-s1")}} |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 {% endmacro %} | 333 {% endmacro %} |
| 342 | 334 |
| 343 {% macro notifications_showuiDescription() %} | 335 {% macro notifications_showuiDescription() %} |
| 344 {{"Determines whether notification management UI should be displayed (only if th
e user opted out of notifications before)."|translate("notifications_showui-desc
ription")}} | 336 {{"Determines whether notification management UI should be displayed (only if th
e user opted out of notifications before)."|translate("notifications_showui-desc
ription")}} |
| 345 {% endmacro %} | 337 {% endmacro %} |
| 346 | 338 |
| 347 {% macro notifications_ignoredcategoriesDescription() %} | 339 {% macro notifications_ignoredcategoriesDescription() %} |
| 348 {{"List of notification categories that the user opted out of."|translate("notif
ications_ignoredcategories-description")}} | 340 {{"List of notification categories that the user opted out of."|translate("notif
ications_ignoredcategories-description")}} |
| 349 {% endmacro %} | 341 {% endmacro %} |
| 350 | 342 |
| 343 {% macro removedIn2_9() %} |
| 344 {{"Unused in Adblock Plus 2.9 and higher."|translate("removedIn2.9")}} |
| 345 {% endmacro %} |
| 346 |
| 351 {# | 347 {# |
| 352 Preference descriptions are defined in the macros above and only referenced | 348 Preference descriptions are defined in the macros above and only referenced |
| 353 here. | 349 here. |
| 354 #} | 350 #} |
| 355 | 351 |
| 356 {% from "includes/preftable" import display_preftable %} | 352 {% from "includes/preftable" import display_preftable %} |
| 357 | 353 |
| 358 {{ display_preftable([ | 354 {{ display_preftable([ |
| 359 { | 355 { |
| 360 "id": "visible_options", | 356 "id": "visible_options", |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 392 "description": clearStatsOnHistoryPurgeDescription | 388 "description": clearStatsOnHistoryPurgeDescription |
| 393 }, | 389 }, |
| 394 { | 390 { |
| 395 "name": "composer_default", | 391 "name": "composer_default", |
| 396 "default": "2", | 392 "default": "2", |
| 397 "description": composer_defaultDescription | 393 "description": composer_defaultDescription |
| 398 }, | 394 }, |
| 399 { | 395 { |
| 400 "name": "data_directory", | 396 "name": "data_directory", |
| 401 "default": "adblockplus", | 397 "default": "adblockplus", |
| 402 "description": data_directoryDescription | 398 "description": removedIn2_9 |
| 403 }, | 399 }, |
| 404 { | 400 { |
| 405 "name": "defaultstatusbaraction", | 401 "name": "defaultstatusbaraction", |
| 406 "default": "0", | 402 "default": "0", |
| 407 "description": defaultstatusbaractionDescription | 403 "description": defaultstatusbaractionDescription |
| 408 }, | 404 }, |
| 409 { | 405 { |
| 410 "name": "defaulttoolbaraction", | 406 "name": "defaulttoolbaraction", |
| 411 "default": "0", | 407 "default": "0", |
| 412 "description": defaulttoolbaractionDescription | 408 "description": defaulttoolbaractionDescription |
| (...skipping 29 matching lines...) Expand all Loading... |
| 442 "description": patternsbackupsDescription | 438 "description": patternsbackupsDescription |
| 443 }, | 439 }, |
| 444 { | 440 { |
| 445 "name": "patternsfile", | 441 "name": "patternsfile", |
| 446 "default": None, | 442 "default": None, |
| 447 "description": patternsfileDescription | 443 "description": patternsfileDescription |
| 448 }, | 444 }, |
| 449 { | 445 { |
| 450 "name": "please_kill_startup_performance", | 446 "name": "please_kill_startup_performance", |
| 451 "default": "false", | 447 "default": "false", |
| 452 "description": please_kill_startup_performanceDescription | 448 "description": removedIn2_9 |
| 453 }, | 449 }, |
| 454 { | 450 { |
| 455 "name": "previewimages", | 451 "name": "previewimages", |
| 456 "default": "true", | 452 "default": "true", |
| 457 "description": previewimagesDescription | 453 "description": previewimagesDescription |
| 458 }, | 454 }, |
| 459 { | 455 { |
| 460 "name": "sendReport_key", | 456 "name": "sendReport_key", |
| 461 "default": None, | 457 "default": None, |
| 462 "description": sendReport_keyDescription | 458 "description": sendReport_keyDescription |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 701 "title": 'Preferences for administrators'|translate('preferences_for_adminis
tratorsTitle'), | 697 "title": 'Preferences for administrators'|translate('preferences_for_adminis
tratorsTitle'), |
| 702 "preferences": [ | 698 "preferences": [ |
| 703 { | 699 { |
| 704 "name": "suppress_first_run_page", | 700 "name": "suppress_first_run_page", |
| 705 "default": "false", | 701 "default": "false", |
| 706 "description": suppress_first_run_pageDescription | 702 "description": suppress_first_run_pageDescription |
| 707 } | 703 } |
| 708 ] | 704 ] |
| 709 } | 705 } |
| 710 ]) }} | 706 ]) }} |
| OLD | NEW |