diff -Nru adblock-plus-2.4.1+dfsg/addChecksum.py adblock-plus-2.6+dfsg/addChecksum.py
--- adblock-plus-2.4.1+dfsg/addChecksum.py	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/addChecksum.py	2014-04-22 06:28:36.000000000 +0000
@@ -2,7 +2,7 @@
 # coding: utf-8
 
 # This file is part of Adblock Plus <http://adblockplus.org/>,
-# Copyright (C) 2006-2013 Eyeo GmbH
+# Copyright (C) 2006-2014 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/bootstrap.js.tmpl adblock-plus-2.6+dfsg/buildtools/bootstrap.js.tmpl
--- adblock-plus-2.4.1+dfsg/buildtools/bootstrap.js.tmpl	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/bootstrap.js.tmpl	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Adblock Plus build tools,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -20,7 +20,7 @@
 const Cr = Components.results;
 const Cu = Components.utils;
 
-let {Services, atob, btoa, File} = Cu.import("resource://gre/modules/Services.jsm", null);
+let {Services, atob, btoa, File, TextDecoder, TextEncoder} = Cu.import("resource://gre/modules/Services.jsm", null);
 
 {%- if hasXMLHttpRequest %}
 let XMLHttpRequest = Components.Constructor("@mozilla.org/xmlextras/xmlhttprequest;1", "nsIXMLHttpRequest");
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/build.py adblock-plus-2.6+dfsg/buildtools/build.py
--- adblock-plus-2.4.1+dfsg/buildtools/build.py	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/build.py	2014-04-22 06:28:36.000000000 +0000
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 # This file is part of the Adblock Plus build tools,
-# Copyright (C) 2006-2013 Eyeo GmbH
+# Copyright (C) 2006-2014 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/chainedconfigparser.py adblock-plus-2.6+dfsg/buildtools/chainedconfigparser.py
--- adblock-plus-2.4.1+dfsg/buildtools/chainedconfigparser.py	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/chainedconfigparser.py	2014-04-22 06:28:36.000000000 +0000
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 # This file is part of the Adblock Plus build tools,
-# Copyright (C) 2006-2013 Eyeo GmbH
+# Copyright (C) 2006-2014 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/chromeDevenvPoller__.js.tmpl adblock-plus-2.6+dfsg/buildtools/chromeDevenvPoller__.js.tmpl
--- adblock-plus-2.4.1+dfsg/buildtools/chromeDevenvPoller__.js.tmpl	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/chromeDevenvPoller__.js.tmpl	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Adblock Plus build tools,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/chromeInfo.js.tmpl adblock-plus-2.6+dfsg/buildtools/chromeInfo.js.tmpl
--- adblock-plus-2.4.1+dfsg/buildtools/chromeInfo.js.tmpl	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/chromeInfo.js.tmpl	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Adblock Plus build tools,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/.hgsubstate adblock-plus-2.6+dfsg/buildtools/.hgsubstate
--- adblock-plus-2.4.1+dfsg/buildtools/.hgsubstate	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/.hgsubstate	2014-04-22 06:28:36.000000000 +0000
@@ -1 +1 @@
-6737deead473f5b2290c3e039e935669d732ded1 jshydra
+77e57ef745092d07ae5d2d05d61f964790332252 jshydra
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/imageConversion.py adblock-plus-2.6+dfsg/buildtools/imageConversion.py
--- adblock-plus-2.4.1+dfsg/buildtools/imageConversion.py	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/imageConversion.py	2014-04-22 06:28:36.000000000 +0000
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 # This file is part of the Adblock Plus build tools,
-# Copyright (C) 2006-2013 Eyeo GmbH
+# Copyright (C) 2006-2014 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/Info.plist.tmpl adblock-plus-2.6+dfsg/buildtools/Info.plist.tmpl
--- adblock-plus-2.4.1+dfsg/buildtools/Info.plist.tmpl	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/Info.plist.tmpl	2014-04-22 06:28:36.000000000 +0000
@@ -17,7 +17,7 @@
   <key>CFBundleInfoDictionaryVersion</key>
   <string>6.0</string>
   <key>CFBundleShortVersionString</key>
-  <string>{{ shortVersion }}</string>
+  <string>{{ version }}</string>
   <key>CFBundleVersion</key>
   <string>{{ version }}</string>
   <key>Chrome</key>
@@ -72,6 +72,8 @@
       <dict>
         <key>Identifier</key>
         <string>{{ identifier }}</string>
+        <key>Label</key>
+        <string>{{ name }}</string>
         {%- for key, value in props.iteritems() %}
         <key>{{ key }}</key>
         {{ str_or_real(value) }}
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/install.rdf.tmpl adblock-plus-2.6+dfsg/buildtools/install.rdf.tmpl
--- adblock-plus-2.4.1+dfsg/buildtools/install.rdf.tmpl	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/install.rdf.tmpl	2014-04-22 06:28:36.000000000 +0000
@@ -2,7 +2,7 @@
 
 <!--
   - This file is part of the Adblock Plus build tools,
-  - Copyright (C) 2006-2013 Eyeo GmbH
+  - Copyright (C) 2006-2014 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/jshydra/autotest/abprewrite_source.js adblock-plus-2.6+dfsg/buildtools/jshydra/autotest/abprewrite_source.js
--- adblock-plus-2.4.1+dfsg/buildtools/jshydra/autotest/abprewrite_source.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/jshydra/autotest/abprewrite_source.js	2014-04-22 06:28:36.000000000 +0000
@@ -20,20 +20,22 @@
 let {x: y} = foo();
 let {k1: v1, k2: v2} = foo();
 
-for each (let v in fooList)
+
+for (let v of fooList)
   alert(v);
 
-for each (let [a, b] in fooList)
+for (let [a, b] of fooList)
 {
   a += b;
   b -= a;
 }
 
-for each (let [a, b] in fooList);
+for (let [a, b] of fooList);
 
-for each (k in fooList)
+for (k of fooList)
   alert(k);
 
+
 let a = function() 1;
 let b = {
   get foo() 1
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/jshydra/autotest/test_abprewrite.js.expected adblock-plus-2.6+dfsg/buildtools/jshydra/autotest/test_abprewrite.js.expected
--- adblock-plus-2.4.1+dfsg/buildtools/jshydra/autotest/test_abprewrite.js.expected	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/jshydra/autotest/test_abprewrite.js.expected	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/jshydra/autotest/test_abprewrite_module.js.expected adblock-plus-2.6+dfsg/buildtools/jshydra/autotest/test_abprewrite_module.js.expected
--- adblock-plus-2.4.1+dfsg/buildtools/jshydra/autotest/test_abprewrite_module.js.expected	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/jshydra/autotest/test_abprewrite_module.js.expected	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/jshydra/jshydra.js adblock-plus-2.6+dfsg/buildtools/jshydra/jshydra.js
--- adblock-plus-2.4.1+dfsg/buildtools/jshydra/jshydra.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/jshydra/jshydra.js	2014-04-22 06:28:36.000000000 +0000
@@ -40,4 +40,4 @@
 
   for (var i = 1; i < scriptArgs.length; i++)
     process_js(Reflect.parse(read(scriptArgs[i])), scriptArgs[i], scriptArg);
-})(arguments);
+})(this.arguments || this.scriptArgs);
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/jshydra/scripts/abprewrite.js adblock-plus-2.6+dfsg/buildtools/jshydra/scripts/abprewrite.js
--- adblock-plus-2.4.1+dfsg/buildtools/jshydra/scripts/abprewrite.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/jshydra/scripts/abprewrite.js	2014-04-22 06:28:36.000000000 +0000
@@ -320,33 +320,8 @@
 {
   if (ast.each)
   {
-    // Convert "for each" loops:
-    // for each (var foo in fooList)
-    // {
-    //   ...
-    // }
-    //
-    // Change into:
-    // for (var _loopIndex44 = 0; _loopIndex44 < fooList.length; ++_loopIndex44)
-    // {
-    //   var foo = fooList[_loopIndex44];
-    //   ...
-    // }
-    let loopIndex = Identifier("_loopIndex" + options.varIndex++);
-
-    let block = ensureBlock(ast.body);
-    if (ast.left.type == "VariableDeclaration")
-      block.body.unshift(VariableDeclaration(ast.left.declarations[0].id, Member(ast.right, loopIndex, true)));
-    else
-      block.body.unshift(Assignment(ast.left, Member(ast.right, loopIndex, true)));
-
-    return {
-      type: "ForStatement",
-      init: VariableDeclaration(loopIndex, 0),
-      test: LogicalExpression(loopIndex, "<", Member(ast.right, "length", false)),
-      update: IncExpression(loopIndex),
-      body: block
-    };
+    print("Use for (.. of ..) instead of for each (..)!\n");
+    throw new Error("Use for (.. of ..) instead of for each (..)!");
   }
 
   // Make sure that the loop body is always wrapped in a block
@@ -355,6 +330,37 @@
   return ast;
 }
 
+function modifyForOfStatement(ast)
+{
+  // Convert "for of" loops:
+  // for (var foo of fooList)
+  // {
+  //   ...
+  // }
+  //
+  // Change into:
+  // for (var _loopIndex44 = 0; _loopIndex44 < fooList.length; ++_loopIndex44)
+  // {
+  //   var foo = fooList[_loopIndex44];
+  //   ...
+  // }
+  let loopIndex = Identifier("_loopIndex" + options.varIndex++);
+
+  let block = ensureBlock(ast.body);
+  if (ast.left.type == "VariableDeclaration")
+    block.body.unshift(VariableDeclaration(ast.left.declarations[0].id, Member(ast.right, loopIndex, true)));
+  else
+    block.body.unshift(Assignment(ast.left, Member(ast.right, loopIndex, true)));
+
+  return {
+    type: "ForStatement",
+    init: VariableDeclaration(loopIndex, 0),
+    test: LogicalExpression(loopIndex, "<", Member(ast.right, "length", false)),
+    update: IncExpression(loopIndex),
+    body: block
+  };
+}
+
 function modifyLetStatement(ast)
 {
   if (ast.body.type == "ForStatement" && ast.body.init == null)
@@ -475,7 +481,7 @@
 
 process_js = function(ast, filename, args)
 {
-  for each (let arg in args.split(/\s+/))
+  for (let arg of args.split(/\s+/))
   {
     let match = /^(\w+)\s*=\s*(.*)/.exec(arg);
     if (match && typeof options[match[1]] == "boolean")
@@ -490,7 +496,7 @@
     // is being processed.
     _print('/*');
     _print(' * This file is part of Adblock Plus <http://adblockplus.org/>,');
-    _print(' * Copyright (C) 2006-2013 Eyeo GmbH');
+    _print(' * Copyright (C) 2006-2014 Eyeo GmbH');
     _print(' *');
     _print(' * Adblock Plus is free software: you can redistribute it and/or modify');
     _print(' * it under the terms of the GNU General Public License version 3 as');
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/jshydra/scripts/astDecompile.js adblock-plus-2.6+dfsg/buildtools/jshydra/scripts/astDecompile.js
--- adblock-plus-2.4.1+dfsg/buildtools/jshydra/scripts/astDecompile.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/jshydra/scripts/astDecompile.js	2014-04-22 06:28:36.000000000 +0000
@@ -134,6 +134,17 @@
   return str;
 }
 
+function decompileForOfStatement(ast) {
+  let str = "for (";
+  if (ast.left.type == "VariableDeclaration")
+      str += decompileVariableDeclaration(ast.left, true);
+  else
+      str += decompileAST(ast.left);
+  str += " of " + decompileExpr(ast.right, ast) + ") ";
+  str += decompileAST(ast.body);
+  return str;
+}
+
 function decompileLetStatement(ast) {
   let str = "let (";
   str += [d ? decompileAST(d) : ' ' for each (d in ast.head)].join(', ');
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/jshydra/utils.py adblock-plus-2.6+dfsg/buildtools/jshydra/utils.py
--- adblock-plus-2.4.1+dfsg/buildtools/jshydra/utils.py	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/jshydra/utils.py	2014-04-22 06:28:36.000000000 +0000
@@ -27,7 +27,7 @@
   if sys.platform not in platform_map:
     raise Exception('Unknown platform, is there a JS shell version for it?')
 
-  download_url = 'https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/20.0-candidates/build1/jsshell-%s.zip' % platform_map[sys.platform]
+  download_url = 'https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2013/01/2013-01-01-03-45-03-mozilla-esr17/jsshell-%s.zip' % platform_map[sys.platform]
   data = StringIO(urllib.urlopen(download_url).read())
   zip = zipfile.ZipFile(data)
   zip.extractall(shell_dir)
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/lib/hooks.js adblock-plus-2.6+dfsg/buildtools/lib/hooks.js
--- adblock-plus-2.4.1+dfsg/buildtools/lib/hooks.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/lib/hooks.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Adblock Plus build tools,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/lib/keySelector.js adblock-plus-2.6+dfsg/buildtools/lib/keySelector.js
--- adblock-plus-2.4.1+dfsg/buildtools/lib/keySelector.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/lib/keySelector.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Adblock Plus build tools,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/lib/prefs.js adblock-plus-2.6+dfsg/buildtools/lib/prefs.js
--- adblock-plus-2.4.1+dfsg/buildtools/lib/prefs.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/lib/prefs.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Adblock Plus build tools,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/lib/windowObserver.js adblock-plus-2.6+dfsg/buildtools/lib/windowObserver.js
--- adblock-plus-2.4.1+dfsg/buildtools/lib/windowObserver.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/lib/windowObserver.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Adblock Plus build tools,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/LocaleTester.pm adblock-plus-2.6+dfsg/buildtools/LocaleTester.pm
--- adblock-plus-2.4.1+dfsg/buildtools/LocaleTester.pm	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/LocaleTester.pm	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,5 @@
 # This file is part of the Adblock Plus build tools,
-# Copyright (C) 2006-2013 Eyeo GmbH
+# Copyright (C) 2006-2014 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/localeTools.py adblock-plus-2.6+dfsg/buildtools/localeTools.py
--- adblock-plus-2.4.1+dfsg/buildtools/localeTools.py	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/localeTools.py	2014-04-22 06:28:36.000000000 +0000
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 # This file is part of the Adblock Plus build tools,
-# Copyright (C) 2006-2013 Eyeo GmbH
+# Copyright (C) 2006-2014 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/manifest.json.tmpl adblock-plus-2.6+dfsg/buildtools/manifest.json.tmpl
--- adblock-plus-2.4.1+dfsg/buildtools/manifest.json.tmpl	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/manifest.json.tmpl	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Adblock Plus build tools,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/packagerChrome.py adblock-plus-2.6+dfsg/buildtools/packagerChrome.py
--- adblock-plus-2.4.1+dfsg/buildtools/packagerChrome.py	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/packagerChrome.py	2014-04-22 06:28:36.000000000 +0000
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 # This file is part of the Adblock Plus build tools,
-# Copyright (C) 2006-2013 Eyeo GmbH
+# Copyright (C) 2006-2014 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
@@ -50,42 +50,46 @@
   # that it can be overridden if necessary.
   return data
 
-def createManifest(params):
+def makeIcons(files, filenames):
+    from PIL import Image
+    icons = {}
+    for filename in filenames:
+      width, height = Image.open(StringIO(files[filename])).size
+      if(width != height):
+        print >>sys.stderr, 'Warning: %s size is %ix%i, icon should be square' % (filename, width, height)
+      icons[width] = filename
+    return icons
+
+def createManifest(params, files):
   template = getTemplate('manifest.json.tmpl')
   templateData = dict(params)
 
   baseDir = templateData['baseDir']
   metadata = templateData['metadata']
 
-  if metadata.has_option('general', 'pageAction') and metadata.get('general', 'pageAction') != '':
-    if re.search(r'\s+', metadata.get('general', 'pageAction')):
-      icon, popup = re.split(r'\s+', metadata.get('general', 'pageAction'), 1)
-    else:
-      icon, popup = (metadata.get('general', 'pageAction'), None)
-    templateData['pageAction'] = {'icon': icon, 'popup': popup}
+  for opt in ('browserAction', 'pageAction'):
+    if not metadata.has_option('general', opt):
+      continue
 
-  if metadata.has_option('general', 'browserAction') and metadata.get('general', 'browserAction') != '':
-    if re.search(r'\s+', metadata.get('general', 'browserAction')):
-      icon, popup = re.split(r'\s+', metadata.get('general', 'browserAction'), 1)
+    icons = metadata.get('general', opt).split()
+    if not icons:
+      continue
+
+    if len(icons) == 1:
+      # ... = icon.png
+      icon, popup = icons[0], None
+    elif len(icons) == 2:
+      # ... = icon.png popup.html
+      icon, popup = icons
     else:
-      icon, popup = (metadata.get('general', 'browserAction'), None)
-    templateData['browserAction'] = {'icon': icon, 'popup': popup}
+      # ... = icon-19.png icon-38.png popup.html
+      popup = icons.pop()
+      icon = makeIcons(files, icons)
 
-  if metadata.has_option('general', 'icons'):
-    icons = {}
-    iconsDir = baseDir
-    for dir in metadata.get('general', 'icons').split('/')[0:-1]:
-      iconsDir = os.path.join(iconsDir, dir)
-
-    prefix, suffix = metadata.get('general', 'icons').split('/')[-1].split('?', 1)
-    for file in os.listdir(iconsDir):
-      path = os.path.join(iconsDir, file)
-      if os.path.isfile(path) and file.startswith(prefix) and file.endswith(suffix):
-        size = file[len(prefix):-len(suffix)]
-        if not re.search(r'\D', size):
-          icons[size] = os.path.relpath(path, baseDir).replace('\\', '/')
+    templateData[opt] = {'icon': icon, 'popup': popup}
 
-    templateData['icons'] = icons
+  if metadata.has_option('general', 'icons'):
+    templateData['icons'] = makeIcons(files, metadata.get('general', 'icons').split())
 
   if metadata.has_option('general', 'permissions'):
     templateData['permissions'] = re.split(r'\s+', metadata.get('general', 'permissions'))
@@ -160,6 +164,12 @@
     sourceFiles = map(lambda f: os.path.abspath(os.path.join(baseDir, f)), sourceFiles)
     files[file] = doRewrite(sourceFiles, args)
 
+def toJson(data):
+  return json.dumps(
+    data, ensure_ascii=False, sort_keys=True,
+    indent=2, separators=(',', ': ')
+  ).encode('utf-8') + '\n'
+
 def importGeckoLocales(params, files):
   import localeTools
 
@@ -261,8 +271,7 @@
       except Exception, e:
         print 'Warning: error importing locale data from %s: %s' % (sourceFile, e)
 
-      files[targetFile] = json.dumps(data, ensure_ascii=False, sort_keys=True,
-                            indent=2, separators=(',', ': ')).encode('utf-8') + '\n'
+      files[targetFile] = toJson(data)
 
   if params['type'] == 'opera':
     # Opera has a slightly different locale mapping
@@ -279,6 +288,24 @@
           files[operaFile] = files[chromeFile]
         del files[chromeFile]
 
+def fixMissingTranslations(files):
+  # Chrome requires messages used in manifest.json to be given in all languages
+  defaults = {}
+  data = json.loads(files['_locales/%s/messages.json' % defaultLocale])
+  for match in re.finditer(r'__MSG_(\S+)__', files['manifest.json']):
+    name = match.group(1)
+    defaults[name] = data[name]
+
+  for filename in files:
+    if not filename.startswith('_locales/') or not filename.endswith('/messages.json'):
+      continue
+
+    data = json.loads(files[filename])
+    for name, info in defaults.iteritems():
+      data.setdefault(name, info)
+
+    files[filename] = toJson(data)
+
 def signBinary(zipdata, keyFile):
   import M2Crypto
   if not os.path.exists(keyFile):
@@ -322,7 +349,7 @@
 
   files = Files(getPackageFiles(params), getIgnoredFiles(params),
                 process=lambda path, data: processFile(path, data, params))
-  files['manifest.json'] = createManifest(params)
+  
   if metadata.has_section('mapping'):
     files.readMappedFiles(metadata.items('mapping'))
   files.read(baseDir)
@@ -342,6 +369,9 @@
 
   if metadata.has_section('import_locales'):
     importGeckoLocales(params, files)
+  
+  files['manifest.json'] = createManifest(params, files)
+  fixMissingTranslations(files)
 
   if devenv:
     files['devenvPoller__.js'] = createPoller(params)
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/packagerGecko.py adblock-plus-2.6+dfsg/buildtools/packagerGecko.py
--- adblock-plus-2.4.1+dfsg/buildtools/packagerGecko.py	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/packagerGecko.py	2014-04-22 06:28:36.000000000 +0000
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 # This file is part of the Adblock Plus build tools,
-# Copyright (C) 2006-2013 Eyeo GmbH
+# Copyright (C) 2006-2014 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/packager.py adblock-plus-2.6+dfsg/buildtools/packager.py
--- adblock-plus-2.4.1+dfsg/buildtools/packager.py	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/packager.py	2014-04-22 06:28:36.000000000 +0000
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 # This file is part of the Adblock Plus build tools,
-# Copyright (C) 2006-2013 Eyeo GmbH
+# Copyright (C) 2006-2014 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/packagerSafari.py adblock-plus-2.6+dfsg/buildtools/packagerSafari.py
--- adblock-plus-2.4.1+dfsg/buildtools/packagerSafari.py	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/packagerSafari.py	2014-04-22 06:28:36.000000000 +0000
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 # This file is part of the Adblock Plus build tools,
-# Copyright (C) 2006-2013 Eyeo GmbH
+# Copyright (C) 2006-2014 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
@@ -87,7 +87,6 @@
   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'],
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/publicSuffixListUpdater.py adblock-plus-2.6+dfsg/buildtools/publicSuffixListUpdater.py
--- adblock-plus-2.4.1+dfsg/buildtools/publicSuffixListUpdater.py	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/publicSuffixListUpdater.py	2014-04-22 06:28:36.000000000 +0000
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 # This file is part of the Adblock Plus build tools,
-# Copyright (C) 2006-2013 Eyeo GmbH
+# Copyright (C) 2006-2014 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/releaseAutomation.py adblock-plus-2.6+dfsg/buildtools/releaseAutomation.py
--- adblock-plus-2.4.1+dfsg/buildtools/releaseAutomation.py	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/releaseAutomation.py	2014-04-22 06:28:36.000000000 +0000
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 # This file is part of the Adblock Plus build tools,
-# Copyright (C) 2006-2013 Eyeo GmbH
+# Copyright (C) 2006-2014 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
@@ -26,14 +26,17 @@
 
   # Replace version number in metadata file "manually", ConfigParser will mess
   # up the order of lines.
-  handle = open(packager.getMetadataPath(baseDir, type), 'rb')
-  rawMetadata = handle.read()
-  handle.close()
-  versionRegExp = re.compile(r'^(\s*version\s*=\s*).*', re.I | re.M)
-  rawMetadata = re.sub(versionRegExp, r'\g<1>%s' % version, rawMetadata)
-  handle = open(packager.getMetadataPath(baseDir, type), 'wb')
-  handle.write(rawMetadata)
-  handle.close()
+  metadata = packager.readMetadata(baseDir, type)
+  with open(metadata.option_source("general", "version"), 'r+b') as file:
+    rawMetadata = file.read()
+    rawMetadata = re.sub(
+      r'^(\s*version\s*=\s*).*', r'\g<1>%s' % version,
+      rawMetadata, flags=re.I | re.M
+    )
+
+    file.seek(0)
+    file.write(rawMetadata)
+    file.truncate()
 
   # Read extension name from locale data
   import buildtools.packagerGecko as packagerGecko
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/safariInfo.js.tmpl adblock-plus-2.6+dfsg/buildtools/safariInfo.js.tmpl
--- adblock-plus-2.4.1+dfsg/buildtools/safariInfo.js.tmpl	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/safariInfo.js.tmpl	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Adblock Plus build tools,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/objtabs.css adblock-plus-2.6+dfsg/chrome/content/objtabs.css
--- adblock-plus-2.4.1+dfsg/chrome/content/objtabs.css	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/objtabs.css	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/composer.js adblock-plus-2.6+dfsg/chrome/content/ui/composer.js
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/composer.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/composer.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/composer.xul adblock-plus-2.6+dfsg/chrome/content/ui/composer.xul
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/composer.xul	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/composer.xul	2014-04-22 06:28:36.000000000 +0000
@@ -2,7 +2,7 @@
 
 <!--
   - This file is part of Adblock Plus <http://adblockplus.org/>,
-  - Copyright (C) 2006-2013 Eyeo GmbH
+  - Copyright (C) 2006-2014 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/fennecSettings.xul adblock-plus-2.6+dfsg/chrome/content/ui/fennecSettings.xul
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/fennecSettings.xul	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/fennecSettings.xul	2014-04-22 06:28:36.000000000 +0000
@@ -2,7 +2,7 @@
 
 <!--
   - This file is part of Adblock Plus <http://adblockplus.org/>,
-  - Copyright (C) 2006-2013 Eyeo GmbH
+  - Copyright (C) 2006-2014 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/filters-backup.js adblock-plus-2.6+dfsg/chrome/content/ui/filters-backup.js
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/filters-backup.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/filters-backup.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -174,7 +174,7 @@
    */
   restoreCustomFilters: function(/**nsIFile*/ file)
   {
-    IO.readFromFile(file, true, {
+    IO.readFromFile(file, {
       seenHeader: false,
       subscription: null,
       process: function(line)
@@ -331,7 +331,7 @@
         yield list[i];
     }
 
-    IO.writeToFile(file, true, generator(), function(e)
+    IO.writeToFile(file, generator(), function(e)
     {
       if (e)
       {
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/filters-filteractions.js adblock-plus-2.6+dfsg/chrome/content/ui/filters-filteractions.js
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/filters-filteractions.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/filters-filteractions.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/filters-filterview.js adblock-plus-2.6+dfsg/chrome/content/ui/filters-filterview.js
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/filters-filterview.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/filters-filterview.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/filters.js adblock-plus-2.6+dfsg/chrome/content/ui/filters.js
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/filters.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/filters.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -136,7 +136,12 @@
         let attribute = node.attributes[i];
         let len = attribute.value.length;
         if (len >= 2 && attribute.value[0] == "{" && attribute.value[len - 1] == "}")
-          attribute.value = Cu.evalInSandbox(attribute.value.substr(1, len - 2), sandbox);
+        {
+          let value = Cu.evalInSandbox(attribute.value.substr(1, len - 2), sandbox);
+          if (attribute.name == "condition")
+            value = value ? "true" : "false";
+          attribute.value = value;
+        }
       }
     }
 
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/filters-search.js adblock-plus-2.6+dfsg/chrome/content/ui/filters-search.js
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/filters-search.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/filters-search.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -134,23 +134,100 @@
  */
 FilterSearch.fakeBrowser =
 {
-  fastFind:
+  finder:
   {
+    _resultListeners: [],
     searchString: null,
+    caseSensitive: false,
+    lastResult: null,
+
+    _notifyResultListeners: function(result, findBackwards)
+    {
+      this.lastResult = result;
+      for each (let listener in this._resultListeners)
+        listener.onFindResult(result, findBackwards);
+    },
+
+    fastFind: function(searchString, linksOnly, drawOutline)
+    {
+      this.searchString = searchString;
+      let result = FilterSearch.search(this.searchString, 0,
+                                       this.caseSensitive);
+      this._notifyResultListeners(result, false);
+    },
+
+    findAgain: function(findBackwards, linksOnly, drawOutline)
+    {
+      let result = FilterSearch.search(this.searchString,
+                                       findBackwards ? -1 : 1,
+                                       this.caseSensitive);
+      this._notifyResultListeners(result, findBackwards);
+    },
+
+    addResultListener: function(listener)
+    {
+      if (this._resultListeners.indexOf(listener) === -1)
+        this._resultListeners.push(listener);
+    },
+
+    removeResultListener: function(listener)
+    {
+      let index = this._resultListeners.indexOf(listener);
+      if (index !== -1)
+        this._resultListeners.splice(index, 1);
+    },
+
+    // Irrelevant for us
+    highlight: function(highlight, word) {},
+    enableSelection: function() {},
+    removeSelection: function() {},
+    focusContent: function() {},
+    keyPress: function() {}
+  },
+
+  get _lastSearchString()
+  {
+    return this.finder.searchString;
+  },
+
+  // This was used before Firefox 27 instead of the "finder" property.
+  fastFind:
+  {
+    get searchString()
+    {
+      return FilterSearch.fakeBrowser.finder.searchString;
+    },
+
+    set searchString(searchString)
+    {
+      FilterSearch.fakeBrowser.finder.searchString = searchString;
+    },
+
     foundLink: null,
     foundEditable: null,
-    caseSensitive: false,
+
+    get caseSensitive()
+    {
+      return FilterSearch.fakeBrowser.finder.caseSensitive;
+    },
+
+    set caseSensitive(caseSensitive)
+    {
+      FilterSearch.fakeBrowser.finder.caseSensitive = caseSensitive;
+    },
+
     get currentWindow() FilterSearch.fakeBrowser.contentWindow,
 
     find: function(searchString, linksOnly)
     {
-      this.searchString = searchString;
-      return FilterSearch.search(this.searchString, 0, this.caseSensitive);
+      FilterSearch.fakeBrowser.finder.fastFind(searchString, linksOnly);
+      return FilterSearch.fakeBrowser.finder.lastResult;
     },
 
     findAgain: function(findBackwards, linksOnly)
     {
-      return FilterSearch.search(this.searchString, findBackwards ? -1 : 1, this.caseSensitive);
+      FilterSearch.fakeBrowser.finder.findAgain(findBackwards, linksOnly);
+      return FilterSearch.fakeBrowser.finder.lastResult;
     },
 
     // Irrelevant for us
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/filters-subscriptionactions.js adblock-plus-2.6+dfsg/chrome/content/ui/filters-subscriptionactions.js
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/filters-subscriptionactions.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/filters-subscriptionactions.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/filters-subscriptionview.js adblock-plus-2.6+dfsg/chrome/content/ui/filters-subscriptionview.js
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/filters-subscriptionview.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/filters-subscriptionview.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/filters.xul adblock-plus-2.6+dfsg/chrome/content/ui/filters.xul
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/filters.xul	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/filters.xul	2014-04-22 06:28:36.000000000 +0000
@@ -2,7 +2,7 @@
 
 <!--
   - This file is part of Adblock Plus <http://adblockplus.org/>,
-  - Copyright (C) 2006-2013 Eyeo GmbH
+  - Copyright (C) 2006-2014 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/firstRun.html adblock-plus-2.6+dfsg/chrome/content/ui/firstRun.html
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/firstRun.html	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/firstRun.html	2014-04-22 06:28:36.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!--
   - This file is part of Adblock Plus <http://adblockplus.org/>,
-  - Copyright (C) 2006-2013 Eyeo GmbH
+  - Copyright (C) 2006-2014 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/firstRun.js adblock-plus-2.6+dfsg/chrome/content/ui/firstRun.js
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/firstRun.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/firstRun.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/flasher.js adblock-plus-2.6+dfsg/chrome/content/ui/flasher.js
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/flasher.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/flasher.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/i18n.js adblock-plus-2.6+dfsg/chrome/content/ui/i18n.js
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/i18n.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/i18n.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/overlay.xul adblock-plus-2.6+dfsg/chrome/content/ui/overlay.xul
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/overlay.xul	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/overlay.xul	2014-04-22 06:28:36.000000000 +0000
@@ -2,7 +2,7 @@
 
 <!--
   - This file is part of Adblock Plus <http://adblockplus.org/>,
-  - Copyright (C) 2006-2013 Eyeo GmbH
+  - Copyright (C) 2006-2014 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
@@ -124,6 +124,11 @@
   <panel id="abp-notification" type="arrow" orient="vertical"
     xmlns:html="http://www.w3.org/1999/xhtml">
     <label id="abp-notification-title" class="header"/>
-    <html:p id="abp-notification-message" maxwidth="300"></html:p>
+    <html:p id="abp-notification-message"/>
+    <hbox id="abp-notification-question">
+      <button id="abp-notification-yes" label="&notification.button.yes;"/>
+      <button id="abp-notification-no" label="&notification.button.no;"/>
+      <toolbarbutton id="abp-notification-close" label="&notification.button.close;"></toolbarbutton>
+    </hbox>
   </panel>
 </overlay>
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/progressBar.js adblock-plus-2.6+dfsg/chrome/content/ui/progressBar.js
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/progressBar.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/progressBar.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/progressBar.xul adblock-plus-2.6+dfsg/chrome/content/ui/progressBar.xul
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/progressBar.xul	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/progressBar.xul	2014-04-22 06:28:36.000000000 +0000
@@ -2,7 +2,7 @@
 
 <!--
   - This file is part of Adblock Plus <http://adblockplus.org/>,
-  - Copyright (C) 2006-2013 Eyeo GmbH
+  - Copyright (C) 2006-2014 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/sendReport.js adblock-plus-2.6+dfsg/chrome/content/ui/sendReport.js
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/sendReport.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/sendReport.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -381,7 +381,7 @@
                                       this._canvas.height - this.imageOffset * 2);
     this._max = this._pixelData.width * this._pixelData.height * 4;
     this._i = 0;
-    Utils.threadManager.currentThread.dispatch(this, Ci.nsIEventTarget.DISPATCH_NORMAL);
+    Utils.runAsync(this.run.bind(this));
   },
 
   run: function()
@@ -401,7 +401,7 @@
     else
     {
       this._i = i;
-      Utils.threadManager.currentThread.dispatch(this, Ci.nsIEventTarget.DISPATCH_NORMAL);
+      Utils.runAsync(this.run.bind(this));
     }
   },
 
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/sendReport.xul adblock-plus-2.6+dfsg/chrome/content/ui/sendReport.xul
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/sendReport.xul	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/sendReport.xul	2014-04-22 06:28:36.000000000 +0000
@@ -2,7 +2,7 @@
 
 <!--
   - This file is part of Adblock Plus <http://adblockplus.org/>,
-  - Copyright (C) 2006-2013 Eyeo GmbH
+  - Copyright (C) 2006-2014 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/settings.xul adblock-plus-2.6+dfsg/chrome/content/ui/settings.xul
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/settings.xul	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/settings.xul	2014-04-22 06:28:36.000000000 +0000
@@ -2,7 +2,7 @@
 
 <!--
   - This file is part of Adblock Plus <http://adblockplus.org/>,
-  - Copyright (C) 2006-2013 Eyeo GmbH
+  - Copyright (C) 2006-2014 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/sidebarDetached.xul adblock-plus-2.6+dfsg/chrome/content/ui/sidebarDetached.xul
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/sidebarDetached.xul	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/sidebarDetached.xul	2014-04-22 06:28:36.000000000 +0000
@@ -2,7 +2,7 @@
 
 <!--
   - This file is part of Adblock Plus <http://adblockplus.org/>,
-  - Copyright (C) 2006-2013 Eyeo GmbH
+  - Copyright (C) 2006-2014 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/sidebar.js adblock-plus-2.6+dfsg/chrome/content/ui/sidebar.js
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/sidebar.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/sidebar.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/sidebar.xul adblock-plus-2.6+dfsg/chrome/content/ui/sidebar.xul
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/sidebar.xul	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/sidebar.xul	2014-04-22 06:28:36.000000000 +0000
@@ -2,7 +2,7 @@
 
 <!--
   - This file is part of Adblock Plus <http://adblockplus.org/>,
-  - Copyright (C) 2006-2013 Eyeo GmbH
+  - Copyright (C) 2006-2014 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/subscriptionSelection.js adblock-plus-2.6+dfsg/chrome/content/ui/subscriptionSelection.js
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/subscriptionSelection.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/subscriptionSelection.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/subscriptionSelection.xul adblock-plus-2.6+dfsg/chrome/content/ui/subscriptionSelection.xul
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/subscriptionSelection.xul	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/subscriptionSelection.xul	2014-04-22 06:28:36.000000000 +0000
@@ -2,7 +2,7 @@
 
 <!--
   - This file is part of Adblock Plus <http://adblockplus.org/>,
-  - Copyright (C) 2006-2013 Eyeo GmbH
+  - Copyright (C) 2006-2014 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/subscriptions.xml adblock-plus-2.6+dfsg/chrome/content/ui/subscriptions.xml
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/subscriptions.xml	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/subscriptions.xml	2014-04-22 06:28:36.000000000 +0000
@@ -2,7 +2,7 @@
 
 <!--
   - This file is part of the Adblock Plus web scripts,
-  - Copyright (C) 2006-2013 Eyeo GmbH
+  - Copyright (C) 2006-2014 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
@@ -36,12 +36,12 @@
                 homepage="http://stanev.org/abp/"
                 prefixes="bg"
                 author="Александър Станев"/>
-  <subscription title="ChinaList+EasyList"
+  <subscription title="EasyList China+EasyList"
                 specialization="中文"
-                url="https://easylist-downloads.adblockplus.org/chinalist+easylist.txt"
-                homepage="https://code.google.com/p/adblock-chinalist/"
+                url="https://easylist-downloads.adblockplus.org/easylistchina+easylist.txt"
+                homepage="http://abpchina.org/forum/"
                 prefixes="zh"
-                author="Gythialy"/>
+                author="John, Li, Jiefei"/>
   <subscription title="EasyList Czech and Slovak+EasyList"
                 specialization="čeština, slovenčina"
                 url="https://easylist-downloads.adblockplus.org/easylistczechslovak+easylist.txt"
@@ -60,18 +60,18 @@
                 homepage="https://easylist.adblockplus.org/"
                 prefixes="de"
                 author="MonztA, Famlam"/>
+  <subscription title="EasyList Hebrew+EasyList"
+                specialization="עברית"
+                url="https://easylist-downloads.adblockplus.org/israellist+easylist.txt"
+                homepage="https://github.com/AdBlockPlusIsrael/EasyListHebrew"
+                prefixes="he"
+                author="BsT"/>
   <subscription title="EasyList Italy+EasyList"
                 specialization="italiano"
                 url="https://easylist-downloads.adblockplus.org/easylistitaly+easylist.txt"
                 homepage="https://easylist.adblockplus.org/"
                 prefixes="it"
                 author="Khrin"/>
-  <subscription title="IsraelList+EasyList"
-                specialization="עברית"
-                url="https://easylist-downloads.adblockplus.org/israellist+easylist.txt"
-                homepage="https://github.com/AdBlockPlusIsrael/EasyListIsrael"
-                prefixes="he"
-                author="BsT, rafiw"/>
   <subscription title="Latvian List+EasyList"
                 specialization="latviešu valoda"
                 url="https://easylist-downloads.adblockplus.org/latvianlist+easylist.txt"
diff -Nru adblock-plus-2.4.1+dfsg/chrome/content/ui/utils.js adblock-plus-2.6+dfsg/chrome/content/ui/utils.js
--- adblock-plus-2.4.1+dfsg/chrome/content/ui/utils.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/content/ui/utils.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ach/composer.dtd adblock-plus-2.6+dfsg/chrome/locale/ach/composer.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/ach/composer.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ach/composer.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,5 @@
 <!ENTITY dialog.title "pierdolona smata ">
 <!ENTITY collapse.yes.label "nie">
-<!ENTITY collapse.default.no.label "tak
-">
+<!ENTITY collapse.default.no.label "tak">
 <!ENTITY accept.label "co huju">
 <!ENTITY collapse.no.label "nie">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ar/composer.dtd adblock-plus-2.6+dfsg/chrome/locale/ar/composer.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/ar/composer.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ar/composer.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -14,7 +14,7 @@
 <!ENTITY unselectAllTypes.label "بدون أي اختيار">
 <!ENTITY type.whitelist.label "قاعدة است&amp;ثناء">
 <!ENTITY regexp.warning "النموذج الذي أدخلته سيتم تعبيره على أنه تعبير العادي، الكثير من التعابير العادية قد تؤدي إلى بطء في التصفح. إن لم تكن تنوي استخدام التعابير العادية، قم بإضافة الرمز &quot;*&quot; إلى نهاية النموذج">
-<!ENTITY dialog.title "أضف قاعدة تصفية لآدبلوك بلس">
+<!ENTITY dialog.title "إضافة قاعدة تصفية لآدبلوك بلوس">
 <!ENTITY basic.label "العرض الأساسي">
 <!ENTITY type.filter.label "&amp;فلاتر حجب">
 <!ENTITY types.label "التطبيق على الأنواع:">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ar/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/ar/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/ar/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ar/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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=آد بلوك بلس يمكنه عمل أشياء أخرى غير حجب الإعلانات
 firstRun_feature_malware_description=إجعل التصفح أكثر أماناً بتعطيل مواقع البرامج الضارة المعروفة.
-firstRun_feature_show_overview=عرض نظرة عامة
 firstRun_feature_social_description=خلص تلقائياً المتصفح الخاص بك من وسائل الإعلام الاجتماعية الأزرار، مثل مثل ألفيس بوك، التي تظهر في صفحات الويب، وتتبع السلوك الخاص بك.
 firstRun_donate=تبرع
 firstRun_donate_label=دعم مشروعنا
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ar/global.properties adblock-plus-2.6+dfsg/chrome/locale/ar/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/ar/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ar/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=لا توجد عناصر للحجب في هذه الصفحة
 action3_tooltip=اضغط لتشغيل/تعطيل آدبلوك بلس
+notification_antiadblock_title=إخفاء الرسائل المستهدفة؟
 type_label_script=سكريبت
 filter_elemhide_nocriteria=لم يتم تحديد صيغة للتعرف على العنصر لإخفاؤه
 blockingGroup_title=قواعد حجب الدعاية
@@ -24,6 +25,7 @@
 action2_tooltip=اضغط لفتح الخيارات، اضغط بالزر الأوسط للتشغيل/التعطيل
 type_label_subdocument=إطار
 clearStats_warning=هذا سيصفّر كل احصاءات الفلاتر ويعطّل تعداد اصابات الفلاتر. هل تريد التقدم؟
+notification_antiadblock_message=لقد عرف هذا الموقع بإظهاره رسائل موجهة إلى المستخدمين. هل تريد أن يخفي Adblock Plus الرسائل المستهدفة؟
 blocked_count_addendum=المسموح به ?1? والمخفي ?2?
 subscription_invalid_location=موقع قائمة الفلتر ليس صحيح كعنوان ويب و لا كأسم ملف
 type_label_image=صورة
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ar/meta.properties adblock-plus-2.6+dfsg/chrome/locale/ar/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/ar/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ar/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 description.short=هل أنت منزعج من الإعلانات و من تتبعك من قبل المواقع ومن كل تلك الشرائط الإعلانية؟ قم بتحميل آدبلوك بلس للتتحكم بتصفحك للويب وتغيير الطريقة التي تنظر بها إلى الإنترنت.\n\nفيديو قصير توضيحي متوفر على العنوان:http://www.youtube.com/watch?v=oNvb2SjVjjI
 name=آدبلوك بلس
-description.long.addition1=بدءاً آد بلوك بلس 2.0 هناك خيار في "تفضيلات عامل التصفية" للسماح لبعض الإعلانات غير تدخلية. والهدف لدعم مواقع الويب باستخدام طرق غير تدخلية للإعلان، وتشجيع المزيد من المواقع تفعل الشيء نفسه. <a href="http://adblockplus.org/en/acceptable-ads"> اقرأ المزيد</a>
-translator=majdcomp
+description.long.addition1=ابتداءاً من آد بلوك بلس  2.0 هناك خيار في تفضيلات تصفية للسماح بعض الإعلانات الغير مزعجة. الهدف هو دعم مواقع الويب باستخدام طرق غير مزعجة للإعلان وتشجيع المزيد من المواقع على أن تحذو حذوها.  <a href="http://adblockplus.org/en/acceptable-ads">اقرأ المزيد</a>
+translator=فلاديمير بلنت
 description.long=يسمح لك آدبلوك بلس بالتحكم بالإنترنت وبالطريقة التي تنظر بها إلى الويب بالشكل الذي تريده. ان هذه الإضافة مدعومة من أكثر من أربعين اشتراك فلتر في عشرات اللغات والتي يتم ضبطها تلقائيا لفوائد تتراوح بين إزالة الإعلانات إلى حجب المواقع الضارة. يسمح آدبلوك بلس أيضا بتعديل الفلاتر بمساعدة العديد من المزايا الهامة كخيار لإزالة الصور وتبويبة لحجب عناصر الفلاش والجافا وقائمة بالعناصر التي يمكن حجبها لإزالة السكريبتات وملفات الستايل.
 description=الإعلانات أصبحت من الأمس!
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ar/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/ar/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/ar/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ar/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,7 @@
+<!ENTITY notification.button.yes "&amp;نعم">
+<!ENTITY notification.button.no "&amp;لا">
 <!ENTITY sync.label "م&amp;زامنة إعدادات آدبلوك بلس">
-<!ENTITY whitelist.site.label "تعطيل في ؟1؟">
+<!ENTITY whitelist.site.label "تعطيل في ?1?">
 <!ENTITY filters.label "ت&amp;فضيلات الفلتر">
 <!ENTITY disable.label "تعطيل في جميع الأماكن">
 <!ENTITY objecttab.title "أحجب">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "آدبلوك بلس : حجب صورة">
 <!ENTITY counthits.label "تعداد اصابات الفلترة (&amp;إ)">
 <!ENTITY opensidebar.label "فتح العناصر المح&amp;جوبة">
+<!ENTITY notification.button.close "&amp;اغلاق">
 <!ENTITY contribute.label "شارك في آد بلُك بلَس">
 <!ENTITY toolbarbutton.label "آدبلوك بلس">
 <!ENTITY context.frame.label "آدبلوك بلس : حجب إطار">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ast/composer.dtd adblock-plus-2.6+dfsg/chrome/locale/ast/composer.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/ast/composer.dtd	1970-01-01 00:00:00.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ast/composer.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -0,0 +1,33 @@
+<!ENTITY anchor.end.label "al fi&amp;nal de la direición">
+<!ENTITY domainRestriction.label "Llendar al &amp;dominiu:">
+<!ENTITY collapse.default.no.label "Usar predeterminaos (non)">
+<!ENTITY firstParty.label "Sólo p&amp;rimera parte">
+<!ENTITY preferences.label "Amo&amp;sar los filtros esistentes...">
+<!ENTITY pattern.label "Buscar un patrón">
+<!ENTITY thirdParty.label "Sólo de &amp;terceros">
+<!ENTITY filter.label "&amp;Filtru nuevu:">
+<!ENTITY collapse.label "P&amp;legar bloquiaos:">
+<!ENTITY match.warning "El patrón qu'escribió yá nun casa cola direición a bloquiar o incluir na llista blanca, y nun tendrá dengún efeutu n'ella.">
+<!ENTITY anchor.start.label "al pr&amp;incipiu de la direición">
+<!ENTITY matchCase.label "Distinguir &amp;mayúscules">
+<!ENTITY custom.pattern.label "&amp;Personalizáu:">
+<!ENTITY unselectAllTypes.label "Nun seleicionar nada">
+<!ENTITY type.whitelist.label "Regla d'e&amp;sceición">
+<!ENTITY regexp.warning "El patrón qu'escribió interpretaráse como una espresión regular, qu'Adblock Plus nun pue procesar de mou eficaz, y pue facer más lenta la navegación. Si nun quería usar una espresión regular, amieste un asteriscu (*) al final del patrón.">
+<!ENTITY dialog.title "Amestar una regla de filtráu d'Adblock Plus">
+<!ENTITY basic.label "Vista básica">
+<!ENTITY type.filter.label "Filtru de &amp;bloquéu">
+<!ENTITY types.label "Aplicar a los tipos:">
+<!ENTITY shortpattern.warning "El patrón qu'escribió ye curtiu enforma pa poder ameyorase y pue facer más lenta la navegación. Recomiéndase qu'escueya una cadena más llarga para esti filtru pa permitir a Adblock Plus procesalu de mou más eficaz.">
+<!ENTITY collapse.yes.label "Sí">
+<!ENTITY anchors.label "Aceutar sólo patrones:">
+<!ENTITY collapse.default.yes.label "Usar predeterminaos (sí)">
+<!ENTITY domainRestriction.help "Use esta opción pa especificar un dominiu o más separaos por una barra (|). El filtru sólo s'aplicará nos dominios seleicionaos. Una tilde (~) antes d'un nome de dominiu significa que'l filtru nun s'aplicará nesi dominiu.">
+<!ENTITY accept.label "Amestar un filtru">
+<!ENTITY options.label "Opciones">
+<!ENTITY disabled.warning "Adblock Plus ta desactiváu. Inda pue amestar filtros, pero nun s'aplicarán si nun [link]activa Adblock Plus[/link].">
+<!ENTITY anchor.start.flexible.label "al pr&amp;incipiu del nome de dominiu">
+<!ENTITY collapse.no.label "Non">
+<!ENTITY selectAllTypes.label "Seleicionar toos">
+<!ENTITY advanced.label "Vista avanzada">
+<!ENTITY pattern.explanation "El patrón pue ser cualquier parte de la direición, los asteriscos (*) úsense como comodinos. El filtru sólo s'aplicará a les direiciones que casen col patrón dau.">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ast/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/ast/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/ast/firstRun.properties	1970-01-01 00:00:00.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ast/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -0,0 +1,6 @@
+firstRun_toggle_off=DESACTIVÁU
+firstRun_title=Instalóse Adblock Plus
+firstRun_acceptableAdsExplanation=Queremos afalar que les páxines web usen una publicidá más direuta y qu'estorbe menos. Poro, establecimos unes <a>regles estrictes</a> col envís d'identificar los anuncios aceptables, que s'amuesen nes opciones predeterminaes. Si inda quier bloquiar tola publicidá, pue <a>desactivar</a> esto nunos segundos.
+firstRun_toggle_on=ACTIVÁU
+firstRun_dataCorruptionWarning=¿Sigue apaeciendo esta páxina? <a>¡Calque equí!</a>
+firstRun_acceptableAdsHeadline=Los anuncios cafiantes bloquiaránse darréu
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ast/meta.properties adblock-plus-2.6+dfsg/chrome/locale/ast/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/ast/meta.properties	1970-01-01 00:00:00.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ast/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -0,0 +1,6 @@
+description.short=Bloquia los cafiantes videos d'anunciu de YouTube, anuncios de Facebook, cartelos y muncho más.\n\nAdblock Plus bloquia tolos anuncios cafiantes, y sofita les páxines web nun bloquiando de mou predetermináu (configurable) los anuncios que nun estorben.
+name=Adblock Plus
+description.long.addition1=Dende Adblock Plus 2.0 hai una opción nes Preferencies de filtros que permite cierta publicidá non invasiva. L'oxetivu ye ayudar a los sitios web qu'usen métodos de publicidá non invasivos pa los anuncios y afalar que más sitios web faigan lo mesmo. <a href="http://adblockplus.org/en/acceptable-ads">Lleer más</a>
+translator=Xuacu Saturio
+description.long=Adblock Plus permite-y recuperar el control d'Internet y ver la web como quiera facelo. Esta estensión tien l'encontu de más de cuarenta suscripciones de filtros en docenes de llingües que la configuran de mou automáticu pa facer coses que van dende desaniciar la publicidá en llinia fasta bloquiar tolos dominios de malware conocíos. Adblock Plus tamién permite-y personalizar los sos filtros col encontu de varies funciones útiles, qu'incluyen una opción de contestu pa imaxes, una pestaña de bloquéu pa oxetos Flash y Java, y una llista d'elementos bloquiables pa desaniciar scripts y fueyes d'estilu.
+description=¡Los anuncios son l'ayeri!
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/bg/composer.dtd adblock-plus-2.6+dfsg/chrome/locale/bg/composer.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/bg/composer.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/bg/composer.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,22 +1,22 @@
-<!ENTITY anchor.end.label "&amp;в края на адреса">
-<!ENTITY domainRestriction.label "Ограничи до &amp;домейн:">
+<!ENTITY anchor.end.label "в края на адре&amp;са">
+<!ENTITY domainRestriction.label "Ог&amp;раничаване на домейн:">
 <!ENTITY collapse.default.no.label "Ползвай по подразбиране(не)">
-<!ENTITY firstParty.label "Само от &amp;първа страна">
-<!ENTITY preferences.label "Покажи &amp;съществуващите филтри…">
+<!ENTITY firstParty.label "Първа страна сам&amp;о">
+<!ENTITY preferences.label "Покажи съ&amp;ществуващите филтри..">
 <!ENTITY pattern.label "Търсете модел">
-<!ENTITY thirdParty.label "Само от &amp;трети страни">
-<!ENTITY filter.label "Нов &amp;филтър:">
+<!ENTITY thirdParty.label "&amp;Трети страни само">
+<!ENTITY filter.label "Нов Филт&amp;ър:">
 <!ENTITY collapse.label "Свиван&amp;е на блокирани:">
 <!ENTITY match.warning "Моделът, който сте въвели, вече не отговаря на адреса за блокиране/белия списък и няма да въздействa върху него.">
-<!ENTITY anchor.start.label "&amp;в началото на адреса">
+<!ENTITY anchor.start.label "в на&amp;чалото на адреса">
 <!ENTITY matchCase.label "Съвпадение на ре&amp;гистъра">
-<!ENTITY custom.pattern.label "&amp;Потребителски:">
+<!ENTITY custom.pattern.label "&amp;Избрани:">
 <!ENTITY unselectAllTypes.label "Не избирай нищо">
-<!ENTITY type.whitelist.label "&amp;Изключение от правилото">
+<!ENTITY type.whitelist.label "Из&amp;ключение от правилото">
 <!ENTITY regexp.warning "Моделът който сте въвели ще бъде интерпретиран като регулярен израз, които не могат да бъдат ефективно обработени с Adblock Плюс и могат да забавят твоят браузър. Ако не възнамерявате да използвате регулярен израз, добавете звездичка (*) към края на модела.">
 <!ENTITY dialog.title "Добавяне на Adblock Plus филтър правило">
 <!ENTITY basic.label "Основен изглед">
-<!ENTITY type.filter.label "&amp;Блокиращ филтър">
+<!ENTITY type.filter.label "&amp;Блокиране на филтър">
 <!ENTITY types.label "Прилага за типове:">
 <!ENTITY shortpattern.warning "Моделът които сте въвели е твърде кратък, за да бъде оптимизиран и може да забави вашия браузър. Препоръчително е да изберете по-дълъг низ за този филтър, за да позволи Adblock Плюс за по-ефективна обработка на филтъра.">
 <!ENTITY collapse.yes.label "Да">
@@ -26,7 +26,7 @@
 <!ENTITY accept.label "Добави Филтър">
 <!ENTITY options.label "Настройки">
 <!ENTITY disabled.warning "Adblock Плюс е изключена. Все още можете да добавите филтри, но те няма да се прилагат, освен ако не [link]Включите Adblock Плюс[/link].">
-<!ENTITY anchor.start.flexible.label "&amp;в началото на името на домейна">
+<!ENTITY anchor.start.flexible.label "в на&amp;чалото на домейн името">
 <!ENTITY collapse.no.label "Не">
 <!ENTITY selectAllTypes.label "Избери всички">
 <!ENTITY advanced.label "Разширен изглед">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/bg/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/bg/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/bg/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/bg/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,21 +1,19 @@
-firstRun_feature_tracking_description=Сърфирайте поверително като забраните проследяването - прикрива вашите действия от рекламните компании, които биха проследили всеки Ваш ход.
-firstRun_toggle_off=ИЗКЛ
+firstRun_feature_tracking_description=Сърфирайте инкогнито като забраните проследяването ви - също така прикрива вашите действия от рекламните компании, които биха проследили всеки  ваш ход.
+firstRun_toggle_off=Стоп
 firstRun_feature_tracking=Забраняване на проследяването
 firstRun_feature_malware=Блокиране на зловреден софтуер
 firstRun_title=Adblock Plus е инсталиран
 firstRun_acceptableAdsExplanation=Бихме искали да насърчаваме уеб-сайтовете да използват обикновена, ненатрапчива реклама. Ето защо ние установихме <a>строги насоки</a>, където можете да видите кои са приемливите реклами, които се показват по подразбиране. Ако все още искате да блокирате всички реклами, можете да ги <a>забраните</a> в рамките на няколко секунди.
-firstRun_toggle_on=ВКЛ
+firstRun_toggle_on=Старт
 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_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_social=Премахвай бутоните на социалните мрежи
 firstRun_legacySafariWarning=Вие използвате стара версия на Safari, която не се поддържа от Adblock Plus. В случая Adblock Plus може да не работи коректно, като е възможно да се наруши работата на потребителите в някои уеб сайтове. Ние силно препоръчваме да актуализирате Safari към версия 6 или по-висока (достъпна за Mac OS X 10.8 Mountain Lion и по-висока), или да използвате последната версия на Mozilla Firefox, Google Chrome или Opera.
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/bg/global.properties adblock-plus-2.6+dfsg/chrome/locale/bg/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/bg/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/bg/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Няма блокирани позиции на текущата страница
 action3_tooltip=Щракнете за включване/изключване Adblock Плюс.
+notification_antiadblock_title=Скриване на умишлените съобщения?
 type_label_script=скрипт
 filter_elemhide_nocriteria=Не е зададен критерий за разпознаване на елемент за скриване
 blockingGroup_title=Правила за Блокиране
@@ -24,6 +25,7 @@
 action2_tooltip=Кликнете за да отворите предпочитанията, средно щракване за включване/изключване.
 type_label_subdocument=рамка
 clearStats_warning=Това ще рестартира цялата статистика и ще забрани броенето на филтрите. Искате ли да продължите?
+notification_antiadblock_message=Този сайт е известен с показване на умишлени послания от потребителите на Adblock Plus. Искате ли Adblock Plus,  да скрие тези умишлени съобщения?
 blocked_count_addendum=(също разрешени:?1?, скрити: ?2?)
 subscription_invalid_location=Местоположението на списъка с филтри или не е валиден URL или не е валидно името на файла.
 type_label_image=картинка
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/bg/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/bg/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/bg/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/bg/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Да">
+<!ENTITY notification.button.no "&amp;Не">
 <!ENTITY sync.label "Син&amp;хронизирай Настройките за Adblock Plus">
 <!ENTITY whitelist.site.label "Забрани на ?1?">
 <!ENTITY filters.label "&amp;Филтър Настройки">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Плюс: Блокирани Картинки">
 <!ENTITY counthits.label "Бройте &amp;филтър хитове">
 <!ENTITY opensidebar.label "Отвори &amp;блокирани предмети">
+<!ENTITY notification.button.close "&amp;Затвори">
 <!ENTITY contribute.label "Помогнете на Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Плюс">
 <!ENTITY context.frame.label "Adblock Плюс:Блокирани Фреймове">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/bg/sendReport.dtd adblock-plus-2.6+dfsg/chrome/locale/bg/sendReport.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/bg/sendReport.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/bg/sendReport.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -3,19 +3,19 @@
 <!ENTITY showData.label "Показване на докладваните данни">
 <!ENTITY typeSelector.falsePositive.label "Adblock Plus блокира твърде &amp;много">
 <!ENTITY issues.change.description "Вашата конфигурация е променена. Моля, презаредете страницата, за да тествате промените и да представите доклад, ако въпросът не бъде уреден от промените.">
-<!ENTITY email.label "&amp;ЕМейл:">
+<!ENTITY email.label "&amp;Ел.Поща:">
 <!ENTITY issues.openPreferences.label "Отвори настройките за филтър">
 <!ENTITY sendPage.confirmation "Отчетът Ви е запазен. Можете да го намерите на следния адрес:">
-<!ENTITY copyLink.label "&amp;Копиране на линка на доклада">
+<!ENTITY copyLink.label "&amp;Копиране линк на доклада">
 <!ENTITY issues.nofilters.description "Adblock Плюс не блокира нищо на текущата страница. Наблюдавания проблем най-вероятно
  не е свързан с Adblock Плюс.">
 <!ENTITY sendPage.knownIssue "Докладваният от Вас проблем вероятно вече е известен. За повече информация:">
 <!ENTITY typeSelector.other.description "Изберете тази настройка, ако подозирате, че проблемът е с Adblock Plus, а не с филтрите му.">
 <!ENTITY issues.disabledgroups.enable.label "Включване на абонамент за филтър / група филтри">
-<!ENTITY typeWarning.override.label "Разбирам и все &amp;пак искам да представя доклада">
+<!ENTITY typeWarning.override.label "Разбирам и все &amp;пак искам да представя доклада въпреки всичко">
 <!ENTITY issues.disabled.enable.label "Включи Adblock Плюс">
 <!ENTITY update.fixed.description "Актуализациите на вашите абонаменти за филтри вероятно са решили въпроса който сте докладвали. Моля, презаредете страницата и опитайте отново, Докладвайте отново, ако проблемът все още го има.">
-<!ENTITY anonymous.label "&amp;Анонимно подаване на информация">
+<!ENTITY anonymous.label "&amp;Анонимно изпращане на информация">
 <!ENTITY reloadButton.label "Пре&amp;зареждане на страницата">
 <!ENTITY recentReports.clear.label "Премах&amp;ни всички доклади">
 <!ENTITY typeSelector.description "Този прозорец ще ви преведе през стъпките, необходими за подаване на доклад за Adblock
@@ -28,10 +28,10 @@
 <!ENTITY recentReports.label "Вашите наскоро представените доклади">
 <!ENTITY typeWarning.description "Посочили сте, че искате да съобщите за общ проблем с Adblock Plus, а не проблем с филтрите. Моля, обърнете внимание, че тези въпроси са най-докладвани във [link]форума на Adblock Plus[/link]. Трябва да използвате докладчика на проблеми за допълване на съществуваща дискусия, тъй като никой няма да забележи вашия доклад, докато не предоставите връзка към него. Автоматично генерирана връзка ще бъде предоставена след предоставянето на доклада.">
 <!ENTITY issues.disabled.description "Adblock Plus е изключен - няма да блокира нищо в неговото текущо състояние.">
-<!ENTITY attachExtensions.label "Прилагане на списък с активните раз&amp;ширения към доклада при добавяне на конфликти, причиняващи проблема">
+<!ENTITY attachExtensions.label "Прилагане на списък с активните раз&amp;ширения към доклада в случай че добавката  причинява проблема">
 <!ENTITY issues.nosubscriptions.add.label "Добавяне на абонамент за филтър">
 <!ENTITY issues.disabledfilters.enable.label "Включи филтъра">
-<!ENTITY issues.override.label "Конфигурацията е &amp;правилно, продължаване с доклада">
+<!ENTITY issues.override.label "Конфигурацията е &amp;правилна, продължаване с доклада">
 <!ENTITY issues.nosubscriptions.description "Изглежда не сте абонирани за някои от предварително направени списъци с филтри, които автоматично премахват нежеланото съдържание от страниците.">
 <!ENTITY typeSelector.falsePositive.description "Изберете тази настройка, ако на страницата липсва важно съдържание, показана е некоректно или не функционира правилно. Може да определите дали Adblock Плюс е причина за проблема, като временно го изключите.">
 <!ENTITY typeSelector.other.label "Др&amp;уг проблем">
@@ -50,7 +50,7 @@
 <!ENTITY screenshot.attach.label "Пр&amp;икачване на изображение на страницата към доклада">
 <!ENTITY issues.whitelist.description "В момента Adblock Plus е изключен за страницата, която докладвате. Моля активирайте повторно
  и презаредете страницата преди да изпратите доклада за да помогнете за откриване на проблема.">
-<!ENTITY typeSelector.falseNegative.label "Adblock Плюа не блоки&amp;ра реклама">
+<!ENTITY typeSelector.falseNegative.label "Adblock Плюс не блоки&amp;ра реклама">
 <!ENTITY typeSelector.heading "Изберете тип на проблема">
 <!ENTITY anonymity.warning "Ние няма да бъдем в състояние да се върнем при теб и вероятно ще свалим приоритета на на доклада най доло.">
 <!ENTITY wizard.title "Докладчик за проблеми">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/bn-IN/composer.dtd adblock-plus-2.6+dfsg/chrome/locale/bn-IN/composer.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/bn-IN/composer.dtd	1970-01-01 00:00:00.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/bn-IN/composer.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -0,0 +1,8 @@
+<!ENTITY accept.label "
+ফিল্টার যোগ করুন">
+<!ENTITY disabled.warning "
+Adblock প্লাস বর্তমানে নিষ্ক্রিয় করা হয়েছে. আপনি এখনও ফিল্টার যোগ করতে পারেন কিন্তু আপনি [লিঙ্ক] Adblock প্লাস [/ লিংক] সক্রিয়, যদি না তারা প্রয়োগ করা হবে না.">
+<!ENTITY advanced.label "উন্নত দেখুন">
+<!ENTITY dialog.title "Adblock প্লাস ফিল্টার নিয়ম যোগ করুন">
+<!ENTITY basic.label "বেসিক দেখুন">
+<!ENTITY filter.label "নতুন ফিল্টার">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/bs/composer.dtd adblock-plus-2.6+dfsg/chrome/locale/bs/composer.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/bs/composer.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/bs/composer.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,14 +1,36 @@
+<!ENTITY anchor.end.label "na &amp;kraju naziva domene">
+<!ENTITY domainRestriction.label "Ograniči na &amp;domenu:">
+<!ENTITY collapse.default.no.label "Koristi zadano(Ne)">
+<!ENTITY firstParty.label "Samo od p&amp;rve strane">
+<!ENTITY preferences.label "Prikaži po&amp;stojeće filtere...">
+<!ENTITY pattern.label "Potraži uzorak">
+<!ENTITY thirdParty.label "Samo od &amp;treće strane">
+<!ENTITY filter.label "Novi filter:">
+<!ENTITY collapse.label "&amp;Sažeti blokirano:">
+<!ENTITY match.warning "
+Obrazac koji ste unijeli više ne  odgovara adresi za blokiranje/odblokiranje i neće imati nikakvog utjecaja na to.">
+<!ENTITY anchor.start.label "na &amp;početku adrese">
+<!ENTITY matchCase.label "Točan i&amp;zraz">
+<!ENTITY custom.pattern.label "Prila&amp;gođeno:">
+<!ENTITY unselectAllTypes.label "Označi ništa">
+<!ENTITY type.whitelist.label "Prav&amp;ilo iznimke">
+<!ENTITY regexp.warning "Obrazac u koji ste ušli će se tumačiti kao regularni izraz koji ne može Adblock Plus efikasno obraditi Adblock Plus i može usporiti vaše iskustvo pregledavanja. Ako ne namjeravate koristiti regularni izraz, dodajte zvjezdicu (*) na kraju obrasca.">
+<!ENTITY dialog.title "Dodaj Adblock Plus filter">
+<!ENTITY basic.label "Početni prikaz">
+<!ENTITY type.filter.label "&amp;Blokirajući filter">
+<!ENTITY types.label "Primjeniti na vrste:">
+<!ENTITY shortpattern.warning "
+Obrazac koji ste unijeli je prekratak da bi se optimizirao i može usporiti vaše iskustvo pregledavanja. Preporučuje se da odaberete duži niz za ovaj filter kako bi se omogućilo Adblock Plus za efikasnije procesuiranje filtera.">
+<!ENTITY collapse.yes.label "Da">
+<!ENTITY anchors.label "Prihvati samo obrazac:">
+<!ENTITY collapse.default.yes.label "Koristi zadano(Da)">
 <!ENTITY domainRestriction.help "Koristi ovu opciju za specifikovanje jedne ili više domena odvojenih uspravnom linijom(|). Filter će biti primijenjen na odabranu(/-e) domenu(/-e).Tilda prije imena domene naznačuje da taj filter neće biti primijenjen na tu domenu.">
 <!ENTITY accept.label "Dodaj filter">
 <!ENTITY options.label "Opcije">
 <!ENTITY disabled.warning "Adblock Plus je isključen. Još uvijek možete dodati filtere, ali oni se neće primjenjivati dok ne [link]uključite Adblock Plus[/linkg].">
-<!ENTITY collapse.default.no.label "Koristi zadano(Ne)">
-<!ENTITY preferences.label "Prikaži po&amp;stojeće filtere...">
-<!ENTITY collapse.yes.label "Da">
+<!ENTITY anchor.start.flexible.label "na &amp;početku naziva domene">
 <!ENTITY collapse.no.label "Ne">
 <!ENTITY selectAllTypes.label "Označi sve">
 <!ENTITY advanced.label "Napredan prikaz">
-<!ENTITY basic.label "Početni prikaz">
-<!ENTITY filter.label "Novi filter:">
-<!ENTITY unselectAllTypes.label "Označi ništa">
-<!ENTITY collapse.default.yes.label "Koristi zadano(Da)">
+<!ENTITY pattern.explanation "
+Obrazac može biti bilo koji dio adrese, znak (*) se ponaša kao zamjena. Filter će se primjenjivati ​​samo na adrese koje odgovaraju uzorku.">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/bs/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/bs/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/bs/firstRun.properties	1970-01-01 00:00:00.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/bs/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -0,0 +1,17 @@
+firstRun_feature_tracking_description=Surfajte privatno tako što ćete onemogućiti praćenje - skrivanjem vaših tragova od reklamnih kompanija koje bi vas pratile još više.
+firstRun_toggle_off=ISKLJUČENO
+firstRun_feature_tracking=Onemogući praćenje
+firstRun_feature_social=Ukloni dugmad za socijalne mreže
+firstRun_title=Adblock Plus je instaliran
+firstRun_feature_malware=Blokiranje Malwarea
+firstRun_toggle_on=UKLJUČENO
+firstRun_contributor_credits=Lista saradnika
+firstRun_dataCorruptionWarning=Da li se ova stranica stalno pojavljuje? <a>Kliknite ovdje!</a>
+firstRun_acceptableAdsHeadline=Dosadne reklame će sada biti blokirane
+firstRun_share=Preporučite nas prijateljima
+firstRun_share_headline=<a>Pomozite nam</a> da web učinimo boljim
+firstRun_features=Adblock Plus može uraditi mnogo više od samog bokiranja reklama
+firstRun_feature_malware_description=Učinite vaše surfanje sigurnijim blokiranjem poznatih malware domena.
+firstRun_feature_social_description=Automatski uklonite dugmad socijalnih mreža, kao što je Facebook Like, koja se prikazuju na web stranicama i prate vaše navike.
+firstRun_donate=doniraj
+firstRun_donate_label=Podržite naš projekat
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/bs/meta.properties adblock-plus-2.6+dfsg/chrome/locale/bs/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/bs/meta.properties	1970-01-01 00:00:00.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/bs/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -0,0 +1,4 @@
+translator=Wladimir Palant
+description.short=Blokirajte dosadne video reklame na Youtubeu i Facebooku, banere i još mnogo toga.\n\nAdblock Plus blokira dosadne reklame i podržava web stranice tako što ne blokirane neupdaljive reklame (prilagodljivo).
+name=Adblock Plus
+description=Reklame su prošlost!
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/bs/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/bs/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/bs/overlay.dtd	1970-01-01 00:00:00.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/bs/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -0,0 +1,2 @@
+<!ENTITY status.tooltip "Status:">
+<!ENTITY options.label "&amp;Opcije">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ca/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/ca/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/ca/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ca/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,7 +6,6 @@
 firstRun_acceptableAdsExplanation=Ens agradaria encoratjar els llocs web a utlitzar d'ara en endavant, publicitat no intrusiva. És per això que hem establert uns <a>patrons estrictes</a> per identificar els anuncis acceptables, els quals es mostren a sota de les preferències per defecte. Si encara voleu bloquejar tots els anuncis podeu <a>desactivar</a> això en pocs segons.
 firstRun_toggle_on=ACTIVAT
 firstRun_contributor_credits=Cràdits de contribució
-firstRun_feature_show_overview=mostra la visió general
 firstRun_dataCorruptionWarning=Es segueix mostrant aquesta pàgina? <a>Cliqueu aquí!</a>
 firstRun_acceptableAdsHeadline=Els anuncis molestos ara es bloquejaran
 firstRun_share=Digueu-ho a les vostres amistats
@@ -17,4 +16,4 @@
 firstRun_donate=Feu un donatiu
 firstRun_donate_label=Recolzeu el nostre projecte
 firstRun_feature_social=Eliminar els botons de xarxes socials
-firstRun_feature_show_expanded=activa les característiques
+firstRun_legacySafariWarning=Estàs usant una versió antiga de Safari que no es troba suportada per Adblock Plus.
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ca/global.properties adblock-plus-2.6+dfsg/chrome/locale/ca/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/ca/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ca/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=La pàgina actual no conté elements bloquejables
 action3_tooltip=Clica per activar/desactivar Adblock Plus
+notification_antiadblock_title=Amagar missatges dirigits?
 type_label_script=script
 filter_elemhide_nocriteria=Cap criteri especificat per reconeixes l'element a amagar
 blockingGroup_title=Regles de blocatge d'anuncis
@@ -24,6 +25,7 @@
 action2_tooltip=Clica per obrir les preferències, clica amb el botó del mig per activar/desactivar.
 type_label_subdocument=marc
 clearStats_warning=Això reiniciarà totes les estadístiques d'ús del filtre.Vols procedir?
+notification_antiadblock_message=Aquesta web ha sigut coneguda per mostrar missatges dirigits a usuaris de Adblock Plus. Vols que Adblock Plus amague els missatges dirigits?
 blocked_count_addendum=(també a la llista blanca: ?1?, amagats: ?2?)
 subscription_invalid_location=La llista de filtres no és una URL vàlida ni un nom de fitxer vàlid.
 type_label_image=imatge
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ca/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/ca/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/ca/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ca/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Si">
+<!ENTITY notification.button.no "&amp;No">
 <!ENTITY sync.label "&amp;Sincronitza la configuració de l'AdBlock Plus">
 <!ENTITY whitelist.site.label "Inhabilita l'Adblock Plus a ?1?">
 <!ENTITY filters.label "Pre&amp;ferències del filtre">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Plus: bloca la imatge">
 <!ENTITY counthits.label "Compta els cops que &amp;funciona el filtre">
 <!ENTITY opensidebar.label "O&amp;bre elements blocables">
+<!ENTITY notification.button.close "&amp;Tancar">
 <!ENTITY contribute.label "Contribueix a l'Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: bloca el marc">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/cs/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/cs/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/cs/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/cs/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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_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_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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/cs/global.properties adblock-plus-2.6+dfsg/chrome/locale/cs/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/cs/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/cs/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Na této stránce nebyly nalezeny prvky k zablokování
 action3_tooltip=Klepnutím povolit/zakázat Adblock Plus
+notification_antiadblock_title=Skrýt cílená hlášení?
 type_label_script=Skript
 filter_elemhide_nocriteria=Nebyla uvedena žádná kritérie pro rozpoznání elementu, který má být skryt
 blockingGroup_title=Pravidla blokování reklam
@@ -24,6 +25,7 @@
 action2_tooltip=Levé tlačítko: Otevřít předvolby
 type_label_subdocument=Rámec
 clearStats_warning=Toto smaže všechny statistiky a vypne počítání zásahů filtrů. Chcete pokračovat?
+notification_antiadblock_message=O této stránce se ví, že zobrazuje hlášení cílená na uživatele Adblocku Plus. Chcete, aby Adblock Plus skryl tyto cílené zprávy?
 blocked_count_addendum=(povoleno výjimkou: ?1?, skryto: ?2?)
 subscription_invalid_location=Zadaná adresa seznamu cizích filtrů je buď nesprávná URL nebo obsahuje nesprávné jméno souboru.
 type_label_image=Obrázek
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/cs/meta.properties adblock-plus-2.6+dfsg/chrome/locale/cs/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/cs/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/cs/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 description.short=Jste otráveni reklamami? Znepokojuje Vás být sledováni? Obtěžují Vás bannery? Nainstalujte si Adblock Plus a získejte zpět kontrolu nad internetem a změňte tak Váš dosavadní pohled na web.
 name=Adblock Plus
 description.long.addition1=Počínaje Adblockem Plus 2.0 je v Předvolbách filtrů volba povolující některé z neobtěžujících reklam. Cílem je podpořit webové stránky používající neobtěžující způsoby reklamy a podnítit více webových stránek ke stejnému chování. <a href="http://adblockplus.org/en/acceptable-ads">Zjistit více</a>(anglicky)
-translator=Wladimir Palant
+translator=Jakub Tománek
 description.long=Adblock Plus Vám umožňuje získat zpět kontrolu nad internetem a prohlížet web tak, jak chcete Vy. Tento doplněk je podpořen více než čtyřiceti příspěvky sad filtrů v mnohých jazycích, které ho automaticky nastaví za účely od odstranění internetové reklamy až po blokování všech známých malwarových domén. Adblock Plus Vám také umožňuje upravovat Vaše filtry s pomocí různých užitečných funkcí včetně kontextové nabídky u obrázků, blokovacích oušek u Flash a Java objektů a seznamu blokovatelných položek umožňující odstranění skriptů a stylů stránky.
 description=A reklamy jsou minulostí!
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/cs/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/cs/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/cs/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/cs/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Ano">
+<!ENTITY notification.button.no "&amp;Ne">
 <!ENTITY sync.label "Na&amp;stavení synchronizace Adblocku Plus">
 <!ENTITY whitelist.site.label "Vypnout na ?1?">
 <!ENTITY filters.label "&amp;Předvolby filtrů">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Blokovat obrázek">
 <!ENTITY counthits.label "Počítat &amp;zásahy filtrů">
 <!ENTITY opensidebar.label "Zo&amp;brazit blokovatelné objekty">
+<!ENTITY notification.button.close "&amp;Zavřít">
 <!ENTITY contribute.label "Přispět Adblocku Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Blokovat rámec">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/da/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/da/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/da/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/da/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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_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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/da/global.properties adblock-plus-2.6+dfsg/chrome/locale/da/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/da/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/da/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Ingen blokerbare elementer på aktuel side
 action3_tooltip=Klik for at aktivere/deaktivere Adblock Plus.
+notification_antiadblock_title=Skjul målrettede beskeder ?
 type_label_script=script
 filter_elemhide_nocriteria=Ingen kriterier angivet for at genkende elementet der skal skjules
 blockingGroup_title=Blokeringsregler
@@ -24,6 +25,7 @@
 action2_tooltip=Klik for at åbne indstillingerne, midterklik aktiverer/deaktiverer.
 type_label_subdocument=ramme
 clearStats_warning=Nulstiller hit statistikker for alle filtre og deaktiverer tælleren. Vil du fortsætte?
+notification_antiadblock_message=Denne side er kendt for målrettede beskeder til Adblock Plus brugere. Skal Adblock Plus skjule disse beskeder ?
 blocked_count_addendum=(også hvidlistet: ?1?, skjult: ?2?)
 subscription_invalid_location=Filterlistens placering er hverken en gyldig URL eller et gyldigt filnavn.
 type_label_image=billede
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/da/meta.properties adblock-plus-2.6+dfsg/chrome/locale/da/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/da/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/da/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,4 +1,4 @@
-description.short=Træt af reklamer? Nervøs for sporing? Irriteret over bannere? Installer Adblock Plus for at genvinde kontrollen over internettet og den måde det vises på.\n\nKort videopræsentation: http://www.youtube.com/watch?v=oNvb2SjVjjI
+description.short=Fjerner irriterende Youtube videoreklamer, Facebook  annoncer, bannere m.m.\n\nAdblock Plus blokerer alle reklamer, men tillader upåtrængende annoncer for at støtte websider (kan fravælges).
 name=Adblock Plus
 description.long.addition1=Fra Adblock Plus 2.0 er det muligt at tillade upåtrængende annoncering i Filterpræferencer. Formålet er at støtte websider der benytter denne annonceform og opmuntre andre til at gøre det samme. <a href="http://adblockplus.org/en/acceptable-ads">Læs mere</a>
 translator=AlleyKat, Regmos
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/da/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/da/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/da/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/da/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Ja">
+<!ENTITY notification.button.no "&amp;Nej">
 <!ENTITY sync.label "Syn&amp;k Adblock Plus indstillinger">
 <!ENTITY whitelist.site.label "Slå fra på ?1?">
 <!ENTITY filters.label "&amp;Filterpræferencer">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock billede">
 <!ENTITY counthits.label "Tæl filter&amp;hits">
 <!ENTITY opensidebar.label "Åbn bloké&amp;rbare elementer">
+<!ENTITY notification.button.close "&amp;Luk">
 <!ENTITY contribute.label "Bidrag til Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock ramme">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/de/composer.dtd adblock-plus-2.6+dfsg/chrome/locale/de/composer.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/de/composer.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/de/composer.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,14 +1,14 @@
-<!ENTITY anchor.end.label "am En&amp;de der Adresse">
+<!ENTITY anchor.end.label "am Ende der Adresse">
 <!ENTITY domainRestriction.label "Auf Do&amp;main beschränken:">
 <!ENTITY collapse.default.no.label "Standardeinstellung (nein)">
 <!ENTITY firstParty.label "Nur für Elemente der Ursprungsseite">
-<!ENTITY preferences.label "Existierende Filter an&amp;zeigen...">
+<!ENTITY preferences.label "Existierende Filter an&amp;zeigen ...">
 <!ENTITY pattern.label "Muster suchen">
 <!ENTITY thirdParty.label "Nur für Elemen&amp;te von Drittseiten">
 <!ENTITY filter.label "Neue &amp;Filter:">
 <!ENTITY collapse.label "Platz frei&amp;geben:">
 <!ENTITY match.warning "Das Muster, das Sie eingegeben haben, passt nicht mehr zu der Adresse, für die der Filter erstellt werden soll. Es wird keinen Einfluss mehr auf diese Adresse haben.">
-<!ENTITY anchor.start.label "am An&amp;fang der Adresse">
+<!ENTITY anchor.start.label "am Anfang der Adresse">
 <!ENTITY matchCase.label "Groß-/&amp;Kleinschreibung beachten">
 <!ENTITY custom.pattern.label "Be&amp;nutzerdefiniert:">
 <!ENTITY unselectAllTypes.label "Keine auswählen">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/de/filters.dtd adblock-plus-2.6+dfsg/chrome/locale/de/filters.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/de/filters.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/de/filters.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 <!ENTITY restore.custom.warning "Alle Ihre eigenen Filter werden durch den Inhalt dieser Datei ersetzt. Wollen Sie fortfahren?">
-<!ENTITY slow.column "&amp;Langsam">
-<!ENTITY enabled.column "A&amp;ktiv">
+<!ENTITY slow.column "&amp;Langsame Filter">
+<!ENTITY enabled.column "A&amp;ktiviert">
 <!ENTITY subscription.lastDownload.checksumMismatch "Fehler, Prüfsumme ist falsch, möglicherweise ein Übertragungsfehler">
 <!ENTITY noFiltersInGroup.text "Die gewählte Filtergruppe ist leer.">
 <!ENTITY subscription.actions.label "Aktionen">
@@ -19,7 +19,7 @@
 <!ENTITY noGroupSelected.text "Sie müssen eine Filtergruppe auswählen, um deren Inhalt anzuzeigen.">
 <!ENTITY filter.cut.label "Ausschneiden">
 <!ENTITY restore.default.label "Sicherung von ?1? wiederherstellen">
-<!ENTITY subscription.lastDownload.inProgress "Wird heruntergeladen...">
+<!ENTITY subscription.lastDownload.inProgress "Wird heruntergeladen ...">
 <!ENTITY subscriptions.tab.label "Filterabonnements">
 <!ENTITY sort.descending.label "A&amp;bsteigend">
 <!ENTITY filters.remove.warning "Wollen Sie wirklich alle ausgewählten Filter löschen?">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/de/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/de/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/de/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/de/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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_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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/de/global.properties adblock-plus-2.6+dfsg/chrome/locale/de/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/de/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/de/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Auf der geöffneten Seite gibt es keine Elemente, die blockiert werden könnten
 action3_tooltip=Adblock Plus ein- bzw. ausschalten
+notification_antiadblock_title=Zielgerichtete Nachrichten ausblenden?
 type_label_script=Skript
 filter_elemhide_nocriteria=Keine Kriterien angegeben, um das zu versteckende Element zu erkennen
 blockingGroup_title=Blockierregeln
@@ -24,6 +25,7 @@
 action2_tooltip=Adblock Plus Einstellungen öffnen. Mittlere Maustaste schaltet Adblock Plus ein und aus.
 type_label_subdocument=Frame
 clearStats_warning=Alle Trefferstatistiken werden zurückgesetzt und Filtertreffer werden in Zukunft nicht mehr gezählt. Wollen Sie fortfahren?
+notification_antiadblock_message=Diese Seite hat in der Vergangenheit Adblock Plus-Nutzern gezielt Nachrichten angezeigt. Soll Adblock Plus Nachrichten dieser Art verstecken?
 blocked_count_addendum=(außerdem Ausnahmen: ?1?, versteckte Elemente: ?2?)
 subscription_invalid_location=Die eingegebene Adresse ist weder eine gültige Web-Adresse, noch ein gültiger Dateiname.
 type_label_image=Grafik
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/de/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/de/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/de/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/de/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Ja">
+<!ENTITY notification.button.no "&amp;Nein">
 <!ENTITY sync.label "Adblock Plus-Einstellungen s&amp;ynchonisieren">
 <!ENTITY whitelist.site.label "Deaktivieren: auf ?1?">
 <!ENTITY filters.label "Filterein&amp;stellungen">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Plus: Grafik blockieren">
 <!ENTITY counthits.label "Filtertreffer &amp;zählen">
 <!ENTITY opensidebar.label "&amp;Blockierbare Elemente öffnen">
+<!ENTITY notification.button.close "&amp;Schließen">
 <!ENTITY contribute.label "Zu Adblock Plus beitragen">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Frame blockieren">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/de/sendReport.dtd adblock-plus-2.6+dfsg/chrome/locale/de/sendReport.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/de/sendReport.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/de/sendReport.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -31,7 +31,7 @@
 <!ENTITY issues.ownfilters.description "Einige der Filter, die auf dieser Seite angewandt wurden, sind benutzerdefiniert.
   Bitte deaktivieren Sie Filter, die das Problem verursacht haben könnten:">
 <!ENTITY update.inProgress.description "Adblock Plus muss Ihre Filterabonnements aktualisieren, um sicherzustellen,
-  dass das Problem nicht bereits gelöst ist. Bitte warten Sie...">
+  dass das Problem nicht bereits gelöst ist. Bitte warten Sie ...">
 <!ENTITY sendPage.retry.label "Noch einmal senden">
 <!ENTITY data.label "Bericht&amp;daten:">
 <!ENTITY recentReports.label "Ihre zuletzt gesendeten Fehlerberichte">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/dsb/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/dsb/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/dsb/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/dsb/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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_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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/dsb/global.properties adblock-plus-2.6+dfsg/chrome/locale/dsb/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/dsb/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/dsb/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Žedne blokěrujobne zapiski na toś tom boku
 action3_tooltip=Kliknuś, aby se Adblock Plus zmóžnił/znjemóžnił.
+notification_antiadblock_title=Celowe powěźeńki schowaś?
 type_label_script=skript
 filter_elemhide_nocriteria=Njejsu žedne kriterije pódane, aby element spóznał, kótaryž ma se schowaś
 blockingGroup_title=Pšawidła za blokěrowanje wabjenja
@@ -24,6 +25,7 @@
 action2_tooltip=Kliknuś, aby se nastajenja wócynili, ze srjejźneju tastu kliknuś, aby zmóžnił/znjemóžnił.
 type_label_subdocument=wobłuk
 clearStats_warning=To stajijo wšu filtrowu statistiku slědk a znjemóžnijo licenje filtrowych wótpowědnikow. Cośo pókšacowaś?
+notification_antiadblock_message=Toś to sedło jo za to znate, až pokazujo celowe powěźeńki za wužywarje Adblock Plus. Cośo, až Adblock Plus chowa celowe powěźeńki?
 blocked_count_addendum=(teke w běłej lisćinje: ?1?, schowane: ?2?)
 subscription_invalid_location=Městno filtroweje lisćiny njejo daniž płaśiwy URL daniž płaśiwe datajowe mě.
 type_label_image=wobraz
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/dsb/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/dsb/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/dsb/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/dsb/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Jo">
+<!ENTITY notification.button.no "&amp;Ně">
 <!ENTITY sync.label "Nastajenja za syn&amp;chronizěrowanje Adblock Plus">
 <!ENTITY whitelist.site.label "Na ?1? znjemóžniś">
 <!ENTITY filters.label "&amp;Filtrowe nastajenja">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Plus: Wobraz blokěrowaś">
 <!ENTITY counthits.label "Fi&amp;ltrowe trjefarje licyś">
 <!ENTITY opensidebar.label "B&amp;lokěrujobne zapiski wócyniś">
+<!ENTITY notification.button.close "&amp;Zacyniś">
 <!ENTITY contribute.label "K Adblock Plus pśinosowaś">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Wobłuk blokěrowaś">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/el/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/el/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/el/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/el/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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 του Facebook, που εμφανίζονται σε ιστοσελίδες και παρακολουθούν τη συμπεριφορά σας.
 firstRun_donate=δωρίστε
 firstRun_donate_label=Υποστηρίξτε το έργο μας
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/el/global.properties adblock-plus-2.6+dfsg/chrome/locale/el/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/el/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/el/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Δεν υπάρχουν αντικείμενα προς φραγή σε αυτή τη σελίδα
 action3_tooltip=Κλικ για ενεργοποίηση/απενεργοποίηση.
+notification_antiadblock_title=Απόκρυψη στοχευμένων μηνυμάτων;
 type_label_script=σενάριο εντολών
 filter_elemhide_nocriteria=Δεν καθορίστηκαν κριτήρια ώστε να αναγνωριστεί το στοιχείο που θα φιλτραριστεί
 blockingGroup_title=Κανόνες φραγής διαφημίσεων
@@ -24,6 +25,7 @@
 action2_tooltip=Κλικ για τις επιλογές, μεσαίο κλικ για ενεργοποίηση/απενεργοποίηση.
 type_label_subdocument=πλαίσιο
 clearStats_warning=Αυτό θα μηδενίσει τα στατιστικά και θα απενεργοποιήσει τις επιτυχίες των φίλτρων. Θέλετε να συνεχίσετε;
+notification_antiadblock_message=Αυτή η σελίδα είναι γνωστό ότι προβάλει στοχευμένα μηνύματα στους χρήστες του Adblock Plus. Θέλετε το Adblock Plus να αποκρύπτει στοχευμένα μηνύματα;
 blocked_count_addendum=(λευκή λίστα: ?1?, κρυφά: ?2?)
 subscription_invalid_location=Η τοποθεσία της λίστας φίλτρων δεν είναι έγκυρη URL ούτε και όνομα αρχείου.
 type_label_image=εικόνα
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/el/meta.properties adblock-plus-2.6+dfsg/chrome/locale/el/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/el/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/el/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,4 +1,4 @@
-description.short=Ενοχλημένοι από τις διαφημίσεις; Προβληματισμένοι από την καταγραφή των κινήσεων σας; Σας εμποδίζουν τα banners; Εγκαταστήστε το Adblock Plus και αποκτήστε τον έλεγχο του διαδικτύου. Αλλάξτε τον τρόπο που βλέπετε τις σελίδες.
+description.short=Μπλοκάρει ενοχλητικές διαφημίσεις στο YouTube, διαφημίσεις του Facebook, banners και πολλά περισσότερα.\n\nΤο Adblock Plus μπλοκάρει όλες τις ενοχλητικές διαφημίσεις και στηρίζει τις σελίδες επιτρέποντας μη-παρεμβατικές διαφημίσεις (ρύθμιση η οποία μπορεί να αλλαχθεί).
 name=Adblock Plus
 description.long.addition1=Αρχίζοντας με το Adblock Plus 2.0, υπάρχει μια επιλογή στις Προτιμήσεις φίλτρων που επιτρέπει μερικές μη-παρεμβατικές διαφημίσεις. Στόχος είναι να υποστηρίξουμε σελίδες που χρησιμοποιούν μη-παρεμβατικούς τρόπους για διαφήμιση και να ενθαρρύνουμε περισσότερες σελίδες να κάνουν το ίδιο. <a href="http://adblockplus.org/en/acceptable-ads">Διαβάστε περισσότερα</a>
 translator=rookie
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/el/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/el/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/el/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/el/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Ναι">
+<!ENTITY notification.button.no "&amp;Όχι">
 <!ENTITY sync.label "Συγ&amp;χρονισμός των ρυθμίσεων του Adblock Plus">
 <!ENTITY whitelist.site.label "Απενεργοποίηση στο ?1?">
 <!ENTITY filters.label "Προτιμήσεις &amp;φίλτρων">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Plus: φραγή εικόνας">
 <!ENTITY counthits.label "Κα&amp;ταμέτρηση επιτυχιών φίλτρων">
 <!ENTITY opensidebar.label "Άνοιγμ&amp;α των φιλτραρισμένων στοιχείων">
+<!ENTITY notification.button.close "&amp;Κλείσιμο">
 <!ENTITY contribute.label "Συνεισφέρετε στο Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: φραγή πλαισίου">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/en-GB/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/en-GB/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/en-GB/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/en-GB/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,21 +1,19 @@
-firstRun_feature_tracking_description=Browse anonymously by disabling tracing - hiding your web traces from advertising companies that would trace your every action.
+firstRun_feature_tracking_description=Browse privately by disabling tracking - hiding your tracks from ad companies that would track your every move.
 firstRun_toggle_off=OFF
 firstRun_feature_tracking=Disable Tracking
 firstRun_feature_malware=Malware Blocking
 firstRun_title=Adblock Plus has been installed
-firstRun_acceptableAdsExplanation=We'd like to encourage websites to use 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_acceptableAdsExplanation=We'd like to encourage websites to use straightforward, unobtrusive advertising. That's why we've established <a>strict guidelines</a> to identify positive ads, which are shown under default settings. If you still wish to block every ad you can <a>disable</a> this in a few seconds.
 firstRun_toggle_on=ON
 firstRun_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_features=Adblock Plus can do more than block ads
+firstRun_feature_malware_description=Make your browsing more secure by blocking known malware domains.
+firstRun_feature_social_description=Automatically rid your browsing experience of social media buttons (such as the Facebook Like) which appear on web pages and track your behaviour.
+firstRun_donate=Donate
+firstRun_donate_label=Support our project
 firstRun_feature_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 -Nru adblock-plus-2.4.1+dfsg/chrome/locale/en-GB/global.properties adblock-plus-2.6+dfsg/chrome/locale/en-GB/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/en-GB/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/en-GB/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=No blockable items on the current page
 action3_tooltip=Click to enable/disable Adblock Plus.
+notification_antiadblock_title=Hide targeted messages?
 type_label_script=script
 filter_elemhide_nocriteria=No criteria specified to recognise the element to be hidden
 blockingGroup_title=Ad Blocking Rules
@@ -24,6 +25,7 @@
 action2_tooltip=Click to open preferences; middle-click to enable/disable.
 type_label_subdocument=frame
 clearStats_warning=This will reset all filter hit statistics and disable counting filter hits. Do you want to proceed?
+notification_antiadblock_message=This site has been known to show targeted messages to Adblock Plus users. Do you want Adblock Plus to hide targeted messages?
 blocked_count_addendum=(also whitelisted: ?1?, hidden: ?2?)
 subscription_invalid_location=Filter list location is neither a valid URL nor a valid file name.
 type_label_image=image
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/en-GB/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/en-GB/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/en-GB/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/en-GB/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "Yes">
+<!ENTITY notification.button.no "No">
 <!ENTITY sync.label "Syn&amp;chronise Adblock Plus settings">
 <!ENTITY whitelist.site.label "Disable on ?1?">
 <!ENTITY filters.label "Filter preferences">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Plus: Block image">
 <!ENTITY counthits.label "Count filter hits">
 <!ENTITY opensidebar.label "Open blockable items">
+<!ENTITY notification.button.close "Close">
 <!ENTITY contribute.label "Contribute to Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Block frame">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/en-US/global.properties adblock-plus-2.6+dfsg/chrome/locale/en-US/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/en-US/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/en-US/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -53,3 +53,6 @@
 mobile_menu_enable_site=ABP: Enable on ?1?
 # Note: the placeholder ?1? will be replaced by the site name. Ideally it should be at the end of the string (space is limited and site names can be long).
 mobile_menu_disable_site=ABP: Disable on ?1?
+
+notification_antiadblock_title=Hide targeted messages?
+notification_antiadblock_message=This site has been known to show targeted messages to Adblock Plus users. Do you want Adblock Plus to hide targeted messages?
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/en-US/meta.properties adblock-plus-2.6+dfsg/chrome/locale/en-US/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/en-US/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/en-US/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -5,7 +5,7 @@
 # Extension description, to be displayed in the add-on manager
 description=Ads were yesterday!
 # Short description for addons.mozilla.org (250 characters limit!). Leave out the link to English-language video if it isn't useful for users speaking your language.
-description.short=Annoyed by adverts? Troubled by tracking? Bothered by banners? Install Adblock Plus now to regain control of the internet and change the way that you view the web.\n\nA short video overview is available at http://www.youtube.com/watch?v=oNvb2SjVjjI
+description.short=Blocks annoying video ads on YouTube, Facebook ads, banners and much more.\n\nAdblock Plus blocks all annoying ads, and supports websites by not blocking unobtrusive ads by default (configurable).
 # Long description for addons.mozilla.org
 description.long=Adblock Plus allows you to regain control of the internet and view the web the way you want to. The add-on is supported by over forty filter subscriptions in dozens of languages which automatically configure it for purposes ranging from removing online advertising to blocking all known malware domains. Adblock Plus also allows you to customize your filters with the assistance of a variety of useful features, including a context option for images, a block tab for Flash and Java objects, and a list of blockable items to remove scripts and stylesheets.
 description.long.addition1=Starting with Adblock Plus 2.0 there is an option in Filter Preferences to allow some non-intrusive advertising. The goal is to support websites using non-intrusive ways to advertise and to encourage more websites to do the same. <a href="http://adblockplus.org/en/acceptable-ads">Read more</a>
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/en-US/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/en-US/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/en-US/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/en-US/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -34,3 +34,7 @@
 <!ENTITY sync.label                 "Syn&amp;c Adblock Plus settings">
 <!ENTITY objecttab.title        "Block">
 <!ENTITY objecttab.tooltip      "Click here to block this object with Adblock Plus">
+
+<!ENTITY notification.button.yes       "&amp;Yes">
+<!ENTITY notification.button.no        "&amp;No">
+<!ENTITY notification.button.close     "&amp;Close">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/eo/composer.dtd adblock-plus-2.6+dfsg/chrome/locale/eo/composer.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/eo/composer.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/eo/composer.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,32 +1,32 @@
-<!ENTITY anchor.end.label "en la &amp;fino de la adreso">
+<!ENTITY anchor.end.label "en la fi&amp;no de la adreso">
 <!ENTITY domainRestriction.label "&amp;Limigi al retregiono:">
-<!ENTITY collapse.default.no.label "Uzi defaŭlton (ne)">
-<!ENTITY firstParty.label "N&amp;ur de unua liveranto">
-<!ENTITY preferences.label "Montri &amp;ekzistantajn filtrilojn…">
+<!ENTITY collapse.default.no.label "Uzi apriorojn (ne)">
+<!ENTITY firstParty.label "Nu&amp;r de unua liveranto">
+<!ENTITY preferences.label "Montri &amp;ekzistantajn filtrilojn...">
 <!ENTITY pattern.label "Serĉi modelon">
 <!ENTITY thirdParty.label "Nur de &amp;tria liveranto">
-<!ENTITY filter.label "No&amp;va filtrilo:">
-<!ENTITY collapse.label "&amp;Maletendi blokitajn:">
+<!ENTITY filter.label "Nova &amp;filtrilo:">
+<!ENTITY collapse.label "Ma&amp;letendi blokitajn:">
 <!ENTITY match.warning "La modelo, kiun vi enigis, ne plu konformas kun la adreso, kiu estu blokata/transprenata en la blankan liston kaj ne havos efikon al ĝi.">
 <!ENTITY anchor.start.label "en la &amp;komenco de la adreso">
 <!ENTITY matchCase.label "&amp;Atenti usklecon">
 <!ENTITY custom.pattern.label "&amp;Propraj:">
-<!ENTITY unselectAllTypes.label "Elekti neniun">
+<!ENTITY unselectAllTypes.label "Elekti nenion">
 <!ENTITY type.whitelist.label "Es&amp;ceptoregulo">
 <!ENTITY regexp.warning "La modelo, kiun vi enigis, estos interpretata kiel regula esprimo, kiu ne povas esti traktata oer Adblock Plus kaj povas malrapidigi vian retumadon. Se vi ne intencas uzi regulan esprimon, aldonu asteriskon (*) al la fino de la modelo.">
 <!ENTITY dialog.title "Aldoni filtrilregulon al Adblock Plus">
 <!ENTITY basic.label "Baza vido">
 <!ENTITY type.filter.label "&amp;Blokanta filtrilo">
-<!ENTITY types.label "Apliki al tipoj:">
+<!ENTITY types.label "Apliki al specoj:">
 <!ENTITY shortpattern.warning "La modelo, kiun vi enigis, estas tro mallonga por optimigo kaj povas malrapidigi vian retumadon. Rekomendiĝas, ke vi elektas pli longan signoĉenon por ĉi tiu filtrilo por permesi Adblock Plus trakti la filtrilon pli efike.">
 <!ENTITY collapse.yes.label "Jes">
 <!ENTITY anchors.label "Akcepti modelon nur:">
-<!ENTITY collapse.default.yes.label "Uzi defaŭlton (jes)">
-<!ENTITY domainRestriction.help "Uzu ĉi tiun opcion por specifi unu retregionon aŭ plurajn retregionojn, separitajn per strekosignon (|). La filtrilo estos nur aplikata al elektitaj retregionoj. Tildo (~) antaŭ retregiona nomo indikas, ke la filtrilo ne estos aplikata al tiu retregiono.">
+<!ENTITY collapse.default.yes.label "Uzi apriorojn (jes)">
+<!ENTITY domainRestriction.help "Uzu ĉi tiun opcion por specifi unu retregionon aŭ plurajn retregionojn, separitajn per strekosigno (|). La filtrilo estos nur aplikata al elektita(j) retregiono(j). Tildo (~) antaŭ retregiona nomo indikas, ke la filtrilo ne estos aplikata al tiu retregiono.">
 <!ENTITY accept.label "Aldoni filtrilon">
 <!ENTITY options.label "Opcioj">
-<!ENTITY disabled.warning "Addblock Plus estas nun malŝaltita. Vi povas ankoraŭ aldoni filtrilojn, sed ili ne estos aplikataj, ĝis vi [link]ŝaltas Adblock Plus[/link].">
-<!ENTITY anchor.start.flexible.label "en la &amp;komenco de la retregiona nomo">
+<!ENTITY disabled.warning "Addblock Plus estas nun malŝaltita. Vi povas ankoraŭ aldoni filtrilojn sed ili ne estos aplikataj, ĝis vi [link]enŝaltas Adblock Plus[/link].">
+<!ENTITY anchor.start.flexible.label "en la komenco de la retre&amp;giona nomo">
 <!ENTITY collapse.no.label "Ne">
 <!ENTITY selectAllTypes.label "Elekti ĉion">
 <!ENTITY advanced.label "Detala vido">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/eo/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/eo/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/eo/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/eo/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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_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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/eo/global.properties adblock-plus-2.6+dfsg/chrome/locale/eo/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/eo/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/eo/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Neniuj blokeblaj elementoj en ĉi tiu paĝo
 action3_tooltip=Klaku por ebligi/malebligi Adblock Plus.
+notification_antiadblock_title=Ĉu kaŝi celmesaĝojn?
 type_label_script=skripto
 filter_elemhide_nocriteria=Neniuj kriterioj specifitaj por ekkoni la kaŝotan elementon
 blockingGroup_title=Reguloj por bloki reklamon
@@ -24,6 +25,7 @@
 action2_tooltip=Klaku por malfermi agordojn, klaku per la meza musklavo por ebligi/malebligi ĝin.
 type_label_subdocument=kadro
 clearStats_warning=Tio rekomencigos la statistikon de filtrilaj trafoj kaj malebligos la nombradon de filtrilaj trafoj. Ĉu vi volas daŭrigi?
+notification_antiadblock_message=Estas konate, ke ĉi tiu retejo montras celmesaĝojn por uzantoj de Adblock Plus. Ĉu vi volas, ke Adblock Plus kaŝu celmesaĝojn?
 blocked_count_addendum=(ankaŭ en blanka listo: ?1?, kaŝita: ?2?)
 subscription_invalid_location=La loko de la listo de filtriloj estas nek valida URL nek valida dosiernomo.
 type_label_image=bildo
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/eo/meta.properties adblock-plus-2.6+dfsg/chrome/locale/eo/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/eo/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/eo/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 description.short=Ĉu vi ĉagrenas pri anoncoj, kolektantoj de datumoj kaj reklamrubandoj? Instalu Adblock Plus por regajni la kontrolon pri la interreto kaj ŝanĝu la manieron kiel rigardi la reton.\n\nMallonga video estas ĉe http://www.youtube.com/watch?v=oNvb2SjVjjI
 name=Adblock Plus
 description.long.addition1=Ekde Adblock Plus 2.0 estas opcio en la filtrilaj agordoj, kiu permesas nealtrudiĝantan reklamon. La celo estas, subteni retejojn, kiuj uzas nealtrudiĝantajn manierojn por reklami kaj kuraĝigi pliajn retejojn fari tion. <a href="http://adblockplus.org/en/acceptable-ads">Legu pli</a>
-translator=Milupo
+translator=Wladimir PALANT
 description.long=Adblock Plus ebligas al vi regajni la kontrolon pri la interreto kaj rigardi la reton tiel, kiel vi volas tion. La aldonaĵo estas kompletigata per pli ol kvardek filtrilabonoj en dekduoj da lingvoj, kiuj aŭtomate konfiguras ĝin por celoj, komencante kun forigo de reta reklamo ĝis blokado de ĉiuj retregionoj de fiprogramaro. Adblock Plus ankaŭ ebligas al vi adapti viajn filtrilojn helpe de multnombraj utilaj funkcioj, inter ili kunteksta opcio por bildoj, langeto por bloki objektojn de Flash kaj Ĝavo kaj listo de blokeblaj elementoj por forigi skriptojn kaj stilfoliojn.
-description=Anoncoj estis hieraŭ!
+description=Reklamoj estis hieraŭ!
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/eo/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/eo/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/eo/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/eo/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Jes">
+<!ENTITY notification.button.no "&amp;Ne">
 <!ENTITY sync.label "&amp;Sinkronigi agordojn de Adblock Plus">
 <!ENTITY whitelist.site.label "Malebligi sur ?1?">
 <!ENTITY filters.label "&amp;Filtrilaj agordoj">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Plus: Bloki bildon">
 <!ENTITY counthits.label "&amp;Nombri filtriltrafojn">
 <!ENTITY opensidebar.label "Malfermi &amp;blokeblajn elementojn">
+<!ENTITY notification.button.close "&amp;Fermi">
 <!ENTITY contribute.label "Kontribuu al Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Bloki kadron">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/es-AR/composer.dtd adblock-plus-2.6+dfsg/chrome/locale/es-AR/composer.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/es-AR/composer.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/es-AR/composer.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -14,15 +14,15 @@
 <!ENTITY unselectAllTypes.label "No seleccionar nada">
 <!ENTITY type.whitelist.label "Regla de &amp;excepción">
 <!ENTITY regexp.warning "El patrón que ingresés será interpretado como una expresión constante. Demasiadas expresiones constantes podrían ralentizar tu navegación web. Si no preferís usar expresiones constantes, agregá un asterisco (&quot;*&quot;) al final del patrón.">
-<!ENTITY dialog.title "Agregar regla de filtro">
+<!ENTITY dialog.title "Agregar regla de filtro de Adblock Plus">
 <!ENTITY basic.label "Vista básica">
 <!ENTITY type.filter.label "Filtros de &amp;bloqueo">
 <!ENTITY types.label "Aplicar a tipos:">
-<!ENTITY shortpattern.warning "El patrón que ingresaste es demasiado corto para poder ser optimizado. Varios patrones similares podrían ralentizar tu navegación web. Te recomendamos que elijas una cadena más larga para este filtro.">
+<!ENTITY shortpattern.warning "El patrón que ingresaste es demasiado corto para poder ser optimizado. Varios patrones similares podrían ralentizar tu navegación web. Te recomendamos que elijás una cadena más larga para este filtro.">
 <!ENTITY collapse.yes.label "Sí">
 <!ENTITY anchors.label "Aceptar solamente patrón:">
 <!ENTITY collapse.default.yes.label "Usar predeterminado (sí)">
-<!ENTITY domainRestriction.help "Especificá uno o más dominios, separados por el símbolo tubería &quot;|&quot;, así el filtro se aplica solamente sobre estos dominios. El símbolo ñuflo &quot;~&quot; antes de un nombre de dominio significa que el filtro no se aplicaría sobre ese dominio.">
+<!ENTITY domainRestriction.help "Especificá uno o más dominios, separados por el símbolo tubería &quot;|&quot;, así el filtro se aplica solamente sobre estos dominios. El símbolo ñuflo &quot;~&quot; adelante de un nombre de dominio significa que el filtro no se aplicaría sobre ese dominio.">
 <!ENTITY accept.label "Agregar filtro">
 <!ENTITY options.label "Opciones">
 <!ENTITY disabled.warning "Adblock Plus está deshabilitado. Podés seguir agregando filtros, pero no se aplicarán hasta que no actives los [link]filtros de Adblock Plus[/link].">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/es-AR/filters.dtd adblock-plus-2.6+dfsg/chrome/locale/es-AR/filters.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/es-AR/filters.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/es-AR/filters.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -6,7 +6,7 @@
 <!ENTITY subscription.actions.label "Acciones">
 <!ENTITY filter.selectAll.label "Seleccionar todo">
 <!ENTITY backupButton.label "Resg&amp;uardar y restaurar">
-<!ENTITY restore.minVersion.warning "Advertencia: este archivo fue creado por una versión más reciente de Adblock Plus. Deberías actualizarte a la última versión de Adblock Plus antes de restaurar este archivo.">
+<!ENTITY restore.minVersion.warning "ADVERTENCIA: este archivo fue creado por una versión más reciente de Adblock Plus. Deberías actualizarte a la última versión de Adblock Plus antes de restaurar este archivo.">
 <!ENTITY restore.error "No se pudo procesar los datos del archivo. ¿Este es un archivo de resguardo de Adblock Plus?">
 <!ENTITY sort.ascending.label "Ordenar de la &quot;&amp;A&quot; a la &quot;Z&quot;">
 <!ENTITY sort.label "&amp;Ordenar por">
@@ -14,12 +14,12 @@
 <!ENTITY hitcount.column "V&amp;eces usado">
 <!ENTITY noFilters.text "Todavía no tenés ningún filtro personalizado.">
 <!ENTITY backup.custom.title "Solamente filtros personalizados">
-<!ENTITY subscription.external.label "Actualizada por otra extensión">
+<!ENTITY subscription.external.label "Actualizado por otra extensión">
 <!ENTITY subscription.delete.label "Eliminar">
 <!ENTITY noGroupSelected.text "Necesitás seleccionar un grupo de filtros antes de que sus filtros puedan ser visualizados.">
 <!ENTITY filter.cut.label "Cortar">
-<!ENTITY restore.default.label "¿Restaurar resguardo del?1?">
-<!ENTITY subscription.lastDownload.inProgress "Descargando...">
+<!ENTITY restore.default.label "¿Restaurar resguardo de ?1?">
+<!ENTITY subscription.lastDownload.inProgress "Descargando…">
 <!ENTITY subscriptions.tab.label "Suscripciones de filtro">
 <!ENTITY sort.descending.label "Ordenar de la &quot;&amp;Z&quot; a la &quot;A&quot;">
 <!ENTITY filters.remove.warning "¿Estás seguro que querés quitar todos los filtros seleccionados?">
@@ -29,8 +29,7 @@
 <!ENTITY subscription.lastDownload.unknown "No disponible">
 <!ENTITY addSubscriptionCancel.label "Cancelar">
 <!ENTITY subscription.enabled.label "Habilitado">
-<!ENTITY noSubscriptions.text "Todavía no agregaste ninguna suscripción de filtro. Adblock Plus no bloqueará nada sin filtros. Por favor, andá a &quot;Agregar suscripción de filtro&quot; para
- agregar alguno.">
+<!ENTITY noSubscriptions.text "Todavía no agregaste ninguna suscripción de filtro. Adblock Plus no bloqueará nada sin filtros. Por favor, andá a &quot;Agregar suscripción de filtro&quot; para agregar alguno.">
 <!ENTITY subscription.update.label "Actualizar filtros">
 <!ENTITY dialog.title "Preferencia de filtro de Adblock Plus">
 <!ENTITY addFilter.label "&amp;Agregar filtro">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/es-AR/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/es-AR/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/es-AR/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/es-AR/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,16 +6,14 @@
 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_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_donate_label=Apoyá nuestro proyecto
 firstRun_feature_social=Quitá botones de redes sociales
-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.
+firstRun_legacySafariWarning=Estás usando una versión vieja de Safari, la cual no soporta Adblock Plus. Puede que no funcione correctamente o que perjudique la experiencia del usuario en algunos sitios web. Te recomendamos encarecidamente que, o bien actualicés a Safari 6.1. o más reciente (en Mac OS X 10.8 Mountain Lion), o Safari 7.0.1 o más reciente (en Mac OS X 10.9 Mavericks), o bien usés la última versión de Mozilla Firefox, Google Chrome u Opera.
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/es-AR/global.properties adblock-plus-2.6+dfsg/chrome/locale/es-AR/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/es-AR/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/es-AR/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=No hay elementos bloqueables en la página actual
 action3_tooltip=Clic para habilitar/deshabilitar Adblock Plus.
+notification_antiadblock_title=¿Ocultar mensajes de usuario?
 type_label_script=script
 filter_elemhide_nocriteria=No se especificó el criterio para reconocer el elemento a ser ocultado
 blockingGroup_title=Reglas de bloqueo de publicidad
@@ -24,6 +25,7 @@
 action2_tooltip=Clic para abrir el menú de preferencias, clic con el botón del medio para habilitarlo/deshabilitarlo.
 type_label_subdocument=marco
 clearStats_warning=Esto restablecerá todas las estadísticas de conteo y las deshabilitará. ¿Querés continuar?
+notification_antiadblock_message=Este sitio web es conocido por mostrar mensajes a los usuarios de Adblock Plus. ¿Querés que Adblock Plus los oculte?
 blocked_count_addendum=(también en la lista segura: ?1?, ocultos: ?2?)
 subscription_invalid_location=La ubicación de lista de filtros no es válida, o no es válido el nombre de archivo.
 type_label_image=imagen
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/es-AR/meta.properties adblock-plus-2.6+dfsg/chrome/locale/es-AR/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/es-AR/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/es-AR/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
-description.short=¿Te molestan las publicidades? ¿Preocupado por los sistemas de rastreo? ¿Te fastidian los báners? Instalá Adblock Plus ahora para recuperar el control de Internet y cambiar la forma en que ves la web.
+description.short=Bloquea las molestas publicidades en video en YouTube, las publicidades de Facebook, báners y mucho más. Adblock Plus bloquea todas las publicidades molestas y apoya a los sitios web al no bloquear publicidad no intrusiva (configurable).
 name=Adblock Plus
-description.long.addition1=A partir de Adblock Plus 2.0, hay una opción en las Preferencias de filtro para permitir publicidad no hostigadora. El fin es apoyar a los sitios web que usen métodos no abusivos de mostrar publicidad y alentar a que otros sitios hagan lo mismo. <a href="http://adblockplus.org/en/acceptable-ads">Aprendé más</a>
+description.long.addition1=A partir de Adblock Plus 2.0, hay una opción en las "Preferencias de filtro" para permitir publicidad no hostigadora. El fin es apoyar a los sitios web que usen métodos no abusivos de mostrar publicidad y alentar a que otros sitios hagan lo mismo. <a href="http://adblockplus.org/en/acceptable-ads">Aprendé más</a>
 translator=KNTRO
-description.long=Adblock Plus te permite recuperar el control de Internet y cambiar la forma en que ves la web. La extensión incluye soporte para más de cuarenta suscripciones de filtros, en docenas de idiomas, cuyos propósitos van desde quitar publicidad en línea hasta bloquear todos los dominios maliciosos conocidos. Adblock Plus también te permite configurar tus filtros con la asistencia de una variedad de funciones muy útiles, incluyendo una opción contextual para imágenes, una pestaña de bloqueos para objetos Flash y Java, y una lista de elementos susceptibles de ser bloqueados, para quitar así scripts y hojas de estilo.
+description.long=Adblock Plus te permite recuperar el control de Internet y ver la web de la forma en que querés. El complemento tiene apoyo de cuarenta suscripciones de filtros, en decenas de idiomas, los cuales automáticamente lo configuran para propósitos que van desde quitar publicidad en línea hasta bloquear todos los dominios maliciosos conocidos. Adblock Plus también te permite configurar tus filtros con la asistencia de una variedad de funciones muy útiles, incluyendo una opción contextual para imágenes, una pestaña de bloqueos para objetos Flash y Java, y una lista de elementos susceptibles de ser bloqueados, para quitar así scripts y hojas de estilo.
 description=¡La publicidad es cosa del pasado!
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/es-AR/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/es-AR/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/es-AR/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/es-AR/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Sí">
+<!ENTITY notification.button.no "&amp;No">
 <!ENTITY sync.label "Si&amp;ncronizar la configuración de Adblock Plus">
 <!ENTITY whitelist.site.label "Deshabilitar en ?1?">
 <!ENTITY filters.label "P&amp;referencias de filtro">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Plus: bloquear imagen">
 <!ENTITY counthits.label "&amp;Veces usado">
 <!ENTITY opensidebar.label "&amp;Abrir elementos bloqueables">
+<!ENTITY notification.button.close "&amp;Cerrar">
 <!ENTITY contribute.label "Contribuí a Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: bloquear marco">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/es-CL/composer.dtd adblock-plus-2.6+dfsg/chrome/locale/es-CL/composer.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/es-CL/composer.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/es-CL/composer.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,23 +1,33 @@
+<!ENTITY anchor.end.label "ir al &amp;final de la dirección">
+<!ENTITY domainRestriction.label "&amp;Restringir al dominio:">
 <!ENTITY collapse.default.no.label "Usar predeterminado (no)">
+<!ENTITY firstParty.label "So&amp;lo propietarios">
 <!ENTITY preferences.label "&amp;Mostrar filtros existentes…">
 <!ENTITY pattern.label "Buscar patrón">
+<!ENTITY thirdParty.label "&amp;Solo terceros">
 <!ENTITY filter.label "&amp;Nuevo filtro:">
-<!ENTITY types.label "aplicar a">
+<!ENTITY collapse.label "Co&amp;lapso bloqueado:">
+<!ENTITY match.warning "El patrón que ha ingresado ya no concuerda con la dirección a ser Bloqueada/Permitida y no tendrá efecto en la misma.">
+<!ENTITY anchor.start.label "&amp;ir al principio de la dirección">
+<!ENTITY matchCase.label "&amp;Coincidir Mayus/Minus">
 <!ENTITY custom.pattern.label "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 dialog.title "Añadir regla de filtrado de Adblock Plus">
 <!ENTITY basic.label "Vista básica">
 <!ENTITY type.filter.label "filtro de bloqueo">
+<!ENTITY types.label "aplicar a">
 <!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 collapse.yes.label "Sí">
 <!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 anchor.start.flexible.label "&amp;ir al principio del nombre de dominio">
 <!ENTITY collapse.no.label "No">
 <!ENTITY selectAllTypes.label "Seleccionar todos">
 <!ENTITY advanced.label "Vista avanzada">
+<!ENTITY pattern.explanation "El patrón puede ser cualquier parte de una dirección; asteriscos(*) actuan como comodines. El filtro solo se aplicara a direcciones que igualen el patrón proporcionado.">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/es-CL/filters.dtd adblock-plus-2.6+dfsg/chrome/locale/es-CL/filters.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/es-CL/filters.dtd	1970-01-01 00:00:00.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/es-CL/filters.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -0,0 +1,72 @@
+<!ENTITY restore.custom.warning "Todas sus filtros personalizados se sustituirán por los contenidos del archivo seleccionado ¿Desea continuar?">
+<!ENTITY slow.column "Filtros lentos">
+<!ENTITY enabled.column "Activado">
+<!ENTITY subscription.lastDownload.checksumMismatch "Fallido, desajuste de suma de comprobación">
+<!ENTITY noFiltersInGroup.text "El grupo seleccionado está vacío.">
+<!ENTITY subscription.actions.label "Acciones">
+<!ENTITY filter.selectAll.label "Seleccionar todos">
+<!ENTITY backupButton.label "&amp;Copias de seguridad y restauración">
+<!ENTITY restore.minVersion.warning "Atención: el archivo se creó con una versión más reciente de Adblock Plus. Debería actualizar a la última versión de Adblock Plus antes de hacer una restauración desde este archivo.">
+<!ENTITY restore.error "No se pudieron procesar los datos del archivo. ¿Es posible que no sea un archivo de copia de seguridad de Adblock Plus?">
+<!ENTITY sort.ascending.label "Ordenar A-Z">
+<!ENTITY sort.label "&amp; Ordenar por">
+<!ENTITY subscription.source.label "Lista de filtros">
+<!ENTITY hitcount.column "&amp;Contador">
+<!ENTITY noFilters.text "Aún no tiene filtros personalizados.">
+<!ENTITY backup.custom.title "Sólo los filtros personalizados">
+<!ENTITY subscription.external.label "Actualizado por otra extensión">
+<!ENTITY subscription.delete.label "Borrar">
+<!ENTITY noGroupSelected.text "Tiene que seleccionar un grupo de filtros para que se muestren sus filtros.">
+<!ENTITY filter.cut.label "Cortar">
+<!ENTITY restore.default.label "Restaurar copia de seguridad de ?1?">
+<!ENTITY subscription.lastDownload.inProgress "Descargando...">
+<!ENTITY subscriptions.tab.label "Filtrar subscripciones">
+<!ENTITY sort.descending.label "Ordenar &amp;Z &gt; A">
+<!ENTITY filters.remove.warning "¿Está seguro de querer eliminar todos los filtros seleccionados?">
+<!ENTITY filter.delete.label "Borrar">
+<!ENTITY addSubscriptionAdd.label "Agregar">
+<!ENTITY viewMenu.label "Ver">
+<!ENTITY subscription.lastDownload.unknown "N/D">
+<!ENTITY addSubscriptionCancel.label "Cancelar">
+<!ENTITY subscription.enabled.label "Activado">
+<!ENTITY noSubscriptions.text "Aún no ha añadido nigun filtro de subscripcion. Adblock Plus no bloquea si no hay filtros, por favor usa la opcion &quot;Agregar filtro de subscripcion&quot; para agregar unos.">
+<!ENTITY subscription.update.label "Actualizar filtros">
+<!ENTITY dialog.title "Filtrar preferencia para Adblock Plus">
+<!ENTITY addFilter.label "A&amp;ñadir filtro">
+<!ENTITY subscription.minVersion.warning "Este filtro de suscripcion requiere una version más reciente de AdBlock Plus, deberías actualizarla a la última version.">
+<!ENTITY subscription.lastDownload.invalidURL "Fallo, direccion inválida">
+<!ENTITY backup.error "Se produjo un error al escribir filtros en el archivo. Asegúrese que el archivo no está protegido contra escritura o siendo utilizado por otra aplicación.">
+<!ENTITY filter.moveUp.label "Mueva hacia arriba">
+<!ENTITY addGroup.label "Agregar filtro y grupo">
+<!ENTITY filter.edit.label "Editar">
+<!ENTITY subscription.showHideFilters.label "Mostrar/ocultar filtros">
+<!ENTITY acceptableAds2.label "Permitir cierta publicidad no intrusiva">
+<!ENTITY addSubscriptionOther.label "Añadir otra suscripcion">
+<!ENTITY close.label "Cerrar">
+<!ENTITY sort.none.label "&amp;Sin ordenar">
+<!ENTITY filter.actions.label "Filtrar acciones">
+<!ENTITY filter.copy.label "Copiar">
+<!ENTITY filter.moveDown.label "Mover hacia abajo">
+<!ENTITY filter.resetHitCounts.label "Reiniciar estadísticas de uso">
+<!ENTITY readMore.label "Leer más">
+<!ENTITY subscription.moveUp.label "Mueva hacia arriba">
+<!ENTITY addSubscription.label "Agregar y filtrar subscripcion">
+<!ENTITY subscription.homepage.label "Página de inicio">
+<!ENTITY backup.complete.title "Todos los filtros y suscripciones">
+<!ENTITY restore.own.label "Restaurar copia de seguridad propia">
+<!ENTITY restore.complete.warning "Todas sus preferencias de filtros se sustituirán por los contenidos del archivo seleccionado ¿Desea continuar?">
+<!ENTITY filters.tab.label "Filtros personalizados">
+<!ENTITY backup.label "Crear nueva copia de seguridad">
+<!ENTITY find.label "&amp;Buscar">
+<!ENTITY subscription.moveDown.label "Mover hacia abajo">
+<!ENTITY subscription.lastDownload.connectionError "Falló, descarga fracaso">
+<!ENTITY subscription.lastDownload.success "Suceso">
+<!ENTITY subscription.lastDownload.invalidData "Falló, no es válida la lista de filtros">
+<!ENTITY filter.paste.label "Pegar">
+<!ENTITY subscription.disabledFilters.enable "Activar filltros deesactivados">
+<!ENTITY lasthit.column "&amp;últimouso">
+<!ENTITY subscription.editTitle.label "Editar título">
+<!ENTITY subscription.disabledFilters.warning "Algúnos filtros en esta suscripcion esta desabilitados.">
+<!ENTITY filter.column "Filtrar regla">
+<!ENTITY subscription.lastDownload.label "Última descarga:">
+<!ENTITY viewList.label "Ver lista">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/es-CL/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/es-CL/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/es-CL/firstRun.properties	1970-01-01 00:00:00.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/es-CL/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -0,0 +1,19 @@
+firstRun_feature_tracking_description=Navegue con intimidad desactivando el rastreo - ocultando su rastro a las empresas de publicidad que espían cada uno de sus movimientos.
+firstRun_toggle_off=DESACTIVAR
+firstRun_feature_tracking=Desactivar el rastreo
+firstRun_feature_malware=Bloqueo de malware
+firstRun_title=Adblock Plus ha sido instalado
+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_dataCorruptionWarning=¿Esta página sigue apareciendo? <a>Haga clic aquí!</a>
+firstRun_acceptableAdsHeadline=Los anuncios molestos ahora serán bloqueados
+firstRun_share=Dile a tus amigos
+firstRun_share_headline=Danos una mano para hacer de esta web un mejor lugar
+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_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_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 -Nru adblock-plus-2.4.1+dfsg/chrome/locale/es-ES/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/es-ES/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/es-ES/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/es-ES/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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_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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/es-ES/global.properties adblock-plus-2.6+dfsg/chrome/locale/es-ES/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/es-ES/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/es-ES/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=No hay elementos que se puedan bloquear en la página actual
 action3_tooltip=Pulse para activar/desactivar Adblock Plus.
+notification_antiadblock_title=¿Ocultar mensajes dirigidos a usuarios de Adblock Plus?
 type_label_script=script
 filter_elemhide_nocriteria=No se especificó ningún criterio para identificar el elemento a ocultar
 blockingGroup_title=Reglas de bloqueo de publicidad
@@ -24,6 +25,7 @@
 action2_tooltip=Pulse para abrir las preferencias, botón central para activar/desactivar.
 type_label_subdocument=marco
 clearStats_warning=Se reiniciarán todas las estadísticas de uso de filtros y se desactivarán dichas estadísticas de uso de filtros. ¿Desea continuar con la acción?
+notification_antiadblock_message=Se sabe que este sitio ha mostrado en el pasado mensajes dirigidos a los usuarios de Adblock Plus. ¿Quiere que Adblock Plus oculte esos mensajes?
 blocked_count_addendum=(en lista blanca: ?1?, ocultos: ?2?)
 subscription_invalid_location=La dirección de la lista de filtros no es una URL ni una ruta de archivo válida.
 type_label_image=imagen
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/es-ES/meta.properties adblock-plus-2.6+dfsg/chrome/locale/es-ES/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/es-ES/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/es-ES/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,4 +1,4 @@
-description.short=¿Le molestan los anuncios, los banners, que espíen su navegación? Instale Adblock Plus para recuperar el control de Internet y cambie la forma en la que ve la web.\n\nPuede consultar la información en español en http://adblockplus.org/es/
+description.short=Bloquea la publicidad molesta en Youtube y Facebook, los banners, y muchas otras cosas. Adblock Plus bloquea todos los anuncios importunos y ayuda a los sitios web al permitir por defecto la publicidad no intrusiva (opción configurable).
 name=Adblock Plus
 description.long.addition1=A partir de Adblock Plus 2.0 se ha incluido una opción en las Preferencias de filtros que permite cierta publicidad no intrusiva. Su finalidad es ayudar a los sitios web que utilizan formas de publicidad no intrusiva para su anuncios y animar a más sitios web a hacer lo mismo. <a href="http://adblockplus.org/en/acceptable-ads">Más información</a>
 translator=Urko
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/es-ES/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/es-ES/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/es-ES/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/es-ES/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp; Sí">
+<!ENTITY notification.button.no "&amp; No">
 <!ENTITY sync.label "Sincroni&amp;zar predisposiciones de Adblock Plus">
 <!ENTITY whitelist.site.label "Desactivar en ?1?">
 <!ENTITY filters.label "&amp;Preferencias de filtros">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "ABP - Bloquear imagen">
 <!ENTITY counthits.label "Contar &amp;usos de filtros">
 <!ENTITY opensidebar.label "Abrir &amp;ventana elementos bloqueables">
+<!ENTITY notification.button.close "&amp;Cerrar">
 <!ENTITY contribute.label "Ayudar a Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "ABP - Bloquear marco">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/es-MX/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/es-MX/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/es-MX/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/es-MX/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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_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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/es-MX/global.properties adblock-plus-2.6+dfsg/chrome/locale/es-MX/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/es-MX/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/es-MX/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=No hay elementos bloqueables en la página actual
 action3_tooltip=Click para activar/desactivar Adblock Plus.
+notification_antiadblock_title=¿Ocultar mensajes dirigidos?
 type_label_script=script
 filter_elemhide_nocriteria=No hay criterios específicos para reconocer el elemento que se oculta
 blockingGroup_title=Reglas de Bloqueo de Anuncios
@@ -24,6 +25,7 @@
 action2_tooltip=Click para abrir las Preferencias, click medio para activar/desactivar.
 type_label_subdocument=marco
 clearStats_warning=Esto reiniciará todas las estadísticas de filtros afectados y desactivará el conteo de accesos de los filtros. ¿Deseas proceder?
+notification_antiadblock_message=Es sabido que este sitio muestra mensajes dirigidos a los usuarios de Adblock Plus. ¿Quieres que Adblock plus oculte estos mensajes?
 blocked_count_addendum=(tambien permitidos: ?1?, ocultos: ?2?)
 subscription_invalid_location=La ubicación de la lista de filtros no es ni una dirección URL válida, ni un nombre de archivo válido.
 type_label_image=imagen
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/es-MX/meta.properties adblock-plus-2.6+dfsg/chrome/locale/es-MX/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/es-MX/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/es-MX/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 description.short=Irritado por los anuncios? Preocupado por los seguimientos? Molesto por tantos banners? Instala Adblock Plus ahora y recupera el control del internet y cambia el modo en el que ves la web.\n\nMas Info en: http://adblockplus.org/es
 name=Adblock Plus
 description.long.addition1=Empezando con Adblock Plus 2.0 existe una opción en Preferencias de Filtros para permitir algo de publicidad no intrusiva (molesta). El objetivo es apoyar a sitios web que usen estos métodos no intrusivos para sustentarse económicamente y también para fomentar y animar a otros sitios web a hacer lo mismo. <a href="http://adblockplus.org/es/acceptable-ads">Leer mas</a>
-translator=Ninnetyer, Francisco Alvarado
+translator=Ninnetyer, Francisco Alvarado, poz2k4444
 description.long=Adblock Plus te permite recuperar el control de la internet y ver la web del modo en el que tu lo deseas. El complemento es apoyado por más de cuarenta subscripciones de filtros en docenas de idiomas que la configuran automáticamente para los propósitos que van desde la eliminación de publicidad en línea a bloquear todos los dominios conocidos con malware en ellos. Adblock Plus también te permite personalizar tus filtros con la asistencia de una variedad de útiles características, incluyendo una opción de contexto para las imágenes, una pestaña de bloqueo para ventanas y objetos de Flash y Java, y una lista de elementos bloqueables para así eliminar los scripts y hojas de estilo no deseados.
 description=Los Anuncios son cosa del Ayer!
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/es-MX/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/es-MX/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/es-MX/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/es-MX/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Sí">
+<!ENTITY notification.button.no "&amp;No">
 <!ENTITY sync.label "&amp;Sincronizar configuración de Adblock Plus">
 <!ENTITY whitelist.site.label "Desactivar en ?1?">
 <!ENTITY filters.label "&amp;Preferencias de filtro">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Plus: Bloquear imagen">
 <!ENTITY counthits.label "Contar accesos de &amp;filtro">
 <!ENTITY opensidebar.label "Abrir elementos bloqueables">
+<!ENTITY notification.button.close "&amp;Cerrar">
 <!ENTITY contribute.label "Desactivar con Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock plus">
 <!ENTITY context.frame.label "Adblock Plus: Bloquear marco">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/et/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/et/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/et/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/et/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,9 +1,11 @@
 firstRun_toggle_off=VÄLJAS
-firstRun_share_headline=<a>Anna meile käsi</a> veebi muutmises paremaks kohaks
+firstRun_feature_tracking=Keela Jälgimine
 firstRun_title=Adblock Plus on paigaldatud
 firstRun_toggle_on=SEES
-firstRun_feature_show_overview=kuva ülevaade
+firstRun_feature_malware=Viiruste blokeerimine
+firstRun_feature_social=Eemalde sotsiaalse meedia nuppe
 firstRun_acceptableAdsHeadline=Tüütud kuulutused on nüüd blokeeritud
 firstRun_share=Räägi oma sõpradele
+firstRun_share_headline=<a>Anna meile käsi</a> veebi muutmises paremaks kohaks
 firstRun_donate=anneta
 firstRun_donate_label=Toeta meie projekti
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/eu/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/eu/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/eu/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/eu/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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_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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/fa/composer.dtd adblock-plus-2.6+dfsg/chrome/locale/fa/composer.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/fa/composer.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/fa/composer.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -14,7 +14,7 @@
 <!ENTITY unselectAllTypes.label "انتخاب هیچکدام">
 <!ENTITY type.whitelist.label "قاعده است&amp;ثنا">
 <!ENTITY regexp.warning "الگویی که شما وارد کرده اید یک نویسه مرتب تفسیر می شود که نمی تواند به صورت بهینه توسط فوق تبلیغ شکن پردازش شود و ممکن است مرور صفحات شمار را کند کند. اگر شما قصد استفاده کردن از یک نویسه مرتب را نداشته اید، یک ستار (*) به انتهای الگوی خود اضافه کنید.">
-<!ENTITY dialog.title "افزودن قاعده فیلتر در Adblock Plus">
+<!ENTITY dialog.title "اضافه کردن قاعد فیلتر ادبلاک پلاس">
 <!ENTITY basic.label "نمایش پایه">
 <!ENTITY type.filter.label "پالایه م&amp;سدود کننده">
 <!ENTITY types.label "اعمال به انواع:">
@@ -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 "فوق تبلیغ شکن هم اکنون غیر فعال می یاشد. شما هنوز می توانید پالایه اضافه کنید، اما آنها اعمال نمی شوند مگر [link]فوق تبلیغ شکن را فعال کنید[/link].">
 <!ENTITY anchor.start.flexible.label "در آ&amp;غاز نام دامنه">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/fa/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/fa/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/fa/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/fa/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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=پروژه ما را حمایت کنید
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/fa/global.properties adblock-plus-2.6+dfsg/chrome/locale/fa/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/fa/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/fa/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=مورد مسدود شده ای در این صفحه موجود نیست
 action3_tooltip=برای فعال یا غیرفعال‌کردن Adblock Plus کلیک کنید.
+notification_antiadblock_title=آیا مایلید پیام های هدفمند برای کاربران Adblock Plus را مخفی نمایید؟
 type_label_script=نویسه
 filter_elemhide_nocriteria=هیچ ضابطه ای برای شناسایی عناصری که می بایست پنهان شوند مشخص نشد.
 blockingGroup_title=قوانین مسدود کردن تبلیغ
@@ -24,6 +25,7 @@
 action2_tooltip=برای گشودن ترجیحات کلیک کنید. کلیک-وسط برای فعال یا غیرفعال کردن است.
 type_label_subdocument=قابک
 clearStats_warning=این کار تمام آمار ها را پاک کرده و آمارگیری را متوقف می کند. آیا مایل به توقف هستید؟
+notification_antiadblock_message=این سایت پیام های هدفمند برای کاربران Adblock Plus نشان می دهد. آیا مایلید که Adblock Plus پیام های هدفمند را از دید شما مخفی کند؟
 blocked_count_addendum=(همچنین فهرست سفید: ?1?, پنهان: ?2?)
 subscription_invalid_location=مکان وارد شده برای فهرست فیلترها نامعتبر است.
 type_label_image=تصویر
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/fa/meta.properties adblock-plus-2.6+dfsg/chrome/locale/fa/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/fa/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/fa/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +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.long=فوق تبلیغ شکن امکان باز پس گیری تسلط بر شبکه جهانی را به شما می دهد.این افزونه توسط بیش از 40 اشتراک فیلتر در 10 ها زبان مختلف پشتیبانی می شود که به منظور پاکسازی شبکه از تبلیغات تولید شده اند. و همچنین به شما امکان سفارشی سازی فیلترها را می دهد.
+translator=از طرف Wladimir Palant
+description.long=اد بلاک پلاس امکان باز پس گیری تسلط بر شبکه جهانی را به شما می دهد.این افزونه توسط بیش از 40 اشتراک فیلتر در 10 ها زبان مختلف پشتیبانی می شود که به منظور پاکسازی شبکه از تبلیغات تولید شده اند. و همچنین به شما امکان سفارشی سازی فیلترها را می دهد.
 description=تبلیغت متعلق به دیروز بود!
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/fa/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/fa/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/fa/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/fa/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "ب&amp;له">
+<!ENTITY notification.button.no "&amp;نه">
 <!ENTITY sync.label "همگام سازی تن&amp;ظیمات Adblock Plus">
 <!ENTITY whitelist.site.label "غیرفعال در ?1?">
 <!ENTITY filters.label "&amp; تنظیمات فیلتر">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Plus: سد تصاویر">
 <!ENTITY counthits.label "شمارش &amp;تعداد فیلتر شده ها">
 <!ENTITY opensidebar.label "باز کردن موارد &amp;قابل مسدود سازی">
+<!ENTITY notification.button.close "&amp;بستن">
 <!ENTITY contribute.label "کمک کردن به Adblock Plus">
 <!ENTITY toolbarbutton.label "فوق تبلیغ شکن یا Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus:سد قابک">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/fi/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/fi/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/fi/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/fi/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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_expanded=ota ominaisuuksia käyttöön
 firstRun_dataCorruptionWarning=Näetkö tämän sivun koko ajan? <a>Napsauta tätä!</a>
 firstRun_acceptableAdsHeadline=Häiritsevät mainokset estetään
 firstRun_share=Kerro ystävillesi
 firstRun_share_headline=<a>Auta meitä</a> tekemään verkosta parempi paikka
 firstRun_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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/fi/global.properties adblock-plus-2.6+dfsg/chrome/locale/fi/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/fi/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/fi/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Ei estettäviä elementtejä avoimella sivulla
 action3_tooltip=Napsauttamalla Adblock Plus otetaan käyttöön/poistetaan käytöstä.
+notification_antiadblock_title=Piilotetaanko kohdennetut viestit?
 type_label_script=komento
 filter_elemhide_nocriteria=Piilotettavaa elementtiä määrittelevää tunnistetta ei annettu
 blockingGroup_title=Estoehdot
@@ -24,6 +25,7 @@
 action2_tooltip=Napsautus avaa asetukset. Keskinapsautus ottaa käyttöön/poistaa käytöstä.
 type_label_subdocument=kehys
 clearStats_warning=Tämä nollaa kaikki osumatilastot ja poistaa osumien laskemisen käytöstä. Haluatko jatkaa?
+notification_antiadblock_message=Tämän sivun tiedetään näyttäneen kohdennettuja viestejä Adblock Plussan käyttäjille. Haluatko, että Adblock Plus piilottaa kohdennetut viestit?
 blocked_count_addendum=(sallituja: ?1?, piilotettuja: ?2?)
 subscription_invalid_location=Suodatinlistan sijainti on joko kelvoton osoite tai tiedoston nimi.
 type_label_image=kuva
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/fi/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/fi/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/fi/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/fi/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Kyllä">
+<!ENTITY notification.button.no "&amp;Ei">
 <!ENTITY sync.label "&amp;Synkronoi Adblock Plussan asetukset">
 <!ENTITY whitelist.site.label "Ei käytössä osoitteessa ?1?">
 <!ENTITY filters.label "&amp;Suodatinasetukset">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Plus: Estä kuva">
 <!ENTITY counthits.label "&amp;Laske suodattimen osumat">
 <!ENTITY opensidebar.label "Näytä &amp;elementit">
+<!ENTITY notification.button.close "&amp;Sulje">
 <!ENTITY contribute.label "Avusta Adblock Plussaa">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Estä kehys">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/fr/composer.dtd adblock-plus-2.6+dfsg/chrome/locale/fr/composer.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/fr/composer.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/fr/composer.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -30,4 +30,4 @@
 <!ENTITY collapse.no.label "Non">
 <!ENTITY selectAllTypes.label "Tout sélectionner">
 <!ENTITY advanced.label "Affichage avancé">
-<!ENTITY pattern.explanation "Le motif peut être une partie de l'adresse; le symbole * jouant le rôle de joker. Le filtre ne sera appliqué qu'aux adresses coïncidant avec le motif.">
+<!ENTITY pattern.explanation "Le motif peut être une partie de l'adresse ; le symbole * jouant le rôle de joker. Le filtre ne sera appliqué qu'aux adresses coïncidant avec le motif.">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/fr/filters.dtd adblock-plus-2.6+dfsg/chrome/locale/fr/filters.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/fr/filters.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/fr/filters.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -44,7 +44,7 @@
 <!ENTITY addSubscriptionOther.label "Ajouter un autre abonnement">
 <!ENTITY close.label "Fermer">
 <!ENTITY sort.none.label "&amp;Non trié">
-<!ENTITY filter.actions.label "Actions du filtre">
+<!ENTITY filter.actions.label "Actions sur filtre">
 <!ENTITY filter.copy.label "Copier">
 <!ENTITY filter.moveDown.label "Descendre">
 <!ENTITY filter.resetHitCounts.label "Réinitialiser le compteur">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/fr/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/fr/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/fr/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/fr/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -3,17 +3,15 @@
 firstRun_feature_tracking=Désactiver l'espionnage
 firstRun_feature_malware=Blocage des logiciels malveillants
 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_acceptableAdsExplanation=Nous aimerions encourager les sites Web à utiliser de la publicité honnête et discrète. C'est pourquoi nous avons établi <a>des lignes directrices strictes</a> afin d'identifier les annonces acceptables, par défaut. Si vous souhaitez tout de même bloquer toutes les publicités, vous pouvez <a>désactiver</a> cela dans les paramètres en quelques secondes.
 firstRun_toggle_on=ACTIF
 firstRun_contributor_credits=Crédits des contributeurs
-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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/fr/global.properties adblock-plus-2.6+dfsg/chrome/locale/fr/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/fr/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/fr/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Aucun élément filtrable sur cette page
 action3_tooltip=Cliquez pour activer/désactiver Adblock Plus.
+notification_antiadblock_title=Cacher les messages ciblés ?
 type_label_script=script
 filter_elemhide_nocriteria=Aucun critère spécifié pour reconnaître l'élément à masquer
 blockingGroup_title=Règles de blocage de publicités
@@ -11,7 +12,7 @@
 filter_regexp_tooltip=Ce filtre est soit une expression régulière, soit trop court pour être optimisé. Un excès de ce genre de filtres pourrait ralentir votre navigation.
 action0_tooltip=Cliquez pour afficher le menu contextuel, clic du milieu pour activer/désactiver.
 whitelisted_page=Adblock Plus a été désactivée pour cette page
-remove_group_warning=Souhaitez-vous vraiment supprimer ce groupe?
+remove_group_warning=Souhaitez-vous vraiment supprimer ce groupe ?
 action1_tooltip=Cliquez pour ouvrir/fermer la liste des éléments filtrables, clic du milieu pour activer/désactiver.
 type_label_xmlhttprequest=requête XML
 active_tooltip=Adblock Plus est active, ?1? abonnement(s) et ?2? filtre(s) personnel(s) utilisé(s).
@@ -24,16 +25,17 @@
 action2_tooltip=Cliquez pour ouvrir les préférences, clic du milieu pour activer/désactiver.
 type_label_subdocument=cadre
 clearStats_warning=Cela va remettre à zéro les statistiques d'utilisation de filtre et désactiver le comptage d'utilisation de filtre. Souhaitez-vous vraiment faire cela ?
+notification_antiadblock_message=Ce site est connu pour afficher des messages destinés aux utilisateurs d'Adblock Plus. Voulez-vous qu'Adblock Plus cache ces messages ?
 blocked_count_addendum=(également en liste blanche : ?1?, masqué(s) : ?2?)
 subscription_invalid_location=L'adresse indiquant l'emplacement de la liste de filtres n'est ni une URL valide, ni un nom de fichier valide.
 type_label_image=image
-remove_subscription_warning=Souhaitez-vous vraiment supprimer cet abonnement?
+remove_subscription_warning=Souhaitez-vous vraiment supprimer cet abonnement ?
 type_label_other=autre
-mobile_menu_enable=ABP: Activer
+mobile_menu_enable=ABP : Activer
 type_label_media=audio/vidéo
-mobile_menu_disable_site=ABP: Désactiver pour ?1?
+mobile_menu_disable_site=ABP : Désactiver pour ?1?
 elemhideGroup_title=Règles de masquage d'éléments
-mobile_menu_enable_site=ABP: Activer pour ?1?
+mobile_menu_enable_site=ABP : Activer pour ?1?
 type_label_elemhide=masqué
 newGroup_title=Nouveau groupe de filtres
 default_dialog_title=Adblock Plus
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/fr/meta.properties adblock-plus-2.6+dfsg/chrome/locale/fr/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/fr/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/fr/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
-description.short=Agacé par les publicités? Préoccupé par le fait d'être pisté? Installez Adblock Plus maintenant pour reprendre le contrôle de ce que vous voyez sur le Web.Petite vidéo de démonstration : http://www.youtube.com/watch?v=oNvb2SjVjjI
+description.short=Bloque les vidéos de pub YouTube, les publicités Facebook, les bannières de pub et bien plus.\n\nAdblock Plus bloque toutes les publicités agaçantes mais pas celles restant discrètes (par défaut et configurable) afin de continuer à soutenir les sites.
 name=Adblock Plus
 description.long.addition1=À partir d'Adblock Plus 2.0, une option dans les « Préférences de Filtres » permet d'autoriser certaines publicités non-intrusives. Le but est d'être compatible avec des sites qui utilisent des manières non-intrusives pour diffuser de la publicité et d'encourager d'autres sites à faire de même. <a href="http://adblockplus.org/fr/acceptable-ads">En apprendre davantage</a>
 translator=jojaba, Jim Courbron, Dagobert_78, pirlouy
 description.long=Adblock Plus vous permet de reprendre le contrôle d'Internet et de visualiser le Web de la manière que vous souhaitez. L'extension prend en charge plus de quarante abonnements à des listes de filtres en des dizaines de langues qui la configurent automatiquement afin, entre autres, de supprimer des publicités en ligne et de bloquer tous les domaines malveillants. Adblock Plus vous permet également de personnaliser vos filtres à l'aide d'une variété de fonctionnalités très utiles telles qu'une option contextuelle pour les images, un onglet permettant de bloquer les objets Flash et Java et une liste d'éléments filtrables pour supprimer des scripts et des feuilles de style.
-description=Les publicités, c'est du passé!
+description=Les publicités, c'est du passé !
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/fr/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/fr/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/fr/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/fr/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Oui">
+<!ENTITY notification.button.no "&amp;Non">
 <!ENTITY sync.label "S&amp;ynchroniser les paramètres d'Adblock Plus">
 <!ENTITY whitelist.site.label "Désactiver pour ?1?">
 <!ENTITY filters.label "Pré&amp;férences de filtre">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Bloquer l'image avec Adblock Plus">
 <!ENTITY counthits.label "Co&amp;mpter la fréquence d'utilisation de filtre">
 <!ENTITY opensidebar.label "Ouvrir la liste des élé&amp;ments filtrables">
+<!ENTITY notification.button.close "&amp;Fermer">
 <!ENTITY contribute.label "Contribuer à Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Bloquer le cadre avec Adblock Plus">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/fr/sendReport.dtd adblock-plus-2.6+dfsg/chrome/locale/fr/sendReport.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/fr/sendReport.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/fr/sendReport.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -33,7 +33,7 @@
 <!ENTITY issues.nosubscriptions.description "Vous ne semblez pas être abonné à une liste de filtres prédéfinis qui suppriment automatiquement des contenus indésirables de sites Web.">
 <!ENTITY typeSelector.falsePositive.description "Choisissez cette option si le contenu de la page est sévèrement tronqué, est mal affiché ou ne fonctionne pas correctement. Vous pouvez vérifier si Adblock Plus en est la cause en la désactivant temporairement.">
 <!ENTITY typeSelector.other.label "&amp;Autre problème">
-<!ENTITY emailComment.label "Nous vous encourageons à saisir un email valide afin que nous puissions vous contacter pour toute question concernant votre rapport. Cela nous permettra également de reconnaître vos contributions et de les prioriser.">
+<!ENTITY emailComment.label "Nous vous encourageons à saisir un courriel valide afin que nous puissions vous contacter pour toute question concernant votre signalement. Cela nous permettra également de reconnaître vos contributions et de les traiter prioritairement.">
 <!ENTITY issues.whitelist.remove.label "Activer à nouveau Adblock Plus sur cette page">
 <!ENTITY outdatedSubscriptions.description "Les abonnements de filtres suivants n'ont pas été mis à jour depuis au moins deux semaines. Veuillez mettre à jour ces abonnements avant de signaler un problème, il se pourrait qu'il ait déjà été résolu.">
 <!ENTITY dataCollector.description "Veuillez patienter quelques instants pendant qu'Adblock Plus réunit les données nécessaires.">
@@ -49,11 +49,11 @@
 <!ENTITY issues.whitelist.description "Adblock Plus est actuellement désactivée sur la page que vous signalez. Veuillez l'activer à nouveau et actualiser la page avant de soumettre le signalement pour qu'une recherche de solutions soit entamée.">
 <!ENTITY typeSelector.falseNegative.label "Ad&amp;block Plus ne bloque pas une publicité">
 <!ENTITY typeSelector.heading "Choisir le type de problème">
-<!ENTITY anonymity.warning "Nous ne serons pas capable de de vous recontacter et votre rapport sera potentiellement moins prioritaire.">
+<!ENTITY anonymity.warning "Nous ne serons pas en mesure de vous recontacter et votre signalement ne sera probablement pas traité prioritairement.">
 <!ENTITY wizard.title "Signalement de problèmes">
 <!ENTITY issues.ownfilters.disable.label "Désactiver le filtre">
 <!ENTITY commentPage.description "Le champ ci-dessous vous permet de saisir un commentaire pour nous aider à comprendre le problème. Cette étape est facultative mais recommandée si le problème n'est pas évident à détecter. Vous pouvez également revoir les données du signalement avant l'envoi.">
-<!ENTITY comment.lengthWarning "Votre commentaire comporte plus de 1000 caractères. Uniquement les 1000 premiers caractères seront envoyés.">
+<!ENTITY comment.lengthWarning "Votre commentaire comporte plus de 1000 caractères. Seuls les 1000 premiers caractères seront envoyés.">
 <!ENTITY typeSelector.falseNegative.description "Choisissez cette option si une publicité est tout de même affichée bien qu'Adblock Plus soit activée.">
 <!ENTITY sendPage.waitMessage "Veuillez patienter pendant qu'Adblock Plus soumet votre signalement.">
 <!ENTITY dataCollector.heading "Bienvenue dans l'assistant de signalement de problèmes">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/fy-NL/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/fy-NL/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/fy-NL/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/fy-NL/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,7 +6,6 @@
 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
@@ -17,4 +16,4 @@
 firstRun_donate=Donneare
 firstRun_donate_label=Support ús projekt
 firstRun_feature_social=Sociale Media knop fuorthelje
-firstRun_feature_show_expanded=aktivere mooglikheden
+firstRun_legacySafariWarning=Do brûkst in âlde fersy fan Safari dy net mear troch Adblock Plus understeunt wurdt. Miskien wurket it net goed of liket it soms wat raar. Wij adviseare om Safari 6.1.1 of heger (op OS X 10.8 Mountain Lion), of Safari 7.0.1 of heger (op OS X 10.9 Mavericks) te brûken, of de lêste fersy van Mozilla Firefox, Google Chrome of Opera.
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/fy-NL/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/fy-NL/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/fy-NL/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/fy-NL/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Ja">
+<!ENTITY notification.button.no "&amp;Nee">
 <!ENTITY sync.label "Sync Adblock Plus opsjes">
 <!ENTITY whitelist.site.label "Utskeakelje op ?1?">
 <!ENTITY filters.label "Filterfoarkarren">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Ofbylding blokkearje">
 <!ENTITY counthits.label "Tel filterhits">
 <!ENTITY opensidebar.label "&amp;Blokkearbere ûnderdielen iepenje">
+<!ENTITY notification.button.close "&amp;Slûte">
 <!ENTITY contribute.label "Donearje oan Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Dielfinster blokkearje">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/gl/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/gl/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/gl/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/gl/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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_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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/gl/global.properties adblock-plus-2.6+dfsg/chrome/locale/gl/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/gl/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/gl/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Non che hai elementos bloqueables nesta páxina
 action3_tooltip=Preme para activar/desactivar o Adblock Plus.
+notification_antiadblock_title=Agochar mensaxes dirixidas?
 type_label_script=script
 filter_elemhide_nocriteria=Non se especificaron criterios para recoñecer o elemento que se quere agochar
 blockingGroup_title=Reglas de bloqueo de publicidade
@@ -24,6 +25,7 @@
 action2_tooltip=Preme para abrir as preferencias, e click no medio para activar/desactivar.
 type_label_subdocument=marco
 clearStats_warning=Isto vai resetear as estatísticas dos filtros e a desactivar a contabilidade do uso dos filtros. Estás seguro que o queres facer?
+notification_antiadblock_message=Este sitio é coñecido por amosar mensaxes dirixidas ós usuarios do Adblock Plus. Queres que o Adblock plus agoche estas mensaxes dirixidas?
 blocked_count_addendum=(tamén na Lista Branca: ?1?, agochados: ?2?)
 subscription_invalid_location=Esa localización da lista de filtros non é nin unha URL válida nin un nome de arquivo válido.
 type_label_image=imaxe
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/gl/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/gl/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/gl/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/gl/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Sí">
+<!ENTITY notification.button.no "&amp;Non">
 <!ENTITY sync.label "Sin&amp;cronizar as opcións do Adblock Plus">
 <!ENTITY whitelist.site.label "Desactivar en ?1?">
 <!ENTITY filters.label "Pre&amp;ferencias dos filtros">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "ABP - Bloquear a imaxe">
 <!ENTITY counthits.label "Co&amp;ntabilizar as veces que se usa cada filtro">
 <!ENTITY opensidebar.label "A&amp;brir temas bloqueables">
+<!ENTITY notification.button.close "&amp;Pechar">
 <!ENTITY contribute.label "Apoquinar ó Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "ABP - Bloquear o marco">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/he/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/he/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/he/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/he/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,16 +6,14 @@
 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 שלא נתמכת על ידי 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.
+firstRun_legacySafariWarning=הנכם משתמשים בגירסה ישנה של Safari שלא נתמכת על ידי Adblock Plus. זה עלול לא לעבוד כראוי או לשבש את חווית המשתמש בחלק מהאתרים. אנו ממליצים לכם לעדכן את Safari לגרסה 6.1.1 ומעלה (OS X 10.8 Mountain Lion) או Safari 7.0.1 ומעלה (OS X 10.9 Mavericks) או להשתמש בגרסה האחרונה של Mozilla Firefox, Google Chrome or Opera.
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/he/global.properties adblock-plus-2.6+dfsg/chrome/locale/he/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/he/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/he/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=אין פריטים לחסימה בעמוד הנוכחי
 action3_tooltip=לחיצה כדי לאפשר/לנטרל את Adblock Plus.
+notification_antiadblock_title=הסתרת הודעות מוכוונות?
 type_label_script=תסריט
 filter_elemhide_nocriteria=לא צוין קריטריון לזיהוי האלמנט שיוסתר
 blockingGroup_title=כללי חסימת מודעות
@@ -24,6 +25,7 @@
 action2_tooltip=לחיצה כדי לפתוח את המאפיינים, לחיצה אמצעית כדי לאפשר/לנטרל.
 type_label_subdocument=מסגרת
 clearStats_warning=זה יאפס את כל סטטיסטיקות הלחיצה של המסננים וינטרל את מניית הלחיצה של המסנן. האם להמשיך?
+notification_antiadblock_message=אתר זה ידוע בהצגת הודעות מכוונות למשתמשי Adblock Plus. האם ברצונכם ש-Adblock Plus יסתיר הודעות מוכוונות?
 blocked_count_addendum=(גם כן ברשימת המורשים: ?1?, מוסתר: ?2?)
 subscription_invalid_location=מיקום רשימת הסינון איננו כתובת אתר חוקית ולא שם קובץ חוקי.
 type_label_image=תמונה
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/he/meta.properties adblock-plus-2.6+dfsg/chrome/locale/he/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/he/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/he/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
-description.short=הפרסומות מציקות לך? מוטרד ממעקב אחריך? הבאנרים מפריעים לך? התקינו עכשיו את Adblock Plus כדי לקבל חזרה את השליטה באינטרנט וכדי לשנות את הדרך שבה אתה צופה ברשת. \n\nסקירת וידאו קצרה באנגלית זמינה ב־http://www.youtube.com/watch?v=oNvb2SjVjjI
+description.short=חסימת מודעות ווידיאו מטרידות ב-YouTube, מודעות Facebook, באנרים ועוד רבות.\nAdblock Plus חוסם את כל המודעות המטרידות, ותומך באתרים על ידי אי חסימת מודעות שאינן בולטות כברירת מחדל (ניתן להגדרה).
 name=Adblock Plus
-description.long.addition1=החל מ-Adblock Plus 2.0 קיימת האפשרות בהעדפות הסינון לאפשר קצת פרסום לא פולשני. המטרה היא לתמוך באתרים המשתמשים בדרכים לא פולשניות לפרסם ולעודד אתרים נוספים לעשות אותו הדבר. <a href="http://adblockplus.org/en/acceptable-ads">לקרא עוד</a>
+description.long.addition1=החל מ-Adblock Plus 2.0 קיימת האפשרות בהעדפות הסינון לאפשר מעט פרסום לא פולשני. המטרה היא לתמוך באתרים המשתמשים בדרכים לא פולשניות לפרסום ולעודד אתרים נוספים לעשות את אותו הדבר. <a href="http://adblockplus.org/en/acceptable-ads">לקרא עוד</a>
 translator=catcat, SiiiE
-description.long=Adblock Plus מאפשר לך לקבל חזרה את השליטה באינטרנט ולצפות ברשת בדרך הרצויה לך. ההרחבה תומכת בלמעלה מארבעים הרשמות מסננים בתריסר שפות שמוגדרות אוטומטית לכיסוי מלא של חסימה, מפרסומות ועד אתרים מזיקים. Adblock Plus גם יאפשר לך להתאים מסננים משלך בעזרת מבחר מאפיינים שימושיים, הכוללים תפריט לחצן ימני לתמונות, לשונית לחסימת פלאש וג'אווה ורשימת פריטים לחסימה כדי להסיר תסריטים וסגנונות.
+description.long=Adblock Plus מאפשר לכם לקבל בחזרה את השליטה באינטרנט ולצפות ברשת בדרך שהנכם רוצים. ההרחבה תומכת בלמעלה מארבעים הרשמות מסננים בתריסר שפות שמוגדרות אוטומטית לכיסוי מלא של חסימה, מפרסומות ועד אתרים מזיקים ושמות מתחם של אתרים זדוניים. Adblock Plus גם מאפשר לכם להתאים מסננים משלכם בעזרת מבחר מאפיינים שימושיים, הכוללים תפריט לחצן ימני לתמונות, לשונית לחסימת פלאש וג'אווה ורשימת פריטים לחסימה כדי להסיר תסריטים וסגנונות.
 description=הפרסומות שייכות לעבר!
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/he/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/he/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/he/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/he/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;כן">
+<!ENTITY notification.button.no "&amp;לא">
 <!ENTITY sync.label "&amp;סנכרון הגדרות Adblock Plus">
 <!ENTITY whitelist.site.label "נטרול ב-?1?">
 <!ENTITY filters.label "&amp;העדפות סינון">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Plus: חסימת תמונה">
 <!ENTITY counthits.label "מנה &amp;לחיצות מסנן">
 <!ENTITY opensidebar.label "&amp;פתיחת רשימת הפריטים לחסימה">
+<!ENTITY notification.button.close "&amp;סגירה">
 <!ENTITY contribute.label "תרום ל-Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: חסימת מסגרת (פריים)">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/hi-IN/filters.dtd adblock-plus-2.6+dfsg/chrome/locale/hi-IN/filters.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/hi-IN/filters.dtd	1970-01-01 00:00:00.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/hi-IN/filters.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -0,0 +1,13 @@
+<!ENTITY subscription.lastDownload.invalidURL "विफल रहा, एक मान्य पता नहीं ">
+<!ENTITY addSubscriptionOther.label "भिन्न सदस्यता जोड़ें">
+<!ENTITY subscription.source.label "फ़िल्टर सूची">
+<!ENTITY subscription.lastDownload.connectionError "विफल रहा, डाउनलोड विफलता">
+<!ENTITY subscription.lastDownload.success "सफलता">
+<!ENTITY addSubscriptionCancel.label "रद्द करें">
+<!ENTITY subscription.enabled.label "सक्षम किया गया">
+<!ENTITY subscription.homepage.label "मुखपृष्ठ">
+<!ENTITY subscription.external.label "एक अन्य एक्सटेंशन द्वारा अद्यतन किया">
+<!ENTITY dialog.title "Adblock प्लस फ़िल्टर वरीयताएँ">
+<!ENTITY filters.tab.label "nbjh">
+<!ENTITY subscription.lastDownload.label "पिछले डाउनलोड:">
+<!ENTITY subscriptions.tab.label "फ़िल्टर सदस्यताएँ">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/hi-IN/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/hi-IN/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/hi-IN/firstRun.properties	1970-01-01 00:00:00.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/hi-IN/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -0,0 +1,2 @@
+firstRun_dataCorruptionWarning=  क्या यह पृष्ट बार बार प्रस्तुत हो रहा है? <a>यहाँ क्लिक करें</a>
+firstRun_acceptableAdsHeadline=कष्टकारी विज्ञापन अब हटा दिए जायेंगे
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/hr/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/hr/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/hr/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/hr/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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_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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/hr/global.properties adblock-plus-2.6+dfsg/chrome/locale/hr/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/hr/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/hr/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Na trenutnoj stranici nema stavki koje se mogu blokirati
 action3_tooltip=Kliknite za omogućavanje/onemogućavanje Adblock Plus-a.
+notification_antiadblock_title=Sakrij ciljane reklame?
 type_label_script=skripta
 filter_elemhide_nocriteria=Nema kriterija za prepoznavanje elementa koji će biti skriven
 blockingGroup_title=Ad Blocking pravila
@@ -24,6 +25,7 @@
 action2_tooltip=Kliknite za otvaranje postavki, srednji klik za omogućavanje/onemogućavanje.
 type_label_subdocument=okvir
 clearStats_warning=Ovo će poništiti svu statistiku pogodaka filtera i onemogućiti brojanje pogodaka filtera. Želite li nastaviti?
+notification_antiadblock_message=Za ovaj sajt se zna da prikazuje ciljane reklame Adblock Plus korisnicima. Želite li da Adblock Plus sakrije ciljane reklame?
 blocked_count_addendum=(dopušteni: ?1?, skriveni: ?2?)
 subscription_invalid_location=Lokacija popisa filtera nije niti valjana web adresa niti naziv datoteke.
 type_label_image=slika
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/hr/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/hr/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/hr/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/hr/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Da">
+<!ENTITY notification.button.no "&amp;Ne">
 <!ENTITY sync.label "Sinkroniziraj Adblo&amp;ck Plus postavke">
 <!ENTITY whitelist.site.label "Onemogući na ?1?">
 <!ENTITY filters.label "Postavke &amp;filtera">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Blokiraj sliku s Adblock Plus-om">
 <!ENTITY counthits.label "Broji pogodke fil&amp;tera">
 <!ENTITY opensidebar.label "Otvori &amp;blokirane stavke">
+<!ENTITY notification.button.close "&amp;Zatvori">
 <!ENTITY contribute.label "Doprinesite Adblock Plus-u">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Blokiraj okvir s Adblock Plus-om">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/hsb/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/hsb/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/hsb/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/hsb/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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_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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/hsb/global.properties adblock-plus-2.6+dfsg/chrome/locale/hsb/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/hsb/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/hsb/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Žane blokujomne zapiski na tutej stronje
 action3_tooltip=Klikńće, zo byšće Adblock Plus zmóžnił/znjemóžnił.
+notification_antiadblock_title=Cilowe zdźělenki schować?
 type_label_script=skript
 filter_elemhide_nocriteria=Žane kriterije podate, zo by element spóznało, kotryž ma so schować
 blockingGroup_title=Prawidła za blokowanje reklamy
@@ -24,6 +25,7 @@
 action2_tooltip=Klikńće, zo byšće nastajenja wočinił, klikńće ze srjedźnej tastu myše, zo by zmóžniło/znjemóžniło.
 type_label_subdocument=wobłuk
 clearStats_warning=To staji wšu filtrowu statistiku wróćo a znjemóžni ličenje filtrowych wotpowědnikow. Chceće pokoročować?
+notification_antiadblock_message=Tute sydło je za to znate, zo cilowe zdźělenki za wužiwarjow Adblock Plus pokazuje. Chceće, zo Adblock Plus cilowe zdźělenki chowa?
 blocked_count_addendum=(tež w běłej lisćinje: ?1?, schowane: ?2?)
 subscription_invalid_location=Městno filtroweje lisćiny njeje ani płaćiwy URL ani płaćiwe datajowe mjeno.
 type_label_image=wobraz
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/hsb/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/hsb/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/hsb/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/hsb/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Haj">
+<!ENTITY notification.button.no "&amp;Ně">
 <!ENTITY sync.label "Nastajenja Adblo&amp;ck Plus synchronizować">
 <!ENTITY whitelist.site.label "Na ?1? znjemóžnić">
 <!ENTITY filters.label "&amp;Filtrowe nastajenja">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Plus: Wobraz blokować">
 <!ENTITY counthits.label "&amp;Filtrowe wotpowědniki ličić">
 <!ENTITY opensidebar.label "Blo&amp;kujomne elementy wočinić">
+<!ENTITY notification.button.close "&amp;Začinić">
 <!ENTITY contribute.label "K Adblock Plus přinošować">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Wobłuk blokować">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/hu/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/hu/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/hu/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/hu/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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_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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/hu/global.properties adblock-plus-2.6+dfsg/chrome/locale/hu/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/hu/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/hu/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Nincsenek blokkolható elemek az aktuális oldalon.
 action3_tooltip=Kattintson ide az Adblock Plus ki/bekapcsolásához.
+notification_antiadblock_title=Célzott üzenetek elrejtése
 type_label_script=szkript
 filter_elemhide_nocriteria=Nincs megadva feltétel az elrejtendő elemre
 blockingGroup_title=Reklám szűrő szabályok
@@ -24,6 +25,7 @@
 action2_tooltip=Kattintson ide a beállítások megnyitásához, középső gombbal a ki/bekapcsoláshoz.
 type_label_subdocument=keret
 clearStats_warning=Ezzel letörli az összes találati statisztikát és letiltja a mentésüket. Biztosan folytatja?
+notification_antiadblock_message=Ezen az oldalon célzott üzeneteket jelenítenek meg az Adblock Plus felhasználóinak. Szeretné, ha az Adblock Plus elrejtené ezeket az üzeneteket?
 blocked_count_addendum=(fehér listán: ?1?, rejtett: ?2?)
 subscription_invalid_location=A megadott külső szűrőt tartalmazó cím helytelen, vagy hibás fájlnevet tartalmaz.
 type_label_image=kép
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/hu/meta.properties adblock-plus-2.6+dfsg/chrome/locale/hu/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/hu/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/hu/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,4 +1,4 @@
-description.short=A weboldalon sok reklám és más, a weboldalt betöltését lassító elem? Telepítse az Adblock Plus kiterjesztést és gyorsítsa a weboldalak betöltését.\n\nGyors áttekintést a http://www.youtube.com/watch?v=oNvb2SjVjjI weboldalon találhat
+description.short=Blokkolja a bosszantó reklámokat YouTube-on, a Facebookos hirdetéseket, bannereket és még sok mást.\n\nAz Adblock Plus blokkolja a hirdetéseket, de támogatja a weboldalakat a nem tolakodó hirdetések engedélyezésével (kikapcsolható).
 name=Adblock Plus
 description.long.addition1=Az Adblock Plus 2.0-s verziójától fogva a Szűrő beállításokban lehetősége van engedélyezni egyes reklámokat, amelyek nem tekinthetőek zavarónak, ezzel támogatva azokat a weboldalakat, amelyek nem tolakodó módon teszik közzé hirdetéseiket. <a href="http://adblockplus.org/hu/acceptable-ads">További információk</a>
 translator=Gárdonyi László, Mikes Kaszmán István
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/hu/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/hu/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/hu/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/hu/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Igen">
+<!ENTITY notification.button.no "&amp;Nem">
 <!ENTITY sync.label "Adblock Plus beállítások s&amp;zinkronizálása">
 <!ENTITY whitelist.site.label "Szűrés tiltása itt: ?1?">
 <!ENTITY filters.label "Szűrő &amp;beállítások">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Kép blokkolása">
 <!ENTITY counthits.label "&amp;Szűrő találati statisztika mentése">
 <!ENTITY opensidebar.label "Blokkolható ob&amp;jektumok megjelenítése">
+<!ENTITY notification.button.close "&amp;Bezárás">
 <!ENTITY contribute.label "Közreműködés az Adblock Plus-hoz">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Keret blokkolása">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/hy-AM/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/hy-AM/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/hy-AM/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/hy-AM/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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=Օգնեք մեր ծրագրին
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/hy-AM/global.properties adblock-plus-2.6+dfsg/chrome/locale/hy-AM/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/hy-AM/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/hy-AM/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Այս էջում ֆիլտրվվող տարրեր չկան
 action3_tooltip=Կլիկով` անջատել/միացնել «Adblock Plus»ը:
+notification_antiadblock_title=Թաքցնե՞լ նամակները
 type_label_script=սկրիպտ
 filter_elemhide_nocriteria=Տարրը թաքցնելու ոչ մի չափանիշ տրված չէ
 blockingGroup_title=Գովազդի արգելման կանոններ
@@ -24,6 +25,7 @@
 action2_tooltip=Կլիկով` Նախընտրանքներ; կետնտրոնական կոճակով` անջատել/միացնել
 type_label_subdocument=ֆրեյմ
 clearStats_warning=Այս կջնջի ստատիստիկան և կանջատի այն:Ցանկանո՞ւմ եք շարունակել:
+notification_antiadblock_message=Այս կայքը ցուցադրում է նամակներ Adblock Plus-ի օգտվողներին։ Ուզո՞ւմ եք թաքցնել դրանք։
 blocked_count_addendum=?1?-ը ?2?-ից
 subscription_invalid_location=Ֆիլտրերի ցանկի հասցեն կամ սխալ URL է, կամ սխալ ֆայլի անուն:
 type_label_image=նկար
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/hy-AM/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/hy-AM/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/hy-AM/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/hy-AM/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Այո">
+<!ENTITY notification.button.no "&amp;Ոչ">
 <!ENTITY sync.label "&amp;Սինքրոնացնել Adblock Plus-ի նախընտրանքները">
 <!ENTITY whitelist.site.label "Անջատել ?1?-ում">
 <!ENTITY filters.label "Ֆիլտրերի կարգավորում (&amp;F)">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock` Ֆիլտրել Նկարը">
 <!ENTITY counthits.label "Հաշվել ֆիլտրի ստատիստիկան (&amp;h)">
 <!ENTITY opensidebar.label "Բացել ֆիլ&amp;տրվող տարրերը">
+<!ENTITY notification.button.close "&amp;Փակել">
 <!ENTITY contribute.label "Աջակցել Adblock Plus-ին">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock` Ֆիլտրել Ֆրեյմը">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/id/composer.dtd adblock-plus-2.6+dfsg/chrome/locale/id/composer.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/id/composer.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/id/composer.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,28 +1,28 @@
 <!ENTITY anchor.end.label "&amp;pada akhir dari alamat">
-<!ENTITY domainRestriction.label "Batasi pa&amp;da ranah:">
+<!ENTITY domainRestriction.label "Membatasi pada &amp; domain:">
 <!ENTITY collapse.default.no.label "Gunakan default (tidak)">
-<!ENTITY firstParty.label "Hanya pihak pe&amp;rtama">
+<!ENTITY firstParty.label "&amp;Hanya untuk pihak pertama">
 <!ENTITY preferences.label "&amp;Tampilkan filter yang ada...">
 <!ENTITY pattern.label "Mencari pola">
 <!ENTITY thirdParty.label "Hanya pihak ke&amp;tiga">
 <!ENTITY filter.label "&amp;Tapis baru:">
-<!ENTITY collapse.label "&amp;Lipat yang diblokir:">
+<!ENTITY collapse.label "&amp;tutup yang diblokir:">
 <!ENTITY match.warning "Pola yang Anda masukkan tidak lagi cocok dengan masuk daftar alamat yang akan diblokir/daftar putih dan tidak akan berpengaruh sama sekali.">
 <!ENTITY anchor.start.label "&amp;pada awal alamat">
-<!ENTITY matchCase.label "&amp;Samakan jenis">
+<!ENTITY matchCase.label "&amp;Sama persis">
 <!ENTITY custom.pattern.label "&amp;Kustom:">
 <!ENTITY unselectAllTypes.label "Tidak memilih apapun">
 <!ENTITY type.whitelist.label "Aturan p&amp;engabaian">
 <!ENTITY regexp.warning "Pola yang Anda masukkan akan dianggap sebagai regular expression yang tidak akan efisien untuk dapat diproses oleh Adblock Plus dan mungkin akan memperlambat pengalaman browsing Anda. Jika Anda tidak berniat untuk menggunakan regular expression, tambahkan tanda bintang (*) diakhir pola.">
 <!ENTITY dialog.title "Tambah aturan filter Adblock Plus">
 <!ENTITY basic.label "Tampilan dasar">
-<!ENTITY type.filter.label "&amp;Blokir tapis">
+<!ENTITY type.filter.label "&amp;Filter yang diblokir">
 <!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 shortpattern.warning "Pola yang Anda masukkan terlalu pendek untuk dapat disempurnakan dan mungkin memperlambat pengalaman berselancar Anda. Anda disarankan untuk memilih lagi karakter yang lebih panjang untuk saringan ini untuk memungkinkan Adblock Plus mengolah saringan agar lebih efisien.">
 <!ENTITY 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 domainRestriction.help "Gunakan pilihan ini untuk menentukan satu atau lebih domain yang dipisahkan oleh sebuah garis bar(|). Filter hanya akan diterapkan pada domain yang dipilih. Sebuah tilde (~) sebelum nama domain menunjukkan bahwa filter tidak akan diterapkan pada domain tersebut.">
 <!ENTITY 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].">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/id/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/id/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/id/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/id/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,21 +1,19 @@
-firstRun_feature_tracking_description=Menjelajah secara rahasia dengan menonaktifkan pelacakan - menyembunyikan jejak anda dari perusahaan iklan yang akan melacak setiap langkah Anda.
+firstRun_feature_tracking_description=Menjelajah secara rahasia dengan menonaktifkan pelacakan - menyembunyikan jejak Anda dari perusahaan iklan yang akan melacak setiap langkah Anda.
 firstRun_toggle_off=OFF
-firstRun_feature_tracking=Menonaktifkan pelacakan
+firstRun_feature_tracking=Nonaktifkan Pelacakan
 firstRun_feature_malware=Memblokir malware
-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_title=Adblock Plus telah diinstal
+firstRun_acceptableAdsExplanation=Kami ingin mendorong situs web untuk menggunakan iklan langsung yang tidak mengganggu. Itu sebabnya kami telah menetapkan <a>Peraturan ketat</a> untuk mengenali iklan yang bisa diterima, yang akan ditampilkan di dalam pengaturan default. Jika Anda masih ingin memblokir setiap iklan, Anda dapat <a>menonaktifkan</a> ini dalam beberapa detik.
 firstRun_toggle_on=ON
-firstRun_contributor_credits=Kontributor kredit
-firstRun_feature_show_expanded=Aktivasi fitur
+firstRun_contributor_credits=Kredit Kontributor
 firstRun_dataCorruptionWarning=Apakah halaman ini tetap muncul? <a>Klik disini!</a>
 firstRun_acceptableAdsHeadline=Sekarang iklan yang mengganggu akan diblokir
 firstRun_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_share_headline=<a>Bantulah kami</a> dalam membuat web menjadi tempat yang lebih baik
+firstRun_features=Adblock Plus dapat melakukan lebih dari sekedar pemblokiran iklan
+firstRun_feature_malware_description=Membuat penjelajahan Anda lebih aman dengan cara memblokir domain yang dikenal sebagai malware.
+firstRun_feature_social_description=Secara otomatis membersihkan tombol media sosial, seperti Facebook Like, yang muncul pada halaman web dan melacak perilaku Anda.
+firstRun_donate=donasi
 firstRun_donate_label=Dukung proyek ini
-firstRun_feature_social=Menghapus tombol Media sosial
-firstRun_legacySafariWarning=Anda menggunakan versi lama Safari yang tidak didukung oleh Adblock Plus. Mungkin tidak akan bekerja dengan baik atau bahkan mengganggu pengalaman pengguna di beberapa website. Kami sangat menyarankan sebaiknya memperbarui ke Safari 6.1.1 atau lebih tinggi (pada OS X 10.8 Mountain Lion), atau Safari 7.0.1 atau lebih tinggi (pada OS X 10.9 Mavericks), atau untuk gunakan versi terbaru dari Mozilla Firefox, Google Chrome atau Opera.
+firstRun_feature_social=Hapus Tombol Media Sosial
+firstRun_legacySafariWarning=Anda menggunakan versi lama Safari yang tidak didukung oleh Adblock Plus. Mungkin tidak akan bekerja dengan baik atau bahkan mengganggu pengalaman pengguna di beberapa website. Kami sangat menyarankan sebaiknya memperbarui ke Safari 6.1.1 atau lebih tinggi (pada OS X 10.8 Mountain Lion), atau Safari 7.0.1 atau lebih tinggi (pada OS X 10.9 Mavericks), atau gunakan versi terbaru dari Mozilla Firefox, Google Chrome atau Opera.
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/id/global.properties adblock-plus-2.6+dfsg/chrome/locale/id/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/id/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/id/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Tidak ada item yang dapat diblok di halaman ini
 action3_tooltip=Klik untuk mengaktifkan/menonaktifkan Adblock Plus.
+notification_antiadblock_title=Sembunyikan pesan yang dipilih?
 type_label_script=script
 filter_elemhide_nocriteria=Tidak ada kriteria yang ditentukan untuk mengenali unsur yang disembunyikan
 blockingGroup_title=Aturan pemblokiran iklan
@@ -24,6 +25,7 @@
 action2_tooltip=Klik untuk membuka preferensi, klik tengah untuk mengaktifkan/menonaktifkan.
 type_label_subdocument=bingkai
 clearStats_warning=Ini akan menyetel ulang semua filter statistik kunjungan dan menonaktifkan filter penghitung kunjungan. Apakah Anda ingin melanjutkan?
+notification_antiadblock_message=Situs ini dikenal sebagai penunjuk pesan yang dipilih terhadap pengguna Adblock Plus. Apakah anda ingin Adblock Plus menyembunyikan pesan yang dipilih?
 blocked_count_addendum=(Dalam daftar putih:?1?, tersembunyi:?2?)
 subscription_invalid_location=Filter daftar lokasi bukanlah URL valid maupun nama file yang valid.
 type_label_image=gambar
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/id/meta.properties adblock-plus-2.6+dfsg/chrome/locale/id/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/id/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/id/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,5 @@
+description.long.addition1=Dimulai dengan Adblock Plus 2.0 terdapat pilihan dalam Preferensi Penyaring untuk memungkinkan beberapa iklan yg tidak menggangu. Tujuannya untuk mendukung situs web dengan menggunakan cara-cara yang tidak mengganguf untuk beriklan dan mendorong lebih banyak website melakukan hal yang sama. <a href="http://adblockplus.org/en/acceptable-ads"> Baca lebih lanjut</a>
 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. 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 konteks untuk gambar, memblokir tab untuk objek Flash dan Java dan daftar item yang dapat diblok untuk menghapus skrip dan stylesheet.
+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 dikonfigurasi untuk keperluan mulai dari menghapus iklan online dan memblokir semua domain malware yang diketahui. Adblock Plus juga memungkinkan Anda untuk menyesuaikan filter Anda dengan bantuan berbagai fitur berguna, termasuk pilihan konteks untuk gambar, memblokir tab untuk objek Flash dan Java dan daftar item yang dapat diblok untuk menghapus skrip dan stylesheet.
 description=Iklan sudah menjadi masa lalu!
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/id/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/id/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/id/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/id/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Iya">
+<!ENTITY notification.button.no "&amp;Tidak">
 <!ENTITY sync.label "Syn&amp;c pengaturan Adblock Plus">
 <!ENTITY whitelist.site.label "Non aktifkan pada ?1?">
 <!ENTITY filters.label "&amp;Preferensi penyaring">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Plus: Blokir gambar">
 <!ENTITY counthits.label "Menghitung filter &amp;kunjungan">
 <!ENTITY opensidebar.label "Buka &amp;item yang dapat diblok">
+<!ENTITY notification.button.close "&amp;Tutup">
 <!ENTITY contribute.label "Kontribusi untuk Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Blokir bingkai">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/id/subscriptionSelection.dtd adblock-plus-2.6+dfsg/chrome/locale/id/subscriptionSelection.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/id/subscriptionSelection.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/id/subscriptionSelection.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,4 +1,4 @@
-<!ENTITY addMain.label "Tambahkan filter &amp;langganan &quot;?&quot; juga">
+<!ENTITY addMain.label "Tambahkan filter &amp;langganan &quot;?1?&quot; juga">
 <!ENTITY list.download.failed "Adblock Plus gagal untuk mengambil daftar langganan.">
 <!ENTITY list.download.retry "Coba lagi">
 <!ENTITY title.label "&amp;Judul langganan:">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/is/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/is/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/is/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/is/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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_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ð
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/is/global.properties adblock-plus-2.6+dfsg/chrome/locale/is/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/is/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/is/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Engir lokaðir hlutir á núverandi síðu
 action3_tooltip=Smelltu til að virkja/gera óvirkt Adblock Plus.
+notification_antiadblock_title=Fela áhugamiðuð skilaboð?
 type_label_script=skrifta
 filter_elemhide_nocriteria=Engin viðmiðun skilgreind til þess að bera kennsl á hlut til að fela
 blockingGroup_title=Lokunarreglur
@@ -24,6 +25,7 @@
 action2_tooltip=Smelltu til að opna stillingar, miðju smelltu til að virkja/gera óvirkt.
 type_label_subdocument=rammi
 clearStats_warning=Þetta mun endurstilla alla teljara á síunotkun og hætta að telja síunotkun. Viltu halda áfram?
+notification_antiadblock_message=Þetta vefsvæði er þekkt fyrir að sýna áhugamiðuð skilaboð til Adblock Plus notenda. Viltu að Adblock Plus feli þessi áhugamiðuð skilaboð?
 blocked_count_addendum=(einnig á hvítlista: ?1?, falið: ?2?)
 subscription_invalid_location=Staðsetning síu er ekki gilt URL eða gilt skráarnafn.
 type_label_image=mynd
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/is/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/is/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/is/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/is/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Já">
+<!ENTITY notification.button.no "&amp;Nei">
 <!ENTITY sync.label "Sa&amp;mstilla Adblock Plus stillingar">
 <!ENTITY whitelist.site.label "Gera óvirkt á ?1?">
 <!ENTITY filters.label "&amp;Síu stillingar">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Plus: Loka auglýsingamynd">
 <!ENTITY counthits.label "Telja síu &amp;notkun">
 <!ENTITY opensidebar.label "Skoða h&amp;luti">
+<!ENTITY notification.button.close "&amp;Loka">
 <!ENTITY contribute.label "Taka þátt í Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Loka auglýsingaramma">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/it/composer.dtd adblock-plus-2.6+dfsg/chrome/locale/it/composer.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/it/composer.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/it/composer.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -12,7 +12,7 @@
 <!ENTITY matchCase.label "Mai&amp;uscole/minuscole">
 <!ENTITY custom.pattern.label "&amp;Personalizza:">
 <!ENTITY unselectAllTypes.label "Deseleziona">
-<!ENTITY type.whitelist.label "E&amp;ccezione">
+<!ENTITY type.whitelist.label "Eccezione">
 <!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 "&lt;&lt; Generali">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/it/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/it/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/it/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/it/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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_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 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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/it/global.properties adblock-plus-2.6+dfsg/chrome/locale/it/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/it/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/it/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Nessun elemento bloccabile nella pagina attuale
 action3_tooltip=Fare clic per attivare/disattivare Adblock Plus
+notification_antiadblock_title=Nascondere messaggi mirati?
 type_label_script=script
 filter_elemhide_nocriteria=Non è stato specificato alcun criterio per rilevare l'elemento da nascondere
 blockingGroup_title=Gruppo di filtri per bloccare elementi
@@ -24,6 +25,7 @@
 action2_tooltip=Fare clic per aprire la finestra di gestione dei filtri, clic centrale per attivare/disattivare
 type_label_subdocument=riquadro
 clearStats_warning=Azzerare le statistiche per tutti i filtri e disattivarne il futuro conteggio?
+notification_antiadblock_message=Questo sito è noto per mostrare messaggi mirati agli utenti di Adblock Plus. Vuoi che Adblock Plus nasconda i messaggi mirati (pubblicità)?
 blocked_count_addendum=(elementi permessi: ?1?, elementi nascosti: ?2?)
 subscription_invalid_location=Attenzione: per poter aggiungere una sottoscrizione è necessario che i campi 'Titolo della sottoscrizione:' ed 'Indirizzo della lista dei filtri:' non siano lasciati vuoti e corrispondano a nomi di file validi. Inserire tali dati e ripetere la procedura
 type_label_image=immagine
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/it/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/it/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/it/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/it/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "Sì">
+<!ENTITY notification.button.no "No">
 <!ENTITY sync.label "Sincronizza le impostazioni di Adbloc&amp;k Plus">
 <!ENTITY whitelist.site.label "Disattiva per ?1?">
 <!ENTITY filters.label "Gestione dei &amp;filtri">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Blocca immagine con Adblock Plus">
 <!ENTITY counthits.label "&amp;Effettua le statistiche di accesso">
 <!ENTITY opensidebar.label "Apri l'elenco degli elementi &amp;bloccabili">
+<!ENTITY notification.button.close "Chiudi">
 <!ENTITY contribute.label "Contribuisci ad Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Blocca riquadro con Adblock Plus">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ja/composer.dtd adblock-plus-2.6+dfsg/chrome/locale/ja/composer.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/ja/composer.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ja/composer.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,22 +1,22 @@
-<!ENTITY anchor.end.label "アドレス末尾 (&amp;N)">
-<!ENTITY domainRestriction.label "ドメイン制限 (&amp;D) :">
+<!ENTITY anchor.end.label "アドレス末尾(&amp;N)">
+<!ENTITY domainRestriction.label "ドメイン制限:(&amp;D)">
 <!ENTITY collapse.default.no.label "デフォルト (いいえ)">
-<!ENTITY firstParty.label "ファーストパーティ制限 (&amp;R)">
-<!ENTITY preferences.label "既存のフィルタを表示 (&amp;S) ...">
+<!ENTITY firstParty.label "ファーストパーティ制限(&amp;R)">
+<!ENTITY preferences.label "既存のフィルタを表示...(&amp;S)">
 <!ENTITY pattern.label "パターンを選択">
-<!ENTITY thirdParty.label "サードパーティ制限 (&amp;T)">
-<!ENTITY filter.label "新フィルタ (&amp;F) :">
-<!ENTITY collapse.label "ブロック後の空きスペースを詰める (&amp;L) :">
+<!ENTITY thirdParty.label "サードパーティ制限(&amp;T)">
+<!ENTITY filter.label "新フィルタ:(&amp;F)">
+<!ENTITY collapse.label "ブロック後の空きスペースを詰める:(&amp;L)">
 <!ENTITY match.warning "入力したパターンはアドレスに一致しないので効果がありません。">
-<!ENTITY anchor.start.label "アドレス先頭 (&amp;G)">
-<!ENTITY matchCase.label "大文字小文字を区別 (&amp;M)">
-<!ENTITY custom.pattern.label "自作 (&amp;C) :">
+<!ENTITY anchor.start.label "アドレス先頭(&amp;G)">
+<!ENTITY matchCase.label "大文字小文字を区別(&amp;M)">
+<!ENTITY custom.pattern.label "自作:(&amp;C)">
 <!ENTITY unselectAllTypes.label "選択解除">
-<!ENTITY type.whitelist.label "ホワイトリスト (&amp;X)">
+<!ENTITY type.whitelist.label "ホワイトリスト(&amp;X)">
 <!ENTITY regexp.warning "入力されたパターンは正規表現として解釈されるため Adblock Plus が効率よく処理できず、ブラウジング速度低下の原因になることがあります。もし正規表現の使用を意図していなかった場合は、パターン末尾に半角アスタリスク (*) を追加してください。">
 <!ENTITY dialog.title "Adblock Plus フィルタを追加">
 <!ENTITY basic.label "基本表示">
-<!ENTITY type.filter.label "ブロックフィルタ (&amp;B)">
+<!ENTITY type.filter.label "ブロックフィルタ(&amp;B)">
 <!ENTITY types.label "適用種別:">
 <!ENTITY shortpattern.warning "入力したパターンは最適化するには短すぎるためブラウジング速度が低下することがあります。Adblock Plus の処理を効率化するために、より長い文字列を選ぶことを推奨します。">
 <!ENTITY collapse.yes.label "はい">
@@ -26,7 +26,7 @@
 <!ENTITY accept.label "フィルタを追加">
 <!ENTITY options.label "オプション">
 <!ENTITY disabled.warning "現在 Adblock Plus は無効になっています。フィルタを追加することはできますが、それらは [link]Adblock Plus を有効にする[/link] まで適用されません。">
-<!ENTITY anchor.start.flexible.label "ドメイン名先頭 (&amp;G)">
+<!ENTITY anchor.start.flexible.label "ドメイン名先頭(&amp;G)">
 <!ENTITY collapse.no.label "いいえ">
 <!ENTITY selectAllTypes.label "すべて選択">
 <!ENTITY advanced.label "詳細表示">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ja/filters.dtd adblock-plus-2.6+dfsg/chrome/locale/ja/filters.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/ja/filters.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ja/filters.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,17 +1,17 @@
 <!ENTITY restore.custom.warning "全ての自作フィルタは指定したファイルの内容に置換されます。よろしいですか？">
-<!ENTITY slow.column "低速フィルタ (&amp;W)">
-<!ENTITY enabled.column "有効 (&amp;N)">
+<!ENTITY slow.column "低速フィルタ(&amp;W)">
+<!ENTITY enabled.column "有効(&amp;N)">
 <!ENTITY subscription.lastDownload.checksumMismatch "更新失敗: チェックサム不一致">
 <!ENTITY noFiltersInGroup.text "選択したグループにフィルタはありません">
 <!ENTITY subscription.actions.label "アクション">
 <!ENTITY filter.selectAll.label "すべて選択">
-<!ENTITY backupButton.label "バックアップと復元 (&amp;B)">
+<!ENTITY backupButton.label "バックアップと復元(&amp;B)">
 <!ENTITY restore.minVersion.warning "警告: このファイルはより新しいバージョンの Adblock Plus で作成されています。このファイルから復元する前に Adblock Plus を最新版に更新してください。">
 <!ENTITY restore.error "ファイルデータが処理できません。このファイルは Adblock Plus のバックアップでないのでは？">
 <!ENTITY sort.ascending.label "&amp;A &gt; Z 順にソート">
-<!ENTITY sort.label "ソート (&amp;S)">
+<!ENTITY sort.label "ソート(&amp;S)">
 <!ENTITY subscription.source.label "フィルタリスト">
-<!ENTITY hitcount.column "ヒット数 (&amp;H)">
+<!ENTITY hitcount.column "ヒット数(&amp;H)">
 <!ENTITY noFilters.text "まだ自作フィルタはありません。">
 <!ENTITY backup.custom.title "自作フィルタのみ">
 <!ENTITY subscription.external.label "他の拡張により更新">
@@ -32,41 +32,41 @@
 <!ENTITY noSubscriptions.text "フィルタをまだ購読していません。Adblock Plus はフィルタなしで何もブロックできないので「購読するフィルタを追加」してください。">
 <!ENTITY subscription.update.label "フィルタを更新">
 <!ENTITY dialog.title "Adblock Plus フィルタ設定">
-<!ENTITY addFilter.label "フィルタを追加 (&amp;D)">
+<!ENTITY addFilter.label "フィルタを追加(&amp;D)">
 <!ENTITY subscription.minVersion.warning "購読しているフィルタはより新しいバージョンの Adblock Plus を要求しているので、最新の Adblock Plus に更新してください。">
 <!ENTITY subscription.lastDownload.invalidURL "更新失敗: アドレス無効">
 <!ENTITY backup.error "ファイル出力エラー。ファイル書き込み禁止／他のアプリケーションで使用中 となっていないか確認してください。">
 <!ENTITY filter.moveUp.label "上に移動">
-<!ENTITY addGroup.label "フィルタグループを追加 (&amp;G)">
+<!ENTITY addGroup.label "フィルタグループを追加(&amp;G)">
 <!ENTITY filter.edit.label "編集">
 <!ENTITY subscription.showHideFilters.label "フィルタを表示／非表示">
-<!ENTITY acceptableAds2.label "控えめな広告を許可 (&amp;I)">
+<!ENTITY acceptableAds2.label "控えめな広告を許可(&amp;I)">
 <!ENTITY addSubscriptionOther.label "別の購読するフィルタを追加">
 <!ENTITY close.label "閉じる">
-<!ENTITY sort.none.label "ソートしない (&amp;U)">
+<!ENTITY sort.none.label "ソートしない(&amp;U)">
 <!ENTITY filter.actions.label "フィルタアクション">
 <!ENTITY filter.copy.label "コピー">
 <!ENTITY filter.moveDown.label "下に移動">
 <!ENTITY filter.resetHitCounts.label "ヒット数をリセット">
 <!ENTITY readMore.label "詳細説明ページを開く">
 <!ENTITY subscription.moveUp.label "上に移動">
-<!ENTITY addSubscription.label "購読するフィルタを追加 (&amp;F)">
+<!ENTITY addSubscription.label "購読するフィルタを追加(&amp;F)">
 <!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 "検索 (&amp;N)">
+<!ENTITY find.label "検索(&amp;N)">
 <!ENTITY subscription.moveDown.label "下に移動">
 <!ENTITY subscription.lastDownload.connectionError "更新失敗: 接続エラー">
 <!ENTITY subscription.lastDownload.success "更新成功">
 <!ENTITY subscription.lastDownload.invalidData "更新失敗: フィルタリスト無効">
 <!ENTITY filter.paste.label "貼り付け">
 <!ENTITY subscription.disabledFilters.enable "無効になっているフィルタを有効化">
-<!ENTITY lasthit.column "最終ヒット日時 (&amp;L)">
+<!ENTITY lasthit.column "最終ヒット日時(&amp;L)">
 <!ENTITY subscription.editTitle.label "タイトルを編集">
 <!ENTITY subscription.disabledFilters.warning "購読しているフィルタの一部が無効化されています">
-<!ENTITY filter.column "フィルタ (&amp;F)">
+<!ENTITY filter.column "フィルタ(&amp;F)">
 <!ENTITY subscription.lastDownload.label "更新日時:">
 <!ENTITY viewList.label "フィルタファイルを開いて確認">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ja/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/ja/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/ja/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ja/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 firstRun_acceptableAdsExplanation=我々はウェブサイトが簡素で控えめな広告を使用するよう後押ししたいと考えています。そのため控えめな広告を区別するための<a>厳格なガイドライン</a>を策定し、デフォルトで許可するようにしました。すべての広告をブロックしたい場合は数秒で控えめな広告の許可を<a>無効にする</a>ことができます 。
 firstRun_toggle_on=ON
 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=プロジェクトを支援
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ja/global.properties adblock-plus-2.6+dfsg/chrome/locale/ja/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/ja/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ja/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=現在のページにブロック可能項目はありません
 action3_tooltip=クリックで Adblock Plus 有効／無効を切り替え
+notification_antiadblock_title=Adblock Plus ユーザー向けのメッセージを非表示にしますか？
 type_label_script=スクリプト
 filter_elemhide_nocriteria=要素を非表示にする条件が指定されていません
 blockingGroup_title=広告ブロックルール
@@ -24,6 +25,7 @@
 action2_tooltip=クリックで設定をオープン、中クリックで有効／無効を切り替え
 type_label_subdocument=フレーム
 clearStats_warning=全フィルタのヒット数をリセットし、ヒット数記録機能を無効化しますか？
+notification_antiadblock_message=このサイトは Adblock Plus ユーザーを対象としたメッセージを表示することで知られています。Adblock Plus でこれらのメッセージを非表示にしますか？
 blocked_count_addendum=(ホワイトリスト: ?1?／要素非表示: ?2?)
 subscription_invalid_location=購読するフィルタの URL が無効、もしくは不正なファイル名です。
 type_label_image=画像
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ja/meta.properties adblock-plus-2.6+dfsg/chrome/locale/ja/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/ja/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ja/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
-description.short=広告にイライラしたり、行動追跡に困ったり、バナー広告に悩まされていませんか？ インターネットでのユーザー主権を取り戻すために今すぐ Adblock Plus をインストールし、Web 参照方法を変えてしまおう。\n\n紹介ビデオはこちら http://www.youtube.com/watch?v=oNvb2SjVjjI
+description.short=迷惑な Youtube の動画広告、Facebook  の広告、バナー等をブロック。\n\nAdblock Plus はすべての迷惑な広告をブロックしつつ、デフォルトで「控えめな広告を許可」することで Web サイト側をも支援しています (後で設定変更可能) 。
 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 -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ja/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/ja/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/ja/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ja/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,28 +1,31 @@
-<!ENTITY sync.label "Adblock Plus 設定を同期 (Sync) (&amp;C)">
+<!ENTITY notification.button.yes "はい(&amp;Y)">
+<!ENTITY notification.button.no "いいえ(&amp;N)">
+<!ENTITY sync.label "Adblock Plus 設定を Sync で同期(&amp;C)">
 <!ENTITY whitelist.site.label "?1? で無効">
-<!ENTITY filters.label "フィルタ設定 (&amp;F)">
+<!ENTITY filters.label "フィルタ設定(&amp;F)">
 <!ENTITY disable.label "全ページで無効">
 <!ENTITY objecttab.title "ブロックする">
 <!ENTITY objecttab.tooltip "クリックしてオブジェクトをブロック (Adblock Plus)">
-<!ENTITY menuitem.label "Adblock Plus 設定 (&amp;B)">
-<!ENTITY objecttabs.label "Flash と Java でタブを表示 (&amp;T)">
-<!ENTITY sendReport.label "このページでの不具合を報告 (&amp;R)">
+<!ENTITY menuitem.label "Adblock Plus 設定(&amp;B)">
+<!ENTITY objecttabs.label "Flash と Java でタブを表示(&amp;T)">
+<!ENTITY sendReport.label "このページでの不具合を報告(&amp;R)">
 <!ENTITY whitelist.page.label "このページだけ無効">
 <!ENTITY context.image.label "Adblock Plus: 画像をブロック">
-<!ENTITY counthits.label "フィルタのヒット数を数える (&amp;H)">
-<!ENTITY opensidebar.label "ブロック可能項目一覧を開く (&amp;B)">
+<!ENTITY counthits.label "フィルタのヒット数を数える(&amp;H)">
+<!ENTITY opensidebar.label "ブロック可能項目一覧を開く(&amp;B)">
+<!ENTITY notification.button.close "閉じる(&amp;C)">
 <!ENTITY contribute.label "Adblock Plus に貢献する">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: フレームをブロック">
 <!ENTITY blocked.tooltip "このページでブロック中の項目:">
-<!ENTITY hideplaceholders.label "ブロックした場所に残る空きスペースを詰める (&amp;L)">
-<!ENTITY showinstatusbar.label "ステータスバーに表示 (&amp;S)">
+<!ENTITY hideplaceholders.label "ブロックした場所に残る空きスペースを詰める(&amp;L)">
+<!ENTITY showinstatusbar.label "ステータスバーに表示(&amp;S)">
 <!ENTITY sidebar.title "このページのブロック可能項目一覧">
-<!ENTITY options.label "オプション (&amp;O)">
+<!ENTITY options.label "オプション(&amp;O)">
 <!ENTITY context.object.label "Adblock Plus: オブジェクトをブロック">
 <!ENTITY context.removeWhitelist.label "Adblock Plus: このページで有効に戻す">
 <!ENTITY filters.tooltip "有効なフィルタ:">
-<!ENTITY closesidebar.label "ブロック可能項目一覧を閉じる (&amp;B)">
-<!ENTITY showintoolbar.label "ツールバーに表示 (&amp;B)">
+<!ENTITY closesidebar.label "ブロック可能項目一覧を閉じる(&amp;B)">
+<!ENTITY showintoolbar.label "ツールバーに表示(&amp;B)">
 <!ENTITY status.tooltip "ステータス:">
 <!ENTITY context.media.label "Adblock Plus: オーディオ／ビデオをブロック">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ja/sendReport.dtd adblock-plus-2.6+dfsg/chrome/locale/ja/sendReport.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/ja/sendReport.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ja/sendReport.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,58 +1,58 @@
-<!ENTITY screenshot.undo.label "元に戻す (&amp;U)">
+<!ENTITY screenshot.undo.label "元に戻す(&amp;U)">
 <!ENTITY issues.disabledgroups.description "購読している次のフィルタ／フィルタグループは無効になっていますが、このページに影響があったかもしれません:">
 <!ENTITY showData.label "不具合報告データを表示">
 <!ENTITY typeSelector.falsePositive.label "Adblock Plus のブロックが過剰 (&amp;M)">
 <!ENTITY issues.change.description "設定が変更されました。確認のためにページを再読み込みし、もし不具合が解決しなければ不具合報告を提出してください">
-<!ENTITY email.label "E&amp;mail:">
+<!ENTITY email.label "Email:(&amp;M)">
 <!ENTITY issues.openPreferences.label "フィルタ設定を開く">
 <!ENTITY sendPage.confirmation "あなたの不具合報告は保存されました。次のアドレスでアクセスできます:">
-<!ENTITY copyLink.label "不具合報告のリンクをコピーする (&amp;C)">
+<!ENTITY copyLink.label "不具合報告のリンクをコピー(&amp;C)">
 <!ENTITY issues.nofilters.description "Adblock Plus はこのページで何もブロックしていないので、お気付きの不具合は恐らく Adblock Plus とは関係ありません。">
 <!ENTITY sendPage.knownIssue "恐らく、あなたの報告した不具合は既知の問題です。詳細:">
 <!ENTITY typeSelector.other.description "フィルタではなく Adblock Plus 自体の不具合が疑われる場合はこの選択肢。">
 <!ENTITY issues.disabledgroups.enable.label "購読しているフィルタ／フィルタグループを有効化">
-<!ENTITY typeWarning.override.label "理解した上で、それでも不具合報告を提出したい (&amp;S)">
+<!ENTITY typeWarning.override.label "理解した上で、それでも不具合報告を提出したい(&amp;S)">
 <!ENTITY issues.disabled.enable.label "Adblock Plus を有効化">
 <!ENTITY update.fixed.description "報告しようとしていた不具合は、購読しているフィルタの更新で解決しそうです。ページを再読み込みして再確認してみてください。それでも解決しない場合は再度不具合を報告願います。">
-<!ENTITY anonymous.label "匿名で報告 (&amp;A)">
-<!ENTITY reloadButton.label "ページを再読み込み (&amp;R)">
-<!ENTITY recentReports.clear.label "すべての不具合報告を削除 (&amp;R)">
+<!ENTITY anonymous.label "匿名で報告(&amp;A)">
+<!ENTITY reloadButton.label "ページを再読み込み(&amp;R)">
+<!ENTITY recentReports.clear.label "すべての不具合報告を削除(&amp;R)">
 <!ENTITY typeSelector.description "このウィンドウで不具合の報告に必要なステップをご案内します。まず最初に、遭遇した不具合の種別を選択してください:">
-<!ENTITY screenshot.remove.label "機密情報等を黒塗りして隠す (&amp;R)">
+<!ENTITY screenshot.remove.label "機密情報等を黒塗りして隠す(&amp;R)">
 <!ENTITY issues.ownfilters.description "このページには自作フィルタが適用されています。それが不具合の原因となっている可能性があるので、まずそれらを無効にしてください:">
 <!ENTITY update.inProgress.description "不具合が解決したか確かめるため、Adblock Plus で購読しているフィルタを更新する必要があります。しばらくお待ちください...">
 <!ENTITY sendPage.retry.label "再送信">
-<!ENTITY data.label "不具合報告データ (&amp;P) :">
+<!ENTITY data.label "不具合報告データ:(&amp;P)">
 <!ENTITY recentReports.label "最近送信した不具合報告">
 <!ENTITY typeWarning.description "フィルタについてではなく Adblock Plus 全般の不具合を報告しようとしています。このような不具合は通常 [link]Adblock Plus フォーラム[/link] で報告されています。また、不具合報告へのリンクを自ら提供しない限りフォーラムの誰もあなたの不具合報告の存在に気付けないので、既存の議論を補完するためだけに使用してください。不具合報告へのリンクはレポート送信後に提供されます。">
 <!ENTITY issues.disabled.description "Adblock Plus が無効なので、何もブロックされていません">
-<!ENTITY attachExtensions.label "アドオンの競合が不具合の原因である場合があるので、動作しているアドオンのリストを不具合報告に添付する (&amp;X)">
+<!ENTITY attachExtensions.label "アドオンの競合が不具合の原因である場合があるので、動作しているアドオンのリストを不具合報告に添付する(&amp;X)">
 <!ENTITY issues.nosubscriptions.add.label "購読するフィルタを追加">
 <!ENTITY issues.disabledfilters.enable.label "フィルタを有効化">
-<!ENTITY issues.override.label "設定に間違いはなかったので報告を続けます (&amp;C)">
+<!ENTITY issues.override.label "設定に間違いはなかったので報告を続けます(&amp;C)">
 <!ENTITY issues.nosubscriptions.description "ウェブサイトの不要なコンテンツを自動削除する、既存のフィルタをまだ購読していないようです。">
 <!ENTITY typeSelector.falsePositive.description "あるべきコンテンツがない、表示がおかしい、フィルタが適切に機能してない場合はこの選択肢。 (ヒント: Adblock Plus を一時的に無効にすれば、原因に Adblock Plus が関わっているか確認できます)">
-<!ENTITY typeSelector.other.label "その他の不具合 (&amp;T)">
+<!ENTITY typeSelector.other.label "その他の不具合(&amp;T)">
 <!ENTITY emailComment.label "報告に不明な点があった際に連絡が取れるよう、メールアドレスの入力をお勧めしています。このメールアドレスにより、報告の受信者が報告者別にこれまでの貢献を考慮し、優先度を調整できるようになります。">
 <!ENTITY issues.whitelist.remove.label "このページで Adblock Plus を再度有効にする">
 <!ENTITY outdatedSubscriptions.description "購読している次のフィルタは２週間以上更新されていません。既に不具合は解決済みかもしれないので、先に手動更新してから不具合を報告してください。">
 <!ENTITY dataCollector.description "Adblock Plus が必要なデータを集めています。しばらくお待ちください。">
-<!ENTITY sendButton.label "不具合報告を送信 (&amp;N)">
-<!ENTITY comment.label "コメント (任意入力項目。他の人が読んで理解できるよう記述してください) (&amp;C) :">
+<!ENTITY sendButton.label "不具合報告を送信(&amp;N)">
+<!ENTITY comment.label "コメント(任意入力):(&amp;C)">
 <!ENTITY sendPage.errorMessage "不具合報告の送信がエラーコード &quot;?1?&quot; で失敗しました。インターネットに接続されているか確認し再試行してください。問題が解決しない場合は [link]Adblock Plus フォーラム[/link] で助けを求めてください。">
 <!ENTITY showRecentReports.label "最近送信した不具合報告を表示">
 <!ENTITY commentPage.heading "コメントを入力">
 <!ENTITY update.start.label "今すぐ更新">
 <!ENTITY issues.disabledfilters.description "次のフィルタは無効になっていますが、このページに影響があったかもしれません:">
 <!ENTITY screenshot.description "同じページでも別の人には異なって表示されることがあるので、スクリーンショット添付は不具合を理解する助けとなります。ボタンをクリックしてからスクリーンショット上でドラッグすることで、不具合箇所に印をつけたり個人情報を隠すことができます。">
-<!ENTITY screenshot.attach.label "不具合報告にスクリーンショットを添付 (&amp;T)">
+<!ENTITY screenshot.attach.label "不具合報告にスクリーンショットを添付(&amp;T)">
 <!ENTITY issues.whitelist.description "報告しようとしているページで Adblock Plus が無効になっています。調査の妨げになるので Adblock Plus を有効に戻し、再読み込みしてから不具合報告を作成してください。">
-<!ENTITY typeSelector.falseNegative.label "Adblock Plus が広告をブロックしていない (&amp;V)">
+<!ENTITY typeSelector.falseNegative.label "Adblock Plus が広告をブロックしていない(&amp;V)">
 <!ENTITY typeSelector.heading "不具合種別を選択">
 <!ENTITY anonymity.warning "匿名で報告の際は報告者を個別に識別できないので優先度が下がります。">
 <!ENTITY wizard.title "不具合報告">
 <!ENTITY issues.ownfilters.disable.label "フィルタを無効化">
-<!ENTITY commentPage.description "このコメント欄を活用することで、不具合の理解が早まります。任意入力項目ですが、問題をはっきりさせるため積極的に利用してください。（コメントに含める情報の例：１．症状、２．期待していた動作との違い、３．画面上の場所、４．再現手順、５．再現条件、６．関係するフィルタ、７．不具合報告の匿名化された URL で問題を再現できない場合にプライバシー問題が発生しない範囲でのサンプル URL、８．自分で試行錯誤してみたこと等々）。不具合報告データは送信前に再検討できます。">
+<!ENTITY commentPage.description "コメントがあると不具合を理解するのに助かります（症状、再現手順、原因を特定した根拠、不具合発生開始時期、正常動作との違い、不具合発生場所）。報告するデータは送信前に再検討できます。">
 <!ENTITY comment.lengthWarning "コメントが 1000 文字を超えているので、先頭から 1000 文字だけ送信します">
 <!ENTITY typeSelector.falseNegative.description "Adblock Plus が有効でも広告が表示される場合はこの選択肢。">
 <!ENTITY sendPage.waitMessage "Adblock Plus が不具合報告を送信する間、しばらくお待ちください">
@@ -60,6 +60,6 @@
 <!ENTITY screenshot.heading "スクリーンショットを添付">
 <!ENTITY sendPage.heading "不具合報告を送信">
 <!ENTITY issues.subscriptionCount.description "購読しているフィルタが多過ぎです。このような設定は問題解決を難しくするので推奨されません。また、どのフィルタ作者がこの不具合に対処すべきか不明なのでレポートを受理できません。本当に必要なフィルタ以外を削除し、不具合が再現するか確認願います。">
-<!ENTITY screenshot.mark.label "不具合箇所に印をつける (&amp;M)">
-<!ENTITY privacyPolicy.label "プライバシー ポリシー">
+<!ENTITY screenshot.mark.label "不具合箇所に印をつける(&amp;M)">
+<!ENTITY privacyPolicy.label "プライバシー・ポリシー">
 <!ENTITY issues.description "Adblock Plus はこの不具合に関係、もしくは調査を困難にしている設定を発見しました。">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ja/sidebar.dtd adblock-plus-2.6+dfsg/chrome/locale/ja/sidebar.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/ja/sidebar.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ja/sidebar.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -7,7 +7,7 @@
 <!ENTITY filter.label "フィルタ">
 <!ENTITY tooltip.size.label "サイズ:">
 <!ENTITY reattach.label "ウィンドウ内表示">
-<!ENTITY search.label "検索 (&amp;S) :">
+<!ENTITY search.label "検索:(&amp;S)">
 <!ENTITY docDomain.thirdParty "(サードパーティ)">
 <!ENTITY filterSource.label "フィルタ帰属">
 <!ENTITY tooltip.docDomain.label "ドキュメント帰属:">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ja/subscriptionSelection.dtd adblock-plus-2.6+dfsg/chrome/locale/ja/subscriptionSelection.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/ja/subscriptionSelection.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ja/subscriptionSelection.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,12 +1,12 @@
-<!ENTITY addMain.label "&quot;?1?&quot; も追加する (&amp;S)">
+<!ENTITY addMain.label "&quot;?1?&quot; も追加する(&amp;S)">
 <!ENTITY list.download.failed "Adblock Plus は購読用フィルタ一覧の取得に失敗しました。">
 <!ENTITY list.download.retry "再試行">
-<!ENTITY title.label "購読するフィルタの名称 (&amp;T) :">
+<!ENTITY title.label "購読するフィルタの名称:(&amp;T)">
 <!ENTITY list.download.website "ウェブサイトを参照">
 <!ENTITY supplementMessage "このフィルタは &quot;?1?&quot; と併用することが前提になっています。">
 <!ENTITY viewList.label "フィルタファイルを開いて確認">
 <!ENTITY visitHomepage.label "作者のページを開く">
 <!ENTITY addSubscription.label "購読するフィルタを追加">
 <!ENTITY dialog.title "購読する Adblock Plus 用フィルタを追加">
-<!ENTITY location.label "購読するフィルタの場所 (&amp;L) :">
+<!ENTITY location.label "購読するフィルタの場所:(&amp;L)">
 <!ENTITY fromWeb.description "購読するフィルタを確認してください。追加前に名称と場所を変更できます。">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/kk/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/kk/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/kk/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/kk/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 firstRun_acceptableAdsExplanation=Біз вебсайттарды тура, мазаңызды алмайтын жарнаманы қолдануын қалаймыз. Сондықтан біз жарамды жарнаманы анықтаудың <a>қатаң нұсқаулығын</a> орнаттық, ол жарнамма бастапқы баптаулармен көрсетілетін болады. Егер сіз сонда да барлық жарнаманы <a>блоктағыңыз</a> келсе, осыны тез арада сөндіре аласыз.
 firstRun_toggle_on=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=Жобамызды қолдаңыз
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/kk/global.properties adblock-plus-2.6+dfsg/chrome/locale/kk/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/kk/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/kk/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Ағымдағы парақта блоктауға болатын құрама жоқ
 action3_tooltip=Adblock Plus қосу/сөндіру үшін шертіңіз.
+notification_antiadblock_title=Мақсатталған хабарламаларды жасыру керек пе?
 type_label_script=Скрипт
 filter_elemhide_nocriteria=Элементті жасыру үшін бірде-бір шарт анықталмады
 blockingGroup_title=Жарнаманы блоктау ережелері
@@ -24,6 +25,7 @@
 action2_tooltip=Баптауларды ашу үшін шертіңіз, тышқанның орта батырмасы - қосу/сөндіру үшін.
 type_label_subdocument=Фрейм
 clearStats_warning=Бұл әрекет барлық фильтрлерді хит статистикасын тастап, фильтр хиттерін санауды сөндіреді. Жалғастыруды қалайсыз ба?
+notification_antiadblock_message=Бұл сайт Adblock Plus пайдаланушыларына мақсатталған хабарламаларды көрсететіні белгілі. Adblock Plus мақсатталған хабарламаларды жасыруы керек пе?
 blocked_count_addendum=(сүзгіден тыс: ?1?, жасырын: ?2?)
 subscription_invalid_location=Енгізілген адрес не интернет адресі, не файл мекен-жайы ретінде анықталмады.
 type_label_image=Сурет
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/kk/meta.properties adblock-plus-2.6+dfsg/chrome/locale/kk/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/kk/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/kk/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,4 +1,4 @@
-description.short=Жарнамадан шаршадыңыз ба? Баннерлер мазаңызды алды ма? Интернетпен жұмысыңызды икемді қылу үшін Adblock Plus қазір орнатыңыз.\n\nҚысқа видеосы осында бар: http://www.youtube.com/watch?v=oNvb2SjVjjI
+description.short=Мазаңызды алатын YouTube, Facebook жарнамаларын, баннерлерді және т.б. блоктайды.\n\nAdblock Plus мазаңызды алатын барлық жарнаманы блоктайды, және зиянкес емес жарнаманы блоктамау арқылы сайттарға қолдау көрсетеді (бапталады).
 name=Adblock Plus
 description.long.addition1=Adblock Plus 2.0 нұсқасынан бастап кейбір зиянкес емес жарнаманы іске қосу мүмкіндігі пайда болды. Мақсаты - зиянды емес жарнаманы қолданатын веб сайттарды қолдау және басқа веб сайттарға үлгі қылу. <a href="http://adblockplus.org/en/acceptable-ads">Көбірек білу</a>
 translator=Бауржан Муфтахидинов
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/kk/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/kk/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/kk/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/kk/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Иә">
+<!ENTITY notification.button.no "&amp;Жоқ">
 <!ENTITY sync.label "Adblock Plus баптауларын Sync і&amp;шіне қосу">
 <!ENTITY whitelist.site.label "Келесі үшін сөндіру: ?1?">
 <!ENTITY filters.label "Фильт&amp;р баптаулары">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Plus: Суретті блоктау">
 <!ENTITY counthits.label "Ф&amp;ильтрлер хиттерін санау">
 <!ENTITY opensidebar.label "Блокталған құраманы аш&amp;у">
+<!ENTITY notification.button.close "Ж&amp;абу">
 <!ENTITY contribute.label "Adblock Plus-қа үлес қосу">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Фреймді блоктау">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ko/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/ko/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/ko/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ko/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,7 +6,6 @@
 firstRun_acceptableAdsExplanation=우리는 비침입적이며 이용자 친화적인 광고 방식을 채택한 웹사이트를 격려하고자 합니다. 특정 광고를 허용하기 위한 <a>광고 허용 지침</a>을 수립하였으며, 기본 설정으로 그러한 광고는 화면에 표시됩니다. 모든 광고를 차단하려면 이 기능의 <a>사용을 중지</a>할 수 있습니다.
 firstRun_toggle_on=켜기
 firstRun_contributor_credits=공헌자 명단
-firstRun_feature_show_overview=개요 보기
 firstRun_dataCorruptionWarning=이 페이지를 계속해서 보시겠습니까? <a>여기 클릭!</a>
 firstRun_acceptableAdsHeadline=인터넷 이용을 방해하거나 불법·유해한 광고는 이제 차단될 것입니다
 firstRun_share=홍보
@@ -17,4 +16,4 @@
 firstRun_donate=기부
 firstRun_donate_label=프로젝트 지원
 firstRun_feature_social=사회관계망 서비스 버튼 제거
-firstRun_feature_show_expanded=기능 활성화
+firstRun_legacySafariWarning=애드블록 플러스에서 지원하지 않는 구버전 사파리를 사용하고 있습니다. 그래서 일부 사이트에서 정상적인 작동을 하지 않거나 사용자 경험에 손상을 줄 수 있습니다. 사파리 6.6.1 이상(OS X 10.8 Mountain Lion), 또는 사파리 7.0.1 이상(OS X 10.9 Mavericks) 또는 모질라 파이어폭, 구글 크롬, 오페라의 최신 버전을 사용할 것을 권장합니다.
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ko/global.properties adblock-plus-2.6+dfsg/chrome/locale/ko/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/ko/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ko/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=현재 페이지에 차단 가능한 항목이 없습니다.
 action3_tooltip=애드블록 플러스 사용/중지
+notification_antiadblock_title=표적 메시지를 숨기겠습니까?
 type_label_script=스크립트
 filter_elemhide_nocriteria=숨기려는 요소를 인식하기 위한 기준이 지정되지 않았습니다.
 blockingGroup_title=요청 차단 필터
@@ -24,6 +25,7 @@
 action2_tooltip=마우스 가운데 버튼 - 애드블록 플러스 사용/중지
 type_label_subdocument=프레임
 clearStats_warning=모든 필터 적용 횟수가 초기화되고, 이 통계 기능을 사용하지 않습니다. 진행하시겠습니까?
+notification_antiadblock_message=이 사이트는 애드블록 플러스 사용자에게 표적 메시지를 보여주는 것으로 알려져 있습니다. 애드블록 플러스로 표적 메시지를 숨기겠습니까?
 blocked_count_addendum=(허용 : ?1?개, 요소 숨김 : ?2?개)
 subscription_invalid_location=구독 필터의 위치에 입력하는 URL 또는 파일명이 올바르지 않습니다.
 type_label_image=이미지
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ko/meta.properties adblock-plus-2.6+dfsg/chrome/locale/ko/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/ko/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ko/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,4 +1,4 @@
-description.short=성가신 배너나 짜증나는 광고가 있습니까? 인터넷 상의 개인 정보 누출을 걱정하고 있습니까? 이용자 통제력을 갖게 하고, 웹 문서의 보는 방식을 변경하기 위해 애드블록 플러스를 설치하십시오.\n\n소개 영상 : http://www.youtube.com/watch?v=oNvb2SjVjjI
+description.short=성가신 유튜브 비디오 광고, 페이스북 광고, 각종 배너와 그 이상의 것들을 차단합니다.\n\n애드블록 플러스는 인터넷 이용을 방해하거나 불법·유해한 광고를 차단하고, 비침입성 광고를 허용함으로써 양질의 콘텐츠를 제공하는 웹사이트를 지원합니다.
 name=Adblock Plus
 description.long.addition1=애드블록 플러스 2.0 버전부터 필터 설정에는 일부 비침입형 광고를 허용하기 위한 옵션이 추가되었습니다. 그 옵션의 목적은 비침입형 광고 방식을 적용한 웹 사이트를 지원하고, 보다 많은 웹 사이트가 그러한 바람직한 광고 방식을 적용하도록 장려하는 것입니다. <a href="http://adblockplus.org/en/acceptable-ads">자세히 보기</a>
 translator=Maybee
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ko/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/ko/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/ko/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ko/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;예">
+<!ENTITY notification.button.no "&amp;아니요">
 <!ENTITY sync.label "애드블록 플러스 설정 동기화 (&amp;c)">
 <!ENTITY whitelist.site.label "사이트 허용 : ?1?">
 <!ENTITY filters.label "필터 설정 (&amp;F)">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "애드블록 플러스 : 이미지 차단">
 <!ENTITY counthits.label "필터 적용 횟수 기록 (&amp;h)">
 <!ENTITY opensidebar.label "차단 가능 목록 (&amp;B)">
+<!ENTITY notification.button.close "&amp;닫기">
 <!ENTITY contribute.label "애드블록 플러스에 공헌하기">
 <!ENTITY toolbarbutton.label "애드블록 플러스">
 <!ENTITY context.frame.label "애드블록 플러스 : 프레임 차단">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/lt/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/lt/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/lt/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/lt/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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_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ą
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/lt/global.properties adblock-plus-2.6+dfsg/chrome/locale/lt/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/lt/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/lt/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Šiame puslapyje nėra jokių blokuojamų elementų
 action3_tooltip=Spragtelėkite, norėdami įjungti/išjungti „Adblock Plus“.
+notification_antiadblock_title=paslėpti tikslinius pranešimus?
 type_label_script=scenarijus
 filter_elemhide_nocriteria=Nėra kriterijaus pagal kurį galima būtų nuspręsti kurį elementą paslėpti
 blockingGroup_title=Reklamų blokavimo taisyklės
@@ -24,6 +25,7 @@
 action2_tooltip=Spragtelėkite, norėdami atverti nustatymus; spragtelėkite viduriniuoju klavišu norėdami įjungti/išjungti.
 type_label_subdocument=kadras
 clearStats_warning=Bus atstatyta visų filtrų blokavimų statistika ir išjungtas blokavimų skaičiavimas. Ar norite tęsti?
+notification_antiadblock_message=Ši svetainė buvo žinoma, kad parodyti tikslines pranešimus Adblock Plus vartotojams. Ar norite Adblock Plus paslėpti tikslinių pranešimus?
 blocked_count_addendum=(baltajame sąraše: ?1?, paslėpta: ?2?)
 subscription_invalid_location=Filtrų sąrašo adresas nėra taisyklingas URL ar failo vardas.
 type_label_image=paveikslėlis
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/lt/meta.properties adblock-plus-2.6+dfsg/chrome/locale/lt/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/lt/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/lt/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,4 +1,4 @@
-description.short=Trukdo reklamos? Bėdos dėl persekiojimo? Atsibodo baneriai? Įdiekite Adblock PLus ir atgaukite interneto išvaizdos kontrolę.\nTrumpa video apžvalga http://www.youtube.com/watch?v=oNvb2SjVjjI
+description.short=Blokuoja erzinančias video reklamas YouTube ir Facebook svetainėse, bei daug daugiau.\n\nAdblock Plus blokuoja visas erzinančias reklamas ir palaiko svetaines kurios reklamuojasi neagresyviai(konfigūruojama).
 name=Adblock Plus
 description.long.addition1=Pradedant Adblock Plus 2.0 filtrų nustatymuose yra parinktis suteikianti galimybę leisti neįkyrias reklamas. Tikslas yra palaikyti svetaines naudojančias neįkyrias reklamas ir paskatinti kitas svetaines naudoti tokias pat. <a href="http://adblockplus.org/en/acceptable-ads">Plačiau</a>
 translator=Jonas Slivka, Algimantas Margevičius
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/lt/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/lt/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/lt/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/lt/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Taip">
+<!ENTITY notification.button.no "&amp;Ne">
 <!ENTITY sync.label "Adblo&amp;ck Plus Sync nustatymai">
 <!ENTITY whitelist.site.label "Išjungti ?1?">
 <!ENTITY filters.label "&amp;Filtrų nustatymai">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "„Adblock Plus“: Blokuoti paveikslėlį">
 <!ENTITY counthits.label "Sus&amp;kaičiuoti filtro blokavimus">
 <!ENTITY opensidebar.label "Atverti &amp;blokuojamus elementus">
+<!ENTITY notification.button.close "&amp;Uždaryti">
 <!ENTITY contribute.label "Prisidėti prie Adblock Plus">
 <!ENTITY toolbarbutton.label "„Adblock Plus“">
 <!ENTITY context.frame.label "„Adblock Plus“: Blokuoti kadrą">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/lv/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/lv/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/lv/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/lv/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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_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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/mk/composer.dtd adblock-plus-2.6+dfsg/chrome/locale/mk/composer.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/mk/composer.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/mk/composer.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,12 +1,12 @@
 <!ENTITY anchor.end.label "&amp;на крајот од адресата">
-<!ENTITY domainRestriction.label "Попречи &amp;до домен:">
+<!ENTITY domainRestriction.label "Забрани &amp;до домен:">
 <!ENTITY collapse.default.no.label "Користи стандардно (не)">
 <!ENTITY firstParty.label "Само од п&amp;рва партија">
 <!ENTITY preferences.label "Прикажи по&amp;стоечки филтери...">
 <!ENTITY pattern.label "Барај шема">
 <!ENTITY thirdParty.label "Само од &amp;трета партија">
 <!ENTITY filter.label "Нов &amp;филтер:">
-<!ENTITY collapse.label "Намали блокирано: (&amp;|)">
+<!ENTITY collapse.label "Скриј блокирано: (&amp;|)">
 <!ENTITY match.warning "Шемата која ја внесивте повеќе не се совпаѓа со адресата што ја одбравте и повеќе нема да функционира.">
 <!ENTITY anchor.start.label "на почетокот на адреса (&amp;г)">
 <!ENTITY matchCase.label "Совпадни со букви (&amp;М)">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/mk/filters.dtd adblock-plus-2.6+dfsg/chrome/locale/mk/filters.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/mk/filters.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/mk/filters.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,12 +1,72 @@
-<!ENTITY addSubscriptionOther.label "Додади друга претплата">
+<!ENTITY restore.custom.warning "Сите ваши сопствени филтери ќе бидат заменети со содржината на одбраната датотека. Дали сакате да продолжите?">
+<!ENTITY slow.column "Спори филтери">
+<!ENTITY enabled.column "Вклучено">
+<!ENTITY subscription.lastDownload.checksumMismatch "Неуспешно, кодовите за проверка не се совпаѓаат">
+<!ENTITY noFiltersInGroup.text "Одбраната група е празна.">
+<!ENTITY subscription.actions.label "Дејства">
+<!ENTITY filter.selectAll.label "Одбери сите">
+<!ENTITY backupButton.label "Резервна копија">
+<!ENTITY restore.minVersion.warning "Внимание: датотеката е од понова верзија на апликацијата. Надградете ја сегашната верзија пред да ја вратите копијата.">
+<!ENTITY restore.error "Не можеше да се одреди содржината на фајлот, можеби не е резервна копија?">
+<!ENTITY sort.ascending.label "Абецеден ред">
+<!ENTITY sort.label "Сортирај по">
 <!ENTITY subscription.source.label "Листа на филтери">
+<!ENTITY hitcount.column "Погодоци">
+<!ENTITY noFilters.text "Сеуште немате свои филтери.">
+<!ENTITY backup.custom.title "Прикажи само свои филтери">
+<!ENTITY subscription.external.label "Ажурирано од друга екстензија">
+<!ENTITY subscription.delete.label "Избриши">
+<!ENTITY noGroupSelected.text "Морате да изберете група на филтери за да се покажат нејзините филтери.">
+<!ENTITY filter.cut.label "Сечи">
+<!ENTITY restore.default.label "Врати резервна копија направена на ?1?">
+<!ENTITY subscription.lastDownload.inProgress "Се презема…">
+<!ENTITY subscriptions.tab.label "Филтерски претплати">
+<!ENTITY sort.descending.label "Обратен абецеден ред">
+<!ENTITY filters.remove.warning "Дали сакате да ги избришите одбраните филтери?">
+<!ENTITY filter.delete.label "Избриши">
 <!ENTITY addSubscriptionAdd.label "Додади">
+<!ENTITY viewMenu.label "Види">
+<!ENTITY subscription.lastDownload.unknown "Ништо">
 <!ENTITY addSubscriptionCancel.label "Откажи">
 <!ENTITY subscription.enabled.label "Вклучено">
-<!ENTITY subscription.homepage.label "Почетна Страница">
 <!ENTITY noSubscriptions.text "Немате додадено филтери. AdBlock неможе да блокира реклами без филтери, ве молиме притиснете “Додади Филтери“ да додадете филтери.">
-<!ENTITY subscription.external.label "Ажурирано од друга екстензија">
-<!ENTITY addSubscription.label "Додади претплата на филтер">
+<!ENTITY subscription.update.label "Надгради филтери">
 <!ENTITY dialog.title "Филтерски Подесувања">
+<!ENTITY addFilter.label "Додај филтер">
+<!ENTITY subscription.minVersion.warning "За овој филтер е потребна понова верзија на AdBlock Plus. Треба да го надградите софтверот на најновата верзија.">
+<!ENTITY subscription.lastDownload.invalidURL "Неуспешно, адресата не е валидна">
+<!ENTITY backup.error "Имаше грешка кога се запишуваа филтрите. Осигурајте се дека датотеката не е во употреба од друга апликација.">
+<!ENTITY filter.moveUp.label "Помести нагоре">
+<!ENTITY addGroup.label "Додај група на филтери">
+<!ENTITY filter.edit.label "Промени">
+<!ENTITY subscription.showHideFilters.label "Покажи/скриј ги филтерите">
+<!ENTITY acceptableAds2.label "Дозволи неинтрузивни (несметачки) реклами">
+<!ENTITY addSubscriptionOther.label "Додади друга претплата">
+<!ENTITY close.label "Затвори">
+<!ENTITY sort.none.label "Несортирано">
+<!ENTITY filter.actions.label "Филтрирај дејства">
+<!ENTITY filter.copy.label "Копирај">
+<!ENTITY filter.moveDown.label "Помести надолу">
+<!ENTITY filter.resetHitCounts.label "Ресетирај статистики">
+<!ENTITY readMore.label "Прочитај повеќе">
+<!ENTITY subscription.moveUp.label "Оди нагоре">
+<!ENTITY addSubscription.label "Додади претплата на филтер">
+<!ENTITY subscription.homepage.label "Почетна Страница">
+<!ENTITY backup.complete.title "Сите филтри и претплати">
+<!ENTITY restore.own.label "Врати своја резервна копија">
+<!ENTITY restore.complete.warning "Сите филтерски нагодувања ќе се заменат со оние од копијата. Дали сакате да продолжите?">
 <!ENTITY filters.tab.label "Твои филтери">
-<!ENTITY subscriptions.tab.label "Филтерски претплати">
+<!ENTITY backup.label "Направи нова резервна копија">
+<!ENTITY find.label "Пронајди">
+<!ENTITY subscription.moveDown.label "Оди надолу">
+<!ENTITY subscription.lastDownload.connectionError "Неуспешно преземање">
+<!ENTITY subscription.lastDownload.success "Успешно">
+<!ENTITY subscription.lastDownload.invalidData "Неуспешно, не е валидна листа на филтери">
+<!ENTITY filter.paste.label "Залепи">
+<!ENTITY subscription.disabledFilters.enable "Вклучи изклучени филтери">
+<!ENTITY lasthit.column "Последен погодок">
+<!ENTITY subscription.editTitle.label "Модифицирај наслов">
+<!ENTITY subscription.disabledFilters.warning "Некои филтери во оваа претплата се исклучени.">
+<!ENTITY filter.column "Филтрирај правило">
+<!ENTITY subscription.lastDownload.label "Последно преземање:">
+<!ENTITY viewList.label "Покажи листа">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/mk/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/mk/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/mk/firstRun.properties	1970-01-01 00:00:00.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/mk/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -0,0 +1,4 @@
+firstRun_acceptableAdsHeadline=Досадните реклами отсега ќе бидат блокирани
+firstRun_dataCorruptionWarning=Дали оваа страна постојано се појавува? <a>Притиснете овде!</a>
+firstRun_title=AdBlock Plus е успешно инсталиран
+firstRun_acceptableAdsExplanation=Би сакале да ги поттикниме веб-страните да користат помалку збунувачки и помалку интрузивни реклами. Затоа направивме <a>збир строги правила</a> за да препознаеме прифатливи реклами, кои се прикажани по прв пат. Ќе можете да го <a>исклучите</a> тоа за неколку секунди.
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ml/composer.dtd adblock-plus-2.6+dfsg/chrome/locale/ml/composer.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/ml/composer.dtd	1970-01-01 00:00:00.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ml/composer.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -0,0 +1,4 @@
+<!ENTITY dialog.title "ആഡ് ആട്ബ്ലോക്ക്‌ പ്ലസ്‌ ഫിൽറ്റർ റൂൾ">
+<!ENTITY collapse.yes.label "ഉവ്">
+<!ENTITY accept.label "ആഡ് ഫിൽറ്റർ">
+<!ENTITY collapse.no.label "ഇല്ല">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ms/composer.dtd adblock-plus-2.6+dfsg/chrome/locale/ms/composer.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/ms/composer.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ms/composer.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -7,7 +7,7 @@
 <!ENTITY thirdParty.label "Pihak keti&amp;ga sahaja">
 <!ENTITY filter.label "Penapis &amp;baru:">
 <!ENTITY collapse.label "&amp;Jatuhkan yang disekat:">
-<!ENTITY match.warning "Pola yang anda masukkan tidak lagi memadani alamat yang ditapis/dikecualikan dan tidak akan berkesan padanya.">
+<!ENTITY match.warning "Pola yang anda masukkan tidak lagi memadani alamat yang akan disekat/dikecualikan dan tidak akan berkesan kepadanya.">
 <!ENTITY anchor.start.label "pada per&amp;mulaan alamat">
 <!ENTITY matchCase.label "&amp;Kes sepadan">
 <!ENTITY custom.pattern.label "&amp;Ubah suai:">
@@ -18,11 +18,11 @@
 <!ENTITY basic.label "Paparan biasa">
 <!ENTITY type.filter.label "&amp;Penapis penyekat">
 <!ENTITY types.label "Gunakan pada jenis:">
-<!ENTITY shortpattern.warning "Pola yang anda masukkan terlalu pendek untuk dioptimumkan dan kemungkinan boleh melambatkan penjelajahan web. Anda digalakkan memilih masukan yang lebih panjang untuk penapis ini.">
+<!ENTITY shortpattern.warning "Pola yang anda masukkan terlalu pendek untuk dioptimumkan dan kemungkinan boleh melambatkan penjelajahan web. Anda digalakkan memilih masukan yang lebih panjang untuk penapis ini supaya Adbolck Plus dapat memproses penapis ini dengan lebih berkesan.">
 <!ENTITY collapse.yes.label "Ya">
 <!ENTITY anchors.label "Terima pola sahaja:">
 <!ENTITY collapse.default.yes.label "Gunakan default (ya)">
-<!ENTITY domainRestriction.help "Gunakan pilihan ini untuk tentukan satu atau lebih domain secara berasingan dengan simbol &quot;|&quot;. Penapis hanya akan digunakan pada domain tersebut sahaja. Simbol &quot;~&quot; sebelum domain bermaksud penapis tidak akan digunakan pada domain tersebut.">
+<!ENTITY domainRestriction.help "Gunakan pilihan ini untuk tentukan satu atau lebih domain secara berasingan dengan simbol &quot;|&quot;. Penapis hanya akan digunakan pada domain terpilih sahaja. Simbol &quot;~&quot; sebelum domain bermaksud penapis tidak akan digunakan pada domain tersebut.">
 <!ENTITY accept.label "Tambah penapis">
 <!ENTITY options.label "Pilihan">
 <!ENTITY disabled.warning "Adblock Plus telah dinyahaktifkan. Anda masih boleh menambah penapis tetapi ia tidak akan aktif sehingga anda [link]aktifkan Adblock Plus[/link].">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ms/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/ms/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/ms/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ms/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,7 +6,6 @@
 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
@@ -17,4 +16,4 @@
 firstRun_donate=mendermakan
 firstRun_donate_label=Menyokong projek kami
 firstRun_feature_social=Mengalih keluar butang Media sosial
-firstRun_feature_show_expanded=Aktifkan ciri-ciri
+firstRun_legacySafariWarning=Anda menggunakan versi lama Safari yang tidak disokong oleh Adblock Plus. Ia mungkin tidak berfungsi dengan betul atau menjejaskan pengalaman pengguna di sesetengah tapak web. Kami amat mengesyorkan sama ada mengemaskini Safari 6 atau lebih tinggi (yang tersedia untuk Mac OS X 10.8 Mountain Lion) dan lebih tinggi(OS X 10.9 Mavericks), atau untuk menggunakan versi terkini pelayar Mozilla Firefox, Google Chrome atau Opera.
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ms/global.properties adblock-plus-2.6+dfsg/chrome/locale/ms/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/ms/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ms/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Tiada item yang boleh disekat pada laman semasa
 action3_tooltip=Klik untuk aktifkan/nyahaktifkan Adblock Plus.
+notification_antiadblock_title=Sembunyi Mesej-mesej yang disasarkan?
 type_label_script=skrip
 filter_elemhide_nocriteria=Tiada kriteria yang dinyatakan untuk mengenal pasti elemen untuk disembunyikan
 blockingGroup_title=Peraturan Penapisan Iklan
@@ -24,6 +25,7 @@
 action2_tooltip=Klik untuk buka tatarajah, klik tengah untuk aktifkan/nyahaktifkan.
 type_label_subdocument=bingkai
 clearStats_warning=Ini akan mengreset semua statistik dan menyahaktifkan kiraan penapis. Teruskan?
+notification_antiadblock_message=Laman web ini telah dikenali untuk menunjukkan mesej yang disasarkan kepada pengguna Adblock Plus. Adakah anda mahu Adblock Plus untuk menyembunyikan mesej yang disasarkan?
 blocked_count_addendum=(juga dikecualikan: ?1?, disembunyikan: ?2?
 subscription_invalid_location=Lokasi senarai penapis sama ada URL atau nama fail adalah tidak sah.
 type_label_image=imej
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ms/meta.properties adblock-plus-2.6+dfsg/chrome/locale/ms/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/ms/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ms/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,5 @@
 description.short=Menyampah dengan iklan? Risau mengenai tracking? Diganggu sepanduk? Pasanglah Adblock Plus untuk mendapatkan kembali kawalan ke atas internet and ubah cara anda melihat laman web.
-name=Penghalang Iklan Tambahan
+name=Adblock Plus
 description.long.addition1=Bermula dengan Adblock Plus 2.0 terdapat pilihan dalam Tatarajah Penapis untuk membenarkan sesetengah iklan. Matlamatnya adalah untuk menyokong laman web yang menggunakan iklan yang tidak menganggu dan untuk menggalakkan lebih banyak laman web untuk berbuat demikian.
 translator=temperror
 description.long=Adblock Plus membolehkan anda mendapatkan kembali kawalan ke atas internet dan cara anda melihat laman web. Add-on ini disokong oleh lebih empat puluh langganan dalam berbagai bahasa yang dapat menyediakannya untuk tujuan dari membuang iklan online hinggalah menyekat domain malware.
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ms/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/ms/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/ms/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ms/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Ya">
+<!ENTITY notification.button.no "&amp;Tiada">
 <!ENTITY sync.label "Syn&amp;c tatacara Adblock Plus">
 <!ENTITY whitelist.site.label "Nyahaktifkan pada ?1?">
 <!ENTITY filters.label "&amp;Tatarajah penapis">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Plus: Sekat imej">
 <!ENTITY counthits.label "&amp;Kira kiraan penapis">
 <!ENTITY opensidebar.label "Buka &amp;item yang boleh disekat">
+<!ENTITY notification.button.close "&amp;Tutup">
 <!ENTITY contribute.label "Sumbang kepada Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Sekat bingkai">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ms/sendReport.dtd adblock-plus-2.6+dfsg/chrome/locale/ms/sendReport.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/ms/sendReport.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ms/sendReport.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -17,7 +17,7 @@
 <!ENTITY anonymous.label "Penyerahan &amp;tanpa nama">
 <!ENTITY reloadButton.label "Reload laman (&amp;t)">
 <!ENTITY recentReports.clear.label "&amp;Padam semua laporan">
-<!ENTITY typeSelector.description "Tingkap ini akan membantu anda dengan langkah-langkah yang diperlukan untuk mengemukakan repot isu Adblock Plus. Pertama sekali, sila pilih jenis isu yang dialami pada laman ini:">
+<!ENTITY typeSelector.description "Tingkap ini akan membimbing anda dengan langkah-langkah yang diperlukan untuk mengemukakan laporan isu Adblock Plus. Pertama sekali, sila pilih jenis isu yang dialami pada laman ini:">
 <!ENTITY screenshot.remove.label "Pa&amp;dam data sensitif">
 <!ENTITY issues.ownfilters.description "Sebahagian penapis yang digunakan pada laman ini ditentukan pengguna. Sila nyahaktifkan penapis tersebut yang mungkin menyebabkan isu itu.">
 <!ENTITY update.inProgress.description "Adblock Plus perlu mengemaskini langganan penapis anda untuk memastikan isu tersebut belum diselesaikan. Sila tunggu&quot;...&quot;">
@@ -31,7 +31,7 @@
 <!ENTITY issues.disabledfilters.enable.label "Aktifkan penapis">
 <!ENTITY issues.override.label "&amp;Konfigurasi adalah betul, sila teruskan dengan laporan">
 <!ENTITY issues.nosubscriptions.description "Anda didapati tidak melanggan mana-mana penapis yang direka khas untuk membuang isi yang tidak diperlukan pada laman web secara automatik.">
-<!ENTITY typeSelector.falsePositive.description "Pilih pilihan ini jika laman tersebut kekurangan isi penting, pemaparan isi yang kurang tepat atau gagal berfungsi dengan betul. Anda boleh menentukan samada Adblock Plus adalah penyebab masalah tersebut dengan menyahaktifkannya untuk sementara.">
+<!ENTITY typeSelector.falsePositive.description "Pilih pilihan ini jika laman tersebut kekurangan isi penting, salah paparannya atau gagal berfungsi dengan betul. Anda boleh menentukan sama ada Adblock Plus ialah penyebab masalah tersebut dengan menyahaktifkannya buat sementara waktu.">
 <!ENTITY typeSelector.other.label "&amp;Isu lain">
 <!ENTITY emailComment.label "Kami menggalakkan anda memasukkan alamat email yang sah supaya kami boleh menghubungi anda jika ada pertanyaan tentang laporan anda. Ia juga akan membolehkan kita untuk mengiktiraf sumbangan anda dan memberi keutamaan kepada mereka dengan lebih tinggi.">
 <!ENTITY issues.whitelist.remove.label "Aktifkan kembali Adblock Plus pada laman ini">
@@ -61,5 +61,5 @@
 <!ENTITY sendPage.heading "Hantar laporan">
 <!ENTITY issues.subscriptionCount.description "Didapati anda melanggan terlalu banyak langganan penapis. Ini tidak disyorkan kerana ia mungkin akan mewujudkan masalah. Kami juga tidak dapat menerima laporan anda kerana ia kurang jelas penulis langganan penapis mana yang perlu mengambil tindakan. Sila buang semua langganan penapis kecuali yang diperlukan dan uji samada masalah masih berterusan.">
 <!ENTITY screenshot.mark.label "&amp;Tanda masalah tersebut">
-<!ENTITY privacyPolicy.label "Polisi maklumat peribadi">
+<!ENTITY privacyPolicy.label "Polisi privasi">
 <!ENTITY issues.description "Adblock Plus telah mengesan isu pada konfigurasi anda yang mungkin penyebab isu ini atau akan menyukarkan penyiasatan laporan.">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/nb-NO/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/nb-NO/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/nb-NO/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/nb-NO/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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_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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/nb-NO/global.properties adblock-plus-2.6+dfsg/chrome/locale/nb-NO/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/nb-NO/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/nb-NO/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Ingen blokkerbare elementer på nåværende side
 action3_tooltip=Klikk for å aktivere/deaktivere Adblock Plus.
+notification_antiadblock_title=Skjul meldinger til Adblock Plus brukere?
 type_label_script=script
 filter_elemhide_nocriteria=Du har ikke spesifisert kriterier for å gjenkjenne elementet som skal skjules
 blockingGroup_title=Regler for annonseblokkering
@@ -24,6 +25,7 @@
 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?
+notification_antiadblock_message=Dette området er kjent for å vise meldinger som henvender seg til AdBlock Plus brukere. Vil du at Adblock Plus skal skjule disse meldingene?
 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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/nb-NO/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/nb-NO/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/nb-NO/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/nb-NO/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Ja">
+<!ENTITY notification.button.no "&amp;Nei">
 <!ENTITY sync.label "Synkroniser innstillinger for Adblo&amp;ck Plus">
 <!ENTITY whitelist.site.label "Deaktiver på ?1?">
 <!ENTITY filters.label "&amp;Filterinnstillinger">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Plus: Blokker bilde">
 <!ENTITY counthits.label "Tell filtertreff (&amp;h)">
 <!ENTITY opensidebar.label "Åpne &amp;blokkerbare elementer">
+<!ENTITY notification.button.close "&amp;Lukk">
 <!ENTITY contribute.label "Bidra til Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Blokker ramme">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/nb-NO/sendReport.dtd adblock-plus-2.6+dfsg/chrome/locale/nb-NO/sendReport.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/nb-NO/sendReport.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/nb-NO/sendReport.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -24,7 +24,7 @@
 <!ENTITY sendPage.retry.label "Send på nytt">
 <!ENTITY data.label "Ra&amp;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 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å [link]Adblock Plus forum[/link]. 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 &quot;add-on&quot; som er grunnen til problemet">
 <!ENTITY issues.nosubscriptions.add.label "Legg til filterabonnement">
@@ -39,7 +39,7 @@
 <!ENTITY dataCollector.description "Vennligst vent på at Adblock Plus samler inn de nødvendige data.">
 <!ENTITY sendButton.label "Se&amp;nd rapport">
 <!ENTITY comment.label "Kommentar (valgfritt): (&amp;C)">
-<!ENTITY sendPage.errorMessage "Et forsøk på å sende inn rapporten feilet, med feilkoden &quot;?1?&quot;. Vennligst kontrollér at du har internettilgang, og prøv på nytt. Hvis problemet vedvarer kan du be om hjelp i .">
+<!ENTITY sendPage.errorMessage "Et forsøk på å sende inn rapporten feilet, med feilkoden &quot;?1?&quot;. Vennligst kontrollér at du har internettilgang, og prøv på nytt. Hvis problemet vedvarer kan du be om hjelp i [link]Adblock Plus forum[/link].">
 <!ENTITY showRecentReports.label "Vis nylig innsendte rapporter">
 <!ENTITY commentPage.heading "Skriv inn kommentar">
 <!ENTITY update.start.label "Start oppdatering nå">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/nl/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/nl/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/nl/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/nl/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,16 +6,14 @@
 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_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_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.
+firstRun_legacySafariWarning=U gebruikt een oude versie van Safari die niet wordt ondersteund door Adblock Plus. Sommige websites kunnen daardoor onjuist worden weergegeven. Wij raden u aan een update uit te voeren naar Safari versie 6.1.1 of hoger (voor Mac OS X 10.8 Mountain Lion), Safari versie 7.0.1 of hoger (voor Mac OS X 10.9 Mavericks) of de laatste versie van Mozilla Firefox, Google Chrome of Opera te gebruiken.
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/nl/global.properties adblock-plus-2.6+dfsg/chrome/locale/nl/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/nl/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/nl/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Geen blokkeerbare onderdelen op deze pagina
 action3_tooltip=Klik om Adblock Plus in/uit te schakelen.
+notification_antiadblock_title=Gerichte berichten verbergen?
 type_label_script=script
 filter_elemhide_nocriteria=Geen criteria opgegeven om het te verbergen element te herkennen
 blockingGroup_title=Advertentieblokkaderegels
@@ -24,6 +25,7 @@
 action2_tooltip=Klik om voorkeuren te openen, middelklik om in/uit te schakelen.
 type_label_subdocument=frame
 clearStats_warning=Dit stelt alle filtertrefferstatistieken opnieuw in en schakelt het tellen van filtertreffers uit. Wilt u doorgaan?
+notification_antiadblock_message=Deze website staat er bekend om dat ze op Adblock Plus-gebruikers gerichte berichten laat zien. Wilt u dat Adblock Plus deze verbergt?
 blocked_count_addendum=(ook op witte lijst: ?1?, verborgen: ?2?)
 subscription_invalid_location=Deze filterlijstlocatie is geen geldige URL en ook geen geldige bestandsnaam.
 type_label_image=afbeelding
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/nl/meta.properties adblock-plus-2.6+dfsg/chrome/locale/nl/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/nl/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/nl/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,4 +1,4 @@
-description.short=Irritante reclames? Hinder van volgers? Altijd die banners? Installeer Adblock Plus nu om internet weer onder controle te krijgen en uw webervaring te veranderen.\n\nEen korte video is te zien op http://www.youtube.com/watch?v=oNvb2SjVjjI
+description.short=Adblock Plus blokkeert alle vervelende advertenties, en steunt websites door standaard niet-opdringerige advertenties niet te blokkeren (instelbaar).
 name=Adblock Plus
 description.long.addition1=Vanaf Adblock Plus 2.0 heeft u de mogelijkheid om in filtervoorkeuren enkele niet-opdringerige reclames toe te staan. Het doel is om websites te ondersteunen bij het gebruik van niet-opdringerige manieren om te adverteren en meer websites aan te moedigen om hetzelfde te doen. <a href="http://adblockplus.org/nl/acceptable-ads">Lees meer</a>
 translator=pitdicker, markh, Onno Ekker
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/nl/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/nl/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/nl/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/nl/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Ja">
+<!ENTITY notification.button.no "&amp;Nee">
 <!ENTITY sync.label "Syn&amp;chroniseer Adblock Plus instellingen">
 <!ENTITY whitelist.site.label "Uitschakelen op ?1?">
 <!ENTITY filters.label "&amp;Filtervoorkeuren">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Plus: Afbeelding blokkeren">
 <!ENTITY counthits.label "&amp;Filtertreffers tellen">
 <!ENTITY opensidebar.label "&amp;Blokkeerbare onderdelen openen">
+<!ENTITY notification.button.close "&amp;Sluit">
 <!ENTITY contribute.label "Draag bij aan Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Deelvenster blokkeren">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/pl/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/pl/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/pl/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/pl/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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_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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/pl/global.properties adblock-plus-2.6+dfsg/chrome/locale/pl/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/pl/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/pl/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Nieblokowalne elementy na aktywnej stronie
 action3_tooltip=Kliknij l.p.m., aby włączyć/wyłączyć Adblock Plus
+notification_antiadblock_title=Ukrywanie ukierunkowanych informacji
 type_label_script=skrypt
 filter_elemhide_nocriteria=Nie określono kryteriów rozpoznania elementu do ukrycia
 blockingGroup_title=Reguły blokowania reklam
@@ -24,6 +25,7 @@
 action2_tooltip=Kliknij l.p.m., aby otworzyć opcje, ś.p.m., aby włączyć/wyłączyć
 type_label_subdocument=ramka
 clearStats_warning=Spowoduje to zresetowanie wszystkich statystyk użycia filtra i wyłączenie zliczania kolejnych użyć. Czy chcesz kontynuować?
+notification_antiadblock_message=Ta witryna wyświetla użytkownikom Adblock Plusa ukierunkowane dla nich informacje. Czy chcesz, by Adblock Plus ukrywał tego typu informacje?
 blocked_count_addendum=(dozwolone:?1?, ukryte:?2?)
 subscription_invalid_location=Lokalizacja zestawu filtrów ma niewłaściwą nazwę pliku, albo adres URL
 type_label_image=obrazek
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/pl/meta.properties adblock-plus-2.6+dfsg/chrome/locale/pl/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/pl/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/pl/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,4 +1,4 @@
-description.short=Masz dość oglądania denerwujących reklam i banerów, które dodatkowo wydłużają wczytywanie stron? Zainstaluj Adblock Plusa i uwolnij się od nich!\n\nKrótkie wideo opisujące instalację znajduje się tutaj: http://www.youtube.com/watch?v=oNvb2SjVjjI
+description.short=Blokuje denerwujące reklamy wideo na YouTube, reklamy na Facebooku, banery i wiele więcej.\n\nAdblock Plus blokuje wszystkie irytujące reklamy, ale wspiera witryny zawierające nienatarczywe reklamy domyślnie nie blokując ich (konfigurowane).
 name=Adblock Plus
 description.long.addition1=Począwszy od wersji 2.0 w ustawieniach filtrów znajduje się funkcja umożliwiająca włączenie wyświetlania niektórych, nie natrętnych reklam. Ma to na celu wsparcie witryn używających tego typu reklam oraz zachęcenie innych witryn do stosowania tej metody. <a href="http://adblockplus.org/en/acceptable-ads">Dowiedz się więcej</a>
 translator=Leszek(teo)Życzkowski
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/pl/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/pl/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/pl/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/pl/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Tak">
+<!ENTITY notification.button.no "&amp;Nie">
 <!ENTITY sync.label "&amp;Synchronizuj ustawienia Adblock Plusa">
 <!ENTITY whitelist.site.label "Wyłącz blokowanie na ?1?">
 <!ENTITY filters.label "&amp;Ustawienia filtra">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Zablokuj obrazek">
 <!ENTITY counthits.label "Zli&amp;czaj użycie filtra">
 <!ENTITY opensidebar.label "Otwórz listę &amp;blokowalnych elementów">
+<!ENTITY notification.button.close "&amp;Zamknij">
 <!ENTITY contribute.label "Wspomóż Adblock Plusa">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Zablokuj ramkę">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/pt-BR/composer.dtd adblock-plus-2.6+dfsg/chrome/locale/pt-BR/composer.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/pt-BR/composer.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/pt-BR/composer.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,8 +1,8 @@
 <!ENTITY anchor.end.label "no f&amp;inal do endereço">
-<!ENTITY domainRestriction.label "Restringir ao &amp;domínio:">
+<!ENTITY domainRestriction.label "Restringir domínio:">
 <!ENTITY collapse.default.no.label "Usar padrão (não)">
 <!ENTITY firstParty.label "So&amp;mente mesmo domínio">
-<!ENTITY preferences.label "&amp;Mostrar filtros existentes...">
+<!ENTITY preferences.label "Mostrar filtros existentes...">
 <!ENTITY pattern.label "Procurar padrão">
 <!ENTITY thirdParty.label "So&amp;mente de terceiros">
 <!ENTITY filter.label "Novo &amp;filtro:">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/pt-BR/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/pt-BR/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/pt-BR/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/pt-BR/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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=LIGADO
 firstRun_contributor_credits=Créditos dos contribuidores
-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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/pt-BR/global.properties adblock-plus-2.6+dfsg/chrome/locale/pt-BR/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/pt-BR/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/pt-BR/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Nenhum item bloqueável na página atual
 action3_tooltip=Clique para ativar/desativar o Adblock Plus.
+notification_antiadblock_title=Ocultar mensagens direcionadas?
 type_label_script=script
 filter_elemhide_nocriteria=Nenhum critério especificado para reconhecer o elemento a ser ocultado
 blockingGroup_title=Regras de bloqueio de propaganda
@@ -24,6 +25,7 @@
 action2_tooltip=Clique para abrir as preferências, e com o botão do meio para ativar/desativar.
 type_label_subdocument=frame
 clearStats_warning=Isso vai reiniciar todas as estatísticas de acertos dos filtros e desativar o contador de acertos dos filtros. Você deseja continuar?
+notification_antiadblock_message=Este site é conhecido por mostrar mensagens direcionadas a usuários do Adblock Plus. Você quer que o Adblock Plus esconda mensagens direcionadas?
 blocked_count_addendum=(e também liberados: ?1?, ocultos: ?2?)
 subscription_invalid_location=O local da lista de filtros não é nem uma URL válida nem um nome válido de arquivo.
 type_label_image=imagem
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/pt-BR/meta.properties adblock-plus-2.6+dfsg/chrome/locale/pt-BR/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/pt-BR/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/pt-BR/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 description.short=Chateado com as propagandas? Incomodado com o rastreamento? Irritado com os banners? Instale agora o Adblock Plus para recuperar o controle da internet e mudar a maneira como você vê a web.
 name=Adblock Plus
-description.long.addition1=A partir da versão 2.0 do Adblock Plus, existe um item nas opções de filtros para permitir algumas propagandas não-invasivas. O objetivo é apoiar sites que usam formas não-invasivas de publicidade e incentivar mais sites a fazerem o mesmo. <a href="http://adblockplus.org/pt_BR/acceptable-ads">Saiba mais</a>
-translator=Teboga, Mauro José da Silva
-description.long=O Adblock Plus permite que você recupere o controle da internet e veja a web do jeito que você quer. Esta extensão é suportada por mais de quarenta inscrições de filtros em diversos idiomas que a configuram automaticamente para fins que vão desde a remoção de publicidade online até o bloqueio de todos os domínios conhecidos de malware. O Adblock Plus também permite personalizar os filtros através de uma variedade de ferramentas úteis tais como: uma opção no menu de contexto das imagens, uma aba bloqueadora nos objetos de Flash e Java, uma lista de itens bloqueáveis para remover scripts e folhas de estilo.
+description.long.addition1=A partir da versão 2.0 do Adblock Plus, existe uma opção nas Preferências de Filtro para permitir algumas propagandas não-invasivas. O objetivo é apoiar sites que usam formas não-invasivas de publicidade e incentivar mais sites a fazerem o mesmo. <a href="http://adblockplus.org/pt_BR/acceptable-ads">Saiba mais</a>
+translator=Teboga, Mauro José da Silva, Ajwsert
+description.long=O Adblock Plus permite que você recupere o controle da internet e veja a web do jeito que você quer. A extensão é suportada por mais de quarenta filtros de inscrições em diversos idiomas que a configuram automaticamente para fins que vão desde a remoção de publicidade online até o bloqueio de todos os domínios conhecidos de malware. Adblock Plus também permite personalizar seus filtros através de uma variedade de ferramentas úteis, incluindo uma opção no menu de contexto para imagens, uma aba bloqueadora nos objetos de Flash e Java e uma lista de itens bloqueáveis para remover scripts e folhas de estilo.
 description=Propaganda indesejada é coisa do passado!
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/pt-BR/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/pt-BR/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/pt-BR/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/pt-BR/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Sim">
+<!ENTITY notification.button.no "&amp;Não">
 <!ENTITY sync.label "S&amp;incronizar configurações do Adblock Plus">
 <!ENTITY whitelist.site.label "Desativar em ?1?">
 <!ENTITY filters.label "Opções de &amp;filtros">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Plus: Bloquear imagem">
 <!ENTITY counthits.label "Cont&amp;ar acertos de filtros">
 <!ENTITY opensidebar.label "A&amp;brir itens bloqueáveis">
+<!ENTITY notification.button.close "&amp;Fechar">
 <!ENTITY contribute.label "Contribuir com o Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Bloquear quadro">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/pt-PT/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/pt-PT/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/pt-PT/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/pt-PT/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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_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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/pt-PT/global.properties adblock-plus-2.6+dfsg/chrome/locale/pt-PT/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/pt-PT/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/pt-PT/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Não há itens bloqueáveis nesta página
 action3_tooltip=Clique para ativar/desativar o Adblock Plus.
+notification_antiadblock_title=Ocultar mensagens?
 type_label_script=script
 filter_elemhide_nocriteria=Nenhum critério especificado para reconhecimento de elementos a bloquear
 blockingGroup_title=Regras de bloqueio de anúncios
@@ -24,6 +25,7 @@
 action2_tooltip=Clique para abrir as preferências, clique na roda do rato para ativar/desativar.
 type_label_subdocument=moldura
 clearStats_warning=Irá reiniciar as estatísticas de todos os filtros e desativar a contagem de bloqueios. Continuar?
+notification_antiadblock_message=Este sítio é conhecido por enviar mensagens dirigidas aos utilizadores do Adblock Plus. Gostaria de ocultar essas mensagens?
 blocked_count_addendum=(na lista de permissões: ?1?, ocultos: ?2?)
 subscription_invalid_location=A localização da lista de filtros não é um endereço ou nome de ficheiro válido.
 type_label_image=imagem
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/pt-PT/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/pt-PT/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/pt-PT/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/pt-PT/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Sim">
+<!ENTITY notification.button.no "&amp;Não">
 <!ENTITY sync.label "Sin&amp;cronizar definições do Adblock Plus">
 <!ENTITY whitelist.site.label "Desativar em ?1?">
 <!ENTITY filters.label "Pre&amp;ferências de filtros">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Bloquear imagem">
 <!ENTITY counthits.label "&amp;Contar bloqueios do filtro">
 <!ENTITY opensidebar.label "A&amp;brir itens bloqueáveis">
+<!ENTITY notification.button.close "Fe&amp;char">
 <!ENTITY contribute.label "Colaborar no Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Bloquear moldura">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ro/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/ro/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/ro/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ro/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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_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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ro/global.properties adblock-plus-2.6+dfsg/chrome/locale/ro/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/ro/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ro/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
-no_blocking_suggestions=În pagină nu se găseşte nici un element blocabil
+no_blocking_suggestions=În pagină nu se găsește nici un element blocabil
 action3_tooltip=Clic pentru a activa/dezactiva Adblock Plus.
+notification_antiadblock_title=Ascunde mesajele direcționate?
 type_label_script=script
 filter_elemhide_nocriteria=Nu s-a specificat nici un criteriu pentru a identifica elementul pentru ascundere.
 blockingGroup_title=Reguli de blocare
@@ -24,6 +25,7 @@
 action2_tooltip=Clic pentru a modifica opţiuni, clic-mijloc pentru a activa/dezactiva.
 type_label_subdocument=cadru (frame)
 clearStats_warning=Toate statisticile filtrelor vor fi iniţializate şi înregistrarea lor va fi dezactivată. Sunteţi sigur că doriţi să continuaţi?
+notification_antiadblock_message=Acest site trimite mesaje direcționate utilizatorilor Adblock Plus. Vrei ca Adblock Plus să ascundă aceste mesaje direcționate?
 blocked_count_addendum=(permisiuni explicite: ?1?, elemente ascunse: ?2?)
 subscription_invalid_location=Locaţia pentru filtre nu este validă
 type_label_image=imagine
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ro/meta.properties adblock-plus-2.6+dfsg/chrome/locale/ro/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/ro/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ro/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,4 +1,4 @@
-description.short=Eşti iritat de publicitate? Te enervează banerele? Instalează Adblock Plus pentru a recâştiga controlul asupra internetului.\n\nPoţi viziona în prealabil o prezentare scurtă http://www.youtube.com/watch?v=oNvb2SjVjjI
+description.short=Blochează publicitatea agasantă de pe YouTube, Facebook și multe altele.\n\nAdblock Plus blochează toate anunțurile publicitare enervante și sprijină site-urile web prin promovarea publicității  discrete, neinvazive (opțiune configurabilă).
 name=Adblock Plus
 description.long.addition1=Începând cu Adblock Plus 2.0, există o opţiune în Preferinţe Filtre pentru a permite publicitatea neagresivă. Scopul ei este să susțină site-urile web care utilizează mijloace discrete de promovare și să încurajeze mai multe site-uri web să facă la fel. <a href="http://adblockplus.org/en/acceptable-ads">Mai multe detalii</a>
 translator=ultravioletu
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ro/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/ro/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/ro/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ro/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Da">
+<!ENTITY notification.button.no "&amp;Nu">
 <!ENTITY sync.label "Si&amp;ncronizează setările Adblock Plus">
 <!ENTITY whitelist.site.label "Dezactivează Adblock Plus pe ?1?">
 <!ENTITY filters.label "Pre&amp;ferințe filtre">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Plus: blochează imagine">
 <!ENTITY counthits.label "Înre&amp;gistrează statisticile filtrelor">
 <!ENTITY opensidebar.label "Deschide &amp;lista elementelor blocabile">
+<!ENTITY notification.button.close "În&amp;chide">
 <!ENTITY contribute.label "Contribuie la Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: blochează cadru">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ru/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/ru/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/ru/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ru/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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, которые появляются на веб-страницах и отслеживают ваше поведение.
 firstRun_donate=пожертвовать
 firstRun_donate_label=Поддержать наш проект
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ru/global.properties adblock-plus-2.6+dfsg/chrome/locale/ru/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/ru/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ru/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=На открытой странице нет элементов, которые можно было бы заблокировать
 action3_tooltip=Щелкните здесь, чтобы включить или отключить Adblock Plus.
+notification_antiadblock_title=скрыть целевых сообщений?
 type_label_script=Скрипт
 filter_elemhide_nocriteria=Не указано никаких признаков, чтобы опознать элемент, который нужно скрыть
 blockingGroup_title=Правила блокирования
@@ -24,6 +25,7 @@
 action2_tooltip=Щелкните здесь, чтобы открыть окно установок. Нажмите среднюю клавишу мышки, чтобы включить или отключить Adblock Plus.
 type_label_subdocument=Фрейм
 clearStats_warning=Статистика попаданий будет обнулена для всех фильтров и в дальнейшем больше не будет записываться. Продолжать?
+notification_antiadblock_message=Этот сайт, как известно, показывают целевые сообщения пользователям Adblock Plus. Хотите Adblock Plus, чтобы скрыть целевых сообщений?
 blocked_count_addendum=(также исключений: ?1?, спрятано: ?2?)
 subscription_invalid_location=Не удалось распознать введенный адрес ни как адрес в интернете, ни как путь файлу.
 type_label_image=Изображение
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/ru/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/ru/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/ru/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/ru/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;да">
+<!ENTITY notification.button.no "&amp;нет">
 <!ENTITY sync.label "Син&amp;хронизировать настройки Adblock Plus">
 <!ENTITY whitelist.site.label "Отключить на ?1?">
 <!ENTITY filters.label "Настройки &amp;фильтров">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Plus: заблокировать изображение">
 <!ENTITY counthits.label "С&amp;читать срабатывания фильтров">
 <!ENTITY opensidebar.label "Открыть с&amp;писок элементов">
+<!ENTITY notification.button.close "&amp;близко">
 <!ENTITY contribute.label "Помочь проекту Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: заблокировать фрейм">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/sk/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/sk/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/sk/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/sk/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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_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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/sk/global.properties adblock-plus-2.6+dfsg/chrome/locale/sk/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/sk/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/sk/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=Na aktuálnej stránke nie sú blokovateľné položky
 action3_tooltip=Kliknúť pre Otvoriť/Zavrieť Adblock Plus.
+notification_antiadblock_title=Skryť cielené správy?
 type_label_script=skript
 filter_elemhide_nocriteria=Žiadne kritéria neboli špecifikované pre rozpoznanie prvku na skrytie
 blockingGroup_title=Pravidlá blokovania
@@ -24,6 +25,7 @@
 action2_tooltip=Kliknúť pre otvorenie nastavení, kliknutie prostredným pre Zapnúť/Vypnúť.
 type_label_subdocument=rámec
 clearStats_warning=Toto resetuje všetky štatistiky filtrov a vypne počítadlo. Chcete pokračovať?
+notification_antiadblock_message=Táto stránka bola známa zobrazením cielených správ pre používateľa Adblock Plus. Chcete, aby  Adblock Plus skryl cielené správy?
 blocked_count_addendum=(tiež biely zoznam: ?1?, skrytý: ?2?)
 subscription_invalid_location=Umiestnenie zoznamu filtrov nemá platnú URL alebo platný názov súboru.
 type_label_image=obrázok
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/sk/meta.properties adblock-plus-2.6+dfsg/chrome/locale/sk/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/sk/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/sk/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,4 +1,4 @@
-description.short=Ste otrávení reklamami? Máte problémy so sledovaním? Obťažovaní banermi? Nainštalujte si Adblock Plus teraz pre znovu získanie kontroly na internete a zmeňte pohľad na web.\n\n Krátke video je dostupné na http://www.youtube.com/watch?v=oNvb2SjVjjI
+description.short=Bloky otravné video reklamy na YouTube, Facebook reklamy, bannery a ešte oveľa viac.\n\nAdblock Plus blokuje všetky otravné reklamy a podporuje webové stránky tým, že neblokuje nenápadné reklamy v predvolenom nastavení (konfigurovateľné).
 name=Adblock Plus
 description.long.addition1=Od Adblock Plus 2.0 je možnosť v Nastavení filtra povolenie niektorých nerušivých reklám. Cieľom je podpora webových stránok pomocou neinvazívnych spôsobov a propagovať a podporovať viac internetových stránok, aby urobili to isté.<a href="http://adblockplus.org/en/acceptable-ads">Viac</a>
 translator=Ján Kendi (Jacen)
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/sk/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/sk/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/sk/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/sk/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Áno">
+<!ENTITY notification.button.no "&amp;Nie">
 <!ENTITY sync.label "Syn&amp;chronizovať nastavenia Adblock Plus">
 <!ENTITY whitelist.site.label "Vypnúť na ?1?">
 <!ENTITY filters.label "&amp;Nastavenia filtrov">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock obrázok">
 <!ENTITY counthits.label "P&amp;očítadlo">
 <!ENTITY opensidebar.label "Otvoriť &amp;blokovateľné položky">
+<!ENTITY notification.button.close "&amp;Zatvoriť">
 <!ENTITY contribute.label "Prispieť na Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock rámec">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/sl/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/sl/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/sl/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/sl/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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_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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/sl/global.properties adblock-plus-2.6+dfsg/chrome/locale/sl/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/sl/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/sl/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,11 +1,12 @@
 no_blocking_suggestions=Na trenutni strani ni elementov blokad
 action3_tooltip=Kliknite za vključitev/izključitev Adblock Plus.
+notification_antiadblock_title=Skrijem ciljana sporočila?
 type_label_script=skript
 filter_elemhide_nocriteria=Za razpoznavo elementa, ki naj bo skrit, ni navedenih pogojev
 blockingGroup_title=Pravila blokiranja oglasov
 whitelisted_tooltip=Adblock Plus je aktiven, vendar je za trenutno stran izključen.
 type_label_stylesheet=predlogo strani
-blocked_count_tooltip=?1? izmed ?2?
+blocked_count_tooltip=?1? od ?2?
 type_label_font=pisava
 type_label_popup=pojavno okno
 filter_regexp_tooltip=Ta filter je regularni izraz ali pa je prekratek za optimizacijo. Preveč filtrov lahko upočasni brskanje.
@@ -24,6 +25,7 @@
 action2_tooltip=Kliknite za nastavitve, s srednjim klikom vključite/izključite.
 type_label_subdocument=okvir
 clearStats_warning=S tem boste ponastavili vso statistiko zadetkov filtra in onemogočili štetje zadetkov filtra. Želite nadaljevati?
+notification_antiadblock_message=Ta stran uporabnikom prikazuje ciljana sporočila. Želite, da Adblock Plus skrije ta sporočila?
 blocked_count_addendum=(prav tako prikriti: ?1?, skriti: ?2?)
 subscription_invalid_location=Mesto seznama filtrov ni niti veljaven URL niti veljavno ime datoteke.
 type_label_image=sliko
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/sl/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/sl/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/sl/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/sl/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Da">
+<!ENTITY notification.button.no "&amp;Ne">
 <!ENTITY sync.label "Sin&amp;hroniziraj nastavitve Adblock Plus">
 <!ENTITY whitelist.site.label "Onemogoči na ?1?">
 <!ENTITY filters.label "Nastavitve &amp;filtra">
@@ -11,7 +13,8 @@
 <!ENTITY context.image.label "Adblock - slike">
 <!ENTITY counthits.label "Štej za&amp;detke filtra">
 <!ENTITY opensidebar.label "Odpri &amp;elemente blokad">
-<!ENTITY contribute.label "Prispevajte k Adblock Plus">
+<!ENTITY notification.button.close "&amp;Zapri">
+<!ENTITY contribute.label "Sodelujte v Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock - okviri">
 <!ENTITY blocked.tooltip "Blokirani elementi na tej strani:">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/sl/subscriptionSelection.dtd adblock-plus-2.6+dfsg/chrome/locale/sl/subscriptionSelection.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/sl/subscriptionSelection.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/sl/subscriptionSelection.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -7,6 +7,6 @@
 <!ENTITY viewList.label "Pokaži filtre">
 <!ENTITY visitHomepage.label "Obišči domačo stran">
 <!ENTITY addSubscription.label "Dodaj naročnino">
-<!ENTITY dialog.title "Naroči filtre za Adblock Plus">
+<!ENTITY dialog.title "Dodaj naročnino na filtre Adblock Plus">
 <!ENTITY location.label "&amp;Mesto seznama filtriranja:">
 <!ENTITY fromWeb.description "Potrdite, da želite dodati to naročnino na filter. Naslov ali kraj naročnine lahko spremenite še pred dodajanjem.">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/sq/filters.dtd adblock-plus-2.6+dfsg/chrome/locale/sq/filters.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/sq/filters.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/sq/filters.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,14 +1,28 @@
+<!ENTITY restore.custom.warning "Krejt filtrat tuaj të personalizuar do të zëvendësohen nga lënda e kartelës së përzgjedhur. Dëshironi të vazhdohet?">
 <!ENTITY slow.column "Filtruesit e ngadalshëm">
 <!ENTITY enabled.column "Aktivizo">
 <!ENTITY subscription.lastDownload.checksumMismatch "Deshtoi,mosperputhje checksumi">
-<!ENTITY lasthit.column "Shtypja e fundit">
+<!ENTITY noFiltersInGroup.text "Grupi i përzgjedhur është i zbrazët.">
+<!ENTITY subscription.actions.label "Veprime">
+<!ENTITY filter.selectAll.label "Përzgjidhi Krejt">
+<!ENTITY backupButton.label "&amp;Kopjeruaje dhe Riktheje">
+<!ENTITY restore.minVersion.warning "Kujdes: kartela është krijuar me një version Adblock Plus më të ri. Do të duhej ta përditësonit Adblock Plus-in me versionin më të ri, përpara se të riktheni të dhëna prej kësaj kartele.">
+<!ENTITY restore.error "Të dhënat e kartelës nuk përpunohen dot, ndoshta kjo nuk është kartelë kopjeruajtjesh për Adblock Plus?">
 <!ENTITY sort.ascending.label "A &gt; Z radhitje">
 <!ENTITY sort.label "Radhit sipas">
 <!ENTITY subscription.source.label "Lista e filtrave">
-<!ENTITY filter.paste.label "Hedh">
+<!ENTITY hitcount.column "Shtypje">
+<!ENTITY noFilters.text "Nuk keni ende ndonjë filtër të personalizuar.">
+<!ENTITY backup.custom.title "Vetëm filtrat e personalizuar">
 <!ENTITY subscription.external.label "E rifreksuar nga nje shtese tjeter">
+<!ENTITY subscription.delete.label "Fshije">
+<!ENTITY noGroupSelected.text "Përpara se të shfaqen filtrat e tij, lypset të përzgjidhni një grup filtrash.">
+<!ENTITY filter.cut.label "Kopjo-largo">
+<!ENTITY restore.default.label "Të rikthehet kopjeruajtja prej ?1?">
 <!ENTITY subscription.lastDownload.inProgress "Duke u shkarkuar...">
 <!ENTITY subscriptions.tab.label "Filtroni abonimet">
+<!ENTITY sort.descending.label "Z &gt; A radhitje">
+<!ENTITY filters.remove.warning "Doni vërtet të hiqen krejt filtrat e përzgjedhur?">
 <!ENTITY filter.delete.label "Fshijë">
 <!ENTITY addSubscriptionAdd.label "Shto">
 <!ENTITY viewMenu.label "Shih">
@@ -16,22 +30,43 @@
 <!ENTITY addSubscriptionCancel.label "Anulo">
 <!ENTITY subscription.enabled.label "E aktivizuar">
 <!ENTITY noSubscriptions.text "Ju nuk keni shtuar ndonje abonim per filter ende.Adblock Plus nuk do te bllokoje asgje pa filtra,ju lutem perdorin &quot;Shto nje abonim filtri&quot; per te shtuar disa.">
+<!ENTITY subscription.update.label "Përditësoni filtra">
 <!ENTITY dialog.title "Filtroni preferencat e Adblock Plus">
+<!ENTITY addFilter.label "Vendos filtrues">
 <!ENTITY subscription.minVersion.warning "Ky abonim filtri kerkon nje version me te ri te Adblock Plus,ti duhet te besh update ne versionin e fundit te Adblock Plus.">
 <!ENTITY subscription.lastDownload.invalidURL "Deshtoi,nje adrese e pavlefshme">
-<!ENTITY hitcount.column "Shtypje">
-<!ENTITY filter.cut.label "Kopjo-largo">
+<!ENTITY backup.error "Pati një gabim gjatë shkrimit te kartela. Sigurohuni që kartela nuk është e mbrojtur ndaj shkrimit ose që nuk po përdoret nga një zbatim tjetër.">
+<!ENTITY filter.moveUp.label "Ngjite sipër">
+<!ENTITY addGroup.label "Shtoni &amp;grup filtrash">
+<!ENTITY filter.edit.label "Përpunojeni">
+<!ENTITY subscription.showHideFilters.label "Shfaqni/fshihni filtra">
+<!ENTITY acceptableAds2.label "Lejo ndoca reklamë jo të &amp;bezdisshme">
 <!ENTITY addSubscriptionOther.label "Shto nje abonim tjeter">
+<!ENTITY close.label "Mbylle">
 <!ENTITY sort.none.label "Pa radhitur">
+<!ENTITY filter.actions.label "Veprime filtrash">
 <!ENTITY filter.copy.label "Kopjo">
+<!ENTITY filter.moveDown.label "Zbrite poshtë">
+<!ENTITY filter.resetHitCounts.label "Rinisi nga e para statistikat e vizitave">
+<!ENTITY readMore.label "Lexoni më tepër">
+<!ENTITY subscription.moveUp.label "Ngjite sipër">
 <!ENTITY addSubscription.label "Shto abonim per filter">
 <!ENTITY subscription.homepage.label "Kryefaqja">
+<!ENTITY backup.complete.title "Krejt filtrat dhe pajtimet">
+<!ENTITY restore.own.label "Rimerr vlera prej kopjeruajtjes së vet">
+<!ENTITY restore.complete.warning "Krejt parapëlqimet tuaja për filtrat do të zëvendësohen nga lënda e kartelës së përzgjedhur. Dëshironi të vazhdohet?">
 <!ENTITY filters.tab.label "Filtra te kostumizuar">
+<!ENTITY backup.label "Krijoni një kopjeruajtje të re">
 <!ENTITY find.label "Kërko">
-<!ENTITY sort.descending.label "Z &gt; A radhitje">
+<!ENTITY subscription.moveDown.label "Zbrite poshtë">
 <!ENTITY subscription.lastDownload.connectionError "Deshtoi,gabim shkarkimi">
 <!ENTITY subscription.lastDownload.success "Sukses">
 <!ENTITY subscription.lastDownload.invalidData "Deshtoi,nje liste jo e vlefshme filtrash">
-<!ENTITY addFilter.label "Vendos filtrues">
-<!ENTITY subscription.lastDownload.label "Shkarkimi i fundit:">
+<!ENTITY filter.paste.label "Hedh">
+<!ENTITY subscription.disabledFilters.enable "Aktivizoni filtrat e aktivizuar">
+<!ENTITY lasthit.column "Shtypja e fundit">
+<!ENTITY subscription.editTitle.label "Përpunoni titullin">
+<!ENTITY subscription.disabledFilters.warning "Për këtë pajtim, disa nga filtrat janë çaktivizuar.">
 <!ENTITY filter.column "Rregulla e filtrimit">
+<!ENTITY subscription.lastDownload.label "Shkarkimi i fundit:">
+<!ENTITY viewList.label "Shihni listën">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/sq/sendReport.dtd adblock-plus-2.6+dfsg/chrome/locale/sq/sendReport.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/sq/sendReport.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/sq/sendReport.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -55,5 +55,5 @@
 <!ENTITY sendPage.heading "Dergo raportin">
 <!ENTITY issues.subscriptionCount.description "Duket sikur ju jeni abonuar ne shume filtra. Ky konfigurim nuk rekomandohet sepse to te shtoje rastet e problemeve te njejta. Gjithashtu ne nuk mund te pranojme raportimin tuaj te problemeve sepse eshet i paqarte se me ke abonim filtri autori duhet te veproje. Ju lutem hiqni te gjithe abonimet ne filtra perveç atyre te nevojshem dhe provoni nese problemi do te jete perseri.">
 <!ENTITY screenshot.mark.label "Shenoni proble&amp;min">
-<!ENTITY privacyPolicy.label "Rregulli i te dhenave vetjake">
+<!ENTITY privacyPolicy.label "Rregulla Privatësie">
 <!ENTITY issues.description "Adblock Plus ka dalluar probleme me konfigurimin tuaj i cili mund te jete pergjegjes per kete problem ose do te veshtiresoje hetimin e raportit.">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/sr/composer.dtd adblock-plus-2.6+dfsg/chrome/locale/sr/composer.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/sr/composer.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/sr/composer.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -7,14 +7,14 @@
 <!ENTITY thirdParty.label "Само са други&amp;х адреса">
 <!ENTITY filter.label "Нови &amp;филтер:">
 <!ENTITY collapse.label "&amp;Скупи блокирано:">
-<!ENTITY match.warning "Шаблон који сте унели не поклапа се са адресом која треба да буде блокирана/одобрена и на њу неће утицати.">
+<!ENTITY match.warning "Образац који сте унели више се не поклапа са адресом која треба да буде блокирана/одобрена и на њу неће утицати.">
 <!ENTITY anchor.start.label "на &amp;почетку адресе">
 <!ENTITY matchCase.label "&amp;Разликуј мала и велика слова">
 <!ENTITY custom.pattern.label "&amp;Прилагођено:">
 <!ENTITY unselectAllTypes.label "Поништи избор">
 <!ENTITY type.whitelist.label "И&amp;зузетак">
 <!ENTITY regexp.warning "Образац који сте унели ће бити коришћен као регуларни израз. Превише регуларних израза може успорити прегледач интернет страна. Уколико не намеравате да користите регуларне изразе, додајте симбол * на крају обрасца.">
-<!ENTITY dialog.title "Додај правило за Adblock Plus филтер">
+<!ENTITY dialog.title "Додавање правила за филтер Adblock Plus-а">
 <!ENTITY basic.label "Основни приказ">
 <!ENTITY type.filter.label "Фи&amp;лтер за блокирање">
 <!ENTITY types.label "Примени на типове:">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/sr/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/sr/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/sr/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/sr/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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=Подржите наш пројекат
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/sr/meta.properties adblock-plus-2.6+dfsg/chrome/locale/sr/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/sr/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/sr/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -3,4 +3,4 @@
 description.long.addition1=Од верзије Adblock Plus 2.0 у подешавањима филтера доступна је опција за ненаметљиво рекламирање. Њен циљ је да подржи странице које користе ненаметљиво рекламирање и охрабре остале сајтове да ураде исто. <a href="http://adblockplus.org/en/acceptable-ads">Сазнајте више.</a>
 translator=kapetance, ДакСРБИЈА
 description.long=Adblock Plus вам омогућава да поново стекнете контролу над Интернетом и изгледом страница. Додатак подржава преко четрдесет претплата на филтере на многим језицима који се аутоматски подешавају како би уклонили све: од уклањана нежељених реклама до блокирања познатих злонамерних домена. Adblock Plus такође дозвољава прилагођавање филтера и помоћ за разноврсне могућности, као што су садржајне опције за слике, језичак за блокирање Flash и Java објеката и списак ставки које је могуће блокирати ради уклањања скрипти и стилова.
-description=Рекламе су прошлост!
+description=Огласи су прошлост!
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/sv-SE/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/sv-SE/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/sv-SE/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/sv-SE/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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_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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/sv-SE/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/sv-SE/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/sv-SE/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/sv-SE/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "Jag">
+<!ENTITY notification.button.no "Nej">
 <!ENTITY sync.label "Syn&amp;kronisera Adblock Plus inställningar">
 <!ENTITY whitelist.site.label "Använd inte på ?1?">
 <!ENTITY filters.label "Filterinställningar">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Plus: Blockera bild">
 <!ENTITY counthits.label "Räkna an&amp;talet filterträffar">
 <!ENTITY opensidebar.label "Visa lista över blockerbara objekt">
+<!ENTITY notification.button.close "Sluta">
 <!ENTITY contribute.label "Bidra till Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Blockera ram">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/th/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/th/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/th/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/th/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,7 +1,8 @@
 firstRun_toggle_off=ไม่ทำงาน
 firstRun_feature_tracking=ปิดระบบติดตามการใข้งาน
-firstRun_dataCorruptionWarning=ไม่ให้หน้านี้แสดงอีกครั้ง <a>คลิกที่นี้</a>
+firstRun_feature_social=ลบปุ่มสื่อสังคมออก
 firstRun_title=กาติดตั้ง Adblock Plus เสร็จสมบูรณ์
 firstRun_toggle_on=ทำงาน
 firstRun_feature_malware=บล็อกมัลแวร์
-firstRun_feature_social=ลบปุ่มสื่อสังคมออก
+firstRun_dataCorruptionWarning=ไม่ให้หน้านี้แสดงอีกครั้ง <a>คลิกที่นี้</a>
+firstRun_acceptableAdsHeadline=โฆษณาที่น่ารำคาญจะถูกปิดกั้น
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/tr/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/tr/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/tr/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/tr/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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=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 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 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
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/tr/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/tr/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/tr/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/tr/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Evet">
+<!ENTITY notification.button.no "&amp;Hayır">
 <!ENTITY sync.label "Adblock Plus ayarlarını &amp;eşitle">
 <!ENTITY whitelist.site.label "?1? sitesinde devre dışı kal">
 <!ENTITY filters.label "&amp;Süzgeç tercihleri">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Plus: Resmi engelle">
 <!ENTITY counthits.label "Süzgeç isa&amp;betini say">
 <!ENTITY opensidebar.label "E&amp;ngellenebilecek öğeleri göster">
+<!ENTITY notification.button.close "&amp;Kapat">
 <!ENTITY contribute.label "Adblock Plus'a katkıda bulun">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Çerçeveyi engelle">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/uk/composer.dtd adblock-plus-2.6+dfsg/chrome/locale/uk/composer.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/uk/composer.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/uk/composer.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -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]увімкнете[/link] Adblock Plus.">
 <!ENTITY anchor.start.flexible.label "на &amp;початку імені домена">
 <!ENTITY collapse.no.label "Ні">
 <!ENTITY selectAllTypes.label "Вибрати все">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/uk/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/uk/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/uk/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/uk/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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, які з'являються на веб-сторінках і відстежують вашу поведінку.
 firstRun_donate=пожертва
 firstRun_donate_label=Підтримайте наш проект
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/uk/global.properties adblock-plus-2.6+dfsg/chrome/locale/uk/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/uk/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/uk/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=На відкритій сторінці немає елементів, які можна було б заблокувати
 action3_tooltip=Клацніть, щоб увімкнути чи вимкнути Adblock Plus.
+notification_antiadblock_title=Приховати цільові повідомлення?
 type_label_script=Скрипт
 filter_elemhide_nocriteria=Не вказаний критерій за яким упізнати  елемент, що буде приховано.
 blockingGroup_title=Правила блокування
@@ -24,6 +25,7 @@
 action2_tooltip=Клацніть, щоб відкрити вікно налаштувань.  Середня клавіша миші — вкл/викл.
 type_label_subdocument=Фрейм
 clearStats_warning=Це скине всю статистику по фільтрам та вимкне рахування хітів. Продовжити?
+notification_antiadblock_message=Цей сайт відомий тим, що показує цільові повідомлення користувачам Adblock Plus. Ви хочете, щоб Adblock Plus приховав цільові повідомлення?
 blocked_count_addendum=(також відкрито: ?1?, приховано: ?2?)
 subscription_invalid_location=Не вдалося розпізнати введену адресу ні як інтернет адресу, ні як шлях до файлу.
 type_label_image=Зображення
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/uk/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/uk/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/uk/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/uk/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Так">
+<!ENTITY notification.button.no "&amp;Ні">
 <!ENTITY sync.label "Синхроні&amp;зувати налаштування Адблоку">
 <!ENTITY whitelist.site.label "Вимкнути: на ?1?">
 <!ENTITY filters.label "&amp;Налаштування фільтрів">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Plus: заблокувати зображення">
 <!ENTITY counthits.label "&amp;Рахувати хіти фільтрів">
 <!ENTITY opensidebar.label "Відкрити с&amp;писок елементів">
+<!ENTITY notification.button.close "&amp;Закрити">
 <!ENTITY contribute.label "Допомогти Адблоку">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: заблокувати фрейм">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/vi/filters.dtd adblock-plus-2.6+dfsg/chrome/locale/vi/filters.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/vi/filters.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/vi/filters.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,19 +1,19 @@
-<!ENTITY restore.custom.warning "Tất cả bộ lọc cá nhân của bạn sẽ được thay thế . Bạn có muốn tiếp tục ?">
+<!ENTITY restore.custom.warning "Tất cả bộ lọc tùy biến của bạn sẽ được thay thế bởi nội dung của tập tin được chọn. Bạn có muốn thực hiện?">
 <!ENTITY slow.column "&amp;Bộ lọc chậm">
 <!ENTITY enabled.column "&amp;Bật">
-<!ENTITY subscription.lastDownload.checksumMismatch "Thất bại, checksum không đúng">
-<!ENTITY noFiltersInGroup.text "Nhóm được chọn không chứa nội dung .">
+<!ENTITY subscription.lastDownload.checksumMismatch "Thất bại, mã băm không phù hợp">
+<!ENTITY noFiltersInGroup.text "Nhóm được chọn trống.">
 <!ENTITY subscription.actions.label "Hành động">
-<!ENTITY filter.selectAll.label "Chọn hết">
+<!ENTITY filter.selectAll.label "Chọn tất cả">
 <!ENTITY backupButton.label "&amp;Sao lưu và phục hồi">
-<!ENTITY restore.minVersion.warning "Cảnh báo : Tập tin được tạo bởi phiên bản Adblock Plus mới hơn . Bạn cần cập nhập phiên bản mới nhất của Adblock Plus trước khi có thể khôi phục từ tập tin này .">
-<!ENTITY restore.error "Dữ liệu không thể được phục hồi ! Có thể file này không phải file phục hồi của AdBlock Plus ?">
-<!ENTITY sort.ascending.label "Hiển thị theo thứ tự A &gt; Z">
+<!ENTITY restore.minVersion.warning "Cảnh báo: tập tin đã được tạo bởi phiên bản Adblock Plus mới hơn. Bạn cần cập nhập lên phiên bản mới nhất của Adblock Plus trước khi có thể khôi phục từ tập tin này.">
+<!ENTITY restore.error "Dữ liệu của tập tin có thể không được xử lý, có lẽ đây không phải là một tập tin sao lưu của Adblock Plus?">
+<!ENTITY sort.ascending.label "Sắp xếp theo thứ tự &amp;A &gt;  Z">
 <!ENTITY sort.label "Sắp &amp;xếp theo">
 <!ENTITY subscription.source.label "Danh sách bộ lọc">
-<!ENTITY hitcount.column "&amp;Số lần hit">
-<!ENTITY noFilters.text "Bạn chưa có bộ lọc cá nhân nào .">
-<!ENTITY backup.custom.title "Chỉ hiển thị bộ lọc cá nhân">
+<!ENTITY hitcount.column "&amp;Số lần bấm">
+<!ENTITY noFilters.text "Bạn chưa có bộ lọc tùy biến nào.">
+<!ENTITY backup.custom.title "Chỉ bộ lọc tùy biến">
 <!ENTITY subscription.external.label "Được cập nhập bởi ứng dụng khác">
 <!ENTITY subscription.delete.label "Xóa">
 <!ENTITY noGroupSelected.text "Bạn cần chọn nhóm cho bộ lọc trước khi nó được hiển thị">
@@ -21,8 +21,8 @@
 <!ENTITY restore.default.label "Khôi phục từ ?1?">
 <!ENTITY subscription.lastDownload.inProgress "Đang tải...">
 <!ENTITY subscriptions.tab.label "Đăng ký bộ lọc">
-<!ENTITY sort.descending.label "Hiển thị theo thứ  tự Z &gt; A">
-<!ENTITY filters.remove.warning "Bạn có thực sự muốn xóa tất cả những bộ lọc được chọn ?">
+<!ENTITY sort.descending.label "Sắp xếp theo thứ tự &amp;Z &gt; A">
+<!ENTITY filters.remove.warning "Bạn có thực sự muốn loại bỏ tất cả những bộ lọc được chọn?">
 <!ENTITY filter.delete.label "Xóa">
 <!ENTITY addSubscriptionAdd.label "Thêm">
 <!ENTITY viewMenu.label "Hiển thị">
@@ -32,14 +32,14 @@
 <!ENTITY noSubscriptions.text "Bạn chưa chọn bất kì bộ lọc nào ! AdBlock Plus không thể hoạt động nếu không có một bộ lọc, xin hãy sử dụng &quot;Đăng ký bộ lọc&quot; để thêm bộ lọc cho mình .">
 <!ENTITY subscription.update.label "Cập nhập bộ lọc">
 <!ENTITY dialog.title "Tùy chọn bộ lọc AdBlock Plus">
-<!ENTITY addFilter.label "Thêm bộ lọc">
+<!ENTITY addFilter.label "&amp;Thêm bộ lọc">
 <!ENTITY subscription.minVersion.warning "Bộ lọc này cần có phiên bản Adblock Plus mới hơn, bạn cần phải cập nhập lên phiên bản mới nhất của AdBlock Plus .">
 <!ENTITY subscription.lastDownload.invalidURL "Thất bại, không phải là địa chỉ hợp lệ">
-<!ENTITY backup.error "Có vấn đề khi ghi phần tử lọc lên file . Hãy chắc chắn rằng file không bị Write-Protected hoặc được sử dụng bởi một ứng dụng khác.">
+<!ENTITY backup.error "Có vấn đề khi ghi bộ lọc vào tập tin. Hãy chắc chắn rằng tập tin không bị bảo vệ ghi hoặc bị sử dụng bởi một ứng dụng khác.">
 <!ENTITY filter.moveUp.label "Di chuyển lên">
-<!ENTITY addGroup.label "Thêm bộ lọc và nhóm">
+<!ENTITY addGroup.label "Thêm &amp;nhóm bộ lọc">
 <!ENTITY filter.edit.label "Chỉnh sửa">
-<!ENTITY subscription.showHideFilters.label "Hiện/Ẩn bộ lọc">
+<!ENTITY subscription.showHideFilters.label "Hiện/ẩn bộ lọc">
 <!ENTITY acceptableAds2.label "Cho phép một số quảng cáo không gây hại">
 <!ENTITY addSubscriptionOther.label "Thêm bộ lọc  khác">
 <!ENTITY close.label "Đóng">
@@ -47,24 +47,24 @@
 <!ENTITY filter.actions.label "Hành động cho bộ lọc">
 <!ENTITY filter.copy.label "Chép">
 <!ENTITY filter.moveDown.label "Di chuyển xuống">
-<!ENTITY filter.resetHitCounts.label "Reset số lần hit">
+<!ENTITY filter.resetHitCounts.label "Cài lại thống kê lượt bấm">
 <!ENTITY readMore.label "Đọc thêm">
 <!ENTITY subscription.moveUp.label "Chuyển lên trên">
 <!ENTITY addSubscription.label "Thêm bộ lọc">
 <!ENTITY subscription.homepage.label "Trang chủ">
-<!ENTITY backup.complete.title "Tất cả phần tử lọc và bộ lọc">
-<!ENTITY restore.own.label "Khôi phục bằng file khác">
-<!ENTITY restore.complete.warning "Tất cả tùy chỉnh bộ lọc của bạn sẽ được thay thế bởi tập tin được chọn. Bạn có muốn tiếp tục ?">
-<!ENTITY filters.tab.label "Bộ lọc cá nhân">
-<!ENTITY backup.label "Tạo điểm phục hồi mới">
-<!ENTITY find.label "Tìm">
+<!ENTITY backup.complete.title "Tất cả các bộ lọc và mục đăng ký">
+<!ENTITY restore.own.label "Khôi phục riêng">
+<!ENTITY restore.complete.warning "Tất cả tùy chỉnh bộ lọc của bạn sẽ được thay thế bởi nội dung của tập tin được chọn. Bạn có muốn thực hiện?">
+<!ENTITY filters.tab.label "Bộ lọc tùy biến">
+<!ENTITY backup.label "Tạo sao lưu mới">
+<!ENTITY find.label "&amp;Tìm">
 <!ENTITY subscription.moveDown.label "Chuyển xuống dưới">
 <!ENTITY subscription.lastDownload.connectionError "Thất bại, tải xuống thất bại">
 <!ENTITY subscription.lastDownload.success "Hoàn thành">
 <!ENTITY subscription.lastDownload.invalidData "Thất bại, đây không phải là danh sách bộ lọc hợp lệ">
 <!ENTITY filter.paste.label "Dán">
 <!ENTITY subscription.disabledFilters.enable "Bật bộ lọc đã bị vô hiệu hóa">
-<!ENTITY lasthit.column "Lần hit cuối">
+<!ENTITY lasthit.column "Lần bấm cuối">
 <!ENTITY subscription.editTitle.label "Sửa tiêu đề">
 <!ENTITY subscription.disabledFilters.warning "Một vài phần tử trong bộ lọc này đã bị vô hiệu hóa .">
 <!ENTITY filter.column "&amp;Quy luật lọc">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/vi/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/vi/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/vi/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/vi/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,16 +1,19 @@
-firstRun_feature_show_expanded=kích hoạt tính năng
+firstRun_feature_tracking_description=Duyệt riêng tư bằng cách vô hiệu theo dõi - ẩn theo dõi của bạn từ các công ty quảng cáo theo dõi từng bước của bạn.
 firstRun_toggle_off=TẮT
 firstRun_feature_tracking=Vô hiệu hóa theo dõi
-firstRun_feature_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_title=Adblock Plus đã được cài đặt
+firstRun_acceptableAdsExplanation=Chúng tôi khuyến khích các trang mạng dùng những quảng cáo minh bạch, không phiền nhiễu. Đó là lí do tại sao chúng tôi gây dựng <a>hướng dẫn chặt chẽ</a> để xác định các quảng cáo được chấp nhận, hiện dưới mức thiết lập mặc định. Nếu bạn vẫn muốn chặn mọi quảng cáo, bạn có thể <a>vô hiệu</a> điều này trong một vài giây.
 firstRun_toggle_on=BẬT
 firstRun_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_dataCorruptionWarning=Có phải trang này luôn hiển thị? <a>Bấm vào đây</a>
 firstRun_acceptableAdsHeadline=Những quảng cáo phiền phức sẽ bị chặn
-firstRun_share=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_share=Nói với bạn bè của bạn
+firstRun_share_headline=<a>Giúp chúng tôi một tay</a> trong việc làm trang mạng trở nên tốt hơn
+firstRun_features=Adblock Plus có thể làm nhiều hơn là chặn quảng cáo
+firstRun_feature_malware_description=Làm cho trình duyệt an toàn hơn bằng cách chặn các tên miền chứa phần mềm độc hại.
+firstRun_feature_social_description=Tự động loại bỏ lịch duyệt của các nút truyền thông mạng xã hội, như là nút Thích Facebook, xuất hiện trên trang mạng và theo dõi hành vi của bạn.
+firstRun_donate=ủng hộ
 firstRun_donate_label=Hỗ trợ dự án của chúng tôi
+firstRun_feature_social=Loại bỏ các nút bấm Phương tiện Mạng xã hội
+firstRun_legacySafariWarning=Bạn đang dùng một phiên bản cũ của Safari không được hỗ trợ bởi Adblock Plus. Nó có thể không hoạt động chính xác hoặc làm giảm trải nghiệm của người dùng trên một số trang mạng. Chúng tôi rất khuyến khích cập nhật lên Safari 6.1.1 hoặc cao hơn (trên OS X 10.8 Mountain Lion), hoặc Safari 7.0.1 hoặc cao hơn (trên OS X 10.9 Mavericks), hoặc dùng phiên bản mới nhất của Mozilla Firefox, Google Chrome hoặc Opera.
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/vi/global.properties adblock-plus-2.6+dfsg/chrome/locale/vi/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/vi/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/vi/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,39 +1,41 @@
 no_blocking_suggestions=Không có mục nào trong trang hiện tại có thể chặn được
 action3_tooltip=Nhấn để bật/tắt Adblock Plus.
-type_label_script=Mã
+notification_antiadblock_title=Ẩn tin nhắn mục tiêu?
+type_label_script=văn lệnh
 filter_elemhide_nocriteria=Không có chuẩn để nhận diện các phần tử bị ẩn
 blockingGroup_title=Quy tắc chặn quảng cáo
-whitelisted_tooltip=Adblock Plus đang hoạt động nhưng bị vô hiệu hóa trên trang hiện tại.
+whitelisted_tooltip=Adblock Plus bị vô hiệu ở trang hiện tại.
 type_label_stylesheet=stylesheet
 blocked_count_tooltip=?1? trong ?2?
 type_label_font=phông
-type_label_popup=Quảng cáo popup
-filter_regexp_tooltip=Bộ lọc này là một biểu thức quy tắc hoặc là do quá ngắn nên không tối ưu hóa được. Quá nhiều bộ lọc như thế này có thể làm chậm việc duyệt web của bạn.
+type_label_popup=cửa sổ bật lên
+filter_regexp_tooltip=Bộ lọc này là một biểu thức chính quy hoặc là do quá ngắn nên không tối ưu hóa được. Quá nhiều bộ lọc như thế này có thể làm chậm việc duyệt của bạn.
 action0_tooltip=Nhấn chuột trái để hiển thị trình đơn ngữ cảnh, nhấn chuột giữa để bật/tắt.
 whitelisted_page=Adblock Plus đã bị vô hiệu hóa cho trang hiện tại
-remove_group_warning=Bạn có thật sự muốn xóa bỏ nhóm này ?
+remove_group_warning=Bạn có thật sự muốn loại bỏ nhóm này?
 action1_tooltip=Nhấn chuột trái để mở/đóng các mục có thể chặn được, nhấn chuột giữa để bật/tắt.
 type_label_xmlhttprequest=yêu cầu XML
-active_tooltip=Adblock Plus đang hoạt động, ?1? bộ lọc trọn gói và ?2? bộ lọc tùy biến đang được dùng.
+active_tooltip=Adblock Plus đã kích hoạt, ?1? bộ lọc trọn gói và ?2? bộ lọc tùy biến đang được dùng.
 type_label_document=tài liệu
-type_label_object_subrequest=subrequest đối tượng
-whitelistGroup_title=Ngoại lệ
-disabled_tooltip=Adblock Plus đang tắt.
+type_label_object_subrequest=yêu cầu con đối tượng
+whitelistGroup_title=Quy tắc ngoại lệ
+disabled_tooltip=Adblock Plus đã bị vô hiệu.
 filter_elemhide_duplicate_id=Chỉ có thể xác định một ID của phần tử bị ẩn
 type_label_object=đối tượng
 action2_tooltip=Nhấn chuột trái để mở tùy chọn, nhấn chuột giữa để bật/tắt.
 type_label_subdocument=khung
-clearStats_warning=Điều này sẽ thiết lập lại toàn bộ thông số hit và sẽ tắt đếm thông số hits . Bạn có muốn tiếp tục ?
+clearStats_warning=Điều này sẽ thiết lập lại toàn bộ thông số lượt bấm và vô hiệu đếm lượt bấm. Bạn có muốn thực hiện?
+notification_antiadblock_message=Trang này đã được biết là hiện tin nhắn mục tiêu cho người dùng Adblock Plus. Bạn có muốn Adblock Plus ẩn tin nhắn mục tiêu?
 blocked_count_addendum=(trong danh sách trắng: ?1?, bị ẩn: ?2?)
 subscription_invalid_location=Địa chỉ để tải bộ lọc không phải là một URL hay tên tập tin hợp lệ.
 type_label_image=ảnh
 remove_subscription_warning=Bạn có thật sự muốn xóa bộ trọn gói này không?
 type_label_other=khác
-mobile_menu_enable=ABP : Bật
+mobile_menu_enable=ABP: Bật
 type_label_media=tiếng/phim
-mobile_menu_disable_site=ABP : Tắt trên ?1?
-elemhideGroup_title=Quy tắc ẩn yếu tố
-mobile_menu_enable_site=ABP : Bật trên ?1?
+mobile_menu_disable_site=ABP: Vô hiệu trên ?1?
+elemhideGroup_title=Quy tắc ẩn phần tử
+mobile_menu_enable_site=ABP: Kích hoạt trên ?1?
 type_label_elemhide=ẩn
-newGroup_title=Nhóm cho bộ lọc mới
-default_dialog_title=Adblock Cộng
+newGroup_title=Nhóm lọc mới
+default_dialog_title=Adblock Plus
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/vi/meta.properties adblock-plus-2.6+dfsg/chrome/locale/vi/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/vi/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/vi/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 description.short=Bực bội vì quảng cáo? Khó chịu vì bị theo dõi? Phiền vì biểu ngữ (banner)? Cài đặt Adblock Plus ngay để giành lại quyền kiểm soát internet và thay đổi cách thức mà bạn xem web.\n\nXem đoạn phim giới thiệu ở http://www.youtube.com/watch?v=oNvb2SjVjjI
-name=Adblock Cộng
+name=Adblock Plus
 description.long.addition1=Bắt đầu từ Adblock Cộng phiên bản 2.0 sẽ có tùy chọn cho Bộ Lọc để cho phép một số quảng cáo không gây phiền phức . Mục đích chính là hỗ trợ cho những trang web sử dụng loại quảng cáo này và để khuyến khích nhiều websites khác làm điều tương tự.  <a href="http://adblockplus.org/en/acceptable-ads">Đọc thêm</a>
-translator=Knight Vegor
+translator=Nguyễn Mạnh Hùng, Knight Vegor, SITUVN
 description.long=Adblock Plus cho phép bạn giành lại quyền kiểm soát internet và xem web theo cách bạn muốn. Tiện ích này được hỗ trợ bởi hơn bốn mươi bộ lọc trọn gói với hàng chục ngôn ngữ, sẽ tự động cấu hình cho các mục đích từ gỡ bỏ quảng cáo trực tuyến cho đến việc chặn các tên miền chứa phần mềm độc hại. Adblock Plus cũng cho phép bạn tùy biến bộ lọc với sự hỗ trợ của nhiều tính năng hữu ích khác nhau, bao gồm tùy chọn ngữ cảnh cho hình ảnh, thẻ chặn đối với các đối tượng Flash và Java, và một danh sách các mục có thể chặn được để gỡ bỏ script và stylesheet.
 description=Quảng cáo đã là dĩ vãng!
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/vi/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/vi/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/vi/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/vi/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;Có">
+<!ENTITY notification.button.no "&amp;Không">
 <!ENTITY sync.label "Đồng bộ thiết lập Adbl&amp;ock Plus">
 <!ENTITY whitelist.site.label "Vô hiệu hóa trên ?1?">
 <!ENTITY filters.label "&amp;Tùy chỉnh bộ lọc">
@@ -9,10 +11,11 @@
 <!ENTITY sendReport.label "&amp;Báo cáo vấn đề trên trang này">
 <!ENTITY whitelist.page.label "Chỉ vô hiệu hóa trên trang này">
 <!ENTITY context.image.label "Adblock Plus: Chặn Ảnh">
-<!ENTITY counthits.label "Đếm số lần &amp;hit của bộ lọc">
+<!ENTITY counthits.label "Đếm lượt &amp;bấm bộ lọc">
 <!ENTITY opensidebar.label "&amp;Mở các mục có thể chặn được">
+<!ENTITY notification.button.close "Đó&amp;ng">
 <!ENTITY contribute.label "Đóng góp cho Adblock Plus">
-<!ENTITY toolbarbutton.label "Adblock cộng">
+<!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus: Chặn Khung">
 <!ENTITY blocked.tooltip "Các mục bị chặn trong trang này:">
 <!ENTITY hideplaceholders.label "Ẩn &amp;chỗ giữ các yếu tố bị chặn">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/vi/sendReport.dtd adblock-plus-2.6+dfsg/chrome/locale/vi/sendReport.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/vi/sendReport.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/vi/sendReport.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -12,7 +12,7 @@
 <!ENTITY typeSelector.other.description "Chọn tùy chọn này nếu bạn nghi ngờ một vấn đề với bản thân Adblock Plus hơn là do bộ lọc của nó.">
 <!ENTITY issues.disabledgroups.enable.label "Kích hoạt bộ lọc trọn gói/nhóm bộ lọc">
 <!ENTITY typeWarning.override.label "Tôi hiể&amp;u và vẫn muốn gửi báo cáo">
-<!ENTITY issues.disabled.enable.label "Bật Adblock Plus">
+<!ENTITY issues.disabled.enable.label "Kích hoạt Adblock Plus">
 <!ENTITY update.fixed.description "Bản cập nhập đến bộ lọc của bạn có vẻ như đã sửa được lỗi mà bạn đang thông báo. Vui lòng tải lại trang và thử lại, nhấn Báo cáo lỗi lần nữa nếu vấn đề vẫn còn tiếp diễn.">
 <!ENTITY anonymous.label "&amp;Gửi thông tin ẩn danh">
 <!ENTITY reloadButton.label "Tải lại tr&amp;ang">
@@ -20,7 +20,7 @@
 <!ENTITY typeSelector.description "Cửa sổ này sẽ hướng dẫn bạn qua các bước cần thiết cho việc gửi lên một báo cáo vấn đề của Adblock Plus. Trước tiên, hãy chọn kiểu vấn đề mà bạn đang gặp trên trang này:">
 <!ENTITY screenshot.remove.label "Xóa dữ liệu nhạ&amp;y cảm">
 <!ENTITY issues.ownfilters.description "Một số bộ lọc áp dụng trên trang này do người dùng tự tạo ra. Vui lòng vô hiệu hóa các bộ lọc có thể đã gây ra vấn đề này:">
-<!ENTITY update.inProgress.description "Adblock Plus cần phải cập nhập bộ lọc quảng cáo để chắc chắn rằng vấn đề chưa được giải quyết. Xin hãy đợi ...">
+<!ENTITY update.inProgress.description "Adblock Plus cần phải cập nhập bộ lọc quảng cáo để chắc chắn rằng vấn đề chưa được giải quyết. Xin chờ...">
 <!ENTITY sendPage.retry.label "Gửi lại">
 <!ENTITY data.label "&amp;Dữ liệu báo cáo:">
 <!ENTITY recentReports.label "Các báo cáo được gửi lên gần đây của bạn">
@@ -35,14 +35,14 @@
 <!ENTITY typeSelector.other.label "&amp;Vấn đề khác">
 <!ENTITY emailComment.label "Chúng tôi khuyến khích bạn nhập địa chỉ email hợp lệ để chúng tôi tiện liên lạc nếu chúng tôi cần gì từ thông báo của bạn. Đồng thời, nó cũng giúp chúng tôi có thể ghi nhận công lao đóng góp của bạn .">
 <!ENTITY issues.whitelist.remove.label "Bật lại Adblock Plus trên trang này">
-<!ENTITY outdatedSubscriptions.description "Bộ lọc sau đã không được cập nhập từ 2 tuần trước . Vui lòng cập nhập bộ lọc trước khi gửi thông báo lỗi, có thể vấn đề đã được giải quyết từ trước .">
+<!ENTITY outdatedSubscriptions.description "Bộ lọc sau đã không được cập nhập từ hai tuần trước. Vui lòng cập nhập bộ lọc trước khi gửi thông báo lỗi, có thể vấn đề đã được giải quyết từ trước.">
 <!ENTITY dataCollector.description "Vui lòng đợi một lát trong khi Adblock Plus thu thập dữ liệu cần thiết.">
 <!ENTITY sendButton.label "&amp;Gửi báo cáo">
 <!ENTITY comment.label "&amp;Bình luận (phụ):">
 <!ENTITY sendPage.errorMessage "Một nỗ lực gửi báo cáo bị thất bại với mã lỗi &quot;?1?&quot;. Vui lòng chắc chắn rằng bạn đã được kết nối Internet rồi thử lại. Nếu vấn đề vẫn còn, vui lòng yêu cầu trợ giúp trên [link]diễn đàn Adblock Plus[/link].">
 <!ENTITY showRecentReports.label "Hiện các báo cáo được gửi lên gần đây">
 <!ENTITY commentPage.heading "Điền bình luận">
-<!ENTITY update.start.label "Bắt đầu cập nhập">
+<!ENTITY update.start.label "Bắt đầu cập nhập ngay">
 <!ENTITY issues.disabledfilters.description "Các bộ lọc sau đã bị vô hiệu hóa, song chúng có thể vẫn gây ảnh hưởng tới trang này:">
 <!ENTITY screenshot.description "Cùng một trang có thể trông khác đối với nhiều người khác nhau. Chúng tôi có thể hiểu vấn đề hơn nếu bạn đính kèm một ảnh chụp màn hình vào báo cáo. Bạn có thể xóa các phần chứa thông tin nhạy cảm cũng như đánh dấu các vùng dễ nhận thấy vấn đề. Để làm việc đó, nhấn chuột vào nút liên quan và chọn vùng hình ảnh bằng chuột của bạn.">
 <!ENTITY screenshot.attach.label "Đính &amp;kèm ảnh chụp trang vào báo cáo">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/vi/sidebar.dtd adblock-plus-2.6+dfsg/chrome/locale/vi/sidebar.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/vi/sidebar.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/vi/sidebar.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -23,9 +23,9 @@
 <!ENTITY detached.title "Adblock Plus: các mục có thể chặn (tách rời)">
 <!ENTITY docDomain.firstParty "(bên thứ nhất)">
 <!ENTITY tooltip.type.whitelisted "(sổ trắng)">
-<!ENTITY tooltip.filter.label "Bộ lọc đang chặn:">
+<!ENTITY tooltip.filter.label "Bộ lọc đang có hiệu lực:">
 <!ENTITY tooltip.filter.disabled "(bị vô hiệu hóa)">
-<!ENTITY context.editfilter.label "Chỉnh sửa bộ lọc đang chặn">
+<!ENTITY context.editfilter.label "Chỉnh sửa bộ lọc đang có hiệu lực">
 <!ENTITY tooltip.type.blocked "(đã chặn)">
 <!ENTITY size.label "Kích thước">
 <!ENTITY context.whitelist.label "Thêm quy luật ngoại lệ cho mục">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/vi/subscriptionSelection.dtd adblock-plus-2.6+dfsg/chrome/locale/vi/subscriptionSelection.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/vi/subscriptionSelection.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/vi/subscriptionSelection.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -2,7 +2,7 @@
 <!ENTITY list.download.failed "Adblock Plus không thể lấy danh sách bộ lọc trọn gói.">
 <!ENTITY list.download.retry "Thử lại">
 <!ENTITY title.label "&amp;Tiêu đề của bộ trọn gói:">
-<!ENTITY list.download.website "Xem trang web">
+<!ENTITY list.download.website "Xem trang mạng">
 <!ENTITY supplementMessage "Bộ lọc trọn gói này chỉ nên dùng kèm với bộ lọc trọn gói &quot;?1?&quot; - cái mà bạn chưa sử dụng.">
 <!ENTITY viewList.label "Xem bộ lọc">
 <!ENTITY visitHomepage.label "Vào trang chủ">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/zh-CN/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/zh-CN/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/zh-CN/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/zh-CN/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,14 +6,12 @@
 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=支持我们的项目
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/zh-CN/global.properties adblock-plus-2.6+dfsg/chrome/locale/zh-CN/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/zh-CN/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/zh-CN/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=当前页面无可过滤项目
 action3_tooltip=点击切换启用/禁用 Adblock Plus。
+notification_antiadblock_title=隐藏针对性的信息？
 type_label_script=脚本
 filter_elemhide_nocriteria=没有指定要隐藏元素的识别标准
 blockingGroup_title=广告屏蔽规则
@@ -24,6 +25,7 @@
 action2_tooltip=点击打开首选项，中键点击切换启用/禁用。
 type_label_subdocument=帧
 clearStats_warning=此操作将禁用并重置所有过滤规则生效次数统计。您确定要这样做吗？
+notification_antiadblock_message=此网站已知会对 Adblock Plus 用户显示针对性的信息。您想让 Adblock Plus 隐藏针对性的信息吗？
 blocked_count_addendum=(白名单: ?1?, 隐藏: ?2?)
 subscription_invalid_location=过滤规则列表的位置不是有效的 URL 或有效的文件名。
 type_label_image=图片
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/zh-CN/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/zh-CN/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/zh-CN/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/zh-CN/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "是(&amp;Y)">
+<!ENTITY notification.button.no "否(&amp;N)">
 <!ENTITY sync.label "同步 Adblo&amp;ck Plus 设置">
 <!ENTITY whitelist.site.label "在 ?1? 禁用 Adblock Plus">
 <!ENTITY filters.label "过滤规则首选项 (&amp;F)">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "过滤图片(Adblock Plus)">
 <!ENTITY counthits.label "统计过滤规则生效次数 (&amp;h)">
 <!ENTITY opensidebar.label "打开可过滤项目 (&amp;b)">
+<!ENTITY notification.button.close "关闭(&amp;C)">
 <!ENTITY contribute.label "助力 Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "过滤帧(Adblock Plus)">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/zh-TW/firstRun.properties adblock-plus-2.6+dfsg/chrome/locale/zh-TW/firstRun.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/zh-TW/firstRun.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/zh-TW/firstRun.properties	2014-04-22 06:28:36.000000000 +0000
@@ -6,16 +6,14 @@
 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=您正在使用舊版不支援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。
+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 -Nru adblock-plus-2.4.1+dfsg/chrome/locale/zh-TW/global.properties adblock-plus-2.6+dfsg/chrome/locale/zh-TW/global.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/zh-TW/global.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/zh-TW/global.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,6 @@
 no_blocking_suggestions=此頁面沒有可阻擋的項目
 action3_tooltip=點擊啟用或停用 Adblock Plus。
+notification_antiadblock_title=隱藏針對性的訊息？
 type_label_script=程式碼
 filter_elemhide_nocriteria=沒有指定欲隱藏元素的辨識名稱
 blockingGroup_title=廣告阻擋規則
@@ -24,6 +25,7 @@
 action2_tooltip=點擊開啟偏好設定視窗，按中鍵則可啟用或停用 Adblock Plus。
 type_label_subdocument=頁框
 clearStats_warning=這會重設所有的條件命中統計並停用命中計數器。您確定要這麼做？
+notification_antiadblock_message=已知此網站會對 Adblock Plus 用戶顯示針對性的訊息。您希望 Adblock Plus 隱藏它們嗎？
 blocked_count_addendum=(以及白名單: ?1?, 已隱藏: ?2?)
 subscription_invalid_location=條件集網址或檔案名稱無效。
 type_label_image=圖片
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/zh-TW/meta.properties adblock-plus-2.6+dfsg/chrome/locale/zh-TW/meta.properties
--- adblock-plus-2.4.1+dfsg/chrome/locale/zh-TW/meta.properties	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/zh-TW/meta.properties	2014-04-22 06:28:36.000000000 +0000
@@ -1,4 +1,4 @@
-description.short=討厭擾人的廣告嗎？害怕被追蹤嗎？痛恨一大片的橫幅廣告嗎？快安裝 Adblock Plus 讓您重拾網路控制權，自己決定想看的內容。\nAdblock Plus 的一分鐘短片介紹：http://www.youtube.com/watch?v=oNvb2SjVjjI
+description.short=過濾網路上所有煩人的廣告，YouTube、Facebook 等，任何您想得到的，都解決了。 \n\nAdblock Plus 會過濾所有惱人的廣告，且預設會支援採用較不起眼廣告的網站 (可變更此設定)。
 name=Adblock Plus
 description.long.addition1=自 Adblock Plus 2.0 起，條件偏好設定中新增了一個允許部分非侵入式廣告的選項。目的在支援那些選擇使用非侵入式廣告的網站，並鼓勵其他網站也這麼做。<a href="http://adblockplus.org/en/acceptable-ads">了解詳細情形</a>
 translator=Jose Sun,knight00931
diff -Nru adblock-plus-2.4.1+dfsg/chrome/locale/zh-TW/overlay.dtd adblock-plus-2.6+dfsg/chrome/locale/zh-TW/overlay.dtd
--- adblock-plus-2.4.1+dfsg/chrome/locale/zh-TW/overlay.dtd	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/locale/zh-TW/overlay.dtd	2014-04-22 06:28:36.000000000 +0000
@@ -1,3 +1,5 @@
+<!ENTITY notification.button.yes "&amp;確定">
+<!ENTITY notification.button.no "&amp;取消">
 <!ENTITY sync.label "同步 Adblo&amp;ck Plus 設定值">
 <!ENTITY whitelist.site.label "在 ?1? 停用">
 <!ENTITY filters.label "條件偏好設定 (&amp;F)">
@@ -11,6 +13,7 @@
 <!ENTITY context.image.label "Adblock Plus：阻擋圖片">
 <!ENTITY counthits.label "計算條件命中次數 (&amp;h)">
 <!ENTITY opensidebar.label "開啟可阻擋項目 (&amp;b)">
+<!ENTITY notification.button.close "&amp;關閉">
 <!ENTITY contribute.label "贊助 Adblock Plus">
 <!ENTITY toolbarbutton.label "Adblock Plus">
 <!ENTITY context.frame.label "Adblock Plus：阻擋頁框">
diff -Nru adblock-plus-2.4.1+dfsg/chrome/skin/composer.css adblock-plus-2.6+dfsg/chrome/skin/composer.css
--- adblock-plus-2.4.1+dfsg/chrome/skin/composer.css	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/skin/composer.css	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/skin/filters.css adblock-plus-2.6+dfsg/chrome/skin/filters.css
--- adblock-plus-2.4.1+dfsg/chrome/skin/filters.css	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/skin/filters.css	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/skin/firstRun.css adblock-plus-2.6+dfsg/chrome/skin/firstRun.css
--- adblock-plus-2.4.1+dfsg/chrome/skin/firstRun.css	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/skin/firstRun.css	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -439,8 +439,8 @@
 {
   visibility: hidden;
   opacity: 0;
-  -webkit-transition-property: opacity, visibility;
-  transition-property: opacity, visibility;
+  -webkit-transition-property: opacity;
+  transition-property: opacity;
 }
 
 #glass-pane
diff -Nru adblock-plus-2.4.1+dfsg/chrome/skin/overlay.css adblock-plus-2.6+dfsg/chrome/skin/overlay.css
--- adblock-plus-2.4.1+dfsg/chrome/skin/overlay.css	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/skin/overlay.css	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -198,8 +198,25 @@
   -moz-image-region: rect(0px, 28px, 14px, 14px);
 }
 
+#abp-notification
+{
+  width: 300px;
+}
+
+#abp-notification-question
+{
+  display: none;
+  white-space: nowrap;
+}
+
+.abp-question #abp-notification-question
+{
+  display: block;
+}
+
 #abp-notification html|a
 {
+  cursor: pointer;
   color: #0000f0;
 }
 
diff -Nru adblock-plus-2.4.1+dfsg/chrome/skin/sendReport.css adblock-plus-2.6+dfsg/chrome/skin/sendReport.css
--- adblock-plus-2.4.1+dfsg/chrome/skin/sendReport.css	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/skin/sendReport.css	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/skin/sidebar.css adblock-plus-2.6+dfsg/chrome/skin/sidebar.css
--- adblock-plus-2.4.1+dfsg/chrome/skin/sidebar.css	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/skin/sidebar.css	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/chrome/skin/subscriptionSelection.css adblock-plus-2.6+dfsg/chrome/skin/subscriptionSelection.css
--- adblock-plus-2.4.1+dfsg/chrome/skin/subscriptionSelection.css	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/chrome/skin/subscriptionSelection.css	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/debian/adblock-plus.upstream-changelog adblock-plus-2.6+dfsg/debian/adblock-plus.upstream-changelog
--- adblock-plus-2.4.1+dfsg/debian/adblock-plus.upstream-changelog	2014-01-19 23:29:54.000000000 +0000
+++ adblock-plus-2.6+dfsg/debian/adblock-plus.upstream-changelog	2014-04-23 14:24:52.000000000 +0000
@@ -1,7 +1,33 @@
-Detailed changelog for Adblock Plus 2.4.1
+Detailed changelog for Adblock Plus 2.6
+
+* The main focus of this release were performance improvements.
+  Changes:
+* Made sure Adblock Plus initialization doesn’t delay Firefox startup (issue 117).
+* Switched to a faster way to access Adblock Plus data on disk (issue 153).
+* Fixed regression in Adblock Plus 2.5.1: Adblock Plus initialization takes longer
+  for each new window opened (issue 238).
+* Fixed: Firefox Sync integration sometimes won’t work (issue 261).
+* Fixed: Filter search in Filter Preferences was broken in newer Firefox versions.
+* Fixed: Wrong button type displayed for Adblock Plus immediately after
+  customizing toolbar in Firefox 29 and above (bug 981543).
+* Fixed: Homepage link is displayed in Filter Preference even if the subscription
+  doesn’t define a homepage (issue 48).
+* Fixed: Pop-up blocker won’t work in some scenarios (issue 341).
+* Various code cleanup tasks (issue 137, issue 301, issue 354).
+
+Detailed changelog for Adblock Plus 2.5.1
 
-This release introduces support for the Australis theme that will be introduced in future Firefox versions. Other changes:
+* This release introduces a new notification that shows up the first time users
+  visit a website which show obtrusive anti-adblock messages asking them whether
+  to block those or not. Apart from this addition it also includes the following
+  changes:
+* Fixed: Pipe character in filters interpreted wrong under some circumstances
+* Fixed: Share window on first-run page doesn’t appear
+
+Detailed changelog for Adblock Plus 2.4.1
 
+* This release introduces support for the Australis theme that will be introduced in
+  future Firefox versions. Other changes:
 * Default icon location is the navigation toolbar again (add-on bar is going away).
 * Fixed image preview in the list of blockable items (forum topic).
 * Fixed keyboard shortcut on Mac OS X (Control key was used instead of Command).
diff -Nru adblock-plus-2.4.1+dfsg/debian/changelog adblock-plus-2.6+dfsg/debian/changelog
--- adblock-plus-2.4.1+dfsg/debian/changelog	2014-01-20 22:40:18.000000000 +0000
+++ adblock-plus-2.6+dfsg/debian/changelog	2014-04-26 12:29:12.000000000 +0000
@@ -1,8 +1,21 @@
-adblock-plus (2.4.1+dfsg-1~ubuntu12.04.1~ppa1) precise; urgency=medium
+adblock-plus (2.6+dfsg-1~ubuntu12.04.1~ppa1) precise; urgency=medium
 
   * No-change backport to precise
 
- -- Benjamin Drung <bdrung@ubuntu.com>  Mon, 20 Jan 2014 23:40:18 +0100
+ -- Benjamin Drung <bdrung@ubuntu.com>  Sat, 26 Apr 2014 14:29:12 +0200
+
+adblock-plus (2.6+dfsg-1) unstable; urgency=medium
+
+  * Imported Upstream version 2.6+dfsg
+  * Update copyright
+
+ -- David Prévot <taffit@debian.org>  Wed, 23 Apr 2014 10:30:38 -0400
+
+adblock-plus (2.5.1+dfsg-1) unstable; urgency=medium
+
+  * Imported Upstream version 2.5.1+dfsg
+
+ -- David Prévot <taffit@debian.org>  Fri, 21 Feb 2014 19:28:14 -0400
 
 adblock-plus (2.4.1+dfsg-1) unstable; urgency=medium
 
diff -Nru adblock-plus-2.4.1+dfsg/debian/copyright adblock-plus-2.6+dfsg/debian/copyright
--- adblock-plus-2.4.1+dfsg/debian/copyright	2014-01-19 23:29:54.000000000 +0000
+++ adblock-plus-2.6+dfsg/debian/copyright	2014-04-23 14:29:35.000000000 +0000
@@ -5,7 +5,7 @@
                 chrome/skin/fonts/CreteRound-Regular.otf
 
 Files: *
-Copyright: 2006-2013, Eyeo GmbH
+Copyright: 2006-2014, Eyeo GmbH
 License: GPL-3
 
 Files: debian/*
diff -Nru adblock-plus-2.4.1+dfsg/debian/patches/0001-Disable-acceptable-ads-feature-by-default.patch adblock-plus-2.6+dfsg/debian/patches/0001-Disable-acceptable-ads-feature-by-default.patch
--- adblock-plus-2.4.1+dfsg/debian/patches/0001-Disable-acceptable-ads-feature-by-default.patch	2014-01-19 23:29:54.000000000 +0000
+++ adblock-plus-2.6+dfsg/debian/patches/0001-Disable-acceptable-ads-feature-by-default.patch	2014-04-23 14:24:56.000000000 +0000
@@ -12,7 +12,7 @@
  2 files changed, 1 insertion(+), 6 deletions(-)
 
 diff --git a/chrome/content/ui/firstRun.html b/chrome/content/ui/firstRun.html
-index 0bd5285..274d3ac 100644
+index a61a01c..752742d 100644
 --- a/chrome/content/ui/firstRun.html
 +++ b/chrome/content/ui/firstRun.html
 @@ -40,11 +40,6 @@
@@ -28,10 +28,10 @@
      <section id="share">
        <h2 id="share-headline" class="i18n_firstRun_share_headline"></h2>
 diff --git a/lib/ui.js b/lib/ui.js
-index 4a46590..dc603ee 100644
+index 6570bca..000510a 100644
 --- a/lib/ui.js
 +++ b/lib/ui.js
-@@ -730,7 +730,7 @@ let UI = exports.UI =
+@@ -754,7 +754,7 @@ let UI = exports.UI =
    {
      // Add "acceptable ads" subscription for new users and user updating from old ABP versions.
      // Don't add it for users of privacy subscriptions (use a hardcoded list for now).
diff -Nru adblock-plus-2.4.1+dfsg/debian/patches/0002-No-focus-on-new-tab.patch adblock-plus-2.6+dfsg/debian/patches/0002-No-focus-on-new-tab.patch
--- adblock-plus-2.4.1+dfsg/debian/patches/0002-No-focus-on-new-tab.patch	2014-01-19 23:29:54.000000000 +0000
+++ adblock-plus-2.6+dfsg/debian/patches/0002-No-focus-on-new-tab.patch	2014-04-23 14:24:56.000000000 +0000
@@ -12,7 +12,7 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/appSupport.js b/lib/appSupport.js
-index e0dd46a..eaeb463 100644
+index f2a6c9b..057f95c 100644
 --- a/lib/appSupport.js
 +++ b/lib/appSupport.js
 @@ -270,7 +270,7 @@ switch (application)
diff -Nru adblock-plus-2.4.1+dfsg/defaults/patterns.ini adblock-plus-2.6+dfsg/defaults/patterns.ini
--- adblock-plus-2.4.1+dfsg/defaults/patterns.ini	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/defaults/patterns.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-# Adblock Plus preferences
-version=4
diff -Nru adblock-plus-2.4.1+dfsg/defaults/prefs.js adblock-plus-2.6+dfsg/defaults/prefs.js
--- adblock-plus-2.4.1+dfsg/defaults/prefs.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/defaults/prefs.js	2014-04-22 06:28:36.000000000 +0000
@@ -34,3 +34,4 @@
 pref("extensions.adblockplus.blockableItemsSize", {width: 200, height: 200});
 pref("extensions.adblockplus.notificationurl", "https://notification.adblockplus.org/notification.json");
 pref("extensions.adblockplus.notificationdata", {});
+pref("extensions.adblockplus.subscriptions_antiadblockurl", "https://easylist-downloads.adblockplus.org/antiadblockfilters.txt");
diff -Nru adblock-plus-2.4.1+dfsg/.hg_archival.txt adblock-plus-2.6+dfsg/.hg_archival.txt
--- adblock-plus-2.4.1+dfsg/.hg_archival.txt	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/.hg_archival.txt	2014-04-22 06:28:36.000000000 +0000
@@ -1,5 +1,5 @@
 repo: 6b6e266a6c16e1151bb6a16b35651ef3a1bddf1c
-node: bde47a0bbb6c958c52a46389aa0a57677a754524
+node: fc821f254bf72b5cac4db8003d46217448dc42a2
 branch: default
-latesttag: 2.4.1
+latesttag: 2.6
 latesttagdistance: 1
diff -Nru adblock-plus-2.4.1+dfsg/.hgsubstate adblock-plus-2.6+dfsg/.hgsubstate
--- adblock-plus-2.4.1+dfsg/.hgsubstate	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/.hgsubstate	2014-04-22 06:28:36.000000000 +0000
@@ -1 +1 @@
-d2f6dda08e423d1cf3112098c266a7a9066fe39f buildtools
+f58d40e12e413e92bb7fea66c3f88b5f28e82a2e buildtools
diff -Nru adblock-plus-2.4.1+dfsg/lib/antiadblockInit.js adblock-plus-2.6+dfsg/lib/antiadblockInit.js
--- adblock-plus-2.4.1+dfsg/lib/antiadblockInit.js	1970-01-01 00:00:00.000000000 +0000
+++ adblock-plus-2.6+dfsg/lib/antiadblockInit.js	2014-04-22 06:28:36.000000000 +0000
@@ -0,0 +1,78 @@
+/*
+ * This file is part of Adblock Plus <http://adblockplus.org/>,
+ * Copyright (C) 2006-2014 Eyeo GmbH
+ *
+ * Adblock Plus is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Adblock Plus is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+Cu.import("resource://gre/modules/Services.jsm");
+
+let {Utils} = require("utils");
+let {Prefs} = require("prefs");
+let {ActiveFilter} = require("filterClasses");
+let {FilterStorage} = require("filterStorage");
+let {FilterNotifier} = require("filterNotifier");
+let {Subscription} = require("subscriptionClasses");
+let {Notification} = require("notification");
+
+exports.initAntiAdblockNotification = function initAntiAdblockNotification()
+{
+  let notification = {
+    id: "antiadblock",
+    type: "question",
+    title: Utils.getString("notification_antiadblock_title"),
+    message: Utils.getString("notification_antiadblock_message"),
+    urlFilters: []
+  };
+
+  function notificationListener(approved)
+  {
+    let subscription = Subscription.fromURL(Prefs.subscriptions_antiadblockurl);
+    if (subscription.url in FilterStorage.knownSubscriptions)
+      subscription.disabled = !approved;
+  }
+
+  function addAntiAdblockNotification(subscription)
+  {
+    let urlFilters = [];
+    for (let filter of subscription.filters)
+      if (filter instanceof ActiveFilter)
+        for (let domain in filter.domains)
+          if (domain && urlFilters.indexOf(domain) == -1)
+            urlFilters.push(domain);
+    notification.urlFilters = urlFilters;
+    Notification.addNotification(notification);
+    Notification.addQuestionListener(notification.id, notificationListener);
+  }
+
+  function removeAntiAdblockNotification()
+  {
+    Notification.removeNotification(notification);
+    Notification.removeQuestionListener(notification.id, notificationListener);
+  }
+
+  let subscription = Subscription.fromURL(Prefs.subscriptions_antiadblockurl);
+  if (subscription.lastDownload && subscription.disabled)
+    addAntiAdblockNotification(subscription);
+
+  FilterNotifier.addListener(function(action, value, newItem, oldItem)
+  {
+    if (!/^subscription\.(updated|removed|disabled)$/.test(action) || value.url != Prefs.subscriptions_antiadblockurl)
+      return;
+
+    if (action == "subscription.updated")
+      addAntiAdblockNotification(value);
+    else if (action == "subscription.removed" || (action == "subscription.disabled" && !value.disabled))
+      removeAntiAdblockNotification();
+  });
+}
diff -Nru adblock-plus-2.4.1+dfsg/lib/appSupport.js adblock-plus-2.6+dfsg/lib/appSupport.js
--- adblock-plus-2.4.1+dfsg/lib/appSupport.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/lib/appSupport.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/lib/contentPolicy.js adblock-plus-2.6+dfsg/lib/contentPolicy.js
--- adblock-plus-2.4.1+dfsg/lib/contentPolicy.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/lib/contentPolicy.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -94,7 +94,7 @@
 
     // type constant by type description and type description by type constant
     let iface = Ci.nsIContentPolicy;
-    for each (let typeName in contentTypes)
+    for (let typeName of contentTypes)
     {
       if ("TYPE_" + typeName in iface)
       {
@@ -113,11 +113,11 @@
     this.typeDescr[0xFFFE] = "POPUP";
     this.localizedDescr[0xFFFE] = Utils.getString("type_label_popup");
 
-    for each (let type in nonVisualTypes)
+    for (let type of nonVisualTypes)
       this.nonVisual[this.type[type]] = true;
 
     // whitelisted URL schemes
-    for each (let scheme in Prefs.whitelistschemes.toLowerCase().split(" "))
+    for (let scheme of Prefs.whitelistschemes.toLowerCase().split(" "))
       this.whitelistSchemes[scheme] = true;
 
     TimeLine.log("done initializing types");
@@ -342,7 +342,7 @@
     if (entry.filter && !(entry.filter instanceof WhitelistFilter))
       return;
 
-    for each (let node in nodes)
+    for (let node of nodes)
       Utils.runAsync(refilterNode, this, node, entry);
   }
 };
@@ -378,7 +378,7 @@
     }
 
     let catMan = Utils.categoryManager;
-    for each (let category in this.xpcom_categories)
+    for (let category of this.xpcom_categories)
       catMan.addCategoryEntry(category, this.contractID, this.contractID, false, true);
 
     // http-on-opening-request is new in Gecko 18, http-on-modify-request can
@@ -401,7 +401,7 @@
       Services.obs.removeObserver(this, "xpcom-category-entry-removed");
       Services.obs.removeObserver(this, "xpcom-category-cleared");
 
-      for each (let category in this.xpcom_categories)
+      for (let category of this.xpcom_categories)
         catMan.deleteCategoryEntry(category, this.contractID, false);
 
       // This needs to run asynchronously, see bug 753687
@@ -514,7 +514,11 @@
         {
           let wnd = Utils.getRequestWindow(subject);
           if (wnd && wnd.opener && wnd.location.href == "about:blank")
+          {
             this.observe(wnd, "content-document-global-created", null, subject.URI);
+            if (subject instanceof Ci.nsIWritablePropertyBag)
+              subject.setProperty("abpRequestType", Policy.type.POPUP);
+          }
         }
 
         break;
@@ -584,6 +588,12 @@
         wnd = wnd.opener;
       }
 
+      if (contentType == Policy.type.POPUP && wnd.opener)
+      {
+        // Popups are initiated by their opener, not their own window.
+        wnd = wnd.opener;
+      }
+
       if (!Policy.processNode(wnd, wnd.document, contentType, newLocation, false))
         result = Cr.NS_BINDING_ABORTED;
     }
@@ -639,7 +649,7 @@
   let nodes = scheduledNodes;
   scheduledNodes = null;
 
-  for each (let node in nodes)
+  for (let node of nodes)
   {
     // adjust frameset's cols/rows for frames
     let parentNode = node.parentNode;
diff -Nru adblock-plus-2.4.1+dfsg/lib/customizableUI.js adblock-plus-2.6+dfsg/lib/customizableUI.js
--- adblock-plus-2.4.1+dfsg/lib/customizableUI.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/lib/customizableUI.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/lib/downloader.js adblock-plus-2.6+dfsg/lib/downloader.js
--- adblock-plus-2.4.1+dfsg/lib/downloader.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/lib/downloader.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -120,7 +120,7 @@
   _doCheck: function()
   {
     let now = Date.now();
-    for each (let downloadable in this.dataSource())
+    for (let downloadable of this.dataSource())
     {
       if (downloadable.lastCheck && now - downloadable.lastCheck > this.maxAbsenceInterval)
       {
diff -Nru adblock-plus-2.4.1+dfsg/lib/elemHideHitRegistration.js adblock-plus-2.6+dfsg/lib/elemHideHitRegistration.js
--- adblock-plus-2.4.1+dfsg/lib/elemHideHitRegistration.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/lib/elemHideHitRegistration.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/lib/elemHide.js adblock-plus-2.6+dfsg/lib/elemHide.js
--- adblock-plus-2.4.1+dfsg/lib/elemHide.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/lib/elemHide.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -248,13 +248,20 @@
       return;
     }
 
-    IO.writeToFile(styleURL.file, false, this._generateCSSContent(), function(e)
+    IO.writeToFile(styleURL.file, this._generateCSSContent(), function(e)
     {
       TimeLine.enter("ElemHide.apply() write callback");
       this._applying = false;
 
-      if (e && e.result == Cr.NS_ERROR_NOT_AVAILABLE)
-        IO.removeFile(styleURL.file, function(e2) {});
+      // _generateCSSContent is throwing NS_ERROR_NOT_AVAILABLE to indicate that
+      // there are no filters. If that exception is passed through XPCOM we will
+      // see a proper exception here, otherwise a number.
+      let noFilters = (e == Cr.NS_ERROR_NOT_AVAILABLE || (e && e.result == Cr.NS_ERROR_NOT_AVAILABLE));
+      if (noFilters)
+      {
+        e = null;
+        IO.removeFile(styleURL.file, function(e) {});
+      }
       else if (e)
         Cu.reportError(e);
 
@@ -263,14 +270,14 @@
         this._needsApply = false;
         this.apply();
       }
-      else if (!e || e.result == Cr.NS_ERROR_NOT_AVAILABLE)
+      else if (!e)
       {
         ElemHide.isDirty = false;
 
         ElemHide.unapply();
         TimeLine.log("ElemHide.unapply() finished");
 
-        if (!e)
+        if (!noFilters)
         {
           try
           {
diff -Nru adblock-plus-2.4.1+dfsg/lib/filterClasses.js adblock-plus-2.6+dfsg/lib/filterClasses.js
--- adblock-plus-2.4.1+dfsg/lib/filterClasses.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/lib/filterClasses.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -303,6 +303,13 @@
   ignoreTrailingDot: true,
 
   /**
+   * Determines whether domainSource is already upper-case,
+   * can be overridden by subclasses.
+   * @type Boolean
+   */
+  domainSourceIsUpperCase: false,
+
+  /**
    * Map containing domains that this filter should match on/not match on or null if the filter should match on all domains
    * @type Object
    */
@@ -312,7 +319,12 @@
 
     if (this.domainSource)
     {
-      let list = this.domainSource.split(this.domainSeparator);
+      let source = this.domainSource;
+      if (!this.domainSourceIsUpperCase) {
+        // RegExpFilter already have uppercase domains
+        source = source.toUpperCase();
+      }
+      let list = source.split(this.domainSeparator);
       if (list.length == 1 && list[0][0] != "~")
       {
         // Fast track for the common one-domain scenario
@@ -352,7 +364,7 @@
         domains[""] = !hasIncludes;
       }
 
-      delete this.domainSource;
+      this.domainSource = null;
     }
 
     this.__defineGetter__("domains", function() domains);
@@ -467,6 +479,11 @@
   __proto__: ActiveFilter.prototype,
 
   /**
+   * @see ActiveFilter.domainSourceIsUpperCase
+   */
+  domainSourceIsUpperCase: true,
+
+  /**
    * Number of filters contained, will always be 1 (required to optimize Matcher).
    * @type Integer
    */
@@ -489,25 +506,18 @@
   get regexp()
   {
     // Remove multiple wildcards
-    let source = this.regexpSource.replace(/\*+/g, "*");
-
-    // Remove leading wildcards
-    if (source[0] == "*")
-      source = source.substr(1);
-
-    // Remove trailing wildcards
-    let pos = source.length - 1;
-    if (pos >= 0 && source[pos] == "*")
-      source = source.substr(0, pos);
-
-    source = source.replace(/\^\|$/, "^")       // remove anchors following separator placeholder
-                   .replace(/\W/g, "\\$&")    // escape special symbols
-                   .replace(/\\\*/g, ".*")      // replace wildcards by .*
-                   // process separator placeholders (all ANSI charaters but alphanumeric characters and _%.-)
-                   .replace(/\\\^/g, "(?:[\\x00-\\x24\\x26-\\x2C\\x2F\\x3A-\\x40\\x5B-\\x5E\\x60\\x7B-\\x80]|$)")
-                   .replace(/^\\\|\\\|/, "^[\\w\\-]+:\\/+(?!\\/)(?:[^.\\/]+\\.)*?") // process extended anchor at expression start
-                   .replace(/^\\\|/, "^")       // process anchor at expression start
-                   .replace(/\\\|$/, "$");      // process anchor at expression end
+    let source = this.regexpSource
+      .replace(/\*+/g, "*")        // remove multiple wildcards
+      .replace(/\^\|$/, "^")       // remove anchors following separator placeholder
+      .replace(/\W/g, "\\$&")      // escape special symbols
+      .replace(/\\\*/g, ".*")      // replace wildcards by .*
+      // process separator placeholders (all ANSI characters but alphanumeric characters and _%.-)
+      .replace(/\\\^/g, "(?:[\\x00-\\x24\\x26-\\x2C\\x2F\\x3A-\\x40\\x5B-\\x5E\\x60\\x7B-\\x7F]|$)")
+      .replace(/^\\\|\\\|/, "^[\\w\\-]+:\\/+(?!\\/)(?:[^\\/]+\\.)?") // process extended anchor at expression start
+      .replace(/^\\\|/, "^")       // process anchor at expression start
+      .replace(/\\\|$/, "$")       // process anchor at expression end
+      .replace(/^(\.\*)/, "")      // remove leading wildcards
+      .replace(/(\.\*)$/, "");     // remove trailing wildcards
 
     let regexp = new RegExp(source, this.matchCase ? "" : "i");
 
@@ -584,7 +594,7 @@
   {
     options = match[1].toUpperCase().split(",");
     text = match.input.substr(0, match.index);
-    for each (let option in options)
+    for (let option of options)
     {
       let value = null;
       let separatorIndex = option.indexOf("=");
@@ -752,7 +762,7 @@
  */
 function ElemHideBase(text, domains, selector)
 {
-  ActiveFilter.call(this, text, domains ? domains.toUpperCase() : null);
+  ActiveFilter.call(this, text, domains || null);
 
   if (domains)
     this.selectorDomain = domains.replace(/,~[^,]+/g, "").replace(/^~[^,]+,?/, "").toLowerCase();
@@ -807,7 +817,7 @@
     let additional = "";
     if (attrRules) {
       attrRules = attrRules.match(/\([\w\-]+(?:[$^*]?=[^\(\)"]*)?\)/g);
-      for each (let rule in attrRules) {
+      for (let rule of attrRules) {
         rule = rule.substr(1, rule.length - 2);
         let separatorPos = rule.indexOf("=");
         if (separatorPos > 0) {
diff -Nru adblock-plus-2.4.1+dfsg/lib/filterListener.js adblock-plus-2.6+dfsg/lib/filterListener.js
--- adblock-plus-2.4.1+dfsg/lib/filterListener.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/lib/filterListener.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -267,7 +267,7 @@
 
     defaultMatcher.clear();
     ElemHide.clear();
-    for each (let subscription in FilterStorage.subscriptions)
+    for (let subscription of FilterStorage.subscriptions)
       if (!subscription.disabled)
         subscription.filters.forEach(addFilter);
     flushElemHide();
diff -Nru adblock-plus-2.4.1+dfsg/lib/filterNotifier.js adblock-plus-2.6+dfsg/lib/filterNotifier.js
--- adblock-plus-2.4.1+dfsg/lib/filterNotifier.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/lib/filterNotifier.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -66,7 +66,8 @@
    */
   triggerListeners: function(action, item, param1, param2, param3)
   {
-    for each (let listener in listeners)
+    let list = listeners.slice();
+    for (let listener of list)
       listener(action, item, param1, param2, param3);
   }
 };
diff -Nru adblock-plus-2.4.1+dfsg/lib/filterStorage.js adblock-plus-2.6+dfsg/lib/filterStorage.js
--- adblock-plus-2.4.1+dfsg/lib/filterStorage.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/lib/filterStorage.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -28,6 +28,7 @@
 let {Filter, ActiveFilter} = require("filterClasses");
 let {Subscription, SpecialSubscription, ExternalSubscription} = require("subscriptionClasses");
 let {FilterNotifier} = require("filterNotifier");
+let {Utils} = require("utils");
 let {TimeLine} = require("timeline");
 
 /**
@@ -86,6 +87,12 @@
   },
 
   /**
+   * Will be set to true if no patterns.ini file exists.
+   * @type Boolean
+   */
+  firstRun: false,
+
+  /**
    * Map of properties listed in the filter storage file before the sections
    * start. Right now this should be only the format version.
    */
@@ -110,7 +117,7 @@
   getGroupForFilter: function(/**Filter*/ filter) /**SpecialSubscription*/
   {
     let generalSubscription = null;
-    for each (let subscription in FilterStorage.subscriptions)
+    for (let subscription of FilterStorage.subscriptions)
     {
       if (subscription instanceof SpecialSubscription && !subscription.disabled)
       {
@@ -340,7 +347,7 @@
       for (let text in Filter.knownFilters)
         filters.push(Filter.knownFilters[text]);
     }
-    for each (let filter in filters)
+    for (let filter of filters)
     {
       filter.hitCount = 0;
       filter.lastHit = 0;
@@ -359,13 +366,14 @@
       return;
 
     TimeLine.enter("Entered FilterStorage.loadFromDisk()");
+    this._loading = true;
 
     let readFile = function(sourceFile, backupIndex)
     {
       TimeLine.enter("FilterStorage.loadFromDisk() -> readFile()");
 
       let parser = new INIParser();
-      IO.readFromFile(sourceFile, true, parser, function(e)
+      IO.readFromFile(sourceFile, parser, function(e)
       {
         TimeLine.enter("FilterStorage.loadFromDisk() read callback");
         if (!e && parser.subscriptions.length == 0)
@@ -444,17 +452,11 @@
       TimeLine.leave("FilterStorage.loadFromDisk() read callback done");
     }.bind(this);
 
-    let startRead = function(file)
-    {
-      this._loading = true;
-      readFile(file, 0);
-    }.bind(this);
-
     let explicitFile;
     if (sourceFile)
     {
       explicitFile = true;
-      startRead(sourceFile);
+      readFile(sourceFile, 0);
     }
     else
     {
@@ -465,11 +467,15 @@
       {
         if (e || !statData.exists)
         {
-          let {addonRoot} = require("info");
-          sourceFile = Services.io.newURI(addonRoot + "defaults/patterns.ini", null, null);
+          this.firstRun = true;
+          this._loading = false;
+          FilterNotifier.triggerListeners("load");
+
+          TimeLine.leave("FilterStorage.loadFromDisk() read callback done");
         }
-        startRead(sourceFile);
-      }
+        else
+          readFile(sourceFile, 0);
+      }.bind(this);
 
       if (sourceFile)
         IO.statFile(sourceFile, callback);
@@ -569,7 +575,7 @@
     let writeFilters = function()
     {
       TimeLine.enter("FilterStorage.saveToDisk() -> writeFilters()");
-      IO.writeToFile(targetFile, true, this._generateFilterData(subscriptions), function(e)
+      IO.writeToFile(targetFile, this._generateFilterData(subscriptions), function(e)
       {
         TimeLine.enter("FilterStorage.saveToDisk() write callback");
         if (!explicitFile)
@@ -689,7 +695,7 @@
   if (!(subscription.url in FilterStorage.knownSubscriptions))
     return;
 
-  for each (let filter in subscription.filters)
+  for (let filter of subscription.filters)
     filter.subscriptions.push(subscription);
 }
 
@@ -702,7 +708,7 @@
   if (!(subscription.url in FilterStorage.knownSubscriptions))
     return;
 
-  for each (let filter in subscription.filters)
+  for (let filter of subscription.filters)
   {
     let i = filter.subscriptions.indexOf(subscription);
     if (i >= 0)
@@ -790,9 +796,10 @@
 }
 INIParser.prototype =
 {
+  linesProcessed: 0,
   subscriptions: null,
   knownFilters: null,
-  knownSubscrptions : null,
+  knownSubscriptions : null,
   wantObj: true,
   fileProperties: null,
   curObj: null,
@@ -832,7 +839,7 @@
               if (this.subscriptions.length)
               {
                 let subscription = this.subscriptions[this.subscriptions.length - 1];
-                for each (let text in this.curObj)
+                for (let text of this.curObj)
                 {
                   let filter = Filter.fromText(text);
                   subscription.filters.push(filter);
@@ -877,5 +884,11 @@
       Filter.knownFilters = origKnownFilters;
       Subscription.knownSubscriptions = origKnownSubscriptions;
     }
+
+    // Allow events to be processed every now and then.
+    // Note: IO.readFromFile() will deal with the potential reentrance here.
+    this.linesProcessed++;
+    if (this.linesProcessed % 1000 == 0)
+      Utils.yield();
   }
 };
diff -Nru adblock-plus-2.4.1+dfsg/lib/io.js adblock-plus-2.6+dfsg/lib/io.js
--- adblock-plus-2.4.1+dfsg/lib/io.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/lib/io.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -19,12 +19,15 @@
  * @fileOverview Module containing file I/O helpers.
  */
 
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/FileUtils.jsm");
-Cu.import("resource://gre/modules/NetUtil.jsm");
+let {Services} = Cu.import("resource://gre/modules/Services.jsm", null);
+let {FileUtils} = Cu.import("resource://gre/modules/FileUtils.jsm", null);
+let {OS} = Cu.import("resource://gre/modules/osfile.jsm", null);
+let {Task} = Cu.import("resource://gre/modules/Task.jsm", null);
 
 let {TimeLine} = require("timeline");
+let {Utils} = require("utils");
+
+const BUFFER_SIZE = 0x8000;  // 32kB
 
 let IO = exports.IO =
 {
@@ -66,37 +69,58 @@
    * each line read and with a null parameter once the read operation is done.
    * The callback will be called when the operation is done.
    */
-  readFromFile: function(/**nsIFile|nsIURI*/ file, /**Boolean*/ decode, /**Object*/ listener, /**Function*/ callback, /**String*/ timeLineID)
+  readFromFile: function(/**nsIFile*/ file, /**Object*/ listener, /**Function*/ callback, /**String*/ timeLineID)
   {
     try
     {
+      let processing = false;
       let buffer = "";
-      let uri = file instanceof Ci.nsIFile ? Services.io.newFileURI(file) : file;
-      let request = new XMLHttpRequest();
-      request.mozBackgroundRequest = true;
-      request.open("GET", uri.spec);
-      request.responseType = "moz-chunked-text";
-      request.overrideMimeType("text/plain" + (decode ? "? charset=utf-8" : ""));
+      let loaded = false;
+      let error = null;
 
-      request.addEventListener("progress", function(event)
+      let onProgress = function(data)
       {
         if (timeLineID)
         {
           TimeLine.asyncStart(timeLineID);
         }
 
-        let data = event.target.response;
-        let index = Math.max(data.lastIndexOf("\n"), data.lastIndexOf("\r"));
+        let index = (processing ? -1 : Math.max(data.lastIndexOf("\n"), data.lastIndexOf("\r")));
         if (index >= 0)
         {
-          let oldBuffer = buffer;
-          buffer = data.substr(index + 1);
-          data = data.substr(0, index + 1);
-          let lines = data.split(/[\r\n]+/);
-          lines.pop();
-          lines[0] = oldBuffer + lines[0];
-          for (let i = 0; i < lines.length; i++)
-            listener.process(lines[i]);
+          // Protect against reentrance in case the listener processes events.
+          processing = true;
+          try
+          {
+            let oldBuffer = buffer;
+            buffer = data.substr(index + 1);
+            data = data.substr(0, index + 1);
+            let lines = data.split(/[\r\n]+/);
+            lines.pop();
+            lines[0] = oldBuffer + lines[0];
+            for (let i = 0; i < lines.length; i++)
+              listener.process(lines[i]);
+          }
+          finally
+          {
+            processing = false;
+            data = buffer;
+            buffer = "";
+            onProgress(data);
+
+            if (loaded)
+            {
+              loaded = false;
+              onSuccess();
+            }
+
+            if (error)
+            {
+              let param = error;
+              error = null;
+              onError(param);
+            }
+          }
         }
         else
           buffer += data;
@@ -105,10 +129,17 @@
         {
           TimeLine.asyncEnd(timeLineID);
         }
-      }, false);
+      };
 
-      request.addEventListener("load", function(event)
+      let onSuccess = function()
       {
+        if (processing)
+        {
+          // Still processing data, delay processing this event.
+          loaded = true;
+          return;
+        }
+
         if (timeLineID)
         {
           TimeLine.asyncStart(timeLineID);
@@ -125,127 +156,97 @@
         }
 
         callback(null);
-      }, false);
+      };
 
-      request.addEventListener("error", function()
+      let onError = function(e)
       {
-        let e = Cc["@mozilla.org/js/xpc/Exception;1"].createInstance(Ci.nsIXPCException);
-        e.initialize("File read operation failed", result, null, Components.stack, file, null);
+        if (processing)
+        {
+          // Still processing data, delay processing this event.
+          error = e;
+          return;
+        }
+
         callback(e);
 
         if (timeLineID)
         {
           TimeLine.asyncDone(timeLineID);
         }
-      }, false);
+      };
 
-      request.send(null);
+      let decoder = new TextDecoder();
+      let array = new Uint8Array(BUFFER_SIZE);
+      Task.spawn(function()
+      {
+        let f = yield OS.File.open(file.path, {read: true});
+        let numBytes;
+        do
+        {
+          numBytes = yield f.readTo(array);
+          if (numBytes)
+          {
+            let data = decoder.decode(numBytes == BUFFER_SIZE ?
+                                      array :
+                                      array.subarray(0, numBytes), {stream: true});
+            onProgress(data);
+          }
+        } while (numBytes);
+
+        yield f.close();
+      }.bind(this)).then(onSuccess, onError);
     }
     catch (e)
     {
       callback(e);
     }
   },
+
   /**
-   * Writes string data to a file asynchronously, optionally encodes it into
-   * UTF-8 first. The callback will be called when the write operation is done.
+   * Writes string data to a file in UTF-8 format asynchronously. The callback
+   * will be called when the write operation is done.
    */
-  writeToFile: function(/**nsIFile*/ file, /**Boolean*/ encode, /**Iterator*/ data, /**Function*/ callback, /**String*/ timeLineID)
+  writeToFile: function(/**nsIFile*/ file, /**Iterator*/ data, /**Function*/ callback, /**String*/ timeLineID)
   {
     try
     {
-      let fileStream = FileUtils.openSafeFileOutputStream(file, FileUtils.MODE_WRONLY | FileUtils.MODE_CREATE | FileUtils.MODE_TRUNCATE);
+      let encoder = new TextEncoder();
 
-      let pipe = Cc["@mozilla.org/pipe;1"].createInstance(Ci.nsIPipe);
-      pipe.init(true, true, 0, 0x8000, null);
-
-      let outStream = pipe.outputStream;
-      if (encode)
+      Task.spawn(function()
       {
-        outStream = Cc["@mozilla.org/intl/converter-output-stream;1"].createInstance(Ci.nsIConverterOutputStream);
-        outStream.init(pipe.outputStream, "UTF-8", 0, Ci.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER);
-      }
-
-      let copier = Cc["@mozilla.org/network/async-stream-copier;1"].createInstance(Ci.nsIAsyncStreamCopier);
-      copier.init(pipe.inputStream, fileStream, null, true, false, 0x8000, true, true);
-      copier.asyncCopy({
-        onStartRequest: function(request, context) {},
-        onStopRequest: function(request, context, result)
-        {
-          if (timeLineID)
-          {
-            TimeLine.asyncDone(timeLineID);
-          }
-
-          if (!Components.isSuccessCode(result))
-          {
-            let e = Cc["@mozilla.org/js/xpc/Exception;1"].createInstance(Ci.nsIXPCException);
-            e.initialize("File write operation failed", result, null, Components.stack, file, null);
-            callback(e);
-          }
-          else
-            callback(null);
-        }
-      }, null);
+        // This mimics OS.File.writeAtomic() but writes in chunks.
+        let tmpPath = file.path + ".tmp";
+        let f = yield OS.File.open(tmpPath, {write: true, truncate: true});
 
-      let lineBreak = this.lineBreak;
-      let writeNextChunk = function()
-      {
         let buf = [];
         let bufLen = 0;
-        while (bufLen < 0x4000)
+        let lineBreak = this.lineBreak;
+
+        function writeChunk()
         {
-          try
-          {
-            let str = data.next();
-            buf.push(str);
-            bufLen += str.length;
-          }
-          catch (e)
-          {
-            if (e instanceof StopIteration)
-              break;
-            else if (typeof e == "number")
-              pipe.outputStream.closeWithStatus(e);
-            else if (e instanceof Ci.nsIException)
-              pipe.outputStream.closeWithStatus(e.result);
-            else
-            {
-              Cu.reportError(e);
-              pipe.outputStream.closeWithStatus(Cr.NS_ERROR_FAILURE);
-            }
-            return;
-          }
+          let array = encoder.encode(buf.join(lineBreak) + lineBreak);
+          buf = [];
+          bufLen = 0;
+          return f.write(array);
         }
 
-        pipe.outputStream.asyncWait({
-          onOutputStreamReady: function()
-          {
-            if (timeLineID)
-            {
-              TimeLine.asyncStart(timeLineID);
-            }
+        for (let line in data)
+        {
+          buf.push(line);
+          bufLen += line.length;
+          if (bufLen >= BUFFER_SIZE)
+            yield writeChunk();
+        }
 
-            if (buf.length)
-            {
-              let str = buf.join(lineBreak) + lineBreak;
-              if (encode)
-                outStream.writeString(str);
-              else
-                outStream.write(str, str.length);
-              writeNextChunk();
-            }
-            else
-              outStream.close();
+        if (bufLen)
+          yield writeChunk();
 
-            if (timeLineID)
-            {
-              TimeLine.asyncEnd(timeLineID);
-            }
-          }
-        }, 0, 0, Services.tm.currentThread);
-      };
-      writeNextChunk();
+        // OS.File.flush() isn't exposed prior to Gecko 27, see bug 912457.
+        if (typeof f.flush == "function")
+          yield f.flush();
+        yield f.close();
+        yield OS.File.move(tmpPath, file.path, {noCopy: true});
+      }.bind(this)).then(callback.bind(null, null), callback);
     }
     catch (e)
     {
@@ -261,22 +262,8 @@
   {
     try
     {
-      let inStream = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(Ci.nsIFileInputStream);
-      inStream.init(fromFile, FileUtils.MODE_RDONLY, 0, Ci.nsIFileInputStream.DEFER_OPEN);
-
-      let outStream = FileUtils.openFileOutputStream(toFile, FileUtils.MODE_WRONLY | FileUtils.MODE_CREATE | FileUtils.MODE_TRUNCATE);
-
-      NetUtil.asyncCopy(inStream, outStream, function(result)
-      {
-        if (!Components.isSuccessCode(result))
-        {
-          let e = Cc["@mozilla.org/js/xpc/Exception;1"].createInstance(Ci.nsIXPCException);
-          e.initialize("File write operation failed", result, null, Components.stack, file, null);
-          callback(e);
-        }
-        else
-          callback(null);
-      });
+      let promise = OS.File.copy(fromFile.path, toFile.path);
+      promise.then(callback.bind(null, null), callback);
     }
     catch (e)
     {
@@ -291,8 +278,10 @@
   {
     try
     {
-      fromFile.moveTo(null, newName);
-      callback(null);
+      toFile = fromFile.clone();
+      toFile.leafName = newName;
+      let promise = OS.File.move(fromFile.path, toFile.path);
+      promise.then(callback.bind(null, null), callback);
     }
     catch(e)
     {
@@ -307,8 +296,8 @@
   {
     try
     {
-      file.remove(false);
-      callback(null);
+      let promise = OS.File.remove(file.path);
+      promise.then(callback.bind(null, null), callback);
     }
     catch(e)
     {
@@ -323,12 +312,28 @@
   {
     try
     {
-      let exists = file.exists();
-      callback(null, {
-        exists: exists,
-        isDirectory: exists && file.isDirectory(),
-        isFile: exists && file.isFile(),
-        lastModified: exists ? file.lastModifiedTime : 0
+      let promise = OS.File.stat(file.path);
+      promise.then(function onSuccess(info)
+      {
+        callback(null, {
+          exists: true,
+          isDirectory: info.isDir,
+          isFile: !info.isDir,
+          lastModified: info.lastModificationDate.getTime()
+        });
+      }, function onError(e)
+      {
+        if (e.becauseNoSuchFile)
+        {
+          callback(null, {
+            exists: false,
+            isDirectory: false,
+            isFile: false,
+            lastModified: 0
+          });
+        }
+        else
+          callback(e);
       });
     }
     catch(e)
diff -Nru adblock-plus-2.4.1+dfsg/lib/main.js adblock-plus-2.6+dfsg/lib/main.js
--- adblock-plus-2.4.1+dfsg/lib/main.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/lib/main.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/lib/matcher.js adblock-plus-2.6+dfsg/lib/matcher.js
--- adblock-plus-2.4.1+dfsg/lib/matcher.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/lib/matcher.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/lib/notification.js adblock-plus-2.6+dfsg/lib/notification.js
--- adblock-plus-2.4.1+dfsg/lib/notification.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/lib/notification.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -25,15 +25,23 @@
 let {Prefs} = require("prefs");
 let {Downloader, Downloadable, MILLIS_IN_MINUTE, MILLIS_IN_HOUR, MILLIS_IN_DAY} = require("downloader");
 let {Utils} = require("utils");
+let {Matcher} = require("matcher");
+let {Filter} = require("filterClasses");
 
 let INITIAL_DELAY = 12 * MILLIS_IN_MINUTE;
 let CHECK_INTERVAL = 1 * MILLIS_IN_HOUR;
 let EXPIRATION_INTERVAL = 1 * MILLIS_IN_DAY;
+let TYPE = {
+  information: 0,
+  question: 1,
+  critical: 2
+};
+
+let listeners = {};
 
 function getNumericalSeverity(notification)
 {
-  let levels = {information: 0, critical: 1};
-  return (notification.severity in levels ? levels[notification.severity] : levels.information);
+  return (notification.type in TYPE ? TYPE[notification.type] : TYPE.information);
 }
 
 function saveNotificationData()
@@ -60,6 +68,7 @@
  * @type Downloader
  */
 let downloader = null;
+let localData = [];
 
 /**
  * Regularly fetches notifications and decides which to show.
@@ -118,7 +127,17 @@
   {
     try
     {
-      Prefs.notificationdata.data = JSON.parse(responseText);
+      let data = JSON.parse(responseText);
+      for (let notification of data.notifications)
+      {
+        if ("severity" in notification)
+        {
+          if (!("type" in notification))
+            notification.type = notification.severity;
+          delete notification.severity;
+        }
+      }
+      Prefs.notificationdata.data = data;
     }
     catch (e)
     {
@@ -142,10 +161,10 @@
 
   /**
    * Determines which notification is to be shown next.
-   * @param {Array of Object} notifications active notifications
+   * @param {String} url URL to match notifications to (optional)
    * @return {Object} notification to be shown, or null if there is none
    */
-  getNextToShow: function()
+  getNextToShow: function(url)
   {
     function checkTarget(target, parameter, name, version)
     {
@@ -154,11 +173,11 @@
       return !((parameter in target && target[parameter] != name) ||
                (minVersionKey in target && Services.vc.compare(version, target[minVersionKey]) < 0) ||
                (maxVersionKey in target && Services.vc.compare(version, target[maxVersionKey]) > 0));
-
     }
 
-    if (typeof Prefs.notificationdata.data != "object" || !(Prefs.notificationdata.data.notifications instanceof Array))
-      return null;
+    let remoteData = [];
+    if (typeof Prefs.notificationdata.data == "object" && Prefs.notificationdata.data.notifications instanceof Array)
+      remoteData = Prefs.notificationdata.data.notifications;
 
     if (!(Prefs.notificationdata.shown instanceof Array))
     {
@@ -166,19 +185,36 @@
       saveNotificationData();
     }
 
+    let notifications = localData.concat(remoteData);
+    if (notifications.length === 0)
+      return null;
+
     let {addonName, addonVersion, application, applicationVersion, platform, platformVersion} = require("info");
-    let notifications = Prefs.notificationdata.data.notifications;
     let notificationToShow = null;
-    for each (let notification in notifications)
+    for (let notification of notifications)
     {
-      if ((typeof notification.severity === "undefined" || notification.severity === "information")
+      if ((typeof notification.type === "undefined" || notification.type !== "critical")
           && Prefs.notificationdata.shown.indexOf(notification.id) !== -1)
         continue;
 
+      if (typeof url === "string" || notification.urlFilters instanceof Array)
+      {
+        if (typeof url === "string" && notification.urlFilters instanceof Array)
+        {
+          let matcher = new Matcher();
+          for (let urlFilter of notification.urlFilters)
+            matcher.add(Filter.fromText(urlFilter));
+          if (!matcher.matchesAny(url, "DOCUMENT", url))
+            continue;
+        }
+        else
+          continue;
+      }
+
       if (notification.targets instanceof Array)
       {
         let match = false;
-        for each (let target in notification.targets)
+        for (let target of notification.targets)
         {
           if (checkTarget(target, "extension", addonName, addonVersion) &&
               checkTarget(target, "application", application, applicationVersion) &&
@@ -199,13 +235,22 @@
 
     if (notificationToShow && "id" in notificationToShow)
     {
-      Prefs.notificationdata.shown.push(notificationToShow.id);
-      saveNotificationData();
+      if (notificationToShow.type !== "question")
+        this.markAsShown(notificationToShow.id);
     }
 
     return notificationToShow;
   },
 
+  markAsShown: function(id)
+  {
+    if (Prefs.notificationdata.shown.indexOf(id) > -1)
+      return;
+
+    Prefs.notificationdata.shown.push(id);
+    saveNotificationData();
+  },
+
   /**
    * Localizes the texts of the supplied notification.
    * @param {Object} notification notification to translate
@@ -218,12 +263,77 @@
     locale = locale || Utils.appLocale;
     let textKeys = ["title", "message"];
     let localizedTexts = [];
-    for each (let key in textKeys)
+    for (let key of textKeys)
     {
       if (key in notification)
-        localizedTexts[key] = localize(notification[key], locale);
+      {
+        if (typeof notification[key] == "string")
+          localizedTexts[key] = notification[key];
+        else
+          localizedTexts[key] = localize(notification[key], locale);
+      }
     }
     return localizedTexts;
+  },
+
+  /**
+   * Adds a local notification.
+   * @param {Object} notification notification to add
+   */
+  addNotification: function(notification)
+  {
+    if (localData.indexOf(notification) == -1)
+      localData.push(notification);
+  },
+
+  /**
+   * Removes an existing local notification.
+   * @param {Object} notification notification to remove
+   */
+  removeNotification: function(notification)
+  {
+    let index = localData.indexOf(notification);
+    if (index > -1)
+      localData.splice(index, 1);
+  },
+
+  /**
+   * Adds a listener for question-type notifications
+   */
+  addQuestionListener: function(/**string*/ id, /**function(approved)*/ listener)
+  {
+    if (!(id in listeners))
+      listeners[id] = [];
+    if (listeners[id].indexOf(listener) === -1)
+      listeners[id].push(listener);
+  },
+
+  /**
+   * Removes a listener that was previously added via addQuestionListener
+   */
+  removeQuestionListener: function(/**string*/ id, /**function(approved)*/ listener)
+  {
+    if (!(id in listeners))
+      return;
+    let index = listeners[id].indexOf(listener);
+    if (index > -1)
+      listeners[id].splice(index, 1);
+    if (listeners[id].length === 0)
+      delete listeners[id];
+  },
+
+  /**
+   * Notifies listeners about interactions with a notification
+   * @param {String} id notification ID
+   * @param {Boolean} approved indicator whether notification has been approved or not
+   */
+  triggerQuestionListeners: function(id, approved)
+  {
+    if (!(id in listeners))
+      return;
+    let questionListeners = listeners[id];
+    for (let listener of questionListeners)
+      listener(approved);
   }
 };
 Notification.init();
diff -Nru adblock-plus-2.4.1+dfsg/lib/objectTabs.js adblock-plus-2.6+dfsg/lib/objectTabs.js
--- adblock-plus-2.4.1+dfsg/lib/objectTabs.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/lib/objectTabs.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -303,7 +303,7 @@
       objtab.removeEventListener("mouseout", objectTabEventHander, false);
       objtab.nodeData = null;
 
-      for each (let wnd in this.windowListeners)
+      for (let wnd of this.windowListeners)
         wnd.removeEventListener("MozAfterPaint", objectWindowEventHandler, false);
       this.windowListeners = null;
     }
diff -Nru adblock-plus-2.4.1+dfsg/lib/Public.jsm adblock-plus-2.6+dfsg/lib/Public.jsm
--- adblock-plus-2.4.1+dfsg/lib/Public.jsm	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/lib/Public.jsm	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -93,7 +93,7 @@
     subscription.lastDownload = parseInt(new Date().getTime() / 1000);
 
     let newFilters = [];
-    for each (let filter in filters)
+    for (let filter of filters)
     {
       filter = Filter.fromText(Filter.normalize(filter));
       if (filter)
@@ -130,7 +130,7 @@
    */
   addPatterns: function(/**Array of String*/ filters)
   {
-    for each (let filter in filters)
+    for (let filter of filters)
     {
       filter = Filter.fromText(Filter.normalize(filter));
       if (filter)
@@ -146,7 +146,7 @@
    */
   removePatterns: function(/**Array of String*/ filters)
   {
-    for each (let filter in filters)
+    for (let filter of filters)
     {
       filter = Filter.fromText(Filter.normalize(filter));
       if (filter)
diff -Nru adblock-plus-2.4.1+dfsg/lib/requestNotifier.js adblock-plus-2.6+dfsg/lib/requestNotifier.js
--- adblock-plus-2.4.1+dfsg/lib/requestNotifier.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/lib/requestNotifier.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -31,8 +31,8 @@
 let setEntry, hasEntry, getEntry;
 if (false)
 {
-  // This branch can be enabled again once both bug 673468 and bug 819131 are
-  // fixed and we can use weak maps
+  // This branch can be enabled again once all of bug 673468, bug 819131 and
+  // bug 982561 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);
@@ -153,51 +153,40 @@
    */
   startScan: function(wnd)
   {
-    let currentThread = Utils.threadManager.currentThread;
-
     let doc = wnd.document;
     let walker = doc.createTreeWalker(doc, Ci.nsIDOMNodeFilter.SHOW_ELEMENT, null, false);
 
-    let runnable =
+    let process = function()
     {
-      notifier: null,
+      if (!this.listener)
+        return;
 
-      run: function()
+      let node = walker.currentNode;
+      let data = getEntry(nodeData, node);
+      if (typeof data != "undefined")
+        for (let k in data)
+          this.notifyListener(wnd, node, data[k]);
+
+      if (walker.nextNode())
+        Utils.runAsync(process);
+      else
       {
-        if (!this.notifier.listener)
-          return;
+        // Done with the current window, start the scan for its frames
+        for (let i = 0; i < wnd.frames.length; i++)
+          this.startScan(wnd.frames[i]);
 
-        let node = walker.currentNode;
-        let data = getEntry(nodeData, node);
-        if (typeof data != "undefined")
-          for (let k in data)
-            this.notifier.notifyListener(wnd, node, data[k]);
-
-        if (walker.nextNode())
-          currentThread.dispatch(runnable, Ci.nsIEventTarget.DISPATCH_NORMAL);
-        else
+        this.eventsPosted--;
+        if (!this.eventsPosted)
         {
-          // Done with the current window, start the scan for its frames
-          for (let i = 0; i < wnd.frames.length; i++)
-            this.notifier.startScan(wnd.frames[i]);
-
-          this.notifier.eventsPosted--;
-          if (!this.notifier.eventsPosted)
-          {
-            this.notifier.scanComplete = true;
-            this.notifier.notifyListener(wnd, null, null);
-          }
-
-          this.notifier = null;
+          this.scanComplete = true;
+          this.notifyListener(wnd, null, null);
         }
       }
-    };
-    runnable.notifier = this;
+    }.bind(this);
 
-    // Process each node in a separate event on current thread to allow other
-    // events to process
+    // Process each node in a separate event to allow other events to process
     this.eventsPosted++;
-    currentThread.dispatch(runnable, Ci.nsIEventTarget.DISPATCH_NORMAL);
+    Utils.runAsync(process);
   }
 };
 
@@ -324,7 +313,7 @@
   }
 
   // Notify listeners
-  for each (let notifier in activeNotifiers)
+  for (let notifier of activeNotifiers)
     if (!notifier.window || notifier.window == topWnd)
       notifier.notifyListener(topWnd, node, this);
 }
diff -Nru adblock-plus-2.4.1+dfsg/lib/subscriptionClasses.js adblock-plus-2.6+dfsg/lib/subscriptionClasses.js
--- adblock-plus-2.4.1+dfsg/lib/subscriptionClasses.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/lib/subscriptionClasses.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -129,7 +129,7 @@
 
   serializeFilters: function(buffer)
   {
-    for each (let filter in this.filters)
+    for (let filter of this.filters)
       buffer.push(filter.text.replace(/\[/g, "\\["));
   },
 
@@ -274,7 +274,7 @@
   {
     if (this.defaults && this.defaults.length)
     {
-      for each (let type in this.defaults)
+      for (let type of this.defaults)
       {
         if (filter instanceof SpecialSubscription.defaultsMap[type])
           return true;
diff -Nru adblock-plus-2.4.1+dfsg/lib/synchronizer.js adblock-plus-2.6+dfsg/lib/synchronizer.js
--- adblock-plus-2.4.1+dfsg/lib/synchronizer.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/lib/synchronizer.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -98,7 +98,7 @@
     if (!Prefs.subscriptions_autoupdate)
       return;
 
-    for each (let subscription in FilterStorage.subscriptions)
+    for (let subscription of FilterStorage.subscriptions)
     {
       if (subscription instanceof DownloadableSubscription)
         yield this._getDownloadable(subscription, false);
@@ -255,7 +255,7 @@
     // Process filters
     lines.shift();
     let filters = [];
-    for each (let line in lines)
+    for (let line of lines)
     {
       line = Filter.normalize(line);
       if (line)
diff -Nru adblock-plus-2.4.1+dfsg/lib/sync.js adblock-plus-2.6+dfsg/lib/sync.js
--- adblock-plus-2.4.1+dfsg/lib/sync.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/lib/sync.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -198,7 +198,7 @@
         id: id,
         subscriptions: [],
       };
-      for each (let subscription in FilterStorage.subscriptions)
+      for (let subscription of FilterStorage.subscriptions)
       {
         if (subscription instanceof ExternalSubscription)
           continue;
@@ -211,7 +211,7 @@
         if (subscription instanceof SpecialSubscription)
         {
           subscriptionEntry.filters = [];
-          for each (let filter in subscription.filters)
+          for (let filter of subscription.filters)
           {
             let filterEntry = {text: filter.text};
             if (filter instanceof ActiveFilter)
@@ -251,7 +251,7 @@
 
     // First make sure we have the same subscriptions on both sides
     let seenSubscription = {__proto__: null};
-    for each (let remoteSubscription in data)
+    for (let remoteSubscription of data)
     {
       seenSubscription[remoteSubscription.url] = true;
       if (remoteSubscription.url in FilterStorage.knownSubscriptions)
@@ -282,7 +282,7 @@
       }
     }
 
-    for each (let subscription in FilterStorage.subscriptions.slice())
+    for (let subscription of FilterStorage.subscriptions.slice())
     {
       if (!(subscription.url in seenSubscription) && subscription instanceof DownloadableSubscription && !trackerInstance.didSubscriptionChange(subscription))
       {
@@ -293,12 +293,12 @@
 
     // Now sync the custom filters
     let seenFilter = {__proto__: null};
-    for each (let remoteSubscription in data)
+    for (let remoteSubscription of data)
     {
       if (!("filters" in remoteSubscription))
         continue;
 
-      for each (let remoteFilter in remoteSubscription.filters)
+      for (let remoteFilter of remoteSubscription.filters)
       {
         seenFilter[remoteFilter.text] = true;
 
@@ -320,12 +320,12 @@
       }
     }
 
-    for each (let subscription in FilterStorage.subscriptions)
+    for (let subscription of FilterStorage.subscriptions)
     {
       if (!(subscription instanceof SpecialSubscription))
         continue;
 
-      for each (let filter in subscription.filters.slice())
+      for (let filter of subscription.filters.slice())
       {
         if (!(filter.text in seenFilter) && !trackerInstance.didFilterChange(filter))
         {
@@ -348,13 +348,13 @@
   {
     this._log.trace("Got wipe command, removing all data");
 
-    for each (let subscription in FilterStorage.subscriptions.slice())
+    for (let subscription of FilterStorage.subscriptions.slice())
     {
       if (subscription instanceof DownloadableSubscription)
         FilterStorage.removeSubscription(subscription);
       else if (subscription instanceof SpecialSubscription)
       {
-        for each (let filter in subscription.filters.slice())
+        for (let filter of subscription.filters.slice())
           FilterStorage.removeFilter(filter);
       }
     }
@@ -435,9 +435,9 @@
         else if (item instanceof SpecialSubscription)
         {
           // User's filters changed via Preferences window
-          for each (let filter in item.filters)
+          for (let filter of item.filters)
             this.addPrivateChange("filter " + filter.text);
-          for each (let filter in item.oldFilters)
+          for (let filter of item.oldFilters)
             this.addPrivateChange("filter " + filter.text);
         }
         break;
diff -Nru adblock-plus-2.4.1+dfsg/lib/timeline.js adblock-plus-2.6+dfsg/lib/timeline.js
--- adblock-plus-2.4.1+dfsg/lib/timeline.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/lib/timeline.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/lib/ui.js adblock-plus-2.6+dfsg/lib/ui.js
--- adblock-plus-2.4.1+dfsg/lib/ui.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/lib/ui.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -30,6 +30,7 @@
 let {Synchronizer} = require("synchronizer");
 let {KeySelector} = require("keySelector");
 let {Notification} = require("notification");
+let {initAntiAdblockNotification} = require("antiadblockInit");
 
 let CustomizableUI;
 try
@@ -455,9 +456,27 @@
     }.bind(this));
 
     notificationTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
-    notificationTimer.initWithCallback(this._showNextNotification.bind(this),
+    notificationTimer.initWithCallback(this.showNextNotification.bind(this),
                                        3 * 60 * 1000, Ci.nsITimer.TYPE_ONE_SHOT);
     onShutdown.add(function() notificationTimer.cancel());
+
+    // Add "anti-adblock messages" notification
+    initAntiAdblockNotification();
+
+    let documentCreationObserver = {
+      observe: function(subject, topic, data)
+      {
+        if (!(subject instanceof Ci.nsIDOMWindow))
+          return;
+
+        this.showNextNotification(subject.location.href);
+      }.bind(UI)
+    };
+    Services.obs.addObserver(documentCreationObserver, "content-document-global-created", false);
+    onShutdown.add(function()
+    {
+      Services.obs.removeObserver(documentCreationObserver, "content-document-global-created", false);
+    });
   },
 
   /**
@@ -525,6 +544,11 @@
     }.bind(this));
     addBrowserClickListener(window, this.onBrowserClick.bind(this, window));
 
+    window.document.getElementById("abp-notification-close").addEventListener("command", function(event)
+    {
+      window.document.getElementById("abp-notification").hidePopup();
+    }, false);
+
     // First-run actions?
     if (!this.firstRunDone)
     {
@@ -770,6 +794,16 @@
         addAcceptable = false;
     }
 
+    // Add "anti-adblock messages" subscription
+    let subscription = Subscription.fromURL(Prefs.subscriptions_antiadblockurl);
+    if (subscription)
+    {
+      subscription.disabled = true;
+      FilterStorage.addSubscription(subscription);
+      if (subscription instanceof DownloadableSubscription && !subscription.lastDownload)
+        Synchronizer.execute(subscription);
+    }
+
     if (!addSubscription && !addAcceptable)
       return;
 
@@ -862,7 +896,7 @@
     let url = null;
     let mainSubscriptionTitle = null;
     let mainSubscriptionURL = null;
-    for each (let param in match[1].split('&'))
+    for (let param of match[1].split('&'))
     {
       let parts = param.split("=", 2);
       if (parts.length != 2 || !/\S/.test(parts[1]))
@@ -1046,7 +1080,7 @@
     }
     else
     {
-      if (icon.hasAttribute("context") && Prefs.defaulttoolbaraction == 0)
+      if (Prefs.defaulttoolbaraction == 0)
         icon.setAttribute("type", "menu");
       else
         icon.setAttribute("type", "menu-button");
@@ -1289,7 +1323,7 @@
     }
 
     // Prevent tooltip from overlapping menu
-    for each (let id in ["abp-toolbar-popup", "abp-status-popup"])
+    for (let id of ["abp-toolbar-popup", "abp-status-popup"])
     {
       let element = E(id);
       if (element && element.state == "open")
@@ -1757,7 +1791,7 @@
   {
     Prefs.hideContributeButton = true;
 
-    for each (let id in ["abp-status-contributebutton", "abp-toolbar-contributebutton", "abp-menuitem-contributebutton"])
+    for (let id of ["abp-status-contributebutton", "abp-toolbar-contributebutton", "abp-menuitem-contributebutton"])
     {
       let button = window.document.getElementById(id);
       if (button)
@@ -1765,7 +1799,7 @@
     }
   },
 
-  _showNextNotification: function()
+  showNextNotification: function(url)
   {
     let window = this.currentWindow;
     if (!window)
@@ -1776,7 +1810,7 @@
     if (!button)
       return;
 
-    let notification = Notification.getNextToShow();
+    let notification = Notification.getNextToShow(url);
     if (!notification)
       return;
 
@@ -1785,6 +1819,10 @@
 
   _showNotification: function(window, button, notification)
   {
+    let panel = window.document.getElementById("abp-notification");
+    if (panel.state !== "closed")
+      return;
+
     function insertMessage(element, text, links)
     {
       let match = /^(.*?)<(a|strong)>(.*?)<\/\2>(.*)$/.exec(text);
@@ -1809,10 +1847,11 @@
 
     let texts = Notification.getLocalizedTexts(notification);
     let titleElement = window.document.getElementById("abp-notification-title");
-    titleElement.setAttribute("value", texts.title);
+    titleElement.textContent = texts.title;
     let messageElement = window.document.getElementById("abp-notification-message");
+    messageElement.innerHTML = "";
     let docLinks = [];
-    for each (let link in notification.links)
+    for (let link of notification.links)
       docLinks.push(Utils.getDocLink(link));
     insertMessage(messageElement, texts.message, docLinks);
 
@@ -1821,14 +1860,29 @@
       let link = event.target;
       while (link && link !== messageElement && link.localName !== "a")
         link = link.parentNode;
-      if (!link)
+      if (!link || link.localName !== "a")
         return;
       event.preventDefault();
       event.stopPropagation();
       this.loadInBrowser(link.href, window);
     }.bind(this));
 
-    let panel = window.document.getElementById("abp-notification");
+    if (notification.type === "question")
+    {
+      function buttonHandler(approved, event)
+      {
+        event.preventDefault();
+        event.stopPropagation();
+        panel.hidePopup();
+        Notification.triggerQuestionListeners(notification.id, approved)
+        Notification.markAsShown(notification.id);
+      }
+      window.document.getElementById("abp-notification-yes").onclick = buttonHandler.bind(null, true);
+      window.document.getElementById("abp-notification-no").onclick = buttonHandler.bind(null, false);
+    }
+
+    panel.setAttribute("class", "abp-" + notification.type);
+    panel.setAttribute("noautohide", notification.type === "question");
     panel.openPopup(button, "bottomcenter topcenter", 0, 0, false, false, null);
   }
 };
diff -Nru adblock-plus-2.4.1+dfsg/lib/utils.js adblock-plus-2.6+dfsg/lib/utils.js
--- adblock-plus-2.4.1+dfsg/lib/utils.js	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/lib/utils.js	2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -225,7 +225,7 @@
         callback.apply(thisPtr, params);
       }
     };
-    Utils.threadManager.currentThread.dispatch(runnable, Ci.nsIEventTarget.DISPATCH_NORMAL);
+    Services.tm.currentThread.dispatch(runnable, Ci.nsIEventTarget.DISPATCH_NORMAL);
   },
 
   /**
@@ -315,7 +315,7 @@
       return null;
 
     let appLocale = Utils.appLocale;
-    for each (let prefix in prefixes.split(/,/))
+    for (let prefix of prefixes.split(/,/))
       if (new RegExp("^" + prefix + "\\b").test(appLocale))
         return prefix;
 
@@ -365,6 +365,16 @@
   },
 
   /**
+   * Pauses code execution and allows events to be processed. Warning:
+   * other extension code might execute, the extension might even shut down.
+   */
+  yield: function()
+  {
+    let thread = Services.tm.currentThread;
+    while (thread.processNextEvent(false));
+  },
+
+  /**
    * Saves sidebar state before detaching/reattaching
    */
   setParams: function(params)
@@ -585,7 +595,6 @@
 
 XPCOMUtils.defineLazyServiceGetter(Utils, "categoryManager", "@mozilla.org/categorymanager;1", "nsICategoryManager");
 XPCOMUtils.defineLazyServiceGetter(Utils, "ioService", "@mozilla.org/network/io-service;1", "nsIIOService");
-XPCOMUtils.defineLazyServiceGetter(Utils, "threadManager", "@mozilla.org/thread-manager;1", "nsIThreadManager");
 XPCOMUtils.defineLazyServiceGetter(Utils, "promptService", "@mozilla.org/embedcomp/prompt-service;1", "nsIPromptService");
 XPCOMUtils.defineLazyServiceGetter(Utils, "effectiveTLD", "@mozilla.org/network/effective-tld-service;1", "nsIEffectiveTLDService");
 XPCOMUtils.defineLazyServiceGetter(Utils, "netUtils", "@mozilla.org/network/util;1", "nsINetUtil");
diff -Nru adblock-plus-2.4.1+dfsg/metadata.gecko adblock-plus-2.6+dfsg/metadata.gecko
--- adblock-plus-2.4.1+dfsg/metadata.gecko	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/metadata.gecko	2014-04-22 06:28:36.000000000 +0000
@@ -1,7 +1,7 @@
 [general]
 id={d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}
 basename=adblockplus
-version=2.4.1
+version=2.6
 author=Wladimir Palant
 options=chrome://adblockplus/content/ui/settings.xul
 optionsType=2
@@ -29,11 +29,11 @@
 zh-TW=https://adblockplus.org/zh_TW/
 
 [compat]
-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
+firefox=19.0/32.0
+fennec2=19.0/32.0
+thunderbird=19.0/32.0
+seamonkey=2.16/2.29
+toolkit=19.0/32.0
 
 [preprocess]
 chrome/content/ui/firstRun.html =
diff -Nru adblock-plus-2.4.1+dfsg/normalizeLocales.pl adblock-plus-2.6+dfsg/normalizeLocales.pl
--- adblock-plus-2.4.1+dfsg/normalizeLocales.pl	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/normalizeLocales.pl	2014-04-22 06:28:36.000000000 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # This file is part of Adblock Plus <http://adblockplus.org/>,
-# Copyright (C) 2006-2013 Eyeo GmbH
+# Copyright (C) 2006-2014 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/search_and_replace.pl adblock-plus-2.6+dfsg/search_and_replace.pl
--- adblock-plus-2.4.1+dfsg/search_and_replace.pl	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/search_and_replace.pl	2014-04-22 06:28:36.000000000 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # This file is part of Adblock Plus <http://adblockplus.org/>,
-# Copyright (C) 2006-2013 Eyeo GmbH
+# Copyright (C) 2006-2014 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/test_locales.pl adblock-plus-2.6+dfsg/test_locales.pl
--- adblock-plus-2.4.1+dfsg/test_locales.pl	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/test_locales.pl	2014-04-22 06:28:36.000000000 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # This file is part of Adblock Plus <http://adblockplus.org/>,
-# Copyright (C) 2006-2013 Eyeo GmbH
+# Copyright (C) 2006-2014 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/update_locales.py adblock-plus-2.6+dfsg/update_locales.py
--- adblock-plus-2.4.1+dfsg/update_locales.py	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/update_locales.py	2014-04-22 06:28:36.000000000 +0000
@@ -2,7 +2,7 @@
 # coding: utf-8
 
 # This file is part of Adblock Plus <http://adblockplus.org/>,
-# Copyright (C) 2006-2013 Eyeo GmbH
+# Copyright (C) 2006-2014 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/validateChecksum.py adblock-plus-2.6+dfsg/validateChecksum.py
--- adblock-plus-2.4.1+dfsg/validateChecksum.py	2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/validateChecksum.py	2014-04-22 06:28:36.000000000 +0000
@@ -2,7 +2,7 @@
 # coding: utf-8
 
 # This file is part of Adblock Plus <http://adblockplus.org/>,
-# Copyright (C) 2006-2013 Eyeo GmbH
+# Copyright (C) 2006-2014 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as