[Pkg-mozext-commits] [adblock-plus] 80/87: Merge commit 'd6484f7'

David Prévot taffit at moszumanska.debian.org
Sat Apr 30 17:59:12 UTC 2016


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit b5a9a79dad8caac3b1967923e523a3b44f89cb44
Merge: 7ff4f73 d6484f7
Author: David Prévot <taffit at debian.org>
Date:   Sat Apr 30 13:22:06 2016 -0400

    Merge commit 'd6484f7'
    
    git merge -s recursive -X subtree=adblockplusui d6484f7

 adblockplusui/README.md                  |  17 +-
 adblockplusui/background.html            |   2 +-
 adblockplusui/background.js              | 143 ++++++++-
 adblockplusui/build.py                   |  16 +
 adblockplusui/common.js                  |  18 +-
 adblockplusui/dependencies               |   3 +
 adblockplusui/devtools-panel.html        | 117 +++++++
 adblockplusui/devtools-panel.js          | 172 ++++++++++
 adblockplusui/ensure_dependencies.py     | 371 ++++++++++++++++++++++
 adblockplusui/ext/background.js          |  15 +-
 adblockplusui/ext/common.js              |   8 +-
 adblockplusui/ext/content.js             |  23 +-
 adblockplusui/ext/devtools.js            |  36 +++
 adblockplusui/firstRun.html              |  11 +-
 adblockplusui/firstRun.js                |  12 +-
 adblockplusui/i18n.js                    |  48 ++-
 adblockplusui/locale/ar/firstRun.json    |  16 +-
 adblockplusui/locale/ast/firstRun.json   |  16 +-
 adblockplusui/locale/bg/firstRun.json    |  16 +-
 adblockplusui/locale/bn-BD/firstRun.json |   8 +-
 adblockplusui/locale/bs/firstRun.json    |  14 +-
 adblockplusui/locale/ca/firstRun.json    |  16 +-
 adblockplusui/locale/cs/firstRun.json    |  16 +-
 adblockplusui/locale/da/firstRun.json    |  16 +-
 adblockplusui/locale/de/firstRun.json    |  16 +-
 adblockplusui/locale/el/firstRun.json    |  16 +-
 adblockplusui/locale/en-GB/firstRun.json |  45 ---
 adblockplusui/locale/en-US/common.json   |  18 ++
 adblockplusui/locale/en-US/firstRun.json |   5 +-
 adblockplusui/locale/en-US/options.json  | 110 +++++--
 adblockplusui/locale/es-AR/firstRun.json |  16 +-
 adblockplusui/locale/es-CL/firstRun.json |  16 +-
 adblockplusui/locale/es-ES/firstRun.json |  16 +-
 adblockplusui/locale/es-MX/firstRun.json |  16 +-
 adblockplusui/locale/et/firstRun.json    |  16 +-
 adblockplusui/locale/eu/firstRun.json    |  16 +-
 adblockplusui/locale/fa/firstRun.json    |  16 +-
 adblockplusui/locale/fi/firstRun.json    |  22 +-
 adblockplusui/locale/fr/firstRun.json    |  16 +-
 adblockplusui/locale/he/firstRun.json    |  16 +-
 adblockplusui/locale/hi-IN/firstRun.json |  16 +-
 adblockplusui/locale/hr/firstRun.json    |  16 +-
 adblockplusui/locale/hu/firstRun.json    |  16 +-
 adblockplusui/locale/hy-AM/firstRun.json |  16 +-
 adblockplusui/locale/id/firstRun.json    |  16 +-
 adblockplusui/locale/is/firstRun.json    |  16 +-
 adblockplusui/locale/it/firstRun.json    |  16 +-
 adblockplusui/locale/ja/firstRun.json    |  22 +-
 adblockplusui/locale/kk/firstRun.json    |  22 +-
 adblockplusui/locale/ko/firstRun.json    |  16 +-
 adblockplusui/locale/lt/firstRun.json    |  16 +-
 adblockplusui/locale/lv/firstRun.json    |  16 +-
 adblockplusui/locale/mk/firstRun.json    |  16 +-
 adblockplusui/locale/mr/firstRun.json    |  16 +-
 adblockplusui/locale/ms/firstRun.json    |  16 +-
 adblockplusui/locale/nb-NO/firstRun.json |  16 +-
 adblockplusui/locale/nl/firstRun.json    |  16 +-
 adblockplusui/locale/pl/firstRun.json    |  16 +-
 adblockplusui/locale/pt-BR/firstRun.json |  16 +-
 adblockplusui/locale/pt-PT/firstRun.json |  16 +-
 adblockplusui/locale/ro/firstRun.json    |  22 +-
 adblockplusui/locale/ru/firstRun.json    |  16 +-
 adblockplusui/locale/sk/firstRun.json    |  22 +-
 adblockplusui/locale/sl/firstRun.json    |  16 +-
 adblockplusui/locale/sq/firstRun.json    |  16 +-
 adblockplusui/locale/sr/firstRun.json    |  16 +-
 adblockplusui/locale/sv-SE/firstRun.json |  16 +-
 adblockplusui/locale/ta-LK/firstRun.json |  14 +-
 adblockplusui/locale/th/firstRun.json    |  14 +-
 adblockplusui/locale/tr/firstRun.json    |  16 +-
 adblockplusui/locale/uk/firstRun.json    |  16 +-
 adblockplusui/locale/vi/firstRun.json    |  16 +-
 adblockplusui/locale/zh-CN/firstRun.json |  16 +-
 adblockplusui/locale/zh-TW/firstRun.json |  16 +-
 adblockplusui/messageResponder.js        |  86 ++++-
 adblockplusui/metadata.generic           |   9 +
 adblockplusui/options.html               | 109 +++++--
 adblockplusui/options.js                 | 523 ++++++++++++++++++++++---------
 adblockplusui/skin/common.css            |   2 +-
 adblockplusui/skin/devtools-panel.css    | 208 ++++++++++++
 adblockplusui/skin/firstRun.css          |  52 +--
 adblockplusui/skin/options-sprite.png    | Bin 2855 -> 4988 bytes
 adblockplusui/skin/options.css           | 447 +++++++++++++++++++-------
 adblockplusui/subscriptions.xml          | 101 +++---
 adblockplusui/test_server.py             |   3 +-
 85 files changed, 2640 insertions(+), 970 deletions(-)

