3 files changed, 95 insertions, 36 deletions

diff --git a/www/xpi-adblock_plus/Makefile b/www/xpi-adblock_plus/Makefile
index 54a1e3557dbc..e615b9b0048f 100644
--- a/www/xpi-adblock_plus/Makefile
+++ b/www/xpi-adblock_plus/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	xpi-adblock_plus
-# Date created:			2 May 2006
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	adblock_plus
-PORTVERSION=	2.1.2
-DISTVERSIONSUFFIX=	-sm+an+fx+tb
+PORTVERSION=	2.2.1
+DISTVERSIONSUFFIX=	-sm+tb+an+fx
 CATEGORIES=	www
 
 MAINTAINER=	ale@FreeBSD.org
diff --git a/www/xpi-adblock_plus/distinfo b/www/xpi-adblock_plus/distinfo
index 7601d904475a..8dddfc3d790b 100644
--- a/www/xpi-adblock_plus/distinfo
+++ b/www/xpi-adblock_plus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xpi/adblock_plus-2.1.2-sm+an+fx+tb.xpi) = 4a3308d668e9b62291354647ba97cab11bb3d3ae2ac8d7a324aea1205add5aef
-SIZE (xpi/adblock_plus-2.1.2-sm+an+fx+tb.xpi) = 741958
+SHA256 (xpi/adblock_plus-2.2.1-sm+tb+an+fx.xpi) = 1c1b4e42504f785a66a7219267e787ebd7ee102eccd4f84bf3eb642300d44583
+SIZE (xpi/adblock_plus-2.2.1-sm+tb+an+fx.xpi) = 804627
diff --git a/www/xpi-adblock_plus/pkg-plist b/www/xpi-adblock_plus/pkg-plist
index 3d1eb1bdc675..f8d64ee45e4d 100644
--- a/www/xpi-adblock_plus/pkg-plist
+++ b/www/xpi-adblock_plus/pkg-plist
@@ -27,6 +27,7 @@
 %%XPI_XPIDIR%%/chrome/content/ui/subscriptionSelection.js
 %%XPI_XPIDIR%%/chrome/content/ui/subscriptionSelection.xul
 %%XPI_XPIDIR%%/chrome/content/ui/subscriptions.xml
+%%XPI_XPIDIR%%/chrome/content/ui/typoSettings.js
 %%XPI_XPIDIR%%/chrome/content/ui/utils.js
 %%XPI_XPIDIR%%/chrome/locale/ar/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/ar/filters.dtd
@@ -36,6 +37,7 @@
 %%XPI_XPIDIR%%/chrome/locale/ar/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/ar/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/ar/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/ar/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/bg/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/bg/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/bg/firstRun.dtd
@@ -44,6 +46,7 @@
 %%XPI_XPIDIR%%/chrome/locale/bg/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/bg/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/bg/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/bg/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/ca/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/ca/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/ca/firstRun.dtd
@@ -52,6 +55,7 @@
 %%XPI_XPIDIR%%/chrome/locale/ca/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/ca/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/ca/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/ca/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/cs/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/cs/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/cs/firstRun.dtd
@@ -60,6 +64,7 @@
 %%XPI_XPIDIR%%/chrome/locale/cs/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/cs/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/cs/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/cs/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/da/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/da/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/da/firstRun.dtd
@@ -68,6 +73,7 @@
 %%XPI_XPIDIR%%/chrome/locale/da/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/da/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/da/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/da/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/de/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/de/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/de/firstRun.dtd
@@ -76,6 +82,16 @@
 %%XPI_XPIDIR%%/chrome/locale/de/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/de/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/de/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/de/typo.properties
+%%XPI_XPIDIR%%/chrome/locale/dsb/composer.dtd
+%%XPI_XPIDIR%%/chrome/locale/dsb/filters.dtd
+%%XPI_XPIDIR%%/chrome/locale/dsb/firstRun.dtd
+%%XPI_XPIDIR%%/chrome/locale/dsb/global.properties
+%%XPI_XPIDIR%%/chrome/locale/dsb/overlay.dtd
+%%XPI_XPIDIR%%/chrome/locale/dsb/sendReport.dtd
+%%XPI_XPIDIR%%/chrome/locale/dsb/sidebar.dtd
+%%XPI_XPIDIR%%/chrome/locale/dsb/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/dsb/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/el/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/el/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/el/firstRun.dtd
@@ -84,6 +100,7 @@
 %%XPI_XPIDIR%%/chrome/locale/el/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/el/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/el/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/el/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/en-GB/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/en-GB/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/en-GB/firstRun.dtd
