[Pkg-mozext-commits] [adblock-plus] 02/06: Merge tag 'upstream/2.6+dfsg'
David Prévot
taffit at moszumanska.debian.org
Wed Apr 23 16:15:15 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository adblock-plus.
commit e7032a615a291093255bf134222e249cb9b573d1
Merge: ee3eec7 3662628
Author: David Prévot <taffit at debian.org>
Date: Wed Apr 23 10:00:59 2014 -0400
Merge tag 'upstream/2.6+dfsg'
Upstream version 2.6+dfsg
# gpg: Signature faite le mer. 23 avril 2014 10:00:50 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
.hg_archival.txt | 4 +-
.hgsubstate | 2 +-
addChecksum.py | 2 +-
buildtools/.hgsubstate | 2 +-
buildtools/Info.plist.tmpl | 4 +-
buildtools/LocaleTester.pm | 2 +-
buildtools/bootstrap.js.tmpl | 4 +-
buildtools/build.py | 2 +-
buildtools/chainedconfigparser.py | 2 +-
buildtools/chromeDevenvPoller__.js.tmpl | 2 +-
buildtools/chromeInfo.js.tmpl | 2 +-
buildtools/imageConversion.py | 2 +-
buildtools/install.rdf.tmpl | 2 +-
buildtools/jshydra/autotest/abprewrite_source.js | 10 +-
.../jshydra/autotest/test_abprewrite.js.expected | 2 +-
.../autotest/test_abprewrite_module.js.expected | 2 +-
buildtools/jshydra/jshydra.js | 2 +-
buildtools/jshydra/scripts/abprewrite.js | 64 +++--
buildtools/jshydra/scripts/astDecompile.js | 11 +
buildtools/jshydra/utils.py | 2 +-
buildtools/lib/hooks.js | 2 +-
buildtools/lib/keySelector.js | 2 +-
buildtools/lib/prefs.js | 2 +-
buildtools/lib/windowObserver.js | 2 +-
buildtools/localeTools.py | 2 +-
buildtools/manifest.json.tmpl | 2 +-
buildtools/packager.py | 2 +-
buildtools/packagerChrome.py | 90 ++++---
buildtools/packagerGecko.py | 2 +-
buildtools/packagerSafari.py | 3 +-
buildtools/publicSuffixListUpdater.py | 2 +-
buildtools/releaseAutomation.py | 21 +-
buildtools/safariInfo.js.tmpl | 2 +-
chrome/content/objtabs.css | 2 +-
chrome/content/ui/composer.js | 2 +-
chrome/content/ui/composer.xul | 2 +-
chrome/content/ui/fennecSettings.xul | 2 +-
chrome/content/ui/filters-backup.js | 6 +-
chrome/content/ui/filters-filteractions.js | 2 +-
chrome/content/ui/filters-filterview.js | 2 +-
chrome/content/ui/filters-search.js | 89 ++++++-
chrome/content/ui/filters-subscriptionactions.js | 2 +-
chrome/content/ui/filters-subscriptionview.js | 2 +-
chrome/content/ui/filters.js | 9 +-
chrome/content/ui/filters.xul | 2 +-
chrome/content/ui/firstRun.html | 2 +-
chrome/content/ui/firstRun.js | 2 +-
chrome/content/ui/flasher.js | 2 +-
chrome/content/ui/i18n.js | 2 +-
chrome/content/ui/overlay.xul | 2 +-
chrome/content/ui/progressBar.js | 2 +-
chrome/content/ui/progressBar.xul | 2 +-
chrome/content/ui/sendReport.js | 6 +-
chrome/content/ui/sendReport.xul | 2 +-
chrome/content/ui/settings.xul | 2 +-
chrome/content/ui/sidebar.js | 2 +-
chrome/content/ui/sidebar.xul | 2 +-
chrome/content/ui/sidebarDetached.xul | 2 +-
chrome/content/ui/subscriptionSelection.js | 2 +-
chrome/content/ui/subscriptionSelection.xul | 2 +-
chrome/content/ui/subscriptions.xml | 10 +-
chrome/content/ui/utils.js | 2 +-
chrome/locale/ar/overlay.dtd | 2 +-
chrome/locale/{eu => ast}/.incomplete | 0
chrome/locale/ast/firstRun.properties | 6 +
chrome/locale/bs/firstRun.properties | 17 ++
chrome/locale/bs/meta.properties | 4 +
chrome/locale/bs/overlay.dtd | 2 +
chrome/locale/ca/global.properties | 2 +
chrome/locale/ca/overlay.dtd | 3 +
chrome/locale/cs/meta.properties | 2 +-
chrome/locale/de/composer.dtd | 6 +-
chrome/locale/de/filters.dtd | 2 +-
chrome/locale/de/sendReport.dtd | 2 +-
chrome/locale/eo/composer.dtd | 24 +-
chrome/locale/eo/meta.properties | 4 +-
chrome/locale/es-CL/composer.dtd | 16 +-
chrome/locale/es-CL/filters.dtd | 72 +++++
chrome/locale/es-CL/firstRun.properties | 19 ++
chrome/locale/fa/composer.dtd | 6 +-
chrome/locale/hi-IN/filters.dtd | 3 +-
chrome/locale/id/composer.dtd | 4 +-
chrome/locale/id/meta.properties | 3 +-
chrome/locale/id/subscriptionSelection.dtd | 2 +-
chrome/locale/it/composer.dtd | 2 +-
chrome/locale/lt/global.properties | 2 +
chrome/locale/mk/composer.dtd | 4 +-
chrome/locale/mk/filters.dtd | 70 ++++-
chrome/locale/mk/firstRun.properties | 4 +
chrome/locale/{nb-NO => ml}/.incomplete | 0
chrome/locale/ml/composer.dtd | 4 +
chrome/locale/{eu => mn}/.incomplete | 0
chrome/locale/ms/composer.dtd | 6 +-
chrome/locale/ms/global.properties | 2 +
chrome/locale/ms/meta.properties | 2 +-
chrome/locale/ms/overlay.dtd | 3 +
chrome/locale/ms/sendReport.dtd | 6 +-
chrome/locale/nb-NO/sendReport.dtd | 4 +-
chrome/locale/nl/global.properties | 4 +-
chrome/locale/pl/global.properties | 2 +
chrome/locale/ru/global.properties | 2 +
chrome/locale/ru/overlay.dtd | 3 +
chrome/locale/sl/global.properties | 2 +
chrome/locale/sl/overlay.dtd | 2 +-
chrome/locale/sl/subscriptionSelection.dtd | 2 +-
chrome/locale/tr/overlay.dtd | 3 +
chrome/locale/uk/composer.dtd | 2 +-
chrome/locale/vi/filters.dtd | 48 ++--
chrome/locale/vi/firstRun.properties | 19 +-
chrome/locale/vi/global.properties | 34 +--
chrome/locale/vi/meta.properties | 4 +-
chrome/locale/vi/overlay.dtd | 7 +-
chrome/locale/vi/sendReport.dtd | 8 +-
chrome/locale/vi/sidebar.dtd | 4 +-
chrome/locale/vi/subscriptionSelection.dtd | 2 +-
chrome/locale/zh-TW/global.properties | 2 +
chrome/skin/composer.css | 2 +-
chrome/skin/filters.css | 2 +-
chrome/skin/firstRun.css | 2 +-
chrome/skin/overlay.css | 2 +-
chrome/skin/sendReport.css | 2 +-
chrome/skin/sidebar.css | 2 +-
chrome/skin/subscriptionSelection.css | 2 +-
defaults/patterns.ini | 2 -
lib/Public.jsm | 8 +-
lib/antiadblockInit.js | 78 ++++++
lib/appSupport.js | 2 +-
lib/contentPolicy.js | 26 +-
lib/customizableUI.js | 2 +-
lib/downloader.js | 4 +-
lib/elemHide.js | 19 +-
lib/elemHideHitRegistration.js | 2 +-
lib/filterClasses.js | 29 +-
lib/filterListener.js | 4 +-
lib/filterNotifier.js | 5 +-
lib/filterStorage.js | 53 ++--
lib/io.js | 291 +++++++++++----------
lib/main.js | 2 +-
lib/matcher.js | 2 +-
lib/notification.js | 15 +-
lib/objectTabs.js | 4 +-
lib/requestNotifier.js | 67 ++---
lib/subscriptionClasses.js | 6 +-
lib/sync.js | 26 +-
lib/synchronizer.js | 6 +-
lib/timeline.js | 2 +-
lib/ui.js | 107 ++------
lib/utils.js | 17 +-
metadata.gecko | 12 +-
normalizeLocales.pl | 2 +-
search_and_replace.pl | 2 +-
test_locales.pl | 2 +-
update_locales.py | 2 +-
validateChecksum.py | 2 +-
154 files changed, 1074 insertions(+), 628 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