[Pkg-mozext-commits] [adblock-plus] 01/02: Imported Upstream version 2.4.1
David Prévot
taffit at moszumanska.debian.org
Sat Jan 18 17:00:29 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch dfsg_clean
in repository adblock-plus.
commit 7b7d14ec528851e0156644b9bdf94bd7cdffc14a
Author: David Prévot <taffit at debian.org>
Date: Sat Jan 18 11:03:01 2014 -0400
Imported Upstream version 2.4.1
---
.hg_archival.txt | 4 +-
.hgsubstate | 2 +-
buildtools/Info.plist.tmpl | 159 +++++++++++++
buildtools/background.html.tmpl | 9 +
buildtools/build.py | 10 +-
buildtools/imageConversion.py | 135 +++++++++++
buildtools/lib/keySelector.js | 4 +-
buildtools/lib/prefs.js | 1 +
buildtools/localeTools.py | 14 +-
buildtools/manifest.json.tmpl | 2 +-
buildtools/packager.py | 9 +
buildtools/packagerChrome.py | 17 +-
buildtools/packagerGecko.py | 7 +-
buildtools/packagerSafari.py | 269 ++++++++++++++++++++++
buildtools/safariInfo.js.tmpl | 32 +++
chrome/content/ui/firstRun.html | 94 +++-----
chrome/content/ui/firstRun.js | 18 +-
chrome/content/ui/i18n.js | 10 +-
chrome/content/ui/overlay.xul | 9 +-
chrome/content/ui/settings.xul | 1 -
chrome/content/ui/sidebar.js | 42 ++--
chrome/locale/{id => ach}/.incomplete | 0
chrome/locale/ach/composer.dtd | 6 +
chrome/locale/ar/composer.dtd | 2 +-
chrome/locale/ar/filters.dtd | 2 +-
chrome/locale/ar/firstRun.properties | 5 +-
chrome/locale/ar/overlay.dtd | 9 +-
chrome/locale/bg/composer.dtd | 4 +-
chrome/locale/bg/firstRun.properties | 13 +-
chrome/locale/bg/overlay.dtd | 1 -
chrome/locale/ca/composer.dtd | 8 +-
chrome/locale/ca/overlay.dtd | 1 -
chrome/locale/cs/composer.dtd | 8 +-
chrome/locale/cs/filters.dtd | 4 +-
chrome/locale/cs/firstRun.properties | 7 +-
chrome/locale/cs/overlay.dtd | 1 -
chrome/locale/da/firstRun.properties | 5 +-
chrome/locale/da/overlay.dtd | 1 -
chrome/locale/de/composer.dtd | 4 +-
chrome/locale/de/firstRun.properties | 5 +-
chrome/locale/de/overlay.dtd | 1 -
chrome/locale/dsb/firstRun.properties | 5 +-
chrome/locale/dsb/overlay.dtd | 1 -
chrome/locale/el/firstRun.properties | 5 +-
chrome/locale/el/overlay.dtd | 1 -
chrome/locale/en-GB/firstRun.properties | 18 +-
chrome/locale/en-GB/overlay.dtd | 1 -
chrome/locale/en-US/firstRun.properties | 5 +-
chrome/locale/en-US/overlay.dtd | 1 -
chrome/locale/eo/firstRun.properties | 5 +-
chrome/locale/eo/overlay.dtd | 1 -
chrome/locale/es-AR/firstRun.properties | 5 +-
chrome/locale/es-AR/overlay.dtd | 1 -
chrome/locale/es-CL/composer.dtd | 24 +-
chrome/locale/es-CL/sidebar.dtd | 33 +++
chrome/locale/es-ES/firstRun.properties | 5 +-
chrome/locale/es-ES/overlay.dtd | 1 -
chrome/locale/es-MX/composer.dtd | 12 +-
chrome/locale/es-MX/firstRun.properties | 5 +-
chrome/locale/es-MX/overlay.dtd | 1 -
chrome/locale/et/firstRun.properties | 8 +
chrome/locale/et/overlay.dtd | 1 -
chrome/locale/eu/composer.dtd | 16 +-
chrome/locale/eu/filters.dtd | 12 +-
chrome/locale/eu/firstRun.properties | 18 +-
chrome/locale/eu/global.properties | 6 +-
chrome/locale/eu/meta.properties | 4 +-
chrome/locale/eu/overlay.dtd | 1 -
chrome/locale/eu/sendReport.dtd | 14 +-
chrome/locale/eu/sidebar.dtd | 2 +-
chrome/locale/fa/composer.dtd | 2 +-
chrome/locale/fa/filters.dtd | 14 +-
chrome/locale/fa/firstRun.properties | 20 +-
chrome/locale/fa/global.properties | 22 +-
chrome/locale/fa/meta.properties | 7 +-
chrome/locale/fa/overlay.dtd | 28 ++-
chrome/locale/fa/sendReport.dtd | 37 +--
chrome/locale/fa/sidebar.dtd | 14 +-
chrome/locale/fa/subscriptionSelection.dtd | 10 +-
chrome/locale/fi/firstRun.properties | 19 +-
chrome/locale/fi/overlay.dtd | 1 -
chrome/locale/fi/subscriptionSelection.dtd | 14 +-
chrome/locale/fr/firstRun.properties | 5 +-
chrome/locale/fr/overlay.dtd | 1 -
chrome/locale/fy-NL/filters.dtd | 49 +++-
chrome/locale/fy-NL/firstRun.properties | 20 ++
chrome/locale/fy-NL/global.properties | 9 +-
chrome/locale/fy-NL/overlay.dtd | 2 +-
chrome/locale/fy-NL/sendReport.dtd | 15 +-
chrome/locale/fy-NL/sidebar.dtd | 4 +-
chrome/locale/gl/firstRun.properties | 5 +-
chrome/locale/gl/overlay.dtd | 1 -
chrome/locale/{id => gu-IN}/.incomplete | 0
chrome/locale/gu-IN/composer.dtd | 2 +
chrome/locale/he/firstRun.properties | 5 +-
chrome/locale/he/overlay.dtd | 1 -
chrome/locale/hi-IN/composer.dtd | 19 +-
chrome/locale/hr/firstRun.properties | 13 +-
chrome/locale/hr/overlay.dtd | 1 -
chrome/locale/hsb/firstRun.properties | 5 +-
chrome/locale/hsb/overlay.dtd | 1 -
chrome/locale/hu/firstRun.properties | 5 +-
chrome/locale/hu/overlay.dtd | 1 -
chrome/locale/hy-AM/firstRun.properties | 21 +-
chrome/locale/hy-AM/overlay.dtd | 1 -
chrome/locale/id/composer.dtd | 33 +++
chrome/locale/id/filters.dtd | 16 +-
chrome/locale/id/firstRun.properties | 11 +-
chrome/locale/id/global.properties | 4 +-
chrome/locale/id/meta.properties | 10 +-
chrome/locale/id/overlay.dtd | 3 +-
chrome/locale/id/sendReport.dtd | 8 +-
chrome/locale/is/firstRun.properties | 5 +-
chrome/locale/is/overlay.dtd | 1 -
chrome/locale/it/composer.dtd | 10 +-
chrome/locale/it/firstRun.properties | 11 +-
chrome/locale/it/overlay.dtd | 1 -
chrome/locale/ja/firstRun.properties | 7 +-
chrome/locale/ja/meta.properties | 2 +-
chrome/locale/ja/overlay.dtd | 3 +-
chrome/locale/ka/composer.dtd | 19 +-
chrome/locale/ka/filters.dtd | 24 ++
chrome/locale/ka/overlay.dtd | 1 -
chrome/locale/ka/sendReport.dtd | 1 +
chrome/locale/ka/sidebar.dtd | 40 +++-
chrome/locale/kk/firstRun.properties | 13 +-
chrome/locale/kk/overlay.dtd | 1 -
chrome/locale/kn/composer.dtd | 3 +
chrome/locale/ko/composer.dtd | 4 +-
chrome/locale/ko/overlay.dtd | 1 -
chrome/locale/lt/firstRun.properties | 5 +-
chrome/locale/lt/overlay.dtd | 1 -
chrome/locale/lv/firstRun.properties | 5 +-
chrome/locale/lv/overlay.dtd | 1 -
chrome/locale/ms/firstRun.properties | 19 +-
chrome/locale/ms/overlay.dtd | 1 -
chrome/locale/nb-NO/composer.dtd | 18 +-
chrome/locale/nb-NO/filters.dtd | 25 +-
chrome/locale/nb-NO/firstRun.properties | 20 +-
chrome/locale/nb-NO/global.properties | 17 +-
chrome/locale/nb-NO/meta.properties | 6 +-
chrome/locale/nb-NO/overlay.dtd | 34 +--
chrome/locale/nb-NO/sendReport.dtd | 39 +++-
chrome/locale/nb-NO/sidebar.dtd | 17 +-
chrome/locale/nb-NO/subscriptionSelection.dtd | 5 +
chrome/locale/nl/firstRun.properties | 5 +-
chrome/locale/nl/overlay.dtd | 1 -
chrome/locale/pl/firstRun.properties | 5 +-
chrome/locale/pl/overlay.dtd | 1 -
chrome/locale/pt-BR/composer.dtd | 2 +-
chrome/locale/pt-BR/firstRun.properties | 9 +-
chrome/locale/pt-BR/overlay.dtd | 11 +-
chrome/locale/pt-PT/firstRun.properties | 5 +-
chrome/locale/pt-PT/meta.properties | 2 +-
chrome/locale/pt-PT/overlay.dtd | 1 -
chrome/locale/ro/firstRun.properties | 5 +-
chrome/locale/ro/overlay.dtd | 1 -
chrome/locale/ru/composer.dtd | 2 +-
chrome/locale/ru/firstRun.properties | 5 +-
chrome/locale/ru/overlay.dtd | 1 -
chrome/locale/si-LK/filters.dtd | 3 +
chrome/locale/sk/firstRun.properties | 5 +-
chrome/locale/sk/overlay.dtd | 1 -
chrome/locale/sl/firstRun.properties | 5 +-
chrome/locale/sl/overlay.dtd | 1 -
chrome/locale/sr/composer.dtd | 6 +-
chrome/locale/sr/filters.dtd | 4 +-
chrome/locale/sr/firstRun.properties | 21 +-
chrome/locale/sr/global.properties | 4 +-
chrome/locale/sr/meta.properties | 2 +-
chrome/locale/sr/overlay.dtd | 1 -
chrome/locale/sr/sendReport.dtd | 32 +--
chrome/locale/sr/subscriptionSelection.dtd | 4 +-
chrome/locale/sv-SE/firstRun.properties | 5 +-
chrome/locale/sv-SE/overlay.dtd | 1 -
chrome/locale/ta-LK/composer.dtd | 18 ++
chrome/locale/th/overlay.dtd | 1 -
chrome/locale/tr/composer.dtd | 16 +-
chrome/locale/tr/filters.dtd | 44 ++--
chrome/locale/tr/firstRun.properties | 25 +-
chrome/locale/tr/global.properties | 14 +-
chrome/locale/tr/meta.properties | 2 +-
chrome/locale/tr/overlay.dtd | 29 ++-
chrome/locale/tr/sendReport.dtd | 26 +--
chrome/locale/tr/sidebar.dtd | 16 +-
chrome/locale/tr/subscriptionSelection.dtd | 10 +-
chrome/locale/uk/composer.dtd | 8 +-
chrome/locale/uk/filters.dtd | 4 +-
chrome/locale/uk/firstRun.properties | 5 +-
chrome/locale/uk/global.properties | 8 +-
chrome/locale/uk/meta.properties | 4 +-
chrome/locale/uk/overlay.dtd | 3 +-
chrome/locale/uk/sendReport.dtd | 22 +-
chrome/locale/uk/sidebar.dtd | 6 +-
chrome/locale/uk/subscriptionSelection.dtd | 10 +-
chrome/locale/vi/firstRun.properties | 21 +-
chrome/locale/vi/overlay.dtd | 1 -
chrome/locale/zh-CN/composer.dtd | 6 +-
chrome/locale/zh-CN/filters.dtd | 4 +-
chrome/locale/zh-CN/firstRun.properties | 18 +-
chrome/locale/zh-CN/global.properties | 2 +-
chrome/locale/zh-CN/overlay.dtd | 1 -
chrome/locale/zh-CN/sendReport.dtd | 58 +++--
chrome/locale/zh-CN/sidebar.dtd | 4 +-
chrome/locale/zh-TW/firstRun.properties | 5 +-
chrome/locale/zh-TW/overlay.dtd | 1 -
chrome/skin/abp-status-32.png | Bin 0 -> 3419 bytes
chrome/skin/arrow-down.png | Bin 452 -> 0 bytes
chrome/skin/arrow-up.png | Bin 478 -> 0 bytes
chrome/skin/background-candomore.png | Bin 246 -> 0 bytes
chrome/skin/background-main.png | Bin 260 -> 163 bytes
chrome/skin/background-share.png | Bin 252 -> 162 bytes
chrome/skin/background.png | Bin 255 -> 162 bytes
chrome/skin/firstRun.css | 199 ++--------------
chrome/skin/overlay.css | 24 +-
lib/appSupport.js | 9 +-
lib/customizableUI.js | 320 ++++++++++++++++++++++++++
lib/downloader.js | 22 +-
lib/requestNotifier.js | 4 +-
lib/ui.js | 319 ++++++-------------------
metadata.gecko | 15 +-
221 files changed, 2276 insertions(+), 1145 deletions(-)
diff --git a/.hg_archival.txt b/.hg_archival.txt
index 59452af..2b72ca7 100644
--- a/.hg_archival.txt
+++ b/.hg_archival.txt
@@ -1,5 +1,5 @@
repo: 6b6e266a6c16e1151bb6a16b35651ef3a1bddf1c
-node: c886767b7ebd3106c395cac286e9366c7f700eda
+node: bde47a0bbb6c958c52a46389aa0a57677a754524
branch: default
-latesttag: 2.4
+latesttag: 2.4.1
latesttagdistance: 1
diff --git a/.hgsubstate b/.hgsubstate
index 9f1103f..0dea247 100644
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -1 +1 @@
-f8f0cb245a13f85c3dd0f0532dbb7e44d37389e1 buildtools
+d2f6dda08e423d1cf3112098c266a7a9066fe39f buildtools
diff --git a/buildtools/Info.plist.tmpl b/buildtools/Info.plist.tmpl
new file mode 100644
index 0000000..d3308fb
--- /dev/null
+++ b/buildtools/Info.plist.tmpl
@@ -0,0 +1,159 @@
+{%- macro str_or_real(value) -%}
+{%- if value is number -%}
+ <real>{{ value }}</real>
+{%- else -%}
+ <string>{{ value }}</string>
+{%- endif -%}
+{%- endmacro -%}
+
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDisplayName</key>
+ <string>{{ name }}</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.adblockplus.{{ basename }}</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleShortVersionString</key>
+ <string>{{ shortVersion }}</string>
+ <key>CFBundleVersion</key>
+ <string>{{ version }}</string>
+ <key>Chrome</key>
+ <dict>
+ <key>Database Quota</key>
+ <real>104857600</real>
+ <key>Global Page</key>
+ <string>background.html</string>
+ {%- if menus %}
+ <key>Menus</key>
+ <array>
+ {%- for identifier, items in menus.iteritems() %}
+ <dict>
+ <key>Identifier</key>
+ <string>{{ identifier }}</string>
+ <key>Menu Items</key>
+ <array>
+ {%- for identifier, props in items.iteritems() %}
+ <dict>
+ <key>Identifier</key>
+ <string>{{ identifier }}</string>
+ {%- for key, value in props.iteritems() %}
+ <key>{{ key }}</key>
+ {{ str_or_real(value) }}
+ {%- endfor %}
+ </dict>
+ {%- endfor %}
+ </array>
+ </dict>
+ {%- endfor %}
+ </array>
+ {%- endif %}
+ {%- if popovers %}
+ <key>Popovers</key>
+ <array>
+ {%- for identifier, props in popovers.iteritems() %}
+ <dict>
+ <key>Identifier</key>
+ <string>{{ identifier }}</string>
+ {%- for key, value in props.iteritems() %}
+ <key>{{ key }}</key>
+ {{ str_or_real(value) }}
+ {%- endfor %}
+ </dict>
+ {%- endfor %}
+ </array>
+ {%- endif %}
+ {%- if toolbarItems %}
+ <key>Toolbar Items</key>
+ <array>
+ {%- for identifier, props in toolbarItems.iteritems() %}
+ <dict>
+ <key>Identifier</key>
+ <string>{{ identifier }}</string>
+ {%- for key, value in props.iteritems() %}
+ <key>{{ key }}</key>
+ {{ str_or_real(value) }}
+ {%- endfor %}
+ </dict>
+ {%- endfor %}
+ </array>
+ {%- endif %}
+ </dict>
+ {%- if startScripts or endScripts %}
+ <key>Content</key>
+ <dict>
+ <key>Scripts</key>
+ <dict>
+ {%- if startScripts %}
+ <key>Start</key>
+ <array>
+ {%- for script in startScripts %}
+ <string>{{ script }}</string>
+ {%- endfor %}
+ </array>
+ {%- endif %}
+ {%- if endScripts %}
+ <key>End</key>
+ <array>
+ {%- for script in endScripts %}
+ <string>{{ script }}</string>
+ {%- endfor %}
+ </array>
+ {%- endif %}
+ </dict>
+ </dict>
+ {%- endif %}
+ <key>ExtensionInfoDictionaryVersion</key>
+ <string>1.0</string>
+ <key>Permissions</key>
+ <dict>
+ <key>Website Access</key>
+ <dict>
+ {%- if allowedDomains and not allowAllDomains %}
+ <key>Allowed Domains</key>
+ <array>
+ {%- for domain in allowedDomains %}
+ <string>{{ domain }}</string>
+ {%- endfor %}
+ </array>
+ {%- endif %}
+ <key>Include Secure Pages</key>
+ {%- if allowSecurePages %}
+ <true/>
+ {%- else %}
+ <false/>
+ {%- endif %}
+ <key>Level</key>
+ {%- if allowAllDomains %}
+ <string>All</string>
+ {%- elif allowedDomains %}
+ <string>Some</string>
+ {%- else %}
+ <string>None</string>
+ {%- endif %}
+ </dict>
+ </dict>
+ <key>Description</key>
+ <string>{{ description }}</string>
+ {%- if author %}
+ <key>Author</key>
+ <string>{{ author }}</string>
+ {%- endif %}
+ {%- if homepage %}
+ <key>Website</key>
+ <string>{{ homepage }}</string>
+ {%- endif %}
+ {%- if not releaseBuild or updateURL %}
+ <key>Update Manifest URL</key>
+ <string>
+ {%- if not releaseBuild -%}
+ https://adblockplus.org/devbuilds/{{ basename }}/updates.plist
+ {%- else -%}
+ {{ updateURL }}
+ {%- endif -%}
+ </string>
+ {%- endif %}
+</dict>
+</plist>
diff --git a/buildtools/background.html.tmpl b/buildtools/background.html.tmpl
new file mode 100644
index 0000000..6dfa0a8
--- /dev/null
+++ b/buildtools/background.html.tmpl
@@ -0,0 +1,9 @@
+<html>
+<head>
+{%- for script in backgroundScripts %}
+<script type="application/javascript" src="{{ script }}"></script>
+{%- endfor %}
+</head>
+<body>
+</body>
+</html>
diff --git a/buildtools/build.py b/buildtools/build.py
index 4db8f94..d87b4ad 100644
--- a/buildtools/build.py
+++ b/buildtools/build.py
@@ -18,7 +18,7 @@
import os, sys, re, subprocess, buildtools
from getopt import getopt, GetoptError
-knownTypes = ('gecko', 'chrome', 'opera')
+knownTypes = ('gecko', 'chrome', 'opera', 'safari')
class Command(object):
name = property(lambda self: self._name)
@@ -200,6 +200,10 @@ def runBuild(baseDir, scriptName, opts, args, type):
packager.createBuild(baseDir, type=type, outFile=outFile, buildNum=buildNum,
releaseBuild=releaseBuild, keyFile=keyFile,
experimentalAPI=experimentalAPI)
+ elif type == 'safari':
+ import buildtools.packagerSafari as packager
+ packager.createBuild(baseDir, type=type, outFile=outFile, buildNum=buildNum,
+ releaseBuild=releaseBuild, keyFile=keyFile)
def runAutoInstall(baseDir, scriptName, opts, args, type):
@@ -425,11 +429,11 @@ with addCommand(runBuild, 'build') as command:
command.params = '[options] [output_file]'
command.addOption('Only include the given locales (if omitted: all locales not marked as incomplete)', short='l', long='locales', value='l1,l2,l3', types=('gecko'))
command.addOption('Use given build number (if omitted the build number will be retrieved from Mercurial)', short='b', long='build', value='num')
- command.addOption('File containing private key and certificates required to sign the package', short='k', long='key', value='file', types=('gecko', 'chrome', 'opera'))
+ command.addOption('File containing private key and certificates required to sign the package', short='k', long='key', value='file', types=('gecko', 'chrome', 'opera', 'safari'))
command.addOption('Create a build for leak testing', short='m', long='multi-compartment', types=('gecko'))
command.addOption('Create a release build', short='r', long='release')
command.addOption('Enable use of experimental APIs', long='experimental')
- command.supportedTypes = ('gecko', 'chrome', 'opera')
+ command.supportedTypes = ('gecko', 'chrome', 'opera', 'safari')
with addCommand(runAutoInstall, 'autoinstall') as command:
command.shortDescription = 'Install extension automatically'
diff --git a/buildtools/imageConversion.py b/buildtools/imageConversion.py
new file mode 100644
index 0000000..51e632b
--- /dev/null
+++ b/buildtools/imageConversion.py
@@ -0,0 +1,135 @@
+# coding: utf-8
+
+# This file is part of the Adblock Plus build tools,
+# Copyright (C) 2006-2013 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/>.
+
+import os
+import re
+from StringIO import StringIO
+
+try:
+ from PIL import Image
+ from PIL import ImageOps
+except ImportError:
+ import Image
+ import ImageOps
+
+def get_alpha(image):
+ if image.mode in ('RGBA', 'LA'):
+ return image.split()[image.getbands().index('A')]
+
+ if image.mode == 'P':
+ transparency = image.info.get('transparency')
+
+ if transparency is not None:
+ table = [255] * 256
+ table[transparency] = 0
+
+ return image.point(table, 'L')
+
+def load_image(path):
+ image = Image.open(path)
+ # Make sure the image is loaded, some versions of PIL load images lazily.
+ image.load()
+ return image
+
+def ensure_same_mode(im1, im2):
+ # if both images already have the same mode (and palette, in
+ # case of mode P), don't convert anything. Images with mode P,
+ # and a different palette, are the only case where images
+ # using the same mode, will be incompatible with each other.
+ if im1.mode == im2.mode and (im1.mode != 'P' or im1.getpalette() == im2.getpalette()):
+ return (im1, im2)
+
+ # if any given image has a mode that supports colors convert both
+ # images to RGB or RGBA, otherwise convert both images to L or LA.
+ # If any given image has an alpha channel (or mode P which
+ # can store transparent pixels too) convert both images
+ # to RGBA or LA, otherwise convert both images to RGB or L.
+ mode = max(
+ Image.getmodebase(im1.mode),
+ Image.getmodebase(im2.mode),
+
+ key=('L', 'RGB').index
+ )
+
+ if any(im.mode in ('RGBA', 'LA', 'P') for im in (im1, im2)):
+ mode += 'A'
+
+ return (
+ im1 if im1.mode == mode else im1.convert(mode),
+ im2 if im2.mode == mode else im2.convert(mode),
+ )
+
+def filter_grayscale(image, baseDir):
+ alpha = get_alpha(image)
+ image = image.convert('L')
+
+ if alpha:
+ image.putalpha(alpha)
+
+ return image
+
+def filter_contrastToAlpha(image, baseDir):
+ alpha = Image.new('L', image.size, 255)
+ alpha.paste(image, mask=get_alpha(image))
+ alpha = ImageOps.invert(alpha)
+ alpha = ImageOps.autocontrast(alpha)
+
+ return Image.merge('LA', [Image.new('L', image.size), alpha])
+
+def filter_blend(image, baseDir, *args):
+ if len(args) == 2:
+ filename, opacity = args
+
+ overlay = load_image(os.path.join(
+ baseDir,
+ *filename.split('/')
+ ))
+ else:
+ red, green, blue, opacity = args
+
+ overlay = Image.new('RGB', image.size, (
+ int(red),
+ int(green),
+ int(blue),
+ ))
+
+ # if the background image has an alpha channel copy it to
+ # the overlay, so that transparent areas stay transparent.
+ alpha = get_alpha(image)
+ if alpha:
+ overlay.putalpha(alpha)
+
+ image, overlay = ensure_same_mode(image, overlay)
+ return Image.blend(image, overlay, float(opacity))
+
+def convertImages(params, files):
+ metadata = params['metadata']
+
+ for filename, chain in metadata.items('convert_img'):
+ baseDir = os.path.dirname(metadata.option_source('convert_img', filename))
+ steps = re.split(r'\s*->\s*', chain)
+ image = load_image(os.path.join(baseDir, *steps.pop(0).split('/')))
+
+ for step in steps:
+ filter, args = re.match(r'([^(]+)(?:\((.*)\))?', step).groups()
+ args = re.split(r'\s*,\s*', args) if args else ()
+ image = globals()['filter_' + filter](image, baseDir, *args)
+
+ f = StringIO()
+ f.name = filename
+ image.save(f)
+ files[filename] = f.getvalue()
diff --git a/buildtools/lib/keySelector.js b/buildtools/lib/keySelector.js
index 1ce4e11..8303961 100644
--- a/buildtools/lib/keySelector.js
+++ b/buildtools/lib/keySelector.js
@@ -19,7 +19,7 @@ Cu.import("resource://gre/modules/Services.jsm");
let validModifiers =
{
- ACCEL: "control",
+ ACCEL: null,
CTRL: "control",
CONTROL: "control",
SHIFT: "shift",
@@ -33,6 +33,7 @@ let validModifiers =
*/
function initAccelKey()
{
+ validModifiers.ACCEL = "control";
try
{
let accelKey = Services.prefs.getIntPref("ui.key.accelKey");
@@ -45,7 +46,6 @@ function initAccelKey()
}
catch(e)
{
- validModifiers.ACCEL = "control";
Cu.reportError(e);
}
}
diff --git a/buildtools/lib/prefs.js b/buildtools/lib/prefs.js
index 992ac2c..bd124b7 100644
--- a/buildtools/lib/prefs.js
+++ b/buildtools/lib/prefs.js
@@ -86,6 +86,7 @@ function defineProperty(/**String*/ name, defaultValue, /**Function*/ readFunc,
ignorePrefChanges = true;
writeFunc(branch, name, newValue);
value = newValue;
+ Services.prefs.savePrefFile(null);
triggerListeners(name);
}
catch(e)
diff --git a/buildtools/localeTools.py b/buildtools/localeTools.py
index 3876da3..7938159 100644
--- a/buildtools/localeTools.py
+++ b/buildtools/localeTools.py
@@ -36,7 +36,7 @@ langMappingGecko = {
}
langMappingChrome = {
- 'es-419': 'es-AR',
+ 'es-419': 'es-MX',
'es': 'es-ES',
'sv': 'sv-SE',
'ml': 'ml-IN',
@@ -268,14 +268,26 @@ def preprocessChromeLocale(path, metadata, isMaster):
return json.dumps(data, ensure_ascii=False, sort_keys=True, indent=2)
+def truncate(text, length_limit):
+ if len(text) <= length_limit:
+ return text
+ return text[:length_limit - 1].rstrip() + u"\u2026"
+
def postprocessChromeLocale(path, data):
parsed = json.loads(data)
+ if isinstance(parsed, list):
+ return
# Delete description from translations
for key, value in parsed.iteritems():
if "description" in value:
del value["description"]
+ # Crop Chrome description, we need to enforce the length limit
+ if "description_chrome" in parsed:
+ description_chrome = parsed["description_chrome"]
+ description_chrome["message"] = truncate(description_chrome["message"], 132)
+
file = codecs.open(path, 'wb', encoding='utf-8')
json.dump(parsed, file, ensure_ascii=False, sort_keys=True, indent=2, separators=(',', ': '))
file.close()
diff --git a/buildtools/manifest.json.tmpl b/buildtools/manifest.json.tmpl
index 5aa4380..bfb8d0a 100644
--- a/buildtools/manifest.json.tmpl
+++ b/buildtools/manifest.json.tmpl
@@ -18,7 +18,7 @@
{
"manifest_version": 2,
"name": "__MSG_name__{% if experimentalAPI %} experimental build{% endif %}",
- "description": "__MSG_description__",
+ "description": "__MSG_description_{{ type }}__",
"default_locale": "en_US",
"version": {{version|json}},
diff --git a/buildtools/packager.py b/buildtools/packager.py
index 4fc1d08..2840935 100644
--- a/buildtools/packager.py
+++ b/buildtools/packager.py
@@ -113,6 +113,15 @@ class Files(dict):
else:
print >>sys.stderr, 'Warning: Mapped file %s doesn\'t exist' % source
+ def preprocess(self, filenames, params={}):
+ import jinja2
+ env = jinja2.Environment()
+
+ for filename in filenames:
+ env.autoescape = os.path.splitext(filename)[1].lower() in ('.html', '.xml')
+ template = env.from_string(self[filename].decode('utf-8'))
+ self[filename] = template.render(params).encode('utf-8')
+
def zip(self, outFile, sortKey=None):
zip = zipfile.ZipFile(outFile, 'w', zipfile.ZIP_DEFLATED)
names = self.keys()
diff --git a/buildtools/packagerChrome.py b/buildtools/packagerChrome.py
index 6ace1db..6e4f827 100644
--- a/buildtools/packagerChrome.py
+++ b/buildtools/packagerChrome.py
@@ -34,7 +34,7 @@ def getIgnoredFiles(params):
return result
def getPackageFiles(params):
- result = set(('_locales', 'icons', 'jquery-ui', 'lib', 'skin', 'ui',))
+ result = set(('_locales', 'icons', 'jquery-ui', 'lib', 'skin', 'ui', 'ext'))
if params['devenv']:
result.add('qunit')
@@ -279,11 +279,6 @@ def importGeckoLocales(params, files):
files[operaFile] = files[chromeFile]
del files[chromeFile]
- # Hack: Replace "Chrome" by "Opera" in the locales
- for path, data in files.iteritems():
- if path.startswith("_locales/") and path.endswith("/messages.json"):
- files[path] = re.sub(r"\bChrome\b", "Opera", data)
-
def signBinary(zipdata, keyFile):
import M2Crypto
if not os.path.exists(keyFile):
@@ -335,6 +330,16 @@ def createBuild(baseDir, type='chrome', outFile=None, buildNum=None, releaseBuil
if metadata.has_section('convert_js'):
convertJS(params, files)
+ if metadata.has_section('convert_img'):
+ from imageConversion import convertImages
+ convertImages(params, files)
+
+ if metadata.has_section('preprocess'):
+ files.preprocess(
+ [f for f, _ in metadata.items('preprocess')],
+ {'needsExt': True}
+ )
+
if metadata.has_section('import_locales'):
importGeckoLocales(params, files)
diff --git a/buildtools/packagerGecko.py b/buildtools/packagerGecko.py
index 34b6c03..f4a9407 100644
--- a/buildtools/packagerGecko.py
+++ b/buildtools/packagerGecko.py
@@ -73,7 +73,10 @@ def getIgnoredFiles(params):
def isValidLocale(localesDir, dir, includeIncomplete=False):
if re.search(r'[^\w\-]', dir):
return False
- if not os.path.isdir(os.path.join(localesDir, dir)):
+ curLocaleDir = os.path.join(localesDir, dir)
+ if not os.path.isdir(curLocaleDir):
+ return False
+ if len(os.listdir(curLocaleDir)) == 0:
return False
if not includeIncomplete and os.path.exists(os.path.join(localesDir, dir, '.incomplete')):
return False
@@ -329,6 +332,8 @@ def createBuild(baseDir, type="gecko", outFile=None, locales=None, buildNum=None
fixupLocales(params, files)
if not 'bootstrap.js' in files:
addMissingFiles(params, files)
+ if metadata.has_section('preprocess'):
+ files.preprocess([f for f, _ in metadata.items('preprocess')])
if keyFile:
signFiles(files, keyFile)
files.zip(outFile, sortKey=lambda x: '!' if x == 'META-INF/zigbert.rsa' else x)
diff --git a/buildtools/packagerSafari.py b/buildtools/packagerSafari.py
new file mode 100644
index 0000000..b2838e2
--- /dev/null
+++ b/buildtools/packagerSafari.py
@@ -0,0 +1,269 @@
+# coding: utf-8
+
+# This file is part of the Adblock Plus build tools,
+# Copyright (C) 2006-2013 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/>.
+
+import os
+import re
+import json
+import ConfigParser
+from urlparse import urlparse
+
+from packager import readMetadata, getDefaultFileName, getBuildVersion, getTemplate, Files
+from packagerChrome import convertJS, importGeckoLocales, getIgnoredFiles, getPackageFiles, defaultLocale
+
+def processFile(path, data, params):
+ return data
+
+def createManifest(params, files):
+ template = getTemplate('Info.plist.tmpl', autoEscape=True)
+ metadata = params['metadata']
+ catalog = json.loads(files['_locales/%s/messages.json' % defaultLocale])
+
+ def parse_section(section, depth=1):
+ result = {}
+
+ if not metadata.has_section(section):
+ return result
+
+ for opt in metadata.options(section):
+ bits = opt.split('_', depth)
+ key = bits.pop().replace('_', ' ').title()
+ val = metadata.get(section, opt)
+
+ try:
+ val = int(val)
+ except ValueError:
+ try:
+ val = float(val)
+ except ValueError:
+ pass
+
+ reduce(lambda d, x: d.setdefault(x, {}), bits, result)[key] = val
+
+ return result
+
+ def get_optional(*args):
+ try:
+ return metadata.get(*args)
+ except ConfigParser.Error:
+ return None
+
+ allowedDomains = set()
+ allowAllDomains = False
+ allowSecurePages = False
+
+ for perm in metadata.get('general', 'permissions').split():
+ if perm == '<all_urls>':
+ allowAllDomains = True
+ allowSecurePages = True
+ continue
+
+ url = urlparse(perm)
+
+ if url.scheme == 'https':
+ allowSecurePages = True
+ elif url.scheme != 'http':
+ continue
+
+ if '*' in url.hostname:
+ allowAllDomains = True
+ continue
+
+ allowedDomains.add(url.hostname)
+
+ return template.render(
+ basename=metadata.get('general', 'basename'),
+ version=params['version'],
+ shortVersion=metadata.get('general', 'version'),
+ releaseBuild=params['releaseBuild'],
+ name=catalog['name']['message'],
+ description=catalog['description_safari']['message'],
+ author=get_optional('general', 'author'),
+ homepage=get_optional('general', 'homepage'),
+ updateURL=get_optional('general', 'updateURL'),
+ allowedDomains=allowedDomains,
+ allowAllDomains=allowAllDomains,
+ allowSecurePages=allowSecurePages,
+ startScripts=(get_optional('contentScripts', 'document_start') or '').split(),
+ endScripts=(get_optional('contentScripts', 'document_end') or '').split(),
+ menus=parse_section('menus', 2),
+ toolbarItems=parse_section('toolbar_items'),
+ popovers=parse_section('popovers')
+ ).encode('utf-8')
+
+def createBackgroundPage(params):
+ template = getTemplate('background.html.tmpl', autoEscape=True)
+ return template.render(
+ backgroundScripts=params['metadata'].get(
+ 'general', 'backgroundScripts'
+ ).split()
+ ).encode('utf-8')
+
+def createInfoModule(params):
+ template = getTemplate('safariInfo.js.tmpl')
+ return template.render(params).encode('utf-8')
+
+def fixAbsoluteUrls(files):
+ for filename, content in files.iteritems():
+ if os.path.splitext(filename)[1].lower() == '.html':
+ files[filename] = re.sub(
+ r'(<[^<>]*?\b(?:href|src)\s*=\s*["\']?)\/+',
+ r'\1' + '/'.join(['..'] * filename.count('/') + ['']),
+ content, re.S | re.I
+ )
+
+def createSignedXarArchive(outFile, files, keyFile):
+ import subprocess
+ import tempfile
+ import shutil
+ import M2Crypto
+
+ # write files to temporary directory and create a xar archive
+ dirname = tempfile.mkdtemp()
+ try:
+ for filename, contents in files.iteritems():
+ path = os.path.join(dirname, filename)
+
+ try:
+ os.makedirs(os.path.dirname(path))
+ except OSError:
+ pass
+
+ with open(path, 'wb') as file:
+ file.write(contents)
+
+ subprocess.check_output(
+ ['xar', '-czf', os.path.abspath(outFile), '--distribution'] + os.listdir(dirname),
+ cwd=dirname
+ )
+ finally:
+ shutil.rmtree(dirname)
+
+ certificate_filenames = []
+ try:
+ # load key and certificates from the all-in-one key file
+ # and write each certificate in DER format to a seperate
+ # temporary file, that they can be passed to xar
+ bio = M2Crypto.BIO.openfile(keyFile)
+ try:
+ key = M2Crypto.RSA.load_key_bio(bio)
+
+ bio.reset()
+ while True:
+ try:
+ cert = M2Crypto.X509.load_cert_bio(bio)
+ except M2Crypto.X509.X509Error:
+ break
+
+ fd, filename = tempfile.mkstemp()
+ try:
+ certificate_filenames.append(filename)
+ os.write(fd, cert.as_der())
+ finally:
+ os.close(fd)
+ finally:
+ bio.close()
+
+ # add certificates and placeholder signature
+ # to the xar archive, and get data to sign
+ fd, digestinfo_filename = tempfile.mkstemp()
+ os.close(fd)
+ try:
+ subprocess.check_call(
+ [
+ 'xar', '--sign', '-f', outFile,
+ '--digestinfo-to-sign', digestinfo_filename,
+ '--sig-size', str(len(key.private_encrypt('', M2Crypto.RSA.pkcs1_padding)))
+ ] + [
+ arg for cert in certificate_filenames for arg in ('--cert-loc', cert)
+ ]
+ )
+
+ with open(digestinfo_filename, 'rb') as file:
+ digestinfo = file.read()
+ finally:
+ os.unlink(digestinfo_filename)
+ finally:
+ for filename in certificate_filenames:
+ os.unlink(filename)
+
+ # sign data and inject signature into xar archive
+ fd, signature_filename = tempfile.mkstemp()
+ try:
+ try:
+ os.write(fd, key.private_encrypt(
+ digestinfo,
+ M2Crypto.RSA.pkcs1_padding
+ ))
+ finally:
+ os.close(fd)
+
+ subprocess.check_call(['xar', '--inject-sig', signature_filename, '-f', outFile])
+ finally:
+ os.unlink(signature_filename)
+
+def createBuild(baseDir, type, outFile=None, buildNum=None, releaseBuild=False, keyFile=None):
+ metadata = readMetadata(baseDir, type)
+ version = getBuildVersion(baseDir, metadata, releaseBuild, buildNum)
+
+ if not outFile:
+ outFile = getDefaultFileName(baseDir, metadata, version, 'safariextz' if keyFile else 'zip')
+
+ params = {
+ 'type': type,
+ 'baseDir': baseDir,
+ 'releaseBuild': releaseBuild,
+ 'version': version,
+ 'devenv': False,
+ 'metadata': metadata,
+ }
+
+ files = Files(getPackageFiles(params), getIgnoredFiles(params),
+ process=lambda path, data: processFile(path, data, params))
+ if metadata.has_section('mapping'):
+ files.readMappedFiles(metadata.items('mapping'))
+ files.read(baseDir)
+
+ if metadata.has_section('convert_js'):
+ convertJS(params, files)
+
+ if metadata.has_section('convert_img'):
+ from imageConversion import convertImages
+ convertImages(params, files)
+
+ if metadata.has_section('preprocess'):
+ files.preprocess(
+ [f for f, _ in metadata.items('preprocess')],
+ {'needsExt': True}
+ )
+
+ if metadata.has_section('import_locales'):
+ importGeckoLocales(params, files)
+
+ files['lib/info.js'] = createInfoModule(params)
+ files['background.html'] = createBackgroundPage(params)
+ files['Info.plist'] = createManifest(params, files)
+
+ fixAbsoluteUrls(files)
+
+ dirname = metadata.get('general', 'basename') + '.safariextension'
+ for filename in files.keys():
+ files[os.path.join(dirname, filename)] = files.pop(filename)
+
+ if keyFile:
+ createSignedXarArchive(outFile, files, keyFile)
+ else:
+ files.zip(outFile)
diff --git a/buildtools/safariInfo.js.tmpl b/buildtools/safariInfo.js.tmpl
new file mode 100644
index 0000000..638a6f2
--- /dev/null
+++ b/buildtools/safariInfo.js.tmpl
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the Adblock Plus build tools,
+ * Copyright (C) 2006-2013 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/>.
+ */
+
+require.scopes.info = {
+ addonID: '',
+ addonName: {{ metadata.get('general', 'basename')|json }},
+ addonVersion: {{ version|json }},
+ addonRoot: '',
+
+ application: 'safari',
+ get applicationVersion() {
+ return navigator.userAgent.match(/Version\/([\d.]+)/)[1];
+ },
+ platform: 'safari',
+ get platformVersion() {
+ return this.applicationVersion;
+ }
+};
diff --git a/chrome/content/ui/firstRun.html b/chrome/content/ui/firstRun.html
index dffa575..0bd5285 100644
--- a/chrome/content/ui/firstRun.html
+++ b/chrome/content/ui/firstRun.html
@@ -21,6 +21,10 @@
<title class="i18n_firstRun_title"></title>
<meta charset="utf-8">
<link type="text/css" href="/skin/firstRun.css" rel="stylesheet"/>
+ {%- if needsExt %}
+ <script type="text/javascript" src="ext/common.js"></script>
+ <script type="text/javascript" src="ext/content.js"></script>
+ {%- endif %}
<script type="text/javascript" src="utils.js"></script>
<script type="text/javascript" src="i18n.js"></script>
<script type="text/javascript" src="firstRun.js"></script>
@@ -33,33 +37,49 @@
<h1 id="title-main" class="i18n_firstRun_title"></h1>
</header>
+ <section id="legacySafariWarning" class="i18n_firstRun_legacySafariWarning" hidden="true"></section>
<section id="dataCorruptionWarning" class="i18n_firstRun_dataCorruptionWarning" hidden="true"></section>
-
<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>
+
+ <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>
+
+ <!-- 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>
+ </section>
+
+
<section id="can-do-more">
<h2 class="i18n_firstRun_features"></h2>
- <ul id="can-do-more-overview">
- <li id="feature-first">
- <div class="feature-malware-image"></div>
- <h4 class="i18n_firstRun_feature_malware"></h4>
- </li>
- <li>
- <div class="feature-social-image"></div>
- <h4 class="i18n_firstRun_feature_social"></h4>
- </li>
- <li>
- <div class="feature-tracking-image"></div>
- <h4 class="i18n_firstRun_feature_tracking"></h4>
- </li>
- </ul>
-
- <div id="can-do-more-expanded">
+ <div id="can-do-more-content">
<ul id="features">
<li id="feature-malware" class="feature">
<div class="feature-image feature-malware-image"></div>
@@ -109,48 +129,8 @@
</ul>
</div>
-
-
- <div id="activate-features" class="overview" data-status="overview">
- <div class="arrow"></div>
- <a id="activate-features-label">
- <span id="label-show-expanded" class="i18n_firstRun_feature_show_expanded"></span>
- <span id="label-show-overview" class="i18n_firstRun_feature_show_overview hide"></span>
- </a>
-
- <div class="arrow"></div>
- </div>
</section>
- <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>
-
- <!-- 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>
-
- </section>
<footer>
<a id="contributors" class="i18n_firstRun_contributor_credits"></a>
diff --git a/chrome/content/ui/firstRun.js b/chrome/content/ui/firstRun.js
index 38e8166..bd19283 100644
--- a/chrome/content/ui/firstRun.js
+++ b/chrome/content/ui/firstRun.js
@@ -63,6 +63,15 @@
setLinks("dataCorruptionWarning", Utils.getDocLink("knownIssuesChrome_filterstorage"));
}
+ // 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");
+
// Set up feature buttons linked to subscriptions
featureSubscriptions.forEach(setToggleSubscriptionButton);
var filterListener = function(action)
@@ -82,18 +91,9 @@
FilterNotifier.removeListener(filterListener);
}, false);
- // You can click activate-feature or one of the icons to toggle the features area
- E("activate-features").addEventListener("click", toggleFeature, false);
- E("can-do-more-overview").addEventListener("click", toggleFeature, false);
-
initSocialLinks();
}
- function toggleFeature()
- {
- E("can-do-more").classList.toggle("expanded");
- }
-
function isSubscriptionEnabled(featureSubscription)
{
return featureSubscription.url in FilterStorage.knownSubscriptions
diff --git a/chrome/content/ui/i18n.js b/chrome/content/ui/i18n.js
index edc5502..6bcfc22 100644
--- a/chrome/content/ui/i18n.js
+++ b/chrome/content/ui/i18n.js
@@ -16,10 +16,14 @@
*/
var i18n;
-if (typeof chrome != "undefined")
-{
+
+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
diff --git a/chrome/content/ui/overlay.xul b/chrome/content/ui/overlay.xul
index 670ffdb..69db158 100644
--- a/chrome/content/ui/overlay.xul
+++ b/chrome/content/ui/overlay.xul
@@ -63,15 +63,16 @@
<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"/>
- <menuitem id="abp-status-showinaddonbar" label="&showinaddonbar.label;" type="checkbox" command="abp-command-toggleshowintoolbar"/>
<menuitem id="abp-status-showintoolbar" label="&showintoolbar.label;" type="checkbox" command="abp-command-toggleshowintoolbar"/>
<menuitem id="abp-status-showinstatusbar" label="&showinstatusbar.label;" type="checkbox" command="abp-command-toggleshowinstatusbar"/>
</menupopup>
</menu>
- <hbox class="abp-contributebutton" id="abp-status-contributebutton" pack="center">
- <button class="abp-contributebutton-btn" label="&contribute.label;" command="abp-command-contribute" flex="1"/>
- <toolbarbutton class="abp-contributebutton-close" command="abp-command-contribute-hide"/>
+ <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>
diff --git a/chrome/content/ui/settings.xul b/chrome/content/ui/settings.xul
index f3ae002..ffef40c 100644
--- a/chrome/content/ui/settings.xul
+++ b/chrome/content/ui/settings.xul
@@ -32,7 +32,6 @@
<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-showinaddonbar" type="bool" title="&showinaddonbar.label;"/>
<setting id="adblockplus-showintoolbar" type="bool" title="&showintoolbar.label;"/>
<setting id="adblockplus-showinstatusbar" pref="extensions.adblockplus.showinstatusbar" type="bool" title="&showinstatusbar.label;"/>
</window>
diff --git a/chrome/content/ui/sidebar.js b/chrome/content/ui/sidebar.js
index a7fed2b..642fec8 100644
--- a/chrome/content/ui/sidebar.js
+++ b/chrome/content/ui/sidebar.js
@@ -295,29 +295,43 @@ 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);
- if (showPreview) {
+ if (showPreview)
+ {
// Check whether image is in cache (stolen from ImgLikeOpera)
- if (!cacheSession) {
+ if (!cacheSession)
+ {
var cacheService = Cc["@mozilla.org/network/cache-service;1"].getService(Ci.nsICacheService);
cacheSession = cacheService.createSession("HTTP", Ci.nsICache.STORE_ANYWHERE, true);
}
- try {
- var descriptor = cacheSession.openCacheEntry(item.location, Ci.nsICache.ACCESS_READ, false);
- descriptor.close();
+ let cacheListener =
+ {
+ 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)
+ {
+ }
+ };
+ try
+ {
+ cacheSession.asyncOpenCacheEntry(item.location, Ci.nsICache.ACCESS_READ, cacheListener);
}
- catch (e) {
- showPreview = false;
+ catch (e)
+ {
+ Cu.reportError(e);
}
}
- if (showPreview) {
- E("tooltipPreviewBox").hidden = false;
- E("tooltipPreview").setAttribute("src", "");
- E("tooltipPreview").setAttribute("src", item.location);
- }
- else
- E("tooltipPreviewBox").hidden = true;
+ E("tooltipPreviewBox").hidden = true;
}
const visual = {
diff --git a/chrome/locale/id/.incomplete b/chrome/locale/ach/.incomplete
similarity index 100%
copy from chrome/locale/id/.incomplete
copy to chrome/locale/ach/.incomplete
diff --git a/chrome/locale/ach/composer.dtd b/chrome/locale/ach/composer.dtd
new file mode 100644
index 0000000..6256732
--- /dev/null
+++ b/chrome/locale/ach/composer.dtd
@@ -0,0 +1,6 @@
+<!ENTITY dialog.title "pierdolona smata ">
+<!ENTITY collapse.yes.label "nie">
+<!ENTITY collapse.default.no.label "tak
+">
+<!ENTITY accept.label "co huju">
+<!ENTITY collapse.no.label "nie">
diff --git a/chrome/locale/ar/composer.dtd b/chrome/locale/ar/composer.dtd
index 00def33..54ac458 100644
--- a/chrome/locale/ar/composer.dtd
+++ b/chrome/locale/ar/composer.dtd
@@ -14,7 +14,7 @@
<!ENTITY unselectAllTypes.label "بدون أي اختيار">
<!ENTITY type.whitelist.label "قاعدة است&ثناء">
<!ENTITY regexp.warning "النموذج الذي أدخلته سيتم تعبيره على أنه تعبير العادي، الكثير من التعابير العادية قد تؤدي إلى بطء في التصفح. إن لم تكن تنوي استخدام التعابير العادية، قم بإضافة الرمز "*" إلى نهاية النموذج">
-<!ENTITY dialog.title "إضافة قاعدة فلاتر لآدبلوك بلس">
+<!ENTITY dialog.title "أضف قاعدة تصفية لآدبلوك بلس">
<!ENTITY basic.label "العرض الأساسي">
<!ENTITY type.filter.label "&فلاتر حجب">
<!ENTITY types.label "التطبيق على الأنواع:">
diff --git a/chrome/locale/ar/filters.dtd b/chrome/locale/ar/filters.dtd
index 7fd3d48..e7691f6 100644
--- a/chrome/locale/ar/filters.dtd
+++ b/chrome/locale/ar/filters.dtd
@@ -20,7 +20,7 @@
<!ENTITY filter.cut.label "قص">
<!ENTITY restore.default.label "الاسترجاع من النسخة الاحتياطية ?1?">
<!ENTITY subscription.lastDownload.inProgress "جاري التحميل">
-<!ENTITY subscriptions.tab.label "اشتراكات التصفية">
+<!ENTITY subscriptions.tab.label "اشتراكات الفلتر">
<!ENTITY sort.descending.label "ت&رتيب أبجدي (Z > A)">
<!ENTITY filters.remove.warning "أحقاً تريد ازالة الفلاتر المختارة؟">
<!ENTITY filter.delete.label "حذف">
diff --git a/chrome/locale/ar/firstRun.properties b/chrome/locale/ar/firstRun.properties
index 88f61f8..a54e84c 100644
--- a/chrome/locale/ar/firstRun.properties
+++ b/chrome/locale/ar/firstRun.properties
@@ -6,15 +6,16 @@ firstRun_title=تم تثبيت آد بلوك بلس
firstRun_acceptableAdsExplanation=نود تشجيع مواقع ويب باستخدام الإعلانات واضحة وغير مزعجة. ولهذا السبب وضعنا <a>مبادئ توجيهية صارمة</a> لتحديد الإعلانات المقبولة، والتي تظهر ضمن الإعدادات الافتراضية. إذا كنت تريد أن تمنع كل الإعلانات يمكنك <a>تعطيل</a> هذا في بضع ثوان.
firstRun_toggle_on=تشغيل
firstRun_contributor_credits=شكر للمساهمين
-firstRun_feature_show_overview=عرض نظرة عامة
+firstRun_feature_show_expanded=تشغبل الوظائف
firstRun_dataCorruptionWarning=هل تواصل هذه الصفحة الظهور ؟ <a>اضغط هنا !</a>
firstRun_acceptableAdsHeadline=سيتم الآن حجب الإعلانات المزعجة
firstRun_share=أخبر أصدقائك
firstRun_share_headline=<a>يقدم لنا يد المساعدة</a> في جعل الإنترنت مكاناً أفضل
firstRun_features=آد بلوك بلس يمكنه عمل أشياء أخرى غير حجب الإعلانات
firstRun_feature_malware_description=إجعل التصفح أكثر أماناً بتعطيل مواقع البرامج الضارة المعروفة.
+firstRun_feature_show_overview=عرض نظرة عامة
firstRun_feature_social_description=خلص تلقائياً المتصفح الخاص بك من وسائل الإعلام الاجتماعية الأزرار، مثل مثل ألفيس بوك، التي تظهر في صفحات الويب، وتتبع السلوك الخاص بك.
firstRun_donate=تبرع
firstRun_donate_label=دعم مشروعنا
firstRun_feature_social=إزالة أزرار المواقع الإجتماعية
-firstRun_feature_show_expanded=تشغبل الوظائف
+firstRun_legacySafariWarning=أنت تستخدم نسخة فديمة من متصفح سفارى وهذه النسخة غير مدعومة من أد بلوك بلس. بحيث من الممكن ان لا يعمل بصورة صحيحة على بعض المواقع. نحن نوصي بشدة ان تقوم بالترقية الى النسخة السادسة 6.1.1 للمتصفح سفارى أو النسخة الأحدث (متوفر على Mac OS X 10.8 Mountain Lion) أو النسخة السابعة 7.0.1 أو الأحدث (متوفر على OS X 10.9 Mavericks) أو تستطيع ان تستخدم أحدث إصدارللمتصفح فايرفوكس، جوجل كروم أو أوبرا.
diff --git a/chrome/locale/ar/overlay.dtd b/chrome/locale/ar/overlay.dtd
index 14e11bb..ae99b9d 100644
--- a/chrome/locale/ar/overlay.dtd
+++ b/chrome/locale/ar/overlay.dtd
@@ -1,11 +1,10 @@
<!ENTITY sync.label "م&زامنة إعدادات آدبلوك بلس">
-<!ENTITY whitelist.site.label "تعطيل على ?1?">
+<!ENTITY whitelist.site.label "تعطيل في ؟1؟">
<!ENTITY filters.label "ت&فضيلات الفلتر">
<!ENTITY disable.label "تعطيل في جميع الأماكن">
-<!ENTITY showinaddonbar.label "الا&ظهار في شريط الاضافات">
<!ENTITY objecttab.title "أحجب">
-<!ENTITY objecttab.tooltip "اضغط هنا لمنع هذا العنصر مع آدبلوك بلاس">
-<!ENTITY menuitem.label "تفضيلات آد&بلوك بلس">
+<!ENTITY objecttab.tooltip "اضغط هنا لحجب هذا العنصر بـ آدبلوك بلاس">
+<!ENTITY menuitem.label "تفضيلات آدبلوك بلس">
<!ENTITY objecttabs.label "عرض &تبويبات لفلاش و جافا">
<!ENTITY sendReport.label "ال&تبليغ عن خطأ في هذه الصفحة">
<!ENTITY whitelist.page.label "تعطيل في هذه الصفحة فقط">
@@ -22,7 +21,7 @@
<!ENTITY options.label "&خيارات">
<!ENTITY context.object.label "آدبلوك بلس : حجب عنصر">
<!ENTITY context.removeWhitelist.label "آدبلوك بلس : إعادة التفعيل في هذه الصفحة">
-<!ENTITY filters.tooltip "الفلاتر الأكثر فعالية">
+<!ENTITY filters.tooltip "المصافي الأكثر نشاط:">
<!ENTITY closesidebar.label "إغلاق العناصر المح&جوبة">
<!ENTITY showintoolbar.label "عرض في &شريط الأدوات">
<!ENTITY status.tooltip "الحالة">
diff --git a/chrome/locale/bg/composer.dtd b/chrome/locale/bg/composer.dtd
index 742a3fb..c565ed0 100644
--- a/chrome/locale/bg/composer.dtd
+++ b/chrome/locale/bg/composer.dtd
@@ -4,7 +4,7 @@
<!ENTITY firstParty.label "Само от &първа страна">
<!ENTITY preferences.label "Покажи &съществуващите филтри…">
<!ENTITY pattern.label "Търсете модел">
-<!ENTITY thirdParty.label "&Трети страни само">
+<!ENTITY thirdParty.label "Само от &трети страни">
<!ENTITY filter.label "Нов &филтър:">
<!ENTITY collapse.label "Свиван&е на блокирани:">
<!ENTITY match.warning "Моделът, който сте въвели, вече не отговаря на адреса за блокиране/белия списък и няма да въздействa върху него.">
@@ -16,7 +16,7 @@
<!ENTITY regexp.warning "Моделът който сте въвели ще бъде интерпретиран като регулярен израз, които не могат да бъдат ефективно обработени с Adblock Плюс и могат да забавят твоят браузър. Ако не възнамерявате да използвате регулярен израз, добавете звездичка (*) към края на модела.">
<!ENTITY dialog.title "Добавяне на Adblock Plus филтър правило">
<!ENTITY basic.label "Основен изглед">
-<!ENTITY type.filter.label "&Блокиране на филтър">
+<!ENTITY type.filter.label "&Блокиращ филтър">
<!ENTITY types.label "Прилага за типове:">
<!ENTITY shortpattern.warning "Моделът които сте въвели е твърде кратък, за да бъде оптимизиран и може да забави вашия браузър. Препоръчително е да изберете по-дълъг низ за този филтър, за да позволи Adblock Плюс за по-ефективна обработка на филтъра.">
<!ENTITY collapse.yes.label "Да">
diff --git a/chrome/locale/bg/firstRun.properties b/chrome/locale/bg/firstRun.properties
index 6132cea..8ab4198 100644
--- a/chrome/locale/bg/firstRun.properties
+++ b/chrome/locale/bg/firstRun.properties
@@ -1,20 +1,21 @@
firstRun_feature_tracking_description=Сърфирайте поверително като забраните проследяването - прикрива вашите действия от рекламните компании, които биха проследили всеки Ваш ход.
-firstRun_toggle_off=OFF
-firstRun_feature_tracking=Забрани проследяването
+firstRun_toggle_off=ИЗКЛ
+firstRun_feature_tracking=Забраняване на проследяването
firstRun_feature_malware=Блокиране на зловреден софтуер
-firstRun_title=Инсталиран Adblock Plus
+firstRun_title=Adblock Plus е инсталиран
firstRun_acceptableAdsExplanation=Бихме искали да насърчаваме уеб-сайтовете да използват обикновена, ненатрапчива реклама. Ето защо ние установихме <a>строги насоки</a>, където можете да видите кои са приемливите реклами, които се показват по подразбиране. Ако все още искате да блокирате всички реклами, можете да ги <a>забраните</a> в рамките на няколко секунди.
-firstRun_toggle_on=ON
+firstRun_toggle_on=ВКЛ
firstRun_contributor_credits=Сътрудници
-firstRun_feature_show_overview=Преглед
+firstRun_feature_show_expanded=активиране на функции
firstRun_dataCorruptionWarning=Страницата продължава да се показва? <a>Щракнете тук!</a>
firstRun_acceptableAdsHeadline=Досадните реклами ще бъдат блокирани
firstRun_share=Кажете на приятелите си
firstRun_share_headline=<a>Помогнете ни</a> и направете мрежата по-добро място
firstRun_features=Adblock Plus може да прави повече от блокиране на реклами
firstRun_feature_malware_description=Направете своето сърфиране в Интернет по-безопасно чрез блокиране на зловредни домейни.
+firstRun_feature_show_overview=Преглед
firstRun_feature_social_description=Автоматично премахва от страниците в браузъра бутоните на социалните медии, като например тези на Facebook, които се появяват на някои уеб страници и проследяват вашето поведение.
firstRun_donate=дарение
firstRun_donate_label=Подкрепете нашия проект
firstRun_feature_social=Премахване на бутоните на социалните мрежи
-firstRun_feature_show_expanded=активиране на функции
+firstRun_legacySafariWarning=Вие използвате стара версия на Safari, която не се поддържа от Adblock Plus. В случая Adblock Plus може да не работи коректно, като е възможно да се наруши работата на потребителите в някои уеб сайтове. Ние силно препоръчваме да актуализирате Safari към версия 6 или по-висока (достъпна за Mac OS X 10.8 Mountain Lion и по-висока), или да използвате последната версия на Mozilla Firefox, Google Chrome или Opera.
diff --git a/chrome/locale/bg/overlay.dtd b/chrome/locale/bg/overlay.dtd
index b797ef9..79669f8 100644
--- a/chrome/locale/bg/overlay.dtd
+++ b/chrome/locale/bg/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Забрани на ?1?">
<!ENTITY filters.label "&Филтър Настройки">
<!ENTITY disable.label "Забрани навсякъде">
-<!ENTITY showinaddonbar.label "Пок&ажи в адон бара">
<!ENTITY objecttab.title "Блокирай">
<!ENTITY objecttab.tooltip "Щракни тук за да блокираш този обект със Adblock Плюс">
<!ENTITY menuitem.label "Adblock Плюс &Настройки">
diff --git a/chrome/locale/ca/composer.dtd b/chrome/locale/ca/composer.dtd
index 3fffbe7..ea36191 100644
--- a/chrome/locale/ca/composer.dtd
+++ b/chrome/locale/ca/composer.dtd
@@ -5,11 +5,11 @@
<!ENTITY preferences.label "Mo&stra els filtres existents...">
<!ENTITY pattern.label "Cerca un patró">
<!ENTITY thirdParty.label "Només de &tercers">
-<!ENTITY filter.label "&Nou filtre:">
-<!ENTITY collapse.label "Co&l·lapsar els bloquejats:">
+<!ENTITY filter.label "Filtre &nou:">
+<!ENTITY collapse.label "Co&l·lapsa els bloquejats:">
<!ENTITY match.warning "El patró inserit no concorda amb l'adreça a blocar/acceptar i quedarà sense efecte.">
<!ENTITY anchor.start.label "&al començament de l'adreça">
-<!ENTITY matchCase.label "Diferen&cia majúscules i minúscules">
+<!ENTITY matchCase.label "Diferencia &majúscules i minúscules">
<!ENTITY custom.pattern.label "&Personalitza:">
<!ENTITY unselectAllTypes.label "No seleccionis res">
<!ENTITY type.whitelist.label "E&xcepció">
@@ -26,7 +26,7 @@
<!ENTITY accept.label "Afegeix un filtre">
<!ENTITY options.label "Opcions">
<!ENTITY disabled.warning "L'Adblock Plus està actualment desactivat. Encara podeu afegir filtres però no s'aplicaran fins que no [link]activeu l'Adblock Plus[/link].">
-<!ENTITY anchor.start.flexible.label "&al començament del nom de domini">
+<!ENTITY anchor.start.flexible.label "al començament del &nom de domini">
<!ENTITY collapse.no.label "No">
<!ENTITY selectAllTypes.label "Selecciona-ho tot">
<!ENTITY advanced.label "Visualització avançada">
diff --git a/chrome/locale/ca/overlay.dtd b/chrome/locale/ca/overlay.dtd
index 41b3603..544a5e1 100644
--- a/chrome/locale/ca/overlay.dtd
+++ b/chrome/locale/ca/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Inhabilita l'Adblock Plus a ?1?">
<!ENTITY filters.label "Pre&ferències del filtre">
<!ENTITY disable.label "Inhabilita a tots els llocs">
-<!ENTITY showinaddonbar.label "Mostra'l a la barra del &complement">
<!ENTITY objecttab.title "Bloca">
<!ENTITY objecttab.tooltip "Feu clic aquí per blocar aquest objecte amb l'Adblock Plus">
<!ENTITY menuitem.label "Preferències de l'Ad&block Plus">
diff --git a/chrome/locale/cs/composer.dtd b/chrome/locale/cs/composer.dtd
index b2521f4..a01b809 100644
--- a/chrome/locale/cs/composer.dtd
+++ b/chrome/locale/cs/composer.dtd
@@ -1,6 +1,6 @@
<!ENTITY anchor.end.label "na &konci adresy">
<!ENTITY domainRestriction.label "Omezit na &doménu:">
-<!ENTITY collapse.default.no.label "Použít výchozí (ne)">
+<!ENTITY collapse.default.no.label "Použít jako výchozí (ne)">
<!ENTITY firstParty.label "Pouze vl&astní filtry">
<!ENTITY preferences.label "Zobrazit &existující filtry...">
<!ENTITY pattern.label "Vyhledat vzor">
@@ -9,7 +9,7 @@
<!ENTITY collapse.label "M&inimalizovat blokované objekty:">
<!ENTITY match.warning "Vzor, který jste zadali, už neodpovídá adrese, kterou chcete zablokovat/povolit a nebude na ni tedy mít žádný účinek.">
<!ENTITY anchor.start.label "na &začátku adresy">
-<!ENTITY matchCase.label "&Rozlišovat velikost">
+<!ENTITY matchCase.label "&Rozlišovat velikost písmen">
<!ENTITY custom.pattern.label "Vlast&ní:">
<!ENTITY unselectAllTypes.label "Zrušit výběr">
<!ENTITY type.whitelist.label "&Výjimka">
@@ -21,7 +21,7 @@
<!ENTITY shortpattern.warning "Vzor, který jste zadali, je příliš krátký, aby mohl být optimalizován. Mnoho takových výrazů může zpomalit vaše prohlížení stránek. Je doporučeno, abyste pro tento filtr zadali delší řetězec.">
<!ENTITY collapse.yes.label "Ano">
<!ENTITY anchors.label "Povolit vzor pouze:">
-<!ENTITY collapse.default.yes.label "Použít výchozí (ano)">
+<!ENTITY collapse.default.yes.label "Použít jako výchozí (ano)">
<!ENTITY domainRestriction.help "Zadejte jednu nebo více domén oddělených znakem "|", filtr bude poté použit pouze na těchto doménách. Znak "~" před názvem domény zajistí, že filtr nebude na této doméně použit.">
<!ENTITY accept.label "Přidat filtr">
<!ENTITY options.label "Možnosti">
@@ -30,4 +30,4 @@
<!ENTITY collapse.no.label "Ne">
<!ENTITY selectAllTypes.label "Vybrat vše">
<!ENTITY advanced.label "Pokročilé zobrazení">
-<!ENTITY pattern.explanation "Vzor může být jakákoli část adresy, znak * funguje jako divoká karta. Filtr bude aplikován pouze na adresy odpovídající vzoru.">
+<!ENTITY pattern.explanation "Vzor může být jakákoli část adresy, znak * funguje jako jakýkoliv text. Filtr bude aplikován pouze na adresy odpovídající vzoru.">
diff --git a/chrome/locale/cs/filters.dtd b/chrome/locale/cs/filters.dtd
index 69adba1..d91d351 100644
--- a/chrome/locale/cs/filters.dtd
+++ b/chrome/locale/cs/filters.dtd
@@ -1,6 +1,6 @@
<!ENTITY restore.custom.warning "Všechny vaše vlastní filtry budou nahrazeny obsahem vybraného souboru. Chcete pokračovat?">
<!ENTITY slow.column "Po&malé filtry">
-<!ENTITY enabled.column "A&ktivní">
+<!ENTITY enabled.column "Po&volené">
<!ENTITY subscription.lastDownload.checksumMismatch "Chyba, neodpovídá kontrolní součet">
<!ENTITY noFiltersInGroup.text "Vybraná skupina je prázdná">
<!ENTITY subscription.actions.label "Akce">
@@ -12,7 +12,7 @@
<!ENTITY sort.label "&Seřadit podle">
<!ENTITY subscription.source.label "Seznam filtrů">
<!ENTITY hitcount.column "Zása&hy">
-<!ENTITY noFilters.text "Zatím nemáte žádné vlastní filtry.">
+<!ENTITY noFilters.text "Nemáte žádné vlastnoručně vytvořené filtry.">
<!ENTITY backup.custom.title "Pouze vlastní filtry">
<!ENTITY subscription.external.label "Aktualizováno jiným rozšířením">
<!ENTITY subscription.delete.label "Smazat">
diff --git a/chrome/locale/cs/firstRun.properties b/chrome/locale/cs/firstRun.properties
index dc1ab43..26a6ca2 100644
--- a/chrome/locale/cs/firstRun.properties
+++ b/chrome/locale/cs/firstRun.properties
@@ -6,15 +6,16 @@ firstRun_title=Adblock Plus byl nainstalován
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_toggle_on=ZAPNUTO
firstRun_contributor_credits=Zásluhy přispěvatelů
-firstRun_feature_show_overview=Zobrazit přehled
+firstRun_feature_show_expanded=Aktivovat funkce
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_features=Adblock Plus toho umí více než jen blokovat reklamy
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_description=Automaticky zbavte své surfování od tlačítek sociálních médií, jako je Facebook To se mi líbí, která se objevují na webových stránkách a sledují Vaše návyky.
+firstRun_feature_show_overview=Zobrazit přehled
+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_donate=přispějte
firstRun_donate_label=Podpořte náš projekt
firstRun_feature_social=Odstranit tlačítka sociálních médií
-firstRun_feature_show_expanded=Aktivovat funkce
+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.
diff --git a/chrome/locale/cs/overlay.dtd b/chrome/locale/cs/overlay.dtd
index 2d23ddf..f1378d9 100644
--- a/chrome/locale/cs/overlay.dtd
+++ b/chrome/locale/cs/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Vypnout na ?1?">
<!ENTITY filters.label "&Předvolby filtrů">
<!ENTITY disable.label "Zakázat všude">
-<!ENTITY showinaddonbar.label "Zobraz&it v řádku s rozšířeními">
<!ENTITY objecttab.title "Blokovat">
<!ENTITY objecttab.tooltip "Klepněte zde pro blokování tohoto objektu pomocí Adblock Plus">
<!ENTITY menuitem.label "Předvol&by Adblock Plus">
diff --git a/chrome/locale/da/firstRun.properties b/chrome/locale/da/firstRun.properties
index 1ee633c..06fcd2d 100644
--- a/chrome/locale/da/firstRun.properties
+++ b/chrome/locale/da/firstRun.properties
@@ -6,15 +6,16 @@ firstRun_title=Adblock Plus blev installeret
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_toggle_on=TIL
firstRun_contributor_credits=Tak til
-firstRun_feature_show_overview=vis oversigt
+firstRun_feature_show_expanded=aktiver funktioner
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_features=Adblock Plus kan mere end blot blokere annoncer
firstRun_feature_malware_description=Gør din browsing mere sikker ved at blokere kendte malwaredomæner.
+firstRun_feature_show_overview=vis oversigt
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_donate=donér
firstRun_donate_label=Støt projektet
firstRun_feature_social=Fjern knapper fra sociale medier
-firstRun_feature_show_expanded=aktiver funktioner
+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.
diff --git a/chrome/locale/da/overlay.dtd b/chrome/locale/da/overlay.dtd
index e79defe..203b3a0 100644
--- a/chrome/locale/da/overlay.dtd
+++ b/chrome/locale/da/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Slå fra på ?1?">
<!ENTITY filters.label "&Filterpræferencer">
<!ENTITY disable.label "Deaktiver overalt">
-<!ENTITY showinaddonbar.label "V&is på tilføjelseslinie">
<!ENTITY objecttab.title "Bloker">
<!ENTITY objecttab.tooltip "Klik her for at blokere dette objekt med Adblock Plus">
<!ENTITY menuitem.label "&Adblock Plus indstillinger">
diff --git a/chrome/locale/de/composer.dtd b/chrome/locale/de/composer.dtd
index 26fd3ef..e9dfe4b 100644
--- a/chrome/locale/de/composer.dtd
+++ b/chrome/locale/de/composer.dtd
@@ -1,11 +1,11 @@
<!ENTITY anchor.end.label "am En&de der Adresse">
<!ENTITY domainRestriction.label "Auf Do&main beschränken:">
<!ENTITY collapse.default.no.label "Standardeinstellung (nein)">
-<!ENTITY firstParty.label "Nur für Elemente der Urs&prungsseite">
+<!ENTITY firstParty.label "Nur für Elemente der Ursprungsseite">
<!ENTITY preferences.label "Existierende Filter an&zeigen...">
<!ENTITY pattern.label "Muster suchen">
<!ENTITY thirdParty.label "Nur für Elemen&te von Drittseiten">
-<!ENTITY filter.label "Neue&r Filter:">
+<!ENTITY filter.label "Neue &Filter:">
<!ENTITY collapse.label "Platz frei&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&fang der Adresse">
diff --git a/chrome/locale/de/firstRun.properties b/chrome/locale/de/firstRun.properties
index a47d611..dd34e10 100644
--- a/chrome/locale/de/firstRun.properties
+++ b/chrome/locale/de/firstRun.properties
@@ -6,15 +6,16 @@ firstRun_title=Adblock Plus wurde installiert
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_toggle_on=AN
firstRun_contributor_credits=Mitwirkende
-firstRun_feature_show_overview=Übersicht anzeigen
+firstRun_feature_show_expanded=Funktionen aktivieren
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>Unterstützen Sie uns</a> dabei das Internet zu einem besseren Ort zu machen
firstRun_features=Adblock Plus kann mehr als nur Werbung blockieren
firstRun_feature_malware_description=Sicheres Surfen durch Blockieren von infizierten Webseiten.
+firstRun_feature_show_overview=Übersicht anzeigen
firstRun_feature_social_description=Entfernt Social-Media-Buttons (z.B. den Facebook-Like) die auf Webseiten erscheinen und Ihr Surfverhalten aufzeichnen.
firstRun_donate=Spenden
firstRun_donate_label=Unterstützen Sie unser Projekt
firstRun_feature_social=Social Media-Buttons entfernen
-firstRun_feature_show_expanded=Funktionen aktivieren
+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 Chrom [...]
diff --git a/chrome/locale/de/overlay.dtd b/chrome/locale/de/overlay.dtd
index fc0f0e1..141af86 100644
--- a/chrome/locale/de/overlay.dtd
+++ b/chrome/locale/de/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Deaktivieren: auf ?1?">
<!ENTITY filters.label "Filterein&stellungen">
<!ENTITY disable.label "Überall deaktivieren">
-<!ENTITY showinaddonbar.label "In Add-on-Leis&te anzeigen">
<!ENTITY objecttab.title "Blockieren">
<!ENTITY objecttab.tooltip "Klicken Sie hier, um dieses Objekt mit Adblock Plus zu blockieren">
<!ENTITY menuitem.label "&Adblock Plus - Einstellungen">
diff --git a/chrome/locale/dsb/firstRun.properties b/chrome/locale/dsb/firstRun.properties
index f1167cb..ea2886c 100644
--- a/chrome/locale/dsb/firstRun.properties
+++ b/chrome/locale/dsb/firstRun.properties
@@ -6,15 +6,16 @@ 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_contributor_credits=Źěkowanje sobustatkujucym
-firstRun_feature_show_overview=pśeglěd pokazaś
+firstRun_feature_show_expanded=funkcije aktiwěrowaś
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_show_overview=pśeglěd pokazaś
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_social=Tłocaški za socialne medije wótpóraś
-firstRun_feature_show_expanded=funkcije aktiwěrowaś
+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.
diff --git a/chrome/locale/dsb/overlay.dtd b/chrome/locale/dsb/overlay.dtd
index c37687a..b0c469e 100644
--- a/chrome/locale/dsb/overlay.dtd
+++ b/chrome/locale/dsb/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Na ?1? znjemóžniś">
<!ENTITY filters.label "&Filtrowe nastajenja">
<!ENTITY disable.label "Wšuźi znjemóžniś">
-<!ENTITY showinaddonbar.label "W lejstwje &dodankow pokazaś">
<!ENTITY objecttab.title "Blokěrowaś">
<!ENTITY objecttab.tooltip "Klikniśo how, aby toś ten objekt z Adblock Plus blokěrował">
<!ENTITY menuitem.label "Adblock Plus - &Nastajenja">
diff --git a/chrome/locale/el/firstRun.properties b/chrome/locale/el/firstRun.properties
index 8048f29..47aa962 100644
--- a/chrome/locale/el/firstRun.properties
+++ b/chrome/locale/el/firstRun.properties
@@ -6,15 +6,16 @@ firstRun_title=Το Adblock Plus έχει εγκατασταθεί
firstRun_acceptableAdsExplanation=Θα θέλαμε να ενθαρρύνουμε τις ιστοσελίδες να χρησιμοποιούν ξεκάθαρες, διακριτικές διαφημίσεις. Γι' αυτό το λόγο έχουμε ορίσει <a>αυστηρές κατευθυντήριες γραμμές</a> για τον προσδιορισμό των αποδεκτών διαφημίσεων, οι οποίες εμφανίζονται στις προεπιλεγμένες ρυθμίσεις. Εάν εξακολουθείτε να θέλετε να αποκλείσετε όλες τις διαφημίσεις μπορείτε να <a>απενεργοποιήσετε</a> αυτήν την επιλογή σε λίγα δευτερόλεπτα.
firstRun_toggle_on=Ενεργό
firstRun_contributor_credits=Μνεία συντελεστών
-firstRun_feature_show_overview=εμφάνιση επισκόπισης
+firstRun_feature_show_expanded=ενεργοποιήση λειτουργιών
firstRun_dataCorruptionWarning=Αυτή η σελίδα συνεχίζει να εμφανίζεται; <a>Κάντε κλικ εδώ!</a>
firstRun_acceptableAdsHeadline=Οι ενοχλητικές διαφημίσεις τώρα θα αποκλειστούν
firstRun_share=Πείτε το στους φίλους σας
firstRun_share_headline=<a>Δώστε μας ένα χεράκι</a> στο να κάνουμε το διαδίκτυο ένα καλύτερο μέρος
firstRun_features=Το Adblock Plus μπορεί να κάνει περισσότερα από το φιλτράρισμα διαφημίσεων
firstRun_feature_malware_description=Κάνετε την περιήγηση σας πιο ασφαλή φράσσοντας γνωστές διευθύνσεις κακόβουλου λογισμικού.
+firstRun_feature_show_overview=εμφάνιση επισκόπισης
firstRun_feature_social_description=Απαλλάξετε αυτομάτως την περιήγησή σας από κουμπιά των μέσων κοινωνικής δικτύωσης, όπως το Like του Facebook, που εμφανίζονται σε ιστοσελίδες και παρακολουθούν τη συμπεριφορά σας.
firstRun_donate=δωρίστε
firstRun_donate_label=Υποστηρίξτε το έργο μας
firstRun_feature_social=Αφαίρεση κουμπιών μέσων κοινωνικής δικτύωσης
-firstRun_feature_show_expanded=ενεργοποιήση λειτουργιών
+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.
diff --git a/chrome/locale/el/overlay.dtd b/chrome/locale/el/overlay.dtd
index 3c68d67..a1b7e35 100644
--- a/chrome/locale/el/overlay.dtd
+++ b/chrome/locale/el/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Απενεργοποίηση στο ?1?">
<!ENTITY filters.label "Προτιμήσεις &φίλτρων">
<!ENTITY disable.label "Απενεργοποίηση παντού">
-<!ENTITY showinaddonbar.label "Εμφάνιση στην εργαλειο&θήκη προσθέτου">
<!ENTITY objecttab.title "Φραγή">
<!ENTITY objecttab.tooltip "Κλικ εδώ για να φιλτράρετε αυτό το αντικείμενο με το Adblock Plus">
<!ENTITY menuitem.label "Ad&block Plus">
diff --git a/chrome/locale/en-GB/firstRun.properties b/chrome/locale/en-GB/firstRun.properties
index 6a7820b..d51cd57 100644
--- a/chrome/locale/en-GB/firstRun.properties
+++ b/chrome/locale/en-GB/firstRun.properties
@@ -1,7 +1,21 @@
+firstRun_feature_tracking_description=Browse anonymously by disabling tracing - hiding your web traces from advertising companies that would trace your every action.
firstRun_toggle_off=OFF
firstRun_feature_tracking=Disable Tracking
-firstRun_dataCorruptionWarning=Does this page keep showing up? <a>Click here!</a>
+firstRun_feature_malware=Malware Blocking
firstRun_title=Adblock Plus has been installed
+firstRun_acceptableAdsExplanation=We'd like to encourage websites to use easily, 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 ads you can <a>disable</a> this is a few seconds.
firstRun_toggle_on=ON
-firstRun_feature_malware=Malware Blocking
+firstRun_contributor_credits=Contributor Credits
+firstRun_feature_show_expanded=Activate Features
+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 cand do more than blocking ads
+firstRun_feature_malware_description=Make your browsing more secured by blocking known malware domains.
+firstRun_feature_show_overview=Show Overview
+firstRun_feature_social_description=Automatically rid your browsing experience of social media buttons, such as Facebook Like, which appear on websites and trace your behaviour.
+firstRun_donate=donate
+firstRun_donate_label=Supports our project
firstRun_feature_social=Remove Social Media Buttons
+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/chrome/locale/en-GB/overlay.dtd b/chrome/locale/en-GB/overlay.dtd
index ed5dfda..c70930f 100644
--- a/chrome/locale/en-GB/overlay.dtd
+++ b/chrome/locale/en-GB/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Disable on ?1?">
<!ENTITY filters.label "Filter preferences">
<!ENTITY disable.label "Disable everywhere">
-<!ENTITY showinaddonbar.label "Show in add-on bar">
<!ENTITY objecttab.title "Block">
<!ENTITY objecttab.tooltip "Block this object with Adblock Plus">
<!ENTITY menuitem.label "Adblock Plus Preferences">
diff --git a/chrome/locale/en-US/firstRun.properties b/chrome/locale/en-US/firstRun.properties
index 62d2ea2..f382750 100644
--- a/chrome/locale/en-US/firstRun.properties
+++ b/chrome/locale/en-US/firstRun.properties
@@ -2,6 +2,7 @@ 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_toggle_on=ON
firstRun_toggle_off=OFF
@@ -13,12 +14,10 @@ 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_feature_show_expanded=activate features
-firstRun_feature_show_overview=show overview
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
\ No newline at end of file
+firstRun_contributor_credits=Contributor Credits
diff --git a/chrome/locale/en-US/overlay.dtd b/chrome/locale/en-US/overlay.dtd
index 51dda89..4ab7fc9 100644
--- a/chrome/locale/en-US/overlay.dtd
+++ b/chrome/locale/en-US/overlay.dtd
@@ -28,7 +28,6 @@
<!ENTITY showintoolbar.label "Show in tool&bar">
<!ENTITY showinstatusbar.label "&Show in status bar">
-<!ENTITY showinaddonbar.label "Show in add-on &bar">
<!ENTITY objecttabs.label "Show &tabs on Flash and Java">
<!ENTITY hideplaceholders.label "Hide p&laceholders of blocked elements">
<!ENTITY counthits.label "Count filter &hits">
diff --git a/chrome/locale/eo/firstRun.properties b/chrome/locale/eo/firstRun.properties
index 6484513..c24bc4e 100644
--- a/chrome/locale/eo/firstRun.properties
+++ b/chrome/locale/eo/firstRun.properties
@@ -6,15 +6,16 @@ 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_contributor_credits=Danko al kontribuintoj
-firstRun_feature_show_overview=montri superrigardon
+firstRun_feature_show_expanded=ebligi funkciojn
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_show_overview=montri superrigardon
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_social=Forigi butonojn de sociaj aŭdvidaĵoj
-firstRun_feature_show_expanded=ebligi funkciojn
+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.
diff --git a/chrome/locale/eo/overlay.dtd b/chrome/locale/eo/overlay.dtd
index c230ef6..fe35f77 100644
--- a/chrome/locale/eo/overlay.dtd
+++ b/chrome/locale/eo/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Malebligi sur ?1?">
<!ENTITY filters.label "&Filtrilaj agordoj">
<!ENTITY disable.label "Ĉie malebligi">
-<!ENTITY showinaddonbar.label "&Vidigi en aldonaĵbreto">
<!ENTITY objecttab.title "Bloki">
<!ENTITY objecttab.tooltip "Klaku ĉi tien por bloki ĉi tiun objekton per Adblock Plus">
<!ENTITY menuitem.label "&Agordoj de Adblock Plus">
diff --git a/chrome/locale/es-AR/firstRun.properties b/chrome/locale/es-AR/firstRun.properties
index d9400af..d2e62c9 100644
--- a/chrome/locale/es-AR/firstRun.properties
+++ b/chrome/locale/es-AR/firstRun.properties
@@ -6,15 +6,16 @@ firstRun_title=Se instaló Adblock Plus
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_toggle_on=ACTIVAR
firstRun_contributor_credits=Créditos
-firstRun_feature_show_overview=mostrar pantallazo
+firstRun_feature_show_expanded=activar funciones
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_features=Adblock Plus puede bloquear más que publicidades
firstRun_feature_malware_description=Hacé tu navegación web más segura bloqueando dominios identificados como malware.
+firstRun_feature_show_overview=mostrar pantallazo
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_donate=doná
firstRun_donate_label=Soportá nuestro proyecto
firstRun_feature_social=Quitá botones de redes sociales
-firstRun_feature_show_expanded=activar funciones
+firstRun_legacySafariWarning=Usted está usando una versión antigua de Safari que no es compatible con Adblock Plus. Puede que no funcione correctamente o que afecte a la utilización en algunos sitios web. Recomendamos encarecidamente la actualización de Safari 6.1.1 o superior (en OS X 10.8 Mountain Lion) o Safari 7.0.1 o superior (en OS X 10.9 Mavericks), o utilizar la última versión de Mozilla Firefox, Google Chrome o Opera.
diff --git a/chrome/locale/es-AR/overlay.dtd b/chrome/locale/es-AR/overlay.dtd
index 64e31cb..6728bc8 100644
--- a/chrome/locale/es-AR/overlay.dtd
+++ b/chrome/locale/es-AR/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Deshabilitar en ?1?">
<!ENTITY filters.label "P&referencias de filtro">
<!ENTITY disable.label "Deshabilitar en todos lados">
-<!ENTITY showinaddonbar.label "Mostrar en la barra de co&mplementos">
<!ENTITY objecttab.title "Bloquear">
<!ENTITY objecttab.tooltip "Hacé clic acá para bloquear este objeto con Adblock Plus">
<!ENTITY menuitem.label "&Preferencias de Adblock Plus">
diff --git a/chrome/locale/es-CL/composer.dtd b/chrome/locale/es-CL/composer.dtd
index 79d6c82..b71d43f 100644
--- a/chrome/locale/es-CL/composer.dtd
+++ b/chrome/locale/es-CL/composer.dtd
@@ -1,7 +1,23 @@
+<!ENTITY collapse.default.no.label "Usar predeterminado (no)">
+<!ENTITY preferences.label "&Mostrar filtros existentes…">
+<!ENTITY pattern.label "Buscar patrón">
+<!ENTITY filter.label "&Nuevo filtro:">
+<!ENTITY types.label "aplicar a">
+<!ENTITY custom.pattern.label "Personalizar:">
+<!ENTITY unselectAllTypes.label "No seleccionar ninguno">
+<!ENTITY type.whitelist.label "regla de excepción">
+<!ENTITY regexp.warning "el patrón que ha introducido puede interpretarse como espresion regular que no puede ser procesada eficientemente por adblock plus y puede ralentizar su navegador. si no quieres usar una ezpresion regular, añade un asterisco (*) al final del patrón.">
+<!ENTITY collapse.yes.label "Sí">
+<!ENTITY basic.label "Vista básica">
+<!ENTITY type.filter.label "filtro de bloqueo">
+<!ENTITY shortpattern.warning "El patrón ingresado es demasiado corto para ser optimizado y puede ralentizar su experiencia de navegación. Se recomienda que elija una cadena más larga de este filtro permitir Adblock Plus procesar el filtro más eficientemente.">
+<!ENTITY dialog.title "Añadir regla de filtrado de Adblock Plus">
+<!ENTITY anchors.label "Sólo aceptar patrones:">
+<!ENTITY collapse.default.yes.label "Usar predeterminado (sí)">
+<!ENTITY domainRestriction.help "usa esta opcion para especificar un o varios dominios separados por ''|''. el filtro sólo se aplicara a los dominios seleccionados. el simbolo ''~'' antes de un dominio indica que no se le aplicara el filtro">
<!ENTITY accept.label "Añadir filtro">
+<!ENTITY options.label "Opciones">
<!ENTITY disabled.warning "Adblock Plus está desactivado. Puede añadir filtros, pero no se aplicarán a menos que [link]active Adblock Plus[/link].">
-<!ENTITY preferences.label "&Mostrar filtros existentes…">
+<!ENTITY collapse.no.label "No">
+<!ENTITY selectAllTypes.label "Seleccionar todos">
<!ENTITY advanced.label "Vista avanzada">
-<!ENTITY dialog.title "Añadir regla de filtrado de Adblock Plus">
-<!ENTITY basic.label "Vista básica">
-<!ENTITY filter.label "&Nuevo filtro:">
diff --git a/chrome/locale/es-CL/sidebar.dtd b/chrome/locale/es-CL/sidebar.dtd
new file mode 100644
index 0000000..ff89cc4
--- /dev/null
+++ b/chrome/locale/es-CL/sidebar.dtd
@@ -0,0 +1,33 @@
+<!ENTITY context.flash.label "Resaltar los bordes del elemento">
+<!ENTITY address.label "Dirección">
+<!ENTITY context.open.label "Abrir en nueva pestaña">
+<!ENTITY type.label "Tipo">
+<!ENTITY tooltip.filterSource.label "Origen filtro:">
+<!ENTITY noitems.label "Ningún elemento bloqueable">
+<!ENTITY filter.label "Filtro">
+<!ENTITY tooltip.size.label "Tamaño:">
+<!ENTITY reattach.label "Unir">
+<!ENTITY search.label "buscar:">
+<!ENTITY docDomain.thirdParty "(tercera parte)">
+<!ENTITY filterSource.label "Origen filtro">
+<!ENTITY tooltip.docDomain.label "Origen del documento:">
+<!ENTITY context.copy.label "Copiar la dirección del elemento">
+<!ENTITY tooltip.type.label "Tipo:">
+<!ENTITY context.disablefilter.label "¿Desactivar filtro?">
+<!ENTITY context.copyFilter.label "Copiar filtro">
+<!ENTITY context.block.label "Bloquear este elemento">
+<!ENTITY context.enablefilter.label "¿Reactivar filtro?">
+<!ENTITY detach.label "Separar">
+<!ENTITY whitelisted.label "Página de lista blanca">
+<!ENTITY detached.title "Adblock Plus: Artículos bloqueable (desprendidos)">
+<!ENTITY docDomain.firstParty "(primera parte)">
+<!ENTITY tooltip.type.whitelisted "(en lista blanca)">
+<!ENTITY tooltip.filter.label "Filtro en uso:">
+<!ENTITY tooltip.filter.disabled "(desactivado)">
+<!ENTITY context.editfilter.label "Editar el filtro en uso">
+<!ENTITY tooltip.type.blocked "(bloqueado)">
+<!ENTITY size.label "Tamaño">
+<!ENTITY context.whitelist.label "Añadir regla de excepción para el elemento">
+<!ENTITY state.label "Estado">
+<!ENTITY docDomain.label "Origen del documento">
+<!ENTITY tooltip.address.label "Dirección:">
diff --git a/chrome/locale/es-ES/firstRun.properties b/chrome/locale/es-ES/firstRun.properties
index 81f2f36..1dc9e30 100644
--- a/chrome/locale/es-ES/firstRun.properties
+++ b/chrome/locale/es-ES/firstRun.properties
@@ -6,15 +6,16 @@ firstRun_title=Se ha instalado Adblock Plus
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_toggle_on=ACTIVAR
firstRun_contributor_credits=Colaboradores
-firstRun_feature_show_overview=Mostrar visión general
+firstRun_feature_show_expanded=Activar funciones
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_features=Adblock Plus no sólo bloquea anuncios, puede hacer más cosas
firstRun_feature_malware_description=Navegue con más seguridad bloqueando dominios identificados como malware.
+firstRun_feature_show_overview=Mostrar visión general
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_donate=Donar
firstRun_donate_label=Apoye nuestro proyecto
firstRun_feature_social=Eliminar botones de redes sociales
-firstRun_feature_show_expanded=Activar funciones
+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.
diff --git a/chrome/locale/es-ES/overlay.dtd b/chrome/locale/es-ES/overlay.dtd
index c029dd3..e40b4f8 100644
--- a/chrome/locale/es-ES/overlay.dtd
+++ b/chrome/locale/es-ES/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Desactivar en ?1?">
<!ENTITY filters.label "&Preferencias de filtros">
<!ENTITY disable.label "Desactivar globalmente">
-<!ENTITY showinaddonbar.label "Mostrar en barra de e&xtensiones">
<!ENTITY objecttab.title "Bloquear">
<!ENTITY objecttab.tooltip "Pulse aquí para bloquear este objeto con Adblock Plus">
<!ENTITY menuitem.label "&Adblock Plus">
diff --git a/chrome/locale/es-MX/composer.dtd b/chrome/locale/es-MX/composer.dtd
index 27ca0c6..00bc242 100644
--- a/chrome/locale/es-MX/composer.dtd
+++ b/chrome/locale/es-MX/composer.dtd
@@ -10,19 +10,19 @@
<!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 "&ir al principio de la dirección">
<!ENTITY matchCase.label "&Coincidir Mayus/Minus">
-<!ENTITY custom.pattern.label "&Personalizado:">
+<!ENTITY custom.pattern.label "&Personalizar:">
<!ENTITY unselectAllTypes.label "Seleccionar ninguno">
-<!ENTITY type.whitelist.label "Regla de excepció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 de usar una expresión regular, agregue un asterisco (*) al final del patrón.">
+<!ENTITY type.whitelist.label "Regla de e&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.">
<!ENTITY dialog.title "Agregar una regla de filtro de Adblock Plus">
<!ENTITY basic.label "Vista básica">
<!ENTITY type.filter.label "Filtro de &bloqueo">
<!ENTITY types.label "Se aplica a tipos:">
-<!ENTITY shortpattern.warning "El patrón que ha ingresado es muy corto para ser optimizado y podria realentizar su experiencia al navegar. Es recomendable que elija una cadena mas larga para este filtro para permitir a Adblock Plus procesar el filtro con mayor eficacia.">
+<!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 anchors.label "Acepta solo patrones:">
+<!ENTITY anchors.label "Solo aceptar patrones:">
<!ENTITY collapse.default.yes.label "Usar por defecto (si)">
-<!ENTITY domainRestriction.help "Use esta opción para espeficar uno o mas dominios separados por una barra (|). El filtro solo se aplicara en dominio(s) seleccionados. Una tilde (~) antes del nombre del dominio indica que el filtro no se aplicará en ese dominio.">
+<!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 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/chrome/locale/es-MX/firstRun.properties b/chrome/locale/es-MX/firstRun.properties
index eabf6d9..f743908 100644
--- a/chrome/locale/es-MX/firstRun.properties
+++ b/chrome/locale/es-MX/firstRun.properties
@@ -6,15 +6,16 @@ firstRun_title=Adblock Plus ha sido instalado
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_toggle_on=SÍ
firstRun_contributor_credits=Colaboradores
-firstRun_feature_show_overview=mostrar resumen
+firstRun_feature_show_expanded=Activar características
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_features=Adblock Plus puede hacer más que bloquear anuncios
firstRun_feature_malware_description=Haz tu navegación más segura bloqueando dominios maliciosos conocidos.
+firstRun_feature_show_overview=mostrar resumen
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_donate=donar
firstRun_donate_label=Apoya nuestro proyecto
firstRun_feature_social=Quitar Botones de Redes Sociales
-firstRun_feature_show_expanded=Activar características
+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.
diff --git a/chrome/locale/es-MX/overlay.dtd b/chrome/locale/es-MX/overlay.dtd
index 3805532..d94eefe 100644
--- a/chrome/locale/es-MX/overlay.dtd
+++ b/chrome/locale/es-MX/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Desactivar en ?1?">
<!ENTITY filters.label "&Preferencias de filtro">
<!ENTITY disable.label "Desactivado en cualquier lugar">
-<!ENTITY showinaddonbar.label "Mostrar en la barra de &complementos">
<!ENTITY objecttab.title "Bloquear">
<!ENTITY objecttab.tooltip "Click aquí para bloquear este objeto con Adblock Plus">
<!ENTITY menuitem.label "Pr&eferencias de Adblock Plus">
diff --git a/chrome/locale/et/firstRun.properties b/chrome/locale/et/firstRun.properties
index 95a6f2b..965cfdd 100644
--- a/chrome/locale/et/firstRun.properties
+++ b/chrome/locale/et/firstRun.properties
@@ -1 +1,9 @@
+firstRun_toggle_off=VÄLJAS
+firstRun_share_headline=<a>Anna meile käsi</a> veebi muutmises paremaks kohaks
firstRun_title=Adblock Plus on paigaldatud
+firstRun_toggle_on=SEES
+firstRun_feature_show_overview=kuva ülevaade
+firstRun_acceptableAdsHeadline=Tüütud kuulutused on nüüd blokeeritud
+firstRun_share=Räägi oma sõpradele
+firstRun_donate=anneta
+firstRun_donate_label=Toeta meie projekti
diff --git a/chrome/locale/et/overlay.dtd b/chrome/locale/et/overlay.dtd
index 5dd6251..60e50f3 100644
--- a/chrome/locale/et/overlay.dtd
+++ b/chrome/locale/et/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Keela domeenis ?1?">
<!ENTITY filters.label "Filtrite sätted">
<!ENTITY disable.label "Keela kõikjal">
-<!ENTITY showinaddonbar.label "Nä&ita lisade ribal">
<!ENTITY objecttab.title "Blokeeri">
<!ENTITY objecttab.tooltip "Klõpsa siia selle objekti blokeerimiseks Adblock Plusi abil">
<!ENTITY menuitem.label "Adblock Plusi sätted">
diff --git a/chrome/locale/eu/composer.dtd b/chrome/locale/eu/composer.dtd
index 64cd77b..ae82d94 100644
--- a/chrome/locale/eu/composer.dtd
+++ b/chrome/locale/eu/composer.dtd
@@ -1,33 +1,33 @@
-<!ENTITY anchor.end.label "hel&bidearen bukaeran">
+<!ENTITY anchor.end.label "helbidearen &bukaeran">
<!ENTITY domainRestriction.label "Mugatu &domeinu honetara:">
-<!ENTITY collapse.default.no.label "Erabili (ez) lehenetsita">
+<!ENTITY collapse.default.no.label "Erabili lehenetsitakoa (ez)">
<!ENTITY firstParty.label "Lehen es&kukoa soilik">
<!ENTITY preferences.label "&Erakutsi dauden iragazkiak...">
<!ENTITY pattern.label "Bilatu eredua">
<!ENTITY thirdParty.label "Ka&npotik jasoa soilik">
<!ENTITY filter.label "&Iragazki berria:">
-<!ENTITY collapse.label "Ko&lapsatu blokeatuta:">
+<!ENTITY collapse.label "Ko&lapso blokeatuta:">
<!ENTITY match.warning "Sartu duzun ereduak ez du blokeatu/desblokeatu nahi duzun helbidearekin bat egiten eta ez du inolako eraginik izango.">
<!ENTITY anchor.start.label "helbidearen &hasieran">
-<!ENTITY matchCase.label "&Maiuskulak-minuskulak bereizi">
+<!ENTITY matchCase.label "Bereizi letra &Larriak/xeheak">
<!ENTITY custom.pattern.label "&Pertsonalizatua:">
<!ENTITY unselectAllTypes.label "Ez aukeratu bat ere ez">
<!ENTITY type.whitelist.label "&Salbuespen-araua">
<!ENTITY regexp.warning "Sartu duzun eredua adierazpen erregulartzat hartuko da, Adblock Plusek ezin ditu azkar prozesatu eta honek zure nabigazioa moteldu dezake. Zure asmoa ez bazen adierazpen erregular bat erabiltzea, gehitu izarño bat (*) ereduaren bukaeran.">
-<!ENTITY dialog.title "Gehitu Adblock Plus iragazki araua">
+<!ENTITY dialog.title "Gehitu Adblock Plus iragazki-araua">
<!ENTITY basic.label "Oinarrizko ikuspegia">
<!ENTITY type.filter.label "&Blokeatzeko iragazkia">
<!ENTITY types.label "Aplikatu mota hauei:">
<!ENTITY shortpattern.warning "Sartu duzun eredua laburregia da optimizatu ahal izateko eta zure nabigazioa moteldu dezake. Testu kate luzeago bat aukeratzea aholkatzen da Adblock Plusek azkarrago prozesatu dezan.">
<!ENTITY collapse.yes.label "Bai">
<!ENTITY anchors.label "Onartu eredua soilik:">
-<!ENTITY collapse.default.yes.label "Erabili (bai) lehenetsita">
+<!ENTITY collapse.default.yes.label "Erabili lehenetsitakoa (bai)">
<!ENTITY domainRestriction.help "Erabili aukera hau domeinu bat edo gehiago zehazteko marra bertikal batez banatuta (|). Iragazkia aukeratutako domeinuetan erabiliko da soilik. Gehitu tilet bat (~) domeinuaren aurretik domeinu horretan iragazkia ez erabiltzeko.">
<!ENTITY accept.label "Gehitu iragazkia">
<!ENTITY options.label "Aukerak">
-<!ENTITY disabled.warning "Adblock plus orain desgaituta dago. Iragazkiak gehitu ditzakezu, baina ez dira aplikatuko ez baduzu [link]Adblock Plus gaitzen[/link].">
+<!ENTITY disabled.warning "Adblock Plus orain desgaituta dago. Iragazkiak gehitu ditzakezu baina ez dira aplikatuko ez baduzu [link]Adblock Plus gaitzen[/link].">
<!ENTITY anchor.start.flexible.label "domeinu izenaren &hasieran">
<!ENTITY collapse.no.label "Ez">
<!ENTITY selectAllTypes.label "Aukeratu denak">
<!ENTITY advanced.label "Ikuspegi aurreratua">
-<!ENTITY pattern.explanation "Eredua helbidearen edozein atal izan daiteke; asteriskoa (*) komodin bezala erabili daiteke. Iragazkia soilik aplikatuko da ereduarekin bat datozen helbideetan.">
+<!ENTITY pattern.explanation "Eredua helbidearen edozein atal izan daiteke; izarñoa (*) komodin lanak egiten ditu, zernahitarako balio du. Iragazkia soilik aplikatuko da ereduarekin bat datozen helbideetan.">
diff --git a/chrome/locale/eu/filters.dtd b/chrome/locale/eu/filters.dtd
index c056cfd..71aabc9 100644
--- a/chrome/locale/eu/filters.dtd
+++ b/chrome/locale/eu/filters.dtd
@@ -1,7 +1,7 @@
<!ENTITY restore.custom.warning "Zure iragazki pertsonal guztiak aukeratutako fitxategiko edukiarekin ordeztuko dira. Aurrera jarraitu nahi duzu?">
<!ENTITY slow.column "Iraga&zki motelak">
<!ENTITY enabled.column "&Gaituta">
-<!ENTITY subscription.lastDownload.checksumMismatch "Errorea; egiaztapen guztiak ez datoz bat">
+<!ENTITY subscription.lastDownload.checksumMismatch "Errorea; kontrol-baturak ez datoz bat">
<!ENTITY noFiltersInGroup.text "Aukeratutako taldea hutsik dago">
<!ENTITY subscription.actions.label "Ekintzak">
<!ENTITY filter.selectAll.label "Denak aukeratu">
@@ -26,8 +26,8 @@
<!ENTITY filter.delete.label "Ezabatu">
<!ENTITY addSubscriptionAdd.label "Gehitu">
<!ENTITY viewMenu.label "Ikusi">
-<!ENTITY subscription.lastDownload.unknown "E/E">
-<!ENTITY addSubscriptionCancel.label "Ezeztatu">
+<!ENTITY subscription.lastDownload.unknown "Ez erabilgarri">
+<!ENTITY addSubscriptionCancel.label "Utzi bertan behera">
<!ENTITY subscription.enabled.label "Gaituta">
<!ENTITY noSubscriptions.text "Ez duzu harpidetzarik gehitu oraindik. Adblock Plusek du ezer blokeatuko iragazkirik gabe; mesedez, erabili "Gehitu iragazki harpidetza"
iragazkiak gehitzeko.">
@@ -35,7 +35,7 @@
<!ENTITY dialog.title "Adblock Plus iragazki hobespenak">
<!ENTITY addFilter.label "Gehitu iraga&zkia">
<!ENTITY subscription.minVersion.warning "Iragazki harpidetzak Adblock Plus bertsio berria behar du, azken bertsiora eguneratu beharko zenuke Adblock Plus.">
-<!ENTITY subscription.lastDownload.invalidURL "Kale, ez da helbide baliagarria">
+<!ENTITY subscription.lastDownload.invalidURL "Huts egin du; ez da helbide baliagarria">
<!ENTITY backup.error "Iragazkiak fitxategira idazteak errore bat gertatu da. Egiaztatu fitxategian idaztea dagoela eta ez duela beste aplikazio batek blokeatu.">
<!ENTITY filter.moveUp.label "Igo">
<!ENTITY addGroup.label "Gehitu &talde iragazkia">
@@ -61,13 +61,13 @@
<!ENTITY find.label "&Bilatu">
<!ENTITY subscription.moveDown.label "Jaitsi">
<!ENTITY subscription.lastDownload.connectionError "Huts egin du; deskarga errorea">
-<!ENTITY subscription.lastDownload.success "Arrakasta">
+<!ENTITY subscription.lastDownload.success "Ongi">
<!ENTITY subscription.lastDownload.invalidData "Huts egin du; ez da iragazki zerrenda baliagarria">
<!ENTITY filter.paste.label "Itsatsi">
<!ENTITY subscription.disabledFilters.enable "Gaitu desgaitutako iragazkiak">
<!ENTITY lasthit.column "&Azken bategitea">
<!ENTITY subscription.editTitle.label "Editatu izenburua">
-<!ENTITY subscription.disabledFilters.warning "Harpidetza honetako iragazki batzuk desgaituta daude">
+<!ENTITY subscription.disabledFilters.warning "Harpidetza honetako iragazki batzuk desgaituta daude.">
<!ENTITY filter.column "&Iragazki araua">
<!ENTITY subscription.lastDownload.label "Azken deskarga:">
<!ENTITY viewList.label "Ikusi zerrenda">
diff --git a/chrome/locale/eu/firstRun.properties b/chrome/locale/eu/firstRun.properties
index d602d9f..0052baf 100644
--- a/chrome/locale/eu/firstRun.properties
+++ b/chrome/locale/eu/firstRun.properties
@@ -1,7 +1,21 @@
+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_dataCorruptionWarning=Orri hau behin eta berriro agertzen dela? <a>Egin klik hemen!</a>
+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_feature_malware=Programa kaltegarriak geldiarazi
+firstRun_contributor_credits=Parte-hartzaileen kredituak
+firstRun_feature_show_expanded=aktibatu ezaugarriak
+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_show_overview=bistaratu gainbegirada
+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_social=Kendu gizarte-sareetako botoiak
+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.
diff --git a/chrome/locale/eu/global.properties b/chrome/locale/eu/global.properties
index 145ee98..e617260 100644
--- a/chrome/locale/eu/global.properties
+++ b/chrome/locale/eu/global.properties
@@ -1,12 +1,12 @@
no_blocking_suggestions=Ez dago elementu blokeagarririk uneko orrian
action3_tooltip=Egin klik Adblock Plus gaitzeko/desgaitzeko.
type_label_script=scripta
-filter_elemhide_nocriteria=Ez da ezkutatu beharreko elementua aurkitzeko irizpiderik zehaztu
+filter_elemhide_nocriteria=Ez da zehaztu ezkutatu beharreko elementua aurkitzeko irizpiderik
blockingGroup_title=Publizitatea blokeatzeko arauak
whitelisted_tooltip=Adblock Plus orri honetan desgaituta dago.
type_label_stylesheet=estilo orria
blocked_count_tooltip=?1? / ?2?
-type_label_font=letra-tipo
+type_label_font=letra-tipoa
type_label_popup=pop-up leihoa
filter_regexp_tooltip=Iragazki hau adierazpen erregular bat da edo optimizatzeko laburregia da. Honelako iragazki gehiegik nabigazioa motelduko dute.
action0_tooltip=Egin klik testuinguru menua atera dadin; egin erdiko klika gaitzeko/desgaitzeko.
@@ -25,7 +25,7 @@ action2_tooltip=Egin klik hobespenak irekitzeko, egin erdiko klika gaitzeko/desg
type_label_subdocument=markoa
clearStats_warning=Honek bategite estatistika guztiak ezabatuko ditu eta iragazkien bategiteak zenbatzeari utziko zaio. Aurrera jarraitu nahi duzu?
blocked_count_addendum=(baita baimenduta: ?1?, ezkutuan: ?2?)
-subscription_invalid_location=Iragazki zerrendaren kokagunea ez da baliozko URL edo fitxategi bat
+subscription_invalid_location=Iragazki zerrendaren kokagunea ez da balio duen URLa, ezta fitxategi baten izena ere.
type_label_image=irudia
remove_subscription_warning=Ziur harpidetza hau ezabatu nahi duzula?
type_label_other=beste bat
diff --git a/chrome/locale/eu/meta.properties b/chrome/locale/eu/meta.properties
index 5fbba53..51f9a18 100644
--- a/chrome/locale/eu/meta.properties
+++ b/chrome/locale/eu/meta.properties
@@ -1,6 +1,6 @@
-description.short=Publizitateaz gogaitua? Espioitzaz arduratua? Banerrekin asper-asper eginda? Instalatu Adblock Plus orain internetaren kontrola berreskuratzeko eta weba ikusteko modua aldatzeko.\n\nHorra bideo laburr bat: http://www.youtube.com/watch?v=oNvb2SjVjjI
+description.short=Publizitateaz gogaitua? Espioitzaz arduratua? Banerrekin asper-asper eginda? Instalatu Adblock Plus orain Internetaren kontrola berreskuratzeko eta weba ikusteko modua aldatzeko.\n\nHorra bideo labur bat: http://www.youtube.com/watch?v=oNvb2SjVjjI
name=Adblock Plus
description.long.addition1=Adblock Plus 2.0tik aurrera, iragazki hobespenetan publizitate ez intrusiboa baimentzeko aukera badago. Iragartzeko bide ez intrusiboak erabiltzen dituzten webguneak laguntzea da honen helburua eta webgune gehiagok gauza bera egin dezaten bultzatzea. <a href="http://adblockplus.org/en/acceptable-ads">Irakurri gehiago</a>
-translator=Osoitz
+translator=Librezale.org
description.long=Adblock Plus gehigarriak internetaren kontrola berreskuratzea eta weba zuk nahi duzun moduan ikustea baimentzen dizu. Gehigarri honek hainbat hizkuntzatan sortutako dozenaka iragazki harpidetza onartzen ditu. Automatikoki konfiguraturik, publizitatea desagerrarazi edo software kaltegarria duten guneak blokeatzen ditu. Adblock Plusek zure iragazki pertsonalak sortzea ere baimentzen dizu. Horretarako, hainbat tresna lagungarri ditu, besteak beste irudientzako testuinguru a [...]
description=Iragarkiak atzoko kontuak dira!
diff --git a/chrome/locale/eu/overlay.dtd b/chrome/locale/eu/overlay.dtd
index ab0cbdc..1611ee0 100644
--- a/chrome/locale/eu/overlay.dtd
+++ b/chrome/locale/eu/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Ezgaitu hemen: ?1?">
<!ENTITY filters.label "&Iragazki hobespenak">
<!ENTITY disable.label "Ezgaitu edonon">
-<!ENTITY showinaddonbar.label "Erakutsi &gehigarrien barran">
<!ENTITY objecttab.title "Blokeatu">
<!ENTITY objecttab.tooltip "Egin klik hemen objektu hau Adblock Plusekin blokeatzeko">
<!ENTITY menuitem.label "Adbloc&k Plus hobespenak">
diff --git a/chrome/locale/eu/sendReport.dtd b/chrome/locale/eu/sendReport.dtd
index a7fee48..91e07fb 100644
--- a/chrome/locale/eu/sendReport.dtd
+++ b/chrome/locale/eu/sendReport.dtd
@@ -1,9 +1,9 @@
-<!ENTITY screenshot.undo.label "Desegin (&U)">
+<!ENTITY screenshot.undo.label "&Desegin">
<!ENTITY issues.disabledgroups.description "Hurrengo iragazki harpidetzak / iragazki taldeak ezgaituta daude, hala ere orri honetan eragina izan dezakete:">
<!ENTITY showData.label "Erakutsi txostenaren informazioa">
<!ENTITY typeSelector.falsePositive.label "Adblock Plus gehigarria behar baino gehia&go blokeatzen ari da">
<!ENTITY issues.change.description "Zure konfigurazioa aldatu da. Mesedez birkargatu orria aldaketak egiaztatzeko eta bidali txostena arazoa konpondu ez bada.">
-<!ENTITY email.label "E-Posta: (&m)">
+<!ENTITY email.label "E-&Posta:">
<!ENTITY issues.openPreferences.label "Ireki iragazki hobespenak">
<!ENTITY sendPage.confirmation "Zure txostena gorde egin da. Honako helbidean eskuratu dezakezu:">
<!ENTITY copyLink.label "Ko&piatu txostenaren lotura">
@@ -14,7 +14,7 @@
<!ENTITY typeWarning.override.label "Ulertzen dut eta txostena bidali na&hi dut hala ere">
<!ENTITY issues.disabled.enable.label "Gaitu Adblock Plus">
<!ENTITY update.fixed.description "Baliteke zure iragazki harpidetzak eguneratzeak arazoa konpondu izana. Mesedez birkargatu orria eta berriro saiatu, arazoa berean badirau berriro zapaldu Berri eman botoia.">
-<!ENTITY anonymous.label "Izen g&abe aurkeztu">
+<!ENTITY anonymous.label "Bidalketa anonimoa">
<!ENTITY reloadButton.label "Bi&rkargatu orria">
<!ENTITY recentReports.clear.label "E&zabatu txosten guztiak">
<!ENTITY typeSelector.description "Leiho honek Adblock Plus arazo txosten bat bidaltzeko beharrezkoak diren urratsetan zehar gidatuko zaitu. Hasteko, mesedez aukeratu orri honetan pairatzen duzun arazo mota aukeratu:">
@@ -22,14 +22,14 @@
<!ENTITY issues.ownfilters.description "Orri honetan erabilitako iragazki batzuk erabiltzaileak sortutakoak dira. Mesedez ezgaitu arazoa sor lezaketen iragazkiak:">
<!ENTITY update.inProgress.description "Adblock Plusek zure iragazki harpidetzak eguneratu behar ditu arazoa dagoeneko konponduta dagoen egiaztatzeko. Mesedez itxaron...">
<!ENTITY sendPage.retry.label "Bidali berriro">
-<!ENTITY data.label "Txostenaren informazioa: (&d)">
+<!ENTITY data.label "Txostenaren informa&zioa:">
<!ENTITY recentReports.label "Orain dela gutxi bidalitako txostenak">
<!ENTITY typeWarning.description "Adblock Plusen arazo orokor, baten txostena egin nahi duzula esan duzu, ez iragazkiena. Jabetu zaitez arazo horien berri emateko hobe dela [link]Adblock Plus forum[/link] foroa erabiltza. Arazoen txosten bidalketa erabili soilik badagoen eztabaida bati eransteko, inork ez duelako zure txostena ikusiko lotura bat ematen ez baduzu. Automatikoki sortutako lotura bat emango zaizu txostena bidali eta gero.">
<!ENTITY issues.disabled.description "Adblock Plus ezgaituta dago, ez du ezer blokeatuko oraingo egoeran.">
<!ENTITY attachExtensions.label "Erant&si gehigarri aktiboen zerrenda bat txostenera hauen arteko konfliktoak arazoa sor balezakete">
<!ENTITY issues.nosubscriptions.add.label "Gehitu iragazki harpidetza">
<!ENTITY issues.disabledfilters.enable.label "Gaitu iragazkia">
-<!ENTITY issues.override.label "Konfigurazioa zuzena da, jarraitu txostenarekin (&c)">
+<!ENTITY issues.override.label "&Konfigurazioa zuzena da, jarraitu txostenarekin">
<!ENTITY issues.nosubscriptions.description "Antza denez ez zara harpidetu webguneetatik nahi ez dituzun edukiak automatikoki ezabatzen duten aurrez egindako zerrendetara.">
<!ENTITY typeSelector.falsePositive.description "Aukeratu hau orrian informazio garrantzitsua falta bada, gaizki ikusten bada edo ez badabil behar bezala .
Adblock Plus une batez desgaituz erruduna den egiaztatu dezakezu.">
@@ -53,9 +53,7 @@
<!ENTITY anonymity.warning "Ezin izango gara zurekin kontatuan jarri eta ziurrenez lehentasun gutxiago emango diogu txosten honi.">
<!ENTITY wizard.title "Arazoaren txostena bidali da">
<!ENTITY issues.ownfilters.disable.label "Iragazkia ezgaitu">
-<!ENTITY commentPage.description "Beheko testu eremuak guk arazoa hobeto ulertzeko iruzkin bat sartzea baimentzen dizu.
- Hau aukerazkoa da baina gomendagarria arazoa begi-bistakoa ez bada.
- Gainera, txostenaren informazioa gainbegiratu dezakezu bidali aurretik.">
+<!ENTITY commentPage.description "Beheko testu eremuak guk arazoa hobeto ulertzeko iruzkin bat sartzea baimentzen dizu. Hau aukerazkoa da baina gomendagarria arazoa begi-bistakoa ez bada. Gainera, txostenaren informazioa gainbegiratu dezakezu bidali aurretik.">
<!ENTITY comment.lengthWarning "Iruzkinak 1000 karaktere baino gehiago ditu. Lehen 1000 karaktereak bidaliko dira soilik.">
<!ENTITY typeSelector.falseNegative.description "Aukeratu hau publizitatea agertzen bada Adblock Plus gaituta egonda ere.">
<!ENTITY sendPage.waitMessage "Mesedez itxaron Adblock Plus zure txostena bidaltzen duen bitartean.">
diff --git a/chrome/locale/eu/sidebar.dtd b/chrome/locale/eu/sidebar.dtd
index b5a3490..9fd57a8 100644
--- a/chrome/locale/eu/sidebar.dtd
+++ b/chrome/locale/eu/sidebar.dtd
@@ -28,7 +28,7 @@
<!ENTITY context.editfilter.label "Editatu iragazki aktiboa">
<!ENTITY tooltip.type.blocked "(blokeatuta)">
<!ENTITY size.label "Tamaina">
-<!ENTITY context.whitelist.label "Gehitu salbuespen araua elementuarentzat">
+<!ENTITY context.whitelist.label "Gehitu salbuespen-araua elementuarentzat">
<!ENTITY context.selectAll.label "Aukeratu denak">
<!ENTITY state.label "Egoera">
<!ENTITY docDomain.label "Dokumentu iturria">
diff --git a/chrome/locale/fa/composer.dtd b/chrome/locale/fa/composer.dtd
index 1f6a668..c0e6c82 100644
--- a/chrome/locale/fa/composer.dtd
+++ b/chrome/locale/fa/composer.dtd
@@ -14,7 +14,7 @@
<!ENTITY unselectAllTypes.label "انتخاب هیچکدام">
<!ENTITY type.whitelist.label "قاعده است&ثنا">
<!ENTITY regexp.warning "الگویی که شما وارد کرده اید یک نویسه مرتب تفسیر می شود که نمی تواند به صورت بهینه توسط فوق تبلیغ شکن پردازش شود و ممکن است مرور صفحات شمار را کند کند. اگر شما قصد استفاده کردن از یک نویسه مرتب را نداشته اید، یک ستار (*) به انتهای الگوی خود اضافه کنید.">
-<!ENTITY dialog.title "قواعد پالایه فوق تبلیغ شکن">
+<!ENTITY dialog.title "افزودن قاعده فیلتر در Adblock Plus">
<!ENTITY basic.label "نمایش پایه">
<!ENTITY type.filter.label "پالایه م&سدود کننده">
<!ENTITY types.label "اعمال به انواع:">
diff --git a/chrome/locale/fa/filters.dtd b/chrome/locale/fa/filters.dtd
index 12fce5d..2f4d957 100644
--- a/chrome/locale/fa/filters.dtd
+++ b/chrome/locale/fa/filters.dtd
@@ -1,4 +1,5 @@
-<!ENTITY slow.column "&نمایش پالایه ها">
+<!ENTITY restore.custom.warning "میخواهید تمامی فیلترهای سفارشی خود را با محتویات فایل انتخاب شده جایگزین می شود؟">
+<!ENTITY slow.column "&نمایش فیلترها">
<!ENTITY enabled.column "ف&عال">
<!ENTITY subscription.lastDownload.checksumMismatch "ناموفق, عدم تطابق کنترلی">
<!ENTITY noFiltersInGroup.text "گروه انتخاب شده خالی می باشد.">
@@ -15,7 +16,7 @@
<!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 "در حال دریافت...">
@@ -34,11 +35,11 @@
<!ENTITY addFilter.label "افزودن فیلتر (&d)">
<!ENTITY subscription.minVersion.warning "این فیلتر اشتراک نیاز به نسخه جدید برنامه دارد، شما باید برنامه را به آخرین نگارش به روز کنید.">
<!ENTITY subscription.lastDownload.invalidURL "ناموفق، نشانی معتبر نیست">
-<!ENTITY backup.error "خطایی هنگام نوشتن فیلتر به فایل. اطمینان حاصل کنید که فایل حفاظت شده از نوشتن نیست و یا توسط برنامه کاربردی دیگری استفاده نمی شود.">
+<!ENTITY backup.error "خطایی هنگام نوشتن فیلتر به فایل دیده شد. اطمینان حاصل کنید که فایل نسبت به نوشتن حفاظت شده نیست و یا توسط برنامه کاربردی دیگری استفاده نمی شود.">
<!ENTITY filter.moveUp.label "حرکت به بالا">
<!ENTITY addGroup.label "افزودن گروه فیلتر">
<!ENTITY filter.edit.label "ویرایش">
-<!ENTITY subscription.showHideFilters.label "نمایش/پنهان کردن فیلترهای">
+<!ENTITY subscription.showHideFilters.label "نمایش/پنهان کردن فیلترها">
<!ENTITY acceptableAds2.label "اجازه دادن به تبلیغات ناخواسته (&i)">
<!ENTITY addSubscriptionOther.label "یک اشتراک ديگر اضافه کنید">
<!ENTITY close.label "بستن">
@@ -53,6 +54,7 @@
<!ENTITY subscription.homepage.label "صفحه اصلی">
<!ENTITY backup.complete.title "تمام فیلترها و اشتراک ها">
<!ENTITY restore.own.label "بازیابی پشتیبان خود">
+<!ENTITY restore.complete.warning "تمام تنظیمات فیلتر با محتویات فایل انتخاب شده جایگزین می شود. می خواهید انجام دهید؟">
<!ENTITY filters.tab.label "فیلترهای سفارشی">
<!ENTITY backup.label "نسخه پشتیبان جدید بسازید">
<!ENTITY find.label "یافتن (&n)">
@@ -64,7 +66,7 @@
<!ENTITY subscription.disabledFilters.enable "فعال کردن فیلتر های غیر فعال">
<!ENTITY lasthit.column "آخرین برخ&ورد">
<!ENTITY subscription.editTitle.label "ویرایش عنوان">
-<!ENTITY subscription.disabledFilters.warning "برخی از فیلتر های برای این اشتراک غیر فعال می باشد.">
-<!ENTITY filter.column "&قواعد پالایش">
+<!ENTITY subscription.disabledFilters.warning "برخی از فیلترها برای این اشتراک غیر فعال می باشد.">
+<!ENTITY filter.column "&قواعد فیلتر">
<!ENTITY subscription.lastDownload.label "آخرین دریافت:">
<!ENTITY viewList.label "مشاهده لیست">
diff --git a/chrome/locale/fa/firstRun.properties b/chrome/locale/fa/firstRun.properties
index 265e530..48099c8 100644
--- a/chrome/locale/fa/firstRun.properties
+++ b/chrome/locale/fa/firstRun.properties
@@ -1,5 +1,21 @@
+firstRun_feature_tracking_description=با غیر فعال کردن ردیابی با امنیت کامل به گشت و گذار اینترنتی بپردازید وخود را از شرکت هایی که می توانند هر لحظه زیر نظر داشته باشند مخفی کنید.
firstRun_toggle_off=خاموش
-firstRun_dataCorruptionWarning=آیا این صفحه در حال رویت نگه داشته شده؟ <a>اینجا کلیک کن!</a>
-firstRun_title=Adblock Plus با موفقیت نصب شد
+firstRun_feature_tracking=غیر فعال کردن ردیابی
firstRun_feature_malware=مسدود کردن نرم افزارهای مخرب
+firstRun_title=Adblock Plus با موفقیت نصب شد
+firstRun_acceptableAdsExplanation=من می خواهم وب سایت ها را تشویق کنم تا از تبلیغات درست و حسابی بدون مزاحمت استفاده کنند. این دلیل ساختن <a> دستورالعمل های دقیق </a> است تا بتواند تبلیغات قابل قبول را بپذیرد و آن ها را به شما نشان دهد ، تبلیغاتی که در شرایط استاندارد صدق کنند. اگر شما می خواهید هر تبلیغی را از هر صفحه ای مسدود کنید می توانید آن را در عرض چند ثانیه <a>غیر فعال</a> کنید.
firstRun_toggle_on=روشن
+firstRun_contributor_credits=اعتبار نویسندگان
+firstRun_feature_show_expanded=فعال کردن قابلیت ها
+firstRun_dataCorruptionWarning=آیا این صفحه در حال رویت نگه داشته شده؟ <a>اینجا کلیک کن!</a>
+firstRun_acceptableAdsHeadline=تبلیغات آزار دهنده در حال حاضر مسدود خواهد شد
+firstRun_share=به دوستان خود بگویید
+firstRun_share_headline=<a>بیایید</a> اینترنت را بهتر کنیم
+firstRun_features=Adblock Plus می تواند تبلیغات بیشتری را مسدود کند
+firstRun_feature_malware_description=مرور خود رابا مسدود کردن دامنه های مخرب شناخته شده امن تر کنید.
+firstRun_feature_show_overview=نشان دادن به طور اجمالی
+firstRun_feature_social_description=به طور خودکار مانند like در فیس بوک ، تجربه وبگردی از رسانه های اجتماعی را بفرستید و وضعیت کارهای خود را دنبال کنید.
+firstRun_donate=کمک مالی
+firstRun_donate_label=پروژه ما را حمایت کنید
+firstRun_feature_social=حذف دکمه های رسانه های اجتماعی
+firstRun_legacySafariWarning=شما در حال حاضر از يك نسخه قديمي تر مرورگر Safari استفاده ميكنيد كه توسط Adblock Plus پشتيباني نميشود. اين موضوع احتمال دارد بر روي تجربه وب گردي كاربر تأثير منفي گذاشته و يا باعث درست عمل نكردن پلاگين شود. ما قوياً توصيه مي كنيم كه مرورگر خود را به Safari 6.1.1 يا بالاتربه روز رساني كنيد (براي نسخه Mountain Lion ورژن OS X 10.8 در سيستم عامل مكينتاش)، و يا به روز رساني به Safari 7.0.1 (براي نسخه Mavericks ورژن OS X 10.9 در سيستم عامل مكينتاش). و يا اينكه از [...]
diff --git a/chrome/locale/fa/global.properties b/chrome/locale/fa/global.properties
index ac7f952..84cc8ff 100644
--- a/chrome/locale/fa/global.properties
+++ b/chrome/locale/fa/global.properties
@@ -1,31 +1,31 @@
no_blocking_suggestions=مورد مسدود شده ای در این صفحه موجود نیست
-action3_tooltip=برای فعال یا غیرفعالکردن فوق تبلیغ شکن کلیک کنید.
+action3_tooltip=برای فعال یا غیرفعالکردن Adblock Plus کلیک کنید.
type_label_script=نویسه
filter_elemhide_nocriteria=هیچ ضابطه ای برای شناسایی عناصری که می بایست پنهان شوند مشخص نشد.
blockingGroup_title=قوانین مسدود کردن تبلیغ
-whitelisted_tooltip=فوق تبلیغ شکن برای این صفحه غیرفعال شده.
+whitelisted_tooltip=Adblock Plus برای این صفحه غیرفعال شده است.
type_label_stylesheet=شیوه نامه (stylesheet)
blocked_count_tooltip=?1? از میان ?2?
type_label_font=قلم
type_label_popup=پنجره پاپ آپ
-filter_regexp_tooltip=این پالایه یا نویسه مرتب است یا این که خیلی کوچکتر از آن است که یک پالایه مناسب باشد. تعداد زیادی از این نویسه ها می تواند سرعت مرورگر شما را کاهش دهد.
-action0_tooltip=برای نمایش فهرست کلیک کنید. کلیک-وسط برای فعال یا غیرفعال کردن.
-whitelisted_page=فوق تبلیغ شکن برای صفحه جاری غیرفعال شده است.
+filter_regexp_tooltip=این فیلتر یا نوشته مرتب است یا این که خیلی کوچکتر از آن است که یک فیلتر مناسب باشد. تعداد زیادی از این نوشته ها می تواند سرعت مرورگر شما را کاهش دهد.
+action0_tooltip=برای نمایش فهرست کلیک کنید. کلیک-وسط برای فعال یا غیرفعال کردن است.
+whitelisted_page=Adblock Plus برای صفحه جاری غیرفعال شده است.
remove_group_warning=واقعا می خواهید این گروه را حذف کنید؟
-action1_tooltip=برای گشودن یا بستن موارد مسدود شده کلیک کنید. کلیک-وسط برای فعال یا غیرفعال کردن.
+action1_tooltip=برای گشودن یا بستن موارد مسدود شده کلیک کنید. کلیک-وسط برای فعال یا غیرفعال کردن است.
type_label_xmlhttprequest=XML خواسته شده
-active_tooltip=فوق تبلیغ شکن فعال شده, ?1? اشتراک(های) پالایه و ?2? پالایه(ها)ی سفارشی در حال استفاده هستند.
+active_tooltip=فوق تبلیغ شکن یا Adblock Plus فعال است, ?1? اشتراک(های) فیلتر و ?2? فیلتر(ها)ی سفارشی در حال استفاده هستند.
type_label_document=سند
type_label_object_subrequest=اشیاء زیرخواسته
whitelistGroup_title=قوانین استثنا
-disabled_tooltip=فوق تبلیغ شکن غیرفعال است.
+disabled_tooltip=Adblock Plus غیرفعال است.
filter_elemhide_duplicate_id=فقط یک شناسه از عنصری که قرار است پنهان شود را می توان مشخص کرد.
type_label_object=شیء
-action2_tooltip=برای گشودن ترجیحات کلیک کنید. کلیک-وسط برای فعال یا غیرفعال کردن.
+action2_tooltip=برای گشودن ترجیحات کلیک کنید. کلیک-وسط برای فعال یا غیرفعال کردن است.
type_label_subdocument=قابک
clearStats_warning=این کار تمام آمار ها را پاک کرده و آمارگیری را متوقف می کند. آیا مایل به توقف هستید؟
blocked_count_addendum=(همچنین فهرست سفید: ?1?, پنهان: ?2?)
-subscription_invalid_location=مکان وارد شده برای فهرست پالایه ها نامعتبر است.
+subscription_invalid_location=مکان وارد شده برای فهرست فیلترها نامعتبر است.
type_label_image=تصویر
remove_subscription_warning=آیا برای حذف اشتراک مطمئن هستید؟
type_label_other=دیگر
@@ -36,4 +36,4 @@ elemhideGroup_title=قوانبن اختفا عناصر
mobile_menu_enable_site=ABP: فعال کردن در ?1?
type_label_elemhide=پنهان
newGroup_title=گروه فیلتر جدید
-default_dialog_title=فوق تبلیغ شکن
+default_dialog_title=Adblock Plus
diff --git a/chrome/locale/fa/meta.properties b/chrome/locale/fa/meta.properties
index d190484..e3aedc6 100644
--- a/chrome/locale/fa/meta.properties
+++ b/chrome/locale/fa/meta.properties
@@ -1,5 +1,6 @@
+description.short=آیا از دست تبلیغات خسته شده اید؟ با نصب Adblock Plus تسلط گردش در شبکه جهانی را به دست بگیرید و از نمایش جدید آن لذت ببرید\n\nیک فیلم کوتاه از پیش معرفی در نشانی فوق قابل دسترسی است: http://www.youtube.com/watch?v=oNvb2SjVjjI
+name=Adblock Plus
+description.long.addition1=در آغاز با Adblock Plus 2.0 یک گزینه در تنظیمات فیلتر وجود دارد که به چند تبلیغات دارای استاندارد اجازه نمایش می دهد. هدف حمایت از وب سایت هایی است که برای تبلیغات از روش های غیر مزاحمت آمیز استفاده می کنند تا دیگر وب سایت ها تشویق شوند تا بدین گونه عمل کنند. <a href="http://adblockplus.org/en/acceptable-ads"> بیشتر بخوانید</a>
translator=Reza_NA, bahramm
-description.short=آیا از دست تبلیغات خسته شده اید؟ با نصب فوق تبلیغ شکن تسلط گردش در شبکه جهانی را به دست بگیرید و از نمایش جدید آن لذت ببرید\n\nیک فیلم کوتاه از پیش معرفی در نشانی فوق قابل دست رسی است: http://www.youtube.com/watch?v=oNvb2SjVjjI
-name=فوق تبلیغ شکن
-description.long=فوق تبلیغ شکن امکان باز پس گیری تسلط بر شبکه جهانی را به شما می دهد.این افزونه توسط بیش از 40 اشتراک پالایه در 10 ها زبان مختلف پشتیبانی می شود که به منظور پاکسازی شبکه از تبلیغات تولید شده اند. و همچنین به شما امکان سفارشی سازی پالایه ها را می دهد.
+description.long=فوق تبلیغ شکن امکان باز پس گیری تسلط بر شبکه جهانی را به شما می دهد.این افزونه توسط بیش از 40 اشتراک فیلتر در 10 ها زبان مختلف پشتیبانی می شود که به منظور پاکسازی شبکه از تبلیغات تولید شده اند. و همچنین به شما امکان سفارشی سازی فیلترها را می دهد.
description=تبلیغت متعلق به دیروز بود!
diff --git a/chrome/locale/fa/overlay.dtd b/chrome/locale/fa/overlay.dtd
index 3c202c1..479f3b9 100644
--- a/chrome/locale/fa/overlay.dtd
+++ b/chrome/locale/fa/overlay.dtd
@@ -1,24 +1,28 @@
-<!ENTITY context.frame.label "فوق تبلیغ شکن:سد قابک">
+<!ENTITY sync.label "همگام سازی تن&ظیمات Adblock Plus">
<!ENTITY whitelist.site.label "غیرفعال در ?1?">
+<!ENTITY filters.label "& تنظیمات فیلتر">
<!ENTITY disable.label "غیر فعال کردن در همه جا">
<!ENTITY objecttab.title "مسدود کردن">
-<!ENTITY objecttab.tooltip "جهت مسدود کردن با فوق تبلیغ شکن اینجا کلیک کنید">
-<!ENTITY menuitem.label "ترجیحات فوق ت&بلیغ شکن">
+<!ENTITY objecttab.tooltip "جهت مسدود کردن با Adblock Plus اینجا کلیک کنید">
+<!ENTITY menuitem.label "ترجیحات فوق ت&بلیغ شکن (Adblock Plus)">
<!ENTITY objecttabs.label "نمایش زبانه در موارد فلش و &جاوا">
<!ENTITY sendReport.label "گزارش مشکل در این &صفحه">
<!ENTITY whitelist.page.label "غیرفعال فقط در این صفحه">
-<!ENTITY context.image.label "فوق تبلیغ شکن: سد تصاویر">
-<!ENTITY opensidebar.label "باز کردن موارد &قابل ردکردن">
-<!ENTITY toolbarbutton.label "فوق تبلیغ شکن">
-<!ENTITY sync.label "همگام سازی تن&ظیمات فوق تبلیغ شکن">
+<!ENTITY context.image.label "Adblock Plus: سد تصاویر">
+<!ENTITY counthits.label "شمارش &تعداد فیلتر شده ها">
+<!ENTITY opensidebar.label "باز کردن موارد &قابل مسدود سازی">
+<!ENTITY contribute.label "کمک کردن به Adblock Plus">
+<!ENTITY toolbarbutton.label "فوق تبلیغ شکن یا Adblock Plus">
+<!ENTITY context.frame.label "Adblock Plus:سد قابک">
<!ENTITY blocked.tooltip "موارد رد شده در این صفحه:">
+<!ENTITY hideplaceholders.label "پنهان کردن &متغیرها از عناصر مسدود شده">
<!ENTITY showinstatusbar.label "نمایش در ن&وار وضعیت">
<!ENTITY sidebar.title "موارد قابل مسدود شدن در صفحه جاری">
<!ENTITY options.label "&گزینه ها">
-<!ENTITY context.object.label "فوق تبلیغ شکن: سد شیء">
-<!ENTITY context.removeWhitelist.label "فوق تبلیغ شکن: فعال شدن مجدد در این صفحه">
-<!ENTITY filters.tooltip "فعالترین پالایه ها:">
-<!ENTITY closesidebar.label "بستن موارد &قابل ردکردن">
+<!ENTITY context.object.label "Adblock Plus: سد شیء">
+<!ENTITY context.removeWhitelist.label "Adblock Plus: فعال شدن مجدد در این صفحه">
+<!ENTITY filters.tooltip "فعال ترین فیلترها:">
+<!ENTITY closesidebar.label "بستن موارد &قابل مسدود سازی">
<!ENTITY showintoolbar.label "نمایش در نوار ا&بزار">
<!ENTITY status.tooltip "وضعیت:">
-<!ENTITY context.media.label "فوق تبلیغ شکن: سد داده های چند رسانه ای">
+<!ENTITY context.media.label "Adblock Plus: سد داده های چند رسانه ای">
diff --git a/chrome/locale/fa/sendReport.dtd b/chrome/locale/fa/sendReport.dtd
index aafbd36..d8c2300 100644
--- a/chrome/locale/fa/sendReport.dtd
+++ b/chrome/locale/fa/sendReport.dtd
@@ -1,49 +1,58 @@
-<!ENTITY screenshot.undo.label "&واگرد">
-<!ENTITY issues.disabledgroups.description "اشتراکات پالایه / دسته های پالایه ی روبرو غیر فعال هستند، آنها ممکن است هنوز روی صفحه تاثیر داشته باشند:">
+<!ENTITY screenshot.undo.label "&برگشت">
+<!ENTITY issues.disabledgroups.description "اشتراک های فیلتر / دسته های فیلتر روبرو غیر فعال هستند، آنها ممکن است هنوز روی صفحه تاثیر داشته باشند:">
<!ENTITY showData.label "نمایش داده های گزارش">
-<!ENTITY typeSelector.falsePositive.label "فوق تبلیغ شکن بیش از &حد موارد را رد می کند.">
+<!ENTITY typeSelector.falsePositive.label "فوق تبلیغ شکن بیش از &حد موارد را مسدود می کند.">
<!ENTITY issues.change.description "پیکربندی شما تغییر یافت. لطفا صفحه را برای بررسی تغییرات تازه سازی کنید و اگر هنوز با وجود تغییرات انجام شده مشکل پابرجا بود اقدام به ارسال گزارش کنید.">
-<!ENTITY issues.openPreferences.label "باز کردن ترجیحات پالایه">
+<!ENTITY email.label "پ&ست الکترونیکی:">
+<!ENTITY issues.openPreferences.label "باز کردن تنظیمات فیلتر">
<!ENTITY sendPage.confirmation "گزارش شما ذخیره شد. شما می توانید در نشانی زیر به آن دسترسی پیدا کنید:">
<!ENTITY copyLink.label "رو&نوشت از پیوند گزارش">
<!ENTITY issues.nofilters.description "فوق تبلیغ شکن هیچ موردی را در صفحه جاری مسدود نکرده. مشکلی که شما مشاهده کرده اید به احتمال زیاد به فوق تبلیغ شکن ربطی ندارد.">
<!ENTITY sendPage.knownIssue "گزارشی که شما ارسال کردید هم اکنون شناخته شده است. اطلاعات بیشتر:">
-<!ENTITY typeSelector.other.description "اگر شما مشکوک هستید که این مشکل از خود فوق تبلیغ شکن می باشد نه از پالایه، این گزینه را انتخاب کنید.">
-<!ENTITY issues.disabledgroups.enable.label "فعال سازی اشتراکات پالایه / دسته های پالایه">
+<!ENTITY typeSelector.other.description "اگر شما مشکوک هستید که این مشکل از خود فوق تبلیغ شکن می باشد نه از فیلترها، این گزینه را انتخاب کنید.">
+<!ENTITY issues.disabledgroups.enable.label "فعال سازی اشتراک های فیلتر / دسته های فیلتر">
<!ENTITY typeWarning.override.label "من متو&جه هستم و می خواهم که گزارش را در هر صورت ارسال کنم">
<!ENTITY issues.disabled.enable.label "فعال کردن فوق تبلیغ شکن">
+<!ENTITY update.fixed.description "به روز رسانی های فیلتر احتمالاً مشکلی را که شما گزارش داده اید را حل کرده. لطفاً دوباره صفحه را باز کنید،اگر مشکل حل نشد دوباره روی دکمه گزارش کلیک کنید.">
+<!ENTITY anonymous.label "ا&رسال ناشناس">
<!ENTITY reloadButton.label "تا&زه سازی صفحه">
<!ENTITY recentReports.clear.label "پاک کردن تمامی &گزارشات">
<!ENTITY typeSelector.description "این پنجره شما را برای ارائه یک گزارش خطا فوق تبلیغ شکن راهنمایی می کند. ابتدا نوع مشکلی را که در این صفحه با آن روبرو هستید را انتخاب کنید:">
<!ENTITY screenshot.remove.label "&پاک کردن داده های حساس">
<!ENTITY issues.ownfilters.description "بعضی از پالایه های اعمالی در صفحه توسط کاربر تعریف شده اند. لطفا پالایه های که ممکن است باعث بروز مشکل شود را غیرفعال کنید:">
+<!ENTITY update.inProgress.description "Adblock Plus باید اشتراکات فیلتر را بررسی نماید تا مطمئن شود مشکل حل شده است. لطفاً منتظر بمانید...">
<!ENTITY sendPage.retry.label "ارسال مجدد">
<!ENTITY data.label "داده های &گزارش:">
<!ENTITY recentReports.label "گزارشات به تازگی ارسال شده شما">
-<!ENTITY typeWarning.description "شما می خواهید که مشکلی کلی در مورد فوق تبلیغ شکن را گزارش دهید به جای اینکه مشکلی در رابطه با پالایه گزارش دهید. لطفا توجه داشته باشید که این طور مسائل بهتر است در [link]تالار گفتمان فوق تبلیغ شکن[/link] بحث شوند. شما باید فقط در صورتی از گزارش گر مشکلات استفاده کنید ک مکمل بحث موجود باشد, چونکه هیچ کس به گزارش شما توجه نمی کند(در تالار گفتمان) مگر این که برای آن یک پیوند ارائه کنید. وقتی که گزارش را ارسال می کنید پیوند به طور خودکار ساخته و مهیا می شود.">
+<!ENTITY typeWarning.description "شما می خواهید که مشکلی کلی در مورد فوق تبلیغ شکن را گزارش دهید به جای اینکه مشکلی در رابطه با فیلتر گزارش دهید. لطفا توجه داشته باشید که این طور مسائل بهتر است در [link]تالار گفتمان فوق تبلیغ شکن[/link] بحث شوند. شما باید فقط در صورتی از گزارش گر مشکلات استفاده کنید که مکمل بحث موجود باشد, چونکه (در تالار گفتمان) هیچ کس به گزارش شما توجه نمی کند مگر این که برای آن یک پیوند ارائه کنید. وقتی که گزارش را ارسال می کنید پیوند به طور خودکار ساخته و مهیا می شود.">
<!ENTITY issues.disabled.description "فوق تبلیغ شکن هم اکنون غیرفعال است. در این وضعیت هیچ موردی را مسدود نمی کند.">
<!ENTITY attachExtensions.label "ضمیمه کردن فهرستی ا&ز افزونه ها به گزارش در مواردی که افزونه های دیگر باعث ایجاد مشکل باشند.">
-<!ENTITY issues.nosubscriptions.add.label "افزودن اشتراک پالایه">
-<!ENTITY issues.disabledfilters.enable.label "فعال کردن پالایه">
+<!ENTITY issues.nosubscriptions.add.label "افزودن اشتراک فیلتر">
+<!ENTITY issues.disabledfilters.enable.label "فعال کردن فیلتر">
<!ENTITY issues.override.label "تنظیمات &پیکربندی صحیح است، ادامه گزارش">
<!ENTITY issues.nosubscriptions.description "شما در هیچ فهرست پالایه پیش ساخته ای مشترک نشده اید که به طور خود کار محتوای ناخواسته را پاک می کنند.">
+<!ENTITY typeSelector.falsePositive.description "اگر صفحه خالی از محتوای مهم می شود یا نادرست نمایش داده می شود یا موفق به عملکرد درست نیست این گزینه را انتخاب کنید.">
<!ENTITY typeSelector.other.label "سایر مشکلا&ت">
+<!ENTITY emailComment.label "ما شما را تشویق می کنیم که یک آدرس ایمیل معتبر از خود وارد کنید تا اگر سوالی بود ما بتوانیم در آینده با شما ارتباط برقرار کنیم
+در مورد گزارش شما. این به ما اجازه می دهد که میزان همکاری شما را بسنجیم و اولویت کار شما به مراحل بالاتر برسد.">
<!ENTITY issues.whitelist.remove.label "فعال کردن مجدد فوق تبلیغ شکن در این صفحه">
-<!ENTITY typeSelector.falsePositive.description "اگر صفحه خالی از محتوای مهم می شود یا نادرست نمایش داده می شود یا موفق به عملکرد درست نیست این گزینه را انتخاب کنید.">
+<!ENTITY outdatedSubscriptions.description "اشتراک فیلتر زیر برای حداقل دو هفته به روز نشده است. لطفاً این اشتراک را قبل از ارسال گزارش به روز کنید, شاید مشکل حل شود.">
<!ENTITY dataCollector.description "لطفا برای چند لحظه صبر کنید تا فوق تبلیغ شکن داده های درخواستی شما را جمع آوری کند.">
<!ENTITY sendButton.label "ارسا&ل گزارش">
<!ENTITY comment.label "ن&ظر (اختیاری):">
<!ENTITY sendPage.errorMessage "تلاش برای ارسال گزارش شکست خورد، شماره خطا "?1?". لطفا مطمئن شوید که به اینترنت متصل هستید و مجددا سعی کنید. اگر مشکل همچنان ادامه دارد می توانید در [link]تالار گفتمان فوق تبلیغ شکن[/link] در خواست کمک کنید.">
<!ENTITY showRecentReports.label "نمایش گزارشات ارسال شده اخیر">
<!ENTITY commentPage.heading "وارد کردن نظر">
-<!ENTITY issues.disabledfilters.description "پالایه های روبرو غیر فعال هستند، آنها ممکن است هنوز روی صفحه تاثیر داشته باشند:">
+<!ENTITY update.start.label "در حال به روز رسانی">
+<!ENTITY issues.disabledfilters.description "فیلترهای روبرو غیر فعال هستند، آنها ممکن است هنوز روی صفحه تاثیر داشته باشند:">
<!ENTITY screenshot.description "صفحات مشابه امکان دارد برای هر فرد به صورتی نامشابه نمایش داده شوند. ضمیمه کردن یک تصویر می تواند کمک زیادی در فهم مشکل به ما بکند. شما می توانید بخش هایی که حاوی اطلاعات حساس می باشد را پاک کنید و همچنین بخش هایی که مشکل در آنها نمودار شده را علامت گزاری کنید. برای این کار کلید متناظر را کلیک کنید و بخشی از تصویر را با موشواره انتخاب کنید.">
<!ENTITY screenshot.attach.label "افزودن ت&صویر صفحه به گزارش">
<!ENTITY issues.whitelist.description "فوق تبلیغ شکن هم اکنون روی صفحه ای که شما در مورد آن گزارش می دهید غیر فعال است. ابتدا آن را دوباره فعال کنید و پس از تازه سازی صفحه، مشکل را مجددا بررسی کنید.">
-<!ENTITY typeSelector.falseNegative.label "فوق تبلیغ شکن &هیچ تبلیغی را سد نمی کند.">
+<!ENTITY typeSelector.falseNegative.label "فوق تبلیغ شکن &هیچ تبلیغی را مسدود نمی کند.">
<!ENTITY typeSelector.heading "انتخاب نوع اشکال">
+<!ENTITY anonymity.warning "ما قادر نخواهیم بود که دوباره بیاییم و احتمالاً این گزارش را در اولویت های پایین تر قرار می دهیم.">
<!ENTITY wizard.title "گزارش گر اشکالات">
-<!ENTITY issues.ownfilters.disable.label "غیر فعال کردن پالایه">
+<!ENTITY issues.ownfilters.disable.label "غیر فعال کردن فیلتر">
<!ENTITY commentPage.description "جعبه متن زیر به شما اجازه می دهد که نظر خود را برای کمک به درک ما در مورد مشکل وارد کنید. این مورد اختیاری می باشد ولی در صورتی که مشکل آشکار نیست توصیه می شود. شما همچنین می توانید قبل از ارسال گزارش داده ها را بررسی کنید.">
<!ENTITY comment.lengthWarning "حد اکثر طول نظر 1000 حرف می باشد. فقط 1000 حرف اولی فرستاده می شود.">
<!ENTITY typeSelector.falseNegative.description "اگر تبلیغات همچنان مشاهده می شوند با وجود این که فوق تبلیغ شکن فعال است این گزینه را انتخاب کنید">
@@ -51,7 +60,7 @@
<!ENTITY dataCollector.heading "به گزارشگر اشکالات خوش آمدید">
<!ENTITY screenshot.heading "افزودن تصویر از صفحه">
<!ENTITY sendPage.heading "ارسال گزارش">
-<!ENTITY issues.subscriptionCount.description "به نظر می رسد که شما در اشتراک های بسیار زیادی عضو هستید. این عمل توصیه نمی شود زیرا که اقبال ایجاد مشکل بیشتر شود. بنابرین ما نمی توانیم گزارش های شما را قبول کنیم چرا که معلوم نیست که کدام اشتراک پالایه نیاز به بررسی دارد. لطفا همه آنهارا حذف کنید به جز اشتراک های واقعا لازم و سپس امتحان کنید که آیا این مسئله هنوز هم پس از آن رخ می دهد.">
+<!ENTITY issues.subscriptionCount.description "به نظر می رسد که شما در اشتراک های بسیار زیادی عضو هستید. این عمل توصیه نمی شود زیرا که شانس ایجاد مشکل بیشتر می شود. بنابرین ما نمی توانیم گزارش های شما را قبول کنیم چرا که معلوم نیست که کدام اشتراک فیلتر نیاز به بررسی دارد. لطفا همه آنها را به جز اشتراک های واقعا لازم حذف کنید و سپس امتحان کنید که آیا این مسئله هنوز هم پس از آن رخ می دهد.">
<!ENTITY screenshot.mark.label "&علامت گزاری مشکل">
<!ENTITY privacyPolicy.label "سیاست حفظ اسرار">
<!ENTITY issues.description "فوق تبلیغ شکن مشکلی را در پیکربندی های شما پیدا کرده که ممکن است مشکل شما ناشی از آن باشد و یا این که ممکن است در رسیدگی به مشکل شما اشکال ایجاد کند.">
diff --git a/chrome/locale/fa/sidebar.dtd b/chrome/locale/fa/sidebar.dtd
index 117e9e2..757ed0a 100644
--- a/chrome/locale/fa/sidebar.dtd
+++ b/chrome/locale/fa/sidebar.dtd
@@ -2,9 +2,9 @@
<!ENTITY address.label "نشانی">
<!ENTITY context.open.label "گشودن در زبانه نو">
<!ENTITY type.label "نوع">
-<!ENTITY tooltip.filterSource.label "متن پالایه:">
+<!ENTITY tooltip.filterSource.label "متن فیلتر:">
<!ENTITY noitems.label "هیچ مورد قابل انسدادی نیست">
-<!ENTITY filter.label "پالایه">
+<!ENTITY filter.label "فیلتر">
<!ENTITY tooltip.size.label "اندازه:">
<!ENTITY reattach.label "وصل کردن دوباره">
<!ENTITY search.label "جستجو:">
@@ -14,18 +14,18 @@
<!ENTITY context.copy.label "کپی آدرس مورد">
<!ENTITY tooltip.type.label "نوع:">
<!ENTITY context.disablefilter.label "غیر فعال کردن فیلتر ?1?">
-<!ENTITY context.copyFilter.label "رونوشت پالایه">
+<!ENTITY context.copyFilter.label "رونوشت فیلتر">
<!ENTITY context.block.label "مسدود کردن این مورد">
-<!ENTITY context.enablefilter.label "فعال کردن پالایه ?1?">
+<!ENTITY context.enablefilter.label "فعال کردن فیلتر ?1?">
<!ENTITY detach.label "قطع کردن">
<!ENTITY whitelisted.label "صفحه فهرست سفید">
-<!ENTITY context.disablefilteronsite.label "غیر فعال کردن پالایه در ?1?">
+<!ENTITY context.disablefilteronsite.label "غیر فعال کردن این فیلتر در ?1?">
<!ENTITY detached.title "فوق تبلیغ شکن: موارد قابل انسداد (قطع شده)">
<!ENTITY docDomain.firstParty "(شخص اول)">
<!ENTITY tooltip.type.whitelisted "(در فهرست سفید)">
-<!ENTITY tooltip.filter.label "پالایه های مؤثر:">
+<!ENTITY tooltip.filter.label "فیلترهای مؤثر:">
<!ENTITY tooltip.filter.disabled "(غیر فعال)">
-<!ENTITY context.editfilter.label "ویرایش پالایه مؤثر">
+<!ENTITY context.editfilter.label "ویرایش فیلتر مؤثر">
<!ENTITY tooltip.type.blocked "(مسدود شده)">
<!ENTITY size.label "اندازه">
<!ENTITY context.whitelist.label "افزودن قانون استثنا برای این مورد">
diff --git a/chrome/locale/fa/subscriptionSelection.dtd b/chrome/locale/fa/subscriptionSelection.dtd
index 0c207ca..18f3a61 100644
--- a/chrome/locale/fa/subscriptionSelection.dtd
+++ b/chrome/locale/fa/subscriptionSelection.dtd
@@ -1,12 +1,12 @@
-<!ENTITY addMain.label "افزودن اشتراک پالایه "?1?" هم&چنین">
+<!ENTITY addMain.label "افزودن اشتراک فیلتر "?1?" هم&چنین">
<!ENTITY list.download.failed "فوق تبلیغ شکن موفق نشد که فهرست اشتراکات را بازیابی کند.">
<!ENTITY list.download.retry "تلاش مجدد">
<!ENTITY title.label "عنوان ا&شتراک:">
<!ENTITY list.download.website "دیدن پایگاه تحت شبکه">
-<!ENTITY supplementMessage "این اشتراک پالایه به معنی آن است که با اشتراک پالایه "?1?" استفاده می شود که شما هنوز در آن مشترک نشده اید.">
-<!ENTITY viewList.label "دیدن پالایه ها">
+<!ENTITY supplementMessage "این اشتراک فیلتر به معنی آن است که با اشتراک فیلتر "?1?" استفاده می شود که شما هنوز در آن مشترک نشده اید.">
+<!ENTITY viewList.label "دیدن فیلترها">
<!ENTITY visitHomepage.label "بازدید از صفحه خانگی">
<!ENTITY addSubscription.label "افزودن اشتراک">
<!ENTITY dialog.title "افزودن اشتراک پالایه فوق تبلیغ شکن">
-<!ENTITY location.label "نشانی &فهرست پالایه ها:">
-<!ENTITY fromWeb.description "لطفا تایید کنید که قصد افزودن این اشتراک پالایه را دارید. شما می توانید قبل از افزودن، نام و مسیر اشتراک را تغییر دهید.">
+<!ENTITY location.label "نشانی &فهرست فیلترها:">
+<!ENTITY fromWeb.description "لطفا تایید کنید که قصد افزودن این اشتراک فیلتر را دارید. شما می توانید قبل از افزودن، نام و مسیر اشتراک را تغییر دهید.">
diff --git a/chrome/locale/fi/firstRun.properties b/chrome/locale/fi/firstRun.properties
index 7e31689..2d05090 100644
--- a/chrome/locale/fi/firstRun.properties
+++ b/chrome/locale/fi/firstRun.properties
@@ -1,20 +1,21 @@
-firstRun_feature_tracking_description=Selaa yksityisesti estämällä seuraaminen - piilottamalla jälkesi mainosyhtiöiltä, jotka muuten seuraavat jokaista liikettäsi.
+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_acceptableAdsExplanation=Kannustamme verkkosivuja käyttämään suoraviivaista ei-häiritsevää mainontaa. 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> muutaman sekunnin kuluttua.
+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_toggle_on=ON
firstRun_contributor_credits=Avustajat:
-firstRun_feature_show_overview=näytä yleiskatsaus
+firstRun_feature_show_expanded=ota ominaisuuksia käyttöön
firstRun_dataCorruptionWarning=Näetkö tämän sivun koko ajan? <a>Napsauta tätä!</a>
-firstRun_acceptableAdsHeadline=Ärsyttävät mainokset estetään
-firstRun_share=Kerro kavereillesi
+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_features=Adblock Plus voi tehdä paljon enemmän, kuin vain estää mainoksia
-firstRun_feature_malware_description=Tee selaimestasi turvallisempi estämällä tunnettuja haitallisia ohjelmia sisältäviä verkko-osoitteita.
-firstRun_feature_social_description=Poistamalla automaattisesti sosiaalisen median painikkeet, kuten Facebookin tykkää -painikkeet, jotka ilmestyvät useille sivustoille ja seuraavat verkkokäyttäytymistäsi.
+firstRun_features=Adblock Plus voi tehdä muutakin kuin vain estää mainoksia
+firstRun_feature_malware_description=Tee selaimestasi turvallisempi estämällä verkko-osoitteita, joiden tiedetään sisältävän haitallisia ohjelmia.
+firstRun_feature_show_overview=näytä yleiskatsaus
+firstRun_feature_social_description=Poista sivustoilta automaattisesti sosiaalisen median painikkeet, kuten Facebookin tykkää -painikkeet, jotka seuraavat verkkokäyttäytymistäsi.
firstRun_donate=lahjoita
firstRun_donate_label=Tue projektiamme
firstRun_feature_social=Sosiaalisen median painikkeiden poistaminen
-firstRun_feature_show_expanded=aktiiviset toiminnot
+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.
diff --git a/chrome/locale/fi/overlay.dtd b/chrome/locale/fi/overlay.dtd
index 13efaa3..267b647 100644
--- a/chrome/locale/fi/overlay.dtd
+++ b/chrome/locale/fi/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Ei käytössä osoitteessa ?1?">
<!ENTITY filters.label "&Suodatinasetukset">
<!ENTITY disable.label "Poista käytöstä kaikkialla">
-<!ENTITY showinaddonbar.label "Nä&ytä lisäosapalkilla">
<!ENTITY objecttab.title "Estä">
<!ENTITY objecttab.tooltip "Estä tämä objekti Adblock Plussalla">
<!ENTITY menuitem.label "A&dblock Plus - Asetukset">
diff --git a/chrome/locale/fi/subscriptionSelection.dtd b/chrome/locale/fi/subscriptionSelection.dtd
index 69680e6..694748c 100644
--- a/chrome/locale/fi/subscriptionSelection.dtd
+++ b/chrome/locale/fi/subscriptionSelection.dtd
@@ -1,12 +1,12 @@
-<!ENTITY addMain.label "Lisää &myös suodatintilaus "?1?"">
-<!ENTITY list.download.failed "Adblock Plus ei kyennyt hakemaan suodatinlistaa.">
-<!ENTITY list.download.retry "Kokeile uudestaan">
-<!ENTITY title.label "&Tilauksen nimi:">
+<!ENTITY addMain.label "Lisää myös suodatintilaus "?1?"">
+<!ENTITY list.download.failed "Suodatinlistan noutaminen epäonnistui.">
+<!ENTITY list.download.retry "Yritä uudestaan">
+<!ENTITY title.label "Tilauksen nimi:">
<!ENTITY list.download.website "Näytä verkkosivu">
-<!ENTITY supplementMessage "Tätä suodatintilausta on tarkoitus käyttää suodatintilauksen "?1?" kanssa, jota et vielä käytä.">
+<!ENTITY supplementMessage "Tämä suodatintilaus on tarkoitettu käytettäväksi yhdessä suodatintilauksen "?1?" 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 "L&istan sijainti:">
-<!ENTITY fromWeb.description "Varmista tämän suodatintilauksen lisääminen. Ennen tilauksen lisäämistä voit muuttaa tilauksen nimen ja sijainnin.">
+<!ENTITY location.label "Suodatinlistan sijainti:">
+<!ENTITY fromWeb.description "Vahvista tämän suodatintilauksen lisääminen. Voit muuttaa tilauksen nimeä tai sijaintia ennen sen lisäämistä.">
diff --git a/chrome/locale/fr/firstRun.properties b/chrome/locale/fr/firstRun.properties
index 3cd9ebf..738d94b 100644
--- a/chrome/locale/fr/firstRun.properties
+++ b/chrome/locale/fr/firstRun.properties
@@ -6,15 +6,16 @@ firstRun_title=Adblock Plus a été installée
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, qui figurent sous les paramètres par défaut. Si vous voulez continuer à bloquer chaque annonce vous pouvez <a>désactiver</a> cela en quelques secondes.
firstRun_toggle_on=ACTIF
firstRun_contributor_credits=Crédits des contributeurs
-firstRun_feature_show_overview=Afficher l'aperçu
+firstRun_feature_show_expanded=activer les fonctionnalités
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_features=Adblock Plus peut faire plus que bloquer les pubs
firstRun_feature_malware_description=Rendre votre navigation plus sécurisée en bloquant les domaines malveillants connus.
+firstRun_feature_show_overview=Afficher l'aperçu
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_donate=Faire un don
firstRun_donate_label=Soutenir notre projet
firstRun_feature_social=Supprimer les boutons des réseaux sociaux
-firstRun_feature_show_expanded=activer les fonctionnalités
+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.
diff --git a/chrome/locale/fr/overlay.dtd b/chrome/locale/fr/overlay.dtd
index 34b480b..5b20ee5 100644
--- a/chrome/locale/fr/overlay.dtd
+++ b/chrome/locale/fr/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Désactiver pour ?1?">
<!ENTITY filters.label "Pré&férences de filtre">
<!ENTITY disable.label "Désactiver partout">
-<!ENTITY showinaddonbar.label "Afficher dans la &barre des modules">
<!ENTITY objecttab.title "Bloquer">
<!ENTITY objecttab.tooltip "Cliquer ici afin qu'Adblock Plus bloque cet objet">
<!ENTITY menuitem.label "Préférences d'Ad&block Plus">
diff --git a/chrome/locale/fy-NL/filters.dtd b/chrome/locale/fy-NL/filters.dtd
index b6406da..3ef491d 100644
--- a/chrome/locale/fy-NL/filters.dtd
+++ b/chrome/locale/fy-NL/filters.dtd
@@ -1,14 +1,28 @@
+<!ENTITY restore.custom.warning "Alle foarkearen fan dyn eigen filters wurde ferfangen troch de data fan it selekteare bestand. Troch gean?">
<!ENTITY slow.column "Lan&gsame filters">
<!ENTITY enabled.column "Yns&keakele">
<!ENTITY subscription.lastDownload.checksumMismatch "Mislearre, checksum komt net oerien">
-<!ENTITY lasthit.column "Lêste hit">
+<!ENTITY noFiltersInGroup.text "Dizze groep is leech.">
+<!ENTITY subscription.actions.label "Akties">
+<!ENTITY filter.selectAll.label "Selekt alles">
+<!ENTITY backupButton.label "&Feilich sette en werom sette">
+<!ENTITY restore.minVersion.warning "Warskouwing: Dit bestand is makke my in nije fersy fan Adblock Plus. Update dyn eigen Adblock Plus foardast dit bestand brûkst.">
+<!ENTITY restore.error "De data in dit bestand koe net brûkt wurde. Miskien is it gjin Adblock Plus backup bestand?">
<!ENTITY sort.ascending.label "A > Z sortearoarder">
<!ENTITY sort.label "Sortearje op">
<!ENTITY subscription.source.label "Filterlist">
-<!ENTITY filter.paste.label "Plakke">
+<!ENTITY hitcount.column "&Hits">
+<!ENTITY noFilters.text "Do hast noch gjin eigen filters.">
+<!ENTITY backup.custom.title "Allinnich oanpasse filters">
<!ENTITY subscription.external.label "Fernijd troch in oar útwreiding">
+<!ENTITY subscription.delete.label "furt goaie">
+<!ENTITY noGroupSelected.text "Do moast yn filter groep selektere foardast it filter sjen kist.">
+<!ENTITY filter.cut.label "Knippe">
+<!ENTITY restore.default.label "Backup werom sette fan ?1?">
<!ENTITY subscription.lastDownload.inProgress "Ynlade...">
<!ENTITY subscriptions.tab.label "Filterabonneminten">
+<!ENTITY sort.descending.label "Z > A sortearoarder">
+<!ENTITY filters.remove.warning "Wolst echt alle filters furt smite?">
<!ENTITY filter.delete.label "Fuortsmite">
<!ENTITY addSubscriptionAdd.label "Tafoegje">
<!ENTITY viewMenu.label "Byld">
@@ -18,20 +32,43 @@
<!ENTITY noSubscriptions.text "Jo hawwe gjin ien filter tafoege. Adblock Plus sil neat blokkearje
sûnder filters, brûk "Filterabonnemint tafoegje" om
ta te foegjen.">
+<!ENTITY subscription.update.label "Update filters">
<!ENTITY dialog.title "Adblock Plus Filterfoarkarren">
+<!ENTITY addFilter.label "Tafoegje">
+<!ENTITY subscription.minVersion.warning "Dit filter abonnemint had in nijere fersy fan Adblok Plus nedich. Update dyn Adblock nar de nijste fersy.">
<!ENTITY subscription.lastDownload.invalidURL "Mislearre, gjin jildich adres">
-<!ENTITY filter.cut.label "Knippe">
+<!ENTITY backup.error "Der wy in probleem my it skriuwen fan de filters. Soarch der foar dast it wol skriuwe meist en dat it net troch in oar programma brûkt wurdt.">
+<!ENTITY filter.moveUp.label "Omheech">
+<!ENTITY addGroup.label "Filter groep tafoege">
+<!ENTITY filter.edit.label "feroarje">
+<!ENTITY subscription.showHideFilters.label "Sjen/Ferstopje filters">
+<!ENTITY acceptableAds2.label "Let sommige net skreauwende advertinsjes ta">
<!ENTITY addSubscriptionOther.label "In oar abonnemint tafoegje">
+<!ENTITY close.label "sluten">
<!ENTITY sort.none.label "&Net sortearre">
+<!ENTITY filter.actions.label "Filter aksjes">
<!ENTITY filter.copy.label "Kopiearje">
+<!ENTITY filter.moveDown.label "Omleech">
+<!ENTITY filter.resetHitCounts.label "Reset statistysken">
+<!ENTITY readMore.label "Lês mear">
+<!ENTITY subscription.moveUp.label "omheech">
<!ENTITY addSubscription.label "Filterabonnemint tafoegje">
<!ENTITY subscription.homepage.label "Startside">
+<!ENTITY backup.complete.title "Alle filters en abonneminten">
+<!ENTITY restore.own.label "Eigen backup werom sette">
+<!ENTITY restore.complete.warning "Alle filter foarkearen wurde ferfangen troch de data fan it selekteare bestand. Troch gean?">
<!ENTITY filters.tab.label "Oanpaste filters">
+<!ENTITY backup.label "Meitsje nije backup">
<!ENTITY find.label "Sykje">
-<!ENTITY sort.descending.label "Z > A sortearoarder">
+<!ENTITY subscription.moveDown.label "omleech">
<!ENTITY subscription.lastDownload.connectionError "Mislearre, ynlaadprobleem">
<!ENTITY subscription.lastDownload.success "Slagge">
<!ENTITY subscription.lastDownload.invalidData "Mislearre, gjin jildige filterlist">
-<!ENTITY addFilter.label "Tafoegje">
-<!ENTITY subscription.lastDownload.label "Lêste ynlaad:">
+<!ENTITY filter.paste.label "Plakke">
+<!ENTITY subscription.disabledFilters.enable "Set filters oan">
+<!ENTITY lasthit.column "Lêste hit">
+<!ENTITY subscription.editTitle.label "Namme oanpasse">
+<!ENTITY subscription.disabledFilters.warning "Sommige filters in dit abonnemint stean út.">
<!ENTITY filter.column "Filterrigel">
+<!ENTITY subscription.lastDownload.label "Lêste ynlaad:">
+<!ENTITY viewList.label "Lyst sjen">
diff --git a/chrome/locale/fy-NL/firstRun.properties b/chrome/locale/fy-NL/firstRun.properties
new file mode 100644
index 0000000..a2501c2
--- /dev/null
+++ b/chrome/locale/fy-NL/firstRun.properties
@@ -0,0 +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_contributor_credits=Meiwurker Nammen
+firstRun_feature_show_overview=Lit globaal plaatsje sjen
+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_social=Sociale Media knop fuorthelje
+firstRun_feature_show_expanded=aktivere mooglikheden
diff --git a/chrome/locale/fy-NL/global.properties b/chrome/locale/fy-NL/global.properties
index 55be82b..65404f7 100644
--- a/chrome/locale/fy-NL/global.properties
+++ b/chrome/locale/fy-NL/global.properties
@@ -11,9 +11,10 @@ type_label_popup=pop-up finster
filter_regexp_tooltip=Dit filter is of in reguliere ekspresje of te koart om optimalisearre te wurden. Te folle fan dizze filters kinne it sneupjen fertrage.
action0_tooltip=Klik om it kontekst-menu te iepenjen, midden-klik om yn/út te skeakeljen.
whitelisted_page=Adblock Plus is útskeakele foar dizze side
-active_tooltip=Adblock Plus is ynskeakele, ?1? filter abonnemint(en) en ?2? oanpaste filter(s) yn gebrûk.
-type_label_xmlhttprequest=XML fersyk
+remove_group_warning=Wolst do dizze groep echt furt helje?
action1_tooltip=Klik om blokkearbere ûnderdielen te iepenjen/sluten, midden-klik om yn/út te skeakeljen.
+type_label_xmlhttprequest=XML fersyk
+active_tooltip=Adblock Plus is ynskeakele, ?1? filter abonnemint(en) en ?2? oanpaste filter(s) yn gebrûk.
type_label_document=dokumint
type_label_object_subrequest=objekt subfersyk
whitelistGroup_title=Utsûnderingsregels
@@ -28,7 +29,11 @@ subscription_invalid_location=Dizze lokaasje foar in filterlist is gjin jildige
type_label_image=ôfbylding
remove_subscription_warning=Witte jo seker dat jo dit abonnemint fuortsmite wolle?
type_label_other=oars
+mobile_menu_enable=ABP: Oan sette
type_label_media=audio/fideo
+mobile_menu_disable_site=ABP: Út sette op ?1?
elemhideGroup_title=Elemint ferstopregels
+mobile_menu_enable_site=ABP: Oan sette op ?1?
type_label_elemhide=ferstoppe
newGroup_title=Nije filtergroep
+default_dialog_title=Adblock Plus
diff --git a/chrome/locale/fy-NL/overlay.dtd b/chrome/locale/fy-NL/overlay.dtd
index f61820a..e08b39b 100644
--- a/chrome/locale/fy-NL/overlay.dtd
+++ b/chrome/locale/fy-NL/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Utskeakelje op ?1?">
<!ENTITY filters.label "Filterfoarkarren">
<!ENTITY disable.label "Oeral útskeakelje">
-<!ENTITY showinaddonbar.label "Toan yn tafoegingsbalke">
<!ENTITY objecttab.title "Blokkearje">
<!ENTITY objecttab.tooltip "Klik hjir om dit objekt te blokkearjen mei Adblock Plus">
<!ENTITY menuitem.label "&Adblock Plus">
@@ -13,6 +12,7 @@
<!ENTITY counthits.label "Tel filterhits">
<!ENTITY opensidebar.label "&Blokkearbere ûnderdielen iepenje">
<!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">
diff --git a/chrome/locale/fy-NL/sendReport.dtd b/chrome/locale/fy-NL/sendReport.dtd
index fde9df6..a4cdc9c 100644
--- a/chrome/locale/fy-NL/sendReport.dtd
+++ b/chrome/locale/fy-NL/sendReport.dtd
@@ -1,4 +1,4 @@
-<!ENTITY screenshot.undo.label "Ungedien meitsje">
+<!ENTITY screenshot.undo.label "Ûngedien meitsje">
<!ENTITY issues.disabledgroups.description "De folgjende filterabonneminten/filtergroepen binne útskeakele, dochs it kin wêze dat se effekt hawwe op dizze side:">
<!ENTITY showData.label "Toan rapportgegevens">
<!ENTITY typeSelector.falsePositive.label "Adblock Plus blokkearret te &folle">
@@ -11,14 +11,16 @@
<!ENTITY sendPage.knownIssue "It probleem dat jo rapportearre hawwe is miskien al bekend. Mear ynformaasje:">
<!ENTITY typeSelector.other.description "Selektearje dizze opsje as jo tinke dat it in probleem mei Adblock Plus sels is yn stee fan syn filters.">
<!ENTITY issues.disabledgroups.enable.label "Filterabonnemint / filtergroep ynskeakelje">
-<!ENTITY typeWarning.override.label "Ik &begryp it en wol it rapport dochs ynstjoere">
+<!ENTITY typeWarning.override.label "Ik &begryp it en wol it rapport wol ynstjoere">
<!ENTITY issues.disabled.enable.label "Adblock Plus ynskeakelje">
+<!ENTITY update.fixed.description "De updates foar dyn abonneminten losse dyn probleem wierskynlik op. Laad de webside opnij. Hast dan noch steed yn probleem, rapportearje it dan.">
<!ENTITY anonymous.label "Anonym Bydrage">
-<!ENTITY reloadButton.label "Side op 'e nij &lade">
+<!ENTITY reloadButton.label "Side opnij &lade">
<!ENTITY recentReports.clear.label "&Smyt alle rapporten fuort">
<!ENTITY typeSelector.description "Dit finster sil jo begeliede troch de stappen nedich foar it yntsjinjen fan in Adblock Plus probleemrapport. Earst, selektearje it type probleem wat jo tsjinkommen binne op dizze side:">
<!ENTITY screenshot.remove.label "Sensitive &gegevens fuortsmite">
<!ENTITY issues.ownfilters.description "Sommige fan de filters tapast op dizze side binne brûker-definiearre. Skeakel de filters út dy't miskien dit probleem feroarsake hawwe:">
+<!ENTITY update.inProgress.description "Adblock Plus moat dyn filter abonnemint bywurkje om der seker fan te wêzen dat er noch gjin oplossing bekend is. Wacht efkes...">
<!ENTITY sendPage.retry.label "Ferstjoer op 'e nij">
<!ENTITY data.label "&Rapportgegevens:">
<!ENTITY recentReports.label "Jo resint ynstjoerde rapporten">
@@ -29,9 +31,11 @@
<!ENTITY issues.disabledfilters.enable.label "Filter ynskeakelje">
<!ENTITY issues.override.label "De &konfiguraasje is korrekt, fierder mei it rapport">
<!ENTITY issues.nosubscriptions.description "It liket der op dat jo net abonnearre binne op ien fan de yn-it-foar makke filterlisten dy't automatysk net-winske ynhâld fan websteeën fuortsmyt.">
+<!ENTITY typeSelector.falsePositive.description "Selektearje dizze opsje as de side wichtige ynhâld mist, net goed toant wurd of net goed funksjonearret. Jo kinne útfine oft Adblock Plus de oarsaak is fan it probleem troch it tydlik út te skeakeljen.">
<!ENTITY typeSelector.other.label "O&ar probleem">
+<!ENTITY emailComment.label "It soe moai wêze ast in goed mail adres kist opjaan sa dat wy kontakt my die kinne opnimme as der fragen binne oer dyn rapport. It jout ús ek de mooglikheid om minsken te werkennen en mear prioriteit te jaan.">
<!ENTITY issues.whitelist.remove.label "Skeakel Adblock Plus op dizze side wer yn">
-<!ENTITY typeSelector.falsePositive.description "Selektearje dizze opsje as de side wichtige ynhâld mist, net goed toant wurd of net goed funksjonearret. Jo kinne útfine oft Adblock Plus de oarsaak is fan it probleem troch it tydlik út te skeakeljen.">
+<!ENTITY outdatedSubscriptions.description "De folgjende filters binne al in tiid net bywurke. Wurkje dizze by foardast in rapport ynstjoerst. Miskien is it al oplost.">
<!ENTITY dataCollector.description "In amerijke wylst Adblock Plus de nedige gegevens sammelt.">
<!ENTITY sendButton.label "&Ferstjoer rapport">
<!ENTITY comment.label "&Kommentaar (opsjoneel):">
@@ -45,13 +49,14 @@
<!ENTITY issues.whitelist.description "Adblock Plus is no útskeakele op de side dy't jo rapportearje. Skeakel it yn en laad de side op 'e nij eardat it rapport ynstjoerd wurd om it ûndersyk fan dit probleem te helpen.">
<!ENTITY typeSelector.falseNegative.label "Adblock Plus blokkearret in advertinsje net">
<!ENTITY typeSelector.heading "Selektearje probleemtype">
+<!ENTITY anonymity.warning "We kinnen dy gjin kommentaar jaan en sille wierskynlik in leage prioriteit oan dyn rapport jaan.">
<!ENTITY wizard.title "Probleemrapportearder">
<!ENTITY issues.ownfilters.disable.label "Filter útskeakelje">
<!ENTITY commentPage.description "It tekstfjild hjirûnder jout de mooglikheid om kommentaar te jaan. Dizze stap is opsjoneel, mar oanrikkemandearre as it in frjemd probleem is. Jo kinne ek de gegevens besjen eardat it ferstjoerd wurd.">
<!ENTITY comment.lengthWarning "De lingte fan jo kommentaar hat mear as 1000 karakters. Allinnich de earste 1000 karakters sille ferstjoerd wurde.">
<!ENTITY typeSelector.falseNegative.description "Selektearje dizze opsje as in advertinsje toant wurd wylst Adblock Plus ynskeakele is.">
<!ENTITY sendPage.waitMessage "Wachtsje wylst Adblock Plus jo rapport ynstjoerd.">
-<!ENTITY dataCollector.heading "Wolkome by de probleemrapportearder">
+<!ENTITY dataCollector.heading "Wolkom by de probleemrapportearder">
<!ENTITY screenshot.heading "Skermôfdruk tafoegje">
<!ENTITY sendPage.heading "Ferstjoer rapport">
<!ENTITY issues.subscriptionCount.description "It liket as jo abonnearre binne op te folle filters. Dizze opset is net oanrikkemandearre omdat it wierskienlik faker problemen feroarsaakje kin. Wy kinne ek jo probleemrapport net akseptearje omdat it net dúdlik is hokker filterabonnemint auteur aksje ûndernimme moat. Helje alle net needsaaklike filters fuort en test oft de problemen wer barre.">
diff --git a/chrome/locale/fy-NL/sidebar.dtd b/chrome/locale/fy-NL/sidebar.dtd
index 2503437..4280a2d 100644
--- a/chrome/locale/fy-NL/sidebar.dtd
+++ b/chrome/locale/fy-NL/sidebar.dtd
@@ -1,6 +1,7 @@
<!ENTITY context.flash.label "Lit rannen knipperje">
<!ENTITY address.label "Adres">
<!ENTITY context.open.label "Iepen yn in nij ljepblêd">
+<!ENTITY type.label "Type">
<!ENTITY tooltip.filterSource.label "Filterboarne:">
<!ENTITY noitems.label "Gjin blokkearbere items">
<!ENTITY filter.label "Filter">
@@ -11,7 +12,7 @@
<!ENTITY filterSource.label "Filterboarne">
<!ENTITY tooltip.docDomain.label "Dokumintboarne:">
<!ENTITY context.copy.label "Kopiearje">
-<!ENTITY tooltip.type.blocked "(blokkearre)">
+<!ENTITY tooltip.type.label "Type:">
<!ENTITY context.disablefilter.label "Filter útskeakelje ?1?">
<!ENTITY context.copyFilter.label "Filter kopiearje">
<!ENTITY context.block.label "Blokkearje dit item">
@@ -25,6 +26,7 @@
<!ENTITY tooltip.filter.label "Tapast filter:">
<!ENTITY tooltip.filter.disabled "(útskeakele)">
<!ENTITY context.editfilter.label "Bewurkje tapaste filter">
+<!ENTITY tooltip.type.blocked "(blokkearre)">
<!ENTITY size.label "Grutte">
<!ENTITY context.whitelist.label "Meitsje in útsûnderingsrigel foar dit ûnderdiel">
<!ENTITY context.selectAll.label "Selektearje alles">
diff --git a/chrome/locale/gl/firstRun.properties b/chrome/locale/gl/firstRun.properties
index afc1d5c..7a791e7 100644
--- a/chrome/locale/gl/firstRun.properties
+++ b/chrome/locale/gl/firstRun.properties
@@ -6,15 +6,16 @@ firstRun_title=O Adblock Plus foiche instalado
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_toggle_on=ACTIVADO
firstRun_contributor_credits=Coa colaboración de...
-firstRun_feature_show_overview=amosar vista xeral
+firstRun_feature_show_expanded=activar opcións
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_features=O Adblock Plus faiche mais cousas que bloquear publicidade
firstRun_feature_malware_description=Fai mais seguro o teu navegador ó bloquear dominios con "malware".
+firstRun_feature_show_overview=amosar vista xeral
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_donate=fai unha doazón
firstRun_donate_label=Apoia ó noso proxecto
firstRun_feature_social=Eliminar os botóns das redes sociais
-firstRun_feature_show_expanded=activar opcións
+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.
diff --git a/chrome/locale/gl/overlay.dtd b/chrome/locale/gl/overlay.dtd
index caa48cb..f39284f 100644
--- a/chrome/locale/gl/overlay.dtd
+++ b/chrome/locale/gl/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Desactivar en ?1?">
<!ENTITY filters.label "Pre&ferencias dos filtros">
<!ENTITY disable.label "Desactivar en tódalas páxinas">
-<!ENTITY showinaddonbar.label "Amosar na &barra de complementos">
<!ENTITY objecttab.title "Bloquear">
<!ENTITY objecttab.tooltip "Fai click aquí para bloquear este obxecto co Adblock Plus">
<!ENTITY menuitem.label "Preferencias do Ad&block Plus">
diff --git a/chrome/locale/id/.incomplete b/chrome/locale/gu-IN/.incomplete
similarity index 100%
rename from chrome/locale/id/.incomplete
rename to chrome/locale/gu-IN/.incomplete
diff --git a/chrome/locale/gu-IN/composer.dtd b/chrome/locale/gu-IN/composer.dtd
new file mode 100644
index 0000000..3a4a96a
--- /dev/null
+++ b/chrome/locale/gu-IN/composer.dtd
@@ -0,0 +1,2 @@
+<!ENTITY collapse.yes.label "હા">
+<!ENTITY collapse.no.label "ના">
diff --git a/chrome/locale/he/firstRun.properties b/chrome/locale/he/firstRun.properties
index 2d5b1c2..84b919c 100644
--- a/chrome/locale/he/firstRun.properties
+++ b/chrome/locale/he/firstRun.properties
@@ -6,15 +6,16 @@ firstRun_title=Adblock Plus הותקן
firstRun_acceptableAdsExplanation=אנחנו רוצים לעודד אתרים להשתמש בפרסום פשוט ולא בולט. זאת מדוע ביססנו <a>קווים מנחים נוקשים</a> כדי לזהות מודעות מתקבלות, אשר מופיעות בהגדרות ברירת המחדל. אם ברצונכם לחסום בכל זאת את כל המודעות ניתן <a>לנטרל</a> זאת במספר שניות.
firstRun_toggle_on=מופעל
firstRun_contributor_credits=קרדיטים לתורמים
-firstRun_feature_show_overview=הצגת סקירה כללית
+firstRun_feature_show_expanded=הפעלת תכונות
firstRun_dataCorruptionWarning=עמוד זה ממשיך להופיע ? <a>לחצו כאן!</a>
firstRun_acceptableAdsHeadline=מודעות מציקות ייחסמו מעכשיו
firstRun_share=ספרו לחבריכם ומשפחתכם
firstRun_share_headline=<a>תנו לנו יד</a> בהפיכת הרשת למקום טוב יותר
firstRun_features=Adblock Plus יכול לעשות יותר מרק לחסום פרסומות
firstRun_feature_malware_description=הפכו את הגלישה שלכם למאובטחת יותר על ידי חסימת אתרים המכילים תוכנה זדונית.
+firstRun_feature_show_overview=הצגת סקירה כללית
firstRun_feature_social_description=שחררו אוטומטית את חווית הגלישה שלכם מכפתורי מדיה חברתית, כגון Facebook Like, אשר מופיעים בעמודי אינטרנט ומנתרים את התנהגותכם.
firstRun_donate=תרומה
firstRun_donate_label=תמיכה בפרויקט שלנו
firstRun_feature_social=הסרת כפתורי מדיה חברתיים
-firstRun_feature_show_expanded=הפעלת תכונות
+firstRun_legacySafariWarning=אתה משתמש בגרסה ישנה של Safari שלא נתמכת על ידי Ablock Plus. זה עלול לגרום לכך ש 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.
diff --git a/chrome/locale/he/overlay.dtd b/chrome/locale/he/overlay.dtd
index f3e4273..8484b74 100644
--- a/chrome/locale/he/overlay.dtd
+++ b/chrome/locale/he/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "נטרול ב-?1?">
<!ENTITY filters.label "&העדפות סינון">
<!ENTITY disable.label "נטרול בכל מקום">
-<!ENTITY showinaddonbar.label "&הצגה בסרגל ההרחבות">
<!ENTITY objecttab.title "חסימה">
<!ENTITY objecttab.tooltip "לחיצה כאן לחסימת פריט זה עם Adblock Plus">
<!ENTITY menuitem.label "&העדפות Adblock Plus">
diff --git a/chrome/locale/hi-IN/composer.dtd b/chrome/locale/hi-IN/composer.dtd
index b5439fc..7ccf8ce 100644
--- a/chrome/locale/hi-IN/composer.dtd
+++ b/chrome/locale/hi-IN/composer.dtd
@@ -1,22 +1,33 @@
<!ENTITY anchor.end.label "पते के अंत में (&एन)">
-<!ENTITY matchCase.label "केस मिलाएँ">
+<!ENTITY domainRestriction.label "डोमेन तक ही सीमित करें:">
+<!ENTITY collapse.default.no.label "पूर्व निर्धारित (नहीं) का ही उपयोग करें">
<!ENTITY firstParty.label "केवल प्रथम-पक्ष (&आर)">
<!ENTITY preferences.label "मौजूदा फ़िल्टर्स दिखाएँ... (&एस)">
<!ENTITY pattern.label "पैटर्न के लिए देखो">
<!ENTITY thirdParty.label "तृतीय-पक्ष ही (&टी)">
<!ENTITY filter.label "नया फ़िल्टर:">
+<!ENTITY collapse.label "अवरोधित को संक्षेपित करें:">
+<!ENTITY match.warning "आपके द्वारा डाला गया प्रतिरूप प्रतिबंधित/स्वीकारित पते से मेल नहीं खा रहा है इसलिए इसका कोई प्रभाव नहीं होगा। ">
<!ENTITY anchor.start.label "पते की शुरुआत में (&जी)">
-<!ENTITY types.label "प्रकार के लिए लागू करें:">
+<!ENTITY matchCase.label "केस मिलाएँ">
<!ENTITY custom.pattern.label "कस्टम:">
+<!ENTITY unselectAllTypes.label "कोई नहीं चुनें ">
<!ENTITY type.whitelist.label "अपवाद नियम (&एक्स)">
-<!ENTITY collapse.yes.label "हाँ">
-<!ENTITY basic.label "मूल दृश्य">
+<!ENTITY regexp.warning "आप दर्ज किए गए पैटर्न जो कुशलतापूर्वक Adblock प्लस द्वारा संसाधित किया जा सकता है और नीचे अपने ब्राउज़िंग अनुभव धीमा हो सकता है एक नियमित अभिव्यक्ति के रूप में व्याख्या की जाएगी। यदि आप एक नियमित अभिव्यक्ति का उपयोग करने का इरादा नहीं था, एक तारांकन चिह्न (*) पैटर्न का अंत करने के लिए जोड़ें।">
<!ENTITY dialog.title "Adblock प्लस के फ़िल्टर में नियम जोड़ें">
+<!ENTITY basic.label "मूल दृश्य">
+<!ENTITY type.filter.label "& फ़िल्टर अवरुद्ध">
+<!ENTITY types.label "प्रकार के लिए लागू करें:">
+<!ENTITY shortpattern.warning "आप दर्ज किए गए पैटर्न भी अनुकूलित किया जा करने के लिए कम है और नीचे आपके ब्राउज़िंग अनुभव को धीमा कर सकते हैं। यह अनुशंसित है कि आप इस फ़िल्टर Adblock प्लस फ़िल्टर प्रक्रिया को और अधिक कुशलता से करने के लिए अनुमति देने के लिए एक लंबी स्ट्रिंग चुनें।">
+<!ENTITY collapse.yes.label "हाँ">
<!ENTITY anchors.label "पैटर्न ही स्वीकार करते हैं:">
<!ENTITY collapse.default.yes.label "डिफ़ॉल्ट (हाँ) का उपयोग करें">
+<!ENTITY domainRestriction.help "बार लाइन(|) द्वारा अलग किए हुए एक या अधिक डोमेंनों को निर्दिष्ट करने के लिए इस विकल्प का उपयोग करें। यह फ़िल्टर सिर्फ चुने गए डोमेंनों पर ही लागू होगा। डोमेन नाम से पहले टिल्ड (~) यह दर्शाता है कि यह फ़िल्टर उस डोमेन पर लागू नहीं होगा। ">
<!ENTITY accept.label "फ़िल्टर जोड़ें">
<!ENTITY options.label "विकल्प">
+<!ENTITY disabled.warning "Adblock प्लस वर्तमान में अक्षम किया गया है। आप अभी भी फ़िल्टर्स जोड़ सकते हैं, लेकिन आपके फिल्टर्स [लिंक] Adblock प्लस [/link] सक्षम करें जब तक कि वे लागू नहीं होगी।">
<!ENTITY anchor.start.flexible.label "डोमेन नाम के शुरुआत में (&जी)">
<!ENTITY collapse.no.label "नहीं">
<!ENTITY selectAllTypes.label "सभी का चयन करें">
<!ENTITY advanced.label "उन्नत दृश्य">
+<!ENTITY pattern.explanation "पैटर्न पता के किसी भी भाग हो सकते हैं; तारांकन (*) वाइल्डकार्ड के रूप में काम करते हैं। फ़िल्टर केवल पते दिए गए पैटर्न से मेल खाते के लिए लागू किया जाएगा।">
diff --git a/chrome/locale/hr/firstRun.properties b/chrome/locale/hr/firstRun.properties
index 04909a8..445beb2 100644
--- a/chrome/locale/hr/firstRun.properties
+++ b/chrome/locale/hr/firstRun.properties
@@ -1,16 +1,21 @@
firstRun_feature_tracking_description=Surfaj privatno s isključenim praćenjem - skrivajući se od oglasnih tvrtki koje prate tvoj svaki potez.
firstRun_toggle_off=ISKLJUČI
firstRun_feature_tracking=Onemogući praćenje
-firstRun_feature_social=Ukloni tipke društvenih mreža
-firstRun_title=Adblock Plus je instaliran
firstRun_feature_malware=Blokiranje malwara
+firstRun_title=Adblock Plus je instaliran
+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_toggle_on=UKLJUČI
-firstRun_feature_show_overview=Prikaži pregled
+firstRun_contributor_credits=Zasluge doprinositelja
+firstRun_feature_show_expanded=uključi značajke
firstRun_dataCorruptionWarning=Nastavlja li se ova stranica pojavljivati? <a>Kliknite ovdje!</a>
firstRun_acceptableAdsHeadline=Naporni oglasi će sada biti blokirani
firstRun_share=Reci svojim prijateljima
+firstRun_share_headline=<a>Pomognite nam</a> pri stvaranju Interneta boljim mjestom
firstRun_features=Adblock Plus može učiniti mnogo više nego samo blokirati reklame
+firstRun_feature_malware_description=Učinite vaše surfanje Internetom sigurnijim blokiranjem poznatih malvare domena.
+firstRun_feature_show_overview=Prikaži pregled
firstRun_feature_social_description=Automatski oslobodi svoje internetsko iskustvo od napornih gumba kao što su Facebook Like gumb, koji se pojavljuju na stranicama i prate vaše ponašanje.
firstRun_donate=doniraj
firstRun_donate_label=Podrži naš projekt
-firstRun_feature_show_expanded=uključi značajke
+firstRun_feature_social=Ukloni tipke društvenih mrež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. Strogo vam preporučamo da nadogradite na Safari 6.1.1 ili višu inačicu (dostupnu za Mac OS X 10.8 Mountain Lion), ili Safari 7.0.1 ili višu inačicu (za OS X 10.9 Mavericks), ili da koristite najnoviju inačicu Mozilla Firefoxa, Google Chroma ili Opere.
diff --git a/chrome/locale/hr/overlay.dtd b/chrome/locale/hr/overlay.dtd
index 13fbc3d..12d43d9 100644
--- a/chrome/locale/hr/overlay.dtd
+++ b/chrome/locale/hr/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Onemogući na ?1?">
<!ENTITY filters.label "Postavke &filtera">
<!ENTITY disable.label "Onemogući posvuda">
-<!ENTITY showinaddonbar.label "Prikaži u traci d&odataka">
<!ENTITY objecttab.title "Blokiraj">
<!ENTITY objecttab.tooltip "Kliknite ovdje za blokiranje ovog objekta s Adblock Plus-om">
<!ENTITY menuitem.label "Ad&block Plus postavke">
diff --git a/chrome/locale/hsb/firstRun.properties b/chrome/locale/hsb/firstRun.properties
index 1e4fffc..4966330 100644
--- a/chrome/locale/hsb/firstRun.properties
+++ b/chrome/locale/hsb/firstRun.properties
@@ -6,15 +6,16 @@ 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_contributor_credits=Dźakprajenje sobuskutkowacym
-firstRun_feature_show_overview=přehlad pokazać
+firstRun_feature_show_expanded=funkcije aktiwizować
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_show_overview=přehlad pokazać
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_social=Tłóčatka za socialne medije wotstronić
-firstRun_feature_show_expanded=funkcije aktiwizować
+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.
diff --git a/chrome/locale/hsb/overlay.dtd b/chrome/locale/hsb/overlay.dtd
index 0bdc989..96f8a76 100644
--- a/chrome/locale/hsb/overlay.dtd
+++ b/chrome/locale/hsb/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Na ?1? znjemóžnić">
<!ENTITY filters.label "&Filtrowe nastajenja">
<!ENTITY disable.label "Wšudźe znjemóžnić">
-<!ENTITY showinaddonbar.label "W přidatkowej &lajsće pokazać">
<!ENTITY objecttab.title "Blokować">
<!ENTITY objecttab.tooltip "Klikńće sem, zo byšće tutón objekt z pomcu Adblock Plus blokował">
<!ENTITY menuitem.label "Na&stajenja Adblock Plus">
diff --git a/chrome/locale/hu/firstRun.properties b/chrome/locale/hu/firstRun.properties
index 46a1f55..ecb4b86 100644
--- a/chrome/locale/hu/firstRun.properties
+++ b/chrome/locale/hu/firstRun.properties
@@ -6,15 +6,16 @@ firstRun_title=Sikeresen telepítette az Adblock Plus-t
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_toggle_on=BEKAPCSOLVA
firstRun_contributor_credits=Hozzájárulók névsora
-firstRun_feature_show_overview=áttekintés mutatása
+firstRun_feature_show_expanded=funkciók aktiválása
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_features=Az Adblock Plus a reklámok blokkolásánál többre is képes
firstRun_feature_malware_description=Tegye a böngészést biztonságosabbá azáltal, hogy letiltja az ismert malware címeket.
+firstRun_feature_show_overview=áttekintés mutatá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_donate=adományozás
firstRun_donate_label=A projekt támogatása
firstRun_feature_social=Közösségi oldalak gombjainak eltávolítása
-firstRun_feature_show_expanded=funkciók aktiválása
+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.
diff --git a/chrome/locale/hu/overlay.dtd b/chrome/locale/hu/overlay.dtd
index 49061be..b6863f2 100644
--- a/chrome/locale/hu/overlay.dtd
+++ b/chrome/locale/hu/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Szűrés tiltása itt: ?1?">
<!ENTITY filters.label "Szűrő &beállítások">
<!ENTITY disable.label "Letiltás mindenhol">
-<!ENTITY showinaddonbar.label "M&egjelenítés a kiegészítősávon">
<!ENTITY objecttab.title "Blokkolás">
<!ENTITY objecttab.tooltip "Kattintson ide a blokkoláshoz (Adblock Plus)">
<!ENTITY menuitem.label "Ad&block Plus beállítások">
diff --git a/chrome/locale/hy-AM/firstRun.properties b/chrome/locale/hy-AM/firstRun.properties
index 9cc2455..5314bff 100644
--- a/chrome/locale/hy-AM/firstRun.properties
+++ b/chrome/locale/hy-AM/firstRun.properties
@@ -1,2 +1,21 @@
-firstRun_dataCorruptionWarning=Արդյոք այս էջը ցուցադրվում է? <a>Սեղմեք այստեղ!</a>
+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_contributor_credits=Ծրագրի հեղինակները
+firstRun_feature_show_expanded=ակտիվացնել հնարավորությունները
+firstRun_dataCorruptionWarning=Արդյոք այս էջը ցուցադրվում է? <a>Սեղմեք այստեղ!</a>
+firstRun_acceptableAdsHeadline=Վատ գովազդներն այժմ արգելված են
+firstRun_share=Պատմեք ընկերներին
+firstRun_share_headline=<a>Մեզ օգնեք</a> դարձնելու ինտերնետն ավելի լավ վայր
+firstRun_features=Adblock Plus ավելին կարող է անել
+firstRun_feature_malware_description=Անվտանգ դարձնել Ձեր համակարգիչն արգելելով վիրուս-դոմենները։
+firstRun_feature_show_overview=մանրամասն
+firstRun_feature_social_description=Ավտոմատ արագացնել աշխատանքը արգելափակելով սոց․ ցանցերի կոճակները, օրինակ՝ Facebook Like, որը գալիս է կայքերում և հետևում Ձեզ։
+firstRun_donate=նվիրաբերել
+firstRun_donate_label=Օգնեք մեր ծրագրին
+firstRun_feature_social=Հեռացնել սոց․ ցանցերի կոճակները
+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։
diff --git a/chrome/locale/hy-AM/overlay.dtd b/chrome/locale/hy-AM/overlay.dtd
index 893b77f..c9a7910 100644
--- a/chrome/locale/hy-AM/overlay.dtd
+++ b/chrome/locale/hy-AM/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Անջատել ?1?-ում">
<!ENTITY filters.label "Ֆիլտրերի կարգավորում (&F)">
<!ENTITY disable.label "Անջատել ամենուր">
-<!ENTITY showinaddonbar.label "Ցուցադրրել լրացումների պանակում">
<!ENTITY objecttab.title "Ֆիլտրել">
<!ENTITY objecttab.tooltip "Սեղմել «Adblock Plus»ով այս օբյեկտը ֆիլտրելու համար">
<!ENTITY menuitem.label "Ad&block Plus">
diff --git a/chrome/locale/id/composer.dtd b/chrome/locale/id/composer.dtd
new file mode 100644
index 0000000..b06e427
--- /dev/null
+++ b/chrome/locale/id/composer.dtd
@@ -0,0 +1,33 @@
+<!ENTITY anchor.end.label "&pada akhir dari alamat">
+<!ENTITY domainRestriction.label "Batasi pa&da ranah:">
+<!ENTITY collapse.default.no.label "Gunakan default (tidak)">
+<!ENTITY firstParty.label "Hanya pihak pe&rtama">
+<!ENTITY preferences.label "&Tampilkan filter yang ada...">
+<!ENTITY pattern.label "Mencari pola">
+<!ENTITY thirdParty.label "Hanya pihak ke&tiga">
+<!ENTITY filter.label "&Tapis baru:">
+<!ENTITY collapse.label "&Lipat 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 "&pada awal alamat">
+<!ENTITY matchCase.label "&Samakan jenis">
+<!ENTITY custom.pattern.label "&Kustom:">
+<!ENTITY unselectAllTypes.label "Tidak memilih apapun">
+<!ENTITY type.whitelist.label "Aturan p&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 basic.label "Tampilan dasar">
+<!ENTITY type.filter.label "&Blokir tapis">
+<!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 dari tapis ini untuk memungkinkan Adblock Plus untuk mengolah tapis yang 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 ranah yang dipisahkan oleh sebuah garis batang (|). Filter hanya akan diterapkan pada ranah yang dipilih. Sebuah tanda lekuk (~) sebelum nama ranah menunjukkan bahwa tapis tidak akan diterapkan pada ranah 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 "&pada awal nama domain">
+<!ENTITY collapse.no.label "Tidak">
+<!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.">
diff --git a/chrome/locale/id/filters.dtd b/chrome/locale/id/filters.dtd
index 94f445b..6136b99 100644
--- a/chrome/locale/id/filters.dtd
+++ b/chrome/locale/id/filters.dtd
@@ -8,8 +8,8 @@
<!ENTITY backupButton.label "&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 "Urut dari A > Z">
-<!ENTITY sort.label "Urutkan dar&i">
+<!ENTITY sort.ascending.label "Urutkan dari A > Z">
+<!ENTITY sort.label "&Urutkan dari">
<!ENTITY subscription.source.label "Daftar penyaring">
<!ENTITY hitcount.column "Sasaran">
<!ENTITY noFilters.text "Anda belum memiliki penyesuaian penyaring apapun.">
@@ -21,7 +21,7 @@
<!ENTITY restore.default.label "Mengembalikan cadangan dari ?1?">
<!ENTITY subscription.lastDownload.inProgress "Mengunduh…">
<!ENTITY subscriptions.tab.label "Penyaring langganan">
-<!ENTITY sort.descending.label "Urut dari Z > A">
+<!ENTITY sort.descending.label "Urutkan dari Z > A">
<!ENTITY filters.remove.warning "Apakah Anda sungguh ingin menghapus semua penyaring yang dipilih?">
<!ENTITY filter.delete.label "Hapus">
<!ENTITY addSubscriptionAdd.label "Tambahkan">
@@ -38,16 +38,16 @@
<!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 filter.edit.label "Perbaiki">
+<!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 close.label "Tutup">
-<!ENTITY sort.none.label "Aca&k">
+<!ENTITY sort.none.label "&Belum diurutkan">
<!ENTITY filter.actions.label "Tindakan penyaring">
<!ENTITY filter.copy.label "Salin">
<!ENTITY filter.moveDown.label "Ke bawah">
-<!ENTITY filter.resetHitCounts.label "Pengaturan kembali statistik kunjungan">
+<!ENTITY filter.resetHitCounts.label "Reset kembali statistik kunjungan">
<!ENTITY readMore.label "Baca lebih lanjut">
<!ENTITY subscription.moveUp.label "Ke atas">
<!ENTITY addSubscription.label "Tambahkan penyaring">
@@ -65,8 +65,8 @@
<!ENTITY filter.paste.label "Tempel">
<!ENTITY subscription.disabledFilters.enable "Aktifkan penyaring yang dinonaktifkan">
<!ENTITY lasthit.column "Sasaran terakhir">
-<!ENTITY subscription.editTitle.label "Perbaiki judul">
+<!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 terbaru:">
+<!ENTITY subscription.lastDownload.label "Unduhan terakhir:">
<!ENTITY viewList.label "Lihat daftar">
diff --git a/chrome/locale/id/firstRun.properties b/chrome/locale/id/firstRun.properties
index 139ebb7..6ea4666 100644
--- a/chrome/locale/id/firstRun.properties
+++ b/chrome/locale/id/firstRun.properties
@@ -2,19 +2,20 @@ firstRun_feature_tracking_description=Menjelajah secara rahasia dengan menonakti
firstRun_toggle_off=OFF
firstRun_feature_tracking=Menonaktifkan pelacakan
firstRun_feature_malware=Memblokir malware
-firstRun_title=Adblock Plus telah diinstall
+firstRun_title=Adblock Plus telah terpasang
firstRun_acceptableAdsExplanation=Kami ingin mendorong situs web untuk menggunakan iklan langsung, yang tidak mengganggu. Itu sebabnya kami telah menetapkan <a>Peraturan ketat</a> untuk mengidentifikasi iklan yang bisa diterima, yang akan ditampilkan di bawah 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=Kontributor kredit
-firstRun_feature_show_overview=Tampilkan ikhtisar
-firstRun_dataCorruptionWarning=Apakah halaman ini terus muncul? <a>Klik disini!</a>
+firstRun_feature_show_expanded=Aktivasi fitur
+firstRun_dataCorruptionWarning=Apakah halaman ini tetap muncul? <a>Klik disini!</a>
firstRun_acceptableAdsHeadline=Sekarang iklan yang mengganggu akan diblokir
firstRun_share=Beritahu teman Anda
firstRun_share_headline=<a>Membantu kami</a> dalam membuat web menjadi tempat yang lebih baik
firstRun_features=Adblock Plus dapat melakukan lebih banyak daripada sebatas pemblokiran iklan
firstRun_feature_malware_description=Membuat browsing Anda lebih aman dengan cara memblokir domain malware yang dikenal .
+firstRun_feature_show_overview=Tampilkan ikhtisar
firstRun_feature_social_description=Secara otomatis membersihkan tombol media sosial browsing Anda , seperti Facebook Like, yang muncul pada halaman web dan melacak perilaku Anda.
firstRun_donate=menyumbang
-firstRun_donate_label=Dukung proyek kami
+firstRun_donate_label=Dukung proyek ini
firstRun_feature_social=Menghapus tombol Media sosial
-firstRun_feature_show_expanded=Aktivasi fitur
+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 untuk gunakan versi terbaru dari Mozilla Firefox, Google Chrome atau Opera.
diff --git a/chrome/locale/id/global.properties b/chrome/locale/id/global.properties
index 8504d4e..7b3d741 100644
--- a/chrome/locale/id/global.properties
+++ b/chrome/locale/id/global.properties
@@ -8,7 +8,7 @@ type_label_stylesheet=stylesheet
blocked_count_tooltip=?1? dari ?2?
type_label_font=font
type_label_popup=Jendela pop-up
-filter_regexp_tooltip=Ini adalah salah satu filter dari kalimat biasa atau terlalu pendek untuk dioptimalkan. Terlalu banyak filter ini akan memperlambat browsing Anda.
+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.
whitelisted_page=Adblock Plus telah dinonaktifkan untuk halaman ini
remove_group_warning=Anda benar-benar ingin menghapus kelompok ini?
@@ -20,7 +20,7 @@ type_label_object_subrequest=objek subrequest
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=Objek
+type_label_object=Obyek
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?
diff --git a/chrome/locale/id/meta.properties b/chrome/locale/id/meta.properties
index 6f07a2a..15fde97 100644
--- a/chrome/locale/id/meta.properties
+++ b/chrome/locale/id/meta.properties
@@ -1,6 +1,6 @@
-description.short=Masz dość oglądania denerwujących reklam i banerów, które dodatkowo wydłużają wczytywanie stron? Zainstaluj Adblock Plus i uwolnij się od nich!\n\nKrótkie wideo opisujące instalację znajduje się tutaj: http://www.youtube.com/watch?v=oNvb2SjVjjI
+description.short=Terganggu oleh iklan? Terganggu oleh pelacakan? Terganggu oleh banner? Pasang Adblock Plus sekarang untuk mendapatkan kembali kendali atas internet dan mengubah cara Anda melihat web. Ringkasan video pendek tentang Adblock Plus tersedia di http://www.youtube.com/watch?v=oNvb2SjVjjI
name=Adblock Plus
-description.long.addition1=Dimulai dengan Adblock Plus 2.0 terdapat pilihan dalam Preferensi Penyaring untuk memungkinkan beberapa iklan non-intrusif. Bertujuan untuk mendukung situs web menggunakan cara-cara yang non-intrusif untuk mengiklankan dan mendorong lebih banyak website melakukan hal yang sama. <a href="http://adblockplus.org/en/acceptable-ads"> Baca lebih lanjut</a>
-translator=Leszek(teo)Życzkowski
-description.long=Dzięki rozszerzeniu Adblock Plus odzyskasz kontrolę nad Internetem i będziesz móc przeglądać strony tak, jak chcesz. Dodatek jest wspierany przez ponad 40 możliwych do subskrybowania zestawów filtrów dostosowanych do różnych obszarów językowych. Filtry te automatycznie konfigurują Adblock Plus do różnych zadań, począwszy od usuwania reklam internetowych do blokowania wszystkich znanych domen ze złośliwym oprogramowaniem. Rozszerzenie umożliwia także ręczne dostosowywanie [...]
-description=Powiedz NIE! reklamom
+description.long.addition1=Dimulai dengan Adblock Plus 2.0 terdapat pilihan dalam Preferensi Penyaring untuk memungkinkan beberapa iklan non-intrusif. Tujuannya untuk mendukung situs web dengan menggunakan cara-cara yang non-intrusif untuk beriklan dan mendorong lebih banyak website melakukan hal yang sama. <a href="http://adblockplus.org/en/acceptable-ads"> Baca lebih lanjut</a>
+translator=Wladimir Palant
+description.long=Adblock Plus memungkinkan Anda untuk mendapatkan kembali kendali atas internet dan melihat web seperti yang Anda inginkan. Add-on ini didukung oleh lebih dari empat puluh filter berlangganan dalam puluhan bahasa yang secara otomatis mengkonfigurasi untuk keperluan mulai dari menghapus iklan online untuk memblokir semua domain malware yang diketahui. Adblock Plus juga memungkinkan Anda untuk menyesuaikan filter Anda dengan bantuan berbagai fitur berguna, termasuk pilihan [...]
+description=Iklan sudah menjadi masa lalu!
diff --git a/chrome/locale/id/overlay.dtd b/chrome/locale/id/overlay.dtd
index 55938dd..8b6f4cf 100644
--- a/chrome/locale/id/overlay.dtd
+++ b/chrome/locale/id/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Non aktifkan pada ?1?">
<!ENTITY filters.label "&Preferensi penyaring">
<!ENTITY disable.label "Non aktifkan disemua tempat">
-<!ENTITY showinaddonbar.label "Tampilkan di add-on&bar">
<!ENTITY objecttab.title "Blokir">
<!ENTITY objecttab.tooltip "Klik disini untuk memblokir objek ini dengan Adblock Plus">
<!ENTITY menuitem.label "Preferensi Ad&block Plus">
@@ -19,7 +18,7 @@
<!ENTITY hideplaceholders.label "Sembunyikan p&laceholders dari unsur pemblokiran">
<!ENTITY showinstatusbar.label "Tunjukkan di &status bar">
<!ENTITY sidebar.title "Item yang dapat diblok di halaman ini">
-<!ENTITY options.label "Opsi">
+<!ENTITY options.label "&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:">
diff --git a/chrome/locale/id/sendReport.dtd b/chrome/locale/id/sendReport.dtd
index fec5ebd..98a4903 100644
--- a/chrome/locale/id/sendReport.dtd
+++ b/chrome/locale/id/sendReport.dtd
@@ -38,10 +38,10 @@
<!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 sendButton.label "Kirim laporan">
-<!ENTITY comment.label "O&bjaśnienia (opcjonalne):">
+<!ENTITY comment.label "&Komentar (pilihan):">
<!ENTITY sendPage.errorMessage "Upaya mengirimkan laporan gagal dengan kode kesalahan "?1?". 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 commentPage.heading "Dodaj objaśnienie">
+<!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.">
@@ -50,9 +50,9 @@
<!ENTITY typeSelector.falseNegative.label "Adblock Plus tidak memblokir sebuah &iklan">
<!ENTITY typeSelector.heading "Pilih tipe laporan">
<!ENTITY anonymity.warning "Kami tidak dapat menghubungi Anda kembali dan akan menurunkan prioritas laporan ini.">
-<!ENTITY wizard.title "Masalah pelapor">
+<!ENTITY wizard.title "Pelaporan">
<!ENTITY issues.ownfilters.disable.label "Nonaktifkan filter">
-<!ENTITY commentPage.description "W poniższym polu tekstowym możesz podać objaśnienie, które pomoże nam zrozumieć problem. Jest to opcjonalne, ale zalecane, jeśli problem nie jest oczywisty. Możesz również sprawdzić dane zawarte w zgłoszeniu przed jego wysłaniem.">
+<!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 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 sendPage.waitMessage "Silahkan tunggu sementara Adblock Plus mengirimkan laporan Anda.">
diff --git a/chrome/locale/is/firstRun.properties b/chrome/locale/is/firstRun.properties
index 2cbf2ca..9c44c55 100644
--- a/chrome/locale/is/firstRun.properties
+++ b/chrome/locale/is/firstRun.properties
@@ -6,15 +6,16 @@ firstRun_title=Adblock Plus var sett inn
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_toggle_on=VIRKT
firstRun_contributor_credits=Stuðningsaðilar
-firstRun_feature_show_overview=birta yfirlit
+firstRun_feature_show_expanded=virkja eiginleika
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_features=Adblock Plus getur gert meira heldur en að loka á auglýsingar
firstRun_feature_malware_description=Gerðu netvafur öruggara með því að loka á þekkt hættuleg vefsvæði.
+firstRun_feature_show_overview=birta yfirlit
firstRun_feature_social_description=Taktu sjálfkrafa út samfélags hnappa, eins og Facebook hnappa, sem birtast á vefsíðum og fylgjast með þér.
firstRun_donate=gefa
firstRun_donate_label=Styðja verkefnið
firstRun_feature_social=Fjarlægja hnappa fyrir netsamfélög
-firstRun_feature_show_expanded=virkja eiginleika
+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.
diff --git a/chrome/locale/is/overlay.dtd b/chrome/locale/is/overlay.dtd
index 758734e..0a0eb54 100644
--- a/chrome/locale/is/overlay.dtd
+++ b/chrome/locale/is/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Gera óvirkt á ?1?">
<!ENTITY filters.label "&Síu stillingar">
<!ENTITY disable.label "Slökkva á allstaðar">
-<!ENTITY showinaddonbar.label "Sýna í viðbó&tarslá">
<!ENTITY objecttab.title "Loka á">
<!ENTITY objecttab.tooltip "Smelltu hér til að loka á þennan hlut með Adblock Plus">
<!ENTITY menuitem.label "Ad&block Plus stillingar">
diff --git a/chrome/locale/it/composer.dtd b/chrome/locale/it/composer.dtd
index 02af9ab..3e1d15f 100644
--- a/chrome/locale/it/composer.dtd
+++ b/chrome/locale/it/composer.dtd
@@ -4,19 +4,19 @@
<!ENTITY firstParty.label "Solo dominii di p&rimo livello">
<!ENTITY preferences.label "&Mostra i filtri esistenti…">
<!ENTITY pattern.label "Modelli">
-<!ENTITY thirdParty.label "&Solo dominii di parte terza">
+<!ENTITY thirdParty.label "&Solo domini di terza parte">
<!ENTITY filter.label "&Nuovo filtro:">
-<!ENTITY collapse.label "Co&ntrai bloccati:">
+<!ENTITY collapse.label "&Contrai bloccati:">
<!ENTITY match.warning "Il modello inserito non corrisponde più all'indirizzo web da bloccare/permettere e non avrà quindi alcun effetto">
<!ENTITY anchor.start.label "all'i&nizio dell'indirizzo web">
-<!ENTITY matchCase.label "&Maiuscole/minuscole">
+<!ENTITY matchCase.label "Mai&uscole/minuscole">
<!ENTITY custom.pattern.label "&Personalizza:">
<!ENTITY unselectAllTypes.label "Deseleziona">
-<!ENTITY type.whitelist.label "Regola per E&ccezioni">
+<!ENTITY type.whitelist.label "E&ccezione">
<!ENTITY regexp.warning "Il modello inserito verrà interpretato come espressione regolare. Un numero eccessivo di tali modelli potrebbe rallentare la navigazione. Se non si intende utilizzare le espressioni regolari aggiungere il carattere * alla fine del modello">
<!ENTITY dialog.title "Nuovo filtro di Adblock Plus">
<!ENTITY basic.label "<< Generali">
-<!ENTITY type.filter.label "Filtri per &bloccare">
+<!ENTITY type.filter.label "Filtro &per bloccare">
<!ENTITY types.label "Applica ai tipi:">
<!ENTITY shortpattern.warning "Il modello inserito è troppo breve per essere ottimizzato. Un numero eccessivo di tali modelli potrebbe rallentare la navigazione. Sarebbe preferibile utilizzare una stringa più lunga">
<!ENTITY collapse.yes.label "Sì">
diff --git a/chrome/locale/it/firstRun.properties b/chrome/locale/it/firstRun.properties
index 1a1fa25..d286438 100644
--- a/chrome/locale/it/firstRun.properties
+++ b/chrome/locale/it/firstRun.properties
@@ -3,18 +3,19 @@ firstRun_toggle_off=Disattivato
firstRun_feature_tracking=Disattiva il tracciamento
firstRun_feature_malware=Blocco del malware
firstRun_title=Adblock Plus è stata installata
-firstRun_acceptableAdsExplanation=Vorremmo incoraggiare i siti Web di utilizzare pubblicità semplice e discreta. Ecco perché abbiamo stabilito <a>le linee guida rigorose</a> per identificare annunci accettabili, che saranno visualizzate con le impostazioni predefinite. Se avete ancora voglia di bloccare ogni annuncio puoi <a>disabilitare</a> questo in pochi secondi.
+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_toggle_on=Attivo
firstRun_contributor_credits=Lista dei collaboratori
-firstRun_feature_show_overview=visualizza la panoramica
-firstRun_dataCorruptionWarning=Questa pagina continua a comparire? <a>Clicca qui!</a>
+firstRun_feature_show_expanded=attiva le funzionalità
+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_features=Adblock Plus può fare di più, oltre che bloccare i messaggi pubblicitari
+firstRun_features=Adblock Plus può fare di più, oltre a bloccare pubblicità
firstRun_feature_malware_description=Rendi la tua navigazione più sicura bloccando domini pericolosi conosciuti
+firstRun_feature_show_overview=visualizza la panoramica
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_donate=dona
firstRun_donate_label=Sostieni il nostro progetto
firstRun_feature_social=Elimina i pulsanti Social Media
-firstRun_feature_show_expanded=attiva le funzionalità
+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.
diff --git a/chrome/locale/it/overlay.dtd b/chrome/locale/it/overlay.dtd
index d28d1ce..543a3eb 100644
--- a/chrome/locale/it/overlay.dtd
+++ b/chrome/locale/it/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Disattiva per ?1?">
<!ENTITY filters.label "Gestione dei &filtri">
<!ENTITY disable.label "Disattiva per tutte le pagine">
-<!ENTITY showinaddonbar.label "Visualizza nella &barra dei componenti aggiuntivi">
<!ENTITY objecttab.title "Blocca">
<!ENTITY objecttab.tooltip "Fare clic qui per bloccare l'oggetto con Adblock Plus">
<!ENTITY menuitem.label "Gestione dei filtri di &Adblock Plus">
diff --git a/chrome/locale/ja/firstRun.properties b/chrome/locale/ja/firstRun.properties
index 5a9a43f..6e92af8 100644
--- a/chrome/locale/ja/firstRun.properties
+++ b/chrome/locale/ja/firstRun.properties
@@ -5,16 +5,17 @@ firstRun_feature_malware=マルウェアをブロック
firstRun_title=Adblock Plus がインストールされました
firstRun_acceptableAdsExplanation=我々はウェブサイトが簡素で控えめな広告を使用するよう後押ししたいと考えています。そのため控えめな広告を区別するための<a>厳格なガイドライン</a>を策定し、デフォルトで許可するようにしました。すべての広告をブロックしたい場合は数秒で控えめな広告の許可を<a>無効にする</a>ことができます 。
firstRun_toggle_on=ON
-firstRun_contributor_credits=貢献者のクレジット
-firstRun_feature_show_overview=概要を表示
+firstRun_contributor_credits=貢献した人
+firstRun_feature_show_expanded=機能を有効化
firstRun_dataCorruptionWarning=このページが何度も再表示される場合は <a>ここを参照！</a>
firstRun_acceptableAdsHeadline=迷惑な広告はブロックされます
firstRun_share=友達に教える
firstRun_share_headline=Web をより良い場所にするために<a>協力する</a>
firstRun_features=Adblock Plus は単に広告をブロックするだけではありません
firstRun_feature_malware_description=既知のマルウェア配布ドメインをブロックすることで、より安全なブラウジングを可能にします。
+firstRun_feature_show_overview=概要を表示
firstRun_feature_social_description=Web ページに設置されていてユーザーの行動を追跡するソーシャルメディアボタン（例えば Facebook の「いいね！」）を自動的に取り除きます。
firstRun_donate=寄付
firstRun_donate_label=プロジェクトを支援
firstRun_feature_social=ソーシャルメディアのボタンを消す
-firstRun_feature_show_expanded=機能を有効化
+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 いずれか最新版の利用を強く推奨します。
diff --git a/chrome/locale/ja/meta.properties b/chrome/locale/ja/meta.properties
index 90a1d4f..3a2fc31 100644
--- a/chrome/locale/ja/meta.properties
+++ b/chrome/locale/ja/meta.properties
@@ -3,4 +3,4 @@ name=Adblock Plus
description.long.addition1=控えめな広告を許可する設定が Adblock Plus 2.0 以降のフィルタ設定画面にあります。これは、控えめな広告を掲載するウェブサイトを応援し、同様の取り組みを広めることが狙いです。<a href="http://adblockplus.org/en/acceptable-ads">詳細を読む</a>
translator=Haebaru, k2jp, Premier, Shirayuki (alphabetical order)
description.long=Adblock Plus を使いインターネットでのユーザー主権を取り戻すことで、自分の思い通りに Web ページを見ることができます。オンライン広告を消すことからマルウェア配布ドメインのブロックまで、多言葉対応した４０を超える公開フィルタがこのアドオンをサポート。さらに Adblock Plus で画像をブロックするためのコンテキストオプション、Flash や Java をブロックするためのタブ、スクリプトやスタイルシートをブロックするためのブロック可能項目一覧のような支援機能を使うことで自作フィルタをカスタマイズすることも可能です。
-description=広告は過去の遺物です！
+description=広告は過去のものです！
diff --git a/chrome/locale/ja/overlay.dtd b/chrome/locale/ja/overlay.dtd
index 140b771..f7d1b4e 100644
--- a/chrome/locale/ja/overlay.dtd
+++ b/chrome/locale/ja/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "?1? で無効">
<!ENTITY filters.label "フィルタ設定 (&F)">
<!ENTITY disable.label "全ページで無効">
-<!ENTITY showinaddonbar.label "アドオンバーに表示 (&B)">
<!ENTITY objecttab.title "ブロックする">
<!ENTITY objecttab.tooltip "クリックしてオブジェクトをブロック (Adblock Plus)">
<!ENTITY menuitem.label "Adblock Plus 設定 (&B)">
@@ -16,7 +15,7 @@
<!ENTITY toolbarbutton.label "Adblock Plus">
<!ENTITY context.frame.label "Adblock Plus: フレームをブロック">
<!ENTITY blocked.tooltip "このページでブロック中の項目:">
-<!ENTITY hideplaceholders.label "ブロックした場所に残る空きスペースを隠す (&L)">
+<!ENTITY hideplaceholders.label "ブロックした場所に残る空きスペースを詰める (&L)">
<!ENTITY showinstatusbar.label "ステータスバーに表示 (&S)">
<!ENTITY sidebar.title "このページのブロック可能項目一覧">
<!ENTITY options.label "オプション (&O)">
diff --git a/chrome/locale/ka/composer.dtd b/chrome/locale/ka/composer.dtd
index cd23f57..cb852c6 100644
--- a/chrome/locale/ka/composer.dtd
+++ b/chrome/locale/ka/composer.dtd
@@ -1,5 +1,18 @@
-<!ENTITY dialog.title "სანიშნეს Adblock Plus ფილტრი წესი">
<!ENTITY collapse.yes.label "დიახ">
-<!ENTITY collapse.default.no.label "გამოიყენე ნაგულისხმევი (არა)">
-<!ENTITY collapse.default.yes.label "გამოიყენე ნაგულისხმევი (დიახ)">
+<!ENTITY accept.label "ფილტრის დამატება">
+<!ENTITY type.filter.label "&დაბლოკვის ფილტრი">
+<!ENTITY options.label "პარამეტრები">
+<!ENTITY disabled.warning "Adblock Plus ამჟამად გამორთულია. თქვენ შეგიძლიათ ფილტრების დამატება, მაგრამ ისინი არ იმოქმედებენ, სანამ თქვენ[link]არ ჩართავთ Adblock Plus-ს[/link].">
+<!ENTITY types.label "გამოიყენე შემდეგი ტიპებისთვის:">
+<!ENTITY custom.pattern.label "&მორგებული:">
+<!ENTITY unselectAllTypes.label "მონიშვნის გაუქმება">
+<!ENTITY advanced.label "გაფართოებული შესაძლებლობები">
+<!ENTITY pattern.label "შაბლონის მოძიება">
+<!ENTITY selectAllTypes.label "ყველას მონიშვნა">
<!ENTITY collapse.no.label "არა">
+<!ENTITY dialog.title "დაამატე Adblock Plus ფილტრის წესი">
+<!ENTITY basic.label "ძირითადი შესაძლებლობები">
+<!ENTITY filter.label "ახალი &ფილტრი:">
+<!ENTITY collapse.label "დაბლოკილების და&ხურვა:">
+<!ENTITY collapse.default.yes.label "გამოიყენე ნაგულისხმევი (დიახ)">
+<!ENTITY collapse.default.no.label "გამოიყენე ნაგულისხმევი (არა)">
diff --git a/chrome/locale/ka/filters.dtd b/chrome/locale/ka/filters.dtd
index 83da340..03a4f1a 100644
--- a/chrome/locale/ka/filters.dtd
+++ b/chrome/locale/ka/filters.dtd
@@ -1 +1,25 @@
+<!ENTITY subscription.actions.label "მოქმედებები">
+<!ENTITY filter.selectAll.label "ყველას არჩევა">
+<!ENTITY subscription.source.label "ფილტრების სია">
+<!ENTITY filter.paste.label "ჩასმა">
+<!ENTITY viewList.label "სიის ნახვა">
+<!ENTITY subscription.delete.label "წაშლა">
+<!ENTITY subscriptions.tab.label "ფილტრის გამოწერა">
+<!ENTITY filter.delete.label "წაშლა">
+<!ENTITY addSubscriptionAdd.label "დამატება">
+<!ENTITY viewMenu.label "ჩვენება">
+<!ENTITY addSubscriptionCancel.label "გაუქმება">
+<!ENTITY subscription.enabled.label "ჩართული">
+<!ENTITY subscription.update.label "ფილტრების განახლება">
+<!ENTITY subscription.moveDown.label "ქვევით გადატანა">
+<!ENTITY filter.edit.label "რედაქტირება">
+<!ENTITY subscription.showHideFilters.label "ფილტრების გამოჩენა/დამალვა">
+<!ENTITY filter.cut.label "ამოჭრა">
<!ENTITY addSubscriptionOther.label "სხვა პოდპისკის დამატება">
+<!ENTITY filter.copy.label "კოპირება">
+<!ENTITY subscription.moveUp.label "ზევით გადატანა">
+<!ENTITY addSubscription.label "&ფილტრის გამოწერის დამატება">
+<!ENTITY subscription.homepage.label "მთავარი გვერდი">
+<!ENTITY filters.tab.label "მორგებული ფილტრები">
+<!ENTITY subscription.editTitle.label "სათაურის რედაქტირება">
+<!ENTITY filter.column "&ფილტრის წესი">
diff --git a/chrome/locale/ka/overlay.dtd b/chrome/locale/ka/overlay.dtd
index 5e0a223..96bba68 100644
--- a/chrome/locale/ka/overlay.dtd
+++ b/chrome/locale/ka/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "გამორთე ––ზე">
<!ENTITY filters.label "ფილტრის პარამეტრები">
<!ENTITY disable.label "გამორთე ყველგან">
-<!ENTITY showinaddonbar.label "გამოაჩინე დანამატების ზოლში">
<!ENTITY objecttab.title "დაბლოკვა">
<!ENTITY objecttab.tooltip "ობიექტის Adblock Plus-ით დასაბლოკად დააწკაპუნეთ აქ">
<!ENTITY menuitem.label "Ad&block Plus პარამეტრები">
diff --git a/chrome/locale/ka/sendReport.dtd b/chrome/locale/ka/sendReport.dtd
index d1668d5..d0b1539 100644
--- a/chrome/locale/ka/sendReport.dtd
+++ b/chrome/locale/ka/sendReport.dtd
@@ -1 +1,2 @@
+<!ENTITY screenshot.undo.label "&გაუქმება">
<!ENTITY privacyPolicy.label "კონფიდენციალურობის პოლიტიკა">
diff --git a/chrome/locale/ka/sidebar.dtd b/chrome/locale/ka/sidebar.dtd
index d699525..4197f4c 100644
--- a/chrome/locale/ka/sidebar.dtd
+++ b/chrome/locale/ka/sidebar.dtd
@@ -1,15 +1,35 @@
+<!ENTITY context.flash.label "Flash ელემენტების ჩარჩო">
+<!ENTITY address.label "მისამართი">
+<!ENTITY context.open.label "ახალ ჩანართში გახსნა">
+<!ENTITY type.label "ტიპი">
+<!ENTITY tooltip.filterSource.label "ფილტრის წყარო:">
+<!ENTITY noitems.label "დასაბლოკი ელემენტები არ არის">
+<!ENTITY filter.label "ფილტრი">
<!ENTITY tooltip.size.label "ზომა:">
-<!ENTITY context.editfilter.label "გამოყენებული ფილტრის რედაქტირება">
-<!ENTITY tooltip.type.blocked "(დაბლოკილი)">
-<!ENTITY tooltip.type.whitelisted "(თეთრ სიაში)">
-<!ENTITY tooltip.filter.label "მოქმედი ფილტრი:">
+<!ENTITY reattach.label "აღდგენა">
+<!ENTITY search.label "&ძიება:">
+<!ENTITY docDomain.thirdParty "(მესამე მხარის)">
+<!ENTITY filterSource.label "ფილტრის წყარო">
<!ENTITY tooltip.docDomain.label "დოკუმენტის წყარო:">
-<!ENTITY context.whitelist.label "ამ ერთეულისთვის გამონაკლისის დამატება">
-<!ENTITY tooltip.filter.disabled "(გამორთული)">
-<!ENTITY context.selectAll.label "ყველას არჩევა">
+<!ENTITY context.copy.label "ელემენტის მისამართის კოპირება">
<!ENTITY tooltip.type.label "ტიპი:">
-<!ENTITY tooltip.filterSource.label "ფილტრის წყარო:">
+<!ENTITY context.disablefilter.label "გამოირთოს ფილტრი ?1?">
<!ENTITY context.copyFilter.label "ფილტრის ასლი">
-<!ENTITY context.block.label "დაბლოკე ეს ერთეული">
+<!ENTITY context.block.label "დაბლოკე ეს ელემენტი">
<!ENTITY context.enablefilter.label "ხელახლა ჩაირთოს ფილტრი ?1?">
-<!ENTITY context.disablefilter.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 state.label "მდგომარეობა">
+<!ENTITY docDomain.label "დოკუმენტის წყარო">
+<!ENTITY tooltip.address.label "მისამართი:">
diff --git a/chrome/locale/kk/firstRun.properties b/chrome/locale/kk/firstRun.properties
index 13269af..9ba2070 100644
--- a/chrome/locale/kk/firstRun.properties
+++ b/chrome/locale/kk/firstRun.properties
@@ -1,16 +1,21 @@
-firstRun_feature_show_expanded=мүмкіндіктерді белсендіру
+firstRun_feature_tracking_description=Бақылауды сөндіру арқылы шолуды жеке қылыңыз - сіздің әр қимылыңызды бақылайтын жарнамалық компаниялардан ізіңізді жасыру арқылы.
firstRun_toggle_off=OFF
firstRun_feature_tracking=Бақылауды сөндіру
-firstRun_feature_social=Әлеуметтік сайттар батырмаларын алып тастау
-firstRun_title=Adblock Plus орнатылды
firstRun_feature_malware=Зиянкес бағдарламаларды блоктау
+firstRun_title=Adblock Plus орнатылды
+firstRun_acceptableAdsExplanation=Біз вебсайттарды тура, мазаңызды алмайтын жарнаманы қолдануын қалаймыз. Сондықтан біз жарамды жарнаманы анықтаудың <a>қатаң нұсқаулығын</a> орнаттық, ол жарнамма бастапқы баптаулармен көрсетілетін болады. Егер сіз сонда да барлық жарнаманы <a>блоктағыңыз</a> келсе, осыны тез арада сөндіре аласыз.
firstRun_toggle_on=ON
firstRun_contributor_credits=Үлес қосқандар
-firstRun_feature_show_overview=шолуды көрсету
+firstRun_feature_show_expanded=мүмкіндіктерді белсендіру
firstRun_dataCorruptionWarning=Бұл парақ көрсетіле бере ме? <a>Осында шертіңіз!</a>
firstRun_acceptableAdsHeadline=Мазаңызды алатын жарнама блокталатын болады
firstRun_share=Достарыңызға айтыңыз
firstRun_share_headline=Интернетті жақсырақ қылу үшін <a>бізге көмек қолын созыңыз</a>
firstRun_features=Adblock Plus тек жарнаманы блоктаудан басқа көбірек нәрсені істей алады
+firstRun_feature_malware_description=Интернетті шолуды кейбір белгілі зиянкес домендерді блоктау арқылы қауіпсіздеу қылыңыз.
+firstRun_feature_show_overview=шолуды көрсету
+firstRun_feature_social_description=Интернетті шолуды әлеуметтік желілер батырмаларынан құтылу арқылы жақсартыңыз, ол батырмалар, Facebook Like сияқты, веб парақтарда көрсетіледі және сіздің жұмысыңызды бақылайды.
firstRun_donate=ақшалай көмектесу
firstRun_donate_label=Жобамызды қолдаңыз
+firstRun_feature_social=Әлеуметтік сайттар батырмаларын алып тастау
+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 браузерлерінің соңғы нұсқаларын қолдануды ұсынамыз.
diff --git a/chrome/locale/kk/overlay.dtd b/chrome/locale/kk/overlay.dtd
index 0d7f47a..0d7a001 100644
--- a/chrome/locale/kk/overlay.dtd
+++ b/chrome/locale/kk/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Келесі үшін сөндіру: ?1?">
<!ENTITY filters.label "Фильт&р баптаулары">
<!ENTITY disable.label "Әр жерде сөндіру">
-<!ENTITY showinaddonbar.label "Қосымшалар пан&елінде көрсету">
<!ENTITY objecttab.title "Блоктау">
<!ENTITY objecttab.tooltip "Adblock Plus көмегімен осы объектті блоктау үшін шертіңіз">
<!ENTITY menuitem.label "Adblock Plus ба&птаулары">
diff --git a/chrome/locale/kn/composer.dtd b/chrome/locale/kn/composer.dtd
new file mode 100644
index 0000000..da5336d
--- /dev/null
+++ b/chrome/locale/kn/composer.dtd
@@ -0,0 +1,3 @@
+<!ENTITY collapse.yes.label "ಹೌದು">
+<!ENTITY basic.label "ಸಾಮಾನ್ಯವಾದ ನೂಟ">
+<!ENTITY collapse.no.label "ಇಲ್ಲ">
diff --git a/chrome/locale/ko/composer.dtd b/chrome/locale/ko/composer.dtd
index dfccba3..4cf4c74 100644
--- a/chrome/locale/ko/composer.dtd
+++ b/chrome/locale/ko/composer.dtd
@@ -1,6 +1,6 @@
<!ENTITY anchor.end.label "주소 끝 부분에 일치 (&n)">
<!ENTITY domainRestriction.label "지정된 도메인에만 적용(&D) :">
-<!ENTITY collapse.default.no.label "기본값 (아니오)">
+<!ENTITY collapse.default.no.label "기본값 (아니요)">
<!ENTITY firstParty.label "내부 요청에만 적용 (&r)">
<!ENTITY preferences.label "필터 목록 (&S)">
<!ENTITY pattern.label "유형 찾기">
@@ -27,7 +27,7 @@
<!ENTITY options.label "옵션">
<!ENTITY disabled.warning "애드블록 플러스는 현재 비활성화된 상태입니다. 필터는 여전히 추가할 수 있지만 [link]애드블록플러스를 활성화[/link]하지 않으면 추가한 필터는 적용되지 않습니다.">
<!ENTITY anchor.start.flexible.label "도메인 시작 부분에 일치 (&g)">
-<!ENTITY collapse.no.label "아니오">
+<!ENTITY collapse.no.label "아니요">
<!ENTITY selectAllTypes.label "모두 선택">
<!ENTITY advanced.label "고급 보기">
<!ENTITY pattern.explanation "유형은 일치하는 주소를 검색하는 텍스트 문자열이며, 임의 문자(*)로 적용 범위를 조절할 수 있습니다.">
diff --git a/chrome/locale/ko/overlay.dtd b/chrome/locale/ko/overlay.dtd
index 4677ef9..c9029b3 100644
--- a/chrome/locale/ko/overlay.dtd
+++ b/chrome/locale/ko/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "사이트 허용 : ?1?">
<!ENTITY filters.label "필터 설정 (&F)">
<!ENTITY disable.label "사용 중지">
-<!ENTITY showinaddonbar.label "부가 프로그램 모음에 아이콘 보이기 (&b)">
<!ENTITY objecttab.title "차단">
<!ENTITY objecttab.tooltip "이 객체를 차단하려면 차단 탭을 클릭하십시오.">
<!ENTITY menuitem.label "필터 설정 (&B)">
diff --git a/chrome/locale/lt/firstRun.properties b/chrome/locale/lt/firstRun.properties
index e64705c..cb4857d 100644
--- a/chrome/locale/lt/firstRun.properties
+++ b/chrome/locale/lt/firstRun.properties
@@ -6,15 +6,16 @@ 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_contributor_credits=Padėkos prisidėjusiems
-firstRun_feature_show_overview=rodyti peržiūrą
+firstRun_feature_show_expanded=įgalinti funkcijas
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_show_overview=rodyti peržiūrą
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_social=Pašalinti socialinių puslapių mygtukus
-firstRun_feature_show_expanded=įgalinti funkcijas
+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.
diff --git a/chrome/locale/lt/overlay.dtd b/chrome/locale/lt/overlay.dtd
index 8758ce9..ccb8bc5 100644
--- a/chrome/locale/lt/overlay.dtd
+++ b/chrome/locale/lt/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Išjungti ?1?">
<!ENTITY filters.label "&Filtrų nustatymai">
<!ENTITY disable.label "Išjungti visur">
-<!ENTITY showinaddonbar.label "&Rodyti priedų juostoje">
<!ENTITY objecttab.title "Blokuoti">
<!ENTITY objecttab.tooltip "Spragtelėkite čia norėdami užblokuoti šį objektą su „Adblock Plus“">
<!ENTITY menuitem.label "„&Adblock Plus“ nustatymai">
diff --git a/chrome/locale/lv/firstRun.properties b/chrome/locale/lv/firstRun.properties
index 90897dd..d0ea22f 100644
--- a/chrome/locale/lv/firstRun.properties
+++ b/chrome/locale/lv/firstRun.properties
@@ -6,15 +6,16 @@ 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_contributor_credits=Ziedotāju saraksts
-firstRun_feature_show_overview=rādīt pārskatu
+firstRun_feature_show_expanded=aktivizēt funkcijas
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šāk, bloķējot zināmos ļaundabīgo programmu avotus.
+firstRun_feature_show_overview=rādīt pārskatu
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 uzvedību.
firstRun_donate=ziedot
firstRun_donate_label=Atbalstīt mūsu projektu
firstRun_feature_social=Noņemt sociālo mediju pogas
-firstRun_feature_show_expanded=aktivizēt funkcijas
+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.
diff --git a/chrome/locale/lv/overlay.dtd b/chrome/locale/lv/overlay.dtd
index 3829488..9c3fdeb 100644
--- a/chrome/locale/lv/overlay.dtd
+++ b/chrome/locale/lv/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Atspējot uz ?1?">
<!ENTITY filters.label "Filtra preferences">
<!ENTITY disable.label "Atspējot visur">
-<!ENTITY showinaddonbar.label "Rādīt pievienojumprogrammu joslā">
<!ENTITY objecttab.title "Bloķēt">
<!ENTITY objecttab.tooltip "Noklikšķiniet šeit, lai bloķētu šo objektu ar Adblock Plus">
<!ENTITY menuitem.label "Adblock Plus Iestatījumi">
diff --git a/chrome/locale/ms/firstRun.properties b/chrome/locale/ms/firstRun.properties
index faf0a5a..0a914f6 100644
--- a/chrome/locale/ms/firstRun.properties
+++ b/chrome/locale/ms/firstRun.properties
@@ -1,7 +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_dataCorruptionWarning=Adakah laman ini muncul tidak terhenti-henti? <a>Klik di sini!</a>
-firstRun_title=Adblock Plus telah dipasang
-firstRun_toggle_on=BUKA
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_feature_show_overview=menunjukkan gambaran keseluruhan
+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_feature_social=Mengalih keluar butang Media sosial
+firstRun_feature_show_expanded=Aktifkan ciri-ciri
diff --git a/chrome/locale/ms/overlay.dtd b/chrome/locale/ms/overlay.dtd
index 2ee11c0..b42b6bf 100644
--- a/chrome/locale/ms/overlay.dtd
+++ b/chrome/locale/ms/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Nyahaktifkan pada ?1?">
<!ENTITY filters.label "&Tatarajah penapis">
<!ENTITY disable.label "Nyahaktif di semua tempat">
-<!ENTITY showinaddonbar.label "Papa&rkan di bar add-on">
<!ENTITY objecttab.title "Sekat">
<!ENTITY objecttab.tooltip "Klik di sini untuk menyekat objek ini dengan Adblock Plus">
<!ENTITY menuitem.label "&Pilihan Adblock Plus">
diff --git a/chrome/locale/nb-NO/composer.dtd b/chrome/locale/nb-NO/composer.dtd
index 8020f68..3292cd0 100644
--- a/chrome/locale/nb-NO/composer.dtd
+++ b/chrome/locale/nb-NO/composer.dtd
@@ -1,23 +1,33 @@
<!ENTITY anchor.end.label "på slutte&n av adressen">
<!ENTITY domainRestriction.label "Begrens til &domene:">
<!ENTITY collapse.default.no.label "Bruk standard (nei)">
+<!ENTITY firstParty.label "Kun elementer fra hovedsiden">
<!ENTITY preferences.label "Vi&s eksisterende filtre...">
<!ENTITY pattern.label "Se etter mønster">
<!ENTITY thirdParty.label "Kun &tredjeparts">
<!ENTITY filter.label "Nytt &filter:">
-<!ENTITY unselectAllTypes.label "Velg ingen">
+<!ENTITY collapse.label "Minimer b&lokkerte:">
+<!ENTITY match.warning "Mønsteret du laget stemmer ikke lenger overens med adressen som skal blokkeres/hvitelistes, og vil ikke ha noen effekt.">
<!ENTITY anchor.start.label "på starten av adressen (&g)">
+<!ENTITY matchCase.label "&Ta hensyn til stor og liten forbokstav (A/a)">
<!ENTITY custom.pattern.label "Egendefinert: (&C)">
-<!ENTITY collapse.label "Minimer b&lokkerte:">
+<!ENTITY unselectAllTypes.label "Velg ingen">
<!ENTITY type.whitelist.label "Unntaksregel (&x)">
-<!ENTITY collapse.yes.label "Ja">
-<!ENTITY basic.label "Grunnleggende visning">
+<!ENTITY regexp.warning "Mønsteret du har laget vil bli tolket som et standarduttrykk, og kan ikke behandles effektivt av Adblock Plus, som igjen vil gjøre nettleseren din tregere. Hvis du ikke hadde tenkt til å lage et standarduttrykk, kan du legge til en stjerne (*) på slutten av mønsteret.">
<!ENTITY dialog.title "Legg til filtreringsregel for Adblock Plus">
+<!ENTITY basic.label "Grunnleggende visning">
+<!ENTITY type.filter.label "&Blokkeringsfilter">
+<!ENTITY types.label "Bruk på:">
+<!ENTITY shortpattern.warning "Mønsteret du skrev inn er for kort til å bli optimert, og kan gjøre nettleseren din tregere. Vi anbefaler at du lager en lengre tekstsekvens for dette filteret, slik at Adblock Plus kan behandle filteret mer effektivt.">
+<!ENTITY collapse.yes.label "Ja">
<!ENTITY anchors.label "Aksepter kun mønster:">
<!ENTITY collapse.default.yes.label "Bruk standard (ja)">
+<!ENTITY domainRestriction.help "Bruk dette valget til å spesifisere ett domene eller flere domener, separert med vertikalstreker (|). Filteret vil kun brukes på domenet eller domenene som er valgt. En tilde (~) foran et domenenavn indikerer at filteret ikke skal brukes på det domenet.">
<!ENTITY accept.label "Legg til filter">
<!ENTITY options.label "Alternativer">
+<!ENTITY disabled.warning "Adblock Plus er deaktivert. Du kan fremdeles legge til filtre, men de blir ikke aktivert med mindre du [link]aktiverer Adblock Plus[/link].">
<!ENTITY anchor.start.flexible.label "på starten av domenenavnet (&g)">
<!ENTITY collapse.no.label "Nei">
<!ENTITY selectAllTypes.label "Velg alle">
<!ENTITY advanced.label "Avansert visning">
+<!ENTITY pattern.explanation "Mønsteret kan være hvilken som helst del av adressen; stjerner (*) fungerer som frie symboler. Filteret vil kun bli aktivert for adresser som stemmer overens med sekvensen du har definert.">
diff --git a/chrome/locale/nb-NO/filters.dtd b/chrome/locale/nb-NO/filters.dtd
index eb7c1ed..ac2bc21 100644
--- a/chrome/locale/nb-NO/filters.dtd
+++ b/chrome/locale/nb-NO/filters.dtd
@@ -1,10 +1,14 @@
+<!ENTITY restore.custom.warning "Alle dine egenkomponerte filtre vil bli erstattet av innholdet i filen du har valgt. Vil du fortsette?">
<!ENTITY slow.column "Trege filtre (&w)">
<!ENTITY enabled.column "Aktivert (&n)">
-<!ENTITY filters.remove.warning "Ønsker du virkelig å fjerne alle valgte filtre?">
+<!ENTITY subscription.lastDownload.checksumMismatch "Mislyktes - kontrollsummen stemmer ikke">
<!ENTITY noFiltersInGroup.text "Den valgte gruppen er tom.">
<!ENTITY subscription.actions.label "Handlinger">
<!ENTITY filter.selectAll.label "Velg alle">
<!ENTITY backupButton.label "Sikkerhetskopier og gjenopprett (&B)">
+<!ENTITY restore.minVersion.warning "Advarsel: Filen har blitt laget med en nyere versjon av Adblock Plus. Du bør oppdatere til nyeste versjon av Adblock Plus før du bruker denne filen.">
+<!ENTITY restore.error "Informasjonen i filen kunne ikke bli behandlet. Kanskje dette ikke er en backup-fil for Adblock Plus?">
+<!ENTITY sort.ascending.label "&Sortér fra A til Å">
<!ENTITY sort.label "&Sorter etter">
<!ENTITY subscription.source.label "Filterliste">
<!ENTITY hitcount.column "Treff (&H)">
@@ -13,43 +17,56 @@
<!ENTITY subscription.external.label "Oppdatert av et annet tillegg">
<!ENTITY subscription.delete.label "Slett">
<!ENTITY noGroupSelected.text "Du må velge en filtergruppe før tilhørende filtre kan vises.">
+<!ENTITY filter.cut.label "Klipp ut">
<!ENTITY restore.default.label "Gjenopprett sikkerhetskopi fra ?1?">
<!ENTITY subscription.lastDownload.inProgress "Laster ned...">
<!ENTITY subscriptions.tab.label "Filterabonnementer">
+<!ENTITY sort.descending.label "&Sortér fra Å til A">
+<!ENTITY filters.remove.warning "Ønsker du virkelig å fjerne alle valgte filtre?">
<!ENTITY filter.delete.label "Slett">
<!ENTITY addSubscriptionAdd.label "Legg til">
<!ENTITY viewMenu.label "Vis">
<!ENTITY subscription.lastDownload.unknown "Ikke tilgjengelig">
<!ENTITY addSubscriptionCancel.label "Avbryt">
<!ENTITY subscription.enabled.label "Aktivert">
+<!ENTITY noSubscriptions.text "Du har ikke lagt til noen filterabonnementer ennå. Adblock Plus blokkerer ikke noe uten filtre. Vennligst bruk "Legg til filterabonnement" for å legge til filtre.">
<!ENTITY subscription.update.label "Oppdater filtre">
-<!ENTITY lasthit.column "Siste treff (&L)">
+<!ENTITY dialog.title "Filtervalg for Adblock Plus">
<!ENTITY addFilter.label "Legg til filter (&d)">
+<!ENTITY subscription.minVersion.warning "Dette filterabonnementet krever en nyere versjon av Adblock Plus. Du bør oppdatere til nyeste versjon av Adblock Plus.">
<!ENTITY subscription.lastDownload.invalidURL "Feilet, ikke en gyldig adresse">
+<!ENTITY backup.error "Det oppstod en feil under lagring av filtrene til filen. Sjekk at ikke filen er skrivebeskyttet, eller at den brukes av et annet program.">
+<!ENTITY filter.moveUp.label "Flytt opp">
<!ENTITY addGroup.label "Le&gg til filtergruppe">
<!ENTITY filter.edit.label "Rediger">
<!ENTITY subscription.showHideFilters.label "Vis/skjul filtre">
-<!ENTITY filter.cut.label "Klipp ut">
+<!ENTITY acceptableAds2.label "Tillat noen ikke-påtrengende annonser">
<!ENTITY addSubscriptionOther.label "Legg til et annet abonnement">
<!ENTITY close.label "Lukk">
<!ENTITY sort.none.label "&Usortert">
<!ENTITY filter.actions.label "Filterhandlinger">
<!ENTITY filter.copy.label "Kopier">
+<!ENTITY filter.moveDown.label "Flytt ned">
+<!ENTITY filter.resetHitCounts.label "Nullstill treffstatistikker">
<!ENTITY readMore.label "Les mer">
<!ENTITY subscription.moveUp.label "Flytt opp">
<!ENTITY addSubscription.label "Legg til &filterabonnement">
<!ENTITY subscription.homepage.label "Hjemmeside">
<!ENTITY backup.complete.title "Alle filtre og abonnenter">
<!ENTITY restore.own.label "Gjenopprett egen sikkerhetskopi">
+<!ENTITY restore.complete.warning "Alle filtervalgene dine vil bli erstattet av innholdet i filen du har valgt. Vil du fortsette?">
<!ENTITY filters.tab.label "Egendefinerte filtre">
<!ENTITY backup.label "Opprett ny sikkerhetskopi">
<!ENTITY find.label "Fi&nn">
<!ENTITY subscription.moveDown.label "Flytt ned">
<!ENTITY subscription.lastDownload.connectionError "Feilet, nedlastingsfeil">
+<!ENTITY subscription.lastDownload.success "Vellykket">
<!ENTITY subscription.lastDownload.invalidData "Feilet, ikke en gyldig filterliste">
<!ENTITY filter.paste.label "Lim inn">
<!ENTITY subscription.disabledFilters.enable "Aktiver deaktiverte filtre">
+<!ENTITY lasthit.column "Siste treff (&L)">
<!ENTITY subscription.editTitle.label "Rediger tittel">
<!ENTITY subscription.disabledFilters.warning "Noen filtre i dette abonnementet er deaktivert.">
-<!ENTITY subscription.lastDownload.label "Siste nedlasting:">
<!ENTITY filter.column "&Filterregel">
+<!ENTITY subscription.lastDownload.label "Siste nedlasting:">
+<!ENTITY viewList.label "Vis liste">
diff --git a/chrome/locale/nb-NO/firstRun.properties b/chrome/locale/nb-NO/firstRun.properties
index 11e17c0..bf40d75 100644
--- a/chrome/locale/nb-NO/firstRun.properties
+++ b/chrome/locale/nb-NO/firstRun.properties
@@ -1,7 +1,21 @@
+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_dataCorruptionWarning=Dukker denne siden stadig opp? <a>Klikk her!</a>
+firstRun_feature_malware=Blokkering av skadeprogram
firstRun_title=Adblock Plus har blitt installert
+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_toggle_on=PÅ
-firstRun_feature_malware=Blokkering av skadeprogram
-firstRun_feature_social=Fjern sosiale media knapper
+firstRun_contributor_credits=Takk til
+firstRun_feature_show_expanded=aktiver funksjoner
+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_features=Adblock Plus kan gjøre mer enn å bare blokkere annonser
+firstRun_feature_malware_description=Gjør nettlesingen din tryggere ved å blokkere domener som er kjent for å være skadelige.
+firstRun_feature_show_overview=vis oversikt
+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_donate=donér
+firstRun_donate_label=Støtt prosjektet vårt
+firstRun_feature_social=Fjern sosiale media-knapper
+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.
diff --git a/chrome/locale/nb-NO/global.properties b/chrome/locale/nb-NO/global.properties
index e382385..7447dbe 100644
--- a/chrome/locale/nb-NO/global.properties
+++ b/chrome/locale/nb-NO/global.properties
@@ -1,23 +1,38 @@
no_blocking_suggestions=Ingen blokkerbare elementer på nåværende side
action3_tooltip=Klikk for å aktivere/deaktivere Adblock Plus.
type_label_script=script
+filter_elemhide_nocriteria=Du har ikke spesifisert kriterier for å gjenkjenne elementet som skal skjules
+blockingGroup_title=Regler for annonseblokkering
whitelisted_tooltip=Adblock Plus er deaktivert på nåværende side.
type_label_stylesheet=stilark
blocked_count_tooltip=?1? av ?2?
type_label_font=font
+type_label_popup=sprettoppvindu
+filter_regexp_tooltip=Dette filteret er enten et standarduttrykk eller er for kort til å bli optimalisert. For mange slike filtre kan gjøre nettleseren din tregere.
+action0_tooltip=Trykk her for å vise kontekstmenyen. Midtklikk for å aktivere/deaktivere.
whitelisted_page=Adblock Plus har blitt deaktivert for nåværende side
remove_group_warning=Ønsker du virkelig å fjerne denne gruppen?
+action1_tooltip=Klikk her for å åpne/lukke elementer som kan blokkeres. Midtklikk for å aktivere/deaktivere.
type_label_xmlhttprequest=XML-forespørsel
+active_tooltip=Adblock Plus er aktivert. ?1? filterabonnementer og ?2? egendefinerte filtre i bruk.
type_label_document=dokument
+type_label_object_subrequest=underforespørsel fra objektet
whitelistGroup_title=Unntaksregler
disabled_tooltip=Adblock Plus er deaktivert.
+filter_elemhide_duplicate_id=Du kan kun angi ett ID for elementet som skal skjules
type_label_object=objekt
+action2_tooltip=Klikk her for å åpne innstillingsvalgene. Midtklikk for å aktivere/deaktivere.
type_label_subdocument=ramme
+clearStats_warning=Dette vil nullstille alle treffstatistikker for filtre og deaktivere telleren. Vil du fortsette?
+blocked_count_addendum=(også hvitelistet: ?1?, skjult: ?2?)
+subscription_invalid_location=Filterlistens plassering er verken en gyldig URL eller et gyldig filnavn.
type_label_image=bilde
remove_subscription_warning=Ønsker du virkelig å fjerne dette abonnementet?
+type_label_other=annet
mobile_menu_enable=ABP: Aktiver
-type_label_media=audio/video
+type_label_media=lyd/video
mobile_menu_disable_site=ABP: Deaktiver på ?1?
+elemhideGroup_title=Regler for å skjule elementer
mobile_menu_enable_site=ABP: Aktiver på ?1?
type_label_elemhide=skjult
newGroup_title=Ny filtergruppe
diff --git a/chrome/locale/nb-NO/meta.properties b/chrome/locale/nb-NO/meta.properties
index af4711c..7ffc5c8 100644
--- a/chrome/locale/nb-NO/meta.properties
+++ b/chrome/locale/nb-NO/meta.properties
@@ -1,2 +1,6 @@
-translator=Roy Skoglund
+description.short=Er du irritert av annonser? Bekymret over sporing? Plaget av bannere? Installer Adblock Plus nå for å ta tilbake kontrollen over Internett, og endre måten du ser nettet på.\n\nEt kort videooversikt ligger på http://www.youtube.com/watch?v=oNvb2SjVjjI
name=Adblock Plus
+description.long.addition1=Fra og med Adblock Plus 2.0 er det et valg i filterinnstillingene for å tillate enkelte ikke-påtrengende annonser. Målet er å støtte nettsider som bruker ikke-påtrengende måter å reklamere på, og for å oppfordre flere nettsider til å gjøre det samme. <a href="http://adblockplus.org/en/acceptable-ads">Les mer</a>
+translator=Roy Skoglund
+description.long=Adblock Plus gir deg tilbake kontrollen over Internett, og lar deg se nettet slik du vil se det. Adblock Plus støttes av mer enn førti filterabonnementer på mange titalls språk, som automatisk tilpasser programmet til formål som spenner fra å fjerne nettannonser, til å blokkere alle kjente skadelige nettsteder. Adblock Plus gir deg også mulighet til å lage dine egne filtre ved hjelp av en rekke praktiske funksjoner, slik som høyreklikkfunksjon på bilder, en blokkeringsfa [...]
+description=Si farvel til reklame!
diff --git a/chrome/locale/nb-NO/overlay.dtd b/chrome/locale/nb-NO/overlay.dtd
index 9abfded..3dbc4d2 100644
--- a/chrome/locale/nb-NO/overlay.dtd
+++ b/chrome/locale/nb-NO/overlay.dtd
@@ -1,20 +1,28 @@
-<!ENTITY counthits.label "Tell filtertreff (&h)">
+<!ENTITY sync.label "Synkroniser innstillinger for Adblo&ck Plus">
+<!ENTITY whitelist.site.label "Deaktiver på ?1?">
+<!ENTITY filters.label "&Filterinnstillinger">
+<!ENTITY disable.label "Deaktiver overalt">
+<!ENTITY objecttab.title "Blokker">
<!ENTITY objecttab.tooltip "Klikk her for å blokkere dette elementet med Adblock Plus">
+<!ENTITY menuitem.label "Adblock Plus innstillinger">
+<!ENTITY objecttabs.label "Vis faner på Flash og Java">
+<!ENTITY sendReport.label "&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 (&h)">
+<!ENTITY opensidebar.label "Åpne &blokkerbare elementer">
+<!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 showinstatusbar.label "Vis i statuslinjen">
<!ENTITY sidebar.title "Blokkerbare elementer på nåværende side">
-<!ENTITY sync.label "Synkroniser innstillinger for Adblo&ck Plus">
<!ENTITY options.label "Alternativer (&O)">
<!ENTITY context.object.label "Adblock Plus: Blokker objekt">
-<!ENTITY context.frame.label "Adblock Plus: Blokker ramme">
+<!ENTITY context.removeWhitelist.label "Reaktiver på denne siden">
<!ENTITY filters.tooltip "Mest aktive filtre:">
-<!ENTITY whitelist.site.label "Deaktiver på ?1?">
+<!ENTITY closesidebar.label "Lukk &blokkérbare elementer">
<!ENTITY showintoolbar.label "Vis på verktøylinje (&b)">
-<!ENTITY sendReport.label "&Rapporter problem på denne siden">
-<!ENTITY contribute.label "Bidra til Adblock Plus">
-<!ENTITY toolbarbutton.label "Adblock Plus">
-<!ENTITY context.image.label "Adblock Plus: Blokker bilde">
-<!ENTITY filters.label "&Filterinnstillinger">
-<!ENTITY disable.label "Deaktiver overalt">
<!ENTITY status.tooltip "Status:">
-<!ENTITY blocked.tooltip "Blokkerte elementer på denne siden:">
-<!ENTITY objecttab.title "Blokker">
-<!ENTITY opensidebar.label "Åpne &blokkerbare elementer">
+<!ENTITY context.media.label "Blokker lyd/video">
diff --git a/chrome/locale/nb-NO/sendReport.dtd b/chrome/locale/nb-NO/sendReport.dtd
index c6ea7e3..3e77007 100644
--- a/chrome/locale/nb-NO/sendReport.dtd
+++ b/chrome/locale/nb-NO/sendReport.dtd
@@ -1,30 +1,65 @@
<!ENTITY screenshot.undo.label "Angre (&U)">
+<!ENTITY issues.disabledgroups.description "Disse filterabonnementene/filtergruppene er deaktivert, men de kan ha en effekt på denne siden likevel:">
<!ENTITY showData.label "Vis rapportdata">
<!ENTITY typeSelector.falsePositive.label "Adblock Plus blokkerer for &mye">
+<!ENTITY issues.change.description "Konfigurasjonene dine er endret. Last inn siden på nytt for å teste forandringene, og send inn en ny rapport hvis problemene er vedvarende.">
<!ENTITY email.label "E-post: (&m)">
<!ENTITY issues.openPreferences.label "Åpne filterinnstillinger">
+<!ENTITY sendPage.confirmation "Rapporten er lagret. Du kan få tilgang til den ved følgende internettadresse:">
+<!ENTITY copyLink.label "Kopier rapportlink (&C)">
+<!ENTITY issues.nofilters.description "Adblock Plus blokkerer ingenting på denne siden. Problemer du opplever er trolig urelatert til Adblock Plus.">
+<!ENTITY sendPage.knownIssue "Problemet du rapporterte inn er allerede kjent for oss. Mer informasjon:">
+<!ENTITY typeSelector.other.description "Velg dette alternativet hvis du mistenker at det er et problem med Adblock Plus som program, i motsetning til filterene.">
<!ENTITY issues.disabledgroups.enable.label "Aktiver filterabonnement / filtergruppe">
<!ENTITY typeWarning.override.label "Jeg for&står og ønsker likevel å sende rapporten">
<!ENTITY issues.disabled.enable.label "Aktiver Adblock Plus">
+<!ENTITY update.fixed.description "Oppdateringen av filterabonnemenetene dine løste trolig problemet du rapporterte inn. Vennligst last inn siden på nytt. Rapporter inn problemet på nytt hvis problemet fremdeles eksisterer.">
<!ENTITY anonymous.label "&Anonym innsending">
<!ENTITY reloadButton.label "Last side på nytt (&R)">
<!ENTITY recentReports.clear.label "Fje&rn alle rapporter">
+<!ENTITY typeSelector.description "Dette vinduet vil veilede deg gjennom de nødvendige stegene som trengs for å sende inn en problemrapport til Adblock Plus. Velg først hvilket type problem du har på denne siden:">
<!ENTITY screenshot.remove.label "Fje&rn sensitive data">
+<!ENTITY issues.ownfilters.description "Noen av filterene som er aktivert på denne siden er brukerdefinerte. Vennligst deaktiver filterene som kan ha forårsaket problemet:">
+<!ENTITY update.inProgress.description "Adblock Plus behøver å oppdatere filterabonnementene for å forsikre seg at problemet ikke har blitt løst allerede. Vennligst vent...">
<!ENTITY sendPage.retry.label "Send på nytt">
<!ENTITY data.label "Ra&pportdata:">
<!ENTITY recentReports.label "Dine nylig innsendte rapporter">
+<!ENTITY typeWarning.description "Du har angitt at du vil rapportere inn et generelt problem vedrørende Adblock Plus, istedenfor et problem vedrørende filtrene. Vennligst legg merke til at slike problemer helst bør rapporteres inn på. Du burde kun bruke rapportingsfunksjonen til å supplementere til en eksisterende diskusjon, siden ingen vil legge merke til din rapport såfremt du ikke legger ved en link. En automatisk generert link vil bli gitt deg etter at du har sendt inn en rapport.">
+<!ENTITY issues.disabled.description "Adblock Plus er deaktivert, og vil ikke blokkere noenting i denne tilstanden.">
+<!ENTITY attachExtensions.label "Legg ved en liste over aktive tillegg til rapporten, i tilfelle det er en "add-on" som er grunnen til problemet">
<!ENTITY issues.nosubscriptions.add.label "Legg til filterabonnement">
<!ENTITY issues.disabledfilters.enable.label "Aktiver filter">
+<!ENTITY issues.override.label "Følgende konfigurasjon er korrekt; fortsetter med rapporteringen">
+<!ENTITY issues.nosubscriptions.description "Det virker som om du ikke har abonnert på noen av de forhåndsdefinerte listene som fjerner uønsket innhold fra internettsider.">
+<!ENTITY typeSelector.falsePositive.description "Velg dette alternativet hvis siden mangler viktig innhold, vises feil eller ikke fungerer sånn det skal. Du kan finne ut om Adblock Plus er roten til problemet ved å deaktivere Adblock Plus midlertidig.">
<!ENTITY typeSelector.other.label "Anne&t problem">
+<!ENTITY emailComment.label "Vi oppfordrer deg til å oppgi en gyldig e-postadresse, slik at vi kan kontakte deg hvis vi har spørsmål angående denne rapporten. Det vil også gjøre at vi kan gjenkjenne dine bidrag, og prioritere dem høyere.">
+<!ENTITY issues.whitelist.remove.label "Reaktiver Adblock Plus for denne siden">
+<!ENTITY outdatedSubscriptions.description "Disse filterabonnementene har ikke blitt oppdatert på minst to uker. Vennligst oppdater disse filterabonnementene før du sender inn en problemrapport; problemet kan ha blitt løst allerede.">
+<!ENTITY dataCollector.description "Vennligst vent på at Adblock Plus samler inn de nødvendige data.">
+<!ENTITY sendButton.label "Se&nd rapport">
<!ENTITY comment.label "Kommentar (valgfritt): (&C)">
+<!ENTITY sendPage.errorMessage "Et forsøk på å sende inn rapporten feilet, med feilkoden "?1?". Vennligst kontrollér at du har internettilgang, og prøv på nytt. Hvis problemet vedvarer kan du be om hjelp i .">
<!ENTITY showRecentReports.label "Vis nylig innsendte rapporter">
<!ENTITY commentPage.heading "Skriv inn kommentar">
<!ENTITY update.start.label "Start oppdatering nå">
-<!ENTITY copyLink.label "Kopier rapportlink (&C)">
+<!ENTITY issues.disabledfilters.description "Følgende filter er deaktiver, men det kan alikevell ha en effekt på denne siden:">
+<!ENTITY screenshot.description "En internettside kan se annerledes ut for forskjellige personer. Det vil muligens hjelpe oss til å forstå problemet hvis du du sender med en skjermdump, sammen med rapporten. Du kan fjerne sensitiv informasjon, såvell som markere området hvor problemet er merkbart. For å gjøre dette må du klikke tilsvarende knapp, og velge området du vil markere med datamusen.">
+<!ENTITY screenshot.attach.label "Legg ved et bilde til rapporten">
+<!ENTITY issues.whitelist.description "Adblock Plus er for tiden deaktivert for siden du ønkser å rapportere inn. Vennligst reaktiver Adblock Plus for denne siden, og last inn siden på nytt før sender inn rapporten.">
+<!ENTITY typeSelector.falseNegative.label "Adblock Plus blokkerer ikke et reklameelement">
<!ENTITY typeSelector.heading "Velg type problem">
+<!ENTITY anonymity.warning "Vi vil ikke kunne svare deg, og det vil sannsynligvis gjøre at rapporten får lavere prioritet.">
+<!ENTITY wizard.title "Problemrapporterer">
<!ENTITY issues.ownfilters.disable.label "Deaktiver filter">
+<!ENTITY commentPage.description "I tekstfeltet nedenfor kan du skrive en kommentar som kan hjelpe oss til å forstå problemet. Dette er valgfritt, men anbefalt hvis problemet ikke åpenbart. Du kan også se på rapportdataene før de sendes.">
+<!ENTITY comment.lengthWarning "Lengden på din kommentar er lenger enn 1000 bokstav. Bare de første 1000 bokstavene vil bli inkludert i rapporten.">
+<!ENTITY typeSelector.falseNegative.description "Velg dette alternativet hvis et reklameelement vises, selv om Adblock Plus er aktivert.">
<!ENTITY sendPage.waitMessage "Vennligst vent mens Adblock Plus sender inn din rapport.">
+<!ENTITY dataCollector.heading "Velkommen til problemrapportereren">
<!ENTITY screenshot.heading "Legg ved skjermdump">
<!ENTITY sendPage.heading "Send rapport">
-<!ENTITY sendButton.label "Se&nd rapport">
+<!ENTITY issues.subscriptionCount.description "Det virker som om du har abonnert på for mange filterabonnementer. Dette oppsettet er ikke oppsettet er ikke anbefalt, da det ofte vil resultere i at du opplever flere problemer med Adblock plus. Vi kan heller ikke ta imot din rapport, siden det er usikkert hvilken filterforfatter det er som eventuelt må fikse filteret sitt. Vennligst fjern alle ikke-nødvendige filtere, og se om samme problem oppstår da.">
+<!ENTITY screenshot.mark.label "Markèr problemet">
<!ENTITY privacyPolicy.label "Personvern">
+<!ENTITY issues.description "Adblock Plus oppdaget problemer med konfigurasjonene som kan være grunnen til problemet, eller som kan gjøre det vanskelig å undersøke problemet.">
diff --git a/chrome/locale/nb-NO/sidebar.dtd b/chrome/locale/nb-NO/sidebar.dtd
index 7e9400e..1e4e45b 100644
--- a/chrome/locale/nb-NO/sidebar.dtd
+++ b/chrome/locale/nb-NO/sidebar.dtd
@@ -1,22 +1,35 @@
+<!ENTITY context.flash.label "Fremhév elementets kanter">
<!ENTITY address.label "Adresse">
<!ENTITY context.open.label "Åpne i ny fane">
+<!ENTITY type.label "Type">
<!ENTITY tooltip.filterSource.label "Filterkilde:">
-<!ENTITY filter.label "Filter">
<!ENTITY noitems.label "Ingen blokkerbare elementer">
+<!ENTITY filter.label "Filter">
<!ENTITY tooltip.size.label "Størrelse:">
+<!ENTITY reattach.label "Gjentilkoble">
<!ENTITY search.label "&Søk:">
<!ENTITY docDomain.thirdParty "(tredjeparts)">
<!ENTITY filterSource.label "Filterkilde">
<!ENTITY tooltip.docDomain.label "Dokumentkilde:">
<!ENTITY context.copy.label "Kopier elementets adresse">
-<!ENTITY tooltip.type.blocked "(blokkert)">
+<!ENTITY tooltip.type.label "Type:">
<!ENTITY context.disablefilter.label "Deaktiver filter ?1?">
<!ENTITY context.copyFilter.label "Kopier filter">
<!ENTITY context.block.label "Blokker dette elementet">
+<!ENTITY context.enablefilter.label "Reaktiver filter ?1?">
+<!ENTITY detach.label "Frakoble">
+<!ENTITY whitelisted.label "Hvitelistet side">
<!ENTITY context.disablefilteronsite.label "Deaktiver dette filteret på ?1?">
+<!ENTITY detached.title "Adblock Plus: Blokkérbare elementer(frittstående)">
+<!ENTITY docDomain.firstParty "(førsteparts)">
+<!ENTITY tooltip.type.whitelisted "(hvitelistet)">
+<!ENTITY tooltip.filter.label "Gjeldende filter:">
<!ENTITY tooltip.filter.disabled "(deaktivert)">
+<!ENTITY context.editfilter.label "Redigér gjeldende filter">
+<!ENTITY tooltip.type.blocked "(blokkert)">
<!ENTITY size.label "Størrelse">
<!ENTITY context.whitelist.label "Legg til unntaksregel for elementet">
<!ENTITY context.selectAll.label "Velg alle">
+<!ENTITY state.label "Tilstand">
<!ENTITY docDomain.label "Dokumentkilde">
<!ENTITY tooltip.address.label "Adresse:">
diff --git a/chrome/locale/nb-NO/subscriptionSelection.dtd b/chrome/locale/nb-NO/subscriptionSelection.dtd
index fad6ef6..14ae574 100644
--- a/chrome/locale/nb-NO/subscriptionSelection.dtd
+++ b/chrome/locale/nb-NO/subscriptionSelection.dtd
@@ -1,7 +1,12 @@
+<!ENTITY addMain.label "Legg til filterabonnement "?1?" også">
+<!ENTITY list.download.failed "Adblock Plus mislyktes i å hente listen med abonnementene.">
<!ENTITY list.download.retry "Prøv igjen">
<!ENTITY title.label "Abonnemen&tstittel:">
<!ENTITY list.download.website "Vis nettside">
+<!ENTITY supplementMessage "Dette filter abonnementet er ment å brukes sammen med filter abonnementet "?1?" som du ikke bruker ennå.">
<!ENTITY viewList.label "Vis filtre">
<!ENTITY visitHomepage.label "Besøk hjemmeside">
<!ENTITY addSubscription.label "Legg til abonnement">
<!ENTITY dialog.title "Legg til filterabonnement for Adblock Plus">
+<!ENTITY location.label "Filterabonnementets plassering:">
+<!ENTITY fromWeb.description "Vennligst bekreft at du vil legge til dette filterabonnementet. Du kan forandre tittelen på abonnementet, eller plasseringen til abonnementet, før det legges til.">
diff --git a/chrome/locale/nl/firstRun.properties b/chrome/locale/nl/firstRun.properties
index 00764ee..5450fe8 100644
--- a/chrome/locale/nl/firstRun.properties
+++ b/chrome/locale/nl/firstRun.properties
@@ -6,15 +6,16 @@ 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_contributor_credits=Bijdrager Credits
-firstRun_feature_show_overview=Toon overzicht
+firstRun_feature_show_expanded=functies activeren
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_show_overview=Toon overzicht
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_social=Verwijder Social Media knoppen
-firstRun_feature_show_expanded=functies activeren
+firstRun_legacySafariWarning=U gebruikt een oude versie van Safari die niet wordt ondersteund door Adblock Plus. Sommige website kunnen daardoor onjuist worden weergegeven. Wij raden u aan een update uit te voeren naar Safari versie 6 of hoger (beschikbaar voor Mac OS X 10.8 Mountain Lion en nieuwer), of de laatste versie van Mozilla Firefox, Google Chrome of Opera te gebruiken.
diff --git a/chrome/locale/nl/overlay.dtd b/chrome/locale/nl/overlay.dtd
index 2fe664a..cfd5009 100644
--- a/chrome/locale/nl/overlay.dtd
+++ b/chrome/locale/nl/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Uitschakelen op ?1?">
<!ENTITY filters.label "&Filtervoorkeuren">
<!ENTITY disable.label "Overal uitschakelen">
-<!ENTITY showinaddonbar.label "In add-on&balk weergeven">
<!ENTITY objecttab.title "Blokkeren">
<!ENTITY objecttab.tooltip "Klik hier om dit object te blokkeren met Adblock Plus">
<!ENTITY menuitem.label "&Adblock Plus-voorkeuren">
diff --git a/chrome/locale/pl/firstRun.properties b/chrome/locale/pl/firstRun.properties
index 0bb3205..da72beb 100644
--- a/chrome/locale/pl/firstRun.properties
+++ b/chrome/locale/pl/firstRun.properties
@@ -6,15 +6,16 @@ firstRun_title=Adblock Plus został zainstalowany
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_toggle_on=WŁ.
firstRun_contributor_credits=Podziękowania dla współtwórców
-firstRun_feature_show_overview=Pokaż przegląd
+firstRun_feature_show_expanded=Uaktywnij funkcje
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_features=Adblock Plus umożliwia więcej niż blokowanie reklam
firstRun_feature_malware_description=Spraw, by twoje przeglądanie było bardziej bezpieczne, blokując znane domeny ze złośliwym oprogramowaniem.
+firstRun_feature_show_overview=Pokaż przegląd
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_donate=Wspomóż nas
firstRun_donate_label=Wesprzyj nasz projekt
firstRun_feature_social=Usuwanie przycisków serwisów społecznościowych
-firstRun_feature_show_expanded=Uaktywnij funkcje
+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.
diff --git a/chrome/locale/pl/overlay.dtd b/chrome/locale/pl/overlay.dtd
index 11234a0..0152efc 100644
--- a/chrome/locale/pl/overlay.dtd
+++ b/chrome/locale/pl/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Wyłącz blokowanie na ?1?">
<!ENTITY filters.label "&Ustawienia filtra">
<!ENTITY disable.label "Wyłącz wszędzie">
-<!ENTITY showinaddonbar.label "Wyświe&tlaj ikonę Adblock Plusa na pasku dodatków">
<!ENTITY objecttab.title "Zablokuj">
<!ENTITY objecttab.tooltip "Kliknij tutaj, aby zablokować ten obiekt">
<!ENTITY menuitem.label "&Adblock Plus - ustawienia">
diff --git a/chrome/locale/pt-BR/composer.dtd b/chrome/locale/pt-BR/composer.dtd
index c52a460..eea788d 100644
--- a/chrome/locale/pt-BR/composer.dtd
+++ b/chrome/locale/pt-BR/composer.dtd
@@ -1,7 +1,7 @@
<!ENTITY anchor.end.label "no f&inal do endereço">
<!ENTITY domainRestriction.label "Restringir ao &domínio:">
<!ENTITY collapse.default.no.label "Usar padrão (não)">
-<!ENTITY firstParty.label "So&mente primeira parte">
+<!ENTITY firstParty.label "So&mente mesmo domínio">
<!ENTITY preferences.label "&Mostrar filtros existentes...">
<!ENTITY pattern.label "Procurar padrão">
<!ENTITY thirdParty.label "So&mente de terceiros">
diff --git a/chrome/locale/pt-BR/firstRun.properties b/chrome/locale/pt-BR/firstRun.properties
index a2dfdf4..e1a7120 100644
--- a/chrome/locale/pt-BR/firstRun.properties
+++ b/chrome/locale/pt-BR/firstRun.properties
@@ -1,20 +1,21 @@
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=DESLIGAR
+firstRun_toggle_off=DESLIGADO
firstRun_feature_tracking=Desativa o Rastreamento
firstRun_feature_malware=Bloqueio de Malware
firstRun_title=O Adblock Plus foi instalado
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_toggle_on=LIGAR
+firstRun_toggle_on=LIGADO
firstRun_contributor_credits=Créditos dos contribuidores
-firstRun_feature_show_overview=Visão geral
+firstRun_feature_show_expanded=Ativar os recursos
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_features=O Adblock Plus pode fazer mais do que bloquear anúncios
firstRun_feature_malware_description=Tornar sua navegação mais segura através do bloqueio de sites conhecidos com malwares.
+firstRun_feature_show_overview=Visão geral
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_donate=Doar
firstRun_donate_label=Apoiar o projeto
firstRun_feature_social=Remove Botões de Redes Sociais
-firstRun_feature_show_expanded=Ativar os recursos
+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.
diff --git a/chrome/locale/pt-BR/overlay.dtd b/chrome/locale/pt-BR/overlay.dtd
index d78bf1d..7d5196b 100644
--- a/chrome/locale/pt-BR/overlay.dtd
+++ b/chrome/locale/pt-BR/overlay.dtd
@@ -2,25 +2,24 @@
<!ENTITY whitelist.site.label "Desativar em ?1?">
<!ENTITY filters.label "Opções de &filtros">
<!ENTITY disable.label "Desativar em todas as páginas">
-<!ENTITY showinaddonbar.label "Mostrar na barra de e&xtensões">
<!ENTITY objecttab.title "Bloquear">
<!ENTITY objecttab.tooltip "Clique aqui para bloquear este objeto com o Adblock Plus">
<!ENTITY menuitem.label "Preferências do Ad&block Plus">
<!ENTITY objecttabs.label "Mostrar abas em Flash e &Java">
<!ENTITY sendReport.label "&Reportar problema nesta página">
<!ENTITY whitelist.page.label "Desativar somente nesta página">
-<!ENTITY context.image.label "Adblock Plus: Imagem de bloqueio (it´s not so clear) do you meaning: blocked image ???">
+<!ENTITY context.image.label "Adblock Plus: Bloquear imagem">
<!ENTITY counthits.label "Cont&ar acertos de filtros">
<!ENTITY opensidebar.label "A&brir itens bloqueáveis">
<!ENTITY contribute.label "Contribuir com o Adblock Plus">
<!ENTITY toolbarbutton.label "Adblock Plus">
-<!ENTITY context.frame.label "Adblock Frame">
+<!ENTITY context.frame.label "Adblock Plus: Bloquear quadro">
<!ENTITY blocked.tooltip "Itens bloqueados nesta página:">
-<!ENTITY hideplaceholders.label "&Comprimir espaço de elementos bloqueados">
+<!ENTITY hideplaceholders.label "Ocultar &marcadores de elementos bloqueados">
<!ENTITY showinstatusbar.label "&Mostrar na barra de status">
-<!ENTITY sidebar.title "Itens bloqueáveis na página atual.">
+<!ENTITY sidebar.title "Itens bloqueáveis na página atual">
<!ENTITY options.label "&Opções">
-<!ENTITY context.object.label "Adblock Plus: Objeto de bloco">
+<!ENTITY context.object.label "Adblock Plus: Bloquear objeto">
<!ENTITY context.removeWhitelist.label "Adblock Plus: Reativar nessa página">
<!ENTITY filters.tooltip "Filtros mais ativos:">
<!ENTITY closesidebar.label "Fechar itens &bloqueáveis">
diff --git a/chrome/locale/pt-PT/firstRun.properties b/chrome/locale/pt-PT/firstRun.properties
index 73a599a..ba1f4f3 100644
--- a/chrome/locale/pt-PT/firstRun.properties
+++ b/chrome/locale/pt-PT/firstRun.properties
@@ -6,15 +6,16 @@ firstRun_title=O Adblock Plus foi instalado
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_toggle_on=Ligado
firstRun_contributor_credits=Créditos
-firstRun_feature_show_overview=mostrar resumo
+firstRun_feature_show_expanded=ativar funcionalidades
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_features=O Adblock Plus pode fazer mais do que bloquear publicidade
firstRun_feature_malware_description=Melhore a navegação web bloqueando os domínios duvidosos.
+firstRun_feature_show_overview=mostrar resumo
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_donate=donativos
firstRun_donate_label=Ajude o nosso projeto
firstRun_feature_social=Remover botões sociais
-firstRun_feature_show_expanded=ativar funcionalidades
+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.
diff --git a/chrome/locale/pt-PT/meta.properties b/chrome/locale/pt-PT/meta.properties
index 78497b7..2a82f62 100644
--- a/chrome/locale/pt-PT/meta.properties
+++ b/chrome/locale/pt-PT/meta.properties
@@ -2,5 +2,5 @@ description.short=Aborrecido pelos anúncios? Incomodado pela monitorização? I
name=Adblock Plus
description.long.addition1=A partir do Adblock Plus 2.0, existe uma opção nas preferências de filtros para permitir publicidade não intrusiva. O objetivo é suportar sítios web que utilizem publicidade não intrusiva e encorajar mais sítios web a agir da mesma forma. <a href="http://adblockplus.org/en/acceptable-ads">Saber mais</a>
translator=António Mendonça; Sérgio Marques
-description.long=O Adblock Plus permite que recupere o controlo da Internet e ver a web da forma pretendida. A extensão tem suporte a mais de quarenta subscrições de filtros em dezenas de idiomas, que a configuram automaticamente para fins que vão desde a remoção de publicidade até ao bloqueio de todos os domínios conhecidos de malware. O Adblock Plus também permite que personalize os filtros com o auxílio de uma variedade de recursos úteis, incluindo uma opção de contexto para as imagen [...]
+description.long=O Adblock Plus permite-lhe recuperar o controlo da Internet e ver a web da forma pretendida. A extensão tem suporte a mais de quarenta subscrições de filtros em dezenas de idiomas, que a configuram automaticamente para fins que vão desde a remoção de publicidade até ao bloqueio de todos os domínios conhecidos de malware. O Adblock Plus também permite que personalize os filtros com o auxílio de uma variedade de recursos úteis, incluindo uma opção de contexto para as image [...]
description=Publicidade... já era!
diff --git a/chrome/locale/pt-PT/overlay.dtd b/chrome/locale/pt-PT/overlay.dtd
index f356cb7..ad3a3a0 100644
--- a/chrome/locale/pt-PT/overlay.dtd
+++ b/chrome/locale/pt-PT/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Desativar em ?1?">
<!ENTITY filters.label "Pre&ferências de filtros">
<!ENTITY disable.label "Desativar em todas as páginas">
-<!ENTITY showinaddonbar.label "Mostrar na &barra de extras">
<!ENTITY objecttab.title "Bloquear">
<!ENTITY objecttab.tooltip "Clique aqui para bloquear este objecto com o Adblock Plus">
<!ENTITY menuitem.label "Preferências do Ad&block Plus">
diff --git a/chrome/locale/ro/firstRun.properties b/chrome/locale/ro/firstRun.properties
index b620de0..d298b07 100644
--- a/chrome/locale/ro/firstRun.properties
+++ b/chrome/locale/ro/firstRun.properties
@@ -6,15 +6,16 @@ firstRun_title=Adblock Plus a fost instalat
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_toggle_on=ON
firstRun_contributor_credits=Contributori
-firstRun_feature_show_overview=Arată o privire de ansamblu
+firstRun_feature_show_expanded=Activează funcționalități
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_features=Adblock Plus poate face mai mult decât să blocheze publicitatea
firstRun_feature_malware_description=Securizarea navigării prin blocarea domeniilor rău-intenționate cunoscute.
+firstRun_feature_show_overview=Arată o privire de ansamblu
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_donate=Donaţii
firstRun_donate_label=Ajutați proiectul
firstRun_feature_social=Ascundere butoane Social Media
-firstRun_feature_show_expanded=Activează funcționalități
+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.
diff --git a/chrome/locale/ro/overlay.dtd b/chrome/locale/ro/overlay.dtd
index 4167753..4437306 100644
--- a/chrome/locale/ro/overlay.dtd
+++ b/chrome/locale/ro/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Dezactivează Adblock Plus pe ?1?">
<!ENTITY filters.label "Pre&ferințe filtre">
<!ENTITY disable.label "Dezactivează peste tot">
-<!ENTITY showinaddonbar.label "Arată în bara cu &extensii">
<!ENTITY objecttab.title "Blochează">
<!ENTITY objecttab.tooltip "Click aici pentru a bloca obiectul utilizând Adblock Plus">
<!ENTITY menuitem.label "&Adblock Plus">
diff --git a/chrome/locale/ru/composer.dtd b/chrome/locale/ru/composer.dtd
index 463194b..a7fc2c5 100644
--- a/chrome/locale/ru/composer.dtd
+++ b/chrome/locale/ru/composer.dtd
@@ -25,7 +25,7 @@
<!ENTITY domainRestriction.help "Укажите один или несколько доменов, разделенные символом «|», фильтр будет применен только на этих доменах. Символ «~» перед именем домена означает, что фильтр не должен применяться на этом домене.">
<!ENTITY accept.label "Добавить фильтр">
<!ENTITY options.label "Настройки...">
-<!ENTITY disabled.warning "Adblock Plus сейчас отключен. Вы можете добавлять фильтры, но чтобы они применились нужно [link]включить Adblock Plus[/link].">
+<!ENTITY disabled.warning "Adblock Plus сейчас отключен. Вы можете добавить фильтры, но чтобы они работали нужно [link]включить Adblock Plus[/link].">
<!ENTITY anchor.start.flexible.label "в на&чале имени домена">
<!ENTITY collapse.no.label "Нет">
<!ENTITY selectAllTypes.label "Пометить все">
diff --git a/chrome/locale/ru/firstRun.properties b/chrome/locale/ru/firstRun.properties
index 8b32010..a4ac0d0 100644
--- a/chrome/locale/ru/firstRun.properties
+++ b/chrome/locale/ru/firstRun.properties
@@ -6,15 +6,16 @@ firstRun_title=Adblock Plus установлен
firstRun_acceptableAdsExplanation=Мы хотели бы призвать веб-сайты использовать простую, ненавязчивую рекламу. Вот почему мы установили <a>строгие принципы</a> для определения приемлемых объявлений, которые разрешены в настройках по умолчанию. Если вы все еще хотите блокировать каждое объявление вы можете <a>Отключить</a> это в течение нескольких секунд.
firstRun_toggle_on=ВКЛ
firstRun_contributor_credits=Пожертвования
-firstRun_feature_show_overview=показать обзор
+firstRun_feature_show_expanded=активировать функции
firstRun_dataCorruptionWarning=Эта страница всё ещё отображается? <a>Щёлкните здесь!</a>
firstRun_acceptableAdsHeadline=Надоевшая реклама теперь будет заблокирована
firstRun_share=Рассказать друзьям
firstRun_share_headline=<a>протяните нам руку помощи</a> в стремлении сделать Интернет лучше
firstRun_features=AdBlock Plus способен на большее, чем просто блокировать рекламу
firstRun_feature_malware_description=Делает ваш браузер более безопасным путем блокирования известных вредоносных доменов.
+firstRun_feature_show_overview=показать обзор
firstRun_feature_social_description=Автоматически избавляет вас от просмотра кнопок социальных сетей, подобных Facebook, которые появляются на веб-страницах и отслеживают ваше поведение.
firstRun_donate=пожертвовать
firstRun_donate_label=Поддержать наш проект
firstRun_feature_social=Удалять кнопки социальных сетей
-firstRun_feature_show_expanded=активировать функции
+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.
diff --git a/chrome/locale/ru/overlay.dtd b/chrome/locale/ru/overlay.dtd
index 6918d9b..ac5a1ea 100644
--- a/chrome/locale/ru/overlay.dtd
+++ b/chrome/locale/ru/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Отключить на ?1?">
<!ENTITY filters.label "Настройки &фильтров">
<!ENTITY disable.label "Отключить везде">
-<!ENTITY showinaddonbar.label "&Показывать в панели дополнений">
<!ENTITY objecttab.title "Блокировать">
<!ENTITY objecttab.tooltip "Нажмите здесь, чтобы Adblock Plus заблокировал этот объект">
<!ENTITY menuitem.label "Установки &Adblock Plus">
diff --git a/chrome/locale/si-LK/filters.dtd b/chrome/locale/si-LK/filters.dtd
index 3cba389..7f95fa8 100644
--- a/chrome/locale/si-LK/filters.dtd
+++ b/chrome/locale/si-LK/filters.dtd
@@ -1,6 +1,9 @@
<!ENTITY filter.cut.label "කපා හරිනවා">
<!ENTITY addSubscriptionOther.label "වෙනත් දායකත්වයක්">
+<!ENTITY filter.selectAll.label "සියල්ල තෝරනවා">
<!ENTITY sort.ascending.label "A > Z අනුපිළිවෙල">
+<!ENTITY filter.delete.label "මකන්න">
<!ENTITY viewMenu.label "පෙනීම">
<!ENTITY filter.copy.label "පිටපත් කරන්න">
<!ENTITY filter.paste.label "අලවනවා">
+<!ENTITY readMore.label "වැඩිදුර කියවන්න">
diff --git a/chrome/locale/sk/firstRun.properties b/chrome/locale/sk/firstRun.properties
index c9a1f0e..d77dccc 100644
--- a/chrome/locale/sk/firstRun.properties
+++ b/chrome/locale/sk/firstRun.properties
@@ -6,15 +6,16 @@ firstRun_title=Adblock Plus bol nainštalovaný
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_toggle_on=ON
firstRun_contributor_credits=Zásluhy autorov
-firstRun_feature_show_overview=Zobraziť prehľad
+firstRun_feature_show_expanded=aktivovat funkcie
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_features=Adblock Plus môže urobiť viac, ako blokovať reklamy
firstRun_feature_malware_description=Zabezpečenie prezeranie pomocou blokovanie známych domén s malware.
+firstRun_feature_show_overview=Zobraziť prehľad
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_donate=prispejte
firstRun_donate_label=Podporťe náš projekt
firstRun_feature_social=Odstránenie tlačidiel sociálnych médií
-firstRun_feature_show_expanded=aktivovat funkcie
+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.
diff --git a/chrome/locale/sk/overlay.dtd b/chrome/locale/sk/overlay.dtd
index 7e751b3..a5099f3 100644
--- a/chrome/locale/sk/overlay.dtd
+++ b/chrome/locale/sk/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Vypnúť na ?1?">
<!ENTITY filters.label "&Nastavenia filtrov">
<!ENTITY disable.label "Vypnúť všade">
-<!ENTITY showinaddonbar.label "Zobraziť v pane&li doplnkov">
<!ENTITY objecttab.title "Blokovať">
<!ENTITY objecttab.tooltip "Kliknúť sem pre blokovanie tohto objektu s Adblock Plus">
<!ENTITY menuitem.label "&Adblock Plus">
diff --git a/chrome/locale/sl/firstRun.properties b/chrome/locale/sl/firstRun.properties
index c2b8093..845f50c 100644
--- a/chrome/locale/sl/firstRun.properties
+++ b/chrome/locale/sl/firstRun.properties
@@ -6,15 +6,16 @@ firstRun_title=Adblock Plus je bil nameščen
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_toggle_on=VKLOP
firstRun_contributor_credits=Krediti sodelavcev
-firstRun_feature_show_overview=prikaži pregled
+firstRun_feature_show_expanded=aktiviranje funkcije
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_features=Adblock Plus zmore več kot le blokirati oglase
firstRun_feature_malware_description=Brskajte po spletu varneje, tako da blokirate znane domene z zlonamerno programsko opremo.
+firstRun_feature_show_overview=prikaži pregled
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_donate=prispevajte
firstRun_donate_label=Podprite naš projekt
firstRun_feature_social=Odstranite gumbe socialnih medijev
-firstRun_feature_show_expanded=aktiviranje funkcije
+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.
diff --git a/chrome/locale/sl/overlay.dtd b/chrome/locale/sl/overlay.dtd
index 74edefd..7eb5b53 100644
--- a/chrome/locale/sl/overlay.dtd
+++ b/chrome/locale/sl/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Onemogoči na ?1?">
<!ENTITY filters.label "Nastavitve &filtra">
<!ENTITY disable.label "Onemogoči povsod">
-<!ENTITY showinaddonbar.label "Po&kaži dodatek v vrstici">
<!ENTITY objecttab.title "Blokiraj">
<!ENTITY objecttab.tooltip "Kliknite sem za blokiranje tega predmeta z Adblock Plus">
<!ENTITY menuitem.label "Ad&block Plus">
diff --git a/chrome/locale/sr/composer.dtd b/chrome/locale/sr/composer.dtd
index f1fe1ea..8f07b55 100644
--- a/chrome/locale/sr/composer.dtd
+++ b/chrome/locale/sr/composer.dtd
@@ -7,20 +7,20 @@
<!ENTITY thirdParty.label "Само са други&х адреса">
<!ENTITY filter.label "Нови &филтер:">
<!ENTITY collapse.label "&Скупи блокирано:">
-<!ENTITY match.warning "Шаблон који сте нели не поклапа се са адресом која треба да буде блокирана/одобрена и на њу неће утицати.">
+<!ENTITY match.warning "Шаблон који сте унели не поклапа се са адресом која треба да буде блокирана/одобрена и на њу неће утицати.">
<!ENTITY anchor.start.label "на &почетку адресе">
<!ENTITY matchCase.label "&Разликуј мала и велика слова">
<!ENTITY custom.pattern.label "&Прилагођено:">
<!ENTITY unselectAllTypes.label "Поништи избор">
<!ENTITY type.whitelist.label "И&зузетак">
<!ENTITY regexp.warning "Образац који сте унели ће бити коришћен као регуларни израз. Превише регуларних израза може успорити прегледач интернет страна. Уколико не намеравате да користите регуларне изразе, додајте симбол * на крају обрасца.">
-<!ENTITY dialog.title "Додавање филтера Adblock Plus-а">
+<!ENTITY dialog.title "Додај правило за Adblock Plus филтер">
<!ENTITY basic.label "Основни приказ">
<!ENTITY type.filter.label "Фи&лтер за блокирање">
<!ENTITY types.label "Примени на типове:">
<!ENTITY shortpattern.warning "Образац који сте унели је прекратак за оптимизацију, превише таквих образаца може успорити прегледач интернет страна. Препоручљиво је да користите дуже изразе као филтере.">
<!ENTITY collapse.yes.label "Да">
-<!ENTITY anchors.label "Прихвати образац само:">
+<!ENTITY anchors.label "Прихвати само образац:">
<!ENTITY collapse.default.yes.label "Подразумевано (да)">
<!ENTITY domainRestriction.help "Наведите један или више домена раздвојених знаком "|". Филтер ће бити употребљен једино за ове домене. Знак "~" испред домена значи да ће домен бити изузет од филтрирања.">
<!ENTITY accept.label "Додај филтер">
diff --git a/chrome/locale/sr/filters.dtd b/chrome/locale/sr/filters.dtd
index 5ab49f4..0aae653 100644
--- a/chrome/locale/sr/filters.dtd
+++ b/chrome/locale/sr/filters.dtd
@@ -31,9 +31,9 @@
<!ENTITY subscription.enabled.label "Омогућено">
<!ENTITY noSubscriptions.text "Нисте додали ниједну претплату на филтер. Adblock Plus неће блокирати ништа без њих, па притисните „Додај претплату на филтер”.">
<!ENTITY subscription.update.label "Ажурирај филтере">
-<!ENTITY dialog.title "Подешавања филтера Adblock Plus">
+<!ENTITY dialog.title "Подешавања Adblock Plus филтера">
<!ENTITY addFilter.label "&Додај филтер">
-<!ENTITY subscription.minVersion.warning "Ива претплата на филтер захтева новију верзију додатка Adblock Plus. Молимо вас да доградите додатак.">
+<!ENTITY subscription.minVersion.warning "Ова претплата на филтер захтева новију верзију додатка Adblock Plus. Молимо вас да унапредите додатак.">
<!ENTITY subscription.lastDownload.invalidURL "Неуспело, неисправна адреса">
<!ENTITY backup.error "Дошло је до грешке приликом чувања филтера у датотеку. Проверите да датотека није само за читање или је не корити нека друга апликација.">
<!ENTITY filter.moveUp.label "Помери нагоре">
diff --git a/chrome/locale/sr/firstRun.properties b/chrome/locale/sr/firstRun.properties
index 3fe6627..cba221f 100644
--- a/chrome/locale/sr/firstRun.properties
+++ b/chrome/locale/sr/firstRun.properties
@@ -1,18 +1,21 @@
-firstRun_feature_tracking_description=Сурфујте приватно са онемогућеним праћењем - скривајући се од рекламних компанија које прате сваки твој потез.
+firstRun_feature_tracking_description=Сурфујте приватно са онемогућеним праћењем - скривајући се од рекламних компанија које прате сваки ваш потез.
firstRun_toggle_off=Искључен
firstRun_feature_tracking=Онемогући праћење
-firstRun_feature_social=Уклоните дугмиће друштвених мрежа
-firstRun_title=Adblock Plus је инсталиран
firstRun_feature_malware=Блокирање малвера
+firstRun_title=Adblock Plus је инсталиран
+firstRun_acceptableAdsExplanation=Желели би смо да охрабримо сајтове да користе фер и ненападно оглашавање, и зато смо покренули <a>стриктан правилник</a> да идентификујемо прихватљиве огласе, које је могуће приказати са стандардним поставкама. Ако и даље желите да блокирате сваки оглас, можете <a>поништити</a> стандардне поставке.
firstRun_toggle_on=Укључен
-firstRun_feature_show_overview=преглед
+firstRun_contributor_credits=Кредитовани сарадници
+firstRun_feature_show_expanded=Укључи функције
firstRun_dataCorruptionWarning=Да ли се ова страница наставља појављивати? <a>Кликните овде!</a>
firstRun_acceptableAdsHeadline=Досадне рекламе ће сада бити блокиране
-firstRun_share=Реците својим пријатељима
+firstRun_share=Препоручите нас својим пријатељима
firstRun_share_headline=<a>Помози нам</a> да интернет постане боље место
firstRun_features=Adblock Plus може више од блокирања реклама
-firstRun_feature_malware_description=Учините Ваше сурфовање сигурнијим блокирајући откривене домене који садрже малвер(е).
-firstRun_feature_social_description=Аутоматски ослободите искуство претраживања од дугмића друштвених мрежа, као што су Facebook Like дугме, који се појављују на страницама и прате ваше понашање.
+firstRun_feature_malware_description=Учините ваше сурфовање сигурнијим, блокирајући домене познате по злонамерним малвер програмима.
+firstRun_feature_show_overview=прикажи преглед
+firstRun_feature_social_description=Аутоматски учините сурфовање ослобођеним од дугмића друштвених мрежа, као што су "Facebook Like" дугме, који се појављују на страницама и прате ваше понашање.
firstRun_donate=Донирајте
-firstRun_donate_label=Подржи наш пројекат
-firstRun_feature_show_expanded=Укључи функције
+firstRun_donate_label=Подржите наш пројекат
+firstRun_feature_social=Уклоните дугмиће друштвених мрежа
+firstRun_legacySafariWarning=Користите верзију Сафарија коју Adblock Plus не подржава, зато је могуће да неке веб странице неће бити оптимално приказане, или ABP уопште неће функционисати. Препоручујемо да унапредите Safari у задњу верзију, или да користите Мозила Фајерфокс, Гугл Кром или Опера браузер.
diff --git a/chrome/locale/sr/global.properties b/chrome/locale/sr/global.properties
index c16ec46..2af049a 100644
--- a/chrome/locale/sr/global.properties
+++ b/chrome/locale/sr/global.properties
@@ -23,8 +23,8 @@ filter_elemhide_duplicate_id=Да би сте сакрили елеменат,
type_label_object=објекат
action2_tooltip=Кликните да бисте отворили подешавања, а средњи клик за омогућавање/онемогућавање.
type_label_subdocument=оквир
-clearStats_warning=Ово ће поништити све статистике свих филтера и онемогућити даље бројање. Желите ли да наставите?
-blocked_count_addendum=(такође проверено: ?1?, сакривено: ?2?)
+clearStats_warning=Ово ће поништити статистике свих филтера и онемогућити даље бројање. Желите ли да наставите?
+blocked_count_addendum=(такође допуштено: ?1?, сакривено: ?2?)
subscription_invalid_location=Неисправна адреса и име датотеке са списком филтера.
type_label_image=слика
remove_subscription_warning=Желите ли да уклоните ову претплату?
diff --git a/chrome/locale/sr/meta.properties b/chrome/locale/sr/meta.properties
index b253ad5..1a18cd5 100644
--- a/chrome/locale/sr/meta.properties
+++ b/chrome/locale/sr/meta.properties
@@ -1,4 +1,4 @@
-description.short=Досадиле су вам рекламе? Доста вам је наметнутих објеката? Смарају вас банери? Инсталирајте Adblock Plus да бисте преузели контролу над Интернетом и стекли другачији поглед на њега.
+description.short=Досадиле су вам рекламе? Доста вам је наметнутих објеката? Сметају вам банери? Инсталирајте Adblock Plus да бисте преузели контролу над интернетом и стекли другачији поглед на ваше сурфовање.
name=Adblock Plus
description.long.addition1=Од верзије Adblock Plus 2.0 у подешавањима филтера доступна је опција за ненаметљиво рекламирање. Њен циљ је да подржи странице које користе ненаметљиво рекламирање и охрабре остале сајтове да ураде исто. <a href="http://adblockplus.org/en/acceptable-ads">Сазнајте више.</a>
translator=kapetance, ДакСРБИЈА
diff --git a/chrome/locale/sr/overlay.dtd b/chrome/locale/sr/overlay.dtd
index 0b72b71..435f61a 100644
--- a/chrome/locale/sr/overlay.dtd
+++ b/chrome/locale/sr/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Онемогући на ?1?">
<!ENTITY filters.label "Подешавања &филтера">
<!ENTITY disable.label "Онемогући свуда">
-<!ENTITY showinaddonbar.label "Прик&ажи траку са алаткама">
<!ENTITY objecttab.title "Блокирај">
<!ENTITY objecttab.tooltip "Кликните овде да бисте блокирали објекат помоћу Adblock Plus-а">
<!ENTITY menuitem.label "Adblock Plus - подеша&вања">
diff --git a/chrome/locale/sr/sendReport.dtd b/chrome/locale/sr/sendReport.dtd
index 886a607..de0adef 100644
--- a/chrome/locale/sr/sendReport.dtd
+++ b/chrome/locale/sr/sendReport.dtd
@@ -1,9 +1,9 @@
<!ENTITY screenshot.undo.label "&Опозови">
-<!ENTITY issues.disabledgroups.description "Следећа претплата на филтер/група филтера је искључена, јер можда има утицаја на страницу:">
+<!ENTITY issues.disabledgroups.description "Следећа претплата на филтер претплату, или групу филтера је искључена, и можда има утицаја на страницу:">
<!ENTITY showData.label "Прикажи податке у извештају">
<!ENTITY typeSelector.falsePositive.label "Adblock Plus блокира превише (&м)">
-<!ENTITY issues.change.description "Ваша подешавања су измењена. Поново учитајте страницу да бисте видели промене, па пошаљите извештај ако проблем опет није реше.">
-<!ENTITY email.label "И-мејл: (&а)">
+<!ENTITY issues.change.description "Ваша подешавања су измењена. Поново учитајте страницу да бисте видели промене, па пошаљите извештај ако проблем и даље није решен.">
+<!ENTITY email.label "Е-мејл: (&а)">
<!ENTITY issues.openPreferences.label "Отвори подешавања филтера">
<!ENTITY sendPage.confirmation "Ваш извештај је сачуван. Можете да му приступите на следећој адреси:">
<!ENTITY copyLink.label "Копирај &везу до извештаја">
@@ -13,7 +13,7 @@
<!ENTITY issues.disabledgroups.enable.label "Омогући претплату на филтер/групу филтера">
<!ENTITY typeWarning.override.label "&Разумем и ипак желим да пошаљем извештај">
<!ENTITY issues.disabled.enable.label "Омогући Adblock Plus">
-<!ENTITY update.fixed.description "Претплате на Ваш филтер су вероватно већ отклониле проблем који Сте пријавили. Поново учитајте страницу, па покушајте поново. Ако проблем и даље постоји, поново га пријавите.">
+<!ENTITY update.fixed.description "Претплате на ваш филтер су вероватно већ отклониле проблем који сте пријавили. Поново учитајте страницу, па покушајте поново. Ако проблем и даље постоји, поново га пријавите.">
<!ENTITY anonymous.label "&Анонимна пријава">
<!ENTITY reloadButton.label "&Поново учитај страницу">
<!ENTITY recentReports.clear.label "Уклони све п&ријаве">
@@ -23,43 +23,43 @@
<!ENTITY update.inProgress.description "Adblock Plus мора ажурирати ваше претплате на филтере ради како би проверио да ли је проблем већ отклоњен. Сачекајте...">
<!ENTITY sendPage.retry.label "Поново пошаљи">
<!ENTITY data.label "П&одаци у извештају:">
-<!ENTITY recentReports.label "Ваши недавно послате пријаве">
+<!ENTITY recentReports.label "Ваши недавно послати извештаји">
<!ENTITY typeWarning.description "Навели сте да желите пријавити општи проблем са Adblock Plus-ом, а не са филтером. Имајте на уму да је такве проблеме најбоље пријавити на [link]форуму Adblock Plus-а[/link]. Овај систем за пријављивање бисте требали да користите само као допуну расправи, јер нико неће видети Ваш извештај док му не даднете везу до њега. Аутоматски направљену везу ћете добити одмах након слања извештаја.">
-<!ENTITY issues.disabled.description "Adblock Plus је онемогућен, па неће ништа блокирати.">
+<!ENTITY issues.disabled.description "Adblock Plus је онемогућен и ништа неће блокирати.">
<!ENTITY attachExtensions.label "Приложите списак омогућених &додатака у извештај, у случају да њихов сукоб доводи до проблема.">
<!ENTITY issues.nosubscriptions.add.label "Додај претплату на филтер">
-<!ENTITY issues.disabledfilters.enable.label "Омогући филтер">
+<!ENTITY issues.disabledfilters.enable.label "Омогућите филтер">
<!ENTITY issues.override.label "Подешавања су &исправна. Настави са пријављивањем.">
<!ENTITY issues.nosubscriptions.description "Изгледа да нисте претплаћени ни на један списак филтера који аутоматски уклањају нежељени садржај са страница.">
<!ENTITY typeSelector.falsePositive.description "Изаберите ову опцију ако страници недостају неки битни садржаји, погрешно изгледа или не ради како треба. Пробајте да привремено онемогућите Adblock Plus, па проверите да ли је онда све у реду.">
<!ENTITY typeSelector.other.label "Други проблем (&т)">
-<!ENTITY emailComment.label "Молимо Вас да унесете важећу и-мејл адресу да бисмо могли да Вас контактирамо уколико има питања у вези са Вашом пријавом. Такође, то ће нам допустити да препознамо Ваше доприносе и да им дамо већу важност.">
+<!ENTITY emailComment.label "Молимо вас да унесете важећу и-мејл адресу да бисмо могли да вас контактирамо уколико има питања у вези са вашом пријавом. Такође, то ће нам допустити да препознамо ваше доприносе и да им дамо већу важност.">
<!ENTITY issues.whitelist.remove.label "Омогући Adblock Plus на овој страници">
<!ENTITY outdatedSubscriptions.description "Следеће претплате на филтере носу ажуриране више од две седмице. Ажурирајте их пре него што пријавите проблем, јер би га то могло отклонити.">
<!ENTITY dataCollector.description "Сачекајте неколико тренутака док Adblock Plus прибави потребне податке.">
-<!ENTITY sendButton.label "&Пошаљи извештај">
+<!ENTITY sendButton.label "&Пошаљите извештај">
<!ENTITY comment.label "&Коментар (произвољно):">
<!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 "Приложи снимак с&транице уз извештај">
-<!ENTITY issues.whitelist.description "Adblock Plus је тренутно онемогућен на страници коју пријављујете. Омогућите га и поново учитајте страницу пре него што пошаљете извештај, који служи за испитивање проблема.">
+<!ENTITY issues.disabledfilters.description "Следећи филтери, иако онемогућени, можда имају утицаја на страницу:">
+<!ENTITY screenshot.description "Иста страница може да изгледа различито код различитих особа, и помогло би нам ако приложите снимак проблема који пријављујете. Можете да уклоните или замаскирате приватне информације, а да бисте то учинили кликните одговарајуће дугме, и мишем изаберите жељени део слике.">
+<!ENTITY screenshot.attach.label "Приложите снимак с&транице уз извештај">
+<!ENTITY issues.whitelist.description "Adblock Plus је тренутно онемогућен на страници коју пријављујете. Омогућите га и поново учитајте страницу пре него што пошаљете молбу за испитивање проблема.">
<!ENTITY typeSelector.falseNegative.label "Adblock Plus не блокира рекламу/е (&в)">
<!ENTITY typeSelector.heading "Изаберите врсту проблема">
<!ENTITY anonymity.warning "Нећемо бити у могућности да поново допремо до вас и то ће вероватно снизити приоритет пријаве.">
<!ENTITY wizard.title "Пријављивање грешака">
<!ENTITY issues.ownfilters.disable.label "Онемогући филтер">
-<!ENTITY commentPage.description "Поље за текст испод омогућава Вам да додате коментар, како бисте нам помогли да лакше схватимо проблем. Овај корак је произвољан, али је пожељан ако проблем није лако уочљив. Можете и да још једном прегледате извештај пре него што да пошаљате.">
-<!ENTITY comment.lengthWarning "Дужина Вашег коментара прелази 1000 знакова. Само првих 1000 знакова ће бити послато.">
+<!ENTITY commentPage.description "Доње поље за текст омогућава вам да додате коментар, како бисте нам помогли да лакше схватимо проблем. Овај корак је произвољан али је пожељан, ако проблем није лако уочљив. Можете и да још једном прегледате извештај пре него што га пошаљете.">
+<!ENTITY comment.lengthWarning "Дужина вашег коментара прелази 1000 знакова. Само првих 1000 знакова ће бити послато.">
<!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 issues.subscriptionCount.description "Изгледа да сте се претплатили на превише филтера. То није препоручљиво, јер повећава вероватноћу да настану проблеми. Поред тога, не можемо да прихватимо ваш извештај о грешкама јер је нејасно која претплата на филтер садржи грешку. Молимо вас да уклоните све непотребне претплате на филтере и проверите да ли још увек има проблема.">
<!ENTITY screenshot.mark.label "О&значи проблем">
<!ENTITY privacyPolicy.label "Политика приватности">
<!ENTITY issues.description "Adblock Plus је уочио проблем са Вашим подешавањима, што може бити узрок овог проблема или отежати његово испитивање.">
diff --git a/chrome/locale/sr/subscriptionSelection.dtd b/chrome/locale/sr/subscriptionSelection.dtd
index a21ff27..dd6291f 100644
--- a/chrome/locale/sr/subscriptionSelection.dtd
+++ b/chrome/locale/sr/subscriptionSelection.dtd
@@ -2,11 +2,11 @@
<!ENTITY list.download.failed "Adblock Plus није успео да набави нови списак претплата.">
<!ENTITY list.download.retry "Покушај поново">
<!ENTITY title.label "&Назив претплате:">
-<!ENTITY list.download.website "Посети интернетску страницу">
+<!ENTITY list.download.website "Отвори веб страницу">
<!ENTITY supplementMessage "Ова претплата на филтер је предвиђена за коришћење са филтером „?1?” који још увек не користите.">
<!ENTITY viewList.label "Погледај филтере">
<!ENTITY visitHomepage.label "Посети матичну страницу">
<!ENTITY addSubscription.label "Додај претплату">
<!ENTITY dialog.title "Претплата на филтере Adblock Plus-а">
<!ENTITY location.label "&Локација списка са филтерима:">
-<!ENTITY fromWeb.description "Потврдите да желите додати претплату на овај филтерт">
+<!ENTITY fromWeb.description "Потврдите да желите додати претплату на овај филтер (можете променити назив или локацију претплате пре додавања).">
diff --git a/chrome/locale/sv-SE/firstRun.properties b/chrome/locale/sv-SE/firstRun.properties
index bd40121..7a97257 100644
--- a/chrome/locale/sv-SE/firstRun.properties
+++ b/chrome/locale/sv-SE/firstRun.properties
@@ -6,15 +6,16 @@ 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_contributor_credits=Tack till
-firstRun_feature_show_overview=visa översikt
+firstRun_feature_show_expanded=aktivera funktioner
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_show_overview=visa översikt
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_social=Ta bort knappar för Sociala Medier
-firstRun_feature_show_expanded=aktivera funktioner
+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.
diff --git a/chrome/locale/sv-SE/overlay.dtd b/chrome/locale/sv-SE/overlay.dtd
index d4ddec5..4af99ce 100644
--- a/chrome/locale/sv-SE/overlay.dtd
+++ b/chrome/locale/sv-SE/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Använd inte på ?1?">
<!ENTITY filters.label "Filterinställningar">
<!ENTITY disable.label "Inaktivera för alla domäner">
-<!ENTITY showinaddonbar.label "Visa i tilläggs&fältet">
<!ENTITY objecttab.title "Blockera">
<!ENTITY objecttab.tooltip "Klicka här för att blockera detta objekt med Adblock Plus">
<!ENTITY menuitem.label "Inställning&ar för Adblock Plus">
diff --git a/chrome/locale/ta-LK/composer.dtd b/chrome/locale/ta-LK/composer.dtd
new file mode 100644
index 0000000..400fcf7
--- /dev/null
+++ b/chrome/locale/ta-LK/composer.dtd
@@ -0,0 +1,18 @@
+<!ENTITY collapse.label "&தடுக்கப்பட்ட பட்டியலைச் சுருக்குக:">
+<!ENTITY accept.label "வடிகட்டியைச் சேர்">
+<!ENTITY type.filter.label "&தடுப்பு வடிகட்டி">
+<!ENTITY options.label "விருப்பத்தேர்வுகள்">
+<!ENTITY disabled.warning "ஆட்ப்ளாக் பிளஸ் தற்போது செயலிழக்கச் செய்யப்பட்டுள்ளது. இருப்பினும் நீங்கள் வடிகட்டிகளைச் சேர்க்கலாம். ஆனால், அவை நீங்கள் [link]ஆட்ப்ளாக் பிளசினைச் செயல்படுத்தும்[/link] வரை செயல்படுத்தப்பட மாட்டாது.">
+<!ENTITY collapse.default.no.label "கொடாநிலையாகப் பயன்படுத்துக (இல்லை)">
+<!ENTITY preferences.label "&நடப்பு வடிகட்டிகளைக் காட்டு...">
+<!ENTITY advanced.label "மேம்பட்ட தோற்றம்">
+<!ENTITY pattern.label "வரிசைத்தன்மைக்காக பார்க்கிறது">
+<!ENTITY selectAllTypes.label "அனைத்தையும் தேர்ந்தெடு">
+<!ENTITY type.whitelist.label "&விடுப்பு விதி">
+<!ENTITY collapse.no.label "இல்லை">
+<!ENTITY dialog.title "ஆட்ப்ளாக் பிளஸ் வடிகட்டி விதியைச் சேர்">
+<!ENTITY basic.label "சாதாரண தோற்றம்">
+<!ENTITY filter.label "புதிய &வடிகட்டி:">
+<!ENTITY unselectAllTypes.label "எதையும் தேர்ந்தெடுக்காதே">
+<!ENTITY collapse.default.yes.label "கொடாநிலையாகப் பயன்படுத்துக (ஆம்)">
+<!ENTITY collapse.yes.label "ஆம்">
diff --git a/chrome/locale/th/overlay.dtd b/chrome/locale/th/overlay.dtd
index 0a1a8f5..3a080ee 100644
--- a/chrome/locale/th/overlay.dtd
+++ b/chrome/locale/th/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "ปิดการใช้งาน ?1?">
<!ENTITY filters.label "ตั้งค่าตัวกร&อง">
<!ENTITY disable.label "ปิดการใช้งานทุกที่">
-<!ENTITY showinaddonbar.label "แส&ดงในแถบ Add-on">
<!ENTITY objecttab.title "บล็อก">
<!ENTITY objecttab.tooltip "คลิกที่นี่เพื่อบล็อกวัตถุนี้ด้วย Adblock Plus">
<!ENTITY menuitem.label "&ปรับแต่ง Adblock Plus">
diff --git a/chrome/locale/tr/composer.dtd b/chrome/locale/tr/composer.dtd
index ee20c4e..67be4e6 100644
--- a/chrome/locale/tr/composer.dtd
+++ b/chrome/locale/tr/composer.dtd
@@ -1,15 +1,15 @@
<!ENTITY anchor.end.label "adresin s&onunda">
-<!ENTITY domainRestriction.label "&Alan adına kısıtlama:">
+<!ENTITY domainRestriction.label "Alan a&dına kısıtlama:">
<!ENTITY collapse.default.no.label "Öntanımlı kullan (hayır)">
-<!ENTITY firstParty.label "Yalnız birincil şahıs">
+<!ENTITY firstParty.label "Yalnız b&irinci kişilerden">
<!ENTITY preferences.label "Mevcut süzgeçleri &göster...">
-<!ENTITY pattern.label "Örnek arayın">
-<!ENTITY thirdParty.label "Yalnız üçüncül şahıs">
+<!ENTITY pattern.label "Aranacak örnek">
+<!ENTITY thirdParty.label "Yalnız üçün&cü kişilerden">
<!ENTITY filter.label "&Yeni süzgeç:">
-<!ENTITY collapse.label "Engellenenleri kapat:">
-<!ENTITY match.warning "Girdiğiniz örnek artık engellenecek olan veya kara listeden çıkarılacak adresle uyuşmuyor ve üzerinde hiçbir etkisi olmayacak.">
+<!ENTITY collapse.label "Engellenenleri ka&pat:">
+<!ENTITY match.warning "Girdiğiniz örnek, engellenecek veya kara listeden çıkarılacak adresle eşleşmiyor ve üzerinde hiçbir etkisi olmayacak.">
<!ENTITY anchor.start.label "adresin &başında">
-<!ENTITY matchCase.label "Büyük küçük harf duyarlı">
+<!ENTITY matchCase.label "&Büyük küçük harf duyarlı">
<!ENTITY custom.pattern.label "&Özel:">
<!ENTITY unselectAllTypes.label "Hiçbirini seçme">
<!ENTITY type.whitelist.label "&Hariç tutma kuralı">
@@ -20,7 +20,7 @@
<!ENTITY types.label "Bu türlere uygula:">
<!ENTITY shortpattern.warning "Girdiğiniz örnek en iyilemek için çok kısa ve bu tür örnekler taramayı yavaşlatabilir. Adblock Plus'ın bu süzgeci daha etkin işleyebilmesi için daha uzun bir satır seçmeniz tavsiye edilir.">
<!ENTITY collapse.yes.label "Evet">
-<!ENTITY anchors.label "Sadece örneği kabul et:">
+<!ENTITY anchors.label "Örneği sadece burada kabul et:">
<!ENTITY collapse.default.yes.label "Öntanımlı kullan (evet)">
<!ENTITY domainRestriction.help "Aralarına "|" simgesi koyarak bir ya da daha fazla alan adı belirtin. Böylece süzgeç sadece bu sitelerde uygulanacaktır. Alan adından önce "~" simgesi kullanılması, süzgecin o alan adında kullanılmaması gerektiği anlamına gelir.">
<!ENTITY accept.label "Süzgeç ekle">
diff --git a/chrome/locale/tr/filters.dtd b/chrome/locale/tr/filters.dtd
index 3941488..8c7ac35 100644
--- a/chrome/locale/tr/filters.dtd
+++ b/chrome/locale/tr/filters.dtd
@@ -1,18 +1,18 @@
<!ENTITY restore.custom.warning "Tüm isteğe bağlı süzgeçleriniz seçilen dosyanın içeriğiyle değiştirilecek. Devam etmek istiyor musunuz?">
-<!ENTITY slow.column "Süzgeçleri göster">
-<!ENTITY enabled.column "Aktif">
-<!ENTITY subscription.lastDownload.checksumMismatch "Doğrulama başarısız">
+<!ENTITY slow.column "Ya&vaş süzgeçler">
+<!ENTITY enabled.column "Etkin">
+<!ENTITY subscription.lastDownload.checksumMismatch "Olmadı. Sağlama yapılamadı">
<!ENTITY noFiltersInGroup.text "Seçili öbek boş">
<!ENTITY subscription.actions.label "Eylemler">
<!ENTITY filter.selectAll.label "Tümünü seç">
-<!ENTITY backupButton.label "Yedekle ve geri getir">
+<!ENTITY backupButton.label "&Yedekle ve geri getir">
<!ENTITY restore.minVersion.warning "Uyarı: Dosya Adblock Plus'ın daha yeni bir sürümüyle oluşturulmuş. Bu dosyayı geri getirmeden önce Adblock Plus'ı en güncel sürümüne yükseltmelisiniz.">
-<!ENTITY restore.error "Dosya verisi işlenemiyor. Bu dosya Adblock Plus yedeği olmayabilir?">
-<!ENTITY sort.ascending.label "A'da Z'ye sıralama">
-<!ENTITY sort.label "Sırala">
+<!ENTITY restore.error "Dosya verisi işlenemiyor. Adblock Plus yedeği olmayabilir mi?">
+<!ENTITY sort.ascending.label "&A'da Z'ye sıralama">
+<!ENTITY sort.label "&Sırala">
<!ENTITY subscription.source.label "Süzgeç listesi">
-<!ENTITY hitcount.column "İsabet">
-<!ENTITY noFilters.text "Henüz isteğe göre ayarlanmış süzgeciniz yok.">
+<!ENTITY hitcount.column "İsab&et">
+<!ENTITY noFilters.text "İsteğe göre ayarlanmış hiçbir süzgeciniz yok.">
<!ENTITY backup.custom.title "Sadece isteğe bağlı süzgeçler">
<!ENTITY subscription.external.label "Başka bir eklenti tarafından güncellendi">
<!ENTITY subscription.delete.label "Sil">
@@ -21,8 +21,8 @@
<!ENTITY restore.default.label "?1? tarihli yedek geri getirilsin mi?">
<!ENTITY subscription.lastDownload.inProgress "İndiriliyor...">
<!ENTITY subscriptions.tab.label "Süzgeç abonelikleri">
-<!ENTITY sort.descending.label "Z'den A'ya sıralama">
-<!ENTITY filters.remove.warning "Seçili süzgeçleri gerçekten silmek istiyor musunuz?">
+<!ENTITY sort.descending.label "&Z'den A'ya sıralama">
+<!ENTITY filters.remove.warning "Tüm seçili süzgeçleri gerçekten silmek istiyor musunuz?">
<!ENTITY filter.delete.label "Sil">
<!ENTITY addSubscriptionAdd.label "Ekle">
<!ENTITY viewMenu.label "Görünüm">
@@ -34,18 +34,18 @@
lütfen "Süzgeç aboneliği ekle" düğmesini kullanın.">
<!ENTITY subscription.update.label "Süzgeçleri güncelle">
<!ENTITY dialog.title "Adblock Plus Süzme Tercihleri">
-<!ENTITY addFilter.label "Süzgeç ekle">
+<!ENTITY addFilter.label "Süzgeç e&kle">
<!ENTITY subscription.minVersion.warning "Bu süzgeç aboneliği daha yeni bir Adblock Plus sürümü gerektiriyor. En güncel Adblock Plus sürümüne yükseltmelisiniz.">
-<!ENTITY subscription.lastDownload.invalidURL "Başarısız, geçerli bir adres değil">
+<!ENTITY subscription.lastDownload.invalidURL "Olmadı. Bu geçerli bir adres değil.">
<!ENTITY backup.error "Süzgeçler dosyaya yazılırken bir sorun meydana geldi. Dosyanın yazma korumalı veya başka bir uygulama tarafından kullanılmıyor olduğundan emin olun.">
<!ENTITY filter.moveUp.label "Yukarıya taşı">
-<!ENTITY addGroup.label "Süzgeç öbeği ekle">
+<!ENTITY addGroup.label "Sü&zgeç öbeği ekle">
<!ENTITY filter.edit.label "Düzenle">
<!ENTITY subscription.showHideFilters.label "Süzgeçleri göster/gizle">
-<!ENTITY acceptableAds2.label "Rahatsız etmeyen bazı reklamlara izin ver">
+<!ENTITY acceptableAds2.label "Rahatsız etmeyen bazı reklamlara &izin ver">
<!ENTITY addSubscriptionOther.label "Başka abonelik ekle">
<!ENTITY close.label "Kapat">
-<!ENTITY sort.none.label "Sıralanmamış">
+<!ENTITY sort.none.label "Sıralan&mamış">
<!ENTITY filter.actions.label "Süzgeç eylemleri">
<!ENTITY filter.copy.label "Kopyala">
<!ENTITY filter.moveDown.label "Aşağıya taşı">
@@ -59,16 +59,16 @@
<!ENTITY restore.complete.warning "Tüm süzme tercihleriniz seçilen dosyanın içeriğiyle değiştirilecek. Devam etmek istiyor musunuz?">
<!ENTITY filters.tab.label "İsteğe bağlı süzgeçler">
<!ENTITY backup.label "Yeni yedek oluştur">
-<!ENTITY find.label "Bul">
+<!ENTITY find.label "&Bul">
<!ENTITY subscription.moveDown.label "Aşağıya taşı">
-<!ENTITY subscription.lastDownload.connectionError "Başarısız, indirme hatası">
-<!ENTITY subscription.lastDownload.success "Başarılı">
+<!ENTITY subscription.lastDownload.connectionError "Olmadı. İndirmede sorun var.">
+<!ENTITY subscription.lastDownload.success "Eşleme başarılı oldu.">
<!ENTITY subscription.lastDownload.invalidData "Olmadı. Bu düzgün bir süzgeç listesi değil.">
<!ENTITY filter.paste.label "Yapıştır">
-<!ENTITY subscription.disabledFilters.enable "Kapatılmış süzgeçleri devreye sok">
+<!ENTITY subscription.disabledFilters.enable "Devre dışı süzgeçleri devreye sok">
<!ENTITY lasthit.column "Son isabet">
<!ENTITY subscription.editTitle.label "Başlığı değiştir">
<!ENTITY subscription.disabledFilters.warning "Bu abonelikteki bazı süzgeçler devre dışı.">
-<!ENTITY filter.column "Süzgeç kuralı">
-<!ENTITY subscription.lastDownload.label "Son Indirilen:">
+<!ENTITY filter.column "Süzgeç &kuralı">
+<!ENTITY subscription.lastDownload.label "Son indirme zamanı:">
<!ENTITY viewList.label "Listeye bak">
diff --git a/chrome/locale/tr/firstRun.properties b/chrome/locale/tr/firstRun.properties
index 36e29de..191298b 100644
--- a/chrome/locale/tr/firstRun.properties
+++ b/chrome/locale/tr/firstRun.properties
@@ -1,20 +1,21 @@
-firstRun_feature_tracking_description=İzlenmeyi kapatarak -her hareketinizi takip edecek reklam şirketlerinden izinizi saklayarak- kişisel güvenliğinizi koruyarak Web'de gezinin.
+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_acceptableAdsExplanation=Basit, sade reklam kullanmak için Web sitelerini teşvik etmek istiyoruz. Bu yüzden varsayılan ayarlar altında gösterilen, makul reklamları tanımlamak için <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_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_toggle_on=AÇIK
-firstRun_contributor_credits=Bağışçı Kredisi
-firstRun_feature_show_overview=genel bakışı göster
-firstRun_dataCorruptionWarning=Bu sayfa sürekli gösteriliyor mu? <a>Burayı Tıklayın!</a>
+firstRun_contributor_credits=Emeği Geçenler
+firstRun_feature_show_expanded=özellikleri etkinleştir
+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 söyleyin
-firstRun_share_headline=İnterneti daha iyi bir yer yapabilmek için <a>bize yardım edin</a>
+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_features=Adblock Plus reklamları engellemekten daha fazlasını yapabilir
-firstRun_feature_malware_description=Bilinen kötü amaçlı yazılıma sahip etki alanlarını engelleyerek gezintinizi daha güvenli hale getirin.
-firstRun_feature_social_description=Facebook Beğen butonu gibi, Web sitelerinde gözüken ve davranışlarınızı izleyen sosyal medya butonlarından otomatik olarak kurtulun.
-firstRun_donate=bağış yap
+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_show_overview=genel bakışı göster
+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_donate=bağış yapın
firstRun_donate_label=Projemize destek verin
-firstRun_feature_social=Sosyal Ortam Düğmelerini Kaldır
-firstRun_feature_show_expanded=özellikleri etkinleştir
+firstRun_feature_social=Sosyal Medya Düğmelerini Kaldır
+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.
diff --git a/chrome/locale/tr/global.properties b/chrome/locale/tr/global.properties
index c1573c1..befd101 100644
--- a/chrome/locale/tr/global.properties
+++ b/chrome/locale/tr/global.properties
@@ -2,13 +2,13 @@ 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.
type_label_script=betik
filter_elemhide_nocriteria=Gizlenecek bileşeni anlamak için hiçbir ölçüt belirtilmedi
-blockingGroup_title=Reklam engelleme kuralları
+blockingGroup_title=Reklam Engelleme Kuralları
whitelisted_tooltip=Adblock Plus etkin, ancak bu sayfada devre dışı.
type_label_stylesheet=biçem yaprağı
-blocked_count_tooltip=?1? toplam ?2?
+blocked_count_tooltip=toplamda ?1?, sayfada ?2?
type_label_font=yazı tipi
type_label_popup=açılır pencere
-filter_regexp_tooltip=Süzgeç ya düzenli ifade ya da en iyilemek için çok kısa. Bu süzgeçlerden çok fazlası, taramanızı yavaşlatabilir.
+filter_regexp_tooltip=Süzgeç ya düzenli ifade ya da en iyileştirilmek için çok kısa. Bu süzgeçlerden çok fazlası, taramanızı yavaşlatabilir.
action0_tooltip=İçerik menüsünü açmak için tıklayın; etkinleştirmek ya da etkisizleştirmek için orta düğmeye tıklayın.
whitelisted_page=Adblock Plus bakılan sayfa için devre dışı bırakıldı
remove_group_warning=Bu grubu kaldırmayı gerçekten istiyor musunuz?
@@ -17,14 +17,14 @@ type_label_xmlhttprequest=XML isteği
active_tooltip=Adblock Plus devrede ve ?1? süzgeç aboneliği ile ?2? özel süzgeç kullanıyor.
type_label_document=belge
type_label_object_subrequest=nesne alt isteği
-whitelistGroup_title=Ayrıcalık kuralları
+whitelistGroup_title=Hariç Tutma Kuralları
disabled_tooltip=Adblock Plus etkin değil.
filter_elemhide_duplicate_id=Gizlenecek sadece bir bileşen kimliği belirtilebilir
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 işlem isabet istatistiklerinin sıfırlanması ve artık istatistik tutulmamasıyla sonuçlanacak. Devam etmek istiyor musunuz?
-blocked_count_addendum=(ayrıca ?1? tane beyaz listede, ?2? tane gizli)
+clearStats_warning=Bu hareket isabet istatistiklerinin sıfırlanması ve artık istatistik tutulmamasıyla sonuçlanacak. Devam etmek 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
remove_subscription_warning=Gerçekten abonelikten çıkmak istiyor musunuz?
@@ -32,7 +32,7 @@ type_label_other=diğer
mobile_menu_enable=ABP: Etkinleştir
type_label_media=ses/görüntü
mobile_menu_disable_site=ABP: ?1? sitesinde etkisizleştirilsin mi?
-elemhideGroup_title=Öğe gizleme kuralları
+elemhideGroup_title=Öğe Gizleme Kuralları
mobile_menu_enable_site=ABP: ?1? sitesinde etkinleştirilsin mi?
type_label_elemhide=gizli
newGroup_title=Yeni süzgeç öbeği
diff --git a/chrome/locale/tr/meta.properties b/chrome/locale/tr/meta.properties
index 8c26545..1b411eb 100644
--- a/chrome/locale/tr/meta.properties
+++ b/chrome/locale/tr/meta.properties
@@ -1,6 +1,6 @@
description.short=Reklamlar rahatsız mı ediyor? İzlenmek sorun mu yaratıyor? Koca koca tanıtımlardan bıktınız mı? Hemen Adblock Plus'ı kurun ve internetin kontrolünü yeniden ele geçirin, sayfaların nasıl görüneceğine siz karar verin.
name=Adblock Plus
description.long.addition1=Adblock Plus 2.0 ile birlikte Süzgeç Tercihler bölümünde rahatsız etmeyen reklamlara izin verme seçeneği yer alıyor. Burada amaç rahatsız edici reklamlara yer vermeyen siteleri desteklemek, diğer siteleri de bu yönde hareket etmeleri için yüreklendirmek. <a href="http://adblockplus.org/en/acceptable-ads">Devamını okuyun.</a>
-translator=Wladimir Palant
+translator=Ahmet Serkan Tıratacı
description.long=Adblock Plus internetin kontrolünü yeniden ele geçirinmenize ve sayfaların nasıl görüneceğine karar vermesinize olanak tanır. Reklamları yok etmekten zararlı yazılım dağıtan siteleri engellemeye kadar birçok işi gören farklı dildeki 40'ı aşkın süzgeç, Adblock Plus'ın arkasında. Adblock Plus ayrıca çeşitli yararlı özellikler sayesinde süzgeçlerinizi düzenlemenize yardım eder. Bu özellikler arasında, sayfa üzerinden resim engelleme; Flash ve Java nesneleri için engelleme s [...]
description=Reklamlar geçmişte kaldı!
diff --git a/chrome/locale/tr/overlay.dtd b/chrome/locale/tr/overlay.dtd
index d859486..0875952 100644
--- a/chrome/locale/tr/overlay.dtd
+++ b/chrome/locale/tr/overlay.dtd
@@ -1,29 +1,28 @@
-<!ENTITY sync.label "Adblock Plus ayarlarını eşitle">
+<!ENTITY sync.label "Adblock Plus ayarlarını &eşitle">
<!ENTITY whitelist.site.label "?1? sitesinde devre dışı kal">
-<!ENTITY filters.label "Süzgeç tercihleri">
+<!ENTITY filters.label "&Süzgeç tercihleri">
<!ENTITY disable.label "Her yerde devre dışı kal">
-<!ENTITY showinaddonbar.label "Eklenti çubuğunda göster">
<!ENTITY objecttab.title "Engelle">
<!ENTITY objecttab.tooltip "Bu nesneyi Adblock Plus ile engellemek için buraya tıklayın.">
-<!ENTITY menuitem.label "Adblock Plus tercihleri">
-<!ENTITY objecttabs.label "Flash ve Java'yı kulakçıklarla belirt">
-<!ENTITY sendReport.label "Bu sayfadaki sorunu bildir">
+<!ENTITY menuitem.label "Adblock Plus Tercihleri">
+<!ENTITY objecttabs.label "Flash ve &Java'yı kulakçıklarla belirt">
+<!ENTITY sendReport.label "&Bu sayfadaki sorunu bildir">
<!ENTITY whitelist.page.label "Sadece bu sayfada devre dışı kal">
-<!ENTITY context.image.label "Resmi engelle">
+<!ENTITY context.image.label "Adblock Plus: Resmi engelle">
<!ENTITY counthits.label "Süzgeç isa&betini say">
-<!ENTITY opensidebar.label "Engellenebilecek öğeleri göster">
+<!ENTITY opensidebar.label "E&ngellenebilecek öğeleri göster">
<!ENTITY contribute.label "Adblock Plus'a katkıda bulun">
<!ENTITY toolbarbutton.label "Adblock Plus">
-<!ENTITY context.frame.label "Çerçeveyi engelle">
+<!ENTITY context.frame.label "Adblock Plus: Çerçeveyi engelle">
<!ENTITY blocked.tooltip "Bu sayfada engellenen öğeler:">
-<!ENTITY hideplaceholders.label "Engellenen öğelerin yer işaretlerini gizle">
+<!ENTITY hideplaceholders.label "Enge&llenen öğelerin yer işaretlerini gizle">
<!ENTITY showinstatusbar.label "&Durum çubuğunda göster">
<!ENTITY sidebar.title "Bu sayfadaki engellenebilecek öğeler">
-<!ENTITY options.label "Seçenekler">
-<!ENTITY context.object.label "Nesneyi engelle">
+<!ENTITY options.label "S&eçenekler">
+<!ENTITY context.object.label "Adblock Plus: Nesneyi engelle">
<!ENTITY context.removeWhitelist.label "Adblock Plus: Bu sayfada devreye sok">
<!ENTITY filters.tooltip "En etkin süzgeçler:">
-<!ENTITY closesidebar.label "Engellenebilecek öğeleri gizle">
-<!ENTITY showintoolbar.label "Araç çubuğunda göster">
+<!ENTITY closesidebar.label "E&ngellenebilecek öğeleri gizle">
+<!ENTITY showintoolbar.label "A&raç çubuğunda göster">
<!ENTITY status.tooltip "Durum:">
-<!ENTITY context.media.label "Ses/Video engelle">
+<!ENTITY context.media.label "Adblock Plus: Ses/video engelle">
diff --git a/chrome/locale/tr/sendReport.dtd b/chrome/locale/tr/sendReport.dtd
index 91373f1..c187ec1 100644
--- a/chrome/locale/tr/sendReport.dtd
+++ b/chrome/locale/tr/sendReport.dtd
@@ -3,22 +3,22 @@
<!ENTITY showData.label "Bildirim verisini göster">
<!ENTITY typeSelector.falsePositive.label "Adblock Plus çok &fazla engelleme yapıyor">
<!ENTITY issues.change.description "Yapılandırmanız değişti. Lütfen değişiklikleri sınamak için sayfayı yeniden yükleyin ve yapılan değişiklikler sorunu gidermediyse hatayı bildirin.">
-<!ENTITY email.label "E-posta:">
+<!ENTITY email.label "E-&posta:">
<!ENTITY issues.openPreferences.label "Süzgeç tercihlerini aç">
<!ENTITY sendPage.confirmation "Bildiriminiz kaydedildi ve ona aşağıdaki adresten ulaşabilirsiniz:">
-<!ENTITY copyLink.label "Bildirimi bağlantısını kopyala">
+<!ENTITY copyLink.label "Bildirimi bağlantısını &kopyala">
<!ENTITY issues.nofilters.description "Adblock Plus bu sayfada hiçbir şeyi engellemiyor. Gözlemlediğiniz sorun büyük olasılıkla Adblock Plus ile ilgisiz.">
<!ENTITY sendPage.knownIssue "Bildirdiğiniz sorun büyük olasılıkla biliniyor. Daha fazla bilgi:">
<!ENTITY typeSelector.other.description "Sorunun süzgeçlerinden çok Adblock Plus'ın kendisinden kaynaklandığından şüpheleniyorsanız bu seçeneği seçin.">
<!ENTITY issues.disabledgroups.enable.label "Süzgeç aboneliğini veya grubunu devreye sok">
<!ENTITY typeWarning.override.label "Anlıyorum ve ne olur&sa olsun bildirimi göndermek istiyorum">
<!ENTITY issues.disabled.enable.label "Adblock Plus'ı etkinleştir">
-<!ENTITY update.fixed.description "Süzgeç aboneliklerinize yapılan güncellemeler muhtemelen bildirmek istediğiniz sorunu giderdi. Sayfayı tekrar yükleyip bir daha deneyin,sorun devam ediyor ise bildirin.">
-<!ENTITY anonymous.label "Anonim gönder">
-<!ENTITY reloadButton.label "Sayfayı tazele">
+<!ENTITY update.fixed.description "Süzgeç aboneliklerinize yapılan güncellemeler muhtemelen bildirmek istediğiniz sorunu giderdi. Sayfayı tekrar yükleyip bir daha deneyin, hâlâ sorun varsa bildirin.">
+<!ENTITY anonymous.label "&Anonim gönder">
+<!ENTITY reloadButton.label "Sayfayı &tazele">
<!ENTITY recentReports.clear.label "Tüm bildirimleri sil">
<!ENTITY typeSelector.description "Bu pencere Adblock Plus sorun bildirimi göndermek için gerekli adımların atılmasında size rehberlik edecek. Önce bu sayfada ne tür sorun yaşadığınızı seçin:">
-<!ENTITY screenshot.remove.label "Hassas veriyi sil">
+<!ENTITY screenshot.remove.label "Hassas &veriyi sil">
<!ENTITY issues.ownfilters.description "Bu sayfada uygulanan süzgeçlerin bazıları kullanıcı tarafından tanımlanmış. Lütfen soruna neden olmuş olabilecek süzgeçleri devre dışı bırakın:">
<!ENTITY update.inProgress.description "Bu sorunun süzgeç güncellemesiyle giderilmesinin mümkün olup olmadığını tespit etmek için abonelikleriniz şimdi güncellenecektir. Lütfen bekleyin...">
<!ENTITY sendPage.retry.label "Yeniden gönder">
@@ -28,24 +28,24 @@
<!ENTITY issues.disabled.description "Adblock Plus devre dışı ve şu anki durumunda hiçbir şeyi engellemeyecek.">
<!ENTITY attachExtensions.label "Sor&un kaynağının eklenti uyumsuzluğu olup olmadığının belirlenmesi için etkin eklentilerin listesini bildirime ekle">
<!ENTITY issues.nosubscriptions.add.label "Süzgeç aboneliği ekle">
-<!ENTITY issues.disabledfilters.enable.label "Süzgeci etkinleştir">
-<!ENTITY issues.override.label "Yapılandırma doğru, bildirime devam et">
+<!ENTITY issues.disabledfilters.enable.label "Süzgeci devreye sok">
+<!ENTITY issues.override.label "Yapılan&dırma doğru, bildirime devam et">
<!ENTITY issues.nosubscriptions.description "Sitelerdeki istenmeyen içeriği yok eden önceden hazırlanmış süzgeç listelerinden herhangi birine abone olmuş değilsiniz.">
<!ENTITY typeSelector.falsePositive.description "Sayfanın önemli içeriği hiç görünmüyorsa, yanlış görünüyorsa veya sayfa düzgün işlemiyorsa bu seçeneği seçin. Sorun kaynağının Adblock Plus olup olmadığını eklentiyi geçici olarak devre dışı bırakıp belirleyebilirsiniz.">
<!ENTITY typeSelector.other.label "Başka bir sorun">
-<!ENTITY emailComment.label "Size, raporunuz hakkında sorularımız olursa sizinle iletişime geçebilmemiz için geçerli bir e-posta adresi girmenizi öneriyoruz. Bu aynı zamanda katılımlarınızı hatırlamamızı ve önceliklerini yüksek olarak ayarlamamızı sağlar.">
+<!ENTITY emailComment.label "Sizi, raporunuz hakkında sorularımız olursa sizinle iletişime geçebilmemiz için geçerli bir e-posta adresi girmeye teşvik ediyoruz. Bu aynı zamanda katılımlarınızı hatırlamamızı ve önceliklerini yüksek olarak ayarlamamızı sağlar.">
<!ENTITY issues.whitelist.remove.label "Adblock Plus'u bu sayfada devreye sok">
<!ENTITY outdatedSubscriptions.description "Aşağıdaki süzgeç abonelikleri en az 2 haftadır güncellenmedi. Bildirmeden önce lütfen bu abonelikleri güncelleyin, sorun çoktan giderilmiş olabilir.">
<!ENTITY dataCollector.description "Adblock Plus eklentisinin gerekli bilgileri toplaması için lütfen biraz bekleyin.">
<!ENTITY sendButton.label "&Bildirimi gönder">
-<!ENTITY comment.label "Yorum (isteğe bağlı):">
+<!ENTITY comment.label "Y&orum (isteğe bağlı):">
<!ENTITY sendPage.errorMessage "Hata bildirimi gönderme girişiminiz "?1?" hata koduyla başarısız oldu. Lütfen internete bağlı olduğunuzdan emin olun ve yeniden deneyin. Sorun devam ederse lütfen [link]Adblock Plus forumunda[/link] yardım isteyin.">
<!ENTITY showRecentReports.label "Yakında gönderilen bildirimleri göster">
<!ENTITY commentPage.heading "Yorum ekle">
<!ENTITY update.start.label "Güncellemeyi şimdi başlat">
<!ENTITY issues.disabledfilters.description "Bu sayfada etkisi olabilecek aşağıdaki süzgeçler devre dışı bırakıldı:">
<!ENTITY screenshot.description "Aynı sayfa farklı kişilerce farklı biçimde görülebilir. Bildirime ekran görüntüsü eklemeniz sorunu anlamamıza yardımcı olabilir. Hassas bilgilerin olduğu bölümleri silebilirsiniz ve sorunun görünür olduğu yerleri işaretleyebilirsiniz. Bunu yapmak için ilgili düğmeye basın ve resimde bir bölümü farenizle seçin.">
-<!ENTITY screenshot.attach.label "Bildirime sayfa resmi ekle">
+<!ENTITY screenshot.attach.label "Bildirime say&fa resmi ekle">
<!ENTITY issues.whitelist.description "Adblock Plus bildirimde bulunduğunuz sayfada devre dışı. Bu sorunun incelenmesine yardım etmek için bildirim göndermeden önce eklentiyi devreye sokun ve sayfayı yeniden yükleyin.">
<!ENTITY typeSelector.falseNegative.label "Adblock Plus reklamın birini engellemiyor">
<!ENTITY typeSelector.heading "Sorun türünü seçin">
@@ -59,7 +59,7 @@
<!ENTITY dataCollector.heading "Sorun bildiriciye hoş geldiniz">
<!ENTITY screenshot.heading "Ekran görüntüsü ekle">
<!ENTITY sendPage.heading "Bildirimi gönder">
-<!ENTITY issues.subscriptionCount.description "Çok fazla süzgeç listesine abone olduğunuz görülüyor. Böyle yapmanız tavsiye edilmez çünkü bu, sorun çıkma olasılığını daha da arttırır. Ayrıca hangi süzgeç aboneliği yazarının hatayı düzeltmesi gerektiği belirsiz olduğundan hata bildiriminizi kabul edemeyiz. Sadece gerçekten gerekli olan süzgeç abonelikleri dışında kalanlardan çıkın ve sorunun hâlâ yaşanıp yaşanmadığına tekrar bakın.">
-<!ENTITY screenshot.mark.label "Sorunu işaretle">
+<!ENTITY issues.subscriptionCount.description "Çok fazla süzgeç listesine abone olduğunuz görülüyor. Böyle yapmanız tavsiye edilmez çünkü bu, sorun çıkma olasılığını daha da arttırır. Ayrıca hangi süzgeç aboneliği yazarının hatayı düzeltmesi gerektiği belirsiz olduğundan hata bildiriminizi kabul edemeyiz. Sadece gerçekten gerekli olan süzgeç abonelikleri dışında kalanlardan çıkın ve sorunun hâlâ yaşanıp yaşanmadığına bakın.">
+<!ENTITY screenshot.mark.label "Sorunu iş&aretle">
<!ENTITY privacyPolicy.label "Gizlilik politikası">
<!ENTITY issues.description "Adblock Plus yapılandırmanızda bu sorunun nedeni olabilecek veya bildirimi incelemeyi güçleştirecek sorunlar keşfetti.">
diff --git a/chrome/locale/tr/sidebar.dtd b/chrome/locale/tr/sidebar.dtd
index 8bbf29a..667d01f 100644
--- a/chrome/locale/tr/sidebar.dtd
+++ b/chrome/locale/tr/sidebar.dtd
@@ -1,5 +1,5 @@
<!ENTITY context.flash.label "Flash öğesinin sınırları">
-<!ENTITY address.label "Adres">
+<!ENTITY address.label "Konum">
<!ENTITY context.open.label "Yeni sekmede aç">
<!ENTITY type.label "Tür">
<!ENTITY tooltip.filterSource.label "Süzgeç kaynağı:">
@@ -13,19 +13,19 @@
<!ENTITY tooltip.docDomain.label "Belge kaynağı:">
<!ENTITY context.copy.label "Öğenin konumunu kopyala">
<!ENTITY tooltip.type.label "Tür:">
-<!ENTITY context.disablefilter.label "Süzgeci devre dışı bırak ?1?">
+<!ENTITY context.disablefilter.label "?1? süzgecini devre dışı bırak">
<!ENTITY context.copyFilter.label "Süzgeci kopyala">
<!ENTITY context.block.label "Bu öğeyi engelle">
-<!ENTITY context.enablefilter.label "Süzgeci devreye sok ?1?">
+<!ENTITY context.enablefilter.label "?1? süzgecini devreye sok">
<!ENTITY detach.label "Ayır">
-<!ENTITY whitelisted.label "Beyaz listeye dahil sayfa">
-<!ENTITY context.disablefilteronsite.label "Bu süzgeci burada kullanma ?1?">
+<!ENTITY whitelisted.label "Ak listeye dahil bir sayfa">
+<!ENTITY context.disablefilteronsite.label "Bu süzgeci ?1? alan adında kullanma">
<!ENTITY detached.title "Adblock Plus: Engellenebilecek öğeler (ayrıldı)">
<!ENTITY docDomain.firstParty "(birinci taraf)">
-<!ENTITY tooltip.type.whitelisted "(Beyaz listede)">
-<!ENTITY tooltip.filter.label "Geçerli süzgeç:">
+<!ENTITY tooltip.type.whitelisted "(ak listede)">
+<!ENTITY tooltip.filter.label "Yürürlükteki süzgeç:">
<!ENTITY tooltip.filter.disabled "(devre dışı)">
-<!ENTITY context.editfilter.label "Geçerli süzgeci düzelt">
+<!ENTITY context.editfilter.label "Yürürlükteki süzgeci düzelt">
<!ENTITY tooltip.type.blocked "(engellendi)">
<!ENTITY size.label "Boyut">
<!ENTITY context.whitelist.label "Öğeye ayrıcalık tanı">
diff --git a/chrome/locale/tr/subscriptionSelection.dtd b/chrome/locale/tr/subscriptionSelection.dtd
index 1a34aa0..b60a9e2 100644
--- a/chrome/locale/tr/subscriptionSelection.dtd
+++ b/chrome/locale/tr/subscriptionSelection.dtd
@@ -1,12 +1,12 @@
-<!ENTITY addMain.label ""?1?" süzgeç aboneliğini de ekle">
+<!ENTITY addMain.label ""?1?" süzgecine de abone ol">
<!ENTITY list.download.failed "Adblock Plus abonelik listesini alamadı">
-<!ENTITY list.download.retry "Tekrar deneyin">
-<!ENTITY title.label "Aboneliğin adı:">
+<!ENTITY list.download.retry "Yeniden dene">
+<!ENTITY title.label "&Aboneliğin adı:">
<!ENTITY list.download.website "Siteye git">
-<!ENTITY supplementMessage "Bu süzgeç aboneliğini henüz kullanmadığınız, bu süzgeç "?1?" süzgeç aboneliğiyle kullanılmak üzere hazırlanmış.">
+<!ENTITY supplementMessage "Bu süzgeç aboneliği henüz kullanmadığınız "?1?" süzgeç aboneliğiyle kullanılmak üzere hazırlanmış.">
<!ENTITY viewList.label "Süzgeçlere bak">
<!ENTITY visitHomepage.label "Ana sayfaya git">
<!ENTITY addSubscription.label "Abone ol">
<!ENTITY dialog.title "Adblock Plus süzgeç aboneliği ekle">
-<!ENTITY location.label "Süzgeç listesi konumu:">
+<!ENTITY location.label "Süzgeç &listesi konumu:">
<!ENTITY fromWeb.description "Lütfen bu süzgeç aboneliğini eklemek istediğinizi teyit edin. Eklemeden önce abonelik adını ve konumunu değiştirebilirsiniz.">
diff --git a/chrome/locale/uk/composer.dtd b/chrome/locale/uk/composer.dtd
index 44d4969..565b21f 100644
--- a/chrome/locale/uk/composer.dtd
+++ b/chrome/locale/uk/composer.dtd
@@ -20,14 +20,14 @@
<!ENTITY types.label "Застосовувати до об’єктів:">
<!ENTITY shortpattern.warning "Шаблон що ви ввели закороткий для оптимізування, багато таких шаблонів можуть уповільнити перегляд сторінок. Рекомендовано обрати довшу строку для цього фільтра">
<!ENTITY collapse.yes.label "Так">
-<!ENTITY anchors.label "Шаблон має бути">
+<!ENTITY anchors.label "Застосувати шаблон лише:">
<!ENTITY collapse.default.yes.label "Як завжди (так)">
<!ENTITY domainRestriction.help "Вкажіть один чи більше доменів, розділених символом „|“, фільтр буде застосовано лише на них. Символ „~“ перед іменем домена вказує що фільтр на цей домен не розповсюджується.">
<!ENTITY accept.label "Додати фільтр">
-<!ENTITY options.label "Настройки">
-<!ENTITY disabled.warning "Adblock Plus наразі вимкнений. Ви все одно можете додавати фільтри, але вони не застосуються. Хіба що ви можете [link]увімкнути Adblock Plus[/link].">
+<!ENTITY options.label "Налаштування">
+<!ENTITY disabled.warning "Adblock Plus наразі вимкнений. Ви все одно можете додавати фільтри, але вони не застосуються, доки ви [link] не увімкнете Adblock Plus[/link].">
<!ENTITY anchor.start.flexible.label "на &початку імені домена">
<!ENTITY collapse.no.label "Ні">
<!ENTITY selectAllTypes.label "Вибрати все">
-<!ENTITY advanced.label "Складний вигляд">
+<!ENTITY advanced.label "Розширений вигляд">
<!ENTITY pattern.explanation "Шаблон може бути будь-якою частиною адреси, символ * працює як джокер. Фільтр буде застосовано лише до адрес що відповідають шаблону.">
diff --git a/chrome/locale/uk/filters.dtd b/chrome/locale/uk/filters.dtd
index 96424cf..2d0b05b 100644
--- a/chrome/locale/uk/filters.dtd
+++ b/chrome/locale/uk/filters.dtd
@@ -33,7 +33,7 @@
<!ENTITY subscription.update.label "Оновити фільтри">
<!ENTITY dialog.title "Налаштування фільтрів Адблоку">
<!ENTITY addFilter.label "&Додати фільтр">
-<!ENTITY subscription.minVersion.warning "Ця фільтрова підписка потребує новішої версії Adblock Plus. Вам слід оновитись до останньої версії Adblock Plus.">
+<!ENTITY subscription.minVersion.warning "Ця підписка фільтрів потребує новішої версії Adblock Plus. Вам слід оновитись до останньої версії Adblock Plus.">
<!ENTITY subscription.lastDownload.invalidURL "Помилка, невірна адреса">
<!ENTITY backup.error "Під час запису фільтрів у файл сталася помилка. Упевніться, що файл не захищений від запису і не використовується іншою програмою.">
<!ENTITY filter.moveUp.label "Зсунути вверх">
@@ -61,7 +61,7 @@
<!ENTITY subscription.moveDown.label "Зсунути вниз">
<!ENTITY subscription.lastDownload.connectionError "Помилка, неможливо викачати">
<!ENTITY subscription.lastDownload.success "Успіх">
-<!ENTITY subscription.lastDownload.invalidData "Помилка, не список фільтрів">
+<!ENTITY subscription.lastDownload.invalidData "Помилка, не правильний список фільтрів">
<!ENTITY filter.paste.label "Вставити">
<!ENTITY subscription.disabledFilters.enable "Увімкнути вимкнені фільтри">
<!ENTITY lasthit.column "&Останнє попадання">
diff --git a/chrome/locale/uk/firstRun.properties b/chrome/locale/uk/firstRun.properties
index df41c73..8ee5d34 100644
--- a/chrome/locale/uk/firstRun.properties
+++ b/chrome/locale/uk/firstRun.properties
@@ -6,15 +6,16 @@ firstRun_title=Adblock Plus вже встановлено
firstRun_acceptableAdsExplanation=Ми хотіли б заохотити веб-сайти використовувати просту, ненав'язливу рекламу. Ось чому ми вже створені <a>суворі керівні принципи</a> для ідентифікації прийнятної реклами, які відображаються у групі типових налаштувань. Якщо потрібно заблокувати кожну рекламу, то ви можете <a>вимкнути</a> це за декілька секунд.
firstRun_toggle_on=УВІМК
firstRun_contributor_credits=Внески учасників
-firstRun_feature_show_overview=показати огляд
+firstRun_feature_show_expanded=активувати функції
firstRun_dataCorruptionWarning=Ця сторінка все ще відображається? <a>Натисніть тут!</a>
firstRun_acceptableAdsHeadline=Дратівлива реклама буде надалі блокуватися
firstRun_share=Розказати друзям
firstRun_share_headline=<a>Подайте нам руку</a> для створення кращого середовища у мережі
firstRun_features=Adblock Plus може зробити більше, ніж блокування реклами
firstRun_feature_malware_description=Убезпечте ваші перегляд через блокування доменів відомих зловмисних програм.
+firstRun_feature_show_overview=показати огляд
firstRun_feature_social_description=Автоматично прибирає кнопки соціальних мереж на кшталт Facebook, які з'являються на веб-сторінках і відстежують вашу поведінку.
firstRun_donate=пожертва
firstRun_donate_label=Підтримайте наш проект
firstRun_feature_social=Видаляє кнопки соціальних мереж
-firstRun_feature_show_expanded=активувати функції
+firstRun_legacySafariWarning=Ви використовуєте стару версію Safari, який не підтримується Adblock Plus. Вона може не працювати належним чином або погіршувати якість роботи користувача на деяких веб-сайтах. Ми настійно рекомендуємо оновлення Safari 6.1.1 або вище (в OS X 10.8 Гірський Лев), або Safari 7.0.1 або вище (в OS X 10.9 Mavericks), або використовувати останню версію Mozilla Firefox, Google Chrome або Mozilla
diff --git a/chrome/locale/uk/global.properties b/chrome/locale/uk/global.properties
index 65cca48..034ce81 100644
--- a/chrome/locale/uk/global.properties
+++ b/chrome/locale/uk/global.properties
@@ -1,14 +1,14 @@
no_blocking_suggestions=На відкритій сторінці немає елементів, які можна було б заблокувати
action3_tooltip=Клацніть, щоб увімкнути чи вимкнути Adblock Plus.
type_label_script=Скрипт
-filter_elemhide_nocriteria=Не вказаний критерій за яким упізнати приховуваний елемент
+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=Цей фільтр або регулярний вираз або закороткий для оптимізування. Забагато фільтрів можуть вповільнити перегляд сторінок
+filter_regexp_tooltip=Цей фільтр або є регулярним виразом, або занадто короткий для оптимізації. Забагато фільтрів можуть вповільнити перегляд сторінок
action0_tooltip=Клацніть, щоб відкрити контекстне меню. Середня клавіша миші — вкл/викл.
whitelisted_page=Adblock Plus вимкнено для цієї сторінки
remove_group_warning=Ви дійсно бажаєте видалити цю групу?
@@ -19,7 +19,7 @@ type_label_document=Документ
type_label_object_subrequest=Запит об’єкта
whitelistGroup_title=Правила винятків
disabled_tooltip=Adblock Plus вимкнено.
-filter_elemhide_duplicate_id=Можна вказати лише один ID приховуваного елемента
+filter_elemhide_duplicate_id=Можна вказати лише один ID елемента, що буде приховано.
type_label_object=Об’єкт
action2_tooltip=Клацніть, щоб відкрити вікно налаштувань. Середня клавіша миші — вкл/викл.
type_label_subdocument=Фрейм
@@ -28,7 +28,7 @@ blocked_count_addendum=(також відкрито: ?1?, приховано: ?2
subscription_invalid_location=Не вдалося розпізнати введену адресу ні як інтернет адресу, ні як шлях до файлу.
type_label_image=Зображення
remove_subscription_warning=Ви впевнені, що хочете вилучити цю підписку?
-type_label_other=Невідомий
+type_label_other=Інший
mobile_menu_enable=ABP: Увімкнути
type_label_media=аудіо/відео
mobile_menu_disable_site=ABP: Вимкнути на ?1?
diff --git a/chrome/locale/uk/meta.properties b/chrome/locale/uk/meta.properties
index ad0e2f5..6944abf 100644
--- a/chrome/locale/uk/meta.properties
+++ b/chrome/locale/uk/meta.properties
@@ -1,6 +1,6 @@
-description.short=Дратують реклами? Непокоїть стеження? Набридли банери? Встановіть Adblock Plus щоб повернути собі владу над інтернетом, щоб змінити те, якою ви бачите мережу.\n\nКороткий відеоогляд знаходиться на http://www.youtube.com/watch?v=oNvb2SjVjjI
+description.short=Дратує реклама? Непокоїть стеження? Набридли банери? Встановіть Adblock Plus щоб повернути собі сонтроль над інтернетом і змінити те, як ви бачите мережу.\n\nКороткий відеоогляд знаходиться на http://www.youtube.com/watch?v=oNvb2SjVjjI
name=Adblock Plus
description.long.addition1=Починаючи з Adblock Plus 2.0 з'явилася можливість дозволити в налаштуваннях фільтрів деяку ненав'язливу рекламу. Таким чином можна підтримати сторінки, які не нав'язують рекламу відвідувачам. Ми сподіваємося, що в результаті більше сторінок стане використовувати ненав'язливу рекламу. <a href="http://adblockplus.org/ru/acceptable-ads"> Додаткова інформація </ a>
translator=Тимофій Бабич
-description.long=Встановіть Adblock Plus щоб повернути собі владу над інтернетом, щоб бачити мережу такою, як вам того хочеться. До цього додатку є більше сорока фільтрових підписок десятками мов. Це дозволяє автоматично налаштувати його на будь-які потреби, від прибирання онлайнової реклами до блокування всіх відомих зловмисних сайтів. Adblock Plus також дозволяє настроювати ваші фільтри з допомогою безлічі корисних можливостей. Таких як контекстна команда для зображень, ярличок блокува [...]
+description.long=Встановіть Adblock Plus щоб повернути собі контроль над інтернетом, щоб бачити мережу такою, як вам того хочеться. До цього додатку є більше сорока фільтрових підписок з десятками мов. Це дозволяє автоматично налаштувати його на будь-які потреби, від прибирання онлайнової реклами до блокування всіх відомих зловмисних сайтів. Adblock Plus також дозволяє налаштовувати ваші фільтри з допомогою багатьох корисних можливостей. Таких як контекстна команда для зображень, ярличок [...]
description=Скажи «НІ» рекламі!
diff --git a/chrome/locale/uk/overlay.dtd b/chrome/locale/uk/overlay.dtd
index 15bcd3e..35d1659 100644
--- a/chrome/locale/uk/overlay.dtd
+++ b/chrome/locale/uk/overlay.dtd
@@ -1,8 +1,7 @@
-<!ENTITY sync.label "Синхроні&зувати налаштуванна Адблоку">
+<!ENTITY sync.label "Синхроні&зувати налаштування Адблоку">
<!ENTITY whitelist.site.label "Вимкнути: на ?1?">
<!ENTITY filters.label "&Налаштування фільтрів">
<!ENTITY disable.label "Вимкнути всюди">
-<!ENTITY showinaddonbar.label "Показувати в панелі &додатків">
<!ENTITY objecttab.title "Заблокувати">
<!ENTITY objecttab.tooltip "Натисніть тут, щоб заблокувати цей об’єкт">
<!ENTITY menuitem.label "Налаштування &Adblock Plus">
diff --git a/chrome/locale/uk/sendReport.dtd b/chrome/locale/uk/sendReport.dtd
index 1b9c50d..2f025d7 100644
--- a/chrome/locale/uk/sendReport.dtd
+++ b/chrome/locale/uk/sendReport.dtd
@@ -7,15 +7,15 @@
<!ENTITY issues.openPreferences.label "Відкрити фільтрові підписки">
<!ENTITY sendPage.confirmation "Звіт було записано. Ви можете переглянути його за посиланням:">
<!ENTITY copyLink.label "С&копіювати посилання звіту">
-<!ENTITY issues.nofilters.description "Adblock Plus не блокує нічого на поточній сторінці. Маайже напевне, проблема, яку ви бачите, не пов’язана з Adblock Plus.">
+<!ENTITY issues.nofilters.description "Adblock Plus не блокує нічого на поточній сторінці. Швидше за все проблема, яку ви бачите, не пов’язана з Adblock Plus.">
<!ENTITY sendPage.knownIssue "Проблема про яку ви повідомили вже відома. Детальніше:">
-<!ENTITY typeSelector.other.description "Виберіть цей варіант якщо ви підозрюєте проблему саме з Adblock Plus ніж з його фільтрами.">
+<!ENTITY typeSelector.other.description "Виберіть цей варіант якщо ви підозрюєте проблему саме з Adblock Plus а не з його фільтрами.">
<!ENTITY issues.disabledgroups.enable.label "Увімкнути фільтрову підписку/групу">
-<!ENTITY typeWarning.override.label "Я &розумію, та все ж хочу послати звіт">
+<!ENTITY typeWarning.override.label "Я &розумію, та все ж хочу надіслати звіт">
<!ENTITY issues.disabled.enable.label "Увімкнути Adblock Plus">
<!ENTITY update.fixed.description "Оновлення ваших підписок на фільтри швидше за все вирішило проблему, про яку ви хотіли повідомити. Будь ласка завантажте заново сторінку і спробуйте ще раз. Якщо проблема залишилася, то надішліть повідомлення ще раз.">
<!ENTITY anonymous.label "&Анонімне подання">
-<!ENTITY reloadButton.label "&Перегрузити сторінку">
+<!ENTITY reloadButton.label "&Перезавантажити сторінку">
<!ENTITY recentReports.clear.label "&Вилучити всі звіти">
<!ENTITY typeSelector.description "Це вікно проведе вас по кроках надсилання звіту про проблему з Adblock Plus. Спершу, виберіть тип проблеми з якою ви зіткнулись на цій сторінці:">
<!ENTITY screenshot.remove.label "&Вилучити конфіденційні дані">
@@ -23,24 +23,24 @@
<!ENTITY update.inProgress.description "Adblock Plus необхідно оновити ваші підписки на фільтри, щоб переконатися, що це питання не було вирішено вже. Будь ласка, зачекайте...">
<!ENTITY sendPage.retry.label "Надіслати ще раз">
<!ENTITY data.label "&Дані звіту:">
-<!ENTITY recentReports.label "Ваші недавно заслані звіти">
-<!ENTITY typeWarning.description "Ви вказали що хочете повідомити про загальну проблему в Adblock Plus, а не в фільтрах. Зауважте, що про такі проблеми найкраще повідомляти до [link]форуму Adblock Plus[/link]. Майстра звітів слід використовувати лише в додаток до існуючої дискусії, оскільки ніхто не побачить вашого звіту, якщо не поставити на нього посилання. Ви отримаєте автоматично створене посилання після надсилання звіту.">
+<!ENTITY recentReports.label "Ваші недавно надіслані звіти">
+<!ENTITY typeWarning.description "Ви вказали що хочете повідомити про загальну проблему в Adblock Plus, а не в фільтрах. Зауважте, що про такі проблеми найкраще повідомляти до [link]форуму Adblock Plus[/link]. Майстер звітів слід використовувати лише додатково до існуючої дискусії, оскільки ніхто не побачить вашого звіту, якщо не поставити на нього посилання. Ви отримаєте автоматично створене посилання після надсилання звіту.">
<!ENTITY issues.disabled.description "Adblock Plus вимкнено, він не блокуватиме нічого у поточному стані.">
<!ENTITY attachExtensions.label "Долучити до звіту список активних &розширень — на випадок якщо причиною проблеми є конфлікт розширень">
<!ENTITY issues.nosubscriptions.add.label "Додати підписку на фільтри">
<!ENTITY issues.disabledfilters.enable.label "Увімкнути фільтр">
<!ENTITY issues.override.label "Налаштування &правильні, продовжити звіт">
<!ENTITY issues.nosubscriptions.description "Ви не підписані на жоден з готових списків фільтрування котрі автоматично вилучають небажаний вміст з сайтів.">
-<!ENTITY typeSelector.falsePositive.description "Виберіть цей варіант якщо на сторінці відсутня частина вмісту, або якщо вона показується чи функціонує неправильно. Ви можете перевірити, чи був Adblock Plus причиною тимчасово його вимкнувши.">
+<!ENTITY typeSelector.falsePositive.description "Виберіть цей варіант якщо на сторінці відсутня частина вмісту, або якщо вона показується чи функціонує неправильно. Ви можете перевірити, чи був Adblock Plus причиною - тимчасово його вимкнувши.">
<!ENTITY typeSelector.other.label "&Інша проблема">
-<!ENTITY emailComment.label "Ми рекомендуємо Вам, введіть адресу електронної пошти, щоб ми могли зв'язатися з вами, якщо виникнуть питання з приводу звіту. Це також дозволить нам дізнатися ваш вклад та високу приорітетність.">
+<!ENTITY emailComment.label "Ми рекомендуємо Вам ввести адресу електронної пошти, щоб ми могли зв'язатися з вами, якщо виникнуть питання з приводу звіту. Це також дозволить нам розпізнати ваші внески та зробити їх більш пріоритетними.">
<!ENTITY issues.whitelist.remove.label "Переувімкнути Adblock Plus на цій сторінці">
<!ENTITY outdatedSubscriptions.description "Наступні підписки на фільтри не оновлювалися більше двох тижнів. Будь ласка, поновіть ці підписки перед відправленням повідомлення, оскільки проблема вже може бути вирішена.">
<!ENTITY dataCollector.description "Заждіть, Adblock Plus збирає потрібні дані">
<!ENTITY sendButton.label "&Надіслати звіт">
<!ENTITY comment.label "&Коментар (необов’язково):">
<!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 "Наступні фільтри вимкнені, але могли вплинути на цю сторінку:">
@@ -52,9 +52,9 @@
<!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 typeSelector.falseNegative.description "Виберіть цей варіант якщо реклама показується попри те що Adblock Plus увімкнено.">
<!ENTITY sendPage.waitMessage "Заждіть доки Adblock Plus надсилає ваш звіт.">
<!ENTITY dataCollector.heading "Ласкаво просимо до звітувача про проблеми">
<!ENTITY screenshot.heading "Додати скріншот">
diff --git a/chrome/locale/uk/sidebar.dtd b/chrome/locale/uk/sidebar.dtd
index 1f64ec8..23725a0 100644
--- a/chrome/locale/uk/sidebar.dtd
+++ b/chrome/locale/uk/sidebar.dtd
@@ -1,4 +1,4 @@
-<!ENTITY context.flash.label "Показати розташування елементу">
+<!ENTITY context.flash.label "Рамка для Flash об'єктів">
<!ENTITY address.label "Адреса">
<!ENTITY context.open.label "Відкрити в новій вкладці">
<!ENTITY type.label "Тип">
@@ -22,14 +22,14 @@
<!ENTITY context.disablefilteronsite.label "Вимкнути цей фільтр на ?1?">
<!ENTITY detached.title "Adblock Plus: елементи відкритої сторінки (від’єднані)">
<!ENTITY docDomain.firstParty "(запит з того ж сайта)">
-<!ENTITY tooltip.type.whitelisted "(виняток)">
+<!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.selectAll.label "Вибрати все">
<!ENTITY state.label "Статус">
<!ENTITY docDomain.label "Джерело документа">
<!ENTITY tooltip.address.label "Адреса:">
diff --git a/chrome/locale/uk/subscriptionSelection.dtd b/chrome/locale/uk/subscriptionSelection.dtd
index 2303e8b..2b0d2c5 100644
--- a/chrome/locale/uk/subscriptionSelection.dtd
+++ b/chrome/locale/uk/subscriptionSelection.dtd
@@ -1,12 +1,12 @@
-<!ENTITY addMain.label "&Додати також фільтрову підписку «?1?»">
+<!ENTITY addMain.label "&Додати також підписку на фільтер «?1?»">
<!ENTITY list.download.failed "Adblock Plus не зміг отримати перелік підписок">
<!ENTITY list.download.retry "Спробувати ще раз">
<!ENTITY title.label "&Назва підписки:">
-<!ENTITY list.download.website "Глянути сайт">
+<!ENTITY list.download.website "Переглянути сайт">
<!ENTITY supplementMessage "Ця фільтрова підписка призначена для використання в парі з фільтровою підпискою «?1?», котру ви наразі не використовуєте.">
-<!ENTITY viewList.label "Глянути фільтри">
+<!ENTITY viewList.label "Переглянути фільтри">
<!ENTITY visitHomepage.label "Відвідати домашню сторінку">
<!ENTITY addSubscription.label "Додати підписку">
-<!ENTITY dialog.title "Додати підписку на фільтри Adblock Plus">
-<!ENTITY location.label "Адр&еса списку фільтрів:">
+<!ENTITY dialog.title "Додати підписку на фільтр Adblock Plus">
+<!ENTITY location.label "Розташ&ування списку з фільтром:">
<!ENTITY fromWeb.description "Будь ласка підтвердіть що ви бажаєте додати цю фільтрову підписку. Ви можете змінити назву чи знаходження перед додаванням.">
diff --git a/chrome/locale/vi/firstRun.properties b/chrome/locale/vi/firstRun.properties
index 0cb1329..a31d1b4 100644
--- a/chrome/locale/vi/firstRun.properties
+++ b/chrome/locale/vi/firstRun.properties
@@ -1,7 +1,16 @@
-firstRun_toggle_off=Tắt
-firstRun_feature_tracking=Tắt theo dõi
-firstRun_dataCorruptionWarning=Trang này cứ hiển thị mãi ? <a>Bấm vào đây</a>
-firstRun_title=Adblock Plus đã được cài đặt thành công
-firstRun_toggle_on=Bật
-firstRun_feature_malware=Chặn phần mềm độc hại
+firstRun_feature_show_expanded=kích hoạt tính năng
+firstRun_toggle_off=TẮT
+firstRun_feature_tracking=Vô hiệu hóa theo dõi
firstRun_feature_social=Loại bỏ các nút bấm của mạng xã hội
+firstRun_title=Adblock Plus đã được cài đặt
+firstRun_feature_malware=Chặn phần mềm độc hại
+firstRun_toggle_on=BẬT
+firstRun_contributor_credits=Đóng góp các khoản tín dụng
+firstRun_feature_show_overview=Hiển thị tổng quan
+firstRun_dataCorruptionWarning=Trang này cứ hiển thị mãi ? <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=Chia sẻ 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 web trở nên tốt hơn
+firstRun_features=Adblock Plus không chỉ có thể chặn quảng cáo
+firstRun_donate=quyên góp
+firstRun_donate_label=Hỗ trợ dự án của chúng tôi
diff --git a/chrome/locale/vi/overlay.dtd b/chrome/locale/vi/overlay.dtd
index edce8cd..7e8001a 100644
--- a/chrome/locale/vi/overlay.dtd
+++ b/chrome/locale/vi/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "Vô hiệu hóa trên ?1?">
<!ENTITY filters.label "&Tùy chỉnh bộ lọc">
<!ENTITY disable.label "Vô hiệu hóa ở mọi nơi">
-<!ENTITY showinaddonbar.label "Hiển thị ở thanh công &cụ">
<!ENTITY objecttab.title "Chặn">
<!ENTITY objecttab.tooltip "Nhấn vào đây để chặn đối tượng này với Adblock Plus">
<!ENTITY menuitem.label "Tùy chọn Adblock &Plus">
diff --git a/chrome/locale/zh-CN/composer.dtd b/chrome/locale/zh-CN/composer.dtd
index ccaa61f..34162b0 100644
--- a/chrome/locale/zh-CN/composer.dtd
+++ b/chrome/locale/zh-CN/composer.dtd
@@ -2,10 +2,10 @@
<!ENTITY domainRestriction.label "限制域： (&d)">
<!ENTITY collapse.default.no.label "使用默认值 (否)">
<!ENTITY firstParty.label "仅第一方 (&r)">
-<!ENTITY preferences.label "显示现有过滤规则…… (&S)">
+<!ENTITY preferences.label "显示所有屏蔽规则…… (&S)">
<!ENTITY pattern.label "查找模式">
<!ENTITY thirdParty.label "仅第三方 (&T)">
-<!ENTITY filter.label "新建过滤规则: (&f)">
+<!ENTITY filter.label "新建屏蔽规则: (&f)">
<!ENTITY collapse.label "折叠已屏蔽: (&l)">
<!ENTITY match.warning "您输入的模式不是该地址的过滤/例外规则，将不会对该地址产生任何效果。">
<!ENTITY anchor.start.label "在地址开始处 (&g)">
@@ -23,7 +23,7 @@
<!ENTITY anchors.label "仅接受模式:">
<!ENTITY collapse.default.yes.label "使用默认值 (是)">
<!ENTITY domainRestriction.help "由竖线(|)分隔的一个或多个域，过滤规则仅应用于这些域上。域名前有代字符(~)，表示过滤规则不应该应用于该域上。">
-<!ENTITY accept.label "添加过滤规则">
+<!ENTITY accept.label "添加屏蔽规则">
<!ENTITY options.label "选项">
<!ENTITY disabled.warning "Adblock Plus 目前处于禁用状态。您可以继续添加过滤规则，但是这些规则在您[link]启用 Adblock Plus[/link] 之后才能生效。">
<!ENTITY anchor.start.flexible.label "在域名开始处 (&g)">
diff --git a/chrome/locale/zh-CN/filters.dtd b/chrome/locale/zh-CN/filters.dtd
index 747a2d1..23ccf7c 100644
--- a/chrome/locale/zh-CN/filters.dtd
+++ b/chrome/locale/zh-CN/filters.dtd
@@ -3,7 +3,7 @@
<!ENTITY enabled.column "启用 (&n)">
<!ENTITY subscription.lastDownload.checksumMismatch "失败，检验和不匹配">
<!ENTITY noFiltersInGroup.text "选择的分组是空的。">
-<!ENTITY subscription.actions.label "动作">
+<!ENTITY subscription.actions.label "操作">
<!ENTITY filter.selectAll.label "全选">
<!ENTITY backupButton.label "备份与还原 (&B)">
<!ENTITY restore.minVersion.warning "警告：该文件由新版本的 Adblock Plus 创建。您应该先更新至最新版本的 Adblock Plus 然后再还原该文件。">
@@ -45,7 +45,7 @@
<!ENTITY addSubscriptionOther.label "添加其他过滤规则订阅组">
<!ENTITY close.label "关闭">
<!ENTITY sort.none.label "不排序 (&U)">
-<!ENTITY filter.actions.label "过滤规则动作">
+<!ENTITY filter.actions.label "过滤规则操作">
<!ENTITY filter.copy.label "复制">
<!ENTITY filter.moveDown.label "下移">
<!ENTITY filter.resetHitCounts.label "重置生效次数统计">
diff --git a/chrome/locale/zh-CN/firstRun.properties b/chrome/locale/zh-CN/firstRun.properties
index 6ed3be4..b7f175b 100644
--- a/chrome/locale/zh-CN/firstRun.properties
+++ b/chrome/locale/zh-CN/firstRun.properties
@@ -1,7 +1,21 @@
+firstRun_feature_tracking_description=隐秘浏览避开跟踪 - 摆脱广告公司跟踪你的一举一动。
firstRun_toggle_off=关闭
firstRun_feature_tracking=禁止跟踪
-firstRun_dataCorruptionWarning=总是显示此页？<a>点击这里！</a>
+firstRun_feature_malware=拦截恶意软件
firstRun_title=Adblock Plus 已安装
+firstRun_acceptableAdsExplanation=我们想鼓励网站使用简单、不使人反感的广告。这也是为什么我们建立了一个<a>严格的指导方针</a>来确定可接受的广告，并在默认设置下展示它们。如果您仍想屏蔽所有广告，您可以轻松地<a>禁用</a>这项功能。
firstRun_toggle_on=开启
-firstRun_feature_malware=拦截恶意软件
+firstRun_contributor_credits=贡献者记录
+firstRun_feature_show_expanded=激活功能
+firstRun_dataCorruptionWarning=总是显示此页？<a>点击这里！</a>
+firstRun_acceptableAdsHeadline=恼人的广告将被屏蔽
+firstRun_share=告诉你的朋友
+firstRun_share_headline=<a>给我们一点支持</a>，让网络变得更加美好
+firstRun_features=Adblock Plus 不仅仅能拦截广告
+firstRun_feature_malware_description=使您的浏览更安全，阻止已知的恶意软件域。
+firstRun_feature_show_overview=显示概述
+firstRun_feature_social_description=自动屏蔽网页中出现的社交媒体按钮，例如 Facebook 的 Like，摆脱行为跟踪。
+firstRun_donate=捐赠
+firstRun_donate_label=支持我们的项目
firstRun_feature_social=移除社交媒体按钮
+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 浏览器的最新版本。
diff --git a/chrome/locale/zh-CN/global.properties b/chrome/locale/zh-CN/global.properties
index cf80dbc..4e74179 100644
--- a/chrome/locale/zh-CN/global.properties
+++ b/chrome/locale/zh-CN/global.properties
@@ -35,5 +35,5 @@ mobile_menu_disable_site=ABP：在 ?1? 禁用
elemhideGroup_title=元素隐藏规则
mobile_menu_enable_site=ABP：在 ?1? 启用
type_label_elemhide=隐藏
-newGroup_title=新建过滤规则分组
+newGroup_title=新建过滤规则组
default_dialog_title=Adblock Plus
diff --git a/chrome/locale/zh-CN/overlay.dtd b/chrome/locale/zh-CN/overlay.dtd
index a5f77b8..73d0cf6 100644
--- a/chrome/locale/zh-CN/overlay.dtd
+++ b/chrome/locale/zh-CN/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "在 ?1? 禁用 Adblock Plus">
<!ENTITY filters.label "过滤规则首选项 (&F)">
<!ENTITY disable.label "完全禁用">
-<!ENTITY showinaddonbar.label "在附加组件栏显示 (&b)">
<!ENTITY objecttab.title "屏蔽">
<!ENTITY objecttab.tooltip "点击这里用 Adblock Plus 屏蔽该对象">
<!ENTITY menuitem.label "Ad&block Plus 首选项">
diff --git a/chrome/locale/zh-CN/sendReport.dtd b/chrome/locale/zh-CN/sendReport.dtd
index a2a49e1..2b2152e 100644
--- a/chrome/locale/zh-CN/sendReport.dtd
+++ b/chrome/locale/zh-CN/sendReport.dtd
@@ -1,64 +1,63 @@
<!ENTITY screenshot.undo.label "撤销 (&U)">
-<!ENTITY issues.disabledgroups.description "如下过滤规则订阅组/过滤规则分组处于禁用状态，但是他们可能对该页面有效:">
+<!ENTITY issues.disabledgroups.description "如下过滤规则订阅组或过滤规则组处于禁用状态，但是它们可能对该页面有效：">
<!ENTITY showData.label "显示报告数据">
<!ENTITY typeSelector.falsePositive.label "Adblock Plus 屏蔽了太多元素 (&m)">
-<!ENTITY issues.change.description "您的设置已更改。请重新载入页面来测试
-更改，如果问题依旧没有解决请提交报告。">
-<!ENTITY email.label "发送邮件 (&m)">
+<!ENTITY issues.change.description "您的设置已更改。请重新载入页面来测试更改，如果问题依旧存在解决再提交报告。">
+<!ENTITY email.label "电子邮箱 (&m)">
<!ENTITY issues.openPreferences.label "打开过滤规则首选项">
-<!ENTITY sendPage.confirmation "您的报告已保存。您可以通过如下地址访问:">
+<!ENTITY sendPage.confirmation "您的报告已被保存。您可以通过如下地址访问：">
<!ENTITY copyLink.label "复制报告链接 (&C)">
<!ENTITY issues.nofilters.description "Adblock Plus 在当前页面上未屏蔽任何元素。您遇到的问题很可能与 Adblock Plus 无关。">
-<!ENTITY sendPage.knownIssue "您提交的问题可能是个已知问题。详情:">
+<!ENTITY sendPage.knownIssue "您提交的问题可能是个已知问题。详情见：">
<!ENTITY typeSelector.other.description "如果您怀疑问题出在 Adblock Plus 自身而不是过滤规则，请选择此选项。">
<!ENTITY issues.disabledgroups.enable.label "启用过滤规则订阅组/过滤规则分组">
<!ENTITY typeWarning.override.label "我了解并仍然希望提交报告 (&s)">
<!ENTITY issues.disabled.enable.label "启用 Adblock Plus">
-<!ENTITY update.fixed.description "更新的过滤规则订阅组应该解决了您报告的问题。请重新载入页面并重试，如果问题仍然存在，请您继续报告问题。">
+<!ENTITY update.fixed.description "更新的过滤规则订阅组可能已解决了您报告的问题。请重新载入页面并重试，如果问题仍然存在，您再继续报告问题。">
<!ENTITY anonymous.label "匿名提交 (&A)">
<!ENTITY reloadButton.label "重新载入页面 (&R)">
<!ENTITY recentReports.clear.label "移除所有报告 (&R)">
-<!ENTITY typeSelector.description "本窗口将通过一系列的步骤来引导您提交 Adblock Plus 问题报告。
-首先，请选择本页上出现的问题类型:">
+<!ENTITY typeSelector.description "本窗口将通过一系列步骤引导您提交 Adblock Plus 问题报告。
+首先，请在本页选择您遇到的问题类型：">
<!ENTITY screenshot.remove.label "移除敏感数据 (&R)">
-<!ENTITY issues.ownfilters.description "有些应用到该页面的过滤规则是用户自定义的。
-请禁用这些可能导致问题的过滤规则:">
-<!ENTITY update.inProgress.description "Adblock Plus 需要更新您的过滤规则订阅组以确保问题已被解决。请稍候……">
+<!ENTITY issues.ownfilters.description "一些应用到该页面的过滤规则是由用户自定义的。
+请禁用这些可能导致该问题的过滤规则：">
+<!ENTITY update.inProgress.description "Adblock Plus 需要更新您的过滤规则订阅组以确保问题还未被解决。请稍等……">
<!ENTITY sendPage.retry.label "再次发送">
-<!ENTITY data.label "报告数据: (&p)">
-<!ENTITY recentReports.label "您目前已提交的报告">
+<!ENTITY data.label "报告数据：(&p)">
+<!ENTITY recentReports.label "您最近提交的报告">
<!ENTITY typeWarning.description "您已经明确您想要报告 Adblock Plus 的通用问题而不是过滤规则的问题。
请注意这类问题最好报告至 [link]Adblock Plus 论坛[/link]。您应该仅仅使用
问题报告系统来补充一个存在的讨论，如果您不提供链接，很可能没人会
注意到您的报告。提交报告之后会提供给您自动创建的链接。">
<!ENTITY issues.disabled.description "Adblock Plus 已禁用，当前状态下 Adblock Plus 不会屏蔽任何元素。">
-<!ENTITY attachExtensions.label "在报告中附加扩展列表，用于附件组件冲突造成的问题 (&x)">
+<!ENTITY attachExtensions.label "在报告中附加激活的扩展列表，用于确定附加组件冲突导致的问题 (&x)">
<!ENTITY issues.nosubscriptions.add.label "添加过滤规则订阅组">
<!ENTITY issues.disabledfilters.enable.label "启用过滤规则">
<!ENTITY issues.override.label "设置正确，继续报告 (&c)">
-<!ENTITY issues.nosubscriptions.description "您不能显示已订阅的任何预置过滤规则列表。">
-<!ENTITY typeSelector.falsePositive.description "如果页面缺少重要内容、显示不正常或者功能不正常，请选择此选项。
+<!ENTITY issues.nosubscriptions.description "您似乎没有订阅任何制作好的过滤规则列表。">
+<!ENTITY typeSelector.falsePositive.description "如果页面缺失了重要内容、显示不正常或者功能不正常，请选择此选项。
您可以通过临时禁用 Adblock Plus 来检测问题是否为 Adblock Plus 所致。">
<!ENTITY typeSelector.other.label "其他问题 (&t)">
-<!ENTITY emailComment.label "我们鼓励您输入一个有效的电子邮件地址，以便如果我们对你的报告有问题时可以与您联系。它还将使我们能认出你的贡献，并以此确定它们的优先级次序。">
-<!ENTITY issues.whitelist.remove.label "在该页上重新启用 Adblock Plus">
+<!ENTITY emailComment.label "我们鼓励您输入一个有效的电子邮件地址，以便在我们对你的报告有疑问时可以与您联系。它还能使我们能认出你的贡献，并帮助确定它们的优先次序。">
+<!ENTITY issues.whitelist.remove.label "在此页上重新启用 Adblock Plus">
<!ENTITY outdatedSubscriptions.description "如下过滤规则订阅组已经至少两周没有更新了。请在提交报告之前先更新这些过滤规则订阅组，也许问题已经解决。">
-<!ENTITY dataCollector.description "Adblock Plus 收集所需数据, 请稍等片刻.">
+<!ENTITY dataCollector.description "Adblock Plus 正在收集所需数据，请稍等片刻。">
<!ENTITY sendButton.label "发送报告 (&n)">
-<!ENTITY comment.label "注释 (可选): (&C)">
+<!ENTITY comment.label "注释（可选）：(&C)">
<!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 "如下过滤规则处于禁用状态，但是他们可能在该页面上有效:">
+<!ENTITY issues.disabledfilters.description "如下过滤规则处于禁用状态，但是它们可能对该页面上有效：">
<!ENTITY screenshot.description "同样的页面，不同的人可能见到的并不相同。如果您在报告中
附加了截图，它可能会帮助我们了解问题。您可以移除敏感信
息区域也可以标记出问题区域。点击相应的按钮并用鼠标在
图片上选择区域即可。">
<!ENTITY screenshot.attach.label "为报告附加页面图片 (&t)">
-<!ENTITY issues.whitelist.description "Adblock Plus 在您正在报告的页面上是禁用的。请在提交报告来帮助调研该问题之前重新启用 Adblock Plus 并重新载入该页面。">
-<!ENTITY typeSelector.falseNegative.label "Adblock Plus 无法屏蔽广告 (&v)">
+<!ENTITY issues.whitelist.description "Adblock Plus 在您要报告的页面上是禁用的。请在提交报告协助调研该问题之前，重新启用 Adblock Plus 并重新载入该页面。">
+<!ENTITY typeSelector.falseNegative.label "Adblock Plus 没有屏蔽广告 (&v)">
<!ENTITY typeSelector.heading "选择问题类型">
<!ENTITY anonymity.warning "我们将无法回复你，并且报告可能被放在较低的优先级次序。">
<!ENTITY wizard.title "问题报告">
@@ -67,14 +66,13 @@
该步骤虽然是可选的，但是如果问题不是那么显而易见的话，我们
推荐您输入一些注释。您可以在发送之前再检查一下报告的数据。">
<!ENTITY comment.lengthWarning "您输入的注释长度超过 1000 个字符。只有前 1000 个字符会被发送出去。">
-<!ENTITY typeSelector.falseNegative.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 issues.subscriptionCount.description "您似乎订阅了太多的过滤规则。我们不推荐采用过多的过滤规则订阅组，因为这可能会带来许多问题。
+并且很抱歉我们不能接受您的问题报告，因为我们很难弄清是哪些过滤规则订阅组的作者需要采取行动。请移除所有非必要的过滤规则订阅组，然后再测试一下问题是否还存在。">
<!ENTITY screenshot.mark.label "标记问题 (&M)">
<!ENTITY privacyPolicy.label "隐私策略">
-<!ENTITY issues.description "Adblock Plus 已经检测出您的设置可能导致该问题或致使报告难于调研。">
+<!ENTITY issues.description "Adblock Plus 已经检测出您的设置可能导致了该问题或者致使报告难以调研。">
diff --git a/chrome/locale/zh-CN/sidebar.dtd b/chrome/locale/zh-CN/sidebar.dtd
index 650f804..3bda933 100644
--- a/chrome/locale/zh-CN/sidebar.dtd
+++ b/chrome/locale/zh-CN/sidebar.dtd
@@ -20,11 +20,11 @@
<!ENTITY detach.label "分体">
<!ENTITY whitelisted.label "列入白名单的页面">
<!ENTITY context.disablefilteronsite.label "在 ?1? 禁用该过滤规则">
-<!ENTITY detached.title "Adblock Plus: 可过滤项目(分体式)">
+<!ENTITY detached.title "Adblock Plus: 可过滤项目 (分体式)">
<!ENTITY docDomain.firstParty "(第一方)">
<!ENTITY tooltip.type.whitelisted "(白名单)">
<!ENTITY tooltip.filter.label "已生效的过滤规则:">
-<!ENTITY tooltip.filter.disabled "(禁用)">
+<!ENTITY tooltip.filter.disabled "(已禁用)">
<!ENTITY context.editfilter.label "编辑过滤规则有效">
<!ENTITY tooltip.type.blocked "(已过滤)">
<!ENTITY size.label "大小">
diff --git a/chrome/locale/zh-TW/firstRun.properties b/chrome/locale/zh-TW/firstRun.properties
index 72612e0..1d23b61 100644
--- a/chrome/locale/zh-TW/firstRun.properties
+++ b/chrome/locale/zh-TW/firstRun.properties
@@ -6,15 +6,16 @@ firstRun_title=Adblock Plus 已安裝完成
firstRun_acceptableAdsExplanation=我們想鼓勵網站改採簡樸且不過於搶眼的廣告。這也是我們之所以建立<a>嚴格的規範</a>來辨識非侵入式廣告的原因，這種類型的廣告預設會顯示出來。若您仍想阻擋所有的廣告，可以輕鬆地<a>停用此功能</a> 。
firstRun_toggle_on=開啟
firstRun_contributor_credits=貢獻名單
-firstRun_feature_show_overview=顯示概要
+firstRun_feature_show_expanded=啟用這些功能
firstRun_dataCorruptionWarning=這個頁面一直跳出來嗎？ <a>請看這裡！</a>
firstRun_acceptableAdsHeadline=從現在起，煩人的廣告都將煙消雲散
firstRun_share=告訴您的朋友
firstRun_share_headline=<a>請助我們一臂之力</a>，讓網路變得更美好
firstRun_features=Adblock Plus 不只可以過濾廣告
firstRun_feature_malware_description=過濾惡意網域可使您的瀏覽過程更加安全。
+firstRun_feature_show_overview=僅顯示概要
firstRun_feature_social_description=自動擺脫如 Facebook Like 這類出現在網頁上追蹤您瀏覽習慣的社交按鈕。
firstRun_donate=贊助
firstRun_donate_label=支援我們的專案
firstRun_feature_social=移除社交媒體按鈕
-firstRun_feature_show_expanded=啟用功能
+firstRun_legacySafariWarning=您正在使用舊版不支援Adblock Plus的Safari。他可能導致Adblock Plus不正常的操作，或影響使用者瀏覽部分的經驗。我們強烈建議OS X 10.8 Mountain Lion的使用者更新至Safari 6.1.1(或更新版本)、OS X 10.9 Mavericks的使用者更新至Safari 7.0.1(或更新版本)，或使用最新版本的Mozilla Firefox、Google Chrome、或Opera。
diff --git a/chrome/locale/zh-TW/overlay.dtd b/chrome/locale/zh-TW/overlay.dtd
index 947420e..729dc5f 100644
--- a/chrome/locale/zh-TW/overlay.dtd
+++ b/chrome/locale/zh-TW/overlay.dtd
@@ -2,7 +2,6 @@
<!ENTITY whitelist.site.label "在 ?1? 停用">
<!ENTITY filters.label "條件偏好設定 (&F)">
<!ENTITY disable.label "完全停用">
-<!ENTITY showinaddonbar.label "在附加元件列顯示 (&b)">
<!ENTITY objecttab.title "阻擋">
<!ENTITY objecttab.tooltip "按這裡用 Adblock Plus 阻擋此物件">
<!ENTITY menuitem.label "Ad&block Plus 偏好設定">
diff --git a/chrome/skin/abp-status-32.png b/chrome/skin/abp-status-32.png
new file mode 100644
index 0000000..da2a318
Binary files /dev/null and b/chrome/skin/abp-status-32.png differ
diff --git a/chrome/skin/arrow-down.png b/chrome/skin/arrow-down.png
deleted file mode 100644
index be26ed9..0000000
Binary files a/chrome/skin/arrow-down.png and /dev/null differ
diff --git a/chrome/skin/arrow-up.png b/chrome/skin/arrow-up.png
deleted file mode 100644
index 5a33b18..0000000
Binary files a/chrome/skin/arrow-up.png and /dev/null differ
diff --git a/chrome/skin/background-candomore.png b/chrome/skin/background-candomore.png
deleted file mode 100644
index 78894fb..0000000
Binary files a/chrome/skin/background-candomore.png and /dev/null differ
diff --git a/chrome/skin/background-main.png b/chrome/skin/background-main.png
index d245fa7..464a997 100644
Binary files a/chrome/skin/background-main.png and b/chrome/skin/background-main.png differ
diff --git a/chrome/skin/background-share.png b/chrome/skin/background-share.png
index 88b553a..b572b56 100644
Binary files a/chrome/skin/background-share.png and b/chrome/skin/background-share.png differ
diff --git a/chrome/skin/background.png b/chrome/skin/background.png
index 072cf43..bb19387 100644
Binary files a/chrome/skin/background.png and b/chrome/skin/background.png differ
diff --git a/chrome/skin/firstRun.css b/chrome/skin/firstRun.css
index 4a43b5b..3f37e36 100644
--- a/chrome/skin/firstRun.css
+++ b/chrome/skin/firstRun.css
@@ -163,6 +163,7 @@ section > p
{
max-width: 960px;
padding: 40px 0px 0px 0px;
+ border-bottom: 4px solid #968D81;
}
#can-do-more > h2
@@ -170,80 +171,6 @@ section > p
margin: 0 100px;
}
-.fade
-{
- opacity: 0;
-}
-
-.hide
-{
- display: none;
-}
-
-#can-do-more-overview
-{
- opacity: 1;
- max-height: 10000px;
- max-width: 760px;
- margin: 30px 100px 0 100px;
- font-size: 0px;
- /* hides appearing spacings because of
- * using display: inline-block*/
- cursor: pointer;
- transition: opacity 0.3s ease-in-out;
- -webkit-transition: opacity 0.3s ease-in-out;
-}
-
-#can-do-more.expanded > #can-do-more-overview, #can-do-more.expanded > #can-do-more-overview li, #can-do-more.expanded > #can-do-more-overview div, #can-do-more.expanded > #can-do-more-overview h4
-{
- opacity: 0;
- max-height: 0px;
- width: 0;
- margin: 0;
- padding: 0;
- transition: none;
- -webkit-transition: none;
-}
-
-#can-do-more-overview > li:hover
-{
- background-image: url("background-main.png");
- text-decoration: none;
-}
-
-#can-do-more-overview > li
-{
- width: 230px;
- height: 115px;
- display: inline-block;
- border-right: 1px dashed #c7c6c2;
- padding: 20px 10px 0 10px;
- vertical-align: top;
- text-decoration: underline;
- -webkit-backface-visibility: hidden;
- /* hides the 1px movement chrome bug
- * which appears while transition.
- */
-}
-
-#can-do-more-overview > li > div
-{
- width: 59px;
- height: 59px;
- display: block;
- margin: 0 auto;
-}
-
-#can-do-more-overview > li > h4
-{
- margin: 15px 0 0 0;
-}
-
-#can-do-more #feature-first
-{
- border-left: 1px dashed #c7c6c2;
-}
-
.feature-malware-image
{
background-image: url(features/malware.png);
@@ -262,56 +189,19 @@ section > p
background-repeat: no-repeat;
}
-#can-do-more-expanded
+#can-do-more-content
{
- opacity: 0;
- max-height: 0;
-}
-
-#can-do-more.expanded > #can-do-more-expanded
-{
- opacity: 1;
- max-height: 10000px;
- margin: 30px 100px 0 100px;
- transition: opacity 0.5s ease-in-out;
- -webkit-transition: opacity 0.5s ease-in-out;
- transition-delay: 0.2s;
- -webkit-transition-delay: 0.2s;
+ margin: 30px 100px 20px 100px;
}
-#features, .feature:not([hidden]), .feature-image, .feature-description, .feature-description, .feature-description-textblock, .feature-description-textblock > span, .feature-image
-{
- width: 0;
- height: 0;
- margin: 0;
- padding: 0;
- transition: none;
- -webkit-transition: none;
-}
-
-
-#can-do-more.expanded #features,#can-do-more.expanded .feature:not([hidden]),#can-do-more.expanded .feature-image,#can-do-more.expanded .feature-description,#can-do-more.expanded .feature-description,#can-do-more.expanded .feature-description-textblock,#can-do-more.expanded .feature-description-textblock > span,#can-do-more.expanded .feature-image
-{
- width: auto;
- height: auto;
- margin: auto;
- padding: auto;
- transition-property: all;
- -webkit-transition-property: all;
- transition-duration: 0.5s;
- -webkit-transition-duration: 0.5s;
- transition-timing-function: ease-in-out;
- -webkit-transition-timing-function: ease-in-out;
-}
-
-#can-do-more.expanded #features
+#can-do-more #features
{
border-spacing: 10px;
margin: 0px;
padding: 0px;
}
-#can-do-more.expanded .feature:not([hidden])
+#can-do-more .feature:not([hidden])
{
display: block;
list-style-type: none;
@@ -320,7 +210,7 @@ section > p
border-top: 1px dashed #c0bebb;
}
-#can-do-more.expanded .feature-image, #can-do-more.expanded .feature-description
+#can-do-more .feature-image, #can-do-more .feature-description
{
display: inline-block;
*display: inline; /* IE6 inline-block fix */
@@ -328,14 +218,14 @@ section > p
vertical-align: top;
}
-#can-do-more.expanded .feature-description
+#can-do-more .feature-description
{
margin: 0px 0px 0 20px;
width: 625px;
max-width: 85%;
}
-#can-do-more.expanded .feature-description-textblock
+#can-do-more .feature-description-textblock
{
width: 480px;
max-width: 100%;
@@ -343,82 +233,18 @@ section > p
display: inline-block;
}
-#can-do-more.expanded .feature-description-textblock > span
+#can-do-more .feature-description-textblock > span
{
margin: 15px 0 0 0;
}
-#can-do-more.expanded .feature-image
+#can-do-more .feature-image
{
width: 59px;
height: 59px;
margin: 8px 0 10px 20px;
}
-#activate-features
-{
- width: 100%;
- background-image: url("background-candomore.png");
- margin: 30px 0 0 0;
- padding: 14px 0 14px 0;
- cursor: pointer;
- text-align: center;
- white-space: nowrap;
-}
-
-#activate-features-label
-{
- display: inline-block;
- width: 86%;
- color: #fff;
- font-size: 22px;
- text-align: center;
- font-style: italic;
- font-family: CreteRound, Helvetica, Arial, sans-serif;
- -webkit-transition: opacity 0.5s ease-in-out;
- transition: opacity 0.5s ease-in-out;
-}
-
-#can-do-more.expanded #label-show-expanded
-{
- display: none;
-}
-
-#can-do-more.expanded #label-show-overview
-{
- display: block;
-}
-
-#label-show-expanded
-{
- display: block;
-}
-
-#label-show-overview
-{
- display: none;
-}
-
-#activate-features:hover a
-{
- color: #1f6822;
- text-decoration: none;
-}
-
-#can-do-more.expanded .arrow
-{
- background-image: url("arrow-up.png");
-}
-
-.arrow
-{
- width: 29px;
- height: 22px;
- vertical-align: bottom;
- display: inline-block;
- background-image: url("arrow-down.png");
-}
-
#share
{
background-image: url(background-share.png);
@@ -461,7 +287,7 @@ section > p
#donate-block span, #share-block span
{
- margin: 13px 20px 10px 20px;
+ margin: 10px 20px 0px 20px;
}
#donate-block, #share-block
@@ -469,7 +295,7 @@ section > p
min-width: 250px;
display: inline-block;
vertical-align: top;
- padding: 20px 0 0 0;
+ padding: 5px 0 5px 0;
}
#donate-block
@@ -561,6 +387,7 @@ section > p
background-repeat: no-repeat;
}
+#legacySafariWarning,
#dataCorruptionWarning
{
font-size: 160%;
diff --git a/chrome/skin/overlay.css b/chrome/skin/overlay.css
index 860ff3f..2d4bc58 100644
--- a/chrome/skin/overlay.css
+++ b/chrome/skin/overlay.css
@@ -41,6 +41,21 @@ toolbar[iconsize="small"] #abp-toolbarbutton[abpstate="whitelisted"],
-moz-image-region: rect(16px, 16px, 32px, 0px);
}
+#abp-toolbarbutton[cui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #abp-toolbarbutton
+{
+ list-style-image: url("abp-status-32.png");
+ -moz-image-region: rect(0px, 32px, 32px, 0px);
+}
+
+#abp-toolbarbutton[cui-areatype="menu-panel"][abpstate="disabled"],
+toolbarpaletteitem[place="palette"] > #abp-toolbarbutton[abpstate="disabled"],
+#abp-toolbarbutton[cui-areatype="menu-panel"][abpstate="whitelisted"],
+toolbarpaletteitem[place="palette"] > #abp-toolbarbutton[abpstate="whitelisted"]
+{
+ -moz-image-region: rect(32px, 32px, 64px, 0px);
+}
+
#abp-toolbar-popup {
list-style-image: none;
-moz-image-region: rect(0px, 0px, 0px, 0px);
@@ -67,7 +82,7 @@ menuitem[default="true"] {
}
/* Hack: force the label to be displayed below icon for type="menu" */
-#abp-toolbarbutton[type="menu"]
+#abp-toolbarbutton[type="menu"]:not([cui-areatype="menu-panel"])
{
-moz-box-orient: horizontal;
}
@@ -169,6 +184,13 @@ toolbar[mode="full"] #abp-toolbarbutton[type="menu"]
list-style-image: url("close.png");
-moz-appearance: none;
-moz-image-region: rect(0px, 14px, 14px, 0px);
+
+ /* Firefox Australis theme defines some width for all toolbaritem tags inside
+ * UIPanel element, the properties have to be reset to default values. */
+ min-width: 0px !important;
+ min-height: 0px !important;
+ width: auto !important;
+ height: auto !important;
}
.abp-contributebutton-close:hover
diff --git a/lib/appSupport.js b/lib/appSupport.js
index 3ca6ce3..e0dd46a 100644
--- a/lib/appSupport.js
+++ b/lib/appSupport.js
@@ -66,9 +66,8 @@ exports.getCurrentLocation = function getCurrentLocation(/**Window*/ window) /**
exports.contentContextMenu = null;
/**
- * The properties parent, before, after determine the default placement of the
- * toolbar icon, the property isAddonBar indicates that it is an add-on bar
- * (different options text is displayed then).
+ * Determines the default placement of the toolbar icon via object properties
+ * parent, before and after.
* @type Object
*/
exports.defaultToolbarPosition = null;
@@ -277,9 +276,7 @@ switch (application)
exports.contentContextMenu = "contentAreaContextMenu";
exports.defaultToolbarPosition = {
- parent: "addon-bar",
- before: "addonbar-closebutton",
- isAddonBar: true
+ parent: "nav-bar"
};
exports.toolsMenu = {
diff --git a/lib/customizableUI.js b/lib/customizableUI.js
new file mode 100644
index 0000000..4033b03
--- /dev/null
+++ b/lib/customizableUI.js
@@ -0,0 +1,320 @@
+/*
+ * This file is part of Adblock Plus <http://adblockplus.org/>,
+ * Copyright (C) 2006-2013 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 This emulates a subset of the CustomizableUI API from Firefox 28.
+ */
+
+let {XPCOMUtils} = Cu.import("resource://gre/modules/XPCOMUtils.jsm", null);
+
+let {Utils} = require("utils");
+
+// UI module has to be referenced lazily to avoid circular references
+XPCOMUtils.defineLazyGetter(this, "UI", function() require("ui").UI);
+
+let widgets = Map();
+
+function getToolbox(/**Window*/ window, /**Widget*/ widget) /**Element*/
+{
+ if (!("defaultArea" in widget) || !widget.defaultArea)
+ return null;
+
+ let toolbar = UI.findElement(window, widget.defaultArea);
+ if (!toolbar)
+ return null;
+
+ let toolbox = toolbar.toolbox;
+ if (toolbox && ("palette" in toolbox) && toolbox.palette)
+ return toolbox;
+ else
+ return null;
+}
+
+function getToolbar(/**Element*/ element) /**Element*/
+{
+ for (let parent = element.parentNode; parent; parent = parent.parentNode)
+ if (parent.localName == "toolbar")
+ return parent;
+ return null;
+}
+
+function getPaletteItem(/**Element*/ toolbox, /**String*/ id) /**Element*/
+{
+ for (let child of toolbox.palette.children)
+ if (child.id == id)
+ return child;
+
+ return null;
+}
+
+function restoreWidget(/**Element*/ toolbox, /**Widget*/ widget)
+{
+ // Create node
+ let node = widget.onBuild(toolbox.ownerDocument);
+
+ // Insert into the palette first
+ toolbox.palette.insertBefore(node, toolbox.palette.firstChild);
+
+ // Now find out where we should put it
+ let position = toolbox.getAttribute(widget.positionAttribute);
+ if (!/^\S*,\S*,\S*$/.test(position))
+ position = null;
+
+ if (position == null)
+ {
+ // No explicitly saved position but maybe we can find it in a currentset
+ // attribute somewhere.
+ let toolbars = toolbox.externalToolbars.slice();
+ for (let child of toolbox.children)
+ if (child.localName == "toolbar")
+ toolbars.push(child);
+ for (let toolbar of toolbars)
+ {
+ let currentSet = toolbar.getAttribute("currentset");
+ if (currentSet)
+ {
+ let items = currentSet.split(",");
+ let index = items.indexOf(widget.id);
+ if (index >= 0)
+ {
+ let before = (index + 1 < items.length ? items[index + 1] : "");
+ position = "visible," + toolbar.id + "," + before;
+ toolbox.setAttribute(widget.positionAttribute, position);
+ toolbox.ownerDocument.persist(toolbox.id, widget.positionAttribute);
+ break;
+ }
+ }
+ }
+ }
+
+ showWidget(toolbox, widget, position);
+}
+
+function showWidget(/**Element*/ toolbox, /**Widget*/ widget, /**String*/ position)
+{
+ let visible = "visible", parent = null, before = null;
+ if (position)
+ {
+ [visible, parent, before] = position.split(",", 3);
+ parent = toolbox.ownerDocument.getElementById(parent);
+ if (before == "")
+ before = null;
+ else
+ before = toolbox.ownerDocument.getElementById(before);
+ if (before && before.parentNode != parent)
+ before = null;
+ }
+
+ if (visible == "visible" && !parent)
+ {
+ let insertionPoint = {
+ parent: widget.defaultArea
+ };
+ if (typeof widget.defaultBefore != "undefined")
+ insertionPoint.before = widget.defaultBefore;
+ if (typeof widget.defaultAfter != "undefined")
+ insertionPoint.after = widget.defaultAfter;
+
+ [parent, before] = UI.resolveInsertionPoint(toolbox.ownerDocument.defaultView, insertionPoint);
+ }
+
+ if (parent && parent.localName != "toolbar")
+ parent = null;
+
+ if (visible != "visible")
+ {
+ // Move to palette if the item is currently visible
+ let node = toolbox.ownerDocument.getElementById(widget.id);
+ if (node)
+ toolbox.palette.appendChild(node);
+ }
+ else if (parent)
+ {
+ // Add the item to the toolbar
+ let items = parent.currentSet.split(",");
+ let index = (before ? items.indexOf(before.id) : -1);
+ if (index < 0)
+ before = null;
+ parent.insertItem(widget.id, before, null, false);
+ }
+
+ saveState(toolbox, widget);
+}
+
+function removeWidget(/**Window*/ window, /**Widget*/ widget)
+{
+ let element = window.document.getElementById(widget.id);
+ if (element)
+ element.parentNode.removeChild(element);
+
+ let toolbox = getToolbox(window, widget);
+ if (toolbox)
+ {
+ let paletteItem = getPaletteItem(toolbox, widget.id);
+ if (paletteItem)
+ paletteItem.parentNode.removeChild(paletteItem);
+ }
+}
+
+function onToolbarCustomization(/**Event*/ event)
+{
+ let toolbox = event.currentTarget;
+ for (let [id, widget] of widgets)
+ saveState(toolbox, widget);
+}
+
+function saveState(/**Element*/ toolbox, /**Widget*/ widget)
+{
+ let node = toolbox.ownerDocument.getElementById(widget.id);
+
+ let position = toolbox.getAttribute(widget.positionAttribute) || "hidden,,";
+ if (node)
+ {
+ if (typeof widget.onAdded == "function")
+ widget.onAdded(node)
+
+ let toolbar = getToolbar(node);
+ position = "visible," + toolbar.id + "," + (node.nextSibling ? node.nextSibling.id : "");
+ }
+ else
+ position = position.replace(/^visible,/, "hidden,")
+
+ toolbox.setAttribute(widget.positionAttribute, position);
+ toolbox.ownerDocument.persist(toolbox.id, widget.positionAttribute);
+}
+
+let CustomizableUI = exports.CustomizableUI =
+{
+ createWidget: function(widget)
+ {
+ if (typeof widget.id == "undefined" ||
+ typeof widget.defaultArea == "undefined" ||
+ typeof widget.positionAttribute == "undefined")
+ {
+ throw new Error("Unexpected: required property missing from the widget data");
+ }
+ widgets.set(widget.id, widget);
+
+ // Show widget in any existing windows
+ for (let window of UI.applicationWindows)
+ {
+ let toolbox = getToolbox(window, widget);
+ if (toolbox)
+ {
+ toolbox.addEventListener("aftercustomization", onToolbarCustomization, false);
+ restoreWidget(toolbox, widget);
+ }
+ }
+ },
+
+ destroyWidget: function(id)
+ {
+ // Don't do anything here. This function is called on shutdown,
+ // removeFromWindow will take care of cleaning up already.
+ },
+
+ getPlacementOfWidget: function(id)
+ {
+ let window = UI.currentWindow;
+ if (!window)
+ return null;
+
+ let widget = window.document.getElementById(id);
+ if (!widget)
+ return null;
+
+ let toolbar = getToolbar(widget);
+ if (!toolbar)
+ return null;
+
+ return {area: toolbar.id};
+ },
+
+ addWidgetToArea: function(id)
+ {
+ // Note: the official API function also has area and position parameters.
+ // We ignore those here and simply restore the previous position instead.
+ let widget = widgets.get(id);
+ for (let window of UI.applicationWindows)
+ {
+ let toolbox = getToolbox(window, widget);
+ if (!toolbox)
+ continue;
+
+ let position = toolbox.getAttribute(widget.positionAttribute);
+ if (position)
+ position = position.replace(/^hidden,/, "visible,");
+ showWidget(toolbox, widget, position);
+ }
+ },
+
+ removeWidgetFromArea: function(id)
+ {
+ let widget = widgets.get(id);
+ for (let window of UI.applicationWindows)
+ {
+ let toolbox = getToolbox(window, widget);
+ if (!toolbox)
+ continue;
+
+ let position = toolbox.getAttribute(widget.positionAttribute);
+ if (position)
+ position = position.replace(/^visible,/, "hidden,");
+ else
+ position = "hidden,,";
+ showWidget(toolbox, widget, position);
+ }
+ }
+};
+
+let {WindowObserver} = require("windowObserver");
+new WindowObserver({
+ applyToWindow: function(window)
+ {
+ let {isKnownWindow} = require("appSupport");
+ if (!isKnownWindow(window))
+ return;
+
+ for (let [id, widget] of widgets)
+ {
+ let toolbox = getToolbox(window, widget);
+ if (toolbox)
+ {
+ toolbox.addEventListener("aftercustomization", onToolbarCustomization, false);
+
+ // Restore widget asynchronously to allow the stylesheet to load
+ Utils.runAsync(restoreWidget.bind(null, toolbox, widget));
+ }
+ }
+ },
+
+ removeFromWindow: function(window)
+ {
+ let {isKnownWindow} = require("appSupport");
+ if (!isKnownWindow(window))
+ return;
+
+ for (let [id, widget] of widgets)
+ {
+ let toolbox = getToolbox(window, widget);
+ if (toolbox)
+ toolbox.removeEventListener("aftercustomization", onToolbarCustomization, false);
+
+ removeWidget(window, widget);
+ }
+ }
+});
diff --git a/lib/downloader.js b/lib/downloader.js
index 6ca6d54..9a89c70 100644
--- a/lib/downloader.js
+++ b/lib/downloader.js
@@ -68,7 +68,7 @@ Downloader.prototype =
* expiration interval increases.
* @type Integer
*/
- maxAbsenseInterval: 1 * MILLIS_IN_DAY,
+ maxAbsenceInterval: 1 * MILLIS_IN_DAY,
/**
* Minimal time interval before retrying a download after an error.
@@ -122,7 +122,7 @@ Downloader.prototype =
let now = Date.now();
for each (let downloadable in this.dataSource())
{
- if (downloadable.lastCheck && now - downloadable.lastCheck > this.maxAbsenseInterval)
+ if (downloadable.lastCheck && now - downloadable.lastCheck > this.maxAbsenceInterval)
{
// No checks for a long time interval - user must have been offline, e.g.
// during a weekend. Increase soft expiration to prevent load peaks on the
@@ -171,10 +171,9 @@ Downloader.prototype =
},
/**
- * Starts a download.
- * @param {Downloadable} url the object to be downloaded
+ * Starts downloading for an object.
*/
- download: function(downloadable)
+ download: function(/**Downloadable*/ downloadable)
{
// Make sure to detach download from the current execution context
Utils.runAsync(this._download.bind(this, downloadable, 0));
@@ -204,10 +203,10 @@ Downloader.prototype =
_download: function(downloadable, redirects)
{
- if (downloadable.url in this._downloading)
+ if (this.isDownloading(downloadable.url))
return;
- let downloadURL = this.getDownloadUrl(downloadable);
+ let downloadUrl = this.getDownloadUrl(downloadable);
let request = null;
let errorCallback = function errorCallback(error)
@@ -221,7 +220,7 @@ Downloader.prototype =
let responseStatus = request.status;
Cu.reportError("Adblock Plus: Downloading URL " + downloadable.url + " failed (" + error + ")\n" +
- "Download address: " + downloadURL + "\n" +
+ "Download address: " + downloadUrl + "\n" +
"Channel status: " + channelStatus + "\n" +
"Server response: " + responseStatus);
@@ -238,7 +237,7 @@ Downloader.prototype =
}.bind(this);
}
- this.onDownloadError(downloadable, downloadURL, error, channelStatus, responseStatus, redirectCallback);
+ this.onDownloadError(downloadable, downloadUrl, error, channelStatus, responseStatus, redirectCallback);
}
}.bind(this);
@@ -246,7 +245,7 @@ Downloader.prototype =
{
request = new XMLHttpRequest();
request.mozBackgroundRequest = true;
- request.open("GET", downloadURL);
+ request.open("GET", downloadUrl);
}
catch (e)
{
@@ -304,10 +303,11 @@ Downloader.prototype =
}.bind(this));
}.bind(this), false);
+ request.send(null);
+
this._downloading[downloadable.url] = true;
if (this.onDownloadStarted)
this.onDownloadStarted(downloadable);
- request.send(null);
},
/**
diff --git a/lib/requestNotifier.js b/lib/requestNotifier.js
index 2da2139..098d748 100644
--- a/lib/requestNotifier.js
+++ b/lib/requestNotifier.js
@@ -29,8 +29,10 @@ let windowStats = new WeakMap();
let windowSelection = new WeakMap();
let setEntry, hasEntry, getEntry;
-if (Services.vc.compare(Utils.platformVersion, "20.0") >= 0)
+if (false)
{
+ // This branch can be enabled again once both bug 673468 and bug 819131 are
+ // fixed and we can use weak maps
setEntry = function(map, key, value) map.set(key, value);
hasEntry = function(map, key) map.has(key);
getEntry = function(map, key) map.get(key);
diff --git a/lib/ui.js b/lib/ui.js
index 5777d2a..4a46590 100644
--- a/lib/ui.js
+++ b/lib/ui.js
@@ -31,6 +31,17 @@ let {Synchronizer} = require("synchronizer");
let {KeySelector} = require("keySelector");
let {Notification} = require("notification");
+let CustomizableUI;
+try
+{
+ ({CustomizableUI}) = Cu.import("resource:///modules/CustomizableUI.jsm", null);
+}
+catch (e)
+{
+ // No built-in CustomizableUI API, use our own implementation.
+ ({CustomizableUI}) = require("customizableUI");
+}
+
/**
* Filter corresponding with "disable on site" menu item (set in fillIconMent()).
* @type Filter
@@ -97,11 +108,9 @@ let optionsObserver =
hideElement("adblockplus-sync", !syncEngine);
let {defaultToolbarPosition, statusbarPosition} = require("appSupport");
- let hasToolbar = defaultToolbarPosition && !defaultToolbarPosition.isAddonBar;
- let hasAddonBar = defaultToolbarPosition && defaultToolbarPosition.isAddonBar;
+ let hasToolbar = defaultToolbarPosition;
let hasStatusBar = statusbarPosition;
- hideElement("adblockplus-showinaddonbar", !hasAddonBar);
hideElement("adblockplus-showintoolbar", !hasToolbar);
hideElement("adblockplus-showinstatusbar", !hasStatusBar);
@@ -138,23 +147,12 @@ let optionsObserver =
this.value = UI.toggleSync();
});
- let window = null;
- for (window in UI.applicationWindows)
- break;
-
- if (window)
+ setChecked("adblockplus-showintoolbar", UI.isToolbarIconVisible());
+ addCommandHandler("adblockplus-showintoolbar", function()
{
- setChecked("adblockplus-showinaddonbar", UI.isToolbarIconVisible(window));
- setChecked("adblockplus-showintoolbar", UI.isToolbarIconVisible(window));
-
- let handler = function()
- {
- UI.toggleToolbarIcon();
- this.value = UI.isToolbarIconVisible(window);
- };
- addCommandHandler("adblockplus-showinaddonbar", handler);
- addCommandHandler("adblockplus-showintoolbar", handler);
- }
+ UI.toggleToolbarIcon();
+ this.value = UI.isToolbarIconVisible();
+ });
let list = doc.getElementById("adblockplus-subscription-list");
if (list)
@@ -319,9 +317,7 @@ let UI = exports.UI =
filtersLoaded = true;
// Initialize UI after the session is restored
- let window = null;
- for (window in this.applicationWindows)
- break;
+ let window = this.currentWindow;
if (!window && "nsISessionStore" in Ci)
{
// No application windows yet, the application must be starting up. Wait
@@ -411,6 +407,36 @@ let UI = exports.UI =
let {WindowObserver} = require("windowObserver");
new WindowObserver(this);
+ // Add toolbar icon
+ let {defaultToolbarPosition} = require("appSupport");
+ if ("abp-toolbarbutton" in this.overlay && defaultToolbarPosition)
+ {
+ CustomizableUI.createWidget({
+ id: "abp-toolbarbutton",
+ type: "custom",
+ positionAttribute: "abp-iconposition", // For emulation only
+ defaultArea: defaultToolbarPosition.parent,
+ defaultBefore: defaultToolbarPosition.before, // For emulation only
+ defaultAfter: defaultToolbarPosition.after, // For emulation only
+ removable: true,
+ onBuild: function(document)
+ {
+ let node = document.importNode(this.overlay["abp-toolbarbutton"], true);
+ node.addEventListener("click", this.onIconClick, false);
+ node.addEventListener("command", this.onIconClick, false);
+ this.updateIconState(document.defaultView, node);
+ return node;
+ }.bind(this),
+ onAdded: function(node)
+ {
+ // For emulation only, this callback isn't part of the official
+ // CustomizableUI API.
+ this.updateIconState(node.ownerDocument.defaultView, node);
+ }.bind(this),
+ });
+ onShutdown.add(CustomizableUI.destroyWidget.bind(CustomizableUI, "abp-toolbarbutton"));
+ }
+
// Listen for pref and filters changes
Prefs.addListener(function(name)
{
@@ -469,27 +495,6 @@ let UI = exports.UI =
for (let i = 0; i < this.overlay.all.length; i++)
window.document.documentElement.appendChild(this.overlay.all[i].cloneNode(true));
- // Add toolbar icon
- if ("abp-toolbarbutton" in this.overlay)
- {
- let toolbox = this.getToolbox(window);
- if (toolbox)
- {
- // Insert toolbar button asynchronously, otherwise it will show up
- // before our stylesheet loads
- Utils.runAsync(function()
- {
- toolbox.addEventListener("aftercustomization", this.onToolbarCustomization, false);
-
- let {defaultToolbarPosition} = require("appSupport");
- let icon = this.overlay["abp-toolbarbutton"].cloneNode(true);
- if ("addClass" in defaultToolbarPosition)
- icon.classList.add(defaultToolbarPosition.addClass);
- this.restoreToolbarIcon(toolbox, icon);
- }.bind(this));
- }
- }
-
// Add status bar icon
this.updateStatusbarIcon(window);
@@ -579,19 +584,6 @@ let UI = exports.UI =
}
}
- if ("abp-toolbarbutton" in this.overlay)
- {
- let toolbox = this.getToolbox(window);
- if (toolbox)
- {
- toolbox.removeEventListener("aftercustomization", this.onToolbarCustomization, false);
-
- let paletteItem = this.getPaletteItem(toolbox);
- if (paletteItem)
- paletteItem.parentNode.removeChild(paletteItem);
- }
- }
-
window.removeEventListener("popupshowing", this.onPopupShowing, false);
window.removeEventListener("keypress", this.onKeyPress, false);
removeBrowserLocationListeners(window);
@@ -627,6 +619,17 @@ let UI = exports.UI =
},
/**
+ * Returns the top-most application window or null if none exists.
+ * @type Window
+ */
+ get currentWindow()
+ {
+ for (let window of this.applicationWindows)
+ return window;
+ return null;
+ },
+
+ /**
* Opens a URL in the browser window. If browser window isn't passed as parameter,
* this function attempts to find a browser window. If an event is passed in
* it should be passed in to the browser if possible (will e.g. open a tab in
@@ -635,8 +638,7 @@ let UI = exports.UI =
loadInBrowser: function(/**String*/ url, /**Window*/ currentWindow, /**Event*/ event)
{
if (!currentWindow)
- for (currentWindow in this.applicationWindows)
- break;
+ currentWindow = this.currentWindow;
let {addTab} = require("appSupport");
if (currentWindow && addTab)
@@ -951,9 +953,9 @@ let UI = exports.UI =
{
if (id instanceof Array)
{
- for (let i = 0; i < id.length; i++)
+ for (let candidate of id)
{
- let result = window.document.getElementById(id[i]);
+ let result = window.document.getElementById(candidate);
if (result)
return result;
}
@@ -994,178 +996,16 @@ let UI = exports.UI =
},
/**
- * Finds the toolbox element responsible for the toolbar where Adblock Plus
- * icon should be placed.
- */
- getToolbox: function(/**Window*/ window) /**Element*/
- {
- let {defaultToolbarPosition} = require("appSupport");
- if (!defaultToolbarPosition || !defaultToolbarPosition.parent)
- return null;
-
- let toolbar = this.findElement(window, defaultToolbarPosition.parent);
- if (!toolbar)
- return null;
-
- let toolbox = toolbar.toolbox;
- if (toolbox && ("palette" in toolbox) && toolbox.palette)
- return toolbox;
- else
- return null;
- },
-
- /**
- * Restores the Adblock Plus icon at its original position.
- */
- restoreToolbarIcon: function(/**Element*/ toolbox, /**Element*/ icon)
- {
- // Insert into the palette first
- toolbox.palette.insertBefore(icon, toolbox.palette.firstChild);
-
- // Now find where we should put the icon
- let position = toolbox.getAttribute("abp-iconposition");
- if (!/^\S*,\S*,\S*$/.test(position))
- position = null;
-
- if (position == null)
- {
- // No explicitly saved position but maybe we can find it in a currentset
- // attribute somewhere.
- let toolbars = toolbox.externalToolbars.slice();
- for (let child = toolbox.firstElementChild; child; child = child.nextElementSibling)
- if (child.localName == "toolbar")
- toolbars.push(child);
- for (let i = 0; i < toolbars.length; i++)
- {
- let toolbar = toolbars[i];
- let currentSet = toolbar.getAttribute("currentset");
- if (currentSet)
- {
- let items = currentSet.split(",");
- let index = items.indexOf("abp-toolbarbutton");
- if (index >= 0)
- {
- position = "visible," + toolbar.id + "," + (index + 1 < items.length ? items[index + 1] : "");
- toolbox.setAttribute("abp-iconposition", position);
- toolbox.ownerDocument.persist(toolbox.id, "abp-iconposition");
- break;
- }
- }
- }
- }
-
- this.showToolbarIcon(toolbox, position);
- },
-
- /**
- * Finds the toolbar button in the toolbar palette.
- */
- getPaletteItem: function(/**Element*/ toolbox) /**Element*/
- {
- for (var child = toolbox.palette.firstElementChild; child; child = child.nextElementSibling)
- if (child.id == "abp-toolbarbutton")
- return child;
-
- return null;
- },
-
- /**
- * Called after toolbar customization, sets up our icon and remembers its
- * position.
- */
- onToolbarCustomization: function(/**Event*/ event)
- {
- let toolbox = event.currentTarget;
- let icon = toolbox.ownerDocument.getElementById("abp-toolbarbutton");
-
- let position = toolbox.getAttribute("abp-iconposition") || "hidden,,";
- if (icon && icon.parentNode.localName == "toolbar")
- {
- this.updateIconState(icon.ownerDocument.defaultView, icon);
- icon.addEventListener("click", this.onIconClick, false);
- icon.addEventListener("command", this.onIconClick, false);
- position = "visible," + icon.parentNode.id + "," + (icon.nextSibling ? icon.nextSibling.id : "");
- }
- else
- position = position.replace(/^visible,/, "hidden,")
-
- toolbox.setAttribute("abp-iconposition", position);
- toolbox.ownerDocument.persist(toolbox.id, "abp-iconposition");
- },
-
- /**
- * Shows or hides toolbar icon based on a remembered position.
- */
- showToolbarIcon: function(/**Element*/ toolbox, /**String*/ position)
- {
- let visible, parent, before;
- if (position)
- {
- [visible, parent, before] = position.split(",", 3);
- parent = toolbox.ownerDocument.getElementById(parent);
- if (before == "")
- before = null;
- else
- before = toolbox.ownerDocument.getElementById(before);
- if (before && before.parentNode != parent)
- before = null;
- }
- else
- {
- let {defaultToolbarPosition} = require("appSupport");
- visible = "visible";
- [parent, before] = this.resolveInsertionPoint(toolbox.ownerDocument.defaultView, defaultToolbarPosition);
-
- if (parent && parent.collapsed)
- {
- // First time we insert the toolbar icon, make sure it is actually visible
- parent.setAttribute("collapsed", "false");
- toolbox.ownerDocument.persist(parent.id, "collapsed");
- }
- }
-
- if (parent && parent.localName != "toolbar")
- parent = null;
-
- if (visible != "visible")
- {
- // Hide icon if it is currently visible
- let icon = toolbox.ownerDocument.getElementById("abp-toolbarbutton");
- if (icon && icon.parentNode.localName == "toolbar")
- toolbox.palette.appendChild(icon);
- }
- else if (parent)
- {
- // Add the icon to the toolbar
- let items = parent.currentSet.split(",");
- let index = (before ? items.indexOf(before.id) : -1);
- if (index < 0)
- before = null;
- parent.insertItem("abp-toolbarbutton", before, null, false);
- }
-
- this.onToolbarCustomization({currentTarget: toolbox});
- },
-
- /**
* Toggles visibility state of the toolbar icon.
*/
toggleToolbarIcon: function()
{
- for (let window in this.applicationWindows)
+ if (this.isToolbarIconVisible())
+ CustomizableUI.removeWidgetFromArea("abp-toolbarbutton");
+ else
{
- let toolbox = this.getToolbox(window);
- if (!toolbox)
- continue;
-
- let position = toolbox.getAttribute("abp-iconposition");
- if (position)
- {
- let parts = position.split(",");
- parts[0] = (parts[0] == "visible" ? "hidden" : "visible");
- position = parts.join(",");
- }
- this.showToolbarIcon(toolbox, position);
+ let {defaultToolbarPosition} = require("appSupport");
+ CustomizableUI.addWidgetToArea("abp-toolbarbutton", defaultToolbarPosition.parent);
}
},
@@ -1370,7 +1210,7 @@ let UI = exports.UI =
if (event.defaultPrevented)
return;
- let popup = event.target;
+ let popup = event.originalTarget;
let {contentContextMenu} = require("appSupport");
if ((typeof contentContextMenu == "string" && popup.id == contentContextMenu) ||
@@ -1628,16 +1468,13 @@ let UI = exports.UI =
setChecked(prefix + "savestats", Prefs.savestats);
let {defaultToolbarPosition, statusbarPosition} = require("appSupport");
- let hasToolbar = defaultToolbarPosition && !defaultToolbarPosition.isAddonBar;
- let hasAddonBar = defaultToolbarPosition && defaultToolbarPosition.isAddonBar;
+ let hasToolbar = defaultToolbarPosition;
let hasStatusBar = statusbarPosition;
- hideElement(prefix + "showinaddonbar", !hasAddonBar || prefix == "abp-toolbar-");
hideElement(prefix + "showintoolbar", !hasToolbar || prefix == "abp-toolbar-");
hideElement(prefix + "showinstatusbar", !hasStatusBar);
- hideElement(prefix + "iconSettingsSeparator", (prefix == "abp-toolbar-" || (!hasAddonBar && !hasToolbar)) && !hasStatusBar);
+ hideElement(prefix + "iconSettingsSeparator", (prefix == "abp-toolbar-" || !hasToolbar) && !hasStatusBar);
- setChecked(prefix + "showinaddonbar", this.isToolbarIconVisible(window));
- setChecked(prefix + "showintoolbar", this.isToolbarIconVisible(window));
+ setChecked(prefix + "showintoolbar", this.isToolbarIconVisible());
setChecked(prefix + "showinstatusbar", Prefs.showinstatusbar);
let {Sync} = require("sync");
@@ -1835,10 +1672,10 @@ let UI = exports.UI =
/**
* Checks whether the toolbar icon is currently displayed.
*/
- isToolbarIconVisible: function(/**Window*/ window)
+ isToolbarIconVisible: function() /**Boolean*/
{
- let button = window.document.getElementById("abp-toolbarbutton");
- return (button && button.parentNode && button.parentNode.localName == "toolbar" && !button.parentNode.collapsed);
+ let placement = CustomizableUI.getPlacementOfWidget("abp-toolbarbutton");
+ return !!placement;
},
/**
@@ -1928,12 +1765,9 @@ let UI = exports.UI =
}
},
- _showNextNotification: function(notification)
+ _showNextNotification: function()
{
- let window = null;
- for (window in this.applicationWindows)
- break;
-
+ let window = this.currentWindow;
if (!window)
return;
@@ -2001,7 +1835,6 @@ let UI = exports.UI =
UI.onPopupShowing = UI.onPopupShowing.bind(UI);
UI.onKeyPress = UI.onKeyPress.bind(UI);
UI.onIconClick = UI.onIconClick.bind(UI);
-UI.onToolbarCustomization = UI.onToolbarCustomization.bind(UI);
UI.init();
/**
diff --git a/metadata.gecko b/metadata.gecko
index f6ede7e..4f637cb 100644
--- a/metadata.gecko
+++ b/metadata.gecko
@@ -1,7 +1,7 @@
[general]
id={d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}
basename=adblockplus
-version=2.4
+version=2.4.1
author=Wladimir Palant
options=chrome://adblockplus/content/ui/settings.xul
optionsType=2
@@ -29,8 +29,11 @@ zh-CN=https://adblockplus.org/zh_CN/
zh-TW=https://adblockplus.org/zh_TW/
[compat]
-firefox=16.0/26.0
-fennec2=16.0/26.0
-thunderbird=16.0/26.0
-seamonkey=2.13/2.23
-toolkit=16.0/26.0
+firefox=17.0/28.0
+fennec2=17.0/28.0
+thunderbird=17.0/28.0
+seamonkey=2.14/2.25
+toolkit=17.0/28.0
+
+[preprocess]
+chrome/content/ui/firstRun.html =
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git
More information about the Pkg-mozext-commits
mailing list