@@ -92,6 +109,7 @@
 %%XPI_XPIDIR%%/chrome/locale/en-GB/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/en-GB/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/en-GB/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/en-GB/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/en-US/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/en-US/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/en-US/firstRun.dtd
@@ -100,6 +118,7 @@
 %%XPI_XPIDIR%%/chrome/locale/en-US/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/en-US/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/en-US/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/en-US/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/eo/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/eo/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/eo/firstRun.dtd
@@ -108,6 +127,7 @@
 %%XPI_XPIDIR%%/chrome/locale/eo/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/eo/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/eo/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/eo/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/es-AR/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/es-AR/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/es-AR/firstRun.dtd
@@ -116,6 +136,7 @@
 %%XPI_XPIDIR%%/chrome/locale/es-AR/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/es-AR/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/es-AR/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/es-AR/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/es-ES/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/es-ES/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/es-ES/firstRun.dtd
@@ -124,6 +145,7 @@
 %%XPI_XPIDIR%%/chrome/locale/es-ES/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/es-ES/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/es-ES/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/es-ES/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/es-MX/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/es-MX/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/es-MX/firstRun.dtd
@@ -132,6 +154,7 @@
 %%XPI_XPIDIR%%/chrome/locale/es-MX/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/es-MX/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/es-MX/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/es-MX/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/et/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/et/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/et/firstRun.dtd
@@ -140,6 +163,7 @@
 %%XPI_XPIDIR%%/chrome/locale/et/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/et/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/et/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/et/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/fa/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/fa/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/fa/firstRun.dtd
@@ -148,6 +172,7 @@
 %%XPI_XPIDIR%%/chrome/locale/fa/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/fa/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/fa/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/fa/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/fi/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/fi/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/fi/firstRun.dtd
@@ -156,6 +181,7 @@
 %%XPI_XPIDIR%%/chrome/locale/fi/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/fi/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/fi/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/fi/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/fr/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/fr/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/fr/firstRun.dtd
@@ -164,6 +190,7 @@
 %%XPI_XPIDIR%%/chrome/locale/fr/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/fr/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/fr/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/fr/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/fy-NL/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/fy-NL/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/fy-NL/firstRun.dtd
@@ -172,6 +199,7 @@
 %%XPI_XPIDIR%%/chrome/locale/fy-NL/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/fy-NL/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/fy-NL/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/fy-NL/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/gl/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/gl/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/gl/firstRun.dtd
@@ -180,6 +208,7 @@
 %%XPI_XPIDIR%%/chrome/locale/gl/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/gl/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/gl/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/gl/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/he/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/he/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/he/firstRun.dtd
@@ -188,6 +217,7 @@
 %%XPI_XPIDIR%%/chrome/locale/he/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/he/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/he/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/he/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/hr/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/hr/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/hr/firstRun.dtd
@@ -196,6 +226,7 @@
 %%XPI_XPIDIR%%/chrome/locale/hr/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/hr/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/hr/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/hr/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/hsb/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/hsb/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/hsb/firstRun.dtd
@@ -204,6 +235,7 @@
 %%XPI_XPIDIR%%/chrome/locale/hsb/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/hsb/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/hsb/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/hsb/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/hu/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/hu/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/hu/firstRun.dtd
@@ -212,6 +244,7 @@
 %%XPI_XPIDIR%%/chrome/locale/hu/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/hu/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/hu/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/hu/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/hy-AM/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/hy-AM/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/hy-AM/firstRun.dtd
@@ -220,6 +253,7 @@
 %%XPI_XPIDIR%%/chrome/locale/hy-AM/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/hy-AM/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/hy-AM/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/hy-AM/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/is/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/is/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/is/firstRun.dtd
@@ -228,6 +262,7 @@
 %%XPI_XPIDIR%%/chrome/locale/is/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/is/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/is/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/is/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/it/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/it/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/it/firstRun.dtd
@@ -236,6 +271,7 @@
 %%XPI_XPIDIR%%/chrome/locale/it/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/it/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/it/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/it/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/ja/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/ja/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/ja/firstRun.dtd
@@ -244,22 +280,16 @@
 %%XPI_XPIDIR%%/chrome/locale/ja/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/ja/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/ja/subscriptionSelection.dtd
