[Pkg-mozext-commits] [adblock-plus] 45/52: Merge remote-tracking branch 'adblockplusui/master' in the adblockplusui directory

David Prévot taffit at moszumanska.debian.org
Thu Jan 22 21:43:48 UTC 2015 

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

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

commit 54e1be3ddacb77643b4138a86488bbdc2492e40a
Merge: f2138e6 af1d3fc
Author: David Prévot <taffit at debian.org>
Date:   Thu Jan 22 16:04:15 2015 -0400

    Merge remote-tracking branch 'adblockplusui/master' in the adblockplusui directory

 adblockplusui/README.md                         |  61 +++
 adblockplusui/background.html                   |  29 ++
 adblockplusui/background.js                     | 179 +++++++
 adblockplusui/ext/background.js                 |  83 ++++
 adblockplusui/ext/common.js                     | 197 ++++++++
 adblockplusui/ext/content.js                    |  74 +++
 adblockplusui/firstRun.html                     | 142 ++++++
 adblockplusui/firstRun.js                       | 285 ++++++++++++
 adblockplusui/i18n.js                           | 102 ++++
 adblockplusui/locale/ar/firstRun.json           |  62 +++
 adblockplusui/locale/ast/firstRun.json          |  20 +
 adblockplusui/locale/bg/firstRun.json           |  62 +++
 adblockplusui/locale/bn-BD/firstRun.json        |  17 +
 adblockplusui/locale/bs/firstRun.json           |  53 +++
 adblockplusui/locale/ca/firstRun.json           |  62 +++
 adblockplusui/locale/cs/firstRun.json           |  62 +++
 adblockplusui/locale/cy/firstRun.json           |  62 +++
 adblockplusui/locale/da/firstRun.json           |  62 +++
 adblockplusui/locale/de/firstRun.json           |  62 +++
 adblockplusui/locale/dsb/firstRun.json          |  62 +++
 adblockplusui/locale/el/firstRun.json           |  62 +++
 adblockplusui/locale/en-GB/firstRun.json        |  62 +++
 adblockplusui/locale/en-US/firstRun.json        |  62 +++
 adblockplusui/locale/eo/firstRun.json           |  62 +++
 adblockplusui/locale/es-AR/firstRun.json        |  62 +++
 adblockplusui/locale/es-CL/firstRun.json        |  62 +++
 adblockplusui/locale/es-ES/firstRun.json        |  62 +++
 adblockplusui/locale/es-MX/firstRun.json        |  62 +++
 adblockplusui/locale/et/firstRun.json           |  50 ++
 adblockplusui/locale/eu/firstRun.json           |  62 +++
 adblockplusui/locale/fa/firstRun.json           |  62 +++
 adblockplusui/locale/fi/firstRun.json           |  62 +++
 adblockplusui/locale/fr/firstRun.json           |  62 +++
 adblockplusui/locale/fy-NL/firstRun.json        |  62 +++
 adblockplusui/locale/gl/firstRun.json           |  62 +++
 adblockplusui/locale/he/firstRun.json           |  62 +++
 adblockplusui/locale/hi-IN/firstRun.json        |  14 +
 adblockplusui/locale/hr/firstRun.json           |  62 +++
 adblockplusui/locale/hsb/firstRun.json          |  62 +++
 adblockplusui/locale/hu/firstRun.json           |  62 +++
 adblockplusui/locale/hy-AM/firstRun.json        |  59 +++
 adblockplusui/locale/id/firstRun.json           |  62 +++
 adblockplusui/locale/is/firstRun.json           |  62 +++
 adblockplusui/locale/it/firstRun.json           |  62 +++
 adblockplusui/locale/ja/firstRun.json           |  62 +++
 adblockplusui/locale/kk/firstRun.json           |  62 +++
 adblockplusui/locale/ko/firstRun.json           |  62 +++
 adblockplusui/locale/lt/firstRun.json           |  62 +++
 adblockplusui/locale/lv/firstRun.json           |  62 +++
 adblockplusui/locale/mk/firstRun.json           |  62 +++
 adblockplusui/locale/mr/firstRun.json           |  59 +++
 adblockplusui/locale/ms/firstRun.json           |  62 +++
 adblockplusui/locale/nb-NO/firstRun.json        |  62 +++
 adblockplusui/locale/nl/firstRun.json           |  62 +++
 adblockplusui/locale/pl/firstRun.json           |  62 +++
 adblockplusui/locale/pt-BR/firstRun.json        |  62 +++
 adblockplusui/locale/pt-PT/firstRun.json        |  62 +++
 adblockplusui/locale/ro/firstRun.json           |  62 +++
 adblockplusui/locale/ru/firstRun.json           |  62 +++
 adblockplusui/locale/sk/firstRun.json           |  62 +++
 adblockplusui/locale/sl/firstRun.json           |  62 +++
 adblockplusui/locale/sq/firstRun.json           |  62 +++
 adblockplusui/locale/sr/firstRun.json           |  62 +++
 adblockplusui/locale/sv-SE/firstRun.json        |  62 +++
 adblockplusui/locale/ta-LK/firstRun.json        |  44 ++
 adblockplusui/locale/th/firstRun.json           |  47 ++
 adblockplusui/locale/tr/firstRun.json           |  62 +++
 adblockplusui/locale/uk/firstRun.json           |  62 +++
 adblockplusui/locale/vi/firstRun.json           |  62 +++
 adblockplusui/locale/zh-CN/firstRun.json        |  62 +++
 adblockplusui/locale/zh-TW/firstRun.json        |  62 +++
 adblockplusui/messageResponder.js               | 177 +++++++
 adblockplusui/skin/abp-icon-big.png             | Bin 0 -> 15201 bytes
 adblockplusui/skin/ajax-loader.gif              | Bin 0 -> 3208 bytes
 adblockplusui/skin/background-main.png          | Bin 0 -> 163 bytes
 adblockplusui/skin/background-share.png         | Bin 0 -> 162 bytes
 adblockplusui/skin/background.png               | Bin 0 -> 162 bytes
 adblockplusui/skin/donate.png                   | Bin 0 -> 160 bytes
 adblockplusui/skin/features/malware.png         | Bin 0 -> 3335 bytes
 adblockplusui/skin/features/social.png          | Bin 0 -> 4260 bytes
 adblockplusui/skin/features/tracking.png        | Bin 0 -> 3562 bytes
 adblockplusui/skin/firstRun.css                 | 590 ++++++++++++++++++++++++
 adblockplusui/skin/fonts/CreteRound-Italic.otf  | Bin 0 -> 43152 bytes
 adblockplusui/skin/fonts/CreteRound-Regular.otf | Bin 0 -> 40968 bytes
 adblockplusui/skin/social/facebook.png          | Bin 0 -> 3861 bytes
 adblockplusui/skin/social/googleplus.png        | Bin 0 -> 4009 bytes
 adblockplusui/skin/social/renren.png            | Bin 0 -> 2619 bytes
 adblockplusui/skin/social/twitter.png           | Bin 0 -> 3944 bytes
 adblockplusui/skin/social/weibo.png             | Bin 0 -> 3497 bytes
 adblockplusui/test_server.py                    |  29 ++
 90 files changed, 5597 insertions(+)

