[Pkg-mozext-commits] [adblock-plus] 02/02: Merge tag 'upstream/2.4.1' into dfsg_clean

David Prévot taffit at moszumanska.debian.org
Sat Jan 18 17:00:30 UTC 2014


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

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

commit 31b1ff0ed58861a67d44c7db043e87076f5c5a7c
Merge: 14dcdc6 7b7d14e
Author: David Prévot <taffit at debian.org>
Date:   Sat Jan 18 11:03:07 2014 -0400

    Merge tag 'upstream/2.4.1' into dfsg_clean
    
    Upstream version 2.4.1
    
    # gpg: Signature faite le sam. 18 janv. 2014 11:03:02 AST
    # gpg:                avec la clef RSA 058C1CF944F6BD3C
    # gpg: Bonne signature de « David Prévot <david at tilapin.org> »
    # gpg:                 alias « David Prévot <davidp at altern.org> »
    # gpg:                 alias « David Prévot <davidp at no-log.org> »
    # gpg:                 alias « David Prévot <taffit at debian.org> »
    # gpg: Attention : cette clef n'est pas certifiée avec une signature de confiance.
    # gpg:             Rien n'indique que la signature appartient à son propriétaire.
    # Empreinte de clef principale : AE14 AD01 426D 2BFB 82EF  7E1E B82A 217A FDFE 09F2
    #    Empreinte de la sous-clef : 7875 4D07 BC09 5C74 48F7  8D66 058C 1CF9 44F6 BD3C

 .hg_archival.txt                              |   4 +-
 .hgsubstate                                   |   2 +-
 buildtools/Info.plist.tmpl                    | 159 +++++++++++++
 buildtools/background.html.tmpl               |   9 +
 buildtools/build.py                           |  10 +-
 buildtools/imageConversion.py                 | 135 +++++++++++
 buildtools/lib/keySelector.js                 |   4 +-
 buildtools/lib/prefs.js                       |   1 +
 buildtools/localeTools.py                     |  14 +-
 buildtools/manifest.json.tmpl                 |   2 +-
 buildtools/packager.py                        |   9 +
 buildtools/packagerChrome.py                  |  17 +-
 buildtools/packagerGecko.py                   |   7 +-
 buildtools/packagerSafari.py                  | 269 ++++++++++++++++++++++
 buildtools/safariInfo.js.tmpl                 |  32 +++
 chrome/content/ui/firstRun.html               |  94 +++-----
 chrome/content/ui/firstRun.js                 |  18 +-
 chrome/content/ui/i18n.js                     |  10 +-
 chrome/content/ui/overlay.xul                 |   9 +-
 chrome/content/ui/settings.xul                |   1 -
 chrome/content/ui/sidebar.js                  |  42 ++--
 chrome/locale/{id => ach}/.incomplete         |   0
 chrome/locale/ach/composer.dtd                |   6 +
 chrome/locale/ar/composer.dtd                 |   2 +-
 chrome/locale/ar/filters.dtd                  |   2 +-
 chrome/locale/ar/firstRun.properties          |   5 +-
 chrome/locale/ar/overlay.dtd                  |   9 +-
 chrome/locale/bg/composer.dtd                 |   4 +-
 chrome/locale/bg/firstRun.properties          |  13 +-
 chrome/locale/bg/overlay.dtd                  |   1 -
 chrome/locale/ca/composer.dtd                 |   8 +-
 chrome/locale/ca/overlay.dtd                  |   1 -
 chrome/locale/cs/composer.dtd                 |   8 +-
 chrome/locale/cs/filters.dtd                  |   4 +-
 chrome/locale/cs/firstRun.properties          |   7 +-
 chrome/locale/cs/overlay.dtd                  |   1 -
 chrome/locale/da/firstRun.properties          |   5 +-
 chrome/locale/da/overlay.dtd                  |   1 -
 chrome/locale/de/composer.dtd                 |   4 +-
 chrome/locale/de/firstRun.properties          |   5 +-
 chrome/locale/de/overlay.dtd                  |   1 -
 chrome/locale/dsb/firstRun.properties         |   5 +-
 chrome/locale/dsb/overlay.dtd                 |   1 -
 chrome/locale/el/firstRun.properties          |   5 +-
 chrome/locale/el/overlay.dtd                  |   1 -
 chrome/locale/en-GB/firstRun.properties       |  18 +-
 chrome/locale/en-GB/overlay.dtd               |   1 -
 chrome/locale/en-US/firstRun.properties       |   5 +-
 chrome/locale/en-US/overlay.dtd               |   1 -
 chrome/locale/eo/firstRun.properties          |   5 +-
 chrome/locale/eo/overlay.dtd                  |   1 -
 chrome/locale/es-AR/firstRun.properties       |   5 +-
 chrome/locale/es-AR/overlay.dtd               |   1 -
 chrome/locale/es-CL/composer.dtd              |  24 +-
 chrome/locale/es-CL/sidebar.dtd               |  33 +++
 chrome/locale/es-ES/firstRun.properties       |   5 +-
 chrome/locale/es-ES/overlay.dtd               |   1 -
 chrome/locale/es-MX/composer.dtd              |  12 +-
 chrome/locale/es-MX/firstRun.properties       |   5 +-
 chrome/locale/es-MX/overlay.dtd               |   1 -
 chrome/locale/et/firstRun.properties          |   8 +
 chrome/locale/et/overlay.dtd                  |   1 -
 chrome/locale/eu/composer.dtd                 |  16 +-
 chrome/locale/eu/filters.dtd                  |  12 +-
 chrome/locale/eu/firstRun.properties          |  18 +-
 chrome/locale/eu/global.properties            |   6 +-
 chrome/locale/eu/meta.properties              |   4 +-
 chrome/locale/eu/overlay.dtd                  |   1 -
 chrome/locale/eu/sendReport.dtd               |  14 +-
 chrome/locale/eu/sidebar.dtd                  |   2 +-
 chrome/locale/fa/composer.dtd                 |   2 +-
 chrome/locale/fa/filters.dtd                  |  14 +-
 chrome/locale/fa/firstRun.properties          |  20 +-
 chrome/locale/fa/global.properties            |  22 +-
 chrome/locale/fa/meta.properties              |   7 +-
 chrome/locale/fa/overlay.dtd                  |  28 ++-
 chrome/locale/fa/sendReport.dtd               |  37 +--
 chrome/locale/fa/sidebar.dtd                  |  14 +-
 chrome/locale/fa/subscriptionSelection.dtd    |  10 +-
 chrome/locale/fi/firstRun.properties          |  19 +-
 chrome/locale/fi/overlay.dtd                  |   1 -
 chrome/locale/fi/subscriptionSelection.dtd    |  14 +-
 chrome/locale/fr/firstRun.properties          |   5 +-
 chrome/locale/fr/overlay.dtd                  |   1 -
 chrome/locale/fy-NL/filters.dtd               |  49 +++-
 chrome/locale/fy-NL/firstRun.properties       |  20 ++
 chrome/locale/fy-NL/global.properties         |   9 +-
 chrome/locale/fy-NL/overlay.dtd               |   2 +-
 chrome/locale/fy-NL/sendReport.dtd            |  15 +-
 chrome/locale/fy-NL/sidebar.dtd               |   4 +-
 chrome/locale/gl/firstRun.properties          |   5 +-
 chrome/locale/gl/overlay.dtd                  |   1 -
 chrome/locale/{id => gu-IN}/.incomplete       |   0
 chrome/locale/gu-IN/composer.dtd              |   2 +
 chrome/locale/he/firstRun.properties          |   5 +-
 chrome/locale/he/overlay.dtd                  |   1 -
 chrome/locale/hi-IN/composer.dtd              |  19 +-
 chrome/locale/hr/firstRun.properties          |  13 +-
 chrome/locale/hr/overlay.dtd                  |   1 -
 chrome/locale/hsb/firstRun.properties         |   5 +-
 chrome/locale/hsb/overlay.dtd                 |   1 -
 chrome/locale/hu/firstRun.properties          |   5 +-
 chrome/locale/hu/overlay.dtd                  |   1 -
 chrome/locale/hy-AM/firstRun.properties       |  21 +-
 chrome/locale/hy-AM/overlay.dtd               |   1 -
 chrome/locale/id/composer.dtd                 |  33 +++
 chrome/locale/id/filters.dtd                  |  16 +-
 chrome/locale/id/firstRun.properties          |  11 +-
 chrome/locale/id/global.properties            |   4 +-
 chrome/locale/id/meta.properties              |  10 +-
 chrome/locale/id/overlay.dtd                  |   3 +-
 chrome/locale/id/sendReport.dtd               |   8 +-
 chrome/locale/is/firstRun.properties          |   5 +-
 chrome/locale/is/overlay.dtd                  |   1 -
 chrome/locale/it/composer.dtd                 |  10 +-
 chrome/locale/it/firstRun.properties          |  11 +-
 chrome/locale/it/overlay.dtd                  |   1 -
 chrome/locale/ja/firstRun.properties          |   7 +-
 chrome/locale/ja/meta.properties              |   2 +-
 chrome/locale/ja/overlay.dtd                  |   3 +-
 chrome/locale/ka/composer.dtd                 |  19 +-
 chrome/locale/ka/filters.dtd                  |  24 ++
 chrome/locale/ka/overlay.dtd                  |   1 -
 chrome/locale/ka/sendReport.dtd               |   1 +
 chrome/locale/ka/sidebar.dtd                  |  40 +++-
 chrome/locale/kk/firstRun.properties          |  13 +-
 chrome/locale/kk/overlay.dtd                  |   1 -
 chrome/locale/kn/composer.dtd                 |   3 +
 chrome/locale/ko/composer.dtd                 |   4 +-
 chrome/locale/ko/overlay.dtd                  |   1 -
 chrome/locale/lt/firstRun.properties          |   5 +-
 chrome/locale/lt/overlay.dtd                  |   1 -
 chrome/locale/lv/firstRun.properties          |   5 +-
 chrome/locale/lv/overlay.dtd                  |   1 -
 chrome/locale/ms/firstRun.properties          |  19 +-
 chrome/locale/ms/overlay.dtd                  |   1 -
 chrome/locale/nb-NO/composer.dtd              |  18 +-
 chrome/locale/nb-NO/filters.dtd               |  25 +-
 chrome/locale/nb-NO/firstRun.properties       |  20 +-
 chrome/locale/nb-NO/global.properties         |  17 +-
 chrome/locale/nb-NO/meta.properties           |   6 +-
 chrome/locale/nb-NO/overlay.dtd               |  34 +--
 chrome/locale/nb-NO/sendReport.dtd            |  39 +++-
 chrome/locale/nb-NO/sidebar.dtd               |  17 +-
 chrome/locale/nb-NO/subscriptionSelection.dtd |   5 +
 chrome/locale/nl/firstRun.properties          |   5 +-
 chrome/locale/nl/overlay.dtd                  |   1 -
 chrome/locale/pl/firstRun.properties          |   5 +-
 chrome/locale/pl/overlay.dtd                  |   1 -
 chrome/locale/pt-BR/composer.dtd              |   2 +-
 chrome/locale/pt-BR/firstRun.properties       |   9 +-
 chrome/locale/pt-BR/overlay.dtd               |  11 +-
 chrome/locale/pt-PT/firstRun.properties       |   5 +-
 chrome/locale/pt-PT/meta.properties           |   2 +-
 chrome/locale/pt-PT/overlay.dtd               |   1 -
 chrome/locale/ro/firstRun.properties          |   5 +-
 chrome/locale/ro/overlay.dtd                  |   1 -
 chrome/locale/ru/composer.dtd                 |   2 +-
 chrome/locale/ru/firstRun.properties          |   5 +-
 chrome/locale/ru/overlay.dtd                  |   1 -
 chrome/locale/si-LK/filters.dtd               |   3 +
 chrome/locale/sk/firstRun.properties          |   5 +-
 chrome/locale/sk/overlay.dtd                  |   1 -
 chrome/locale/sl/firstRun.properties          |   5 +-
 chrome/locale/sl/overlay.dtd                  |   1 -
 chrome/locale/sr/composer.dtd                 |   6 +-
 chrome/locale/sr/filters.dtd                  |   4 +-
 chrome/locale/sr/firstRun.properties          |  21 +-
 chrome/locale/sr/global.properties            |   4 +-
 chrome/locale/sr/meta.properties              |   2 +-
 chrome/locale/sr/overlay.dtd                  |   1 -
 chrome/locale/sr/sendReport.dtd               |  32 +--
 chrome/locale/sr/subscriptionSelection.dtd    |   4 +-
 chrome/locale/sv-SE/firstRun.properties       |   5 +-
 chrome/locale/sv-SE/overlay.dtd               |   1 -
 chrome/locale/ta-LK/composer.dtd              |  18 ++
 chrome/locale/th/overlay.dtd                  |   1 -
 chrome/locale/tr/composer.dtd                 |  16 +-
 chrome/locale/tr/filters.dtd                  |  44 ++--
 chrome/locale/tr/firstRun.properties          |  25 +-
 chrome/locale/tr/global.properties            |  14 +-
 chrome/locale/tr/meta.properties              |   2 +-
 chrome/locale/tr/overlay.dtd                  |  29 ++-
 chrome/locale/tr/sendReport.dtd               |  26 +--
 chrome/locale/tr/sidebar.dtd                  |  16 +-
 chrome/locale/tr/subscriptionSelection.dtd    |  10 +-
 chrome/locale/uk/composer.dtd                 |   8 +-
 chrome/locale/uk/filters.dtd                  |   4 +-
 chrome/locale/uk/firstRun.properties          |   5 +-
 chrome/locale/uk/global.properties            |   8 +-
 chrome/locale/uk/meta.properties              |   4 +-
 chrome/locale/uk/overlay.dtd                  |   3 +-
 chrome/locale/uk/sendReport.dtd               |  22 +-
 chrome/locale/uk/sidebar.dtd                  |   6 +-
 chrome/locale/uk/subscriptionSelection.dtd    |  10 +-
 chrome/locale/vi/firstRun.properties          |  21 +-
 chrome/locale/vi/overlay.dtd                  |   1 -
 chrome/locale/zh-CN/composer.dtd              |   6 +-
 chrome/locale/zh-CN/filters.dtd               |   4 +-
 chrome/locale/zh-CN/firstRun.properties       |  18 +-
 chrome/locale/zh-CN/global.properties         |   2 +-
 chrome/locale/zh-CN/overlay.dtd               |   1 -
 chrome/locale/zh-CN/sendReport.dtd            |  58 +++--
 chrome/locale/zh-CN/sidebar.dtd               |   4 +-
 chrome/locale/zh-TW/firstRun.properties       |   5 +-
 chrome/locale/zh-TW/overlay.dtd               |   1 -
 chrome/skin/abp-status-32.png                 | Bin 0 -> 3419 bytes
 chrome/skin/arrow-down.png                    | Bin 452 -> 0 bytes
 chrome/skin/arrow-up.png                      | Bin 478 -> 0 bytes
 chrome/skin/background-candomore.png          | Bin 246 -> 0 bytes
 chrome/skin/background-main.png               | Bin 260 -> 163 bytes
 chrome/skin/background-share.png              | Bin 252 -> 162 bytes
 chrome/skin/background.png                    | Bin 255 -> 162 bytes
 chrome/skin/firstRun.css                      | 199 ++--------------
 chrome/skin/overlay.css                       |  24 +-
 lib/appSupport.js                             |   9 +-
 lib/customizableUI.js                         | 320 ++++++++++++++++++++++++++
 lib/downloader.js                             |  22 +-
 lib/requestNotifier.js                        |   4 +-
 lib/ui.js                                     | 319 ++++++-------------------
 metadata.gecko                                |  15 +-
 221 files changed, 2276 insertions(+), 1145 deletions(-)

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