-%%XPI_XPIDIR%%/chrome/locale/ka-GE/composer.dtd
-%%XPI_XPIDIR%%/chrome/locale/ka-GE/filters.dtd
-%%XPI_XPIDIR%%/chrome/locale/ka-GE/firstRun.dtd
-%%XPI_XPIDIR%%/chrome/locale/ka-GE/global.properties
-%%XPI_XPIDIR%%/chrome/locale/ka-GE/overlay.dtd
-%%XPI_XPIDIR%%/chrome/locale/ka-GE/sendReport.dtd
-%%XPI_XPIDIR%%/chrome/locale/ka-GE/sidebar.dtd
-%%XPI_XPIDIR%%/chrome/locale/ka-GE/subscriptionSelection.dtd
-%%XPI_XPIDIR%%/chrome/locale/kk-KZ/composer.dtd
-%%XPI_XPIDIR%%/chrome/locale/kk-KZ/filters.dtd
-%%XPI_XPIDIR%%/chrome/locale/kk-KZ/firstRun.dtd
-%%XPI_XPIDIR%%/chrome/locale/kk-KZ/global.properties
-%%XPI_XPIDIR%%/chrome/locale/kk-KZ/overlay.dtd
-%%XPI_XPIDIR%%/chrome/locale/kk-KZ/sendReport.dtd
-%%XPI_XPIDIR%%/chrome/locale/kk-KZ/sidebar.dtd
-%%XPI_XPIDIR%%/chrome/locale/kk-KZ/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/ja/typo.properties
+%%XPI_XPIDIR%%/chrome/locale/kk/composer.dtd
+%%XPI_XPIDIR%%/chrome/locale/kk/filters.dtd
+%%XPI_XPIDIR%%/chrome/locale/kk/firstRun.dtd
+%%XPI_XPIDIR%%/chrome/locale/kk/global.properties
+%%XPI_XPIDIR%%/chrome/locale/kk/overlay.dtd
+%%XPI_XPIDIR%%/chrome/locale/kk/sendReport.dtd
+%%XPI_XPIDIR%%/chrome/locale/kk/sidebar.dtd
+%%XPI_XPIDIR%%/chrome/locale/kk/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/kk/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/ko/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/ko/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/ko/firstRun.dtd
@@ -268,6 +298,7 @@
 %%XPI_XPIDIR%%/chrome/locale/ko/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/ko/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/ko/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/ko/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/lt/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/lt/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/lt/firstRun.dtd
@@ -276,6 +307,7 @@
 %%XPI_XPIDIR%%/chrome/locale/lt/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/lt/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/lt/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/lt/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/lv/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/lv/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/lv/firstRun.dtd
@@ -284,6 +316,7 @@
 %%XPI_XPIDIR%%/chrome/locale/lv/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/lv/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/lv/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/lv/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/mn/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/mn/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/mn/firstRun.dtd
@@ -292,14 +325,16 @@
 %%XPI_XPIDIR%%/chrome/locale/mn/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/mn/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/mn/subscriptionSelection.dtd
-%%XPI_XPIDIR%%/chrome/locale/ms-MY/composer.dtd
-%%XPI_XPIDIR%%/chrome/locale/ms-MY/filters.dtd
-%%XPI_XPIDIR%%/chrome/locale/ms-MY/firstRun.dtd
-%%XPI_XPIDIR%%/chrome/locale/ms-MY/global.properties
-%%XPI_XPIDIR%%/chrome/locale/ms-MY/overlay.dtd
-%%XPI_XPIDIR%%/chrome/locale/ms-MY/sendReport.dtd
-%%XPI_XPIDIR%%/chrome/locale/ms-MY/sidebar.dtd
-%%XPI_XPIDIR%%/chrome/locale/ms-MY/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/mn/typo.properties
+%%XPI_XPIDIR%%/chrome/locale/ms/composer.dtd
+%%XPI_XPIDIR%%/chrome/locale/ms/filters.dtd
+%%XPI_XPIDIR%%/chrome/locale/ms/firstRun.dtd
+%%XPI_XPIDIR%%/chrome/locale/ms/global.properties
+%%XPI_XPIDIR%%/chrome/locale/ms/overlay.dtd
+%%XPI_XPIDIR%%/chrome/locale/ms/sendReport.dtd
+%%XPI_XPIDIR%%/chrome/locale/ms/sidebar.dtd
+%%XPI_XPIDIR%%/chrome/locale/ms/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/ms/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/nl/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/nl/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/nl/firstRun.dtd
@@ -308,6 +343,7 @@
 %%XPI_XPIDIR%%/chrome/locale/nl/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/nl/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/nl/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/nl/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/pl/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/pl/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/pl/firstRun.dtd
