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_acceptable_ads_header": {
+  "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"
   },
-  "options_acceptable_ads_description": {
+  "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_acceptable_ads_label": {
+  "options_acceptableAds_ads_label": {
     "description": "Acceptable Ads section option label in General tab",
     "message": "Allow some nonintrusive ads"
   },
-  "options_acceptable_ads_tracking_description_1": {

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

Detail: There are still a couple of strings whose ID contains "tracking" instead
of "privacy".

See
https://codereview.adblockplus.org/29478597/diff/29498701/new-options.js#newc...

[saroyanm, 2017/08/17 21:24:04]

Done.

+  "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_acceptable_ads_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."
   },
-  "options_acceptable_ads_privacy_label": {
+  "options_acceptableAds_privacy_label": {
     "description": "Acceptable Ads section option label in General tab",
     "message": "Allow only nonintrusive ads that are privacy-friendly"
   },
-  "options_acceptable_ads_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_acceptable_ads_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": "<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_acceptable_ads_disable_label": {
+  "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 18 matching lines @@
     "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 language"
-  },
-  "options_more_anti-adblock_tooltip": {
-    "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": {
-    "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."
-  },
-  "options_more_privacy_tooltip": {
-    "message": "Protect your personal data by removing all forms of tracking from the Internet including information collectors."
-  },
-  "options_more_social_tooltip": {
-    "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_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 322 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"
   }
 }