From 9cb91f8a48f9467e448f88984c20b3429e8a2510 Mon Sep 17 00:00:00 2001
From: Ruben Rodriguez <ruben@gnu.org>
Date: Mon, 13 Jul 2015 22:52:06 -0500
Subject: Spyblock updated to 2.6.9.0 from upstream changes

---
 data/extensions/spyblock@gnu.org/bootstrap.js      |  19 +-
 data/extensions/spyblock@gnu.org/chrome.manifest   |   1 +
 .../spyblock@gnu.org/chrome/content/errors.html    |   2 +-
 .../spyblock@gnu.org/chrome/content/objtabs.css    |   4 +-
 .../spyblock@gnu.org/chrome/content/ui/composer.js |   6 +-
 .../chrome/content/ui/composer.xul                 |   4 +-
 .../chrome/content/ui/ext/common.js                | 159 ++++++
 .../chrome/content/ui/ext/content.js               | 102 ++++
 .../chrome/content/ui/fennecSettings.xul           |   6 +-
 .../chrome/content/ui/filters-backup.js            |   4 +-
 .../chrome/content/ui/filters-filteractions.js     |  14 +-
 .../chrome/content/ui/filters-filterview.js        |   8 +-
 .../chrome/content/ui/filters-search.js            | 102 ++--
 .../content/ui/filters-subscriptionactions.js      |   8 +-
 .../chrome/content/ui/filters-subscriptionview.js  |  10 +-
 .../spyblock@gnu.org/chrome/content/ui/filters.js  |   6 +-
 .../spyblock@gnu.org/chrome/content/ui/filters.xul |   9 +-
 .../chrome/content/ui/firstRun.html                | 164 +++---
 .../spyblock@gnu.org/chrome/content/ui/firstRun.js | 191 ++++---
 .../spyblock@gnu.org/chrome/content/ui/flasher.js  |   4 +-
 .../spyblock@gnu.org/chrome/content/ui/i18n.js     |  93 +---
 .../spyblock@gnu.org/chrome/content/ui/overlay.xul |  14 +-
 .../chrome/content/ui/progressBar.js               |  18 +-
 .../chrome/content/ui/progressBar.xul              |   4 +-
 .../chrome/content/ui/sendReport.js                |  50 +-
 .../chrome/content/ui/sendReport.xul               |   6 +-
 .../chrome/content/ui/settings.xul                 |   5 +-
 .../spyblock@gnu.org/chrome/content/ui/sidebar.js  |  97 ++--
 .../spyblock@gnu.org/chrome/content/ui/sidebar.xul |   4 +-
 .../chrome/content/ui/sidebarDetached.xul          |   4 +-
 .../chrome/content/ui/skin/abp-128.png             | Bin 0 -> 7303 bytes
 .../chrome/content/ui/skin/ajax-loader.gif         | Bin 0 -> 3208 bytes
 .../chrome/content/ui/skin/background-main.png     | Bin 0 -> 163 bytes
 .../chrome/content/ui/skin/background-share.png    | Bin 0 -> 162 bytes
 .../chrome/content/ui/skin/background.png          | Bin 0 -> 162 bytes
 .../chrome/content/ui/skin/donate.png              | Bin 0 -> 160 bytes
 .../chrome/content/ui/skin/features/malware.png    | Bin 0 -> 3335 bytes
 .../chrome/content/ui/skin/features/social.png     | Bin 0 -> 4260 bytes
 .../chrome/content/ui/skin/features/tracking.png   | Bin 0 -> 3562 bytes
 .../chrome/content/ui/skin/firstRun.css            | 601 +++++++++++++++++++++
 .../content/ui/skin/fonts/CreteRound-Italic.otf    | Bin 0 -> 43152 bytes
 .../content/ui/skin/fonts/CreteRound-Regular.otf   | Bin 0 -> 40968 bytes
 .../chrome/content/ui/skin/social/facebook.png     | Bin 0 -> 3861 bytes
 .../chrome/content/ui/skin/social/googleplus.png   | Bin 0 -> 4009 bytes
 .../chrome/content/ui/skin/social/renren.png       | Bin 0 -> 2619 bytes
 .../chrome/content/ui/skin/social/twitter.png      | Bin 0 -> 3944 bytes
 .../chrome/content/ui/skin/social/weibo.png        | Bin 0 -> 3497 bytes
 .../chrome/content/ui/subscriptionSelection.js     |   8 +-
 .../chrome/content/ui/subscriptionSelection.xul    |   4 +-
 .../chrome/content/ui/subscriptions.xml            |  10 +-
 .../spyblock@gnu.org/chrome/content/ui/utils.js    |   4 +-
 .../spyblock@gnu.org/chrome/locale/ar/composer.dtd |   2 +-
 .../chrome/locale/ar/firstRun.properties           |  26 +-
 .../spyblock@gnu.org/chrome/locale/ar/overlay.dtd  |   5 +-
 .../chrome/locale/ar/sendReport.dtd                |   4 +-
 .../spyblock@gnu.org/chrome/locale/bg/composer.dtd |  56 +-
 .../spyblock@gnu.org/chrome/locale/bg/filters.dtd  | 110 ++--
 .../chrome/locale/bg/firstRun.properties           |  36 +-
 .../chrome/locale/bg/global.properties             |  62 +--
 .../spyblock@gnu.org/chrome/locale/bg/overlay.dtd  |  51 +-
 .../chrome/locale/bg/sendReport.dtd                | 158 +++---
 .../spyblock@gnu.org/chrome/locale/bg/sidebar.dtd  |  48 +-
 .../chrome/locale/bg/subscriptionSelection.dtd     |  18 +-
 .../spyblock@gnu.org/chrome/locale/ca/filters.dtd  |   4 +-
 .../chrome/locale/ca/firstRun.properties           |  32 +-
 .../chrome/locale/ca/global.properties             |  10 +-
 .../spyblock@gnu.org/chrome/locale/ca/overlay.dtd  |   5 +-
 .../spyblock@gnu.org/chrome/locale/cs/filters.dtd  |   2 +-
 .../chrome/locale/cs/firstRun.properties           |  26 +-
 .../spyblock@gnu.org/chrome/locale/cs/overlay.dtd  |   5 +-
 .../chrome/locale/cs/sendReport.dtd                |   2 +-
 .../spyblock@gnu.org/chrome/locale/cs/sidebar.dtd  |   2 +-
 .../spyblock@gnu.org/chrome/locale/cy/composer.dtd |  33 ++
 .../spyblock@gnu.org/chrome/locale/cy/filters.dtd  |  72 +++
 .../chrome/locale/cy/firstRun.properties           |  20 +
 .../chrome/locale/cy/global.properties             |  41 ++
 .../spyblock@gnu.org/chrome/locale/cy/overlay.dtd  |  31 ++
 .../chrome/locale/cy/sendReport.dtd                |  65 +++
 .../spyblock@gnu.org/chrome/locale/cy/sidebar.dtd  |  35 ++
 .../chrome/locale/cy/subscriptionSelection.dtd     |  12 +
 .../chrome/locale/da/firstRun.properties           |  26 +-
 .../spyblock@gnu.org/chrome/locale/da/overlay.dtd  |   5 +-
 .../spyblock@gnu.org/chrome/locale/de/composer.dtd |   6 +-
 .../spyblock@gnu.org/chrome/locale/de/filters.dtd  |   4 +-
 .../chrome/locale/de/firstRun.properties           |  32 +-
 .../chrome/locale/de/global.properties             |   4 +-
 .../spyblock@gnu.org/chrome/locale/de/overlay.dtd  |   7 +-
 .../chrome/locale/de/sendReport.dtd                |   8 +-
 .../chrome/locale/dsb/firstRun.properties          |  26 +-
 .../spyblock@gnu.org/chrome/locale/dsb/overlay.dtd |   5 +-
 .../chrome/locale/el/firstRun.properties           |  26 +-
 .../spyblock@gnu.org/chrome/locale/el/overlay.dtd  |   5 +-
 .../chrome/locale/en-GB/firstRun.properties        |  28 +-
 .../chrome/locale/en-GB/overlay.dtd                |   5 +-
 .../chrome/locale/en-GB/sendReport.dtd             |   2 +-
 .../chrome/locale/en-US/firstRun.properties        |  28 +-
 .../chrome/locale/en-US/overlay.dtd                |   1 -
 .../chrome/locale/en-US/sendReport.dtd             |   2 +-
 .../chrome/locale/eo/firstRun.properties           |  26 +-
 .../spyblock@gnu.org/chrome/locale/eo/overlay.dtd  |   5 +-
 .../chrome/locale/es-AR/firstRun.properties        |  26 +-
 .../chrome/locale/es-AR/overlay.dtd                |   5 +-
 .../chrome/locale/es-ES/firstRun.properties        |  26 +-
 .../chrome/locale/es-ES/overlay.dtd                |   5 +-
 .../chrome/locale/es-MX/composer.dtd               |  12 +-
 .../chrome/locale/es-MX/firstRun.properties        |  26 +-
 .../chrome/locale/es-MX/overlay.dtd                |   5 +-
 .../chrome/locale/et/firstRun.properties           |  26 +-
 .../spyblock@gnu.org/chrome/locale/et/overlay.dtd  |   7 +-
 .../chrome/locale/eu/firstRun.properties           |  26 +-
 .../chrome/locale/eu/global.properties             |   4 +-
 .../spyblock@gnu.org/chrome/locale/eu/overlay.dtd  |   9 +-
 .../spyblock@gnu.org/chrome/locale/fa/composer.dtd |  12 +-
 .../chrome/locale/fa/firstRun.properties           |  26 +-
 .../spyblock@gnu.org/chrome/locale/fa/overlay.dtd  |   5 +-
 .../chrome/locale/fa/sendReport.dtd                |   2 +-
 .../spyblock@gnu.org/chrome/locale/fi/filters.dtd  |  26 +-
 .../chrome/locale/fi/firstRun.properties           |  26 +-
 .../chrome/locale/fi/global.properties             |  24 +-
 .../spyblock@gnu.org/chrome/locale/fi/overlay.dtd  |  15 +-
 .../chrome/locale/fi/sendReport.dtd                |  50 +-
 .../spyblock@gnu.org/chrome/locale/fi/sidebar.dtd  |  10 +-
 .../chrome/locale/fi/subscriptionSelection.dtd     |   6 +-
 .../chrome/locale/fr/firstRun.properties           |  26 +-
 .../spyblock@gnu.org/chrome/locale/fr/overlay.dtd  |   5 +-
 .../chrome/locale/fr/sendReport.dtd                |   2 +-
 .../chrome/locale/fy-NL/firstRun.properties        |  26 +-
 .../chrome/locale/fy-NL/overlay.dtd                |   5 +-
 .../chrome/locale/gl/firstRun.properties           |  26 +-
 .../spyblock@gnu.org/chrome/locale/gl/overlay.dtd  |   5 +-
 .../chrome/locale/he/firstRun.properties           |  26 +-
 .../spyblock@gnu.org/chrome/locale/he/overlay.dtd  |   5 +-
 .../chrome/locale/hr/firstRun.properties           |  26 +-
 .../spyblock@gnu.org/chrome/locale/hr/overlay.dtd  |   5 +-
 .../chrome/locale/hsb/firstRun.properties          |  26 +-
 .../spyblock@gnu.org/chrome/locale/hsb/overlay.dtd |   7 +-
 .../chrome/locale/hu/firstRun.properties           |  26 +-
 .../spyblock@gnu.org/chrome/locale/hu/overlay.dtd  |   5 +-
 .../chrome/locale/hu/sendReport.dtd                |   2 +-
 .../chrome/locale/hy-AM/firstRun.properties        |  24 +-
 .../chrome/locale/hy-AM/overlay.dtd                |   5 +-
 .../chrome/locale/hy-AM/sendReport.dtd             |   2 +-
 .../spyblock@gnu.org/chrome/locale/id/composer.dtd |  44 +-
 .../spyblock@gnu.org/chrome/locale/id/filters.dtd  |  94 ++--
 .../chrome/locale/id/firstRun.properties           |  34 +-
 .../chrome/locale/id/global.properties             |  48 +-
 .../spyblock@gnu.org/chrome/locale/id/overlay.dtd  |  47 +-
 .../chrome/locale/id/sendReport.dtd                |  35 +-
 .../spyblock@gnu.org/chrome/locale/id/sidebar.dtd  |  46 +-
 .../chrome/locale/id/subscriptionSelection.dtd     |  20 +-
 .../chrome/locale/is/firstRun.properties           |  26 +-
 .../spyblock@gnu.org/chrome/locale/is/overlay.dtd  |   5 +-
 .../chrome/locale/it/firstRun.properties           |  26 +-
 .../spyblock@gnu.org/chrome/locale/it/overlay.dtd  |   5 +-
 .../chrome/locale/it/sendReport.dtd                |   2 +-
 .../chrome/locale/ja/firstRun.properties           |  26 +-
 .../spyblock@gnu.org/chrome/locale/ja/overlay.dtd  |   7 +-
 .../chrome/locale/ja/sendReport.dtd                |   6 +-
 .../chrome/locale/kk/firstRun.properties           |  26 +-
 .../spyblock@gnu.org/chrome/locale/kk/overlay.dtd  |   5 +-
 .../chrome/locale/ko/firstRun.properties           |  26 +-
 .../spyblock@gnu.org/chrome/locale/ko/overlay.dtd  |   5 +-
 .../chrome/locale/lt/firstRun.properties           |  26 +-
 .../spyblock@gnu.org/chrome/locale/lt/overlay.dtd  |   5 +-
 .../chrome/locale/lt/sendReport.dtd                |   2 +-
 .../chrome/locale/lv/firstRun.properties           |  26 +-
 .../spyblock@gnu.org/chrome/locale/lv/overlay.dtd  |   5 +-
 .../spyblock@gnu.org/chrome/locale/lv/sidebar.dtd  |   2 +-
 .../spyblock@gnu.org/chrome/locale/ms/composer.dtd |   8 +-
 .../chrome/locale/ms/firstRun.properties           |  38 +-
 .../spyblock@gnu.org/chrome/locale/ms/overlay.dtd  |   5 +-
 .../chrome/locale/nb-NO/firstRun.properties        |  26 +-
 .../chrome/locale/nb-NO/overlay.dtd                |   5 +-
 .../spyblock@gnu.org/chrome/locale/nl/composer.dtd |  24 +-
 .../spyblock@gnu.org/chrome/locale/nl/filters.dtd  |  38 +-
 .../chrome/locale/nl/firstRun.properties           |  26 +-
 .../chrome/locale/nl/global.properties             |  30 +-
 .../spyblock@gnu.org/chrome/locale/nl/overlay.dtd  |  37 +-
 .../chrome/locale/nl/sendReport.dtd                |  66 +--
 .../spyblock@gnu.org/chrome/locale/nl/sidebar.dtd  |  14 +-
 .../chrome/locale/nl/subscriptionSelection.dtd     |  10 +-
 .../chrome/locale/pl/firstRun.properties           |  26 +-
 .../spyblock@gnu.org/chrome/locale/pl/overlay.dtd  |   5 +-
 .../chrome/locale/pl/sendReport.dtd                |   2 +-
 .../chrome/locale/pt-BR/composer.dtd               |   4 +-
 .../chrome/locale/pt-BR/firstRun.properties        |  26 +-
 .../chrome/locale/pt-BR/overlay.dtd                |   5 +-
 .../chrome/locale/pt-BR/sendReport.dtd             |   2 +-
 .../chrome/locale/pt-PT/composer.dtd               |   2 +-
 .../chrome/locale/pt-PT/filters.dtd                |  56 +-
 .../chrome/locale/pt-PT/firstRun.properties        |  26 +-
 .../chrome/locale/pt-PT/global.properties          |  10 +-
 .../chrome/locale/pt-PT/overlay.dtd                |   5 +-
 .../chrome/locale/pt-PT/sendReport.dtd             |   4 +-
 .../chrome/locale/ro/firstRun.properties           |  26 +-
 .../spyblock@gnu.org/chrome/locale/ro/overlay.dtd  |   5 +-
 .../spyblock@gnu.org/chrome/locale/ru/composer.dtd |   2 +-
 .../chrome/locale/ru/firstRun.properties           |  26 +-
 .../chrome/locale/ru/global.properties             |  10 +-
 .../spyblock@gnu.org/chrome/locale/ru/overlay.dtd  |  23 +-
 .../chrome/locale/ru/sendReport.dtd                |  23 +-
 .../chrome/locale/ru/subscriptionSelection.dtd     |  12 +-
 .../chrome/locale/sk/firstRun.properties           |  26 +-
 .../spyblock@gnu.org/chrome/locale/sk/overlay.dtd  |   5 +-
 .../spyblock@gnu.org/chrome/locale/sl/composer.dtd |   2 +-
 .../spyblock@gnu.org/chrome/locale/sl/filters.dtd  |  12 +-
 .../chrome/locale/sl/firstRun.properties           |  30 +-
 .../chrome/locale/sl/global.properties             |  16 +-
 .../spyblock@gnu.org/chrome/locale/sl/overlay.dtd  |   9 +-
 .../chrome/locale/sl/sendReport.dtd                |  12 +-
 .../spyblock@gnu.org/chrome/locale/sq/composer.dtd |   6 +-
 .../chrome/locale/sq/firstRun.properties           |  44 +-
 .../chrome/locale/sq/global.properties             |  66 +--
 .../spyblock@gnu.org/chrome/locale/sq/overlay.dtd  |  47 +-
 .../chrome/locale/sq/sendReport.dtd                |  34 +-
 .../chrome/locale/sq/subscriptionSelection.dtd     |   4 +-
 .../chrome/locale/sr/firstRun.properties           |  26 +-
 .../spyblock@gnu.org/chrome/locale/sr/overlay.dtd  |   5 +-
 .../chrome/locale/sr/sendReport.dtd                |   2 +-
 .../chrome/locale/sv-SE/composer.dtd               |  14 +-
 .../chrome/locale/sv-SE/firstRun.properties        |  26 +-
 .../chrome/locale/sv-SE/global.properties          |   8 +-
 .../chrome/locale/sv-SE/overlay.dtd                |   5 +-
 .../chrome/locale/th/firstRun.properties           |  24 +-
 .../spyblock@gnu.org/chrome/locale/th/overlay.dtd  |   7 +-
 .../chrome/locale/tr/firstRun.properties           |  26 +-
 .../chrome/locale/tr/global.properties             |   4 +-
 .../spyblock@gnu.org/chrome/locale/tr/overlay.dtd  |   5 +-
 .../chrome/locale/uk/firstRun.properties           |  28 +-
 .../spyblock@gnu.org/chrome/locale/uk/overlay.dtd  |   5 +-
 .../spyblock@gnu.org/chrome/locale/vi/composer.dtd |   2 +-
 .../chrome/locale/vi/firstRun.properties           |  26 +-
 .../spyblock@gnu.org/chrome/locale/vi/overlay.dtd  |   5 +-
 .../chrome/locale/zh-CN/filters.dtd                |   3 +-
 .../chrome/locale/zh-CN/firstRun.properties        |  26 +-
 .../chrome/locale/zh-CN/overlay.dtd                |   5 +-
 .../chrome/locale/zh-CN/sendReport.dtd             |   2 +-
 .../chrome/locale/zh-TW/firstRun.properties        |  26 +-
 .../chrome/locale/zh-TW/overlay.dtd                |   5 +-
 .../spyblock@gnu.org/chrome/skin/abp-icon-big.png  | Bin 15201 -> 0 bytes
 .../spyblock@gnu.org/chrome/skin/abp-status-16.png | Bin 1304 -> 1376 bytes
 .../spyblock@gnu.org/chrome/skin/abp-status-32.png | Bin 3419 -> 2906 bytes
 .../spyblock@gnu.org/chrome/skin/abp-status.png    | Bin 2433 -> 2278 bytes
 .../spyblock@gnu.org/chrome/skin/ajax-loader.gif   | Bin 3208 -> 0 bytes
 .../chrome/skin/background-main.png                | Bin 163 -> 0 bytes
 .../chrome/skin/background-share.png               | Bin 162 -> 0 bytes
 .../spyblock@gnu.org/chrome/skin/background.png    | Bin 162 -> 0 bytes
 .../spyblock@gnu.org/chrome/skin/composer.css      |   4 +-
 .../spyblock@gnu.org/chrome/skin/donate.png        | Bin 160 -> 0 bytes
 .../chrome/skin/features/malware.png               | Bin 3335 -> 0 bytes
 .../chrome/skin/features/social.png                | Bin 4260 -> 0 bytes
 .../chrome/skin/features/tracking.png              | Bin 3562 -> 0 bytes
 .../spyblock@gnu.org/chrome/skin/filters.css       |   4 +-
 .../spyblock@gnu.org/chrome/skin/firstRun.css      | 588 --------------------
 .../chrome/skin/fonts/CreteRound-Italic.otf        | Bin 43152 -> 0 bytes
 .../chrome/skin/fonts/CreteRound-Regular.otf       | Bin 40968 -> 0 bytes
 .../spyblock@gnu.org/chrome/skin/overlay.css       |   4 +-
 .../spyblock@gnu.org/chrome/skin/sendReport.css    |   4 +-
 .../spyblock@gnu.org/chrome/skin/sidebar.css       |   4 +-
 .../chrome/skin/social/facebook.png                | Bin 3861 -> 0 bytes
 .../chrome/skin/social/googleplus.png              | Bin 4009 -> 0 bytes
 .../spyblock@gnu.org/chrome/skin/social/renren.png | Bin 2619 -> 0 bytes
 .../chrome/skin/social/twitter.png                 | Bin 3944 -> 0 bytes
 .../spyblock@gnu.org/chrome/skin/social/weibo.png  | Bin 3497 -> 0 bytes
 .../chrome/skin/subscriptionSelection.css          |   4 +-
 data/extensions/spyblock@gnu.org/defaults/prefs.js |   3 +-
 data/extensions/spyblock@gnu.org/icon.png          | Bin 3387 -> 3040 bytes
 data/extensions/spyblock@gnu.org/icon64.png        | Bin 5727 -> 4177 bytes
 data/extensions/spyblock@gnu.org/install.rdf       |  33 +-
 data/extensions/spyblock@gnu.org/lib/Public.jsm    |   4 +-
 .../spyblock@gnu.org/lib/antiadblockInit.js        |  15 +-
 data/extensions/spyblock@gnu.org/lib/appSupport.js |  20 +-
 .../spyblock@gnu.org/lib/contentPolicy.js          | 110 ++--
 .../spyblock@gnu.org/lib/customizableUI.js         |   4 +-
 data/extensions/spyblock@gnu.org/lib/downloader.js |  19 +-
 data/extensions/spyblock@gnu.org/lib/elemHide.js   |  55 +-
 .../lib/elemHideHitRegistration.js                 |  12 +-
 .../spyblock@gnu.org/lib/ext_background.js         | 102 ++++
 data/extensions/spyblock@gnu.org/lib/ext_common.js | 159 ++++++
 .../spyblock@gnu.org/lib/filterClasses.js          | 154 ++++--
 .../spyblock@gnu.org/lib/filterListener.js         |  12 +-
 .../spyblock@gnu.org/lib/filterNotifier.js         |   4 +-
 .../spyblock@gnu.org/lib/filterStorage.js          |  51 +-
 data/extensions/spyblock@gnu.org/lib/io.js         |  61 +--
 .../extensions/spyblock@gnu.org/lib/keySelector.js |  19 +-
 data/extensions/spyblock@gnu.org/lib/main.js       |  16 +-
 data/extensions/spyblock@gnu.org/lib/matcher.js    |  85 +--
 .../spyblock@gnu.org/lib/messageResponder.js       | 180 ++++++
 .../spyblock@gnu.org/lib/notification.js           |  12 +-
 data/extensions/spyblock@gnu.org/lib/objectTabs.js |  13 +-
 data/extensions/spyblock@gnu.org/lib/prefs.js      |  19 +-
 .../spyblock@gnu.org/lib/requestNotifier.js        |  27 +-
 .../spyblock@gnu.org/lib/subscriptionClasses.js    |  42 +-
 data/extensions/spyblock@gnu.org/lib/sync.js       |   8 +-
 .../spyblock@gnu.org/lib/synchronizer.js           |  11 +-
 data/extensions/spyblock@gnu.org/lib/timeline.js   | 155 ------
 data/extensions/spyblock@gnu.org/lib/ui.js         |  32 +-
 data/extensions/spyblock@gnu.org/lib/utils.js      |  33 +-
 .../spyblock@gnu.org/lib/windowObserver.js         |  21 +-
 299 files changed, 4143 insertions(+), 3386 deletions(-)
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/ext/common.js
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/ext/content.js
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/skin/abp-128.png
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/skin/ajax-loader.gif
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/skin/background-main.png
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/skin/background-share.png
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/skin/background.png
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/skin/donate.png
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/skin/features/malware.png
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/skin/features/social.png
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/skin/features/tracking.png
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/skin/firstRun.css
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/skin/fonts/CreteRound-Italic.otf
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/skin/fonts/CreteRound-Regular.otf
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/skin/social/facebook.png
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/skin/social/googleplus.png
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/skin/social/renren.png
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/skin/social/twitter.png
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/skin/social/weibo.png
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/cy/composer.dtd
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/cy/filters.dtd
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/cy/firstRun.properties
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/cy/global.properties
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/cy/overlay.dtd
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/cy/sendReport.dtd
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/cy/sidebar.dtd
 create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/cy/subscriptionSelection.dtd
 delete mode 100644 data/extensions/spyblock@gnu.org/chrome/skin/abp-icon-big.png
 delete mode 100644 data/extensions/spyblock@gnu.org/chrome/skin/ajax-loader.gif
 delete mode 100644 data/extensions/spyblock@gnu.org/chrome/skin/background-main.png
 delete mode 100644 data/extensions/spyblock@gnu.org/chrome/skin/background-share.png
 delete mode 100644 data/extensions/spyblock@gnu.org/chrome/skin/background.png
 delete mode 100644 data/extensions/spyblock@gnu.org/chrome/skin/donate.png
 delete mode 100644 data/extensions/spyblock@gnu.org/chrome/skin/features/malware.png
 delete mode 100644 data/extensions/spyblock@gnu.org/chrome/skin/features/social.png
 delete mode 100644 data/extensions/spyblock@gnu.org/chrome/skin/features/tracking.png
 delete mode 100644 data/extensions/spyblock@gnu.org/chrome/skin/firstRun.css
 delete mode 100644 data/extensions/spyblock@gnu.org/chrome/skin/fonts/CreteRound-Italic.otf
 delete mode 100644 data/extensions/spyblock@gnu.org/chrome/skin/fonts/CreteRound-Regular.otf
 delete mode 100644 data/extensions/spyblock@gnu.org/chrome/skin/social/facebook.png
 delete mode 100644 data/extensions/spyblock@gnu.org/chrome/skin/social/googleplus.png
 delete mode 100644 data/extensions/spyblock@gnu.org/chrome/skin/social/renren.png
 delete mode 100644 data/extensions/spyblock@gnu.org/chrome/skin/social/twitter.png
 delete mode 100644 data/extensions/spyblock@gnu.org/chrome/skin/social/weibo.png
 create mode 100644 data/extensions/spyblock@gnu.org/lib/ext_background.js
 create mode 100644 data/extensions/spyblock@gnu.org/lib/ext_common.js
 create mode 100644 data/extensions/spyblock@gnu.org/lib/messageResponder.js
 delete mode 100644 data/extensions/spyblock@gnu.org/lib/timeline.js

(limited to 'data/extensions')

diff --git a/data/extensions/spyblock@gnu.org/bootstrap.js b/data/extensions/spyblock@gnu.org/bootstrap.js
index 09530b9..29c1b77 100644
--- a/data/extensions/spyblock@gnu.org/bootstrap.js
+++ b/data/extensions/spyblock@gnu.org/bootstrap.js
@@ -1,19 +1,6 @@
-/*
- * This file is part of the Adblock Plus build tools,
- * Copyright (C) 2006-2014 Eyeo GmbH
- *
- * Adblock Plus is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * Adblock Plus is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
diff --git a/data/extensions/spyblock@gnu.org/chrome.manifest b/data/extensions/spyblock@gnu.org/chrome.manifest
index 9778eda..0b1b0e7 100644
--- a/data/extensions/spyblock@gnu.org/chrome.manifest
+++ b/data/extensions/spyblock@gnu.org/chrome.manifest
@@ -5,6 +5,7 @@ locale    adblockplus ar chrome/locale/ar/
 locale    adblockplus bg chrome/locale/bg/
 locale    adblockplus ca chrome/locale/ca/
 locale    adblockplus cs chrome/locale/cs/
+locale    adblockplus cy chrome/locale/cy/
 locale    adblockplus da chrome/locale/da/
 locale    adblockplus de chrome/locale/de/
 locale    adblockplus dsb chrome/locale/dsb/
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/errors.html b/data/extensions/spyblock@gnu.org/chrome/content/errors.html
index 5c18929..24e05a5 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/errors.html
+++ b/data/extensions/spyblock@gnu.org/chrome/content/errors.html
@@ -65,7 +65,7 @@
     {
       document.write("<p>Errors related to Adblock Plus:</p>");
 
-      for each (let message in messages)
+      for (let message of messages)
       {
         let type = (message.flags & Components.interfaces.nsIScriptError.warningFlag ? "warning" : "error");
         let html = "<b>" + (type == "warning" ? "Warning:" : "Error:") + "</b><br>";
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/objtabs.css b/data/extensions/spyblock@gnu.org/chrome/content/objtabs.css
index ce3a830..d61f702 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/objtabs.css
+++ b/data/extensions/spyblock@gnu.org/chrome/content/objtabs.css
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/composer.js b/data/extensions/spyblock@gnu.org/chrome/content/ui/composer.js
index f7b8087..98a38aa 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/composer.js
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/composer.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -146,7 +146,7 @@ function init()
   let typeGroup = E("typeGroup");
   let defaultTypes = RegExpFilter.prototype.contentType & ~RegExpFilter.typeMap.DOCUMENT;
   let isDefaultType = (RegExpFilter.typeMap[item.typeDescr] & defaultTypes) != 0;
-  for each (let type in types)
+  for (let type of types)
   {
     if (type == Policy.type.ELEMHIDE)
       continue;
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/composer.xul b/data/extensions/spyblock@gnu.org/chrome/content/ui/composer.xul
index 8931e16..66e64ef 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/composer.xul
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/composer.xul
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
-  - This file is part of Adblock Plus <http://adblockplus.org/>,
-  - Copyright (C) 2006-2014 Eyeo GmbH
+  - This file is part of Adblock Plus <https://adblockplus.org/>,
+  - Copyright (C) 2006-2015 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/ext/common.js b/data/extensions/spyblock@gnu.org/chrome/content/ui/ext/common.js
new file mode 100644
index 0000000..129f232
--- /dev/null
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/ext/common.js
@@ -0,0 +1,159 @@
+/*
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
+ *
+ * Adblock Plus is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Adblock Plus is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+(function(global)
+{
+  const Ci = Components.interfaces;
+
+  if (!global.ext)
+    global.ext = {};
+
+  var holder = {
+    get Page()
+    {
+      delete this.Page;
+      this.Page = (typeof require == "function" ?
+          require("ext_background").Page :
+          function() {});
+      return this.Page;
+    }
+  };
+
+  var getSender = global.ext._getSender = function(origin)
+  {
+    if (origin instanceof Ci.nsIDOMXULElement)
+      return origin.messageManager;
+    else if (origin instanceof Ci.nsIMessageSender)
+      return origin;
+    else
+      return null;
+  };
+
+  var MessageProxy = global.ext._MessageProxy = function(messageManager, messageTarget)
+  {
+    this._messageManager = messageManager;
+    this._messageTarget = messageTarget;
+    this._callbacks = new Map();
+    this._responseCallbackCounter = 0;
+
+    this._handleRequest = this._handleRequest.bind(this);
+    this._handleResponse = this._handleResponse.bind(this);
+    this._messageManager.addMessageListener("AdblockPlus:Message", this._handleRequest);
+    this._messageManager.addMessageListener("AdblockPlus:Response", this._handleResponse);
+  };
+  MessageProxy.prototype = {
+    _disconnect: function()
+    {
+      this._messageManager.removeMessageListener("AdblockPlus:Message", this._handleRequest);
+      this._messageManager.removeMessageListener("AdblockPlus:Response", this._handleResponse);
+    },
+
+    _sendResponse: function(sender, callbackId, message)
+    {
+      var response = {
+        callbackId: callbackId
+      };
+      if (typeof response != "undefined")
+        response.payload = message;
+      sender.sendAsyncMessage("AdblockPlus:Response", response);
+    },
+
+    _handleRequest: function(message)
+    {
+      var sender = getSender(message.target);
+      var request = message.data;
+
+      var sent = false;
+      var sendResponse;
+      if (sender && "callbackId" in request)
+      {
+        sendResponse = function(message)
+        {
+          this._sendResponse(sender, request.callbackId, message);
+          sent = true;
+        }.bind(this);
+      }
+      else
+        sendResponse = function() {};
+
+      var results = this._messageTarget._dispatch(request.payload, {
+        page: new holder.Page(sender)
+      }, sendResponse);
+      if (!sent && results.indexOf(true) == -1)
+        sendResponse(undefined);
+    },
+
+    _handleResponse: function(message)
+    {
+      var response = message.data;
+      var callback = this._callbacks.get(response.callbackId);
+      if (callback)
+      {
+        this._callbacks.delete(response.callbackId);
+        if ("payload" in response)
+          callback(response.payload);
+      }
+    },
+
+    sendMessage: function(message, responseCallback)
+    {
+      if (!(this._messageManager instanceof Ci.nsIMessageSender))
+        throw new Error("Not implemented");
+
+      var request = {
+        payload: message
+      };
+      if (responseCallback)
+      {
+        request.callbackId = ++this._responseCallbackCounter;
+        this._callbacks.set(request.callbackId, responseCallback);
+      }
+
+      this._messageManager.sendAsyncMessage("AdblockPlus:Message", request);
+    }
+  };
+
+  var EventTarget = global.ext._EventTarget = function()
+  {
+    this._listeners = [];
+  };
+  EventTarget.prototype = {
+    addListener: function(listener)
+    {
+      if (this._listeners.indexOf(listener) == -1)
+        this._listeners.push(listener);
+    },
+    removeListener: function(listener)
+    {
+      var idx = this._listeners.indexOf(listener);
+      if (idx != -1)
+        this._listeners.splice(idx, 1);
+    },
+    _dispatch: function()
+    {
+      var results = [];
+
+      for (var i = 0; i < this._listeners.length; i++)
+        results.push(this._listeners[i].apply(null, arguments));
+
+      return results;
+    }
+  };
+
+  if (typeof exports == "object")
+    exports = global.ext;
+})(this);
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/ext/content.js b/data/extensions/spyblock@gnu.org/chrome/content/ui/ext/content.js
new file mode 100644
index 0000000..db2d7e1
--- /dev/null
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/ext/content.js
@@ -0,0 +1,102 @@
+/*
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
+ *
+ * Adblock Plus is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Adblock Plus is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+(function(global)
+{
+  const Ci = Components.interfaces;
+  const Cu = Components.utils;
+
+  if (!global.ext)
+    global.ext = {};
+
+  /* Message passing */
+  global.ext.onMessage = new global.ext._EventTarget();
+
+  global.ext.backgroundPage = new global.ext._MessageProxy(
+      window.QueryInterface(Ci.nsIInterfaceRequestor)
+                              .getInterface(Ci.nsIDocShell)
+                              .QueryInterface(Ci.nsIInterfaceRequestor)
+                              .getInterface(Ci.nsIContentFrameMessageManager),
+      global.ext.onMessage);
+  window.addEventListener("unload", function()
+  {
+    global.ext.backgroundPage._disconnect();
+  }, false);
+
+  /* i18n */
+  global.ext.i18n = (function()
+  {
+    var Services = Cu.import("resource://gre/modules/Services.jsm", null).Services;
+    var pageName = location.pathname.replace(/.*\//, "").replace(/\..*?$/, "");
+
+    // Randomize URI to work around bug 719376
+    var stringBundle = Services.strings.createBundle("chrome://adblockplus/locale/" + pageName +
+      ".properties?" + Math.random());
+
+    function getI18nMessage(key)
+    {
+      return {
+        "message": stringBundle.GetStringFromName(key)
+      };
+    }
+
+    function getText(message, args)
+    {
+      var text = message.message;
+      var placeholders = message.placeholders;
+
+      if (!args || !placeholders)
+        return text;
+
+      for (var key in placeholders)
+      {
+        var content = placeholders[key].content;
+        if (!content)
+          continue;
+
+        var index = parseInt(content.slice(1), 10);
+        if (isNaN(index))
+          continue;
+
+        var replacement = args[index - 1];
+        if (typeof replacement === "undefined")
+          continue;
+
+        text = text.split("$" + key + "$").join(replacement);
+      }
+      return text;
+    }
+
+    return {
+      getMessage: function(key, args)
+      {
+        try{
+          var message = getI18nMessage(key);
+          return getText(message, args);
+        }
+        catch(e)
+        {
+          // Don't report errors for special strings, these are expected to be
+          // missing.
+          if (key[0] != "@")
+            Cu.reportError(e);
+          return "";
+        }
+      }
+    };
+  })();
+})(this);
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/fennecSettings.xul b/data/extensions/spyblock@gnu.org/chrome/content/ui/fennecSettings.xul
index acbe2b9..c0f38f6 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/fennecSettings.xul
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/fennecSettings.xul
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
-  - This file is part of Adblock Plus <http://adblockplus.org/>,
-  - Copyright (C) 2006-2014 Eyeo GmbH
+  - This file is part of Adblock Plus <https://adblockplus.org/>,
+  - Copyright (C) 2006-2015 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
@@ -29,8 +29,6 @@
   <setting type="control" title="&subscriptions.tab.label;">
     <menulist id="adblockplus-subscription-list"/>
   </setting>
-  <setting pref="extensions.adblockplus.fastcollapse" type="bool" title="&hideplaceholders.label;"
-           inverted="true"/>
   <setting id="adblockplus-sync" type="bool" title="&sync.label;"
     oncommand="/**See bug 762015*/ if (event.type == 'oncommand') {event = document.createEvent('Events'); event.initEvent('command', false, false); this.dispatchEvent(event);}"/>
 </vbox>
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/filters-backup.js b/data/extensions/spyblock@gnu.org/chrome/content/ui/filters-backup.js
index 3ef38c6..9232b5f 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/filters-backup.js
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/filters-backup.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/filters-filteractions.js b/data/extensions/spyblock@gnu.org/chrome/content/ui/filters-filteractions.js
index 5512fda..2a78e56 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/filters-filteractions.js
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/filters-filteractions.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -26,11 +26,7 @@ var FilterActions =
    */
   init: function()
   {
-    let me = this;
-    this.treeElement.parentNode.addEventListener("keypress", function(event)
-    {
-      me.keyPress(event);
-    }, true);
+    this.treeElement.parentNode.addEventListener("keydown", this.keyDown.bind(this), true);
     this.treeElement.view = FilterView;
 
     // Work around https://bugzilla.mozilla.org/show_bug.cgi?id=777832, don't
@@ -373,7 +369,7 @@ var FilterActions =
   /**
    * Called whenever a key is pressed on the list.
    */
-  keyPress: function(/**Event*/ event)
+  keyDown: function(/**Event*/ event)
   {
     if (event.target != E("filtersTree"))
       return;
@@ -386,7 +382,7 @@ var FilterActions =
     if (event.metaKey)
       modifiers |= SubscriptionActions._metaMask;
 
-    if (event.charCode == " ".charCodeAt(0) && modifiers == 0 && !E("col-enabled").hidden)
+    if (event.keyCode == Ci.nsIDOMKeyEvent.DOM_VK_SPACE && modifiers == 0 && !E("col-enabled").hidden)
       this.selectionToggleDisabled();
     else if (event.keyCode == Ci.nsIDOMKeyEvent.DOM_VK_UP && modifiers == SubscriptionActions._accelMask)
     {
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/filters-filterview.js b/data/extensions/spyblock@gnu.org/chrome/content/ui/filters-filterview.js
index dcee183..524356f 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/filters-filterview.js
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/filters-filterview.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -647,9 +647,9 @@ var FilterView =
       let boolAtoms = ["selected", "dummy", "slow", "disabled"];
 
       this.atoms = {};
-      for each (let atom in stringAtoms)
+      for (let atom of stringAtoms)
         this.atoms[atom] = atomService.getAtom(atom);
-      for each (let atom in boolAtoms)
+      for (let atom of boolAtoms)
       {
         this.atoms[atom + "-true"] = atomService.getAtom(atom + "-true");
         this.atoms[atom + "-false"] = atomService.getAtom(atom + "-false");
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/filters-search.js b/data/extensions/spyblock@gnu.org/chrome/content/ui/filters-search.js
index 4e817ac..2d0c0cf 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/filters-search.js
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/filters-search.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -26,8 +26,20 @@ var FilterSearch =
    */
   init: function()
   {
+    let filters = E("filtersTree");
+    for (let prop in FilterSearch.fakeBrowser)
+      filters[prop] = FilterSearch.fakeBrowser[prop];
+    Object.defineProperty(filters, "_lastSearchString", {
+      get: function()
+      {
+        return this.finder.searchString;
+      },
+      enumerable: true,
+      configurable: true
+    });
+
     let findbar = E("findbar");
-    findbar.browser = FilterSearch.fakeBrowser;
+    findbar.browser = filters;
 
     findbar.addEventListener("keypress", function(event)
     {
@@ -144,8 +156,25 @@ FilterSearch.fakeBrowser =
     _notifyResultListeners: function(result, findBackwards)
     {
       this.lastResult = result;
-      for each (let listener in this._resultListeners)
-        listener.onFindResult(result, findBackwards);
+      for (let listener of this._resultListeners)
+      {
+        // See https://bugzilla.mozilla.org/show_bug.cgi?id=958101, starting
+        // with Gecko 29 only one parameter is expected.
+        try
+        {
+          if (listener.onFindResult.length == 1)
+          {
+            listener.onFindResult({searchString: this.searchString,
+                result: result, findBackwards: findBackwards});
+          }
+          else
+            listener.onFindResult(result, findBackwards);
+        }
+        catch (e)
+        {
+          Cu.reportError(e);
+        }
+      }
     },
 
     fastFind: function(searchString, linksOnly, drawOutline)
@@ -178,6 +207,7 @@ FilterSearch.fakeBrowser =
     },
 
     // Irrelevant for us
+    requestMatchesCount: function(searchString, matchLimit, linksOnly) {},
     highlight: function(highlight, word) {},
     enableSelection: function() {},
     removeSelection: function() {},
@@ -185,57 +215,6 @@ FilterSearch.fakeBrowser =
     keyPress: function() {}
   },
 
-  get _lastSearchString()
-  {
-    return this.finder.searchString;
-  },
-
-  // This was used before Firefox 27 instead of the "finder" property.
-  fastFind:
-  {
-    get searchString()
-    {
-      return FilterSearch.fakeBrowser.finder.searchString;
-    },
-
-    set searchString(searchString)
-    {
-      FilterSearch.fakeBrowser.finder.searchString = searchString;
-    },
-
-    foundLink: null,
-    foundEditable: null,
-
-    get caseSensitive()
-    {
-      return FilterSearch.fakeBrowser.finder.caseSensitive;
-    },
-
-    set caseSensitive(caseSensitive)
-    {
-      FilterSearch.fakeBrowser.finder.caseSensitive = caseSensitive;
-    },
-
-    get currentWindow() FilterSearch.fakeBrowser.contentWindow,
-
-    find: function(searchString, linksOnly)
-    {
-      FilterSearch.fakeBrowser.finder.fastFind(searchString, linksOnly);
-      return FilterSearch.fakeBrowser.finder.lastResult;
-    },
-
-    findAgain: function(findBackwards, linksOnly)
-    {
-      FilterSearch.fakeBrowser.finder.findAgain(findBackwards, linksOnly);
-      return FilterSearch.fakeBrowser.finder.lastResult;
-    },
-
-    // Irrelevant for us
-    init: function() {},
-    setDocShell: function() {},
-    setSelectionModeAndRepaint: function() {},
-    collapseSelection: function() {}
-  },
   currentURI: Utils.makeURI("http://example.com/"),
   contentWindow:
   {
@@ -251,16 +230,7 @@ FilterSearch.fakeBrowser =
     {
       E("filtersTree").boxObject.scrollByPages(num);
     },
-  },
-
-  addEventListener: function(event, handler, capture)
-  {
-    E("filtersTree").addEventListener(event, handler, capture);
-  },
-  removeEventListener: function(event, handler, capture)
-  {
-    E("filtersTree").addEventListener(event, handler, capture);
-  },
+  }
 };
 
 window.addEventListener("load", function()
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/filters-subscriptionactions.js b/data/extensions/spyblock@gnu.org/chrome/content/ui/filters-subscriptionactions.js
index 222a4a6..091a9f3 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/filters-subscriptionactions.js
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/filters-subscriptionactions.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -236,7 +236,7 @@ var SubscriptionActions =
       else if (accelKey == Ci.nsIDOMKeyEvent.DOM_VK_ALT)
         result = this._altMask;
     } catch(e) {}
-    this.__defineGetter__("_accelMask", function() result);
+    Object.defineProperty(this, "_accelMask", {value: result});
     return result;
   },
 
@@ -444,7 +444,7 @@ var TitleEditor =
     if (save)
     {
       newTitle = subscriptionNode.getElementsByClassName("titleEditor")[0].value;
-      newTitle = newTitle.replace(/^\s+/, "").replace(/\s+$/, "");
+      newTitle = newTitle.trim();
     }
 
     let subscription = Templater.getDataForNode(subscriptionNode).subscription
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/filters-subscriptionview.js b/data/extensions/spyblock@gnu.org/chrome/content/ui/filters-subscriptionview.js
index a1673e4..8fc26e5 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/filters-subscriptionview.js
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/filters-subscriptionview.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -87,7 +87,7 @@ ListManager.prototype =
     let subscriptions = FilterStorage.subscriptions.filter(this._filter, this);
     if (subscriptions.length)
     {
-      for each (let subscription in subscriptions)
+      for (let subscription of subscriptions)
         this.addSubscription(subscription, null);
 
       // Make sure first list item is selected after list initialization
@@ -176,7 +176,7 @@ ListManager.prototype =
     {
       if (this._scheduledUpdateDisabled == null)
       {
-        this._scheduledUpdateDisabled = {__proto__: null};
+        this._scheduledUpdateDisabled = Object.create(null);
         Utils.runAsync(this.updateDisabled, this);
       }
       for (let i = 0; i < item.subscriptions.length; i++)
@@ -273,7 +273,7 @@ ListManager.prototype =
       {
         if (this._scheduledUpdateDisabled == null)
         {
-          this._scheduledUpdateDisabled = {__proto__: null};
+          this._scheduledUpdateDisabled = Object.create(null);
           Utils.runAsync(this.updateDisabled, this);
         }
         this._scheduledUpdateDisabled[item.url] = true;
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/filters.js b/data/extensions/spyblock@gnu.org/chrome/content/ui/filters.js
index 8830fdb..29a2e31 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/filters.js
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/filters.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -147,7 +147,7 @@ var Templater =
 
     // Process <if> tags - remove if condition is false, replace by their children
     // if it is true
-    for each (let node in conditionals)
+    for (let node of conditionals)
     {
       let fragment = document.createDocumentFragment();
       let condition = node.getAttribute("condition");
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/filters.xul b/data/extensions/spyblock@gnu.org/chrome/content/ui/filters.xul
index ce65659..2341cdc 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/filters.xul
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/filters.xul
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
-  - This file is part of Adblock Plus <http://adblockplus.org/>,
-  - Copyright (C) 2006-2014 Eyeo GmbH
+  - This file is part of Adblock Plus <https://adblockplus.org/>,
+  - Copyright (C) 2006-2015 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
@@ -264,11 +264,6 @@
           </richlistbox>
         </deck>
 
-        <!--description>
-          <checkbox id="acceptableAds" label="&acceptableAds2.label;" oncommand="ListManager.allowAcceptableAds(this.checked);"/>
-          <label class="text-link" value="&viewList.label;" onclick="UI.loadInBrowser(Prefs.subscriptions_exceptionsurl);"/>
-          <label class="text-link" value="&readMore.label;" onclick="UI.loadDocLink('acceptable_ads');"/>
-        </description-->
       </tabpanel>
       <tabpanel id="filtersTab" orient="vertical" flex="1">
         <hbox pack="end">
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/firstRun.html b/data/extensions/spyblock@gnu.org/chrome/content/ui/firstRun.html
index 36f5cf7..cb2ec25 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/firstRun.html
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/firstRun.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!--
-  - This file is part of Adblock Plus <http://adblockplus.org/>,
-  - Copyright (C) 2006-2014 Eyeo GmbH
+  - This file is part of Adblock Plus <https://adblockplus.org/>,
+  - Copyright (C) 2006-2015 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
@@ -20,8 +20,9 @@
   <head>
     <title class="i18n_firstRun_title"></title>
     <meta charset="utf-8">
-    <link type="text/css" href="/skin/firstRun.css" rel="stylesheet"/>
-    <script type="text/javascript" src="utils.js"></script>
+    <link type="text/css" href="skin/firstRun.css" rel="stylesheet"/>
+    <script type="text/javascript" src="ext/common.js"></script>
+    <script type="text/javascript" src="ext/content.js"></script>
     <script type="text/javascript" src="i18n.js"></script>
     <script type="text/javascript" src="firstRun.js"></script>
   </head>
@@ -29,7 +30,7 @@
 
 
     <header>
-        <div id="logo"></div>
+        <img id="logo">
         <h1 id="title-main" class="i18n_firstRun_title"></h1>
     </header>
 
@@ -37,97 +38,98 @@
     <section id="filterlistsReinitializedWarning" class="i18n_firstRun_filterlistsReinitializedWarning warning" hidden="true"></section>
     <section id="dataCorruptionWarning" class="i18n_firstRun_dataCorruptionWarning warning" hidden="true"></section>
 
-    <section id="acceptable-ads">
-      <h2 class="i18n_firstRun_acceptableAdsHeadline"></h2>
-      <p id="acceptableAdsExplanation" class="i18n_firstRun_acceptableAdsExplanation"></p>
-    </section>
+    <div id="content">
+      <section id="acceptable-ads">
+        <h2 class="i18n_firstRun_acceptableAdsHeadline"></h2>
+        <p id="acceptableAdsExplanation" class="i18n_firstRun_acceptableAdsExplanation"></p>
+      </section>
 
 
-    <section id="share">
-      <h2 id="share-headline" class="i18n_firstRun_share_headline"></h2>
+      <section id="share">
+        <h2 id="share-headline" class="i18n_firstRun_share_headline"></h2>
 
-      <div id="donate-block">
-        <a id="donate" class="i18n_firstRun_donate" target="_blank"></a>
-        <span id="donate-label" class="i18n_firstRun_donate_label"></span>
-      </div>
-
-      <div id="share-block">
-        <div id="share-general" class="share-buttons">
-          <a id="share-facebook" href="https://www.facebook.com/adblockplus" target="_blank" data-script="https://facebook.com/plugins/like.php?">
-          </a>
-          <a id="share-twitter" href="https://twitter.com/adblockplus" target="_blank" data-script="https://platform.twitter.com/widgets.js">
-          </a>
-          <a id="share-gplus" href="https://www.google.com/+AdblockPlus" target="_blank" data-script="https://apis.google.com/js/plusone.js">
-          </a>
+        <div id="donate-block">
+          <a id="donate" class="i18n_firstRun_donate" target="_blank"></a>
+          <span id="donate-label" class="i18n_firstRun_donate_label"></span>
         </div>
 
-        <!-- Chinese social networks -->
-        <div id="share-chinese" class="share-buttons">
-          <a id="share-renren" href="http://www.renren.com/601651969" target="_blank">
-          </a>
-          <a id="share-weibo" href="http://e.weibo.com/adblockplus/" target="_blank">
-          </a>
+        <div id="share-block">
+          <div id="share-general" class="share-buttons">
+            <a id="share-facebook" href="https://www.facebook.com/adblockplus" target="_blank" data-script="https://facebook.com/plugins/like.php?">
+            </a>
+            <a id="share-twitter" href="https://twitter.com/adblockplus" target="_blank" data-script="https://platform.twitter.com/widgets/">
+            </a>
+            <a id="share-gplus" href="https://www.google.com/+AdblockPlus" target="_blank" data-script="https://apis.google.com/se/0/_/+1/fastbutton?">
+            </a>
+          </div>
+
+          <!-- Chinese social networks -->
+          <div id="share-chinese" class="share-buttons">
+            <a id="share-renren" href="http://www.renren.com/601651969" target="_blank">
+            </a>
+            <a id="share-weibo" href="http://e.weibo.com/adblockplus/" target="_blank">
+            </a>
+          </div>
+          <span class="i18n_firstRun_share"></span>
         </div>
-        <span class="i18n_firstRun_share"></span>
-      </div>
-    </section>
-
-
-    <section id="can-do-more">
-      <h2 class="i18n_firstRun_features"></h2>
-
-      <div id="can-do-more-content">
-        <ul id="features">
-          <li id="feature-malware" class="feature">
-            <div class="feature-image feature-malware-image"></div>
-            <div class="feature-description">
-              <div class="feature-description-textblock">
-                <h3 class="i18n_firstRun_feature_malware feature-title"></h3>
-                <span class="i18n_firstRun_feature_malware_description"></span>
-              </div>
-              <div id="toggle-malware" class="toggle">
-                <div class="i18n_firstRun_toggle_on toggle-on"></div>
-                <div class="toggle-blob"></div>
-                <div class="i18n_firstRun_toggle_off toggle-off"></div>
-              </div>
-            </div>
-
-          </li>
-          <li id="feature-social" class="feature">
-            <div class="feature-image feature-social-image"></div>
-            <div class="feature-description">
-              <div class="feature-description-textblock">
-                <h3 class="i18n_firstRun_feature_social feature-title"></h3>
-                <span class="i18n_firstRun_feature_social_description"></span>
-              </div>
-              <div id="toggle-social" class="toggle">
-                <div class="i18n_firstRun_toggle_on toggle-on"></div>
-                <div class="toggle-blob"></div>
-                <div class="i18n_firstRun_toggle_off toggle-off"></div>
-              </div>
-            </div>
-          </li>
+      </section>
 
-          <li id="feature-tracking" class="feature">
-            <div class="feature-image feature-tracking-image"></div>
-            <div class="feature-description">
+
+      <section id="can-do-more">
+        <h2 class="i18n_firstRun_features"></h2>
+
+        <div id="can-do-more-content">
+          <ul id="features">
+            <li id="feature-malware" class="feature">
+              <div class="feature-image feature-malware-image"></div>
+              <div class="feature-description">
                 <div class="feature-description-textblock">
-                  <h3 class="i18n_firstRun_feature_tracking feature-title"></h3>
-                  <span class="i18n_firstRun_feature_tracking_description"></span>
+                  <h3 class="i18n_firstRun_feature_malware feature-title"></h3>
+                  <span class="i18n_firstRun_feature_malware_description"></span>
                 </div>
-                <div id="toggle-tracking" class="toggle">
+                <div id="toggle-malware" class="toggle">
                   <div class="i18n_firstRun_toggle_on toggle-on"></div>
                   <div class="toggle-blob"></div>
                   <div class="i18n_firstRun_toggle_off toggle-off"></div>
                 </div>
-            </div>
-          </li>
+              </div>
 
-        </ul>
+            </li>
+            <li id="feature-social" class="feature">
+              <div class="feature-image feature-social-image"></div>
+              <div class="feature-description">
+                <div class="feature-description-textblock">
+                  <h3 class="i18n_firstRun_feature_social feature-title"></h3>
+                  <span class="i18n_firstRun_feature_social_description"></span>
+                </div>
+                <div id="toggle-social" class="toggle">
+                  <div class="i18n_firstRun_toggle_on toggle-on"></div>
+                  <div class="toggle-blob"></div>
+                  <div class="i18n_firstRun_toggle_off toggle-off"></div>
+                </div>
+              </div>
+            </li>
+
+            <li id="feature-tracking" class="feature">
+              <div class="feature-image feature-tracking-image"></div>
+              <div class="feature-description">
+                  <div class="feature-description-textblock">
+                    <h3 class="i18n_firstRun_feature_tracking feature-title"></h3>
+                    <span class="i18n_firstRun_feature_tracking_description"></span>
+                  </div>
+                  <div id="toggle-tracking" class="toggle">
+                    <div class="i18n_firstRun_toggle_on toggle-on"></div>
+                    <div class="toggle-blob"></div>
+                    <div class="i18n_firstRun_toggle_off toggle-off"></div>
+                  </div>
+              </div>
+            </li>
 
-      </div>
-    </section>
+          </ul>
 
+        </div>
+      </section>
+    </div>
 
     <footer>
       <a id="contributors" class="i18n_firstRun_contributor_credits"></a>
@@ -138,4 +140,4 @@
       <iframe id="share-popup" scrolling="no"></iframe>
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/firstRun.js b/data/extensions/spyblock@gnu.org/chrome/content/ui/firstRun.js
index be2caa6..3a11a2e 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/firstRun.js
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/firstRun.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -19,6 +19,11 @@
 
 (function()
 {
+  function E(id)
+  {
+    return document.getElementById(id);
+  }
+
   // Load subscriptions for features
   var featureSubscriptions = [
     {
@@ -41,95 +46,107 @@
     }
   ];
 
+  function getDocLink(link, callback)
+  {
+    ext.backgroundPage.sendMessage({
+      type: "app.get",
+      what: "doclink",
+      link: link
+    }, callback);
+  }
+
   function onDOMLoaded()
   {
-    var locale = require("utils").Utils.appLocale;
-    document.documentElement.setAttribute("lang", locale);
+    // Set up logo image
+    var logo = E("logo");
+    logo.src = "skin/abp-128.png";
+    var errorCallback = function()
+    {
+      logo.removeEventListener("error", errorCallback, false);
+      // We are probably in Chrome/Opera/Safari, the image has a different path.
+      logo.src = "icons/detailed/abp-128.png";
+    };
+    logo.addEventListener("error", errorCallback, false);
 
     // Set up URLs
-    var donateLink = E("donate");
-    donateLink.href = Utils.getDocLink("donate");
+    getDocLink("donate", function(link)
+    {
+      E("donate").href = link;
+    });
 
-    var contributors = E("contributors");
-    contributors.href = Utils.getDocLink("contributors");
+    getDocLink("contributors", function(link)
+    {
+      E("contributors").href = link;
+    });
 
-    setLinks("acceptableAdsExplanation", Utils.getDocLink("acceptable_ads_criteria"), openFilters);
-    setLinks("share-headline", Utils.getDocLink("contribute"));
+    getDocLink("acceptable_ads_criteria", function(link)
+    {
+      setLinks("acceptableAdsExplanation", link, openFilters);
+    });
+
+    getDocLink("contribute", function(link)
+    {
+      setLinks("share-headline", link);
+    });
 
-    if (typeof backgroundPage != "undefined")
+    ext.backgroundPage.sendMessage({
+      type: "app.get",
+      what: "issues"
+    }, function(issues)
     {
       // Show warning if data corruption was detected
-      if (backgroundPage.seenDataCorruption)
+      if (issues.seenDataCorruption)
       {
         E("dataCorruptionWarning").removeAttribute("hidden");
-        setLinks("dataCorruptionWarning", Utils.getDocLink("knownIssuesChrome_filterstorage"));
+        getDocLink("knownIssuesChrome_filterstorage", function(link)
+        {
+          setLinks("dataCorruptionWarning", link);
+        });
       }
 
       // Show warning if filterlists settings were reinitialized
-      if (backgroundPage.filterlistsReinitialized)
+      if (issues.filterlistsReinitialized)
       {
         E("filterlistsReinitializedWarning").removeAttribute("hidden");
         setLinks("filterlistsReinitializedWarning", openFilters);
       }
-    }
 
-    // Show warning if Safari version isn't supported
-    var info = require("info");
-    if (info.platform == "safari" && (
-      Services.vc.compare(info.platformVersion, "6.0")  < 0 ||  // beforeload breaks websites in Safari 5
-      Services.vc.compare(info.platformVersion, "6.1") == 0 ||  // extensions are broken in 6.1 and 7.0
-      Services.vc.compare(info.platformVersion, "7.0") == 0
-    ))
-      E("legacySafariWarning").removeAttribute("hidden");
+      if (issues.legacySafariVersion)
+        E("legacySafariWarning").removeAttribute("hidden");
+    });
 
     // Set up feature buttons linked to subscriptions
-    featureSubscriptions.forEach(setToggleSubscriptionButton);
-    var filterListener = function(action)
+    featureSubscriptions.forEach(initToggleSubscriptionButton);
+    updateToggleButtons();
+    updateSocialLinks();
+
+    ext.onMessage.addListener(function(message)
     {
-      if (/^subscription\.(added|removed|disabled)$/.test(action))
+      if (message.type == "subscriptions.listen")
       {
-        for (var i = 0; i < featureSubscriptions.length; i++)
-        {
-          var featureSubscription = featureSubscriptions[i];
-          updateToggleButton(featureSubscription.feature, isSubscriptionEnabled(featureSubscription));
-        }
+        updateToggleButtons();
+        updateSocialLinks();
       }
-    }
-    FilterNotifier.addListener(filterListener);
-    window.addEventListener("unload", function(event)
-    {
-      FilterNotifier.removeListener(filterListener);
-    }, false);
-
-    initSocialLinks();
-  }
-
-  function isSubscriptionEnabled(featureSubscription)
-  {
-    return featureSubscription.url in FilterStorage.knownSubscriptions
-      && !Subscription.fromURL(featureSubscription.url).disabled;
+    });
+    ext.backgroundPage.sendMessage({
+      type: "subscriptions.listen",
+      filter: ["added", "removed", "updated", "disabled"]
+    });
   }
 
-  function setToggleSubscriptionButton(featureSubscription)
+  function initToggleSubscriptionButton(featureSubscription)
   {
     var feature = featureSubscription.feature;
 
     var element = E("toggle-" + feature);
-    updateToggleButton(feature, isSubscriptionEnabled(featureSubscription));
     element.addEventListener("click", function(event)
     {
-      var subscription = Subscription.fromURL(featureSubscription.url);
-      if (isSubscriptionEnabled(featureSubscription))
-        FilterStorage.removeSubscription(subscription);
-      else
-      {
-        subscription.disabled = false;
-        subscription.title = featureSubscription.title;
-        subscription.homepage = featureSubscription.homepage;
-        FilterStorage.addSubscription(subscription);
-        if (!subscription.lastDownload)
-          Synchronizer.execute(subscription);
-      }
+      ext.backgroundPage.sendMessage({
+        type: "subscriptions.toggle",
+        url: featureSubscription.url,
+        title: featureSubscription.title,
+        homepage: featureSubscription.homepage
+      });
     }, false);
   }
 
@@ -141,8 +158,7 @@
 
     var popupMessageListener = function(event)
     {
-      var originFilter = Filter.fromText("||adblockplus.org^");
-      if (!originFilter.matches(event.origin, "OTHER", null, null))
+      if (!/[.\/]adblockplus\.org$/.test(event.origin))
         return;
 
       var width = event.data.width;
@@ -184,25 +200,38 @@
     glassPane.className = "visible";
   }
 
-  function initSocialLinks()
+  function updateSocialLinks()
   {
     var networks = ["twitter", "facebook", "gplus"];
     networks.forEach(function(network)
     {
       var link = E("share-" + network);
-      link.addEventListener("click", onSocialLinkClick, false);
+      var message = {
+        type: "filters.blocked",
+        url: link.getAttribute("data-script"),
+        requestType: "SCRIPT",
+        docDomain: "adblockplus.org",
+        thirdParty: true
+      };
+      ext.backgroundPage.sendMessage(message, function(blocked)
+      {
+        // Don't open the share page if the sharing script would be blocked
+        if (blocked)
+          link.removeEventListener("click", onSocialLinkClick, false);
+        else
+          link.addEventListener("click", onSocialLinkClick, false);
+      });
     });
   }
 
   function onSocialLinkClick(event)
   {
-    // Don't open the share page if the sharing script would be blocked
-    var filter = defaultMatcher.matchesAny(event.target.getAttribute("data-script"), "SCRIPT", "adblockplus.org", true);
-    if (!(filter instanceof BlockingFilter))
+    event.preventDefault();
+
+    getDocLink(event.target.id, function(link)
     {
-      event.preventDefault();
-      openSharePopup(Utils.getDocLink(event.target.id));
-    }
+      openSharePopup(link);
+    });
   }
 
   function setLinks(id)
@@ -232,12 +261,26 @@
 
   function openFilters()
   {
-    if (typeof UI != "undefined")
-      UI.openFiltersDialog();
-    else
+    ext.backgroundPage.sendMessage({type: "app.open", what: "options"});
+  }
+
+  function updateToggleButtons()
+  {
+    ext.backgroundPage.sendMessage({
+      type: "subscriptions.get",
+      downloadable: true,
+      ignoreDisabled: true
+    }, function(subscriptions)
     {
-      backgroundPage.openOptions();
-    }
+      var known = Object.create(null);
+      for (var i = 0; i < subscriptions.length; i++)
+        known[subscriptions[i].url] = true;
+      for (var i = 0; i < featureSubscriptions.length; i++)
+      {
+        var featureSubscription = featureSubscriptions[i];
+        updateToggleButton(featureSubscription.feature, featureSubscription.url in known);
+      }
+    });
   }
 
   function updateToggleButton(feature, isEnabled)
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/flasher.js b/data/extensions/spyblock@gnu.org/chrome/content/ui/flasher.js
index ddb4131..69f4c9e 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/flasher.js
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/flasher.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/i18n.js b/data/extensions/spyblock@gnu.org/chrome/content/ui/i18n.js
index 8366268..9d380b7 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/i18n.js
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/i18n.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -15,81 +15,30 @@
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-var i18n;
+// This variable should no longer be necessary once options.js in Chrome
+// accesses ext.i18n directly.
+var i18n = ext.i18n;
 
-if (typeof ext != "undefined")
-  i18n = ext.i18n;
-else if (typeof chrome != "undefined")
-  // TODO: This check only exist for backwards compatibility, while the Safari
-  // port isn't merged into the adblockpluschrome repo. So this branch should
-  // be removed when the Safari port was merged.
-  i18n = chrome.i18n;
-else
-{
-  // Using Firefox' approach on i18n instead
-
-  // Randomize URI to work around bug 719376
-  var pageName = location.pathname.replace(/.*\//, '').replace(/\..*?$/, '');
-  var stringBundle = Services.strings.createBundle("chrome://adblockplus/locale/" + pageName +
-    ".properties?" + Math.random());
-
-  function getI18nMessage(key)
+// Getting UI locale cannot be done synchronously on Firefox,
+// requires messaging the background page. For Chrome and Safari,
+// we could get the UI locale here, but would need to duplicate
+// the logic implemented in Utils.appLocale.
+ext.backgroundPage.sendMessage(
   {
-    return {
-      "message": stringBundle.GetStringFromName(key)
-    };
-  }
-
-  i18n = (function()
+    type: "app.get",
+    what: "localeInfo"
+  },
+  function(localeInfo)
   {
-    function getText(message, args)
-    {
-      var text = message.message;
-      var placeholders = message.placeholders;
-
-      if (!args || !placeholders)
-        return text;
-
-      for (var key in placeholders)
-      {
-        var content = placeholders[key].content;
-        if (!content)
-          continue;
-
-        var index = parseInt(content.slice(1), 10);
-        if (isNaN(index))
-          continue;
-
-        var replacement = args[index - 1];
-        if (typeof replacement === "undefined")
-          continue;
-
-        text = text.split("$" + key + "$").join(replacement);
-      }
-      return text;
-    }
-
-    return {
-      getMessage: function(key, args)
-      {
-        try{
-          var message = getI18nMessage(key);
-          return getText(message, args);
-        }
-        catch(e)
-        {
-          Cu.reportError(e);
-          return "Missing translation: " + key;
-        }
-      }
-    };
-  })();
-}
+    document.documentElement.lang = localeInfo.locale;
+    document.documentElement.dir = localeInfo.bidiDir;
+  }
+);
 
 // Inserts i18n strings into matching elements. Any inner HTML already in the element is
 // parsed as JSON and used as parameters to substitute into placeholders in the i18n
 // message.
-i18n.setElementText = function(element, stringName, arguments)
+ext.i18n.setElementText = function(element, stringName, arguments)
 {
   function processString(str, element)
   {
@@ -110,7 +59,7 @@ i18n.setElementText = function(element, stringName, arguments)
 
   while (element.lastChild)
     element.removeChild(element.lastChild);
-  processString(i18n.getMessage(stringName, arguments), element);
+  processString(ext.i18n.getMessage(stringName, arguments), element);
 }
 
 // Loads i18n strings
@@ -129,7 +78,7 @@ function loadI18nStrings()
       className = className.animVal;
     var stringName = className.split(/\s/)[0].substring(5);
 
-    i18n.setElementText(node, stringName, arguments);
+    ext.i18n.setElementText(node, stringName, arguments);
   }
 }
 
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/overlay.xul b/data/extensions/spyblock@gnu.org/chrome/content/ui/overlay.xul
index 90b5b9f..62c57e6 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/overlay.xul
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/overlay.xul
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
-  - This file is part of Adblock Plus <http://adblockplus.org/>,
-  - Copyright (C) 2006-2014 Eyeo GmbH
+  - This file is part of Adblock Plus <https://adblockplus.org/>,
+  - Copyright (C) 2006-2015 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
@@ -47,7 +47,6 @@
 
   <!-- Icon's context menu -->
   <menupopup id="abp-status-popup" context="">
-    <!--menuitem id="abp-status-sendReport" label="&sendReport.label;…" key="abp-key-sendReport" command="abp-command-sendReport"/-->
     <menuitem id="abp-status-openbottombar" label="&opensidebar.label;" key="abp-key-sidebar" command="abp-command-sidebar"/>
     <menuitem id="abp-status-closebottombar" label="&closesidebar.label;" key="abp-key-sidebar" command="abp-command-sidebar"/>
     <menuitem id="abp-status-filters" label="&filters.label;…" key="abp-key-filters" command="abp-command-filters"/>
@@ -59,7 +58,6 @@
     <menu id="abp-status-options" label="&options.label;">
       <menupopup id="abp-status-options-popup">
         <menuitem id="abp-status-frameobjects" label="&objecttabs.label;" type="checkbox" command="abp-command-toggleobjtabs"/>
-        <menuitem id="abp-status-slowcollapse" label="&hideplaceholders.label;" type="checkbox" command="abp-command-togglecollapse"/>
         <menuitem id="abp-status-savestats" label="&counthits.label;" type="checkbox" command="abp-command-togglesavestats"/>
         <menuitem id="abp-status-sync" label="&sync.label;" type="checkbox" command="abp-command-togglesync"/>
         <menuseparator id="abp-status-iconSettingsSeparator"/>
@@ -68,26 +66,18 @@
       </menupopup>
     </menu>
 
-    <hbox class="abp-contributebutton" id="abp-status-contributebutton" pack="center" align="center">
-      <!-- noautoclose attribute tells Australis menu that it shouldn't close when
-           these are clicked, see https://bugzilla.mozilla.org/show_bug.cgi?id=940693 -->
-      <button class="abp-contributebutton-btn" label="&contribute.label;" command="abp-command-contribute" flex="1" noautoclose="true"/>
-      <toolbarbutton class="abp-contributebutton-close" command="abp-command-contribute-hide" noautoclose="true"/>
-    </hbox>
   </menupopup>
 
   <keyset id="abp-keyset"/>
 
   <!-- Dummy oncommand attributes are work-arounds for bug 371900 -->
   <commandset id="abp-commandset">
-    <command id="abp-command-sendReport" oncommand="//"/>
     <command id="abp-command-filters" oncommand="//"/>
     <command id="abp-command-settings" oncommand="//"/>
     <command id="abp-command-sidebar" oncommand="//"/>
     <command id="abp-command-togglesitewhitelist"/>
     <command id="abp-command-togglepagewhitelist"/>
     <command id="abp-command-toggleobjtabs"/>
-    <command id="abp-command-togglecollapse"/>
     <command id="abp-command-togglesavestats"/>
     <command id="abp-command-togglesync"/>
     <command id="abp-command-toggleshowintoolbar"/>
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/progressBar.js b/data/extensions/spyblock@gnu.org/chrome/content/ui/progressBar.js
index 659acdd..a449c2c 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/progressBar.js
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/progressBar.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -32,10 +32,16 @@
       canvas.parentNode.appendChild(headers[i]);
 
     // Expose properties
-    progressBar.__defineGetter__("activeItem", getActiveItem);
-    progressBar.__defineSetter__("activeItem", setActiveItem);
-    progressBar.__defineGetter__("activeItemComplete", getActiveItemComplete);
-    progressBar.__defineSetter__("activeItemComplete", setActiveItemComplete);
+    Object.defineProperty(progressBar, "activeItem",
+    {
+      get: getActiveItem,
+      set: setActiveItem
+    });
+    Object.defineProperty(progressBar, "activeItemComplete",
+    {
+      get: getActiveItemComplete,
+      set: setActiveItemComplete
+    });
 
     isRTL = (window.getComputedStyle(document.documentElement).direction == "rtl");
 
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/progressBar.xul b/data/extensions/spyblock@gnu.org/chrome/content/ui/progressBar.xul
index d940e61..3098d12 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/progressBar.xul
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/progressBar.xul
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
-  - This file is part of Adblock Plus <http://adblockplus.org/>,
-  - Copyright (C) 2006-2014 Eyeo GmbH
+  - This file is part of Adblock Plus <https://adblockplus.org/>,
+  - Copyright (C) 2006-2015 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/sendReport.js b/data/extensions/spyblock@gnu.org/chrome/content/ui/sendReport.js
index 3ccc0e6..c61dbbb 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/sendReport.js
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/sendReport.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -189,7 +189,7 @@ let requestsDataSource =
   origRequests: [],
   requestNotifier: null,
   callback: null,
-  nodeByKey: {__proto__: null},
+  nodeByKey: Object.create(null),
 
   collectData: function(wnd, windowURI, callback)
   {
@@ -636,7 +636,7 @@ let errorsDataSource =
       messages = messages.slice(messages.length - 10, messages.length);
 
     // Censor app and profile paths in error messages
-    let censored = {__proto__: null};
+    let censored = Object.create(null);
     let pathList = [["ProfD", "%PROFILE%"], ["GreD", "%GRE%"], ["CurProcD", "%APP%"]];
     for (let i = 0; i < pathList.length; i++)
     {
@@ -733,6 +733,14 @@ let subscriptionUpdateDataSource =
   type: null,
   outdated: null,
   needUpdate: null,
+  
+  subscriptionFilter: function(s)
+  {
+    if (s instanceof DownloadableSubscription)
+      return subscriptionsDataSource.subscriptionFilter(s);
+    else
+      return false;
+  },
 
   collectData: function(wnd, windowURI, callback)
   {
@@ -744,7 +752,7 @@ let subscriptionUpdateDataSource =
     this.outdated = [];
     this.needUpdate = [];
 
-    let subscriptions = FilterStorage.subscriptions.filter(issuesDataSource.subscriptionFilter);
+    let subscriptions = FilterStorage.subscriptions.filter(this.subscriptionFilter);
     for (let i = 0; i < subscriptions.length; i++)
     {
       let lastSuccess = subscriptions[i].lastSuccess;
@@ -884,8 +892,12 @@ let issuesDataSource =
 
   subscriptionFilter: function(s)
   {
-    if (s instanceof DownloadableSubscription)
+    if (s instanceof DownloadableSubscription &&
+        s.url != Prefs.subscriptions_exceptionsurl &&
+        s.url != Prefs.subscriptions_antiadblockurl)
+    {
       return subscriptionsDataSource.subscriptionFilter(s);
+    }
     else
       return false;
   },
@@ -899,18 +911,18 @@ let issuesDataSource =
     {
       // Find disabled filters in active subscriptions matching any of the requests
       let disabledMatcher = new CombinedMatcher();
-      for each (let subscription in FilterStorage.subscriptions)
+      for (let subscription of FilterStorage.subscriptions)
       {
         if (subscription.disabled)
           continue;
 
-        for each (let filter in subscription.filters)
+        for (let filter of subscription.filters)
           if (filter instanceof BlockingFilter && filter.disabled)
             disabledMatcher.add(filter);
       }
 
-      let seenFilters = {__proto__: null};
-      for each (let request in requestsDataSource.origRequests)
+      let seenFilters = Object.create(null);
+      for (let request of requestsDataSource.origRequests)
       {
         if (request.filter)
           continue;
@@ -924,18 +936,18 @@ let issuesDataSource =
       }
 
       // Find disabled subscriptions with filters matching any of the requests
-      let seenSubscriptions = {__proto__: null};
-      for each (let subscription in FilterStorage.subscriptions)
+      let seenSubscriptions = Object.create(null);
+      for (let subscription of FilterStorage.subscriptions)
       {
         if (!subscription.disabled)
           continue;
 
         disabledMatcher.clear();
-        for each (let filter in subscription.filters)
+        for (let filter of subscription.filters)
           if (filter instanceof BlockingFilter)
             disabledMatcher.add(filter);
 
-        for each (let request in requestsDataSource.origRequests)
+        for (let request of requestsDataSource.origRequests)
         {
           if (request.filter)
             continue;
@@ -952,7 +964,7 @@ let issuesDataSource =
 
       this.numSubscriptions = FilterStorage.subscriptions.filter(this.subscriptionFilter).length;
       this.numAppliedFilters = 0;
-      for each (let filter in filtersDataSource.origFilters)
+      for (let filter of filtersDataSource.origFilters)
       {
         if (filter instanceof WhitelistFilter)
           continue;
@@ -984,7 +996,7 @@ let issuesDataSource =
     if (this.ownFilters.length && !ownFiltersBox.firstChild)
     {
       let template = E("issuesOwnFiltersTemplate");
-      for each (let filter in this.ownFilters)
+      for (let filter of this.ownFilters)
       {
         let element = template.cloneNode(true);
         element.removeAttribute("id");
@@ -1001,7 +1013,7 @@ let issuesDataSource =
     if (this.disabledSubscriptions.length && !disabledSubscriptionsBox.firstChild)
     {
       let template = E("issuesDisabledSubscriptionsTemplate");
-      for each (let subscription in this.disabledSubscriptions)
+      for (let subscription of this.disabledSubscriptions)
       {
         let element = template.cloneNode(true);
         element.removeAttribute("id");
@@ -1018,7 +1030,7 @@ let issuesDataSource =
     if (this.disabledFilters.length && !disabledFiltersBox.firstChild)
     {
       let template = E("issuesDisabledFiltersTemplate");
-      for each (let filter in this.disabledFilters)
+      for (let filter of this.disabledFilters)
       {
         let element = template.cloneNode(true);
         element.removeAttribute("id");
@@ -1107,7 +1119,7 @@ let issuesDataSource =
     if ("mainSubscriptionURL" in result)
       subscriptionResults.push([result.mainSubscriptionURL, result.mainSubscriptionTitle]);
 
-    for each (let [url, title] in subscriptionResults)
+    for (let [url, title] of subscriptionResults)
     {
       let subscription = Subscription.fromURL(url);
       if (!subscription)
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/sendReport.xul b/data/extensions/spyblock@gnu.org/chrome/content/ui/sendReport.xul
index 54e0726..491e3b6 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/sendReport.xul
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/sendReport.xul
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
-  - This file is part of Adblock Plus <http://adblockplus.org/>,
-  - Copyright (C) 2006-2014 Eyeo GmbH
+  - This file is part of Adblock Plus <https://adblockplus.org/>,
+  - Copyright (C) 2006-2015 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
@@ -213,7 +213,7 @@
   <description>&emailComment.label;</description>
   <hbox class="topLabel" align="baseline">
     <label id="emailLabel" control="email" value="&email.label;"/>
-    <textbox id="email" persist="value" flex="1" maxlength="200" oninput="updateEmail();"/>
+    <textbox id="email" type="email" persist="value" flex="1" maxlength="200" oninput="updateEmail();"/>
   </hbox>
   <checkbox id="anonymousCheckbox" label="&anonymous.label;" oncommand="updateEmail();"/>
   <description id="anonymityWarning" visible="false">&anonymity.warning;</description>
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/settings.xul b/data/extensions/spyblock@gnu.org/chrome/content/ui/settings.xul
index 4215a38..0dc8317 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/settings.xul
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/settings.xul
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
-  - This file is part of Adblock Plus <http://adblockplus.org/>,
-  - Copyright (C) 2006-2014 Eyeo GmbH
+  - This file is part of Adblock Plus <https://adblockplus.org/>,
+  - Copyright (C) 2006-2015 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
@@ -29,7 +29,6 @@
   </setting>
   <setting pref="extensions.adblockplus.enabled" type="bool" inverted="true" title="&disable.label;"/>
   <setting pref="extensions.adblockplus.frameobjects" type="bool" title="&objecttabs.label;"/>
-  <setting pref="extensions.adblockplus.fastcollapse" type="bool" inverted="true" title="&hideplaceholders.label;"/>
   <setting id="adblockplus-savestats" type="bool" title="&counthits.label;"/>
   <setting id="adblockplus-sync" type="bool" title="&sync.label;"/>
   <setting id="adblockplus-showintoolbar" type="bool" title="&showintoolbar.label;"/>
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/sidebar.js b/data/extensions/spyblock@gnu.org/chrome/content/ui/sidebar.js
index 358aebe..0b49068 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/sidebar.js
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/sidebar.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -23,7 +23,7 @@ var mainWin = parent;
 // The window handler currently in use
 var requestNotifier = null;
 
-var cacheSession = null;
+var cacheStorage = null;
 var noFlash = false;
 
 // Matcher for disabled filters
@@ -85,7 +85,7 @@ function init() {
   }
 
   let {getBrowser, addBrowserLocationListener} = require("appSupport");
-  window.__defineGetter__("content", function() {return getBrowser(mainWin).contentWindow;});
+  Object.defineProperty(window, "content", { get: () => getBrowser(mainWin).contentWindow });
 
   // Initialize matcher for disabled filters
   reloadDisabledFilters();
@@ -155,12 +155,12 @@ function reloadDisabledFiltersInternal()
 
   if (Prefs.enabled)
   {
-    for each (let subscription in FilterStorage.subscriptions)
+    for (let subscription of FilterStorage.subscriptions)
     {
       if (subscription.disabled)
         continue;
 
-      for each (let filter in subscription.filters)
+      for (let filter of subscription.filters)
         if (filter instanceof RegExpFilter && filter.disabled)
           disabledMatcher.add(filter);
     }
@@ -200,6 +200,7 @@ function handleLocationChange()
     if (item)
       treeView.addItem(node, item, scanComplete);
   });
+  cacheStorage = null;
 }
 
 // Fills a box with text splitting it up into multiple lines if necessary
@@ -295,43 +296,67 @@ function fillInTooltip(e) {
   var showPreview = Prefs.previewimages && !("tooltip" in item);
   showPreview = showPreview && item.typeDescr == "IMAGE";
   showPreview = showPreview && (!item.filter || item.filter.disabled || item.filter instanceof WhitelistFilter);
+  E("tooltipPreviewBox").hidden = true;
   if (showPreview)
   {
-    // Check whether image is in cache (stolen from ImgLikeOpera)
-    if (!cacheSession)
+    if (!cacheStorage)
     {
-      var cacheService = Cc["@mozilla.org/network/cache-service;1"].getService(Ci.nsICacheService);
-      cacheSession = cacheService.createSession("HTTP", Ci.nsICache.STORE_ANYWHERE, true);
+      let {Services} = Cu.import("resource://gre/modules/Services.jsm", null);
+      // Cache v2 API is enabled by default starting with Gecko 32
+      if (Services.vc.compare(Utils.platformVersion, "32.0a1") >= 0)
+      {
+        let {LoadContextInfo} = Cu.import("resource://gre/modules/LoadContextInfo.jsm", null);
+        let loadContext = content.QueryInterface(Ci.nsIInterfaceRequestor)
+                                 .getInterface(Ci.nsIWebNavigation)
+                                 .QueryInterface(Ci.nsILoadContext);
+        cacheStorage = Services.cache2.diskCacheStorage(LoadContextInfo.fromLoadContext(loadContext, false), false);
+      }
+      else
+        cacheStorage = Services.cache.createSession("HTTP", Ci.nsICache.STORE_ANYWHERE, true);
     }
-
-    let cacheListener =
+    
+    let showTooltipPreview = function ()
     {
-       onCacheEntryAvailable: function(descriptor, accessGranted, status)
-       {
-          if (!descriptor)
-            return;
-
-          descriptor.close();
-          // Show preview here since this is asynchronous now
-          // and we have a valid descriptor
-          E("tooltipPreview").setAttribute("src", item.location);
-          E("tooltipPreviewBox").hidden = false;
-       },
-       onCacheEntryDoomed: function(status)
-       {
-       }
+      E("tooltipPreview").setAttribute("src", item.location);
+      E("tooltipPreviewBox").hidden = false;
     };
     try
     {
-      cacheSession.asyncOpenCacheEntry(item.location, Ci.nsICache.ACCESS_READ, cacheListener);
+      if (Ci.nsICacheStorage && cacheStorage instanceof Ci.nsICacheStorage)
+      {
+        cacheStorage.asyncOpenURI(Utils.makeURI(item.location), "", Ci.nsICacheStorage.OPEN_READONLY, {
+          onCacheEntryCheck: function (entry, appCache)
+          {
+            return Ci.nsICacheEntryOpenCallback.ENTRY_WANTED;
+          },
+          onCacheEntryAvailable: function (entry, isNew, appCache, status)
+          {
+            if (!isNew)
+              showTooltipPreview();
+          }
+        });
+      }
+      else
+      {
+        cacheStorage.asyncOpenCacheEntry(item.location, Ci.nsICache.ACCESS_READ, {
+          onCacheEntryAvailable: function(descriptor, accessGranted, status)
+          {
+            if (!descriptor)
+              return;
+            descriptor.close();
+            showTooltipPreview();
+          },
+          onCacheEntryDoomed: function(status)
+          {
+          }
+        });
+      }
     }
     catch (e)
     {
       Cu.reportError(e);
     }
   }
-
-  E("tooltipPreviewBox").hidden = true;
 }
 
 const visual = {
@@ -451,7 +476,7 @@ function handleDblClick(event)
 function openInTab(item, /**Event*/ event)
 {
   let items = (item ? [item] : treeView.getAllSelectedItems());
-  for each (let item in items)
+  for (let item of items)
   {
     if (item && item.typeDescr != "ELEMHIDE")
       UI.loadInBrowser(item.location, mainWin, event);
@@ -647,7 +672,7 @@ function getItemSize(item)
   if (item.filter && !item.filter.disabled && item.filter instanceof BlockingFilter)
     return null;
 
-  for each (let node in item.nodes)
+  for (let node of item.nodes)
   {
     if (node instanceof HTMLImageElement && (node.naturalWidth || node.naturalHeight))
       return [node.naturalWidth, node.naturalHeight];
@@ -777,9 +802,9 @@ var treeView = {
     var boolAtoms = ["selected", "dummy", "filter-disabled"];
     var atomService = Cc["@mozilla.org/atom-service;1"].getService(Ci.nsIAtomService);
     this.atoms = {};
-    for each (let atom in stringAtoms)
+    for (let atom of stringAtoms)
       this.atoms[atom] = atomService.getAtom(atom);
-    for each (let atom in boolAtoms)
+    for (let atom of boolAtoms)
     {
       this.atoms[atom + "-true"] = atomService.getAtom(atom + "-true");
       this.atoms[atom + "-false"] = atomService.getAtom(atom + "-false");
@@ -1009,7 +1034,7 @@ var treeView = {
   filter: "",
   data: null,
   allData: [],
-  dataMap: {__proto__: null},
+  dataMap: Object.create(null),
   sortColumn: null,
   sortProc: null,
   resortTimeout: null,
@@ -1038,7 +1063,7 @@ var treeView = {
   clearData: function(data) {
     var oldRows = this.rowCount;
     this.allData = [];
-    this.dataMap = {__proto__: null};
+    this.dataMap = Object.create(null);
     this.refilter();
 
     this.boxObject.rowCountChanged(0, -oldRows);
@@ -1119,7 +1144,7 @@ var treeView = {
 
   updateFilters: function()
   {
-    for each (let item in this.allData)
+    for (let item of this.allData)
     {
       if (item.filter instanceof RegExpFilter && item.filter.disabled)
         delete item.filter;
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/sidebar.xul b/data/extensions/spyblock@gnu.org/chrome/content/ui/sidebar.xul
index 180b3ec..208389d 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/sidebar.xul
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/sidebar.xul
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
-  - This file is part of Adblock Plus <http://adblockplus.org/>,
-  - Copyright (C) 2006-2014 Eyeo GmbH
+  - This file is part of Adblock Plus <https://adblockplus.org/>,
+  - Copyright (C) 2006-2015 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/sidebarDetached.xul b/data/extensions/spyblock@gnu.org/chrome/content/ui/sidebarDetached.xul
index b7e117b..6738177 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/sidebarDetached.xul
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/sidebarDetached.xul
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
-  - This file is part of Adblock Plus <http://adblockplus.org/>,
-  - Copyright (C) 2006-2014 Eyeo GmbH
+  - This file is part of Adblock Plus <https://adblockplus.org/>,
+  - Copyright (C) 2006-2015 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/abp-128.png b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/abp-128.png
new file mode 100644
index 0000000..f1485e4
Binary files /dev/null and b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/abp-128.png differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/ajax-loader.gif b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/ajax-loader.gif
new file mode 100644
index 0000000..a642494
Binary files /dev/null and b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/ajax-loader.gif differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/background-main.png b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/background-main.png
new file mode 100644
index 0000000..464a997
Binary files /dev/null and b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/background-main.png differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/background-share.png b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/background-share.png
new file mode 100644
index 0000000..b572b56
Binary files /dev/null and b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/background-share.png differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/background.png b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/background.png
new file mode 100644
index 0000000..bb19387
Binary files /dev/null and b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/background.png differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/donate.png b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/donate.png
new file mode 100644
index 0000000..3e77b37
Binary files /dev/null and b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/donate.png differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/features/malware.png b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/features/malware.png
new file mode 100644
index 0000000..9b51b63
Binary files /dev/null and b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/features/malware.png differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/features/social.png b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/features/social.png
new file mode 100644
index 0000000..a2af1ea
Binary files /dev/null and b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/features/social.png differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/features/tracking.png b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/features/tracking.png
new file mode 100644
index 0000000..a8727a9
Binary files /dev/null and b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/features/tracking.png differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/firstRun.css b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/firstRun.css
new file mode 100644
index 0000000..a3c57d8
--- /dev/null
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/firstRun.css
@@ -0,0 +1,601 @@
+/*
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
+ *
+ * Adblock Plus is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Adblock Plus is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+@font-face {
+  font-family: 'CreteRound';
+  font-style: normal;
+  src: url(fonts/CreteRound-Regular.otf);
+  src: local ('Ø'),
+  /*local ('Ø') forces using no local font called CreteRound*/
+  url(fonts/CreteRound-Regular.otf) format('otf');
+}
+
+@font-face {
+  font-family: 'CreteRound';
+  font-style: italic;
+  src: url(fonts/CreteRound-Italic.otf);
+  src: local ('Ø'),
+  /*local ('Ø') forces using no local font called CreteRound*/
+  url(fonts/CreteRound-Italic.otf) format('otf');
+}
+
+body
+{
+  font-family: Helvetica, Arial, sans-serif;
+  font-size: 15px;
+  line-height: 140%;
+  color: #7f776b;
+  background-color: #f8f6f2;
+  background-image: url(background-main.png);
+  margin: 0;
+  padding: 0;
+}
+
+a, a:link, a:visited
+{
+  color: #5a84b3;
+  text-decoration: underline;
+}
+
+a:hover
+{
+  text-decoration: none;
+}
+
+button
+{
+  cursor: pointer;
+}
+
+ul
+{
+  margin: 0;
+  padding: 0;
+}
+
+li
+{
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+}
+
+header
+{
+  background-image: url(background.png);
+  background-repeat: repeat-x;
+  width: 100%;
+  padding: 25px 0 0 0;
+}
+
+header h1
+{
+  font-size: 24px;
+  font-weight: normal;
+  color: #57ab5b;
+  text-align: center;
+  margin: 21px auto;
+  padding: 16px 0 14px 0;
+  border: 1px #57ab5b;
+  border-style: dashed none;
+  /* border parallel fix - 957px is the value
+   * closest to 960px(page width) which makes
+   * the dashed border parallel
+   */
+  max-width: 957px;
+}
+
+h1,h2,h3
+{
+ font-family: CreteRound, Helvetica, Arial, sans-serif;
+}
+
+h2
+{
+  font-size: 26px;
+  font-weight: lighter;
+  color: #968d81;
+  line-height: 28px;
+  text-align: center;
+  margin: 0;
+  padding: 0;
+}
+
+h3
+{
+  font-size: 22px;
+  color: #7F776B;
+  font-weight: normal;
+  margin: 0 0 10px 0;
+  padding: 0;
+  line-height: 24px;
+}
+
+h4
+{
+  font-size: 15px;
+  color: #7f776b;
+  font-weight: normal;
+  text-align: center;
+  margin: 0;
+  padding: 0;
+}
+
+section
+{
+  margin: 0 auto;
+  margin-bottom: 30px;
+  max-width: 760px;
+  background-image: url(background.png);
+  padding: 40px 100px;
+}
+
+section > p
+{
+  margin: 15px 0 0 0;
+}
+
+#logo
+{
+  margin: 0 auto;
+  height: 128px;
+  width: 128px;
+  display: block;
+}
+
+#can-do-more
+{
+  max-width: 960px;
+  padding: 40px 0px 0px 0px;
+  border-bottom: 4px solid #968D81;
+}
+
+#can-do-more > h2
+{
+  margin: 0 100px;
+}
+
+.feature-malware-image
+{
+  background-image: url(features/malware.png);
+  background-repeat: no-repeat;
+}
+
+.feature-social-image
+{
+  background-image: url(features/social.png);
+  background-repeat: no-repeat;
+}
+
+.feature-tracking-image
+{
+  background-image: url(features/tracking.png);
+  background-repeat: no-repeat;
+}
+
+#can-do-more-content
+{
+  margin: 30px 100px 20px 100px;
+}
+
+#can-do-more #features
+{
+  border-spacing: 10px;
+  margin: 0px;
+  padding: 0px;
+}
+
+#can-do-more .feature:not([hidden])
+{
+  display: block;
+  list-style-type: none;
+  padding: 30px 0;
+  padding-bottom: 20px;
+  border-top: 1px dashed #c0bebb;
+}
+
+#can-do-more .feature-image, #can-do-more .feature-description
+{
+  display: inline-block;
+  *display: inline; /* IE6 inline-block fix */
+  *zoom: 1;
+  vertical-align: top;
+}
+
+#can-do-more .feature-description
+{
+  margin: 0px 0px 0 20px;
+  width: 625px;
+  max-width: 85%;
+}
+
+#can-do-more .feature-description-textblock
+{
+  width: 480px;
+  max-width: 100%;
+  margin: 0 40px 0 0;
+  display: inline-block;
+}
+
+#can-do-more .feature-description-textblock > span
+{
+  margin: 15px 0 0 0;
+}
+
+#can-do-more .feature-image
+{
+  width: 59px;
+  height: 59px;
+  margin: 8px 0 10px 20px;
+}
+
+#share
+{
+  background-image: url(background-share.png);
+  padding: 50px 100px 40px 100px;
+  max-width: 760px;
+  text-align: center;
+  font-family: CreteRound, Helvetica, Arial, sans-serif;
+}
+
+#share h2
+{
+  color: #fff;
+  margin: 0 0 30px 0;
+}
+
+#share h2 > a
+{
+  color: #fff;
+}
+
+#share h2 > a:hover
+{
+  color: #2e5075;
+}
+
+#share span
+{
+  color: #bed1e6;
+  text-align: center;
+  line-height: 34px;
+  font-size: 22px;
+  display: block;
+}
+
+#donate:hover, .share-buttons a:hover
+{
+  box-shadow: 0px 0px 0px 2px #8ca7c4;
+  border-radius: 30px;
+}
+
+#donate-block span, #share-block span
+{
+  margin: 10px 20px 0px 20px;
+}
+
+#donate-block, #share-block
+{
+  min-width: 250px;
+  display: inline-block;
+  vertical-align: top;
+  padding: 5px 0 5px 0;
+  border: 1px dashed #37506d;
+  border-style: none dashed;
+}
+
+#donate-block
+{
+  width: 50%;
+}
+
+#share-block
+{
+  width: 49%;
+
+  -webkit-border-start-style: none;
+  -moz-border-start-style: none;
+}
+
+.share-buttons
+{
+  margin: 6px 0 0 0;
+  cursor: pointer;
+  vertical-align: top;
+  /* because inline block creates
+   * space if not captured with
+   * font-size and line-height 0px
+   */
+  font-size: 0px;
+  line-height: 0px;
+}
+
+.share-buttons > a
+{
+  width: 50px;
+  height: 50px;
+  margin: 0 8px;
+  text-decoration: none;
+  display: inline-block;
+}
+
+#share-general,
+#share-chinese:lang(zh)
+{
+  display: block;
+}
+
+#share-general:lang(zh),
+#share-chinese
+{
+  display: none;
+}
+
+#share-chinese > a
+{
+  border-bottom: 2px solid transparent;
+}
+
+#share-chinese > a:hover
+{
+  box-shadow: none;
+  border-radius: 0;
+  border-bottom: 2px solid #8CA7C4;
+}
+
+#share-facebook
+{
+  background-image: url(social/facebook.png);
+  background-repeat: no-repeat;
+}
+
+#share-twitter
+{
+  background-image: url(social/twitter.png);
+  background-repeat: no-repeat;
+}
+
+#share-gplus
+{
+  background-image: url(social/googleplus.png);
+  background-repeat: no-repeat;
+}
+
+#share-renren
+{
+  background-image: url(social/renren.png);
+  background-repeat: no-repeat;
+}
+
+#share-weibo
+{
+  background-image: url(social/weibo.png);
+  background-repeat: no-repeat;
+}
+
+.warning
+{
+  font-size: 160%;
+  border: 3px dashed red;
+  text-align: center;
+  line-height: 1.3em;
+}
+
+#social ul
+{
+  list-style: none;
+  display: inline-block;
+  padding: 0;
+  margin: 0;
+}
+
+#social:hover h1
+{
+  opacity: 0;
+}
+
+#social ul:hover li {
+  opacity: 0.3;
+}
+
+#social ul li
+{
+  display: inline-block;
+  margin: 0px 5px;
+  -webkit-transition: opacity .5s ease, bottom .3s ease;
+  transition: opacity .5s ease, bottom .3s ease;
+  position: relative;
+  bottom: -30px;
+}
+
+#social ul li:hover
+{
+  opacity: 1.0;
+  bottom: 0px;
+}
+
+.share-button
+{
+  display: inline-block;
+  width: 82px;
+  height: 82px;
+}
+
+#glass-pane, #share-popup
+{
+  visibility: hidden;
+  opacity: 0;
+  -webkit-transition-property: opacity;
+  transition-property: opacity;
+}
+
+#glass-pane
+{
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  background: rgba(0, 0, 0, 0.5) url(ajax-loader.gif) no-repeat 50% 50%;
+  z-index: 101;
+  -webkit-transition-duration: 0.2s;
+  transition-duration: 0.2s;
+}
+
+#share-popup
+{
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  border: none;
+  -webkit-transition-delay: 0.1s;
+  transition-delay: 0.1s;
+}
+
+#glass-pane.visible, #share-popup.visible
+{
+  visibility: visible;
+  opacity: 1;
+}
+
+#share-popup.visible
+{
+  -webkit-transition-duration: 0.15s;
+  transition-duration: 0.15s;
+}
+
+/* Change order of the blocks for French */
+#content:lang(fr)
+{
+  display: table;
+  margin: auto;
+  caption-side: bottom;
+}
+
+#share:lang(fr)
+{
+  display: table-caption;
+}
+
+.toggle
+{
+  cursor: pointer;
+  position: relative;
+  display: inline-block;
+  vertical-align: top;
+  height: 22px;
+  margin: 32px 0px 7px 0px;
+  border-radius: 9999px;
+  border: 1px solid #999;
+  overflow: hidden;
+  -moz-user-select: none;
+  -webkit-user-select: none;
+  user-select: none;
+}
+
+.toggle:hover
+{
+  box-shadow: 0px 0px 3px 0px #968d81;
+}
+
+.toggle:active
+{
+  cursor: wait;
+}
+
+.toggle-on, .toggle-off
+{
+  min-width: 42px;
+  height: 100%;
+  font-size: 11px;
+  font-weight: 500;
+  text-align: center;
+  line-height: 23px;
+  border-radius: 9999px;
+}
+
+.toggle-on
+{
+  padding: 0px 30px 0px 10px;
+  color: rgba(255,255,255, 0.8);
+  text-shadow: 1px 1px rgba(0,0,0,0.2);
+  box-shadow: inset 2px 2px 6px rgba(0,0,0,0.2);
+  background: rgb(69,163,31);
+}
+
+.toggle-off
+{
+  padding: 0px 10px 0px 30px;
+  color: rgba(0,0,0,0.6);
+  text-shadow: 1px 1px rgba(255,255,255,0.2);
+  background: #cfcfcf;
+  background: -moz-linear-gradient(top,  #cfcfcf 0%, #f5f5f5 100%);
+  background: -webkit-linear-gradient(top,  #cfcfcf 0%,#f5f5f5 100%);
+  background: linear-gradient(to bottom,  #cfcfcf 0%,#f5f5f5 100%);
+}
+
+.toggle-blob
+{
+  position: absolute;
+  top: 0px;
+  right: 0px;
+  height: 100%;
+  width: 22px;
+  border-radius: 50px;
+  background: #cfcfcf;
+  background: -moz-linear-gradient(bottom,  #cfcfcf 0%, #f5f5f5 100%);
+  background: -webkit-linear-gradient(bottom,  #cfcfcf 0%,#f5f5f5 100%);
+  background: linear-gradient(to top,  #cfcfcf 0%,#f5f5f5 100%);
+  box-shadow: 1px 1px 2px #888;
+}
+
+.off .toggle-on
+{
+  margin-top: -22px;
+}
+
+.off .toggle-blob
+{
+  left: 0px;
+  right: auto;
+}
+
+#donate
+{
+  height: 21px;
+  display: inline-block;
+  margin: 15px 0px 2px 0px;
+  font-size: 16px;
+  color: #003366;
+  cursor: pointer;
+  font-weight: bold;
+  padding: 5px 18px;
+  text-decoration: none;
+  border-radius: 20px;
+  border: 1px solid #FF9933;
+  overflow: hidden;
+  font-family: arial, sans-serif;
+  background-image: url(donate.png);
+  background-repeat: repeat-x;
+}
+
+footer
+{
+  margin: 0 auto 30px;
+  max-width: 960px;
+  text-align: center;
+}
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/fonts/CreteRound-Italic.otf b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/fonts/CreteRound-Italic.otf
new file mode 100644
index 0000000..169bced
Binary files /dev/null and b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/fonts/CreteRound-Italic.otf differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/fonts/CreteRound-Regular.otf b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/fonts/CreteRound-Regular.otf
new file mode 100644
index 0000000..d951855
Binary files /dev/null and b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/fonts/CreteRound-Regular.otf differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/social/facebook.png b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/social/facebook.png
new file mode 100644
index 0000000..f45c417
Binary files /dev/null and b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/social/facebook.png differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/social/googleplus.png b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/social/googleplus.png
new file mode 100644
index 0000000..53e6819
Binary files /dev/null and b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/social/googleplus.png differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/social/renren.png b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/social/renren.png
new file mode 100644
index 0000000..e9af994
Binary files /dev/null and b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/social/renren.png differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/social/twitter.png b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/social/twitter.png
new file mode 100644
index 0000000..fec913a
Binary files /dev/null and b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/social/twitter.png differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/social/weibo.png b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/social/weibo.png
new file mode 100644
index 0000000..176a628
Binary files /dev/null and b/data/extensions/spyblock@gnu.org/chrome/content/ui/skin/social/weibo.png differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/subscriptionSelection.js b/data/extensions/spyblock@gnu.org/chrome/content/ui/subscriptionSelection.js
index 3fdcc18..b9129ea 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/subscriptionSelection.js
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/subscriptionSelection.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -239,7 +239,7 @@ function validateURL(url)
 {
   if (!url)
     return null;
-  url = url.replace(/^\s+/, "").replace(/\s+$/, "");
+  url = url.trim();
 
   // Is this a file path?
   try {
@@ -266,7 +266,7 @@ function addSubscription()
     return false;
   }
 
-  let title = E("title").value.replace(/^\s+/, "").replace(/\s+$/, "");
+  let title = E("title").value.trim();
   if (!title)
     title = url;
 
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/subscriptionSelection.xul b/data/extensions/spyblock@gnu.org/chrome/content/ui/subscriptionSelection.xul
index 17f1854..f2e1e44 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/subscriptionSelection.xul
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/subscriptionSelection.xul
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
-  - This file is part of Adblock Plus <http://adblockplus.org/>,
-  - Copyright (C) 2006-2014 Eyeo GmbH
+  - This file is part of Adblock Plus <https://adblockplus.org/>,
+  - Copyright (C) 2006-2015 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/subscriptions.xml b/data/extensions/spyblock@gnu.org/chrome/content/ui/subscriptions.xml
index 6a05d5e..f6727b2 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/subscriptions.xml
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/subscriptions.xml
@@ -2,7 +2,7 @@
 
 <!--
   - This file is part of the Adblock Plus web scripts,
-  - Copyright (C) 2006-2014 Eyeo GmbH
+  - Copyright (C) 2006-2015 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
@@ -45,7 +45,7 @@
   <subscription title="EasyList Czech and Slovak+EasyList"
                 specialization="čeština, slovenčina"
                 url="https://easylist-downloads.adblockplus.org/easylistczechslovak+easylist.txt"
-                homepage="http://adblocksk.tk/"
+                homepage="http://adblock.sk/"
                 prefixes="cs,sk"
                 author="tomasko126"/>
   <subscription title="EasyList Dutch+EasyList"
@@ -108,10 +108,4 @@
                 homepage="https://code.google.com/p/ruadlist/"
                 prefixes="ru,uk"
                 author="Lain_13"/>
-  <subscription title="Wiltteri+EasyList"
-                specialization="suomi"
-                url="https://easylist-downloads.adblockplus.org/wiltteri+easylist.txt"
-                homepage="http://wiltteri.net/"
-                prefixes="fi"
-                author="None"/>
   </subscriptions>
\ No newline at end of file
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/utils.js b/data/extensions/spyblock@gnu.org/chrome/content/ui/utils.js
index 49f6e7f..171fd60 100644
--- a/data/extensions/spyblock@gnu.org/chrome/content/ui/utils.js
+++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/utils.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/ar/composer.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/ar/composer.dtd
index 54ac458..56122c8 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/ar/composer.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/ar/composer.dtd
@@ -6,7 +6,7 @@
 <!ENTITY pattern.label "إبحث عن نموذج">
 <!ENTITY thirdParty.label "أطراف أ&amp;خرى فقط">
 <!ENTITY filter.label "&amp;فلتر جديد :">
-<!ENTITY collapse.label "طوي المحجوب: (&amp;س)">
+<!ENTITY collapse.label "طوي المحجوب:">
 <!ENTITY match.warning "النموذج الذي أدخلته لم يعد موافقا للعنوان الذي يجب أن يحجب أو يسمح به ولن يأثر فيه">
 <!ENTITY anchor.start.label "في ب&amp;داية العنوان">
 <!ENTITY matchCase.label "م&amp;طابقة الحالة">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/ar/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/ar/firstRun.properties
index 647ee0c..aa5bf90 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/ar/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/ar/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=حافظ على خصوصيتك عند استخدام المتصفح بتعطيل التجسس و أخفي نفسك على الشركات الإعلانية اللتي تحاول أن تتبع كل تحركاتك.
-firstRun_toggle_off=إيقاف
-firstRun_feature_tracking=تعطيل التعقب
-firstRun_feature_malware=منع البرامج الضارة
-firstRun_title=تم تثبيت آد بلوك بلس
-firstRun_toggle_on=تشغيل
 firstRun_acceptableAdsExplanation=نود تشجيع مواقع ويب باستخدام الإعلانات واضحة وغير مزعجة. ولهذا السبب وضعنا <a>مبادئ توجيهية صارمة</a> لتحديد الإعلانات المقبولة، والتي تظهر ضمن الإعدادات الافتراضية. إذا كنت تريد أن تمنع كل الإعلانات يمكنك <a>تعطيل</a> هذا في بضع ثوان.
+firstRun_acceptableAdsHeadline=سيتم الآن حجب الإعلانات المزعجة
 firstRun_contributor_credits=شكر للمساهمين
 firstRun_dataCorruptionWarning=هل تواصل هذه الصفحة الظهور ؟ <a>اضغط هنا !</a>
-firstRun_acceptableAdsHeadline=سيتم الآن حجب الإعلانات المزعجة
-firstRun_share=أخبر أصدقائك
-firstRun_share_headline=<a>يقدم لنا يد المساعدة</a> في جعل الإنترنت مكاناً أفضل
-firstRun_feature_social_description=خلص تلقائياً المتصفح الخاص بك من وسائل الإعلام الاجتماعية الأزرار، مثل مثل ألفيس بوك، التي تظهر في صفحات الويب، وتتبع السلوك الخاص بك.
-firstRun_filterlistsReinitializedWarning=ويبدو أن خطأ تسبب في إزالة جميع قوائم الفلترات حجب الإعلانات، و لم نتمكن من استعادة نسخة احتياطية. ولذلك اضطررنا إلى إعادة تعيين الإعدادات الخاصة بك و قائمة الفلاتر للوضع السابق مع "الإعلانات القبول". الرجاء التحقق من قوائم الفلترات و إعدادات "الإعلانات المقبولة" في <a>خيارات آدبلوك بلس</a>.
-firstRun_feature_malware_description=إجعل التصفح أكثر أماناً بتعطيل مواقع البرامج الضارة المعروفة.
-firstRun_features=آد بلوك بلس يمكنه عمل أشياء أخرى غير حجب الإعلانات
 firstRun_donate=تبرع
 firstRun_donate_label=دعم مشروعنا
+firstRun_feature_malware=منع البرامج الضارة
+firstRun_feature_malware_description=إجعل التصفح أكثر أماناً بتعطيل مواقع البرامج الضارة المعروفة.
 firstRun_feature_social=إزالة أزرار المواقع الإجتماعية
+firstRun_feature_social_description=خلص تلقائياً المتصفح الخاص بك من وسائل الإعلام الاجتماعية الأزرار، مثل مثل ألفيس بوك، التي تظهر في صفحات الويب، وتتبع السلوك الخاص بك.
+firstRun_feature_tracking=تعطيل التعقب
+firstRun_feature_tracking_description=حافظ على خصوصيتك عند استخدام المتصفح بتعطيل التجسس و أخفي نفسك على الشركات الإعلانية اللتي تحاول أن تتبع كل تحركاتك.
+firstRun_features=آد بلوك بلس يمكنه عمل أشياء أخرى غير حجب الإعلانات
+firstRun_filterlistsReinitializedWarning=ويبدو أن خطأ تسبب في إزالة جميع قوائم الفلترات حجب الإعلانات، و لم نتمكن من استعادة نسخة احتياطية. ولذلك اضطررنا إلى إعادة تعيين الإعدادات الخاصة بك و قائمة الفلاتر للوضع السابق مع "الإعلانات القبول". الرجاء التحقق من قوائم الفلترات و إعدادات "الإعلانات المقبولة" في <a>خيارات آدبلوك بلس</a>.
 firstRun_legacySafariWarning=أنت تستخدم نسخة فديمة من متصفح سفارى وهذه النسخة غير مدعومة من أد بلوك بلس. بحيث من الممكن ان لا يعمل بصورة صحيحة على بعض المواقع. نحن نوصي بشدة ان تقوم بالترقية الى النسخة السادسة 6.1.1 للمتصفح سفارى أو النسخة الأحدث (متوفر على Mac OS X 10.8 Mountain Lion) أو النسخة السابعة 7.0.1 أو الأحدث (متوفر على OS X 10.9 Mavericks) أو تستطيع ان تستخدم أحدث إصدارللمتصفح فايرفوكس، جوجل كروم أو أوبرا.
+firstRun_share=أخبر أصدقائك
+firstRun_share_headline=<a>يقدم لنا يد المساعدة</a> في جعل الإنترنت مكاناً أفضل
+firstRun_title=تم تثبيت آد بلوك بلس
+firstRun_toggle_off=إيقاف
+firstRun_toggle_on=تشغيل
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/ar/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/ar/overlay.dtd
index 6214cda..f15d26f 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/ar/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/ar/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;نعم">
 <!ENTITY notification.button.no "&amp;لا">
 <!ENTITY sync.label "م&amp;زامنة إعدادات آدبلوك بلس">
 <!ENTITY whitelist.site.label "تعطيل في ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "ال&amp;تبليغ عن خطأ في هذه الصفحة">
 <!ENTITY whitelist.page.label "تعطيل في هذه الصفحة فقط">
 <!ENTITY context.image.label "آدبلوك بلس : حجب صورة">
-<!ENTITY counthits.label "تعداد اصابات الفلترة (&amp;إ)">
+<!ENTITY notification.button.yes "&amp;نعم">
 <!ENTITY opensidebar.label "فتح العناصر المح&amp;جوبة">
 <!ENTITY notification.button.close "&amp;اغلاق">
 <!ENTITY contribute.label "شارك في آد بلُك بلَس">
 <!ENTITY toolbarbutton.label "آدبلوك بلس">
 <!ENTITY context.frame.label "آدبلوك بلس : حجب إطار">
 <!ENTITY blocked.tooltip "العناصر المحجوبة في هذه الصفحة">
-<!ENTITY hideplaceholders.label "ا&amp;خفاء ماسك المكان للعناصر الموقوفة">
+<!ENTITY counthits.label "تعداد اصابات الفلترة (&amp;إ)">
 <!ENTITY showinstatusbar.label "عرض في شريط ال&amp;حالة">
 <!ENTITY sidebar.title "العناصر المحجوبة في الصفحة الحالية">
 <!ENTITY options.label "&amp;خيارات">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/ar/sendReport.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/ar/sendReport.dtd
index 5e7f255..5452341 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/ar/sendReport.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/ar/sendReport.dtd
@@ -26,7 +26,7 @@
 <!ENTITY recentReports.label "تقاريرك المرسلة مؤخرا">
 <!ENTITY typeWarning.description "لقد أشرت إلى رغبتك بالتبليغ عن مشكلة في آدبلوك بلس نفسه وليس بالفلاتر. الرجاء الانتباه إلى أنه من الأفضل التبليغ عن مثل هذه المشاكل في  [link]منتدى آدبلوك بلس[/link]. يجب استعمال مبلغ المشاكل فقط للإضافة إلى مناقشة جارية أصلا لأن أحداً لن يلاحظ تقريرك إن لم تقم بوضع رابط إليه. سيتم إظهار رابط مولد لتقريرك بمجرد أن تقوم بإرسال التقرير.">
 <!ENTITY issues.disabled.description "آدبلوك بلس معطل ولن يقوم بحجب أي شيء في هذه الحالة">
-<!ENTITY attachExtensions.label "إرف&amp;اق قائمة بالإضافات الفعالة مع التقرير">
+<!ENTITY attachExtensions.label "إرفق قائمة الملحقات النشطة للتقرير في حالة كون خطأ في أحد إضافات سبب المشكلة">
 <!ENTITY issues.nosubscriptions.add.label "إضافة اشتراك فلتر">
 <!ENTITY issues.disabledfilters.enable.label "تفعيل فلتر">
 <!ENTITY issues.override.label "ال&amp;إعدادات معطلة، المتابعة بالتقرير">
@@ -37,7 +37,7 @@
 <!ENTITY issues.whitelist.remove.label "إعادة تفعيل آدبلوك بلس على هذه الصفحة">
 <!ENTITY outdatedSubscriptions.description "اشتراكات الفلاتر التالية لم يتم تحديثها منذ أسبوعين على الأقل. الرجاء تحديث هذه الاشتراكات قبل إرسال تقرير، ربما تم إصلاح المشكلة مسبقا.">
 <!ENTITY dataCollector.description "من فضلك انتظر بضعة دقائق ريثما يجمع آدبلوك بلس المعلومات المطلوبة">
-<!ENTITY sendButton.label "إرسا&amp;ل التقرير">
+<!ENTITY sendButton.label "إرسال التقرير">
 <!ENTITY comment.label "التعلي&amp;ق (اختياري)ـ">
 <!ENTITY sendPage.errorMessage "فشل إرسال التقرير بسبب الخطأ &quot;?1?&quot;. الرجاء التأكد من صحة اتصالك بالإنترنت وإعادة المحاولة. إن استمرت المشكلة الرجاء طلب المساعدة في [link]منتديات آدبلوك بلس[/link]">
 <!ENTITY showRecentReports.label "إظهار التقارير المرسلة مؤخرا">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/bg/composer.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/bg/composer.dtd
index 1d185af..01ff9d6 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/bg/composer.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/bg/composer.dtd
@@ -1,33 +1,33 @@
-<!ENTITY anchor.end.label "в края на адре&amp;са">
-<!ENTITY domainRestriction.label "Ог&amp;раничаване на домейн:">
-<!ENTITY collapse.default.no.label "Ползвай по подразбиране(не)">
-<!ENTITY firstParty.label "Първа страна сам&amp;о">
-<!ENTITY preferences.label "Покажи съ&amp;ществуващите филтри..">
-<!ENTITY pattern.label "Търсете модел">
-<!ENTITY thirdParty.label "&amp;Трети страни само">
-<!ENTITY filter.label "Нов Филт&amp;ър:">
-<!ENTITY collapse.label "Свиван&amp;е на блокирани:">
-<!ENTITY match.warning "Моделът, който сте въвели, вече не отговаря на адреса за блокиране/белия списък и няма да въздействa върху него.">
-<!ENTITY anchor.start.label "в на&amp;чалото на адреса">
-<!ENTITY matchCase.label "Съвпадение на ре&amp;гистъра">
-<!ENTITY custom.pattern.label "&amp;Избрани:">
-<!ENTITY unselectAllTypes.label "Не избирай нищо">
-<!ENTITY type.whitelist.label "Из&amp;ключение от правилото">
-<!ENTITY regexp.warning "Моделът който сте въвели ще бъде интерпретиран като регулярен израз, които не могат да бъдат ефективно обработени с Adblock Плюс и могат да забавят твоят браузър. Ако не възнамерявате да използвате регулярен израз, добавете звездичка (*) към края на модела.">
-<!ENTITY dialog.title "Добавяне на Adblock Plus филтър правило">
+<!ENTITY anchor.end.label "за &amp;края на адреса">
+<!ENTITY domainRestriction.label "Ограничи до &amp;домейна:">
+<!ENTITY collapse.default.no.label "Ползвай по подразбиране (не)">
+<!ENTITY firstParty.label "само към &amp;първите страни">
+<!ENTITY preferences.label "Покажи &amp;съществуващите филтри…">
+<!ENTITY pattern.label "Намиране на модел">
+<!ENTITY thirdParty.label "само към &amp;третите страни">
+<!ENTITY filter.label "Нов &amp;филтър:">
+<!ENTITY collapse.label "Съ&amp;бери блокираните:">
+<!ENTITY match.warning "Въведеният модел не съвпада с адреса за блокиране/изключване и поради това няма да му въздейства.">
+<!ENTITY anchor.start.label "за &amp;началото на адреса">
+<!ENTITY matchCase.label "към &amp;точното изписване">
+<!ENTITY custom.pattern.label "&amp;Потребителски:">
+<!ENTITY unselectAllTypes.label "Откажи всичко">
+<!ENTITY type.whitelist.label "&amp;Изключение от правилото">
+<!ENTITY regexp.warning "Въведеният модел ще се разглежда като редовен израз, който не може да се обработва по-ефективно от Adblock Plus и вероятно ще бави работата с браузъра. Ако не целите да ползвате редовен израз, добавете звезда (*) в края на модела.">
+<!ENTITY dialog.title "Добавяне на правило за филтър на Adblock Plus">
 <!ENTITY basic.label "Основен изглед">
-<!ENTITY type.filter.label "&amp;Блокиране на филтър">
-<!ENTITY types.label "Прилага за типове:">
-<!ENTITY shortpattern.warning "Моделът които сте въвели е твърде кратък, за да бъде оптимизиран и може да забави вашия браузър. Препоръчително е да изберете по-дълъг низ за този филтър, за да позволи Adblock Плюс за по-ефективна обработка на филтъра.">
+<!ENTITY type.filter.label "&amp;Блокиращ филтър">
+<!ENTITY types.label "Прилагай:">
+<!ENTITY shortpattern.warning "Въведеният модел е твърде къс за оптимизиране и вероятно ще бави работата с браузъра. Препоръчва се да посочите по-дълъг низ за филтъра, за да позволите на Adblock Plus да го обработва по-ефективно.">
 <!ENTITY collapse.yes.label "Да">
-<!ENTITY anchors.label "Приемам само модел:">
-<!ENTITY collapse.default.yes.label "Ползвай по подразбиране(да)">
-<!ENTITY domainRestriction.help "Използвайте тази опция, за да зададете една или повече области, разделени с бар линия (|). Филтърът ще се прилага само за избран(и) домейн(и). А тилда (~) пред името на домейна се посочва, че филтърът не се прилага в този домейн.">
-<!ENTITY accept.label "Добави Филтър">
+<!ENTITY anchors.label "Приемай модела:">
+<!ENTITY collapse.default.yes.label "Ползвай по подразбиране (да)">
+<!ENTITY domainRestriction.help "Настройката указва един или повече домейни, разделени с права черта (|). Филтърът ще се прилага само за избраните домейни. Тилда (~) пред домейна указва, че филтърът няма да се прилага за домейна.">
+<!ENTITY accept.label "Добави филтър">
 <!ENTITY options.label "Настройки">
-<!ENTITY disabled.warning "Adblock Плюс е изключена. Все още можете да добавите филтри, но те няма да се прилагат, освен ако не [link]Включите Adblock Плюс[/link].">
-<!ENTITY anchor.start.flexible.label "в на&amp;чалото на домейн името">
+<!ENTITY disabled.warning "Понастоящем Adblock Plus забранен. Можете да добавяте филтри, но те няма да се прилагат, докато не [link]разрешите Adblock Plus[/link].">
+<!ENTITY anchor.start.flexible.label "за &amp;началото на домейна">
 <!ENTITY collapse.no.label "Не">
-<!ENTITY selectAllTypes.label "Избери всички">
+<!ENTITY selectAllTypes.label "Избери всичкo">
 <!ENTITY advanced.label "Разширен изглед">
-<!ENTITY pattern.explanation "Моделът може да бъде част от адрес; звездичка (*) да действа като заместващи символи. Филтърът ще се прилага само за адресите, отговарящи на предвидения образец.">
+<!ENTITY pattern.explanation "Моделът е част от адрес; звездите (*) служат за заместващи символи. Филтърът ще се прилага само към адреси, съвпадащи с модела.">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/bg/filters.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/bg/filters.dtd
index 28cd5e4..998afaf 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/bg/filters.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/bg/filters.dtd
@@ -1,74 +1,72 @@
-<!ENTITY restore.custom.warning "Всички ваши потребителски филтри ще бъде заменен от съдържанието на избрания файл. Искате ли да продължите?">
-<!ENTITY slow.column "Пока&amp;жи филтри">
-<!ENTITY enabled.column "&amp;Включен">
-<!ENTITY subscription.lastDownload.checksumMismatch "Грешка, несъвпадение на контролната сума">
-<!ENTITY noFiltersInGroup.text "Избраната група е празна">
+<!ENTITY restore.custom.warning "Настройките на потребителските филтри ще бъдат заместени със съдържанието на избрания файл. Продължавате ли?">
+<!ENTITY slow.column "Пока&amp;жи филтрите">
+<!ENTITY enabled.column "&amp;Разреши">
+<!ENTITY subscription.lastDownload.checksumMismatch "Провален — несъвпадаща контролна сума">
+<!ENTITY noFiltersInGroup.text "Избраната група е празна.">
 <!ENTITY subscription.actions.label "Действия">
-<!ENTITY filter.selectAll.label "Избери Всички">
-<!ENTITY backupButton.label "Архи&amp;вирай и Възстанови">
-<!ENTITY restore.minVersion.warning "Внимание: файлът е създаден с по-нова версия на Adblock Plus. Трябва да обновите до последната версия на Adblock Plus, преди да възстановите от този файл.">
-<!ENTITY restore.error "Файлът не може да се обработи или не е с данни, може би Това не е Adblock Plus архивния файл?">
-<!ENTITY sort.ascending.label "&amp;А &gt; Я сортиране">
-<!ENTITY sort.label "&amp;Сортирай по">
-<!ENTITY subscription.source.label "Филтър Лист">
-<!ENTITY hitcount.column "Посе&amp;щения">
-<!ENTITY noFilters.text "Ти нямаш нито един собствен филтър още.">
-<!ENTITY backup.custom.title "Лични филтри само">
-<!ENTITY subscription.external.label "Ъпдейтнат от друга добавка">
+<!ENTITY filter.selectAll.label "Избери всичко">
+<!ENTITY backupButton.label "&amp;Резервирай и възстанови">
+<!ENTITY restore.minVersion.warning "Предупреждение: файлът е създаден с по-нова версия на Adblock Plus. Обновете версията на Adblock Plus до най-новата преди да възстановите файла.">
+<!ENTITY restore.error "Данните от файла е невъзможно да бъдат обработени и вероятно това не е файл с резервно копие на Adblock Plus?">
+<!ENTITY sort.ascending.label "Низходящо &amp;А &gt; Я">
+<!ENTITY sort.label "&amp;Подреди по">
+<!ENTITY subscription.source.label "Списък с филтри">
+<!ENTITY hitcount.column "&amp;Попадения">
+<!ENTITY noFilters.text "Все още няма потребителски филтри.">
+<!ENTITY backup.custom.title "Само потребителските филтри">
+<!ENTITY subscription.external.label "Обновен от друго разширение">
 <!ENTITY subscription.delete.label "Изтрий">
-<!ENTITY noGroupSelected.text "Вие трябва да изберете филтър група, преди тези филтри да бъдат показани.">
+<!ENTITY noGroupSelected.text "Трябва да изберете група с филтри преди да можете да ги покажете.">
 <!ENTITY filter.cut.label "Изрежи">
-<!ENTITY restore.default.label "Възстанови архив от ?1?">
-<!ENTITY subscription.lastDownload.inProgress "Изтегляне...">
-<!ENTITY subscriptions.tab.label "Абонаменти за Филтър">
-<!ENTITY sort.descending.label "&amp;Я &gt; А Сортиране">
-<!ENTITY filters.remove.warning "Наистина ли искаш да изтриеш всички избрани филтри?">
+<!ENTITY restore.default.label "Възстанови копието от ?1?">
+<!ENTITY subscription.lastDownload.inProgress "Изтегляне…">
+<!ENTITY subscriptions.tab.label "Абонаментни филтри">
+<!ENTITY sort.descending.label "Възходящо &amp;Я &gt; А">
+<!ENTITY filters.remove.warning "Наистина ли премахвате избраните филтри?">
 <!ENTITY filter.delete.label "Изтрий">
 <!ENTITY addSubscriptionAdd.label "Добави">
 <!ENTITY viewMenu.label "Изглед">
-<!ENTITY subscription.lastDownload.unknown "Няма данни">
-<!ENTITY addSubscriptionCancel.label "Откажи">
-<!ENTITY subscription.enabled.label "Включен">
-<!ENTITY noSubscriptions.text "Ти не си добавил никакъв абонамент за филтри. Adblock Plus няма да блокира
- нищо без филтри, моля избери &quot;Добави филтър абонаменти&quot; за да
- добавиш някакви.">
+<!ENTITY subscription.lastDownload.unknown "Н/Д">
+<!ENTITY addSubscriptionCancel.label "Отказ">
+<!ENTITY subscription.enabled.label "Разрешен">
+<!ENTITY noSubscriptions.text "Все още няма абонамент за филтри. Adblock Plus няма да блокира нищо без филтри, моля, ползвайте „Добави абонамент“ и добавете няколко.">
 <!ENTITY subscription.update.label "Обнови филтрите">
-<!ENTITY dialog.title "Adblock Plus Настройки за филтър">
-<!ENTITY addFilter.label "Доб&amp;ави Филтър">
-<!ENTITY subscription.minVersion.warning "Този филтър абонамент изисква по-нова версия на Adblock Plus, трябва да обновите до последната версия на Adblock Plus.">
-<!ENTITY subscription.lastDownload.invalidURL "Грешка, невалиден адрес">
-<!ENTITY backup.error "Възникна грешка при писане на филтри за файла.Уверете се, че файлът не е защитени или се използва от друго приложение.">
+<!ENTITY dialog.title "Настройки на филтрите в Adblock Plus">
+<!ENTITY addFilter.label "До&amp;бави филтър">
+<!ENTITY subscription.minVersion.warning "Абонаментът за този филтър изисква по-нова версия на Adblock Plus, затова обновете Adblock Plus до последната версия.">
+<!ENTITY subscription.lastDownload.invalidURL "Провален — недействителен адрес">
+<!ENTITY backup.error "Възникна грешка при записване на филтрите във файл. Уверете се, че файлът не е защитен срещу запис, или че не се ползва от друго приложение.">
 <!ENTITY filter.moveUp.label "Премести нагоре">
-<!ENTITY addGroup.label "Добави филтър &amp;група">
-<!ENTITY filter.edit.label "Промени">
+<!ENTITY addGroup.label "Добави &amp;група с филтъри">
+<!ENTITY filter.edit.label "Редактирай">
 <!ENTITY subscription.showHideFilters.label "Покажи/скрий филтрите">
-<!ENTITY acceptableAds2.label "Оставете няко&amp;и не натрапчиви реклами">
+<!ENTITY acceptableAds2.label "Позволи определени &amp;ненатрапчиви реклами">
 <!ENTITY addSubscriptionOther.label "Добави друг абонамент">
 <!ENTITY close.label "Затвори">
-<!ENTITY sort.none.label "&amp;Несортирани">
-<!ENTITY filter.actions.label "Филтър действия">
+<!ENTITY sort.none.label "&amp;Неподредено">
+<!ENTITY filter.actions.label "Действия за филтър">
 <!ENTITY filter.copy.label "Копирай">
-<!ENTITY filter.moveDown.label "Премести надоло">
-<!ENTITY filter.resetHitCounts.label "Рестарт на Хит Статистиката">
-<!ENTITY readMore.label "Прочети повече">
+<!ENTITY filter.moveDown.label "Премести надолу">
+<!ENTITY filter.resetHitCounts.label "Нулирай статистиката">
+<!ENTITY readMore.label "Повече">
 <!ENTITY subscription.moveUp.label "Премести нагоре">
-<!ENTITY addSubscription.label "Добави абонамент за &amp;филтър">
-<!ENTITY subscription.homepage.label "Лична Страница">
+<!ENTITY addSubscription.label "Добави &amp;абонамент">
+<!ENTITY subscription.homepage.label "Начална страница">
 <!ENTITY backup.complete.title "Всички филтри и абонаменти">
-<!ENTITY restore.own.label "Възстанови свой архив">
-<!ENTITY restore.complete.warning "Всички ваши филтър предпочитания ще бъдат заменени от съдържанието на избрания файл. Искате ли да продължите?">
+<!ENTITY restore.own.label "Възстанови собственото копие">
+<!ENTITY restore.complete.warning "Настройките на всички филтри ще бъдат заместени със съдържанието на избрания файл. Продължавате ли?">
 <!ENTITY filters.tab.label "Потребителски филтри">
-<!ENTITY backup.label "Направи нов архив">
+<!ENTITY backup.label "Създай резервно копие">
 <!ENTITY find.label "&amp;Намери">
-<!ENTITY subscription.moveDown.label "Премести надоло">
-<!ENTITY subscription.lastDownload.connectionError "Грешка, неуспешно изтегляне">
-<!ENTITY subscription.lastDownload.success "Успешно">
-<!ENTITY subscription.lastDownload.invalidData "Грешка, невалиден списък с филтри">
+<!ENTITY subscription.moveDown.label "Премести надолу">
+<!ENTITY subscription.lastDownload.connectionError "Провален — при изтегляне">
+<!ENTITY subscription.lastDownload.success "Изправен">
+<!ENTITY subscription.lastDownload.invalidData "Провален — недействителен списък">
 <!ENTITY filter.paste.label "Постави">
 <!ENTITY subscription.disabledFilters.enable "Разреши забранените филтри">
-<!ENTITY lasthit.column "&amp;Последни Посещения">
-<!ENTITY subscription.editTitle.label "Промени титла">
-<!ENTITY subscription.disabledFilters.warning "Някой филтри в този абонамент са забранени.">
-<!ENTITY filter.column "&amp;Филтър правило">
-<!ENTITY subscription.lastDownload.label "Последно изтеглен:">
-<!ENTITY viewList.label "Виж лист">
+<!ENTITY lasthit.column "&amp;Последно попадение">
+<!ENTITY subscription.editTitle.label "Редактирай заглавието">
+<!ENTITY subscription.disabledFilters.warning "Някой филтри от абонамента са забранени.">
+<!ENTITY filter.column "Правило за &amp;филтър">
+<!ENTITY subscription.lastDownload.label "Изтеглен:">
+<!ENTITY viewList.label "Покажи списъка">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/bg/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/bg/firstRun.properties
index bd93321..ceb4a66 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/bg/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/bg/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Сърфирайте инкогнито като забраните проследяването ви - също така прикрива вашите действия от рекламните компании, които биха проследили всеки  ваш ход.
-firstRun_toggle_off=Стоп
-firstRun_feature_tracking=Забраняване на проследяването
-firstRun_feature_malware=Блокиране на зловреден софтуер
-firstRun_title=Adblock Plus е инсталиран
-firstRun_toggle_on=Старт
-firstRun_acceptableAdsExplanation=Бихме искали да насърчаваме уеб-сайтовете да използват обикновена, ненатрапчива реклама. Ето защо ние установихме <a>строги насоки</a>, където можете да видите кои са приемливите реклами, които се показват по подразбиране. Ако все още искате да блокирате всички реклами, можете да ги <a>забраните</a> в рамките на няколко секунди.
+firstRun_acceptableAdsExplanation=Искаме да насърчим сайтовете да ползват конкретна, ненатрапчива реклама. Ето защо въведохме <a>строги правила</a> за разпознаване на приемливи реклами, които се показват с настройките по подразбиране. И ако все пак желаете да блокирате всички да можете <a>да ги забраните</a> за няколко секунди.
+firstRun_acceptableAdsHeadline=Блокира досадните реклами
 firstRun_contributor_credits=Сътрудници
 firstRun_dataCorruptionWarning=Страницата продължава да се показва? <a>Щракнете тук!</a>
-firstRun_acceptableAdsHeadline=Досадните реклами ще бъдат блокирани
-firstRun_share=Споделете с приятелите си
-firstRun_share_headline=<a>Помогнете ни</a> и направете мрежата по-добро място
-firstRun_feature_social_description=Автоматично премахва от страниците в браузъра бутоните на социалните медии, като например тези на Facebook, които се появяват на някои уеб страници и проследяват вашето поведение.
-firstRun_filterlistsReinitializedWarning=Изглежда, че има проблем, който е изтрил всички филтри и не сме в състояние да ги възстановим от архив. Поради тази причина се наложи да нулираме Вашите филтри и настройките за Приемливи реклами. Моля, проверете Вашите списъци с филтри, както и настройките за Приемливи реклами в <a>Adblock Плюс опции</a>.
-firstRun_feature_malware_description=Направете своето сърфиране в Интернет по-безопасно чрез блокиране на зловредни домейни.
-firstRun_features=Adblock Plus може и прави повече от блокиране на реклами
-firstRun_donate=дарение
-firstRun_donate_label=Подкрепете нашия проект
-firstRun_feature_social=Премахвай бутоните на социалните мрежи
-firstRun_legacySafariWarning=Вие използвате стара версия на Safari, която не се поддържа от Adblock Plus. В случая Adblock Plus може да не работи коректно, като е възможно да се наруши работата на потребителите в някои уеб сайтове. Ние силно препоръчваме да актуализирате Safari към версия 6 или по-висока (достъпна за Mac OS X 10.8 Mountain Lion и по-висока), или да използвате последната версия на Mozilla Firefox, Google Chrome или Opera.
+firstRun_donate=дари
+firstRun_donate_label=Подкрепи проекта
+firstRun_feature_malware=Блокира зловредния софтуер
+firstRun_feature_malware_description=Прави сърфирането по-сигурно с блокиране на познатите зловредни домейни.
+firstRun_feature_social=Премахва бутоните на социалните мрежи
+firstRun_feature_social_description=Отстранява автоматично бутоните на социалните мрежи, като „Харесвам“ на Facebook, чиято цел е да следят поведението ви в тези страници.
+firstRun_feature_tracking=Забранява проследяването
+firstRun_feature_tracking_description=Забранява проследяването при поверително сърфиране, с което скрива следите ви от рекламните компании.
+firstRun_features=Adblock Plus може повече от блокирането на реклами
+firstRun_filterlistsReinitializedWarning=Неизправност изглежда предизвика премахването на всички филтри без възможност за възстановяването им от резервно копие. Затова нулирахме настройките на филтрите и приемливите реклами. Моля, проверете списъка с филтри и настройките на приемливи реклами в <a>настройките на Adblock Plus</a>.
+firstRun_legacySafariWarning=Ползвате стара версия на Safari, която не се поддържа от Adblock Plus. Вероятно ще работи неправилно или с прекъсвания в определени сайтове. Строго препоръчваме или да обновите до Safari 6.1.1 или по-нова (за OS X 10.8 Mountain Lion), до Safari 7.0.1 или по-нова (за OS X 10.9 Mavericks), или да ползвате най-новата версия на Mozilla Firefox, Google Chrome или Opera.
+firstRun_share=Сподели с приятел
+firstRun_share_headline=<a>Подайте ръка</a>, за да направим мрежата по-добро място
+firstRun_title=Adblock Plus е инсталиран
+firstRun_toggle_off=ИЗКЛ
+firstRun_toggle_on=ВКЛ
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/bg/global.properties b/data/extensions/spyblock@gnu.org/chrome/locale/bg/global.properties
index ab8ac88..f10b3da 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/bg/global.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/bg/global.properties
@@ -1,41 +1,41 @@
-no_blocking_suggestions=Няма блокирани позиции на текущата страница
-action3_tooltip=Щракнете за включване/изключване Adblock Плюс.
+no_blocking_suggestions=Няма елементи за блокиране в текущата страница
+action3_tooltip=Щракнете за разрешаване/забраняване на Adblock Plus.
 notification_antiadblock_title=Скриване на умишлените съобщения?
 type_label_script=скрипт
-filter_elemhide_nocriteria=Не е зададен критерий за разпознаване на елемент за скриване
-blockingGroup_title=Правила за Блокиране
-whitelisted_tooltip=Adblock Плюс е изключен на текущата страница.
-type_label_stylesheet=интерфейс
+filter_elemhide_nocriteria=Няма зададен критерий за разпознаване на скривания елемент
+blockingGroup_title=Правила за блокиране
+whitelisted_tooltip=Adblock Plus е забранен за текущата страница.
+type_label_stylesheet=стилова таблица
 blocked_count_tooltip=?1? от ?2?
 type_label_font=шрифт
 type_label_popup=изскачащ прозорец
-filter_regexp_tooltip=Този филтър или е регулярен израз или е твърде кратък, за да се оптимизира. Твърде много от тези филтри могат да забавят сърфирането.
-action0_tooltip=Щракнете за да извадите контекстното меню, средно щракване за включване/изключване.
-whitelisted_page=Adblock Плюс беше изключен за текущата страница
-remove_group_warning=Наистина ли искате да премахнете тази група?
-action1_tooltip=Щракнете за да отворите/затворите блокираните параграфи, средно щракване за включване/изключване.
-type_label_xmlhttprequest=XML заявка
-active_tooltip=Adblock Плюс е включен, ?1? абонамента за филтриране и ?2? потребителски филтър(а) се използват.
+filter_regexp_tooltip=Филтърът е или редовен израз или е твърде къс, за да подлежи на оптимизиране. Прекаленият брой филтри могат да забавят сърфирането.
+action0_tooltip=Щракнете за извикване на контекстното меню, щракнете със средния  за разрешаване/забраняване.
+whitelisted_page=Adblock Plus е забранен за текущата страница
+remove_group_warning=Наистина ли премахвате групата?
+action1_tooltip=Щракнете за отваряне/затваряне на блокираните обекти, щракнете със средния за разрешаване/забраняване.
+type_label_xmlhttprequest=заявка XML
+active_tooltip=Adblock Plus е разрешен; абонирани сте за ?1? и ползвате ?2? потребителски филтри.
 type_label_document=документ
-type_label_object_subrequest=обект под заявка
-whitelistGroup_title=Изключение от правилата
-disabled_tooltip=Adblock Плюс е изключен.
-filter_elemhide_duplicate_id=Може да бъде задаван само един ID на елемент за скриване
+type_label_object_subrequest=подзаявка на обект
+whitelistGroup_title=Изключения от правилата
+disabled_tooltip=Adblock Plus е забранен.
+filter_elemhide_duplicate_id=Само един идентификатор може да бъде указан за скривания елемент
 type_label_object=обект
-action2_tooltip=Кликнете за да отворите предпочитанията, средно щракване за включване/изключване.
+action2_tooltip=Щракнете за отваряне на настройките, щракнете със средния за разрешаване/забраняване.
 type_label_subdocument=рамка
-clearStats_warning=Това ще рестартира цялата статистика и ще забрани броенето на филтрите. Искате ли да продължите?
-notification_antiadblock_message=Този сайт е известен с показване на умишлени послания от потребителите на Adblock Plus. Искате ли Adblock Plus,  да скрие тези умишлени съобщения?
-blocked_count_addendum=(също разрешени:?1?, скрити: ?2?)
-subscription_invalid_location=Местоположението на списъка с филтри или не е валиден URL или не е валидно името на файла.
-type_label_image=картинка
-remove_subscription_warning=Наистина ли искате да премахнете този абонамент?
-type_label_other=други
-mobile_menu_enable=ABP: Включване
-type_label_media=аудио/видео
-mobile_menu_disable_site=ABP: Изключване на ?1?
-elemhideGroup_title=Правила за скриване на елементи
-mobile_menu_enable_site=ABP: Включване на ?1?
-type_label_elemhide=скрит
+clearStats_warning=С това нулирате статистиката за попадения на филтъра и забранявате преброяването на попаденията за филтъра. Продължавате ли?
+notification_antiadblock_message=Този сайт показва целенасочени съобщения за потребителите на Adblock Plus. Желаете ли Adblock Plus да скрива целенасочените съобщения?
+blocked_count_addendum=(а също изключени: ?1? и скрити: ?2?)
+subscription_invalid_location=Местоположението на списъка с филтри е или с недействителен адрес (URL) или с недействително име на файл.
+type_label_image=картина
+remove_subscription_warning=Наистина ли премахвате абонамента?
+type_label_other=друго
+mobile_menu_enable=ABP: Разреши
+type_label_media=звук/видео
+mobile_menu_disable_site=ABP: Забрани за ?1?
+elemhideGroup_title=Правила за скриване
+mobile_menu_enable_site=ABP: Разреши за ?1?
+type_label_elemhide=скрито
 newGroup_title=Нова група с филтри
 default_dialog_title=Adblock Plus
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/bg/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/bg/overlay.dtd
index b1efd15..a0b4b09 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/bg/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/bg/overlay.dtd
@@ -1,32 +1,31 @@
-<!ENTITY notification.button.yes "&amp;Да">
 <!ENTITY notification.button.no "&amp;Не">
-<!ENTITY sync.label "Син&amp;хронизирай Настройките за Adblock Plus">
-<!ENTITY whitelist.site.label "Забрани на ?1?">
-<!ENTITY filters.label "&amp;Филтър Настройки">
+<!ENTITY sync.label "&amp;Сверявай настройките на Adblock Plus">
+<!ENTITY whitelist.site.label "Забрани за ?1?">
+<!ENTITY filters.label "Настройки на &amp;филтъра">
 <!ENTITY disable.label "Забрани навсякъде">
 <!ENTITY objecttab.title "Блокирай">
-<!ENTITY objecttab.tooltip "Щракни тук за да блокираш този обект със Adblock Плюс">
-<!ENTITY menuitem.label "Adblock Плюс &amp;Настройки">
-<!ENTITY objecttabs.label "&amp;Покажи разделите за Флаш и Java">
-<!ENTITY sendReport.label "&amp;Докладване на проблем на тази страница">
-<!ENTITY whitelist.page.label "Забрани на тази страница само">
-<!ENTITY context.image.label "Adblock Плюс: Блокирани Картинки">
-<!ENTITY counthits.label "Бройте &amp;филтър хитове">
-<!ENTITY opensidebar.label "Отвори &amp;блокирани предмети">
+<!ENTITY objecttab.tooltip "Щракнете за блокиране на обекта с Adblock Plus">
+<!ENTITY menuitem.label "Настро&amp;йки на Adblock Plus">
+<!ENTITY objecttabs.label "Показвай Flash и Java в пре&amp;градки">
+<!ENTITY sendReport.label "&amp;Докладвай неизправност в страницата">
+<!ENTITY whitelist.page.label "Забрани за страницата">
+<!ENTITY context.image.label "Adblock Plus: блокирана картина">
+<!ENTITY notification.button.yes "&amp;Да">
+<!ENTITY opensidebar.label "Отвори &amp;блокираните елементи">
 <!ENTITY notification.button.close "&amp;Затвори">
-<!ENTITY contribute.label "Помогнете на Adblock Plus">
-<!ENTITY toolbarbutton.label "Adblock Плюс">
-<!ENTITY context.frame.label "Adblock Плюс:Блокирани Фреймове">
-<!ENTITY blocked.tooltip "Блокирани предмети от тази страница:">
-<!ENTITY hideplaceholders.label "Скрий контейнери на блокираните еле&amp;менти">
-<!ENTITY showinstatusbar.label "Покажи в лен&amp;тата на състоянието">
-<!ENTITY sidebar.title "Блокирани предмети на тази страница">
+<!ENTITY contribute.label "Помогни на Adblock Plus">
+<!ENTITY toolbarbutton.label "Adblock Plus">
+<!ENTITY context.frame.label "Adblock Plus: блокирана рамка">
+<!ENTITY blocked.tooltip "Блокирани елементи в страницата:">
+<!ENTITY counthits.label "Отброявай попа&amp;денията на филтъра">
+<!ENTITY showinstatusbar.label "&amp;Показвай в лентата на състоянието">
+<!ENTITY sidebar.title "Блокирани елементи в страницата">
 <!ENTITY options.label "&amp;Настройки">
-<!ENTITY context.object.label "Adblock Плюс:Блокирани Обекти">
-<!ENTITY context.removeWhitelist.label "Adblock Плюс: Пусни за тази страница">
-<!ENTITY filters.tooltip "Най активни филтри:">
-<!ENTITY closesidebar.label "Затвори &amp;блокирани предмети">
-<!ENTITY showintoolbar.label "Пок&amp;ажи в лентата с инструменти">
-<!ENTITY status.tooltip "Статус:">
-<!ENTITY context.media.label "Adblock Плюс: Блокирани аудио/видео">
+<!ENTITY context.object.label "Adblock Plus: блокиран обект">
+<!ENTITY context.removeWhitelist.label "Adblock Plus: разреши за страницата">
+<!ENTITY filters.tooltip "Най-дейни филтри:">
+<!ENTITY closesidebar.label "Затвори &amp;блокираните елементи">
+<!ENTITY showintoolbar.label "По&amp;казвай в лентата с инструменти">
+<!ENTITY status.tooltip "Състояние:">
+<!ENTITY context.media.label "Adblock Plus: блокиран звук/видео">
 <!ENTITY subscription.update.label "Обнови филтрите">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/bg/sendReport.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/bg/sendReport.dtd
index 080b8ba..1ed7f12 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/bg/sendReport.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/bg/sendReport.dtd
@@ -1,69 +1,101 @@
-<!ENTITY screenshot.undo.label "&amp;Отмяна">
-<!ENTITY issues.disabledgroups.description "Следните абонаменти за филтри/групи филтри са изключени. Все пак биха могли да имат ефект върху тази страница:">
-<!ENTITY showData.label "Показване на докладваните данни">
-<!ENTITY typeSelector.falsePositive.label "Adblock Plus блокира твърде &amp;много">
-<!ENTITY issues.change.description "Вашата конфигурация е променена. Моля, презаредете страницата, за да тествате промените и да представите доклад, ако въпросът не бъде уреден от промените.">
-<!ENTITY email.label "&amp;Ел.Поща:">
-<!ENTITY issues.openPreferences.label "Отвори настройките за филтър">
-<!ENTITY sendPage.confirmation "Отчетът Ви е запазен. Можете да го намерите на следния адрес:">
-<!ENTITY copyLink.label "&amp;Копиране линк на доклада">
-<!ENTITY issues.nofilters.description "Adblock Плюс не блокира нищо на текущата страница. Наблюдавания проблем най-вероятно
- не е свързан с Adblock Плюс.">
-<!ENTITY sendPage.knownIssue "Докладваният от Вас проблем вероятно вече е известен. За повече информация:">
-<!ENTITY typeSelector.other.description "Изберете тази настройка, ако подозирате, че проблемът е с Adblock Plus, а не с филтрите му.">
-<!ENTITY issues.disabledgroups.enable.label "Включване на абонамент за филтър / група филтри">
-<!ENTITY typeWarning.override.label "Разбирам и все &amp;пак искам да представя доклада въпреки всичко">
-<!ENTITY issues.disabled.enable.label "Включи Adblock Плюс">
-<!ENTITY update.fixed.description "Актуализациите на вашите абонаменти за филтри вероятно са решили въпроса който сте докладвали. Моля, презаредете страницата и опитайте отново, Докладвайте отново, ако проблемът все още го има.">
-<!ENTITY anonymous.label "&amp;Анонимно изпращане на информация">
-<!ENTITY reloadButton.label "Пре&amp;зареждане на страницата">
-<!ENTITY recentReports.clear.label "Премах&amp;ни всички доклади">
-<!ENTITY typeSelector.description "Този прозорец ще ви преведе през стъпките, необходими за подаване на доклад за Adblock
- Плюс проблем. Първо, моля изберете вида на проблема, който сте срещнали на тази страница:">
-<!ENTITY screenshot.remove.label "П&amp;ремахване на чувствителните данни">
-<!ENTITY issues.ownfilters.description "Някои от филтрите, приложени на тази страница са дефинирани от потребителя. Моля, деактивирайте филтрите, които може да причиняват проблема:">
-<!ENTITY update.inProgress.description "Adblock Plus трябва да актуализира вашите абонаменти за филтри и да се увери, че въпросът не е решен вече. Моля, изчакайте..">
-<!ENTITY sendPage.retry.label "Изпращане отново">
+<!ENTITY screenshot.undo.label "&amp;Отмени">
+<!ENTITY issues.disabledgroups.description "Следните абонаменти за филтър или групи филтри са забранени и въпреки това
+  влияят на страницата:">
+<!ENTITY showData.label "Покажи докладваните данни">
+<!ENTITY typeSelector.falsePositive.label "Adblock Plus блокира &amp;прекалено">
+<!ENTITY issues.change.description "Конфигурацията е променена. Моля, презаредете страницата за проверка на
+  промените и предайте доклад, в случай че измененията не отстранят неизправността.">
+<!ENTITY email.label "&amp;Е-поща:">
+<!ENTITY issues.openPreferences.label "Отваряне на настройките на филтър">
+<!ENTITY sendPage.confirmation "Докладът е записан. Ще го откриете на следния адрес:">
+<!ENTITY copyLink.label "&amp;Копирай като препратка">
+<!ENTITY issues.nofilters.description "Adblock Plus не блокира нищо в текущата страница. Наблюдаваната от вас
+  неизправност по всяка вероятност не е свързана с Adblock Plus.">
+<!ENTITY sendPage.knownIssue "Докладваната неизправност вероятно е вече позната. За повече информация:">
+<!ENTITY typeSelector.other.description "Изберете настройката когато подозирате, че неизправността се дължи
+  по-скоро на Adblock Plus, а не на филтрите.">
+<!ENTITY issues.disabledgroups.enable.label "Разрешаване на абонамент за филтър или група филтри">
+<!ENTITY typeWarning.override.label "Приемам и желая да предам доклада">
+<!ENTITY issues.disabled.enable.label "Разрешаване на Adblock Plus">
+<!ENTITY update.fixed.description "Обновяването на вашите абонаменти като че ли разреши докладваната от вас
+  неизправност. Моля, презаредете страницата и пробвайте. Ако случаят
+  се повтаря, натиснете „Докладвай отново“.">
+<!ENTITY anonymous.label "Предай &amp;анонимно">
+<!ENTITY reloadButton.label "&amp;Презареди страницата">
+<!ENTITY recentReports.clear.label "Премахни &amp;всички доклади">
+<!ENTITY typeSelector.description "Прозорецът ще ви преведе през необходимите стъпки за предаване на доклад
+  за неизправност в AdBlock Plus. Първо, на тази страница, моля, изберете вида
+  на срещаната неизправност:">
+<!ENTITY screenshot.remove.label "Премахни &amp;чувствителните данни">
+<!ENTITY issues.ownfilters.description "Някои от приложените към страницата филтри са зададени от потребителя. Моля, 
+  забранете филтрите предизвикващи неизправността:">
+<!ENTITY update.inProgress.description "Adblock Plus обновява абонамента за вашите филтри, за да провери дали
+  неизправността вече не е била разрешена. Моля, изчакайте…">
+<!ENTITY sendPage.retry.label "Изпрати отново">
 <!ENTITY data.label "&amp;Докладвани данни:">
-<!ENTITY recentReports.label "Вашите наскоро представените доклади">
-<!ENTITY typeWarning.description "Посочили сте, че искате да съобщите за общ проблем с Adblock Plus, а не проблем с филтрите. Моля, обърнете внимание, че тези въпроси са най-докладвани във [link]форума на Adblock Plus[/link]. Трябва да използвате докладчика на проблеми за допълване на съществуваща дискусия, тъй като никой няма да забележи вашия доклад, докато не предоставите връзка към него. Автоматично генерирана връзка ще бъде предоставена след предоставянето на доклада.">
-<!ENTITY issues.disabled.description "Adblock Plus е изключен - няма да блокира нищо в неговото текущо състояние.">
+<!ENTITY recentReports.label "Вашите предадени доклади">
+<!ENTITY typeWarning.description "Посочвате, че ще докладвате обща неизправност в AdBlock Plus, а не случай
+  с неговите филтри. Моля, имайте предвид, че подобни неизправности
+  е най-добре да докладвате във [link]форума на Adblock Plus[/link]. Трябва
+  да ползвате този Докладчик на неизправност само като допълнение към
+  съществуваща дискусия, тъй като докато не предоставите препратка към
+  доклада си никой няма да го забележи. Такава автоматично генерирана
+  препратка ще получите след предаване на вашия доклад.">
+<!ENTITY issues.disabled.description "Adblock Plus забранен и в текущото си състояние не блокира нищо.">
 <!ENTITY attachExtensions.label "Прилагане на списък с активните раз&amp;ширения към доклада в случай че добавката  причинява проблема">
 <!ENTITY issues.nosubscriptions.add.label "Добавяне на абонамент за филтър">
-<!ENTITY issues.disabledfilters.enable.label "Включи филтъра">
-<!ENTITY issues.override.label "Конфигурацията е &amp;правилна, продължаване с доклада">
-<!ENTITY issues.nosubscriptions.description "Изглежда не сте абонирани за някои от предварително направени списъци с филтри, които автоматично премахват нежеланото съдържание от страниците.">
-<!ENTITY typeSelector.falsePositive.description "Изберете тази настройка, ако на страницата липсва важно съдържание, показана е некоректно или не функционира правилно. Може да определите дали Adblock Плюс е причина за проблема, като временно го изключите.">
-<!ENTITY typeSelector.other.label "Др&amp;уг проблем">
-<!ENTITY emailComment.label "Ние ви препоръчваме да въведете валиден емайл адрес, така че да можем да се свържем, ако има въпроси относно вашия отчет. Това ще ни позволи да споделим вашия принос и да е с по висок приоритет.">
-<!ENTITY issues.whitelist.remove.label "Повторно активиране на Adblock Plus на тази страница">
-<!ENTITY outdatedSubscriptions.description "Този филтър абонамент не е бил актуализиран най-малко две седмици. Моля, актуализирайте тези абонаменти, преди да изпратите доклад въпросът може да е решен вече и да не се налага да докладвате.">
+<!ENTITY issues.disabledfilters.enable.label "Разрешаване на филтър">
+<!ENTITY issues.override.label "Конфигурацията е &amp;правилна, продължи с доклада">
+<!ENTITY issues.nosubscriptions.description "Изглежда не сте абонирани за никой от фабричните филтри за автоматично
+  премахване на нежелано съдържание от сайтовете.">
+<!ENTITY typeSelector.falsePositive.description "Изберете настройката когато липсва важно съдържание; то се изобразява
+  неправилно; или функционира неправилно в страницата. Бихте могли да
+  определите дали се причинява от AdBlock Plus, като временно го изключите.">
+<!ENTITY typeSelector.other.label "&amp;Друга неизправност">
+<!ENTITY emailComment.label "Съветваме ви да въведете действителен адрес за е-поща, за да се свържем, ако възникнат
+  въпроси. Също така ще можем да удостоверим вашия принос и дадем по-висок приоритет на доклада.">
+<!ENTITY issues.whitelist.remove.label "Повторно разрешаване на Adblock Plus">
+<!ENTITY outdatedSubscriptions.description "Абонаментите за следните филтри не са обновявани от поне две седмици.
+  Моля, обновете ги преди предаването на доклада, защото неизправността
+  може вече да е била разрешена.">
 <!ENTITY dataCollector.description "Моля, изчакайте няколко секунди, докато Adblock Plus събере необходимите данни.">
-<!ENTITY sendButton.label "Из&amp;пращане на доклада">
-<!ENTITY comment.label "&amp;Коментар (по избор)">
-<!ENTITY sendPage.errorMessage "Опитът за изпращане на доклада се провали с код на грешка &quot;?1?&quot;. Моля, уверете се, че сте свързани с интернет и повторете. Ако проблемът продължи, моля потърсете помощ в [link]форума на Adblock Plus[/link].">
-<!ENTITY showRecentReports.label "Покажи наскоро представените доклади">
+<!ENTITY sendButton.label "&amp;Изпрати доклада">
+<!ENTITY comment.label "&amp;Коментар (по избор):">
+<!ENTITY sendPage.errorMessage "Опитът за изпращане на доклада се провали с код на грешка „?1?“. Моля, уверете се, че сте свързани с интернет и повторете. Ако това продължи, моля потърсете помощ във [link]форума на Adblock Plus[/link].">
+<!ENTITY showRecentReports.label "Покажи предадените доклади">
 <!ENTITY commentPage.heading "Въвеждане на коментар">
-<!ENTITY update.start.label "Започни обновяването сега">
-<!ENTITY issues.disabledfilters.description "Следните филтри са изключени, но въпреки това може да окажат влияние на тази страница:">
-<!ENTITY screenshot.description "Същата страница може да изглежда различно за различни хора. Това може да ни помогне да разберем проблема, ако прикачите снимка на екрана към вашия доклад. Можете да премахнете частите, съдържащи чувствителна информация, както и зони, в които проблемът се забелязва. За да направите това натиснете съответния бутон и изберете частта от изображението с мишката.">
-<!ENTITY screenshot.attach.label "Пр&amp;икачване на изображение на страницата към доклада">
-<!ENTITY issues.whitelist.description "В момента Adblock Plus е изключен за страницата, която докладвате. Моля активирайте повторно
- и презаредете страницата преди да изпратите доклада за да помогнете за откриване на проблема.">
-<!ENTITY typeSelector.falseNegative.label "Adblock Плюс не блоки&amp;ра реклама">
-<!ENTITY typeSelector.heading "Изберете тип на проблема">
-<!ENTITY anonymity.warning "Ние няма да бъдем в състояние да се върнем при теб и вероятно ще свалим приоритета на на доклада най доло.">
-<!ENTITY wizard.title "Докладчик за проблеми">
-<!ENTITY issues.ownfilters.disable.label "Изключване на филтър">
-<!ENTITY commentPage.description "Полето по-долу ви позволява да въведете коментар да ни помогне да разберем проблема. Тази стъпка не е задължителна, но се препоръчва, ако проблемът не е очевиден. Можете също да прегледате данните от доклада, преди да е изпратен.">
+<!ENTITY update.start.label "Обнови сега">
+<!ENTITY issues.disabledfilters.description "Следните филтри са забранени и въпреки това влияят на страницата:">
+<!ENTITY screenshot.description "Същата тази страница може да изглежда различно при други хора. Ако прикачите
+  екран към доклада ще ни помогнете да разберем това. Премахнете разделите
+  с чувствителна информация и отбележете областите, в които присъства.
+  За целта натискате съответния бутон и избирате област от картината с мишката.">
+<!ENTITY screenshot.attach.label "Прикрепи &amp;картина към доклада">
+<!ENTITY issues.whitelist.description "Понастоящем Adblock Plus е забранен за докладваната страница. Моля, разрешете
+  го повторно и я презаредете преди предаване на доклада, за да подпомогнете
+  разследването на неизправността.">
+<!ENTITY typeSelector.falseNegative.label "Adblock Plus не блокира &amp;реклама">
+<!ENTITY typeSelector.heading "Избор на неизправност">
+<!ENTITY anonymity.warning "Иначе няма да сме в състояние да се свържем с вас и вероятно приоритетът на доклада ви ще бъде понижен.">
+<!ENTITY wizard.title "Докладчик на неизправност">
+<!ENTITY issues.ownfilters.disable.label "Забраняване на филтър">
+<!ENTITY commentPage.description "Полето по-долу е за коментар, който ще ни помогне да разберем неизправността.
+  Стъпката е по-избор, но е препоръчителна, ако случаят е неочевиден.
+  Можете също да прегледате докладваните данни, преди изпращане.">
 <!ENTITY comment.lengthWarning "Дължината на коментара надвишава 1000 знака. Само първите 1000 знака ще бъдат изпратени.">
-<!ENTITY typeSelector.falseNegative.description "Изберете тази настройка, ако се показва реклама въпреки, че Adblock Плюс е включен.">
-<!ENTITY sendPage.waitMessage "Моля, изчакайте докато Adblock Plus представя Вашия отчет.">
-<!ENTITY dataCollector.heading "Добре дошли в докладчика за проблеми">
-<!ENTITY screenshot.heading "Прикачете екранна снимка">
-<!ENTITY sendPage.heading "Изпрати доклада">
-<!ENTITY issues.subscriptionCount.description "Изглежда, че сте се абонирали за твърде много филтри. Тази настройка не се препоръчва, защото ще направи вероятността от проблеми много по-високи. Също така не може да приемем отчета за грешки защото не е ясно кой филтър прави проблеми и кой автор трябва да предприеме действия. Моля, премахнете всички и оставете само най важният филтър и пробвайте дали проблемът все още съществува.">
-<!ENTITY screenshot.mark.label "&amp;Маркиране на проблема">
-<!ENTITY privacyPolicy.label "Защита на личните данни">
-<!ENTITY issues.description "Adblock Plus откри проблеми с вашата конфигурация, които може да причиняват
- този проблем или ще затрудни доклада за разследването.">
+<!ENTITY typeSelector.falseNegative.description "Изберете настройката когато се изобразява реклама, въпреки
+  включването на AdBlock Plus.">
+<!ENTITY sendPage.waitMessage "Моля, изчакайте докато Adblock Plus изпрати доклада.">
+<!ENTITY dataCollector.heading "Добре дошли в докладчика на неизправност">
+<!ENTITY screenshot.heading "Прикрепяне на екранна снимка">
+<!ENTITY sendPage.heading "Изпращане на доклада">
+<!ENTITY issues.subscriptionCount.description "Изглежда сте абонирани за твърде много филтри. Подобна настройка е
+  непрепоръчителна, защото значително повишава шансовете от 
+  възникване на неизправности. Не можем да приемем вашия доклад за
+  неизправност и поради това, че от него не става ясно кой от авторите на абонаментите за филтър трябва да предприеме действие. Моля,
+  премахнете всички без наистина необходимите ви абонаменти и пробвайте
+  дали пак наблюдавате неизправността.">
+<!ENTITY screenshot.mark.label "&amp;Отбележи">
+<!ENTITY privacyPolicy.label "Политика на поверителност">
+<!ENTITY issues.description "Adblock Plus установи неизправности с конфигурацията, които вероятно са
+  отговорни за неизправността, или които биха затруднили разследването на доклада.">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/bg/sidebar.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/bg/sidebar.dtd
index 12441c0..071fda8 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/bg/sidebar.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/bg/sidebar.dtd
@@ -1,35 +1,35 @@
-<!ENTITY context.flash.label "Рамки на флаш продукти">
+<!ENTITY context.flash.label "Освети границите на елемента">
 <!ENTITY address.label "Адрес">
-<!ENTITY context.open.label "Отвори в нов под прозорец">
-<!ENTITY type.label "Тип">
-<!ENTITY tooltip.filterSource.label "Източник на филтъра">
-<!ENTITY noitems.label "Няма блокирани продукти">
+<!ENTITY context.open.label "Отвори в нова преградка">
+<!ENTITY type.label "Вид">
+<!ENTITY tooltip.filterSource.label "Източник на филтъра:">
+<!ENTITY noitems.label "Няма елементи за блокиране">
 <!ENTITY filter.label "Филтър">
 <!ENTITY tooltip.size.label "Размер:">
-<!ENTITY reattach.label "Прикачи отново">
+<!ENTITY reattach.label "Прикачи">
 <!ENTITY search.label "&amp;Търси:">
 <!ENTITY docDomain.thirdParty "(трета страна)">
-<!ENTITY filterSource.label "Филтър източник">
+<!ENTITY filterSource.label "Източник на филтъра">
 <!ENTITY tooltip.docDomain.label "Източник на документа:">
-<!ENTITY context.copy.label "Копирай адреса на продукта">
-<!ENTITY tooltip.type.label "Тип:">
-<!ENTITY context.disablefilter.label "Да изключа ли филтър ?1?">
-<!ENTITY context.copyFilter.label "Копирай филтърът">
-<!ENTITY context.block.label "Блокирай този продукт">
-<!ENTITY context.enablefilter.label "Повторно включване на филтъра ?1?">
-<!ENTITY detach.label "Отдели">
-<!ENTITY whitelisted.label "Разрешена странница">
-<!ENTITY context.disablefilteronsite.label "Да изключа ли този филтър за ?1?">
-<!ENTITY detached.title "Adblock Plus: Блокирани продукти (отделени)">
-<!ENTITY docDomain.firstParty "Основни">
-<!ENTITY tooltip.type.whitelisted "(разрешен)">
-<!ENTITY tooltip.filter.label "Филтър в сила:">
-<!ENTITY tooltip.filter.disabled "(изключен)">
-<!ENTITY context.editfilter.label "Редактиране на филтъра в сила:">
+<!ENTITY context.copy.label "Копирай адреса на елемента">
+<!ENTITY tooltip.type.label "Вид:">
+<!ENTITY context.disablefilter.label "Забрани ?1?">
+<!ENTITY context.copyFilter.label "Копирай филтъра">
+<!ENTITY context.block.label "Блокирай елемента">
+<!ENTITY context.enablefilter.label "Разреши ?1?">
+<!ENTITY detach.label "Откачи">
+<!ENTITY whitelisted.label "Изключена странница">
+<!ENTITY context.disablefilteronsite.label "Забрани за ?1?">
+<!ENTITY detached.title "Adblock Plus: блокируеми елементи (откачени)">
+<!ENTITY docDomain.firstParty "(първа страна)">
+<!ENTITY tooltip.type.whitelisted "(изключен)">
+<!ENTITY tooltip.filter.label "Действащ филтър:">
+<!ENTITY tooltip.filter.disabled "(забранен)">
+<!ENTITY context.editfilter.label "Редактирай действащия филтър">
 <!ENTITY tooltip.type.blocked "(блокиран)">
 <!ENTITY size.label "Размер">
-<!ENTITY context.whitelist.label "Добави изключващо правило за продукта">
-<!ENTITY context.selectAll.label "Избери всички">
+<!ENTITY context.whitelist.label "Добави изключение за елемента">
+<!ENTITY context.selectAll.label "Избери всичко">
 <!ENTITY state.label "Състояние">
 <!ENTITY docDomain.label "Източник на документа">
 <!ENTITY tooltip.address.label "Адрес:">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/bg/subscriptionSelection.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/bg/subscriptionSelection.dtd
index df9a1b7..c96dd74 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/bg/subscriptionSelection.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/bg/subscriptionSelection.dtd
@@ -1,12 +1,12 @@
-<!ENTITY addMain.label "До&amp;бави абонамент за филтър &quot;?1?&quot;">
-<!ENTITY list.download.failed "Adblock Плюс не успя да изтегли списък с абонаменти.">
-<!ENTITY list.download.retry "Опитайте отново">
+<!ENTITY addMain.label "&amp;Абонирай за „?1?“">
+<!ENTITY list.download.failed "Adblock Plus се провали при извличане на списъка с абонаменти.">
+<!ENTITY list.download.retry "Опитай отново">
 <!ENTITY title.label "&amp;Заглавие на абонамента:">
-<!ENTITY list.download.website "Покажи сайтът">
-<!ENTITY supplementMessage "Този абонамент за филтърът е предназначен да се използва с подписка за филтри &quot;?1?&quot;  Които не използвате все още.">
+<!ENTITY list.download.website "Покажи сайта">
+<!ENTITY supplementMessage "Абонирането за филтъра изисква абонамент за „?1?“, който още не ползвате.">
 <!ENTITY viewList.label "Покажи филтрите">
-<!ENTITY visitHomepage.label "Посетете началната страница">
+<!ENTITY visitHomepage.label "Посети началната страница">
 <!ENTITY addSubscription.label "Добави абонамент">
-<!ENTITY dialog.title "Добавяне на абонамент за филтъра на Adblock Плюс">
-<!ENTITY location.label "&amp;Местоположение на списъка с филтрите:">
-<!ENTITY fromWeb.description "Моля, потвърдете, че желаете да добавите този абонамент за този филтър. Може да промените заглавието или местоположението преди да го добавите.">
+<!ENTITY dialog.title "Абониране за филтър в Adblock Plus">
+<!ENTITY location.label "&amp;Местоположение на филтъра:">
+<!ENTITY fromWeb.description "Моля, потвърдете абонирането за филтъра. Можете да промените заглавието или местоположението на абонамента, преди да го добавите.">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/ca/filters.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/ca/filters.dtd
index 541ba03..1605173 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/ca/filters.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/ca/filters.dtd
@@ -35,7 +35,7 @@
 <!ENTITY addFilter.label "Afegeix un filt&amp;re">
 <!ENTITY subscription.minVersion.warning "Aquesta subscripció de filtre requereix una versió recent. Heu d'actualitzar l'Adblock Plus.">
 <!ENTITY subscription.lastDownload.invalidURL "Error, no és una adreça vàlida">
-<!ENTITY backup.error "Hi ha hagut un error escribint els filtres al fitxer.  Assegura't que el fitxer no s'hagi escrit protegint-lo o que l'estigui fent servir una altra aplicació.">
+<!ENTITY backup.error "Hi ha hagut un error escribint els filtres al fitxer.  Assegura't que el fitxer no estigui protegit contra escritura o que l'estigui fent servir una altra aplicació.">
 <!ENTITY filter.moveUp.label "Mou amunt">
 <!ENTITY addGroup.label "Afe&amp;geix un grup de filtres">
 <!ENTITY filter.edit.label "Edita">
@@ -50,7 +50,7 @@
 <!ENTITY filter.resetHitCounts.label "Reinicia les estadístiques">
 <!ENTITY readMore.label "Més informació">
 <!ENTITY subscription.moveUp.label "Mou amunt">
-<!ENTITY addSubscription.label "A&amp;fegeix el filtre">
+<!ENTITY addSubscription.label "A&amp;fegeix una subscripció de filtre">
 <!ENTITY subscription.homepage.label "Pàgina d'inici">
 <!ENTITY backup.complete.title "Tots els filtres i subscripcions">
 <!ENTITY restore.own.label "Restaura d'una còpia de seguretat propia">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/ca/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/ca/firstRun.properties
index 2eac957..688a5f0 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/ca/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/ca/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Navegar de forma privada mitjançant la desactivació del seguiment – amagant el vostre rastre a les companyies de publicitat, que us seguirien encara més.
-firstRun_toggle_off=DESACTIVAT
-firstRun_feature_tracking=Desactivar el seguiment
-firstRun_feature_malware=Bloqueig de programari maliciós
-firstRun_title=S'ha instal·lat l'AdBlock Plus
-firstRun_toggle_on=ACTIVAT
-firstRun_acceptableAdsExplanation=Ens agradaria encoratjar els llocs web a utlitzar d'ara en endavant, publicitat no intrusiva. És per això que hem establert uns <a>patrons estrictes</a> per identificar els anuncis acceptables, els quals es mostren a sota de les preferències per defecte. Si encara voleu bloquejar tots els anuncis podeu <a>desactivar</a> això en pocs segons.
-firstRun_contributor_credits=Crèdits de contribució
-firstRun_dataCorruptionWarning=Es segueix mostrant aquesta pàgina? <a>Cliqueu aquí!</a>
+firstRun_acceptableAdsExplanation=Ens agradaria encoratjar els llocs web a utlitzar d'ara en endavant publicitat no intrusiva. És per això que hem establert uns <a>patrons estrictes</a> per identificar els anuncis acceptables, els quals es mostren a sota de les preferències per defecte. Si encara voleu bloquejar tots els anuncis podeu <a>desactivar</a> això en pocs segons.
 firstRun_acceptableAdsHeadline=Els anuncis molestos ara es bloquejaran
-firstRun_share=Digueu-ho a les vostres amistats
-firstRun_share_headline=<a>Dóneu-nos un cop de mà</a> al fer la xarxa un lloc millor
-firstRun_feature_social_description=Eliminar automàticament de la vostra experència de navegació els botons socials, com el m'agrada de Facebook, que apareixen a les pàgines web i segueixen el vostre comportament.
-firstRun_filterlistsReinitializedWarning=Sembla que un problema ha causat que tots els filtres es suprimeixin, però hem pogut restaurar una còpia de seguretat. Durant aquest procés, també s'ha restaurat els filtres i la configuració d'anuncis acceptable. Verifiqueu que la configuració actual és la desitjada, mitjançant les <a>«Preferències del filtre»</a> de l'Adblock Plus.
-firstRun_feature_malware_description=Fer la vostra navegació més segura bloquejant els dominis de malware coneguts.
-firstRun_features=Adblock Plus pot fer molt més que bloquejar anuncis
+firstRun_contributor_credits=Reconeiximents als co·laboradors
+firstRun_dataCorruptionWarning=Es segueix mostrant aquesta pàgina? <a>Cliqueu aquí!</a>
 firstRun_donate=Feu un donatiu
 firstRun_donate_label=Recolzeu el nostre projecte
+firstRun_feature_malware=Bloqueig de programari maliciós
+firstRun_feature_malware_description=Fer la vostra navegació més segura bloquejant els dominis de malware coneguts.
 firstRun_feature_social=Eliminar els botons de xarxes socials
-firstRun_legacySafariWarning=Estàs usant una versió antiga de Safari que no es troba suportada per Adblock Plus.
+firstRun_feature_social_description=Eliminar automàticament de la vostra experència de navegació els botons socials, com el m'agrada de Facebook, que apareixen a les pàgines web i segueixen el vostre comportament.
+firstRun_feature_tracking=Desactivar el seguiment
+firstRun_feature_tracking_description=Navegar de forma privada mitjançant la desactivació del seguiment – amagant el vostre rastre a les companyies de publicitat, que us seguirien encara més.
+firstRun_features=Adblock Plus pot fer molt més que bloquejar anuncis
+firstRun_filterlistsReinitializedWarning=Sembla que un problema ha causat que tots els filtres es suprimeixin, però hem pogut restaurar una còpia de seguretat. Durant aquest procés, també s'ha restaurat els filtres i la configuració d'anuncis acceptable. Verifiqueu que la configuració actual és la desitjada, mitjançant les <a>«Preferències del filtre»</a> de l'Adblock Plus.
+firstRun_legacySafariWarning=Estàs emprant una versió antiga de Safari que no es troba suportada per Adblock Plus, el que pot fer que no funcioni correctament o amb un pobre rendiment. Es recomana actualitzar a Safari 6.1.1 o superior (amb OS X 10.8 Mountain Lion), o Safari 7.0.1 o superior (amb OS X 10.9 Mavericks), o emprar la darrera versió de Mozilla Firefox, Google Chrome o Opera.
+firstRun_share=Digueu-ho a les vostres amistats
+firstRun_share_headline=<a>Dóneu-nos un cop de mà</a> al fer la xarxa un lloc millor
+firstRun_title=S'ha instal·lat l'AdBlock Plus
+firstRun_toggle_off=DESACTIVAT
+firstRun_toggle_on=ACTIVAT
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/ca/global.properties b/data/extensions/spyblock@gnu.org/chrome/locale/ca/global.properties
index 1145e04..58d9afe 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/ca/global.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/ca/global.properties
@@ -1,8 +1,8 @@
 no_blocking_suggestions=La pàgina actual no conté elements bloquejables
 action3_tooltip=Clica per activar/desactivar Adblock Plus
-notification_antiadblock_title=Amagar missatges dirigits?
+notification_antiadblock_title=Amagar missatges apuntats?
 type_label_script=script
-filter_elemhide_nocriteria=Cap criteri especificat per reconeixes l'element a amagar
+filter_elemhide_nocriteria=Cap criteri especificat per reconeixer l'element a amagar
 blockingGroup_title=Regles de blocatge d'anuncis
 whitelisted_tooltip=Adblock Plus està actiu però desactivat en la pàgina actual
 type_label_stylesheet=llista d'estils
@@ -20,14 +20,14 @@ type_label_document=document
 type_label_object_subrequest=Subpetició d'objecte
 whitelistGroup_title=Regles d'excepció
 disabled_tooltip=Adblock Plus està desactivat
-filter_elemhide_duplicate_id=Només un identificador de l'element pot ser especificat
+filter_elemhide_duplicate_id=Només es pot indicar un identificador de l'element a ocultar
 type_label_object=objecte
 action2_tooltip=Clica per obrir les preferències, clica amb el botó del mig per activar/desactivar.
 type_label_subdocument=marc
 clearStats_warning=Això reiniciarà totes les estadístiques d'ús del filtre.Vols procedir?
-notification_antiadblock_message=Aquesta web ha sigut coneguda per mostrar missatges dirigits a usuaris de Adblock Plus. Vols que Adblock Plus amague els missatges dirigits?
+notification_antiadblock_message=Aquest lloc ha estat conegut per mostrar missatges dirigides als usuaris Adblock Plus. Voleu Adblock Plus per ocultar missatges apuntats?
 blocked_count_addendum=(també a la llista blanca: ?1?, amagats: ?2?)
-subscription_invalid_location=La llista de filtres no és una URL vàlida ni un nom de fitxer vàlid.
+subscription_invalid_location=La ubicació de la llista de filtres no és una URL vàlida ni un nom de fitxer vàlid.
 type_label_image=imatge
 remove_subscription_warning=Realment desitges eliminar aquesta subscripció?
 type_label_other=Un altre
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/ca/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/ca/overlay.dtd
index fc91e9e..db51a5e 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/ca/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/ca/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Si">
 <!ENTITY notification.button.no "&amp;No">
 <!ENTITY sync.label "&amp;Sincronitza la configuració de l'AdBlock Plus">
 <!ENTITY whitelist.site.label "Inhabilita l'Adblock Plus a ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "&amp;Informa sobre la pàgina">
 <!ENTITY whitelist.page.label "Inhabilita només en aquesta pàgina">
 <!ENTITY context.image.label "Adblock Plus: bloca la imatge">
-<!ENTITY counthits.label "Compta els cops que &amp;funciona el filtre">
+<!ENTITY notification.button.yes "&amp;Sí">
 <!ENTITY opensidebar.label "Obre &amp;elements blocables">
 <!ENTITY notification.button.close "&amp;Tancar">
 <!ENTITY contribute.label "Contribueix a l'Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: bloca el marc">
 <!ENTITY blocked.tooltip "Elements bloquejats en aquesta pàgina:">
-<!ENTITY hideplaceholders.label "Amaga &amp;les localitzacions dels elements blocats">
+<!ENTITY counthits.label "Compta els cops que &amp;funciona el filtre">
 <!ENTITY showinstatusbar.label "Mostra a la barra d'&amp;estat">
 <!ENTITY sidebar.title "Elements blocables a la pàgina actual">
 <!ENTITY options.label "&amp;Opcions">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/cs/filters.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/cs/filters.dtd
index d91d351..498c7a6 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/cs/filters.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/cs/filters.dtd
@@ -6,7 +6,7 @@
 <!ENTITY subscription.actions.label "Akce">
 <!ENTITY filter.selectAll.label "Vybrat vše">
 <!ENTITY backupButton.label "Zál&amp;ohování a obnova">
-<!ENTITY restore.minVersion.warning "Varování: Soubor byl vytvořen novější verzí Adblocku Plus. Měli byste jej aktualizovat na nějnovější verzi, než budete pokračovat.">
+<!ENTITY restore.minVersion.warning "Varování: Soubor byl vytvořen novější verzí Adblocku Plus. Než budete pokračovat, měli byste jej aktualizovat na nejnovější verzi.">
 <!ENTITY restore.error "Data ze souboru nelze zpracovat, možná nejde o zálohu filtrů Adblocku Plus?">
 <!ENTITY sort.ascending.label "Vzestupně (&amp;A-Z)">
 <!ENTITY sort.label "&amp;Seřadit podle">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/cs/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/cs/firstRun.properties
index d71aea6..4c3bf5c 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/cs/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/cs/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Zakázáním sledování si zachovejte soukromí při prohlížení - zakryjte své stopy před reklamními společnostmi, které by jinak sladovali každičký Váš pohyb.
-firstRun_toggle_off=VYPNUTO
-firstRun_feature_tracking=Zakázat sledování
-firstRun_feature_malware=Blokování malware
-firstRun_title=Adblock Plus byl nainstalován
-firstRun_toggle_on=ZAPNUTO
 firstRun_acceptableAdsExplanation=Rádi bychom podpořili webové stránky v používání jasné neobtěžující reklamy. Proto jsme zavedli <a>přísná pravidla</a> k určení přijatelných reklam, které se pak ve výchozím nastavení zobrazují . Pokud přesto chcete blokovat veškerou reklamu, můžete toto během chvilky <a>zakázat</a>.
+firstRun_acceptableAdsHeadline=Otravné reklamy budou nyní blokovány
 firstRun_contributor_credits=Zásluhy přispěvatelů
 firstRun_dataCorruptionWarning=Neustále se Vám tato stránka znovu zobrazuje? <a>Klikněte zde!</a>
-firstRun_acceptableAdsHeadline=Otravné reklamy budou nyní blokovány
-firstRun_share=Řekněte svým přátelům
-firstRun_share_headline=<a>Pomožte nám</a> učinit web lepším
-firstRun_feature_social_description=Automaticky zbavte své surfování od tlačítek sociálních médií, jako například Facebook "To se mi líbí", která se objevují na webových stránkách a sledují Vaše chování.
-firstRun_filterlistsReinitializedWarning=Zdá se, že nastal problém, který způsobil smazání všech filtrů a nebyli jsme schopni je obnovit ze zálohy. Museli jsme tudíž Vaše filtry a nastavení Přijatelných reklam resetovat. Prosím zkontrolujte si své nastavení seznamů filtrů a Přijatelných reklam v <a>předvolbách Adblocku Plus</a>.
-firstRun_feature_malware_description=Blokováním známých malwarových domén učiňte Vaše prohlížení webu bezpečnějším.
-firstRun_features=Adblock Plus toho umí více než jen blokovat reklamy
 firstRun_donate=přispějte
 firstRun_donate_label=Podpořte náš projekt
+firstRun_feature_malware=Blokování malware
+firstRun_feature_malware_description=Blokováním známých malwarových domén učiňte Vaše prohlížení webu bezpečnějším.
 firstRun_feature_social=Odstranit tlačítka sociálních médií
+firstRun_feature_social_description=Automaticky zbavte své surfování od tlačítek sociálních médií, jako například Facebook "To se mi líbí", která se objevují na webových stránkách a sledují Vaše chování.
+firstRun_feature_tracking=Zakázat sledování
+firstRun_feature_tracking_description=Zakázáním sledování si zachovejte soukromí při prohlížení - zakryjte své stopy před reklamními společnostmi, které by jinak sladovali každičký Váš pohyb.
+firstRun_features=Adblock Plus toho umí více než jen blokovat reklamy
+firstRun_filterlistsReinitializedWarning=Zdá se, že nastal problém, který způsobil smazání všech filtrů a nebyli jsme schopni je obnovit ze zálohy. Museli jsme tudíž Vaše filtry a nastavení Přijatelných reklam resetovat. Prosím zkontrolujte si své nastavení seznamů filtrů a Přijatelných reklam v <a>předvolbách Adblocku Plus</a>.
 firstRun_legacySafariWarning=Používáte starou verzi Safari, která není podporovaná Adblockem Plus. Nemusí to tak správně fungovat nebo to může zhoršit použitelnost na některých webových stránkách. Důrazně doporučujeme buď aktualizovat na Safari 6.1.1 či vyšší (v OS X 10.8 Mountain Lion), nebo Safari 7.0.1 či vyšší (v OS X 10.9 Mavericks), nebo používat nejnovější verzi Mozilla Firefoxu, Google Chrome či Opery.
+firstRun_share=Řekněte svým přátelům
+firstRun_share_headline=<a>Pomožte nám</a> učinit web lepším
+firstRun_title=Adblock Plus byl nainstalován
+firstRun_toggle_off=VYPNUTO
+firstRun_toggle_on=ZAPNUTO
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/cs/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/cs/overlay.dtd
index 9980b76..17643da 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/cs/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/cs/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Ano">
 <!ENTITY notification.button.no "&amp;Ne">
 <!ENTITY sync.label "Na&amp;stavení synchronizace Adblocku Plus">
 <!ENTITY whitelist.site.label "Vypnout na ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "&amp;Nahlásit problém na této stránce">
 <!ENTITY whitelist.page.label "Vypnout pouze na této stránce">
 <!ENTITY context.image.label "Blokovat obrázek">
-<!ENTITY counthits.label "Počítat &amp;zásahy filtrů">
+<!ENTITY notification.button.yes "&amp;Ano">
 <!ENTITY opensidebar.label "Zo&amp;brazit blokovatelné objekty">
 <!ENTITY notification.button.close "&amp;Zavřít">
 <!ENTITY contribute.label "Přispět Adblocku Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Blokovat rámec">
 <!ENTITY blocked.tooltip "Blokované prvky na této stránce:">
-<!ENTITY hideplaceholders.label "Skrýt zástupné o&amp;bjekty blokovaných prvků">
+<!ENTITY counthits.label "Počítat &amp;zásahy filtrů">
 <!ENTITY showinstatusbar.label "Zob&amp;razit ve stavovém řádku">
 <!ENTITY sidebar.title "Adblock Plus: Blokovatelné objekty na zobrazené stránce">
 <!ENTITY options.label "&amp;Možnosti">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/cs/sendReport.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/cs/sendReport.dtd
index 3fd5628..5680c0a 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/cs/sendReport.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/cs/sendReport.dtd
@@ -26,7 +26,7 @@
 <!ENTITY recentReports.label "Vaše nedávná hlášení">
 <!ENTITY typeWarning.description "Vybrali jste, že chcete nahlásit problém přímo v Adblocku Plus, nikoli chybu ve filtrech. Nejlepší způsob hlášení takovýchto chyb je na [link]fóru Adblocku Plus[/link]. Měli byste používat nástroj na hlášení chyb pouze jako doplněk existující diskuse na fóru, protože nikdo se nebude zabývat vaším hlášením, dokud neposkytnete odkaz na něj. Automaticky vygenerovaný odkaz bude zobrazet po odeslání hlášení.">
 <!ENTITY issues.disabled.description "Adblock Plus je zakázaný, v současném stavu nebude blokovat nic.">
-<!ENTITY attachExtensions.label "&amp;Připojit seznam aktivních rozšíření k hlášení pro případ, že problém byl způsoben konfliktem mezi doplňky">
+<!ENTITY attachExtensions.label "&amp;Připojte k hlášení seznam aktivních doplňků pro případ, že byl problém způsoben konfliktem doplňků">
 <!ENTITY issues.nosubscriptions.add.label "Přidat sadu cizích filtrů">
 <!ENTITY issues.disabledfilters.enable.label "Povolit filtr">
 <!ENTITY issues.override.label "Nastavení je v &amp;pořádku, pokračovat v hlášení problém">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/cs/sidebar.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/cs/sidebar.dtd
index 8707ce4..7c94d15 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/cs/sidebar.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/cs/sidebar.dtd
@@ -18,7 +18,7 @@
 <!ENTITY context.block.label "Blokovat tento objekt">
 <!ENTITY context.enablefilter.label "Opět povolit filtr ?1?">
 <!ENTITY detach.label "Oddělit">
-<!ENTITY whitelisted.label "Adresa je na bílé listině">
+<!ENTITY whitelisted.label "je na bílé listině">
 <!ENTITY context.disablefilteronsite.label "Zakázat tento filtr na ?1?">
 <!ENTITY detached.title "Adblock Plus: Blokovatelné prvky (odděleno)">
 <!ENTITY docDomain.firstParty "(vlastní)">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/cy/composer.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/cy/composer.dtd
new file mode 100644
index 0000000..94bbd39
--- /dev/null
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/cy/composer.dtd
@@ -0,0 +1,33 @@
+<!ENTITY anchor.end.label "ar dd&amp;iwedd y cyfeiriad">
+<!ENTITY domainRestriction.label "Cyfyngu i &amp;barth:">
+<!ENTITY collapse.default.no.label "Defnyddio'r rhagosodiad (na)">
+<!ENTITY firstParty.label "&amp;Mewnol yn unig">
+<!ENTITY preferences.label "&amp;Dangos hidlyddion presennol...">
+<!ENTITY pattern.label "Chwilio am batrwm">
+<!ENTITY thirdParty.label "&amp;Allanol yn unig">
+<!ENTITY filter.label "&amp;Hidlydd newydd:">
+<!ENTITY collapse.label "Cuddio'r hyn sydd wedi'i rwystro:">
+<!ENTITY match.warning "Nid yw'r patrwm a roesoch bellach yn cyfateb i'r cyfeiriad i'w rwystro/wenrestru ac ni fydd yn cael unrhyw effaith arno.">
+<!ENTITY anchor.start.label "ar &amp;ddechrau'r cyfeiriad">
+<!ENTITY matchCase.label "&amp;Ystyried priflythrennau">
+<!ENTITY custom.pattern.label "&amp;Addasedig:">
+<!ENTITY unselectAllTypes.label "Dewis dim">
+<!ENTITY type.whitelist.label "Rheol &amp;eithrio">
+<!ENTITY regexp.warning "Caiff y patrwm a roesoch ei ddehongli fel ymadrodd arferol na ellir ei brosesu'n effeithlon gan Adblock Plus a gall arafu'ch porwr. Os nad oeddech am ddefnyddio ymadrodd arferol, rhowch seren (*) ar ddiwedd y patrwm.">
+<!ENTITY dialog.title "Ychwanegu rheol hidlydd Adblock Plus">
+<!ENTITY basic.label "Golwg sylfaenol">
+<!ENTITY type.filter.label "Hidlydd &amp;rhwystro">
+<!ENTITY types.label "Gweithredu ar y mathau:">
+<!ENTITY shortpattern.warning "Mae'r patrwm a roeswch yn rhy fyr i gael ei optimeiddio a gall arafu'ch porwr. Argymhellir eich bod yn dewis llinyn hwy ar gyfer yr hidlydd i Adblock Plus gael brosesu'r hidlydd yn fwy effeithlon.">
+<!ENTITY collapse.yes.label "Ie">
+<!ENTITY anchors.label "Derbyn y patrwm dim ond:">
+<!ENTITY collapse.default.yes.label "Defnyddio'r rhagosodiad (ie)">
+<!ENTITY domainRestriction.help "Defnyddiwch hwn i nodi un neu fwy o barthau wedi'u gwahanu gan y symbol '|'. Bydd yr hidlydd ond yn gweithredu ar y parth(au) a ddewiswyd. Mae tild (~) cyn enw parth yn golygu na fydd yr hidlydd yn gweithredu ar y parth hwnnw.">
+<!ENTITY accept.label "Ychwanegu hidlydd">
+<!ENTITY options.label "Dewisiadau">
+<!ENTITY disabled.warning "Mae Adblock Plus wedi'i analluogi ar hyn o bryd. Gallwch ychwanegu hidlyddion o hyd, ond fyddan nhw ddim yn weithredol oni bai i chi [link] alluogi Adblock Plus [/link].">
+<!ENTITY anchor.start.flexible.label "ar dd&amp;echrau enw'r parth">
+<!ENTITY collapse.no.label "Na">
+<!ENTITY selectAllTypes.label "Dewis y cyfan">
+<!ENTITY advanced.label "Golwg uwch">
+<!ENTITY pattern.explanation "Gall y patrwm fod yn unrhyw ran o'r cyfeiriad; mae sêr (*) yn gweithredu fel nodau chwilio. Bydd yr hidlydd yn gweithredu ar y cyfeiriadau sy'n cyd-fynd â'r patrwm a roddwyd.">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/cy/filters.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/cy/filters.dtd
new file mode 100644
index 0000000..fd5a076
--- /dev/null
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/cy/filters.dtd
@@ -0,0 +1,72 @@
+<!ENTITY restore.custom.warning "Bydd eich holl hidlyddion addasedig yn cael eu disodli gan y cynnwys yn y ffeil a ddewiswyd. Hoffech chi barhau?">
+<!ENTITY slow.column "Hidlyddion ara&amp;f">
+<!ENTITY enabled.column "&amp;Galluogwyd">
+<!ENTITY subscription.lastDownload.checksumMismatch "Methwyd, prawfswm anghywir">
+<!ENTITY noFiltersInGroup.text "Mae'r grŵp hwn yn wag.">
+<!ENTITY subscription.actions.label "Gweithredu">
+<!ENTITY filter.selectAll.label "Dewis popeth">
+<!ENTITY backupButton.label "&amp;Creu copi wrth gefn ac adfer">
+<!ENTITY restore.minVersion.warning "Rhybudd: Crëwyd y ffeil gyda fersiwn diweddarach o Adblock Plus. Dylech ddefnyddio fersiwn diweddarach o Adblock Plus cyn adfer o'r ffeil hon.">
+<!ENTITY restore.error "Ni ellir prosesu data'r ffeil, efallai nad ffeil copi wrth gefn Adblock Plus yw hon?">
+<!ENTITY sort.ascending.label "Trefnu &amp;A &gt; Y">
+<!ENTITY sort.label "&amp;Trefnu yn ôl">
+<!ENTITY subscription.source.label "Rhestr hidlyddion">
+<!ENTITY hitcount.column "&amp;Ymweliadau">
+<!ENTITY noFilters.text "Does gennych chi ddim hidlyddion addasedig eto.">
+<!ENTITY backup.custom.title "Hidlyddion addasedig yn unig">
+<!ENTITY subscription.external.label "Diweddarwyd gan ychwanegiad arall">
+<!ENTITY subscription.delete.label "Dileu">
+<!ENTITY noGroupSelected.text "Rhaid i chi ddewis grŵp hidlo cyn dangos ei hidlyddion.">
+<!ENTITY filter.cut.label "Torri">
+<!ENTITY restore.default.label "Adfer copi wrth gefn o ?1?">
+<!ENTITY subscription.lastDownload.inProgress "Yn lawrlwytho...">
+<!ENTITY subscriptions.tab.label "Tanysgrifiadau i hidlyddion">
+<!ENTITY sort.descending.label "Trefnu &amp;Y &gt; A">
+<!ENTITY filters.remove.warning "Ydych chi wir am ddileu'r holl hidlyddion a ddewiswyd?">
+<!ENTITY filter.delete.label "Dileu">
+<!ENTITY addSubscriptionAdd.label "Ychwanegu">
+<!ENTITY viewMenu.label "Golwg">
+<!ENTITY subscription.lastDownload.unknown "Ddim yn berthnasol">
+<!ENTITY addSubscriptionCancel.label "Yn ôl">
+<!ENTITY subscription.enabled.label "Wedi'i alluogi">
+<!ENTITY noSubscriptions.text "'Dych chi heb ychwanegu unrhyw danysgrifiadau hidlo eto. Ni fydd Adblock Plus yn rhwystro dim heb hidlyddion, felly defnyddiwch &quot;Ychwanegu tanysgrifiad hidlo&quot; i ychwanegu rhai.">
+<!ENTITY subscription.update.label "Diweddaru'r hidlyddion">
+<!ENTITY dialog.title "Dewisiadau hidlyddion Adblock Plus">
+<!ENTITY addFilter.label "&amp;Ychwanegu hidlydd">
+<!ENTITY subscription.minVersion.warning "Mae angen fersiwn diweddarach o Adblock Plus ar gyfer y tanysgrifiad hwn. Dylech chi ddiweddaru Adblock Plus.">
+<!ENTITY subscription.lastDownload.invalidURL "Methwyd, cyfeiriad annilys">
+<!ENTITY backup.error "Bu gwall wrth ysgrifennu'r hidlyddion i'r ffeil. Gwnewch yn siŵr ei bod hi'n bosibl ysgrifennu i'r ffeil a bod dim rhaglen arall yn defnyddio'r ffeil.">
+<!ENTITY filter.moveUp.label "Symud i fyny">
+<!ENTITY addGroup.label "Ychwanegu &amp;grŵp hidlo">
+<!ENTITY filter.edit.label "Golygu">
+<!ENTITY subscription.showHideFilters.label "Dangos/cuddio'r hidlyddion">
+<!ENTITY acceptableAds2.label "Caniatáu rhai &amp;hysbysiadau sydd ddim yn ymwthiol">
+<!ENTITY addSubscriptionOther.label "Ychwanegu tanysgrifiad gwahanol">
+<!ENTITY close.label "Cau">
+<!ENTITY sort.none.label "&amp;Heb drefn">
+<!ENTITY filter.actions.label "Gweithredoedd yr hidlydd">
+<!ENTITY filter.copy.label "Copïo">
+<!ENTITY filter.moveDown.label "Symud i lawr">
+<!ENTITY filter.resetHitCounts.label "Ailosod ystadegau ymweld">
+<!ENTITY readMore.label "Darllen mwy">
+<!ENTITY subscription.moveUp.label "Symud i fyny">
+<!ENTITY addSubscription.label "Ychwanegu tanysgrifiad i &amp;hidlydd">
+<!ENTITY subscription.homepage.label "Hafan">
+<!ENTITY backup.complete.title "Pob hidlydd a thanysgrifiad">
+<!ENTITY restore.own.label "Adfer copi wrth gefn eich hun">
+<!ENTITY restore.complete.warning "Bydd eich holl ddewisiadau hidlo yn cael eu disodli gan y cynnwys yn y ffeil a ddewiswyd. Hoffech chi barhau?">
+<!ENTITY filters.tab.label "Hidlyddion addasedig">
+<!ENTITY backup.label "Creu copi wrth gefn newydd">
+<!ENTITY find.label "&amp;Canfod">
+<!ENTITY subscription.moveDown.label "Symud i lawr">
+<!ENTITY subscription.lastDownload.connectionError "Methwyd, gwall lawrlwytho">
+<!ENTITY subscription.lastDownload.success "Llwyddiannus">
+<!ENTITY subscription.lastDownload.invalidData "Methwyd, rhestr hidlyddion annilys">
+<!ENTITY filter.paste.label "Gludo">
+<!ENTITY subscription.disabledFilters.enable "Galluogi'r hidlyddion a analluogwyd">
+<!ENTITY lasthit.column "Ymweliad &amp;diwethaf">
+<!ENTITY subscription.editTitle.label "Golygu'r teitl">
+<!ENTITY subscription.disabledFilters.warning "Analluogwyd rhai o hidlyddion y tanysgrifiad hwn.">
+<!ENTITY filter.column "&amp;Rheol hidlydd">
+<!ENTITY subscription.lastDownload.label "Lawrlwythiad dywethaf">
+<!ENTITY viewList.label "Gweld rhestr">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/cy/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/cy/firstRun.properties
new file mode 100644
index 0000000..2db6656
--- /dev/null
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/cy/firstRun.properties
@@ -0,0 +1,20 @@
+firstRun_acceptableAdsExplanation=Hoffem annog gwefannau i ddefnyddio hysbysebion syml, anymwthiol. Dyna pam rydym wedi sefydlu <a>canllawiau llym</a> i adnabod hysbysebion derbyniol, ac fe'u dangosir yn ddiofyn. Os hoffech rwystro'r holl hysbysebion gallwch <a>annalluogi</a> hyn mewn eiliadau.
+firstRun_acceptableAdsHeadline=Caiff hysbysebion diflas eu rhwystro o hyn ymlaen
+firstRun_contributor_credits=Clodydd i'r Cyfranwyr
+firstRun_dataCorruptionWarning=Ydy'r dudalen hon yn ymddangos drwy'r amser? <a>Cliciwch yma!</a>
+firstRun_donate=rhoddi
+firstRun_donate_label=Cefnogwch ein prosiect
+firstRun_feature_malware=Rhwystro meddalwedd maleisus
+firstRun_feature_malware_description=Gwnewch bori'n fwy diogel drwy rwystro parthau sy'n arwain at feddalwedd maleisus.
+firstRun_feature_social=Dileu botymau cyfryngau cymdeithasol
+firstRun_feature_social_description=Gallwch gael gwared ar fotymau cyfryngau cymdeithasol yn ddiofyn, fel y Facebook Like, sy'n ymddangos ar dudalennau'r we ac yn tracio'ch ymddygiad.
+firstRun_feature_tracking=Analluogi tracio
+firstRun_feature_tracking_description=Porwch yn breifat drwy analluogi tracio - cuddio'ch camau oddi wrth gwmniau hysbysebu fyddai'n tracio pob dim.
+firstRun_features=Gall Adblock Plus wneud mwy na rhwystro hysbysebion
+firstRun_filterlistsReinitializedWarning=Mae'n ymddangos bod nam wedi achosi i bob hidlydd gael ei ddileu ac ni allwn adfer copi wrth gefn. Felly bu'n rhaid i ni ailosod eich hidlyddion a gosodiadau Hysbysebion Derbyniol. Gwiriwch eich rhestri hidlo a gosodiadau Hysbysebion Derbyniol yng <a> ngosodiadau Adblock Plus</a>.
+firstRun_legacySafariWarning=Mae'n ymddangos eich bod yn defnyddio hen fersiwn o Safari nad yw Adblock Plus yn ei gefnogi. Efallai na fydd yn gweithio'n iawn neu'n ymharu ar brofiad y defnyddiwr ar rai wefannau. Rydym yn argymell naill ai diweddaru i Safari 6.1.1 neu'n uwch (ar OS X 10.8 Mountain Lion), neu Safari 7.0.1 neu'n uwch (ar OS X 10.9 Mavericks), neu ddefnyddio fersiwn diweddaraf Mozilla Firefox, Google Chrome neu Opera.
+firstRun_share=Dywedwch wrth eich ffrindiau
+firstRun_share_headline=<a>Rhowch help llaw</a> i ni wneud y we'n lle gwell
+firstRun_title=Mae Adblock Plus wedi'i osod
+firstRun_toggle_off=I FFWRDD
+firstRun_toggle_on=YMLAEN
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/cy/global.properties b/data/extensions/spyblock@gnu.org/chrome/locale/cy/global.properties
new file mode 100644
index 0000000..0524a4b
--- /dev/null
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/cy/global.properties
@@ -0,0 +1,41 @@
+no_blocking_suggestions=Does dim eitemau y gellir rhwystro ar y dudalen hon
+action3_tooltip=Cliciwch i alluogi/analluogi Adblock Plus.
+notification_antiadblock_title=Cuddio negeseuon wedi eu targedu?
+type_label_script=sgript
+filter_elemhide_nocriteria=Does dim maen prawf wedi ei bennu i gydnabod yr elfen i'w chuddio
+blockingGroup_title=Rheolau rhwystro hysbysebion
+whitelisted_tooltip=Analluogwyd Adblock Plus ar y dudalen hon.
+type_label_stylesheet=taflen arddull
+blocked_count_tooltip=?1? o ?2?
+type_label_font=ffont
+type_label_popup=naidlen
+filter_regexp_tooltip=Mae'r hidlydd hwn naill ai'n ymadrodd arferol neu'n rhy fyr i gael ei optimeiddio. Gall gormod o'r hidlyddion hyn arafu'ch porwr.
+action0_tooltip=Cliciwch i fynd i'r naidlen. Bydd clic canol yn galluogi/analluogi.
+whitelisted_page=Mae Adblock Plus wedi ei analluogi ar gyfer y dudalen hon
+remove_group_warning=Ydych chi wir am ddileu'r grŵp hwn?
+action1_tooltip=Cliciwch i agor/cau yr eitemau y gellir rhwystro. Bydd clic canol yn galluogi/analluogi.
+type_label_xmlhttprequest=cais XML
+active_tooltip=Mae Adblock Plus wedi ei alluogi ac mae ?1? tanysgrifiad hidlo a ?2? hidlydd addasedig yn cael eu defnyddio.
+type_label_document=dogfen
+type_label_object_subrequest=is-gais gwrthrych
+whitelistGroup_title=Rheolau eithrio
+disabled_tooltip=Analluogwyd Adblock Plus.
+filter_elemhide_duplicate_id=Gellir pennu dim ond un ID o'r elfen i'w chuddio
+type_label_object=gwrthrych
+action2_tooltip=Cliciwch i agor dewisiadau. Bydd clic canol yn galluogi/analluogi.
+type_label_subdocument=fframyn
+clearStats_warning=Bydd hyn yn ailosod holl ystadegau ymweld yr hidlydd ac yn analluogi cyfrif ymweliadau'r hidlydd. Hoffech chi fwrw ymlaen?
+notification_antiadblock_message=Mae'r wefan hon yn dangos negeseuon wedi eu targedu i ddefnyddwyr Adblock Plus. Ydych chi am i Adblock Plus guddio negeseuon wedi eu targedu?
+blocked_count_addendum=(hefyd wenrestrwyd: ?1?, cuddiwyd: ?2?)
+subscription_invalid_location=Nid yw lleoliad y rhestr hidlyddion yn URL dilys na'n enw ffeil dilys.
+type_label_image=llun
+remove_subscription_warning=Ydych chi wir am ddileu'r tanysgrifiad hwn?
+type_label_other=arall
+mobile_menu_enable=ABP: Galluogi
+type_label_media=sain/fideo
+mobile_menu_disable_site=ABP: Analluogi ar ?1?
+elemhideGroup_title=Rheolau cuddio elfennau
+mobile_menu_enable_site=ABP: Galluogi ar ?1?
+type_label_elemhide=cudd
+newGroup_title=Grŵp hidlo newydd
+default_dialog_title=Adblock Plus
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/cy/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/cy/overlay.dtd
new file mode 100644
index 0000000..278968a
--- /dev/null
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/cy/overlay.dtd
@@ -0,0 +1,31 @@
+<!ENTITY notification.button.no "&amp;Na">
+<!ENTITY sync.label "&amp;Cysoni gosodiadau Adblock Plus">
+<!ENTITY whitelist.site.label "Analluogi ar ?1?">
+<!ENTITY filters.label "&amp;Dewisiadau hidlo">
+<!ENTITY disable.label "Analluogi ym mhobman">
+<!ENTITY objecttab.title "Rhwystro">
+<!ENTITY objecttab.tooltip "Cliciwch yma i rwystro hwn gydag Adblock Plus">
+<!ENTITY menuitem.label "Dewisiadau Ad&amp;block Plus">
+<!ENTITY objecttabs.label "Dangos &amp;tabiau ar Flash a Java">
+<!ENTITY sendReport.label "&amp;Adrodd nam ar y dudalen hon">
+<!ENTITY whitelist.page.label "Analluogi ar y dudalen hon yn unig">
+<!ENTITY context.image.label "Adblock Plus: Rhwystro llun">
+<!ENTITY notification.button.yes "&amp;Ie">
+<!ENTITY opensidebar.label "Dangos yr eitemau y gellir &amp;rhwystro">
+<!ENTITY notification.button.close "&amp;Cau">
+<!ENTITY contribute.label "Cyfrannu i Adblock Plus">
+<!ENTITY toolbarbutton.label "Adblock Plus">
+<!ENTITY context.frame.label "Adblock Plus: Rhwystro fframyn">
+<!ENTITY blocked.tooltip "Eitemau rwystrwyd ar y dudalen hon:">
+<!ENTITY counthits.label "&amp;Mesurydd yr hidlydd">
+<!ENTITY showinstatusbar.label "Dangos yn y bar &amp;statws">
+<!ENTITY sidebar.title "Eitemau gellir eu rhwystro ar y dudalen hon">
+<!ENTITY options.label "&amp;Dewisiadau">
+<!ENTITY context.object.label "Adblock Plus: Rhwystro gwrthrych">
+<!ENTITY context.removeWhitelist.label "Adblock Plus: Ail-alluogi ar y dudalen hon">
+<!ENTITY filters.tooltip "Hidlyddion mwyaf gweithgar:">
+<!ENTITY closesidebar.label "Cuddio'r eitemau y gellir &amp;rhwystro">
+<!ENTITY showintoolbar.label "Dangos yn y &amp;bar offer">
+<!ENTITY status.tooltip "Statws:">
+<!ENTITY context.media.label "Adblock Plus: Rhwystro sain/fideo">
+<!ENTITY subscription.update.label "Diweddaru'r hidlyddion">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/cy/sendReport.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/cy/sendReport.dtd
new file mode 100644
index 0000000..c1bc127
--- /dev/null
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/cy/sendReport.dtd
@@ -0,0 +1,65 @@
+<!ENTITY screenshot.undo.label "&amp;Dadwneud">
+<!ENTITY issues.disabledgroups.description "Mae'r tanysgrifiadau hidlo/grwpiau hidlo canlynol wedi eu hanalluogi, ac eto gallant gael effaith ar y dudalen hon:">
+<!ENTITY showData.label "Dangos data'r adroddiad">
+<!ENTITY typeSelector.falsePositive.label "Mae Adblock Plus yn rhwystro &amp;gormod">
+<!ENTITY issues.change.description "Newidwyd eich ffurfweddiad. Ail-lwythwch y dudalen i brofi'r newidiadau a chyflwyno adroddiad os na fydd y newidiadau'n datrys y nam.">
+<!ENTITY email.label "&amp;Ebost:">
+<!ENTITY issues.openPreferences.label "Agor gosodiadau'r hidlydd">
+<!ENTITY sendPage.confirmation "Cadwyd eich adroddiad. Gallwch fynd ato drwy'r cyfeiriad canlynol:">
+<!ENTITY copyLink.label "&amp;Copïo cyfeiriad yr adroddiad">
+<!ENTITY issues.nofilters.description "Dyw Adblock Plus ddim yn rhwystro unrhyw beth ar y dudalen gyfredol. Mae'n debyg nad yw'r nam rydych chi'n ei brofi'n ymwneud ag Adblock Plus.">
+<!ENTITY sendPage.knownIssue "Mae'n debygol bod y nam ag adroddoch yn hysbys. Mwy o wybodaeth:">
+<!ENTITY typeSelector.other.description "Dewiswch hwn os ydych yn amau bod nam gydag Adblock Plus ei hun yn hytrach na'i hidlyddion.">
+<!ENTITY issues.disabledgroups.enable.label "Galluogi'r tanysgrifiad hidlo/grŵp hidlo">
+<!ENTITY typeWarning.override.label "&amp;Rwy'n deall ac rwyf am gyflwyno'r adroddiad beth bynnag">
+<!ENTITY issues.disabled.enable.label "Galluogi Adblock Plus">
+<!ENTITY update.fixed.description "Mae'n debygol bod y diweddariadau i'ch tanysgrifiadau hidlo wedi datrys y namau adroddoch chi. Ail-lwythwch y dudalen a rhoi cynnig arall arni. Cliciwch Adrodd eto os bydd y broblem yn parhau.">
+<!ENTITY anonymous.label "&amp;Cyflwyniad dienw">
+<!ENTITY reloadButton.label "&amp;Ail-lwytho'r dudalen">
+<!ENTITY recentReports.clear.label "&amp;Dileu pob adroddiad">
+<!ENTITY typeSelector.description "Bydd y ffenestr hon yn eich tywys drwy'r camau sydd eu hangen er mwyn adrodd nam ar Adblock Plus. Yn gyntaf, dewiswch isod y math o nam rydych chi'n ei brofi:">
+<!ENTITY screenshot.remove.label "&amp;Tynnu data sensitif">
+<!ENTITY issues.ownfilters.description "Mae rhai o'r hidlyddion ar waith ar y dudalen hon wedi eu diffinio â llaw. Analluogwch yr hidlyddion a allai fod wedi achosi'r nam:">
+<!ENTITY update.inProgress.description "Rhaid i Adblock Plus ddiweddaru'ch tanysgrifiadau hidlo i wneud yn siŵr nad yw'r nam wedi ei ddatrys eisoes. Arhoswch...">
+<!ENTITY sendPage.retry.label "Anfon eto">
+<!ENTITY data.label "A&amp;drodd data:">
+<!ENTITY recentReports.label "Yr adroddiadau a gyflwynoch yn ddiweddar">
+<!ENTITY typeWarning.description "Rydych wedi nodi eich bod am adrodd nam cyffredinol gydag Adblock Plus yn hytrach na phroblem gyda'r hidlyddion. Noder ei bod yn well adrodd namau fel hyn yn [link] fforymau Adblock Plus[/link]. Dylech ond ddefnyddio'r teclyn adrodd namau i ategu i drafodaeth sydd eisoes yn bodoli, gan na fydd neb yn sylwi ar eich adroddiad oni bai eich bod yn rhoi'r ddolen iddynt. Rhoddir y ddolen i chi ar ôl cyflwyno'r adroddiad.">
+<!ENTITY issues.disabled.description "Mae Adblock Plus wedi ei analluogi, ni fydd yn rhwystro dim ar hyn o bryd.">
+<!ENTITY attachExtensions.label "Atodi rhestr o &amp;ychwanegiadau gweithredol i'r adroddiad rhag ofn taw gwrthdaro rhwng ychwanegion sy'n achosi'r nam">
+<!ENTITY issues.nosubscriptions.add.label "Ychwanegu tanysgrifiad hidlo">
+<!ENTITY issues.disabledfilters.enable.label "Galluogi'r hidlydd">
+<!ENTITY issues.override.label "Mae'r &amp;ffurfweddiad yn gywir, parhau â'r adroddiad">
+<!ENTITY issues.nosubscriptions.description "Mae'n ymddangos nad ydych wedi tanysgrifio i unrhyw un o'r hidlyddion rhagosodedig sy'n tynnu cynnwys annymunedig oddi ar wefannau'n ddiofyn.">
+<!ENTITY typeSelector.falsePositive.description "Dewiswch hwn os yw'r dudalen heb gynnwys pwysig, yn ymddangos yn anghywir neu'n methu gweithio'n gywir. Gallwch ddarganfod ai Adblock Plus sy'n achosi'r broblem drwy ei analluogi dros dro.">
+<!ENTITY typeSelector.other.label "&amp;Nam arall">
+<!ENTITY emailComment.label "Rydym yn eich annog i roi cyfeiriad ebost dilys fel y gallwn gysylltu â chi os oes cwestiynau am eich adroddiad. Bydd hefyd yn ein galluogi i adnabod eich cyfraniadau a'u blaenoriaethu.">
+<!ENTITY issues.whitelist.remove.label "Ail-alluogi Adblock Plus ar y dudalen hon">
+<!ENTITY outdatedSubscriptions.description "Dyw'r tanysgrifiadau hidlo canlynol heb eu diweddaru ers o leiaf dwy wythnos. Diweddarwch y tanysgrifiadau hyn cyn adrodd namau, mae'n bosibl bod y nam wedi ei ddatrys eisoes.">
+<!ENTITY dataCollector.description "Arhoswch ychydig eiliadau tra bod Adblock Plus yn casglu'r data sydd ei angen.">
+<!ENTITY sendButton.label "An&amp;fon yr adroddiad">
+<!ENTITY comment.label "&amp;Sylw (dewisol):">
+<!ENTITY sendPage.errorMessage "Methwyd cais i anfon yr adroddiad gyda chôd gwall &quot;?1?&quot;. Sicrhewch eich bod chi wedi cysylltu â'r we a rhowch gynnig arall arni. Os bydd y broblem yn parhau, gofynnwch am gymorth yn [link]fforwm Adblock Plus[/link].">
+<!ENTITY showRecentReports.label "Dangos adroddiadau a gyflwynwyd yn ddiweddar">
+<!ENTITY commentPage.heading "Ychwanegu sylw">
+<!ENTITY update.start.label "Dechrau diweddaru nawr">
+<!ENTITY issues.disabledfilters.description "Mae'r hidlyddion canlynol wedi eu hanalluogi ac eto gallant gael effaith ar y dudalen hon:">
+<!ENTITY screenshot.description "Gall yr un dudalen edrych yn wahanol i bobl wahanol. Gall atodi sgrîn-lun i'ch adroddiad fod o gymorth i ni ddeall y broblem. Gallwch dynnu adrannau sy'n cynnwys gwybodaeth sensitif yn ogystal â marcio'r rhannau lle mae'r broblem yn amlwg. I wneud hynny, cliciwch ar y botwm cyfatebol a dewiswch ddarn o'r llun gyda'ch llygoden.">
+<!ENTITY screenshot.attach.label "A&amp;todi llun o'r dudalen i'r adroddiad">
+<!ENTITY issues.whitelist.description "Mae Adblock Plus wedi ei analluogi ar y dudalen rydych chi'n ei hadrodd. Ail-alluogwch Adblock Plus ac ail-lwythwch y dudalen cyn adrodd y nam i helpu ymchwilio i'r nam.">
+<!ENTITY typeSelector.falseNegative.label "Dyw Adblock Plus ddim yn rhwystro &amp;hysbyseb">
+<!ENTITY typeSelector.heading "Dewis y math o nam">
+<!ENTITY anonymity.warning "Allwn ni ddim ymateb a byddwn yn debygol o beidio â blaenoriaethu'r adroddiad.">
+<!ENTITY wizard.title "Teclyn adrodd namau">
+<!ENTITY issues.ownfilters.disable.label "Analluogi'r hidlydd">
+<!ENTITY commentPage.description "Mae'r blwch testun isod yn eich galluogi i adael sylw i helpu ni i ddeall beth yw'r nam. Mae'r cam yn ddewisol ond argymhellir ei gymryd os nad yw'r broblem yn amlwg. Gallwch hefyd adolygu data'r adroddiad cyn ei anfon.">
+<!ENTITY comment.lengthWarning "Mae hyd eich sylw dros 1000 nod. Dim ond y 1000 nod cyntaf caiff ei anfon.">
+<!ENTITY typeSelector.falseNegative.description "Dewiswch hwn os yw hysbyseb yn cael ei harddangos er bod Adblock Plus wedi ei alluogi.">
+<!ENTITY sendPage.waitMessage "Arhoswch funud tra bod Adblock Plus yn cyflwyno eich adroddiad.">
+<!ENTITY dataCollector.heading "Croeso i'r teclyn adrodd namau">
+<!ENTITY screenshot.heading "Atodi sgrinlun">
+<!ENTITY sendPage.heading "An&amp;fon yr adroddiad">
+<!ENTITY issues.subscriptionCount.description "Mae'n debyg eich bod chi wedi tanysgrifio i ormod o danysgrifiadau hidlo. 'Dyn ni ddim yn argymell hyn oherwydd ei bod hi'n cynyddu'r siawns y bydd namau. Hefyd, allwn ni ddim derbyn eich adroddiad o nam oherwydd nad yw'n glir pa danysgrifiad hidlo sydd ar fai. Dilëwch pob tanysgrifiad hidlo ond am y rhai angenrheidiol a phrofwch a yw'r nam yn dal i ddigwydd wedyn.">
+<!ENTITY screenshot.mark.label "&amp;Marcio'r broblem">
+<!ENTITY privacyPolicy.label "Polisi preifatrwydd">
+<!ENTITY issues.description "Mae Adblock Plus wedi canfod namau gyda'ch ffurfweddiad a allai fod yn gyfrifol am y nam hwn neu a allai wneud ymchwilio i'r adroddiad yn anodd.">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/cy/sidebar.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/cy/sidebar.dtd
new file mode 100644
index 0000000..9bf2c22
--- /dev/null
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/cy/sidebar.dtd
@@ -0,0 +1,35 @@
+<!ENTITY context.flash.label "Fflachio ymylon yr eitem">
+<!ENTITY address.label "Cyfeiriad">
+<!ENTITY context.open.label "Agor mewn tab newydd">
+<!ENTITY type.label "Math">
+<!ENTITY tooltip.filterSource.label "Ffynhonnell yr hidlydd:">
+<!ENTITY noitems.label "Dim eitem y gellir ei rwystro">
+<!ENTITY filter.label "Hidlydd">
+<!ENTITY tooltip.size.label "Maint:">
+<!ENTITY reattach.label "Ailgysylltu">
+<!ENTITY search.label "&amp;Chwilio:">
+<!ENTITY docDomain.thirdParty "(allanol)">
+<!ENTITY filterSource.label "Ffynhonnell yr hidlydd">
+<!ENTITY tooltip.docDomain.label "Ffynhonnell y ddogfen:">
+<!ENTITY context.copy.label "Copïo cyfeiriad yr eitem">
+<!ENTITY tooltip.type.label "Math:">
+<!ENTITY context.disablefilter.label "Analluogi'r hidlydd ?1?">
+<!ENTITY context.copyFilter.label "Copïo'r hidlydd">
+<!ENTITY context.block.label "Rhwystro'r eitem hon">
+<!ENTITY context.enablefilter.label "Ail-alluogi'r hidlydd ?1?">
+<!ENTITY detach.label "Datgysylltu">
+<!ENTITY whitelisted.label "Tudalen a wenrestrwyd">
+<!ENTITY context.disablefilteronsite.label "Analluogi'r hidlydd hwn ar ?1?">
+<!ENTITY detached.title "Adblock Plus: Eitemau gellir eu rhwystro (wedi'i ddatgysylltu)">
+<!ENTITY docDomain.firstParty "(mewnol)">
+<!ENTITY tooltip.type.whitelisted "(wedi'i wenrestru)">
+<!ENTITY tooltip.filter.label "Hidlydd ar waith:">
+<!ENTITY tooltip.filter.disabled "(analluogwyd)">
+<!ENTITY context.editfilter.label "Golygu'r hidlydd ar waith">
+<!ENTITY tooltip.type.blocked "(wedi'i rwystro)">
+<!ENTITY size.label "Maint">
+<!ENTITY context.whitelist.label "Ychwanegu eithriad i'r rheol ar gyfer yr eitem">
+<!ENTITY context.selectAll.label "Dewis y cyfan">
+<!ENTITY state.label "Cyflwr">
+<!ENTITY docDomain.label "Ffynhonnell y ddogfen">
+<!ENTITY tooltip.address.label "Cyfeiriad:">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/cy/subscriptionSelection.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/cy/subscriptionSelection.dtd
new file mode 100644
index 0000000..0938a8f
--- /dev/null
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/cy/subscriptionSelection.dtd
@@ -0,0 +1,12 @@
+<!ENTITY addMain.label "Ychwanegu'r &amp;tanysgrifiad hidlo &quot;?1?&quot; hefyd">
+<!ENTITY list.download.failed "Methodd Adblock Plus ddod o hyd i'r rhestr o danysgrifiadau.">
+<!ENTITY list.download.retry "Ceisio eto">
+<!ENTITY title.label "Teitl y &amp;tanysgrifiad:">
+<!ENTITY list.download.website "Ymweld â'r wefan">
+<!ENTITY supplementMessage "Dylid defnyddio'r tanysgrifiad hidlo hwn gyda'r tanysgrifiad hidlo &quot;?1?&quot; nad ydych yn ei ddefnyddio eto.">
+<!ENTITY viewList.label "Gweld yr hidlyddion">
+<!ENTITY visitHomepage.label "Ymweld â'r hafan">
+<!ENTITY addSubscription.label "Ychwanegu'r tanysgrifiad">
+<!ENTITY dialog.title "Ychwanegu tanysgrifiadau hidlo Adblock Plus">
+<!ENTITY location.label "&amp;Lleoliad y rhestr hidlyddion:">
+<!ENTITY fromWeb.description "Cadarnhewch eich bod am ychwanegu'r tanysgrifiad hidlo hwn. Gallwch newid teitl neu leoliad y tanysgrifiad cyn ei ychwanegu.">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/da/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/da/firstRun.properties
index 57c941b..3971eaf 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/da/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/da/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Deaktiver sporing - og skjul dine netvaner fra de annoncefirmaer der holder øje med din færden.
-firstRun_toggle_off=FRA
-firstRun_feature_tracking=Deaktiver sporing
-firstRun_feature_malware=Malwareblokering
-firstRun_title=Adblock Plus blev installeret
-firstRun_toggle_on=TIL
 firstRun_acceptableAdsExplanation=Vi vil gerne tilskynde websider til at bruge enkel, diskret annoncering. Derfor har vi indført <a>strenge retningslinjer</a> for at identificere de acceptable annoncer, der vises med standardindstillingerne. Hvis du stadig vil blokere alle annoncer, kan du let <a>deaktivere</a> dette.
+firstRun_acceptableAdsHeadline=Generende annoncer bliver nu blokeret
 firstRun_contributor_credits=Tak til
 firstRun_dataCorruptionWarning=<a>Klik her!</a> hvis denne side bliver ved med at dukke op.
-firstRun_acceptableAdsHeadline=Generende annoncer bliver nu blokeret
-firstRun_share=Fortæl det til vennerne
-firstRun_share_headline=<a>Giv en hånd</a> med at gøre internettet til et bedre sted
-firstRun_feature_social_description=Fjern automatisk de knapper fra sociale medier, f.eks Facebook Like, som vises på websider og sporer din adfærd.
-firstRun_filterlistsReinitializedWarning=Et problem har tilsyneladende fjernet alle filtre og det var ikke muligt at gendanne en backup. Dine filtre og indstillinger for upåtrængende annoncer er derfor blevet nulstillet. Kontroller dine filtre m.m. i <a>Adblock Plus præferencer</a>.
-firstRun_feature_malware_description=Gør din browsing mere sikker ved at blokere kendte malwaredomæner.
-firstRun_features=Adblock Plus kan mere end blot blokere annoncer
 firstRun_donate=donér
 firstRun_donate_label=Støt projektet
+firstRun_feature_malware=Malwareblokering
+firstRun_feature_malware_description=Gør din browsing mere sikker ved at blokere kendte malwaredomæner.
 firstRun_feature_social=Fjern knapper fra sociale medier
+firstRun_feature_social_description=Fjern automatisk de knapper fra sociale medier, f.eks Facebook Like, som vises på websider og sporer din adfærd.
+firstRun_feature_tracking=Deaktiver sporing
+firstRun_feature_tracking_description=Deaktiver sporing - og skjul dine netvaner fra de annoncefirmaer der holder øje med din færden.
+firstRun_features=Adblock Plus kan mere end blot blokere annoncer
+firstRun_filterlistsReinitializedWarning=Et problem har tilsyneladende fjernet alle filtre og det var ikke muligt at gendanne en backup. Dine filtre og indstillinger for upåtrængende annoncer er derfor blevet nulstillet. Kontroller dine filtre m.m. i <a>Adblock Plus præferencer</a>.
 firstRun_legacySafariWarning=Du bruger en gammel udgave af Safari, som ikke understøttes af Adblock Plus. Det kan fungere dårligt eller forringe brugeroplevelsen på nogle websteder. Vi anbefaler kraftigt at opdatere til minimum Safari 6.1.1 (på OS X 10,8 Mountain Lion), Safari 7.0.1 (på OS X 10.9 Mavericks) eller bruge den nyeste Firefox, Google Chrome eller Opera.
+firstRun_share=Fortæl det til vennerne
+firstRun_share_headline=<a>Giv en hånd</a> med at gøre internettet til et bedre sted
+firstRun_title=Adblock Plus blev installeret
+firstRun_toggle_off=FRA
+firstRun_toggle_on=TIL
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/da/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/da/overlay.dtd
index 89522f2..c435567 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/da/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/da/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Ja">
 <!ENTITY notification.button.no "&amp;Nej">
 <!ENTITY sync.label "Syn&amp;k Adblock Plus indstillinger">
 <!ENTITY whitelist.site.label "Slå fra på ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "Ra&amp;pporter problem">
 <!ENTITY whitelist.page.label "Slå fra på denne side">
 <!ENTITY context.image.label "Adblock billede">
-<!ENTITY counthits.label "Tæl filter&amp;hits">
+<!ENTITY notification.button.yes "&amp;Ja">
 <!ENTITY opensidebar.label "Åbn bloké&amp;rbare elementer">
 <!ENTITY notification.button.close "&amp;Luk">
 <!ENTITY contribute.label "Bidrag til Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock ramme">
 <!ENTITY blocked.tooltip "Blokerede emner på denne side:">
-<!ENTITY hideplaceholders.label "Skjul blokerede emners &amp;pladsholder">
+<!ENTITY counthits.label "Tæl filter&amp;hits">
 <!ENTITY showinstatusbar.label "&amp;Vis på statuslinje">
 <!ENTITY sidebar.title "Blokérbare elementer på aktuel side">
 <!ENTITY options.label "In&amp;dstillinger">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/de/composer.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/de/composer.dtd
index 7d377e2..cdbe73e 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/de/composer.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/de/composer.dtd
@@ -1,11 +1,11 @@
 <!ENTITY anchor.end.label "am En&amp;de der Adresse">
 <!ENTITY domainRestriction.label "Auf Do&amp;main beschränken:">
 <!ENTITY collapse.default.no.label "Standardeinstellung (nein)">
-<!ENTITY firstParty.label "Nur für Elemente der Ursprungsseite">
-<!ENTITY preferences.label "Existierende Filter an&amp;zeigen ...">
+<!ENTITY firstParty.label "Nur für Elemente der Urs&amp;prungsseite">
+<!ENTITY preferences.label "Vorhandene Filter an&amp;zeigen…">
 <!ENTITY pattern.label "Muster suchen">
 <!ENTITY thirdParty.label "Nur für Elemen&amp;te von Drittseiten">
-<!ENTITY filter.label "Neue &amp;Filter:">
+<!ENTITY filter.label "Neue&amp;r Filter:">
 <!ENTITY collapse.label "Platz frei&amp;geben:">
 <!ENTITY match.warning "Das Muster, das Sie eingegeben haben, passt nicht mehr zu der Adresse, für die der Filter erstellt werden soll. Es wird keinen Einfluss mehr auf diese Adresse haben.">
 <!ENTITY anchor.start.label "am An&amp;fang der Adresse">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/de/filters.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/de/filters.dtd
index 7c3e0f1..afcfba7 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/de/filters.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/de/filters.dtd
@@ -1,5 +1,5 @@
 <!ENTITY restore.custom.warning "Alle Ihre eigenen Filter werden durch den Inhalt dieser Datei ersetzt. Wollen Sie fortfahren?">
-<!ENTITY slow.column "&amp;Langsame Filter">
+<!ENTITY slow.column "&amp;Langsam">
 <!ENTITY enabled.column "A&amp;ktiviert">
 <!ENTITY subscription.lastDownload.checksumMismatch "Fehler, Prüfsumme ist falsch, möglicherweise ein Übertragungsfehler">
 <!ENTITY noFiltersInGroup.text "Die gewählte Filtergruppe ist leer.">
@@ -60,7 +60,7 @@
 <!ENTITY backup.label "Neue Sicherung erstellen">
 <!ENTITY find.label "Filter durch&amp;suchen">
 <!ENTITY subscription.moveDown.label "Nach unten verschieben">
-<!ENTITY subscription.lastDownload.connectionError "Fehler, Herunterladen fehlgeschlagen">
+<!ENTITY subscription.lastDownload.connectionError "Fehler, Download fehlgeschlagen">
 <!ENTITY subscription.lastDownload.success "Erfolgreich">
 <!ENTITY subscription.lastDownload.invalidData "Fehler, keine gültige Filterliste">
 <!ENTITY filter.paste.label "Einfügen">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/de/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/de/firstRun.properties
index 98089de..6493d0a 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/de/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/de/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Privates Surfen durch Deaktivierung der Tracker - Versteckt Ihr Surfverhalten vor Werbefirmen, die Sie sonst ausspionieren würden.
-firstRun_toggle_off=AUS
-firstRun_feature_tracking=Verfolgung ausschalten
-firstRun_feature_malware=Malware-Blockierung
-firstRun_title=Adblock Plus wurde installiert
-firstRun_toggle_on=AN
-firstRun_acceptableAdsExplanation=Wir möchten Webseiten dazu ermutigen schlichte und unaufdringliche Werbung zu verwenden. Deshalb werden durch <a>strenge Richtlinien</a> akzeptable Werbeanzeigen bestimmt, welche unter Standard-Einstellungen noch angezeigt werden. Wenn Sie jedoch alle Werbungen blockieren möchten, können Sie diese Einstellung in kurzer Zeit <a>deaktivieren</a>.
+firstRun_acceptableAdsExplanation=Wir möchten Webseiten dazu ermutigen schlichte und unaufdringliche Werbung zu verwenden. Deshalb werden durch <a>strenge Richtlinien</a> akzeptable Werbeanzeigen bestimmt, welche unter den Standard-Einstellungen noch angezeigt werden. Wenn Sie jedoch alle Werbungen blockieren möchten, können Sie diese Einstellung in kurzer Zeit <a>deaktivieren</a>.
+firstRun_acceptableAdsHeadline=Lästige Werbung wird jetzt blockiert
 firstRun_contributor_credits=Mitwirkende
 firstRun_dataCorruptionWarning=Wird diese Seite immer wieder angezeigt? <a>Bitte hier klicken!</a>
-firstRun_acceptableAdsHeadline=Lästige Werbung wird jetzt blockiert
-firstRun_share=Weiterempfehlen
-firstRun_share_headline=<a>Bitte unterstützen Sie uns</a> dabei, das Internet zu einem besseren Ort zu machen
-firstRun_feature_social_description=Entfernt Social-Media-Buttons (z.B. den Facebook-Like) die auf Webseiten erscheinen und Ihr Surfverhalten aufzeichnen.
-firstRun_filterlistsReinitializedWarning=Es scheint, als ob aufgrund eines Problems alle Filter entfernt wurden und wir keine Sicherung wiederherstellen konnten. Deshalb wurden alle Ihre Filter sowie Ihre Einstellungen für akzeptable Werbung zurückgesetzt werden. Überprüfen Sie bitte Ihre Filterliste und Ihre Einstellungen für akzeptable Werbung in den <a>Adblock Plus Optionen</a>.
-firstRun_feature_malware_description=Sicheres Surfen durch Blockieren von infizierten Webseiten.
-firstRun_features=Adblock Plus kann mehr als nur Werbung blockieren
 firstRun_donate=Spenden
 firstRun_donate_label=Unterstützen Sie unser Projekt
-firstRun_feature_social=Social Media-Buttons entfernen
-firstRun_legacySafariWarning=Sie verwenden eine ältere Version von Safari, die nicht von Adblock Plus unterstützt wird. Es kann sein, dass Adblock Plus damit nicht richtig funktioniert oder dass bestimmte Websites nicht richtig dargestellt werden. Wir empfehlen deshalb dringend, entweder einen Upgrade auf Safari 6.1.1 oder höher (auf OS X 10.8 Mountain Lion) oder auf Safari 7.0.1 oder höher (auf OS X 10.9 Mavericks) durchzuführen oder die neueste Version von Mozilla Firefox, Google Chrome oder Opera zu verwenden.
+firstRun_feature_malware=Malware-Blockierung
+firstRun_feature_malware_description=Sicheres Surfen durch Blockieren von infizierten Webseiten.
+firstRun_feature_social=Social Media-Knöpfe entfernen
+firstRun_feature_social_description=Entfernt Social-Media-Buttons (z.B. den Facebook-Like) die auf Webseiten erscheinen und Ihr Surfverhalten aufzeichnen.
+firstRun_feature_tracking=Tracking verhindern
+firstRun_feature_tracking_description=Privates Surfen durch Deaktivierung der Tracker - Versteckt Ihr Surfverhalten vor Werbefirmen, die Sie sonst ausspionieren würden.
+firstRun_features=Adblock Plus kann mehr als nur Werbung blockieren
+firstRun_filterlistsReinitializedWarning=Es scheint, als ob aufgrund eines Problems alle Filter entfernt wurden und wir keine Sicherung wiederherstellen konnten. Deshalb wurden alle Ihre Filter sowie Ihre Einstellungen für akzeptable Werbung zurückgesetzt. Überprüfen Sie bitte Ihre Filterliste und Ihre Einstellungen für akzeptable Werbung in den <a>Adblock Plus Optionen</a>.
+firstRun_legacySafariWarning=Sie verwenden eine ältere Version von Safari, die nicht von Adblock Plus unterstützt wird. Es kann sein, dass Adblock Plus damit nicht richtig funktioniert oder dass bestimmte Websites nicht richtig dargestellt werden. Wir empfehlen deshalb dringend, entweder ein Upgrade auf Safari 6.1.1 oder höher (auf OS X 10.8 Mountain Lion) oder auf Safari 7.0.1 oder höher (auf OS X 10.9 Mavericks) durchzuführen oder die neueste Version von Mozilla Firefox, Google Chrome oder Opera zu verwenden.
+firstRun_share=Weiterempfehlen
+firstRun_share_headline=<a>Bitte unterstützen Sie uns</a> dabei, das Internet zu einem besseren Ort zu machen
+firstRun_title=Adblock Plus wurde installiert
+firstRun_toggle_off=AUS
+firstRun_toggle_on=AN
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/de/global.properties b/data/extensions/spyblock@gnu.org/chrome/locale/de/global.properties
index da3cac2..b2cd0f0 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/de/global.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/de/global.properties
@@ -1,6 +1,6 @@
 no_blocking_suggestions=Auf der geöffneten Seite gibt es keine Elemente, die blockiert werden könnten
 action3_tooltip=Adblock Plus ein- bzw. ausschalten
-notification_antiadblock_title=Zielgerichtete Nachrichten ausblenden?
+notification_antiadblock_title=Gezielte Nachrichten ausblenden?
 type_label_script=Skript
 filter_elemhide_nocriteria=Keine Kriterien angegeben, um das zu versteckende Element zu erkennen
 blockingGroup_title=Blockierregeln
@@ -30,7 +30,7 @@ blocked_count_addendum=(außerdem Ausnahmen: ?1?, versteckte Elemente: ?2?)
 subscription_invalid_location=Die eingegebene Adresse ist weder eine gültige Web-Adresse, noch ein gültiger Dateiname.
 type_label_image=Grafik
 remove_subscription_warning=Sind Sie sicher, dass Sie dieses Abonnement entfernen möchten?
-type_label_other=Unbekannt
+type_label_other=Andere
 mobile_menu_enable=ABP: Aktivieren
 type_label_media=Audio/Video
 mobile_menu_disable_site=ABP: Deaktivieren auf ?1?
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/de/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/de/overlay.dtd
index 7007b24..a8afa42 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/de/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/de/overlay.dtd
@@ -1,6 +1,5 @@
-<!ENTITY notification.button.yes "&amp;Ja">
 <!ENTITY notification.button.no "&amp;Nein">
-<!ENTITY sync.label "Adblock Plus-Einstellungen s&amp;ynchonisieren">
+<!ENTITY sync.label "Adblock-Plus-Einstellungen s&amp;ynchronisieren">
 <!ENTITY whitelist.site.label "Deaktivieren: auf ?1?">
 <!ENTITY filters.label "Filterein&amp;stellungen">
 <!ENTITY disable.label "Überall deaktivieren">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "&amp;Fehler auf dieser Seite melden">
 <!ENTITY whitelist.page.label "Deaktivieren: nur auf dieser Seite">
 <!ENTITY context.image.label "Adblock Plus: Grafik blockieren">
-<!ENTITY counthits.label "Filtertreffer &amp;zählen">
+<!ENTITY notification.button.yes "&amp;Ja">
 <!ENTITY opensidebar.label "&amp;Blockierbare Elemente öffnen">
 <!ENTITY notification.button.close "&amp;Schließen">
 <!ENTITY contribute.label "Zu Adblock Plus beitragen">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Frame blockieren">
 <!ENTITY blocked.tooltip "Blockierte Elemente auf dieser Seite:">
-<!ENTITY hideplaceholders.label "P&amp;latzhalter blockierter Elemente verstecken">
+<!ENTITY counthits.label "Filtertreffer &amp;zählen">
 <!ENTITY showinstatusbar.label "In &amp;Statusleiste anzeigen">
 <!ENTITY sidebar.title "Elemente der geöffneten Seite">
 <!ENTITY options.label "&amp;Optionen">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/de/sendReport.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/de/sendReport.dtd
index 5dfc848..654209e 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/de/sendReport.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/de/sendReport.dtd
@@ -31,8 +31,8 @@
 <!ENTITY issues.ownfilters.description "Einige der Filter, die auf dieser Seite angewandt wurden, sind benutzerdefiniert.
   Bitte deaktivieren Sie Filter, die das Problem verursacht haben könnten:">
 <!ENTITY update.inProgress.description "Adblock Plus muss Ihre Filterabonnements aktualisieren, um sicherzustellen,
-  dass das Problem nicht bereits gelöst ist. Bitte warten Sie ...">
-<!ENTITY sendPage.retry.label "Noch einmal senden">
+  dass das Problem nicht bereits behoben ist. Bitte warten Sie ...">
+<!ENTITY sendPage.retry.label "Erneut senden">
 <!ENTITY data.label "Bericht&amp;daten:">
 <!ENTITY recentReports.label "Ihre zuletzt gesendeten Fehlerberichte">
 <!ENTITY typeWarning.description "Sie haben angedeutet, dass Sie ein allgemeines Problem mit Adblock Plus melden wollen
@@ -45,14 +45,14 @@
 <!ENTITY attachExtensions.label "Liste aktiver Er&amp;weiterungen anhängen für den Fall, dass das Problem von einer anderen Erweiterung verursacht wird">
 <!ENTITY issues.nosubscriptions.add.label "Filterabonnement hinzufügen">
 <!ENTITY issues.disabledfilters.enable.label "Filter aktivieren">
-<!ENTITY issues.override.label "Die Einstellungen sind so &amp;korrekt, mit dem Fehlerbericht fortfahren">
+<!ENTITY issues.override.label "Die Einstellungen sind &amp;korrekt, mit dem Fehlerbericht fortfahren">
 <!ENTITY issues.nosubscriptions.description "Es scheint, dass Sie keine der fertigen Filterlisten abonniert haben. Ein solches
   kostenloses Abonnement ist jedoch erforderlich, um automatisch Werbung zu entfernen.">
 <!ENTITY typeSelector.falsePositive.description "Wählen Sie diese Option, falls auf der Seite wichtige Inhalte fehlen, die Seite
   falsch angezeigt wird oder nicht korrekt funktioniert. Sie können feststellen,
   ob Adblock Plus das Problem verursacht, indem Sie es vorübergehend deaktivieren.">
 <!ENTITY typeSelector.other.label "An&amp;derer Fehler">
-<!ENTITY emailComment.label "Wir empfehlen Ihnen, eine gültige e-Mail-Adresse einzugeben, damit wir Sie kontaktieren können, falls es Fragen zu Ihrem Bericht gibt. Es erlaubt uns, Ihre Beiträge zu erkennen und diesen höhere Prioritäten beizumessen.">
+<!ENTITY emailComment.label "Wir empfehlen Ihnen, eine gültige E-Mail-Adresse einzugeben, damit wir Sie kontaktieren können, falls es Fragen zu Ihrem Bericht gibt. Es erlaubt uns, Ihre Beiträge zu erkennen und diesen höhere Prioritäten beizumessen.">
 <!ENTITY issues.whitelist.remove.label "Adblock Plus auf dieser Seite wieder aktivieren">
 <!ENTITY outdatedSubscriptions.description "Die folgenden Filterabonnements wurden mindesten zwei Wochen lang nicht
   aktualisiert. Bitte aktualisieren Sie diese, bevor Sie einen Fehlerbericht
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/dsb/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/dsb/firstRun.properties
index fa8cf6a..ccb978f 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/dsb/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/dsb/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Pśeglědujśo priwatnje, z tym až znjemóžnjujośo slědowanje resp. zatajaśo swóje slědy pśed wabjeńskimi pśedewześami, kótarež by rady kuždemu z wašych pógibow slědowali.
-firstRun_toggle_off=WUŠALTOWANY
-firstRun_feature_tracking=Slědowanje znjemóžniś
-firstRun_feature_malware=Škódnu software blokěrowaś
-firstRun_title=Adblock Plus jo se instalěrował
 firstRun_acceptableAdsExplanation=My by rady websedła pózbuźili, wuwěrne, decentne wabjenje wužywaś. Togodla smy <a>kšute směrnice</a> póstajili, aby my akceptabelne wabjenje identificěrowali, kótarež pokazujo se w standardnych nastajenjach. Jolic cośo weto wšykne wabjenje blokěrowaś, móžośo jo w běgu mało sekundow <a>znjemóžniś</a>.
-firstRun_toggle_on=ZAŠALTOWANY
+firstRun_acceptableAdsHeadline=Gramne wabjenje buźo se něnto blokěrowaś
 firstRun_contributor_credits=Źěkowanje sobustatkujucym
 firstRun_dataCorruptionWarning=Pokazujo se toś ten bok dalej? <a>Klikniśo how!</a>
-firstRun_acceptableAdsHeadline=Gramne wabjenje buźo se něnto blokěrowaś
-firstRun_share=Informěrujśo swóje pśijaśele
-firstRun_share_headline=<a>Pódajśo nam ruku</a>, aby my web k lěpšemu městnoju cynili
-firstRun_features=Adblock Plus móžo wěcej cyniś ako wabjenje blokěrowaś
-firstRun_feature_malware_description=Cyńśo swójo pśeglědowanje wěsćejše, z tym až blokěrujośo znate domeny złosneje softwary.
-firstRun_feature_social_description=Wótpórajśo swóju pśeglědowańsku aktiwitu z tłocaškow socialnych medijow, ako na pś. tłocaška "Spódoba se mě" na Facebooku, kótarež pokazuju se na webbokach a slěduju wašomu zaźaržanjeju.
 firstRun_donate=pósćiś
 firstRun_donate_label=Pódprějśo naš projekt
+firstRun_feature_malware=Škódnu software blokěrowaś
+firstRun_feature_malware_description=Cyńśo swójo pśeglědowanje wěsćejše, z tym až blokěrujośo znate domeny złosneje softwary.
 firstRun_feature_social=Tłocaški za socialne medije wótpóraś
+firstRun_feature_social_description=Wótpórajśo swóju pśeglědowańsku aktiwitu z tłocaškow socialnych medijow, ako na pś. tłocaška "Spódoba se mě" na Facebooku, kótarež pokazuju se na webbokach a slěduju wašomu zaźaržanjeju.
+firstRun_feature_tracking=Slědowanje znjemóžniś
+firstRun_feature_tracking_description=Pśeglědujśo priwatnje, z tym až znjemóžnjujośo slědowanje resp. zatajaśo swóje slědy pśed wabjeńskimi pśedewześami, kótarež by rady kuždemu z wašych pógibow slědowali.
+firstRun_features=Adblock Plus móžo wěcej cyniś ako wabjenje blokěrowaś
+firstRun_filterlistsReinitializedWarning=Zda se, až problem jo zawinował, až wšykne filtry su se wótpórali a my njejsmy mógli zawěsćenje wótnowiś. Togodla smy musyli waše filtry a nastajenja za akceptabelne wabjenje slědk stajiś. Pšosym pśeglědajśo swóje filtrowe lisćiny a nastajenja za akceptabelne wabjenje w <a>nastajenjach Adblock Plus</a>.
 firstRun_legacySafariWarning=Wužywaśo staru wersiju Safari, kótaraž njepódpěra se pśez Adblock Plus. Wón njebuźo snaź korektnje funkcioněrowaś abo by mógał wužywarske dožywjenje na wěstych websedłach kazyś. Pśiraźujomy wuraznje, až pak aktualizěrujośo na Safari 6.1.1 abo wušu wersiju (stoj za Mac OS X 10.8 Mountain Lion k dispoziciji) abo Safari 7.0.1 abo wušu wersiju (na OS X 10.9 Mavericks) pak wužywaśo nejnowšu wersiju Mozilla Firefox, Google Chrome abo Opera.
-firstRun_filterlistsReinitializedWarning=It seems that an issue caused all filters to be removed and we were unable to restore a backup. Therefore we had to reset your filters and Acceptable Ads settings. Please check your filter lists and Acceptable Ads settings in the <a>Adblock Plus options</a>.
+firstRun_share=Informěrujśo swóje pśijaśele
+firstRun_share_headline=<a>Pódajśo nam ruku</a>, aby my web k lěpšemu městnoju cynili
+firstRun_title=Adblock Plus jo se instalěrował
+firstRun_toggle_off=WUŠALTOWANY
+firstRun_toggle_on=ZAŠALTOWANY
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/dsb/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/dsb/overlay.dtd
index b5e7b62..d69b611 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/dsb/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/dsb/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Jo">
 <!ENTITY notification.button.no "&amp;Ně">
 <!ENTITY sync.label "Nastajenja za syn&amp;chronizěrowanje Adblock Plus">
 <!ENTITY whitelist.site.label "Na ?1? znjemóžniś">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "&amp;Problem na toś tom boku k wěsći daś">
 <!ENTITY whitelist.page.label "Jano na toś tom boku znjemóžniś">
 <!ENTITY context.image.label "Adblock Plus: Wobraz blokěrowaś">
-<!ENTITY counthits.label "Fi&amp;ltrowe trjefarje licyś">
+<!ENTITY notification.button.yes "&amp;Jo">
 <!ENTITY opensidebar.label "B&amp;lokěrujobne zapiski wócyniś">
 <!ENTITY notification.button.close "&amp;Zacyniś">
 <!ENTITY contribute.label "K Adblock Plus pśinosowaś">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Wobłuk blokěrowaś">
 <!ENTITY blocked.tooltip "Blokěrowane zapiski na toś tom boku:">
-<!ENTITY hideplaceholders.label "Na&amp;městniki blokěrowanych elementow schowaś">
+<!ENTITY counthits.label "Fi&amp;ltrowe trjefarje licyś">
 <!ENTITY showinstatusbar.label "W &amp;statusowej lejstwje pokazaś">
 <!ENTITY sidebar.title "Blokěrujobne zapiski na aktualnem boku">
 <!ENTITY options.label "&amp;Opcije">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/el/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/el/firstRun.properties
index 5ca81f3..89b7b84 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/el/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/el/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Περιηγηθείτε ιδιωτικά απενεργοποιώντας την παρακολούθηση - αποκρύπτοντας τα ίχνη σας από εταιρείες διαφημίσεων που μπορούν να παρακολουθούν κάθε κίνησή σας.
-firstRun_toggle_off=Ανενεργό
-firstRun_feature_tracking=Απενεργοποίηση της παρακολούθησης
-firstRun_feature_malware=Φραγή κακόβουλου λογισμικού
-firstRun_title=Το Adblock Plus έχει εγκατασταθεί
 firstRun_acceptableAdsExplanation=Θα θέλαμε να ενθαρρύνουμε τις ιστοσελίδες να χρησιμοποιούν ξεκάθαρες, διακριτικές διαφημίσεις. Γι' αυτό το λόγο έχουμε ορίσει <a>αυστηρές κατευθυντήριες γραμμές</a> για τον προσδιορισμό των αποδεκτών διαφημίσεων, οι οποίες εμφανίζονται στις προεπιλεγμένες ρυθμίσεις. Εάν εξακολουθείτε να θέλετε να αποκλείσετε όλες τις διαφημίσεις μπορείτε να <a>απενεργοποιήσετε</a> αυτήν την επιλογή σε λίγα δευτερόλεπτα.
-firstRun_toggle_on=Ενεργό
+firstRun_acceptableAdsHeadline=Οι ενοχλητικές διαφημίσεις τώρα θα αποκλειστούν
 firstRun_contributor_credits=Μνεία συντελεστών
 firstRun_dataCorruptionWarning=Αυτή η σελίδα συνεχίζει να εμφανίζεται; <a>Κάντε κλικ εδώ!</a>
-firstRun_acceptableAdsHeadline=Οι ενοχλητικές διαφημίσεις τώρα θα αποκλειστούν
-firstRun_share=Πείτε το στους φίλους σας
-firstRun_share_headline=<a>Δώστε μας ένα χεράκι</a> στο να κάνουμε το διαδίκτυο ένα καλύτερο μέρος
-firstRun_features=Το Adblock Plus μπορεί να κάνει περισσότερα από το φιλτράρισμα διαφημίσεων
-firstRun_feature_malware_description=Κάνετε την περιήγηση σας πιο ασφαλή φράσσοντας γνωστές διευθύνσεις κακόβουλου λογισμικού.
-firstRun_feature_social_description=Απαλλάξετε αυτομάτως την περιήγησή σας από κουμπιά των μέσων κοινωνικής δικτύωσης, όπως το Like του Facebook, που εμφανίζονται σε ιστοσελίδες και παρακολουθούν τη συμπεριφορά σας.
 firstRun_donate=δωρίστε
 firstRun_donate_label=Υποστηρίξτε το έργο μας
+firstRun_feature_malware=Φραγή κακόβουλου λογισμικού
+firstRun_feature_malware_description=Κάνετε την περιήγηση σας πιο ασφαλή φράσσοντας γνωστές διευθύνσεις κακόβουλου λογισμικού.
 firstRun_feature_social=Αφαίρεση κουμπιών μέσων κοινωνικής δικτύωσης
+firstRun_feature_social_description=Απαλλάξετε αυτομάτως την περιήγησή σας από κουμπιά των μέσων κοινωνικής δικτύωσης, όπως το Like του Facebook, που εμφανίζονται σε ιστοσελίδες και παρακολουθούν τη συμπεριφορά σας.
+firstRun_feature_tracking=Απενεργοποίηση της παρακολούθησης
+firstRun_feature_tracking_description=Περιηγηθείτε ιδιωτικά απενεργοποιώντας την παρακολούθηση - αποκρύπτοντας τα ίχνη σας από εταιρείες διαφημίσεων που μπορούν να παρακολουθούν κάθε κίνησή σας.
+firstRun_features=Το Adblock Plus μπορεί να κάνει περισσότερα από το φιλτράρισμα διαφημίσεων
+firstRun_filterlistsReinitializedWarning=Φαίνεται πως ένα ζήτημα προκάλεσε την αφαίρεση όλων των φίλτρων και δεν μπορέσαμε να επαναφέρουμε ένα αντίγραφο ασφαλείας. Γι' αυτό έπρεπε να επαναφέρουμε τα αρχικά σας φίλτρα και τις ρυθμίσεις Αποδεκτών Διαφημίσεων. Παρακαλώ ελέγξτε τις λίστες φίλτρων σας και τις ρυθμίσεις Αποδεκτών Διαφημίσεων στις <a>επιλογές του Adblock Plus</a>.
 firstRun_legacySafariWarning=Χρησιμοποιείτε μια παλιά έκδοση του Safari,  η οποία δεν υποστηρίζεται από το Adblock Plus. Μπορεί να μην λειτουργεί σωστά ή να αλλοιώσει την εμπειρία χρήστη σε ορισμένες ιστοσελίδες. Σας συνιστούμε είτε να ενημερώσετε την έκδοση του φυλλομετρητή σε Safari 6.1.1 ή νεότερη (σε Mac OS X 10.8 Mountain Lion), ή σε Safari 7.0.1 ή νεότερη (σε OS X 10.9 Mavericks) ή να χρησιμοποιήσετε την τελευταία έκδοση του Mozilla Firefox, Google Chrome ή Opera.
-firstRun_filterlistsReinitializedWarning=It seems that an issue caused all filters to be removed and we were unable to restore a backup. Therefore we had to reset your filters and Acceptable Ads settings. Please check your filter lists and Acceptable Ads settings in the <a>Adblock Plus options</a>.
+firstRun_share=Πείτε το στους φίλους σας
+firstRun_share_headline=<a>Δώστε μας ένα χεράκι</a> στο να κάνουμε το διαδίκτυο ένα καλύτερο μέρος
+firstRun_title=Το Adblock Plus έχει εγκατασταθεί
+firstRun_toggle_off=Ανενεργό
+firstRun_toggle_on=Ενεργό
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/el/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/el/overlay.dtd
index 0d3fe6e..8178773 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/el/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/el/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Ναι">
 <!ENTITY notification.button.no "&amp;Όχι">
 <!ENTITY sync.label "Συγ&amp;χρονισμός των ρυθμίσεων του Adblock Plus">
 <!ENTITY whitelist.site.label "Απενεργοποίηση στο ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "Αναφο&amp;ρά προβλήματος σε αυτή την σελίδα">
 <!ENTITY whitelist.page.label "Απενεργοποίηση σε αυτή τη σελίδα μόνο">
 <!ENTITY context.image.label "Adblock Plus: φραγή εικόνας">
-<!ENTITY counthits.label "Κα&amp;ταμέτρηση επιτυχιών φίλτρων">
+<!ENTITY notification.button.yes "&amp;Ναι">
 <!ENTITY opensidebar.label "Άνοιγμ&amp;α των φιλτραρισμένων στοιχείων">
 <!ENTITY notification.button.close "&amp;Κλείσιμο">
 <!ENTITY contribute.label "Συνεισφέρετε στο Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: φραγή πλαισίου">
 <!ENTITY blocked.tooltip "Στοιχεία που έχουν φραχθεί σε αυτή τη σελίδα:">
-<!ENTITY hideplaceholders.label "Απόκρυψη πλα&amp;ισίων των φιλτραρισμένων στοιχείων">
+<!ENTITY counthits.label "Κα&amp;ταμέτρηση επιτυχιών φίλτρων">
 <!ENTITY showinstatusbar.label "Εμφάνιση στην γραμμή &amp;κατάστασης">
 <!ENTITY sidebar.title "Στοιχεία προς φιλτράρισμα στην τρέχουσα σελίδα">
 <!ENTITY options.label "Επι&amp;λογές">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/en-GB/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/en-GB/firstRun.properties
index 971a702..7185c13 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/en-GB/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/en-GB/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Browse privately by disabling tracking - hiding your tracks from ad companies that would track your every move.
-firstRun_toggle_off=OFF
-firstRun_feature_tracking=Disable Tracking
-firstRun_feature_malware=Malware Blocking
-firstRun_title=Adblock Plus has been installed
-firstRun_acceptableAdsExplanation=We'd like to encourage websites to use straightforward, unobtrusive advertising. That's why we've established <a>strict guidelines</a> to identify positive ads, which are shown under default settings. If you still wish to block every ad you can <a>disable</a> this in a few seconds.
-firstRun_toggle_on=ON
+firstRun_acceptableAdsExplanation=We'd like to encourage websites to use straightforward, unobtrusive advertising. That's why we've established <a>strict guidelines</a> to identify acceptable ads, which are shown under default settings. If you still wish to block every ad you can <a>disable</a> this in a few seconds.
+firstRun_acceptableAdsHeadline=Annoying ads will now be blocked
 firstRun_contributor_credits=Contributor Credits
 firstRun_dataCorruptionWarning=Does this page keep showing up? <a>Click here!</a>
-firstRun_acceptableAdsHeadline=Annoying ads will now be blocked.
-firstRun_share=Tell your friends
-firstRun_share_headline=<a>Help us</a> in making the web a better place
-firstRun_features=Adblock Plus can do more than block ads
-firstRun_feature_malware_description=Make your browsing more secure by blocking known malware domains.
-firstRun_feature_social_description=Automatically rid your browsing experience of social media buttons (such as the Facebook Like) which appear on web pages and track your behaviour.
 firstRun_donate=Donate
 firstRun_donate_label=Support our project
+firstRun_feature_malware=Malware Blocking
+firstRun_feature_malware_description=Make your browsing more secure by blocking known malware domains.
 firstRun_feature_social=Remove Social Media Buttons
+firstRun_feature_social_description=Automatically rid your browsing experience of social media buttons (such as the Facebook Like) which appear on web pages and track your behaviour.
+firstRun_feature_tracking=Disable Tracking
+firstRun_feature_tracking_description=Browse privately by disabling tracking - hiding your tracks from ad companies that would track your every move.
+firstRun_features=Adblock Plus can do more than block ads
+firstRun_filterlistsReinitializedWarning=It seems that an issue caused all filters to be removed and we were unable to restore a backup.\nTherefore we had to reset your own filters and Acceptable Ads settings. Please check your filter lists and acceptable Ads settings in the Adblock Plus settings.
 firstRun_legacySafariWarning=You are using an old version of Safari which is not supported by Adblock Plus. It might not work correctly or impair the user experience on some websites. We strongly recommend to either update to Safari 6.1.1 or higher (on OS X 10.8 Mountain Lion), or Safari 7.0.1 or higher (on OS X 10.9 Mavericks), or to use the latest version of Mozilla Firefox, Google Chrome or Opera.
-firstRun_filterlistsReinitializedWarning=It seems that an issue caused all filters to be removed and we were unable to restore a backup. Therefore we had to reset your filters and Acceptable Ads settings. Please check your filter lists and Acceptable Ads settings in the <a>Adblock Plus options</a>.
+firstRun_share=Tell your friends
+firstRun_share_headline=Help us in making the web a better place
+firstRun_title=Adblock Plus has been installed
+firstRun_toggle_off=OFF
+firstRun_toggle_on=ON
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/en-GB/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/en-GB/overlay.dtd
index f916e9a..f754ebe 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/en-GB/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/en-GB/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "Yes">
 <!ENTITY notification.button.no "No">
 <!ENTITY sync.label "Syn&amp;chronise Adblock Plus settings">
 <!ENTITY whitelist.site.label "Disable on ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "Report issue on this page">
 <!ENTITY whitelist.page.label "Disable on this page only">
 <!ENTITY context.image.label "Adblock Plus: Block image">
-<!ENTITY counthits.label "Count filter hits">
+<!ENTITY notification.button.yes "Yes">
 <!ENTITY opensidebar.label "Open blockable items">
 <!ENTITY notification.button.close "Close">
 <!ENTITY contribute.label "Contribute to Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Block frame">
 <!ENTITY blocked.tooltip "Blocked items on this page:">
-<!ENTITY hideplaceholders.label "Hide placeholders of blocked elements">
+<!ENTITY counthits.label "Count filter hits">
 <!ENTITY showinstatusbar.label "Show in status bar">
 <!ENTITY sidebar.title "Blockable items on current page">
 <!ENTITY options.label "Options">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/en-GB/sendReport.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/en-GB/sendReport.dtd
index 1dec6f7..506b8b2 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/en-GB/sendReport.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/en-GB/sendReport.dtd
@@ -29,7 +29,7 @@
 <!ENTITY recentReports.label "Your recently submitted reports">
 <!ENTITY typeWarning.description "You have indicated that you want to report a general issue with Adblock Plus rather than a problem with the filters. Please note that such issues are best reported in the [link]Adblock Plus forum[/link]. You should only use the issue reporter to supplement an existing discussion, as nobody will notice your report unless you provide them with the link to it. The automatically generated link will be provided after submitting the report.">
 <!ENTITY issues.disabled.description "Adblock Plus is disabled, it will not block anything in its current state.">
-<!ENTITY attachExtensions.label "Attach a list of active extensions to the report in case add-on conflict is the cause of the problem">
+<!ENTITY attachExtensions.label "Attach a list of active e&amp;xtensions to the report in case an add-on conflict is the cause of the problem">
 <!ENTITY issues.nosubscriptions.add.label "Add filter subscription">
 <!ENTITY issues.disabledfilters.enable.label "Enable filter">
 <!ENTITY issues.override.label "The configuration is correct, continue with the report">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/en-US/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/en-US/firstRun.properties
index 21438b1..f273e13 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/en-US/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/en-US/firstRun.properties
@@ -1,24 +1,20 @@
-firstRun_title=Adblock Plus has been installed
-firstRun_dataCorruptionWarning=Does this page keep showing up? <a>Click here!</a>
-firstRun_acceptableAdsHeadline=Annoying ads will now be blocked
 firstRun_acceptableAdsExplanation=We'd like to encourage websites to use straightforward, unobtrusive advertising. That's why we've established <a>strict guidelines</a> to identify acceptable ads, which are shown under default settings. If you still want to block every ad you can <a>disable</a> this in a few seconds.
-firstRun_legacySafariWarning=You are using an old version of Safari which is not supported by Adblock Plus. It might not work correctly or impair the user experience on some websites. We strongly recommend to either update to Safari 6.1.1 or higher (on OS X 10.8 Mountain Lion), or Safari 7.0.1 or higher (on OS X 10.9 Mavericks), or to use the latest version of Mozilla Firefox, Google Chrome or Opera.
-firstRun_filterlistsReinitializedWarning=It seems that an issue caused all filters to be removed and we were unable to restore a backup. Therefore we had to reset your filters and Acceptable Ads settings. Please check your filter lists and Acceptable Ads settings in the <a>Adblock Plus options</a>.
-
-firstRun_toggle_on=ON
-firstRun_toggle_off=OFF
-
-firstRun_features=Adblock Plus can do more than block ads
+firstRun_acceptableAdsHeadline=Annoying ads will now be blocked
+firstRun_contributor_credits=Contributor Credits
+firstRun_dataCorruptionWarning=Does this page keep showing up? <a>Click here!</a>
+firstRun_donate=donate
+firstRun_donate_label=Support our project
 firstRun_feature_malware=Malware Blocking
 firstRun_feature_malware_description=Make your browsing more secure by blocking known malware domains.
 firstRun_feature_social=Remove Social Media Buttons
 firstRun_feature_social_description=Automatically rid your browsing experience of social media buttons, such as the Facebook Like, which appear on web pages and track your behavior.
 firstRun_feature_tracking=Disable Tracking
 firstRun_feature_tracking_description=Browse privately by disabling tracking - hiding your tracks from ad companies that would track your every move.
-
-firstRun_share_headline=<a>Give us a hand</a> in making the web a better place
-firstRun_donate=donate
-firstRun_donate_label=Support our project
+firstRun_features=Adblock Plus can do more than block ads
+firstRun_filterlistsReinitializedWarning=It seems that an issue caused all filters to be removed and we were unable to restore a backup. Therefore we had to reset your filters and Acceptable Ads settings. Please check your filter lists and Acceptable Ads settings in the <a>Adblock Plus options</a>.
+firstRun_legacySafariWarning=You are using an old version of Safari which is not supported by Adblock Plus. It might not work correctly or impair the user experience on some websites. We strongly recommend to either update to Safari 6.1.1 or higher (on OS X 10.8 Mountain Lion), or Safari 7.0.1 or higher (on OS X 10.9 Mavericks), or to use the latest version of Mozilla Firefox, Google Chrome or Opera.
 firstRun_share=Tell your friends
-
-firstRun_contributor_credits=Contributor Credits
+firstRun_share_headline=<a>Give us a hand</a> in making the web a better place
+firstRun_title=Adblock Plus has been installed
+firstRun_toggle_off=OFF
+firstRun_toggle_on=ON
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/en-US/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/en-US/overlay.dtd
index 895ff80..5df3178 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/en-US/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/en-US/overlay.dtd
@@ -29,7 +29,6 @@
 <!ENTITY showintoolbar.label        "Show in tool&amp;bar">
 <!ENTITY showinstatusbar.label      "&amp;Show in status bar">
 <!ENTITY objecttabs.label           "Show &amp;tabs on Flash and Java">
-<!ENTITY hideplaceholders.label     "Hide p&amp;laceholders of blocked elements">
 <!ENTITY counthits.label            "Count filter &amp;hits">
 <!ENTITY sync.label                 "Syn&amp;c Adblock Plus settings">
 <!ENTITY objecttab.title        "Block">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/en-US/sendReport.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/en-US/sendReport.dtd
index 49621ec..478afe5 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/en-US/sendReport.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/en-US/sendReport.dtd
@@ -160,7 +160,7 @@
 <!ENTITY anonymous.label              "&amp;Anonymous submission">
 <!ENTITY anonymity.warning            "We won't be able to come back to you and will likely prioritize the report lower.">
 
-<!ENTITY attachExtensions.label       "Attach a list of active e&amp;xtensions to the report in case add-on conflict is the cause of the problem">
+<!ENTITY attachExtensions.label       "Attach a list of active e&amp;xtensions to the report in case an add-on conflict is the cause of the problem">
 <!ENTITY sendButton.label             "Se&amp;nd report">
 <!ENTITY showData.label               "Show report data">
 <!ENTITY data.label                   "Re&amp;port data:">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/eo/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/eo/firstRun.properties
index 64666ee..db06d3f 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/eo/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/eo/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Retumu private malebligante spuradon resp. kaŝante viajn spurojn antaŭ reklamfirmaoj, kiuj volonte spurus ĉiun el viaj movoj.
-firstRun_toggle_off=Malŝaltita
-firstRun_feature_tracking=Malebligi spuradon
-firstRun_feature_malware=Bloki fiprogramaron
-firstRun_title=Adblock Plus instaliĝis
 firstRun_acceptableAdsExplanation=Ni volonte kuraĝigus retejojn uzi sinceran, nealtrudiĝeman varbadon. Tial ni fiksis <a>striktajn direktivojn</a> por identigi akcepteblan reklamon, kiujn vi trovas en la defaŭltaj agordoj. Se vi ankoraŭ volas bloki ĉian reklamon, vi povas <a>malebligi</a> tion dum malmultaj sekundoj.
-firstRun_toggle_on=Ŝaltita
+firstRun_acceptableAdsHeadline=Altrudiĝema reklamo estos nun blokata
 firstRun_contributor_credits=Danko al kontribuintoj
 firstRun_dataCorruptionWarning=Ĉu la paĝo estas plumontrata? <a>Klaku ĉi tie!</a>
-firstRun_acceptableAdsHeadline=Altrudiĝema reklamo estos nun blokata
-firstRun_share=Informu viajn amikojn
-firstRun_share_headline=<a>Donu al ni manon</a>, por ke ni faru la reton pli bona loko
-firstRun_features=Adblock Plus povas fari pli multe ol bloki reklamon
-firstRun_feature_malware_description=Faru vian retumadon pli sekura blokante konatajn domajnojn de fiprogramaro.
-firstRun_feature_social_description=Aŭtomate forigi vian retan agadon faritan pere de butonoj de sociaj medioj, kiel la butono "Ŝati" en Fejsbuko, kiuj aperas en retpaĝoj kaj spuras vian konduton.
 firstRun_donate=donaci
 firstRun_donate_label=Subtenu nian projekton
+firstRun_feature_malware=Bloki fiprogramaron
+firstRun_feature_malware_description=Faru vian retumadon pli sekura blokante konatajn domajnojn de fiprogramaro.
 firstRun_feature_social=Forigi butonojn de sociaj aŭdvidaĵoj
+firstRun_feature_social_description=Aŭtomate forigi vian retan agadon faritan pere de butonoj de sociaj medioj, kiel la butono "Ŝati" en Fejsbuko, kiuj aperas en retpaĝoj kaj spuras vian konduton.
+firstRun_feature_tracking=Malebligi spuradon
+firstRun_feature_tracking_description=Retumu private malebligante spuradon resp. kaŝante viajn spurojn antaŭ reklamfirmaoj, kiuj volonte spurus ĉiun el viaj movoj.
+firstRun_features=Adblock Plus povas fari pli multe ol bloki reklamon
+firstRun_filterlistsReinitializedWarning=Ŝajnas, ke problemo kaŭzis, ke ĉiuj filtroj estas forigitaj kaj ni ne\npovis restaŭri la sekurkopion. Tial ni devis remeti la agordojn por\nakceptebla reklamo. Bonvolu kontroli viajn filtrilajn listojn kaj\nagordojn por akceptebla reklamo en la <a>agordoj de Adblock Plus</a>.
 firstRun_legacySafariWarning=Vi uzas malnovan version de Safari, kiun Adblock Plus ne subtenas. Eble ĝi ne korekte funkcios aŭ ĝenas la travivaĵon de uzanto sur kelkaj retejoj. Ni eksplicite rekomendas aŭ ĝisdatigi al Safari 6.1.1 aŭ pli alta versio (estas je dispono por Mac OS X 10.8 Mountain Lion) aŭ Safari 7.0.1 aŭ pli alta versio (estas je dispono por OS X 10.9 Mavericks) aŭ uzi la plej novan version de Mozilla Firefox, Google Chrome aŭ Opera.
-firstRun_filterlistsReinitializedWarning=It seems that an issue caused all filters to be removed and we were unable to restore a backup. Therefore we had to reset your filters and Acceptable Ads settings. Please check your filter lists and Acceptable Ads settings in the <a>Adblock Plus options</a>.
+firstRun_share=Informu viajn amikojn
+firstRun_share_headline=<a>Donu al ni manon</a>, por ke ni faru la reton pli bona loko
+firstRun_title=Adblock Plus instaliĝis
+firstRun_toggle_off=Malŝaltita
+firstRun_toggle_on=Ŝaltita
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/eo/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/eo/overlay.dtd
index 6c1bb4f..2b6e84f 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/eo/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/eo/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Jes">
 <!ENTITY notification.button.no "&amp;Ne">
 <!ENTITY sync.label "&amp;Sinkronigi agordojn de Adblock Plus">
 <!ENTITY whitelist.site.label "Malebligi sur ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "&amp;Raporti problemon pri ĉi tiu paĝo">
 <!ENTITY whitelist.page.label "Malebligi nur sur ĉi tiu paĝo">
 <!ENTITY context.image.label "Adblock Plus: Bloki bildon">
-<!ENTITY counthits.label "&amp;Nombri filtriltrafojn">
+<!ENTITY notification.button.yes "&amp;Jes">
 <!ENTITY opensidebar.label "Malfermi &amp;blokeblajn elementojn">
 <!ENTITY notification.button.close "&amp;Fermi">
 <!ENTITY contribute.label "Kontribuu al Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Bloki kadron">
 <!ENTITY blocked.tooltip "Blokitaj elementoj sur ĉi tiu paĝo:">
-<!ENTITY hideplaceholders.label "Kaŝi &amp;lokokupilojn de blokitaj elementoj">
+<!ENTITY counthits.label "&amp;Nombri filtriltrafojn">
 <!ENTITY showinstatusbar.label "Vidi&amp;gi en statstrio">
 <!ENTITY sidebar.title "Blokeblaj elementoj sur la nuna paĝo">
 <!ENTITY options.label "&amp;Opcioj">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/es-AR/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/es-AR/firstRun.properties
index 3973073..f3f9c65 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/es-AR/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/es-AR/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Navegá privadamente deshabilitando el rastreo; esto es: ocultarle a las agencias de publicidad tus visitas, las cuales, de otro modo, registrarían todos tus movimientos.
-firstRun_toggle_off=DESACTIVAR
-firstRun_feature_tracking=Deshabilitá el rastreo
-firstRun_feature_malware=Bloqueá malware
-firstRun_title=Se instaló Adblock Plus
-firstRun_toggle_on=ACTIVAR
 firstRun_acceptableAdsExplanation=Nos gustaría alentar a que los sitios web usen publicidad más directa y menos hostigadora. Es por eso que establecimos unas <a>pautas estrictas</a> para identificar publicidades aceptables, las cuales se muestran en la configuración predeterminada. Si aún así querés seguir bloqueando todas las publicidades, podés <a>deshabilitar</a> esto en segundos.
+firstRun_acceptableAdsHeadline=Las molestas publicidades ahora serán bloqueadas
 firstRun_contributor_credits=Créditos
 firstRun_dataCorruptionWarning=¿Sigue apareciendo esta página? <a>¡Hacé clic acá!</a>
-firstRun_acceptableAdsHeadline=Las molestas publicidades ahora serán bloqueadas
-firstRun_share=Contáselo a tus amigos
-firstRun_share_headline=<a>Danos una mano</a> para hacer de la web un lugar mejor
-firstRun_feature_social_description=Deshacé automáticamente, en tu experiencia al navegar, botones de medios sociales, como el "Me gusta" de Facebook, el cual aparece en miles de páginas web y rastrean tu comportamiento.
-firstRun_filterlistsReinitializedWarning=Parece que hay un problema que causa que todos los filtros se quiten y que no se pueda restaurar desde una copia de seguridad. Por lo tanto tuvimos que restablecer tus filtros y la configuración de publicidades aceptadas. Por favor, revisá tus listas de filtros y la configuración de publicidades aceptadas en las <a>opciones de Adblock Plus</a>.
-firstRun_feature_malware_description=Hacé tu navegación web más segura bloqueando dominios identificados como malware.
-firstRun_features=Adblock Plus puede bloquear más que publicidades
 firstRun_donate=doná
 firstRun_donate_label=Apoyá nuestro proyecto
+firstRun_feature_malware=Bloqueá malware
+firstRun_feature_malware_description=Hacé tu navegación web más segura bloqueando dominios identificados como malware.
 firstRun_feature_social=Quitá botones de redes sociales
+firstRun_feature_social_description=Deshacé automáticamente, en tu experiencia al navegar, botones de medios sociales, como el "Me gusta" de Facebook, el cual aparece en miles de páginas web y rastrean tu comportamiento.
+firstRun_feature_tracking=Deshabilitá el rastreo
+firstRun_feature_tracking_description=Navegá privadamente deshabilitando el rastreo; esto es: ocultarle a las agencias de publicidad tus visitas, las cuales, de otro modo, registrarían todos tus movimientos.
+firstRun_features=Adblock Plus puede bloquear más que publicidades
+firstRun_filterlistsReinitializedWarning=Parece que hay un problema que causa que todos los filtros se quiten y que no se pueda restaurar desde una copia de seguridad. Por lo tanto tuvimos que restablecer tus filtros y la configuración de publicidades aceptadas. Por favor, revisá tus listas de filtros y la configuración de publicidades aceptadas en las <a>opciones de Adblock Plus</a>.
 firstRun_legacySafariWarning=Estás usando una versión vieja de Safari, la cual no soporta Adblock Plus. Puede que no funcione correctamente o que perjudique la experiencia del usuario en algunos sitios web. Te recomendamos encarecidamente que, o bien actualicés a Safari 6.1. o más reciente (en Mac OS X 10.8 Mountain Lion), o Safari 7.0.1 o más reciente (en Mac OS X 10.9 Mavericks), o bien usés la última versión de Mozilla Firefox, Google Chrome u Opera.
+firstRun_share=Contáselo a tus amigos
+firstRun_share_headline=<a>Danos una mano</a> para hacer de la web un lugar mejor
+firstRun_title=Se instaló Adblock Plus
+firstRun_toggle_off=DESACTIVAR
+firstRun_toggle_on=ACTIVAR
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/es-AR/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/es-AR/overlay.dtd
index 1ba864e..455ccfd 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/es-AR/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/es-AR/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Sí">
 <!ENTITY notification.button.no "&amp;No">
 <!ENTITY sync.label "Si&amp;ncronizar la configuración de Adblock Plus">
 <!ENTITY whitelist.site.label "Deshabilitar en ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "&amp;Informar de problemas en esta página">
 <!ENTITY whitelist.page.label "Deshabilitar solamente en esta página">
 <!ENTITY context.image.label "Adblock Plus: bloquear imagen">
-<!ENTITY counthits.label "&amp;Veces usado">
+<!ENTITY notification.button.yes "&amp;Sí">
 <!ENTITY opensidebar.label "&amp;Abrir elementos bloqueables">
 <!ENTITY notification.button.close "&amp;Cerrar">
 <!ENTITY contribute.label "Contribuí a Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: bloquear marco">
 <!ENTITY blocked.tooltip "Elementos bloqueados en esta página:">
-<!ENTITY hideplaceholders.label "Co&amp;lapsar elementos bloqueados">
+<!ENTITY counthits.label "&amp;Veces usado">
 <!ENTITY showinstatusbar.label "Mostrar en la barra de &amp;estado">
 <!ENTITY sidebar.title "Elementos bloqueables en la página actual">
 <!ENTITY options.label "&amp;Opciones">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/es-ES/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/es-ES/firstRun.properties
index 83ba3ff..e7a548e 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/es-ES/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/es-ES/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Navegue con intimidad desactivando el rastreo - ocultando su rastro a las empresas de publicidad que espían cada uno de sus movimientos.
-firstRun_toggle_off=DESACTIVAR
-firstRun_feature_tracking=Desactivar el rastreo
-firstRun_feature_malware=Bloquear malware
-firstRun_title=Se ha instalado Adblock Plus
-firstRun_toggle_on=ACTIVAR
 firstRun_acceptableAdsExplanation=Nos gustaría fomentar el uso de una publicidad más directa y menos agresiva en los sitios web. Por eso hemos establecido unas <a>directrices estrictas</a> para identificar la publicidad aceptable, que se muestra en modo predeterminado. Si sigue queriendo bloquear toda la publicidad puede <a>desactivar</a> este modo en unos pocos segundos.
+firstRun_acceptableAdsHeadline=Ahora se bloqueará la publicidad molesta
 firstRun_contributor_credits=Colaboradores
 firstRun_dataCorruptionWarning=¿Sigue apareciendo esta página? <a>Pulse aquí</a>
-firstRun_acceptableAdsHeadline=Ahora se bloqueará la publicidad molesta
-firstRun_share=Dígaselo a sus amigos
-firstRun_share_headline=<a>Ayúdenos</a> a conseguir una web mejor
-firstRun_feature_social_description=Elimine automáticamente de su navegación los botones de redes sociales, como los "Me gusta" de Facebook, incluidos en las paginas web y que rastrean sus hábitos.
-firstRun_filterlistsReinitializedWarning=Parece que un problema provocó que se eliminasen todos los filtros y no se pudo restaurar una copia de seguridad. Por ello ha sido necesario reiniciar los filtros y predisposiciones de publicidad aceptable. Por favor, revise sus listas de filtros y predisposiciones de publicidad aceptable en <a>Opciones de Adblock Plus</a>.
-firstRun_feature_malware_description=Navegue con más seguridad bloqueando dominios identificados como malware.
-firstRun_features=Adblock Plus no sólo bloquea anuncios, puede hacer más cosas
 firstRun_donate=Donar
 firstRun_donate_label=Apoye nuestro proyecto
+firstRun_feature_malware=Bloquear malware
+firstRun_feature_malware_description=Navegue con más seguridad bloqueando dominios identificados como malware.
 firstRun_feature_social=Eliminar botones de redes sociales
+firstRun_feature_social_description=Elimine automáticamente de su navegación los botones de redes sociales, como los "Me gusta" de Facebook, incluidos en las paginas web y que rastrean sus hábitos.
+firstRun_feature_tracking=Desactivar el rastreo
+firstRun_feature_tracking_description=Navegue con intimidad desactivando el rastreo - ocultando su rastro a las empresas de publicidad que espían cada uno de sus movimientos.
+firstRun_features=Adblock Plus no sólo bloquea anuncios, puede hacer más cosas
+firstRun_filterlistsReinitializedWarning=Parece que un problema provocó que se eliminasen todos los filtros y no se pudo restaurar una copia de seguridad. Por ello ha sido necesario reiniciar los filtros y predisposiciones de publicidad aceptable. Por favor, revise sus listas de filtros y predisposiciones de publicidad aceptable en <a>Opciones de Adblock Plus</a>.
 firstRun_legacySafariWarning=Está utilizando una versión antigua de Safari no soportada por Adblock Plus, por lo que podría funcionar incorrectamente o afectar a su experiencia de usuario en algunos sitios web. Le recomendamos actualizar a Safari 6.1.1 o posterior (para Mac OS X 10.8 Mountain Lion), o a Safari 7.0.1 o superior (para Mac OS X 10.9 Mavericks), o usar la última versión de Mozilla Firefox, Google Chrome u Opera.
+firstRun_share=Dígaselo a sus amigos
+firstRun_share_headline=<a>Ayúdenos</a> a conseguir una web mejor
+firstRun_title=Se ha instalado Adblock Plus
+firstRun_toggle_off=DESACTIVAR
+firstRun_toggle_on=ACTIVAR
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/es-ES/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/es-ES/overlay.dtd
index 7820c11..2586c95 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/es-ES/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/es-ES/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp; Sí">
 <!ENTITY notification.button.no "&amp; No">
 <!ENTITY sync.label "Sincroni&amp;zar predisposiciones de Adblock Plus">
 <!ENTITY whitelist.site.label "Desactivar en ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "&amp;Informar de un problema en esta página">
 <!ENTITY whitelist.page.label "Desactivar sólo en esta página">
 <!ENTITY context.image.label "ABP - Bloquear imagen">
-<!ENTITY counthits.label "Contar &amp;usos de filtros">
+<!ENTITY notification.button.yes "&amp; Sí">
 <!ENTITY opensidebar.label "Abrir &amp;ventana elementos bloqueables">
 <!ENTITY notification.button.close "&amp;Cerrar">
 <!ENTITY contribute.label "Ayudar a Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "ABP - Bloquear marco">
 <!ENTITY blocked.tooltip "Elementos bloqueados en esta página:">
-<!ENTITY hideplaceholders.label "O&amp;cultar posicionadores de elementos bloqueados">
+<!ENTITY counthits.label "Contar &amp;usos de filtros">
 <!ENTITY showinstatusbar.label "Mostrar en la barra &amp;de estado">
 <!ENTITY sidebar.title "Elementos bloqueables en la página actual">
 <!ENTITY options.label "&amp;Opciones">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/es-MX/composer.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/es-MX/composer.dtd
index 00bc242..a2d7e77 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/es-MX/composer.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/es-MX/composer.dtd
@@ -1,7 +1,7 @@
 <!ENTITY anchor.end.label "ir al &amp;final de la dirección">
 <!ENTITY domainRestriction.label "&amp;Restringir al dominio:">
 <!ENTITY collapse.default.no.label "Usar por defecto (no)">
-<!ENTITY firstParty.label "So&amp;lo propietarios">
+<!ENTITY firstParty.label "Sólo para conteni&amp;dos del dominio">
 <!ENTITY preferences.label "&amp;Mostrar filtros existentes...">
 <!ENTITY pattern.label "Buscar un patrón">
 <!ENTITY thirdParty.label "&amp;Solo terceros">
@@ -10,7 +10,7 @@
 <!ENTITY match.warning "El patrón que ha ingresado ya no concuerda con la dirección a ser Bloqueada/Permitida y no tendrá efecto en la misma.">
 <!ENTITY anchor.start.label "&amp;ir al principio de la dirección">
 <!ENTITY matchCase.label "&amp;Coincidir Mayus/Minus">
-<!ENTITY custom.pattern.label "&amp;Personalizar:">
+<!ENTITY custom.pattern.label "&amp;Personalizado:">
 <!ENTITY unselectAllTypes.label "Seleccionar ninguno">
 <!ENTITY type.whitelist.label "Regla de e&amp;xcepción">
 <!ENTITY regexp.warning "El patrón que ha escrito se interpretará como una expresión regular, la cual no puede ser eficientemente procesada por Adblock Plus y podría ralentizar su experiencia al navegar. Si no tenía la intención de usar una expresión regular, agregue un asterisco (*) al final del patrón.">
@@ -18,11 +18,11 @@
 <!ENTITY basic.label "Vista básica">
 <!ENTITY type.filter.label "Filtro de &amp;bloqueo">
 <!ENTITY types.label "Se aplica a tipos:">
-<!ENTITY shortpattern.warning "El patrón que ha ingresado es muy corto para ser optimizado y podría ralentizar su experiencia al navegar. Es recomendable que elija una cadena más larga para este filtro para permitir a Adblock Plus procesar el filtro con mayor eficacia.">
-<!ENTITY collapse.yes.label "Si">
+<!ENTITY shortpattern.warning "El patrón ingresado es muy corto para ser optimizado y podría ralentizar su experiencia al navegar. Se recomienda que elija una cadena más larga para este filtro para permitir que Adblock Plus procese el filtro con mayor eficacia.">
+<!ENTITY collapse.yes.label "Sí">
 <!ENTITY anchors.label "Solo aceptar patrones:">
-<!ENTITY collapse.default.yes.label "Usar por defecto (si)">
-<!ENTITY domainRestriction.help "Use esta opción para especificar uno o más dominios separados por una barra (|). El filtro solo se aplicará en dominio(s) seleccionados. Una tilde (~) antes del nombre del dominio indica que el filtro no se aplicará en ese dominio.">
+<!ENTITY collapse.default.yes.label "Usar predeterminado (sí)">
+<!ENTITY domainRestriction.help "Use esta opción para especificar uno o más dominios separados por una barra (|). El filtro solo se aplicará en los dominio(s) seleccionados. Una tilde (~) antes del nombre de dominio indica que el filtro no se aplicará en ese dominio.">
 <!ENTITY accept.label "Agregar filtro">
 <!ENTITY options.label "Opciones">
 <!ENTITY disabled.warning "Adblock Plus se encuentra desactivado. Puedes continuar agregando filtros pero no serán aplicados hasta que [link]habilites Adblock Plus[/link].">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/es-MX/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/es-MX/firstRun.properties
index bc70db1..cba6701 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/es-MX/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/es-MX/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Navega de forma privada desactivando el rastreo, ocultando así tu actividad de compañías de publicidad que te rastrearían en cada momento.
-firstRun_toggle_off=NO
-firstRun_feature_tracking=Desactivar el Rastreo
-firstRun_feature_malware=Bloquear Malware
-firstRun_title=Adblock Plus ha sido instalado
-firstRun_toggle_on=SÍ
 firstRun_acceptableAdsExplanation=Nos gustaría fomentar en los sitios web, el uso de publicidad discreta y directa. Es por eso que hemos establecido <a>lineamientos estrictos</a> para identificar anuncios aceptables, que son mostrados bajo las configuraciones predeterminadas. Si aun así deseas bloquear todos los anuncios, puedes <a>desactivar</a> esta opción en pocos segundos.
+firstRun_acceptableAdsHeadline=Anuncios molestos serán bloqueados
 firstRun_contributor_credits=Colaboradores
 firstRun_dataCorruptionWarning=¿Se sigue mostrando esta página? <a>¡Haz clic acá!</a>
-firstRun_acceptableAdsHeadline=Anuncios molestos serán bloqueados
-firstRun_share=Cuéntale a tus amigos
-firstRun_share_headline=<a>Ayúdanos</a> haciendo el internet un mejor lugar
-firstRun_feature_social_description=Libérate automáticamente de los botones de redes sociales, como el "Me gusta" de Facebook, el cual aparece en páginas web y rastrea tu actividad en línea.
-firstRun_filterlistsReinitializedWarning=Parece que un problema provocó que todos los filtros fueron removidos y fuimos incapaces de restaurar una copia de seguridad. Por lo tanto tuvimos que restaurar tus filtros y configuraciones de anuncios aceptables. Por favor revisa tu lista de filtros y configuración de anuncios aceptables en las <a>Opciones de Adblock Plus</a>.
-firstRun_feature_malware_description=Haz tu navegación más segura bloqueando dominios maliciosos conocidos.
-firstRun_features=Adblock Plus puede hacer más que bloquear anuncios
 firstRun_donate=donar
 firstRun_donate_label=Apoya nuestro proyecto
+firstRun_feature_malware=Bloquear Malware
+firstRun_feature_malware_description=Haz tu navegación más segura bloqueando dominios maliciosos conocidos.
 firstRun_feature_social=Quitar Botones de Redes Sociales
+firstRun_feature_social_description=Libérate automáticamente de los botones de redes sociales, como el "Me gusta" de Facebook, el cual aparece en páginas web y rastrea tu actividad en línea.
+firstRun_feature_tracking=Desactivar el Rastreo
+firstRun_feature_tracking_description=Navega de forma privada desactivando el rastreo, ocultando así tu actividad de compañías de publicidad que te rastrearían en cada momento.
+firstRun_features=Adblock Plus puede hacer más que bloquear anuncios
+firstRun_filterlistsReinitializedWarning=Parece que un problema provocó que todos los filtros fueron removidos y fuimos incapaces de restaurar una copia de seguridad. Por lo tanto tuvimos que restaurar tus filtros y configuraciones de anuncios aceptables. Por favor revisa tu lista de filtros y configuración de anuncios aceptables en las <a>Opciones de Adblock Plus</a>.
 firstRun_legacySafariWarning=Está utilizando una versión antigua de Safari no soportada por Adblock Plus, por lo que podría funcionar incorrectamente o afectar a su experiencia de usuario en algunos sitios web. Le recomendamos actualizar a Safari 6.1.1 o superior (para Mac OS X 10.8 Mountain Lion), o a Safari 7.0.1 o superior (para Mac OS X 10.9 Mavericks), o usar la última versión de Mozilla Firefox, Google Chrome u Opera.
+firstRun_share=Cuéntale a tus amigos
+firstRun_share_headline=<a>Ayúdanos</a> haciendo el internet un mejor lugar
+firstRun_title=Adblock Plus ha sido instalado
+firstRun_toggle_off=NO
+firstRun_toggle_on=SÍ
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/es-MX/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/es-MX/overlay.dtd
index ffa1dc3..379cb9a 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/es-MX/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/es-MX/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Sí">
 <!ENTITY notification.button.no "&amp;No">
 <!ENTITY sync.label "&amp;Sincronizar configuración de Adblock Plus">
 <!ENTITY whitelist.site.label "Desactivar en ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "Reportar problema en esta página">
 <!ENTITY whitelist.page.label "Deshabilitar solo en esta página">
 <!ENTITY context.image.label "Adblock Plus: Bloquear imagen">
-<!ENTITY counthits.label "Contar accesos de &amp;filtro">
+<!ENTITY notification.button.yes "&amp;Sí">
 <!ENTITY opensidebar.label "Abrir elementos bloqueables">
 <!ENTITY notification.button.close "&amp;Cerrar">
 <!ENTITY contribute.label "Desactivar con Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock plus">
 <!ENTITY context.frame.label "Adblock Plus: Bloquear marco">
 <!ENTITY blocked.tooltip "Elementos bloqueados en esta pagina:">
-<!ENTITY hideplaceholders.label "&amp;Ocultar marcadores de posición de elementos bloqueados">
+<!ENTITY counthits.label "Contar accesos de &amp;filtro">
 <!ENTITY showinstatusbar.label "&amp;Mostrar en la barra de estado">
 <!ENTITY sidebar.title "Elementos bloqueables en la página actual">
 <!ENTITY options.label "&amp;Opciones">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/et/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/et/firstRun.properties
index fdc591a..811de44 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/et/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/et/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_toggle_off=VÄLJAS
-firstRun_feature_tracking=Keela Jälgimine
-firstRun_title=Adblock Plus on paigaldatud
-firstRun_toggle_on=SEES
+firstRun_acceptableAdsExplanation=Sooviksime julgustada veebilehti kasutama otsekoheseid, mittehäirivaid reklaame. Sellepärast on meil <a>ranged eeskirjad</a>, et tuvastada lubatavaid reklaame, mida kuvatakse vaikimise sätete all. Kui sa ikka soovid kõik reklaamid blokeerida, saad sa selle paari sekundi pärast <a>välja lülitada</a>.
+firstRun_acceptableAdsHeadline=Tüütud kuulutused on nüüd blokeeritud
+firstRun_dataCorruptionWarning=Kas see leht ilmub ikka? <a>Kliki siia!</a>
+firstRun_donate=anneta
+firstRun_donate_label=Toeta meie projekti
 firstRun_feature_malware=Viiruste blokeerimine
+firstRun_feature_malware_description=Tehke veebis surfamine turvalisemaks tuntud pahavara domeeninimede blokeerimisega.
 firstRun_feature_social=Eemalde sotsiaalse meedia nuppe
-firstRun_acceptableAdsHeadline=Tüütud kuulutused on nüüd blokeeritud
+firstRun_feature_tracking=Keela Jälgimine
+firstRun_features=Adblock Plus suudab teha enamat, kui reklaame blokeerida
+firstRun_legacySafariWarning=Te kasutate vana Safari versiooni, mida Adblock Plus ei toeta. Adblock Plus ei pruugi korralikult töötada ning võib mõnedel lehekülgedel kasutaja kogemust halvendada. Me soovitame tungivalt uuendada Safarit versioonile 6.1.1 või uuemale (OS X 10.8 Mountain Lion operatsioonisüsteemi puhul), versioonile 7.0.1 või uuemale (OS X 10.9 operatsioonisüsteemi puhul) või kasutada järgmiste veebilehitsejate värskemaid versioone: Mozilla Firefox, Google Chrome, Opera.
 firstRun_share=Räägi oma sõpradele
 firstRun_share_headline=<a>Anna meile käsi</a> veebi muutmises paremaks kohaks
-firstRun_donate=anneta
-firstRun_donate_label=Toeta meie projekti
+firstRun_title=Adblock Plus on paigaldatud
+firstRun_toggle_off=VÄLJAS
+firstRun_toggle_on=SEES
 firstRun_feature_tracking_description=Browse privately by disabling tracking - hiding your tracks from ad companies that would track your every move.
-firstRun_acceptableAdsExplanation=We'd like to encourage websites to use straightforward, unobtrusive advertising. That's why we've established <a>strict guidelines</a> to identify acceptable ads, which are shown under default settings. If you still want to block every ad you can <a>disable</a> this in a few seconds.
-firstRun_contributor_credits=Contributor Credits
-firstRun_dataCorruptionWarning=Does this page keep showing up? <a>Click here!</a>
 firstRun_feature_social_description=Automatically rid your browsing experience of social media buttons, such as the Facebook Like, which appear on web pages and track your behavior.
+firstRun_contributor_credits=Contributor Credits
 firstRun_filterlistsReinitializedWarning=It seems that an issue caused all filters to be removed and we were unable to restore a backup. Therefore we had to reset your filters and Acceptable Ads settings. Please check your filter lists and Acceptable Ads settings in the <a>Adblock Plus options</a>.
-firstRun_feature_malware_description=Make your browsing more secure by blocking known malware domains.
-firstRun_features=Adblock Plus can do more than block ads
-firstRun_legacySafariWarning=You are using an old version of Safari which is not supported by Adblock Plus. It might not work correctly or impair the user experience on some websites. We strongly recommend to either update to Safari 6.1.1 or higher (on OS X 10.8 Mountain Lion), or Safari 7.0.1 or higher (on OS X 10.9 Mavericks), or to use the latest version of Mozilla Firefox, Google Chrome or Opera.
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/et/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/et/overlay.dtd
index 4750c46..7110613 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/et/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/et/overlay.dtd
@@ -9,13 +9,12 @@
 <!ENTITY sendReport.label "&amp;Teata probleemist antud lehel">
 <!ENTITY whitelist.page.label "Keela ainult antud lehel">
 <!ENTITY context.image.label "Adblock Plus: Blokeeri pilt">
-<!ENTITY counthits.label "Loenda &amp;filtrite tabamusi">
 <!ENTITY opensidebar.label "Ava blokeeritavad elemendid">
 <!ENTITY contribute.label "Toeta Adblock Plus'i">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Blokeeri raam">
 <!ENTITY blocked.tooltip "Blokeeritud elemendid antud lehel:">
-<!ENTITY hideplaceholders.label "Peida blokeeritud elementide kohatäitjad">
+<!ENTITY counthits.label "Loenda &amp;filtrite tabamusi">
 <!ENTITY showinstatusbar.label "Näita &amp;olekuribal">
 <!ENTITY sidebar.title "Blokeeritavad elemendid antud lehel">
 <!ENTITY options.label "V&amp;alikud">
@@ -26,7 +25,7 @@
 <!ENTITY showintoolbar.label "Nä&amp;ita tööriistade menüüs">
 <!ENTITY status.tooltip "Olek:">
 <!ENTITY context.media.label "Adblock Plus: Blokeeri audio/video">
-<!ENTITY subscription.update.label "Uuenda filtreid">
-<!ENTITY notification.button.yes "&amp;Yes">
 <!ENTITY notification.button.no "&amp;No">
+<!ENTITY notification.button.yes "&amp;Yes">
 <!ENTITY notification.button.close "&amp;Close">
+<!ENTITY subscription.update.label "Uuenda filtreid">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/eu/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/eu/firstRun.properties
index 86b4926..ccaf965 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/eu/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/eu/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Jarraitzea blokeatuz pribatuki nabigatu - Zure nondik norakoak  dena jakin nahi duten publizitate konpainiei ezkutatuz.
-firstRun_toggle_off=EZGAITUA
-firstRun_feature_tracking=Ezgaitu jarraipena
-firstRun_feature_malware=Programa kaltegarriak geldiarazi
-firstRun_title=Adblock Plus instalatu da
 firstRun_acceptableAdsExplanation=Webguneak publizitate zintzoa eta ez intrusiboa erabiltzera bultzatu nahi ditugu. Horregatik  <a>arau zorrotzak</a> ezarri ditugu iragarki onargarriak bereizteko, lehenetsitako hobespenetan daude ikusgai. Iragarki guztiak blokeatu nahi badituzu aukera hau <a>desgaitu</a> dezakezu.
-firstRun_toggle_on=GAITUA
+firstRun_acceptableAdsHeadline=Iragarki gogaikarriak blokeatuko dira orain
 firstRun_contributor_credits=Parte-hartzaileen kredituak
 firstRun_dataCorruptionWarning=Orri hau behin eta berriro agertzen dela? <a>Egin klik hemen!</a>
-firstRun_acceptableAdsHeadline=Iragarki gogaikarriak blokeatuko dira orain
-firstRun_share=Esan zure lagunei
-firstRun_share_headline=<a>Lagundu gaitzazu</a> web-a hobetzen
-firstRun_features=Adblock Plus iragarkiak blokeatzea baino gehiago egin dezake
-firstRun_feature_malware_description=Malware domeinuak blokeatuz zure nabigazioa ziurragoa egin.
-firstRun_feature_social_description=Automatikoki kendu gizarte sare botoiak webguneetatik, Facebook Like kasu, zure nondik norakoak gordetzen dituzten webguneetan agertu ohi dira.
 firstRun_donate=diruz lagundu
 firstRun_donate_label=Babestu gure proiektua
+firstRun_feature_malware=Programa kaltegarriak geldiarazi
+firstRun_feature_malware_description=Malware domeinuak blokeatuz zure nabigazioa ziurragoa egin.
 firstRun_feature_social=Kendu gizarte-sareetako botoiak
+firstRun_feature_social_description=Automatikoki kendu gizarte sare botoiak webguneetatik, Facebook Like kasu, zure nondik norakoak gordetzen dituzten webguneetan agertu ohi dira.
+firstRun_feature_tracking=Ezgaitu jarraipena
+firstRun_feature_tracking_description=Jarraitzea blokeatuz pribatuki nabigatu - Zure nondik norakoak  dena jakin nahi duten publizitate konpainiei ezkutatuz.
+firstRun_features=Adblock Plus iragarkiak blokeatzea baino gehiago egin dezake
+firstRun_filterlistsReinitializedWarning=Badirudi arazoren baten erruz iragazki guztiak ezabatu direla eta ezin izan dugu segurtasun kopia berreskuratu. Ondorioz zure iragazkiak berrezarri behar izan ditugu, baita iragarki onargarrien ezarpenak. Mesedez egiaztatu zure iragazki zerrenda eta iragarki onargarrien ezarpenak <a>Adblock Plus aukerak</a> atalean.
 firstRun_legacySafariWarning=Adblock Plus-ekin bateragarria ez den Safari nabigatzailearen bertsio zahar bat erabiltzen ari zara. Agian ez da behar bezala ibiliko, edo webgune batzuen erabilera oztopatuko du. Mesedez Safari 6.11 edo berriagoa den bertsio batetara eguneratu (Mac OS X 10.8 Mountain Lion bertsiotik aurrera eskuragarri dago) edo Safari 7.0.1 (OS X 10.9 Mavericks bertsioan), edo erabili Mozilla Firefox, Google Chrome edo Opera nabigatzaileen azken bertsioa.
-firstRun_filterlistsReinitializedWarning=It seems that an issue caused all filters to be removed and we were unable to restore a backup. Therefore we had to reset your filters and Acceptable Ads settings. Please check your filter lists and Acceptable Ads settings in the <a>Adblock Plus options</a>.
+firstRun_share=Esan zure lagunei
+firstRun_share_headline=<a>Lagundu gaitzazu</a> web-a hobetzen
+firstRun_title=Adblock Plus instalatu da
+firstRun_toggle_off=EZGAITUA
+firstRun_toggle_on=GAITUA
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/eu/global.properties b/data/extensions/spyblock@gnu.org/chrome/locale/eu/global.properties
index 1dc9c84..47a7564 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/eu/global.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/eu/global.properties
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Ez dago elementu blokeagarririk uneko orrian
 action3_tooltip=Egin klik Adblock Plus gaitzeko/desgaitzeko.
+notification_antiadblock_title=Ezkutatu zuzendutako mezuak?
 type_label_script=scripta
 filter_elemhide_nocriteria=Ez da zehaztu ezkutatu beharreko elementua aurkitzeko irizpiderik
 blockingGroup_title=Publizitatea blokeatzeko arauak
@@ -24,6 +25,7 @@ type_label_object=objektua
 action2_tooltip=Egin klik hobespenak irekitzeko, egin erdiko klika gaitzeko/desgaitzeko.
 type_label_subdocument=markoa
 clearStats_warning=Honek bategite estatistika guztiak ezabatuko ditu eta iragazkien bategiteak zenbatzeari utziko zaio. Aurrera jarraitu nahi duzu?
+notification_antiadblock_message=Webgune honek Adblock Plus erabiltzaileei zuzendutako mezuak erakusten dituela dakigu. Adblock Plus-ek mezu hauek ezkutatzea nahi duzu?
 blocked_count_addendum=(baita baimenduta: ?1?, ezkutuan: ?2?)
 subscription_invalid_location=Iragazki zerrendaren kokagunea ez da balio duen URLa, ezta fitxategi baten izena ere.
 type_label_image=irudia
@@ -37,5 +39,3 @@ mobile_menu_enable_site=ABP: Gaitua ?1? horretan
 type_label_elemhide=ezkutuan
 newGroup_title=Iragazki talde berria
 default_dialog_title=Adblock Plus
-notification_antiadblock_title=Hide targeted messages?
-notification_antiadblock_message=This site has been known to show targeted messages to Adblock Plus users. Do you want Adblock Plus to hide targeted messages?
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/eu/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/eu/overlay.dtd
index 21efd6c..fa15990 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/eu/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/eu/overlay.dtd
@@ -1,3 +1,4 @@
+<!ENTITY notification.button.no "&amp;Ez">
 <!ENTITY sync.label "&amp;Sinkronizatu Adblock Plus ezarpenak">
 <!ENTITY whitelist.site.label "Ezgaitu hemen: ?1?">
 <!ENTITY filters.label "&amp;Iragazki hobespenak">
@@ -9,13 +10,14 @@
 <!ENTITY sendReport.label "Orri hone&amp;tan sortutako arazo bati buruzko txostena egin">
 <!ENTITY whitelist.page.label "Ezgaitu orri honetan soilik">
 <!ENTITY context.image.label "Adblock Plus: Irudia blokeatu">
-<!ENTITY counthits.label "Zenbatu iragazkien &amp;bategiteak">
+<!ENTITY notification.button.yes "&amp;Bai">
 <!ENTITY opensidebar.label "Ire&amp;ki elementu blokeagarriak">
+<!ENTITY notification.button.close "&amp;Itxi">
 <!ENTITY contribute.label "Adblock Plus-en parte hartu">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Markoa blokeatu">
 <!ENTITY blocked.tooltip "Orri honetan blokeatutako elementuak:">
-<!ENTITY hideplaceholders.label "Ezkutatu blokeatutako elementuen &amp;kokagunea">
+<!ENTITY counthits.label "Zenbatu iragazkien &amp;bategiteak">
 <!ENTITY showinstatusbar.label "Erakutsi &amp;egoera-barran">
 <!ENTITY sidebar.title "Elementu blokeagarriak uneko orrialdean">
 <!ENTITY options.label "&amp;Aukerak">
@@ -27,6 +29,3 @@
 <!ENTITY status.tooltip "Egoera:">
 <!ENTITY context.media.label "Adblock Plus: audio/bideoa blokeatu">
 <!ENTITY subscription.update.label "Eguneratu iragazkiak">
-<!ENTITY notification.button.yes "&amp;Yes">
-<!ENTITY notification.button.no "&amp;No">
-<!ENTITY notification.button.close "&amp;Close">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/fa/composer.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/fa/composer.dtd
index dc68759..5be5f1e 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/fa/composer.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/fa/composer.dtd
@@ -2,10 +2,10 @@
 <!ENTITY domainRestriction.label "مح&amp;دود به دامنه :">
 <!ENTITY collapse.default.no.label "استفاده پیشفرض (خیر)">
 <!ENTITY firstParty.label "فقط او&amp;لین عضو">
-<!ENTITY preferences.label "نمایش پالایه های موجود...">
+<!ENTITY preferences.label "&amp;نمایش فیلترهای موجود...">
 <!ENTITY pattern.label "جستجو برای الگوی">
 <!ENTITY thirdParty.label "فقط سو&amp;مین عضو">
-<!ENTITY filter.label "پالایه جدید:">
+<!ENTITY filter.label "&amp;فیلتر جدید:">
 <!ENTITY collapse.label "بس&amp;تن مسدود شده ها:">
 <!ENTITY match.warning "الگویی که وارد کرده اید دیگر با نشانی که قصد مسدود کردن/افزودن به فهرست سفید آن را داشته اید مطابقت ندارد و روی آن تاثیر نمی گزارد.">
 <!ENTITY anchor.start.label "در آ&amp;غاز نشانی">
@@ -14,18 +14,18 @@
 <!ENTITY unselectAllTypes.label "انتخاب هیچکدام">
 <!ENTITY type.whitelist.label "قاعده است&amp;ثنا">
 <!ENTITY regexp.warning "الگویی که شما وارد کرده اید یک نویسه مرتب تفسیر می شود که نمی تواند به صورت بهینه توسط فوق تبلیغ شکن پردازش شود و ممکن است مرور صفحات شمار را کند کند. اگر شما قصد استفاده کردن از یک نویسه مرتب را نداشته اید، یک ستار (*) به انتهای الگوی خود اضافه کنید.">
-<!ENTITY dialog.title "اضافه کردن قاعد فیلتر ادبلاک پلاس">
+<!ENTITY dialog.title "اضافه کردن قانون فیلتر ادبلاک پلاس">
 <!ENTITY basic.label "نمایش پایه">
-<!ENTITY type.filter.label "فیلتر م&amp;سدود کننده">
+<!ENTITY type.filter.label "&amp;فیلتر مسدود کننده">
 <!ENTITY types.label "اعمال به انواع:">
 <!ENTITY shortpattern.warning "الگویی که وارد کردید بسیار کوتاه تر از آن است که بهینه باشد و ممکن است سرعت مرور صفحات شما را کند کند. توصیه می شود که جمله طویل تری را وارد کنید که فوق تبلیغ شکن بهتر بتواند آن را پردازش کند.">
 <!ENTITY collapse.yes.label "بله">
 <!ENTITY anchors.label "فقط پذیرش الگو:">
 <!ENTITY collapse.default.yes.label "استفاده پیشفرض (بله)">
-<!ENTITY domainRestriction.help "از این گزینه برای مشخص کردن یک یا چند دامنه از هم جدا شده توسط نوار خط (|) استفاده کنید. پالایه تنها برای دامنه(ها)ی انتخاب شده اعمال می شود. علامت مد (~) قبل از نام دامنه نشاندهنده آن است که پالایه در آن دامنه اعمال نشود.">
+<!ENTITY domainRestriction.help "از این گزینه برای مشخص کردن یک یا چند دامنه از هم جدا شده توسط نوار خط (|) استفاده کنید. فیلتر تنها برای دامنه(ها)ی انتخاب شده اعمال می شود. علامت مد (~) قبل از نام دامنه نشاندهنده آن است که پالایه در آن دامنه اعمال نشود.">
 <!ENTITY accept.label "افزودن فیلتر">
 <!ENTITY options.label "گزینه ها">
-<!ENTITY disabled.warning "فوق تبلیغ شکن هم اکنون غیر فعال می یاشد. شما هنوز می توانید پالایه اضافه کنید، اما آنها اعمال نمی شوند مگر [link]فوق تبلیغ شکن را فعال کنید[/link].">
+<!ENTITY disabled.warning "ادبلاک پلاس هم اکنون غیر فعال می باشد. شما هنوز می توانید فیلتر اضافه کنید، اما آنها اعمال نمی شوند مگر [link] ادبلاک پلاس را فعال کنید[/link].">
 <!ENTITY anchor.start.flexible.label "در آ&amp;غاز نام دامنه">
 <!ENTITY collapse.no.label "خیر">
 <!ENTITY selectAllTypes.label "انتخاب همه">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/fa/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/fa/firstRun.properties
index 0ee991a..0a1820f 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/fa/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/fa/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=با غیر فعال کردن ردیابی با امنیت کامل به گشت و گذار اینترنتی بپردازید وخود را از شرکت هایی که می توانند هر لحظه زیر نظر داشته باشند مخفی کنید.
-firstRun_toggle_off=خاموش
-firstRun_feature_tracking=غیر فعال کردن ردیابی
-firstRun_feature_malware=مسدود کردن نرم افزارهای مخرب
-firstRun_title=Adblock Plus با موفقیت نصب شد
-firstRun_toggle_on=روشن
 firstRun_acceptableAdsExplanation=من می خواهم وب سایت ها را تشویق کنم تا از تبلیغات درست و حسابی بدون مزاحمت استفاده کنند. این دلیل ساختن <a> دستورالعمل های دقیق </a> است تا بتواند تبلیغات قابل قبول را بپذیرد و آن ها را به شما نشان دهد ، تبلیغاتی که در شرایط استاندارد صدق کنند. اگر شما می خواهید هر تبلیغی را از هر صفحه ای مسدود کنید می توانید آن را در عرض چند ثانیه <a>غیر فعال</a> کنید.
+firstRun_acceptableAdsHeadline=تبلیغات آزار دهنده در حال حاضر مسدود خواهد شد
 firstRun_contributor_credits=اعتبار نویسندگان
 firstRun_dataCorruptionWarning=آیا این صفحه در حال رویت نگه داشته شده؟ <a>اینجا کلیک کن!</a>
-firstRun_acceptableAdsHeadline=تبلیغات آزار دهنده در حال حاضر مسدود خواهد شد
-firstRun_share=به دوستان خود بگویید
-firstRun_share_headline=<a>بیایید</a> اینترنت را بهتر کنیم
-firstRun_feature_social_description=به طور خودکار مانند like در فیس بوک ، تجربه وبگردی از رسانه های اجتماعی را بفرستید و وضعیت کارهای خود را دنبال کنید.
-firstRun_filterlistsReinitializedWarning=به نظر می رسد که ناشی از موضوع همه فیلتر به حذف می شود و ما قادر به بازگرداندن پشتیبان. بنابراین ما مجبور به تنظیم مجدد فیلتر و تنظیمات تبلیغات قابل قبول. لطفا لیست فیلتر و تنظیمات تبلیغات قابل قبول در <a>Adblock پلاس گزینه های</a> خود را.
-firstRun_feature_malware_description=مرور خود رابا مسدود کردن دامنه های مخرب شناخته شده امن تر کنید.
-firstRun_features=Adblock Plus می تواند تبلیغات بیشتری را مسدود کند
 firstRun_donate=کمک مالی
 firstRun_donate_label=پروژه ما را حمایت کنید
+firstRun_feature_malware=مسدود کردن نرم افزارهای مخرب
+firstRun_feature_malware_description=مرور خود رابا مسدود کردن دامنه های مخرب شناخته شده امن تر کنید.
 firstRun_feature_social=حذف دکمه های رسانه های اجتماعی
+firstRun_feature_social_description=به طور خودکار مانند like در فیس بوک ، تجربه وبگردی از رسانه های اجتماعی را بفرستید و وضعیت کارهای خود را دنبال کنید.
+firstRun_feature_tracking=غیر فعال کردن ردیابی
+firstRun_feature_tracking_description=با غیر فعال کردن ردیابی با امنیت کامل به گشت و گذار اینترنتی بپردازید وخود را از شرکت هایی که می توانند هر لحظه زیر نظر داشته باشند مخفی کنید.
+firstRun_features=Adblock Plus می تواند تبلیغات بیشتری را مسدود کند
+firstRun_filterlistsReinitializedWarning=به نظر می رسد که ناشی از موضوع همه فیلتر به حذف می شود و ما قادر به بازگرداندن پشتیبان. بنابراین ما مجبور به تنظیم مجدد فیلتر و تنظیمات تبلیغات قابل قبول. لطفا لیست فیلتر و تنظیمات تبلیغات قابل قبول در <a>Adblock پلاس گزینه های</a> خود را.
 firstRun_legacySafariWarning=شما در حال حاضر از يك نسخه قديمي تر مرورگر Safari استفاده ميكنيد كه توسط Adblock Plus پشتيباني نميشود. اين موضوع احتمال دارد بر روي تجربه وب گردي كاربر تأثير منفي گذاشته و يا باعث درست عمل نكردن پلاگين شود. ما قوياً توصيه مي كنيم كه مرورگر خود را به Safari 6.1.1 يا بالاتربه روز رساني كنيد (براي نسخه  Mountain Lion ورژن  OS X 10.8 در سيستم عامل مكينتاش)، و يا به روز رساني به Safari 7.0.1 (براي نسخه Mavericks ورژن OS X 10.9 در سيستم عامل مكينتاش). و يا اينكه ازآخرين ورژن مرورگرهايي مانند: Google Chrome ،Mozilla Firefox و يا Opera استفاده كنيد.
+firstRun_share=به دوستان خود بگویید
+firstRun_share_headline=<a>بیایید</a> اینترنت را بهتر کنیم
+firstRun_title=Adblock Plus با موفقیت نصب شد
+firstRun_toggle_off=خاموش
+firstRun_toggle_on=روشن
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/fa/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/fa/overlay.dtd
index c2a0e52..7c6c12a 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/fa/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/fa/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "ب&amp;له">
 <!ENTITY notification.button.no "&amp;نه">
 <!ENTITY sync.label "همگام سازی تن&amp;ظیمات Adblock Plus">
 <!ENTITY whitelist.site.label "غیرفعال در ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "گزارش مشکل در این &amp;صفحه">
 <!ENTITY whitelist.page.label "غیرفعال فقط در این صفحه">
 <!ENTITY context.image.label "Adblock Plus: سد تصاویر">
-<!ENTITY counthits.label "شمارش &amp;تعداد فیلتر شده ها">
+<!ENTITY notification.button.yes "ب&amp;له">
 <!ENTITY opensidebar.label "باز کردن موارد &amp;قابل مسدود سازی">
 <!ENTITY notification.button.close "&amp;بستن">
 <!ENTITY contribute.label "کمک کردن به Adblock Plus">
 <!ENTITY toolbarbutton.label "فوق تبلیغ شکن یا Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus:سد قابک">
 <!ENTITY blocked.tooltip "موارد رد شده در این صفحه:">
-<!ENTITY hideplaceholders.label "پنهان کردن &amp;متغیرها از عناصر مسدود شده">
+<!ENTITY counthits.label "شمارش &amp;تعداد فیلتر شده ها">
 <!ENTITY showinstatusbar.label "نمایش در ن&amp;وار وضعیت">
 <!ENTITY sidebar.title "موارد قابل مسدود شدن در صفحه جاری">
 <!ENTITY options.label "&amp;گزینه ها">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/fa/sendReport.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/fa/sendReport.dtd
index d8c2300..c4e0815 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/fa/sendReport.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/fa/sendReport.dtd
@@ -26,7 +26,7 @@
 <!ENTITY recentReports.label "گزارشات به تازگی ارسال شده شما">
 <!ENTITY typeWarning.description "شما می خواهید که مشکلی کلی در مورد فوق تبلیغ شکن را گزارش دهید به جای	اینکه مشکلی در رابطه با فیلتر گزارش دهید. لطفا توجه داشته باشید که این طور مسائل بهتر است در [link]تالار گفتمان فوق تبلیغ شکن[/link] بحث شوند. شما باید فقط در صورتی از گزارش گر مشکلات استفاده کنید که مکمل بحث موجود باشد, چونکه (در تالار گفتمان) هیچ کس به گزارش شما توجه نمی کند مگر این که برای آن یک پیوند ارائه کنید. وقتی که گزارش را ارسال می کنید پیوند به طور خودکار ساخته و مهیا می شود.">
 <!ENTITY issues.disabled.description "فوق تبلیغ شکن هم اکنون غیرفعال است. در این وضعیت هیچ موردی را مسدود نمی کند.">
-<!ENTITY attachExtensions.label "ضمیمه کردن فهرستی ا&amp;ز افزونه ها به گزارش در مواردی که افزونه های دیگر باعث ایجاد مشکل باشند.">
+<!ENTITY attachExtensions.label "ضمیمه کردن فهرستی ا&amp;ز افزونه ها به گزارش در مواردی که افزونه های دیگر باعث ایجاد مشکل باشند">
 <!ENTITY issues.nosubscriptions.add.label "افزودن اشتراک فیلتر">
 <!ENTITY issues.disabledfilters.enable.label "فعال کردن فیلتر">
 <!ENTITY issues.override.label "تنظیمات &amp;پیکربندی صحیح است، ادامه گزارش">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/fi/filters.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/fi/filters.dtd
index 5535b40..d6ccc11 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/fi/filters.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/fi/filters.dtd
@@ -2,42 +2,40 @@
 <!ENTITY slow.column "&amp;Hitaat suodattimet">
 <!ENTITY enabled.column "Kä&amp;ytössä">
 <!ENTITY subscription.lastDownload.checksumMismatch "Epäonnistui, tarkistussumma ei täsmää">
-<!ENTITY noFiltersInGroup.text "Valittu ryhmä on tyhjä">
+<!ENTITY noFiltersInGroup.text "Valittu ryhmä on tyhjä.">
 <!ENTITY subscription.actions.label "Toiminnot">
 <!ENTITY filter.selectAll.label "Valitse kaikki">
 <!ENTITY backupButton.label "&amp;Varmuuskopioi ja palauta">
-<!ENTITY restore.minVersion.warning "Varoitus: tiedosto on luotu uudemmalla Adblock Plussan versiolla. Ennen kuin palautat tästä tiedostosta, on suositeltavaa päivittää uusimpaan Adblock Plussan versioon.">
+<!ENTITY restore.minVersion.warning "Varoitus: tiedosto on luotu uudemmalla Adblock Plussan versiolla. Ennen kuin palautat tästä tiedostosta, on suositeltavaa päivittää Adblock Plus uusimpaan versioon.">
 <!ENTITY restore.error "Tiedoston tietoja ei voida käsitellä. Ehkä tämä ei ole Adblock Plus -varmuuskopiotiedosto?">
-<!ENTITY sort.ascending.label "&amp;A &gt; Z lajittelu">
+<!ENTITY sort.ascending.label "&amp;A &gt; Ö lajittelu">
 <!ENTITY sort.label "Lajitt&amp;eluperuste">
-<!ENTITY subscription.source.label "Suodatintilaus">
+<!ENTITY subscription.source.label "Suodatinlista">
 <!ENTITY hitcount.column "&amp;Osumat">
 <!ENTITY noFilters.text "Omia suodattimia ei ole vielä.">
 <!ENTITY backup.custom.title "Vain omat suodattimet">
-<!ENTITY subscription.external.label "Toisen laajennuksen päivättävä">
+<!ENTITY subscription.external.label "Toisen laajennuksen päivättämä">
 <!ENTITY subscription.delete.label "Poista">
-<!ENTITY noGroupSelected.text "Suodatinryhmä on valittava, ennen kuin sen suodattimia voidaan näyttää.">
+<!ENTITY noGroupSelected.text "Suodatinryhmä on valittava, ennen kuin sen suodattimet voidaan näyttää.">
 <!ENTITY filter.cut.label "Leikkaa">
 <!ENTITY restore.default.label "Palauta varmuuskopio: ?1?">
 <!ENTITY subscription.lastDownload.inProgress "Lataa...">
 <!ENTITY subscriptions.tab.label "Suodatintilaukset">
-<!ENTITY sort.descending.label "&amp;Z &gt; A lajittelu">
+<!ENTITY sort.descending.label "&amp;Ö &gt; A lajittelu">
 <!ENTITY filters.remove.warning "Haluatko varmasti poistaa kaikki valitut suodattimet?">
 <!ENTITY filter.delete.label "Poista">
 <!ENTITY addSubscriptionAdd.label "Lisää">
 <!ENTITY viewMenu.label "Näytä">
-<!ENTITY subscription.lastDownload.unknown "N/A">
+<!ENTITY subscription.lastDownload.unknown "Ei tietoa">
 <!ENTITY addSubscriptionCancel.label "Peruuta">
 <!ENTITY subscription.enabled.label "Käytössä">
-<!ENTITY noSubscriptions.text "Suodatintilauksia ei ole vielä lisätty. Adblock Plus ei estä mitään
- ilman suodattimia. Käytä &quot;Lisää suodatintilaus&quot; -painiketta lisätäksesi 
- joitakin.">
+<!ENTITY noSubscriptions.text "Suodatintilauksia ei ole vielä lisätty. Adblock Plus ei estä mitään ilman suodattimia. Käytä &quot;Lisää suodatintilaus&quot; -painiketta lisätäksesi joitakin.">
 <!ENTITY subscription.update.label "Päivitä suodattimet">
 <!ENTITY dialog.title "Adblock Plus -suodatinasetukset">
 <!ENTITY addFilter.label "&amp;Lisää suodatin">
-<!ENTITY subscription.minVersion.warning "Tämä suodatintilaus vaatii uudemman Adblock Plus -version, on suositeltavaa päivittää uusimpaan Adblock Plussan versioon.">
+<!ENTITY subscription.minVersion.warning "Tämä suodatintilaus vaatii uudemman Adblock Plus -version. Päivitä Adblock Plus uusimpaan versioon.">
 <!ENTITY subscription.lastDownload.invalidURL "Epäonnistui, kelvoton osoite">
-<!ENTITY backup.error "Tapahtui virhe kirjoitettaessa suodattimia tiedostoon. Varmista että tiedosto ei ole kirjoitussuojattu tai jonkin muun ohjelman käytössä.">
+<!ENTITY backup.error "Virhe kirjoitettaessa suodattimia tiedostoon. Varmista, että tiedosto ei ole kirjoitussuojattu tai jonkin muun ohjelman käytössä.">
 <!ENTITY filter.moveUp.label "Siirrä ylös">
 <!ENTITY addGroup.label "Li&amp;sää suodatinryhmä">
 <!ENTITY filter.edit.label "Muokkaa">
@@ -68,7 +66,7 @@
 <!ENTITY subscription.disabledFilters.enable "Ota käytöstä poistetut suodattimet käyttöön">
 <!ENTITY lasthit.column "&amp;Viimeisin osuma">
 <!ENTITY subscription.editTitle.label "Muokkaa otsikkoa">
-<!ENTITY subscription.disabledFilters.warning "Jotkin tämän suodatintilauksen suodattimista on poistettu käytössä.">
+<!ENTITY subscription.disabledFilters.warning "Jotkin tämän suodatintilauksen suodattimista on poistettu käytöstä.">
 <!ENTITY filter.column "&amp;Suodatusehto">
 <!ENTITY subscription.lastDownload.label "Viimeisin lataus:">
 <!ENTITY viewList.label "Näytä lista">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/fi/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/fi/firstRun.properties
index 3e6d9bb..939cbb7 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/fi/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/fi/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Selaa yksityisesti estämällä seuraaminen - piilota jälkesi mainosyhtiöiltä, jotka muuten seuraavat jokaista liikettäsi.
-firstRun_toggle_off=OFF
-firstRun_feature_tracking=Seuraamisen estäminen
-firstRun_feature_malware=Haittaohjelmien estäminen
-firstRun_title=Adblock Plus on asennettu
-firstRun_toggle_on=ON
 firstRun_acceptableAdsExplanation=Kannustamme verkkosivuja käyttämään yksinkertaisia mainoksia, jotka eivät häiritse. Tämän vuoksi olemme luoneet <a>tiukat ohjesäännöt</a> hyväksyttävien mainosten tunnistamiseksi, jotka näytetään oletusasetuksilla. Jos silti haluat estää kaikki mainokset, voit ottaa tämän <a>pois käytöstä</a> käden käänteessä.
+firstRun_acceptableAdsHeadline=Häiritsevät mainokset estetään
 firstRun_contributor_credits=Avustajat:
 firstRun_dataCorruptionWarning=Näetkö tämän sivun koko ajan? <a>Napsauta tätä!</a>
-firstRun_acceptableAdsHeadline=Häiritsevät mainokset estetään
-firstRun_share=Kerro ystävillesi
-firstRun_share_headline=<a>Auta meitä</a> tekemään verkosta parempi paikka
-firstRun_feature_social_description=Poista sivustoilta automaattisesti sosiaalisen median painikkeet, kuten Facebookin tykkää -painikkeet, jotka seuraavat verkkokäyttäytymistäsi.
-firstRun_filterlistsReinitializedWarning=Näyttäisi siltä, että ongelman takia kaikki suodattimet on poistettu ja niiden palauttaminen varmuuskopiosta epäonnistui. Tämän vuoksi kaikki suodattimien ja hyväksyttävien mainoksien asetukset on palautettu alkuarvoihin. Tarkasta suodatinlistat ja hyväksyttävien mainosten asetukset <a>Adblock Plussan asetuksista</a>.
-firstRun_feature_malware_description=Tee selaimestasi turvallisempi estämällä verkko-osoitteita, joiden tiedetään sisältävän haitallisia ohjelmia.
-firstRun_features=Adblock Plus voi tehdä muutakin kuin vain estää mainoksia
 firstRun_donate=lahjoita
 firstRun_donate_label=Tue projektiamme
+firstRun_feature_malware=Haittaohjelmien estäminen
+firstRun_feature_malware_description=Tee selaimestasi turvallisempi estämällä verkko-osoitteita, joiden tiedetään sisältävän haitallisia ohjelmia.
 firstRun_feature_social=Sosiaalisen median painikkeiden poistaminen
+firstRun_feature_social_description=Poista sivustoilta automaattisesti sosiaalisen median painikkeet, kuten Facebookin tykkää -painikkeet, jotka seuraavat verkkokäyttäytymistäsi.
+firstRun_feature_tracking=Seuraamisen estäminen
+firstRun_feature_tracking_description=Selaa yksityisesti estämällä seuraaminen - piilota jälkesi mainosyhtiöiltä, jotka muuten seuraavat jokaista liikettäsi.
+firstRun_features=Adblock Plus voi tehdä muutakin kuin vain estää mainoksia
+firstRun_filterlistsReinitializedWarning=Näyttäisi siltä, että ongelman takia kaikki suodattimet on poistettu ja niiden palauttaminen varmuuskopiosta epäonnistui. Tämän vuoksi kaikki suodattimien ja hyväksyttävien mainosten asetukset on palautettu alkuarvoihin. Tarkasta suodatinlistat ja hyväksyttävien mainosten asetukset <a>Adblock Plussan asetuksista</a>.
 firstRun_legacySafariWarning=Käytössäsi on Safarin vanha versio, jota Adblock Plus ei tue. Se ei välttämättä toimi oikein tai saattaa heikentää joidenkin sivustojen käyttökokemusta. Suosittelemme vahvasti päivittämään Safari 6.1.1:een tai uudempaan (OSX 10.8 Mountain Lion), tai Safari 7.0.1:een tai uudempaan (OSX 10.9 Mavericks), tai käyttämään Mozilla Firefoxin, Google Chromen tai Operan uusinta versiota.
+firstRun_share=Kerro ystävillesi
+firstRun_share_headline=<a>Auta meitä</a> tekemään verkosta parempi paikka
+firstRun_title=Adblock Plus on asennettu
+firstRun_toggle_off=OFF
+firstRun_toggle_on=ON
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/fi/global.properties b/data/extensions/spyblock@gnu.org/chrome/locale/fi/global.properties
index 843c5e6..fb17172 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/fi/global.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/fi/global.properties
@@ -1,22 +1,22 @@
-no_blocking_suggestions=Ei estettäviä elementtejä avoimella sivulla
-action3_tooltip=Napsauttamalla Adblock Plus otetaan käyttöön/poistetaan käytöstä.
+no_blocking_suggestions=Ei estettäviä elementtejä tällä sivulla
+action3_tooltip=Ota Adblock Plus käyttöön/poista käytöstä napsauttamalla.
 notification_antiadblock_title=Piilotetaanko kohdennetut viestit?
-type_label_script=komento
-filter_elemhide_nocriteria=Piilotettavaa elementtiä määrittelevää tunnistetta ei annettu
+type_label_script=komentosarja
+filter_elemhide_nocriteria=Piilotettavan elementin määrittävää tunnistetta ei annettu
 blockingGroup_title=Estoehdot
-whitelisted_tooltip=Adblock Plus on poistettu käytöstä tämänhetkisellä sivustolla.
+whitelisted_tooltip=Adblock Plus ei ole käytössä tällä sivulla.
 type_label_stylesheet=tyyliohje
 blocked_count_tooltip=?1? / ?2?
-type_label_font=kirjaisin
+type_label_font=kirjasin
 type_label_popup=ponnahdusikkuna
 filter_regexp_tooltip=Tämä suodatin on joko säännöllinen lauseke tai liian lyhyt optimoitavaksi. Liian monta tällaista suodatinta saattaa hidastaa selailuasi.
 action0_tooltip=Napsautus avaa ponnahdusvalikon. Keskinapsautus ottaa käyttöön/poistaa käytöstä.
-whitelisted_page=Adblock Plus on poistettu käytöstä avoimella sivulla
+whitelisted_page=Adblock Plus on poistettu käytöstä tällä sivulla
 remove_group_warning=Haluatko varmasti poistaa tämän ryhmän?
 action1_tooltip=Napsautus avaa/sulkee elementtilistan. Keskinapsautus ottaa käyttöön/poistaa käytöstä.
 type_label_xmlhttprequest=XML-pyyntö
-active_tooltip=Adblock Plus on aktiivinen, ?1? kpl suodatintilauksia ja ?2? kpl omia suodattimia käytössä.
-type_label_document=dokumentti
+active_tooltip=Adblock Plus on käytössä. ?1? suodatintilaus(ta) ja ?2? oma(a) suodatin(ta) käytössä.
+type_label_document=asiakirja
 type_label_object_subrequest=objektin alipyyntö
 whitelistGroup_title=Poikkeusehdot
 disabled_tooltip=Adblock Plus ei ole käytössä.
@@ -26,16 +26,16 @@ action2_tooltip=Napsautus avaa asetukset. Keskinapsautus ottaa käyttöön/poist
 type_label_subdocument=kehys
 clearStats_warning=Tämä nollaa kaikki osumatilastot ja poistaa osumien laskemisen käytöstä. Haluatko jatkaa?
 notification_antiadblock_message=Tämän sivun tiedetään näyttäneen kohdennettuja viestejä Adblock Plussan käyttäjille. Haluatko, että Adblock Plus piilottaa kohdennetut viestit?
-blocked_count_addendum=(sallituja: ?1?, piilotettuja: ?2?)
+blocked_count_addendum=(sallittuja: ?1?, piilotettuja: ?2?)
 subscription_invalid_location=Suodatinlistan sijainti on joko kelvoton osoite tai tiedoston nimi.
 type_label_image=kuva
 remove_subscription_warning=Haluatko varmasti poistaa tämän tilauksen?
 type_label_other=muu
 mobile_menu_enable=ABP: Ota käyttöön
 type_label_media=ääni/video
-mobile_menu_disable_site=ABP: Ei käytössä osoitteessa ?1?
+mobile_menu_disable_site=ABP: Ei käytössä sivustolla ?1?
 elemhideGroup_title=Elementtien piilotusehdot
-mobile_menu_enable_site=ABP: Käytä osoitteessa ?1?
+mobile_menu_enable_site=ABP: Käytä sivustolla ?1?
 type_label_elemhide=piilotettu
 newGroup_title=Uusi suodatinryhmä
 default_dialog_title=Adblock Plus
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/fi/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/fi/overlay.dtd
index a123135..89aa628 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/fi/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/fi/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Kyllä">
 <!ENTITY notification.button.no "&amp;Ei">
 <!ENTITY sync.label "&amp;Synkronoi Adblock Plussan asetukset">
 <!ENTITY whitelist.site.label "Ei käytössä osoitteessa ?1?">
@@ -6,27 +5,27 @@
 <!ENTITY disable.label "Poista käytöstä kaikkialla">
 <!ENTITY objecttab.title "Estä">
 <!ENTITY objecttab.tooltip "Estä tämä objekti Adblock Plussalla">
-<!ENTITY menuitem.label "A&amp;dblock Plus - Asetukset">
+<!ENTITY menuitem.label "Ad&amp;block Plus -asetukset">
 <!ENTITY objecttabs.label "&amp;Korvake Flashin ja Javan yhteydessä">
 <!ENTITY sendReport.label "Raportoi onge&amp;lma tällä sivulla">
 <!ENTITY whitelist.page.label "Ei käytössä tällä sivulla">
 <!ENTITY context.image.label "Adblock Plus: Estä kuva">
-<!ENTITY counthits.label "&amp;Laske suodattimen osumat">
+<!ENTITY notification.button.yes "&amp;Kyllä">
 <!ENTITY opensidebar.label "Näytä &amp;elementit">
 <!ENTITY notification.button.close "&amp;Sulje">
 <!ENTITY contribute.label "Avusta Adblock Plussaa">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Estä kehys">
-<!ENTITY blocked.tooltip "Tämän sivun estetyt elementit:">
-<!ENTITY hideplaceholders.label "P&amp;iilota elementit, jotka sisältävät estettyjä elementtejä">
+<!ENTITY blocked.tooltip "Estetyt elementit tällä sivulla:">
+<!ENTITY counthits.label "&amp;Laske suodattimen osumat">
 <!ENTITY showinstatusbar.label "&amp;Näytä tilarivillä">
-<!ENTITY sidebar.title "Estettävät elementit avoimella sivulla">
+<!ENTITY sidebar.title "Estettävät elementit tällä sivulla">
 <!ENTITY options.label "&amp;Valinnat">
 <!ENTITY context.object.label "Adblock Plus: Estä kohde">
-<!ENTITY context.removeWhitelist.label "Adblock Plus: Ota tämä sivu uudestaan käyttöön">
+<!ENTITY context.removeWhitelist.label "Adblock Plus: Ota uudelleen käyttöön tällä sivulla">
 <!ENTITY filters.tooltip "Aktiivisimmat suodattimet:">
 <!ENTITY closesidebar.label "Sulj&amp;e elementit">
-<!ENTITY showintoolbar.label "Nä&amp;ytä työkalupalkilla">
+<!ENTITY showintoolbar.label "Nä&amp;ytä työkalupalkissa">
 <!ENTITY status.tooltip "Tila:">
 <!ENTITY context.media.label "Adblock Plus: Estä ääni/kuva">
 <!ENTITY subscription.update.label "Päivitä suodattimet">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/fi/sendReport.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/fi/sendReport.dtd
index 8c58fdc..386916f 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/fi/sendReport.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/fi/sendReport.dtd
@@ -1,52 +1,52 @@
 <!ENTITY screenshot.undo.label "K&amp;umoa">
-<!ENTITY issues.disabledgroups.description "Seuraavat suodatintilaukset / suodatinryhmät ovat poistettu käytöstä mutta niillä saatta silti olla vaikutusta tällä sivulla:">
+<!ENTITY issues.disabledgroups.description "Seuraavat suodatintilaukset / suodatinryhmät on poistettu käytöstä, mutta niillä saattaa silti olla vaikutusta tällä sivulla:">
 <!ENTITY showData.label "Näytä raportin tiedot">
-<!ENTITY typeSelector.falsePositive.label "Adb&amp;lock Plus estää liikaa">
-<!ENTITY issues.change.description "Asetuksia on muutettu. Päivitä sivu testataksesi muutokset ja raportoi, jos muutokset eivät ratkaisseet ongelmaa.">
+<!ENTITY typeSelector.falsePositive.label "Adblock Plus estää &amp;liikaa">
+<!ENTITY issues.change.description "Asetuksia on muutettu. Päivitä sivu testataksesi muutokset ja raportoi, jos ongelma ei niistä huolimatta ratkennut.">
 <!ENTITY email.label "Sä&amp;hköposti:">
 <!ENTITY issues.openPreferences.label "Avaa suodatinasetukset">
-<!ENTITY sendPage.confirmation "Rapotti on tallennettu. Se löytyy tästä osoitteesta:">
+<!ENTITY sendPage.confirmation "Raporttisi on tallennettu. Se löytyy tästä osoitteesta:">
 <!ENTITY copyLink.label "&amp;Kopioi raportin linkki">
-<!ENTITY issues.nofilters.description "Adblock Plus ei estä mitään tällä sivulla. Kohdattu ongelma on todennäköisesti riippumaton Adblock Plussasta.">
+<!ENTITY issues.nofilters.description "Adblock Plus ei estä mitään tällä sivulla. Kohtaamasi ongelma ei todennäköisesti liity Adblock Plussaan.">
 <!ENTITY sendPage.knownIssue "Raportoimasi ongelma on todennäköisesti jo tiedossa. Lisätietoa:">
 <!ENTITY typeSelector.other.description "Valitse tämä vaihtoehto, jos epäilet ongelman olevan ennemminkin Adblock Plussassa kuin sen suodattimissa.">
 <!ENTITY issues.disabledgroups.enable.label "Ota suodatintilaus / suodatinlista käyttöön">
 <!ENTITY typeWarning.override.label "&amp;Ymmärrän ja haluan silti raportoida">
-<!ENTITY issues.disabled.enable.label "Ota Adblock Plus käyttöön tällä sivulla">
+<!ENTITY issues.disabled.enable.label "Ota Adblock Plus käyttöön">
 <!ENTITY update.fixed.description "Suodatintilausten päivitykset todennäköisesti ratkaisivat raportoitavan ongelman. Päivitä sivusto ja yritä uudelleen. Mikäli ongelma säilyy, raportoi se.">
 <!ENTITY anonymous.label "&amp;Lähetä nimettömänä">
 <!ENTITY reloadButton.label "&amp;Päivitä sivu">
 <!ENTITY recentReports.clear.label "Poista kaikki &amp;raportit">
-<!ENTITY typeSelector.description "Tämä ikkuna ohjeistaa tarvittavat vaiheet Adblockin Plussan ongelmaraportin lähettämiseksi. Aluksi valitse onhelmatyyppi, jollaisen koet tällä sivulla:">
+<!ENTITY typeSelector.description "Tämä ikkuna ohjaa sinut Adblock Plus -ongelmaraportin lähettämiseen tarvittavien vaiheiden läpi. Kerro ensin, millaisen ongelman olet kohdannut tällä sivulla:">
 <!ENTITY screenshot.remove.label "&amp;Poista arkaluontoista tietoa">
 <!ENTITY issues.ownfilters.description "Osa tämän sivun suodattimista on käyttäjän määrittelemiä. Poista käytöstä suodattimet, jotka saattavat aiheuttaa ongelmia:">
-<!ENTITY update.inProgress.description "Adblock Plussan pitää päivittää suodatintilaukset varmistaakseen, että ongelmaa ei ole jo ratkottu. Odota hetki...">
+<!ENTITY update.inProgress.description "Adblock Plus päivittää suodatintilauksesi selvittääkseen, onko ongelma ehditty jo ratkaista. Odota hetki...">
 <!ENTITY sendPage.retry.label "Lähetä uudelleen">
 <!ENTITY data.label "Raportin tie&amp;dot:">
-<!ENTITY recentReports.label "Näytä viimeksi lähetemäsi raportit">
-<!ENTITY typeWarning.description "Olet antanut ymmärtää halukkuutesi raportoida yleisestä virheestä Adblock Plussassa suodattimien sijaan. Huomaa että tällaiset raportit olisi parasta jättää [link]Adblock Plussan foorumeille[/link]. Ongelmaraportteria tulisi käyttää vain täydentämään olevassa olevaa keskutelua, sillä kukaan ei huomioi raporttiasi, jos et anna siihen linkitystä. Rapotoidessa annetaan automaattisesti luotu linkki.">
-<!ENTITY issues.disabled.description "Adblock Plus on poissa käytöstö tällä sivulla, se ei estä mitään.">
-<!ENTITY attachExtensions.label "L&amp;iitä lista aktiivisista laajennuksista rapottiin siltä varalta, että jokin niistä on ongelma syy">
+<!ENTITY recentReports.label "Viimeksi lähettämäsi raportit">
+<!ENTITY typeWarning.description "Olet ilmoittanut haluavasi raportoida yleisestä Adblock Plussaan suodattimien sijaan liittyvästä ongelmasta. Huomaa, että tällaiset raportit olisi parasta jättää [link]Adblock Plussan foorumille[/link]. Ongelmanraportointia tulisi käyttää vain olemassa olevan keskustelun täydennykseksi, sillä kukaan ei huomioi raporttiasi, jos et anna linkkiä siihen. Linkki luodaan automaattisesti jätettyäsi raportin.">
+<!ENTITY issues.disabled.description "Adblock Plus ei ole käytössä eikä estä mitään tässä tilassa.">
+<!ENTITY attachExtensions.label "L&amp;iitä raporttiin lista käytössä olevista lisäosista siltä varalta, että jokin niistä on ongelman aiheuttaja">
 <!ENTITY issues.nosubscriptions.add.label "Lisää suodatintilaus">
 <!ENTITY issues.disabledfilters.enable.label "Ota suodatin käyttöön">
 <!ENTITY issues.override.label "Asetukset ovat oikein, &amp;jatka raportoimista">
-<!ENTITY issues.nosubscriptions.description "Näyttäisi siltä, että et ole tilannut yhtään valmiiksi tehtyä suodatinlistaa, jotka poistavat automaattisesti sivuilta epämieluisaa sisältöä.">
-<!ENTITY typeSelector.falsePositive.description "Valitse tämä vaihtoehto, jos sivulta puuttu olennaista sisältöä tai se näkyy väärin. Voit päätellä onko Adblock Plus syy ongelmaan ottamalla sen väliaikaisesti pois kaytöstä.">
+<!ENTITY issues.nosubscriptions.description "Et näemmä ole tilannut yhtään valmista suodatinlistaa, jotka poistavat sivuilta epämieluisaa sisältöä automaattisesti.">
+<!ENTITY typeSelector.falsePositive.description "Valitse tämä vaihtoehto, jos sivulta puuttuu olennaista sisältöä tai se näkyy väärin. Voit päätellä onko Adblock Plus syy ongelmaan ottamalla sen väliaikaisesti pois kaytöstä.">
 <!ENTITY typeSelector.other.label "&amp;Muu ongelma">
-<!ENTITY emailComment.label "On suositeltavaa antaa voimassa oleva sähköpostiosoite, jotta sinuun voidaan ottaa yhteyttä raporttiin liittyvissä kysymyksissä. Tämä mahdollistaa myös avustuksiesi tunnistamisen ja priorisoinnin korkeammalle.">
-<!ENTITY issues.whitelist.remove.label "Ota Adblock Plus uudestaan käyttöön tällä sivulla">
-<!ENTITY outdatedSubscriptions.description "Seuraavia suodatintilauksia ei ole päivitetty ainakaan kahteen viikkoon. Päivitä nämä tilaukset ennen raportin lähettämistä, sillä ongelma on saattaanut jo ratketa.">
+<!ENTITY emailComment.label "On suositeltavaa antaa toimiva sähköpostiosoite, jotta sinuun voidaan ottaa yhteyttä raporttiin liittyvissä kysymyksissä. Sen avulla voimme myös antaa tunnustusta panoksestasi ja priorisoida sitä korkeammalle.">
+<!ENTITY issues.whitelist.remove.label "Ota Adblock Plus uudelleen käyttöön tällä sivulla">
+<!ENTITY outdatedSubscriptions.description "Seuraavia suodatintilauksia ei ole päivitetty ainakaan kahteen viikkoon. Päivitä nämä tilaukset ennen raportin lähettämistä, sillä ongelma on saattanut jo ratketa.">
 <!ENTITY dataCollector.description "Odota hetki, kun Adblock Plus kerää tarvittavia tietoja.">
 <!ENTITY sendButton.label "&amp;Lähetä raportti">
 <!ENTITY comment.label "Kommentti (&amp;valinnainen):">
-<!ENTITY sendPage.errorMessage "Raportin lähettäminen epäonnistui virhekoodilla &quot;?1?&quot;. Varmista että olet yhteydessä Internettiin ja yritä uudelleen. Mikäli ongelma ei katoa, pyydä apua osoitteesta [link]Adblock Plus forum[/link].">
+<!ENTITY sendPage.errorMessage "Raportin lähettäminen epäonnistui virhekoodilla &quot;?1?&quot;. Varmista, että olet yhteydessä Internetiin ja yritä uudelleen. Mikäli ongelma ei katoa, pyydä apua [link]Adblock Plus foorumilta[/link].">
 <!ENTITY showRecentReports.label "Näytä viimeksi lähetetyt raportit">
 <!ENTITY commentPage.heading "Lisää kommentti">
 <!ENTITY update.start.label "Aloita päivittäminen nyt">
-<!ENTITY issues.disabledfilters.description "Seuraavat suodattimet on poistettu käytöstä mutta niillä saatta silti olla vaikutusta tällä sivulla:">
-<!ENTITY screenshot.description "Sama sivu saattaa näyttää erilaiselta eri ihmisillä. Ongelman ymmärtämistä saattaa helpottaa, jos liität raporttiisi kuvakaappauksen. Voit myös poistaa arkaluontoista tietoa tai merkitä ongelman kannalta huomattavia kohtia. Tehdäksesi tämän napsauta vastaava painiketta ja valitse kuvan kohta hiirellä.">
+<!ENTITY issues.disabledfilters.description "Seuraavat suodattimet on poistettu käytöstä, mutta niillä saatta silti olla vaikutusta tällä sivulla:">
+<!ENTITY screenshot.description "Sama sivu saattaa näyttää erilaiselta eri ihmisillä. Ongelman ymmärtämistä saattaa helpottaa, jos liität raporttiisi kuvakaappauksen. Voit myös poistaa arkaluontoista tietoa tai merkitä ongelman kannalta huomattavia kohtia. Tehdäksesi tämän napsauta vastaavaa painiketta ja valitse kuvan kohta hiirellä.">
 <!ENTITY screenshot.attach.label "&amp;Liitä sivun kuva raporttiin">
-<!ENTITY issues.whitelist.description "Adblock Plus on tällä hetkellä poistettu käytöstä sivulla, jota olet raportoimassa. Ota se käyttöön ja ennen raportointia päivitä sivu. Tämä auttaa rapotin tutkimista.">
+<!ENTITY issues.whitelist.description "Adblock Plus ei tällä hetkellä ole käytössä sivulla, jota olet raportoimassa. Ota se käyttöön ja päivitä sivu ennen raportointia. Tämä auttaa ongelman tutkimisessa.">
 <!ENTITY typeSelector.falseNegative.label "Adblock Plus &amp;ei estä mainosta">
 <!ENTITY typeSelector.heading "Valitse ongelman tyyppi">
 <!ENTITY anonymity.warning "Sinuun ei voida ottaa yhteyttä ja todennäköisesti priorisoimme raportin alemmas.">
@@ -58,8 +58,8 @@
 <!ENTITY sendPage.waitMessage "Odota, Adblock Plus lähettää raporttia.">
 <!ENTITY dataCollector.heading "Tervetuloa ongelman raportoijaan">
 <!ENTITY screenshot.heading "Liitä kuvakaappaus">
-<!ENTITY sendPage.heading "Raportin lähettäminen">
-<!ENTITY issues.subscriptionCount.description "Näyttäisi siltä, että liian monta suodatintilausta on tilattuna. Tällainen järjestely ei ole suositeltavaa, sillä se nostaa ongelmien todennäköisyyttä. Emme voi hyväksyä ongelmaraporttia, koska jää epäselväksi kenen suodatintilauksen tekijän on ryhdyttävä korjaustoimiin. Poista kaikki paitsi välttämättömät suodatintilaukset ja kokeile esiintyykö ongelma yhä.">
-<!ENTITY screenshot.mark.label "&amp;Merkkaa ongelma">
+<!ENTITY sendPage.heading "Lähettää...">
+<!ENTITY issues.subscriptionCount.description "Näyttäisi siltä, että olet tilannut liian monta suodatinta. Tällaista järjestelyä ei suositella, sillä se lisää ongelmien todennäköisyyttä. Emme voi hyväksyä ongelmaraporttia, koska jää epäselväksi, minkä suodattimen tekijän on ryhdyttävä korjaustoimiin. Poista kaikki paitsi välttämättömät suodatintilaukset ja kokeile esiintyykö ongelma yhä.">
+<!ENTITY screenshot.mark.label "&amp;Merkitse ongelma">
 <!ENTITY privacyPolicy.label "Yksityisyyskäytäntö">
-<!ENTITY issues.description "Adblock Plus on havainnut ongelmia asetuksissa, jotka saattavat aiheuttaa tämän ongelman tai tehdä raportin tutkimisesta vaikeaa.">
+<!ENTITY issues.description "Adblock Plus on havainnut asetuksissasi ongelmia, jotka saattavat aiheuttaa tämän ongelman tai tehdä raportin tutkimisesta vaikeaa.">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/fi/sidebar.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/fi/sidebar.dtd
index 5a6c4d0..7575cdf 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/fi/sidebar.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/fi/sidebar.dtd
@@ -1,4 +1,4 @@
-<!ENTITY context.flash.label "Välkytä reunoja">
+<!ENTITY context.flash.label "Välkytä kohteen reunoja">
 <!ENTITY address.label "Osoite">
 <!ENTITY context.open.label "Avaa uuteen välilehteen">
 <!ENTITY type.label "Tyyppi">
@@ -10,13 +10,13 @@
 <!ENTITY search.label "&amp;Etsi:">
 <!ENTITY docDomain.thirdParty "(kolmas osapuoli)">
 <!ENTITY filterSource.label "Suodattimen lähde">
-<!ENTITY tooltip.docDomain.label "Dokumentin lähde:">
-<!ENTITY context.copy.label "Kopioi osoite">
+<!ENTITY tooltip.docDomain.label "Asiakirjan lähde:">
+<!ENTITY context.copy.label "Kopioi kohteen osoite">
 <!ENTITY tooltip.type.label "Tyyppi:">
 <!ENTITY context.disablefilter.label "Poista käytöstä suodatin: ?1?">
 <!ENTITY context.copyFilter.label "Kopioi suodatin">
 <!ENTITY context.block.label "Estä elementti">
-<!ENTITY context.enablefilter.label "Palauta suodatin: ?1?">
+<!ENTITY context.enablefilter.label "Ota käyttöön suodatin: ?1?">
 <!ENTITY detach.label "Irrota">
 <!ENTITY whitelisted.label "Sallittu sivu">
 <!ENTITY context.disablefilteronsite.label "Poista tämä suodatin käytöstä osoiteessa ?1?">
@@ -31,5 +31,5 @@
 <!ENTITY context.whitelist.label "Lisää poikkeusehto">
 <!ENTITY context.selectAll.label "Valitse kaikki">
 <!ENTITY state.label "Tila">
-<!ENTITY docDomain.label "Dokumentin lähde">
+<!ENTITY docDomain.label "Asiakirjan lähde">
 <!ENTITY tooltip.address.label "Osoite:">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/fi/subscriptionSelection.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/fi/subscriptionSelection.dtd
index 694748c..e1dc745 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/fi/subscriptionSelection.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/fi/subscriptionSelection.dtd
@@ -1,12 +1,12 @@
-<!ENTITY addMain.label "Lisää myös suodatintilaus &quot;?1?&quot;">
+<!ENTITY addMain.label "Lisää &amp;myös suodatintilaus &quot;?1?&quot;">
 <!ENTITY list.download.failed "Suodatinlistan noutaminen epäonnistui.">
 <!ENTITY list.download.retry "Yritä uudestaan">
-<!ENTITY title.label "Tilauksen nimi:">
+<!ENTITY title.label "&amp;Tilauksen nimi:">
 <!ENTITY list.download.website "Näytä verkkosivu">
 <!ENTITY supplementMessage "Tämä suodatintilaus on tarkoitettu käytettäväksi yhdessä suodatintilauksen &quot;?1?&quot; kanssa, jota et vielä käytä.">
 <!ENTITY viewList.label "Näytä suodattimet">
 <!ENTITY visitHomepage.label "Vieraile kotisivulla">
 <!ENTITY addSubscription.label "Lisää suodatintilaus">
 <!ENTITY dialog.title "Lisää Adblock Plus -suodatintilaus">
-<!ENTITY location.label "Suodatinlistan sijainti:">
+<!ENTITY location.label "Suodatinl&amp;istan sijainti:">
 <!ENTITY fromWeb.description "Vahvista tämän suodatintilauksen lisääminen. Voit muuttaa tilauksen nimeä tai sijaintia ennen sen lisäämistä.">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/fr/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/fr/firstRun.properties
index ddc8c7b..10a7645 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/fr/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/fr/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Naviguer incognito en désactivant le suivi, en masquant vos traces aux publicistes qui traqueraient vos faits et gestes.
-firstRun_toggle_off=INACTIF
-firstRun_feature_tracking=Désactiver l'espionnage
-firstRun_feature_malware=Blocage des logiciels malveillants
-firstRun_title=Adblock Plus a été installée
-firstRun_toggle_on=ACTIF
 firstRun_acceptableAdsExplanation=Nous aimerions encourager les sites Web à utiliser de la publicité honnête et discrète. C'est pourquoi nous avons établi <a>des lignes directrices strictes</a> afin d'identifier les annonces acceptables, par défaut. Si vous souhaitez tout de même bloquer toutes les publicités, vous pouvez <a>désactiver</a> cela dans les paramètres en quelques secondes.
+firstRun_acceptableAdsHeadline=Les pubs seront à présent bloquées
 firstRun_contributor_credits=Crédits des contributeurs
 firstRun_dataCorruptionWarning=Cette page s'affiche-t-elle encore ? <a>Cliquez ici !</a>
-firstRun_acceptableAdsHeadline=Les pubs seront à présent bloquées
-firstRun_share=Parlez-en à vos amis
-firstRun_share_headline=<a>Donnez-nous un coup de main</a> à rendre le Web meilleur
-firstRun_feature_social_description=Se débarrasser automatiquement des boutons de réseaux sociaux tels que les « J'aime » Facebook qui apparaissent sur les pages Web et suivent votre comportement.
-firstRun_filterlistsReinitializedWarning=Il semblerait qu'à cause d'un problème, tous les filtres aient été supprimés et que nous n'ayons été en mesure de rétablir une sauvegarde. C'est pourquoi nous avons été contraints de réinitialiser vos filtres et les paramètres des publicités acceptables. Veuillez vérifier vos listes de filtres et les paramètres de publicités acceptables dans les <a>options d'Adblock Plus</a>.
-firstRun_feature_malware_description=Rendre votre navigation plus sécurisée en bloquant les domaines malveillants connus.
-firstRun_features=Adblock Plus peut faire plus que bloquer les pubs
 firstRun_donate=Faire un don
 firstRun_donate_label=Soutenir notre projet
+firstRun_feature_malware=Blocage des logiciels malveillants
+firstRun_feature_malware_description=Rendre votre navigation plus sécurisée en bloquant les domaines malveillants connus.
 firstRun_feature_social=Supprimer les boutons des réseaux sociaux
+firstRun_feature_social_description=Se débarrasser automatiquement des boutons de réseaux sociaux tels que les « J'aime » Facebook qui apparaissent sur les pages Web et suivent votre comportement.
+firstRun_feature_tracking=Désactiver l'espionnage
+firstRun_feature_tracking_description=Naviguer incognito en désactivant le suivi, en masquant vos traces aux publicistes qui traqueraient vos faits et gestes.
+firstRun_features=Pour terminer l'installation, choisissez un niveau de protection de votre vie privée
+firstRun_filterlistsReinitializedWarning=Il semblerait qu'à cause d'un problème, tous les filtres aient été supprimés et que nous n'ayons été en mesure de rétablir une sauvegarde. C'est pourquoi nous avons été contraints de réinitialiser vos filtres et les paramètres des publicités acceptables. Veuillez vérifier vos listes de filtres et les paramètres de publicités acceptables dans les <a>options d'Adblock Plus</a>.
 firstRun_legacySafariWarning=Vous utilisez une vieille version de Safari incompatible avec Adblock Plus. Elle pourra ne pas bien fonctionner ou nuire à l'expérience utilisateur sur certains sites Web. Nous recommandons fortement de mettre à jour Safari, soit vers la version 6.1.1 ou supérieure (sur OS X 10.8 Mountain Lion), soit vers la version 7.0.1 ou supérieure (sur OS X 10.9 Mavericks) ou d'utiliser la dernière version de Mozilla Firefox, Google Chrome ou Opera.
+firstRun_share=Parlez-en à vos amis
+firstRun_share_headline=<a>Donnez-nous un coup de main</a> à rendre le Web meilleur
+firstRun_title=Adblock Plus a été installée
+firstRun_toggle_off=INACTIF
+firstRun_toggle_on=ACTIF
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/fr/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/fr/overlay.dtd
index c07c593..d8cc549 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/fr/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/fr/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Oui">
 <!ENTITY notification.button.no "&amp;Non">
 <!ENTITY sync.label "S&amp;ynchroniser les paramètres d'Adblock Plus">
 <!ENTITY whitelist.site.label "Désactiver pour ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "&amp;Signaler un problème sur cette page">
 <!ENTITY whitelist.page.label "Désactiver pour cette page uniquement">
 <!ENTITY context.image.label "Bloquer l'image avec Adblock Plus">
-<!ENTITY counthits.label "Co&amp;mpter la fréquence d'utilisation de filtre">
+<!ENTITY notification.button.yes "&amp;Oui">
 <!ENTITY opensidebar.label "Ouvrir la liste des élé&amp;ments filtrables">
 <!ENTITY notification.button.close "&amp;Fermer">
 <!ENTITY contribute.label "Contribuer à Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Bloquer le cadre avec Adblock Plus">
 <!ENTITY blocked.tooltip "Éléments bloqués sur cette page :">
-<!ENTITY hideplaceholders.label "Ré&amp;utiliser l'espace laissé par les éléments bloqués">
+<!ENTITY counthits.label "Co&amp;mpter la fréquence d'utilisation de filtre">
 <!ENTITY showinstatusbar.label "Afficher da&amp;ns la barre d'état">
 <!ENTITY sidebar.title "Éléments filtrables dans la page courante">
 <!ENTITY options.label "&amp;Options">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/fr/sendReport.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/fr/sendReport.dtd
index ee5069b..3cea283 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/fr/sendReport.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/fr/sendReport.dtd
@@ -26,7 +26,7 @@
 <!ENTITY recentReports.label "Vos signalements récemment soumis">
 <!ENTITY typeWarning.description "Vous avez indiqué que vous voulez signaler un problème général concernant Adblock Plus plutôt qu'un problème de filtres. Veuillez prendre note que ce type de problèmes est plutôt signalé dans le [link]forum d'Adblock Plus[/link]. Vous devriez utiliser la soumission de signalement uniquement pour ajouter un point à une discussion existante, puisque personne n'en prendra connaissance à moins que vous leur fournissiez le lien pointant vers la discussion. Le lien automatiquement généré sera fourni après la soumission du signalement.">
 <!ENTITY issues.disabled.description "Adblock Plus est désactivée, elle ne bloquera rien dans cet état.">
-<!ENTITY attachExtensions.label "Joindre une liste d'e&amp;xtensions actives au signalement au cas où il y aurait un problème de conflit d'extension">
+<!ENTITY attachExtensions.label "Joindre une liste d'e&amp;xtensions actives au rapport au cas où il y aurait un problème de conflit d'extension">
 <!ENTITY issues.nosubscriptions.add.label "Ajouter un abonnement">
 <!ENTITY issues.disabledfilters.enable.label "Activer le filtre">
 <!ENTITY issues.override.label "La &amp;configuration est correcte, poursuivre le signalement">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/fy-NL/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/fy-NL/firstRun.properties
index 98c1128..760d6d6 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/fy-NL/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/fy-NL/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Ynternette mear privaat troch it útsetten fan tracking.  Ferstopje dyn surf gedrach fan reklame bedriuwen dy't dy graach in de gaten wolle hâlde.
-firstRun_toggle_off=út
-firstRun_feature_tracking=Folgje út
-firstRun_feature_malware=Troep blokkeare
-firstRun_title=Adblock is no ynstalleare
 firstRun_acceptableAdsExplanation=Wy wolle graach dat websiden simpele net skreauwende advertinsjes brûke. Derom hawwe wy <a>stringe regels</a> om akseptabele advertinsjes te werkennen.  Dit stiet ûnder standert settings. Ast noch steeds alle advertinsjes blokkeare wolst, dan kist dat <a>Út sette</a> yn in pear sekonden.
-firstRun_toggle_on=Oan
+firstRun_acceptableAdsHeadline=ferfelende advertinsjes wurde no tsjin hâlden
 firstRun_contributor_credits=Meiwurker Nammen
 firstRun_dataCorruptionWarning=Bliuwst dizze side sjen? <a>Klik hjir!</a>
-firstRun_acceptableAdsHeadline=ferfelende advertinsjes wurde no tsjin hâlden
-firstRun_share=sis it tsjin freonen
-firstRun_share_headline=<a>Jou ús in hantsje</a>  om it web in moaiere plak te meitsjen
-firstRun_features=Adblock kin mear dwaan dan advertinsjes stopje
-firstRun_feature_malware_description=Meitsje dyn browser mear feiliger troch it blokkearen fan bekende  rotsoai domeinen.
-firstRun_feature_social_description=Meitsje dyn ynternetten moaier  en helje automatysk  de knoppen furt as de Facebook Like, dy't op websiden stean om dyn gedrach by te hâlden.
 firstRun_donate=Donneare
 firstRun_donate_label=Support ús projekt
+firstRun_feature_malware=Troep blokkeare
+firstRun_feature_malware_description=Meitsje dyn browser mear feiliger troch it blokkearen fan bekende  rotsoai domeinen.
 firstRun_feature_social=Sociale Media knop fuorthelje
+firstRun_feature_social_description=Meitsje dyn ynternetten moaier  en helje automatysk  de knoppen furt as de Facebook Like, dy't op websiden stean om dyn gedrach by te hâlden.
+firstRun_feature_tracking=Folgje út
+firstRun_feature_tracking_description=Ynternette mear privaat troch it útsetten fan tracking.  Ferstopje dyn surf gedrach fan reklame bedriuwen dy't dy graach in de gaten wolle hâlde.
+firstRun_features=Adblock kin mear dwaan dan advertinsjes stopje
+firstRun_filterlistsReinitializedWarning=It liket der op dat der in probleem wie wer troch alle filters fuorthelle wurden en it ûnmooglik wie om in backup werom te setten. Hjirfoar hawwe wie jo filters en Akseptabele Advertinsjes opnij ynstelt.  Kontrolear jo ynstellingen in de <a>Adblock Plus Opties</a>.
 firstRun_legacySafariWarning=Do brûkst in âlde fersy fan Safari dy net mear troch Adblock Plus understeunt wurdt. Miskien wurket it net goed of liket it soms wat raar. Wij adviseare om Safari 6.1.1 of heger (op OS X 10.8 Mountain Lion), of Safari 7.0.1 of heger (op OS X 10.9 Mavericks) te brûken, of de lêste fersy van Mozilla Firefox, Google Chrome of Opera.
-firstRun_filterlistsReinitializedWarning=It seems that an issue caused all filters to be removed and we were unable to restore a backup. Therefore we had to reset your filters and Acceptable Ads settings. Please check your filter lists and Acceptable Ads settings in the <a>Adblock Plus options</a>.
+firstRun_share=sis it tsjin freonen
+firstRun_share_headline=<a>Jou ús in hantsje</a>  om it web in moaiere plak te meitsjen
+firstRun_title=Adblock is no ynstalleare
+firstRun_toggle_off=út
+firstRun_toggle_on=Oan
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/fy-NL/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/fy-NL/overlay.dtd
index 57e9f9e..230c0a6 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/fy-NL/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/fy-NL/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Ja">
 <!ENTITY notification.button.no "&amp;Nee">
 <!ENTITY sync.label "Sync Adblock Plus opsjes">
 <!ENTITY whitelist.site.label "Utskeakelje op ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "Rapportearje probleem op dizze side">
 <!ENTITY whitelist.page.label "Allinnich op dizze side útskeakelje">
 <!ENTITY context.image.label "Ofbylding blokkearje">
-<!ENTITY counthits.label "Tel filterhits">
+<!ENTITY notification.button.yes "&amp;Ja">
 <!ENTITY opensidebar.label "&amp;Blokkearbere ûnderdielen iepenje">
 <!ENTITY notification.button.close "&amp;Slûte">
 <!ENTITY contribute.label "Donearje oan Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Dielfinster blokkearje">
 <!ENTITY blocked.tooltip "Blokkearre ûnderdielen:">
-<!ENTITY hideplaceholders.label "Ferstop placeholders fan blokkearre eleminten">
+<!ENTITY counthits.label "Tel filterhits">
 <!ENTITY showinstatusbar.label "Toane yn steatbalke">
 <!ENTITY sidebar.title "Blokkearbere ûnderdelen op dizze side">
 <!ENTITY options.label "Opsjes">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/gl/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/gl/firstRun.properties
index bb33050..103a7f7 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/gl/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/gl/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Navega de xeito privado ó desactivar o seguemento - agochando as túas trazas das compañías de publicidade que doutro xeito rexistrarían os teus movementos.
-firstRun_toggle_off=DESACTIVADO
-firstRun_feature_tracking=Desactivar o seguimento
-firstRun_feature_malware=Bloquear malware
-firstRun_title=O Adblock Plus foiche instalado
-firstRun_toggle_on=ACTIVADO
 firstRun_acceptableAdsExplanation=Queremos animar ás páxinas web para que empreguen a publicidade dun xeito mais directo e non invasivo. É polo que fixemos unhas <a>regras moi estrictas</a> co fin de identificar a publicidade aceptable, a cal é mostrada coas opcións por defecto. Se aínda queres bloquear tódala publicidade, podes <a>desactivar</a> isto deseguido.
+firstRun_acceptableAdsHeadline=A partir de agora os anuncios anoxantes seranche bloqueados
 firstRun_contributor_credits=Coa colaboración de...
 firstRun_dataCorruptionWarning=Segue a aparecer a páxina esta? <a>Fai click aquí!</a>
-firstRun_acceptableAdsHeadline=A partir de agora os anuncios anoxantes seranche bloqueados
-firstRun_share=Cóntalle ós teus amigos
-firstRun_share_headline=<a>Bótanos unha man</a> para facer da rede un sitio mellor
-firstRun_feature_social_description=Eliminar de xeito automático os botóns de redes sociais como o "gústame" do Facebook, que aparecen nás páxinas web e rexistran o teu comportamento.
-firstRun_filterlistsReinitializedWarning=Semella que un problema facía que tódolos filtros fosen borrados e imposibles de restaurar. Polo tanto, tivemos que resetear os filtros e a configuración da "Publicidade Aceptable". Por favor bótalle un ollo á tua lista de filtros e á configuración de "Publicidade Aceptable" nas  <a>opcións do Adblock Plus</a>.
-firstRun_feature_malware_description=Fai mais seguro o teu navegador ó bloquear dominios con "malware".
-firstRun_features=O Adblock Plus faiche mais cousas que bloquear publicidade
 firstRun_donate=fai unha doazón
 firstRun_donate_label=Apoia ó noso proxecto
+firstRun_feature_malware=Bloquear malware
+firstRun_feature_malware_description=Fai mais seguro o teu navegador ó bloquear dominios con "malware".
 firstRun_feature_social=Eliminar os botóns das redes sociais
+firstRun_feature_social_description=Eliminar de xeito automático os botóns de redes sociais como o "gústame" do Facebook, que aparecen nás páxinas web e rexistran o teu comportamento.
+firstRun_feature_tracking=Desactivar o seguimento
+firstRun_feature_tracking_description=Navega de xeito privado ó desactivar o seguemento - agochando as túas trazas das compañías de publicidade que doutro xeito rexistrarían os teus movementos.
+firstRun_features=O Adblock Plus faiche mais cousas que bloquear publicidade
+firstRun_filterlistsReinitializedWarning=Semella que un problema facía que tódolos filtros fosen borrados e imposibles de restaurar. Polo tanto, tivemos que resetear os filtros e a configuración da "Publicidade Aceptable". Por favor bótalle un ollo á tua lista de filtros e á configuración de "Publicidade Aceptable" nas  <a>opcións do Adblock Plus</a>.
 firstRun_legacySafariWarning=Estás a empregar unha versión vella do Safari que xa non está mantida polo Adblock Plus. Podería non funcionar correctamente ou alterar a experiencia do usuario nalgunhas webs. Aconsellámosche que ou ben actualices ó Safari 6.1.1 ou superior (no OS X 10.8 Mountain Lion), ou ó Safari 7.0.1 ou superior (no OSX 10.9 Mavericks), ou empregues a última versión do Mozilla Firefox, do Google Chrome ou do Opera.
+firstRun_share=Cóntalle ós teus amigos
+firstRun_share_headline=<a>Bótanos unha man</a> para facer da rede un sitio mellor
+firstRun_title=O Adblock Plus foiche instalado
+firstRun_toggle_off=DESACTIVADO
+firstRun_toggle_on=ACTIVADO
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/gl/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/gl/overlay.dtd
index 7a68f62..3833961 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/gl/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/gl/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Sí">
 <!ENTITY notification.button.no "&amp;Non">
 <!ENTITY sync.label "Sin&amp;cronizar as opcións do Adblock Plus">
 <!ENTITY whitelist.site.label "Desactivar en ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "&amp;Informar dun problema nesta páxina">
 <!ENTITY whitelist.page.label "Desactivar só nesta páxina">
 <!ENTITY context.image.label "ABP - Bloquear a imaxe">
-<!ENTITY counthits.label "Co&amp;ntabilizar as veces que se usa cada filtro">
+<!ENTITY notification.button.yes "&amp;Sí">
 <!ENTITY opensidebar.label "A&amp;brir temas bloqueables">
 <!ENTITY notification.button.close "&amp;Pechar">
 <!ENTITY contribute.label "Apoquinar ó Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "ABP - Bloquear o marco">
 <!ENTITY blocked.tooltip "Elementos bloqueados nesta páxina:">
-<!ENTITY hideplaceholders.label "Agochar o espacio deixado po&amp;los elementos bloqueados">
+<!ENTITY counthits.label "Co&amp;ntabilizar as veces que se usa cada filtro">
 <!ENTITY showinstatusbar.label "Amosar na barra d&amp;e estado">
 <!ENTITY sidebar.title "Temas bloqueables na páxina actual">
 <!ENTITY options.label "&amp;Opcións">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/he/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/he/firstRun.properties
index b1b4799..0e6601d 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/he/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/he/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=גלשו באנונימיות בעזרת נטרול מעקב - הסתרת עקבותיכם מחברות המודעות אשר עוקבות אחר כל פעולה שלכם.
-firstRun_toggle_off=מכובה
-firstRun_feature_tracking=נטרול מעקב
-firstRun_feature_malware=חסימת תוכנות זדוניות
-firstRun_title=Adblock Plus הותקן 
 firstRun_acceptableAdsExplanation=אנחנו רוצים לעודד אתרים להשתמש בפרסום פשוט ולא בולט. זאת מדוע ביססנו <a>קווים מנחים נוקשים</a> כדי לזהות מודעות מתקבלות, אשר מופיעות בהגדרות ברירת המחדל. אם ברצונכם  לחסום בכל זאת את כל המודעות ניתן <a>לנטרל</a> זאת במספר שניות.
-firstRun_toggle_on=מופעל
+firstRun_acceptableAdsHeadline=מודעות מציקות ייחסמו מעכשיו
 firstRun_contributor_credits=קרדיטים לתורמים
 firstRun_dataCorruptionWarning=עמוד זה ממשיך להופיע ? <a>לחצו כאן!</a>
-firstRun_acceptableAdsHeadline=מודעות מציקות ייחסמו מעכשיו
-firstRun_share=ספרו לחבריכם ומשפחתכם
-firstRun_share_headline=<a>תנו לנו יד</a> בהפיכת הרשת למקום טוב יותר
-firstRun_features=Adblock Plus יכול לעשות יותר מרק לחסום פרסומות
-firstRun_feature_malware_description=הפכו את הגלישה שלכם למאובטחת יותר על ידי חסימת אתרים המכילים תוכנה זדונית.
-firstRun_feature_social_description=שחררו אוטומטית את חווית הגלישה שלכם מכפתורי מדיה חברתית, כגון Facebook Like, אשר מופיעים בעמודי אינטרנט ומנתרים את התנהגותכם.
 firstRun_donate=תרומה
 firstRun_donate_label=תמיכה בפרויקט שלנו
+firstRun_feature_malware=חסימת תוכנות זדוניות
+firstRun_feature_malware_description=הפכו את הגלישה שלכם למאובטחת יותר על ידי חסימת אתרים המכילים תוכנה זדונית.
 firstRun_feature_social=הסרת כפתורי מדיה חברתיים
+firstRun_feature_social_description=שחררו אוטומטית את חווית הגלישה שלכם מכפתורי מדיה חברתית, כגון Facebook Like, אשר מופיעים בעמודי אינטרנט ומנתרים את התנהגותכם.
+firstRun_feature_tracking=נטרול מעקב
+firstRun_feature_tracking_description=גלשו באנונימיות בעזרת נטרול מעקב - הסתרת עקבותיכם מחברות המודעות אשר עוקבות אחר כל פעולה שלכם.
+firstRun_features=Adblock Plus יכול לעשות יותר מרק לחסום פרסומות
+firstRun_filterlistsReinitializedWarning=נראה שישנה בעיה שגרמה לכל המסננים להימחק ולא היה ביכולתנו לגבות אותם. לכן נאלצנו לאפס את המסננים ואת הגדרות המודעות המקובלות. נא בדקו את רשימת המסננים והגדרות המודעות המקובלות ב <a>Adblock Plus אפשרויות</a>.
 firstRun_legacySafariWarning=הנכם משתמשים בגירסה ישנה של Safari שלא נתמכת על ידי Adblock Plus. זה עלול לא לעבוד כראוי או לשבש את חווית המשתמש בחלק מהאתרים. אנו ממליצים לכם לעדכן את Safari לגרסה 6.1.1 ומעלה (OS X 10.8 Mountain Lion) או Safari 7.0.1 ומעלה (OS X 10.9 Mavericks) או להשתמש בגרסה האחרונה של Mozilla Firefox, Google Chrome or Opera.
-firstRun_filterlistsReinitializedWarning=It seems that an issue caused all filters to be removed and we were unable to restore a backup. Therefore we had to reset your filters and Acceptable Ads settings. Please check your filter lists and Acceptable Ads settings in the <a>Adblock Plus options</a>.
+firstRun_share=ספרו לחבריכם ומשפחתכם
+firstRun_share_headline=<a>תנו לנו יד</a> בהפיכת הרשת למקום טוב יותר
+firstRun_title=Adblock Plus הותקן 
+firstRun_toggle_off=מכובה
+firstRun_toggle_on=מופעל
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/he/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/he/overlay.dtd
index 96b0652..01a63be 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/he/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/he/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;כן">
 <!ENTITY notification.button.no "&amp;לא">
 <!ENTITY sync.label "&amp;סנכרון הגדרות Adblock Plus">
 <!ENTITY whitelist.site.label "נטרול ב-?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "&amp;דיווח על בעיה בעמוד זה">
 <!ENTITY whitelist.page.label "נטרול בעמוד הזה בלבד">
 <!ENTITY context.image.label "Adblock Plus: חסימת תמונה">
-<!ENTITY counthits.label "מנה &amp;לחיצות מסנן">
+<!ENTITY notification.button.yes "&amp;כן">
 <!ENTITY opensidebar.label "&amp;פתיחת רשימת הפריטים לחסימה">
 <!ENTITY notification.button.close "&amp;סגירה">
 <!ENTITY contribute.label "תרום ל-Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: חסימת מסגרת (פריים)">
 <!ENTITY blocked.tooltip "פריטים חסומים בעמוד זה:">
-<!ENTITY hideplaceholders.label "הסתרת &amp;מצייני מקום של אלמנטים חסומים">
+<!ENTITY counthits.label "מנה &amp;לחיצות מסנן">
 <!ENTITY showinstatusbar.label "&amp;הצגה בשורת המצב">
 <!ENTITY sidebar.title "פריטים לחסימה בעמוד הנוכחי">
 <!ENTITY options.label "&amp;אפשרויות">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/hr/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/hr/firstRun.properties
index dad411a..4b0724d 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/hr/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/hr/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Surfajte privatno tako što ćete onemogućiti praćenje - skrivanjem od reklamnih kompanija koje prate vaš svaki pokret.
-firstRun_toggle_off=ISKLJUČI
-firstRun_feature_tracking=Onemogućavanje praćenja
-firstRun_feature_malware=Blokiranje malwara
-firstRun_title=Adblock Plus je instaliran
-firstRun_toggle_on=UKLJUČI
 firstRun_acceptableAdsExplanation=Želimo podupirati web stranice da koriste pošteno, nenametljivo reklamiranje. Zato smo uspostavili <a>točne smjernice</a> za prepoznavanje reklama, koje su prikazane prema uobičajenim postavkama. Ako još uvijek želite blokirati svaku reklamu to možete <a>onemogućiti</a> za nekoliko sekuondis.
+firstRun_acceptableAdsHeadline=Naporni oglasi će sada biti blokirani
 firstRun_contributor_credits=Zasluge doprinositelja
 firstRun_dataCorruptionWarning=Nastavlja li se ova stranica pojavljivati? <a>Kliknite ovdje!</a>
-firstRun_acceptableAdsHeadline=Naporni oglasi će sada biti blokirani
-firstRun_share=Recite svojim prijateljima
-firstRun_share_headline=<a>Pomognite nam</a> pri stvaranju Interneta boljim mjestom
-firstRun_feature_social_description=Automatski oslobodite svoje surfanje internetom od napornih tipki društvenih mreža poput Facebook 'Sviđa mi se' tipke, koji se pojavljuju na web stranicama i prati vaše ponašanje.
-firstRun_filterlistsReinitializedWarning=Izgleda da je greška uzrokovala uklanjanje svih filtra, a mi smo u nemogućnosti da ih vratimo. Zato smo postavili na početne postavke vaših filtra i prihvatljivih reklama. Provjerite postavke vaših popisa filtra i prihvatljivih reklama u <a>Adblock Plus mogućnostima</a>.
-firstRun_feature_malware_description=Učinite vaše surfanje Internetom sigurnijim blokiranjem poznatih malvare domena.
-firstRun_features=Adblock Plus može učiniti mnogo više nego samo blokirati reklame
 firstRun_donate=donirajte
 firstRun_donate_label=Podržite naš projekt
+firstRun_feature_malware=Blokiranje malwara
+firstRun_feature_malware_description=Učinite vaše surfanje Internetom sigurnijim blokiranjem poznatih malvare domena.
 firstRun_feature_social=Uklanjanje tipki društvenih mreža
+firstRun_feature_social_description=Automatski oslobodite svoje surfanje internetom od napornih tipki društvenih mreža poput Facebook 'Sviđa mi se' tipke, koji se pojavljuju na web stranicama i prati vaše ponašanje.
+firstRun_feature_tracking=Onemogućavanje praćenja
+firstRun_feature_tracking_description=Surfajte privatno tako što ćete onemogućiti praćenje - skrivanjem od reklamnih kompanija koje prate vaš svaki pokret.
+firstRun_features=Adblock Plus može učiniti mnogo više nego samo blokirati reklame
+firstRun_filterlistsReinitializedWarning=Izgleda da je greška uzrokovala uklanjanje svih filtra, a mi smo u nemogućnosti da ih vratimo. Zato smo postavili na početne postavke vaših filtra i prihvatljivih reklama. Provjerite postavke vaših popisa filtra i prihvatljivih reklama u <a>Adblock Plus mogućnostima</a>.
 firstRun_legacySafariWarning=Koristite stariju inačicu Safarija koja ne podržava Adblock Plus. Možda neće ispravno raditi ili može narušiti korisničko iskustvo na nekim web stranicama. Stoga vam preporučamo nadogradnju na Safari 6.1.1 ili noviju inačicu (dostupnu za Mac OS X 10.8 Mountain Lion), ili Safari 7.0.1 ili noviju inačicu (za OS X 10.9 Mavericks), ili koristite najnoviju inačicu Mozilla Firefoxa, Google Chroma ili Opere.
+firstRun_share=Recite svojim prijateljima
+firstRun_share_headline=<a>Pomognite nam</a> pri stvaranju Interneta boljim mjestom
+firstRun_title=Adblock Plus je instaliran
+firstRun_toggle_off=ISKLJUČI
+firstRun_toggle_on=UKLJUČI
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/hr/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/hr/overlay.dtd
index cf53e9f..a7dd691 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/hr/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/hr/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Da">
 <!ENTITY notification.button.no "&amp;Ne">
 <!ENTITY sync.label "Sinkroniziraj Adblo&amp;ck Plus postavke">
 <!ENTITY whitelist.site.label "Onemogući na ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "P&amp;rijavite problem na ovoj stranici">
 <!ENTITY whitelist.page.label "Onemogući samo na ovoj stranici">
 <!ENTITY context.image.label "Blokiraj sliku s Adblock Plus-om">
-<!ENTITY counthits.label "Broji pogodke fil&amp;tera">
+<!ENTITY notification.button.yes "&amp;Da">
 <!ENTITY opensidebar.label "Otvori &amp;blokirane stavke">
 <!ENTITY notification.button.close "&amp;Zatvori">
 <!ENTITY contribute.label "Doprinesite Adblock Plus-u">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Blokiraj okvir s Adblock Plus-om">
 <!ENTITY blocked.tooltip "Blokirane stavke na ovoj stranici:">
-<!ENTITY hideplaceholders.label "Sakrij rezervirana mjesta b&amp;lokiranih elemenata">
+<!ENTITY counthits.label "Broji pogodke fil&amp;tera">
 <!ENTITY showinstatusbar.label "Prikaži u &amp;statusnoj traci">
 <!ENTITY sidebar.title "Stavke koje se mogu blokirati na trenutnoj stranici">
 <!ENTITY options.label "M&amp;ogućnosti">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/hsb/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/hsb/firstRun.properties
index de870d3..46a529d 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/hsb/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/hsb/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Přehladujće priwatnje znjemóžnjejo slědowanje resp. chowajo swoje slědy před wabjenskimi předewzaćemi, kotrež bychu rady kóždy z wašich pohibow slědowali.
-firstRun_toggle_off=WUPINJENY
-firstRun_feature_tracking=Slědowanje znjemóžnić
-firstRun_feature_malware=Škódnu softwaru blokować
-firstRun_title=Adblock Plus je so instalował
 firstRun_acceptableAdsExplanation=Bychmy rady websydła pozbudźili, sprawne, decentne wabjenje wužiwać. Tohodla smy <a>krute směrnicy</a> postajili, zo bychmy akceptabelne wabjenje identifikowali, kotrež so w standardnych nastajenjach pokazuje. Jeli chceće najebać toho wšo wabjenje blokować, móžeće jo wob mało sekundow <a>znjemóžnić</a>.
-firstRun_toggle_on=ZAPINJENY
+firstRun_acceptableAdsHeadline=Mjerzaca reklama budźe so nětko blokować
 firstRun_contributor_credits=Dźakprajenje sobuskutkowacym
 firstRun_dataCorruptionWarning=Pokazuje so tuta strona dale? <a>Klikńće tu!</a>
-firstRun_acceptableAdsHeadline=Mjerzaca reklama budźe so nětko blokować
-firstRun_share=Informujće swojich přećelow
-firstRun_share_headline=<a>Podajće nam ruku</a>, zo bychmy web k lěpšemu městnu činili
-firstRun_features=Adblock Plus móže wjace činić hač wabjenje blokować
-firstRun_feature_malware_description=Čińće swoje přehladowanje wěsćiše blokujo znate domeny złomyslneje softwary.
-firstRun_feature_social_description=Wotstrońće swoju přehladowansku aktiwitu z tłóčatkow socialnych medijow, kaž na př. tłóčatka "Lubi so mi" na Facebooku, kotrež so na webstronach jewja a waše zadźerženje slěduja.
 firstRun_donate=darić
 firstRun_donate_label=Podpěrajće naš projekt
+firstRun_feature_malware=Škódnu softwaru blokować
+firstRun_feature_malware_description=Čińće swoje přehladowanje wěsćiše blokujo znate domeny złomyslneje softwary.
 firstRun_feature_social=Tłóčatka za socialne medije wotstronić
+firstRun_feature_social_description=Wotstrońće swoju přehladowansku aktiwitu z tłóčatkow socialnych medijow, kaž na př. tłóčatka "Lubi so mi" na Facebooku, kotrež so na webstronach jewja a waše zadźerženje slěduja.
+firstRun_feature_tracking=Slědowanje znjemóžnić
+firstRun_feature_tracking_description=Přehladujće priwatnje znjemóžnjejo slědowanje resp. chowajo swoje slědy před wabjenskimi předewzaćemi, kotrež bychu rady kóždy z wašich pohibow slědowali.
+firstRun_features=Adblock Plus móže wjace činić hač wabjenje blokować
+firstRun_filterlistsReinitializedWarning=Zda so, zo problem je zawinował, zo wšě filtry su so wotstronili a my njemóžachmy zawěsćenje wobnowić. Tohodla dyrbjachmy waše filtry a nastajenja za akceptabelne wabjenje wróćo stajić. Prošu přepruwujće swoje filtrowe lisćiny a nastajenja za akceptabelne wabjenje w <a>nastajenjach Adblock Plus</a>.
 firstRun_legacySafariWarning=Wužiwaće staru wersiju Safari, kotraž se přez Adblock Plus njepodpěruje. Wón njebudźe snano korektnje fungować abo wužiwarske dožiwjenje na wěstach websydłach kazyć. Poručujemy wuraznje, zo pak aktualizujeće na Safari 6.1.1 abo wyši (k dispoziciji za Mac OS X 10.8 Lion) abo na Safari 7.0.1 abo wyši (na OS X 10.9 Mavericks) pak wužiwaće najnowšu wersiju Mozilla Firefox, Google Chrome abo Opera.
-firstRun_filterlistsReinitializedWarning=It seems that an issue caused all filters to be removed and we were unable to restore a backup. Therefore we had to reset your filters and Acceptable Ads settings. Please check your filter lists and Acceptable Ads settings in the <a>Adblock Plus options</a>.
+firstRun_share=Informujće swojich přećelow
+firstRun_share_headline=<a>Podajće nam ruku</a>, zo bychmy web k lěpšemu městnu činili
+firstRun_title=Adblock Plus je so instalował
+firstRun_toggle_off=WUPINJENY
+firstRun_toggle_on=ZAPINJENY
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/hsb/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/hsb/overlay.dtd
index 1b480b2..cd368ff 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/hsb/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/hsb/overlay.dtd
@@ -1,24 +1,23 @@
-<!ENTITY notification.button.yes "&amp;Haj">
 <!ENTITY notification.button.no "&amp;Ně">
 <!ENTITY sync.label "Nastajenja Adblo&amp;ck Plus synchronizować">
 <!ENTITY whitelist.site.label "Na ?1? znjemóžnić">
 <!ENTITY filters.label "&amp;Filtrowe nastajenja">
 <!ENTITY disable.label "Wšudźe znjemóžnić">
 <!ENTITY objecttab.title "Blokować">
-<!ENTITY objecttab.tooltip "Klikńće sem, zo byšće tutón objekt z pomcu Adblock Plus blokował">
+<!ENTITY objecttab.tooltip "Klikńće sem, zo byšće tutón objekt z pomocu Adblock Plus blokował">
 <!ENTITY menuitem.label "Na&amp;stajenja Adblock Plus">
 <!ENTITY objecttabs.label "Rajtarki wo Flash a Ja&amp;va pokazać">
 <!ENTITY sendReport.label "&amp;Problem na tutej stronje zdźělić">
 <!ENTITY whitelist.page.label "Jenož na tutej stronje znjemóžnić">
 <!ENTITY context.image.label "Adblock Plus: Wobraz blokować">
-<!ENTITY counthits.label "&amp;Filtrowe wotpowědniki ličić">
+<!ENTITY notification.button.yes "&amp;Haj">
 <!ENTITY opensidebar.label "Blo&amp;kujomne elementy wočinić">
 <!ENTITY notification.button.close "&amp;Začinić">
 <!ENTITY contribute.label "K Adblock Plus přinošować">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Wobłuk blokować">
 <!ENTITY blocked.tooltip "Zablokowane elementy na tutej stronje:">
-<!ENTITY hideplaceholders.label "&amp;Městodźeržićele zablokowanych elementow schować">
+<!ENTITY counthits.label "&amp;Filtrowe wotpowědniki ličić">
 <!ENTITY showinstatusbar.label "W &amp;statusowej lajsće pokazać">
 <!ENTITY sidebar.title "Blokujomne elementy na aktualnej stronje">
 <!ENTITY options.label "&amp;Opcije">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/hu/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/hu/firstRun.properties
index 8a3d609..4c2d8ab 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/hu/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/hu/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Böngésszen privátban azáltal, hogy letiltja a követést - elrejtheti nyomait a reklámcégek elől, amelyek egyébként figyelnék minden lépését.
-firstRun_toggle_off=KIKAPCSOLVA
-firstRun_feature_tracking=Követés letiltása
-firstRun_feature_malware=Rosszindulatú kódok blokkolása
-firstRun_title=Sikeresen telepítette az Adblock Plus-t
-firstRun_toggle_on=BEKAPCSOLVA
 firstRun_acceptableAdsExplanation=Szeretnénk arra biztatni a weboldalakat, hogy egyértelmű, nem tolakodó hirdetéseket használjanak. Ezért hoztunk létre <a>szigorú irányelveket</a>, amelyek segítségével azonosíthatók az elfogadható hirdetések, amelyek az alapbeállítások között találhatók meg. Ha ennek ellenére minden hirdetést <a>blokkolni</a> szeretne, ezt továbbra is megteheti mindössze néhány másodperc alatt.
+firstRun_acceptableAdsHeadline=A bosszantó hirdetések mostantól blokkolva lesznek
 firstRun_contributor_credits=Hozzájárulók névsora
 firstRun_dataCorruptionWarning=Állandóan megjelenik ez az oldal? <a>Kattintson ide!</a>
-firstRun_acceptableAdsHeadline=A bosszantó hirdetések mostantól blokkolva lesznek
-firstRun_share=Mondja el barátainak
-firstRun_share_headline=<a>Segítsen nekünk</a> jobb hellyé tenni a világhálót
-firstRun_feature_social_description=Automatikusan szabaduljon meg a közösségi médiával kapcsolatos gomboktól, mint például a facebook "Tetszik" gombja, amelyek a weboldalakon jelennek meg és figyelik az Ön szokásait.
-firstRun_filterlistsReinitializedWarning=Egy hiba miatt az összes szűrő eltávolításra került és a biztonsági másolatot sem sikerült visszaállítani. Az összes szűrő és az elfogadható hirdetések beállításai alapállapotba kerültek. Kérem ellenőrizze a szűrő listákat és az elfogadható hirdetések beállításait az <a>Adblock Plus opció</a> közt.
-firstRun_feature_malware_description=Tegye a böngészést biztonságosabbá azáltal, hogy letiltja az ismert malware címeket.
-firstRun_features=Az Adblock Plus a reklámok blokkolásánál többre is képes
 firstRun_donate=adományozás
 firstRun_donate_label=A projekt támogatása
+firstRun_feature_malware=Rosszindulatú kódok blokkolása
+firstRun_feature_malware_description=Tegye a böngészést biztonságosabbá azáltal, hogy letiltja az ismert malware címeket.
 firstRun_feature_social=Közösségi oldalak gombjainak eltávolítása
+firstRun_feature_social_description=Automatikusan szabaduljon meg a közösségi médiával kapcsolatos gomboktól, mint például a facebook "Tetszik" gombja, amelyek a weboldalakon jelennek meg és figyelik az Ön szokásait.
+firstRun_feature_tracking=Követés letiltása
+firstRun_feature_tracking_description=Böngésszen privátban azáltal, hogy letiltja a követést - elrejtheti nyomait a reklámcégek elől, amelyek egyébként figyelnék minden lépését.
+firstRun_features=Az Adblock Plus a reklámok blokkolásánál többre is képes
+firstRun_filterlistsReinitializedWarning=Egy hiba miatt az összes szűrő eltávolításra került és a biztonsági másolatot sem sikerült visszaállítani. Az összes szűrő és az elfogadható hirdetések beállításai alapállapotba kerültek. Kérem ellenőrizze a szűrő listákat és az elfogadható hirdetések beállításait az <a>Adblock Plus opció</a> közt.
 firstRun_legacySafariWarning=A Safari egy régi verzióját használja, amelyet nem támogat az Adblock Plus. Lehetséges, hogy nem fog megfelelően működni vagy lelassítja a működést egyes weboldalakon. Erősen ajánlott frissíteni a Safari 6.1.1-es (Mac OS X 10.8 Mountain Lion operációs rendszeren) , vagy a Safari 7.0.1-es és újabb verzióira (OS X 10.9 Maverics operációs rendszertől) vagy használja a Mozilla Firefox, Google Chrome vagy Opera legújabb verzióját.
+firstRun_share=Mondja el barátainak
+firstRun_share_headline=<a>Segítsen nekünk</a> jobb hellyé tenni a világhálót
+firstRun_title=Sikeresen telepítette az Adblock Plus-t
+firstRun_toggle_off=KIKAPCSOLVA
+firstRun_toggle_on=BEKAPCSOLVA
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/hu/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/hu/overlay.dtd
index f60fae1..9e5fa9e 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/hu/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/hu/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Igen">
 <!ENTITY notification.button.no "&amp;Nem">
 <!ENTITY sync.label "Adblock Plus beállítások s&amp;zinkronizálása">
 <!ENTITY whitelist.site.label "Szűrés tiltása itt: ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "Hibás webhel&amp;y bejelentése">
 <!ENTITY whitelist.page.label "Szűrés tiltása csak ezen az aloldalon">
 <!ENTITY context.image.label "Kép blokkolása">
-<!ENTITY counthits.label "&amp;Szűrő találati statisztika mentése">
+<!ENTITY notification.button.yes "&amp;Igen">
 <!ENTITY opensidebar.label "Blokkolható ob&amp;jektumok megjelenítése">
 <!ENTITY notification.button.close "&amp;Bezárás">
 <!ENTITY contribute.label "Közreműködés az Adblock Plus-hoz">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Keret blokkolása">
 <!ENTITY blocked.tooltip "Blokkolt objektumok ezen az oldalon:">
-<!ENTITY hideplaceholders.label "Letiltott elemek &amp;helyőrzőinek elrejtése">
+<!ENTITY counthits.label "&amp;Szűrő találati statisztika mentése">
 <!ENTITY showinstatusbar.label "Megje&amp;lenítés az állapotsoron">
 <!ENTITY sidebar.title "Blokkolható objektumok">
 <!ENTITY options.label "&amp;Opciók">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/hu/sendReport.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/hu/sendReport.dtd
index e9477ed..3647704 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/hu/sendReport.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/hu/sendReport.dtd
@@ -26,7 +26,7 @@
 <!ENTITY recentReports.label "Legutóbb beküldött jelentések">
 <!ENTITY typeWarning.description "Ön azt a lehetőséget választotta, hogy a hiba az Adblock Plus-szal van és nem a szűrőkkel. Kérem vegye figyelembe, hogy az ilyen hibákat célszerűbb az [link]Adblock Plus fórumon[/link] bejelenteni. Csak akkor használja így a hibajelentőt, ha egy meglévő szálhoz szeretne hozzátenni, és a jelentésben tüntesse fel a hozzá tartozó hivatkozást is. Az automatikusan generált hivatkozás a jelentés beküldése után áll majd rendelkezésre.">
 <!ENTITY issues.disabled.description "Az Adblock Plus le van tiltva, így nem tud semmit blokkolni.">
-<!ENTITY attachExtensions.label "Engedélyezett k&amp;iterjesztések listájának csatolása, arra az esetre, ha a kiterjesztések közti ütközésekből adódik a probléma">
+<!ENTITY attachExtensions.label "A kiterjesztések közti ütközésekből adódó probléma esetén, csatolja a jelentéshez az aktív k&amp;iterjesztések listáját">
 <!ENTITY issues.nosubscriptions.add.label "Feliratkozás szűrőre">
 <!ENTITY issues.disabledfilters.enable.label "Szűrő engedélyezése">
 <!ENTITY issues.override.label "A kon&amp;figuráció megfelelő, bejelentés folytatása">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/hy-AM/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/hy-AM/firstRun.properties
index 6206ba5..4317100 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/hy-AM/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/hy-AM/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Այցելեք ինտերնետ անանուն՝ թաքցնելով Ձեր տվյալները, որոնցից օգտվում են որոշ կազմակերպություններ։
-firstRun_toggle_off=ԱՆՋ
-firstRun_feature_tracking=Անջատել թրեքինգը
-firstRun_feature_malware=Վիրուսի արգելում
-firstRun_title=Վերջ! կարող էք օգտվել Adblock-ից
 firstRun_acceptableAdsExplanation=Մենք թույլատրում ենք <a>որոշ կայքերի</a> գովազդը, որովհետև գիտենք, որ նրանք հաճելի գովազդ են օգտագործում։ Եթե Դուք չեք ցանկանում դրանք տեսնել, կարող եք <a>անջատել</a> դրանք շատ հեշտ։
-firstRun_toggle_on=ՄԻԱՑ
+firstRun_acceptableAdsHeadline=Վատ գովազդներն այժմ արգելված են
 firstRun_contributor_credits=Ծրագրի հեղինակները
 firstRun_dataCorruptionWarning=Արդյոք այս էջը ցուցադրվում է? <a>Սեղմեք այստեղ!</a>
-firstRun_acceptableAdsHeadline=Վատ գովազդներն այժմ արգելված են
-firstRun_share=Պատմեք ընկերներին
-firstRun_share_headline=<a>Մեզ օգնեք</a> դարձնելու ինտերնետն ավելի լավ վայր
-firstRun_features=Adblock Plus ավելին կարող է անել
-firstRun_feature_malware_description=Անվտանգ դարձնել Ձեր համակարգիչն արգելելով վիրուս-դոմենները։
-firstRun_feature_social_description=Ավտոմատ արագացնել աշխատանքը արգելափակելով սոց․ ցանցերի կոճակները, օրինակ՝ Facebook Like, որը գալիս է կայքերում և հետևում Ձեզ։
 firstRun_donate=նվիրաբերել
 firstRun_donate_label=Օգնեք մեր ծրագրին
+firstRun_feature_malware=Վիրուսի արգելում
+firstRun_feature_malware_description=Անվտանգ դարձնել Ձեր համակարգիչն արգելելով վիրուս-դոմենները։
 firstRun_feature_social=Հեռացնել սոց․ ցանցերի կոճակները
+firstRun_feature_social_description=Ավտոմատ արագացնել աշխատանքը արգելափակելով սոց․ ցանցերի կոճակները, օրինակ՝ Facebook Like, որը գալիս է կայքերում և հետևում Ձեզ։
+firstRun_feature_tracking=Անջատել թրեքինգը
+firstRun_feature_tracking_description=Այցելեք ինտերնետ անանուն՝ թաքցնելով Ձեր տվյալները, որոնցից օգտվում են որոշ կազմակերպություններ։
+firstRun_features=Adblock Plus ավելին կարող է անել
 firstRun_legacySafariWarning=Դուք օգտագործում եք Safari հին տարբերակ, որտեղ Adblock Plus չի աշխատում կամ վատ է աշխատում։ Մենք խորհուրդ ենք տեղադրել Safari 6.1.1 կամ ավելի բարձր տարբերակ (OS X 10.8 Mountain Lion-ում) կամ Safari 7.0.1 և բարձր (OS X 10.9 Mavericks-ում), իսկ եթե ոչ օգտագործեք Mozilla Firefox, Google Chrome կամ Opera։
+firstRun_share=Պատմեք ընկերներին
+firstRun_share_headline=<a>Մեզ օգնեք</a> դարձնելու ինտերնետն ավելի լավ վայր
+firstRun_title=Վերջ! կարող էք օգտվել Adblock-ից
+firstRun_toggle_off=ԱՆՋ
+firstRun_toggle_on=ՄԻԱՑ
 firstRun_filterlistsReinitializedWarning=It seems that an issue caused all filters to be removed and we were unable to restore a backup. Therefore we had to reset your filters and Acceptable Ads settings. Please check your filter lists and Acceptable Ads settings in the <a>Adblock Plus options</a>.
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/hy-AM/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/hy-AM/overlay.dtd
index 23482ce..e3ff0ef 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/hy-AM/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/hy-AM/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Այո">
 <!ENTITY notification.button.no "&amp;Ոչ">
 <!ENTITY sync.label "&amp;Սինքրոնացնել Adblock Plus-ի նախընտրանքները">
 <!ENTITY whitelist.site.label "Անջատել ?1?-ում">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "Տեղեկացնել այս էջի պրոբլեմի մասին (&amp;R)">
 <!ENTITY whitelist.page.label "Անջատել միայն այս էջի համար">
 <!ENTITY context.image.label "Adblock` Ֆիլտրել Նկարը">
-<!ENTITY counthits.label "Հաշվել ֆիլտրի ստատիստիկան (&amp;h)">
+<!ENTITY notification.button.yes "&amp;Այո">
 <!ENTITY opensidebar.label "Բացել ֆիլ&amp;տրվող տարրերը">
 <!ENTITY notification.button.close "&amp;Փակել">
 <!ENTITY contribute.label "Աջակցել Adblock Plus-ին">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock` Ֆիլտրել Ֆրեյմը">
 <!ENTITY blocked.tooltip "Այս էջի ֆիլտրված տարրերը`">
-<!ENTITY hideplaceholders.label "Ցույց չտալ արգելված էլեմենտների տեղը">
+<!ENTITY counthits.label "Հաշվել ֆիլտրի ստատիստիկան (&amp;h)">
 <!ENTITY showinstatusbar.label "Ցույց տալ &amp;վիճակի տողում">
 <!ENTITY sidebar.title "Այս էջի ֆիլտրվող տարրերը">
 <!ENTITY options.label "&amp;Ընտրանքներ">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/hy-AM/sendReport.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/hy-AM/sendReport.dtd
index 28dfde3..1687bb7 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/hy-AM/sendReport.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/hy-AM/sendReport.dtd
@@ -26,7 +26,7 @@
 <!ENTITY recentReports.label "Ձեր վերջին ներկայացված հաղորդագրությունները">
 <!ENTITY typeWarning.description "Դուք ցանկանում եք հայտնել Adblock Plus-ի պրոբլեիմի մասին, ոչ թե կապված ֆիլտրերի հետ: Խնդրում ենք նկատի ունենալ, որ նման հարցերի մասին տեղեկացնելու լավագույն տեղը 	[link]Adblock Plus ֆորում[/link]-ն է: Դուք պետք է օգտվեք այս միջոցից միայն քննարկումը շարունակելու համար, քանի որ ոչ ոք չի նկատի Ձեր զեկույցը եթե Դուք չտրամադրեք հղում են դեպի այն: Ավտոմատ կերպով գեներացված հղում կտրամադրվի զեկույցը ներկայացնելուց հետո:">
 <!ENTITY issues.disabled.description "Adblock Plus-ը անջատված է, այն չի արգելափակում որեւէ բան այս վիճակում:">
-<!ENTITY attachExtensions.label "Ամրացնել ակտիվ ավելացումների ցուցակը զեկույցին, այն դեպքի համար եթե ավելացնումները խնդրի պատճառ են:">
+<!ENTITY attachExtensions.label "Ամրացնել ակտիվ ավելացումների ցուցակը զեկույցին, այն դեպքի համար եթե ավելացնումները խնդրի պատճառ են">
 <!ENTITY issues.nosubscriptions.add.label "Ավելացնել ֆիլտրի բաժանորդագրություն">
 <!ENTITY issues.disabledfilters.enable.label "Միացնել ֆիլտրը">
 <!ENTITY issues.override.label "Կոնֆիգուրացիան ճիշտ է, շարունակել հայտնել խնդրի մասին">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/id/composer.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/id/composer.dtd
index 867e6ca..1b0db70 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/id/composer.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/id/composer.dtd
@@ -1,33 +1,33 @@
 <!ENTITY anchor.end.label "&amp;pada akhir dari alamat">
-<!ENTITY domainRestriction.label "Membatasi pada &amp; domain:">
-<!ENTITY collapse.default.no.label "Gunakan default (tidak)">
-<!ENTITY firstParty.label "&amp;Hanya untuk pihak pertama">
-<!ENTITY preferences.label "&amp;Tampilkan filter yang ada...">
+<!ENTITY domainRestriction.label "Terbatas pada &amp;domain:">
+<!ENTITY collapse.default.no.label "Gunakan aturan baku (tidak)">
+<!ENTITY firstParty.label "Hanya pihak &amp;pertama">
+<!ENTITY preferences.label "&amp;Tampilkan penyaring yang ada...">
 <!ENTITY pattern.label "Mencari pola">
 <!ENTITY thirdParty.label "Hanya pihak ke&amp;tiga">
-<!ENTITY filter.label "&amp;Tapis baru:">
-<!ENTITY collapse.label "&amp;tutup yang diblokir:">
-<!ENTITY match.warning "Pola yang Anda masukkan tidak lagi cocok dengan masuk daftar alamat yang akan diblokir/daftar putih dan tidak akan berpengaruh sama sekali.">
-<!ENTITY anchor.start.label "&amp;pada awal alamat">
-<!ENTITY matchCase.label "&amp;Sama persis">
-<!ENTITY custom.pattern.label "&amp;Kustom:">
-<!ENTITY unselectAllTypes.label "Tidak memilih apapun">
-<!ENTITY type.whitelist.label "Aturan p&amp;engabaian">
-<!ENTITY regexp.warning "Pola yang Anda masukkan akan dianggap sebagai regular expression yang tidak akan efisien untuk dapat diproses oleh Adblock Plus dan mungkin akan memperlambat pengalaman browsing Anda. Jika Anda tidak berniat untuk menggunakan regular expression, tambahkan tanda bintang (*) diakhir pola.">
-<!ENTITY dialog.title "Tambah aturan filter Adblock Plus">
+<!ENTITY filter.label "&amp;Penyaring baru:">
+<!ENTITY collapse.label "&amp;Ciutkan yang dicekal:">
+<!ENTITY match.warning "Pola yang Anda masukkan tidak lagi cocok dengan alamat yang akan diblokir/dimasukkan dalam daftar putih dan tidak akan berpengaruh sama sekali.">
+<!ENTITY anchor.start.label "pada &amp;awal alamat">
+<!ENTITY matchCase.label "&amp;Cocokkan kapitalisasi">
+<!ENTITY custom.pattern.label "Kustomisasi:">
+<!ENTITY unselectAllTypes.label "Jangan pilih apapun">
+<!ENTITY type.whitelist.label "Aturan pen&amp;gecualian">
+<!ENTITY regexp.warning "Pola yang Anda masukkan akan dianggap sebagai suatu regular expression yang tidak dapat diproses secara efisien oleh Adblock Plus dan mungkin akan memperlambat peramban Anda. Jika Anda tidak berniat untuk menggunakan regular expression, tambahkan tanda bintang (*) di akhir pola.">
+<!ENTITY dialog.title "Tambah aturan penyaring Adblock Plus">
 <!ENTITY basic.label "Tampilan dasar">
-<!ENTITY type.filter.label "&amp;Filter yang diblokir">
+<!ENTITY type.filter.label "filter pemblokiran">
 <!ENTITY types.label "Terapkan untuk jenis:">
-<!ENTITY shortpattern.warning "Pola yang Anda masukkan terlalu pendek untuk dapat disempurnakan dan mungkin memperlambat pengalaman berselancar Anda. Anda disarankan untuk memilih lagi karakter yang lebih panjang untuk saringan ini untuk memungkinkan Adblock Plus mengolah saringan agar lebih efisien.">
+<!ENTITY shortpattern.warning "Pola yang Anda masukkan terlalu pendek untuk dapat dioptimalkan dan mungkin akan memperlambat peramban Anda. Kami menyarankan agar Anda memilih kata yang lebih panjang untuk penyaring ini sehingga memungkinkan Adblock Plus memproses penyaring tersebut dengan lebih efisien.">
 <!ENTITY collapse.yes.label "Ya">
 <!ENTITY anchors.label "Hanya menerima pola:">
-<!ENTITY collapse.default.yes.label "Gunakan default (Ya)">
-<!ENTITY domainRestriction.help "Gunakan pilihan ini untuk menentukan satu atau lebih domain yang dipisahkan oleh sebuah garis bar(|). Filter hanya akan diterapkan pada domain yang dipilih. Sebuah tilde (~) sebelum nama domain menunjukkan bahwa filter tidak akan diterapkan pada domain tersebut.">
+<!ENTITY collapse.default.yes.label "Gunakan aturan baku (ya)">
+<!ENTITY domainRestriction.help "Gunakan opsi ini untuk menentukan satu atau lebih domain yang dipisahkan oleh sebuah garis batang (|). Penyaring hanya akan diterapkan pada domain yang dipilih. Sebuah tanda tilda (~) sebelum nama domain menunjukkan bahwa penyaring tidak akan diterapkan pada domain tersebut.">
 <!ENTITY accept.label "Tambahkan filter">
 <!ENTITY options.label "Pilihan">
-<!ENTITY disabled.warning "Adblock Plus sedang dimatikan. Anda masih dapat menambahkan filter tetapi mereka tidak akan diterapkan kecuali Anda [link] mengaktifkan Adblock Plus [/link].">
-<!ENTITY anchor.start.flexible.label "&amp;pada awal nama domain">
+<!ENTITY disabled.warning "Adblock Plus saat ini sedang dinonaktifkan. Anda masih bisa menambahkan penyaring namun penyaring tersebut tidak akan diterapkan hingga Anda [link]mengaktifkan Adblock Plus[/link].">
+<!ENTITY anchor.start.flexible.label "pada &amp;awal nama domain">
 <!ENTITY collapse.no.label "Tidak">
-<!ENTITY selectAllTypes.label "Pilih Semua">
+<!ENTITY selectAllTypes.label "Pilih semua">
 <!ENTITY advanced.label "Tampilan lanjutan">
-<!ENTITY pattern.explanation "Pola dapat menjadi bagian dari alamat; tanda bintang (*) bertindak sebagai wildcard. Filter hanya akan diterapkan ke alamat yang cocok dengan pola yang diberikan.">
+<!ENTITY pattern.explanation "Pola dapat berupa bagian apapun dari suatu alamat; tanda bintang (*) bertindak sebagai wildcard. Penyaring hanya akan diterapkan ke alamat-alamat yang cocok dengan pola yang telah disediakan.">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/id/filters.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/id/filters.dtd
index 6136b99..3a5de86 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/id/filters.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/id/filters.dtd
@@ -1,72 +1,74 @@
-<!ENTITY restore.custom.warning "Semua penyesuaian penyaring Anda akan digantikan oleh isi berkas yang dipilih. Apakah Anda ingin memproses?">
-<!ENTITY slow.column "Penyaring Slo&amp;w">
-<!ENTITY enabled.column "Hidupka&amp;n">
-<!ENTITY subscription.lastDownload.checksumMismatch "Gagal, checksum berbeda">
+<!ENTITY restore.custom.warning "Semua penyaring ubahsuaian Anda akan diganti dengan isi dari berkas terpilih. Apakah Anda ingin melanjutkan?">
+<!ENTITY slow.column "Penyaring yang &amp;lambat">
+<!ENTITY enabled.column "&amp;Diaktifkan">
+<!ENTITY subscription.lastDownload.checksumMismatch "Gagal, checksum tidak cocok">
 <!ENTITY noFiltersInGroup.text "Kelompok yang dipilih kosong.">
 <!ENTITY subscription.actions.label "Tindakan">
-<!ENTITY filter.selectAll.label "Pilih semua">
-<!ENTITY backupButton.label "&amp;Cadangan dan Pengembalian">
-<!ENTITY restore.minVersion.warning "Peringatan: berkas telah dibuat dengan versi Adblock Plus yang lebih baru. Anda harus memperbarui ke versi Adblock Plus terbaru sebelum mengembalikan dari berkas ini.">
-<!ENTITY restore.error "Data berkas tidak bisa diproses, mungkin ini bukan berkas cadangan Adblock Plus?">
-<!ENTITY sort.ascending.label "Urutkan dari A &gt; Z">
-<!ENTITY sort.label "&amp;Urutkan dari">
+<!ENTITY filter.selectAll.label "Pilih Semua">
+<!ENTITY backupButton.label "&amp;Cadangkan dan Pulihkan">
+<!ENTITY restore.minVersion.warning "Peringatan: berkas ini dibuat dengan Adblock Plus versi baru. Anda harus memutakhirkan Adblock Plus ke versi terbaru sebelum memulihkan dari berkas ini.">
+<!ENTITY restore.error "Data berkas tidak dapat diproses, mungkin ini bukan berkas cadangan Adblock Plus?">
+<!ENTITY sort.ascending.label "Urutan &amp;A &gt; Z">
+<!ENTITY sort.label "&amp;Urutkan menurut">
 <!ENTITY subscription.source.label "Daftar penyaring">
 <!ENTITY hitcount.column "Sasaran">
-<!ENTITY noFilters.text "Anda belum memiliki penyesuaian penyaring apapun.">
-<!ENTITY backup.custom.title "Hanya penyesuaian penyaring">
-<!ENTITY subscription.external.label "Diperbarui oleh ekstensi lain">
+<!ENTITY noFilters.text "Anda belum memiliki penyaring ubahsuaian.">
+<!ENTITY backup.custom.title "Penyaring ubahsuaian saja">
+<!ENTITY subscription.external.label "Telah dimutakhirkan oleh ekstensi lain">
 <!ENTITY subscription.delete.label "Hapus">
-<!ENTITY noGroupSelected.text "Anda perlu memilih kelompok penyaring sebelum penyaring dapat ditampilkan.">
+<!ENTITY noGroupSelected.text "Anda perlu memilih sebuah kelompok penyaring sebelum dapat menampilkan isi penyaringnya.">
 <!ENTITY filter.cut.label "Potong">
-<!ENTITY restore.default.label "Mengembalikan cadangan dari ?1?">
+<!ENTITY restore.default.label "Pulihkan cadangan ?1?">
 <!ENTITY subscription.lastDownload.inProgress "Mengunduh…">
 <!ENTITY subscriptions.tab.label "Penyaring langganan">
-<!ENTITY sort.descending.label "Urutkan dari Z &gt; A">
-<!ENTITY filters.remove.warning "Apakah Anda sungguh ingin menghapus semua penyaring yang dipilih?">
+<!ENTITY sort.descending.label "Urutan &amp;Z &gt; A">
+<!ENTITY filters.remove.warning "Apakah Anda yakin ingin menghapus semua penyaring terpilih?">
 <!ENTITY filter.delete.label "Hapus">
 <!ENTITY addSubscriptionAdd.label "Tambahkan">
-<!ENTITY viewMenu.label "Lihat">
-<!ENTITY subscription.lastDownload.unknown "N/A">
+<!ENTITY viewMenu.label "Tampilkan">
+<!ENTITY subscription.lastDownload.unknown "(Tidak diketahui)">
 <!ENTITY addSubscriptionCancel.label "Batal">
 <!ENTITY subscription.enabled.label "Diaktifkan">
-<!ENTITY noSubscriptions.text "Anda belum menambahkan penyaring langganan apapun. Adblock Plus tidak akan memblok apapun tanpa penyaring, silahkan gunakan &quot;Tambahkan penyaring langganan&quot; untuk menambahkan.">
-<!ENTITY subscription.update.label "Perbarui penyaring">
+<!ENTITY noSubscriptions.text "Anda belum menambahkan penyaring langganan apapun. Adblock Plus
+ tidak akan mencekal apa-apa tanpa adanya penyaring, silakan gunakan
+ &quot;Tambah penyaring langganan&quot; untuk menambahkan beberapa penyaring.">
+<!ENTITY subscription.update.label "Mutakhirkan penyaring">
 <!ENTITY dialog.title "Preferensi Penyaring Adblock Plus">
-<!ENTITY addFilter.label "Tambahkan penyaring">
-<!ENTITY subscription.minVersion.warning "Penyaring langganan memerlukan versi Adblock Plus yang lebih baru, Anda harus memperbarui ke versi Adblock Plus terbaru.">
-<!ENTITY subscription.lastDownload.invalidURL "Gagal, bukan alamat yang benar">
-<!ENTITY backup.error "Ada kesalahan penulisan penyaring ke berkas. Pastikan berkas tidak diproteksi atau sedang digunakan aplikasi lain.">
-<!ENTITY filter.moveUp.label "Ke atas">
-<!ENTITY addGroup.label "Tambahkan penyaring dan kelompok">
+<!ENTITY addFilter.label "Tambah &amp;penyaring">
+<!ENTITY subscription.minVersion.warning "Penyaring langganan ini memerlukan versi Adblock Plus yang lebih baru, Anda harus memutakhirkan Adblock Plus ke versi terbaru.">
+<!ENTITY subscription.lastDownload.invalidURL "Gagal, alamat tidak sah">
+<!ENTITY backup.error "Terjadi galat penulisan penyaring ke berkas. Pastikan berkas tersebut tidak baca-saja dan tidak sedang digunakan aplikasi lain.">
+<!ENTITY filter.moveUp.label "Naikkan">
+<!ENTITY addGroup.label "Tambah &amp;kelompok penyaring">
 <!ENTITY filter.edit.label "Sunting">
 <!ENTITY subscription.showHideFilters.label "Tampilkan/sembunyikan penyaring">
-<!ENTITY acceptableAds2.label "Ijinkan beberapa iklan yang bukan dan mengganggu">
-<!ENTITY addSubscriptionOther.label "Tambahkan skrip yang berbeda">
+<!ENTITY acceptableAds2.label "Izinkan beberapa iklan yang tidak men&amp;colok">
+<!ENTITY addSubscriptionOther.label "Tambah langganan yang lainnya">
 <!ENTITY close.label "Tutup">
 <!ENTITY sort.none.label "&amp;Belum diurutkan">
 <!ENTITY filter.actions.label "Tindakan penyaring">
 <!ENTITY filter.copy.label "Salin">
-<!ENTITY filter.moveDown.label "Ke bawah">
-<!ENTITY filter.resetHitCounts.label "Reset kembali statistik kunjungan">
+<!ENTITY filter.moveDown.label "Turunkan">
+<!ENTITY filter.resetHitCounts.label "Atur ulang statistik kunjungan">
 <!ENTITY readMore.label "Baca lebih lanjut">
-<!ENTITY subscription.moveUp.label "Ke atas">
-<!ENTITY addSubscription.label "Tambahkan penyaring">
+<!ENTITY subscription.moveUp.label "Naikkan">
+<!ENTITY addSubscription.label "Tambah &amp;penyaring langganan">
 <!ENTITY subscription.homepage.label "Beranda">
 <!ENTITY backup.complete.title "Semua penyaring dan langganan">
-<!ENTITY restore.own.label "Mengembalikan cadangan sendiri">
-<!ENTITY restore.complete.warning "Semua preferensi penyaring Anda akan digantikan oleh isi berkas yang dipilih. Apakah Anda ingin memproses?">
-<!ENTITY filters.tab.label "Penyesuaian penyaring">
-<!ENTITY backup.label "Membuat cadangan baru">
-<!ENTITY find.label "Cari">
-<!ENTITY subscription.moveDown.label "Ke bawah">
-<!ENTITY subscription.lastDownload.connectionError "Gagal, gagal mengunduh">
-<!ENTITY subscription.lastDownload.success "Sukses">
-<!ENTITY subscription.lastDownload.invalidData "Gagal, bukan daftar penyaring yang benar">
+<!ENTITY restore.own.label "Pulihkan cadangan sendiri">
+<!ENTITY restore.complete.warning "Semua preferensi penyaring Anda akan diganti dengan isi dari berkas terpilih. Apakah Anda ingin melanjutkan?">
+<!ENTITY filters.tab.label "Penyaring ubahsuaian">
+<!ENTITY backup.label "Buat cadangan baru">
+<!ENTITY find.label "&amp;Temukan">
+<!ENTITY subscription.moveDown.label "Turunkan">
+<!ENTITY subscription.lastDownload.connectionError "Gagal, kesalahan pengunduhan">
+<!ENTITY subscription.lastDownload.success "Berhasil">
+<!ENTITY subscription.lastDownload.invalidData "Gagal, daftar penyaring tidak sah">
 <!ENTITY filter.paste.label "Tempel">
 <!ENTITY subscription.disabledFilters.enable "Aktifkan penyaring yang dinonaktifkan">
-<!ENTITY lasthit.column "Sasaran terakhir">
+<!ENTITY lasthit.column "Kunjungan &amp;terkini">
 <!ENTITY subscription.editTitle.label "Sunting judul">
-<!ENTITY subscription.disabledFilters.warning "Beberapa penyaring di layanan langganan ini dinonaktifkan.">
-<!ENTITY filter.column "Aturan penyaring">
-<!ENTITY subscription.lastDownload.label "Unduhan terakhir:">
+<!ENTITY subscription.disabledFilters.warning "Beberapa penyaring pada langganan ini dinonaktifkan.">
+<!ENTITY filter.column "&amp;Aturan penyaring">
+<!ENTITY subscription.lastDownload.label "Terakhir diunduh:">
 <!ENTITY viewList.label "Lihat daftar">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/id/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/id/firstRun.properties
index 573f16c..44a3e65 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/id/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/id/firstRun.properties
@@ -1,20 +1,20 @@
+firstRun_acceptableAdsExplanation=Kami ingin mendorong situs web untuk menggunakan iklan yang tanpa basa-basi dan tidak mengganggu. Itulah sebabnya kami telah menetapkan <a>panduan ketat</a> untuk mengidentifikasi iklan mana saja yang diizinkan, yang akan ditampilkan dengan pengaturan baku. Jika Anda masih ingin mencekal semua iklan, Anda dapat <a>menonaktifkan</a> fitur ini dalam beberapa detik.
+firstRun_acceptableAdsHeadline=Iklan yang mengganggu kini akan dicekal
+firstRun_contributor_credits=Daftar Kontributor
+firstRun_dataCorruptionWarning=Apakah halaman ini terus muncul? <a>Klik di sini!</a>
+firstRun_donate=sumbang
+firstRun_donate_label=Dukung proyek kami
+firstRun_feature_malware=Pencekalan malware
+firstRun_feature_malware_description=Membuat penjelajahan Anda lebih aman dengan memcekal domain malware yang sudah diketahui.
+firstRun_feature_social=Penghilangan Tombol Sosial Media
+firstRun_feature_social_description=Secara otomatis menyingkirkan tombol media sosial dari pengalaman penjelajahan Anda, seperti tombol Suka Facebook yang muncul pada halaman web dan melacak kebiasaan anda.
+firstRun_feature_tracking=Penonaktifan Pelacakan
 firstRun_feature_tracking_description=Menjelajah secara rahasia dengan menonaktifkan pelacakan - menyembunyikan jejak Anda dari perusahaan iklan yang akan melacak setiap langkah Anda.
-firstRun_toggle_off=OFF
-firstRun_feature_tracking=Nonaktifkan Pelacakan
-firstRun_feature_malware=Memblokir malware
-firstRun_title=Adblock Plus telah diinstal
-firstRun_acceptableAdsExplanation=Kami ingin mendorong situs web untuk menggunakan iklan langsung yang tidak mengganggu. Itu sebabnya kami telah menetapkan <a>Peraturan ketat</a> untuk mengenali iklan yang bisa diterima, yang akan ditampilkan di dalam pengaturan default. Jika Anda masih ingin memblokir setiap iklan, Anda dapat <a>menonaktifkan</a> ini dalam beberapa detik.
-firstRun_toggle_on=ON
-firstRun_contributor_credits=Kredit Kontributor
-firstRun_dataCorruptionWarning=Apakah halaman ini tetap muncul? <a>Klik disini!</a>
-firstRun_acceptableAdsHeadline=Sekarang iklan yang mengganggu akan diblokir
+firstRun_features=Adblock Plus dapat melakukan lebih banyak hal daripada sekadar memcekal iklan
+firstRun_filterlistsReinitializedWarning=Nampaknya ada masalah yang menyebabkan semua penyaring terhapus dan kami tak dapat memulihkan cadangan. Maka dari itu, kami telah mengatur ulang penyaring dan pengaturan Iklan yang Diizinkan Anda. Silakan periksa daftar penyaring dan pengaturan Iklan yang Diizinkan Anda di <a>opsi Adblock Plus</a>.
+firstRun_legacySafariWarning=Anda menggunakan Safari versi lama yang tidak didukung oleh Adblock Plus. Adblock Plus mungkin saja tidak dapat berfungsi dengan baik atau mengurangi kenyamanan pengguna pada beberapa situs. Kami sangat menyarankan agar Anda memutakhirkannya ke Safari 6.1.1 atau yang lebih baru (pada OS X 10.8 Mountain Lion), atau Safari 7.0.1 atau yang lebih baru (pada OS X 10.9 Mavericks), atau menggunakan Mozilla Firefox, Google Chrome atau Opera versi terbaru.
 firstRun_share=Beritahu teman Anda
 firstRun_share_headline=<a>Bantulah kami</a> dalam membuat web menjadi tempat yang lebih baik
-firstRun_features=Adblock Plus dapat melakukan lebih dari sekedar pemblokiran iklan
-firstRun_feature_malware_description=Membuat penjelajahan Anda lebih aman dengan cara memblokir domain yang dikenal sebagai malware.
-firstRun_feature_social_description=Secara otomatis membersihkan tombol media sosial, seperti Facebook Like, yang muncul pada halaman web dan melacak perilaku Anda.
-firstRun_donate=donasi
-firstRun_donate_label=Dukung proyek ini
-firstRun_feature_social=Hapus Tombol Media Sosial
-firstRun_legacySafariWarning=Anda menggunakan versi lama Safari yang tidak didukung oleh Adblock Plus. Mungkin tidak akan bekerja dengan baik atau bahkan mengganggu pengalaman pengguna di beberapa website. Kami sangat menyarankan sebaiknya memperbarui ke Safari 6.1.1 atau lebih tinggi (pada OS X 10.8 Mountain Lion), atau Safari 7.0.1 atau lebih tinggi (pada OS X 10.9 Mavericks), atau gunakan versi terbaru dari Mozilla Firefox, Google Chrome atau Opera.
-firstRun_filterlistsReinitializedWarning=It seems that an issue caused all filters to be removed and we were unable to restore a backup. Therefore we had to reset your filters and Acceptable Ads settings. Please check your filter lists and Acceptable Ads settings in the <a>Adblock Plus options</a>.
+firstRun_title=Adblock Plus telah dipasang
+firstRun_toggle_off=MATI
+firstRun_toggle_on=NYALA
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/id/global.properties b/data/extensions/spyblock@gnu.org/chrome/locale/id/global.properties
index 42fbf15..14b024b 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/id/global.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/id/global.properties
@@ -1,40 +1,40 @@
-no_blocking_suggestions=Tidak ada item yang dapat diblok di halaman ini
+no_blocking_suggestions=Tidak ada butir yang dapat dicekal pada halaman ini
 action3_tooltip=Klik untuk mengaktifkan/menonaktifkan Adblock Plus.
-notification_antiadblock_title=Sembunyikan pesan yang dipilih?
-type_label_script=script
-filter_elemhide_nocriteria=Tidak ada kriteria yang ditentukan untuk mengenali unsur yang disembunyikan
-blockingGroup_title=Aturan pemblokiran iklan
+notification_antiadblock_title=Sembunyikan pesan yang ditargetkan?
+type_label_script=skrip
+filter_elemhide_nocriteria=Tidak ada kriteria yang telah ditentukan untuk mengenali elemen yang ingin disembunyikan
+blockingGroup_title=Aturan Pencekalan Iklan
 whitelisted_tooltip=Adblock Plus dinonaktifkan pada halaman ini.
-type_label_stylesheet=stylesheet
+type_label_stylesheet=lembar gaya
 blocked_count_tooltip=?1? dari ?2?
-type_label_font=font
-type_label_popup=Jendela pop-up
-filter_regexp_tooltip=Filter ini adalah regular expression atau terlalu pendek untuk dioptimalkan. Penggunaan filter yang terlalu banyak akan memperlambat browsing Anda.
-action0_tooltip=Klik untuk memunculkan menu, klik tengah untuk mengaktifkan/menonaktifkan.
+type_label_font=Gaya huruf
+type_label_popup=jendela munculan
+filter_regexp_tooltip=Penyaring ini terlalu pendek untuk dioptimalkan atau merupakan suatu regular expression. Jika ada banyak penyaring semacam ini, peramban Anda mungkin akan melambat.
+action0_tooltip=Klik untuk memunculkan menu konteks, klik tengah untuk mengaktifkan/menonaktifkan.
 whitelisted_page=Adblock Plus telah dinonaktifkan untuk halaman ini
-remove_group_warning=Anda benar-benar ingin menghapus kelompok ini?
-action1_tooltip=Klik untuk membuka/menutup item yang dapat diblok, klik tengah untuk mengaktifkan/menonaktifkan.
+remove_group_warning=Apakah Anda yakin ingin menghapus kelompok ini?
+action1_tooltip=Klik untuk membuka/menutup butir yang dapat dicekal, klik tengah untuk mengaktifkan/menonaktifkan.
 type_label_xmlhttprequest=permintaan XML
-active_tooltip=Adblock Plus diaktifkan, ?1? filter subscription(s) dan ?2? custom filter(s) digunakan.
+active_tooltip=Adblock Plus diaktifkan, ?1? penyaring langganan dan ?2? penyaring ubahsuaian digunakan.
 type_label_document=dokumen
-type_label_object_subrequest=objek subrequest
+type_label_object_subrequest=subpermintaan objek
 whitelistGroup_title=Aturan pengecualian
 disabled_tooltip=Adblock Plus dinonaktifkan.
-filter_elemhide_duplicate_id=Hanya satu ID dari unsur yang akan disembunyikan dapat ditentukan
-type_label_object=Obyek
+filter_elemhide_duplicate_id=Adblok Plus hanya dapat menerima sebanyak satu kali suatu ID dari elemen yang ingin disembunyikan
+type_label_object=objek
 action2_tooltip=Klik untuk membuka preferensi, klik tengah untuk mengaktifkan/menonaktifkan.
 type_label_subdocument=bingkai
-clearStats_warning=Ini akan menyetel ulang semua filter statistik kunjungan dan menonaktifkan filter penghitung kunjungan. Apakah Anda ingin melanjutkan?
-notification_antiadblock_message=Situs ini dikenal sebagai penunjuk pesan yang dipilih terhadap pengguna Adblock Plus. Apakah anda ingin Adblock Plus menyembunyikan pesan yang dipilih?
-blocked_count_addendum=(Dalam daftar putih:?1?, tersembunyi:?2?)
-subscription_invalid_location=Filter daftar lokasi bukanlah URL valid maupun nama file yang valid.
+clearStats_warning=Statistik kunjungan dari semua penyaring akan diatur ulang dan penghitung kunjungan penyaring akan dinonaktifkan. Apakah Anda ingin melanjutkan?
+notification_antiadblock_message=Situs ini telah diketahui sering menampilkan pesan yang ditargetkan untuk pengguna Adblock Plus. Apakah Anda ingin Adblick Plus untuk menyembunyikan pesan yang ditargetkan tersebut?
+blocked_count_addendum=(juga masuk dalam daftar putih: ?1?, dan disembunyikan: ?2?)
+subscription_invalid_location=Lokasi daftar penyaring bukan merupakan sebuah URL atau nama berkas yang sah.
 type_label_image=gambar
-remove_subscription_warning=Apakah anda yakin ingin menghapus langganan ini?
-type_label_other=Lainnya
+remove_subscription_warning=Apakah Anda yakin ingin menghapus langganan ini?
+type_label_other=lainnya
 mobile_menu_enable=ABP: Aktifkan
 type_label_media=audio/video
-mobile_menu_disable_site=ABP: Menonaktifkan pada ?1?
-elemhideGroup_title=Aturan penyembunyian elemen
+mobile_menu_disable_site=ABP: Nonaktifkan pada ?1?
+elemhideGroup_title=Aturan Penyembunyian Elemen
 mobile_menu_enable_site=ABP: Aktifkan pada ?1?
 type_label_elemhide=tersembunyi
 newGroup_title=Kelompok penyaring baru
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/id/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/id/overlay.dtd
index 0cb31d3..41a67ca 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/id/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/id/overlay.dtd
@@ -1,32 +1,31 @@
-<!ENTITY notification.button.yes "&amp;Iya">
 <!ENTITY notification.button.no "&amp;Tidak">
-<!ENTITY sync.label "Syn&amp;c pengaturan Adblock Plus">
-<!ENTITY whitelist.site.label "Non aktifkan pada ?1?">
+<!ENTITY sync.label "&amp;Sinkronkan pengaturan Adblock Plus">
+<!ENTITY whitelist.site.label "Nonaktifkan pada ?1?">
 <!ENTITY filters.label "&amp;Preferensi penyaring">
-<!ENTITY disable.label "Non aktifkan disemua tempat">
-<!ENTITY objecttab.title "Blokir">
-<!ENTITY objecttab.tooltip "Klik disini untuk memblokir objek ini dengan Adblock Plus">
+<!ENTITY disable.label "Nonaktifkan di semua tempat">
+<!ENTITY objecttab.title "Cekal">
+<!ENTITY objecttab.tooltip "Klik di sini untuk mencekal objek ini dengan Adblock Plus">
 <!ENTITY menuitem.label "Preferensi Ad&amp;block Plus">
-<!ENTITY objecttabs.label "&amp;Tunjukkan tab pada Flash dan Java">
+<!ENTITY objecttabs.label "&amp;Tampilkan tab pada Flash dan Java">
 <!ENTITY sendReport.label "&amp;Laporkan masalah pada halaman ini">
-<!ENTITY whitelist.page.label "Non aktifkan pada halaman ini saja">
-<!ENTITY context.image.label "Adblock Plus: Blokir gambar">
-<!ENTITY counthits.label "Menghitung filter &amp;kunjungan">
-<!ENTITY opensidebar.label "Buka &amp;item yang dapat diblok">
+<!ENTITY whitelist.page.label "Nonaktifkan pada halaman ini saja">
+<!ENTITY context.image.label "Adblock Plus: Cekal gambar">
+<!ENTITY notification.button.yes "&amp;Ya">
+<!ENTITY opensidebar.label "Buka &amp;butir yang dapat dicekal">
 <!ENTITY notification.button.close "&amp;Tutup">
 <!ENTITY contribute.label "Kontribusi untuk Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
-<!ENTITY context.frame.label "Adblock Plus: Blokir bingkai">
-<!ENTITY blocked.tooltip "Blokir item pada halaman ini:">
-<!ENTITY hideplaceholders.label "Sembunyikan p&amp;laceholders dari unsur pemblokiran">
-<!ENTITY showinstatusbar.label "Tunjukkan di &amp;status bar">
-<!ENTITY sidebar.title "Item yang dapat diblok di halaman ini">
-<!ENTITY options.label "&amp;Pilihan">
-<!ENTITY context.object.label "Adblock Plus: Blokir objek">
-<!ENTITY context.removeWhitelist.label "Adblock Plus: Mengaktifkan ulang pada halaman ini">
-<!ENTITY filters.tooltip "Filter paling aktif:">
-<!ENTITY closesidebar.label "Tutup &amp;item yang dapat diblok">
-<!ENTITY showintoolbar.label "Tunjukkan di tool&amp;bar">
+<!ENTITY context.frame.label "Adblock Plus: Cekal bingkai">
+<!ENTITY blocked.tooltip "Butir yang dicekal pada halaman ini:">
+<!ENTITY counthits.label "Hitung &amp;kunjungan penyaring">
+<!ENTITY showinstatusbar.label "Tampilkan pada bilah &amp;status">
+<!ENTITY sidebar.title "Butir yang dapat dicekal pada halaman ini">
+<!ENTITY options.label "&amp;Opsi">
+<!ENTITY context.object.label "Adblock Plus: Cekal objek">
+<!ENTITY context.removeWhitelist.label "Adblock Plus: Aktifkan kembali pada halaman ini">
+<!ENTITY filters.tooltip "Penyaring teraktif:">
+<!ENTITY closesidebar.label "Tutup butir yang dapat dicekal">
+<!ENTITY showintoolbar.label "Tampilkan pada bilah &amp;alat">
 <!ENTITY status.tooltip "Status:">
-<!ENTITY context.media.label "Adblock Plus: Blokir audio/video">
-<!ENTITY subscription.update.label "Perbarui penyaring">
+<!ENTITY context.media.label "Adblock Plus: Cekal audio/video">
+<!ENTITY subscription.update.label "Mutakhirkan penyaring">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/id/sendReport.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/id/sendReport.dtd
index 98a4903..2e484ec 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/id/sendReport.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/id/sendReport.dtd
@@ -1,7 +1,7 @@
 <!ENTITY screenshot.undo.label "&amp;Batalkan">
 <!ENTITY issues.disabledgroups.description "Filter langganan / kelompok filter ini dinonaktifkan, namun mungkin tetap akan memliki efek pada halaman ini:">
 <!ENTITY showData.label "Tunjukkan data laporan">
-<!ENTITY typeSelector.falsePositive.label "Adblock Plus memblokir terlalu &amp;banyak">
+<!ENTITY typeSelector.falsePositive.label "Adblock Plus memcekal terlalu &amp;banyak">
 <!ENTITY issues.change.description "Konfigurasi Anda telah diubah. Silahkan muat ulang halaman untuk menguji perubahan dan kirimkan laporan jika masalah belum terselesaikan oleh perubahan tersebut.">
 <!ENTITY email.label "Email:">
 <!ENTITY issues.openPreferences.label "Buka preferensi filter">
@@ -9,7 +9,8 @@
 <!ENTITY copyLink.label "&amp;Copy link laporan">
 <!ENTITY issues.nofilters.description "Adblock Plus tidak memblokir apapun pada halaman ini. Masalah yang Anda alami tidak ada kaitannya dengan Adblock Plus.">
 <!ENTITY sendPage.knownIssue "Masalah yang Anda laporkan mungkin sudah dikenal. Informasi selanjutnya:">
-<!ENTITY typeSelector.other.description "Pilih opsi ini jika Anda mencurigai masalah dengan Adblock Plus sendiri daripada filter nya.">
+<!ENTITY typeSelector.other.description "Pilih opsi ini jika Anda mencurigai adanya permasalahan dengan
+ Adblock Plus itu sendiri, dan bukan berasal dari penyaringnya.">
 <!ENTITY issues.disabledgroups.enable.label "Aktifkan filter langganan / kelompok filter">
 <!ENTITY typeWarning.override.label "Saya mengerti dan ingin mengirim laporan">
 <!ENTITY issues.disabled.enable.label "Aktifkan Adblock Plus">
@@ -17,13 +18,15 @@
 <!ENTITY anonymous.label "&amp;Penyerahan anonim">
 <!ENTITY reloadButton.label "&amp;Muat ulang halaman">
 <!ENTITY recentReports.clear.label "&amp;Hapus semua laporan">
-<!ENTITY typeSelector.description "Jendela ini akan memandu Anda melalui langkah-langkah yang diperlukan untuk penyerahan laporan masalah Adblock plus. Pertama, silakan pilih jenis masalah yang Anda alami di halaman ini:">
+<!ENTITY typeSelector.description "Jendela ini akan memandu Anda melewati langkah-langkah yang diperlukan 
+ untuk mengirimkan laporan permasalahan Adblock Plus. Pertama, silakan pilih 
+ jenis permasalahan yang Anda alami di halaman ini:">
 <!ENTITY screenshot.remove.label "&amp;Hapus semua data sensitif">
 <!ENTITY issues.ownfilters.description "Beberapa dari filter yang diterapkan pada halaman ini ditetapkan oleh pengguna. Silahkan nonaktifkan filter yang mungkin menyebabkan masalah:">
 <!ENTITY update.inProgress.description "Adblock Plus perlu memperbaharui langganan filter Anda untuk memastikan bahwa masalah belum bisa diselesaikan. Harap tunggu...">
 <!ENTITY sendPage.retry.label "Kirim kembali">
 <!ENTITY data.label "Data laporan:">
-<!ENTITY recentReports.label "Anda baru saja mengirimkan laporan">
+<!ENTITY recentReports.label "Laporan Anda yang baru saja dikirim">
 <!ENTITY typeWarning.description "Anda menyatakan bahwa Anda ingin melaporkan masalah umum dengan Adblock Plus daripada masalah filter. Silahkan catat bahwa masalah seperti ini lebih baik dilaporkan pada [link]Forum Adblock Plus[/link]. Anda hanya perlu menggunakan pelaporan masalah untuk melengkapi diskusi yang ada, karena tidak ada seorangpun yang melihat laporan Anda kecuali Anda memberi mereka link untuk masalah tersebut. Link otomatis akan diberikan setelah mengirimkan laporan.">
 <!ENTITY issues.disabled.description "Adblock Plus dinonaktifkan, ini tidak akan memblokir apapun dalam keadaan ini.">
 <!ENTITY attachExtensions.label "Lampirkan daftar ekstensi aktif pada laporan jika konflik pengaya adalah penyebab dari masalah tersebut">
@@ -31,32 +34,36 @@
 <!ENTITY issues.disabledfilters.enable.label "Aktifkan filter">
 <!ENTITY issues.override.label "&amp;Konfigurasi benar, lanjutkan dengan laporkan">
 <!ENTITY issues.nosubscriptions.description "Anda tidak berlangganan satupun dari filter bawaan yang secara otomatis menghapus konten yang tidak diinginkan pada situs web.">
-<!ENTITY typeSelector.falsePositive.description "Pilih opsi ini jika halaman kurang memiliki konten penting, salah menampilkan atau tidak berfungsi dengan benar. Anda dapat menentukan apakah Adblock Plus adalah penyebab masalah dengan menonaktifkannya untuk sementara.">
-<!ENTITY typeSelector.other.label "Masalah lainnya">
+<!ENTITY typeSelector.falsePositive.description "Pilih opsi ini jika halaman tersebut telah kehilangan konten penting, ditampilkan dengan 
+  tidak tepat, atau tidak berfungsi sebagaimana mestinya. Anda dapat memastikan apakah 
+  Adblock Plus yang menyebabkan permasalahan tersebut dengan menonaktifkannya untuk sementara.">
+<!ENTITY typeSelector.other.label "Permasalahan &amp;lainnya">
 <!ENTITY emailComment.label "Kami menganjurkan Anda untuk memasukkan alamat email yang valid sehingga kami dapat menghubungi Anda jika terdapat pertanyaan tentang laporan Anda. Ini juga akan memungkinkan kami untuk mengetahui kontribusi Anda dan meninggikan prioritas.">
 <!ENTITY issues.whitelist.remove.label "Aktifkan kembali Adblock Plus pada halaman ini">
 <!ENTITY outdatedSubscriptions.description "Filter langganan ini belum diperbaharui setidaknya dua minggu. Silahkan perbaharui langganan ini sebelum mengirimkan laporan masalah yang mungkin sudah terselesaikan sebelumnya.">
-<!ENTITY dataCollector.description "Silahkan tunggu beberapa saat sementara Adblock Plus mengumpulkan data yang dibutuhkan.">
+<!ENTITY dataCollector.description "Silakan tunggu beberapa saat selagi Adblock Plus mengumpulkan data yang diperlukan.">
 <!ENTITY sendButton.label "Kirim laporan">
 <!ENTITY comment.label "&amp;Komentar (pilihan):">
 <!ENTITY sendPage.errorMessage "Upaya mengirimkan laporan gagal dengan kode kesalahan &quot;?1?&quot;. Silahkan pastikan Anda terhubung ke Internet dan coba kembali. Jika masalah berlanjut, silahkan meminta bantuan pada [link]Forum Adblock Plus[/link].">
-<!ENTITY showRecentReports.label "Tampilkan laporan yang baru disampaikan">
+<!ENTITY showRecentReports.label "Tampilkan laporan yang baru dikirim">
 <!ENTITY commentPage.heading "Masukkan Komentar">
 <!ENTITY update.start.label "Mulai pembaharuan sekarang">
 <!ENTITY issues.disabledfilters.description "Filter ini dinonaktifkan, namun mungkin masih mempunyai efek pada halaman ini:">
 <!ENTITY screenshot.description "Halaman yang sama dapat terlihat berbeda untuk berbagai orang. Ini dapat membantu kami untuk memahami masalah jika Anda melampirkan sebuah screenshot pada laporan Anda. Anda dapat menghapus bagian yang mengandung informasi sensitif serta tandai daerah dimana masalah tersebut terjadi. Untuk melakukannya klik sesuai tombol dan pilih bagian dari gambar dengan mouse Anda.">
 <!ENTITY screenshot.attach.label "Lampirkan gambar halaman untuk melaporkan">
 <!ENTITY issues.whitelist.description "Adblock Plus sedang dinonaktifkan pada halaman yang Anda laporkan. Silahkan aktifkan dan muat ulang halaman sebelum mengirimkan laporan untuk membantu peyelidikan masalah ini.">
-<!ENTITY typeSelector.falseNegative.label "Adblock Plus tidak memblokir sebuah &amp;iklan">
-<!ENTITY typeSelector.heading "Pilih tipe laporan">
+<!ENTITY typeSelector.falseNegative.label "Adblock Plus tidak mencekal sebuah &amp;iklan">
+<!ENTITY typeSelector.heading "Pilih jenis permasalahan">
 <!ENTITY anonymity.warning "Kami tidak dapat menghubungi Anda kembali dan akan menurunkan prioritas laporan ini.">
-<!ENTITY wizard.title "Pelaporan">
+<!ENTITY wizard.title "Pelapor permasalahan">
 <!ENTITY issues.ownfilters.disable.label "Nonaktifkan filter">
-<!ENTITY commentPage.description "Kotak teks di bawah ini memungkinkan Anda untuk memasukkan komentar untuk membantu kami memahami masalah.   Langkah ini bersifat pilihan tetapi dianjurkan jika masalahnya tidak jelas.   Anda juga dapat memeriksa data laporan sebelum dikirim.">
+<!ENTITY commentPage.description "Kotak teks di bawah ini memungkinkan Anda untuk memasukkan komentar untuk membantu kami memahami masalah.
+Langkah ini adalah pilihan tetapi dianjurkan jika masalahnya tidak jelas.   Anda juga dapat memeriksa data laporan sebelum dikirim.">
 <!ENTITY comment.lengthWarning "Panjang komentar Anda melebihi 1000 karakter. Hanya 1000 karakter pertama yang akan dikirim.">
-<!ENTITY typeSelector.falseNegative.description "Pilih opsi ini jika iklan ditampilkan meskipun Adblock Plus telah diaktifkan.">
+<!ENTITY typeSelector.falseNegative.description "Pilih opsi ini jika suatu iklan tetap muncul meski Adblock Plus 
+ telah diaktifkan.">
 <!ENTITY sendPage.waitMessage "Silahkan tunggu sementara Adblock Plus mengirimkan laporan Anda.">
-<!ENTITY dataCollector.heading "Selama datang di pelaporan masalah">
+<!ENTITY dataCollector.heading "Selamat datang di pelapor permasalahan">
 <!ENTITY screenshot.heading "Lampirkan screenshot">
 <!ENTITY sendPage.heading "Kirim laporan">
 <!ENTITY issues.subscriptionCount.description "Tampaknya Anda berlangganan filter langganan terlalu banyak. Pengaturan ini tidak dianjurkan karena akan membuat masalah semakin tinggi. Kami juga tidak dapat menerima laporan masalah karena tidak jelas filter langganan mana yang pembuat butuhkan untuk menindak lanjuti. Silahkan hapus semua selain yang benar-benar dibutuhkan dan uji apakah masalah masih terjadi.">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/id/sidebar.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/id/sidebar.dtd
index a6f02e1..a778478 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/id/sidebar.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/id/sidebar.dtd
@@ -1,35 +1,35 @@
-<!ENTITY context.flash.label "Border item yang ber-flash">
+<!ENTITY context.flash.label "Kedipkan tepian butir">
 <!ENTITY address.label "Alamat">
-<!ENTITY context.open.label "Buka di tab baru">
-<!ENTITY type.label "Ketik">
-<!ENTITY tooltip.filterSource.label "Sumber filter:">
-<!ENTITY noitems.label "Tidak ada item yang bisa diblok">
-<!ENTITY filter.label "Filter">
+<!ENTITY context.open.label "Buka di Tab Baru">
+<!ENTITY type.label "Jenis">
+<!ENTITY tooltip.filterSource.label "Sumber penyaring:">
+<!ENTITY noitems.label "Tidak ada butir yang dapat dicekal">
+<!ENTITY filter.label "Penyaring">
 <!ENTITY tooltip.size.label "Ukuran:">
-<!ENTITY reattach.label "Sertakan kembali">
+<!ENTITY reattach.label "Sematkan">
 <!ENTITY search.label "&amp;Cari:">
 <!ENTITY docDomain.thirdParty "(pihak ketiga)">
-<!ENTITY filterSource.label "Sumber filter">
+<!ENTITY filterSource.label "Sumber penyaring">
 <!ENTITY tooltip.docDomain.label "Sumber dokumen:">
-<!ENTITY context.copy.label "Salin alamat item">
-<!ENTITY tooltip.type.label "Tipe:">
-<!ENTITY context.disablefilter.label "Nonaktifkan filter ?1?">
-<!ENTITY context.copyFilter.label "Salin filter">
-<!ENTITY context.block.label "Blokir item ini">
-<!ENTITY context.enablefilter.label "Hidupkan ulang filter ?1?">
-<!ENTITY detach.label "Lepas">
-<!ENTITY whitelisted.label "Halaman yang dibebaskan">
+<!ENTITY context.copy.label "Salin alamat butir">
+<!ENTITY tooltip.type.label "Jenis:">
+<!ENTITY context.disablefilter.label "Nonaktifkan penyaring ?1?">
+<!ENTITY context.copyFilter.label "Salin penyaring">
+<!ENTITY context.block.label "Cekal butir ini">
+<!ENTITY context.enablefilter.label "Aktifkan kembali penyaring ?1?">
+<!ENTITY detach.label "Lepaskan">
+<!ENTITY whitelisted.label "Halaman dalam daftar putih">
 <!ENTITY context.disablefilteronsite.label "Nonaktifkan filter ini pada ?1?">
-<!ENTITY detached.title "Adblock Plus: Item yang bisa diblok (dilepaskan)">
+<!ENTITY detached.title "Adblock Plus: Butir yang dapat dicekal (dilepaskan)">
 <!ENTITY docDomain.firstParty "(pihak pertama)">
-<!ENTITY tooltip.type.whitelisted "(dibebaskan)">
-<!ENTITY tooltip.filter.label "Efek filter:">
+<!ENTITY tooltip.type.whitelisted "(dalam daftar putih)">
+<!ENTITY tooltip.filter.label "Penyaring yang berlaku:">
 <!ENTITY tooltip.filter.disabled "(dinonaktifkan)">
-<!ENTITY context.editfilter.label "Edit efek filter">
-<!ENTITY tooltip.type.blocked "(diblokir)">
+<!ENTITY context.editfilter.label "Sunting penyaring yang berlaku">
+<!ENTITY tooltip.type.blocked "(dicekal)">
 <!ENTITY size.label "Ukuran">
-<!ENTITY context.whitelist.label "Tambahkan Aturan pengecualian untuk item">
+<!ENTITY context.whitelist.label "Tambah aturan pengecualian untuk butir ini">
 <!ENTITY context.selectAll.label "Pilih semua">
-<!ENTITY state.label "Bagian">
+<!ENTITY state.label "Status">
 <!ENTITY docDomain.label "Sumber dokumen">
 <!ENTITY tooltip.address.label "Alamat:">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/id/subscriptionSelection.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/id/subscriptionSelection.dtd
index 4092dd2..f1e217c 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/id/subscriptionSelection.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/id/subscriptionSelection.dtd
@@ -1,12 +1,12 @@
-<!ENTITY addMain.label "Tambahkan filter &amp;langganan &quot;?1?&quot; juga">
-<!ENTITY list.download.failed "Adblock Plus gagal untuk mengambil daftar langganan.">
+<!ENTITY addMain.label "Tambahkan juga penyaring &amp;langganan &quot;?1?&quot;">
+<!ENTITY list.download.failed "Adblock Plus gagal mengambil daftar penyaring langganan.">
 <!ENTITY list.download.retry "Coba lagi">
 <!ENTITY title.label "&amp;Judul langganan:">
-<!ENTITY list.download.website "Lihat situs">
-<!ENTITY supplementMessage "Filter langganan ini dimaksudkan untuk digunakan dengan filter langganan &quot;?1?&quot; yang Anda tidak menggunakannya lagi.">
-<!ENTITY viewList.label "Lihat filter">
-<!ENTITY visitHomepage.label "Kunjungi situs web">
-<!ENTITY addSubscription.label "Tambahkan langganan">
-<!ENTITY dialog.title "Tambahkan filter langganan Adblock Plus">
-<!ENTITY location.label "&amp;Lokasi daftar filter:">
-<!ENTITY fromWeb.description "Silahkan konfirmasi bahwa Anda ingin menambahkan filter langganan. Anda dapat merubah judul langganan atau lokasi sebelum menambahkannya.">
+<!ENTITY list.download.website "Tampilkan situs web">
+<!ENTITY supplementMessage "Penyaring langganan ini dimaksudkan untuk digunakan bersamaan dengan penyaring langganan &quot;?1?&quot; yang tidak Anda gunakan saat ini.">
+<!ENTITY viewList.label "Tampilkan penyaring">
+<!ENTITY visitHomepage.label "Kunjungi beranda">
+<!ENTITY addSubscription.label "Tambah langganan">
+<!ENTITY dialog.title "Tambah penyaring langganan Adblock Plus">
+<!ENTITY location.label "&amp;Lokasi daftar penyaring:">
+<!ENTITY fromWeb.description "Silakan konfirmasi bahwa Anda ingin menambahkan penyaring langganan ini. Anda dapat mengubah judul atau lokasi langganan sebelum menambahkannya.">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/is/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/is/firstRun.properties
index a337e72..ddcc89b 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/is/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/is/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Vafraðu örugglega með því að loka á að fylgst sé með þér - feldu þig frá auglýsinga fyrirtækjum sem geta fylgst með þér í hverju skrefi.
-firstRun_toggle_off=ÓVIRKT
-firstRun_feature_tracking=Slökkva á rakningu
-firstRun_feature_malware=Loka á spilliforrit
-firstRun_title=Adblock Plus var sett inn
-firstRun_toggle_on=VIRKT
 firstRun_acceptableAdsExplanation=Við viljum hvetja vefsvæði til að nota einfaldar auglýsingar, sem eru ekki uppáþrengjandi. Þess vegna höfum við sett fram <a>ákveðnar reglur</a> til að skilgreina ásættanlegar auglýsingar, sem eru birtar með venjulegum stillingum. Ef þú vilt loka á allar auglýsingar geturðu gert þetta <a>óvirkt</a> á einfaldan hátt.
+firstRun_acceptableAdsHeadline=Lokað verður á uppáþrengjandi auglýsingar
 firstRun_contributor_credits=Stuðningsaðilar
 firstRun_dataCorruptionWarning=Er þessi síða alltaf að birtast? <a>Smelltu hér!</a>
-firstRun_acceptableAdsHeadline=Lokað verður á uppáþrengjandi auglýsingar
-firstRun_share=Láttu vini þína vita
-firstRun_share_headline=<a>Hjálpaðu okkur</a> í því að gera vefinn betri
-firstRun_feature_social_description=Taktu sjálfkrafa út samfélags hnappa, eins og Facebook hnappa, sem birtast á vefsíðum og fylgjast með þér.
-firstRun_filterlistsReinitializedWarning=Svo virðist sem að upp hafi komið vandamál sem gerði það að verkum að öllum síum var eytt og ekki var hægt að endurheimta. Þar af leiðandi þurfti að endurstilla allar síur og stillingar fyrir ásættanlegar auglýsingar. Athugaðu síu listana og stillingar fyrir ásættanlegar auglýsingar í <a>Adblock Plus stillingum</a>.
-firstRun_feature_malware_description=Gerðu netvafur öruggara með því að loka á þekkt hættuleg vefsvæði.
-firstRun_features=Adblock Plus getur gert meira heldur en að loka á auglýsingar
 firstRun_donate=gefa
 firstRun_donate_label=Styðja verkefnið
+firstRun_feature_malware=Loka á spilliforrit
+firstRun_feature_malware_description=Gerðu netvafur öruggara með því að loka á þekkt hættuleg vefsvæði.
 firstRun_feature_social=Fjarlægja hnappa fyrir netsamfélög
+firstRun_feature_social_description=Taktu sjálfkrafa út samfélags hnappa, eins og Facebook hnappa, sem birtast á vefsíðum og fylgjast með þér.
+firstRun_feature_tracking=Slökkva á rakningu
+firstRun_feature_tracking_description=Vafraðu örugglega með því að loka á að fylgst sé með þér - feldu þig frá auglýsinga fyrirtækjum sem geta fylgst með þér í hverju skrefi.
+firstRun_features=Adblock Plus getur gert meira heldur en að loka á auglýsingar
+firstRun_filterlistsReinitializedWarning=Svo virðist sem að upp hafi komið vandamál sem gerði það að verkum að öllum síum var eytt og ekki var hægt að endurheimta. Þar af leiðandi þurfti að endurstilla allar síur og stillingar fyrir ásættanlegar auglýsingar. Athugaðu síu listana og stillingar fyrir ásættanlegar auglýsingar í <a>Adblock Plus stillingum</a>.
 firstRun_legacySafariWarning=Þú ert að nota gamla útgáfu af Safari sem er ekki með stuðning frá Adblock Plus. Hugsanlega virkar hún ekki eða virkar illa á sumum vefsvæðum. Við mælum með að þú annað hvort uppfærir í Safari 6.1.1 eða hærri útgáfu (á Mac OS X 10.8 Mountain Lion), eða Safari 7.0.1 eða hærri (á OS X 10.9 Mavericks), eða notir nýjustu útgáfu af Mozilla Firefox, Google Chrome eða Opera.
+firstRun_share=Láttu vini þína vita
+firstRun_share_headline=<a>Hjálpaðu okkur</a> í því að gera vefinn betri
+firstRun_title=Adblock Plus var sett inn
+firstRun_toggle_off=ÓVIRKT
+firstRun_toggle_on=VIRKT
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/is/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/is/overlay.dtd
index 6f94a02..b35663b 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/is/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/is/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Já">
 <!ENTITY notification.button.no "&amp;Nei">
 <!ENTITY sync.label "Sa&amp;mstilla Adblock Plus stillingar">
 <!ENTITY whitelist.site.label "Gera óvirkt á ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "Tilkynna vandamál á þessa&amp;ri síðu">
 <!ENTITY whitelist.page.label "Gera óvirkt aðeins á þessari síðu">
 <!ENTITY context.image.label "Adblock Plus: Loka auglýsingamynd">
-<!ENTITY counthits.label "Telja síu &amp;notkun">
+<!ENTITY notification.button.yes "&amp;Já">
 <!ENTITY opensidebar.label "Skoða h&amp;luti">
 <!ENTITY notification.button.close "&amp;Loka">
 <!ENTITY contribute.label "Taka þátt í Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Loka auglýsingaramma">
 <!ENTITY blocked.tooltip "Lokaðir hlutir á þessari síðu:">
-<!ENTITY hideplaceholders.label "Fela staðgeng&amp;itákn á lokuðum einindum">
+<!ENTITY counthits.label "Telja síu &amp;notkun">
 <!ENTITY showinstatusbar.label "&amp;Sýna í stöðuslá">
 <!ENTITY sidebar.title "Hlutir á núverandi síðu sem hægt er að loka á">
 <!ENTITY options.label "&amp;Valkostir">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/it/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/it/firstRun.properties
index bd96e56..e631b7c 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/it/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/it/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Naviga privatamente disattivando il tracciamento, nascondendo alle compagnie pubblicitarie quali siti web vengono visitati
-firstRun_toggle_off=Disattivato
-firstRun_feature_tracking=Disattiva il tracciamento
-firstRun_feature_malware=Blocco del malware
-firstRun_title=Adblock Plus è stata installata
-firstRun_toggle_on=Attivo
 firstRun_acceptableAdsExplanation=Vorremmo incoraggiare i siti web ad utilizzare pubblicità semplici e discrete. Ecco perché sono state stabilite <a>severe linee guida</a> per identificare pubblicità accettabili, che saranno visualizzate con le impostazioni predefinite. Per bloccare comunque tutte le pubblicità è possibile <a>disattivare</a> l'opzione rapidamente
+firstRun_acceptableAdsHeadline=Le pubblicità fastidiose verranno bloccate
 firstRun_contributor_credits=Lista dei collaboratori
 firstRun_dataCorruptionWarning=Questa pagina continua ad essere visualizzata? <a>Fai clic qui</a>
-firstRun_acceptableAdsHeadline=Le pubblicità fastidiose verranno bloccate
-firstRun_share=Dillo ai tuoi amici
-firstRun_share_headline=<a>Aiuta</a> a rendere il web un luogo migliore
-firstRun_feature_social_description=Elimina automaticamente i pulsanti social media, come Facebook Like, che compaiono sulle pagine web e tracciano poi quali siti vengono visitati
-firstRun_filterlistsReinitializedWarning=Sembra che un problema abbia causato la rimozione di tutti i filtri e non siamo stati in grado di ripristinare un backup. Quindi abbiamo dovuto azzerare i filtri e le impostazioni per la pubblicità accettabile. Si prega di controllare le impostazioni per la pubblicità accettabile e gli elenchi dei filtri nelle <a>opzioni di Adblock Plus</a>.
-firstRun_feature_malware_description=Rendi la tua navigazione più sicura bloccando domini pericolosi conosciuti
-firstRun_features=Adblock Plus può fare di più, oltre a bloccare pubblicità
 firstRun_donate=dona
 firstRun_donate_label=Sostieni il nostro progetto
+firstRun_feature_malware=Blocco del malware
+firstRun_feature_malware_description=Rendi la tua navigazione più sicura bloccando domini pericolosi conosciuti
 firstRun_feature_social=Elimina i pulsanti Social Media
+firstRun_feature_social_description=Elimina automaticamente i pulsanti social media, come Facebook Like, che compaiono sulle pagine web e tracciano poi quali siti vengono visitati
+firstRun_feature_tracking=Disattiva il tracciamento
+firstRun_feature_tracking_description=Naviga privatamente disattivando il tracciamento, nascondendo alle compagnie pubblicitarie quali siti web vengono visitati
+firstRun_features=Adblock Plus può fare di più, oltre a bloccare pubblicità
+firstRun_filterlistsReinitializedWarning=Sembra che un problema abbia causato la rimozione di tutti i filtri e non siamo stati in grado di ripristinare un backup. Quindi abbiamo dovuto azzerare i filtri e le impostazioni per la pubblicità accettabile. Si prega di controllare le impostazioni per la pubblicità accettabile e gli elenchi dei filtri nelle <a>opzioni di Adblock Plus</a>.
 firstRun_legacySafariWarning=Si sta utilizzando una vecchia versione di Safari che non è supportato da Adblock Plus. Potrebbe non funzionare correttamente o compromettere l'esperienza dell'utente su alcuni siti Web. Si consiglia vivamente di aggiornare a Safari 6.1.1 o superiore (disponibile per Mac OS X 10.8 Mountain Lion), or Safari 7.0.1 (per OS X 10.9 Maveriscks), o di utilizzare l'ultima versione di Mozilla Firefox, Google Chrome o Opera.
+firstRun_share=Dillo ai tuoi amici
+firstRun_share_headline=<a>Aiuta</a> a rendere il web un luogo migliore
+firstRun_title=Adblock Plus è stata installata
+firstRun_toggle_off=Disattivato
+firstRun_toggle_on=Attivo
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/it/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/it/overlay.dtd
index 3bd3482..d61dfc7 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/it/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/it/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "Sì">
 <!ENTITY notification.button.no "No">
 <!ENTITY sync.label "Sincronizza le impostazioni di Adbloc&amp;k Plus">
 <!ENTITY whitelist.site.label "Disattiva per ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "&amp;Segnala problemi nella pagina attuale">
 <!ENTITY whitelist.page.label "Disattiva solo per la pagina attuale">
 <!ENTITY context.image.label "Blocca immagine con Adblock Plus">
-<!ENTITY counthits.label "&amp;Effettua le statistiche di accesso">
+<!ENTITY notification.button.yes "Sì">
 <!ENTITY opensidebar.label "Apri l'elenco degli elementi &amp;bloccabili">
 <!ENTITY notification.button.close "Chiudi">
 <!ENTITY contribute.label "Contribuisci ad Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Blocca riquadro con Adblock Plus">
 <!ENTITY blocked.tooltip "Elementi attualmente bloccati">
-<!ENTITY hideplaceholders.label "&amp;Nascondi gli elementi bloccati">
+<!ENTITY counthits.label "&amp;Effettua le statistiche di accesso">
 <!ENTITY showinstatusbar.label "Vi&amp;sualizza nella barra di stato">
 <!ENTITY sidebar.title "Elenco degli elementi bloccabili con Adblock Plus">
 <!ENTITY options.label "&amp;Opzioni di Adblock Plus">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/it/sendReport.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/it/sendReport.dtd
index 5d83af1..c2f818b 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/it/sendReport.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/it/sendReport.dtd
@@ -38,7 +38,7 @@
 		una segnalazione priva di relativo link alla pagina web dove si verifica appunto il problema.
 		Il link generato automaticamente verrà fornito dopo l'invio della segnalazione">
 <!ENTITY issues.disabled.description "Adblock Plus è attualmente disattivata e quindi non bloccherà alcun elemento">
-<!ENTITY attachExtensions.label "A&amp;llega la lista di estensioni e plugin attivi">
+<!ENTITY attachExtensions.label "A&amp;llegare una lista di estensioni attive al report nel caso in cui un add-on in conflitto è la causa del problema">
 <!ENTITY issues.nosubscriptions.add.label "Aggiungi una sottoscrizione di filtri…">
 <!ENTITY issues.disabledfilters.enable.label "Attiva i filtri">
 <!ENTITY issues.override.label "&amp;Le impostazioni di Adblock Plus sono corrette, proseguire con la raccolta dei dati per la segnalazione">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/ja/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/ja/firstRun.properties
index 776b9e7..60bdf13 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/ja/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/ja/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=追跡を無効化してプライバシーを確保しつつブラウジング - あなたのあらゆる動静を追跡する広告会社から足跡を隠します。
-firstRun_toggle_off=OFF
-firstRun_feature_tracking=トラッキングを無効化
-firstRun_feature_malware=マルウェアをブロック
-firstRun_title=Adblock Plus がインストールされました
-firstRun_toggle_on=ON
 firstRun_acceptableAdsExplanation=我々はウェブサイトが簡素で控えめな広告を使用するよう後押ししたいと考えています。そのため控えめな広告を区別するための<a>厳格なガイドライン</a>を策定し、デフォルトで許可するようにしました。すべての広告をブロックしたい場合は数秒で控えめな広告の許可を<a>無効にする</a>ことができます 。
+firstRun_acceptableAdsHeadline=迷惑な広告はブロックされます
 firstRun_contributor_credits=貢献した人
 firstRun_dataCorruptionWarning=このページが何度も再表示される場合は <a>ここを参照！</a>
-firstRun_acceptableAdsHeadline=迷惑な広告はブロックされます
-firstRun_share=友達に教える
-firstRun_share_headline=Web をより良い場所にするために<a>協力する</a>
-firstRun_feature_social_description=Web ページに設置されていてユーザーの行動を追跡するソーシャルメディアボタン（例えば Facebook の「いいね！」）を自動的に取り除きます。 
-firstRun_filterlistsReinitializedWarning=すべてのフィルタが削除されてしまう問題が発生したようです。バックアップから復元することができず、お使いのフィルタと控えめな広告の設定をリセットする必要がありました。 <a>Adblock Plus のオプション</a>から、お使いのフィルタリストと控えめな広告の設定を確認してください。
-firstRun_feature_malware_description=既知のマルウェア配布ドメインをブロックすることで、より安全なブラウジングを可能にします。
-firstRun_features=Adblock Plus は単に広告をブロックするだけではありません
 firstRun_donate=寄付
 firstRun_donate_label=プロジェクトを支援
+firstRun_feature_malware=マルウェアをブロック
+firstRun_feature_malware_description=既知のマルウェア配布ドメインをブロックすることで、より安全なブラウジングを可能にします。
 firstRun_feature_social=ソーシャルメディアのボタンを消す
+firstRun_feature_social_description=Web ページに設置されていてユーザーの行動を追跡するソーシャルメディアボタン（例えば Facebook の「いいね！」）を自動的に取り除きます。 
+firstRun_feature_tracking=トラッキングを無効化
+firstRun_feature_tracking_description=追跡を無効化してプライバシーを確保しつつブラウジング - あなたのあらゆる動静を追跡する広告会社から足跡を隠します。
+firstRun_features=Adblock Plus は単に広告をブロックするだけではありません
+firstRun_filterlistsReinitializedWarning=すべてのフィルタが削除されてしまう問題が発生したようです。バックアップから復元することができず、お使いのフィルタと控えめな広告の設定をリセットする必要がありました。 <a>Adblock Plus のオプション</a>から、お使いのフィルタリストと控えめな広告の設定を確認してください。
 firstRun_legacySafariWarning=Adblock Plus がサポートしていない古いバージョンの Safari を利用しているため、正常に動作しなかったりユーザー体験を損なう Web サイトがあるかもしれません。Mac OS X 10.8 Mountain Lion なら Safari 6.1.1 以降、Mac OS X 10.9 Mavericks なら Safari 7.0.1 以降に更新するか、Mozilla Firefox／Google Chrome／Opera いずれか最新版の利用を強く推奨します。
+firstRun_share=友達に教える
+firstRun_share_headline=Web をより良い場所にするために<a>協力する</a>
+firstRun_title=Adblock Plus がインストールされました
+firstRun_toggle_off=OFF
+firstRun_toggle_on=ON
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/ja/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/ja/overlay.dtd
index 660a2df..be39d5e 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/ja/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/ja/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "はい(&amp;Y)">
 <!ENTITY notification.button.no "いいえ(&amp;N)">
 <!ENTITY sync.label "Adblock Plus 設定を Sync で同期(&amp;C)">
 <!ENTITY whitelist.site.label "?1? で無効">
@@ -9,16 +8,16 @@
 <!ENTITY menuitem.label "Adblock Plus 設定(&amp;B)">
 <!ENTITY objecttabs.label "Flash と Java でタブを表示(&amp;T)">
 <!ENTITY sendReport.label "このページでの不具合を報告(&amp;R)">
-<!ENTITY whitelist.page.label "このページだけ無効">
+<!ENTITY whitelist.page.label "このページのみで無効">
 <!ENTITY context.image.label "Adblock Plus: 画像をブロック">
-<!ENTITY counthits.label "フィルタのヒット数を数える(&amp;H)">
+<!ENTITY notification.button.yes "はい(&amp;Y)">
 <!ENTITY opensidebar.label "ブロック可能項目一覧を開く(&amp;B)">
 <!ENTITY notification.button.close "閉じる(&amp;C)">
 <!ENTITY contribute.label "Adblock Plus に貢献する">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: フレームをブロック">
 <!ENTITY blocked.tooltip "このページでブロック中の項目:">
-<!ENTITY hideplaceholders.label "ブロックした場所に残る空きスペースを詰める(&amp;L)">
+<!ENTITY counthits.label "フィルタのヒット数を数える(&amp;H)">
 <!ENTITY showinstatusbar.label "ステータスバーに表示(&amp;S)">
 <!ENTITY sidebar.title "このページのブロック可能項目一覧">
 <!ENTITY options.label "オプション(&amp;O)">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/ja/sendReport.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/ja/sendReport.dtd
index d8a54eb..d8f1957 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/ja/sendReport.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/ja/sendReport.dtd
@@ -33,12 +33,12 @@
 <!ENTITY issues.nosubscriptions.description "ウェブサイトの不要なコンテンツを自動削除する、既存のフィルタをまだ購読していないようです。">
 <!ENTITY typeSelector.falsePositive.description "あるべきコンテンツがない、表示がおかしい、フィルタが適切に機能してない場合はこの選択肢。 (ヒント: Adblock Plus を一時的に無効にすれば、原因に Adblock Plus が関わっているか確認できます)">
 <!ENTITY typeSelector.other.label "その他の不具合(&amp;T)">
-<!ENTITY emailComment.label "報告に不明な点があった際に連絡が取れるよう、メールアドレスの入力をお勧めしています。このメールアドレスにより、報告の受信者が報告者別にこれまでの貢献を考慮し、優先度を調整できるようになります。">
+<!ENTITY emailComment.label "メールアドレスを入力すると調査中の不明な点を問い合わせたり、報告者毎に優先度に上げた対応が可能になります。">
 <!ENTITY issues.whitelist.remove.label "このページで Adblock Plus を再度有効にする">
 <!ENTITY outdatedSubscriptions.description "購読している次のフィルタは２週間以上更新されていません。既に不具合は解決済みかもしれないので、先に手動更新してから不具合を報告してください。">
 <!ENTITY dataCollector.description "Adblock Plus が必要なデータを集めています。しばらくお待ちください。">
 <!ENTITY sendButton.label "不具合報告を送信(&amp;N)">
-<!ENTITY comment.label "コメント(任意入力):(&amp;C)">
+<!ENTITY comment.label "コメント (的確に記述すれば良い対応が期待できます) (&amp;C):">
 <!ENTITY sendPage.errorMessage "不具合報告の送信がエラーコード &quot;?1?&quot; で失敗しました。インターネットに接続されているか確認し再試行してください。問題が解決しない場合は [link]Adblock Plus フォーラム[/link] で助けを求めてください。">
 <!ENTITY showRecentReports.label "最近送信した不具合報告を表示">
 <!ENTITY commentPage.heading "コメントを入力">
@@ -52,7 +52,7 @@
 <!ENTITY anonymity.warning "匿名で報告の際は報告者を個別に識別できないので優先度が下がります。">
 <!ENTITY wizard.title "不具合報告">
 <!ENTITY issues.ownfilters.disable.label "フィルタを無効化">
-<!ENTITY commentPage.description "コメントがあると不具合を理解するのに助かります（症状、再現手順、原因を特定した根拠、不具合発生開始時期、正常動作との違い、不具合発生場所）。報告するデータは送信前に再検討できます。">
+<!ENTITY commentPage.description "症状、再現手順、原因特定の根拠、発生開始時期、正常時との違い、画面上の位置等をコメントに記入">
 <!ENTITY comment.lengthWarning "コメントが 1000 文字を超えているので、先頭から 1000 文字だけ送信します">
 <!ENTITY typeSelector.falseNegative.description "Adblock Plus が有効でも広告が表示される場合はこの選択肢。">
 <!ENTITY sendPage.waitMessage "Adblock Plus が不具合報告を送信する間、しばらくお待ちください">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/kk/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/kk/firstRun.properties
index fac03ce..23827c5 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/kk/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/kk/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Бақылауды сөндіру арқылы шолуды жеке қылыңыз - сіздің әр қимылыңызды бақылайтын жарнамалық компаниялардан ізіңізді жасыру арқылы.
-firstRun_toggle_off=OFF
-firstRun_feature_tracking=Бақылауды сөндіру
-firstRun_feature_malware=Зиянкес бағдарламаларды блоктау
-firstRun_title=Adblock Plus орнатылды
-firstRun_toggle_on=ON
 firstRun_acceptableAdsExplanation=Біз вебсайттарды тура, мазаңызды алмайтын жарнаманы қолдануын қалаймыз. Сондықтан біз жарамды жарнаманы анықтаудың <a>қатаң нұсқаулығын</a> орнаттық, ол жарнамма бастапқы баптаулармен көрсетілетін болады. Егер сіз сонда да барлық жарнаманы <a>блоктағыңыз</a> келсе, осыны тез арада сөндіре аласыз.
+firstRun_acceptableAdsHeadline=Мазаңызды алатын жарнама блокталатын болады
 firstRun_contributor_credits=Үлес қосқандар
 firstRun_dataCorruptionWarning=Бұл парақ көрсетіле бере ме? <a>Осында шертіңіз!</a>
-firstRun_acceptableAdsHeadline=Мазаңызды алатын жарнама блокталатын болады
-firstRun_share=Достарыңызға айтыңыз
-firstRun_share_headline=Интернетті жақсырақ қылу үшін <a>бізге көмек қолын созыңыз</a>
-firstRun_feature_social_description=Интернетті шолуды әлеуметтік желілер батырмаларынан құтылу арқылы жақсартыңыз, ол батырмалар, Facebook Like сияқты, веб парақтарда көрсетіледі және сіздің жұмысыңызды бақылайды.
-firstRun_filterlistsReinitializedWarning=Қандай да бір мәселе салдарынан барлық сүзгілер өшіріліп, біз оларды қор көшірмеден қалпына келтіре алмайтын сияқтымыз. Сондықтан, барлық сүзгілер өшіріледі және жарамды жарнама баптаулары іске асырылады. Өзіңіздің сүзгілер тізімін және жарамды жарнама баптауларын <a>Adblock Plus баптауларында</a> тексеріңіз.
-firstRun_feature_malware_description=Интернетті шолуды кейбір белгілі зиянкес домендерді блоктау арқылы қауіпсіздеу қылыңыз.
-firstRun_features=Adblock Plus тек жарнаманы блоктаудан басқа көбірек нәрсені істей алады
 firstRun_donate=ақшалай көмектесу
 firstRun_donate_label=Жобамызды қолдаңыз
+firstRun_feature_malware=Зиянкес бағдарламаларды блоктау
+firstRun_feature_malware_description=Интернетті шолуды кейбір белгілі зиянкес домендерді блоктау арқылы қауіпсіздеу қылыңыз.
 firstRun_feature_social=Әлеуметтік сайттар батырмаларын алып тастау
+firstRun_feature_social_description=Интернетті шолуды әлеуметтік желілер батырмаларынан құтылу арқылы жақсартыңыз, ол батырмалар, Facebook Like сияқты, веб парақтарда көрсетіледі және сіздің жұмысыңызды бақылайды.
+firstRun_feature_tracking=Бақылауды сөндіру
+firstRun_feature_tracking_description=Бақылауды сөндіру арқылы шолуды жеке қылыңыз - сіздің әр қимылыңызды бақылайтын жарнамалық компаниялардан ізіңізді жасыру арқылы.
+firstRun_features=Adblock Plus тек жарнаманы блоктаудан басқа көбірек нәрсені істей алады
+firstRun_filterlistsReinitializedWarning=Қандай да бір мәселе салдарынан барлық сүзгілер өшіріліп, біз оларды қор көшірмеден қалпына келтіре алмайтын сияқтымыз. Сондықтан, барлық сүзгілер өшіріледі және жарамды жарнама баптаулары іске асырылады. Өзіңіздің сүзгілер тізімін және жарамды жарнама баптауларын <a>Adblock Plus баптауларында</a> тексеріңіз.
 firstRun_legacySafariWarning=Сіз қолданып отырған Safari нұсқасы ескі, және оны Adblock Plus қолдамайды. Ол дұрыс жұмыс жасамауы мүмкін, немесе кейбір вебсайттарда пайдаланушы жұмысын нашарлау қылуы мүмкін. Біз қатаң түрде Safari нұсқасы 6.1.1 не одан жаңалау (OS X 10.8 Mountain Lion жүйесінде), немесе Safari нұсқасы 7.0.1 не одан жаңалау (OS X 10.9 Mavericks жүйесінде) дейін жаңартуды ұсынамыз, немесе Mozilla Firefox, Google Chrome не Opera браузерлерінің соңғы нұсқаларын қолдануды ұсынамыз.
+firstRun_share=Достарыңызға айтыңыз
+firstRun_share_headline=Интернетті жақсырақ қылу үшін <a>бізге көмек қолын созыңыз</a>
+firstRun_title=Adblock Plus орнатылды
+firstRun_toggle_off=OFF
+firstRun_toggle_on=ON
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/kk/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/kk/overlay.dtd
index 85523ea..bb7da9a 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/kk/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/kk/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Иә">
 <!ENTITY notification.button.no "&amp;Жоқ">
 <!ENTITY sync.label "Adblock Plus баптауларын Sync і&amp;шіне қосу">
 <!ENTITY whitelist.site.label "Келесі үшін сөндіру: ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "Бұл парақтағы мәселе туралы &amp;хабарлау">
 <!ENTITY whitelist.page.label "Тек осы парақ үшін сөндіру">
 <!ENTITY context.image.label "Adblock Plus: Суретті блоктау">
-<!ENTITY counthits.label "Ф&amp;ильтрлер хиттерін санау">
+<!ENTITY notification.button.yes "&amp;Иә">
 <!ENTITY opensidebar.label "Блокталған құраманы аш&amp;у">
 <!ENTITY notification.button.close "Ж&amp;абу">
 <!ENTITY contribute.label "Adblock Plus-қа үлес қосу">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Фреймді блоктау">
 <!ENTITY blocked.tooltip "Бұл парақтағы блокталған құрама:">
-<!ENTITY hideplaceholders.label "Блокталған &amp;элементтер шектерін жасыру">
+<!ENTITY counthits.label "Ф&amp;ильтрлер хиттерін санау">
 <!ENTITY showinstatusbar.label "Қалып-&amp;күй жолағында көрсету">
 <!ENTITY sidebar.title "Ағымдағы парақ құрамасы">
 <!ENTITY options.label "&amp;Баптаулар">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/ko/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/ko/firstRun.properties
index 10a0ba9..e260208 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/ko/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/ko/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=광고 회사가 수집하는 사용자 추적 정보를  유출되지 않게 하여 개인 정보를 보호합니다.
-firstRun_toggle_off=끄기
-firstRun_feature_tracking=추적 차단
-firstRun_feature_malware=맬웨어 차단
-firstRun_title=애드블록 플러스가 설치되었습니다.
-firstRun_toggle_on=켜기
 firstRun_acceptableAdsExplanation=우리는 비침입적이며 이용자 친화적인 광고 방식을 채택한 웹사이트를 격려하고자 합니다. 특정 광고를 허용하기 위한 <a>광고 허용 지침</a>을 수립하였으며, 기본 설정으로 그러한 광고는 화면에 표시됩니다. 모든 광고를 차단하려면 이 기능의 <a>사용을 중지</a>할 수 있습니다.
+firstRun_acceptableAdsHeadline=인터넷 이용을 방해하거나 불법·유해한 광고는 이제 차단될 것입니다
 firstRun_contributor_credits=공헌자 명단
 firstRun_dataCorruptionWarning=이 페이지를 계속해서 보시겠습니까? <a>여기 클릭!</a>
-firstRun_acceptableAdsHeadline=인터넷 이용을 방해하거나 불법·유해한 광고는 이제 차단될 것입니다
-firstRun_share=홍보
-firstRun_share_headline=더 나은 웹을 만들기 위해 <a>공헌하기</a>
-firstRun_feature_social_description=웹페이지상에 인터넷 사용 행태를 추적하는 사회관계망 서비스 버튼을 자동으로 제거해줍니다.
-firstRun_filterlistsReinitializedWarning=문제가 발생하여 모든 필터가 제거되고, 백업을 복원할 수 없습니다. 그러므로 사용자 필터와 허용 광고 설정을 초기화했어야 합니다. <a>애드블록 플러스 옵션</a>에서 구독필터와 허용 광고 설정을 확인하십시오.
-firstRun_feature_malware_description=널리 알려진 맬웨어 도메인을 차단함으로써 웹을 더 안전하게 이용합니다.
-firstRun_features=애드블록 플러스는 광고 차단 이외 다양한 기능이 있습니다
 firstRun_donate=기부
 firstRun_donate_label=프로젝트 지원
+firstRun_feature_malware=맬웨어 차단
+firstRun_feature_malware_description=널리 알려진 맬웨어 도메인을 차단함으로써 웹을 더 안전하게 이용합니다.
 firstRun_feature_social=사회관계망 서비스 버튼 제거
+firstRun_feature_social_description=웹페이지상에 인터넷 사용 행태를 추적하는 사회관계망 서비스 버튼을 자동으로 제거해줍니다.
+firstRun_feature_tracking=추적 차단
+firstRun_feature_tracking_description=광고 회사가 수집하는 사용자 추적 정보를  유출되지 않게 하여 개인 정보를 보호합니다.
+firstRun_features=애드블록 플러스는 광고 차단 이외 다양한 기능이 있습니다
+firstRun_filterlistsReinitializedWarning=문제가 발생하여 모든 필터가 제거되고, 백업을 복원할 수 없습니다. 그러므로 사용자 필터와 허용 광고 설정을 초기화했어야 합니다. <a>애드블록 플러스 옵션</a>에서 구독필터와 허용 광고 설정을 확인하십시오.
 firstRun_legacySafariWarning=애드블록 플러스에서 지원하지 않는 구버전 사파리를 사용하고 있습니다. 그래서 일부 사이트에서 정상적인 작동을 하지 않거나 사용자 경험에 손상을 줄 수 있습니다. 사파리 6.6.1 이상(OS X 10.8 Mountain Lion), 또는 사파리 7.0.1 이상(OS X 10.9 Mavericks) 또는 모질라 파이어폭, 구글 크롬, 오페라의 최신 버전을 사용할 것을 권장합니다.
+firstRun_share=홍보
+firstRun_share_headline=더 나은 웹을 만들기 위해 <a>공헌하기</a>
+firstRun_title=애드블록 플러스가 설치되었습니다.
+firstRun_toggle_off=끄기
+firstRun_toggle_on=켜기
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/ko/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/ko/overlay.dtd
index 2b84e5e..c345c40 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/ko/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/ko/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;예">
 <!ENTITY notification.button.no "&amp;아니요">
 <!ENTITY sync.label "애드블록 플러스 설정 동기화 (&amp;c)">
 <!ENTITY whitelist.site.label "사이트 허용 : ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "현재 페이지의 문제 보고 (&amp;R)">
 <!ENTITY whitelist.page.label "현재 페이지 허용">
 <!ENTITY context.image.label "애드블록 플러스 : 이미지 차단">
-<!ENTITY counthits.label "필터 적용 횟수 기록 (&amp;h)">
+<!ENTITY notification.button.yes "&amp;예">
 <!ENTITY opensidebar.label "차단 가능 목록 (&amp;B)">
 <!ENTITY notification.button.close "&amp;닫기">
 <!ENTITY contribute.label "애드블록 플러스에 공헌하기">
 <!ENTITY toolbarbutton.label "애드블록 플러스">
 <!ENTITY context.frame.label "애드블록 플러스 : 프레임 차단">
 <!ENTITY blocked.tooltip "적용된 필터 개수">
-<!ENTITY hideplaceholders.label "차단된 요소의 영역 숨기기 (&amp;l)">
+<!ENTITY counthits.label "필터 적용 횟수 기록 (&amp;h)">
 <!ENTITY showinstatusbar.label "상태 표시줄에 아이콘 보이기 (&amp;S)">
 <!ENTITY sidebar.title "현재 페이지의 차단 가능한 항목">
 <!ENTITY options.label "옵션 (&amp;O)">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/lt/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/lt/firstRun.properties
index 18f17b1..e6bbdec 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/lt/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/lt/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Išjunkite sekimą ir paverskite savo naršymą privačiu - paslėpkite savo pėdsakus nuo reklamos įmonių kurios galbūt seka kiekvieną jūsų žingsnį.
-firstRun_toggle_off=IŠJ.
-firstRun_feature_tracking=Išjungti sekimą
-firstRun_feature_malware=Kenkėjiškų programų blokavimas
-firstRun_title=AdBlock Plus sėkmingai įdiegta
 firstRun_acceptableAdsExplanation=Mes norėtume paskatinti svetaines naudoti paprastas, nekrentančias į akis reklamas. Todėl nustatėme <a>griežtas gaires</a> priimtinų reklamų nustatymui, jos bus rodomos pagal nutylėjimą. Jei vis tiek norite visas reklamas galite <a>išjungti</a> šią galimybę per kelias sekundes.
-firstRun_toggle_on=Įj.
+firstRun_acceptableAdsHeadline=Nuo šiol erzinančios reklamos bus užblokuotos
 firstRun_contributor_credits=Padėkos prisidėjusiems
 firstRun_dataCorruptionWarning=Ar šis puslapis pastoviai rodomas? <a>Paspauskite čia</a>
-firstRun_acceptableAdsHeadline=Nuo šiol erzinančios reklamos bus užblokuotos
-firstRun_share=Papasakokite savo draugams
-firstRun_share_headline=<a>Padėkite mums</a> paversti internetą geresne vieta
-firstRun_features=Adblock Plus gali daugiau nei tik blokuoti reklamas
-firstRun_feature_malware_description=Padarykite savo naršymą saugesniu užblokuodami žinomas kenkėjiškas svetaines.
-firstRun_feature_social_description=Automatiškai pašalinkite socialinių tinklų mygtukus, tokius kaip „Facebook Like“, kurie seka jūsų elgesį.
 firstRun_donate=paaukoti
 firstRun_donate_label=Paremkite mūsų projektą
+firstRun_feature_malware=Kenkėjiškų programų blokavimas
+firstRun_feature_malware_description=Padarykite savo naršymą saugesniu užblokuodami žinomas kenkėjiškas svetaines.
 firstRun_feature_social=Pašalinti socialinių puslapių mygtukus
+firstRun_feature_social_description=Automatiškai pašalinkite socialinių tinklų mygtukus, tokius kaip „Facebook Like“, kurie seka jūsų elgesį.
+firstRun_feature_tracking=Išjungti sekimą
+firstRun_feature_tracking_description=Išjunkite sekimą ir paverskite savo naršymą privačiu - paslėpkite savo pėdsakus nuo reklamos įmonių kurios galbūt seka kiekvieną jūsų žingsnį.
+firstRun_features=Adblock Plus gali daugiau nei tik blokuoti reklamas
+firstRun_filterlistsReinitializedWarning=Dėl klaidos visi filtrai buvo pašalinti, todėl mes negalime atkurti atsarginės kopijos. Taip pat filtrai ir priimtinų reklamų nustatymai nustatyti iš naujo. Prašome pasitikrinti jūsų filtrų sąrašus ir priimtinų reklamų nustatymus<a>Adblock Plus nustatymuose</a>.
 firstRun_legacySafariWarning=Jūs naudojate seną Safari versiją, kurios Adblock Plus nepalaiko. Adblock plus gali veikti netinkamai ar sukelti problemų. Rekomenduojame naudoti Safari 6.1.1 ar naujesnę versiją (prieinama Mac OS X 10.9 Mavericks) arba naudokite naujausią Mozilla Firefox, Google Chrome ar Opera.
-firstRun_filterlistsReinitializedWarning=It seems that an issue caused all filters to be removed and we were unable to restore a backup. Therefore we had to reset your filters and Acceptable Ads settings. Please check your filter lists and Acceptable Ads settings in the <a>Adblock Plus options</a>.
+firstRun_share=Papasakokite savo draugams
+firstRun_share_headline=<a>Padėkite mums</a> paversti internetą geresne vieta
+firstRun_title=AdBlock Plus sėkmingai įdiegta
+firstRun_toggle_off=IŠJ.
+firstRun_toggle_on=Įj.
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/lt/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/lt/overlay.dtd
index 8e2f332..47aba40 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/lt/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/lt/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Taip">
 <!ENTITY notification.button.no "&amp;Ne">
 <!ENTITY sync.label "Adblo&amp;ck Plus Sync nustatymai">
 <!ENTITY whitelist.site.label "Išjungti ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "P&amp;ranešti apie problemą šiame puslapyje">
 <!ENTITY whitelist.page.label "Išjungti šiam tinklalapiui">
 <!ENTITY context.image.label "„Adblock Plus“: Blokuoti paveikslėlį">
-<!ENTITY counthits.label "Sus&amp;kaičiuoti filtro blokavimus">
+<!ENTITY notification.button.yes "&amp;Taip">
 <!ENTITY opensidebar.label "Atverti &amp;blokuojamus elementus">
 <!ENTITY notification.button.close "&amp;Uždaryti">
 <!ENTITY contribute.label "Prisidėti prie Adblock Plus">
 <!ENTITY toolbarbutton.label "„Adblock Plus“">
 <!ENTITY context.frame.label "„Adblock Plus“: Blokuoti kadrą">
 <!ENTITY blocked.tooltip "Šiame tinklalapyje užblokuoti elementai:">
-<!ENTITY hideplaceholders.label "S&amp;lėpti užblokuotų elementų vietos laikiklius">
+<!ENTITY counthits.label "Sus&amp;kaičiuoti filtro blokavimus">
 <!ENTITY showinstatusbar.label "Rodyti &amp;būsenos juostoje">
 <!ENTITY sidebar.title "Blokuojami elementai dabartiniame tinklalapyje">
 <!ENTITY options.label "&amp;Pasirinktys">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/lt/sendReport.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/lt/sendReport.dtd
index 9a832cd..3ccb11f 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/lt/sendReport.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/lt/sendReport.dtd
@@ -37,7 +37,7 @@ tik papildyti esamas diskusijas, niekas nepastebės jūsų pranešimo
 nebent duosite nuorodą į jį. Automatiškai sukurta nuoroda
 bus parodyta kai išsiųsite pranešimą.">
 <!ENTITY issues.disabled.description "Adblock Plus yra išjungtas, tokioje būsenoje jis nieko neužblokuos.">
-<!ENTITY attachExtensions.label "Prie pranešimo pri&amp;segti aktyvių plėtinių sąrašą, jei kartais problema kilo dėl plėtinių nesuderinamumo">
+<!ENTITY attachExtensions.label "Jei kilo problema dėl plėtinių (add-on), praneškite problema pridėje aktyvių plėtinių sąrašą,">
 <!ENTITY issues.nosubscriptions.add.label "Pridėti filtro prenumeratą">
 <!ENTITY issues.disabledfilters.enable.label "Įjungti filtrą">
 <!ENTITY issues.override.label "Konfi&amp;gūracija teisinga, tęskite su pranešimu">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/lv/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/lv/firstRun.properties
index efbd94e..c82bbe1 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/lv/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/lv/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Pārlūkot privāti, atspējojot izsekošanu - slēpjot Jūsu pēdas no reklāmas kompānijām, kuras varētu izsekot katru Jūsu kustību.
-firstRun_toggle_off=IZSLĒGTS
-firstRun_feature_tracking=Atspējot izsekošanu
-firstRun_feature_malware=Bloķēt ļaundabīgas programmas
-firstRun_title=AdblockPlus ir uzstādīts
 firstRun_acceptableAdsExplanation=Mēs vēlētos veicināt vienkāršu, neuzbāzīgu reklāmu lietošanu vietnēs. Tāpēc esam izveidojuši <a>stingras vadlīnijas</a> pieņemamo reklāmu noteikšanai, kuras parādītas noklusējuma iestatījumos. Ja Jūs joprojām vēlaties bloķēt pilnīgi visas reklāmas, Jūs varat <a>atspējot</a> šo pēc dažām sekundēm.
-firstRun_toggle_on=IESLĒGTS
+firstRun_acceptableAdsHeadline=Uzmācīgas reklāmas turpmāk tiks bloķētas
 firstRun_contributor_credits=Ziedotāju saraksts
 firstRun_dataCorruptionWarning=Vai šī lapa turpina attēloties? <a>Spied šeit!</a>
-firstRun_acceptableAdsHeadline=Uzmācīgas reklāmas turpmāk tiks bloķētas
-firstRun_share=Pastāsti saviem draugiem
-firstRun_share_headline=<a>Palīdzi mums</a> padarīt tīklu par labāku vietu
-firstRun_features=AdblockPlus var izdarīt vairāk, ne tikai bloķēt reklāmas
-firstRun_feature_malware_description=Padarīt Jūsu pārlūkošanu drošāku, bloķējot zināmos ļaundabīgo programmu avotus.
-firstRun_feature_social_description=Automātiski atbrīvot Jūsu pārlūkošanas procesu no tādām sociālo mediju pogām kā Facebook Live, kas parādās interneta lapās un izseko Jūsu darbību.
 firstRun_donate=ziedot
 firstRun_donate_label=Atbalstīt mūsu projektu
+firstRun_feature_malware=Bloķēt ļaundabīgas programmas
+firstRun_feature_malware_description=Padarīt Jūsu pārlūkošanu drošāku, bloķējot zināmos ļaundabīgo programmu avotus.
 firstRun_feature_social=Noņemt sociālo mediju pogas
+firstRun_feature_social_description=Automātiski atbrīvot Jūsu pārlūkošanas procesu no tādām sociālo mediju pogām kā Facebook Live, kas parādās interneta lapās un izseko Jūsu darbību.
+firstRun_feature_tracking=Atspējot izsekošanu
+firstRun_feature_tracking_description=Pārlūkot privāti, atspējojot izsekošanu - slēpjot Jūsu pēdas no reklāmas kompānijām, kuras varētu izsekot katru Jūsu kustību.
+firstRun_features=AdblockPlus var izdarīt vairāk, ne tikai bloķēt reklāmas
+firstRun_filterlistsReinitializedWarning=Diemžēl, traucējuma dēļ visi filtri bija novākti un neizdevās izmantot rezerves versiju. Tādēļ mēs atjaunojam jūsu filtrus un Acceptable Ads iestatījumus līdz sākumstāvoklim. Esiet tik laipni un izpētiet jūsu filtra sarakstus un Acceptable Ads iestātījumus  izmantojot šo <a>Adblock Plus options</a>.
 firstRun_legacySafariWarning=Jūs izmantojat novecojušu Safari versiju, kuru Adblock Plus neatbalsta. Tas var nedarboties pareizi vai pasliktināt lietotāja pieredzi dažās vietnēs. Mēs uzstājīgi iesakām Jums atjaunināt Safari līdz 6. vai vēl jaunākai versijai (pieejama Mac OS X 10.8 Mountain Lion un augstāk) jeb lietot Mozilla Firefox, Google Chrome vai Opera jaunākās versijas.
-firstRun_filterlistsReinitializedWarning=It seems that an issue caused all filters to be removed and we were unable to restore a backup. Therefore we had to reset your filters and Acceptable Ads settings. Please check your filter lists and Acceptable Ads settings in the <a>Adblock Plus options</a>.
+firstRun_share=Pastāsti saviem draugiem
+firstRun_share_headline=<a>Palīdzi mums</a> padarīt tīklu par labāku vietu
+firstRun_title=AdblockPlus ir uzstādīts
+firstRun_toggle_off=IZSLĒGTS
+firstRun_toggle_on=IESLĒGTS
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/lv/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/lv/overlay.dtd
index 030d111..b67d25c 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/lv/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/lv/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp; Jā">
 <!ENTITY notification.button.no "&amp; Nē">
 <!ENTITY sync.label "Sinhronizet Adblock Plus uzstādījumus">
 <!ENTITY whitelist.site.label "Atspējot uz ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "&amp;Ziņot par problēmām šajā lapā">
 <!ENTITY whitelist.page.label "Atspējot tikai šajā lapā">
 <!ENTITY context.image.label "Adblock Plus: Bloķēt attēlu">
-<!ENTITY counthits.label "Skaitīt filtra izmantojumus">
+<!ENTITY notification.button.yes "&amp; Jā">
 <!ENTITY opensidebar.label "Atvērt bloķējamās vienības">
 <!ENTITY notification.button.close "&amp; Aizvērt">
 <!ENTITY contribute.label "Palīdziet Adblock Plus veidošanai, tulkošanai...">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Bloķēt rāmi">
 <!ENTITY blocked.tooltip "Bloķētās vienības šajā lapā:">
-<!ENTITY hideplaceholders.label "Noslēpt bloķēto elementu vietturus">
+<!ENTITY counthits.label "Skaitīt filtra izmantojumus">
 <!ENTITY showinstatusbar.label "Rādīt stāvokļa joslā">
 <!ENTITY sidebar.title "Bloķējamās vienības šajā lapā">
 <!ENTITY options.label "Iespējas">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/lv/sidebar.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/lv/sidebar.dtd
index 97a127a..f461b52 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/lv/sidebar.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/lv/sidebar.dtd
@@ -1,7 +1,7 @@
 <!ENTITY context.flash.label "Flash vienības malas">
 <!ENTITY address.label "Adrese">
 <!ENTITY context.open.label "Atvērt jaunā cilnē">
-<!ENTITY type.label "Tips">
+<!ENTITY type.label "Veids">
 <!ENTITY tooltip.filterSource.label "Filtra avots:">
 <!ENTITY noitems.label "Nav bloķējamu vienību">
 <!ENTITY filter.label "Filtrs">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/ms/composer.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/ms/composer.dtd
index 5b2264c..8e674b1 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/ms/composer.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/ms/composer.dtd
@@ -2,17 +2,17 @@
 <!ENTITY domainRestriction.label "Terhad pada domain: (&amp;s)">
 <!ENTITY collapse.default.no.label "Gunakan default (tidak)">
 <!ENTITY firstParty.label "Pihak per&amp;tama sahaja">
-<!ENTITY preferences.label "Papar penapi&amp;s sedia ada...">
+<!ENTITY preferences.label "&amp;Papar penapis sedia ada...">
 <!ENTITY pattern.label "Lihat pola">
 <!ENTITY thirdParty.label "Pihak keti&amp;ga sahaja">
-<!ENTITY filter.label "Penapis &amp;baru:">
+<!ENTITY filter.label "Penapis &amp;baharu:">
 <!ENTITY collapse.label "&amp;Jatuhkan yang disekat:">
 <!ENTITY match.warning "Pola yang anda masukkan tidak lagi memadani alamat yang akan disekat/dikecualikan dan tidak akan berkesan kepadanya.">
 <!ENTITY anchor.start.label "pada per&amp;mulaan alamat">
 <!ENTITY matchCase.label "&amp;Kes sepadan">
 <!ENTITY custom.pattern.label "&amp;Ubah suai:">
 <!ENTITY unselectAllTypes.label "Tidak pilih">
-<!ENTITY type.whitelist.label "Peraturan penge&amp;cualian">
+<!ENTITY type.whitelist.label "&amp;Peraturan pengecualian">
 <!ENTITY regexp.warning "Pola yang anda masukkan akan diinterpretasi sebagai ungkapan biasa di mana ia boleh melambatkan penjelajahan web. Jika anda tidak berniat untuk menggunakan ungkapan biasa, tambah simbol (*) diakhir pola.">
 <!ENTITY dialog.title "Tambah peraturan penapis Adblock Plus">
 <!ENTITY basic.label "Paparan biasa">
@@ -25,7 +25,7 @@
 <!ENTITY domainRestriction.help "Gunakan pilihan ini untuk tentukan satu atau lebih domain secara berasingan dengan simbol &quot;|&quot;. Penapis hanya akan digunakan pada domain terpilih sahaja. Simbol &quot;~&quot; sebelum domain bermaksud penapis tidak akan digunakan pada domain tersebut.">
 <!ENTITY accept.label "Tambah penapis">
 <!ENTITY options.label "Pilihan">
-<!ENTITY disabled.warning "Adblock Plus telah dinyahaktifkan. Anda masih boleh menambah penapis tetapi ia tidak akan aktif sehingga anda [link]aktifkan Adblock Plus[/link].">
+<!ENTITY disabled.warning "Adblock Plus telah dilumpuhkan. Anda masih boleh menambah penapis tetapi ia tidak akan dipasang sehingga anda [link]aktifkan Adblock Plus[/link].">
 <!ENTITY anchor.start.flexible.label "pada per&amp;mulaan nama domain">
 <!ENTITY collapse.no.label "Tidak">
 <!ENTITY selectAllTypes.label "Pilih semua">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/ms/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/ms/firstRun.properties
index d119e0b..a924430 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/ms/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/ms/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Lihat secara peribadi dengan menyahdayakan pengesanan - menyembunyikan trek anda dari syarikat-syarikat iklan yang akan menjejaki setiap langkah anda.
-firstRun_toggle_off=TUTUP
-firstRun_feature_tracking=Menyahdayakan pengesanan
-firstRun_feature_malware=Menyekat perisian berniat jahat
-firstRun_title=Adblock Plus telah dipasang
-firstRun_acceptableAdsExplanation=Kami ingin menggalakkan Laman web untuk menggunakan pengiklanan terus-terang, tidak mengganggu. Itulah sebabnya mengapa kita telah menetapkan <a>garis panduan yang ketat</a> untuk mengenalpasti iklan yang boleh diterima, yang ditunjukkan di bawah seting lalai. Jika anda masih mahu menyekat iklan setiap anda boleh <a>menyahdayakan</a> ini dalam beberapa saat.
-firstRun_toggle_on=Pada
-firstRun_contributor_credits=Kredit sebagai penyumbang
-firstRun_dataCorruptionWarning=Adakah laman ini muncul tidak terhenti-henti? <a>Klik di sini!</a>
-firstRun_acceptableAdsHeadline=Annoying iklan akan kini menjadi disekat
-firstRun_share=Beritahu rakan-rakan anda
-firstRun_share_headline=<a>Berikan tangan</a> dalam membuat laman web yang lebih baik
-firstRun_features=Adblock Plus boleh melakukan lebih daripada iklan yang menghalang
-firstRun_feature_malware_description=Membuat pelayaran anda lebih selamat dengan menyekat domain dikenali perisian berniat jahat.
-firstRun_feature_social_description=Secara automatik membuang pengalaman menyemak lalu anda daripada butang media sosial, seperti Facebook Like, yang muncul di laman web dan mengesan tingkah laku anda.
-firstRun_donate=mendermakan
-firstRun_donate_label=Menyokong projek kami
+firstRun_acceptableAdsExplanation=Kami ingin menggalakkan Laman sesawang untuk menggunakan pengiklanan yang jelas dan tidak mengganggu. Itulah sebabnya mengapa kita mewujudkan <a>garis panduan yang ketat</a> untuk mengenalpasti iklan yang boleh diterima, yang ditunjukkan di bawah tetapan lalai. Jika anda masih mahu menyekat setiap iklan anda boleh <a>mematikan</a> ini dalam beberapa saat.
+firstRun_acceptableAdsHeadline=Iklan yang mengganggu kini akan disekat
+firstRun_contributor_credits=Kredit kepada penyumbang
+firstRun_dataCorruptionWarning=Adakah laman ini muncul berkali-kali? <a>Klik di sini!</a>
+firstRun_donate=Derma
+firstRun_donate_label=Sokong projek kami
+firstRun_feature_malware=Menyekat perisian jahat
+firstRun_feature_malware_description=Membuat pelayar anda lebih selamat dengan menyekat domain perisian jahat.
 firstRun_feature_social=Mengalih keluar butang Media sosial
-firstRun_legacySafariWarning=Anda menggunakan versi lama Safari yang tidak disokong oleh Adblock Plus. Ia mungkin tidak berfungsi dengan betul atau menjejaskan pengalaman pengguna di sesetengah tapak web. Kami amat mengesyorkan sama ada mengemaskini Safari 6 atau lebih tinggi (yang tersedia untuk Mac OS X 10.8 Mountain Lion) dan lebih tinggi(OS X 10.9 Mavericks), atau untuk menggunakan versi terkini pelayar Mozilla Firefox, Google Chrome atau Opera.
-firstRun_filterlistsReinitializedWarning=It seems that an issue caused all filters to be removed and we were unable to restore a backup. Therefore we had to reset your filters and Acceptable Ads settings. Please check your filter lists and Acceptable Ads settings in the <a>Adblock Plus options</a>.
+firstRun_feature_social_description=Membuang butang media sosial daripada pengalaman pelayaran anda secara automatik, seperti Facebook Like, yang muncul di laman sesawang dan mengesan tingkah laku anda.
+firstRun_feature_tracking=Melumpuhkan pengesanan
+firstRun_feature_tracking_description=Melayar secara bebas dengan melumpuhkan pengesanan - menyembunyikan anda dari syarikat-syarikat iklan yang akan menjejaki setiap langkah anda.
+firstRun_features=Adblock Plus boleh melakukan lebih daripada menghalang iklan
+firstRun_filterlistsReinitializedWarning=Terdapat isu yang menyebabkan semua penapisan telah ditanggalkan dan kami tidak dapat memasukkan semula maklumat sokongan. Dengan itu kami perlu melaras semula penapisan serta tetapan Iklan Yang Diterima. Sila periksa senarai penapisan dan tetapan Iklan Yang Diterima di dalam <a>Pilihan Adblock Plus</a>.
+firstRun_legacySafariWarning=Anda menggunakan versi lama Safari yang tidak disokong oleh Adblock Plus. Ia mungkin tidak berfungsi dengan betul atau menjejaskan pengalaman pengguna di sesetengah laman sesawang. Kami amat mengesyorkan sama ada mengemaskini kepada Safari 6.1.1 atau lebih tinggi (bagi Mac OS X 10.8 Mountain Lion) atau Safari 7.0.1 pada yang lebih tinggi (OS X 10.9 Mavericks), atau gunakan versi terkini pelayar Mozilla Firefox, Google Chrome atau Opera.
+firstRun_share=Beritahu rakan anda
+firstRun_share_headline=<a>Berikan bantuan</a> menjadikan laman sesawang tempat yang lebih baik
+firstRun_title=Adblock Plus telah dipasang
+firstRun_toggle_off=MATI
+firstRun_toggle_on=HIDUP
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/ms/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/ms/overlay.dtd
index 5fc0085..c995e22 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/ms/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/ms/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Ya">
 <!ENTITY notification.button.no "&amp;Tiada">
 <!ENTITY sync.label "Syn&amp;c tatacara Adblock Plus">
 <!ENTITY whitelist.site.label "Nyahaktifkan pada ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "&amp;Lapor isu pada laman ini">
 <!ENTITY whitelist.page.label "Nyahaktifkan pada laman ini sahaja">
 <!ENTITY context.image.label "Adblock Plus: Sekat imej">
-<!ENTITY counthits.label "&amp;Kira kiraan penapis">
+<!ENTITY notification.button.yes "&amp;Ya">
 <!ENTITY opensidebar.label "Buka &amp;item yang boleh disekat">
 <!ENTITY notification.button.close "&amp;Tutup">
 <!ENTITY contribute.label "Sumbang kepada Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Sekat bingkai">
 <!ENTITY blocked.tooltip "Item yang disekat pada laman ini:">
-<!ENTITY hideplaceholders.label "Sembun&amp;yikan placeholders elemen tersembunyi">
+<!ENTITY counthits.label "&amp;Kira kiraan penapis">
 <!ENTITY showinstatusbar.label "Papar&amp;kan di bar status">
 <!ENTITY sidebar.title "Item yang boleh disekat pada laman semasa">
 <!ENTITY options.label "Piliha&amp;n">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/nb-NO/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/nb-NO/firstRun.properties
index dc51602..978dfbf 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/nb-NO/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/nb-NO/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Vær privat på nettet ved å hindre sporing - gjem sporene dine fra reklameselskaper som ellers registrerer alt du gjør.
-firstRun_toggle_off=AV
-firstRun_feature_tracking=Slå av sporing
-firstRun_feature_malware=Blokkering av skadeprogram
-firstRun_title=Adblock Plus har blitt installert
-firstRun_toggle_on=PÅ
 firstRun_acceptableAdsExplanation=Vi vil oppfordre nettsider til å bruke standard, ikke-påtrengende annonser. Derfor har vi laget <a>strenge retningslinjer</a> for å identifisere akseptable annonser, som vises når man har aktivert standardinnstillingene. Hvis du ønsker å blokkere alle annonser, kan du  <a>velge bort</a> dette straks.
+firstRun_acceptableAdsHeadline=Irriterende annonser blir fra nå av blokkert
 firstRun_contributor_credits=Takk til
 firstRun_dataCorruptionWarning=Dukker denne siden stadig opp? <a>Klikk her!</a>
-firstRun_acceptableAdsHeadline=Irriterende annonser blir fra nå av blokkert
-firstRun_share=Fortell dette til vennene dine
-firstRun_share_headline=<a>Hjelp oss</a> med å gjøre Internett til et bedre sted
-firstRun_feature_social_description=Bli kvitt knapper for sosiale medier, slik som "Liker" fra Facebook, som dukker opp på nettsider og sporer handlingene dine.
-firstRun_filterlistsReinitializedWarning=Det kan se ut som at en feil i systemet gjorde at alle filtrene ble fjernet, og vi var ute av stand til å gjenopprette sikkerhetskopien. Vi har derfor måttet nullstille alle filtrene og innstillingene for Akseptable annonser. Vennligst kontroller filterlistene dine og innstillingene for Akseptable annonser i valgalternativene til <a>Adblock Plus options</a>.
-firstRun_feature_malware_description=Gjør nettlesingen din tryggere ved å blokkere domener som er kjent for å være skadelige.
-firstRun_features=Adblock Plus kan gjøre mer enn å bare blokkere annonser
 firstRun_donate=donér
 firstRun_donate_label=Støtt prosjektet vårt
+firstRun_feature_malware=Blokkering av skadeprogram
+firstRun_feature_malware_description=Gjør nettlesingen din tryggere ved å blokkere domener som er kjent for å være skadelige.
 firstRun_feature_social=Fjern sosiale media-knapper
+firstRun_feature_social_description=Bli kvitt knapper for sosiale medier, slik som "Liker" fra Facebook, som dukker opp på nettsider og sporer handlingene dine.
+firstRun_feature_tracking=Slå av sporing
+firstRun_feature_tracking_description=Vær privat på nettet ved å hindre sporing - gjem sporene dine fra reklameselskaper som ellers registrerer alt du gjør.
+firstRun_features=Adblock Plus kan gjøre mer enn å bare blokkere annonser
+firstRun_filterlistsReinitializedWarning=Det kan se ut som at en feil i systemet gjorde at alle filtrene ble fjernet, og vi var ute av stand til å gjenopprette sikkerhetskopien. Vi har derfor måttet nullstille alle filtrene og innstillingene for Akseptable annonser. Vennligst kontroller filterlistene dine og innstillingene for Akseptable annonser i valgalternativene til <a>Adblock Plus options</a>.
 firstRun_legacySafariWarning=Du bruker en gammel versjon av Safari som ikke støttes av Adblock Plus, og det kan hende Adblock Plus ikke fungerer, eller forverrer brukeropplevelsen på enkelte nettsteder. Vi anbefaler sterkt at du enten oppdaterer til Safari 6.1.1 eller nyere (tilgjengelig for Mac OS X 10.8 Mountain Lion), Safari 7.0.1 (tilgjengelig for OS X 10.9 Mavericks) eller nyere, eller bruker den nyeste versjonen av Mozilla Firefox, Google Chrome eller Opera.
+firstRun_share=Fortell dette til vennene dine
+firstRun_share_headline=<a>Hjelp oss</a> med å gjøre Internett til et bedre sted
+firstRun_title=Adblock Plus har blitt installert
+firstRun_toggle_off=AV
+firstRun_toggle_on=PÅ
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/nb-NO/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/nb-NO/overlay.dtd
index 9d89b41..e5e69e5 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/nb-NO/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/nb-NO/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Ja">
 <!ENTITY notification.button.no "&amp;Nei">
 <!ENTITY sync.label "Synkroniser innstillinger for Adblo&amp;ck Plus">
 <!ENTITY whitelist.site.label "Deaktiver på ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "&amp;Rapporter problem på denne siden">
 <!ENTITY whitelist.page.label "Deaktiv kun på denne siden">
 <!ENTITY context.image.label "Adblock Plus: Blokker bilde">
-<!ENTITY counthits.label "Tell filtertreff (&amp;h)">
+<!ENTITY notification.button.yes "&amp;Ja">
 <!ENTITY opensidebar.label "Åpne &amp;blokkerbare elementer">
 <!ENTITY notification.button.close "&amp;Lukk">
 <!ENTITY contribute.label "Bidra til Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Blokker ramme">
 <!ENTITY blocked.tooltip "Blokkerte elementer på denne siden:">
-<!ENTITY hideplaceholders.label "Skjul plassbeholder for blokkerte elementer">
+<!ENTITY counthits.label "Tell filtertreff (&amp;h)">
 <!ENTITY showinstatusbar.label "Vis i statuslinjen">
 <!ENTITY sidebar.title "Blokkerbare elementer på nåværende side">
 <!ENTITY options.label "Alternativer (&amp;O)">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/nl/composer.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/nl/composer.dtd
index 1ae748e..4b597f8 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/nl/composer.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/nl/composer.dtd
@@ -1,28 +1,28 @@
-<!ENTITY anchor.end.label "aan het e&amp;ind van het adres">
-<!ENTITY domainRestriction.label "Tot domein be&amp;perken:">
+<!ENTITY anchor.end.label "aan het ei&amp;nde van het adres">
+<!ENTITY domainRestriction.label "Beperken tot &amp;domein:">
 <!ENTITY collapse.default.no.label "Standaard gebruiken (nee)">
-<!ENTITY firstParty.label "A&amp;lleen van eigen website">
+<!ENTITY firstParty.label "Alleen van &amp;eigen website">
 <!ENTITY preferences.label "Bestaande filters &amp;weergeven…">
-<!ENTITY pattern.label "Naar patroon zoeken">
+<!ENTITY pattern.label "Zoeken naar patroon">
 <!ENTITY thirdParty.label "Alleen van &amp;derden">
-<!ENTITY filter.label "&amp;Nieuwe filter:">
-<!ENTITY collapse.label "&amp;Geblokkeerd onderdeel inklappen:">
-<!ENTITY match.warning "Het door u ingegeven patroon komt niet meer overeen met het te blokkeren/op de witte lijst te plaatsen adres en zal er geen effect op hebben.">
+<!ENTITY filter.label "&amp;Nieuw filter:">
+<!ENTITY collapse.label "&amp;Geblokkeerde samenvouwen:">
+<!ENTITY match.warning "Het door u ingevoerde patroon komt niet meer overeen met het te blokkeren / op de witte lijst te plaatsen adres en zal hier geen effect op hebben.">
 <!ENTITY anchor.start.label "aan &amp;het begin van het adres">
 <!ENTITY matchCase.label "H&amp;oofdlettergevoelig">
 <!ENTITY custom.pattern.label "&amp;Aangepast:">
 <!ENTITY unselectAllTypes.label "Niets selecteren">
 <!ENTITY type.whitelist.label "&amp;Uitzonderingsregel">
-<!ENTITY regexp.warning "Het patroon dat u heeft gegeven zal worden behandeld als een reguliere expressie. Deze kunnen niet efficiënt worden verwerkt door Adblock Plus en kunnen uw browser traag maken. Als het niet uw bedoeling was een reguliere expressie te schrijven, voeg dan een asterisk (*) aan het eind van het patroon toe.">
+<!ENTITY regexp.warning "Het patroon dat u hebt ingevoerd zal worden behandeld als een reguliere expressie. Deze kunnen niet efficiënt worden verwerkt door Adblock Plus en kunnen uw browser traag maken. Als het niet uw bedoeling was een reguliere expressie te schrijven, voeg dan een asterisk (*) aan het einde van het patroon toe.">
 <!ENTITY dialog.title "Adblock Plus-filterregel toevoegen">
 <!ENTITY basic.label "Eenvoudige weergave">
 <!ENTITY type.filter.label "&amp;Blokkeringsfilter">
-<!ENTITY types.label "Toepassen op types:">
-<!ENTITY shortpattern.warning "Het patroon dat u heeft gegeven is te kort om te worden geoptimaliseerd en kan uw browser traag maken. U kunt beter een langere regel voor dit filter kiezen, zodat Adblock Plus het filter efficiënter kan toepassen.">
+<!ENTITY types.label "Toepassen op typen:">
+<!ENTITY shortpattern.warning "Het patroon dat u hebt ingevoerd is te kort om te worden geoptimaliseerd en kan uw browser traag maken. U kunt beter een langere regel voor dit filter kiezen, zodat Adblock Plus het filter efficiënter kan verwerken.">
 <!ENTITY collapse.yes.label "Ja">
 <!ENTITY anchors.label "Alleen patronen accepteren:">
 <!ENTITY collapse.default.yes.label "Standaard gebruiken (ja)">
-<!ENTITY domainRestriction.help "Gebruik deze optie om één of meer domeinen te specificeren, gescheiden door een lijn (|). Het filter zal alleen op deze domeinen worden toegepast. Een tilde (~) voor een domein betekent dat het filter niet moet worden toegepast op dat domein.">
+<!ENTITY domainRestriction.help "Gebruik deze optie om een of meer domeinen te specificeren, gescheiden door een sluisteken (|). Het filter zal alleen op de geselecteerde domeinen worden toegepast. Een tilde (~) voor een domein betekent dat het filter niet op dat domein zal worden toegepast.">
 <!ENTITY accept.label "Filter toevoegen">
 <!ENTITY options.label "Opties">
 <!ENTITY disabled.warning "Adblock Plus is momenteel uitgeschakeld. U kunt nog wel filters toevoegen, maar ze worden niet toegepast tenzij u [link]Adblock Plus weer inschakelt[/link].">
@@ -30,4 +30,4 @@
 <!ENTITY collapse.no.label "Nee">
 <!ENTITY selectAllTypes.label "Alles selecteren">
 <!ENTITY advanced.label "Geavanceerde weergave">
-<!ENTITY pattern.explanation "Het patroon kan ieder gedeelte zijn van het adres, waarbij een asterisk (*) als wildcard geldt. Het filter wordt alleen toegepast op adressen die met het patroon overeenkomen.">
+<!ENTITY pattern.explanation "Het patroon kan een willekeurig gedeelte van het adres zijn, asterisken (*) gelden als jokertekens. Het filter wordt alleen toegepast op adressen die met het opgegeven patroon overeenkomen.">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/nl/filters.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/nl/filters.dtd
index f04172e..14f13a6 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/nl/filters.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/nl/filters.dtd
@@ -1,55 +1,55 @@
 <!ENTITY restore.custom.warning "Al uw aangepaste filters worden vervangen door de inhoud van het geselecteerde bestand. Wilt u doorgaan?">
 <!ENTITY slow.column "T&amp;rage filters">
-<!ENTITY enabled.column "&amp;Ingeschakeld">
+<!ENTITY enabled.column "I&amp;ngeschakeld">
 <!ENTITY subscription.lastDownload.checksumMismatch "Mislukt, afwijkend controlecijfer">
 <!ENTITY noFiltersInGroup.text "De geselecteerde groep is leeg.">
 <!ENTITY subscription.actions.label "Acties">
 <!ENTITY filter.selectAll.label "Alles selecteren">
-<!ENTITY backupButton.label "&amp;Back-up en herstel">
-<!ENTITY restore.minVersion.warning "Waarschuwing: het bestand is gemaakt met een nieuwere versie van Adblock Plus. U dient bij te werken naar de laatste versie voordat u kunt herstellen vanuit dit bestand.">
-<!ENTITY restore.error "De gegevens in het bestand kunnen niet worden verwerkt, wellicht is het geen back-up-bestand van Adblock Plus?">
-<!ENTITY sort.ascending.label "&amp;A &gt; Z sortering">
+<!ENTITY backupButton.label "Ba&amp;ck-up en herstel">
+<!ENTITY restore.minVersion.warning "Waarschuwing: het bestand is gemaakt met een nieuwere versie van Adblock Plus. U dient Adblock Plus bij te werken naar de nieuwste versie voordat u iets vanuit dit bestand kunt terugzetten.">
+<!ENTITY restore.error "De gegevens in het bestand konden niet worden verwerkt; wellicht is het geen back-upbestand van Adblock Plus?">
+<!ENTITY sort.ascending.label "Sorteervolgorde &amp;A &gt; Z">
 <!ENTITY sort.label "&amp;Sorteren op">
 <!ENTITY subscription.source.label "Filterlijst">
 <!ENTITY hitcount.column "&amp;Treffers">
-<!ENTITY noFilters.text "U heeft nog geen aangepaste filters.">
+<!ENTITY noFilters.text "U hebt nog geen aangepaste filters.">
 <!ENTITY backup.custom.title "Alleen aangepaste filters">
 <!ENTITY subscription.external.label "Bijgewerkt door een andere extensie">
 <!ENTITY subscription.delete.label "Verwijderen">
-<!ENTITY noGroupSelected.text "U dient een filtergroep te selecteren voordat de filters kunnen worden weergegeven.">
+<!ENTITY noGroupSelected.text "U dient een filtergroep te selecteren voordat de filters ervan kunnen worden weergegeven.">
 <!ENTITY filter.cut.label "Knippen">
 <!ENTITY restore.default.label "Back-up van ?1? terugzetten">
 <!ENTITY subscription.lastDownload.inProgress "Downloaden…">
 <!ENTITY subscriptions.tab.label "Filterabonnementen">
-<!ENTITY sort.descending.label "&amp;Z &gt; A sortering">
+<!ENTITY sort.descending.label "Sorteervolgorde &amp;Z &gt; A">
 <!ENTITY filters.remove.warning "Wilt u echt alle geselecteerde filters verwijderen?">
 <!ENTITY filter.delete.label "Verwijderen">
 <!ENTITY addSubscriptionAdd.label "Toevoegen">
 <!ENTITY viewMenu.label "Beeld">
-<!ENTITY subscription.lastDownload.unknown "Onbekend">
+<!ENTITY subscription.lastDownload.unknown "N.v.t.">
 <!ENTITY addSubscriptionCancel.label "Annuleren">
 <!ENTITY subscription.enabled.label "Ingeschakeld">
-<!ENTITY noSubscriptions.text "U heeft nog geen filterabonnementen toegevoegd. Adblock Plus blokkeert niets zonder filters, gebruik ‘Filterabonnement toevoegen’ om er één toe te voegen.">
+<!ENTITY noSubscriptions.text "U hebt nog geen filterabonnementen toegevoegd. Adblock Plus blokkeert niets zonder filters; gebruik ‘Filterabonnement toevoegen’ om er enkele toe te voegen.">
 <!ENTITY subscription.update.label "Filters bijwerken">
 <!ENTITY dialog.title "Adblock Plus-filtervoorkeuren">
 <!ENTITY addFilter.label "Fil&amp;ter toevoegen">
-<!ENTITY subscription.minVersion.warning "Dit filterabonnement vereist een nieuwere versie van Adblock Plus, u dient bij te werken naar de nieuwste versie.">
+<!ENTITY subscription.minVersion.warning "Dit filterabonnement vereist een nieuwere versie van Adblock Plus; u dient Adblock Plus bij te werken naar de nieuwste versie.">
 <!ENTITY subscription.lastDownload.invalidURL "Mislukt, geen geldig adres">
-<!ENTITY backup.error "Er is een fout opgetreden bij het wegschrijven van de filters. Zorg ervoor dat het bestand niet tegen schrijven beveiligd is of wordt gebruikt door een andere toepassing.">
-<!ENTITY filter.moveUp.label "Omhoog">
+<!ENTITY backup.error "Er is een fout opgetreden bij het wegschrijven van de filters. Zorg ervoor dat het bestand niet tegen schrijven is beveiligd of door een andere toepassing wordt gebruikt.">
+<!ENTITY filter.moveUp.label "Omhoog verplaatsen">
 <!ENTITY addGroup.label "&amp;Filtergroep toevoegen">
 <!ENTITY filter.edit.label "Bewerken">
-<!ENTITY subscription.showHideFilters.label "Filters weergeven/verbergen">
+<!ENTITY subscription.showHideFilters.label "Filters tonen/verbergen">
 <!ENTITY acceptableAds2.label "&amp;Enkele niet-opdringerige advertenties toestaan">
 <!ENTITY addSubscriptionOther.label "Een ander abonnement toevoegen">
 <!ENTITY close.label "Sluiten">
 <!ENTITY sort.none.label "&amp;Ongesorteerd">
 <!ENTITY filter.actions.label "Filteracties">
 <!ENTITY filter.copy.label "Kopiëren">
-<!ENTITY filter.moveDown.label "Omlaag">
+<!ENTITY filter.moveDown.label "Omlaag verplaatsen">
 <!ENTITY filter.resetHitCounts.label "Trefferstatistieken opnieuw instellen">
-<!ENTITY readMore.label "Lees meer">
-<!ENTITY subscription.moveUp.label "Omhoog">
+<!ENTITY readMore.label "Meer lezen">
+<!ENTITY subscription.moveUp.label "Omhoog verplaatsen">
 <!ENTITY addSubscription.label "&amp;Filterabonnement toevoegen">
 <!ENTITY subscription.homepage.label "Startpagina">
 <!ENTITY backup.complete.title "Alle filters en abonnementen">
@@ -57,8 +57,8 @@
 <!ENTITY restore.complete.warning "Al uw filtervoorkeuren worden vervangen door de inhoud van het geselecteerde bestand. Wilt u doorgaan?">
 <!ENTITY filters.tab.label "Aangepaste filters">
 <!ENTITY backup.label "Nieuwe back-up maken">
-<!ENTITY find.label "Z&amp;oeken">
-<!ENTITY subscription.moveDown.label "Omlaag">
+<!ENTITY find.label "&amp;Zoeken">
+<!ENTITY subscription.moveDown.label "Omlaag verplaatsen">
 <!ENTITY subscription.lastDownload.connectionError "Mislukt, downloadprobleem">
 <!ENTITY subscription.lastDownload.success "Gelukt">
 <!ENTITY subscription.lastDownload.invalidData "Mislukt, geen geldige filterlijst">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/nl/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/nl/firstRun.properties
index 309fdcd..5c1980a 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/nl/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/nl/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Browse privé door 'tracking' uit te schakelen - verberg uw gegevens voor advertentiebedrijven die al uw surfgedrag zouden volgen.
-firstRun_toggle_off=UIT
-firstRun_feature_tracking=Tracking uitschakelen
-firstRun_feature_malware=Malware Blokkering
-firstRun_title=Adblock plus is geïnstalleerd
 firstRun_acceptableAdsExplanation=Wij zouden websites willen aanmoedigen eenvoudige, niet-opdringerige advertenties te gebruiken. Daarom hebben we <a>strikte richtlijnen</a> opgesteld om acceptabele advertenties te identificeren, die worden getoond onder Standaardinstellingen. Als u alsnog alle advertenties wilt blokkeren, kunt u dit in een paar seconden <a>uitschakelen</a>.
-firstRun_toggle_on=AAN
+firstRun_acceptableAdsHeadline=Vervelende advertenties zullen nu worden geblokkeerd
 firstRun_contributor_credits=Bijdrager Credits
 firstRun_dataCorruptionWarning=Blijft deze pagina verschijnen? <a>Klik hier!</a>
-firstRun_acceptableAdsHeadline=Vervelende advertenties zullen nu worden geblokkeerd
-firstRun_share=Vertel uw vrienden
-firstRun_share_headline=<a>Help ons</a> om van het web een betere plek te maken
-firstRun_features=Adblock Plus kan meer doen dan advertenties blokkeren
-firstRun_feature_malware_description=Maak het browsen veiliger door het blokkeren van bekende malware domeinen.
-firstRun_feature_social_description=Verwijder social media-knoppen (zoals de Facebook "Like" knop) automatisch, omdat die op webpagina's verschijnen en uw surfgedrag volgen.
 firstRun_donate=doneren
 firstRun_donate_label=Steun ons project
+firstRun_feature_malware=Malware Blokkering
+firstRun_feature_malware_description=Maak het browsen veiliger door het blokkeren van bekende malware domeinen.
 firstRun_feature_social=Verwijder Social Media knoppen
+firstRun_feature_social_description=Verwijder social media-knoppen (zoals de Facebook "Like" knop) automatisch, omdat die op webpagina's verschijnen en uw surfgedrag volgen.
+firstRun_feature_tracking=Tracking uitschakelen
+firstRun_feature_tracking_description=Browse privé door 'tracking' uit te schakelen - verberg uw gegevens voor advertentiebedrijven die al uw surfgedrag zouden volgen.
+firstRun_features=Adblock Plus kan meer doen dan advertenties blokkeren
+firstRun_filterlistsReinitializedWarning=Het lijkt er op dat een probleem was waardoor alle filters verwijderd werden en het onmogelijk was om een backup terug te zetten. Hierdoor hebben we al uw filters en Acceptabele Advertenties instellingen moeten resetten. Controleer A.U.B. uw instellingen in de <a>Adblock Plus Opties</a>.
 firstRun_legacySafariWarning=U gebruikt een oude versie van Safari die niet wordt ondersteund door Adblock Plus. Sommige websites kunnen daardoor onjuist worden weergegeven. Wij raden u aan een update uit te voeren naar Safari versie 6.1.1 of hoger (voor Mac OS X 10.8 Mountain Lion), Safari versie 7.0.1 of hoger (voor Mac OS X 10.9 Mavericks) of de laatste versie van Mozilla Firefox, Google Chrome of Opera te gebruiken.
-firstRun_filterlistsReinitializedWarning=It seems that an issue caused all filters to be removed and we were unable to restore a backup. Therefore we had to reset your filters and Acceptable Ads settings. Please check your filter lists and Acceptable Ads settings in the <a>Adblock Plus options</a>.
+firstRun_share=Vertel uw vrienden
+firstRun_share_headline=<a>Help ons</a> om van het web een betere plek te maken
+firstRun_title=Adblock plus is geïnstalleerd
+firstRun_toggle_off=UIT
+firstRun_toggle_on=AAN
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/nl/global.properties b/data/extensions/spyblock@gnu.org/chrome/locale/nl/global.properties
index 15b65fd..ddd9dc4 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/nl/global.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/nl/global.properties
@@ -1,41 +1,41 @@
-no_blocking_suggestions=Geen blokkeerbare onderdelen op deze pagina
+no_blocking_suggestions=Geen blokkeerbare items op deze pagina
 action3_tooltip=Klik om Adblock Plus in/uit te schakelen.
 notification_antiadblock_title=Gerichte berichten verbergen?
 type_label_script=script
 filter_elemhide_nocriteria=Geen criteria opgegeven om het te verbergen element te herkennen
-blockingGroup_title=Advertentieblokkaderegels
+blockingGroup_title=Regels voor advertentieblokkering
 whitelisted_tooltip=Adblock Plus is ingeschakeld maar staat uit voor deze pagina.
-type_label_stylesheet=stylesheet
+type_label_stylesheet=stijlblad
 blocked_count_tooltip=?1? van de ?2?
 type_label_font=lettertype
 type_label_popup=pop-upvenster
 filter_regexp_tooltip=Dit filter is een reguliere expressie of te kort om te kunnen worden geoptimaliseerd. Te veel van dit soort filters kan uw browser traag maken.
-action0_tooltip=Klik om het contextmenu te openen, middelklik om in/uit te schakelen.
+action0_tooltip=Klik om het contextmenu te openen, klik met de middelste muisknop om in/uit te schakelen.
 whitelisted_page=Adblock Plus is uitgeschakeld voor deze pagina
-remove_group_warning=Wilt u echt deze groep verwijderen?
-action1_tooltip=Klik om blokkeerbare onderdelen te openen/sluiten, middelklik om in/uit te schakelen.
+remove_group_warning=Wilt u deze groep echt verwijderen?
+action1_tooltip=Klik om blokkeerbare onderdelen te openen/sluiten, klik met de middelste muisknop om in/uit te schakelen.
 type_label_xmlhttprequest=XML-verzoek
-active_tooltip=Adblock Plus is actief, ?1? filterabonnement(en) en ?2? aangepast(e) filter(s) in gebruik.
+active_tooltip=Adblock Plus is ingeschakeld, ?1? filterabonnement(en) en ?2? aangepast(e) filter(s) in gebruik.
 type_label_document=document
 type_label_object_subrequest=object-subverzoek
 whitelistGroup_title=Uitzonderingsregels
 disabled_tooltip=Adblock Plus is uitgeschakeld.
 filter_elemhide_duplicate_id=Er kan slechts één ID van het te verbergen element worden opgegeven
 type_label_object=object
-action2_tooltip=Klik om voorkeuren te openen, middelklik om in/uit te schakelen.
+action2_tooltip=Klik om voorkeuren te openen, klik met de middelste muisknop om in/uit te schakelen.
 type_label_subdocument=frame
 clearStats_warning=Dit stelt alle filtertrefferstatistieken opnieuw in en schakelt het tellen van filtertreffers uit. Wilt u doorgaan?
-notification_antiadblock_message=Deze website staat er om bekend dat ze berichten laat zien die op Adblock plus gebruikers gericht zijn. Wilt u dat Adblock Plus deze verbergt?
+notification_antiadblock_message=Deze website staat bekend om het tonen van gerichte berichten aan Adblock Plus-gebruikers. Wilt u dat Adblock Plus deze verbergt?
 blocked_count_addendum=(ook op witte lijst: ?1?, verborgen: ?2?)
-subscription_invalid_location=Deze filterlijstlocatie is geen geldige URL en ook geen geldige bestandsnaam.
+subscription_invalid_location=Deze filterlijstlocatie is geen geldige URL, noch een geldige bestandsnaam.
 type_label_image=afbeelding
-remove_subscription_warning=Weet u zeker dat u dit abonnement wilt verwijderen?
+remove_subscription_warning=Wilt u dit abonnement echt verwijderen?
 type_label_other=anders
-mobile_menu_enable=ABP: Inschakelen
+mobile_menu_enable=ABP: inschakelen
 type_label_media=audio/video
-mobile_menu_disable_site=ABP: Uitschakelen op ?1?
-elemhideGroup_title=Elementverbergingsregels
-mobile_menu_enable_site=ABP: Inschakelen op ?1?
+mobile_menu_disable_site=ABP: uitschakelen op ?1?
+elemhideGroup_title=Regels voor verbergen van elementen
+mobile_menu_enable_site=ABP: inschakelen op ?1?
 type_label_elemhide=verborgen
 newGroup_title=Nieuwe filtergroep
 default_dialog_title=Adblock Plus
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/nl/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/nl/overlay.dtd
index 9537253..7cf1464 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/nl/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/nl/overlay.dtd
@@ -1,32 +1,31 @@
-<!ENTITY notification.button.yes "&amp;Ja">
 <!ENTITY notification.button.no "&amp;Nee">
-<!ENTITY sync.label "Syn&amp;chroniseer Adblock Plus instellingen">
+<!ENTITY sync.label "Adblock Plus-instellingen syn&amp;chroniseren">
 <!ENTITY whitelist.site.label "Uitschakelen op ?1?">
 <!ENTITY filters.label "&amp;Filtervoorkeuren">
 <!ENTITY disable.label "Overal uitschakelen">
 <!ENTITY objecttab.title "Blokkeren">
 <!ENTITY objecttab.tooltip "Klik hier om dit object te blokkeren met Adblock Plus">
 <!ENTITY menuitem.label "&amp;Adblock Plus-voorkeuren">
-<!ENTITY objecttabs.label "&amp;Tabs weergeven op Flash en Java">
-<!ENTITY sendReport.label "&amp;Probleem op deze pagina rapporteren">
+<!ENTITY objecttabs.label "&amp;Tabs tonen bij Flash en Java">
+<!ENTITY sendReport.label "&amp;Probleem op deze pagina melden">
 <!ENTITY whitelist.page.label "Alleen op deze pagina uitschakelen">
-<!ENTITY context.image.label "Adblock Plus: Afbeelding blokkeren">
-<!ENTITY counthits.label "&amp;Filtertreffers tellen">
-<!ENTITY opensidebar.label "&amp;Blokkeerbare onderdelen openen">
-<!ENTITY notification.button.close "&amp;Sluit">
-<!ENTITY contribute.label "Draag bij aan Adblock Plus">
+<!ENTITY context.image.label "Adblock Plus: afbeelding blokkeren">
+<!ENTITY notification.button.yes "&amp;Ja">
+<!ENTITY opensidebar.label "&amp;Blokkeerbare items openen">
+<!ENTITY notification.button.close "&amp;Sluiten">
+<!ENTITY contribute.label "Bijdragen aan Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
-<!ENTITY context.frame.label "Adblock Plus: Deelvenster blokkeren">
-<!ENTITY blocked.tooltip "Geblokkeerde onderdelen op deze pagina:">
-<!ENTITY hideplaceholders.label "P&amp;laatshouders van geblokkeerde elementen verbergen">
-<!ENTITY showinstatusbar.label "In &amp;statusbalk weergeven">
-<!ENTITY sidebar.title "Blokkeerbare onderdelen op deze pagina">
+<!ENTITY context.frame.label "Adblock Plus: deelvenster blokkeren">
+<!ENTITY blocked.tooltip "Geblokkeerde items op deze pagina:">
+<!ENTITY counthits.label "&amp;Filtertreffers tellen">
+<!ENTITY showinstatusbar.label "Tonen in &amp;statusbalk">
+<!ENTITY sidebar.title "Blokkeerbare items op deze pagina">
 <!ENTITY options.label "&amp;Opties">
-<!ENTITY context.object.label "Adblock Plus: Object blokkeren">
-<!ENTITY context.removeWhitelist.label "Adblock Plus: Opnieuw inschakelen op deze pagina">
+<!ENTITY context.object.label "Adblock Plus: object blokkeren">
+<!ENTITY context.removeWhitelist.label "Adblock Plus: opnieuw inschakelen op deze pagina">
 <!ENTITY filters.tooltip "Meest actieve filters:">
-<!ENTITY closesidebar.label "&amp;Blokkeerbare onderdelen sluiten">
-<!ENTITY showintoolbar.label "In werk&amp;balk weergeven">
+<!ENTITY closesidebar.label "&amp;Blokkeerbare items sluiten">
+<!ENTITY showintoolbar.label "Tonen in werk&amp;balk">
 <!ENTITY status.tooltip "Status:">
-<!ENTITY context.media.label "Adblock Plus: Audio/video blokkeren">
+<!ENTITY context.media.label "Adblock Plus: audio/video blokkeren">
 <!ENTITY subscription.update.label "Filters bijwerken">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/nl/sendReport.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/nl/sendReport.dtd
index 90265fb..c27c5a8 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/nl/sendReport.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/nl/sendReport.dtd
@@ -1,65 +1,65 @@
 <!ENTITY screenshot.undo.label "Onge&amp;daan maken">
-<!ENTITY issues.disabledgroups.description "De volgende filterabonnementen / filtergroepen zijn uitgeschakeld, maar ze hebben mogelijk wel een effect op deze pagina:">
-<!ENTITY showData.label "Rapportgegevens weergeven">
-<!ENTITY typeSelector.falsePositive.label "Adblock Plus blokkeert te &amp;veel">
-<!ENTITY issues.change.description "Uw configuratie is gewijzigd. Laad de pagina opnieuw om de wijzigingen te testen en een rapport in te dienen als het probleem niet is opgelost door de wijzigingen.">
+<!ENTITY issues.disabledgroups.description "De volgende filterabonnementen / filtergroepen zijn uitgeschakeld, maar zijn mogelijk wel van invloed op deze pagina:">
+<!ENTITY showData.label "Rapportgegevens tonen">
+<!ENTITY typeSelector.falsePositive.label "Adblock Plus blokkeert &amp;te veel">
+<!ENTITY issues.change.description "Uw configuratie is gewijzigd. Laad de pagina opnieuw om de wijzigingen te testen en dien een rapport in als het probleem niet door de wijzigingen is verholpen.">
 <!ENTITY email.label "E-&amp;mailadres:">
 <!ENTITY issues.openPreferences.label "Filtervoorkeuren openen">
-<!ENTITY sendPage.confirmation "Uw rapport is opgeslagen. U kunt het bekijken op het volgende adres:">
+<!ENTITY sendPage.confirmation "Uw rapport is opgeslagen. U kunt het vinden op het volgende adres:">
 <!ENTITY copyLink.label "Rapport&amp;koppeling kopiëren">
-<!ENTITY issues.nofilters.description "Adblock Plus blokkeert niets op de huidige pagina. Het door u ervaren probleem hangt hoogstwaarschijnlijk niet samen met Adblock Plus.">
+<!ENTITY issues.nofilters.description "Adblock Plus blokkeert niets op de huidige pagina. Het door u ervaren probleem heeft zeer waarschijnlijk niets met Adblock Plus te maken.">
 <!ENTITY sendPage.knownIssue "Het door u gemelde probleem is waarschijnlijk al bekend. Meer informatie:">
 <!ENTITY typeSelector.other.description "Selecteer deze optie als u een probleem met Adblock Plus zelf vermoedt in plaats van met de filters.">
 <!ENTITY issues.disabledgroups.enable.label "Filterabonnement / filtergroep inschakelen">
-<!ENTITY typeWarning.override.label "Ik be&amp;grijp het en wil het rapport toch indienen">
+<!ENTITY typeWarning.override.label "Ik &amp;begrijp het en wil het rapport toch indienen">
 <!ENTITY issues.disabled.enable.label "Adblock Plus inschakelen">
-<!ENTITY update.fixed.description "De updates voor uw filterabonnementen hebben waarschijnlijk het door u gerapporteerde probleem verholpen. Laad de pagina opnieuw en probeer het nog eens, en druk opnieuw op Rapporteren als het probleem aanhoudt.">
+<!ENTITY update.fixed.description "De updates voor uw filterabonnementen hebben het door u gemelde probleem waarschijnlijk verholpen. Laad de pagina opnieuw en probeer het nogmaals, en klik opnieuw op Probleem op deze pagina melden als het probleem aanhoudt.">
 <!ENTITY anonymous.label "&amp;Anonieme bijdrage">
 <!ENTITY reloadButton.label "Pagina opnie&amp;uw laden">
 <!ENTITY recentReports.clear.label "Alle rappor&amp;ten verwijderen">
-<!ENTITY typeSelector.description "Dit venster leidt u door de stappen die nodig zijn voor het indienen van een Adblock Plus-probleemrapport. Selecteer eerst het probleemtype dat u ervaart op deze pagina:">
+<!ENTITY typeSelector.description "Dit venster leidt u door de benodigde stappen voor het indienen van een Adblock Plus-probleemrapport. Selecteer eerst het probleemtype dat u op deze pagina ervaart:">
 <!ENTITY screenshot.remove.label "Gevoelige gegevens ver&amp;wijderen">
-<!ENTITY issues.ownfilters.description "Enkele van de op deze pagina toegepaste filters zijn door een gebruiker gedefinieerd. Schakel de filters uit die mogelijk het probleem hebben veroorzaakt:">
+<!ENTITY issues.ownfilters.description "Enkele van de op deze pagina toegepaste filters zijn door een gebruiker gedefinieerd. Schakel de filters uit die het probleem mogelijk hebben veroorzaakt:">
 <!ENTITY update.inProgress.description "Adblock Plus dient uw filterabonnementen bij te werken om te controleren of het probleem niet al is opgelost. Een ogenblik…">
 <!ENTITY sendPage.retry.label "Opnieuw verzenden">
-<!ENTITY data.label "Ra&amp;pportgegevens:">
+<!ENTITY data.label "R&amp;apportgegevens:">
 <!ENTITY recentReports.label "Uw onlangs ingediende rapporten">
-<!ENTITY typeWarning.description "U hebt aangegeven dat u een algemeen probleem met Adblock Plus wilt rapporteren in plaats van een probleem met de filters. Merk op dat dergelijke problemen het beste kunnen worden gerapporteerd in het [link]Adblock Plus-forum[/link]. U dient de probleemrapportage alleen te gebruiken om een bestaande discussie aan te vullen, aangezien niemand uw rapport zal opmerken tenzij u een koppeling ernaartoe geeft. De automatisch aangemaakte koppeling wordt weergegeven na indienenvan het rapport.">
-<!ENTITY issues.disabled.description "Adblock Plus is uitgeschakeld, in de huidige staat zal het niets blokkeren.">
-<!ENTITY attachExtensions.label "Voeg een lijst met actieve e&amp;xtensies toe aan het rapport voor het geval conflicterende add-ons de oorzaak van het probleem zijn">
+<!ENTITY typeWarning.description "U hebt aangegeven dat u een algemeen probleem met Adblock Plus wilt melden in plaats van een probleem met de filters. Houd er rekening mee dat dergelijke problemen het beste in het [link]Adblock Plus-forum[/link] kunnen worden gemeld. U dient de probleemrapportage alleen te gebruiken om een bestaande discussie aan te vullen, aangezien niemand uw rapport zal opmerken, tenzij u hen een koppeling ernaartoe geeft. De automatisch aangemaakte koppeling wordt na het indienen van het rapport weergegeven.">
+<!ENTITY issues.disabled.description "Adblock Plus is uitgeschakeld; in de huidige toestand zal het niets blokkeren.">
+<!ENTITY attachExtensions.label "Een lijst met actieve e&amp;xtensies aan het rapport toevoegen voor het geval een conflicterende add-on de oorzaak van het probleem is">
 <!ENTITY issues.nosubscriptions.add.label "Filterabonnement toevoegen">
 <!ENTITY issues.disabledfilters.enable.label "Filter inschakelen">
 <!ENTITY issues.override.label "De &amp;configuratie is juist, doorgaan met rapportage">
-<!ENTITY issues.nosubscriptions.description "Het lijkt er op dat u geen abonnement heeft op een filterlijst die automatisch ongewenste inhoud van websites verwijdert.">
+<!ENTITY issues.nosubscriptions.description "Het lijkt erop dat u geen abonnement hebt op vooraf gemaakte filterlijsten die automatisch ongewenste inhoud van websites verwijderen.">
 <!ENTITY typeSelector.falsePositive.description "Selecteer deze optie als de pagina belangrijke inhoudt niet weergeeft, onjuist wordt weergegeven of niet goed werkt. U kunt bepalen of Adblock Plus de oorzaak hiervan is door het tijdelijk uit te schakelen.">
-<!ENTITY typeSelector.other.label "&amp;Overige problemen">
-<!ENTITY emailComment.label "We raden u aan een geldig e-mailadres in te voeren, zodat we contact met u op kunnen nemen als er vragen zijn over uw verslag. Hierdoor kunnen wij uw bijdragen ook herkennen en ze hoger prioriteren.">
+<!ENTITY typeSelector.other.label "&amp;Ander probleem">
+<!ENTITY emailComment.label "We raden u aan een geldig e-mailadres in te voeren, zodat we contact met u kunnen opnemen als er vragen zijn over uw rapport. Hierdoor kunnen we uw bijdragen ook herkennen en een hogere prioriteit geven.">
 <!ENTITY issues.whitelist.remove.label "Adblock Plus weer inschakelen op deze pagina">
-<!ENTITY outdatedSubscriptions.description "De volgende filterabonnementen zijn ten minste twee weken niet meer bijgewerkt. Werk ze eerst bij voordat u een rapport indient, het probleem is mogelijk al verholpen.">
-<!ENTITY dataCollector.description "Wacht enkele momenten terwijl Adblock Plus de benodigde gegevens verzamelt.">
+<!ENTITY outdatedSubscriptions.description "De volgende filterabonnementen zijn minstens twee weken niet meer bijgewerkt. Werk deze abonnementen eerst bij voordat u een rapport indient; mogelijk is het probleem al verholpen.">
+<!ENTITY dataCollector.description "Wacht even terwijl Adblock Plus de benodigde gegevens verzamelt.">
 <!ENTITY sendButton.label "Rapport ver&amp;zenden">
-<!ENTITY comment.label "Opme&amp;rking (optioneel):">
+<!ENTITY comment.label "&amp;Opmerking (optioneel):">
 <!ENTITY sendPage.errorMessage "De poging om het rapport te verzenden is mislukt met foutcode ‘?1?’. Controleer uw internetverbinding en probeer het opnieuw. Als het probleem aanhoudt, vraag dan om hulp op het [link]Adblock Plus-forum[/link].">
-<!ENTITY showRecentReports.label "Onlangs ingediende rapporten weergeven">
+<!ENTITY showRecentReports.label "Onlangs ingediende rapporten tonen">
 <!ENTITY commentPage.heading "Opmerking toevoegen">
 <!ENTITY update.start.label "Nu bijwerken">
-<!ENTITY issues.disabledfilters.description "De volgende filters zijn uitgeschakeld, maar ze hebben mogelijk wel een effect op deze pagina:">
-<!ENTITY screenshot.description "Dezelfde pagina kan er verschillend uitzien voor verschillende personen. We begrijpen het probleem misschien beter als u een schermafbeelding toevoegt aan uw rapport. U kunt secties met gevoelige informatie verwijderen en gebieden waar het probleem zich voordoet markeren. Klik op de bijbehorende knop om dit te doen en selecteer een sectie van de afbeelding met uw muis.">
-<!ENTITY screenshot.attach.label "Een pagina-afbeelding bi&amp;j het rapport bijvoegen">
-<!ENTITY issues.whitelist.description "Adblock Plus is momenteel uitgeschakeld op de door u gerapporteerde pagina. Schakel het weer in en herlaad de pagina voordat u het rapport indient om te helpen bij het onderzoeken van dit probleem.">
-<!ENTITY typeSelector.falseNegative.label "Adblock Plus blokk&amp;eert een advertentie niet">
-<!ENTITY typeSelector.heading "Selecteer probleemtype">
-<!ENTITY anonymity.warning "We kunnen niet met u in contact komen en zullen uw verslag daarom waarschijnlijk lager prioriteren.">
+<!ENTITY issues.disabledfilters.description "De volgende filters zijn uitgeschakeld, maar zijn mogelijk wel van invloed op deze pagina:">
+<!ENTITY screenshot.description "Dezelfde pagina kan er voor verschillende personen anders uitzien. We begrijpen het probleem misschien beter als u een schermafbeelding aan uw rapport toevoegt. Secties met gevoelige informatie kunt u verwijderen en gebieden waar het probleem merkbaar is kunt u markeren. Klik op de bijbehorende knop om dit te doen en selecteer een gedeelte van de afbeelding met uw muis.">
+<!ENTITY screenshot.attach.label "Een pagina-afbeelding bij het rapport &amp;bijvoegen">
+<!ENTITY issues.whitelist.description "Adblock Plus is momenteel uitgeschakeld op de door u gerapporteerde pagina. Schakel het weer in en laad de pagina opnieuw voordat u het rapport indient om dit probleem te helpen onderzoeken.">
+<!ENTITY typeSelector.falseNegative.label "Adblock Plus blokkeert een advertentie &amp;niet">
+<!ENTITY typeSelector.heading "Probleemtype selecteren">
+<!ENTITY anonymity.warning "We zullen geen contact met u kunnen opnemen en het rapport waarschijnlijk een lagere prioriteit geven.">
 <!ENTITY wizard.title "Probleemrapportage">
 <!ENTITY issues.ownfilters.disable.label "Filter uitschakelen">
 <!ENTITY commentPage.description "In het onderstaande tekstveld kunt u een opmerking toevoegen om ons te helpen het probleem te begrijpen. Deze stap is optioneel maar wordt aanbevolen als het probleem niet evident is. U kunt de rapportgegevens ook nakijken voordat u het rapport verstuurt.">
 <!ENTITY comment.lengthWarning "De lengte van uw opmerking overschrijdt 1000 tekens. Alleen de eerste 1000 tekens worden verzonden.">
-<!ENTITY typeSelector.falseNegative.description "Selecteer deze optie als een advertentie wordt weergegeven ondanks het feit dat Adblock Plus is ingeschakeld.">
-<!ENTITY sendPage.waitMessage "Een ogenblik terwijl Adblock Plus uw rapport indient.">
+<!ENTITY typeSelector.falseNegative.description "Selecteer deze optie als een advertentie wordt weergegeven, ondanks het feit dat Adblock Plus is ingeschakeld.">
+<!ENTITY sendPage.waitMessage "Wacht even terwijl Adblock Plus uw rapport indient.">
 <!ENTITY dataCollector.heading "Welkom bij de probleemrapportage">
 <!ENTITY screenshot.heading "Schermafbeelding toevoegen">
 <!ENTITY sendPage.heading "Rapport verzenden">
-<!ENTITY issues.subscriptionCount.description "Het lijkt er op dat u op te veel filterabonnementen geabonneerd bent. Dit is niet aanbevolen, want het verhoogt de kans op problemen. Wij kunnen ook geen probleemmeldingen accepteren, omdat het niet duidelijk is van welk filterabonnement de auteur actie dient te ondernemen. Verwijder alstublieft alle filterabonnementen op de hoogst nodige na en controleer of het probleem dan nog steeds optreedt.">
-<!ENTITY screenshot.mark.label "Het problee&amp;m markeren">
+<!ENTITY issues.subscriptionCount.description "Het lijkt erop dat u op te veel filterabonnementen bent geabonneerd. Dit wordt niet aanbevolen, want het verhoogt de kans op problemen. We kunnen ook geen probleemmeldingen accepteren, omdat het niet duidelijk is van welk filterabonnement de auteur actie dient te ondernemen. Verwijder alle filterabonnementen op de hoogst nodige na en controleer of het probleem dan nog steeds optreedt.">
+<!ENTITY screenshot.mark.label "Het probleem &amp;markeren">
 <!ENTITY privacyPolicy.label "Privacybeleid">
-<!ENTITY issues.description "Adblock plus heeft problemen met uw configuratie gedetecteerd die mogelijk verantwoordelijk zijn voor dit probleem of het onderzoeken van het rapport bemoeilijken.">
+<!ENTITY issues.description "Adblock plus heeft problemen met uw configuratie gedetecteerd die mogelijk voor dit probleem verantwoordelijk zijn of het onderzoeken van het rapport bemoeilijken.">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/nl/sidebar.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/nl/sidebar.dtd
index d715dff..74a3a04 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/nl/sidebar.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/nl/sidebar.dtd
@@ -1,9 +1,9 @@
 <!ENTITY context.flash.label "Randen laten knipperen">
 <!ENTITY address.label "Adres">
-<!ENTITY context.open.label "Openen in een nieuw tabblad">
+<!ENTITY context.open.label "Openen in nieuw tabblad">
 <!ENTITY type.label "Type">
 <!ENTITY tooltip.filterSource.label "Filterbron:">
-<!ENTITY noitems.label "Geen blokkeerbare onderdelen">
+<!ENTITY noitems.label "Geen blokkeerbare items">
 <!ENTITY filter.label "Filter">
 <!ENTITY tooltip.size.label "Grootte:">
 <!ENTITY reattach.label "Vastkoppelen">
@@ -15,12 +15,12 @@
 <!ENTITY tooltip.type.label "Type:">
 <!ENTITY context.disablefilter.label "Filter ?1? uitschakelen">
 <!ENTITY context.copyFilter.label "Filter kopiëren">
-<!ENTITY context.block.label "Dit onderdeel blokkeren">
-<!ENTITY context.enablefilter.label "Filter ?1? inschakelen">
+<!ENTITY context.block.label "Dit item blokkeren">
+<!ENTITY context.enablefilter.label "Filter ?1? weer inschakelen">
 <!ENTITY detach.label "Loskoppelen">
 <!ENTITY whitelisted.label "Toegestane pagina">
-<!ENTITY context.disablefilteronsite.label "Filter uitschakelen op ?1?">
-<!ENTITY detached.title "Adblock Plus: Blokkeerbare onderdelen (losgekoppeld)">
+<!ENTITY context.disablefilteronsite.label "Dit filter uitschakelen op ?1?">
+<!ENTITY detached.title "Adblock Plus: Blokkeerbare items (losgekoppeld)">
 <!ENTITY docDomain.firstParty "(rechtstreeks)">
 <!ENTITY tooltip.type.whitelisted "(toegestaan)">
 <!ENTITY tooltip.filter.label "Toegepast filter:">
@@ -28,7 +28,7 @@
 <!ENTITY context.editfilter.label "Toegepast filter bewerken">
 <!ENTITY tooltip.type.blocked "(geblokkeerd)">
 <!ENTITY size.label "Grootte">
-<!ENTITY context.whitelist.label "Uitzonderingsregel voor dit onderdeel toevoegen">
+<!ENTITY context.whitelist.label "Uitzonderingsregel voor item toevoegen">
 <!ENTITY context.selectAll.label "Alles selecteren">
 <!ENTITY state.label "Status">
 <!ENTITY docDomain.label "Documentbron">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/nl/subscriptionSelection.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/nl/subscriptionSelection.dtd
index cfc0f76..c35a8c1 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/nl/subscriptionSelection.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/nl/subscriptionSelection.dtd
@@ -1,12 +1,12 @@
 <!ENTITY addMain.label "Filterabonnement “?1?” oo&amp;k toevoegen">
-<!ENTITY list.download.failed "Adblock Plus kan de lijst met abonnementen niet ophalen.">
+<!ENTITY list.download.failed "Adblock Plus kon de lijst met abonnementen niet ophalen.">
 <!ENTITY list.download.retry "Opnieuw proberen">
 <!ENTITY title.label "A&amp;bonnementstitel:">
 <!ENTITY list.download.website "Website bekijken">
-<!ENTITY supplementMessage "Dit filterabonnement is bedoeld om samen gebruikt te worden met het filterabonnement “?1?”, dat u nog niet gebruikt.">
+<!ENTITY supplementMessage "Dit filterabonnement is bedoeld om te worden gebruikt met het filterabonnement “?1?”, dat u nog niet gebruikt.">
 <!ENTITY viewList.label "Filters bekijken">
 <!ENTITY visitHomepage.label "Startpagina bezoeken">
 <!ENTITY addSubscription.label "Abonneren">
-<!ENTITY dialog.title "Adblock Plus filterabonnement toevoegen">
-<!ENTITY location.label "Fi&amp;lterlijstlocatie:">
-<!ENTITY fromWeb.description "Bevestig a.u.b. dat u dit filterabonnement wilt toevoegen. U kunt de abonnementstitel of -locatie wijzigen voor toevoegen.">
+<!ENTITY dialog.title "Adblock Plus-filterabonnement toevoegen">
+<!ENTITY location.label "Filterlijstl&amp;ocatie:">
+<!ENTITY fromWeb.description "Bevestig dat u dit filterabonnement wilt toevoegen. U kunt de abonnementstitel of -locatie voor het toevoegen wijzigen.">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/pl/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/pl/firstRun.properties
index dee4d0f..281fcbe 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/pl/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/pl/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Przeglądaj, zachowując prywatność poprzez wyłączenie śledzenia, ukrywając swoje ślady przed firmami reklamowymi, które chciałyby śledzić każdy twój ruch.
-firstRun_toggle_off=WYŁ.
-firstRun_feature_tracking=Wyłączenie śledzenia
-firstRun_feature_malware=Blokowanie złośliwego oprogramowania
-firstRun_title=Adblock Plus został zainstalowany
-firstRun_toggle_on=WŁ.
 firstRun_acceptableAdsExplanation=Chcielibyśmy zachęcić witryny do używania prostych, dyskretnych reklam. Dlatego mamy zdefiniowane<a> ścisłe wytyczne </ a>określające akceptowalne reklamy wyświetlane na podstawie tych ustawień. Jeśli chcesz blokować każdą reklamę, możesz tę funkcję <a> wyłączyć </ a> w ciągu kilku sekund.
+firstRun_acceptableAdsHeadline=Irytujące reklamy będą teraz blokowane
 firstRun_contributor_credits=Podziękowania dla współtwórców
 firstRun_dataCorruptionWarning=Czy ta strona ma być wyświetlana? <a>Kliknij tutaj!</a>
-firstRun_acceptableAdsHeadline=Irytujące reklamy będą teraz blokowane
-firstRun_share=Powiedz znajomym
-firstRun_share_headline=<a>Pomóż nam</a> uczynić internet lepszym miejscem
-firstRun_feature_social_description=Automatycznie pozbądź się przycisków dodawanych przez media społecznościowe, takich jak facebookowy „Lubię to!”, które śledzą twoje zachowanie.
-firstRun_filterlistsReinitializedWarning=Wygląda na to, że w wyniku błędu wszystkie filtry zostały usunięte i nie udało się ich przywrócić z kopii zapasowej, dlatego twoje filtry i ustawienia akceptowalnych reklam zostały zresetowane. Sprawdź swoje listy filtrów i ustawienia akceptowalnych reklam w <a>opcjach Adblock Plusa</a>.
-firstRun_feature_malware_description=Spraw, by twoje przeglądanie było bardziej bezpieczne, blokując znane domeny ze złośliwym oprogramowaniem.
-firstRun_features=Adblock Plus umożliwia więcej niż blokowanie reklam
 firstRun_donate=Wspomóż nas
 firstRun_donate_label=Wesprzyj nasz projekt
+firstRun_feature_malware=Blokowanie złośliwego oprogramowania
+firstRun_feature_malware_description=Spraw, by twoje przeglądanie było bardziej bezpieczne, blokując znane domeny ze złośliwym oprogramowaniem.
 firstRun_feature_social=Usuwanie przycisków serwisów społecznościowych
+firstRun_feature_social_description=Automatycznie pozbądź się przycisków dodawanych przez media społecznościowe, takich jak facebookowy „Lubię to!”, które śledzą twoje zachowanie.
+firstRun_feature_tracking=Wyłączenie śledzenia
+firstRun_feature_tracking_description=Przeglądaj, zachowując prywatność poprzez wyłączenie śledzenia, ukrywając swoje ślady przed firmami reklamowymi, które chciałyby śledzić każdy twój ruch.
+firstRun_features=Adblock Plus umożliwia więcej niż blokowanie reklam
+firstRun_filterlistsReinitializedWarning=Wygląda na to, że w wyniku błędu wszystkie filtry zostały usunięte i nie udało się ich przywrócić z kopii zapasowej, dlatego twoje filtry i ustawienia akceptowalnych reklam zostały zresetowane. Sprawdź swoje listy filtrów i ustawienia akceptowalnych reklam w <a>opcjach Adblock Plusa</a>.
 firstRun_legacySafariWarning=Używasz starej, nie obsługiwanej już przez Adblock Plusa wersji Safari. Może to powodować nieprawidłowe działanie lub zakłócać przeglądanie niektórych witryn. Zalecamy uaktualnienie Safari w systemie OS X Mountain Lion do wersji 6.1.1 lub nowszej, lub do wersji 7.0.1 lub nowszej w systemie OS X 10.9 Maverick. Możesz także użyć najnowszych wersji przeglądarek Firefox, Chrome lub Opera.
+firstRun_share=Powiedz znajomym
+firstRun_share_headline=<a>Pomóż nam</a> uczynić internet lepszym miejscem
+firstRun_title=Adblock Plus został zainstalowany
+firstRun_toggle_off=WYŁ.
+firstRun_toggle_on=WŁ.
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/pl/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/pl/overlay.dtd
index 115752e..88c4080 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/pl/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/pl/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Tak">
 <!ENTITY notification.button.no "&amp;Nie">
 <!ENTITY sync.label "&amp;Synchronizuj ustawienia Adblock Plusa">
 <!ENTITY whitelist.site.label "Wyłącz blokowanie na ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "&amp;Zgłoś problem na tej stronie">
 <!ENTITY whitelist.page.label "Wyłącz blokowanie tylko na tej stronie">
 <!ENTITY context.image.label "Zablokuj obrazek">
-<!ENTITY counthits.label "Zli&amp;czaj użycie filtra">
+<!ENTITY notification.button.yes "&amp;Tak">
 <!ENTITY opensidebar.label "Otwórz listę &amp;blokowalnych elementów">
 <!ENTITY notification.button.close "&amp;Zamknij">
 <!ENTITY contribute.label "Wspomóż Adblock Plusa">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Zablokuj ramkę">
 <!ENTITY blocked.tooltip "Zablokowane elementy na tej stronie:">
-<!ENTITY hideplaceholders.label "Ukrywaj za&amp;mienniki blokowanych elementów">
+<!ENTITY counthits.label "Zli&amp;czaj użycie filtra">
 <!ENTITY showinstatusbar.label "&amp;Wyświetlaj ikonę Adblock Plusa na pasku stanu">
 <!ENTITY sidebar.title "Blokowalne elementy na aktywnej stronie">
 <!ENTITY options.label "&amp;Opcje">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/pl/sendReport.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/pl/sendReport.dtd
index 7ab04d9..9ab38b5 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/pl/sendReport.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/pl/sendReport.dtd
@@ -26,7 +26,7 @@
 <!ENTITY recentReports.label "Twoje ostatnio wysłane zgłoszenia">
 <!ENTITY typeWarning.description "Chcesz zgłosić ogólny problem dotyczący Adblock Plusa, a nie problem z filtrami. Tego rodzaju problemy najlepiej jest zgłaszać na [link]forum Adblock Plusa[/link]. Reportera błędów powinno się używać do uzupełnienia dyskusji na forum, ponieważ nikt nie zauważy zgłoszenia, chyba że dołączysz do niego odnośnik. Automatycznie generowany odnośnik zostanie dołączony po wysłaniu zgłoszenia.">
 <!ENTITY issues.disabled.description "Adblock Plus jest wyłączony. Obecnie nic nie będzie blokował.">
-<!ENTITY attachExtensions.label "Dołącz do zgłoszenia listę aktywnych &amp;rozszerzeń, gdy przyczyną problemu jest konflikt z innym rozszerzeniem.">
+<!ENTITY attachExtensions.label "Dołącz do zgłoszenia listę aktywnych &amp;rozszerzeń, gdy przyczyną problemu jest konflikt z innym rozszerzeniem">
 <!ENTITY issues.nosubscriptions.add.label "Subskrybuj filtry">
 <!ENTITY issues.disabledfilters.enable.label "Włącz filtr">
 <!ENTITY issues.override.label "&amp;Konfiguracja jest prawidłowa – kontynuuj zgłoszenie">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/pt-BR/composer.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/pt-BR/composer.dtd
index d8b038d..e0ab6d9 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/pt-BR/composer.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/pt-BR/composer.dtd
@@ -1,12 +1,12 @@
 <!ENTITY anchor.end.label "no f&amp;inal do endereço">
-<!ENTITY domainRestriction.label "Restringir domínio:">
+<!ENTITY domainRestriction.label "Restringir ao &amp;domínio:">
 <!ENTITY collapse.default.no.label "Usar padrão (não)">
 <!ENTITY firstParty.label "So&amp;mente mesmo domínio">
 <!ENTITY preferences.label "Mostrar filtros existentes...">
 <!ENTITY pattern.label "Procurar padrão">
 <!ENTITY thirdParty.label "So&amp;mente de terceiros">
 <!ENTITY filter.label "Novo &amp;filtro:">
-<!ENTITY collapse.label "Es&amp;tado de crise bloqueado:">
+<!ENTITY collapse.label "Es&amp;conder bloqueados:">
 <!ENTITY match.warning "O padrão que você digitou não corresponde mais ao endereço a ser bloqueado/liberado e não terá efeito sobre ele.">
 <!ENTITY anchor.start.label "no &amp;começo do endereço">
 <!ENTITY matchCase.label "&amp;Diferenciar maiúsculas/minúsculas">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/pt-BR/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/pt-BR/firstRun.properties
index 19fb73f..28e868c 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/pt-BR/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/pt-BR/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Navegar em modo privado desabilitando o acompanhamento - esconde seus rastros de empresas de anúncio que iria acompanhar cada movimento seu.
-firstRun_toggle_off=DESLIGADO
-firstRun_feature_tracking=Desativa o Rastreamento
-firstRun_feature_malware=Bloqueio de Malware
-firstRun_title=O Adblock Plus foi instalado
-firstRun_toggle_on=LIGADO
 firstRun_acceptableAdsExplanation=Gostaríamos de incentivar sites com publicidade discreta, é simples de usar. É por isso que estabelecemos <a>diretrizes rígidas</a> para identificarmos anúncios aceitáveis, que são mostrados em configurações padrão. Se você ainda deseja bloquear todos os anúncios você pode <a>desativar</a> isso em poucos segundos.
+firstRun_acceptableAdsHeadline=Anúncios chatos serão bloqueados
 firstRun_contributor_credits=Créditos dos contribuidores
 firstRun_dataCorruptionWarning=Esta página continua aparecendo? <a>Clique aqui!</a>
-firstRun_acceptableAdsHeadline=Anúncios chatos serão bloqueados
-firstRun_share=Indique a seus amigos
-firstRun_share_headline=<a>Ajude-nos</a> a tornar a web um lugar melhor
-firstRun_feature_social_description=Automaticamente melhore sua experiência de navegação livrando-se de botões de redes sociais, como o Like do Facebook, que aparecem em páginas da web e que controlam seu comportamento.
-firstRun_filterlistsReinitializedWarning=Parece que algum um problema causou a remoção de todos os filtros e fomos incapazes de restaurá-los por backup. Portanto tivemos que resetar seus filtros e as configurações de anúncios toleráveis. Por favor verifique a lista de filtros a as configurações de anúncios aceitáveis em <a>Opções do Adblock Plus</a>.
-firstRun_feature_malware_description=Tornar sua navegação mais segura através do bloqueio de sites conhecidos com malwares.
-firstRun_features=O Adblock Plus pode fazer mais do que bloquear anúncios
 firstRun_donate=Doar
 firstRun_donate_label=Apoiar o projeto
+firstRun_feature_malware=Bloqueio de Malware
+firstRun_feature_malware_description=Tornar sua navegação mais segura através do bloqueio de sites conhecidos com malwares.
 firstRun_feature_social=Remove Botões de Redes Sociais
+firstRun_feature_social_description=Automaticamente melhore sua experiência de navegação livrando-se de botões de redes sociais, como o Like do Facebook, que aparecem em páginas da web e que controlam seu comportamento.
+firstRun_feature_tracking=Desativa o Rastreamento
+firstRun_feature_tracking_description=Navegar em modo privado desabilitando o acompanhamento - esconde seus rastros de empresas de anúncio que iria acompanhar cada movimento seu.
+firstRun_features=O Adblock Plus pode fazer mais do que bloquear anúncios
+firstRun_filterlistsReinitializedWarning=Parece que algum um problema causou a remoção de todos os filtros e fomos incapazes de restaurá-los por backup. Portanto tivemos que resetar seus filtros e as configurações de anúncios toleráveis. Por favor verifique a lista de filtros a as configurações de anúncios aceitáveis em <a>Opções do Adblock Plus</a>.
 firstRun_legacySafariWarning=Você está usando uma versão antiga do Safari não suportada pelo Adblock Plus. Ele pode não funcionar corretamente ou prejudicar a experiência do usuário em alguns sites. Recomendamos fortemente atualizar para o Safari 6.1.1 ou superior (no OS X 10.8 Mountain Lion) ou Safari 7.0.1 ou superior (no OS X 10.9 Mavericks), ou usar a última versão do Mozilla Firefox, Google Chrome ou Opera.
+firstRun_share=Indique a seus amigos
+firstRun_share_headline=<a>Ajude-nos</a> a tornar a web um lugar melhor
+firstRun_title=O Adblock Plus foi instalado
+firstRun_toggle_off=DESLIGADO
+firstRun_toggle_on=LIGADO
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/pt-BR/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/pt-BR/overlay.dtd
index 58def63..bacca3c 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/pt-BR/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/pt-BR/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Sim">
 <!ENTITY notification.button.no "&amp;Não">
 <!ENTITY sync.label "S&amp;incronizar configurações do Adblock Plus">
 <!ENTITY whitelist.site.label "Desativar em ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "&amp;Reportar problema nesta página">
 <!ENTITY whitelist.page.label "Desativar somente nesta página">
 <!ENTITY context.image.label "Adblock Plus: Bloquear imagem">
-<!ENTITY counthits.label "Cont&amp;ar acertos de filtros">
+<!ENTITY notification.button.yes "&amp;Sim">
 <!ENTITY opensidebar.label "A&amp;brir itens bloqueáveis">
 <!ENTITY notification.button.close "&amp;Fechar">
 <!ENTITY contribute.label "Contribuir com o Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Bloquear quadro">
 <!ENTITY blocked.tooltip "Itens bloqueados nesta página:">
-<!ENTITY hideplaceholders.label "Ocultar &amp;marcadores de elementos bloqueados">
+<!ENTITY counthits.label "Cont&amp;ar acertos de filtros">
 <!ENTITY showinstatusbar.label "&amp;Mostrar na barra de status">
 <!ENTITY sidebar.title "Itens bloqueáveis na página atual">
 <!ENTITY options.label "&amp;Opções">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/pt-BR/sendReport.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/pt-BR/sendReport.dtd
index 4f2bfd5..8653608 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/pt-BR/sendReport.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/pt-BR/sendReport.dtd
@@ -26,7 +26,7 @@
 <!ENTITY recentReports.label "Seus relatórios enviados recentemente">
 <!ENTITY typeWarning.description "Você indicou que deseja comunicar um erro geral no Adblock Plus em vez de um problema com os filtros. Por favor, note que problemas desse tipo devem ser tratados no [link]fórum do Adblock Plus[/link]. Envie um relatório apenas para complementar uma discussão existente no fórum, pois ninguém vai notá-lo a menos que você informe o endereço do relatório. O endereço gerado automaticamente será apresentado após o envio do relatório.">
 <!ENTITY issues.disabled.description "O Adblock Plus está desativado; ele não vai bloquear nada no seu estado atual.">
-<!ENTITY attachExtensions.label "Ane&amp;xar ao relatório uma lista de extensões ativas caso haja um conflito entre elas">
+<!ENTITY attachExtensions.label "Ane&amp;xar uma lista das extensões ativas ao relatório caso um conflito de complementos é a causa do problema">
 <!ENTITY issues.nosubscriptions.add.label "Adicionar inscrição de filtros">
 <!ENTITY issues.disabledfilters.enable.label "Ativar filtro">
 <!ENTITY issues.override.label "A &amp;configuração está correta, continue com o relatório">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/pt-PT/composer.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/pt-PT/composer.dtd
index c864644..2c63a65 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/pt-PT/composer.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/pt-PT/composer.dtd
@@ -28,6 +28,6 @@
 <!ENTITY disabled.warning "O Adblock Plus está inativo. Pode adicionar filtros mas estes não serão aplicados até que [link]ative o Adblock Plus[/link].">
 <!ENTITY anchor.start.flexible.label "no &amp;início do nome de domínio">
 <!ENTITY collapse.no.label "Não">
-<!ENTITY selectAllTypes.label "Seleccionar todos">
+<!ENTITY selectAllTypes.label "Selecionar tudo">
 <!ENTITY advanced.label "Vista avançada">
 <!ENTITY pattern.explanation "O padrão pode ser qualquer parte do endereço; o asterisco (*) funciona como wildcard. O filtro só será aplicado ao(s) endereço(s) que correspondam ao padrão indicado.">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/pt-PT/filters.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/pt-PT/filters.dtd
index 3466a3d..41add0e 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/pt-PT/filters.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/pt-PT/filters.dtd
@@ -1,49 +1,49 @@
 <!ENTITY restore.custom.warning "Todas os seus filtros personalizados serão substituídos pelo conteúdo do ficheiro selecionado. Continuar?">
 <!ENTITY slow.column "Fi&amp;ltros lentos">
 <!ENTITY enabled.column "A&amp;tivo">
-<!ENTITY subscription.lastDownload.checksumMismatch "Erro de verificação (checksum)">
+<!ENTITY subscription.lastDownload.checksumMismatch "Falhou, checksum errado">
 <!ENTITY noFiltersInGroup.text "O grupo selecionado está vazio.">
 <!ENTITY subscription.actions.label "Ações">
-<!ENTITY filter.selectAll.label "Selecionar tudo">
+<!ENTITY filter.selectAll.label "Selecionar Tudo">
 <!ENTITY backupButton.label "&amp;Backup e restauro">
-<!ENTITY restore.minVersion.warning "Atenção: o ficheiro foi criado com uma versão mais recente do Adblock Plus. Deve atualizar para a versão mais recente do Adblock Plus antes de restaurar este ficheiro.">
-<!ENTITY restore.error "A informação do ficheiro não foi processada com sucesso. Tem a certeza que é um ficheiro válido?">
+<!ENTITY restore.minVersion.warning "Aviso: o ficheiro foi criado com uma versão mais recente do Adblock Plus. Deve atualizar para a última versão do Adblock Plus, antes de restaurar deste ficheiro.">
+<!ENTITY restore.error "Não foi possível processar os dados do ficheiro. Este poderá não ser um ficheiros de cópias do Adblock Plus?">
 <!ENTITY sort.ascending.label "Ordenar &amp;A &gt; Z">
 <!ENTITY sort.label "&amp;Ordenar por">
-<!ENTITY subscription.source.label "Lista de filtros">
+<!ENTITY subscription.source.label "Lista de Filtros">
 <!ENTITY hitcount.column "&amp;Contagem">
-<!ENTITY noFilters.text "Ainda não tem qualquer filtro personalizado.">
+<!ENTITY noFilters.text "Ainda não tem quaisquer filtros personalizados.">
 <!ENTITY backup.custom.title "Apenas filtros personalizados">
 <!ENTITY subscription.external.label "Atualizado por outra extensão">
-<!ENTITY subscription.delete.label "Eliminar">
+<!ENTITY subscription.delete.label "Apagar">
 <!ENTITY noGroupSelected.text "Tem que selecionar um grupo de filtros para que os mesmos sejam exibidos.">
 <!ENTITY filter.cut.label "Cortar">
 <!ENTITY restore.default.label "Restaurar backup de ?1?">
-<!ENTITY subscription.lastDownload.inProgress "A transferir...">
+<!ENTITY subscription.lastDownload.inProgress "A transferir ...">
 <!ENTITY subscriptions.tab.label "Subscrições de filtros">
 <!ENTITY sort.descending.label "Ordenar &amp;Z &gt; A">
 <!ENTITY filters.remove.warning "Quer mesmo remover todos os filtros selecionados?">
-<!ENTITY filter.delete.label "Eliminar">
+<!ENTITY filter.delete.label "Apagar">
 <!ENTITY addSubscriptionAdd.label "Adicionar">
 <!ENTITY viewMenu.label "Ver">
 <!ENTITY subscription.lastDownload.unknown "N/D">
 <!ENTITY addSubscriptionCancel.label "Cancelar">
-<!ENTITY subscription.enabled.label "Ativo">
-<!ENTITY noSubscriptions.text "Ainda não adicionou uma subscrição de filtros. O Adblock Plus não bloqueará
-elementos sem filtros. Por favor utilize &quot;Adicionar subscrição de filtros&quot; para
-um filtro.">
+<!ENTITY subscription.enabled.label "Ativada">
+<!ENTITY noSubscriptions.text "Ainda não adicionou quaisquer subscrições de filtros. O Adblock Plus não bloqueará
+nada sem os filtros. Por favor, utilize &quot;Adicionar Subscrição de Filtros&quot; para
+adicionar um filtro.">
 <!ENTITY subscription.update.label "Atualizar filtros">
-<!ENTITY dialog.title "Preferências de filtros do Adblock Plus">
+<!ENTITY dialog.title "Preferências de Filtros do Adblock Plus">
 <!ENTITY addFilter.label "A&amp;dicionar filtro">
-<!ENTITY subscription.minVersion.warning "Esta subscrição de filtros requer uma versão mais recente do Adblock Plus. Deve atualizar para a versão mais recente do Adblock Plus.">
-<!ENTITY subscription.lastDownload.invalidURL "Endereço inválido">
+<!ENTITY subscription.minVersion.warning "Esta subscrição de filtro requer uma versão mais recente do Adblock Plus. Deve atualizar para a última versão do Adblock Plus.">
+<!ENTITY subscription.lastDownload.invalidURL "Falhou, endereço inválido">
 <!ENTITY backup.error "Ocorreu um erro ao guardar os filtros no ficheiro. Certifique-se que o ficheiro não está protegido contra escrita ou a ser utilizado por outra aplicação.">
 <!ENTITY filter.moveUp.label "Mover para cima">
 <!ENTITY addGroup.label "Adicionar &amp;grupo de filtros">
 <!ENTITY filter.edit.label "Editar">
 <!ENTITY subscription.showHideFilters.label "Mostrar/ocultar filtros">
-<!ENTITY acceptableAds2.label "Perm&amp;itir alguma publicidade não intrusiva">
-<!ENTITY addSubscriptionOther.label "Adicionar outra subscrição">
+<!ENTITY acceptableAds2.label "Perm&amp;itir alguns anúncios não incómodos">
+<!ENTITY addSubscriptionOther.label "Adicionar uma subscrição diferente">
 <!ENTITY close.label "Fechar">
 <!ENTITY sort.none.label "&amp;Não ordenar">
 <!ENTITY filter.actions.label "Ações de filtros">
@@ -52,23 +52,23 @@ um filtro.">
 <!ENTITY filter.resetHitCounts.label "Reiniciar estatísticas">
 <!ENTITY readMore.label "Saber mais">
 <!ENTITY subscription.moveUp.label "Mover para cima">
-<!ENTITY addSubscription.label "Adicionar subscrição de &amp;filtros">
-<!ENTITY subscription.homepage.label "Página web">
+<!ENTITY addSubscription.label "Adicionar Subscrição de &amp;Filtros">
+<!ENTITY subscription.homepage.label "Página Inicial">
 <!ENTITY backup.complete.title "Todos os filtros e subscrições">
-<!ENTITY restore.own.label "Restaurar outro backup">
-<!ENTITY restore.complete.warning "Todas as preferências de filtros serão substituídas pelo conteúdo do ficheiro selecionado. Continuar?">
+<!ENTITY restore.own.label "Restaurar a minha cópia de segurança">
+<!ENTITY restore.complete.warning "Todas as suas preferências de filtros serão substituídas pelo conteúdo do ficheiro selecionado. Continuar?">
 <!ENTITY filters.tab.label "Filtros personalizados">
-<!ENTITY backup.label "Criar novo backup">
-<!ENTITY find.label "&amp;Localizar">
+<!ENTITY backup.label "Criar nova cópia de segurança">
+<!ENTITY find.label "Enco&amp;ntrar">
 <!ENTITY subscription.moveDown.label "Mover para baixo">
-<!ENTITY subscription.lastDownload.connectionError "Transferência falhada">
+<!ENTITY subscription.lastDownload.connectionError "Falhou, transferência inválida">
 <!ENTITY subscription.lastDownload.success "Bem sucedido">
-<!ENTITY subscription.lastDownload.invalidData "Não é uma lista válida">
+<!ENTITY subscription.lastDownload.invalidData "Falhou, não é uma lista de filtros válida">
 <!ENTITY filter.paste.label "Colar">
-<!ENTITY subscription.disabledFilters.enable "Ativar filtros inativos">
+<!ENTITY subscription.disabledFilters.enable "Ativar filtros desativados">
 <!ENTITY lasthit.column "Última &amp;utilização">
 <!ENTITY subscription.editTitle.label "Editar título">
-<!ENTITY subscription.disabledFilters.warning "Alguns filtros desta subscrição estão inativos.">
+<!ENTITY subscription.disabledFilters.warning "Alguns filtros desta subscrição estão desativados.">
 <!ENTITY filter.column "Regra de &amp;filtro">
 <!ENTITY subscription.lastDownload.label "Última atualização:">
 <!ENTITY viewList.label "Ver lista">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/pt-PT/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/pt-PT/firstRun.properties
index 29d3e16..e9ab38f 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/pt-PT/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/pt-PT/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Navegue na web desativando a monitorização. Oculte o seu registo de navegação das companhias que monitorizam os seus movimentos.
-firstRun_toggle_off=Desligado
-firstRun_feature_tracking=Desativar monitorização
-firstRun_feature_malware=Bloqueio de malware
-firstRun_title=O Adblock Plus foi instalado
-firstRun_toggle_on=Ligado
 firstRun_acceptableAdsExplanation=Gostamos de incentivar os sítios web de publicidade a utilizar anúncios não intrusivos. Foi por essa razão que estabelecemos <a>políticas restritas</a> para identificar os anúncios aceitáveis e que são mostrados em definições padrão. No entanto, se você quiser bloquear todos os anúncios, pode <a>desativar</a> essa opção facilmente.
+firstRun_acceptableAdsHeadline=A publicidade será bloqueada
 firstRun_contributor_credits=Créditos
 firstRun_dataCorruptionWarning=Esta página continua a aparecer? <a>Clique aqui!</a>
-firstRun_acceptableAdsHeadline=A publicidade será bloqueada
-firstRun_share=Publicite o programa
-firstRun_share_headline=<a>Ajude-nos</a> a melhorar a web
-firstRun_feature_social_description=Remova os botões das redes sociais, tais como o Facebook Like, que aparecem nas páginas web e que monitorizam o seu comportamento.
-firstRun_filterlistsReinitializedWarning=Parece que ocorreu um erro que causou a remoção de todos os filtros e nós não conseguimos restaurar a cópia de segurança. Neste sentido, os filtros e as definições de anúncios aceitáveis foram reiniciados, Analise os seus filtros e os anúncios aceitáveis nas definições do <a>Adblock Plus.</a>.
-firstRun_feature_malware_description=Melhore a navegação web bloqueando os domínios duvidosos.
-firstRun_features=O Adblock Plus pode fazer mais do que bloquear publicidade
 firstRun_donate=donativos
 firstRun_donate_label=Ajude o nosso projeto
+firstRun_feature_malware=Bloqueio de malware
+firstRun_feature_malware_description=Melhore a navegação web bloqueando os domínios duvidosos.
 firstRun_feature_social=Remover botões sociais
+firstRun_feature_social_description=Remova os botões das redes sociais, tais como o Facebook Like, que aparecem nas páginas web e que monitorizam o seu comportamento.
+firstRun_feature_tracking=Desativar monitorização
+firstRun_feature_tracking_description=Navegue na web desativando a monitorização. Oculte o seu registo de navegação das companhias que monitorizam os seus movimentos.
+firstRun_features=O Adblock Plus pode fazer mais do que bloquear publicidade
+firstRun_filterlistsReinitializedWarning=Parece que ocorreu um erro que causou a remoção de todos os filtros e nós não conseguimos restaurar a cópia de segurança. Neste sentido, os filtros e as definições de anúncios aceitáveis foram reiniciados, Analise os seus filtros e os anúncios aceitáveis nas definições do <a>Adblock Plus.</a>.
 firstRun_legacySafariWarning=Você está a utilizar uma versão do Safari que não é suportada pelo Adblock Plus. A aplicação pode não funcionar corretamente e prejudicar a navegação em alguns sítios web. Deve atualizar para o Safari 6.1.1 ou mais recente (disponível para o Mac OS X 10.8 Mountain Lion), para a versão 7.0.1 ou mais recente (disponível no OS x 10.9 Mavericks) ou utilizar uma versão recente dos navegadores Mozilla Firefox, Google Chrome ou Opera.
+firstRun_share=Publicite o programa
+firstRun_share_headline=<a>Ajude-nos</a> a melhorar a web
+firstRun_title=O Adblock Plus foi instalado
+firstRun_toggle_off=Desligado
+firstRun_toggle_on=Ligado
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/pt-PT/global.properties b/data/extensions/spyblock@gnu.org/chrome/locale/pt-PT/global.properties
index a8730e8..d0eae03 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/pt-PT/global.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/pt-PT/global.properties
@@ -4,7 +4,7 @@ notification_antiadblock_title=Ocultar mensagens?
 type_label_script=script
 filter_elemhide_nocriteria=Nenhum critério especificado para reconhecimento de elementos a bloquear
 blockingGroup_title=Regras de bloqueio de anúncios
-whitelisted_tooltip=O Adblock Plus está está inativo nesta página.
+whitelisted_tooltip=O Adblock Plus está desativado nesta página.
 type_label_stylesheet=folha de estilo
 blocked_count_tooltip=?1? de ?2?
 type_label_font=tipo de letra
@@ -13,13 +13,13 @@ filter_regexp_tooltip=Este filtro é uma expressão regular ou demasiado curto p
 action0_tooltip=Clique para mostrar o menu de contexto, clique na roda do rato para ativar/desativar.
 whitelisted_page=O Adblock Plus foi desativado nesta página
 remove_group_warning=Quer mesmo remover este grupo?
-action1_tooltip=Clique para abrir/fechar itens bloqueáveis, clique na roda do rato para ativar/desativar.
+action1_tooltip=Clique para abrir/fechar os itens bloqueáveis, clique na roda do rato para ativar/desativar.
 type_label_xmlhttprequest=pedido XML
-active_tooltip=O Adblock Plus está ativo. ?1? subscrições de filtros e ?2? filtros personalizados.
+active_tooltip=O Adblock Plus está ativado, ?1? subscrições de filtros e ?2? filtros personalizados.
 type_label_document=documento
 type_label_object_subrequest=subpedido de objeto
 whitelistGroup_title=Regras de exceção
-disabled_tooltip=O Adblock Plus está inativo.
+disabled_tooltip=O Adblock Plus está desativado.
 filter_elemhide_duplicate_id=Apenas pode especificar uma ID do elemento a ocultar
 type_label_object=objeto
 action2_tooltip=Clique para abrir as preferências, clique na roda do rato para ativar/desativar.
@@ -36,6 +36,6 @@ type_label_media=áudio/vídeo
 mobile_menu_disable_site=ABP: Desativar em ?1?
 elemhideGroup_title=Regras de bloqueio de elementos
 mobile_menu_enable_site=ABP: Ativar em ?1?
-type_label_elemhide=oculto
+type_label_elemhide=ocultado
 newGroup_title=Novo grupo de filtros
 default_dialog_title=Adblock Plus
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/pt-PT/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/pt-PT/overlay.dtd
index fbcb8c8..5cd2c95 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/pt-PT/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/pt-PT/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Sim">
 <!ENTITY notification.button.no "&amp;Não">
 <!ENTITY sync.label "Sin&amp;cronizar definições do Adblock Plus">
 <!ENTITY whitelist.site.label "Desativar em ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "&amp;Reportar erros nesta página">
 <!ENTITY whitelist.page.label "Desativar apenas nesta página">
 <!ENTITY context.image.label "Bloquear imagem">
-<!ENTITY counthits.label "&amp;Contar bloqueios do filtro">
+<!ENTITY notification.button.yes "&amp;Sim">
 <!ENTITY opensidebar.label "A&amp;brir itens bloqueáveis">
 <!ENTITY notification.button.close "Fe&amp;char">
 <!ENTITY contribute.label "Colaborar no Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Bloquear moldura">
 <!ENTITY blocked.tooltip "Itens bloqueados nesta página:">
-<!ENTITY hideplaceholders.label "Ocultar &amp;locais de elementos bloqueados">
+<!ENTITY counthits.label "&amp;Contar bloqueios do filtro">
 <!ENTITY showinstatusbar.label "Mo&amp;strar na barra de estado">
 <!ENTITY sidebar.title "Elementos bloqueáveis nesta página">
 <!ENTITY options.label "&amp;Opções">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/pt-PT/sendReport.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/pt-PT/sendReport.dtd
index d4ac781..8a0c9f0 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/pt-PT/sendReport.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/pt-PT/sendReport.dtd
@@ -17,7 +17,7 @@
 <!ENTITY anonymous.label "Submissão &amp;anónima">
 <!ENTITY reloadButton.label "&amp;Recarregar página">
 <!ENTITY recentReports.clear.label "&amp;Remover todos os relatórios">
-<!ENTITY typeSelector.description "Esta janela guiá-lo-à através dos passos necessários para submeter o relatório de erros. Por favor selecione o tipo de erro que está a ocorrer nesta página:">
+<!ENTITY typeSelector.description "Esta janela guiá-lo-à através dos passos necessários para submeter o relatório de erros. Em primeiro lugar, selecione o tipo de erro que está a ocorrer nesta página:">
 <!ENTITY screenshot.remove.label "&amp;Remover informação sensível">
 <!ENTITY issues.ownfilters.description "Alguns dos filtros aplicados nesta página são definidos pelo utilizador. Por favor desative os filtros que poderão estar a causar o problema:">
 <!ENTITY update.inProgress.description "O Adblock Plus necessita de atualizar as subscrições de filtros para se certificar que o problema não foi resolvido. Por favor aguarde...">
@@ -48,7 +48,7 @@
 <!ENTITY screenshot.attach.label "Anexar uma imagem ao rela&amp;tório">
 <!ENTITY issues.whitelist.description "O Adblock Plus está inativo na página sobre a qual está a reportar. Por favor reative-o e recarregue a página antes de submeter um relatório para ajudar a analisar este problema.">
 <!ENTITY typeSelector.falseNegative.label "O Adblock Plus não bloqueia um anú&amp;ncio">
-<!ENTITY typeSelector.heading "Selecione o tipo de erro">
+<!ENTITY typeSelector.heading "Seleccione o tipo de problema">
 <!ENTITY anonymity.warning "Desta forma, não o poderemos contactar e o mais provável é que lhe iremos dar uma prioridade baixa.">
 <!ENTITY wizard.title "Comunicação de erros">
 <!ENTITY issues.ownfilters.disable.label "Desativar filtro">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/ro/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/ro/firstRun.properties
index f097877..d43c4e6 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/ro/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/ro/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Navigare fără urme prin eliminarea indiciilor plantate de către companiile publicitare care urmăresc și înregistrează comportamentul dumneavoastră.
-firstRun_toggle_off=OFF
-firstRun_feature_tracking=Dezactivare urmărire
-firstRun_feature_malware=Blocare software rău intenţionat
-firstRun_title=Adblock Plus a fost instalat
-firstRun_toggle_on=ON
 firstRun_acceptableAdsExplanation=Dorim să încurajăm site-urile web în a utiliza publicitate simplă, discretă. De aceea ne-am stabilit <a>reguli de orientare stricte</a> pentru a identifica anunțurile acceptabile, care sunt permise de către setările implicite. Dacă totuși doriți să bloca toată publicitatea, puteți <a>dezactiva</a> aceste permisiuni în câteva secunde.
+firstRun_acceptableAdsHeadline=Reclamele enervante vor fi blocate acum
 firstRun_contributor_credits=Contributori
 firstRun_dataCorruptionWarning=Această pagină continuă să apară și după terminarea instalării? <a>Faceți clic aici!</a>
-firstRun_acceptableAdsHeadline=Reclamele enervante vor fi blocate acum
-firstRun_share=Spuneți prietenilor dumneavoastră
-firstRun_share_headline=<a>Ajutați-ne</a> în a îmbunătăți web-ul
-firstRun_feature_social_description=Eliminare automată a butoanelor mass-media socială, cum ar fi Facebook, care apar pe paginile de web pentru a urmări și înregistra comportamentul dumneavoastră.
-firstRun_filterlistsReinitializedWarning=Se pare că din cauza unor probleme toate filtrele au fost eliminate şi a fost imposibil să le recuperăm. Prin urmare, am resetat filtrele şi setările pentru publicitate acceptabilă. Vă rugăm să verificaţi listele de filtre şi setările pentru publicitate acceptabilă în <a>Opţiuni pentru Adblock Plus</a>.
-firstRun_feature_malware_description=Securizarea navigării prin blocarea domeniilor rău-intenționate cunoscute.
-firstRun_features=Adblock Plus poate face mai mult decât să blocheze publicitatea
 firstRun_donate=Donaţii
 firstRun_donate_label=Ajutați proiectul
+firstRun_feature_malware=Blocare software rău intenţionat
+firstRun_feature_malware_description=Securizarea navigării prin blocarea domeniilor rău-intenționate cunoscute.
 firstRun_feature_social=Ascundere butoane Social Media
+firstRun_feature_social_description=Eliminare automată a butoanelor mass-media socială, cum ar fi Facebook, care apar pe paginile de web pentru a urmări și înregistra comportamentul dumneavoastră.
+firstRun_feature_tracking=Dezactivare urmărire
+firstRun_feature_tracking_description=Navigare fără urme prin eliminarea indiciilor plantate de către companiile publicitare care urmăresc și înregistrează comportamentul dumneavoastră.
+firstRun_features=Adblock Plus poate face mai mult decât să blocheze publicitatea
+firstRun_filterlistsReinitializedWarning=Se pare că din cauza unor probleme toate filtrele au fost eliminate şi a fost imposibil să le recuperăm. Prin urmare, am resetat filtrele şi setările pentru publicitate acceptabilă. Vă rugăm să verificaţi listele de filtre şi setările pentru publicitate acceptabilă în <a>Opţiuni pentru Adblock Plus</a>.
 firstRun_legacySafariWarning=Folosiți o versiune veche de Safari care nu este suportată de Adblock Plus. Aceasta putea funcționa incorect sau ar putea afecta navigarea pe unele site-uri. Vă recomandăm insistent să instalați cel puțin Safari 6.1.1 (pe sistemul de operare Mac OS X 10.8 Mountain Lion), sau Safari 7.0.1 (pe OS X 10.9 Mavericks), sau să utilizați cea mai recentă versiune de Mozilla Firefox, Google Chrome, sau Opera.
+firstRun_share=Spuneți prietenilor dumneavoastră
+firstRun_share_headline=<a>Ajutați-ne</a> în a îmbunătăți web-ul
+firstRun_title=Adblock Plus a fost instalat
+firstRun_toggle_off=OFF
+firstRun_toggle_on=ON
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/ro/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/ro/overlay.dtd
index 4da883a..5d75eab 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/ro/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/ro/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Da">
 <!ENTITY notification.button.no "&amp;Nu">
 <!ENTITY sync.label "Si&amp;ncronizează setările Adblock Plus">
 <!ENTITY whitelist.site.label "Dezactivează Adblock Plus pe ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "Rapor&amp;tează probleme pe această pagină">
 <!ENTITY whitelist.page.label "Dezactivează Adblock Plus doar pe pagina curentă">
 <!ENTITY context.image.label "Adblock Plus: blochează imagine">
-<!ENTITY counthits.label "Înre&amp;gistrează statisticile filtrelor">
+<!ENTITY notification.button.yes "&amp;Da">
 <!ENTITY opensidebar.label "Deschide &amp;lista elementelor blocabile">
 <!ENTITY notification.button.close "În&amp;chide">
 <!ENTITY contribute.label "Contribuie la Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: blochează cadru">
 <!ENTITY blocked.tooltip "Elemente blocate în pagină:">
-<!ENTITY hideplaceholders.label "Ascunde &amp;indicatoarele elementelor blocate">
+<!ENTITY counthits.label "Înre&amp;gistrează statisticile filtrelor">
 <!ENTITY showinstatusbar.label "Arată în bara de &amp;stare">
 <!ENTITY sidebar.title "Adblock Plus: elemente blocabile în pagină">
 <!ENTITY options.label "&amp;Opţiuni">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/ru/composer.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/ru/composer.dtd
index a7fc2c5..b855baf 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/ru/composer.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/ru/composer.dtd
@@ -17,7 +17,7 @@
 <!ENTITY dialog.title "Составление фильтра для Adblock Plus">
 <!ENTITY basic.label "Стандартный вид">
 <!ENTITY type.filter.label "Правило &amp;блокирования">
-<!ENTITY types.label "Применять к типам:">
+<!ENTITY types.label "Применять к типам элементов:">
 <!ENTITY shortpattern.warning "Введенный шаблон слишком короткий и потому не будет оптимизирован. Большое количество таких шаблонов может отрицательно сказаться на быстродействии вашего браузера. Рекомендуется по возможности использовать более длинный шаблон.">
 <!ENTITY collapse.yes.label "Да">
 <!ENTITY anchors.label "Принимать шаблон только:">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/ru/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/ru/firstRun.properties
index 9de16d0..316d4e1 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/ru/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/ru/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Просматривайте конфиденциально путем отключения отслеживания - скрыв ваши действия  от объявления компаний, которые будут отслеживать каждый ваш шаг.
-firstRun_toggle_off=ВЫКЛ
-firstRun_feature_tracking=Отключить слежение
-firstRun_feature_malware=Блокирование вредоносных программ
-firstRun_title=Adblock Plus установлен
-firstRun_toggle_on=ВКЛ
 firstRun_acceptableAdsExplanation=Мы хотели бы призвать веб-сайты использовать простую, ненавязчивую рекламу. Вот почему мы установили <a>строгие принципы</a> для определения приемлемых объявлений, которые разрешены в  настройках по умолчанию. Если вы все еще хотите блокировать каждое объявление вы можете <a>Отключить</a> это в течение нескольких секунд.
+firstRun_acceptableAdsHeadline=Надоевшая реклама теперь будет заблокирована
 firstRun_contributor_credits=Пожертвования
 firstRun_dataCorruptionWarning=Эта страница всё ещё отображается? <a>Щёлкните здесь!</a>
-firstRun_acceptableAdsHeadline=Надоевшая реклама теперь будет заблокирована
-firstRun_share=Рассказать друзьям
-firstRun_share_headline=<a>протяните нам руку помощи</a> в стремлении сделать Интернет лучше
-firstRun_feature_social_description=Автоматически избавляет вас от просмотра кнопок социальных сетей, подобных Facebook, которые появляются на веб-страницах и отслеживают ваше поведение.
-firstRun_filterlistsReinitializedWarning=Похоже ошибка привела к тому, что все фильтры удалены, и мы не можем их восстановить из резервной копии. Поэтому мы сбросили ваши фильтры и параметры "ненавязчивой" рекламы. Пожалуйста проверьте список ваших фильтров и параметры "ненавязчивой "рекламы в <a>параметры Adblock Plus</a>.
-firstRun_feature_malware_description=Делает ваш браузер более безопасным путем блокирования известных вредоносных доменов.
-firstRun_features=AdBlock Plus способен на большее, чем просто блокировать рекламу
 firstRun_donate=пожертвовать
 firstRun_donate_label=Поддержать наш проект
+firstRun_feature_malware=Блокирование вредоносных программ
+firstRun_feature_malware_description=Делает ваш браузер более безопасным путем блокирования известных вредоносных доменов.
 firstRun_feature_social=Удалять кнопки социальных сетей
+firstRun_feature_social_description=Автоматически избавляет вас от просмотра кнопок социальных сетей, подобных Facebook, которые появляются на веб-страницах и отслеживают ваше поведение.
+firstRun_feature_tracking=Отключить слежение
+firstRun_feature_tracking_description=Просматривайте конфиденциально путем отключения отслеживания - скрыв ваши действия  от объявления компаний, которые будут отслеживать каждый ваш шаг.
+firstRun_features=AdBlock Plus способен на большее, чем просто блокировать рекламу
+firstRun_filterlistsReinitializedWarning=Похоже ошибка привела к тому, что все фильтры удалены, и мы не можем их восстановить из резервной копии. Поэтому мы сбросили ваши фильтры и параметры "ненавязчивой" рекламы. Пожалуйста проверьте список ваших фильтров и параметры "ненавязчивой "рекламы в <a>параметры Adblock Plus</a>.
 firstRun_legacySafariWarning=Вы используете старую версию Safari, который не поддерживается Adblock Plus. Она может  работать не правильно или ухудшать качество работы пользователя на некоторых веб-сайтах. Мы настоятельно рекомендуем обновиться до  Safari 6.1.1 или выше (в OS X 10.8 Mountain Lion), или Safari 7.0.1 или выше (в OS X 10.9 Mavericks), или использовать последнюю версию Mozilla Firefox, Google Chrome или Opera.
+firstRun_share=Рассказать друзьям
+firstRun_share_headline=<a>протяните нам руку помощи</a> в стремлении сделать Интернет лучше
+firstRun_title=Adblock Plus установлен
+firstRun_toggle_off=ВЫКЛ
+firstRun_toggle_on=ВКЛ
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/ru/global.properties b/data/extensions/spyblock@gnu.org/chrome/locale/ru/global.properties
index c279c00..ac168e2 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/ru/global.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/ru/global.properties
@@ -1,6 +1,6 @@
 no_blocking_suggestions=На открытой странице нет элементов, которые можно было бы заблокировать
 action3_tooltip=Щелкните здесь, чтобы включить или отключить Adblock Plus.
-notification_antiadblock_title=скрыть целевых сообщений?
+notification_antiadblock_title=Скрыть целевые сообщения?
 type_label_script=Скрипт
 filter_elemhide_nocriteria=Не указано никаких признаков, чтобы опознать элемент, который нужно скрыть
 blockingGroup_title=Правила блокирования
@@ -10,10 +10,10 @@ blocked_count_tooltip=?1? из ?2?
 type_label_font=Шрифт
 type_label_popup=Всплывающее окно
 filter_regexp_tooltip=Этот фильтр либо является регулярным выражением, либо слишком короткий для оптимизации. Большое количество таких фильтров может отрицательно сказаться на быстродействии вашего браузера.
-action0_tooltip=Щелкните здесь, чтобы открыть контекстное меню. Нажмите среднюю клавишу мышки, чтобы включить или отключить Adblock Plus.
+action0_tooltip=Нажмите, чтобы открыть контекстное меню. Нажмите среднюю кнопку мыши, чтобы включить или отключить Adblock Plus.
 whitelisted_page=Adblock Plus отключен на этой странице
 remove_group_warning=Вы уверены, что хотите удалить эту группу?
-action1_tooltip=Щелкните здесь, чтобы открыть/закрыть список элементов. Нажмите среднюю клавишу мышки, чтобы включить или отключить Adblock Plus.
+action1_tooltip=Щелкните здесь, чтобы открыть/закрыть список элементов. Нажмите среднюю кнопку мыши, чтобы включить или отключить Adblock Plus.
 type_label_xmlhttprequest=XML-запрос
 active_tooltip=Adblock Plus включен, используется подписок: ?1?, собственных фильтров: ?2?.
 type_label_document=Документ
@@ -22,10 +22,10 @@ whitelistGroup_title=Исключения
 disabled_tooltip=Adblock Plus отключен.
 filter_elemhide_duplicate_id=У элемента, который нужно скрыть, может быть только один идентификатор
 type_label_object=Объект
-action2_tooltip=Щелкните здесь, чтобы открыть окно установок. Нажмите среднюю клавишу мышки, чтобы включить или отключить Adblock Plus.
+action2_tooltip=Нажмите, чтобы открыть окно установок. Нажмите среднюю кнопку мыши, чтобы включить или отключить Adblock Plus.
 type_label_subdocument=Фрейм
 clearStats_warning=Статистика попаданий будет обнулена для всех фильтров и в дальнейшем больше не будет записываться. Продолжать?
-notification_antiadblock_message=Этот сайт, как известно, показывают целевые сообщения пользователям Adblock Plus. Хотите Adblock Plus, чтобы скрыть целевых сообщений?
+notification_antiadblock_message=Известно, что этот сайт показывает сообщения пользователям Adblock Plus. Хотите, чтобы Adblock Plus скрывал такие сообщения?
 blocked_count_addendum=(также исключений: ?1?, спрятано: ?2?)
 subscription_invalid_location=Не удалось распознать введенный адрес ни как адрес в интернете, ни как путь файлу.
 type_label_image=Изображение
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/ru/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/ru/overlay.dtd
index dd49760..50378da 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/ru/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/ru/overlay.dtd
@@ -1,32 +1,31 @@
-<!ENTITY notification.button.yes "&amp;да">
-<!ENTITY notification.button.no "&amp;нет">
+<!ENTITY notification.button.no "&amp;Нет">
 <!ENTITY sync.label "Син&amp;хронизировать настройки Adblock Plus">
 <!ENTITY whitelist.site.label "Отключить на ?1?">
 <!ENTITY filters.label "Настройки &amp;фильтров">
 <!ENTITY disable.label "Отключить везде">
 <!ENTITY objecttab.title "Блокировать">
 <!ENTITY objecttab.tooltip "Нажмите здесь, чтобы Adblock Plus заблокировал этот объект">
-<!ENTITY menuitem.label "Установки &amp;Adblock Plus">
+<!ENTITY menuitem.label "Настройки Ad&amp;block Plus">
 <!ENTITY objecttabs.label "Показывать &amp;ярлык на Flash и Java">
 <!ENTITY sendReport.label "&amp;Сообщить о проблеме на этой странице">
 <!ENTITY whitelist.page.label "Отключить только на этой странице">
 <!ENTITY context.image.label "Adblock Plus: заблокировать изображение">
-<!ENTITY counthits.label "С&amp;читать срабатывания фильтров">
+<!ENTITY notification.button.yes "&amp;Да">
 <!ENTITY opensidebar.label "Открыть с&amp;писок элементов">
-<!ENTITY notification.button.close "&amp;близко">
+<!ENTITY notification.button.close "&amp;Закрыть">
 <!ENTITY contribute.label "Помочь проекту Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
-<!ENTITY context.frame.label "Adblock Plus: заблокировать фрейм">
+<!ENTITY context.frame.label "Adblock Plus: Заблокировать фрейм">
 <!ENTITY blocked.tooltip "Заблокированные элементы на этой странице:">
-<!ENTITY hideplaceholders.label "Прятать &amp;метки на месте заблокированных элементов">
+<!ENTITY counthits.label "С&amp;читать срабатывания фильтров">
 <!ENTITY showinstatusbar.label "Показывать в &amp;строке состояния">
-<!ENTITY sidebar.title "Элементы открытой страницы">
+<!ENTITY sidebar.title "Доступные для блокирования элементы на текущей странице">
 <!ENTITY options.label "&amp;Настройки">
-<!ENTITY context.object.label "Adblock Plus: заблокировать объект">
-<!ENTITY context.removeWhitelist.label "Adblock Plus: включить обратно на этой странице">
-<!ENTITY filters.tooltip "Наиболее часто примененные фильтры:">
+<!ENTITY context.object.label "Adblock Plus: Заблокировать объект">
+<!ENTITY context.removeWhitelist.label "Adblock Plus: Включить на этой странице">
+<!ENTITY filters.tooltip "Наиболее часто применяемые фильтры:">
 <!ENTITY closesidebar.label "Закрыть с&amp;писок элементов">
 <!ENTITY showintoolbar.label "&amp;Показывать в панели инструментов">
 <!ENTITY status.tooltip "Статус:">
-<!ENTITY context.media.label "Adblock Plus: заблокировать аудио/видео">
+<!ENTITY context.media.label "Adblock Plus: Заблокировать аудио/видео">
 <!ENTITY subscription.update.label "Обновить фильтры">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/ru/sendReport.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/ru/sendReport.dtd
index 39b1b77..a777544 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/ru/sendReport.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/ru/sendReport.dtd
@@ -1,7 +1,7 @@
 <!ENTITY screenshot.undo.label "&amp;Отменить">
 <!ENTITY issues.disabledgroups.description "Следующие подписки / группы фильтров отключены, но могли бы повлиять на эту страницу:">
 <!ENTITY showData.label "Показать данные сообщения">
-<!ENTITY typeSelector.falsePositive.label "Adblock Plus блокирует слишко&amp;м многое">
+<!ENTITY typeSelector.falsePositive.label "&amp;Adblock Plus блокирует слишком многое">
 <!ENTITY issues.change.description "Ваши настройки изменились. Пожалуйста, обновите страницу для проверки
   внесенных изменений и отправьте сообщение, если проблема не разрешилась.">
 <!ENTITY email.label "E-&amp;mail:">
@@ -17,11 +17,12 @@
 <!ENTITY typeWarning.override.label "Я &amp;понял и, тем не менее, хочу отправить сообщение">
 <!ENTITY issues.disabled.enable.label "Включить Adblock Plus">
 <!ENTITY update.fixed.description "Обновление ваших подписок на фильтры скорее всего решило проблему, о которой
-  вы хотели сообщить. Пожалуйста загрузите заново страницу и попробуйте еще раз.
-  Если проблема осталось, то пошлите сообщение еще раз.">
+  вы хотели сообщить. Пожалуйста, загрузите страницу заново и попробуйте еще раз.
+  Если проблема сохраняется,
+отправьте отчет повторно.">
 <!ENTITY anonymous.label "Отпр&amp;авить анонимно">
 <!ENTITY reloadButton.label "Об&amp;новить страницу">
-<!ENTITY recentReports.clear.label "Уда&amp;лить все сообщения">
+<!ENTITY recentReports.clear.label "&amp;Удалить все отчеты">
 <!ENTITY typeSelector.description "Мастер поможет вам отправить сообщение о проблеме с Adblock Plus.
   Пожалуйста, укажите на этой странице тип проблемы, с которой вы столкнулись:">
 <!ENTITY screenshot.remove.label "У&amp;далить конфиденциальные данные">
@@ -31,7 +32,7 @@
   что проблема еще не была решена. Подождите, пожалуйста...">
 <!ENTITY sendPage.retry.label "Отправить еще раз">
 <!ENTITY data.label "Да&amp;нные сообщения:">
-<!ENTITY recentReports.label "Ваши недавно отправленные сообщения">
+<!ENTITY recentReports.label "Ваши недавно отправленные отчеты">
 <!ENTITY typeWarning.description "Вы указали, что хотите сообщить о проблеме в Adblock Plus, а не в его фильтрах.
   Пожалуйста, учтите, что о таких проблемах лучше сообщать на
   [link]форуме Adblock Plus[/link]. Мастер отправки сообщения следует
@@ -53,7 +54,7 @@
 <!ENTITY emailComment.label "Мы рекомендуем ввести e-mail адрес, по которому мы могли бы связаться в случает вопросов по вашему сообщению. Это также позволит нам узнавать Ваши взносы и обрабатывать их в предпочтительном порядке.">
 <!ENTITY issues.whitelist.remove.label "Включить Adblock Plus на этой странице">
 <!ENTITY outdatedSubscriptions.description "Следующие подписки на фильтры не обновлялись более двух недель. Пожалуйста,
-  обновите эти подписки перед отправлением сообщения, поскольку проблема уже
+  обновите эти подписки перед отправкой отчета, поскольку проблема уже
   может быть решена.">
 <!ENTITY dataCollector.description "Пожалуйста, подождите несколько секунд, пока Adblock Plus собирает нужные данные.">
 <!ENTITY sendButton.label "От&amp;править сообщение">
@@ -61,7 +62,7 @@
 <!ENTITY sendPage.errorMessage "Ошибка отправки сообщения: «?1?». Пожалуйста,
   удостоверьтесь, что ваше соединение с сетью Интернет работает, и попробуйте еще раз.
   Если проблема остается, обратитесь в [link]форум Adblock Plus[/link].">
-<!ENTITY showRecentReports.label "Показать недавно отправленные сообщения">
+<!ENTITY showRecentReports.label "Показать недавно отправленные отчеты">
 <!ENTITY commentPage.heading "Комментарий">
 <!ENTITY update.start.label "Обновить подписки">
 <!ENTITY issues.disabledfilters.description "Следующие фильтры отключены, но могли бы повлиять на эту страницу:">
@@ -73,7 +74,7 @@
 <!ENTITY issues.whitelist.description "Adblock Plus отключен на странице, о которой вы собираетесь сообщить. Пожалуйста,
   включите Adblock Plus и обновите страницу, прежде чем посылать сообщение.
   Это поможет рассмотрению вашего сообщения.">
-<!ENTITY typeSelector.falseNegative.label "Adblock Plus не блоки&amp;рует рекламу">
+<!ENTITY typeSelector.falseNegative.label "&amp;Adblock Plus не блокирует рекламу">
 <!ENTITY typeSelector.heading "Выбор типа проблемы">
 <!ENTITY anonymity.warning "Мы не сможем связаться с вами и, вероятно, уделим меньше внимания Вашему сообщению.">
 <!ENTITY wizard.title "Сообщить о проблеме">
@@ -86,7 +87,7 @@
 <!ENTITY typeSelector.falseNegative.description "Если несмотря на то, что Adblock Plus включен, на странице отображается реклама,
   то следует выбрать этот вариант.">
 <!ENTITY sendPage.waitMessage "Пожалуйста, подождите, пока Adblock Plus отправляет ваше сообщение.">
-<!ENTITY dataCollector.heading "Добро пожаловать в мастер отправки сообщения">
+<!ENTITY dataCollector.heading "Добро пожаловать в мастер отправки отчетов">
 <!ENTITY screenshot.heading "Снимок экрана">
 <!ENTITY sendPage.heading "Отправка сообщения">
 <!ENTITY issues.subscriptionCount.description "Похоже, что вы подписаны на слишком большое количество списков фильтров. Это
@@ -95,6 +96,6 @@
   фильтров нужно исправлять. Пожалуйста, удалите все списки фильтров кроме
   действительно нужных. После этого проверьте, проявляется ли еще проблема.">
 <!ENTITY screenshot.mark.label "&amp;Пометить проблему">
-<!ENTITY privacyPolicy.label "Правила конфиденциальности">
+<!ENTITY privacyPolicy.label "Политика конфиденциальности">
 <!ENTITY issues.description "Adblock Plus обнаружил проблемы в ваших настройках, которые, возможно, вызвали
-  данную проблему или усложнят рассмотрение вашего сообщения.">
+  данную проблему или усложнят рассмотрение вашего отчета.">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/ru/subscriptionSelection.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/ru/subscriptionSelection.dtd
index 080da8b..e418942 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/ru/subscriptionSelection.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/ru/subscriptionSelection.dtd
@@ -1,12 +1,12 @@
-<!ENTITY addMain.label "Доба&amp;вить подписку на список фильтров «?1?»">
-<!ENTITY list.download.failed "При скачивании списка подписок произошла ошибка.">
-<!ENTITY list.download.retry "Попробовать еще раз">
-<!ENTITY title.label "На&amp;звание подписки:">
+<!ENTITY addMain.label "&amp;Добавить подписку на список фильтров «?1?»">
+<!ENTITY list.download.failed "При получении списка подписок произошла ошибка.">
+<!ENTITY list.download.retry "Повторить">
+<!ENTITY title.label "&amp;Название подписки:">
 <!ENTITY list.download.website "Открыть страницу с подписками">
 <!ENTITY supplementMessage "Этот список фильтров должен использоваться в комбинации со списком фильтров «?1?», который вы не используете.">
 <!ENTITY viewList.label "Просмотреть фильтры">
-<!ENTITY visitHomepage.label "Посетить домашнюю страницу списка">
+<!ENTITY visitHomepage.label "Посетить домашнюю страницу">
 <!ENTITY addSubscription.label "Добавить подписку">
 <!ENTITY dialog.title "Добавить подписку для Adblock Plus">
-<!ENTITY location.label "А&amp;дрес списка фильтров:">
+<!ENTITY location.label "&amp;Адрес списка фильтров:">
 <!ENTITY fromWeb.description "Пожалуйста, подтвердите, что вы действительно хотите добавить подписку на этот список фильтров. Вы можете изменить название и адрес подписки перед добавлением.">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/sk/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/sk/firstRun.properties
index 6a3ce81..6dcd4aa 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/sk/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/sk/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Prechádzať súkromne vypnutím sledovania - skryť vaše skladby z reklamné spoločnosti, ktoré by sledovali každý váš pohyb.
-firstRun_toggle_off=OFF
-firstRun_feature_tracking=Zakázať sledovanie
-firstRun_feature_malware=Blokovanie malvéru
-firstRun_title=Adblock Plus bol nainštalovaný
-firstRun_toggle_on=ON
 firstRun_acceptableAdsExplanation=Radi by sme povzbudili webové stránky aby používali jednoduché a nevtieravé inzercie. To je dôvod, prečo sme zaviedli <a>prísne pravidlá</a> na identifikáciu prijateľné reklamy, ktoré sú uvedené v časti predvolené nastavenie. Ak si napriek tomu chcete blokovať každú reklamu môžete <a>vypnúť</a> toto za pár sekúnd.
+firstRun_acceptableAdsHeadline=Otravné reklamy budú teraz blokované
 firstRun_contributor_credits=Zásluhy autorov
 firstRun_dataCorruptionWarning=Chcete stále vidieť túto stránku? <a>Klikni tu!</a>
-firstRun_acceptableAdsHeadline=Otravné reklamy budú teraz blokované
-firstRun_share=Povedzte svojim priateľom
-firstRun_share_headline=<a>Pomuožte nám</a> urobiť web lepším miestom
-firstRun_feature_social_description=Automaticky zbaviť prehliadanie webu tlačidiel sociálnych médií, ako napríklad Facebook podobne, ktoré sú uvedené na webových stránkach a sledují vaše správanie.
-firstRun_filterlistsReinitializedWarning=Zdá sa, že problém spôsobil, že všetky filtre boli odstránené a nie sme schopní obnoviť zálohu. Preto sme museli resetovať vaše filtre a prijateľné nastavenia reklám. Prosím, skontrolujte filter zoznamov a prijateľné nastavenia reklamy v <a>Nastavenia Adblock Plus</a>.
-firstRun_feature_malware_description=Zabezpečenie prezeranie pomocou blokovanie známych domén s malware.
-firstRun_features=Adblock Plus môže urobiť viac, ako blokovať reklamy
 firstRun_donate=prispejte
 firstRun_donate_label=Podporťe náš projekt
+firstRun_feature_malware=Blokovanie malvéru
+firstRun_feature_malware_description=Zabezpečenie prezeranie pomocou blokovanie známych domén s malware.
 firstRun_feature_social=Odstránenie tlačidiel sociálnych médií
+firstRun_feature_social_description=Automaticky zbaviť prehliadanie webu tlačidiel sociálnych médií, ako napríklad Facebook podobne, ktoré sú uvedené na webových stránkach a sledují vaše správanie.
+firstRun_feature_tracking=Zakázať sledovanie
+firstRun_feature_tracking_description=Prechádzať súkromne vypnutím sledovania - skryť vaše skladby z reklamné spoločnosti, ktoré by sledovali každý váš pohyb.
+firstRun_features=Adblock Plus môže urobiť viac, ako blokovať reklamy
+firstRun_filterlistsReinitializedWarning=Zdá sa, že problém spôsobil, že všetky filtre boli odstránené a nie sme schopní obnoviť zálohu. Preto sme museli resetovať vaše filtre a prijateľné nastavenia reklám. Prosím, skontrolujte filter zoznamov a prijateľné nastavenia reklamy v <a>Nastavenia Adblock Plus</a>.
 firstRun_legacySafariWarning=Používate starú verziu Safari, ktorá nepodporuje Adblock Plus. Nemusel by pracovať správne alebo  by mohol narušiť používateľské skúsenosti na niektorých webových stránkach. Dôrazne odporúčame aktualizovať na Safari 6.1.1 alebo vyšší (k dispozícii pre Mac OS X 10,8 Mountain Lion), alebo Safari 7.0.1 a vyššie (pre OS X 10.9 Mavericks), alebo použiť najnovšiu verziu Mozilla Firefox, Google Chrome alebo Opera.
+firstRun_share=Povedzte svojim priateľom
+firstRun_share_headline=<a>Pomuožte nám</a> urobiť web lepším miestom
+firstRun_title=Adblock Plus bol nainštalovaný
+firstRun_toggle_off=OFF
+firstRun_toggle_on=ON
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/sk/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/sk/overlay.dtd
index fb1b256..57c5a78 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/sk/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/sk/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Áno">
 <!ENTITY notification.button.no "&amp;Nie">
 <!ENTITY sync.label "Syn&amp;chronizovať nastavenia Adblock Plus">
 <!ENTITY whitelist.site.label "Vypnúť na ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "&amp;Ohlásiť problém na tejto stránke">
 <!ENTITY whitelist.page.label "Vypnúť len na tejto stránke">
 <!ENTITY context.image.label "Adblock obrázok">
-<!ENTITY counthits.label "P&amp;očítadlo">
+<!ENTITY notification.button.yes "&amp;Áno">
 <!ENTITY opensidebar.label "Otvoriť &amp;blokovateľné položky">
 <!ENTITY notification.button.close "&amp;Zatvoriť">
 <!ENTITY contribute.label "Prispieť na Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock rámec">
 <!ENTITY blocked.tooltip "Blokovať položky na tejto stránke:">
-<!ENTITY hideplaceholders.label "Sk&amp;ryť symboly blokovaných prvkov">
+<!ENTITY counthits.label "P&amp;očítadlo">
 <!ENTITY showinstatusbar.label "Zobraziť v &amp;stavovom riadku">
 <!ENTITY sidebar.title "Blokovateľné položky na aktuálnej stránke">
 <!ENTITY options.label "&amp;Možnosti">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/sl/composer.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/sl/composer.dtd
index 4290a58..56fea38 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/sl/composer.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/sl/composer.dtd
@@ -11,7 +11,7 @@
 <!ENTITY anchor.start.label "na &amp;začetku naslova">
 <!ENTITY matchCase.label "Razlikuj velike/male &amp;črke">
 <!ENTITY custom.pattern.label "Po &amp;meri:">
-<!ENTITY unselectAllTypes.label "Nič ne izberi">
+<!ENTITY unselectAllTypes.label "Ne izberi ničesar">
 <!ENTITY type.whitelist.label "Pravi&amp;lo izjem">
 <!ENTITY regexp.warning "Vneseni vzorec bo obravnavan kot regularni izraz. Številni regularni izrazi lahko upočasnijo vaše brskanje. Če ne nameravate uporabljati regularnih izrazov, dodajte simbol * na konec vzorca.">
 <!ENTITY dialog.title "Dodaj pravilo filtra Adblock Plus">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/sl/filters.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/sl/filters.dtd
index 68220ee..d953d5e 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/sl/filters.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/sl/filters.dtd
@@ -12,9 +12,9 @@
 <!ENTITY sort.label "Raz&amp;vrsti">
 <!ENTITY subscription.source.label "Seznam filtrov">
 <!ENTITY hitcount.column "Za&amp;detki">
-<!ENTITY noFilters.text "Svojega lastnega filtra še nimaš.">
+<!ENTITY noFilters.text "Trenutno nimate filtrov po meri.">
 <!ENTITY backup.custom.title "Samo filtri po meri">
-<!ENTITY subscription.external.label "Posodobljepreko druge razširitve">
+<!ENTITY subscription.external.label "Posodobljeno preko druge razširitve">
 <!ENTITY subscription.delete.label "Izbriši">
 <!ENTITY noGroupSelected.text "Preden se filtre lahko prikaže moraš izbrati filter skupino.">
 <!ENTITY filter.cut.label "Izreži">
@@ -29,13 +29,13 @@
 <!ENTITY subscription.lastDownload.unknown "Ni na voljo">
 <!ENTITY addSubscriptionCancel.label "Prekliči">
 <!ENTITY subscription.enabled.label "Omogočeno">
-<!ENTITY noSubscriptions.text "Zaenkrat nimaš naročenega še nobenega filtra. Adblock Plus ne more
-blokirati ničesar brez filtrov, zato uporabi opcijo &quot;Dodaj naročnino za filter&quot;
-in dodaj vsaj en filter.">
+<!ENTITY noSubscriptions.text "Trenutno nimate nobenih naročnin filtrov. Adblock Plus ne more
+blokirati ničesar brez filtrov. Prosimo, izberite &quot;Dodaj naročnino filtra&quot;
+za dodajanje novega filtra.">
 <!ENTITY subscription.update.label "Posodobi filtre">
 <!ENTITY dialog.title "Nastavitve filtrov za Adblock Plus">
 <!ENTITY addFilter.label "&amp;Dodaj filter">
-<!ENTITY subscription.minVersion.warning "Ta filter potrebuje novejšo verzijo Adblock Plusa. Nadgradi Adblock plus z najnovešo različico.">
+<!ENTITY subscription.minVersion.warning "Ta filter potrebuje novejšo različico Adblock Plus. Priporočamo posodobitev Adblock Plus na najnovešo različico.">
 <!ENTITY subscription.lastDownload.invalidURL "Neuspešno, ni veljaven naslov">
 <!ENTITY backup.error "Napaka pri zapisu filtrov v datoteko. Poskrbite, da datoteka ni zaščitena pred pisanjem ali v uporabi nekega drugega programa.">
 <!ENTITY filter.moveUp.label "Premakni navzgor">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/sl/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/sl/firstRun.properties
index d749c77..90abc16 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/sl/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/sl/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Brskajte zasebno z onemogočanjem sledenja - zabrišite svoje sledi oglaševalskim agencijam, ki vam sledijo na vsakem koraku.
-firstRun_toggle_off=IZKLOP
-firstRun_feature_tracking=Onemogočite sledenje
-firstRun_feature_malware=Blokiranje zlonamernih spletnih mest
-firstRun_title=Adblock Plus je bil nameščen
-firstRun_toggle_on=VKLOP
 firstRun_acceptableAdsExplanation=Želimo spodbujati uporabo preprostih, nevsiljivih oglasov na spletnih straneh. Zato smo vpeljali <a>stroge kriterije</a> prepoznavanja sprejemljivih oglasov, ki so privzeto prikazani. Če vseeno želite blokirati vse oglase, jih lahko <a>onemogočite</a> v nekaj sekundah.
-firstRun_contributor_credits=Krediti sodelavcev
-firstRun_dataCorruptionWarning=Se vam ta stran še vedno prikazuje? <a>Kliknite tukaj!</a>
 firstRun_acceptableAdsHeadline=Nadležni oglasi bodo zdaj blokirani
-firstRun_share=Povejte svojim prijateljem
-firstRun_share_headline=<a>Podajte nam roko</a> v ustvarjanju boljšega spleta
-firstRun_feature_social_description=Med brskanjem se samodejno izognite gumbom socialnih medijev, kot je Facebookov Všeč mi je, ki se pojavljajo na spletnih straneh in sledijo vašim navadam brskanja.
-firstRun_filterlistsReinitializedWarning=Očitno so bili zaradi težave vsi filtri odstranjeni in varnostne kopije ni bilo mogoče obnoviti. Zato smo ponastavili vaše nastavitve filtrov in dovoljenih oglasov. Prosimo, preverite svoj seznam filtrov in nastavitve dovoljenih oglasov v <a>nastavitvah za Adblock Plus</a>.
-firstRun_feature_malware_description=Brskajte po spletu varneje, tako da blokirate znane domene z zlonamerno programsko opremo.
-firstRun_features=Adblock Plus zmore več kot le blokirati oglase
+firstRun_contributor_credits=Zasluge sodelavcev
+firstRun_dataCorruptionWarning=Se vam ta stran še vedno prikazuje? <a>Kliknite tukaj!</a>
 firstRun_donate=prispevajte
 firstRun_donate_label=Podprite naš projekt
-firstRun_feature_social=Odstranite gumbe socialnih medijev
+firstRun_feature_malware=Blokiranje zlonamernih spletnih mest
+firstRun_feature_malware_description=Brskajte po spletu varneje, tako da blokirate znane domene z zlonamerno programsko opremo.
+firstRun_feature_social=Odstranitev vtičnikov družabnih omrežij
+firstRun_feature_social_description=Med brskanjem se samodejno izognite vtičnikom družabnih omrežij, kot je Facebookov "Všeč mi je", ki se pojavljajo na spletnih straneh in sledijo vašim navadam brskanja.
+firstRun_feature_tracking=Onemogočite sledenje
+firstRun_feature_tracking_description=Brskajte zasebno z onemogočanjem sledenja - skrijte svoje sledi pred oglaševalcem, ki vam lahko sledijo na vsakem koraku.
+firstRun_features=Adblock Plus zmore več kot le blokirati oglase
+firstRun_filterlistsReinitializedWarning=Očitno so bili zaradi težave vsi filtri odstranjeni in varnostne kopije ni bilo mogoče obnoviti. Zato smo ponastavili vaše nastavitve filtrov in dovoljenih oglasov. Prosimo, preverite svoj seznam filtrov in nastavitve dovoljenih oglasov v <a>nastavitvah za Adblock Plus</a>.
 firstRun_legacySafariWarning=Uporabljate staro različico Safarija, ki je Adblock Plus ne podpira. Morda ne bo pravilno deloval ali bo poslabšal uporabniško izkušnjo na nekaterih spletnih straneh. Močno priporočamo, da nadgradite na Safari 6.1.1 ali novejšega (na OS X 10.8 Mountain Lion), Safari 7.0.1 ali novejšega (na OS X 10.9 Mavericks), ali da uporabljate najnovejšo različico Mozille Firefox, Google Chroma ali Opere.
+firstRun_share=Povejte svojim prijateljem
+firstRun_share_headline=<a>Pomagajte nam</a> pri ustvarjanju boljšega spleta
+firstRun_title=Adblock Plus je bil nameščen
+firstRun_toggle_off=IZKLOP
+firstRun_toggle_on=VKLOP
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/sl/global.properties b/data/extensions/spyblock@gnu.org/chrome/locale/sl/global.properties
index e612a82..18e6696 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/sl/global.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/sl/global.properties
@@ -1,20 +1,20 @@
-no_blocking_suggestions=Na trenutni strani ni elementov blokad
+no_blocking_suggestions=Na trenutni strani ni možnih elementov za blokiranje
 action3_tooltip=Kliknite za vključitev/izključitev Adblock Plus.
-notification_antiadblock_title=Skrijem ciljana sporočila?
+notification_antiadblock_title=Skrij ciljana sporočila?
 type_label_script=skript
 filter_elemhide_nocriteria=Za razpoznavo elementa, ki naj bo skrit, ni navedenih pogojev
 blockingGroup_title=Pravila blokiranja oglasov
-whitelisted_tooltip=Adblock Plus je aktiven, vendar je za trenutno stran izključen.
+whitelisted_tooltip=Adblock Plus je za trenutno stran onemogočen.
 type_label_stylesheet=predlogo strani
 blocked_count_tooltip=?1? od ?2?
 type_label_font=pisava
 type_label_popup=pojavno okno
 filter_regexp_tooltip=Ta filter je regularni izraz ali pa je prekratek za optimizacijo. Preveč filtrov lahko upočasni brskanje.
 action0_tooltip=Kliknite za pojavni meni, s srednjim klikom vključite/izključite.
-whitelisted_page=Za trenutno stran je bil Adblock Plus izključen
-remove_group_warning=Resnično želite odstraniti to skupino?
+whitelisted_page=Adblock Plus je bil za trenutno stran onemogočen
+remove_group_warning=Ste prepričani da želite odstraniti to skupino?
 action1_tooltip=Kliknite za odprtje/zaprtje blokiranih elementov, s srednjim klikom vključite/izključite.
-type_label_xmlhttprequest=Zahteva XML
+type_label_xmlhttprequest=zahteva XML
 active_tooltip=Adblock Plus je aktiven, ?1? naročnine na filtre in ?2? filtri po meri so v rabi.
 type_label_document=dokument
 type_label_object_subrequest=podzahteva predmeta
@@ -29,10 +29,10 @@ notification_antiadblock_message=Ta stran uporabnikom prikazuje ciljana sporoči
 blocked_count_addendum=(prav tako prikriti: ?1?, skriti: ?2?)
 subscription_invalid_location=Mesto seznama filtrov ni niti veljaven URL niti veljavno ime datoteke.
 type_label_image=sliko
-remove_subscription_warning=Želite res odpovedati naročnino?
+remove_subscription_warning=Ste prepričani da želite odpovedati naročnino?
 type_label_other=drugo
 mobile_menu_enable=ABP: omogoči
-type_label_media=zvok/video
+type_label_media=avdio/video
 mobile_menu_disable_site=ABP: onemogoči za ?1?
 elemhideGroup_title=Pravila skrivanja elementov
 mobile_menu_enable_site=ABP: omogoči za ?1?
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/sl/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/sl/overlay.dtd
index fabef17..152582a 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/sl/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/sl/overlay.dtd
@@ -1,24 +1,23 @@
-<!ENTITY notification.button.yes "&amp;Da">
 <!ENTITY notification.button.no "&amp;Ne">
 <!ENTITY sync.label "Sin&amp;hroniziraj nastavitve Adblock Plus">
 <!ENTITY whitelist.site.label "Onemogoči na ?1?">
 <!ENTITY filters.label "Nastavitve &amp;filtra">
 <!ENTITY disable.label "Onemogoči povsod">
 <!ENTITY objecttab.title "Blokiraj">
-<!ENTITY objecttab.tooltip "Kliknite sem za blokiranje tega predmeta z Adblock Plus">
+<!ENTITY objecttab.tooltip "Kliknite tukaj za blokiranje tega predmeta z Adblock Plus">
 <!ENTITY menuitem.label "Ad&amp;block Plus">
 <!ENTITY objecttabs.label "Pokaži &amp;zavihke za Flash in Javo">
 <!ENTITY sendReport.label "&amp;Javite težavo na tej strani">
 <!ENTITY whitelist.page.label "Onemogoči samo na tej strani">
 <!ENTITY context.image.label "Adblock - slike">
-<!ENTITY counthits.label "Štej za&amp;detke filtra">
+<!ENTITY notification.button.yes "&amp;Da">
 <!ENTITY opensidebar.label "Odpri &amp;elemente blokad">
 <!ENTITY notification.button.close "&amp;Zapri">
-<!ENTITY contribute.label "Sodelujte v Adblock Plus">
+<!ENTITY contribute.label "Prispevajte k Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock - okviri">
 <!ENTITY blocked.tooltip "Blokirani elementi na tej strani:">
-<!ENTITY hideplaceholders.label "Skrij ograde &amp;blokoranih elementov">
+<!ENTITY counthits.label "Štej za&amp;detke filtra">
 <!ENTITY showinstatusbar.label "Pokaži &amp;v vrstici stanja">
 <!ENTITY sidebar.title "Elementi blokad na trenutni strani">
 <!ENTITY options.label "Mo&amp;žnosti">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/sl/sendReport.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/sl/sendReport.dtd
index 47ebf1b..39e3aef 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/sl/sendReport.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/sl/sendReport.dtd
@@ -28,7 +28,7 @@ da problem ni bil že rešen. Prosim počakajte ...">
 <!ENTITY data.label "Podatki poročila:">
 <!ENTITY recentReports.label "Vaša nedavno poslana poročila">
 <!ENTITY typeWarning.description "Nakazali ste, da želite poročati o splošni težavi z Adblock Plus, ne pa o težavi s filtri. Upoštevajte, da je o takšnih težavah najbolje poročati na [link]forumu Adblock Plus[/link]. Poročanje o težavah uporabite le za podporo obstoječe razprave, saj sicer nihče ne bo opazil vašega poročila, razen če ne podate povezavo nanj. Samodejno ustvarjena povezava bo na voljo po pošiljanju poročila.">
-<!ENTITY issues.disabled.description "Adblock Plus je onemogoče, v trenutnem stanju ne more blokirati ničesar.">
+<!ENTITY issues.disabled.description "Adblock Plus je onemogočen, v trenutnem stanju ne blokira ničesar.">
 <!ENTITY attachExtensions.label "Poroči&amp;lu priložite seznam aktivnih razširitev, če je vzrok težave spor z dodatkom">
 <!ENTITY issues.nosubscriptions.add.label "Dodaj naročnino na filter">
 <!ENTITY issues.disabledfilters.enable.label "Omogoči filter">
@@ -36,7 +36,7 @@ da problem ni bil že rešen. Prosim počakajte ...">
 <!ENTITY issues.nosubscriptions.description "Kot kaže, niste naročeni na noben seznam filtrov, ki samodejno odstranijo neželene vsebine s spletnih strani.">
 <!ENTITY typeSelector.falsePositive.description "Izberite to možnost, če strani manjka pomembna vsebina, če se prikaže nepravilno ali ne deluje pravilno. Določite lahko, ali je Adblock Plus kriv težav, tako da ga začasno izključite.">
 <!ENTITY typeSelector.other.label "Druga težava">
-<!ENTITY emailComment.label "Bilo bi dobro, da vneseš veljaven email, tako da se na vas lahko obrnemo, če bodo obstajala vprašanja glede poročila. Pravtako nam omogoča prepoznati vaše prispevke in tako lažje določiti prioriteto višje.">
+<!ENTITY emailComment.label "Priporočamo, da vnesete veljaven e-poštni naslov, tako da se na vas lahko obrnemo, če bodo obstajala vprašanja glede poročila. Prav tako nam omogoča prepoznati vaše prispevke in tako določiti prioriteto višje.">
 <!ENTITY issues.whitelist.remove.label "Ponovno omogoči Adblock Plus na tej strani">
 <!ENTITY outdatedSubscriptions.description "Ta filter ni bil posodobljen vsaj dva tedna.
 Preden pošljete poročilo, posodobite vse naročene fitre,
@@ -53,18 +53,18 @@ saj je morda problem že rešen.">
 <!ENTITY screenshot.attach.label "Poročilu priloži &amp;sliko strani">
 <!ENTITY issues.whitelist.description "Adblock Plus je trenutno na strani, o kateri poročate, onemogočen. Omogočite ga in ponovno naložite stran, preden pošljete poročilo o težavi.">
 <!ENTITY typeSelector.falseNegative.label "Adbloc&amp;k Plus ne blokira oglasa">
-<!ENTITY typeSelector.heading "Kakšno težavo imate?">
+<!ENTITY typeSelector.heading "Izberite vrsto težave">
 <!ENTITY anonymity.warning "Kontakta z vami ne bomo mogli vzpostaviti. Prioriteto poročilu pa bomo verjetno znižali.">
-<!ENTITY wizard.title "Poročilo o težavah">
+<!ENTITY wizard.title "Poročevalec težav">
 <!ENTITY issues.ownfilters.disable.label "Onemogoči filter">
 <!ENTITY commentPage.description "Spodnje polje z besedilom omogoča vnos komentarja, ki nam pomaga razumeti težavo. To je neobvezno, vendar priporočamo, če težava ni očitna. Pred pošiljanjem si lahko še enkrat ogledate podatke poročila.">
 <!ENTITY comment.lengthWarning "Dolžina vašega komentarja presega 1000 znakov. Poslanih bo le prvih 1000 znakov.">
 <!ENTITY typeSelector.falseNegative.description "Izberite to možnost, če je oglas prikazan kljub temu, da je Adblock Plus omogočen.">
 <!ENTITY sendPage.waitMessage "Počakajte, dokler Adblock Plus pošilja vaše poročilo.">
-<!ENTITY dataCollector.heading "Dobrodošli v poročanje o težavah">
+<!ENTITY dataCollector.heading "Dobrodošli v poročevalca težav">
 <!ENTITY screenshot.heading "Priložite sliko strani">
 <!ENTITY sendPage.heading "Pošlji poročilo">
 <!ENTITY issues.subscriptionCount.description "Zdi se, da ste naročeni na preveč filtrov. Takšna nastavitev ni priporočena, saj je možnost težav veliko večja. Prav tako ne moremo obdelati vašega poročila o napaki, saj ni jasno, kateri avtor naročnine na filtre mora narediti popravke. Prosimo, da odstranite vse nepotrebne naročnine na filtre in preizkusite, če še vedno prihaja do napake.">
 <!ENTITY screenshot.mark.label "Označi &amp;težavo">
-<!ENTITY privacyPolicy.label "Izjava o zasebnosti">
+<!ENTITY privacyPolicy.label "Politika zasebnosti">
 <!ENTITY issues.description "Adblock Plus je zaznal težave z vašo konfiguracijo, ki so lahko krive za to težavo ali pa bodo raziskovanje poročila otežile.">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/sq/composer.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/sq/composer.dtd
index 144de9e..3337f0a 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/sq/composer.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/sq/composer.dtd
@@ -11,14 +11,14 @@
 <!ENTITY anchor.start.label "në fillim të adresës">
 <!ENTITY matchCase.label "Përputh shembullin">
 <!ENTITY custom.pattern.label "Përshtatja:">
-<!ENTITY unselectAllTypes.label "Mos selekto asnjë">
+<!ENTITY unselectAllTypes.label "Mos përzgjidh asnjë">
 <!ENTITY type.whitelist.label "Rregull përjashtimi">
 <!ENTITY regexp.warning "Motivi që dhatë do të interpretohet si shprehje e rregullt që nuk mund të përdoret nga Adblock Plus dhe mund të ngadalsojë hapjen e faqeve te internetit. Nëse nuk kishit ndërmend të përdorni një shprehje të rregullt, shtoni një (*) në fund të motivit.">
 <!ENTITY dialog.title "Shto një rregullore filtri në Adblock Plus">
 <!ENTITY basic.label "Pamje kryesore">
 <!ENTITY type.filter.label "Blloko filtrin">
 <!ENTITY types.label "Apliko në llojet:">
-<!ENTITY shortpattern.warning "Motivi që dhatë është shumë i shkurtër që të optimizohet dhe mund të ngadalsojë internetin. Rekomandohet që të zgjidhni një varg më të gjatë për këtë filtër në menyrë që të lejoj Adblock Plus ta përpunoj filtrin më mirë.">
+<!ENTITY shortpattern.warning "Motivi që dhatë është shumë i shkurtër që të optimizohet dhe mund të ngadalësojë internetin. Rekomandohet që të zgjidhni një varg më të gjatë për këtë filtër në mënyrë që të lejoj Adblock Plus ta përpunoj filtrin më mirë.">
 <!ENTITY collapse.yes.label "Po">
 <!ENTITY anchors.label "Prano vetëm motivin:">
 <!ENTITY collapse.default.yes.label "Përdor të parazgjedhurën (po):">
@@ -28,6 +28,6 @@
 <!ENTITY disabled.warning "Adblock Plus nuk punon për momentin. Mund të shtoni filtra por nuk do të funksionojnë nëse ju nuk [link]mundësoni Adblock Plus[/link].">
 <!ENTITY anchor.start.flexible.label "në fillim të domain name">
 <!ENTITY collapse.no.label "Jo">
-<!ENTITY selectAllTypes.label "Selekto të gjitha">
+<!ENTITY selectAllTypes.label "Përzgjidhi krejt">
 <!ENTITY advanced.label "Pamje e avancuar">
 <!ENTITY pattern.explanation "Motivi mund të jetë çdo pjesë e adresës; simboli (*) vepron si xhoker. Filtri do të zbatohet vetëm në adresat që i përshtaten motivit të dhënë.">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/sq/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/sq/firstRun.properties
index 21438b1..f7697f5 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/sq/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/sq/firstRun.properties
@@ -1,24 +1,20 @@
-firstRun_title=Adblock Plus has been installed
-firstRun_dataCorruptionWarning=Does this page keep showing up? <a>Click here!</a>
-firstRun_acceptableAdsHeadline=Annoying ads will now be blocked
-firstRun_acceptableAdsExplanation=We'd like to encourage websites to use straightforward, unobtrusive advertising. That's why we've established <a>strict guidelines</a> to identify acceptable ads, which are shown under default settings. If you still want to block every ad you can <a>disable</a> this in a few seconds.
-firstRun_legacySafariWarning=You are using an old version of Safari which is not supported by Adblock Plus. It might not work correctly or impair the user experience on some websites. We strongly recommend to either update to Safari 6.1.1 or higher (on OS X 10.8 Mountain Lion), or Safari 7.0.1 or higher (on OS X 10.9 Mavericks), or to use the latest version of Mozilla Firefox, Google Chrome or Opera.
-firstRun_filterlistsReinitializedWarning=It seems that an issue caused all filters to be removed and we were unable to restore a backup. Therefore we had to reset your filters and Acceptable Ads settings. Please check your filter lists and Acceptable Ads settings in the <a>Adblock Plus options</a>.
-
-firstRun_toggle_on=ON
-firstRun_toggle_off=OFF
-
-firstRun_features=Adblock Plus can do more than block ads
-firstRun_feature_malware=Malware Blocking
-firstRun_feature_malware_description=Make your browsing more secure by blocking known malware domains.
-firstRun_feature_social=Remove Social Media Buttons
-firstRun_feature_social_description=Automatically rid your browsing experience of social media buttons, such as the Facebook Like, which appear on web pages and track your behavior.
-firstRun_feature_tracking=Disable Tracking
-firstRun_feature_tracking_description=Browse privately by disabling tracking - hiding your tracks from ad companies that would track your every move.
-
-firstRun_share_headline=<a>Give us a hand</a> in making the web a better place
-firstRun_donate=donate
-firstRun_donate_label=Support our project
-firstRun_share=Tell your friends
-
-firstRun_contributor_credits=Contributor Credits
+firstRun_acceptableAdsExplanation=Ne do të donim tju inkurajonim të përdorit faqet e internetit të drejtpërdrejtë,pa reklama. Kjo është arsyeja pse ne kemi krijuar <a> udhëzime strikte </a> për të identifikuar reklama pranueshme, të cilat janë paraqitur në default settings. Nëse ju ende i doni të bllokoni çdo reklame ju mund <a> çaktivizoni </a> në pak sekonda.
+firstRun_acceptableAdsHeadline=Te gjitha Reklamat do te bllokohen
+firstRun_contributor_credits=Kredite kontribues
+firstRun_dataCorruptionWarning=Kjo Faqe del gjithmone? <a>Klikoni Ketu</a>
+firstRun_donate=dhuro
+firstRun_donate_label=Mbeshtet Projektet Tona
+firstRun_feature_malware=Malware u Bllokua
+firstRun_feature_malware_description=Bëni shfletimin tuaj më të sigurt duke bllokuar domains dhe njohur malware.
+firstRun_feature_social=Hiq Butonat e Rrjeteve sociale
+firstRun_feature_social_description=Automatikisht shpejtoj përvojën tuaj në shfletim të butonat sociale media, të tilla si Facebook Like, të cilat paraqiten në faqet e internetit dhe të pista sjelljen tuaj.
+firstRun_feature_tracking=Caktivizo Gjurmimin
+firstRun_feature_tracking_description=Shfleto privatisht duke caktivizuar gjurmimin - fshehur gjurmët tuaj nga kompanitë që duan te marrin çdo lëvizje tuaj.
+firstRun_features=Adblock Plus mund te beje me shume sesa te bllokoje ads
+firstRun_filterlistsReinitializedWarning=Duket se dicka ka shkaktuar heqjen e te gjitha filtrave dhe ne ishim ne gjendje ti benim nje backup.\nPrandaj ne kishim rivendosur filtrat tuaj ne Acceptable Ads settings.Ju lutem kontrolloni listen e filtrave tuaj dhe Acceptable Ads settings ne <a>Adblock Plus options</a>.
+firstRun_legacySafariWarning=Ju jeni duke përdorur një version të vjetër të Safari i cili nuk është i mbështetur nga Adblock Plus. Ajo mund të mos punojnë si duhet, ose të pengojë përdoruesit per nje përvojë me te mire në disa nga faqet e internetit. Ne rekomandojmë që të dyja përditësimit për Safari 6.1.1 ose më të lartë (në OS X 10.8 Mountain Lion), ose Safari 7.0.1 ose më e lartë (më OS X 10.9 Mavericks), ose për të përdorur versionin e fundit të Mozilla Firefox, Google Chrome ose Opera.
+firstRun_share=Tregoji Shokve
+firstRun_share_headline=<a> Na jep një dore </a>  per te bere internetin një vend më të mirë
+firstRun_title=Adblock Plus u instalua
+firstRun_toggle_off=Fikur
+firstRun_toggle_on=Ndezur
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/sq/global.properties b/data/extensions/spyblock@gnu.org/chrome/locale/sq/global.properties
index 37f6dc5..9bb1539 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/sq/global.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/sq/global.properties
@@ -1,41 +1,41 @@
-disabled_tooltip=Adblock Plus është ç'aktiv.
-blocked_count_tooltip=?1?jasht nga ?2?
-action3_tooltip=Aktivizim/çaktivizo Adblock Plus.
 no_blocking_suggestions=S'ka elemente bllokuese në këtë faqe
-type_label_object=objekti
+action3_tooltip=Aktivizim/çaktivizo Adblock Plus.
+notification_antiadblock_title=Fshih mesazhe në shënjestër?
+type_label_script=skripta
+filter_elemhide_nocriteria=Nuk ka kritere të përcaktuara për të njohur element të jetë fshehur
+blockingGroup_title=Rregullat Ad Blocking
+whitelisted_tooltip=Adblock Plus është aktiv por i pasivizuar në këtë faqe.
+type_label_stylesheet=stilet
+blocked_count_tooltip=?1?jasht nga ?2?
+type_label_font=shkronjat
 type_label_popup=dritarja pop-up
+filter_regexp_tooltip=Ky filtër është ose një shprehje e rregullt ose shumë i shkurtër që të jetë i optimizuar. Shumë nga këto filtra mund të ngadalësojnë shfletimit tuaj.
+action0_tooltip=Klikoni për të sjellë deri context menu, mesme-klikoni për të mundësuar/disable.
+whitelisted_page=Adblock Plus është caktivizuar për faqen e tanishme
+remove_group_warning=doni me verte ta hiqni kete grup?
+action1_tooltip=Kliko për të hapur / artikuj blockable, mesme-klikoni për të mundësuar / disable.
+type_label_xmlhttprequest=kerkimi për XML
+active_tooltip=Adblock Plus është aktivizuar, ?1? abonim filter (s) dhe ?2? filter custom (s) në përdorim.
+type_label_document=dokumenti
+type_label_object_subrequest=objekti subrequest
+whitelistGroup_title=Rregullat përjashtim
+disabled_tooltip=Adblock Plus është ç'aktiv.
+filter_elemhide_duplicate_id=Vetëm një ID e elementit të jetë fshehur mund të specifikohet
+type_label_object=objekti
+action2_tooltip=Kliko për të hapur preferencat, mesme-klikoni për të mundësuar / disable.
+type_label_subdocument=ndarja
+clearStats_warning=Kjo do të rivendos të gjitha filtrat dhe te caktivizoje filtrat hits. A doni për të vazhduar?
+notification_antiadblock_message=Kjo faqe ka qenë i njohur për të treguar mesazhe në shënjestër për përdoruesit Adblock Plus. A doni Adblock Plus për të fshehur mesazhet në shënjestër?
+blocked_count_addendum=(whitelisted gjithashtu: ?1?, fshehur: ?2?)
+subscription_invalid_location=Filtrat ne liste nuk kane asnjë URL të vlefshme dhe as një emër i vlefshëm file.
 type_label_image=figura
+remove_subscription_warning=Doni me verte ra hiqni kete subscripion?
 type_label_other=tjera
-type_label_font=shkronjat
 mobile_menu_enable=ABP: Mbroj
-type_label_subdocument=ndarja
 type_label_media=zë/video
-type_label_xmlhttprequest=kerkimi për XML
-type_label_script=skripta
+mobile_menu_disable_site=ABP: Caktivizo ?1?
+elemhideGroup_title=Rregullat e elementeve te fshehura
+mobile_menu_enable_site=ABP: Aktivizo ?1?
 type_label_elemhide=fshehur
-type_label_document=dokumenti
-whitelisted_tooltip=Adblock Plus është aktiv por i pasivizuar në këtë faqe.
+newGroup_title=Grup filtrash i ri
 default_dialog_title=Adblock Plus
-type_label_stylesheet=stilet
-notification_antiadblock_title=Hide targeted messages?
-filter_elemhide_nocriteria=No criteria specified to recognize the element to be hidden
-blockingGroup_title=Ad Blocking Rules
-filter_regexp_tooltip=This filter is either a regular expression or too short to be optimized. Too many of these filters might slow down your browsing.
-action0_tooltip=Click to bring up context menu, middle-click to enable/disable.
-whitelisted_page=Adblock Plus has been disabled for the current page
-remove_group_warning=Do you really want to remove this group?
-action1_tooltip=Click to open/close blockable items, middle-click to enable/disable.
-active_tooltip=Adblock Plus is enabled, ?1? filter subscription(s) and ?2? custom filter(s) in use.
-type_label_object_subrequest=object subrequest
-whitelistGroup_title=Exception Rules
-filter_elemhide_duplicate_id=Only one ID of the element to be hidden can be specified
-action2_tooltip=Click to open preferences, middle-click to enable/disable.
-clearStats_warning=This will reset all filter hit statistics and disable counting filter hits. Do you want to proceed?
-notification_antiadblock_message=This site has been known to show targeted messages to Adblock Plus users. Do you want Adblock Plus to hide targeted messages?
-blocked_count_addendum=(also whitelisted: ?1?, hidden: ?2?)
-subscription_invalid_location=Filter list location is neither a valid URL nor a valid file name.
-remove_subscription_warning=Do you really want to remove this subscription?
-mobile_menu_disable_site=ABP: Disable on ?1?
-elemhideGroup_title=Element Hiding Rules
-mobile_menu_enable_site=ABP: Enable on ?1?
-newGroup_title=New filter group
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/sq/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/sq/overlay.dtd
index 256509f..996cff4 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/sq/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/sq/overlay.dtd
@@ -1,32 +1,31 @@
+<!ENTITY notification.button.no "&amp;Jo">
+<!ENTITY sync.label "Sync Adblock Plus settings">
+<!ENTITY whitelist.site.label "Çaktivizo në ?1?">
+<!ENTITY filters.label "&amp;filtër preferencat">
+<!ENTITY disable.label "Caktivizo Kudo">
+<!ENTITY objecttab.title "Blloko">
+<!ENTITY objecttab.tooltip "Kliko ketu per te bllokuar kete objekt me Adblock Plus">
+<!ENTITY menuitem.label "Parapëlqimet e Ad&amp;block Plus">
+<!ENTITY objecttabs.label "Trego &amp;butonin ne Flash dhe Java">
+<!ENTITY sendReport.label "&amp;Raporti çështje në këtë faqe">
+<!ENTITY whitelist.page.label "Çaktivizo vetëm në këtë faqe">
+<!ENTITY context.image.label "Adblock Plus: Figurat e bllokuara">
+<!ENTITY notification.button.yes "&amp;po">
 <!ENTITY opensidebar.label "Hap elementet &amp;bllokuese">
+<!ENTITY notification.button.close "&amp;Mbyll">
+<!ENTITY contribute.label "Kontribut te Adblock Plus">
+<!ENTITY toolbarbutton.label "Adblock Plus">
+<!ENTITY context.frame.label "Adblock Plus: Pjesët e bllokuara">
+<!ENTITY blocked.tooltip "Jane bllokuar te dhena ne kete faqe:">
+<!ENTITY counthits.label "Llogarit filtrat&amp;hits">
+<!ENTITY showinstatusbar.label "&amp;Trego ne status bar">
+<!ENTITY sidebar.title "Artikuj Blockable në faqen aktuale">
 <!ENTITY options.label "Mundësitë (&amp;O)">
 <!ENTITY context.object.label "Adblock Plus: Objektet e bllokuara">
 <!ENTITY context.removeWhitelist.label "Adblock Plus: Rilejo në këtë faqe">
-<!ENTITY context.frame.label "Adblock Plus: Pjesët e bllokuara">
 <!ENTITY filters.tooltip "Filtruesit më aktivë:">
-<!ENTITY menuitem.label "Parapëlqimet e Ad&amp;block Plus">
 <!ENTITY closesidebar.label "M&amp;byll elementet bllokuese">
-<!ENTITY whitelist.page.label "Çaktivizo vetëm në këtë faqe">
-<!ENTITY whitelist.site.label "Çaktivizo në ?1?">
-<!ENTITY toolbarbutton.label "Adblock Plus">
-<!ENTITY context.image.label "Adblock Plus: Figurat e bllokuara">
+<!ENTITY showintoolbar.label "Trego ne tool&amp;bar">
 <!ENTITY status.tooltip "Gjendja:">
-<!ENTITY objecttab.title "Blloko">
+<!ENTITY context.media.label "Adblock Plus:Blloko audi/video">
 <!ENTITY subscription.update.label "Përditësoni filtra">
-<!ENTITY notification.button.yes "&amp;Yes">
-<!ENTITY notification.button.no "&amp;No">
-<!ENTITY sync.label "Syn&amp;c Adblock Plus settings">
-<!ENTITY filters.label "&amp;Filter preferences">
-<!ENTITY disable.label "Disable everywhere">
-<!ENTITY objecttab.tooltip "Click here to block this object with Adblock Plus">
-<!ENTITY objecttabs.label "Show &amp;tabs on Flash and Java">
-<!ENTITY sendReport.label "&amp;Report issue on this page">
-<!ENTITY counthits.label "Count filter &amp;hits">
-<!ENTITY notification.button.close "&amp;Close">
-<!ENTITY contribute.label "Contribute to Adblock Plus">
-<!ENTITY blocked.tooltip "Blocked items on this page:">
-<!ENTITY hideplaceholders.label "Hide p&amp;laceholders of blocked elements">
-<!ENTITY showinstatusbar.label "&amp;Show in status bar">
-<!ENTITY sidebar.title "Blockable items on current page">
-<!ENTITY showintoolbar.label "Show in tool&amp;bar">
-<!ENTITY context.media.label "Adblock Plus: Block audio/video">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/sq/sendReport.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/sq/sendReport.dtd
index a4139d6..570114c 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/sq/sendReport.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/sq/sendReport.dtd
@@ -13,24 +13,35 @@
 <!ENTITY issues.disabledgroups.enable.label "Aktivizo abonim filtri/grup filtrash">
 <!ENTITY typeWarning.override.label "Une kuptoj dhe de&amp;shiroj te dergoj raportin gjithsesi">
 <!ENTITY issues.disabled.enable.label "Aktivizo Adblock Plus">
+<!ENTITY update.fixed.description "Të rejat me abonimet tuaja filtër gjasa zgjidhur çështjen që ju
+raportonin. Ju lutemi të rifreskoni faqen dhe rigjykuar, goditi Raporto përsëri nëse
+Problemi mbetet.">
+<!ENTITY anonymous.label "&amp; Publikime anonime">
 <!ENTITY reloadButton.label "&amp;Ringarko faqen">
-<!ENTITY recentReports.clear.label "Hiq gjithe &amp;raportimet">
+<!ENTITY recentReports.clear.label "&amp;Hiq te gjithe raportimet">
 <!ENTITY typeSelector.description "Kjo dritare do ju udhezoje neper gjithe hapat e nevojshem per dergimin e raportit te problemeve me Adblock Plus. Si fillim, ju lutem zgjidhni tipin e problemit qe ju vereni me kete faqe:">
 <!ENTITY screenshot.remove.label "Hiqni te dhenat pe&amp;rsonale">
 <!ENTITY issues.ownfilters.description "Disa nga filtrat e aplikuar ne kete faqe jane te percaktuar nga perdoruesi. Ju lutem bllokoni filtrat te cilet mund te kene shkaktuar kete problem:">
+<!ENTITY update.inProgress.description "Adblock Plus do qe te rinovoj abonimet tuaja filtër për të siguruar që
+Çështja nuk është zgjidhur tashmë. Ju lutem prisni ...">
 <!ENTITY sendPage.retry.label "Dergo perseri">
 <!ENTITY data.label "&amp;Permbajtja e raportit:">
 <!ENTITY recentReports.label "Raportimet tuaja me te fundit">
 <!ENTITY typeWarning.description "Ju keni treguar se deshironi te raportoni nje problem te pergjithshem me Adblock Plus ne vend te nje problemi me filtrat. Ju lutem kini parasysh se keto probleme raportohen me mire ne [link]forumin Adblock Plus[/link]. Ju duhet te perdorni raportimin e problemeve vetem si shtese te nje diskutimi ekzistues, sepse askush nuk do ta vere re raportimin tuaj, vetem nese ju jepni nje adrese te problemit. Adrese e krijuar automatikisht do ju jepet pasi ju te keni derguar raportin.">
 <!ENTITY issues.disabled.description "Adblock Plus eshte jo-aktiv, ai nuk do te bllokoje asnje gje ne gjendjen aktuale.">
-<!ENTITY attachExtensions.label "Bashkangjisni nje liste te prapashtesave aktive ne raportim, ne rast se shkaku i problemit eshte nje konflikt ndermjet moduleve. (&amp;x)">
+<!ENTITY attachExtensions.label "&amp;Bashkangjisni nje liste te prapashtesave aktive ne raportim, ne rast se shkaku i problemit eshte nje konflikt ndermjet moduleve">
 <!ENTITY issues.nosubscriptions.add.label "Shto abonim ne filtra">
 <!ENTITY issues.disabledfilters.enable.label "Aktivizo filtrin">
 <!ENTITY issues.override.label "Konfigurimi eshte i sakte, vazhdoni me raportimin (&amp;c)">
 <!ENTITY issues.nosubscriptions.description "Duket sikur ju nuk keni asnje abonim ne filtrat e gatshem te cilet heqin automatikisht permbajtjen e padeshiruar nga faqet web.">
-<!ENTITY typeSelector.other.label "Problem &amp;tjeter">
-<!ENTITY issues.whitelist.remove.label "Ri-aktivizo Adblock Plus ne kete faqe">
 <!ENTITY typeSelector.falsePositive.description "Zgjidhni kete mundesi nese faqes i mungon permbajtja e rendesishme, shfaqet gabim ose nuk funksionon ne rregull. Ju mund te percaktoni nese problemi eshte Adblock Plus duke e fikur ate perkohesisht.">
+<!ENTITY typeSelector.other.label "Problemi tj&amp;eter">
+<!ENTITY emailComment.label "Ne ju inkurajojmë që të vendosni një adresë te vlefshme email në mënyrë që ne mund të lidhen me ju nëse ka pyetje
+në lidhje me raportin tuaj. Ai gjithashtu do të na lejojë për të njohur kontributet tuaja dhe për të përcaktuar përparësitë e tyre më të larta.">
+<!ENTITY issues.whitelist.remove.label "Ri-aktivizo Adblock Plus ne kete faqe">
+<!ENTITY outdatedSubscriptions.description "Adresat e mëposhtme filtër nuk janë përditësuar për të paktën dy
+javë. Ju lutemi të rinovuar këto abonimet para dorëzimit të raportit,
+Çështja mund të zgjidhet tashmë.">
 <!ENTITY dataCollector.description "Ju lutem prisni disa momente deri sa Adblock Plus te mbledhe te gjitha te dhenat e nevojshme.">
 <!ENTITY sendButton.label "Dergo raporti&amp;n">
 <!ENTITY comment.label "Koment (fakultative): (&amp;C)">
@@ -42,8 +53,9 @@
 <!ENTITY screenshot.description "E njejta faqe mund te duket ndryshe per njerez te ndryshem. Mund te na ndihmoje ne kuptimin e problemit nese ju bashkangjisni nje foto raportimit tuaj. Ju mund te hiqni ose mbuloni fusha te cilat permbajne informacion te rendesishem dhe personal dhe gjithashtu mund te shenoni zonat ku eshte i dukshem problemi. Per te bere kete klikoni butonin e duhur dhe zgjidhni nje zone te fotos me mausin tuaj.">
 <!ENTITY screenshot.attach.label "Bashkangji&amp;t nje faqe me imazh ketij raportimi">
 <!ENTITY issues.whitelist.description "Adblock Plus eshte aktualisht jo-aktiv ne faqen ne te cilen ju po raportoni. Ju lutem ri-aktivizojeni ate dhe ringarkoni faqen perpara se te dergoni raportin i cili do te ndihmoje ne hetimin e metejshem te ketij problemi.">
-<!ENTITY typeSelector.falseNegative.label "Adblock Plus nuk po bllokon nje reklame (&amp;v)">
+<!ENTITY typeSelector.falseNegative.label "Adblock Plus nuk bllokon nje rreklame">
 <!ENTITY typeSelector.heading "Lloji i problemit">
+<!ENTITY anonymity.warning "Ne nuk do të jetë në gjendje për të ardhur tek ju dhe do të ngjarë prioritet raporti më i ulët.">
 <!ENTITY wizard.title "Raportuesi i problemeve">
 <!ENTITY issues.ownfilters.disable.label "Blloko filtrin">
 <!ENTITY commentPage.description "Fusha e meposhtme ju lejon qe te jepni nje koment qe te na ndihmoje ne ta kuptojme me mire problemin. Ky hap eshte fakultativ por i rekomanduar nese problemi nuk eshte lehtesisht i dallueshem. Ju mund te rishikoni gjithashtu te dhenat e raportimit perpara se te dergohet.">
@@ -57,15 +69,3 @@
 <!ENTITY screenshot.mark.label "Shenoni proble&amp;min">
 <!ENTITY privacyPolicy.label "Rregulla Privatësie">
 <!ENTITY issues.description "Adblock Plus ka dalluar probleme me konfigurimin tuaj i cili mund te jete pergjegjes per kete problem ose do te veshtiresoje hetimin e raportit.">
-<!ENTITY update.fixed.description "The updates to your filter subscriptions likely resolved the issue that you
-  were reporting. Please reload the page and retry, hit Report again if the
-  problem remains.">
-<!ENTITY anonymous.label "&amp;Anonymous submission">
-<!ENTITY update.inProgress.description "Adblock Plus needs to update your filter subscriptions to make sure that the
-  issue hasn't been resolved already. Please wait...">
-<!ENTITY emailComment.label "We encourage you to enter a valid email address so that we can contact you if there are questions
-  about your report. It will also allow us to recognize your contributions and to prioritize them higher.">
-<!ENTITY outdatedSubscriptions.description "The following filter subscriptions haven't been updated for at least two
-  weeks. Please update these subscriptions before submitting a report, the
-  issue might be resolved already.">
-<!ENTITY anonymity.warning "We won't be able to come back to you and will likely prioritize the report lower.">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/sq/subscriptionSelection.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/sq/subscriptionSelection.dtd
index e336024..c7dd1fd 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/sq/subscriptionSelection.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/sq/subscriptionSelection.dtd
@@ -1,12 +1,12 @@
+<!ENTITY addMain.label "Shto filtër dhe abonimin &quot;?1?&quot; si edhe">
 <!ENTITY list.download.failed "Adblock Plus dështoj të lidhet me listën e abonimeve.">
 <!ENTITY list.download.retry "Provo prap">
 <!ENTITY title.label "&amp;Titulli i abonimit:">
 <!ENTITY list.download.website "Shiko faqen">
+<!ENTITY supplementMessage "Ky abonim filtri është menduar që të përdoret me abonim filtri &quot;?1?&quot; të cilat ju nuk jeni duke përdorur ende.">
 <!ENTITY viewList.label "Shiko filtrat">
 <!ENTITY visitHomepage.label "Vizito faqen kryesore">
 <!ENTITY addSubscription.label "Shto abonim">
 <!ENTITY dialog.title "Shtoi Adblock Plus filtër abonimi">
 <!ENTITY location.label "Vendi i &amp;listës së filtrit:">
 <!ENTITY fromWeb.description "Ju lutem konfirmoni që doni të shtoni këtë filtër abonimi. Ju mund ta ndryshoni emrin e abonimit ose vendëndodhjen para se ta konfirmoni.">
-<!ENTITY addMain.label "Add filter &amp;subscription &quot;?1?&quot; as well">
-<!ENTITY supplementMessage "This filter subscription is meant to be used with the filter subscription &quot;?1?&quot; which you are not using yet.">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/sr/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/sr/firstRun.properties
index cac5818..76aaf8a 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/sr/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/sr/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Сурфујте приватно са онемогућеним праћењем - скривајући се од рекламних компанија које прате сваки ваш потез.
-firstRun_toggle_off=Искључен
-firstRun_feature_tracking=Онемогући праћење
-firstRun_feature_malware=Блокирање малвера
-firstRun_title=Adblock Plus је инсталиран
-firstRun_toggle_on=Укључен
 firstRun_acceptableAdsExplanation=Желели бисмо да охрабримо сајтове да користе фер и ненападно оглашавање, и зато смо покренули <a>стриктан правилник</a> у циљу препознавања прихватљивих огласа који је могуће видети под подразумеваним поставкама. Ако и даље желите да блокирате све огласе, можете <a>онемогућити</a> ову опцију.
+firstRun_acceptableAdsHeadline=Досадне рекламе ће сада бити блокиране
 firstRun_contributor_credits=Кредитовани сарадници
 firstRun_dataCorruptionWarning=Да ли се ова страница наставља појављивати? <a>Кликните овде!</a>
-firstRun_acceptableAdsHeadline=Досадне рекламе ће сада бити блокиране
-firstRun_share=Препоручите нас својим пријатељима
-firstRun_share_headline=<a>Помози нам</a> да интернет постане боље место
-firstRun_feature_social_description=Аутоматски учините сурфовање ослобођеним од  дугмића друштвених мрежа, као што су "Facebook Like" дугме, који се појављују на страницама и прате ваше понашање.
-firstRun_filterlistsReinitializedWarning=Изгледа да је проблем узроковао да сви филтери буду уклоњени, а резервне примерке није могуће повратити. Због тога смо морали да вратимо поставке филтера и дозвољених огласа на подразумеване вредности. Проверите листе филтера и дозвољене огласе у <a>опцијама Adblock Plus-а</a>.
-firstRun_feature_malware_description=Учините ваше сурфовање сигурнијим, блокирајући домене познате по злонамерним малвер програмима.
-firstRun_features=Adblock Plus може више од блокирања реклама
 firstRun_donate=Донирајте
 firstRun_donate_label=Подржите наш пројекат
+firstRun_feature_malware=Блокирање малвера
+firstRun_feature_malware_description=Учините ваше сурфовање сигурнијим, блокирајући домене познате по злонамерним малвер програмима.
 firstRun_feature_social=Уклоните дугмиће друштвених мрежа
+firstRun_feature_social_description=Аутоматски учините сурфовање ослобођеним од  дугмића друштвених мрежа, као што су "Facebook Like" дугме, који се појављују на страницама и прате ваше понашање.
+firstRun_feature_tracking=Онемогући праћење
+firstRun_feature_tracking_description=Сурфујте приватно са онемогућеним праћењем - скривајући се од рекламних компанија које прате сваки ваш потез.
+firstRun_features=Adblock Plus може више од блокирања реклама
+firstRun_filterlistsReinitializedWarning=Изгледа да је проблем узроковао да сви филтери буду уклоњени, а резервне примерке није могуће повратити. Због тога смо морали да вратимо поставке филтера и дозвољених огласа на подразумеване вредности. Проверите листе филтера и дозвољене огласе у <a>опцијама Adblock Plus-а</a>.
 firstRun_legacySafariWarning=Користите верзију Сафарија коју Adblock Plus не подржава, зато је могуће да неке веб странице неће бити оптимално приказане, или ABP уопште неће функционисати. Препоручујемо да унапредите Safari у задњу верзију, или да користите Мозила Фајерфокс, Гугл Кром или Опера браузер.
+firstRun_share=Препоручите нас својим пријатељима
+firstRun_share_headline=<a>Помози нам</a> да интернет постане боље место
+firstRun_title=Adblock Plus је инсталиран
+firstRun_toggle_off=Искључен
+firstRun_toggle_on=Укључен
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/sr/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/sr/overlay.dtd
index 52b43c7..1505dfc 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/sr/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/sr/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Да">
 <!ENTITY notification.button.no "&amp;Не">
 <!ENTITY sync.label "Поставке &amp;усклађивања Adblock Plus-а">
 <!ENTITY whitelist.site.label "Онемогући на ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "&amp;Пријави проблеме на овој страници">
 <!ENTITY whitelist.page.label "Онемогући само на овој страници">
 <!ENTITY context.image.label "Блокирај слику">
-<!ENTITY counthits.label "Бр&amp;ој поготке филтера">
+<!ENTITY notification.button.yes "&amp;Да">
 <!ENTITY opensidebar.label "О&amp;твори ставке које се могу блокирати">
 <!ENTITY notification.button.close "&amp;Затвори">
 <!ENTITY contribute.label "Допринесите Adblock Plus-у">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Блокирај оквир">
 <!ENTITY blocked.tooltip "Блокиране ставке на овој страни:">
-<!ENTITY hideplaceholders.label "Сакриј &amp;држаче елемената блокираних ставки">
+<!ENTITY counthits.label "Бр&amp;ој поготке филтера">
 <!ENTITY showinstatusbar.label "Прикажи у &amp;статусној траци">
 <!ENTITY sidebar.title "Ставке које се могу блокирати на овој страници">
 <!ENTITY options.label "Оп&amp;ције">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/sr/sendReport.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/sr/sendReport.dtd
index de0adef..d1ca2a3 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/sr/sendReport.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/sr/sendReport.dtd
@@ -26,7 +26,7 @@
 <!ENTITY recentReports.label "Ваши недавно послати извештаји">
 <!ENTITY typeWarning.description "Навели сте да желите пријавити општи проблем са Adblock Plus-ом, а не са филтером. Имајте на уму да је такве проблеме најбоље пријавити на [link]форуму Adblock Plus-а[/link]. Овај систем за пријављивање бисте требали да користите само као допуну расправи, јер нико неће видети Ваш извештај док му не даднете везу до њега. Аутоматски направљену везу ћете добити одмах након слања извештаја.">
 <!ENTITY issues.disabled.description "Adblock Plus је онемогућен и ништа неће блокирати.">
-<!ENTITY attachExtensions.label "Приложите списак омогућених &amp;додатака у извештај, у случају да њихов сукоб доводи до проблема.">
+<!ENTITY attachExtensions.label "Додај листу активних екстензија у извештај у случају када је конфликт додатака узрок проблема">
 <!ENTITY issues.nosubscriptions.add.label "Додај претплату на филтер">
 <!ENTITY issues.disabledfilters.enable.label "Омогућите филтер">
 <!ENTITY issues.override.label "Подешавања су &amp;исправна. Настави са пријављивањем.">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/sv-SE/composer.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/sv-SE/composer.dtd
index b16c505..3df34ed 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/sv-SE/composer.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/sv-SE/composer.dtd
@@ -1,7 +1,7 @@
 <!ENTITY anchor.end.label "I slutet av adressen">
 <!ENTITY domainRestriction.label "Begränsa till domän:">
 <!ENTITY collapse.default.no.label "Standard (nej)">
-<!ENTITY firstParty.label "Endast första part">
+<!ENTITY firstParty.label "Endast &amp;första part">
 <!ENTITY preferences.label "Visa existerande filter…">
 <!ENTITY pattern.label "Sök efter mönster">
 <!ENTITY thirdParty.label "Endast tredje part">
@@ -10,19 +10,19 @@
 <!ENTITY match.warning "Mönstret du har angivit matchar inte längre adressen som skall blockeras/undantas och kommer därför inte att påverka den.">
 <!ENTITY anchor.start.label "I början av adressen">
 <!ENTITY matchCase.label "S&amp;kiftlägeskänslig">
-<!ENTITY custom.pattern.label "Eget:">
-<!ENTITY unselectAllTypes.label "Välj ingen">
+<!ENTITY custom.pattern.label "&amp;Eget:">
+<!ENTITY unselectAllTypes.label "Markera ingen">
 <!ENTITY type.whitelist.label "Regel för &amp;undantag">
-<!ENTITY regexp.warning "Mönstret du angivit hanteras som ett reguljärt uttryck. Många reguljära uttryck kan göra din surfning långsam. Om du inte avsåg att använda reguljära uttryck, lägg till en asterisk (*) i slutet av mönstret.">
+<!ENTITY regexp.warning "Det mönster som du har angett kommer att tolkas som ett reguljärt uttryck vilket inte kan bearbetas effektivt av Adblock Plus och det kan göra din webbupplevelse långsam. Om du inte tänkte använda ett reguljärt uttryck, lägg till en asterisk (*) i slutet av mönstret.">
 <!ENTITY dialog.title "Lägg till filterregel för Adblock Plus">
 <!ENTITY basic.label "Standard">
 <!ENTITY type.filter.label "Blockerande filter">
-<!ENTITY types.label "Verkställ för:">
-<!ENTITY shortpattern.warning "Detta mönster är för kort för optimal prestanda och för många sådana mönster kan göra din surfning långsam. Det rekommenderas att använda längre strängar för detta filter.">
+<!ENTITY types.label "Verkställ för typer:">
+<!ENTITY shortpattern.warning "Det mönstret som du angav är för kort för att optimeras och kan göra din webbupplevelse långsam. Det rekommenderas att du väljer en längre sträng för detta filter så att Adblock Plus kan bearbeta filtret mer effektivt.">
 <!ENTITY collapse.yes.label "Ja">
 <!ENTITY anchors.label "Acceptera endast mönster:">
 <!ENTITY collapse.default.yes.label "Standard (ja)">
-<!ENTITY domainRestriction.help "Ange en eller flera domäner avgränsade med lodrätt streck (|). Filtret kommer endast att tillämpas på dessa valda domäner(na). Tilde-tecknet (~) framför en domän anger att filtret inte kommer att användas för den domänen.">
+<!ENTITY domainRestriction.help "Använd detta alternativ för att ange en eller flera domäner avgränsat med en lodrät linje (|). Filtret kommer endast att tillämpas på domäner som valts. Ett tildetecken (~) före ett domännamn anger att filtret inte kommer att tillämpas på den domänen.">
 <!ENTITY accept.label "Lägg till filter">
 <!ENTITY options.label "Inställningar">
 <!ENTITY disabled.warning "Adblock Plus är inaktiverat. Du kan lägga till filter, men de kan inte användas förrän du [link]aktiverar Adblock Plus[/link].">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/sv-SE/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/sv-SE/firstRun.properties
index 5381477..2491bbd 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/sv-SE/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/sv-SE/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Surfa privat genom att inaktivera spårning - dölj dina spår från reklamföretag som vill spåra dina rörelser.
-firstRun_toggle_off=AV
-firstRun_feature_tracking=Inaktivera Spårning
-firstRun_feature_malware=Malwareblockering
-firstRun_title=Adblock Plus har installerats
 firstRun_acceptableAdsExplanation=Vi vill uppmuntra webbplatser att använda enkel, diskret reklam. Det är därför vi har fastställt <a>strikta riktlinjer</a> för att identifiera acceptabla annonser, som visas under standardinställningar. Om du fortfarande vill blockera alla annonser kan du <a>inaktivera</a> detta inom ett par sekunder.
-firstRun_toggle_on=PÅ
+firstRun_acceptableAdsHeadline=Irriterande annonser blockeras nu
 firstRun_contributor_credits=Tack till
 firstRun_dataCorruptionWarning=Fortsätter denna sida att visas? <a>Klicka här!</a>
-firstRun_acceptableAdsHeadline=Irriterande annonser blockeras nu
-firstRun_share=Berätta för dina vänner
-firstRun_share_headline=<a>Hjälp oss</a> att göra webben till en bättre plats
-firstRun_features=Adblock Plus kan göra mer än att blockera reklam
-firstRun_feature_malware_description=Göra din surfning säkrare genom att blockera kända skadliga domäner.
-firstRun_feature_social_description=Förbättrar automatiskt din webbupplevelse genom borttagning av sociala medier knappar, såsom Facebook Gilla, som visas på webbsidor och spåra ditt beteende.
 firstRun_donate=donera
 firstRun_donate_label=Stöd vårt projekt
+firstRun_feature_malware=Malwareblockering
+firstRun_feature_malware_description=Göra din surfning säkrare genom att blockera kända skadliga domäner.
 firstRun_feature_social=Ta bort knappar för Sociala Medier
+firstRun_feature_social_description=Förbättrar automatiskt din webbupplevelse genom borttagning av sociala medier knappar, såsom Facebook Gilla, som visas på webbsidor och spåra ditt beteende.
+firstRun_feature_tracking=Inaktivera Spårning
+firstRun_feature_tracking_description=Surfa privat genom att inaktivera spårning - dölj dina spår från reklamföretag som vill spåra dina rörelser.
+firstRun_features=Adblock Plus kan göra mer än att blockera reklam
+firstRun_filterlistsReinitializedWarning=Det verkar som ett problem har orsakat att alla filter har tagits bort och det gick inte att återställa en säkerhetskopia. Vi var därför tvunga att att återställa dina Filter och Acceptabla Annonser inställningar. Vänligen kontrollera dina Filterlistor och Acceptabla Annonser inställningar i <a>Adblock Plus alternativ</a>.
 firstRun_legacySafariWarning=Du använder en äldre version av Safari som inte stödjs av Adblock Plus. Adblock Plus kanske inte fungerar korrekt eller försämrar användarupplevelsen på vissa hemsidor. Vi rekommenderar starkt att antingen uppdatera till Safari 6.1.1 eller högre (tillgänglig på OS X 10.8 Mountain Lion), Safari 7.0.1 eller högre (tillgänglig på OS X 10.9 Mavericks), eller att använda den senaste versionen av Mozilla Firefox, Google Chrome eller Opera.
-firstRun_filterlistsReinitializedWarning=It seems that an issue caused all filters to be removed and we were unable to restore a backup. Therefore we had to reset your filters and Acceptable Ads settings. Please check your filter lists and Acceptable Ads settings in the <a>Adblock Plus options</a>.
+firstRun_share=Berätta för dina vänner
+firstRun_share_headline=<a>Hjälp oss</a> att göra webben till en bättre plats
+firstRun_title=Adblock Plus har installerats
+firstRun_toggle_off=AV
+firstRun_toggle_on=PÅ
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/sv-SE/global.properties b/data/extensions/spyblock@gnu.org/chrome/locale/sv-SE/global.properties
index 0bf2eab..45570b7 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/sv-SE/global.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/sv-SE/global.properties
@@ -10,10 +10,10 @@ blocked_count_tooltip=?1? av ?2?
 type_label_font=teckensnitt
 type_label_popup=popupfönster
 filter_regexp_tooltip=Detta filter är ett reguljärt uttryck eller för kort för optimal funktion. För många av dessa filter kan göra din surfning långsam.
-action0_tooltip=Klicka för meny, mittenklicka för att slå på/av Adblock Plus.
-whitelisted_page=Adblock Plus är inaktiverat på denna sida
+action0_tooltip=Klicka för att ta upp sammanhangsmeny, mittenklicka för att slå på/av.
+whitelisted_page=Adblock Plus är inaktiverat för denna sida
 remove_group_warning=Vill du verkligen radera denna grupp?
-action1_tooltip=Klicka för att öppna/stänga listan med blockerbara objekt, mittenklicka för att slå på/av Adblock Plus.
+action1_tooltip=Klicka för att öppna/stänga listan med blockerbara objekt, mittenklicka för att slå på/av.
 type_label_xmlhttprequest=XML-förfrågan
 active_tooltip=Adblock Plus är aktiverat, ?1? filterprenumeration(er) och ?2? egna filter används.
 type_label_document=dokument
@@ -22,7 +22,7 @@ whitelistGroup_title=Undantagsregler
 disabled_tooltip=Adblock Plus är av.
 filter_elemhide_duplicate_id=Endast ett ID får anges för elementet som skall döljas
 type_label_object=objekt
-action2_tooltip=Klicka för att öppna inställningarna, mittenklicka för att slå på/av Adblock Plus.
+action2_tooltip=Klicka för att öppna inställningarna, mittenklicka för att slå på/av .
 type_label_subdocument=ram
 clearStats_warning=Detta kommer att återställa all filterträffstatistik och inaktivera räkning av filterträffar. Vill du fortsätta?
 notification_antiadblock_message=Denna webbplats har varit känt för att visa riktade budskap till Adblock Plus användare. Vill du Adblock Plus att dölja riktade budskap?
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/sv-SE/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/sv-SE/overlay.dtd
index 9e5694a..13c9213 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/sv-SE/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/sv-SE/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "Jag">
 <!ENTITY notification.button.no "Nej">
 <!ENTITY sync.label "Syn&amp;kronisera Adblock Plus inställningar">
 <!ENTITY whitelist.site.label "Använd inte på ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "Rapportera problem på denna sida">
 <!ENTITY whitelist.page.label "Använd inte på denna sida">
 <!ENTITY context.image.label "Adblock Plus: Blockera bild">
-<!ENTITY counthits.label "Räkna an&amp;talet filterträffar">
+<!ENTITY notification.button.yes "Jag">
 <!ENTITY opensidebar.label "Visa lista över blockerbara objekt">
 <!ENTITY notification.button.close "Sluta">
 <!ENTITY contribute.label "Bidra till Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Blockera ram">
 <!ENTITY blocked.tooltip "Blockerade objekt på denna sida:">
-<!ENTITY hideplaceholders.label "Dölj platshållare för blockerade element">
+<!ENTITY counthits.label "Räkna an&amp;talet filterträffar">
 <!ENTITY showinstatusbar.label "Visa i statusfältet">
 <!ENTITY sidebar.title "Blockerbara objekt på denna sida">
 <!ENTITY options.label "Alter&amp;nativ">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/th/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/th/firstRun.properties
index f9d617a..3549c70 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/th/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/th/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_toggle_off=ไม่ทำงาน
-firstRun_feature_tracking=ปิดระบบติดตามการใข้งาน
-firstRun_feature_social=ลบปุ่มสื่อสังคมออก
-firstRun_title=กาติดตั้ง Adblock Plus เสร็จสมบูรณ์
-firstRun_feature_malware=บล็อกมัลแวร์
-firstRun_toggle_on=ทำงาน
-firstRun_dataCorruptionWarning=ไม่ให้หน้านี้แสดงอีกครั้ง <a>คลิกที่นี้</a>
 firstRun_acceptableAdsHeadline=โฆษณาที่น่ารำคาญจะถูกปิดกั้น
-firstRun_share=บอกเพื่อนของคุณ
-firstRun_filterlistsReinitializedWarning=ดูเหมือนว่าปัญหาจะเกิดจากตัวกรองทั้งหมดถูกลบออกไปแล้วไม่สามารถคืนค่าจากตัวสำรองข้อมูลได้ ดังนั้นเรามีตัวรีเซ็ตตัวกรองที่ได้รับการยอมรับ กรุณาตรวจสอบรายการตัวกรองโฆษณาของคุณืั้ <a>ตัวเลือก Adblock Plus</a>
-firstRun_feature_malware_description=ทำให้ท่องเว็บได้ปลอดภัยยิ่งขึ้น โดยการบล็อกเว็บที่มีมัลแวร์ที่รู้จัก
-firstRun_features=Adblock Plus สามารถทำได้มากกกว่าบล็อกโฆษณา
+firstRun_dataCorruptionWarning=ไม่ให้หน้านี้แสดงอีกครั้ง <a>คลิกที่นี้</a>
 firstRun_donate=บริจาค
 firstRun_donate_label=สนับสนุนโปรเจ็คของเรา
+firstRun_feature_malware=บล็อกมัลแวร์
+firstRun_feature_malware_description=ทำให้ท่องเว็บได้ปลอดภัยยิ่งขึ้น โดยการบล็อกเว็บที่มีมัลแวร์ที่รู้จัก
+firstRun_feature_social=ลบปุ่มสื่อสังคมออก
+firstRun_feature_tracking=ปิดระบบติดตามการใข้งาน
+firstRun_features=Adblock Plus สามารถทำได้มากกกว่าบล็อกโฆษณา
+firstRun_filterlistsReinitializedWarning=ดูเหมือนว่าปัญหาจะเกิดจากตัวกรองทั้งหมดถูกลบออกไปแล้วไม่สามารถคืนค่าจากตัวสำรองข้อมูลได้ ดังนั้นเรามีตัวรีเซ็ตตัวกรองที่ได้รับการยอมรับ กรุณาตรวจสอบรายการตัวกรองโฆษณาของคุณืั้ <a>ตัวเลือก Adblock Plus</a>
 firstRun_legacySafariWarning=คุณกำลังใช้เวอร์ชั่นเก่าบน Safari ที่ไม่ได้รับการสนับสนุนจาก Adblock Plus จะทำให้ทำงานผิดพลาดได้ เราขอแนะนำให้คุณอัพเดต Safari เป็นเวอร์ชั่น 6.1.1 หรือรุ่นที่สูงกว่า (บน OS X 10.8 Mountain Lion) หรือ Safari 7.0.1 หรือสูงกว่า (บน OS X 10.9 Mavericks) หรือใช้เวอร์ชั่นล่าสุดบน Mozilla Firefox, Google Chrome และ Opera
+firstRun_share=บอกเพื่อนของคุณ
+firstRun_title=กาติดตั้ง Adblock Plus เสร็จสมบูรณ์
+firstRun_toggle_off=ไม่ทำงาน
+firstRun_toggle_on=ทำงาน
 firstRun_feature_tracking_description=Browse privately by disabling tracking - hiding your tracks from ad companies that would track your every move.
+firstRun_feature_social_description=Automatically rid your browsing experience of social media buttons, such as the Facebook Like, which appear on web pages and track your behavior.
 firstRun_acceptableAdsExplanation=We'd like to encourage websites to use straightforward, unobtrusive advertising. That's why we've established <a>strict guidelines</a> to identify acceptable ads, which are shown under default settings. If you still want to block every ad you can <a>disable</a> this in a few seconds.
 firstRun_contributor_credits=Contributor Credits
 firstRun_share_headline=<a>Give us a hand</a> in making the web a better place
-firstRun_feature_social_description=Automatically rid your browsing experience of social media buttons, such as the Facebook Like, which appear on web pages and track your behavior.
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/th/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/th/overlay.dtd
index 57feaca..ac506d6 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/th/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/th/overlay.dtd
@@ -9,13 +9,12 @@
 <!ENTITY sendReport.label "&amp;รายงานปัญหาที่พบในหน้านี้">
 <!ENTITY whitelist.page.label "ปิดการใช้งานเฉพาะหน้านี้">
 <!ENTITY context.image.label "Adblock รูปภาพ">
-<!ENTITY counthits.label "นับจำนวนตัว&amp;กรองฮิต">
 <!ENTITY opensidebar.label "เปิดราย&amp;การที่บล็อกได้">
 <!ENTITY contribute.label "เข้ามีส่วนร่วมกับ Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock เฟรม">
 <!ENTITY blocked.tooltip "สิ่งที่บล็อกในหน้านี้:">
-<!ENTITY hideplaceholders.label "ซ่อน&amp;ตำแหน่งตัวยึดตำแหน่งขององค์ประกอบที่ถูกบล็อคไว้">
+<!ENTITY counthits.label "นับจำนวนตัว&amp;กรองฮิต">
 <!ENTITY showinstatusbar.label "แ&amp;สดงในแถบสถานะ">
 <!ENTITY sidebar.title "รายการที่บล็อกได้ในหน้าล่าสุด">
 <!ENTITY options.label "ตั&amp;วเลือก">
@@ -26,7 +25,7 @@
 <!ENTITY showintoolbar.label "แสดงในแถบเ&amp;ครื่องมือ">
 <!ENTITY status.tooltip "สถานะ:">
 <!ENTITY context.media.label "Adblock Plus: บล็อกเสียง/วีดิทัศน์">
-<!ENTITY subscription.update.label "ปรับปรุงตัวกรอง">
-<!ENTITY notification.button.yes "&amp;Yes">
 <!ENTITY notification.button.no "&amp;No">
+<!ENTITY notification.button.yes "&amp;Yes">
 <!ENTITY notification.button.close "&amp;Close">
+<!ENTITY subscription.update.label "ปรับปรุงตัวกรอง">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/tr/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/tr/firstRun.properties
index e7c76d5..83bc2ae 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/tr/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/tr/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Her hareketinizi izleyen reklam şirketlerin adımlarınızı gizleyin. İnternette izlenmeyi devre dışı bırakarak gezin.
-firstRun_toggle_off=KAPALI
-firstRun_feature_tracking=İzlenmeyi Devre Dışı Bırak
-firstRun_feature_malware=Zararlı Yazılım Engelleme
-firstRun_title=Adblock Plus yüklendi
-firstRun_toggle_on=AÇIK
 firstRun_acceptableAdsExplanation=Siteleri basit ve rahatsız etmeyen reklamlar yayınlamaya teşvik ediyoruz. Bu yüzden varsayılan ayarlar altında gösterilen, makul reklamları tanımlayan <a>sıkı kuralları</a> kabul ettik. Yine de tüm reklamları engellemek istiyorsanız <a>devre dışı bırakma</a> işini birkaç saniye içinde yapabilirsiniz.
+firstRun_acceptableAdsHeadline=Rahatsız edici reklamlar artık engellenecek
 firstRun_contributor_credits=Emeği Geçenler
 firstRun_dataCorruptionWarning=Bu sayfa sürekli gösteriliyor mu? <a>Buraya tıklayın!</a>
-firstRun_acceptableAdsHeadline=Rahatsız edici reklamlar artık engellenecek
-firstRun_share=Arkadaşlarınıza bahsedin
-firstRun_share_headline=İnterneti daha iyi bir yer yapabilmek için <a>bize elinizi uzatın</a>
-firstRun_feature_social_description=Sayfalarda çıkan ve davranışlarınızı takip eden Facebook'un "Beğen" düğmesi gibi sosyal medya düğmelerinden kurtulun.
-firstRun_filterlistsReinitializedWarning=Görünüşe göre bir sorun tüm filtrelerinizin kaldırılmasına neden olmuş ve bir yedeği geri yükleyemiyoruz. Bu yüzden filtrelerinizi ve Kabul Edilebilir Reklamlar ayarlarınızı sıfırlamamız gerekiyordu. Lütfen <a>Adblock Plus seçenekleri</a> bölümünde filtre listelerinizi ve Kabul Edilebilir Reklamlar ayarlarınızı denetleyin.
-firstRun_feature_malware_description=Bilinen kötü amaçlı yazılıma sahip alan adlarını engelleyerek gezintinizi daha güvenli hale getirin.
-firstRun_features=Adblock Plus reklamları engellemekten daha fazlasını yapabilir
 firstRun_donate=bağış yapın
 firstRun_donate_label=Projemize destek verin
+firstRun_feature_malware=Zararlı Yazılım Engelleme
+firstRun_feature_malware_description=Bilinen kötü amaçlı yazılıma sahip alan adlarını engelleyerek gezintinizi daha güvenli hale getirin.
 firstRun_feature_social=Sosyal Medya Düğmelerini Kaldır
+firstRun_feature_social_description=Sayfalarda çıkan ve davranışlarınızı takip eden Facebook'un "Beğen" düğmesi gibi sosyal medya düğmelerinden kurtulun.
+firstRun_feature_tracking=İzlenmeyi Devre Dışı Bırak
+firstRun_feature_tracking_description=Her hareketinizi izleyen reklam şirketlerin adımlarınızı gizleyin. İnternette izlenmeyi devre dışı bırakarak gezin.
+firstRun_features=Adblock Plus reklamları engellemekten daha fazlasını yapabilir
+firstRun_filterlistsReinitializedWarning=Görünüşe göre bir sorun tüm filtrelerinizin kaldırılmasına neden olmuş ve yedeği geri yükleyemiyoruz. Bu yüzden filtrelerinizi ve Kabul Edilebilir Reklamlar ayarlarınızı sıfırlamamız gerekiyordu. Lütfen <a>Adblock Plus seçenekleri</a> bölümünde filtre listelerinizi ve Kabul Edilebilir Reklamlar ayarlarınızı denetleyin.
 firstRun_legacySafariWarning=Safari'nin Adblock Plus tarafından desteklenmeyen eski bir sürümünü kullanıyorsunuz. Uygulama doğru şekilde çalışmayabilir veya bazı internet sitelerinde kullanıcı deneyimini olumsuz etkileyebilir. Sürümünüzü Safari 6.1.1 veya daha yüksek  (OS X 10.8 Mountain Lion için), ya da Safari 7.0.1 veya daha yüksek (OS X 10.9 Mavericks için) bir sürüme yükseltmenizi, veya Mozilla Firefox, Google  Chrome ya da Opera'nın en son sürümünü kullanmanızı önemle tavsiye ederiz.
+firstRun_share=Arkadaşlarınıza bahsedin
+firstRun_share_headline=İnterneti daha iyi bir yer yapabilmek için <a>bize elinizi uzatın</a>
+firstRun_title=Adblock Plus yüklendi
+firstRun_toggle_off=KAPALI
+firstRun_toggle_on=AÇIK
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/tr/global.properties b/data/extensions/spyblock@gnu.org/chrome/locale/tr/global.properties
index bf4bc48..f0e12f8 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/tr/global.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/tr/global.properties
@@ -1,6 +1,6 @@
 no_blocking_suggestions=Bakılan sayfada engellenebilecek bir öğe bulunmuyor
 action3_tooltip=Adblock Plus'ı etkinleştirmek ya da etkisizleştirmek için orta düğmeye tıklayın.
-notification_antiadblock_title=Hedeflenen iletileri gizlemek istiyor musunuz?
+notification_antiadblock_title=İletileri gizlemek istiyor musunuz?
 type_label_script=betik
 filter_elemhide_nocriteria=Gizlenecek bileşeni anlamak için hiçbir ölçüt belirtilmedi
 blockingGroup_title=Reklam Engelleme Kuralları
@@ -25,7 +25,7 @@ type_label_object=nesne
 action2_tooltip=Tercihler penceresini açmak için tıklayın; etkinleştirmek ya da etkisizleştirmek için orta düğmeye tıklayın.
 type_label_subdocument=çerçeve
 clearStats_warning=Bu hareket isabet istatistiklerinin sıfırlanması ve artık istatistik tutulmamasıyla sonuçlanacak. Devam etmek istiyor musunuz?
-notification_antiadblock_message=Bu site Adblock Plus kullanıcılarına  hedeflenen iletiler göstermesiyle bilinir. Adblock Plus'ın hedeflenen iletileri gizlemesini istiyor musunuz?
+notification_antiadblock_message=Bu site Adblock Plus kullanıcılarına yönelik iletiler göstermesiyle bilinir. Adblock Plus'ın bu iletileri gizlemesini istiyor musunuz?
 blocked_count_addendum=(ayrıca ?1? tane ak listede, ?2? tane gizli)
 subscription_invalid_location=Dosya listesi konumu ne düzgün bir URL ne de düzgün bir ada sahip.
 type_label_image=resim
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/tr/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/tr/overlay.dtd
index 4cbbc1c..a7364a4 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/tr/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/tr/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Evet">
 <!ENTITY notification.button.no "&amp;Hayır">
 <!ENTITY sync.label "Adblock Plus ayarlarını &amp;eşitle">
 <!ENTITY whitelist.site.label "?1? sitesinde devre dışı kal">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "&amp;Bu sayfadaki sorunu bildir">
 <!ENTITY whitelist.page.label "Sadece bu sayfada devre dışı kal">
 <!ENTITY context.image.label "Adblock Plus: Resmi engelle">
-<!ENTITY counthits.label "Süzgeç isa&amp;betini say">
+<!ENTITY notification.button.yes "&amp;Evet">
 <!ENTITY opensidebar.label "E&amp;ngellenebilecek öğeleri göster">
 <!ENTITY notification.button.close "&amp;Kapat">
 <!ENTITY contribute.label "Adblock Plus'a katkıda bulun">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Çerçeveyi engelle">
 <!ENTITY blocked.tooltip "Bu sayfada engellenen öğeler:">
-<!ENTITY hideplaceholders.label "Enge&amp;llenen öğelerin yer işaretlerini gizle">
+<!ENTITY counthits.label "Süzgeç isa&amp;betini say">
 <!ENTITY showinstatusbar.label "&amp;Durum çubuğunda göster">
 <!ENTITY sidebar.title "Bu sayfadaki engellenebilecek öğeler">
 <!ENTITY options.label "S&amp;eçenekler">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/uk/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/uk/firstRun.properties
index f001239..abc6f01 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/uk/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/uk/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Переглядайте сайти анонімно шляхом вимкнення відстеження - приховування вашого шляху від рекламних компаній, які хочуть відслідковувати кожний ваш крок.
-firstRun_toggle_off=ВИМКН
-firstRun_feature_tracking=Вимкнення відстеження
-firstRun_feature_malware=Блокування шкідливих програм
-firstRun_title=Adblock Plus вже встановлено
-firstRun_toggle_on=УВІМК
-firstRun_acceptableAdsExplanation=Ми хотіли б заохотити веб-сайти використовувати просту, ненав'язливу рекламу. Ось чому ми вже створені <a>суворі керівні принципи</a> для ідентифікації прийнятної реклами, які відображаються у групі типових налаштувань. Якщо потрібно заблокувати кожну рекламу, то ви можете <a>вимкнути</a> це за декілька секунд.
+firstRun_acceptableAdsExplanation=Ми хотіли б заохотити веб-сайти використовувати просту, ненав'язливу рекламу. Ось чому ми створили <a>суворі принципи</a> для ідентифікації прийнятної реклами, які по замовчуванню будуть показуватись. Якщо Ви все ж бажаєте заблокувати всю рекламу, то ви можете <a>вимкнути</a> це за декілька секунд.
+firstRun_acceptableAdsHeadline=Надокучлива реклама буде надалі блокуватися
 firstRun_contributor_credits=Внески учасників
 firstRun_dataCorruptionWarning=Ця сторінка все ще відображається? <a>Натисніть тут!</a>
-firstRun_acceptableAdsHeadline=Дратівлива реклама буде надалі блокуватися
-firstRun_share=Розказати друзям
-firstRun_share_headline=<a>Подайте нам руку</a> для створення кращого середовища у мережі
-firstRun_feature_social_description=Автоматично прибирає кнопки соціальних мереж на кшталт Facebook, які з'являються на веб-сторінках і відстежують вашу поведінку.
-firstRun_filterlistsReinitializedWarning=Здається, що помилка призвела до того, що всі фільтри були знищені, і ми не можемо відновити резервну копію. Тому ми скинули фільтри і налаштування ненав’язливої реклами. Будь ласка, перевірте список ваших фільтрів та налаштування ненав’язливої реклами <a>Adblock Plus параметри</a>.
-firstRun_feature_malware_description=Убезпечте ваші перегляд через блокування доменів відомих зловмисних програм.
-firstRun_features=Adblock Plus може зробити більше, ніж блокування реклами
 firstRun_donate=пожертва
 firstRun_donate_label=Підтримайте наш проект
+firstRun_feature_malware=Блокування шкідливих програм
+firstRun_feature_malware_description=Убезпечте ваші перегляд через блокування доменів відомих зловмисних програм.
 firstRun_feature_social=Видаляє кнопки соціальних мереж
+firstRun_feature_social_description=Автоматично прибирає кнопки соціальних мереж на кшталт Facebook, які з'являються на веб-сторінках і відстежують вашу поведінку.
+firstRun_feature_tracking=Вимкнення відстеження
+firstRun_feature_tracking_description=Переглядайте сайти анонімно шляхом вимкнення відстеження - приховування вашого шляху від рекламних компаній, які хочуть відслідковувати кожний ваш крок.
+firstRun_features=Adblock Plus може зробити більше, ніж блокування реклами
+firstRun_filterlistsReinitializedWarning=Здається, що помилка призвела до того, що всі фільтри були знищені, і ми не можемо відновити резервну копію. Тому ми скинули фільтри і налаштування ненав’язливої реклами. Будь ласка, перевірте список ваших фільтрів та налаштування ненав’язливої реклами <a>Adblock Plus параметри</a>.
 firstRun_legacySafariWarning=Ви використовуєте стару версію Safari, яка не підтримується Adblock Plus. Вона може не працювати належним чином або погіршувати якість роботи користувача на деяких веб-сайтах. Ми настійно рекомендуємо онвити до Safari 6.1.1 або вище (в OS X 10.8 Mounain Lion), або Safari 7.0.1 або вище (в OS X 10.9 Mavericks), або використовувати останню версію Mozilla Firefox, Google Chrome або Mozilla.
+firstRun_share=Розказати друзям
+firstRun_share_headline=<a>Подайте нам руку</a> для створення кращого середовища у мережі
+firstRun_title=Adblock Plus вже встановлено
+firstRun_toggle_off=ВИМКН
+firstRun_toggle_on=УВІМК
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/uk/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/uk/overlay.dtd
index 3928786..31e88f8 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/uk/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/uk/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Так">
 <!ENTITY notification.button.no "&amp;Ні">
 <!ENTITY sync.label "Синхроні&amp;зувати налаштування Адблоку">
 <!ENTITY whitelist.site.label "Вимкнути: на ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "Повідомити про проблеми на &amp;сторінці">
 <!ENTITY whitelist.page.label "Вимкнути: тільки на цій сторінці">
 <!ENTITY context.image.label "Adblock Plus: заблокувати зображення">
-<!ENTITY counthits.label "&amp;Рахувати хіти фільтрів">
+<!ENTITY notification.button.yes "&amp;Так">
 <!ENTITY opensidebar.label "Відкрити с&amp;писок елементів">
 <!ENTITY notification.button.close "&amp;Закрити">
 <!ENTITY contribute.label "Допомогти Адблоку">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: заблокувати фрейм">
 <!ENTITY blocked.tooltip "Заблоковані елементи на цій сторінці:">
-<!ENTITY hideplaceholders.label "При&amp;ховувати замінники заблокованих елементів">
+<!ENTITY counthits.label "&amp;Рахувати хіти фільтрів">
 <!ENTITY showinstatusbar.label "Показувати в рядку &amp;стану">
 <!ENTITY sidebar.title "Елементи відкритої сторінки">
 <!ENTITY options.label "Н&amp;алаштування">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/vi/composer.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/vi/composer.dtd
index 71d2903..02859d2 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/vi/composer.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/vi/composer.dtd
@@ -18,7 +18,7 @@
 <!ENTITY basic.label "Hiển thị cơ bản">
 <!ENTITY type.filter.label "Bộ lọc chặn">
 <!ENTITY types.label "Áp dụng cho các kiểu:">
-<!ENTITY shortpattern.warning "Mẫu bạn gõ vào quá ngắn để tối ưu hóa, nhiều mẫu như vậy có thể làm chậm việc duyệt web của bạn. Lời khuyên là bạn hãy chọn một chuỗi dài hơn cho bộ lọc này.">
+<!ENTITY shortpattern.warning "Mẫu bạn gõ vào quá ngắn để tối ưu hóa, nhiều mẫu như vậy có thể làm chậm việc duyệt mạng của bạn. Lời khuyên là bạn hãy chọn một chuỗi dài hơn cho bộ lọc này.">
 <!ENTITY collapse.yes.label "Có">
 <!ENTITY anchors.label "Chỉ chấp nhận mẫu:">
 <!ENTITY collapse.default.yes.label "Dùng mặc định (có)">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/vi/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/vi/firstRun.properties
index 74e60dc..f348260 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/vi/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/vi/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Duyệt riêng tư bằng cách vô hiệu theo dõi - ẩn theo dõi của bạn từ các công ty quảng cáo theo dõi từng bước của bạn.
-firstRun_toggle_off=TẮT
-firstRun_feature_tracking=Vô hiệu hóa theo dõi
-firstRun_feature_malware=Chặn phần mềm độc hại
-firstRun_title=Adblock Plus đã được cài đặt
 firstRun_acceptableAdsExplanation=Chúng tôi khuyến khích các trang mạng dùng những quảng cáo minh bạch, không phiền nhiễu. Đó là lí do tại sao chúng tôi gây dựng <a>hướng dẫn chặt chẽ</a> để xác định các quảng cáo được chấp nhận, hiện dưới mức thiết lập mặc định. Nếu bạn vẫn muốn chặn mọi quảng cáo, bạn có thể <a>vô hiệu</a> điều này trong một vài giây.
-firstRun_toggle_on=BẬT
+firstRun_acceptableAdsHeadline=Những quảng cáo phiền phức sẽ bị chặn
 firstRun_contributor_credits=Đóng góp các khoản tín dụng
 firstRun_dataCorruptionWarning=Có phải trang này luôn hiển thị? <a>Bấm vào đây</a>
-firstRun_acceptableAdsHeadline=Những quảng cáo phiền phức sẽ bị chặn
-firstRun_share=Nói với bạn bè của bạn
-firstRun_share_headline=<a>Giúp chúng tôi một tay</a> trong việc làm trang mạng trở nên tốt hơn
-firstRun_features=Adblock Plus có thể làm nhiều hơn là chặn quảng cáo
-firstRun_feature_malware_description=Làm cho trình duyệt an toàn hơn bằng cách chặn các tên miền chứa phần mềm độc hại.
-firstRun_feature_social_description=Tự động loại bỏ lịch duyệt của các nút truyền thông mạng xã hội, như là nút Thích Facebook, xuất hiện trên trang mạng và theo dõi hành vi của bạn.
 firstRun_donate=ủng hộ
 firstRun_donate_label=Hỗ trợ dự án của chúng tôi
+firstRun_feature_malware=Chặn phần mềm độc hại
+firstRun_feature_malware_description=Làm cho trình duyệt an toàn hơn bằng cách chặn các tên miền chứa phần mềm độc hại.
 firstRun_feature_social=Loại bỏ các nút bấm Phương tiện Mạng xã hội
+firstRun_feature_social_description=Tự động loại bỏ lịch duyệt của các nút truyền thông mạng xã hội, như là nút Thích Facebook, xuất hiện trên trang mạng và theo dõi hành vi của bạn.
+firstRun_feature_tracking=Vô hiệu hóa theo dõi
+firstRun_feature_tracking_description=Duyệt riêng tư bằng cách vô hiệu theo dõi - ẩn theo dõi của bạn từ các công ty quảng cáo theo dõi từng bước của bạn.
+firstRun_features=Adblock Plus không chỉ có thể chặn quảng cáo
+firstRun_filterlistsReinitializedWarning=Có vẻ như là một vấn đề gây ra tất cả các bộ lọc phải được loại bỏ và chúng tôi không thể khôi phục lại một bản sao lưu. Vì vậy chúng tôi đã phải thiết lập lại các bộ lọc của bạn và thiết lập danh mục chấp nhận được. Hãy kiểm tra danh sách bộ lọc của bạn và các thiết lập danh mục được chấp nhận trong các <a>tùy chọn Adblock Plus</a>.
 firstRun_legacySafariWarning=Bạn đang dùng một phiên bản cũ của Safari không được hỗ trợ bởi Adblock Plus. Nó có thể không hoạt động chính xác hoặc làm giảm trải nghiệm của người dùng trên một số trang mạng. Chúng tôi rất khuyến khích cập nhật lên Safari 6.1.1 hoặc cao hơn (trên OS X 10.8 Mountain Lion), hoặc Safari 7.0.1 hoặc cao hơn (trên OS X 10.9 Mavericks), hoặc dùng phiên bản mới nhất của Mozilla Firefox, Google Chrome hoặc Opera.
-firstRun_filterlistsReinitializedWarning=It seems that an issue caused all filters to be removed and we were unable to restore a backup. Therefore we had to reset your filters and Acceptable Ads settings. Please check your filter lists and Acceptable Ads settings in the <a>Adblock Plus options</a>.
+firstRun_share=Nói với bạn bè của bạn
+firstRun_share_headline=<a>Giúp chúng tôi một tay</a> trong việc làm trang mạng trở nên tốt hơn
+firstRun_title=Adblock Plus đã được cài đặt
+firstRun_toggle_off=TẮT
+firstRun_toggle_on=BẬT
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/vi/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/vi/overlay.dtd
index 71de231..1609dc9 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/vi/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/vi/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;Có">
 <!ENTITY notification.button.no "&amp;Không">
 <!ENTITY sync.label "Đồng bộ thiết lập Adbl&amp;ock Plus">
 <!ENTITY whitelist.site.label "Vô hiệu hóa trên ?1?">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "&amp;Báo cáo vấn đề trên trang này">
 <!ENTITY whitelist.page.label "Chỉ vô hiệu hóa trên trang này">
 <!ENTITY context.image.label "Adblock Plus: Chặn Ảnh">
-<!ENTITY counthits.label "Đếm lượt &amp;bấm bộ lọc">
+<!ENTITY notification.button.yes "&amp;Có">
 <!ENTITY opensidebar.label "&amp;Mở các mục có thể chặn được">
 <!ENTITY notification.button.close "Đó&amp;ng">
 <!ENTITY contribute.label "Đóng góp cho Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Chặn Khung">
 <!ENTITY blocked.tooltip "Các mục bị chặn trong trang này:">
-<!ENTITY hideplaceholders.label "Ẩn &amp;chỗ giữ các yếu tố bị chặn">
+<!ENTITY counthits.label "Đếm lượt &amp;bấm bộ lọc">
 <!ENTITY showinstatusbar.label "Hiện t&amp;rong thanh trạng thái">
 <!ENTITY sidebar.title "Các mục bị chặn trên trang hiện tại">
 <!ENTITY options.label "Tù&amp;y chọn">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/zh-CN/filters.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/zh-CN/filters.dtd
index 23ccf7c..adb206e 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/zh-CN/filters.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/zh-CN/filters.dtd
@@ -29,8 +29,7 @@
 <!ENTITY subscription.lastDownload.unknown "未知">
 <!ENTITY addSubscriptionCancel.label "取消">
 <!ENTITY subscription.enabled.label "启用">
-<!ENTITY noSubscriptions.text "您还没有添加过滤规则订阅组。Adblock Plus 没有过滤规则将无法
-进行屏蔽，请使用 “添加过滤规则订阅组” 添加过滤规则。">
+<!ENTITY noSubscriptions.text "您还没有添加过滤规则订阅组。Adblock Plus 没有过滤规则将无法进行屏蔽，请使用“添加过滤规则订阅组”添加过滤规则。">
 <!ENTITY subscription.update.label "更新过滤规则">
 <!ENTITY dialog.title "Adblock Plus 过滤规则首选项">
 <!ENTITY addFilter.label "添加过滤规则 (&amp;d)">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/zh-CN/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/zh-CN/firstRun.properties
index e318330..39f74a0 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/zh-CN/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/zh-CN/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=隐秘浏览避开跟踪 - 摆脱广告公司跟踪你的一举一动。
-firstRun_toggle_off=关闭
-firstRun_feature_tracking=禁止跟踪
-firstRun_feature_malware=拦截恶意软件
-firstRun_title=Adblock Plus 已安装
-firstRun_toggle_on=开启
 firstRun_acceptableAdsExplanation=我们想鼓励网站使用简单、不使人反感的广告。这也是为什么我们建立了一个<a>严格的指导方针</a>来确定可接受的广告，并在默认设置下展示它们。如果您仍想屏蔽所有广告，您可以轻松地<a>禁用</a>这项功能。
+firstRun_acceptableAdsHeadline=恼人的广告将被屏蔽
 firstRun_contributor_credits=贡献者记录
 firstRun_dataCorruptionWarning=总是显示此页？<a>点击这里！</a>
-firstRun_acceptableAdsHeadline=恼人的广告将被屏蔽
-firstRun_share=告诉你的朋友
-firstRun_share_headline=<a>给我们一点支持</a>，让网络变得更加美好
-firstRun_feature_social_description=自动屏蔽网页中出现的社交媒体按钮，例如 Facebook 的 Like，摆脱行为跟踪。
-firstRun_filterlistsReinitializedWarning=似乎因一个问题导致所有过滤规则已被删除，并且我们无法从备份中恢复。因此，我们不得不重置您的过滤规则和可接受广告设置。请在 <a>Adblock Plus 选项</a> 中检查您的过滤规则列表和可接受广告设置。
-firstRun_feature_malware_description=使您的浏览更安全，阻止已知的恶意软件域。
-firstRun_features=Adblock Plus 不仅仅能拦截广告
 firstRun_donate=捐赠
 firstRun_donate_label=支持我们的项目
+firstRun_feature_malware=拦截恶意软件
+firstRun_feature_malware_description=使您的浏览更安全，阻止已知的恶意软件域。
 firstRun_feature_social=移除社交媒体按钮
+firstRun_feature_social_description=自动屏蔽网页中出现的社交媒体按钮，例如 Facebook 的 Like，摆脱行为跟踪。
+firstRun_feature_tracking=禁止跟踪
+firstRun_feature_tracking_description=隐秘浏览避开跟踪 - 摆脱广告公司跟踪你的一举一动。
+firstRun_features=Adblock Plus 不仅仅能拦截广告
+firstRun_filterlistsReinitializedWarning=似乎因一个问题导致所有过滤规则已被删除，并且我们无法从备份中恢复。因此，我们不得不重置您的过滤规则和可接受广告设置。请在 <a>Adblock Plus 选项</a> 中检查您的过滤规则列表和可接受广告设置。
 firstRun_legacySafariWarning=Adblock Plus 不支持您正在使用的 Safari 旧版本。这可能导致无法正常工作，或者损害一些网站上的用户体验。我们强烈建议您更新到 Safari 6.1.1 或更高版本（基于 OS X 10.8 Mountain Lion），或 Safari 7.0.1 或更高版本（基于 OS X 10.9 Mavericks），或者使用 Mozilla Firefox、Google Chrome 或 Opera 浏览器的最新版本。
+firstRun_share=告诉你的朋友
+firstRun_share_headline=<a>给我们一点支持</a>，让网络变得更加美好
+firstRun_title=Adblock Plus 已安装
+firstRun_toggle_off=关闭
+firstRun_toggle_on=开启
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/zh-CN/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/zh-CN/overlay.dtd
index cf9ea7f..14deb7c 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/zh-CN/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/zh-CN/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "是(&amp;Y)">
 <!ENTITY notification.button.no "否(&amp;N)">
 <!ENTITY sync.label "同步 Adblo&amp;ck Plus 设置">
 <!ENTITY whitelist.site.label "在 ?1? 禁用 Adblock Plus">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "报告该页面上的问题 (&amp;R)">
 <!ENTITY whitelist.page.label "仅在本页禁用 Adblock Plus">
 <!ENTITY context.image.label "过滤图片(Adblock Plus)">
-<!ENTITY counthits.label "统计过滤规则生效次数 (&amp;h)">
+<!ENTITY notification.button.yes "是(&amp;Y)">
 <!ENTITY opensidebar.label "打开可过滤项目 (&amp;b)">
 <!ENTITY notification.button.close "关闭(&amp;C)">
 <!ENTITY contribute.label "助力 Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "过滤帧(Adblock Plus)">
 <!ENTITY blocked.tooltip "该页上已过滤的项目:">
-<!ENTITY hideplaceholders.label "隐藏已屏蔽元素的占位符 (&amp;l)">
+<!ENTITY counthits.label "统计过滤规则生效次数 (&amp;h)">
 <!ENTITY showinstatusbar.label "在状态栏显示 (&amp;s)">
 <!ENTITY sidebar.title "本页可过滤的项目">
 <!ENTITY options.label "选项 (&amp;O)">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/zh-CN/sendReport.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/zh-CN/sendReport.dtd
index 2b2152e..b1fe246 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/zh-CN/sendReport.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/zh-CN/sendReport.dtd
@@ -31,7 +31,7 @@
 问题报告系统来补充一个存在的讨论，如果您不提供链接，很可能没人会
 注意到您的报告。提交报告之后会提供给您自动创建的链接。">
 <!ENTITY issues.disabled.description "Adblock Plus 已禁用，当前状态下 Adblock Plus 不会屏蔽任何元素。">
-<!ENTITY attachExtensions.label "在报告中附加激活的扩展列表，用于确定附加组件冲突导致的问题 (&amp;x)">
+<!ENTITY attachExtensions.label "在报告中附加已启用扩展的列表，用于确定附加组件冲突导致的问题 (&amp;x)">
 <!ENTITY issues.nosubscriptions.add.label "添加过滤规则订阅组">
 <!ENTITY issues.disabledfilters.enable.label "启用过滤规则">
 <!ENTITY issues.override.label "设置正确，继续报告 (&amp;c)">
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/zh-TW/firstRun.properties b/data/extensions/spyblock@gnu.org/chrome/locale/zh-TW/firstRun.properties
index e0eda73..a845709 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/zh-TW/firstRun.properties
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/zh-TW/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=阻止追蹤功能才能達到真正的隱密瀏覽 - 此功能可以擺脫想監視您一舉一動的廣告商。
-firstRun_toggle_off=關閉
-firstRun_feature_tracking=停用追蹤
-firstRun_feature_malware=惡意軟體過濾
-firstRun_title=Adblock Plus 已安裝完成
 firstRun_acceptableAdsExplanation=我們想鼓勵網站改採簡樸且不過於搶眼的廣告。這也是我們之所以建立<a>嚴格的規範</a>來辨識非侵入式廣告的原因，這種類型的廣告預設會顯示出來。若您仍想阻擋所有的廣告，可以輕鬆地<a>停用此功能</a> 。
-firstRun_toggle_on=開啟
+firstRun_acceptableAdsHeadline=從現在起，煩人的廣告都將煙消雲散
 firstRun_contributor_credits=貢獻名單
 firstRun_dataCorruptionWarning=這個頁面一直跳出來嗎？ <a>請看這裡！</a>
-firstRun_acceptableAdsHeadline=從現在起，煩人的廣告都將煙消雲散
-firstRun_share=告訴您的朋友
-firstRun_share_headline=<a>請助我們一臂之力</a>，讓網路變得更美好
-firstRun_features=Adblock Plus 不只可以過濾廣告
-firstRun_feature_malware_description=過濾惡意網域可使您的瀏覽過程更加安全。
-firstRun_feature_social_description=自動擺脫如 Facebook Like 這類出現在網頁上追蹤您瀏覽習慣的社交按鈕。
 firstRun_donate=贊助
 firstRun_donate_label=支援我們的專案
+firstRun_feature_malware=惡意軟體過濾
+firstRun_feature_malware_description=過濾惡意網域可使您的瀏覽過程更加安全。
 firstRun_feature_social=移除社交媒體按鈕
+firstRun_feature_social_description=自動擺脫如 Facebook Like 這類出現在網頁上追蹤您瀏覽習慣的社交按鈕。
+firstRun_feature_tracking=停用追蹤
+firstRun_feature_tracking_description=阻止追蹤功能才能達到真正的隱密瀏覽 - 此功能可以擺脫想監視您一舉一動的廣告商。
+firstRun_features=Adblock Plus 不只可以過濾廣告
+firstRun_filterlistsReinitializedWarning=有一個問題已刪除了所有的廣告過濾器，我們也無法還原備份。因此我們得重新設置您的廣告過濾器和可接受的廣告設置。請在<a>Adblock Plus 選項</a>裡檢查您的廣告過濾器名單和可接受的廣告設置。
 firstRun_legacySafariWarning=您正在使用 Adblock Plus 所不支援的舊版 Safari。這可能影響使用者體驗或導致功能失常。我們強烈建議將 Safari 更新至 6.1.1 以上版本 (OS X 10.8 Mountain Lion 系統)，或更新至 Safari 7.0.1 (OS X 10.9 Mavericks 系統) 以上版本，或可考慮改用最新版的 Mozilla Firefox, Google Chrome 或 Opera。
-firstRun_filterlistsReinitializedWarning=It seems that an issue caused all filters to be removed and we were unable to restore a backup. Therefore we had to reset your filters and Acceptable Ads settings. Please check your filter lists and Acceptable Ads settings in the <a>Adblock Plus options</a>.
+firstRun_share=告訴您的朋友
+firstRun_share_headline=<a>請助我們一臂之力</a>，讓網路變得更美好
+firstRun_title=Adblock Plus 已安裝完成
+firstRun_toggle_off=關閉
+firstRun_toggle_on=開啟
diff --git a/data/extensions/spyblock@gnu.org/chrome/locale/zh-TW/overlay.dtd b/data/extensions/spyblock@gnu.org/chrome/locale/zh-TW/overlay.dtd
index 76a2b80..9f1a3b8 100644
--- a/data/extensions/spyblock@gnu.org/chrome/locale/zh-TW/overlay.dtd
+++ b/data/extensions/spyblock@gnu.org/chrome/locale/zh-TW/overlay.dtd
@@ -1,4 +1,3 @@
-<!ENTITY notification.button.yes "&amp;確定">
 <!ENTITY notification.button.no "&amp;取消">
 <!ENTITY sync.label "同步 Adblo&amp;ck Plus 設定值">
 <!ENTITY whitelist.site.label "在 ?1? 停用">
@@ -11,14 +10,14 @@
 <!ENTITY sendReport.label "回報此頁面錯誤 (&amp;R)">
 <!ENTITY whitelist.page.label "只在此頁面停用">
 <!ENTITY context.image.label "Adblock Plus：阻擋圖片">
-<!ENTITY counthits.label "計算條件命中次數 (&amp;h)">
+<!ENTITY notification.button.yes "&amp;確定">
 <!ENTITY opensidebar.label "開啟可阻擋項目 (&amp;b)">
 <!ENTITY notification.button.close "&amp;關閉">
 <!ENTITY contribute.label "贊助 Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus：阻擋頁框">
 <!ENTITY blocked.tooltip "此頁已阻擋項目:">
-<!ENTITY hideplaceholders.label "隱藏已阻擋元素所佔用的空間 (&amp;l)">
+<!ENTITY counthits.label "計算條件命中次數 (&amp;h)">
 <!ENTITY showinstatusbar.label "在狀態列顯示 (&amp;s)">
 <!ENTITY sidebar.title "本頁可阻擋項目">
 <!ENTITY options.label "選項 (&amp;O)">
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/abp-icon-big.png b/data/extensions/spyblock@gnu.org/chrome/skin/abp-icon-big.png
deleted file mode 100644
index 85cce1c..0000000
Binary files a/data/extensions/spyblock@gnu.org/chrome/skin/abp-icon-big.png and /dev/null differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/abp-status-16.png b/data/extensions/spyblock@gnu.org/chrome/skin/abp-status-16.png
index c3abf18..27339c7 100644
Binary files a/data/extensions/spyblock@gnu.org/chrome/skin/abp-status-16.png and b/data/extensions/spyblock@gnu.org/chrome/skin/abp-status-16.png differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/abp-status-32.png b/data/extensions/spyblock@gnu.org/chrome/skin/abp-status-32.png
index da2a318..7d98d62 100644
Binary files a/data/extensions/spyblock@gnu.org/chrome/skin/abp-status-32.png and b/data/extensions/spyblock@gnu.org/chrome/skin/abp-status-32.png differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/abp-status.png b/data/extensions/spyblock@gnu.org/chrome/skin/abp-status.png
index a1c4e0b..e7ecf24 100644
Binary files a/data/extensions/spyblock@gnu.org/chrome/skin/abp-status.png and b/data/extensions/spyblock@gnu.org/chrome/skin/abp-status.png differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/ajax-loader.gif b/data/extensions/spyblock@gnu.org/chrome/skin/ajax-loader.gif
deleted file mode 100644
index a642494..0000000
Binary files a/data/extensions/spyblock@gnu.org/chrome/skin/ajax-loader.gif and /dev/null differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/background-main.png b/data/extensions/spyblock@gnu.org/chrome/skin/background-main.png
deleted file mode 100644
index 464a997..0000000
Binary files a/data/extensions/spyblock@gnu.org/chrome/skin/background-main.png and /dev/null differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/background-share.png b/data/extensions/spyblock@gnu.org/chrome/skin/background-share.png
deleted file mode 100644
index b572b56..0000000
Binary files a/data/extensions/spyblock@gnu.org/chrome/skin/background-share.png and /dev/null differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/background.png b/data/extensions/spyblock@gnu.org/chrome/skin/background.png
deleted file mode 100644
index bb19387..0000000
Binary files a/data/extensions/spyblock@gnu.org/chrome/skin/background.png and /dev/null differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/composer.css b/data/extensions/spyblock@gnu.org/chrome/skin/composer.css
index da75ba4..d80eafe 100644
--- a/data/extensions/spyblock@gnu.org/chrome/skin/composer.css
+++ b/data/extensions/spyblock@gnu.org/chrome/skin/composer.css
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/donate.png b/data/extensions/spyblock@gnu.org/chrome/skin/donate.png
deleted file mode 100644
index 3e77b37..0000000
Binary files a/data/extensions/spyblock@gnu.org/chrome/skin/donate.png and /dev/null differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/features/malware.png b/data/extensions/spyblock@gnu.org/chrome/skin/features/malware.png
deleted file mode 100644
index 9b51b63..0000000
Binary files a/data/extensions/spyblock@gnu.org/chrome/skin/features/malware.png and /dev/null differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/features/social.png b/data/extensions/spyblock@gnu.org/chrome/skin/features/social.png
deleted file mode 100644
index a2af1ea..0000000
Binary files a/data/extensions/spyblock@gnu.org/chrome/skin/features/social.png and /dev/null differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/features/tracking.png b/data/extensions/spyblock@gnu.org/chrome/skin/features/tracking.png
deleted file mode 100644
index a8727a9..0000000
Binary files a/data/extensions/spyblock@gnu.org/chrome/skin/features/tracking.png and /dev/null differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/filters.css b/data/extensions/spyblock@gnu.org/chrome/skin/filters.css
index a4ea586..3576315 100644
--- a/data/extensions/spyblock@gnu.org/chrome/skin/filters.css
+++ b/data/extensions/spyblock@gnu.org/chrome/skin/filters.css
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/firstRun.css b/data/extensions/spyblock@gnu.org/chrome/skin/firstRun.css
deleted file mode 100644
index 7a02ad6..0000000
--- a/data/extensions/spyblock@gnu.org/chrome/skin/firstRun.css
+++ /dev/null
@@ -1,588 +0,0 @@
-/*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
- *
- * Adblock Plus is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * Adblock Plus is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-@font-face {
-  font-family: 'CreteRound';
-  font-style: normal;
-  src: url(fonts/CreteRound-Regular.otf);
-  src: local ('Ø'),
-  /*local ('Ø') forces using no local font called CreteRound*/
-  url(fonts/CreteRound-Regular.otf) format('otf');
-}
-
-@font-face {
-  font-family: 'CreteRound';
-  font-style: italic;
-  src: url(fonts/CreteRound-Italic.otf);
-  src: local ('Ø'),
-  /*local ('Ø') forces using no local font called CreteRound*/
-  url(fonts/CreteRound-Italic.otf) format('otf');
-}
-
-body
-{
-  font-family: Helvetica, Arial, sans-serif;
-  font-size: 15px;
-  line-height: 140%;
-  color: #7f776b;
-  background-color: #f8f6f2;
-  background-image: url(background-main.png);
-  margin: 0;
-  padding: 0;
-}
-
-a, a:link, a:visited
-{
-  color: #5a84b3;
-  text-decoration: underline;
-}
-
-a:hover
-{
-  text-decoration: none;
-}
-
-button
-{
-  cursor: pointer;
-}
-
-ul
-{
-  margin: 0;
-  padding: 0;
-}
-
-li
-{
-  margin: 0;
-  padding: 0;
-  list-style-type: none;
-}
-
-header
-{
-  background-image: url(background.png);
-  background-repeat: repeat-x;
-  width: 100%;
-  padding: 40px 0 0 0;
-}
-
-header h1
-{
-  font-size: 24px;
-  font-weight: normal;
-  color: #57ab5b;
-  text-align: center;
-  margin: 21px auto;
-  padding: 16px 0 14px 0;
-  border: 1px #57ab5b;
-  border-style: dashed none;
-  /* border parallel fix - 957px is the value
-   * closest to 960px(page width) which makes
-   * the dashed border parallel
-   */
-  max-width: 957px;
-}
-
-h1,h2,h3
-{
- font-family: CreteRound, Helvetica, Arial, sans-serif;
-}
-
-h2
-{
-  font-size: 26px;
-  font-weight: lighter;
-  color: #968d81;
-  line-height: 28px;
-  text-align: center;
-  margin: 0;
-  padding: 0;
-}
-
-h3
-{
-  font-size: 22px;
-  color: #7F776B;
-  font-weight: normal;
-  margin: 0 0 10px 0;
-  padding: 0;
-  line-height: 24px;
-}
-
-h4
-{
-  font-size: 15px;
-  color: #7f776b;
-  font-weight: normal;
-  text-align: center;
-  margin: 0;
-  padding: 0;
-}
-
-section
-{
-  margin: 0 auto;
-  margin-bottom: 30px;
-  max-width: 760px;
-  background-image: url(background.png);
-  padding: 40px 100px;
-}
-
-section > p
-{
-  margin: 15px 0 0 0;
-}
-
-#logo
-{
-  margin: 0 auto;
-  height: 100px;
-  width: 99px;
-  display: block;
-  background-image: url(abp-icon-big.png);
-  background-repeat: no-repeat;
-}
-
-#can-do-more
-{
-  max-width: 960px;
-  padding: 40px 0px 0px 0px;
-  border-bottom: 4px solid #968D81;
-}
-
-#can-do-more > h2
-{
-  margin: 0 100px;
-}
-
-.feature-malware-image
-{
-  background-image: url(features/malware.png);
-  background-repeat: no-repeat;
-}
-
-.feature-social-image
-{
-  background-image: url(features/social.png);
-  background-repeat: no-repeat;
-}
-
-.feature-tracking-image
-{
-  background-image: url(features/tracking.png);
-  background-repeat: no-repeat;
-}
-
-#can-do-more-content
-{
-  margin: 30px 100px 20px 100px;
-}
-
-#can-do-more #features
-{
-  border-spacing: 10px;
-  margin: 0px;
-  padding: 0px;
-}
-
-#can-do-more .feature:not([hidden])
-{
-  display: block;
-  list-style-type: none;
-  padding: 30px 0;
-  padding-bottom: 20px;
-  border-top: 1px dashed #c0bebb;
-}
-
-#can-do-more .feature-image, #can-do-more .feature-description
-{
-  display: inline-block;
-  *display: inline; /* IE6 inline-block fix */
-  *zoom: 1;
-  vertical-align: top;
-}
-
-#can-do-more .feature-description
-{
-  margin: 0px 0px 0 20px;
-  width: 625px;
-  max-width: 85%;
-}
-
-#can-do-more .feature-description-textblock
-{
-  width: 480px;
-  max-width: 100%;
-  margin: 0 40px 0 0;
-  display: inline-block;
-}
-
-#can-do-more .feature-description-textblock > span
-{
-  margin: 15px 0 0 0;
-}
-
-#can-do-more .feature-image
-{
-  width: 59px;
-  height: 59px;
-  margin: 8px 0 10px 20px;
-}
-
-#share
-{
-  background-image: url(background-share.png);
-  padding: 50px 100px 40px 100px;
-  max-width: 760px;
-  text-align: center;
-  font-family: CreteRound, Helvetica, Arial, sans-serif;
-}
-
-#share h2
-{
-  color: #fff;
-  margin: 0 0 30px 0;
-}
-
-#share h2 > a
-{
-  color: #fff;
-}
-
-#share h2 > a:hover
-{
-  color: #2e5075;
-}
-
-#share span
-{
-  color: #bed1e6;
-  text-align: center;
-  line-height: 34px;
-  font-size: 22px;
-  display: block;
-}
-
-#donate:hover, .share-buttons a:hover
-{
-  box-shadow: 0px 0px 0px 2px #8ca7c4;
-  border-radius: 30px;
-}
-
-#donate-block span, #share-block span
-{
-  margin: 10px 20px 0px 20px;
-}
-
-#donate-block, #share-block
-{
-  min-width: 250px;
-  display: inline-block;
-  vertical-align: top;
-  padding: 5px 0 5px 0;
-}
-
-#donate-block
-{
-  border: 1px dashed #37506d;
-  border-style: none dashed;
-  width: 50%;
-}
-
-#share-block
-{
-  border-right: 1px dashed #37506d;
-  width: 49%;
-}
-
-.share-buttons
-{
-  margin: 6px 0 0 0;
-  cursor: pointer;
-  vertical-align: top;
-  /* because inline block creates
-   * space if not captured with
-   * font-size and line-height 0px
-   */
-  font-size: 0px;
-  line-height: 0px;
-}
-
-.share-buttons > a
-{
-  width: 50px;
-  height: 50px;
-  margin: 0 8px;
-  text-decoration: none;
-  display: inline-block;
-}
-
-#share-general,
-:root[lang^="zh-"] #share-chinese
-{
-  display: block;
-}
-
-:root[lang^="zh-"] #share-general,
-#share-chinese
-{
-  display: none;
-}
-
-#share-chinese > a
-{
-  border-bottom: 2px solid transparent;
-}
-
-#share-chinese > a:hover
-{
-  box-shadow: none;
-  border-radius: 0;
-  border-bottom: 2px solid #8CA7C4;
-}
-
-#share-facebook
-{
-  background-image: url(social/facebook.png);
-  background-repeat: no-repeat;
-}
-
-#share-twitter
-{
-  background-image: url(social/twitter.png);
-  background-repeat: no-repeat;
-}
-
-#share-gplus
-{
-  background-image: url(social/googleplus.png);
-  background-repeat: no-repeat;
-}
-
-#share-renren
-{
-  background-image: url(social/renren.png);
-  background-repeat: no-repeat;
-}
-
-#share-weibo
-{
-  background-image: url(social/weibo.png);
-  background-repeat: no-repeat;
-}
-
-.warning
-{
-  font-size: 160%;
-  border: 3px dashed red;
-  text-align: center;
-  line-height: 1.3em;
-}
-
-#social ul
-{
-  list-style: none;
-  display: inline-block;
-  padding: 0;
-  margin: 0;
-}
-
-#social:hover h1
-{
-  opacity: 0;
-}
-
-#social ul:hover li {
-  opacity: 0.3;
-}
-
-#social ul li
-{
-  display: inline-block;
-  margin: 0px 5px;
-  -webkit-transition: opacity .5s ease, bottom .3s ease;
-  transition: opacity .5s ease, bottom .3s ease;
-  position: relative;
-  bottom: -30px;
-}
-
-#social ul li:hover
-{
-  opacity: 1.0;
-  bottom: 0px;
-}
-
-.share-button
-{
-  display: inline-block;
-  width: 82px;
-  height: 82px;
-}
-
-#glass-pane, #share-popup
-{
-  visibility: hidden;
-  opacity: 0;
-  -webkit-transition-property: opacity;
-  transition-property: opacity;
-}
-
-#glass-pane
-{
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  background: rgba(0, 0, 0, 0.5) url(ajax-loader.gif) no-repeat 50% 50%;
-  z-index: 101;
-  -webkit-transition-duration: 0.2s;
-  transition-duration: 0.2s;
-}
-
-#share-popup
-{
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  border: none;
-  -webkit-transition-delay: 0.1s;
-  transition-delay: 0.1s;
-}
-
-#glass-pane.visible, #share-popup.visible
-{
-  visibility: visible;
-  opacity: 1;
-}
-
-#share-popup.visible
-{
-  -webkit-transition-duration: 0.15s;
-  transition-duration: 0.15s;
-}
-
-.toggle
-{
-  cursor: pointer;
-  position: relative;
-  display: inline-block;
-  vertical-align: top;
-  height: 22px;
-  margin: 32px 0px 7px 0px;
-  border-radius: 9999px;
-  border: 1px solid #999;
-  overflow: hidden;
-  -moz-user-select: none;
-  -webkit-user-select: none;
-  user-select: none;
-}
-
-.toggle:hover
-{
-  box-shadow: 0px 0px 3px 0px #968d81;
-}
-
-.toggle:active
-{
-  cursor: wait;
-}
-
-.toggle-on, .toggle-off
-{
-  min-width: 42px;
-  height: 100%;
-  font-size: 11px;
-  font-weight: 500;
-  text-align: center;
-  line-height: 23px;
-  border-radius: 9999px;
-}
-
-.toggle-on
-{
-  padding: 0px 30px 0px 10px;
-  color: rgba(255,255,255, 0.8);
-  text-shadow: 1px 1px rgba(0,0,0,0.2);
-  box-shadow: inset 2px 2px 6px rgba(0,0,0,0.2);
-  background: rgb(69,163,31);
-}
-
-.toggle-off
-{
-  padding: 0px 10px 0px 30px;
-  color: rgba(0,0,0,0.6);
-  text-shadow: 1px 1px rgba(255,255,255,0.2);
-  background: #cfcfcf;
-  background: -moz-linear-gradient(top,  #cfcfcf 0%, #f5f5f5 100%);
-  background: -webkit-linear-gradient(top,  #cfcfcf 0%,#f5f5f5 100%);
-  background: linear-gradient(to bottom,  #cfcfcf 0%,#f5f5f5 100%);
-}
-
-.toggle-blob
-{
-  position: absolute;
-  top: 0px;
-  right: 0px;
-  height: 100%;
-  width: 22px;
-  border-radius: 50px;
-  background: #cfcfcf;
-  background: -moz-linear-gradient(bottom,  #cfcfcf 0%, #f5f5f5 100%);
-  background: -webkit-linear-gradient(bottom,  #cfcfcf 0%,#f5f5f5 100%);
-  background: linear-gradient(to top,  #cfcfcf 0%,#f5f5f5 100%);
-  box-shadow: 1px 1px 2px #888;
-}
-
-.off .toggle-on
-{
-  margin-top: -22px;
-}
-
-.off .toggle-blob
-{
-  left: 0px;
-  right: auto;
-}
-
-#donate
-{
-  height: 21px;
-  display: inline-block;
-  margin: 15px 0px 2px 0px;
-  font-size: 16px;
-  color: #003366;
-  cursor: pointer;
-  font-weight: bold;
-  padding: 5px 18px;
-  text-decoration: none;
-  border-radius: 20px;
-  border: 1px solid #FF9933;
-  overflow: hidden;
-  font-family: arial, sans-serif;
-  background-image: url(donate.png);
-  background-repeat: repeat-x;
-}
-
-footer
-{
-  margin: 0 auto 30px;
-  max-width: 960px;
-  text-align: center;
-}
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/fonts/CreteRound-Italic.otf b/data/extensions/spyblock@gnu.org/chrome/skin/fonts/CreteRound-Italic.otf
deleted file mode 100644
index 169bced..0000000
Binary files a/data/extensions/spyblock@gnu.org/chrome/skin/fonts/CreteRound-Italic.otf and /dev/null differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/fonts/CreteRound-Regular.otf b/data/extensions/spyblock@gnu.org/chrome/skin/fonts/CreteRound-Regular.otf
deleted file mode 100644
index d951855..0000000
Binary files a/data/extensions/spyblock@gnu.org/chrome/skin/fonts/CreteRound-Regular.otf and /dev/null differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/overlay.css b/data/extensions/spyblock@gnu.org/chrome/skin/overlay.css
index 0f58a15..dca1b46 100644
--- a/data/extensions/spyblock@gnu.org/chrome/skin/overlay.css
+++ b/data/extensions/spyblock@gnu.org/chrome/skin/overlay.css
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/sendReport.css b/data/extensions/spyblock@gnu.org/chrome/skin/sendReport.css
index 53768f9..9410880 100644
--- a/data/extensions/spyblock@gnu.org/chrome/skin/sendReport.css
+++ b/data/extensions/spyblock@gnu.org/chrome/skin/sendReport.css
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/sidebar.css b/data/extensions/spyblock@gnu.org/chrome/skin/sidebar.css
index abad956..ba511d5 100644
--- a/data/extensions/spyblock@gnu.org/chrome/skin/sidebar.css
+++ b/data/extensions/spyblock@gnu.org/chrome/skin/sidebar.css
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/social/facebook.png b/data/extensions/spyblock@gnu.org/chrome/skin/social/facebook.png
deleted file mode 100644
index f45c417..0000000
Binary files a/data/extensions/spyblock@gnu.org/chrome/skin/social/facebook.png and /dev/null differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/social/googleplus.png b/data/extensions/spyblock@gnu.org/chrome/skin/social/googleplus.png
deleted file mode 100644
index 53e6819..0000000
Binary files a/data/extensions/spyblock@gnu.org/chrome/skin/social/googleplus.png and /dev/null differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/social/renren.png b/data/extensions/spyblock@gnu.org/chrome/skin/social/renren.png
deleted file mode 100644
index e9af994..0000000
Binary files a/data/extensions/spyblock@gnu.org/chrome/skin/social/renren.png and /dev/null differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/social/twitter.png b/data/extensions/spyblock@gnu.org/chrome/skin/social/twitter.png
deleted file mode 100644
index fec913a..0000000
Binary files a/data/extensions/spyblock@gnu.org/chrome/skin/social/twitter.png and /dev/null differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/social/weibo.png b/data/extensions/spyblock@gnu.org/chrome/skin/social/weibo.png
deleted file mode 100644
index 176a628..0000000
Binary files a/data/extensions/spyblock@gnu.org/chrome/skin/social/weibo.png and /dev/null differ
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/subscriptionSelection.css b/data/extensions/spyblock@gnu.org/chrome/skin/subscriptionSelection.css
index 8ed7c24..44c3080 100644
--- a/data/extensions/spyblock@gnu.org/chrome/skin/subscriptionSelection.css
+++ b/data/extensions/spyblock@gnu.org/chrome/skin/subscriptionSelection.css
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff --git a/data/extensions/spyblock@gnu.org/defaults/prefs.js b/data/extensions/spyblock@gnu.org/defaults/prefs.js
index 2df1e3e..655f714 100644
--- a/data/extensions/spyblock@gnu.org/defaults/prefs.js
+++ b/data/extensions/spyblock@gnu.org/defaults/prefs.js
@@ -30,9 +30,10 @@ pref("extensions.adblockplus.composer_default", 2);
 pref("extensions.adblockplus.clearStatsOnHistoryPurge", true);
 pref("extensions.adblockplus.report_submiturl", "https://reports.adblockplus.org/submitReport?version=1&guid=%GUID%&lang=%LANG%");
 pref("extensions.adblockplus.recentReports", []);
-pref("extensions.adblockplus.hideContributeButton", true);
+pref("extensions.adblockplus.hideContributeButton", false);
 pref("extensions.adblockplus.blockableItemsSize", {width: 200, height: 200});
 pref("extensions.adblockplus.notificationurl", "https://notification.adblockplus.org/notification.json");
 pref("extensions.adblockplus.notificationdata", {});
 pref("extensions.adblockplus.subscriptions_antiadblockurl", "https://easylist-downloads.adblockplus.org/antiadblockfilters.txt");
 pref("extensions.adblockplus.please_kill_startup_performance", false);
+pref("extensions.adblockplus.suppress_first_run_page", false);
diff --git a/data/extensions/spyblock@gnu.org/icon.png b/data/extensions/spyblock@gnu.org/icon.png
index 9db9e39..4bb73bf 100644
Binary files a/data/extensions/spyblock@gnu.org/icon.png and b/data/extensions/spyblock@gnu.org/icon.png differ
diff --git a/data/extensions/spyblock@gnu.org/icon64.png b/data/extensions/spyblock@gnu.org/icon64.png
index a8dcad6..5735fd3 100644
Binary files a/data/extensions/spyblock@gnu.org/icon64.png and b/data/extensions/spyblock@gnu.org/icon64.png differ
diff --git a/data/extensions/spyblock@gnu.org/install.rdf b/data/extensions/spyblock@gnu.org/install.rdf
index e88421e..86364d9 100644
--- a/data/extensions/spyblock@gnu.org/install.rdf
+++ b/data/extensions/spyblock@gnu.org/install.rdf
@@ -1,31 +1,18 @@
 <?xml version="1.0"?>
 
-<!--
-  - This file is part of the Adblock Plus build tools,
-  - Copyright (C) 2006-2014 Eyeo GmbH
-  -
-  - Adblock Plus is free software: you can redistribute it and/or modify
-  - it under the terms of the GNU General Public License version 3 as
-  - published by the Free Software Foundation.
-  -
-  - Adblock Plus is distributed in the hope that it will be useful,
-  - but WITHOUT ANY WARRANTY; without even the implied warranty of
-  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  - GNU General Public License for more details.
-  -
-  - You should have received a copy of the GNU General Public License
-  - along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
-  -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>spyblock@gnu.org</em:id>
-    <em:version>2.6.3.0</em:version>
+    <em:version>2.6.9.0</em:version>
     <em:name>SpyBlock</em:name>
     <em:description>Privacy blacklist filter</em:description>
-    <em:creator>Based on AdBlock Plus by Wladimir Palant</em:creator><em:contributor>Claude Lespagnol aka Efdur</em:contributor><em:contributor>Nickolay Ponomarev</em:contributor><em:contributor>Kevin Keller</em:contributor><em:contributor>Fabrice Desré</em:contributor><em:contributor>Hubird</em:contributor><em:contributor>Günther Beyer (opoloo.de)</em:contributor><em:contributor>Algimantas Margevičius</em:contributor><em:contributor>anonymous74100</em:contributor><em:contributor>BsT</em:contributor><em:contributor>Crits</em:contributor><em:contributor>Famlam</em:contributor><em:contributor>fanboy</em:contributor><em:contributor>heradhis</em:contributor><em:contributor>Jiefei</em:contributor><em:contributor>John</em:contributor><em:contributor>Khrin</em:contributor><em:contributor>Lain_13</em:contributor><em:contributor>Li</em:contributor><em:contributor>Lian</em:contributor><em:contributor>MenetZ</em:contributor><em:contributor>MonztA</em:contributor><em:contributor>None</em:contributor><em:contributor>smed79</em:contributor><em:contributor>tomasko126</em:contributor><em:contributor>Zoso</em:contributor><em:contributor>Александър Станев</em:contributor>
+    <em:creator>Based on AdBlock Plus by Wladimir Palant</em:creator><em:contributor>Ruben Rodriguez</em:contributor><em:contributor>Claude Lespagnol aka Efdur</em:contributor><em:contributor>Nickolay Ponomarev</em:contributor><em:contributor>Kevin Keller</em:contributor><em:contributor>Fabrice Desré</em:contributor><em:contributor>Hubird</em:contributor><em:contributor>Günther Beyer (opoloo.de)</em:contributor><em:contributor>Algimantas Margevičius</em:contributor><em:contributor>anonymous74100</em:contributor><em:contributor>BsT</em:contributor><em:contributor>Crits</em:contributor><em:contributor>Famlam</em:contributor><em:contributor>fanboy</em:contributor><em:contributor>heradhis</em:contributor><em:contributor>Jiefei</em:contributor><em:contributor>John</em:contributor><em:contributor>Khrin</em:contributor><em:contributor>Lain_13</em:contributor><em:contributor>Li</em:contributor><em:contributor>Lian</em:contributor><em:contributor>MenetZ</em:contributor><em:contributor>MonztA</em:contributor><em:contributor>smed79</em:contributor><em:contributor>tomasko126</em:contributor><em:contributor>Zoso</em:contributor><em:contributor>Александър Станев</em:contributor>
     <em:homepageURL>https://www.gnu.org/software/gnuzilla/</em:homepageURL>
     <em:type>2</em:type>
     <em:bootstrap>true</em:bootstrap>
@@ -37,7 +24,7 @@
         <!-- fennec2 -->
         <em:id>{aa3c5121-dab2-40e2-81ca-7ea25febc110}</em:id>
         <em:minVersion>22.0</em:minVersion>
-        <em:maxVersion>33.0</em:maxVersion>
+        <em:maxVersion>39.0</em:maxVersion>
       </Description>
     </em:targetApplication>
     <em:targetApplication>
@@ -45,7 +32,7 @@
         <!-- firefox -->
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>22.0</em:minVersion>
-        <em:maxVersion>33.0</em:maxVersion>
+        <em:maxVersion>39.0</em:maxVersion>
       </Description>
     </em:targetApplication>
     <em:targetApplication>
@@ -53,7 +40,7 @@
         <!-- seamonkey -->
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
         <em:minVersion>2.19</em:minVersion>
-        <em:maxVersion>2.30</em:maxVersion>
+        <em:maxVersion>2.36</em:maxVersion>
       </Description>
     </em:targetApplication>
     <em:targetApplication>
@@ -61,7 +48,7 @@
         <!-- thunderbird -->
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
         <em:minVersion>22.0</em:minVersion>
-        <em:maxVersion>33.0</em:maxVersion>
+        <em:maxVersion>39.0</em:maxVersion>
       </Description>
     </em:targetApplication>
     <em:targetApplication>
@@ -69,7 +56,7 @@
         <!-- toolkit -->
         <em:id>toolkit@mozilla.org</em:id>
         <em:minVersion>22.0</em:minVersion>
-        <em:maxVersion>33.0</em:maxVersion>
+        <em:maxVersion>39.0</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>
diff --git a/data/extensions/spyblock@gnu.org/lib/Public.jsm b/data/extensions/spyblock@gnu.org/lib/Public.jsm
index 0f96bcb..ddd2389 100644
--- a/data/extensions/spyblock@gnu.org/lib/Public.jsm
+++ b/data/extensions/spyblock@gnu.org/lib/Public.jsm
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff --git a/data/extensions/spyblock@gnu.org/lib/antiadblockInit.js b/data/extensions/spyblock@gnu.org/lib/antiadblockInit.js
index d8b29ca..d4ef326 100644
--- a/data/extensions/spyblock@gnu.org/lib/antiadblockInit.js
+++ b/data/extensions/spyblock@gnu.org/lib/antiadblockInit.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -46,10 +46,17 @@ exports.initAntiAdblockNotification = function initAntiAdblockNotification()
   {
     let urlFilters = [];
     for (let filter of subscription.filters)
+    {
       if (filter instanceof ActiveFilter)
+      {
         for (let domain in filter.domains)
-          if (domain && urlFilters.indexOf(domain) == -1)
-            urlFilters.push(domain);
+        {
+          let urlFilter = "||" + domain + "^";
+          if (domain && filter.domains[domain] && urlFilters.indexOf(urlFilter) == -1)
+            urlFilters.push(urlFilter);
+        }
+      }
+    }
     notification.urlFilters = urlFilters;
     Notification.addNotification(notification);
     Notification.addQuestionListener(notification.id, notificationListener);
diff --git a/data/extensions/spyblock@gnu.org/lib/appSupport.js b/data/extensions/spyblock@gnu.org/lib/appSupport.js
index 67c6248..992d568 100644
--- a/data/extensions/spyblock@gnu.org/lib/appSupport.js
+++ b/data/extensions/spyblock@gnu.org/lib/appSupport.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -359,6 +359,14 @@ switch (application)
         return (browser ? browser.currentURI : null);
       }
     };
+    
+    // for Seamonkey we have to ignore same document flag because of
+    // bug #1035171 (https://bugzilla.mozilla.org/show_bug.cgi?id=1035171)
+    let origAddBrowserLocationListener = exports.addBrowserLocationListener;
+    exports.addBrowserLocationListener = function sm_addBrowserLocationListener(window, callback, ignoreSameDoc)
+    {
+      origAddBrowserLocationListener(window, callback, false);
+    };
 
     exports.contentContextMenu = ["contentAreaContextMenu", "mailContext"];
 
@@ -694,7 +702,11 @@ switch (application)
       this.window = window;
       this.callback = callback;
       this.onSelect = this.onSelect.bind(this);
-      this.attach();
+      this.attach = this.attach.bind(this);
+      if (window.BrowserApp.deck)
+        this.attach();
+      else
+        window.addEventListener("UIReady", this.attach, false);
     };
     BrowserChangeListener.prototype = {
       window: null,
@@ -722,8 +734,8 @@ switch (application)
 
       attach: function()
       {
+        this.window.removeEventListener("UIReady", this.attach, false);
         this.onSelect();
-
         this.window.BrowserApp.deck.addEventListener("TabSelect", this.onSelect, false);
       },
       detach: function()
diff --git a/data/extensions/spyblock@gnu.org/lib/contentPolicy.js b/data/extensions/spyblock@gnu.org/lib/contentPolicy.js
index 084ebc5..4f2247e 100644
--- a/data/extensions/spyblock@gnu.org/lib/contentPolicy.js
+++ b/data/extensions/spyblock@gnu.org/lib/contentPolicy.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -22,7 +22,6 @@
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-let {TimeLine} = require("timeline");
 let {Utils} = require("utils");
 let {Prefs} = require("prefs");
 let {FilterStorage} = require("filterStorage");
@@ -90,8 +89,6 @@ let Policy = exports.Policy =
    */
   init: function()
   {
-    TimeLine.enter("Entered content policy initialization");
-
     // type constant by type description and type description by type constant
     let iface = Ci.nsIContentPolicy;
     for (let typeName of contentTypes)
@@ -120,12 +117,8 @@ let Policy = exports.Policy =
     for (let scheme of Prefs.whitelistschemes.toLowerCase().split(" "))
       this.whitelistSchemes[scheme] = true;
 
-    TimeLine.log("done initializing types");
-
     // Generate class identifier used to collapse node and register corresponding
     // stylesheet.
-    TimeLine.log("registering global stylesheet");
-
     let offset = "a".charCodeAt(0);
     for (let i = 0; i < 20; i++)
       collapsedClass +=  String.fromCharCode(offset + Math.random() * 26);
@@ -137,10 +130,7 @@ let Policy = exports.Policy =
     onShutdown.add(function()
     {
       Utils.styleService.unregisterSheet(collapseStyle, Ci.nsIStyleSheetService.USER_SHEET);
-    })
-    TimeLine.log("done registering stylesheet");
-
-    TimeLine.leave("Done initializing content policy");
+    });
   },
 
   /**
@@ -160,44 +150,25 @@ let Policy = exports.Policy =
 
     let privatenode=false;
     Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
-    if (PrivateBrowsingUtils.isWindowPrivate(wnd))
+    if (PrivateBrowsingUtils.isContentWindowPrivate(wnd))
       privatenode=true;
 
     let originWindow = Utils.getOriginWindow(wnd);
     let wndLocation = originWindow.location.href;
     let docDomain = getHostname(wndLocation);
     let match = null;
+    let [sitekey, sitekeyWnd] = getSitekey(wnd);
     if (!match && Prefs.enabled)
     {
       let testWnd = wnd;
+      let testSitekey = sitekey;
+      let testSitekeyWnd = sitekeyWnd;
       let parentWndLocation = getWindowLocation(testWnd);
       while (true)
       {
         let testWndLocation = parentWndLocation;
         parentWndLocation = (testWnd == testWnd.parent ? testWndLocation : getWindowLocation(testWnd.parent));
-        match = Policy.isWhitelisted(testWndLocation, parentWndLocation);
-
-        if (!(match instanceof WhitelistFilter))
-        {
-          let keydata = (testWnd.document && testWnd.document.documentElement ? testWnd.document.documentElement.getAttribute("data-adblockkey") : null);
-          if (keydata && keydata.indexOf("_") >= 0)
-          {
-            let [key, signature] = keydata.split("_", 2);
-            let keyMatch = defaultMatcher.matchesByKey(testWndLocation, key.replace(/=/g, ""), docDomain);
-            if (keyMatch && Utils.crypto)
-            {
-              // Website specifies a key that we know but is the signature valid?
-              let uri = Services.io.newURI(testWndLocation, null, null);
-              let params = [
-                uri.path.replace(/#.*/, ""),  // REQUEST_URI
-                uri.asciiHost,                // HTTP_HOST
-                Utils.httpProtocol.userAgent  // HTTP_USER_AGENT
-              ];
-              if (Utils.verifySignature(key, signature, params.join("\0")))
-                match = keyMatch;
-            }
-          }
-        }
+        match = Policy.isWhitelisted(testWndLocation, parentWndLocation, testSitekey);
 
         if (match instanceof WhitelistFilter)
         {
@@ -208,8 +179,10 @@ let Policy = exports.Policy =
 
         if (testWnd.parent == testWnd)
           break;
-        else
-          testWnd = testWnd.parent;
+
+        if (testWnd == testSitekeyWnd)
+          [testSitekey, testSitekeyWnd] = getSitekey(testWnd.parent);
+        testWnd = testWnd.parent;
       }
     }
 
@@ -231,7 +204,7 @@ let Policy = exports.Policy =
         let testWndLocation = parentWndLocation;
         parentWndLocation = (testWnd == testWnd.parent ? testWndLocation : getWindowLocation(testWnd.parent));
         let parentDocDomain = getHostname(parentWndLocation);
-        match = defaultMatcher.matchesAny(testWndLocation, "ELEMHIDE", parentDocDomain, false);
+        match = defaultMatcher.matchesAny(testWndLocation, "ELEMHIDE", parentDocDomain, false, sitekey);
         if (match instanceof WhitelistFilter)
         {
           FilterStorage.increaseHitCount(match, wnd);
@@ -256,7 +229,7 @@ let Policy = exports.Policy =
       if (exception)
       {
         FilterStorage.increaseHitCount(exception, wnd);
-        RequestNotifier.addNodeData(node, topWnd, contentType, docDomain, thirdParty, locationText, exception);
+        RequestNotifier.addNodeData(node, topWnd, contentType, docDomain, false, locationText, exception);
         return true;
       }
     }
@@ -265,7 +238,7 @@ let Policy = exports.Policy =
 
     if (!match && Prefs.enabled)
     {
-      match = defaultMatcher.matchesAny(locationText, Policy.typeDescr[contentType] || "", docDomain, thirdParty, privatenode);
+      match = defaultMatcher.matchesAny(locationText, Policy.typeDescr[contentType] || "", docDomain, thirdParty, sitekey, privatenode);
       if (match instanceof BlockingFilter && node.ownerDocument && !(contentType in Policy.nonVisual))
       {
         let prefCollapse = (match.collapse != null ? match.collapse : !Prefs.fastcollapse);
@@ -303,9 +276,10 @@ let Policy = exports.Policy =
    * Checks whether a page is whitelisted.
    * @param {String} url
    * @param {String} [parentUrl] location of the parent page
+   * @param {String} [sitekey] public key provided on the page
    * @return {Filter} filter that matched the URL or null if not whitelisted
    */
-  isWhitelisted: function(url, parentUrl)
+  isWhitelisted: function(url, parentUrl, sitekey)
   {
     if (!url)
       return null;
@@ -323,12 +297,12 @@ let Policy = exports.Policy =
     if (index >= 0)
       url = url.substring(0, index);
 
-    let result = defaultMatcher.matchesAny(url, "DOCUMENT", getHostname(parentUrl), false);
+    let result = defaultMatcher.matchesAny(url, "DOCUMENT", getHostname(parentUrl), false, sitekey);
     return (result instanceof WhitelistFilter ? result : null);
   },
 
   /**
-   * Checks whether the page loaded in a window is whitelisted.
+   * Checks whether the page loaded in a window is whitelisted for indication in the UI.
    * @param wnd {nsIDOMWindow}
    * @return {Filter} matching exception rule or null if not whitelisted
    */
@@ -337,11 +311,12 @@ let Policy = exports.Policy =
     return Policy.isWhitelisted(getWindowLocation(wnd));
   },
 
-
   /**
    * Asynchronously re-checks filters for given nodes.
+   * @param {Node[]} nodes
+   * @param {RequestEntry} entry
    */
-  refilterNodes: function(/**Node[]*/ nodes, /**RequestEntry*/ entry)
+  refilterNodes: function(nodes, entry)
   {
     // Ignore nodes that have been blocked already
     if (entry.filter && !(entry.filter instanceof WhitelistFilter))
@@ -695,6 +670,47 @@ function getHostname(/**String*/ url) /**String*/
   }
 }
 
+/**
+ * Retrieves the sitekey of a window.
+ */
+function getSitekey(wnd)
+{
+  let sitekey = null;
+
+  while (true)
+  {
+    if (wnd.document && wnd.document.documentElement)
+    {
+      let keydata = wnd.document.documentElement.getAttribute("data-adblockkey");
+      if (keydata && keydata.indexOf("_") >= 0)
+      {
+        let [key, signature] = keydata.split("_", 2);
+        key = key.replace(/=/g, "");
+
+        // Website specifies a key but is the signature valid?
+        let uri = Services.io.newURI(getWindowLocation(wnd), null, null);
+        let host = uri.asciiHost;
+        if (uri.port > 0)
+          host += ":" + uri.port;
+        let params = [
+          uri.path.replace(/#.*/, ""),  // REQUEST_URI
+          host,                         // HTTP_HOST
+          Utils.httpProtocol.userAgent  // HTTP_USER_AGENT
+        ];
+        if (Utils.verifySignature(key, signature, params.join("\0")))
+          return [key, wnd];
+      }
+    }
+
+    if (wnd === wnd.parent)
+      break;
+
+    wnd = wnd.parent;
+  }
+
+  return [sitekey, wnd];
+}
+
 /**
  * Retrieves the location of a window.
  * @param wnd {nsIDOMWindow}
diff --git a/data/extensions/spyblock@gnu.org/lib/customizableUI.js b/data/extensions/spyblock@gnu.org/lib/customizableUI.js
index 7db7425..ee250fa 100644
--- a/data/extensions/spyblock@gnu.org/lib/customizableUI.js
+++ b/data/extensions/spyblock@gnu.org/lib/customizableUI.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff --git a/data/extensions/spyblock@gnu.org/lib/downloader.js b/data/extensions/spyblock@gnu.org/lib/downloader.js
index d1ef209..320a754 100644
--- a/data/extensions/spyblock@gnu.org/lib/downloader.js
+++ b/data/extensions/spyblock@gnu.org/lib/downloader.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -191,13 +191,18 @@ Downloader.prototype =
       url += "&";
     else
       url += "?";
+    // We limit the download count to 4+ to keep the request anonymized
+    let downloadCount = downloadable.downloadCount;
+    if (downloadCount > 4)
+      downloadCount = "4+";
     url += "addonName=" + encodeURIComponent(addonName) +
         "&addonVersion=" + encodeURIComponent(addonVersion) +
         "&application=" + encodeURIComponent(application) +
         "&applicationVersion=" + encodeURIComponent(applicationVersion) +
         "&platform=" + encodeURIComponent(platform) +
         "&platformVersion=" + encodeURIComponent(platformVersion) +
-        "&lastVersion=" + encodeURIComponent(downloadable.lastVersion);
+        "&lastVersion=" + encodeURIComponent(downloadable.lastVersion) +
+        "&downloadCount=" + encodeURIComponent(downloadCount);
     return url;
   },
 
@@ -291,6 +296,8 @@ Downloader.prototype =
         return;
       }
 
+      downloadable.downloadCount++;
+
       this.onDownloadSuccess(downloadable, request.responseText, errorCallback, function redirectCallback(url)
       {
         if (redirects >= this.maxRedirects)
@@ -378,4 +385,10 @@ Downloadable.prototype =
    * @type Integer
    */
   hardExpiration: 0,
+  
+  /**
+   * Number indicating how often the object was downloaded.
+   * @type Integer
+   */
+  downloadCount: 0,
 };
diff --git a/data/extensions/spyblock@gnu.org/lib/elemHide.js b/data/extensions/spyblock@gnu.org/lib/elemHide.js
index df17a0f..b762040 100644
--- a/data/extensions/spyblock@gnu.org/lib/elemHide.js
+++ b/data/extensions/spyblock@gnu.org/lib/elemHide.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -27,31 +27,30 @@ let {Prefs} = require("prefs");
 let {ElemHideException} = require("filterClasses");
 let {FilterNotifier} = require("filterNotifier");
 let {AboutHandler} = require("elemHideHitRegistration");
-let {TimeLine} = require("timeline");
 
 /**
  * Lookup table, filters by their associated key
  * @type Object
  */
-let filterByKey = {__proto__: null};
+let filterByKey = Object.create(null);
 
 /**
  * Lookup table, keys of the filters by filter text
  * @type Object
  */
-let keyByFilter = {__proto__: null};
+let keyByFilter = Object.create(null);
 
 /**
  * Lookup table, keys are known element hiding exceptions
  * @type Object
  */
-let knownExceptions = {__proto__: null};
+let knownExceptions = Object.create(null);
 
 /**
  * Lookup table, lists of element hiding exceptions by selector
  * @type Object
  */
-let exceptions = {__proto__: null};
+let exceptions = Object.create(null);
 
 /**
  * Currently applied stylesheet URL
@@ -82,7 +81,6 @@ let ElemHide = exports.ElemHide =
    */
   init: function()
   {
-    TimeLine.enter("Entered ElemHide.init()");
     Prefs.addListener(function(name)
     {
       if (name == "enabled")
@@ -93,14 +91,9 @@ let ElemHide = exports.ElemHide =
       ElemHide.unapply();
     });
 
-    TimeLine.log("done adding prefs listener");
-
     let styleFile = IO.resolveFilePath(Prefs.data_directory);
     styleFile.append("elemhide.css");
     styleURL = Services.io.newFileURI(styleFile).QueryInterface(Ci.nsIFileURL);
-    TimeLine.log("done determining stylesheet URL");
-
-    TimeLine.leave("ElemHide.init() done");
   },
 
   /**
@@ -108,10 +101,10 @@ let ElemHide = exports.ElemHide =
    */
   clear: function()
   {
-    filterByKey = {__proto__: null};
-    keyByFilter = {__proto__: null};
-    knownExceptions = {__proto__: null};
-    exceptions = {__proto__: null};
+    filterByKey = Object.create(null);
+    keyByFilter = Object.create(null);
+    knownExceptions = Object.create(null);
+    exceptions = Object.create(null);
     ElemHide.isDirty = false;
     ElemHide.unapply();
   },
@@ -184,7 +177,6 @@ let ElemHide = exports.ElemHide =
    */
   getException: function(/**Filter*/ filter, /**String*/ docDomain) /**ElemHideException*/
   {
-    let selector = filter.selector;
     if (!(filter.selector in exceptions))
       return null;
 
@@ -220,8 +212,6 @@ let ElemHide = exports.ElemHide =
       return;
     }
 
-    TimeLine.enter("Entered ElemHide.apply()");
-
     if (!ElemHide.isDirty || !Prefs.enabled)
     {
       // Nothing changed, looks like we merely got enabled/disabled
@@ -236,21 +226,17 @@ let ElemHide = exports.ElemHide =
         {
           Cu.reportError(e);
         }
-        TimeLine.log("Applying existing stylesheet finished");
       }
       else if (!Prefs.enabled && ElemHide.applied)
       {
         ElemHide.unapply();
-        TimeLine.log("ElemHide.unapply() finished");
       }
 
-      TimeLine.leave("ElemHide.apply() done (no file changes)");
       return;
     }
 
     IO.writeToFile(styleURL.file, this._generateCSSContent(), function(e)
     {
-      TimeLine.enter("ElemHide.apply() write callback");
       this._applying = false;
 
       // _generateCSSContent is throwing NS_ERROR_NOT_AVAILABLE to indicate that
@@ -275,7 +261,6 @@ let ElemHide = exports.ElemHide =
         ElemHide.isDirty = false;
 
         ElemHide.unapply();
-        TimeLine.log("ElemHide.unapply() finished");
 
         if (!noFilters)
         {
@@ -288,24 +273,19 @@ let ElemHide = exports.ElemHide =
           {
             Cu.reportError(e);
           }
-          TimeLine.log("Applying stylesheet finished");
         }
 
         FilterNotifier.triggerListeners("elemhideupdate");
       }
-      TimeLine.leave("ElemHide.apply() write callback done");
-    }.bind(this), "ElemHideWrite");
+    }.bind(this));
 
     this._applying = true;
-
-    TimeLine.leave("ElemHide.apply() done", "ElemHideWrite");
   },
 
   _generateCSSContent: function()
   {
     // Grouping selectors by domains
-    TimeLine.log("start grouping selectors");
-    let domains = {__proto__: null};
+    let domains = Object.create(null);
     let hasFilters = false;
     for (let key in filterByKey)
     {
@@ -317,13 +297,12 @@ let ElemHide = exports.ElemHide =
         list = domains[domain];
       else
       {
-        list = {__proto__: null};
+        list = Object.create(null);
         domains[domain] = list;
       }
       list[filter.selector] = key;
       hasFilters = true;
     }
-    TimeLine.log("done grouping selectors");
 
     if (!hasFilters)
       throw Cr.NS_ERROR_NOT_AVAILABLE;
@@ -402,13 +381,7 @@ let ElemHide = exports.ElemHide =
     for (let key in filterByKey)
     {
       let filter = filterByKey[key];
-
-      // it is important to always access filter.domains
-      // here, even if it isn't used, in order to
-      // workaround WebKit bug 132872, also see #419
-      let domains = filter.domains;
-
-      if (specificOnly && (!domains || domains[""]))
+      if (specificOnly && (!filter.domains || filter.domains[""]))
         continue;
 
       if (filter.isActiveOnDomain(domain) && !this.getException(filter, domain))
diff --git a/data/extensions/spyblock@gnu.org/lib/elemHideHitRegistration.js b/data/extensions/spyblock@gnu.org/lib/elemHideHitRegistration.js
index a05f6df..74661a9 100644
--- a/data/extensions/spyblock@gnu.org/lib/elemHideHitRegistration.js
+++ b/data/extensions/spyblock@gnu.org/lib/elemHideHitRegistration.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -70,7 +70,7 @@ let AboutHandler = exports.AboutHandler =
 
   newChannel: function(uri)
   {
-    let match = /\?(\d+)/.exec(uri.path)
+    let match = /\?(\d+)/.exec(uri.path);
     if (!match)
       throw Cr.NS_ERROR_FAILURE;
 
@@ -126,7 +126,11 @@ HitRegistrationChannel.prototype = {
   {
     let {Policy} = require("contentPolicy");
     let {ElemHide} = require("elemHide");
-    let data = "<bindings xmlns='http://www.mozilla.org/xbl'><binding id='dummy'/></bindings>";
+
+    // This dummy binding below won't have any effect on the element. For
+    // elements that should be hidden however we don't return any binding at
+    // all, this makes Gecko stop constructing the node - it cannot be shown.
+    let data = "<bindings xmlns='http://www.mozilla.org/xbl'><binding id='dummy' bindToUntrustedContent='true'/></bindings>";
     let filter = ElemHide.getFilterByKey(this.key);
     if (filter)
     {
diff --git a/data/extensions/spyblock@gnu.org/lib/ext_background.js b/data/extensions/spyblock@gnu.org/lib/ext_background.js
new file mode 100644
index 0000000..2a50142
--- /dev/null
+++ b/data/extensions/spyblock@gnu.org/lib/ext_background.js
@@ -0,0 +1,102 @@
+/*
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
+ *
+ * Adblock Plus is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Adblock Plus is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+let {XPCOMUtils} = Cu.import("resource://gre/modules/XPCOMUtils.jsm", null);
+let {Services} = Cu.import("resource://gre/modules/Services.jsm", null);
+let {
+  _MessageProxy: MessageProxy,
+  _EventTarget: EventTarget,
+  _getSender: getSender
+} = require("ext_common");
+exports.onMessage = new EventTarget();
+
+let messageProxy = new MessageProxy(
+    Cc["@mozilla.org/globalmessagemanager;1"]
+      .getService(Ci.nsIMessageListenerManager),
+    exports.onMessage);
+onShutdown.add(function()
+{
+  messageProxy._disconnect();
+});
+
+function Page(sender)
+{
+  this._sender = sender;
+}
+Page.prototype = {
+  sendMessage: function(message)
+  {
+    if (this._sender)
+      this._sender.sendAsyncMessage("AdblockPlus:Message", {payload: message});
+  }
+};
+exports.Page = Page;
+
+function PageMap()
+{
+  this._map = new Map();
+
+  Services.obs.addObserver(this, "message-manager-disconnect", true);
+  onShutdown.add(function()
+  {
+    Services.obs.removeObserver(this, "message-manager-disconnect");
+  }.bind(this));
+}
+PageMap.prototype = {
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
+
+  observe: function(subject, topic, data)
+  {
+    if (topic == "message-manager-disconnect")
+      this._map.delete(subject);
+  },
+
+  keys: function()
+  {
+    let result = [];
+    for (let sender of this._map.keys())
+      result.push(new Page(sender));
+    return result;
+  },
+
+  get: function(page)
+  {
+    return this._map.get(page._sender);
+  },
+
+  set: function(page, value)
+  {
+    if (page._sender)
+      this._map.set(page._sender, value);
+  },
+
+  has: function(page)
+  {
+    return this._map.has(page._sender);
+  },
+
+  delete: function(page)
+  {
+    this._map.delete(page._sender);
+  }
+};
+exports.PageMap = PageMap;
+
+exports.showOptions = function()
+{
+  require("ui").UI.openFiltersDialog();
+};
diff --git a/data/extensions/spyblock@gnu.org/lib/ext_common.js b/data/extensions/spyblock@gnu.org/lib/ext_common.js
new file mode 100644
index 0000000..129f232
--- /dev/null
+++ b/data/extensions/spyblock@gnu.org/lib/ext_common.js
@@ -0,0 +1,159 @@
+/*
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
+ *
+ * Adblock Plus is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Adblock Plus is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+(function(global)
+{
+  const Ci = Components.interfaces;
+
+  if (!global.ext)
+    global.ext = {};
+
+  var holder = {
+    get Page()
+    {
+      delete this.Page;
+      this.Page = (typeof require == "function" ?
+          require("ext_background").Page :
+          function() {});
+      return this.Page;
+    }
+  };
+
+  var getSender = global.ext._getSender = function(origin)
+  {
+    if (origin instanceof Ci.nsIDOMXULElement)
+      return origin.messageManager;
+    else if (origin instanceof Ci.nsIMessageSender)
+      return origin;
+    else
+      return null;
+  };
+
+  var MessageProxy = global.ext._MessageProxy = function(messageManager, messageTarget)
+  {
+    this._messageManager = messageManager;
+    this._messageTarget = messageTarget;
+    this._callbacks = new Map();
+    this._responseCallbackCounter = 0;
+
+    this._handleRequest = this._handleRequest.bind(this);
+    this._handleResponse = this._handleResponse.bind(this);
+    this._messageManager.addMessageListener("AdblockPlus:Message", this._handleRequest);
+    this._messageManager.addMessageListener("AdblockPlus:Response", this._handleResponse);
+  };
+  MessageProxy.prototype = {
+    _disconnect: function()
+    {
+      this._messageManager.removeMessageListener("AdblockPlus:Message", this._handleRequest);
+      this._messageManager.removeMessageListener("AdblockPlus:Response", this._handleResponse);
+    },
+
+    _sendResponse: function(sender, callbackId, message)
+    {
+      var response = {
+        callbackId: callbackId
+      };
+      if (typeof response != "undefined")
+        response.payload = message;
+      sender.sendAsyncMessage("AdblockPlus:Response", response);
+    },
+
+    _handleRequest: function(message)
+    {
+      var sender = getSender(message.target);
+      var request = message.data;
+
+      var sent = false;
+      var sendResponse;
+      if (sender && "callbackId" in request)
+      {
+        sendResponse = function(message)
+        {
+          this._sendResponse(sender, request.callbackId, message);
+          sent = true;
+        }.bind(this);
+      }
+      else
+        sendResponse = function() {};
+
+      var results = this._messageTarget._dispatch(request.payload, {
+        page: new holder.Page(sender)
+      }, sendResponse);
+      if (!sent && results.indexOf(true) == -1)
+        sendResponse(undefined);
+    },
+
+    _handleResponse: function(message)
+    {
+      var response = message.data;
+      var callback = this._callbacks.get(response.callbackId);
+      if (callback)
+      {
+        this._callbacks.delete(response.callbackId);
+        if ("payload" in response)
+          callback(response.payload);
+      }
+    },
+
+    sendMessage: function(message, responseCallback)
+    {
+      if (!(this._messageManager instanceof Ci.nsIMessageSender))
+        throw new Error("Not implemented");
+
+      var request = {
+        payload: message
+      };
+      if (responseCallback)
+      {
+        request.callbackId = ++this._responseCallbackCounter;
+        this._callbacks.set(request.callbackId, responseCallback);
+      }
+
+      this._messageManager.sendAsyncMessage("AdblockPlus:Message", request);
+    }
+  };
+
+  var EventTarget = global.ext._EventTarget = function()
+  {
+    this._listeners = [];
+  };
+  EventTarget.prototype = {
+    addListener: function(listener)
+    {
+      if (this._listeners.indexOf(listener) == -1)
+        this._listeners.push(listener);
+    },
+    removeListener: function(listener)
+    {
+      var idx = this._listeners.indexOf(listener);
+      if (idx != -1)
+        this._listeners.splice(idx, 1);
+    },
+    _dispatch: function()
+    {
+      var results = [];
+
+      for (var i = 0; i < this._listeners.length; i++)
+        results.push(this._listeners[i].apply(null, arguments));
+
+      return results;
+    }
+  };
+
+  if (typeof exports == "object")
+    exports = global.ext;
+})(this);
diff --git a/data/extensions/spyblock@gnu.org/lib/filterClasses.js b/data/extensions/spyblock@gnu.org/lib/filterClasses.js
index cb3a5b1..a0dfaf0 100644
--- a/data/extensions/spyblock@gnu.org/lib/filterClasses.js
+++ b/data/extensions/spyblock@gnu.org/lib/filterClasses.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -68,7 +68,7 @@ Filter.prototype =
  * Cache for known filters, maps string representation to filter objects.
  * @type Object
  */
-Filter.knownFilters = {__proto__: null};
+Filter.knownFilters = Object.create(null);
 
 /**
  * Regular expression that element hiding filters should match
@@ -109,7 +109,7 @@ Filter.fromText = function(text)
 
   Filter.knownFilters[ret.text] = ret;
   return ret;
-}
+};
 
 /**
  * Deserializes a filter
@@ -130,7 +130,7 @@ Filter.fromObject = function(obj)
       ret._lastHit = parseInt(obj.lastHit) || 0;
   }
   return ret;
-}
+};
 
 /**
  * Removes unnecessary whitespaces from filter text, will only return null if
@@ -147,17 +147,17 @@ Filter.normalize = function(/**String*/ text) /**String*/
   if (/^\s*!/.test(text))
   {
     // Don't remove spaces inside comments
-    return text.replace(/^\s+/, "").replace(/\s+$/, "");
+    return text.trim();
   }
   else if (Filter.elemhideRegExp.test(text))
   {
     // Special treatment for element hiding filters, right side is allowed to contain spaces
     let [, domain, separator, selector] = /^(.*?)(#\@?#?)(.*)$/.exec(text);
-    return domain.replace(/\s/g, "") + separator + selector.replace(/^\s+/, "").replace(/\s+$/, "");
+    return domain.replace(/\s/g, "") + separator + selector.trim();
   }
   else
     return text.replace(/\s/g, "");
-}
+};
 
 /**
  * Class for invalid filters
@@ -215,7 +215,7 @@ CommentFilter.prototype =
 /**
  * Abstract base class for filters that can get hits
  * @param {String} text see Filter()
- * @param {String} domains  (optional) Domains that the filter is restricted to separated by domainSeparator e.g. "foo.com|bar.com|~baz.com"
+ * @param {String} [domains] Domains that the filter is restricted to separated by domainSeparator e.g. "foo.com|bar.com|~baz.com"
  * @constructor
  * @augments Filter
  */
@@ -324,6 +324,12 @@ ActiveFilter.prototype =
    */
   get domains()
   {
+    // Despite this property being cached, the getter is called
+    // several times on Safari, due to WebKit bug 132872
+    let prop = Object.getOwnPropertyDescriptor(this, "domains");
+    if (prop)
+      return prop.value;
+
     let domains = null;
 
     if (this.domainSource)
@@ -366,7 +372,7 @@ ActiveFilter.prototype =
           }
 
           if (!domains)
-            domains = {__proto__: null};
+            domains = Object.create(null);
 
           domains[domain] = include;
         }
@@ -380,11 +386,25 @@ ActiveFilter.prototype =
     return this.domains;
   },
 
+  /**
+   * Array containing public keys of websites that this filter should apply to
+   * @type Array of String
+   */
+  sitekeys: null,
+
   /**
    * Checks whether this filter is active on a domain.
+   * @param {String} docDomain domain name of the document that loads the URL
+   * @param {String} [sitekey] public key provided by the document
+   * @return {Boolean} true in case of the filter being active
    */
-  isActiveOnDomain: function(/**String*/ docDomain) /**Boolean*/
+  isActiveOnDomain: function(docDomain, sitekey)
   {
+    // Sitekeys are case-sensitive so we shouldn't convert them to upper-case to avoid false
+    // positives here. Instead we need to change the way filter options are parsed.
+    if (this.sitekeys && (!sitekey || this.sitekeys.indexOf(sitekey.toUpperCase()) < 0))
+      return false;
+
     // If no domains are set the rule matches everywhere
     if (!this.domains)
       return true;
@@ -451,16 +471,17 @@ ActiveFilter.prototype =
  * Abstract base class for RegExp-based filters
  * @param {String} text see Filter()
  * @param {String} regexpSource filter part that the regular expression should be build from
- * @param {Number} contentType  (optional) Content types the filter applies to, combination of values from RegExpFilter.typeMap
- * @param {Boolean} matchCase   (optional) Defines whether the filter should distinguish between lower and upper case letters
- * @param {String} domains      (optional) Domains that the filter is restricted to, e.g. "foo.com|bar.com|~baz.com"
- * @param {Boolean} thirdParty  (optional) Defines whether the filter should apply to third-party or first-party content only
+ * @param {Number} [contentType] Content types the filter applies to, combination of values from RegExpFilter.typeMap
+ * @param {Boolean} [matchCase] Defines whether the filter should distinguish between lower and upper case letters
+ * @param {String} [domains] Domains that the filter is restricted to, e.g. "foo.com|bar.com|~baz.com"
+ * @param {Boolean} [thirdParty] Defines whether the filter should apply to third-party or first-party content only
+ * @param {String} [sitekeys] Public keys of websites that this filter should apply to
  * @constructor
  * @augments ActiveFilter
  */
-function RegExpFilter(text, regexpSource, contentType, matchCase, domains, thirdParty)
+function RegExpFilter(text, regexpSource, contentType, matchCase, domains, thirdParty, sitekeys)
 {
-  ActiveFilter.call(this, text, domains);
+  ActiveFilter.call(this, text, domains, sitekeys);
 
   if (contentType != null)
     this.contentType = contentType;
@@ -468,12 +489,14 @@ function RegExpFilter(text, regexpSource, contentType, matchCase, domains, third
     this.matchCase = matchCase;
   if (thirdParty != null)
     this.thirdParty = thirdParty;
+  if (sitekeys != null)
+    this.sitekeySource = sitekeys;
 
   if (regexpSource.length >= 2 && regexpSource[0] == "/" && regexpSource[regexpSource.length - 1] == "/")
   {
     // The filter is a regular expression - convert it immediately to catch syntax errors
     let regexp = new RegExp(regexpSource.substr(1, regexpSource.length - 2), this.matchCase ? "" : "i");
-    this.__defineGetter__("regexp", () => regexp);
+    Object.defineProperty(this, "regexp", {value: regexp});
   }
   else
   {
@@ -514,6 +537,12 @@ RegExpFilter.prototype =
    */
   get regexp()
   {
+    // Despite this property being cached, the getter is called
+    // several times on Safari, due to WebKit bug 132872
+    let prop = Object.getOwnPropertyDescriptor(this, "regexp");
+    if (prop)
+      return prop.value;
+
     // Remove multiple wildcards
     let source = this.regexpSource
       .replace(/\*+/g, "*")        // remove multiple wildcards
@@ -529,10 +558,8 @@ RegExpFilter.prototype =
       .replace(/(\.\*)$/, "");     // remove trailing wildcards
 
     let regexp = new RegExp(source, this.matchCase ? "" : "i");
-
-    delete this.regexpSource;
-    this.__defineGetter__("regexp", () => regexp);
-    return this.regexp;
+    Object.defineProperty(this, "regexp", {value: regexp});
+    return regexp;
   },
   /**
    * Content types the filter applies to, combination of values from RegExpFilter.typeMap
@@ -550,15 +577,46 @@ RegExpFilter.prototype =
    */
   thirdParty: null,
 
+  /**
+   * String that the sitekey property should be generated from
+   * @type String
+   */
+  sitekeySource: null,
+
+  /**
+   * Array containing public keys of websites that this filter should apply to
+   * @type Array of String
+   */
+  get sitekeys()
+  {
+    // Despite this property being cached, the getter is called
+    // several times on Safari, due to WebKit bug 132872
+    let prop = Object.getOwnPropertyDescriptor(this, "sitekeys");
+    if (prop)
+      return prop.value;
+
+    let sitekeys = null;
+
+    if (this.sitekeySource)
+    {
+      sitekeys = this.sitekeySource.split("|");
+      this.sitekeySource = null;
+    }
+
+    Object.defineProperty(this, "sitekeys", {value: sitekeys, enumerable: true});
+    return this.sitekeys;
+  },
+
   /**
    * Tests whether the URL matches this filter
    * @param {String} location URL to be tested
    * @param {String} contentType content type identifier of the URL
    * @param {String} docDomain domain name of the document that loads the URL
    * @param {Boolean} thirdParty should be true if the URL is a third-party request
+   * @param {String} sitekey public key provided by the document
    * @return {Boolean} true in case of a match
    */
-  matches: function(location, contentType, docDomain, thirdParty, privatenode)
+  matches: function(location, contentType, docDomain, thirdParty, sitekey, privatenode)
   {
 
     if(this.subscriptions[0])
@@ -566,10 +624,9 @@ RegExpFilter.prototype =
             if (privatenode==false)
               return false;
 
-    if (this.regexp.test(location) &&
-        (RegExpFilter.typeMap[contentType] & this.contentType) != 0 &&
+    if ((RegExpFilter.typeMap[contentType] & this.contentType) != 0 &&
         (this.thirdParty == null || this.thirdParty == thirdParty) &&
-        this.isActiveOnDomain(docDomain))
+        this.isActiveOnDomain(docDomain, sitekey) && this.regexp.test(location))
     {
       return true;
     }
@@ -578,9 +635,10 @@ RegExpFilter.prototype =
   }
 };
 
-RegExpFilter.prototype.__defineGetter__("0", function()
+// Required to optimize Matcher, see also RegExpFilter.prototype.length
+Object.defineProperty(RegExpFilter.prototype, "0",
 {
-  return this;
+  get: function() { return this; }
 });
 
 /**
@@ -600,7 +658,7 @@ RegExpFilter.fromText = function(text)
   let contentType = null;
   let matchCase = null;
   let domains = null;
-  let siteKeys = null;
+  let sitekeys = null;
   let thirdParty = null;
   let collapse = null;
   let options;
@@ -646,7 +704,7 @@ RegExpFilter.fromText = function(text)
       else if (option == "~COLLAPSE")
         collapse = false;
       else if (option == "SITEKEY" && typeof value != "undefined")
-        siteKeys = value.split(/\|/);
+        sitekeys = value;
       else
         return new InvalidFilter(origText, "Unknown option " + option.toLowerCase());
     }
@@ -660,21 +718,19 @@ RegExpFilter.fromText = function(text)
       contentType = RegExpFilter.prototype.contentType;
     contentType &= ~RegExpFilter.typeMap.DOCUMENT;
   }
-  if (!blocking && siteKeys)
-    contentType = RegExpFilter.typeMap.DOCUMENT;
 
   try
   {
     if (blocking)
-      return new BlockingFilter(origText, text, contentType, matchCase, domains, thirdParty, collapse);
+      return new BlockingFilter(origText, text, contentType, matchCase, domains, thirdParty, sitekeys, collapse);
     else
-      return new WhitelistFilter(origText, text, contentType, matchCase, domains, thirdParty, siteKeys);
+      return new WhitelistFilter(origText, text, contentType, matchCase, domains, thirdParty, sitekeys);
   }
   catch (e)
   {
     return new InvalidFilter(origText, e);
   }
-}
+};
 
 /**
  * Maps type strings like "SCRIPT" or "OBJECT" to bit masks
@@ -712,13 +768,14 @@ RegExpFilter.prototype.contentType &= ~(RegExpFilter.typeMap.ELEMHIDE | RegExpFi
  * @param {Boolean} matchCase see RegExpFilter()
  * @param {String} domains see RegExpFilter()
  * @param {Boolean} thirdParty see RegExpFilter()
+ * @param {String} sitekeys see RegExpFilter()
  * @param {Boolean} collapse  defines whether the filter should collapse blocked content, can be null
  * @constructor
  * @augments RegExpFilter
  */
-function BlockingFilter(text, regexpSource, contentType, matchCase, domains, thirdParty, collapse)
+function BlockingFilter(text, regexpSource, contentType, matchCase, domains, thirdParty, sitekeys, collapse)
 {
-  RegExpFilter.call(this, text, regexpSource, contentType, matchCase, domains, thirdParty);
+  RegExpFilter.call(this, text, regexpSource, contentType, matchCase, domains, thirdParty, sitekeys);
 
   this.collapse = collapse;
 }
@@ -743,34 +800,25 @@ BlockingFilter.prototype =
  * @param {Boolean} matchCase see RegExpFilter()
  * @param {String} domains see RegExpFilter()
  * @param {Boolean} thirdParty see RegExpFilter()
- * @param {String[]} siteKeys public keys of websites that this filter should apply to
+ * @param {String} sitekeys see RegExpFilter()
  * @constructor
  * @augments RegExpFilter
  */
-function WhitelistFilter(text, regexpSource, contentType, matchCase, domains, thirdParty, siteKeys)
+function WhitelistFilter(text, regexpSource, contentType, matchCase, domains, thirdParty, sitekeys)
 {
-  RegExpFilter.call(this, text, regexpSource, contentType, matchCase, domains, thirdParty);
-
-  if (siteKeys != null)
-    this.siteKeys = siteKeys;
+  RegExpFilter.call(this, text, regexpSource, contentType, matchCase, domains, thirdParty, sitekeys);
 }
 exports.WhitelistFilter = WhitelistFilter;
 
 WhitelistFilter.prototype =
 {
-  __proto__: RegExpFilter.prototype,
-
-  /**
-   * List of public keys of websites that this filter should apply to
-   * @type String[]
-   */
-  siteKeys: null
-}
+  __proto__: RegExpFilter.prototype
+};
 
 /**
  * Base class for element hiding filters
  * @param {String} text see Filter()
- * @param {String} domains    (optional) Host names or domains the filter should be restricted to
+ * @param {String} [domains] Host names or domains the filter should be restricted to
  * @param {String} selector   CSS selector for the HTML elements that should be hidden
  * @constructor
  * @augments ActiveFilter
@@ -865,7 +913,7 @@ ElemHideBase.fromText = function(text, domain, isException, tagName, attrRules,
     return new ElemHideException(text, domain, selector);
   else
     return new ElemHideFilter(text, domain, selector);
-}
+};
 
 /**
  * Class for element hiding filters
diff --git a/data/extensions/spyblock@gnu.org/lib/filterListener.js b/data/extensions/spyblock@gnu.org/lib/filterListener.js
index 1687a26..e993a44 100644
--- a/data/extensions/spyblock@gnu.org/lib/filterListener.js
+++ b/data/extensions/spyblock@gnu.org/lib/filterListener.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -22,7 +22,6 @@
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-let {TimeLine} = require("timeline");
 let {FilterStorage} = require("filterStorage");
 let {FilterNotifier} = require("filterNotifier");
 let {ElemHide} = require("elemHide");
@@ -103,8 +102,6 @@ let HistoryPurgeObserver =
  */
 function init()
 {
-  TimeLine.enter("Entered filter listener initialization()");
-
   FilterNotifier.addListener(function(action, item, newValue, oldValue)
   {
     let match = /^(\w+)\.(.*)/.exec(action);
@@ -122,16 +119,11 @@ function init()
     flushElemHide = function() {};    // No global stylesheet in Chrome & Co.
   FilterStorage.loadFromDisk();
 
-  TimeLine.log("done initializing data structures");
-
   Services.obs.addObserver(HistoryPurgeObserver, "browser:purge-session-history", true);
   onShutdown.add(function()
   {
     Services.obs.removeObserver(HistoryPurgeObserver, "browser:purge-session-history");
   });
-  TimeLine.log("done adding observers");
-
-  TimeLine.leave("Filter listener initialization done");
 }
 init();
 
diff --git a/data/extensions/spyblock@gnu.org/lib/filterNotifier.js b/data/extensions/spyblock@gnu.org/lib/filterNotifier.js
index 010081e..80d6769 100644
--- a/data/extensions/spyblock@gnu.org/lib/filterNotifier.js
+++ b/data/extensions/spyblock@gnu.org/lib/filterNotifier.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff --git a/data/extensions/spyblock@gnu.org/lib/filterStorage.js b/data/extensions/spyblock@gnu.org/lib/filterStorage.js
index 546f788..dd8aea7 100644
--- a/data/extensions/spyblock@gnu.org/lib/filterStorage.js
+++ b/data/extensions/spyblock@gnu.org/lib/filterStorage.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -29,7 +29,6 @@ let {Filter, ActiveFilter} = require("filterClasses");
 let {Subscription, SpecialSubscription, ExternalSubscription} = require("subscriptionClasses");
 let {FilterNotifier} = require("filterNotifier");
 let {Utils} = require("utils");
-let {TimeLine} = require("timeline");
 
 /**
  * Version number of the filter storage file format.
@@ -85,8 +84,9 @@ let FilterStorage = exports.FilterStorage =
     if (!file)
       Cu.reportError("Adblock Plus: Failed to resolve filter file location from extensions.adblockplus.patternsfile preference");
 
-    this.__defineGetter__("sourceFile", () => file);
-    return this.sourceFile;
+    // Property is configurable because of the test suite.
+    Object.defineProperty(this, "sourceFile", {value: file, configurable: true});
+    return file;
   },
 
   /**
@@ -99,7 +99,7 @@ let FilterStorage = exports.FilterStorage =
    * Map of properties listed in the filter storage file before the sections
    * start. Right now this should be only the format version.
    */
-  fileProperties: {__proto__: null},
+  fileProperties: Object.create(null),
 
   /**
    * List of filter subscriptions containing all filters
@@ -111,7 +111,7 @@ let FilterStorage = exports.FilterStorage =
    * Map of subscriptions already on the list, by their URL/identifier
    * @type Object
    */
-  knownSubscriptions: {__proto__: null},
+  knownSubscriptions: Object.create(null),
 
   /**
    * Finds the filter group that a filter should be added to by default. Will
@@ -368,17 +368,13 @@ let FilterStorage = exports.FilterStorage =
     if (this._loading)
       return;
 
-    TimeLine.enter("Entered FilterStorage.loadFromDisk()");
     this._loading = true;
 
     let readFile = function(sourceFile, backupIndex)
     {
-      TimeLine.enter("FilterStorage.loadFromDisk() -> readFile()");
-
       let parser = new INIParser();
       IO.readFromFile(sourceFile, parser, function(e)
       {
-        TimeLine.enter("FilterStorage.loadFromDisk() read callback");
         if (!e && parser.subscriptions.length == 0)
         {
           // No filter subscriptions in the file, this isn't right.
@@ -406,21 +402,18 @@ let FilterStorage = exports.FilterStorage =
               else
                 doneReading(parser);
             });
-            TimeLine.leave("FilterStorage.loadFromDisk() read callback done");
             return;
           }
         }
         doneReading(parser);
-      }.bind(this), "FilterStorageRead");
-
-      TimeLine.leave("FilterStorage.loadFromDisk() <- readFile()", "FilterStorageRead");
+      }.bind(this));
     }.bind(this);
 
     var doneReading = function(parser)
     {
       // Old special groups might have been converted, remove them if they are empty
       let specialMap = {"~il~": true, "~wl~": true, "~fl~": true, "~eh~": true};
-      let knownSubscriptions = {__proto__: null};
+      let knownSubscriptions = Object.create(null);
       for (let i = 0; i < parser.subscriptions.length; i++)
       {
         let subscription = parser.subscriptions[i];
@@ -444,7 +437,6 @@ let FilterStorage = exports.FilterStorage =
           this.addFilter(filter, null, undefined, true);
         }
       }
-      TimeLine.log("Initializing data done, triggering observers")
 
       this._loading = false;
       FilterNotifier.triggerListeners("load");
@@ -452,7 +444,6 @@ let FilterStorage = exports.FilterStorage =
       if (sourceFile != this.sourceFile)
         this.saveToDisk();
 
-      TimeLine.leave("FilterStorage.loadFromDisk() read callback done");
     }.bind(this);
 
     let explicitFile;
@@ -473,8 +464,6 @@ let FilterStorage = exports.FilterStorage =
           this.firstRun = true;
           this._loading = false;
           FilterNotifier.triggerListeners("load");
-
-          TimeLine.leave("FilterStorage.loadFromDisk() read callback done");
         }
         else
           readFile(sourceFile, 0);
@@ -485,8 +474,6 @@ let FilterStorage = exports.FilterStorage =
       else
         callback(true);
     }
-
-    TimeLine.leave("FilterStorage.loadFromDisk() done");
   },
 
   _generateFilterData: function(subscriptions)
@@ -494,7 +481,7 @@ let FilterStorage = exports.FilterStorage =
     yield "# Adblock Plus preferences";
     yield "version=" + formatVersion;
 
-    let saved = {__proto__: null};
+    let saved = Object.create(null);
     let buf = [];
 
     // Save filter data
@@ -568,8 +555,6 @@ let FilterStorage = exports.FilterStorage =
       return;
     }
 
-    TimeLine.enter("Entered FilterStorage.saveToDisk()");
-
     // Make sure the file's parent directory exists
     try {
       targetFile.parent.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
@@ -577,10 +562,8 @@ let FilterStorage = exports.FilterStorage =
 
     let writeFilters = function()
     {
-      TimeLine.enter("FilterStorage.saveToDisk() -> writeFilters()");
       IO.writeToFile(targetFile, this._generateFilterData(subscriptions), function(e)
       {
-        TimeLine.enter("FilterStorage.saveToDisk() write callback");
         if (!explicitFile)
           this._saving = false;
 
@@ -594,9 +577,7 @@ let FilterStorage = exports.FilterStorage =
         }
         else
           FilterNotifier.triggerListeners("save");
-        TimeLine.leave("FilterStorage.saveToDisk() write callback done");
-      }.bind(this), "FilterStorageWrite");
-      TimeLine.leave("FilterStorage.saveToDisk() -> writeFilters()", "FilterStorageWrite");
+      }.bind(this));
     }.bind(this);
 
     let checkBackupRequired = function(callbackNotRequired, callbackRequired)
@@ -628,16 +609,13 @@ let FilterStorage = exports.FilterStorage =
 
     let removeLastBackup = function(part1, part2)
     {
-      TimeLine.enter("FilterStorage.saveToDisk() -> removeLastBackup()");
       let file = targetFile.clone();
       file.leafName = part1 + "-backup" + Prefs.patternsbackups + part2;
       IO.removeFile(file, (e) => renameBackup(part1, part2, Prefs.patternsbackups - 1));
-      TimeLine.leave("FilterStorage.saveToDisk() <- removeLastBackup()");
     }.bind(this);
 
     let renameBackup = function(part1, part2, index)
     {
-      TimeLine.enter("FilterStorage.saveToDisk() -> renameBackup()");
       if (index > 0)
       {
         let fromFile = targetFile.clone();
@@ -654,7 +632,6 @@ let FilterStorage = exports.FilterStorage =
 
         IO.copyFile(targetFile, toFile, writeFilters);
       }
-      TimeLine.leave("FilterStorage.saveToDisk() <- renameBackup()");
     }.bind(this);
 
     // Do not persist external subscriptions
@@ -663,8 +640,6 @@ let FilterStorage = exports.FilterStorage =
       this._saving = true;
 
     checkBackupRequired(writeFilters, removeLastBackup);
-
-    TimeLine.leave("FilterStorage.saveToDisk() done");
   },
 
   /**
@@ -794,8 +769,8 @@ function INIParser()
 {
   this.fileProperties = this.curObj = {};
   this.subscriptions = [];
-  this.knownFilters = {__proto__: null};
-  this.knownSubscriptions = {__proto__: null};
+  this.knownFilters = Object.create(null);
+  this.knownSubscriptions = Object.create(null);
 }
 INIParser.prototype =
 {
diff --git a/data/extensions/spyblock@gnu.org/lib/io.js b/data/extensions/spyblock@gnu.org/lib/io.js
index ea362b7..5e60b54 100644
--- a/data/extensions/spyblock@gnu.org/lib/io.js
+++ b/data/extensions/spyblock@gnu.org/lib/io.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -24,12 +24,11 @@ let {FileUtils} = Cu.import("resource://gre/modules/FileUtils.jsm", null);
 let {OS} = Cu.import("resource://gre/modules/osfile.jsm", null);
 let {Task} = Cu.import("resource://gre/modules/Task.jsm", null);
 
-let {TimeLine} = require("timeline");
 let {Prefs} = require("prefs");
 let {Utils} = require("utils");
 
 let firstRead = true;
-const BUFFER_SIZE = 0x8000;  // 32kB
+const BUFFER_SIZE = 0x80000;  // 512kB
 
 let IO = exports.IO =
 {
@@ -39,9 +38,8 @@ let IO = exports.IO =
   get lineBreak()
   {
     let lineBreak = (Services.appinfo.OS == "WINNT" ? "\r\n" : "\n");
-    delete IO.lineBreak;
-    IO.__defineGetter__("lineBreak", () => lineBreak);
-    return IO.lineBreak;
+    Object.defineProperty(this, "lineBreak", {value: lineBreak});
+    return lineBreak;
   },
 
   /**
@@ -71,7 +69,7 @@ let IO = exports.IO =
    * each line read and with a null parameter once the read operation is done.
    * The callback will be called when the operation is done.
    */
-  readFromFile: function(/**nsIFile*/ file, /**Object*/ listener, /**Function*/ callback, /**String*/ timeLineID)
+  readFromFile: function(/**nsIFile*/ file, /**Object*/ listener, /**Function*/ callback)
   {
     try
     {
@@ -82,11 +80,6 @@ let IO = exports.IO =
 
       let onProgress = function(data)
       {
-        if (timeLineID)
-        {
-          TimeLine.asyncStart(timeLineID);
-        }
-
         let index = (processing ? -1 : Math.max(data.lastIndexOf("\n"), data.lastIndexOf("\r")));
         if (index >= 0)
         {
@@ -126,11 +119,6 @@ let IO = exports.IO =
         }
         else
           buffer += data;
-
-        if (timeLineID)
-        {
-          TimeLine.asyncEnd(timeLineID);
-        }
       };
 
       let onSuccess = function()
@@ -142,21 +130,10 @@ let IO = exports.IO =
           return;
         }
 
-        if (timeLineID)
-        {
-          TimeLine.asyncStart(timeLineID);
-        }
-
         if (buffer !== "")
           listener.process(buffer);
         listener.process(null);
 
-        if (timeLineID)
-        {
-          TimeLine.asyncEnd(timeLineID);
-          TimeLine.asyncDone(timeLineID);
-        }
-
         callback(null);
       };
 
@@ -170,15 +147,9 @@ let IO = exports.IO =
         }
 
         callback(e);
-
-        if (timeLineID)
-        {
-          TimeLine.asyncDone(timeLineID);
-        }
       };
 
       let decoder = new TextDecoder();
-      let array = new Uint8Array(BUFFER_SIZE);
       Task.spawn(function()
       {
         if (firstRead && Services.vc.compare(Utils.platformVersion, "23.0a1") <= 0)
@@ -201,19 +172,15 @@ let IO = exports.IO =
         firstRead = false;
 
         let f = yield OS.File.open(file.path, {read: true});
-        let numBytes;
-        do
+        while (true)
         {
-          numBytes = yield f.readTo(array);
-          if (numBytes)
-          {
-            let data = decoder.decode(numBytes == BUFFER_SIZE ?
-                                      array :
-                                      array.subarray(0, numBytes), {stream: true});
-            onProgress(data);
-          }
-        } while (numBytes);
+          let array = yield f.read(BUFFER_SIZE);
+          if (!array.length)
+            break;
 
+          let data = decoder.decode(array, {stream: true});
+          onProgress(data);
+        }
         yield f.close();
       }.bind(this)).then(onSuccess, onError);
     }
@@ -227,7 +194,7 @@ let IO = exports.IO =
    * Writes string data to a file in UTF-8 format asynchronously. The callback
    * will be called when the write operation is done.
    */
-  writeToFile: function(/**nsIFile*/ file, /**Iterator*/ data, /**Function*/ callback, /**String*/ timeLineID)
+  writeToFile: function(/**nsIFile*/ file, /**Iterator*/ data, /**Function*/ callback)
   {
     try
     {
diff --git a/data/extensions/spyblock@gnu.org/lib/keySelector.js b/data/extensions/spyblock@gnu.org/lib/keySelector.js
index 20847d9..01d9cd0 100644
--- a/data/extensions/spyblock@gnu.org/lib/keySelector.js
+++ b/data/extensions/spyblock@gnu.org/lib/keySelector.js
@@ -1,19 +1,6 @@
-/*
- * This file is part of the Adblock Plus build tools,
- * Copyright (C) 2006-2014 Eyeo GmbH
- *
- * Adblock Plus is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * Adblock Plus is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 Cu.import("resource://gre/modules/Services.jsm");
 
diff --git a/data/extensions/spyblock@gnu.org/lib/main.js b/data/extensions/spyblock@gnu.org/lib/main.js
index f18cc05..fa84d9e 100644
--- a/data/extensions/spyblock@gnu.org/lib/main.js
+++ b/data/extensions/spyblock@gnu.org/lib/main.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -22,24 +22,14 @@
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-let {TimeLine} = require("timeline");
-
-TimeLine.enter("Adblock Plus startup");
 registerPublicAPI();
-TimeLine.log("Done registering public API");
 require("filterListener");
-TimeLine.log("Done loading filter listener");
 require("contentPolicy");
-TimeLine.log("Done loading content policy");
 require("synchronizer");
-TimeLine.log("Done loading subscription synchronizer");
 require("notification");
-TimeLine.log("Done loading notification downloader");
 require("sync");
-TimeLine.log("Done loading sync support");
+require("messageResponder");
 require("ui");
-TimeLine.log("Done loading UI integration code");
-TimeLine.leave("Started up");
 
 function registerPublicAPI()
 {
diff --git a/data/extensions/spyblock@gnu.org/lib/matcher.js b/data/extensions/spyblock@gnu.org/lib/matcher.js
index 908b0b8..59ef1e7 100644
--- a/data/extensions/spyblock@gnu.org/lib/matcher.js
+++ b/data/extensions/spyblock@gnu.org/lib/matcher.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -49,8 +49,8 @@ Matcher.prototype = {
    */
   clear: function()
   {
-    this.filterByKeyword = {__proto__: null};
-    this.keywordByFilter = {__proto__: null};
+    this.filterByKeyword = Object.create(null);
+    this.keywordByFilter = Object.create(null);
   },
 
   /**
@@ -165,13 +165,13 @@ Matcher.prototype = {
   /**
    * Checks whether the entries for a particular keyword match a URL
    */
-  _checkEntryMatch: function(keyword, location, contentType, docDomain, thirdParty, privatenode)
+  _checkEntryMatch: function(keyword, location, contentType, docDomain, thirdParty, sitekey, privatenode)
   {
     let list = this.filterByKeyword[keyword];
     for (let i = 0; i < list.length; i++)
     {
       let filter = list[i];
-      if (filter.matches(location, contentType, docDomain, thirdParty,privatenode))
+      if (filter.matches(location, contentType, docDomain, thirdParty, sitekey, privatenode))
         return filter;
     }
     return null;
@@ -183,9 +183,10 @@ Matcher.prototype = {
    * @param {String} contentType content type identifier of the URL
    * @param {String} docDomain domain name of the document that loads the URL
    * @param {Boolean} thirdParty should be true if the URL is a third-party request
+   * @param {String} sitekey public key provided by the document
    * @return {RegExpFilter} matching filter or null
    */
-  matchesAny: function(location, contentType, docDomain, thirdParty)
+  matchesAny: function(location, contentType, docDomain, thirdParty, sitekey)
   {
     let candidates = location.toLowerCase().match(/[a-z0-9%]{3,}/g);
     if (candidates === null)
@@ -196,7 +197,7 @@ Matcher.prototype = {
       let substr = candidates[i];
       if (substr in this.filterByKeyword)
       {
-        let result = this._checkEntryMatch(substr, location, contentType, docDomain, thirdParty);
+        let result = this._checkEntryMatch(substr, location, contentType, docDomain, thirdParty, sitekey);
         if (result)
           return result;
       }
@@ -215,8 +216,7 @@ function CombinedMatcher()
 {
   this.blacklist = new Matcher();
   this.whitelist = new Matcher();
-  this.keys = {__proto__: null};
-  this.resultCache = {__proto__: null};
+  this.resultCache = Object.create(null);
 }
 exports.CombinedMatcher = CombinedMatcher;
 
@@ -240,12 +240,6 @@ CombinedMatcher.prototype =
    */
   whitelist: null,
 
-  /**
-   * Exception rules that are limited by public keys, mapped by the corresponding keys.
-   * @type Object
-   */
-  keys: null,
-
   /**
    * Lookup table of previous matchesAny results
    * @type Object
@@ -265,8 +259,7 @@ CombinedMatcher.prototype =
   {
     this.blacklist.clear();
     this.whitelist.clear();
-    this.keys = {__proto__: null};
-    this.resultCache = {__proto__: null};
+    this.resultCache = Object.create(null);
     this.cacheEntries = 0;
   },
 
@@ -276,21 +269,13 @@ CombinedMatcher.prototype =
   add: function(filter)
   {
     if (filter instanceof WhitelistFilter)
-    {
-      if (filter.siteKeys)
-      {
-        for (let i = 0; i < filter.siteKeys.length; i++)
-          this.keys[filter.siteKeys[i]] = filter.text;
-      }
-      else
-        this.whitelist.add(filter);
-    }
+      this.whitelist.add(filter);
     else
       this.blacklist.add(filter);
 
     if (this.cacheEntries > 0)
     {
-      this.resultCache = {__proto__: null};
+      this.resultCache = Object.create(null);
       this.cacheEntries = 0;
     }
   },
@@ -301,21 +286,13 @@ CombinedMatcher.prototype =
   remove: function(filter)
   {
     if (filter instanceof WhitelistFilter)
-    {
-      if (filter.siteKeys)
-      {
-        for (let i = 0; i < filter.siteKeys.length; i++)
-          delete this.keys[filter.siteKeys[i]];
-      }
-      else
-        this.whitelist.remove(filter);
-    }
+      this.whitelist.remove(filter);
     else
       this.blacklist.remove(filter);
 
     if (this.cacheEntries > 0)
     {
-      this.resultCache = {__proto__: null};
+      this.resultCache = Object.create(null);
       this.cacheEntries = 0;
     }
   },
@@ -370,7 +347,7 @@ CombinedMatcher.prototype =
    * simultaneously. For parameters see Matcher.matchesAny().
    * @see Matcher#matchesAny
    */
-  matchesAnyInternal: function(location, contentType, docDomain, thirdParty, privatenode)
+  matchesAnyInternal: function(location, contentType, docDomain, thirdParty, sitekey, privatenode)
   {
     let candidates = location.toLowerCase().match(/[a-z0-9%]{3,}/g);
     if (candidates === null)
@@ -383,12 +360,12 @@ CombinedMatcher.prototype =
       let substr = candidates[i];
       if (substr in this.whitelist.filterByKeyword)
       {
-        let result = this.whitelist._checkEntryMatch(substr, location, contentType, docDomain, thirdParty, privatenode);
+        let result = this.whitelist._checkEntryMatch(substr, location, contentType, docDomain, thirdParty, sitekey, privatenode);
         if (result)
           return result;
       }
       if (substr in this.blacklist.filterByKeyword && blacklistHit === null)
-        blacklistHit = this.blacklist._checkEntryMatch(substr, location, contentType, docDomain, thirdParty, privatenode);
+        blacklistHit = this.blacklist._checkEntryMatch(substr, location, contentType, docDomain, thirdParty, sitekey, privatenode);
     }
     return blacklistHit;
   },
@@ -396,19 +373,19 @@ CombinedMatcher.prototype =
   /**
    * @see Matcher#matchesAny
    */
-  matchesAny: function(location, contentType, docDomain, thirdParty, privatenode)
+  matchesAny: function(location, contentType, docDomain, thirdParty, sitekey, privatenode)
   {
-    let key = location + " " + contentType + " " + docDomain + " " + thirdParty;
+    let key = location + " " + contentType + " " + docDomain + " " + thirdParty + " " + sitekey;
     if (!privatenode){
       if (key in this.resultCache)
         return this.resultCache[key];
     }
 
-    let result = this.matchesAnyInternal(location, contentType, docDomain, thirdParty, privatenode);
+    let result = this.matchesAnyInternal(location, contentType, docDomain, thirdParty, sitekey, privatenode);
 
     if (this.cacheEntries >= CombinedMatcher.maxCacheEntries)
     {
-      this.resultCache = {__proto__: null};
+      this.resultCache = Object.create(null);
       this.cacheEntries = 0;
     }
 
@@ -418,24 +395,6 @@ CombinedMatcher.prototype =
     }
 
     return result;
-  },
-
-  /**
-   * Looks up whether any filters match the given website key.
-   */
-  matchesByKey: function(/**String*/ location, /**String*/ key, /**String*/ docDomain)
-  {
-    key = key.toUpperCase();
-    if (key in this.keys)
-    {
-      let filter = Filter.knownFilters[this.keys[key]];
-      if (filter && filter.matches(location, "DOCUMENT", docDomain, false))
-        return filter;
-      else
-        return null;
-    }
-    else
-      return null;
   }
 }
 
diff --git a/data/extensions/spyblock@gnu.org/lib/messageResponder.js b/data/extensions/spyblock@gnu.org/lib/messageResponder.js
new file mode 100644
index 0000000..0f5ff0e
--- /dev/null
+++ b/data/extensions/spyblock@gnu.org/lib/messageResponder.js
@@ -0,0 +1,180 @@
+/*
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
+ *
+ * Adblock Plus is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Adblock Plus is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+(function(global)
+{
+  if (!global.ext)
+    global.ext = require("ext_background");
+
+  var Utils = require("utils").Utils;
+  var FilterStorage = require("filterStorage").FilterStorage;
+  var FilterNotifier = require("filterNotifier").FilterNotifier;
+  var defaultMatcher = require("matcher").defaultMatcher;
+  var BlockingFilter = require("filterClasses").BlockingFilter;
+  var Synchronizer = require("synchronizer").Synchronizer;
+
+  var subscriptionClasses = require("subscriptionClasses");
+  var Subscription = subscriptionClasses.Subscription;
+  var DownloadableSubscription = subscriptionClasses.DownloadableSubscription;
+  var SpecialSubscription = subscriptionClasses.SpecialSubscription;
+
+  var subscriptionKeys = ["disabled", "homepage", "lastSuccess", "title", "url", "downloadStatus"];
+  function convertSubscription(subscription)
+  {
+    var result = {};
+    for (var i = 0; i < subscriptionKeys.length; i++)
+      result[subscriptionKeys[i]] = subscription[subscriptionKeys[i]]
+    return result;
+  }
+
+  var changeListeners = null;
+  var messageTypes = {
+    "app": "app.listen",
+    "filter": "filters.listen",
+    "subscription": "subscriptions.listen"
+  };
+
+  function onFilterChange(action)
+  {
+    var parts = action.split(".", 2);
+    var type;
+    if (parts.length == 1)
+    {
+      type = "app";
+      action = parts[0];
+    }
+    else
+    {
+      type = parts[0];
+      action = parts[1];
+    }
+
+    if (!messageTypes.hasOwnProperty(type))
+      return;
+
+    var args = Array.prototype.slice.call(arguments, 1).map(function(arg)
+    {
+      if (arg instanceof Subscription)
+        return convertSubscription(arg);
+      else
+        return arg;
+    });
+
+    var pages = changeListeners.keys();
+    for (var i = 0; i < pages.length; i++)
+    {
+      var filters = changeListeners.get(pages[i]);
+      if (filters[type] && filters[type].indexOf(action) >= 0)
+      {
+        pages[i].sendMessage({
+          type: messageTypes[type],
+          action: action,
+          args: args
+        });
+      }
+    }
+  };
+
+  global.ext.onMessage.addListener(function(message, sender, callback)
+  {
+    switch (message.type)
+    {
+      case "app.get":
+        if (message.what == "issues")
+        {
+          var info = require("info");
+          callback({
+            seenDataCorruption: "seenDataCorruption" in global ? global.seenDataCorruption : false,
+            filterlistsReinitialized: "filterlistsReinitialized" in global ? global.filterlistsReinitialized : false,
+            legacySafariVersion: (info.platform == "safari" && (
+                Services.vc.compare(info.platformVersion, "6.0") < 0 ||   // beforeload breaks websites in Safari 5
+                Services.vc.compare(info.platformVersion, "6.1") == 0 ||  // extensions are broken in 6.1 and 7.0
+                Services.vc.compare(info.platformVersion, "7.0") == 0))
+          });
+        }
+        else if (message.what == "doclink")
+          callback(Utils.getDocLink(message.link));
+        else if (message.what == "localeInfo")
+        {
+          var bidiDir;
+          if ("chromeRegistry" in Utils)
+            bidiDir = Utils.chromeRegistry.isLocaleRTL("adblockplus") ? "rtl" : "ltr";
+          else
+            bidiDir = ext.i18n.getMessage("@@bidi_dir");
+
+          callback({locale: Utils.appLocale, bidiDir: bidiDir});
+        }
+        else
+          callback(null);
+        break;
+      case "app.open":
+        if (message.what == "options")
+          ext.showOptions();
+        break;
+      case "subscriptions.get":
+        var subscriptions = FilterStorage.subscriptions.filter(function(s)
+        {
+          if (message.ignoreDisabled && s.disabled)
+            return false;
+          if (s instanceof DownloadableSubscription && message.downloadable)
+            return true;
+          if (s instanceof SpecialSubscription && message.special)
+            return true;
+          return false;
+        });
+        callback(subscriptions.map(convertSubscription));
+        break;
+      case "filters.blocked":
+        var filter = defaultMatcher.matchesAny(message.url, message.requestType, message.docDomain, message.thirdParty);
+        callback(filter instanceof BlockingFilter);
+        break;
+      case "subscriptions.toggle":
+        var subscription = Subscription.fromURL(message.url);
+        if (subscription.url in FilterStorage.knownSubscriptions && !subscription.disabled)
+          FilterStorage.removeSubscription(subscription);
+        else
+        {
+          subscription.disabled = false;
+          subscription.title = message.title;
+          subscription.homepage = message.homepage;
+          FilterStorage.addSubscription(subscription);
+          if (!subscription.lastDownload)
+            Synchronizer.execute(subscription);
+        }
+        break;
+      case "subscriptions.listen":
+        if (!changeListeners)
+        {
+          changeListeners = new global.ext.PageMap();
+          FilterNotifier.addListener(onFilterChange);
+        }
+
+        var filters = changeListeners.get(sender.page);
+        if (!filters)
+        {
+          filters = Object.create(null);
+          changeListeners.set(sender.page, filters);
+        }
+
+        if (message.filter)
+          filters.subscription = message.filter;
+        else
+          delete filters.subscription;
+        break;
+    }
+  });
+})(this);
diff --git a/data/extensions/spyblock@gnu.org/lib/notification.js b/data/extensions/spyblock@gnu.org/lib/notification.js
index 06e949e..1fa8eed 100644
--- a/data/extensions/spyblock@gnu.org/lib/notification.js
+++ b/data/extensions/spyblock@gnu.org/lib/notification.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -21,7 +21,6 @@
 
 Cu.import("resource://gre/modules/Services.jsm");
 
-let {TimeLine} = require("timeline");
 let {Prefs} = require("prefs");
 let {Downloader, Downloadable, MILLIS_IN_MINUTE, MILLIS_IN_HOUR, MILLIS_IN_DAY} = require("downloader");
 let {Utils} = require("utils");
@@ -81,8 +80,6 @@ let Notification = exports.Notification =
    */
   init: function()
   {
-    TimeLine.enter("Entered Notification.init()");
-
     downloader = new Downloader(this._getDownloadables.bind(this), INITIAL_DELAY, CHECK_INTERVAL);
     onShutdown.add(function()
     {
@@ -92,8 +89,6 @@ let Notification = exports.Notification =
     downloader.onExpirationChange = this._onExpirationChange.bind(this);
     downloader.onDownloadSuccess = this._onDownloadSuccess.bind(this);
     downloader.onDownloadError = this._onDownloadError.bind(this);
-
-    TimeLine.leave("Notification.init() done");
   },
 
   /**
@@ -112,6 +107,8 @@ let Notification = exports.Notification =
       downloadable.softExpiration = Prefs.notificationdata.softExpiration;
     if (typeof Prefs.notificationdata.hardExpiration === "number")
       downloadable.hardExpiration = Prefs.notificationdata.hardExpiration;
+    if (typeof Prefs.notificationdata.downloadCount === "number")
+      downloadable.downloadCount = Prefs.notificationdata.downloadCount;
     yield downloadable;
   },
 
@@ -149,6 +146,7 @@ let Notification = exports.Notification =
     Prefs.notificationdata.lastError = 0;
     Prefs.notificationdata.downloadStatus = "synchronize_ok";
     [Prefs.notificationdata.softExpiration, Prefs.notificationdata.hardExpiration] = downloader.processExpirationInterval(EXPIRATION_INTERVAL);
+    Prefs.notificationdata.downloadCount = downloadable.downloadCount;
     saveNotificationData();
   },
 
diff --git a/data/extensions/spyblock@gnu.org/lib/objectTabs.js b/data/extensions/spyblock@gnu.org/lib/objectTabs.js
index 7b1c1af..bcf4362 100644
--- a/data/extensions/spyblock@gnu.org/lib/objectTabs.js
+++ b/data/extensions/spyblock@gnu.org/lib/objectTabs.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -226,8 +226,10 @@ var objTabs =
 
   /**
    * Makes the tab element visible.
+   * @param {Element} element
+   * @param {RequestEntry} data
    */
-  _showTab: function(/**Element*/ element, /**RequestEntry*/ data)
+  _showTab: function(element, data)
   {
     let {UI} = require("ui");
     if (!UI.overlay)
@@ -420,8 +422,11 @@ var objTabs =
 
   /**
    * Called whenever a timer fires.
+   * @param {nsISupport} subject
+   * @param {string} topic
+   * @param {string} data
    */
-  observe: function(/**nsISupport*/ subject, /**String*/ topic, /**String*/ data)
+  observe: function(subject, topic, data)
   {
     if (subject == this.positionTimer)
     {
diff --git a/data/extensions/spyblock@gnu.org/lib/prefs.js b/data/extensions/spyblock@gnu.org/lib/prefs.js
index e1b6ae0..ab1cc5c 100644
--- a/data/extensions/spyblock@gnu.org/lib/prefs.js
+++ b/data/extensions/spyblock@gnu.org/lib/prefs.js
@@ -1,19 +1,6 @@
-/*
- * This file is part of the Adblock Plus build tools,
- * Copyright (C) 2006-2014 Eyeo GmbH
- *
- * Adblock Plus is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * Adblock Plus is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
diff --git a/data/extensions/spyblock@gnu.org/lib/requestNotifier.js b/data/extensions/spyblock@gnu.org/lib/requestNotifier.js
index 2ee9ec3..8b9ca30 100644
--- a/data/extensions/spyblock@gnu.org/lib/requestNotifier.js
+++ b/data/extensions/spyblock@gnu.org/lib/requestNotifier.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -27,6 +27,7 @@ let {BlockingFilter, WhitelistFilter, ElemHideBase, ElemHideFilter, ElemHideExce
 let nodeData = new WeakMap();
 let windowStats = new WeakMap();
 let windowSelection = new WeakMap();
+let requestEntryMaxId = 0;
 
 let setEntry, hasEntry, getEntry;
 // Last issue(Bug 982561) preventing us from using WeakMap fixed for FF version 32
@@ -134,8 +135,11 @@ RequestNotifier.prototype =
 
   /**
    * Notifies listener about a new request.
+   * @param {Window} wnd
+   * @param {Node} node
+   * @param {RequestEntry} entry
    */
-  notifyListener: function(/**Window*/ wnd, /**Node*/ node, /**RequestEntry*/ entry)
+  notifyListener: function(wnd, node, entry)
   {
     this.listener.call(this.listenerObj, wnd, node, entry, this.scanComplete);
   },
@@ -244,16 +248,19 @@ RequestNotifier.getDataForNode = function(node, noParent, type, location)
     let data = getEntry(nodeData, node);
     if (typeof data != "undefined")
     {
+      let entry = null;
       // Look for matching entry
       for (let k in data)
       {
-        let entry = data[k];
-        if ((typeof type == "undefined" || entry.type == type) &&
-            (typeof location == "undefined" || entry.location == location))
+        if ((!entry || entry.id < data[k].id) &&
+            (typeof type == "undefined" || data[k].type == type) &&
+            (typeof location == "undefined" || data[k].location == location))
         {
-          return [node, entry];
+          entry = data[k];
         }
       }
+      if (entry)
+        return [node, entry];
     }
 
     // If we don't have any match on this node then maybe its parent will do
@@ -278,6 +285,7 @@ function RequestEntry(node, topWnd, contentType, docDomain, thirdParty, location
   this.thirdParty = thirdParty;
   this.location = location;
   this.filter = filter;
+  this.id = ++requestEntryMaxId;
 
   this.attachToNode(node);
 
@@ -318,6 +326,11 @@ function RequestEntry(node, topWnd, contentType, docDomain, thirdParty, location
 }
 RequestEntry.prototype =
 {
+  /**
+   * id of request (used to determine last entry attached to a node)
+   * @type integer
+   */
+  id: 0,
   /**
    * Content type of the request (one of the nsIContentPolicy constants)
    * @type Integer
diff --git a/data/extensions/spyblock@gnu.org/lib/subscriptionClasses.js b/data/extensions/spyblock@gnu.org/lib/subscriptionClasses.js
index 13dceaf..6ba15f5 100644
--- a/data/extensions/spyblock@gnu.org/lib/subscriptionClasses.js
+++ b/data/extensions/spyblock@gnu.org/lib/subscriptionClasses.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -122,7 +122,7 @@ Subscription.prototype =
   },
 
   /**
-   * Serializes the filter to an array of strings for writing out on the disk.
+   * Serializes the subscription to an array of strings for writing out on the disk.
    * @param {Array of String} buffer  buffer to push the serialization results into
    */
   serialize: function(buffer)
@@ -154,7 +154,7 @@ Subscription.prototype =
  * Cache for known filter subscriptions, maps URL to subscription objects.
  * @type Object
  */
-Subscription.knownSubscriptions = {__proto__: null};
+Subscription.knownSubscriptions = Object.create(null);
 
 /**
  * Returns a subscription from its URL, creates a new one if necessary.
@@ -176,7 +176,7 @@ Subscription.fromURL = function(url)
   {
     return new SpecialSubscription(url);
   }
-}
+};
 
 /**
  * Deserializes a subscription
@@ -196,17 +196,17 @@ Subscription.fromObject = function(obj)
     if ("downloadStatus" in obj)
       result._downloadStatus = obj.downloadStatus;
     if ("lastSuccess" in obj)
-      result.lastSuccess = parseInt(obj.lastSuccess) || 0;
+      result.lastSuccess = parseInt(obj.lastSuccess, 10) || 0;
     if ("lastCheck" in obj)
-      result._lastCheck = parseInt(obj.lastCheck) || 0;
+      result._lastCheck = parseInt(obj.lastCheck, 10) || 0;
     if ("expires" in obj)
-      result.expires = parseInt(obj.expires) || 0;
+      result.expires = parseInt(obj.expires, 10) || 0;
     if ("softExpiration" in obj)
-      result.softExpiration = parseInt(obj.softExpiration) || 0;
+      result.softExpiration = parseInt(obj.softExpiration, 10) || 0;
     if ("errors" in obj)
-      result._errors = parseInt(obj.errors) || 0;
+      result._errors = parseInt(obj.errors, 10) || 0;
     if ("version" in obj)
-      result.version = parseInt(obj.version) || 0;
+      result.version = parseInt(obj.version, 10) || 0;
     if ("requiredVersion" in obj)
     {
       let {addonVersion} = require("info");
@@ -217,7 +217,9 @@ Subscription.fromObject = function(obj)
     if ("homepage" in obj)
       result._homepage = obj.homepage;
     if ("lastDownload" in obj)
-      result._lastDownload = parseInt(obj.lastDownload) || 0;
+      result._lastDownload = parseInt(obj.lastDownload, 10) || 0;
+    if ("downloadCount" in obj)
+      result.downloadCount = parseInt(obj.downloadCount, 10) || 0;
   }
   catch (e)
   {
@@ -250,7 +252,7 @@ Subscription.fromObject = function(obj)
     result._disabled = (obj.disabled == "true");
 
   return result;
-}
+};
 
 /**
  * Class for special filter subscriptions (user's filters)
@@ -329,7 +331,7 @@ SpecialSubscription.create = function(title)
   {
     url = "~user~" + Math.round(Math.random()*1000000);
   } while (url in Subscription.knownSubscriptions);
-  return new SpecialSubscription(url, title)
+  return new SpecialSubscription(url, title);
 };
 
 /**
@@ -425,7 +427,7 @@ RegularSubscription.prototype =
 };
 
 /**
- * Class for filter subscriptions updated by externally (by other extension)
+ * Class for filter subscriptions updated externally (by other extension)
  * @param {String} url    see Subscription()
  * @param {String} [title]  see Subscription()
  * @constructor
@@ -451,7 +453,7 @@ ExternalSubscription.prototype =
 };
 
 /**
- * Class for filter subscriptions updated by externally (by other extension)
+ * Class for filter subscriptions updated externally (by other extension)
  * @param {String} url  see Subscription()
  * @param {String} [title]  see Subscription()
  * @constructor
@@ -563,6 +565,12 @@ DownloadableSubscription.prototype =
    */
   upgradeRequired: false,
 
+  /**
+   * Number indicating how often the object was downloaded.
+   * @type Number
+   */
+  downloadCount: 0,
+
   /**
    * Should be true if the Privatemode: header is set to true in the subscription
    * @type Boolean
@@ -591,6 +599,8 @@ DownloadableSubscription.prototype =
       buffer.push("version=" + this.version);
     if (this.requiredVersion)
       buffer.push("requiredVersion=" + this.requiredVersion);
+    if (this.downloadCount)
+      buffer.push("downloadCount=" + this.downloadCount);
     if (this.privateMode)
       buffer.push("privateMode=" + this.privateMode);
   }
diff --git a/data/extensions/spyblock@gnu.org/lib/sync.js b/data/extensions/spyblock@gnu.org/lib/sync.js
index 05eeced..a250e81 100644
--- a/data/extensions/spyblock@gnu.org/lib/sync.js
+++ b/data/extensions/spyblock@gnu.org/lib/sync.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -250,7 +250,7 @@ ABPStore.prototype =
     let data = record.cleartext.subscriptions;
 
     // First make sure we have the same subscriptions on both sides
-    let seenSubscription = {__proto__: null};
+    let seenSubscription = Object.create(null);
     for (let remoteSubscription of data)
     {
       seenSubscription[remoteSubscription.url] = true;
@@ -292,7 +292,7 @@ ABPStore.prototype =
     }
 
     // Now sync the custom filters
-    let seenFilter = {__proto__: null};
+    let seenFilter = Object.create(null);
     for (let remoteSubscription of data)
     {
       if (!("filters" in remoteSubscription))
diff --git a/data/extensions/spyblock@gnu.org/lib/synchronizer.js b/data/extensions/spyblock@gnu.org/lib/synchronizer.js
index b9f9e29..2304895 100644
--- a/data/extensions/spyblock@gnu.org/lib/synchronizer.js
+++ b/data/extensions/spyblock@gnu.org/lib/synchronizer.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -22,7 +22,6 @@
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-let {TimeLine} = require("timeline");
 let {Downloader, Downloadable,
     MILLIS_IN_SECOND, MILLIS_IN_MINUTE, MILLIS_IN_HOUR, MILLIS_IN_DAY} = require("downloader");
 let {Filter, CommentFilter} = require("filterClasses");
@@ -54,8 +53,6 @@ let Synchronizer = exports.Synchronizer =
    */
   init: function()
   {
-    TimeLine.enter("Entered Synchronizer.init()");
-
     downloader = new Downloader(this._getDownloadables.bind(this), INITIAL_DELAY, CHECK_INTERVAL);
     onShutdown.add(function()
     {
@@ -66,8 +63,6 @@ let Synchronizer = exports.Synchronizer =
     downloader.onDownloadStarted = this._onDownloadStarted.bind(this);
     downloader.onDownloadSuccess = this._onDownloadSuccess.bind(this);
     downloader.onDownloadError = this._onDownloadError.bind(this);
-
-    TimeLine.leave("Synchronizer.init() done");
   },
 
   /**
@@ -118,6 +113,7 @@ let Synchronizer = exports.Synchronizer =
     result.softExpiration = subscription.softExpiration * MILLIS_IN_SECOND;
     result.hardExpiration = subscription.expires * MILLIS_IN_SECOND;
     result.manual = manual;
+    result.downloadCount = subscription.downloadCount;
     result.privateMode = subscription.privateMode;
     return result;
   },
@@ -202,6 +198,7 @@ let Synchronizer = exports.Synchronizer =
     // The download actually succeeded
     subscription.lastSuccess = subscription.lastDownload = Math.round(Date.now() / MILLIS_IN_SECOND);
     subscription.downloadStatus = "synchronize_ok";
+    subscription.downloadCount = downloadable.downloadCount;
     subscription.errors = 0;
 
     // Remove lines containing parameters
diff --git a/data/extensions/spyblock@gnu.org/lib/timeline.js b/data/extensions/spyblock@gnu.org/lib/timeline.js
deleted file mode 100644
index 18c10fb..0000000
--- a/data/extensions/spyblock@gnu.org/lib/timeline.js
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
- *
- * Adblock Plus is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * Adblock Plus is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @fileOverview Debugging module used for load time measurements.
- */
-
-let nestingCounter = 0;
-let firstTimeStamp = null;
-let lastTimeStamp = null;
-
-let asyncActions = {__proto__: null};
-
-/**
- * Time logging module, used to measure startup time of Adblock Plus (development builds only).
- * @class
- */
-let TimeLine = exports.TimeLine = {
-  /**
-   * Logs an event to console together with the time it took to get there.
-   */
-  log: function(/**String*/ message, /**Boolean*/ _forceDisplay)
-  {
-    if (!_forceDisplay && nestingCounter <= 0)
-      return;
-
-    let now = Date.now();
-    let diff = lastTimeStamp ? Math.round(now - lastTimeStamp) : "first event";
-    lastTimeStamp = now;
-
-    // Indent message depending on current nesting level
-    for (let i = 0; i < nestingCounter; i++)
-      message = "* " + message;
-
-    // Pad message with spaces
-    let padding = [];
-    for (let i = message.toString().length; i < 80; i++)
-      padding.push(" ");
-    dump("[" + now + "] ABP timeline: " + message + padding.join("") + "\t (" + diff + ")\n");
-  },
-
-  /**
-   * Called to indicate that application entered a block that needs to be timed.
-   */
-  enter: function(/**String*/ message)
-  {
-    if (nestingCounter <= 0)
-      firstTimeStamp = Date.now();
-
-    this.log(message, true);
-    nestingCounter = (nestingCounter <= 0 ? 1 : nestingCounter + 1);
-  },
-
-  /**
-   * Called when application exited a block that TimeLine.enter() was called for.
-   * @param {String} message  message to be logged
-   * @param {String} [asyncAction]  identifier of a pending async action
-   */
-  leave: function(message, asyncAction)
-  {
-    if (typeof asyncAction != "undefined")
-      message += " (async action pending)";
-
-    nestingCounter--;
-    this.log(message, true);
-
-    if (nestingCounter <= 0)
-    {
-      if (firstTimeStamp !== null)
-        dump("ABP timeline: Total time elapsed: " + Math.round(Date.now() - firstTimeStamp) + "\n");
-      firstTimeStamp = null;
-      lastTimeStamp = null;
-    }
-
-    if (typeof asyncAction != "undefined")
-    {
-      if (asyncAction in asyncActions)
-        dump("ABP timeline: Warning: Async action " + asyncAction + " already executing\n");
-      asyncActions[asyncAction] = {start: Date.now(), total: 0};
-    }
-  },
-
-  /**
-   * Called when the application starts processing of an async action.
-   */
-  asyncStart: function(/**String*/ asyncAction)
-  {
-    if (asyncAction in asyncActions)
-    {
-      let action = asyncActions[asyncAction];
-      if ("currentStart" in action)
-        dump("ABP timeline: Warning: Processing reentered for async action " + asyncAction + "\n");
-      action.currentStart = Date.now();
-    }
-    else
-      dump("ABP timeline: Warning: Async action " + asyncAction + " is unknown\n");
-  },
-
-  /**
-   * Called when the application finishes processing of an async action.
-   */
-  asyncEnd: function(/**String*/ asyncAction)
-  {
-    if (asyncAction in asyncActions)
-    {
-      let action = asyncActions[asyncAction];
-      if ("currentStart" in action)
-      {
-        action.total += Date.now() - action.currentStart;
-        delete action.currentStart;
-      }
-      else
-        dump("ABP timeline: Warning: Processing not entered for async action " + asyncAction + "\n");
-    }
-    else
-      dump("ABP timeline: Warning: Async action " + asyncAction + " is unknown\n");
-  },
-
-  /**
-   * Called when an async action is done and its time can be logged.
-   */
-  asyncDone: function(/**String*/ asyncAction)
-  {
-    if (asyncAction in asyncActions)
-    {
-      let action = asyncActions[asyncAction];
-      let now = Date.now();
-      let diff = now - action.start;
-      if ("currentStart" in action)
-        dump("ABP timeline: Warning: Still processing for async action " + asyncAction + "\n");
-
-      let message = "Async action " + asyncAction + " done";
-      let padding = [];
-      for (let i = message.toString().length; i < 80; i++)
-        padding.push(" ");
-      dump("[" + now + "] ABP timeline: " + message + padding.join("") + "\t (" + action.total + "/" + diff + ")\n");
-    }
-    else
-      dump("ABP timeline: Warning: Async action " + asyncAction + " is unknown\n");
-  }
-};
diff --git a/data/extensions/spyblock@gnu.org/lib/ui.js b/data/extensions/spyblock@gnu.org/lib/ui.js
index 668e356..2910337 100644
--- a/data/extensions/spyblock@gnu.org/lib/ui.js
+++ b/data/extensions/spyblock@gnu.org/lib/ui.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -159,7 +159,8 @@ let optionsObserver =
             return;
 
           let currentSubscription = FilterStorage.subscriptions.filter((subscription) => subscription instanceof DownloadableSubscription &&
-            subscription.url != Prefs.subscriptions_exceptionsurl);
+            subscription.url != Prefs.subscriptions_exceptionsurl && 
+            subscription.url != Prefs.subscriptions_antiadblockurl);
           currentSubscription = (currentSubscription.length ? currentSubscription[0] : null);
 
           let subscriptions =request.responseXML.getElementsByTagName("subscription");
@@ -504,6 +505,11 @@ let UI = exports.UI =
     {
       Prefs.currentVersion = addonVersion;
       this.addSubscription(window, prevVersion);
+
+      // The "Hide placeholders" option has been removed from the UI in 2.6.6.3881
+      // So we reset the option for users updating from older versions.
+      if (prevVersion && Services.vc.compare(prevVersion, "2.6.6.3881") < 0)
+        Prefs.fastcollapse = false;
     }
   },
 
@@ -830,12 +836,12 @@ let UI = exports.UI =
     FilterStorage.addSubscription(subscription);
     Synchronizer.execute(subscription);
 
-    let subscription = Subscription.fromURL("http://gnuzilla.gnu.org/filters/third-party.txt");
+    subscription = Subscription.fromURL("http://gnuzilla.gnu.org/filters/third-party.txt");
     subscription.disabled = false;
     FilterStorage.addSubscription(subscription);
     Synchronizer.execute(subscription);
 
-    let subscription = Subscription.fromURL("http://gnuzilla.gnu.org/filters/javascript.txt");
+    subscription = Subscription.fromURL("http://gnuzilla.gnu.org/filters/javascript.txt");
     subscription.disabled = true;
     FilterStorage.addSubscription(subscription);
     Synchronizer.execute(subscription);
@@ -967,12 +973,12 @@ let UI = exports.UI =
       mainSubscriptionURL = null;
 
     // Trim spaces in title and URL
-    title = title.replace(/^\s+/, "").replace(/\s+$/, "");
-    url = url.replace(/^\s+/, "").replace(/\s+$/, "");
+    title = title.trim();
+    url = url.trim();
     if (mainSubscriptionURL)
     {
-      mainSubscriptionTitle = mainSubscriptionTitle.replace(/^\s+/, "").replace(/\s+$/, "");
-      mainSubscriptionURL = mainSubscriptionURL.replace(/^\s+/, "").replace(/\s+$/, "");
+      mainSubscriptionTitle = mainSubscriptionTitle.trim();
+      mainSubscriptionURL = mainSubscriptionURL.trim();
     }
 
     // Verify that the URL is valid
@@ -1548,7 +1554,6 @@ let UI = exports.UI =
 
     setChecked(prefix + "disabled", !Prefs.enabled);
     setChecked(prefix + "frameobjects", Prefs.frameobjects);
-    setChecked(prefix + "slowcollapse", !Prefs.fastcollapse);
     setChecked(prefix + "savestats", Prefs.savestats);
 
     let {defaultToolbarPosition, statusbarPosition} = require("appSupport");
@@ -1903,8 +1908,10 @@ let UI = exports.UI =
     let messageElement = window.document.getElementById("abp-notification-message");
     messageElement.innerHTML = "";
     let docLinks = [];
-    for (let link of notification.links)
-      docLinks.push(Utils.getDocLink(link));
+    if (notification.links)
+      for (let link of notification.links)
+        docLinks.push(Utils.getDocLink(link));
+
     insertMessage(messageElement, texts.message, docLinks);
 
     messageElement.addEventListener("click", function(event)
@@ -1955,7 +1962,6 @@ let eventHandlers = [
   ["abp-command-togglesitewhitelist", "command", function() { UI.toggleFilter(siteWhitelist); }],
   ["abp-command-togglepagewhitelist", "command", function() { UI.toggleFilter(pageWhitelist); }],
   ["abp-command-toggleobjtabs", "command", UI.togglePref.bind(UI, "frameobjects")],
-  ["abp-command-togglecollapse", "command", UI.togglePref.bind(UI, "fastcollapse")],
   ["abp-command-togglesavestats", "command", UI.toggleSaveStats.bind(UI)],
   ["abp-command-togglesync", "command", UI.toggleSync.bind(UI)],
   ["abp-command-toggleshowintoolbar", "command", UI.toggleToolbarIcon.bind(UI)],
diff --git a/data/extensions/spyblock@gnu.org/lib/utils.js b/data/extensions/spyblock@gnu.org/lib/utils.js
index a18cebe..13f4876 100644
--- a/data/extensions/spyblock@gnu.org/lib/utils.js
+++ b/data/extensions/spyblock@gnu.org/lib/utils.js
@@ -1,6 +1,6 @@
 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -73,8 +73,8 @@ let Utils = exports.Utils =
     {
       Cu.reportError(e);
     }
-    Utils.__defineGetter__("appLocale", () => locale);
-    return Utils.appLocale;
+    Object.defineProperty(this, "appLocale", {value: locale});
+    return locale;
   },
 
   /**
@@ -83,8 +83,8 @@ let Utils = exports.Utils =
   get platformVersion()
   {
     let platformVersion = Services.appinfo.platformVersion;
-    Utils.__defineGetter__("platformVersion", () => platformVersion);
-    return Utils.platformVersion;
+    Object.defineProperty(this, "platformVersion", {value: platformVersion});
+    return platformVersion;
   },
 
   /**
@@ -215,8 +215,10 @@ let Utils = exports.Utils =
    * Posts an action to the event queue of the current thread to run it
    * asynchronously. Any additional parameters to this function are passed
    * as parameters to the callback.
+   * @param {function} callback
+   * @param {object} thisPtr
    */
-  runAsync: function(/**Function*/ callback, /**Object*/ thisPtr)
+  runAsync: function(callback, thisPtr)
   {
     let params = Array.prototype.slice.call(arguments, 2);
     let runnable = {
@@ -400,8 +402,12 @@ let Utils = exports.Utils =
 
   /**
    * Verifies RSA signature. The public key and signature should be base64-encoded.
+   * @param {string} key
+   * @param {string} signature
+   * @param {string} data
+   * @return {boolean}
    */
-  verifySignature: function(/**String*/ key, /**String*/ signature, /**String*/ data) /**Boolean*/
+  verifySignature: function(key, signature, data)
   {
     if (!Utils.crypto)
       return false;
@@ -539,7 +545,7 @@ let Utils = exports.Utils =
 function Cache(/**Integer*/ size)
 {
   this._ringBuffer = new Array(size);
-  this.data = {__proto__: null};
+  this.data = Object.create(null);
 }
 exports.Cache = Cache;
 
@@ -593,7 +599,7 @@ Cache.prototype =
   clear: function()
   {
     this._ringBuffer = new Array(this._ringBuffer.length);
-    this.data = {__proto__: null};
+    this.data = Object.create(null);
   }
 }
 
@@ -631,7 +637,12 @@ XPCOMUtils.defineLazyGetter(Utils, "crypto", function()
     catch (e)
     {
       // It seems that on Mac OS X the full path name needs to be specified
-      let file = Services.dirsvc.get("GreD", Ci.nsILocalFile);
+      let file;
+      // Gecko 35 added GreBinD key, see https://bugzilla.mozilla.org/show_bug.cgi?id=1077099
+      if (Services.dirsvc.has("GreBinD"))
+        file = Services.dirsvc.get("GreBinD", Ci.nsILocalFile);
+      else
+        file = Services.dirsvc.get("GreD", Ci.nsILocalFile);
       file.append(ctypes.libraryName("nss3"));
       nsslib = ctypes.open(file.path);
     }
diff --git a/data/extensions/spyblock@gnu.org/lib/windowObserver.js b/data/extensions/spyblock@gnu.org/lib/windowObserver.js
index eb0b13a..7d34f8a 100644
--- a/data/extensions/spyblock@gnu.org/lib/windowObserver.js
+++ b/data/extensions/spyblock@gnu.org/lib/windowObserver.js
@@ -1,19 +1,6 @@
-/*
- * This file is part of the Adblock Plus build tools,
- * Copyright (C) 2006-2014 Eyeo GmbH
- *
- * Adblock Plus is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * Adblock Plus is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
@@ -48,7 +35,7 @@ function WindowObserver(listener, when)
     if (windows.indexOf(element) < 0)
       windows.push(element);
   }
-  
+
   for (let i = 0; i < windows.length; i++)
   {
     let window = windows[i].QueryInterface(Ci.nsIDOMWindow);
-- 
cgit v1.2.3