@@ -316,6 +352,7 @@
 %%XPI_XPIDIR%%/chrome/locale/pl/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/pl/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/pl/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/pl/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/pt-BR/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/pt-BR/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/pt-BR/firstRun.dtd
@@ -324,6 +361,7 @@
 %%XPI_XPIDIR%%/chrome/locale/pt-BR/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/pt-BR/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/pt-BR/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/pt-BR/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/pt-PT/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/pt-PT/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/pt-PT/firstRun.dtd
@@ -332,6 +370,7 @@
 %%XPI_XPIDIR%%/chrome/locale/pt-PT/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/pt-PT/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/pt-PT/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/pt-PT/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/ro/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/ro/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/ro/firstRun.dtd
@@ -340,6 +379,7 @@
 %%XPI_XPIDIR%%/chrome/locale/ro/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/ro/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/ro/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/ro/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/ru/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/ru/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/ru/firstRun.dtd
@@ -348,6 +388,7 @@
 %%XPI_XPIDIR%%/chrome/locale/ru/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/ru/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/ru/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/ru/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/sk/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/sk/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/sk/firstRun.dtd
@@ -356,6 +397,7 @@
 %%XPI_XPIDIR%%/chrome/locale/sk/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/sk/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/sk/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/sk/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/sl/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/sl/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/sl/firstRun.dtd
@@ -364,6 +406,7 @@
 %%XPI_XPIDIR%%/chrome/locale/sl/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/sl/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/sl/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/sl/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/sq/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/sq/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/sq/firstRun.dtd
@@ -372,6 +415,7 @@
 %%XPI_XPIDIR%%/chrome/locale/sq/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/sq/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/sq/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/sq/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/sr/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/sr/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/sr/firstRun.dtd
@@ -380,6 +424,7 @@
 %%XPI_XPIDIR%%/chrome/locale/sr/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/sr/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/sr/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/sr/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/sv-SE/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/sv-SE/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/sv-SE/firstRun.dtd
@@ -388,6 +433,7 @@
 %%XPI_XPIDIR%%/chrome/locale/sv-SE/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/sv-SE/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/sv-SE/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/sv-SE/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/th/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/th/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/th/firstRun.dtd
@@ -396,6 +442,7 @@
 %%XPI_XPIDIR%%/chrome/locale/th/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/th/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/th/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/th/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/tr/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/tr/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/tr/firstRun.dtd
@@ -404,6 +451,7 @@
 %%XPI_XPIDIR%%/chrome/locale/tr/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/tr/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/tr/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/tr/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/uk/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/uk/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/uk/firstRun.dtd
@@ -412,6 +460,7 @@
 %%XPI_XPIDIR%%/chrome/locale/uk/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/uk/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/uk/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/uk/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/vi/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/vi/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/vi/firstRun.dtd
@@ -420,6 +469,7 @@
 %%XPI_XPIDIR%%/chrome/locale/vi/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/vi/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/vi/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/vi/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/zh-CN/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/zh-CN/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/zh-CN/firstRun.dtd
@@ -428,6 +478,7 @@
 %%XPI_XPIDIR%%/chrome/locale/zh-CN/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/zh-CN/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/zh-CN/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/zh-CN/typo.properties
 %%XPI_XPIDIR%%/chrome/locale/zh-TW/composer.dtd
 %%XPI_XPIDIR%%/chrome/locale/zh-TW/filters.dtd
 %%XPI_XPIDIR%%/chrome/locale/zh-TW/firstRun.dtd
@@ -436,6 +487,7 @@
 %%XPI_XPIDIR%%/chrome/locale/zh-TW/sendReport.dtd
 %%XPI_XPIDIR%%/chrome/locale/zh-TW/sidebar.dtd
 %%XPI_XPIDIR%%/chrome/locale/zh-TW/subscriptionSelection.dtd
+%%XPI_XPIDIR%%/chrome/locale/zh-TW/typo.properties
 %%XPI_XPIDIR%%/chrome/skin/abp-icon-big.png
 %%XPI_XPIDIR%%/chrome/skin/abp-status-16.png
 %%XPI_XPIDIR%%/chrome/skin/abp-status.png
