Merge branch 'v0.9.5.3'

* v0.9.5.3:
  Added the phrase "- free ad blocker" after uBlock

Author: uBlockAdmin

platform/chromium/manifest.json

@@ -1,8 +1,8 @@
 {
     "manifest_version": 2,
 
-    "name": "uBlock",
-    "version": "0.9.5.22",
+    "name": "__MSG_extName__",
+    "version": "0.9.5.23",
 
     "default_locale": "en",
     "description": "__MSG_extShortDesc__",
@@ -59,5 +59,5 @@
         "webRequestBlocking",
         "<all_urls>"
     ],
-    "short_name": "uBlock"
+    "short_name": "__MSG_extShortName__"
 }

platform/chromium/vapi-background.js

@@ -64,7 +64,7 @@ var noopFunc = function(){};
 /******************************************************************************/
 
 vAPI.app = {
-    name: manifest.name,
+    name: manifest.short_name,
     version: manifest.version
 };
 

platform/webext/manifest.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
 
-    "name": "uBlock",
+    "name": "__MSG_extName__",
     "version": "0.9.5.7",
 
     "applications": {
@@ -24,7 +24,7 @@
         "default_popup": "popup.html"
     },
 
-    "author": "The uBlock Development Team",
+    "author": "All uBlock contributors",
     "background": {
         "page": "background.html"
     },
@@ -51,7 +51,7 @@
             "run_at": "document_idle"
         }
     ],
-    "minimum_chrome_version": "22.0",
+    "minimum_chrome_version": "49.0",
     "options_ui": {
         "page": "options_ui.html"
     },
@@ -65,5 +65,5 @@
         "webRequestBlocking",
         "<all_urls>"
     ],
-    "short_name": "uBlock"
+    "short_name": "__MSG_extShortName__"
 }

src/_locales/ar/messages.json

@@ -3,6 +3,10 @@
     "message":"uBlock",
     "description":"extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc":{
     "message":"وأخيراً, مانع اعلانات كفوء. خفيف على المعالج و الذاكرة.",
     "description":"this will be in the chrome web store: must be 132 characters or less"

src/_locales/bg/messages.json

@@ -3,6 +3,10 @@
     "message":"uBlock",
     "description":"extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc":{
     "message":"Най-накрая, ефективен рекламен блокер с малки изисквания за процесор и памет.",
     "description":"this will be in the chrome web store: must be 132 characters or less"

src/_locales/ca/messages.json

@@ -3,6 +3,10 @@
     "message":"uBlock",
     "description":"extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc":{
     "message":"Finalment, un bloquejador efficient, amb poc ús de memòria i processador.",
     "description":"this will be in the chrome web store: must be 132 characters or less"

src/_locales/cs/messages.json

@@ -3,6 +3,10 @@
     "message":"uBlock",
     "description":"extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc":{
     "message":"Konečně efektivní blokovač, který nezatěžuje CPU a paměť.",
     "description":"this will be in the chrome web store: must be 132 characters or less"

src/_locales/da/messages.json

@@ -3,6 +3,10 @@
     "message":"uBlock",
     "description":"extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc":{
     "message":"Endelig en effektiv blocker til Chromium-baserede browsere. Lavt CPU- og hukommelsesbrug.",
     "description":"this will be in the chrome web store: must be 132 characters or less"

src/_locales/de/messages.json

@@ -3,6 +3,10 @@
     "message": "uBlock",
     "description": "extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc": {
     "message": "Endlich ein effizienter Blocker. Prozessor-freundlich und bescheiden beim Speicherbedarf.",
     "description": "this will be in the chrome web store: must be 132 characters or less"

src/_locales/el/messages.json

@@ -3,6 +3,10 @@
     "message":"uBlock",
     "description":"extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc":{
     "message":"Επιτέλους, ένας αποτελεσματικός blocker. Ελαφρύς για τον επεξεργαστή και τη μνήμη.",
     "description":"this will be in the chrome web store: must be 132 characters or less"