Issue #1170 More progress migrating adblockplus.org to our CMS.

locales/en/coding-style.json

Index: locales/en/coding-style.json
===================================================================
--- a/locales/en/coding-style.json
+++ b/locales/en/coding-style.json
@@ -6,7 +6,7 @@
     "message": "Precedence"
   },
   "s2": {
-    "message": "The Adblock Plus coding style is based on others. The general section below overrules any referenced style guides, and the language specific sections overrule the general section."
+    "message": "The Adblock Plus coding style is based on others. Our rules (both general and language specific) always overrule referenced style guides. The language specific sections overrule the general section."
   },
   "s3": {
     "message": "Consistency"
@@ -21,90 +21,96 @@
     "message": "Follow the Mozilla Coding Style's <a>general practices</a> and its <a>naming and formatting rules</a>."
   },
   "s7": {
-    "message": "All files should have a license header, but no mode line comments."
+    "message": "Use 2 spaces per indentation level."
   },
   "s8": {
-    "message": "Newline at end of file."
+    "message": "All files should have a <a>license header</a>, but no mode line comments."
   },
   "s9": {
-    "message": "Lines can be longer than 80 characters if limiting line length would hurt readability in a particular case."
+    "message": "Newline at end of file, otherwise no trailing whitespace."
   },
   "s10": {
+    "message": "Lines can be longer than the limit, if limiting line length would hurt readability in a particular case."
+  },
+  "s11": {
     "message": "Opening braces always go on their own line."
   },
-  "s11": {
+  "s12": {
     "message": "No hungarian notation, no special variable name prefixes or suffixes denoting type or scope."
   },
-  "s12": {
+  "s13": {
+    "message": "Don't comment code out, delete it."
+  },
+  "s14": {
     "message": "JavaScript"
   },
-  "s13": {
+  "s15": {
     "message": "Follow the Mozilla Coding Style's <a>JavaScript practices</a>."
   },
-  "s14": {
-    "message": "Opening braces of object literals don't go on their own line."
+  "s16": {
+    "message": "Opening braces of object literals in don't go on their own line when that would cause a syntax error."
   },
-  "s15": {
+  "s17": {
     "message": "Use"
   },
-  "s16": {
+  "s18": {
     "message": "bind()"
   },
-  "s17": {
+  "s19": {
     "message": "to ensure the desired value of the"
   },
-  "s18": {
+  "s20": {
     "message": "this"
   },
-  "s19": {
+  "s21": {
     "message": "variable, don’t use temporary variables as a replacement."
   },
-  "s20": {
+  "s22": {
     "message": "In classes, prefix private functions with a single underscore to make them pseudo-private."
   },
-  "s21": {
+  "s23": {
     "message": "Python"
   },
-  "s22": {
+  "s24": {
     "message": "Follow the Mozilla Coding Style's <a>Python practices</a>."
   },
-  "s23": {
+  "s25": {
     "message": "In modules, prefix private functions and variables with a single underscore."
   },
-  "s24": {
+  "s26": {
     "message": "Java"
   },
-  "s25": {
+  "s27": {
     "message": "Follow the Mozilla Coding Style's <a>Java practices</a>."
   },
-  "s26": {
+  "s28": {
+    "message": "Imports should be organised consistently per file, we don't use global rules."
+  },
+  "s29": {
     "message": "C++"
   },
-  "s27": {
+  "s30": {
     "message": "Follow the Mozilla Coding Style's <a>C++ practices</a>."
   },
-  "s28": {
+  "s31": {
     "message": "Indent namespace bodies."
   },
-  "s29": {
-    "message": "Don't use anything from C++11."
-  },
-  "s30": {
-    "message": "std::tr1"
-  },
-  "s31": {
-    "message": "can and should be used."
-  },
   "s32": {
     "message": "Avoid manual memory management: Use references and values when possible, smart pointers when necessary, raw pointers only for weak references."
   },
   "s33": {
+    "message": "Don't use C-style casts unless its exact semantics are required."
+  },
+  "s34": {
+    "message": "We tend to use anonymous namespaces instead of static."
+  },
+  "s35": {
     "message": "Puppet"
   },
-  "s34": {
+  "s36": {
     "message": "Follow the <a>Puppet Style Guide</a>."
   },
-  "s35": {
+  "s37": {
     "message": "Opening braces don't go on their own line."
   }
 }