Issue 2597 - Begin the switch to adblockpluscore

_locales/en_US/messages.json

Index: _locales/en_US/messages.json
diff --git a/_locales/en_US/messages.json b/_locales/en_US/messages.json
index c9e233461a970cee1758aea6f06d9426ce4dd733..50fe021b117a61a02b579f24df0231e71cac59ed 100644
--- a/_locales/en_US/messages.json
+++ b/_locales/en_US/messages.json
@@ -40,8 +40,7 @@
   "description_safari": {
     "message": "Used by over 50 million people, a free ad blocker for Safari that blocks ALL annoying ads, malware and tracking."
   },
-  "disabled_for_site":
-  {
+  "disabled_for_site": {
     "description": "Popup balloon label to disable blocking",
     "message": "<strong>Disabled</strong> on this site"
   },
@@ -69,6 +68,45 @@
   "filter_must_follow_syntax": {
     "message": "Your filter must follow the <a>Adblock Plus filter syntax</a>."
   },
+  "filters_acceptableAds2_label": {
+    "message": "Allow some non-intrusive advertising"
+  },
+  "filters_addSubscriptionAdd_label": {
+    "message": "Add"
+  },
+  "filters_addSubscriptionOther_label": {
+    "message": "Add a different subscription"
+  },
+  "filters_addSubscription_label": {
+    "message": "Add filter subscription"
+  },
+  "filters_readMore_label": {
+    "message": "Read more"
+  },
+  "filters_subscription_delete_label": {
+    "message": "Delete"
+  },
+  "filters_subscription_enabled_label": {
+    "message": "Enabled"
+  },
+  "filters_subscription_lastDownload_checksumMismatch": {
+    "message": "Failed, checksum mismatch"
+  },
+  "filters_subscription_lastDownload_connectionError": {
+    "message": "Failed, download failure"
+  },
+  "filters_subscription_lastDownload_inProgress": {
+    "message": "Downloading…"
+  },
+  "filters_subscription_lastDownload_invalidData": {
+    "message": "Failed, not a valid filters list"
+  },
+  "filters_subscription_lastDownload_invalidURL": {
+    "message": "Failed, not a valid address"
+  },
+  "filters_viewList_label": {
+    "message": "View list"
+  },
   "found_a_bug": {
     "message": "Found a bug? Want to translate Adblock Plus into your language? Please <a>file a request here</a>."
   },
@@ -76,6 +114,35 @@
     "description": "This is a tab heading.",
     "message": "General"
   },
+  "global_filter_cssproperty_nodomain": {
+    "message": "No active domain specified for CSS property filter"
+  },
+  "global_filter_elemhide_duplicate_id": {
+    "message": "Only one ID of the element to be hidden can be specified"
+  },
+  "global_filter_elemhide_nocriteria": {
+    "message": "No criteria specified to recognize the element to be hidden"
+  },
+  "global_notification_antiadblock_message": {
+    "message": "This site has been known to show targeted messages to Adblock Plus users. Do you want Adblock Plus to hide targeted messages?"
+  },
+  "global_notification_antiadblock_title": {
+    "message": "Hide targeted messages?"
+  },
+  "global_remove_subscription_warning": {
+    "message": "Do you really want to remove this subscription?"
+  },
+  "global_subscription_invalid_location": {
+    "message": "Filter list location is neither a valid URL nor a valid file name."
+  },
+  "invalid_css_selector": {
+    "message": "$selector$ is not a valid CSS selector",
+    "placeholders": {
+      "selector": {
+        "content": "$1"
+      }
+    }
+  },
   "last_updated_at": {
     "description": "e.g. Last updated at 3:00pm on Apr 1, 2011",
     "message": "Last updated at $time$ on $date$",
@@ -97,6 +164,18 @@
       }
     }
   },
+  "line": {
+    "description": "Prepended to error messages to indicate the line number (e.g. \"Line 42: Some error on this line\")",
+    "message": "Line $number$",
+    "placeholders": {
+      "number": {
+        "content": "$1"
+      }
+    }
+  },
+  "name": {
+    "message": "Adblock Plus"
+  },
   "name_devbuild": {
     "description": "Extension name to be shown for development builds. Note: this cannot be longer than 45 characters.",
     "message": "Adblock Plus development build"
@@ -123,6 +202,21 @@
   "out_of_date_lists": {
     "message": "Out-of-date lists are updated periodically."
   },
+  "overlay_notification_button_no": {
+    "message": "No"
+  },
+  "overlay_notification_button_yes": {
+    "message": "Yes"
+  },
+  "overlay_notification_closing_button_hide": {
+    "message": "Close this notification"
+  },
+  "overlay_notification_closing_button_optout": {
+    "message": "Stop showing notifications"
+  },
+  "overlay_shownotifications_label": {
+    "message": "Show useful notifications"
+  },
   "remove_button": {
     "description": "This is the label for the 'Remove selected' buttons.",
     "message": "Remove selected"
@@ -182,35 +276,24 @@
     "description": "Title for the stats section in the popup.",
     "message": "Ads blocked"
   },
+  "subscriptionSelection_location_label": {
+    "message": "Filter list location:"
+  },
   "subscriptionSelection_subscriptionSelector_label": {
     "message": "Please choose a filter subscription from the list:"
   },
-  "update_now": {
-    "message": "Update now"
-  },
-  "whitelisted_domains": {
-    "description": "This is a tab heading.",
-    "message": "Whitelisted domains"
+  "subscriptionSelection_title_label": {
+    "message": "Subscription title:"
   },
   "unexpected_filter_list_header": {
     "description": "Error message shown when the user attempts to add a custom filter that has the format of a header (e.g. \"[Adblock Plus 2.0]\") which are only allowed in filter lists",
     "message": "Filter list headers aren't allowed here"
   },
-  "invalid_css_selector": {

[Sebastian Noack, 2016/02/05 11:39:30]

Mind not changing the order of existing strings, at least for the source
translation, to keep the diff clean and easier to review?

[kzar, 2016/02/05 12:34:52]

This was done automatically by my script, it looks like someone put things in
here in the wrong order. I'd rather leave it but if you insist I can remove.

-    "message": "$selector$ is not a valid CSS selector",
-    "placeholders": {
-      "selector": {
-        "content": "$1"
-      }
-    }
+  "update_now": {
+    "message": "Update now"
   },
-  "line": {
-    "message": "Line $number$",
-    "description": "Prepended to error messages to indicate the line number (e.g. \"Line 42: Some error on this line\")",
-    "placeholders": {
-      "number": {
-        "content": "$1"
-      }
-    }
+  "whitelisted_domains": {
+    "description": "This is a tab heading.",
+    "message": "Whitelisted domains"
   }
-}
+}