[Pkg-mozext-commits] [adblock-plus] 17/24: Merge tag 'upstream/2.6.5+dfsg'

[David Prévot]

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

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

commit 9445b9572567676180b29b6abb4f53854181ee78
Merge: e5aea24 f98646b
Author: David Prévot <taffit at debian.org>
Date:   Sun Oct 19 21:18:30 2014 -0400

    Merge tag 'upstream/2.6.5+dfsg'
    
    Upstream version 2.6.5+dfsg
    
    # gpg: Signature faite le dim. 19 oct. 2014 21:18:17 AST
    # gpg:                avec la clef RSA B82A217AFDFE09F2
    # 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

 .hgtags                                       |   1 +
 COPYING                                       | 674 ++++++++++++++++++++++++++
 README.md                                     |   2 +-
 chrome/content/ui/filters-filteractions.js    |   2 +-
 chrome/content/ui/firstRun.html               |   4 +-
 chrome/content/ui/sendReport.js               |  16 +-
 chrome/content/ui/sendReport.xul              |   2 +-
 chrome/locale/ar/composer.dtd                 |   2 +-
 chrome/locale/bg/sendReport.dtd               |  22 +-
 chrome/locale/bs/filters.dtd                  |   1 +
 chrome/locale/ca/global.properties            |   4 +-
 chrome/locale/ca/overlay.dtd                  |   2 +-
 chrome/locale/cs/sidebar.dtd                  |   2 +-
 chrome/locale/cy/.incomplete                  |   0
 chrome/locale/cy/composer.dtd                 |  33 ++
 chrome/locale/cy/filters.dtd                  |  71 ++-
 chrome/locale/cy/firstRun.properties          |  20 +
 chrome/locale/cy/global.properties            |  51 +-
 chrome/locale/cy/meta.properties              |   7 +-
 chrome/locale/cy/overlay.dtd                  |  31 ++
 chrome/locale/cy/sendReport.dtd               |  65 +++
 chrome/locale/cy/sidebar.dtd                  |  35 ++
 chrome/locale/cy/subscriptionSelection.dtd    |  13 +-
 chrome/locale/de/composer.dtd                 |   6 +-
 chrome/locale/de/filters.dtd                  |   2 +-
 chrome/locale/el/firstRun.properties          |   7 +-
 chrome/locale/en-GB/firstRun.properties       |   4 +-
 chrome/locale/es-CL/meta.properties           |   6 +
 chrome/locale/es-CL/overlay.dtd               |  13 +
 chrome/locale/fa/composer.dtd                 |   2 +-
 chrome/locale/hi-IN/firstRun.properties       |   4 +-
 chrome/locale/id/composer.dtd                 |  20 +-
 chrome/locale/id/filters.dtd                  |  94 ++--
 chrome/locale/id/firstRun.properties          |  38 +-
 chrome/locale/id/global.properties            |  48 +-
 chrome/locale/id/meta.properties              |   8 +-
 chrome/locale/id/overlay.dtd                  |  46 +-
 chrome/locale/id/sendReport.dtd               |  32 +-
 chrome/locale/id/sidebar.dtd                  |  46 +-
 chrome/locale/id/subscriptionSelection.dtd    |  20 +-
 chrome/locale/ja/overlay.dtd                  |   2 +-
 chrome/locale/ja/sendReport.dtd               |   4 +-
 chrome/locale/lv/firstRun.properties          |   7 +-
 chrome/locale/mk/filters.dtd                  |   2 +-
 chrome/locale/mk/sendReport.dtd               |  15 +
 chrome/locale/ru/composer.dtd                 |   2 +-
 chrome/locale/ru/global.properties            |  10 +-
 chrome/locale/ru/overlay.dtd                  |  20 +-
 chrome/locale/ru/sendReport.dtd               |  23 +-
 chrome/locale/ru/sidebar.dtd                  |   2 +-
 chrome/locale/ru/subscriptionSelection.dtd    |  12 +-
 chrome/locale/sl/composer.dtd                 |   4 +-
 chrome/locale/sq/firstRun.properties          |  20 +
 chrome/locale/sq/global.properties            |  44 +-
 chrome/locale/sq/overlay.dtd                  |  31 +-
 chrome/locale/sq/sendReport.dtd               |  14 +-
 chrome/locale/sq/subscriptionSelection.dtd    |   2 +
 chrome/locale/sv-SE/composer.dtd              |   4 +-
 chrome/locale/ta-LK/firstRun.properties       |  14 +
 chrome/locale/ta-LK/meta.properties           |   6 +
 chrome/locale/ta-LK/overlay.dtd               |  32 +-
 chrome/locale/ta-LK/sidebar.dtd               |  37 +-
 chrome/locale/ta-LK/subscriptionSelection.dtd |  12 +
 chrome/locale/tr/firstRun.properties          |   2 +-
 chrome/locale/vi/composer.dtd                 |   2 +-
 chrome/locale/vi/firstRun.properties          |   7 +-
 lib/antiadblockInit.js                        |  11 +-
 lib/contentPolicy.js                          |  96 ++--
 lib/elemHide.js                               |  31 +-
 lib/elemHideHitRegistration.js                |   6 +-
 lib/filterClasses.js                          | 114 +++--
 lib/filterListener.js                         |   8 -
 lib/filterStorage.js                          |  30 +-
 lib/io.js                                     |  31 +-
 lib/main.js                                   |  11 -
 lib/matcher.js                                |  67 +--
 lib/notification.js                           |   5 -
 lib/requestNotifier.js                        |  18 +-
 lib/synchronizer.js                           |   5 -
 lib/timeline.js                               | 155 ------
 lib/utils.js                                  |   7 +-
 metadata.gecko                                |  12 +-
 82 files changed, 1682 insertions(+), 711 deletions(-)

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