[Pkg-mozext-commits] [adblock-plus] 02/09: Merge tag 'upstream/2.4'

David Prévot taffit at alioth.debian.org
Thu Oct 10 20:08:49 UTC 2013


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

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

commit 54b0e9902974627564ec75cc2634d596b3dc5d73
Merge: 1ad63ba eae43bf
Author: David Prévot <taffit at debian.org>
Date:   Thu Oct 10 00:05:20 2013 -0400

    Merge tag 'upstream/2.4'
    
    Upstream version 2.4
    
    # gpg: Signature faite le jeu. 10 oct. 2013 00:05:15 AST avec la clef RSA d'identifiant 44F6BD3C
    # 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/build.py                                |   34 +-
 buildtools/lib/windowObserver.js                   |   18 +-
 buildtools/packager.py                             |    6 +-
 ...easeAutomationGecko.py => releaseAutomation.py} |   47 +-
 chrome/content/errors.html                         |    2 +-
 chrome/content/ui/firstRun.html                    |  171 +++--
 chrome/content/ui/firstRun.js                      |   65 +-
 chrome/content/ui/i18n.js                          |   20 +-
 chrome/content/ui/sendReport.js                    |    2 +-
 chrome/content/ui/subscriptions.xml                |   20 +-
 chrome/locale/af/meta.properties                   |    7 +-
 chrome/locale/ar/composer.dtd                      |    8 +-
 chrome/locale/ar/firstRun.properties               |   20 +
 chrome/locale/ar/meta.properties                   |    4 +-
 chrome/locale/bg/composer.dtd                      |   18 +-
 chrome/locale/bg/firstRun.properties               |   20 +
 chrome/locale/bn-BD/composer.dtd                   |   14 +-
 chrome/locale/bn-BD/filters.dtd                    |   22 +
 chrome/locale/bn-BD/firstRun.properties            |    5 +
 chrome/locale/bn-BD/global.properties              |    8 +
 chrome/locale/bn-BD/meta.properties                |    3 +
 chrome/locale/bn-BD/overlay.dtd                    |    6 +
 chrome/locale/bn-BD/sendReport.dtd                 |    5 +
 chrome/locale/bn-BD/sidebar.dtd                    |   17 +
 chrome/locale/bn-BD/subscriptionSelection.dtd      |    5 +
 chrome/locale/ca/firstRun.properties               |   19 +-
 chrome/locale/cs/composer.dtd                      |    4 +-
 chrome/locale/cs/firstRun.properties               |   20 +
 chrome/locale/cs/meta.properties                   |    8 +-
 chrome/locale/da/firstRun.properties               |   19 +-
 chrome/locale/de/firstRun.properties               |   19 +-
 chrome/locale/de/subscriptionSelection.dtd         |    2 +-
 chrome/locale/dsb/firstRun.properties              |   17 +-
 chrome/locale/el/composer.dtd                      |   10 +-
 chrome/locale/el/firstRun.properties               |   31 +-
 chrome/locale/en-GB/composer.dtd                   |   37 +-
 chrome/locale/en-GB/filters.dtd                    |   17 +-
 chrome/locale/en-GB/firstRun.properties            |    7 +
 chrome/locale/en-GB/overlay.dtd                    |   28 +-
 chrome/locale/en-GB/sendReport.dtd                 |   28 +-
 chrome/locale/en-GB/sidebar.dtd                    |    1 +
 chrome/locale/en-GB/subscriptionSelection.dtd      |    5 +-
 chrome/locale/en-US/firstRun.properties            |   20 +-
 chrome/locale/eo/firstRun.properties               |   17 +-
 chrome/locale/es-AR/composer.dtd                   |    2 +-
 chrome/locale/es-AR/filters.dtd                    |    2 +-
 chrome/locale/es-AR/firstRun.properties            |   25 +-
 chrome/locale/es-AR/global.properties              |   16 +-
 chrome/locale/es-AR/meta.properties                |    2 +-
 chrome/locale/es-AR/overlay.dtd                    |    4 +-
 chrome/locale/es-AR/sendReport.dtd                 |   22 +-
 chrome/locale/es-AR/sidebar.dtd                    |   10 +-
 chrome/locale/es-AR/subscriptionSelection.dtd      |    2 +-
 chrome/locale/es-CL/composer.dtd                   |    7 +
 chrome/locale/es-ES/firstRun.properties            |   19 +-
 chrome/locale/es-MX/composer.dtd                   |   10 +-
 chrome/locale/es-MX/filters.dtd                    |   26 +-
 chrome/locale/es-MX/firstRun.properties            |   17 +-
 chrome/locale/es-MX/global.properties              |   12 +-
 chrome/locale/es-MX/overlay.dtd                    |   20 +-
 chrome/locale/es-MX/sendReport.dtd                 |   24 +-
 chrome/locale/es-MX/sidebar.dtd                    |    2 +-
 chrome/locale/es-MX/subscriptionSelection.dtd      |    4 +-
 chrome/locale/eu/composer.dtd                      |    2 +-
 chrome/locale/eu/firstRun.properties               |   10 +-
 chrome/locale/fa/firstRun.properties               |    6 +-
 chrome/locale/fa/global.properties                 |    2 +
 chrome/locale/fi/composer.dtd                      |    6 +-
 chrome/locale/fi/firstRun.properties               |   19 +-
 chrome/locale/fr/firstRun.properties               |   17 +-
 chrome/locale/gl/firstRun.properties               |   19 +-
 chrome/locale/he/firstRun.properties               |   19 +-
 chrome/locale/hr/firstRun.properties               |   17 +-
 chrome/locale/hsb/firstRun.properties              |   17 +-
 chrome/locale/hu/firstRun.properties               |   19 +-
 chrome/locale/hy-AM/firstRun.properties            |    2 +
 chrome/locale/id/composer.dtd                      |   33 -
 chrome/locale/id/filters.dtd                       |   81 ++-
 chrome/locale/id/firstRun.properties               |   20 +
 chrome/locale/id/global.properties                 |   67 +-
 chrome/locale/id/meta.properties                   |    6 +-
 chrome/locale/id/overlay.dtd                       |   44 +-
 chrome/locale/id/sendReport.dtd                    |   79 ++-
 chrome/locale/id/sidebar.dtd                       |   23 +-
 chrome/locale/id/subscriptionSelection.dtd         |   13 +-
 chrome/locale/is/firstRun.properties               |   19 +-
 chrome/locale/it/composer.dtd                      |   18 +-
 chrome/locale/it/firstRun.properties               |   25 +-
 chrome/locale/ja/firstRun.properties               |   19 +-
 chrome/locale/ja/meta.properties                   |    2 +-
 chrome/locale/ja/subscriptionSelection.dtd         |    2 +-
 chrome/locale/ka/global.properties                 |   13 +
 chrome/locale/ka/meta.properties                   |    3 +
 chrome/locale/ka/sendReport.dtd                    |    1 +
 chrome/locale/ka/sidebar.dtd                       |   15 +
 chrome/locale/ka/subscriptionSelection.dtd         |   12 +-
 chrome/locale/kk/firstRun.properties               |   19 +-
 chrome/locale/km/meta.properties                   |    3 +
 chrome/locale/km/sidebar.dtd                       |   32 +
 chrome/locale/ko/composer.dtd                      |    4 +-
 chrome/locale/ko/firstRun.properties               |   20 +-
 chrome/locale/ko/global.properties                 |    4 +-
 chrome/locale/ko/meta.properties                   |    2 +-
 chrome/locale/ko/sendReport.dtd                    |    6 +-
 chrome/locale/lt/firstRun.properties               |   19 +-
 chrome/locale/lv/firstRun.properties               |   20 +
 chrome/locale/lv/overlay.dtd                       |    3 +-
 chrome/locale/mk/filters.dtd                       |   12 +
 chrome/locale/ms/firstRun.properties               |    7 +
 chrome/locale/nb-NO/filters.dtd                    |    5 +-
 chrome/locale/nb-NO/firstRun.properties            |    7 +
 chrome/locale/nl/composer.dtd                      |    4 +-
 chrome/locale/nl/filters.dtd                       |    2 +-
 chrome/locale/nl/firstRun.properties               |   17 +-
 chrome/locale/pl/firstRun.properties               |   17 +-
 chrome/locale/pt-BR/composer.dtd                   |   16 +-
 chrome/locale/pt-BR/filters.dtd                    |   22 +-
 chrome/locale/pt-BR/firstRun.properties            |   21 +-
 chrome/locale/pt-BR/overlay.dtd                    |   10 +-
 chrome/locale/pt-BR/sendReport.dtd                 |   32 +-
 chrome/locale/pt-BR/sidebar.dtd                    |    6 +-
 chrome/locale/pt-BR/subscriptionSelection.dtd      |    2 +-
 chrome/locale/pt-PT/composer.dtd                   |   30 +-
 chrome/locale/pt-PT/filters.dtd                    |   82 +--
 chrome/locale/pt-PT/firstRun.properties            |   27 +-
 chrome/locale/pt-PT/global.properties              |   52 +-
 chrome/locale/pt-PT/meta.properties                |    8 +-
 chrome/locale/pt-PT/overlay.dtd                    |   40 +-
 chrome/locale/pt-PT/sendReport.dtd                 |   94 +--
 chrome/locale/pt-PT/sidebar.dtd                    |   34 +-
 chrome/locale/pt-PT/subscriptionSelection.dtd      |   12 +-
 chrome/locale/ro/firstRun.properties               |   17 +-
 chrome/locale/ru/composer.dtd                      |   14 +-
 chrome/locale/ru/firstRun.properties               |   23 +-
 chrome/locale/sk/composer.dtd                      |    8 +-
 chrome/locale/sk/firstRun.properties               |   19 +-
 chrome/locale/sl/firstRun.properties               |   20 +
 chrome/locale/sl/meta.properties                   |    4 +-
 chrome/locale/sl/sendReport.dtd                    |   26 +-
 chrome/locale/sq/filters.dtd                       |   17 +-
 chrome/locale/sr/composer.dtd                      |   28 +-
 chrome/locale/sr/firstRun.properties               |   18 +
 chrome/locale/sv-SE/composer.dtd                   |   24 +-
 chrome/locale/sv-SE/firstRun.properties            |   20 +
 chrome/locale/th/firstRun.properties               |    7 +
 chrome/locale/tr/composer.dtd                      |   24 +-
 chrome/locale/tr/filters.dtd                       |   50 +-
 chrome/locale/tr/firstRun.properties               |   19 +-
 chrome/locale/tr/global.properties                 |    8 +-
 chrome/locale/tr/meta.properties                   |    2 +-
 chrome/locale/tr/overlay.dtd                       |   24 +-
 chrome/locale/tr/sendReport.dtd                    |   32 +-
 chrome/locale/tr/sidebar.dtd                       |    8 +-
 chrome/locale/tr/subscriptionSelection.dtd         |   10 +-
 chrome/locale/uk/firstRun.properties               |   17 +-
 chrome/locale/vi/firstRun.properties               |   10 +-
 chrome/locale/zh-CN/composer.dtd                   |    6 +-
 chrome/locale/zh-CN/firstRun.properties            |    7 +
 chrome/locale/zh-CN/sendReport.dtd                 |    2 +
 chrome/locale/zh-TW/firstRun.properties            |   20 +
 chrome/locale/zh-TW/sendReport.dtd                 |    4 +
 chrome/skin/abp-icon-big.png                       |  Bin 14719 -> 15201 bytes
 chrome/skin/arrow-down.png                         |  Bin 0 -> 452 bytes
 chrome/skin/arrow-up.png                           |  Bin 0 -> 478 bytes
 chrome/skin/background-candomore.png               |  Bin 0 -> 246 bytes
 chrome/skin/background-main.png                    |  Bin 0 -> 260 bytes
 chrome/skin/background-share.png                   |  Bin 0 -> 252 bytes
 chrome/skin/donate.png                             |  Bin 0 -> 160 bytes
 chrome/skin/features/malware.png                   |  Bin 1539 -> 3335 bytes
 chrome/skin/features/social.png                    |  Bin 2410 -> 4260 bytes
 chrome/skin/features/tracking.png                  |  Bin 1854 -> 3562 bytes
 chrome/skin/firstRun.css                           |  726 +++++++++++++-------
 chrome/skin/fonts/CreteRound-Italic.otf            |  Bin 0 -> 43152 bytes
 chrome/skin/fonts/CreteRound-Regular.otf           |  Bin 0 -> 40968 bytes
 chrome/skin/social/facebook.png                    |  Bin 1136 -> 3861 bytes
 chrome/skin/social/googleplus.png                  |  Bin 0 -> 4009 bytes
 chrome/skin/social/gplus.png                       |  Bin 1501 -> 0 bytes
 chrome/skin/social/renren.png                      |  Bin 0 -> 2619 bytes
 chrome/skin/social/twitter.png                     |  Bin 1214 -> 3944 bytes
 chrome/skin/social/weibo.png                       |  Bin 0 -> 3497 bytes
 lib/contentPolicy.js                               |   27 +-
 lib/downloader.js                                  |    6 +-
 lib/requestNotifier.js                             |    4 +-
 metadata.gecko                                     |   12 +-
 186 files changed, 2404 insertions(+), 1288 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