Issue 5482 - Sidebar and about ABP dialog

locale/en-US/new-options.json

 {
   "options_page_title": {
     "description": "Options page title",
     "message": "Adblock Plus Options"
   },
-  "options_page_title_1": {
-    "description": "Page title in navigation sidebar",
-    "message": "Adblock <strong>Plus</strong>"
-  },
-  "options_page_title_2": {
+  "options_page_title": {
     "description": "Page title in navigation sidebar",
     "message": "Settings"
   },
   "options_tab_general": {
     "description": "Sidebar tab label",
     "message": "General"
   },
   "options_tab_whitelist": {
     "description": "Sidebar tab label and main heading inside corresponding tab",
     "message": "Whitelisted websites"
@@ skipping 23 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": {
+  "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_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."
-  },
-  "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>."
-  },
-  "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"
-  },
-  "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."
-  },
-  "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."
+    "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 11 matching lines @@
     "message": "You aren't whitelisting any websites yet."
   },
   "options_whitelist_empty_2": {
     "description": "Empty Whitelist placeholder",
     "message": "Websites you trust and want to allow ads on will be shown here."
   },
   "options_whitelist_duplicate": {
     "description": "Duplicate hostname warning of whitelist text input",
     "message": "Website is already whitelisted"
   },
-  "options_whitelist_description": {
-    "description": "Section description in whitelisted tab",
-    "message": "You've turned off ad blocking on these websites. You will see ads on these websites."
-  },
   "options_button_add": {
     "description": "Add button label",
     "message": "add"
   },
   "options_advanced_description": {
     "description": "Advanced tab description",
     "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 113 matching lines @@
     "message": "Edit filters"
   },
   "options_customFilter_cancel": {
     "description": "Label below raw view of user's filter list in Advanced tab",
     "message": "Cancel"
   },
   "options_customFilter_save": {
     "description": "Label below raw view of user's filter list in Advanced tab",
     "message": "Save"
   },
-  "options_faq_title": {
-    "description": "FAQ section name in Help tab and link label in same section",
-    "message": "Frequently asked questions"
-  },
-  "options_faq_description": {
-    "description": "FAQ section description in Help tab",
-    "message": "You only need to refresh your filter list in \"Advanced\" very often, but there are also other known problems."
-  },
-  "options_forum_title": {
-    "description": "Forum section name in Help tab",
-    "message": "Forum"
-  },
-  "options_forum_description": {
-    "description": "Forum section description in Help tab",
-    "message": "If the frequently asked questions helped you can reach us in our forum."
-  },
-  "options_forum_link": {
-    "description": "Forum section link in Help tab",
-    "message": "Adblock Plus support forum"
-  },
-  "options_media_title": {
-    "description": "Social media Section name in Help tab",
-    "message": "Social media"
-  },
-  "options_media_description": {
-    "description": "Social media section description in Help tab",
-    "message": "If there are major problems with Adblock Plus which affects all of our users, we tell you in our social media channels."
+  "options_help_description": {
+    "description": "Help tab description",
+    "message": "Find help or get in touch with us"
+  },
+  "options_support_title": {
+    "description": "Section title in Help tab",
+    "message": "Support"
+  },
+  "options_report_issue": {
+    "description": "'Support' section list item in Help tab",
+    "message": "Think content or functionality is being incorrectly blocked by us? <a>Report incorrectly blocked items here</a>"
+  },
+  "options_report_ad": {
+    "description": "'Support' section list item in Help tab",
+    "message": "See an ad that you think shouldn't be there? <a>Report an ad</a>"
+  },
+  "options_report_bug": {
+    "description": "'Support' section list item in Help tab",
+    "message": "Found a bug? <a>Send us a bug report</a>"
+  },
+  "options_report_forum": {
+    "description": "'Support' section list item in Help tab",
+    "message": "Want support from our community? <a>Go to the Forum</a>"
+  },
+  "options_social_title": {
+    "description": "'Section' title in Help tab",
+    "message": "Get in touch"
+  },
+  "options_social_description": {
+    "description": "'Get in touch' section description in Help tab",
+    "message": "Have a question or a new idea? We're here to help."
+  },
+  "options_email": {
+    "description": "Email label in Help tab",
+    "message": "Email:"
   },
   "options_dialog_about_title": {
-    "description": "Title of 'about Adblock Plus' modal dialog ",
+    "description": "Title of about ABP dialog",
     "message": "About Adblock Plus"
   },
   "options_dialog_about_version": {
     "description": "Version information in 'about Adblock Plus' modal dialog ",
     "message": "Version number $version$",
     "placeholders": {
       "version": {
         "content": "$1",
         "example": "2.6.7"
       }
@@ skipping 48 matching lines @@
     "message": "Added languages"
   },
   "options_dialog_language_other": {
     "description": "Table headline in add language modal dialog",
     "message": "Other languages"
   },
   "options_dialog_language_other_empty": {
     "description": "Text shown when list of available languages is empty",
     "message": "There are no available languages."
   },
+  "options_whitelist_notification": {
+    "description": "Notification that is shown after a new website is whitelisted",
+    "message": "\"$website$\" has been whitelisted.",
+    "placeholders": {
+      "website": {
+        "content": "$1",
+        "example": "example.com"
+      }
+    }
+  },
+  "options_notification_hide": {
+    "description": "Hidden text attached to the close button for screen readers of Notification",
+    "message": "Close notification"
+  },
   "options_language_en": {
     "description": "Language name shown in add language modal dialog",
     "message": "English"
   },
   "options_language_id": {
     "description": "Language name shown in add language modal dialog",
     "message": "Indonesian"
   },
   "options_language_bg": {
     "description": "Language name shown in add language modal dialog",
@@ skipping 41 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"
   }
 }