diff --cc adblockplusui/build.py
index 0000000,cca908e..cca908e
mode 000000,100755..100755
--- a/adblockplusui/build.py
+++ b/adblockplusui/build.py
diff --cc adblockplusui/dependencies
index 0000000,3614348..3614348
mode 000000,100644..100644
--- a/adblockplusui/dependencies
+++ b/adblockplusui/dependencies
diff --cc adblockplusui/devtools-panel.html
index 0000000,b66ad24..b66ad24
mode 000000,100644..100644
--- a/adblockplusui/devtools-panel.html
+++ b/adblockplusui/devtools-panel.html
diff --cc adblockplusui/devtools-panel.js
index 0000000,85068dd..85068dd
mode 000000,100644..100644
--- a/adblockplusui/devtools-panel.js
+++ b/adblockplusui/devtools-panel.js
diff --cc adblockplusui/ensure_dependencies.py
index 0000000,707574d..707574d
mode 000000,100755..100755
--- a/adblockplusui/ensure_dependencies.py
+++ b/adblockplusui/ensure_dependencies.py
diff --cc adblockplusui/ext/devtools.js
index 0000000,42c692e..42c692e
mode 000000,100644..100644
--- a/adblockplusui/ext/devtools.js
+++ b/adblockplusui/ext/devtools.js
diff --cc adblockplusui/locale/en-US/common.json
index 0000000,f144db1..f144db1
mode 000000,100644..100644
--- a/adblockplusui/locale/en-US/common.json
+++ b/adblockplusui/locale/en-US/common.json
diff --cc adblockplusui/metadata.generic
index 0000000,061eb7d..061eb7d
mode 000000,100644..100644
--- a/adblockplusui/metadata.generic
+++ b/adblockplusui/metadata.generic
diff --cc adblockplusui/skin/devtools-panel.css
index 0000000,1ece4e1..1ece4e1
mode 000000,100644..100644
--- a/adblockplusui/skin/devtools-panel.css
+++ b/adblockplusui/skin/devtools-panel.css
diff --cc adblockplusui/skin/options-sprite.png
index 535e418,3d6ef68..3d6ef68
Binary files differ

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git



More information about the Pkg-mozext-commits mailing list