Issue 5326 - General tab (HTML, strings and functionality)

locale/en-US/new-options.json

 {
   "options_page_title": {
     "description": "Options page title",
     "message": "Adblock Plus Options"
   },
   "options_page_header_1": {
     "description": "Page title in navigation sidebar",
     "message": "Options"
   },
   "options_page_header_2": {
@@ skipping 37 matching lines @@
     "message": "read more"
   },
   "options_general_description": {
     "description": "General tab description",
     "message": "Determine what Adblock Plus shows and hides on websites"
   },
   "options_privacy_header": {
     "description": "Section title in General tab",
     "message": "PRIVACY & SECURITY"
   },
-  "options_aa_header": {

[Thomas Greiner, 2017/08/09 18:14:47]

Detail: It'd be great if we could stay away from abbreviations because not
everyone might be aware that "aa" here stands for "Acceptable Ads" so using more
descriptive words such as "acceptable" could help make the code more readable.

[saroyanm, 2017/08/14 14:00:07]

Agree.

[saroyanm, 2017/08/16 14:17:35]

I used acceptabe_ads as already used that in some other places, let me know if
you want me to shorten this.

[Thomas Greiner, 2017/08/16 17:57:08]

Nah, no need to shorten. It looks good the way it is.

+  "options_protection_privacy_tooltip": {
+    "description": "Tooltip for 'Disable tracking' option in General tab",
+    "message": "Protect your personal data by removing all forms of tracking from the Internet including information collectors."
+  },
+  "options_protection_social_tooltip": {
+    "description": "Tooltip for 'Remove Social Media Buttons' option in General tab",
+    "message": "The social media buttons (or icons) on the websites that you visit allow social media networks to build a profile of you based on your browsing habits - even when you don't click on them. Hide these buttons to protect your profile."
+  },
+  "options_acceptableAds_header": {
     "description": "Section title in General tab",
-    "message": "ACCEPTABLE ADS"

[Thomas Greiner, 2017/08/09 18:14:47]

Detail: I thought we agreed on transforming headlines to upper-case via CSS
rather than defining them as such in here.

[saroyanm, 2017/08/14 14:00:08]

We did, I think I already have this here/forgot to change. Will update.

[saroyanm, 2017/08/16 14:17:34]

Done.

-  },
-  "options_aa_description": {
+    "message": "Acceptable Ads"
+  },
+  "options_acceptableAds_description": {
     "description": "Acceptable Ads section description in General tab",
     "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."
   },
-  "options_aa_tracking_label": {
+  "options_acceptableAds_ads_label": {
     "description": "Acceptable Ads section option label in General tab",
     "message": "Allow some nonintrusive ads"
   },
-  "options_aa_tracking_description_1": {
+  "options_acceptableAds_ads_description_1": {
     "description": "Acceptable Ads section 'Allow some nonintrusive ads' option description in General tab",
     "message": "Nonintrusive ads are not annoying and do not interfere with the content you are viewing. These ads collect some information about your browsing habits to provide you with more relevant ads. <a>Read more about the nonintrusive ad criteria</a>"
   },
-  "options_aa_tracking_description_2": {
+  "options_acceptableAds_ads_description_2": {
     "description": "Acceptable Ads section 'Allow some nonintrusive ads' option description in General tab",
-    "message": "<strong>Note:</strong> The ads collect data about your browsing habits <strong>_not_</strong> Adblock Plus."

[Thomas Greiner, 2017/08/09 18:14:47]

Detail: I assume that the underscores in "<strong>_not_</strong>" were
unintentional because they're used in Markdown to emphasize text.

[saroyanm, 2017/08/14 14:00:07]

Right, will change.

[saroyanm, 2017/08/16 14:17:34]

Done.

-  },
-  "options_aa_no_tracking_label": {
+    "message": "<strong>Note:</strong> The ads collect data about your browsing habits <strong>not</strong> Adblock Plus."
+  },
+  "options_acceptableAds_privacy_label": {
     "description": "Acceptable Ads section option label in General tab",
     "message": "Allow only nonintrusive ads that are privacy-friendly"
   },
-  "options_aa_no_tracking_description": {
+  "options_acceptableAds_privacy_description": {
     "description": "Acceptable Ads section 'Allow only nonintrusive ads that are privacy-friendly ' option description in General tab",
     "message": "These ads do not collect personal user information. Ads may be less relevant as a result."
   },
-  "options_aa_no_dnt_notification": {
+  "options_acceptableAds_dnt_notification": {
     "description": "Acceptable Ads section's notification (being shown if Do Not Track is not enabled) in General tab",
-    "message": "**Note:** You have **Do Not Track (DNT)** disabled in your Chrome settings. For this feature to work properly, please enable **DNT** in your browser preferences. <a>Find out how to turn on DNT</a>."

[Thomas Greiner, 2017/08/09 18:14:47]

Detail: We're not using Markdown syntax so please convert it into HTML.

It seems that the spec generally mixes HTML with Markdown for some reason to
mark up the strings so we should make that consistent.

[saroyanm, 2017/08/14 14:00:08]

Copy-past error, thanks.

[saroyanm, 2017/08/16 14:17:34]

Done.

-  },
-  "options_aa_disable_label": {
+    "message": "<strong>Note:</strong> You have <strong>Do Not Track (DNT)</strong> disabled in your Chrome settings. For this feature to work properly, please enable <strong>DNT</strong> in your browser preferences. <a>Find out how to turn on DNT</a>."
+  },
+  "options_acceptableAds_none_label": {
     "description": "Acceptable Ads section option label in General tab",
     "message": "Block all ads"
   },
   "options_language_header": {
     "description": "Section title in General tab",
     "message": "Language"
   },
   "options_language_description": {
     "description": "Language section description in General tab",
     "message": "Optimize Adblock Plus for the language(s) you typically browse websites in."
@@ skipping 17 matching lines @@
   "options_more_filters_description": {
     "description": "More filters section description in General tab",
     "message": "These are additional filters you previously added to Adblock Plus."
   },
   "options_more_filters_note": {
     "description": "More filters section note in General tab",
     "message": "<strong>Note:</strong> These filters are managed by third party authors. Adblock Plus is not responsible for them."
   },
   "options_language_add": {
     "description": "Add other language button in General Tab",
-    "message": "+ add a languages"

[Thomas Greiner, 2017/08/09 18:14:47]

Typo: Replace "languages" with "language"

[saroyanm, 2017/08/14 14:00:08]

Acknowledged.

[saroyanm, 2017/08/16 14:17:34]

Done.

-  },
-  "options_more_anti-adblock_tooltip_1": {
-    "message": "Some websites show messages that ask you to turn off your ad blocker. Access to content will not be limited on sites that require no action from you (i.e. you are not required to turn off Adblock Plus to access the content)."
-  },
-  "options_more_malware_tooltip_1": {
-    "message": "Malicious software (or 'malware') is software that is intended to gain access to and damage your computer. Computer viruses, worms, spyware and Trojan horses are all forms of malware."

[Thomas Greiner, 2017/08/09 18:14:47]

Detail: "(or 'malware')" is not using the same type of quotes as defined in the
spec.

[saroyanm, 2017/08/14 14:00:07]

Acknowledged.

[saroyanm, 2017/08/16 14:17:35]

Done.

-  },
-  "options_more_privacy_tooltip_1": {
-    "message": "Protect your personal data by removing all forms of tracking from the Internet including information collectors."
-  },
-  "options_more_social_tooltip_1": {
-    "message": "The social media buttons (or icons) on the websites that you visit allow social media networks to build a profile of you based on your browsing habits - even when you don’t click on them. Hide these buttons to protect your profile."

[Thomas Greiner, 2017/08/09 18:14:47]

Detail: Replace "’" with "'"

[saroyanm, 2017/08/14 14:00:08]

Acknowledged.

[saroyanm, 2017/08/16 14:17:35]

Done.

+    "message": "+ add a language"
   },
   "options_whitelist_description": {
     "description": "Whitelist tab description",
     "message": "You've turned off ad blocking on these websites. You will see ads on these websites."
   },
   "options_whitelist_add": {
     "description": "Add whitelisted domain button",
     "message": "Add website"
   },
   "options_whitelist_placeholder_example": {
@@ skipping 31 matching lines @@
     "message": "Customize Adblock Plus, add or remove filter lists, create and maintain your own filter lists"
   },
   "options_customize_header": {
     "description": "Section title in Advanced tab",
     "message": "Customize on-page actions"
   },
   "options_customize_blockElement": {
     "description": "Option label of customize section in Advanced tab",
     "message": "Show 'Block element' right-click menu item"
   },
-  "options_customize_blockElement_tooltip_1": {
+  "options_customize_blockElement_tooltip": {
     "description": "Tooltip text for Show 'Block element' option item of customize section in Advanced tab",
     "message": "Temporarily block annoying items on a webpage, e.g. images or animated slideshows."
   },
   "options_customize_showDevToolsPanel": {
     "description": "Option label of customize section in Advanced tab",
     "message": "Show 'Adblock Plus' panel in the developer tools"
   },
-  "options_customize_showDevToolsPanel_tooltip_1": {
+  "options_customize_showDevToolsPanel_tooltip": {
     "description": "Tooltip text for Show 'Adblock Plus' panel option item of customize section in Advanced tab",
     "message": "View blocked and whitelisted items from your browser's developer tools panel."
   },
   "options_customize_showNotifications": {
     "description": "Option label of customize section in Advanced tab",
     "message": "Show useful notifications"
   },
-  "options_customize_showNotifications_tooltip_1": {
+  "options_customize_showNotifications_tooltip": {
     "description": "Tooltip text for Show notifications option item of customize section in Advanced tab",
     "message": "Turn off all notifications from Adblock Plus."
   },
   "options_filterList_title": {
     "description": "Section title in Advanced tab",
     "message": "Filter lists"
   },
   "options_filterList_description": {
     "description": "Filter lists section description in Advanced tab",
     "message": "Each Adblock Plus setting functions because of a filter list. Below are the corresponding filter lists to all your Adblock Plus settings. You can also add additional filters created and maintained by our trusted community. <a>Learn more</a>."
@@ skipping 254 matching lines @@
   },
   "options_language_ro": {
     "description": "Language name shown in add language modal dialog",
     "message": "Romanian"
   },
   "options_language_ru_uk": {
     "description": "Language name shown in add language modal dialog",
     "message": "Russian and Ukrainian"
   }
 }