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"

src/_locales/en/messages.json

@@ -1,8 +1,12 @@
 {
   "extName":{
-    "message":"uBlock",
+    "message":"uBlock - free ad blocker",
     "description":"extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc":{
     "message":"A fast, effective, and lean ad blocker. Blocks ads, trackers, and protects your privacy.",
     "description":"this will be in the chrome web store: must be 132 characters or less"

src/_locales/en_GB/messages.json

@@ -1,8 +1,12 @@
 {
   "extName": {
-    "message": "uBlock",
+    "message": "uBlock - free ad blocker",
     "description": "extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc": {
     "message": "A fast, effective and lean ad blocker. Blocks ads, trackers, and protects your privacy.",
     "description": "this will be in the chrome web store: must be 132 characters or less"

src/_locales/es/messages.json

@@ -3,6 +3,10 @@
     "message": "uBlock",
     "description": "extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc": {
     "message": "Por fin, un bloqueador eficiente con uso mínimo de procesador y memoria.",
     "description": "this will be in the chrome web store: must be 132 characters or less"

src/_locales/et/messages.json

@@ -3,6 +3,10 @@
     "message":"uBlock",
     "description":"extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc":{
     "message":"Lõpuks on valminud tõhus blokeerija. Protsessori- ja mälusõbralik.",
     "description":"this will be in the chrome web store: must be 132 characters or less"

src/_locales/fa/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/fi/messages.json

@@ -3,6 +3,10 @@
     "message": "uBlock",
     "description": "extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc": {
     "message": "Viimeinkin tehokas ja kevyt mainosten estäjä.",
     "description": "this will be in the chrome web store: must be 132 characters or less"

src/_locales/fil/messages.json

@@ -3,6 +3,10 @@
     "message":"uBlock",
     "description":"extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc":{
     "message":"Sa wakas! Isang magaling na blocker para sa Chromium-based browsers. Magaan sa CPU at memory.",
     "description":"this will be in the chrome web store: must be 132 characters or less"

src/_locales/fr/messages.json

@@ -3,6 +3,10 @@
     "message": "uBlock",
     "description": "extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc": {
     "message": "Voici un bloqueur de nuisances efficace, qui ne sollicitera pas outre mesure votre processeur et votre mémoire vive.",
     "description": "this will be in the chrome web store: must be 132 characters or less"

src/_locales/fy/messages.json

@@ -3,6 +3,10 @@
     "message":"uBlock",
     "description":"extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc":{
     "message":"Einlik, in effisjinte adblocker. Brûkt hast gjin prosessorkrêft of ûnthâld.",
     "description":"this will be in the chrome web store: must be 132 characters or less"

src/_locales/he/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/hi/messages.json

@@ -3,6 +3,10 @@
     "message":"uBlock",
     "description":"extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc":{
     "message":"आख़िरकार, क्रोमियम-बेस्ड ब्राउज़रों के लिए एक कुशल अवरोधक। CPU और स्मृति पर आसान।",
     "description":"this will be in the chrome web store: must be 132 characters or less"

src/_locales/hr/messages.json

@@ -3,6 +3,10 @@
     "message":"uBlock",
     "description":"extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc":{
     "message":"Konačno, efikasan blokator. Lak na CPU i memoriji.",
     "description":"this will be in the chrome web store: must be 132 characters or less"

src/_locales/hu/messages.json

@@ -3,6 +3,10 @@
     "message":"uBlock",
     "description":"extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc":{
     "message":"Végre egy hatékony reklám- és követésblokkoló böngészőkhöz, amely kíméletes a processzorral és a memóriával.",
     "description":"this will be in the chrome web store: must be 132 characters or less"

src/_locales/id/messages.json

@@ -3,6 +3,10 @@
     "message":"uBlock",
     "description":"extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc":{
     "message":"Akhirnya, pemblokir iklan yang efisien. Ringan penggunaan CPU dan memori.",
     "description":"this will be in the chrome web store: must be 132 characters or less"

src/_locales/it/messages.json

@@ -3,6 +3,10 @@
     "message": "uBlock",
     "description": "extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc": {
     "message": "Finalmente, un blocker efficiente. Leggero sulla CPU e sulla memoria.",
     "description": "this will be in the chrome web store: must be 132 characters or less"

src/_locales/ja/messages.json

@@ -3,6 +3,10 @@
     "message":"uBlock",
     "description":"extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc":{
     "message":"高効率ブロッカーが遂に登場。CPUとメモリーの負担を抑えます。",
     "description":"this will be in the chrome web store: must be 132 characters or less"

src/_locales/ko/messages.json

@@ -3,6 +3,10 @@
     "message":"uBlock",
     "description":"extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc":{
     "message":"이 확장기능은 효율적인 차단기입니다. CPU와 메모리에 주는 부담이 적습니다.",
     "description":"this will be in the chrome web store: must be 132 characters or less"

src/_locales/lt/messages.json

@@ -3,6 +3,10 @@
     "message":"uBlock",
     "description":"extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc":{
     "message":"Pagaliau, efektyvus blokatorius, neapkraunantis nei procesoriaus, nei darbinės atminties.",
     "description":"this will be in the chrome web store: must be 132 characters or less"

src/_locales/lv/messages.json

@@ -3,6 +3,10 @@
     "message":"uBlock",
     "description":"extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc":{
     "message":"Beidzot, efektīvs bloķētājs. Nepārslogo procesoru un atmiņu.",
     "description":"this will be in the chrome web store: must be 132 characters or less"

src/_locales/mr/messages.json

@@ -3,6 +3,10 @@
     "message":"म्यूब्लॉक",
     "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/nb/messages.json

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

src/_locales/nl/messages.json

@@ -3,6 +3,10 @@
     "message": "uBlock",
     "description": "extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc": {
     "message": "Eindelijk, een efficiënte adblocker. Gebruikt weinig processorkracht of geheugen.",
     "description": "this will be in the chrome web store: must be 132 characters or less"

src/_locales/pl/messages.json

@@ -3,6 +3,10 @@
     "message": "uBlock",
     "description": "extension name."
   },
+  "extShortName": {
+    "message": "uBlock",
+    "description": "extension short name."
+  },
   "extShortDesc": {
     "message": "Nareszcie, wydajne blokowanie reklam. Niskie użycie procesora i pamięci.",
     "description": "this will be in the chrome web store: must be 132 characters or less"