@@ -444,6 +496,7 @@
 %%XPI_XPIDIR%%/chrome/skin/composer.css
 %%XPI_XPIDIR%%/chrome/skin/filters.css
 %%XPI_XPIDIR%%/chrome/skin/firstRun.css
+%%XPI_XPIDIR%%/chrome/skin/icon16.png
 %%XPI_XPIDIR%%/chrome/skin/item-state.png
 %%XPI_XPIDIR%%/chrome/skin/overlay.css
 %%XPI_XPIDIR%%/chrome/skin/sendReport.css
@@ -453,6 +506,7 @@
 %%XPI_XPIDIR%%/chrome.manifest
 %%XPI_XPIDIR%%/defaults/patterns.ini
 %%XPI_XPIDIR%%/defaults/prefs.js
+%%XPI_XPIDIR%%/defaults/typoRules.json
 %%XPI_XPIDIR%%/icon.png
 %%XPI_XPIDIR%%/icon64.png
 %%XPI_XPIDIR%%/install.rdf
@@ -464,6 +518,8 @@
 %%XPI_XPIDIR%%/lib/filterListener.js
 %%XPI_XPIDIR%%/lib/filterNotifier.js
 %%XPI_XPIDIR%%/lib/filterStorage.js
+%%XPI_XPIDIR%%/lib/elemHideHitRegistration.js
+%%XPI_XPIDIR%%/lib/hooks.js
 %%XPI_XPIDIR%%/lib/io.js
 %%XPI_XPIDIR%%/lib/keySelector.js
 %%XPI_XPIDIR%%/lib/main.js
@@ -474,6 +530,13 @@
 %%XPI_XPIDIR%%/lib/subscriptionClasses.js
 %%XPI_XPIDIR%%/lib/sync.js
 %%XPI_XPIDIR%%/lib/synchronizer.js
+%%XPI_XPIDIR%%/lib/typoAppIntegration.js
+%%XPI_XPIDIR%%/lib/typoBootstrap.js
+%%XPI_XPIDIR%%/lib/typoCollector.js
+%%XPI_XPIDIR%%/lib/typoFixer.js
+%%XPI_XPIDIR%%/lib/typoNetError.js
+%%XPI_XPIDIR%%/lib/typoRules.js
+%%XPI_XPIDIR%%/lib/typoSurvey.js
 %%XPI_XPIDIR%%/lib/ui.js
 %%XPI_XPIDIR%%/lib/utils.js
 %%XPI_XPIDIR%%/lib/windowObserver.js
@@ -485,6 +548,7 @@
 @dirrm %%XPI_XPIDIR%%/chrome/locale/cs
 @dirrm %%XPI_XPIDIR%%/chrome/locale/da
 @dirrm %%XPI_XPIDIR%%/chrome/locale/de
+@dirrm %%XPI_XPIDIR%%/chrome/locale/dsb
 @dirrm %%XPI_XPIDIR%%/chrome/locale/el
 @dirrm %%XPI_XPIDIR%%/chrome/locale/en-GB
 @dirrm %%XPI_XPIDIR%%/chrome/locale/en-US
@@ -506,13 +570,12 @@
 @dirrm %%XPI_XPIDIR%%/chrome/locale/is
 @dirrm %%XPI_XPIDIR%%/chrome/locale/it
 @dirrm %%XPI_XPIDIR%%/chrome/locale/ja
-@dirrm %%XPI_XPIDIR%%/chrome/locale/ka-GE
-@dirrm %%XPI_XPIDIR%%/chrome/locale/kk-KZ
+@dirrm %%XPI_XPIDIR%%/chrome/locale/kk
 @dirrm %%XPI_XPIDIR%%/chrome/locale/ko
 @dirrm %%XPI_XPIDIR%%/chrome/locale/lt
 @dirrm %%XPI_XPIDIR%%/chrome/locale/lv
 @dirrm %%XPI_XPIDIR%%/chrome/locale/mn
-@dirrm %%XPI_XPIDIR%%/chrome/locale/ms-MY
+@dirrm %%XPI_XPIDIR%%/chrome/locale/ms
 @dirrm %%XPI_XPIDIR%%/chrome/locale/nl
 @dirrm %%XPI_XPIDIR%%/chrome/locale/pl
 @dirrm %%XPI_XPIDIR%%/chrome/locale/pt-BR