[Pkg-mozext-commits] [adblock-plus] 18/22: Merge tag 'upstream/2.6.3'

[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 e1351f81aec648633983b2b0f2ab9408f1ff6e90
Merge: 8dd2b0d 1a2bdcd
Author: David Prévot <taffit at debian.org>
Date:   Wed Jun 4 13:31:30 2014 -0400

    Merge tag 'upstream/2.6.3'
    
    Upstream version 2.6.3
    
    # gpg: Signature faite le mer. 04 juin 2014 13:31:19 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 +-
 chrome/content/ui/filters-filterview.js |  16 ++++
 chrome/content/ui/firstRun.html         |   5 +-
 chrome/content/ui/firstRun.js           |  18 ++++-
 chrome/content/ui/overlay.xul           |   4 +-
 chrome/locale/ar/firstRun.properties    |   7 +-
 chrome/locale/be/composer.dtd           |   4 +
 chrome/locale/bg/firstRun.properties    |   7 +-
 chrome/locale/bn-IN/composer.dtd        |   6 +-
 chrome/locale/bs/composer.dtd           |   9 +--
 chrome/locale/ca/composer.dtd           |   4 +-
 chrome/locale/ca/firstRun.properties    |   9 ++-
 chrome/locale/ca/overlay.dtd            |   4 +-
 chrome/locale/ca/sidebar.dtd            |  20 ++---
 chrome/locale/cs/firstRun.properties    |   7 +-
 chrome/locale/da/firstRun.properties    |   7 +-
 chrome/locale/de/filters.dtd            |   5 +-
 chrome/locale/de/firstRun.properties    |   9 ++-
 chrome/locale/en-US/firstRun.properties |   1 +
 chrome/locale/es-AR/firstRun.properties |   7 +-
 chrome/locale/es-CL/global.properties   |  37 +++++++++
 chrome/locale/es-ES/firstRun.properties |   7 +-
 chrome/locale/es-MX/firstRun.properties |   7 +-
 chrome/locale/fa/composer.dtd           |   4 +-
 chrome/locale/fa/firstRun.properties    |   7 +-
 chrome/locale/fi/firstRun.properties    |   7 +-
 chrome/locale/fr/firstRun.properties    |   7 +-
 chrome/locale/gd/.incomplete            |   0
 chrome/locale/gd/composer.dtd           |   2 +
 chrome/locale/gl/firstRun.properties    |   7 +-
 chrome/locale/hr/firstRun.properties    |  21 ++---
 chrome/locale/hr/global.properties      |   4 +-
 chrome/locale/hr/meta.properties        |   2 +-
 chrome/locale/hu/firstRun.properties    |   7 +-
 chrome/locale/is/firstRun.properties    |   7 +-
 chrome/locale/it/firstRun.properties    |   7 +-
 chrome/locale/ja/firstRun.properties    |   7 +-
 chrome/locale/kk/firstRun.properties    |   7 +-
 chrome/locale/ko/firstRun.properties    |   9 ++-
 chrome/locale/lv/firstRun.properties    |   4 +-
 chrome/locale/lv/global.properties      |   4 +-
 chrome/locale/lv/overlay.dtd            |   5 +-
 chrome/locale/nb-NO/firstRun.properties |   7 +-
 chrome/locale/nl/global.properties      |   2 +-
 chrome/locale/nn-NO/composer.dtd        |  13 +++-
 chrome/locale/pl/firstRun.properties    |   7 +-
 chrome/locale/pt-BR/firstRun.properties |   7 +-
 chrome/locale/pt-PT/firstRun.properties |   7 +-
 chrome/locale/ro/firstRun.properties    |   7 +-
 chrome/locale/ru/firstRun.properties    |   7 +-
 chrome/locale/sk/firstRun.properties    |   7 +-
 chrome/locale/sk/meta.properties        |   2 +-
 chrome/locale/sl/firstRun.properties    |   7 +-
 chrome/locale/sr/firstRun.properties    |   7 +-
 chrome/locale/sr/global.properties      |   1 +
 chrome/locale/sv-SE/global.properties   |   2 +
 chrome/locale/th/composer.dtd           |  10 +--
 chrome/locale/th/firstRun.properties    |   9 ++-
 chrome/locale/tr/firstRun.properties    |   7 +-
 chrome/locale/tr/meta.properties        |   2 +-
 chrome/locale/uk/firstRun.properties    |   7 +-
 chrome/locale/zh-CN/composer.dtd        |   2 +-
 chrome/locale/zh-CN/firstRun.properties |   7 +-
 chrome/skin/firstRun.css                |   4 +-
 defaults/prefs.js                       |   1 +
 lib/elemHide.js                         |  10 ++-
 lib/io.js                               |  21 +++++
 lib/requestNotifier.js                  |   5 +-
 lib/ui.js                               | 132 ++++++++++++++++++++------------
 lib/utils.js                            |   6 ++
 metadata.gecko                          |  12 +--
 71 files changed, 410 insertions(+), 230 deletions(-)

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