[Pkg-mozext-commits] [adblock-plus] 36/41: Merge tag 'upstream/2.6.8+dfsg'
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 18:21:40 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 4f36d30d0fec99ac0b51d25ba9b33b1c211e9cb6
Merge: 45ff1bf 13646b9
Author: David Prévot <taffit at debian.org>
Date: Wed Mar 18 13:07:35 2015 -0400
Merge tag 'upstream/2.6.8+dfsg'
Upstream version 2.6.8+dfsg
# gpg: Signature faite le mer. 18 mars 2015 13:07:28 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
.hgtags | 1 +
build.py | 16 ++--
chrome/content/errors.html | 2 +-
chrome/content/ui/composer.js | 2 +-
chrome/content/ui/filters-filterview.js | 4 +-
chrome/content/ui/filters-search.js | 76 ++++---------------
chrome/content/ui/filters-subscriptionview.js | 2 +-
chrome/content/ui/filters.js | 2 +-
chrome/content/ui/sendReport.js | 22 +++---
chrome/content/ui/sidebar.js | 14 ++--
chrome/locale/be/global.properties | 4 +
chrome/locale/bg/composer.dtd | 2 +-
chrome/locale/bg/filters.dtd | 2 +-
chrome/locale/bg/global.properties | 6 +-
chrome/locale/bg/meta.properties | 6 +-
chrome/locale/bg/sendReport.dtd | 104 +++++++++++++++-----------
chrome/locale/bn-BD/composer.dtd | 35 +++++++--
chrome/locale/bn-BD/filters.dtd | 58 +++++++++++++-
chrome/locale/bn-BD/global.properties | 9 ++-
chrome/locale/bn-BD/overlay.dtd | 1 +
chrome/locale/bn-BD/sendReport.dtd | 10 ++-
chrome/locale/bn-BD/sidebar.dtd | 34 +++++++--
chrome/locale/br/global.properties | 7 +-
chrome/locale/br/overlay.dtd | 28 ++++---
chrome/locale/br/sendReport.dtd | 5 ++
chrome/locale/br/sidebar.dtd | 6 +-
chrome/locale/bs/composer.dtd | 2 +-
chrome/locale/bs/filters.dtd | 29 +++++--
chrome/locale/cs/sendReport.dtd | 2 +-
chrome/locale/cy/global.properties | 2 +-
chrome/locale/de/overlay.dtd | 2 +-
chrome/locale/en-GB/sendReport.dtd | 2 +-
chrome/locale/en-US/sendReport.dtd | 2 +-
chrome/locale/es-CL/sendReport.dtd | 3 +
chrome/locale/es-MX/composer.dtd | 12 +--
chrome/locale/fa/sendReport.dtd | 2 +-
chrome/locale/fi/sendReport.dtd | 2 +-
chrome/locale/fr/sendReport.dtd | 2 +-
chrome/locale/gu-IN/composer.dtd | 22 ++++++
chrome/locale/hu/sendReport.dtd | 2 +-
chrome/locale/it/sendReport.dtd | 2 +-
chrome/locale/ka/composer.dtd | 36 +++++----
chrome/locale/ka/overlay.dtd | 3 +
chrome/locale/ka/subscriptionSelection.dtd | 6 +-
chrome/locale/lt/sendReport.dtd | 2 +-
chrome/locale/ml/composer.dtd | 14 +++-
chrome/locale/nl/composer.dtd | 24 +++---
chrome/locale/nl/filters.dtd | 28 +++----
chrome/locale/nl/global.properties | 30 ++++----
chrome/locale/nl/meta.properties | 8 +-
chrome/locale/nl/overlay.dtd | 32 ++++----
chrome/locale/nl/sendReport.dtd | 62 +++++++--------
chrome/locale/nl/sidebar.dtd | 14 ++--
chrome/locale/nl/subscriptionSelection.dtd | 10 +--
chrome/locale/pt-BR/sendReport.dtd | 2 +-
chrome/locale/pt-PT/sidebar.dtd | 14 ++--
chrome/locale/sl/sendReport.dtd | 10 +--
chrome/locale/sq/composer.dtd | 6 +-
chrome/locale/sq/global.properties | 4 +-
chrome/locale/sr/sendReport.dtd | 2 +-
chrome/locale/sv-SE/composer.dtd | 10 +--
chrome/locale/sv-SE/global.properties | 8 +-
chrome/locale/ta-LK/composer.dtd | 13 +++-
chrome/locale/tr/global.properties | 4 +-
chrome/locale/tr/meta.properties | 2 +-
chrome/locale/zh-CN/filters.dtd | 3 +-
chrome/locale/zh-CN/sendReport.dtd | 2 +-
chrome/skin/abp-status-16.png | Bin 1304 -> 737 bytes
chrome/skin/abp-status-32.png | Bin 3419 -> 1313 bytes
chrome/skin/abp-status.png | Bin 2433 -> 997 bytes
dependencies | 2 +-
ext/background.js | 5 ++
ext/common.js | 4 +-
icon.png | Bin 3387 -> 2600 bytes
icon64.png | Bin 5727 -> 3439 bytes
lib/contentPolicy.js | 2 +-
lib/elemHideHitRegistration.js | 2 +-
lib/filterClasses.js | 12 +--
lib/subscriptionClasses.js | 14 ++--
metadata.gecko | 14 ++--
80 files changed, 558 insertions(+), 392 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