diff --cc adblockplusui/README.md
index 0000000,f957207..f957207
mode 000000,100644..100644
--- a/adblockplusui/README.md
+++ b/adblockplusui/README.md
diff --cc adblockplusui/background.html
index 0000000,87ad89b..87ad89b
mode 000000,100644..100644
--- a/adblockplusui/background.html
+++ b/adblockplusui/background.html
diff --cc adblockplusui/background.js
index 0000000,1d9bcb8..1d9bcb8
mode 000000,100644..100644
--- a/adblockplusui/background.js
+++ b/adblockplusui/background.js
diff --cc adblockplusui/ext/background.js
index 0000000,02cbcc5..02cbcc5
mode 000000,100644..100644
--- a/adblockplusui/ext/background.js
+++ b/adblockplusui/ext/background.js
diff --cc adblockplusui/ext/common.js
index 0000000,779af2f..779af2f
mode 000000,100644..100644
--- a/adblockplusui/ext/common.js
+++ b/adblockplusui/ext/common.js
diff --cc adblockplusui/ext/content.js
index 0000000,ef9ff6c..ef9ff6c
mode 000000,100644..100644
--- a/adblockplusui/ext/content.js
+++ b/adblockplusui/ext/content.js
diff --cc adblockplusui/firstRun.html
index 0000000,116bbea..116bbea
mode 000000,100644..100644
--- a/adblockplusui/firstRun.html
+++ b/adblockplusui/firstRun.html
diff --cc adblockplusui/firstRun.js
index 0000000,fb7f222..fb7f222
mode 000000,100644..100644
--- a/adblockplusui/firstRun.js
+++ b/adblockplusui/firstRun.js
diff --cc adblockplusui/i18n.js
index 0000000,6cf6cb7..6cf6cb7
mode 000000,100644..100644
--- a/adblockplusui/i18n.js
+++ b/adblockplusui/i18n.js
diff --cc adblockplusui/locale/ar/firstRun.json
index 0000000,db5ff5d..db5ff5d
mode 000000,100644..100644
--- a/adblockplusui/locale/ar/firstRun.json
+++ b/adblockplusui/locale/ar/firstRun.json
diff --cc adblockplusui/locale/ast/firstRun.json
index 0000000,327d8ce..327d8ce
mode 000000,100644..100644
--- a/adblockplusui/locale/ast/firstRun.json
+++ b/adblockplusui/locale/ast/firstRun.json
diff --cc adblockplusui/locale/bg/firstRun.json
index 0000000,aa4346b..aa4346b
mode 000000,100644..100644
--- a/adblockplusui/locale/bg/firstRun.json
+++ b/adblockplusui/locale/bg/firstRun.json
diff --cc adblockplusui/locale/bn-BD/firstRun.json
index 0000000,dfd44ea..dfd44ea
mode 000000,100644..100644
--- a/adblockplusui/locale/bn-BD/firstRun.json
+++ b/adblockplusui/locale/bn-BD/firstRun.json
diff --cc adblockplusui/locale/bs/firstRun.json
index 0000000,38db685..38db685
mode 000000,100644..100644
--- a/adblockplusui/locale/bs/firstRun.json
+++ b/adblockplusui/locale/bs/firstRun.json
diff --cc adblockplusui/locale/ca/firstRun.json
index 0000000,ee78bbc..ee78bbc
mode 000000,100644..100644
--- a/adblockplusui/locale/ca/firstRun.json
+++ b/adblockplusui/locale/ca/firstRun.json
diff --cc adblockplusui/locale/cs/firstRun.json
index 0000000,cac6e68..cac6e68
mode 000000,100644..100644
--- a/adblockplusui/locale/cs/firstRun.json
+++ b/adblockplusui/locale/cs/firstRun.json
diff --cc adblockplusui/locale/cy/firstRun.json
index 0000000,6e44baa..6e44baa
mode 000000,100644..100644
--- a/adblockplusui/locale/cy/firstRun.json
+++ b/adblockplusui/locale/cy/firstRun.json
diff --cc adblockplusui/locale/da/firstRun.json
index 0000000,d2c720c..d2c720c
mode 000000,100644..100644
--- a/adblockplusui/locale/da/firstRun.json
+++ b/adblockplusui/locale/da/firstRun.json
diff --cc adblockplusui/locale/de/firstRun.json
index 0000000,2cacc0f..2cacc0f
mode 000000,100644..100644
--- a/adblockplusui/locale/de/firstRun.json
+++ b/adblockplusui/locale/de/firstRun.json
diff --cc adblockplusui/locale/dsb/firstRun.json
index 0000000,5bcabe1..5bcabe1
mode 000000,100644..100644
--- a/adblockplusui/locale/dsb/firstRun.json
+++ b/adblockplusui/locale/dsb/firstRun.json
diff --cc adblockplusui/locale/el/firstRun.json
index 0000000,0149c06..0149c06
mode 000000,100644..100644
--- a/adblockplusui/locale/el/firstRun.json
+++ b/adblockplusui/locale/el/firstRun.json
diff --cc adblockplusui/locale/en-GB/firstRun.json
index 0000000,3d05d86..3d05d86
mode 000000,100644..100644
--- a/adblockplusui/locale/en-GB/firstRun.json
+++ b/adblockplusui/locale/en-GB/firstRun.json
diff --cc adblockplusui/locale/en-US/firstRun.json
index 0000000,1a7c2fc..1a7c2fc
mode 000000,100644..100644
--- a/adblockplusui/locale/en-US/firstRun.json
+++ b/adblockplusui/locale/en-US/firstRun.json
diff --cc adblockplusui/locale/eo/firstRun.json
index 0000000,00c25cb..00c25cb
mode 000000,100644..100644
--- a/adblockplusui/locale/eo/firstRun.json
+++ b/adblockplusui/locale/eo/firstRun.json
diff --cc adblockplusui/locale/es-AR/firstRun.json
index 0000000,a9a1f72..a9a1f72
mode 000000,100644..100644
--- a/adblockplusui/locale/es-AR/firstRun.json
+++ b/adblockplusui/locale/es-AR/firstRun.json
diff --cc adblockplusui/locale/es-CL/firstRun.json
index 0000000,d7df238..d7df238
mode 000000,100644..100644
--- a/adblockplusui/locale/es-CL/firstRun.json
+++ b/adblockplusui/locale/es-CL/firstRun.json
diff --cc adblockplusui/locale/es-ES/firstRun.json
index 0000000,789d758..789d758
mode 000000,100644..100644
--- a/adblockplusui/locale/es-ES/firstRun.json
+++ b/adblockplusui/locale/es-ES/firstRun.json
diff --cc adblockplusui/locale/es-MX/firstRun.json
index 0000000,9eea9d3..9eea9d3
mode 000000,100644..100644
--- a/adblockplusui/locale/es-MX/firstRun.json
+++ b/adblockplusui/locale/es-MX/firstRun.json
diff --cc adblockplusui/locale/et/firstRun.json
index 0000000,c777950..c777950
mode 000000,100644..100644
--- a/adblockplusui/locale/et/firstRun.json
+++ b/adblockplusui/locale/et/firstRun.json
diff --cc adblockplusui/locale/eu/firstRun.json
index 0000000,78a1138..78a1138
mode 000000,100644..100644
--- a/adblockplusui/locale/eu/firstRun.json
+++ b/adblockplusui/locale/eu/firstRun.json
diff --cc adblockplusui/locale/fa/firstRun.json
index 0000000,b1612af..b1612af
mode 000000,100644..100644
--- a/adblockplusui/locale/fa/firstRun.json
+++ b/adblockplusui/locale/fa/firstRun.json
diff --cc adblockplusui/locale/fi/firstRun.json
index 0000000,8724b3a..8724b3a
mode 000000,100644..100644
--- a/adblockplusui/locale/fi/firstRun.json
+++ b/adblockplusui/locale/fi/firstRun.json
diff --cc adblockplusui/locale/fr/firstRun.json
index 0000000,412d4fa..412d4fa
mode 000000,100644..100644
--- a/adblockplusui/locale/fr/firstRun.json
+++ b/adblockplusui/locale/fr/firstRun.json
diff --cc adblockplusui/locale/fy-NL/firstRun.json
index 0000000,7e39428..7e39428
mode 000000,100644..100644
--- a/adblockplusui/locale/fy-NL/firstRun.json
+++ b/adblockplusui/locale/fy-NL/firstRun.json
diff --cc adblockplusui/locale/gl/firstRun.json
index 0000000,cfc9337..cfc9337
mode 000000,100644..100644
--- a/adblockplusui/locale/gl/firstRun.json
+++ b/adblockplusui/locale/gl/firstRun.json
diff --cc adblockplusui/locale/he/firstRun.json
index 0000000,c591122..c591122
mode 000000,100644..100644
--- a/adblockplusui/locale/he/firstRun.json
+++ b/adblockplusui/locale/he/firstRun.json
diff --cc adblockplusui/locale/hi-IN/firstRun.json
index 0000000,3e84dd4..3e84dd4
mode 000000,100644..100644
--- a/adblockplusui/locale/hi-IN/firstRun.json
+++ b/adblockplusui/locale/hi-IN/firstRun.json
diff --cc adblockplusui/locale/hr/firstRun.json
index 0000000,d10d81c..d10d81c
mode 000000,100644..100644
--- a/adblockplusui/locale/hr/firstRun.json
+++ b/adblockplusui/locale/hr/firstRun.json
diff --cc adblockplusui/locale/hsb/firstRun.json
index 0000000,67e5266..67e5266
mode 000000,100644..100644
--- a/adblockplusui/locale/hsb/firstRun.json
+++ b/adblockplusui/locale/hsb/firstRun.json
diff --cc adblockplusui/locale/hu/firstRun.json
index 0000000,924797a..924797a
mode 000000,100644..100644
--- a/adblockplusui/locale/hu/firstRun.json
+++ b/adblockplusui/locale/hu/firstRun.json
diff --cc adblockplusui/locale/hy-AM/firstRun.json
index 0000000,bf58843..bf58843
mode 000000,100644..100644
--- a/adblockplusui/locale/hy-AM/firstRun.json
+++ b/adblockplusui/locale/hy-AM/firstRun.json
diff --cc adblockplusui/locale/id/firstRun.json
index 0000000,6c2390d..6c2390d
mode 000000,100644..100644
--- a/adblockplusui/locale/id/firstRun.json
+++ b/adblockplusui/locale/id/firstRun.json
diff --cc adblockplusui/locale/is/firstRun.json
index 0000000,2b7dadc..2b7dadc
mode 000000,100644..100644
--- a/adblockplusui/locale/is/firstRun.json
+++ b/adblockplusui/locale/is/firstRun.json
diff --cc adblockplusui/locale/it/firstRun.json
index 0000000,464a9c4..464a9c4
mode 000000,100644..100644
--- a/adblockplusui/locale/it/firstRun.json
+++ b/adblockplusui/locale/it/firstRun.json
diff --cc adblockplusui/locale/ja/firstRun.json
index 0000000,2a72cc9..2a72cc9
mode 000000,100644..100644
--- a/adblockplusui/locale/ja/firstRun.json
+++ b/adblockplusui/locale/ja/firstRun.json
diff --cc adblockplusui/locale/kk/firstRun.json
index 0000000,e3b1826..e3b1826
mode 000000,100644..100644
--- a/adblockplusui/locale/kk/firstRun.json
+++ b/adblockplusui/locale/kk/firstRun.json
diff --cc adblockplusui/locale/ko/firstRun.json
index 0000000,e4aaadf..e4aaadf
mode 000000,100644..100644
--- a/adblockplusui/locale/ko/firstRun.json
+++ b/adblockplusui/locale/ko/firstRun.json
diff --cc adblockplusui/locale/lt/firstRun.json
index 0000000,ff5b4c9..ff5b4c9
mode 000000,100644..100644
--- a/adblockplusui/locale/lt/firstRun.json
+++ b/adblockplusui/locale/lt/firstRun.json
diff --cc adblockplusui/locale/lv/firstRun.json
index 0000000,73870f6..73870f6
mode 000000,100644..100644
--- a/adblockplusui/locale/lv/firstRun.json
+++ b/adblockplusui/locale/lv/firstRun.json
diff --cc adblockplusui/locale/mk/firstRun.json
index 0000000,ccbd552..ccbd552
mode 000000,100644..100644
--- a/adblockplusui/locale/mk/firstRun.json
+++ b/adblockplusui/locale/mk/firstRun.json
diff --cc adblockplusui/locale/mr/firstRun.json
index 0000000,100d889..100d889
mode 000000,100644..100644
--- a/adblockplusui/locale/mr/firstRun.json
+++ b/adblockplusui/locale/mr/firstRun.json
diff --cc adblockplusui/locale/ms/firstRun.json
index 0000000,0417d8f..0417d8f
mode 000000,100644..100644
--- a/adblockplusui/locale/ms/firstRun.json
+++ b/adblockplusui/locale/ms/firstRun.json
diff --cc adblockplusui/locale/nb-NO/firstRun.json
index 0000000,6da181e..6da181e
mode 000000,100644..100644
--- a/adblockplusui/locale/nb-NO/firstRun.json
+++ b/adblockplusui/locale/nb-NO/firstRun.json
diff --cc adblockplusui/locale/nl/firstRun.json
index 0000000,a9960d4..a9960d4
mode 000000,100644..100644
--- a/adblockplusui/locale/nl/firstRun.json
+++ b/adblockplusui/locale/nl/firstRun.json
diff --cc adblockplusui/locale/pl/firstRun.json
index 0000000,9a40bab..9a40bab
mode 000000,100644..100644
--- a/adblockplusui/locale/pl/firstRun.json
+++ b/adblockplusui/locale/pl/firstRun.json
diff --cc adblockplusui/locale/pt-BR/firstRun.json
index 0000000,ab42e50..ab42e50
mode 000000,100644..100644
--- a/adblockplusui/locale/pt-BR/firstRun.json
+++ b/adblockplusui/locale/pt-BR/firstRun.json
diff --cc adblockplusui/locale/pt-PT/firstRun.json
index 0000000,9cb20c6..9cb20c6
mode 000000,100644..100644
--- a/adblockplusui/locale/pt-PT/firstRun.json
+++ b/adblockplusui/locale/pt-PT/firstRun.json
diff --cc adblockplusui/locale/ro/firstRun.json
index 0000000,a974b6a..a974b6a
mode 000000,100644..100644
--- a/adblockplusui/locale/ro/firstRun.json
+++ b/adblockplusui/locale/ro/firstRun.json
diff --cc adblockplusui/locale/ru/firstRun.json
index 0000000,d373914..d373914
mode 000000,100644..100644
--- a/adblockplusui/locale/ru/firstRun.json
+++ b/adblockplusui/locale/ru/firstRun.json
diff --cc adblockplusui/locale/sk/firstRun.json
index 0000000,4ead36b..4ead36b
mode 000000,100644..100644
--- a/adblockplusui/locale/sk/firstRun.json
+++ b/adblockplusui/locale/sk/firstRun.json
diff --cc adblockplusui/locale/sl/firstRun.json
index 0000000,eb29f16..eb29f16
mode 000000,100644..100644
--- a/adblockplusui/locale/sl/firstRun.json
+++ b/adblockplusui/locale/sl/firstRun.json
diff --cc adblockplusui/locale/sq/firstRun.json
index 0000000,e201051..e201051
mode 000000,100644..100644
--- a/adblockplusui/locale/sq/firstRun.json
+++ b/adblockplusui/locale/sq/firstRun.json
diff --cc adblockplusui/locale/sr/firstRun.json
index 0000000,3cc6e48..3cc6e48
mode 000000,100644..100644
--- a/adblockplusui/locale/sr/firstRun.json
+++ b/adblockplusui/locale/sr/firstRun.json
diff --cc adblockplusui/locale/sv-SE/firstRun.json
index 0000000,bf55d7c..bf55d7c
mode 000000,100644..100644
--- a/adblockplusui/locale/sv-SE/firstRun.json
+++ b/adblockplusui/locale/sv-SE/firstRun.json
diff --cc adblockplusui/locale/ta-LK/firstRun.json
index 0000000,1ebc74d..1ebc74d
mode 000000,100644..100644
--- a/adblockplusui/locale/ta-LK/firstRun.json
+++ b/adblockplusui/locale/ta-LK/firstRun.json
diff --cc adblockplusui/locale/th/firstRun.json
index 0000000,1e2dab0..1e2dab0
mode 000000,100644..100644
--- a/adblockplusui/locale/th/firstRun.json
+++ b/adblockplusui/locale/th/firstRun.json
diff --cc adblockplusui/locale/tr/firstRun.json
index 0000000,a7b6d74..a7b6d74
mode 000000,100644..100644
--- a/adblockplusui/locale/tr/firstRun.json
+++ b/adblockplusui/locale/tr/firstRun.json
diff --cc adblockplusui/locale/uk/firstRun.json
index 0000000,334fd20..334fd20
mode 000000,100644..100644
--- a/adblockplusui/locale/uk/firstRun.json
+++ b/adblockplusui/locale/uk/firstRun.json
diff --cc adblockplusui/locale/vi/firstRun.json
index 0000000,d5b2603..d5b2603
mode 000000,100644..100644
--- a/adblockplusui/locale/vi/firstRun.json
+++ b/adblockplusui/locale/vi/firstRun.json
diff --cc adblockplusui/locale/zh-CN/firstRun.json
index 0000000,e0eaedb..e0eaedb
mode 000000,100644..100644
--- a/adblockplusui/locale/zh-CN/firstRun.json
+++ b/adblockplusui/locale/zh-CN/firstRun.json
diff --cc adblockplusui/locale/zh-TW/firstRun.json
index 0000000,f10ce83..f10ce83
mode 000000,100644..100644
--- a/adblockplusui/locale/zh-TW/firstRun.json
+++ b/adblockplusui/locale/zh-TW/firstRun.json
diff --cc adblockplusui/messageResponder.js
index 0000000,cf11a1b..cf11a1b
mode 000000,100644..100644
--- a/adblockplusui/messageResponder.js
+++ b/adblockplusui/messageResponder.js
diff --cc adblockplusui/skin/abp-icon-big.png
index 0000000,85cce1c..85cce1c
mode 000000,100644..100644
Binary files differ
diff --cc adblockplusui/skin/ajax-loader.gif
index 0000000,a642494..a642494
mode 000000,100644..100644
Binary files differ
diff --cc adblockplusui/skin/background-main.png
index 0000000,464a997..464a997
mode 000000,100644..100644
Binary files differ
diff --cc adblockplusui/skin/background-share.png
index 0000000,b572b56..b572b56
mode 000000,100644..100644
Binary files differ
diff --cc adblockplusui/skin/background.png
index 0000000,bb19387..bb19387
mode 000000,100644..100644
Binary files differ
diff --cc adblockplusui/skin/donate.png
index 0000000,3e77b37..3e77b37
mode 000000,100644..100644
Binary files differ
diff --cc adblockplusui/skin/features/malware.png
index 0000000,9b51b63..9b51b63
mode 000000,100644..100644
Binary files differ
diff --cc adblockplusui/skin/features/social.png
index 0000000,a2af1ea..a2af1ea
mode 000000,100644..100644
Binary files differ
diff --cc adblockplusui/skin/features/tracking.png
index 0000000,a8727a9..a8727a9
mode 000000,100644..100644
Binary files differ
diff --cc adblockplusui/skin/firstRun.css
index 0000000,6ddcb77..6ddcb77
mode 000000,100644..100644
--- a/adblockplusui/skin/firstRun.css
+++ b/adblockplusui/skin/firstRun.css
diff --cc adblockplusui/skin/fonts/CreteRound-Italic.otf
index 0000000,169bced..169bced
mode 000000,100644..100644
Binary files differ
diff --cc adblockplusui/skin/fonts/CreteRound-Regular.otf
index 0000000,d951855..d951855
mode 000000,100644..100644
Binary files differ
diff --cc adblockplusui/skin/social/facebook.png
index 0000000,f45c417..f45c417
mode 000000,100644..100644
Binary files differ
diff --cc adblockplusui/skin/social/googleplus.png
index 0000000,53e6819..53e6819
mode 000000,100644..100644
Binary files differ
diff --cc adblockplusui/skin/social/renren.png
index 0000000,e9af994..e9af994
mode 000000,100644..100644
Binary files differ
diff --cc adblockplusui/skin/social/twitter.png
index 0000000,fec913a..fec913a
mode 000000,100644..100644
Binary files differ
diff --cc adblockplusui/skin/social/weibo.png
index 0000000,176a628..176a628
mode 000000,100644..100644
Binary files differ
diff --cc adblockplusui/test_server.py
index 0000000,a2a30f3..a2a30f3
mode 000000,100755..100755
--- a/adblockplusui/test_server.py
+++ b/adblockplusui/test_server.py

-- 
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