[Pkg-mozext-commits] [adblock-plus] 16/24: Imported Upstream version 2.6.5+dfsg
David Prévot
taffit at moszumanska.debian.org
Mon Oct 20 02:15:24 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository adblock-plus.
commit f98646bc5af508c4307512cc078262279ff20d16
Author: David Prévot <taffit at debian.org>
Date: Sun Oct 19 21:18:13 2014 -0400
Imported Upstream version 2.6.5+dfsg
---
.hgtags | 1 +
COPYING | 674 ++++++++++++++++++++++++++
README.md | 2 +-
chrome/content/ui/filters-filteractions.js | 2 +-
chrome/content/ui/firstRun.html | 4 +-
chrome/content/ui/sendReport.js | 16 +-
chrome/content/ui/sendReport.xul | 2 +-
chrome/locale/ar/composer.dtd | 2 +-
chrome/locale/bg/sendReport.dtd | 22 +-
chrome/locale/bs/filters.dtd | 1 +
chrome/locale/ca/global.properties | 4 +-
chrome/locale/ca/overlay.dtd | 2 +-
chrome/locale/cs/sidebar.dtd | 2 +-
chrome/locale/cy/.incomplete | 0
chrome/locale/cy/composer.dtd | 33 ++
chrome/locale/cy/filters.dtd | 71 ++-
chrome/locale/cy/firstRun.properties | 20 +
chrome/locale/cy/global.properties | 51 +-
chrome/locale/cy/meta.properties | 7 +-
chrome/locale/cy/overlay.dtd | 31 ++
chrome/locale/cy/sendReport.dtd | 65 +++
chrome/locale/cy/sidebar.dtd | 35 ++
chrome/locale/cy/subscriptionSelection.dtd | 13 +-
chrome/locale/de/composer.dtd | 6 +-
chrome/locale/de/filters.dtd | 2 +-
chrome/locale/el/firstRun.properties | 7 +-
chrome/locale/en-GB/firstRun.properties | 4 +-
chrome/locale/es-CL/meta.properties | 6 +
chrome/locale/es-CL/overlay.dtd | 13 +
chrome/locale/fa/composer.dtd | 2 +-
chrome/locale/hi-IN/firstRun.properties | 4 +-
chrome/locale/id/composer.dtd | 20 +-
chrome/locale/id/filters.dtd | 94 ++--
chrome/locale/id/firstRun.properties | 38 +-
chrome/locale/id/global.properties | 48 +-
chrome/locale/id/meta.properties | 8 +-
chrome/locale/id/overlay.dtd | 46 +-
chrome/locale/id/sendReport.dtd | 32 +-
chrome/locale/id/sidebar.dtd | 46 +-
chrome/locale/id/subscriptionSelection.dtd | 20 +-
chrome/locale/ja/overlay.dtd | 2 +-
chrome/locale/ja/sendReport.dtd | 4 +-
chrome/locale/lv/firstRun.properties | 7 +-
chrome/locale/mk/filters.dtd | 2 +-
chrome/locale/mk/sendReport.dtd | 15 +
chrome/locale/ru/composer.dtd | 2 +-
chrome/locale/ru/global.properties | 10 +-
chrome/locale/ru/overlay.dtd | 20 +-
chrome/locale/ru/sendReport.dtd | 23 +-
chrome/locale/ru/sidebar.dtd | 2 +-
chrome/locale/ru/subscriptionSelection.dtd | 12 +-
chrome/locale/sl/composer.dtd | 4 +-
chrome/locale/sq/firstRun.properties | 20 +
chrome/locale/sq/global.properties | 44 +-
chrome/locale/sq/overlay.dtd | 31 +-
chrome/locale/sq/sendReport.dtd | 14 +-
chrome/locale/sq/subscriptionSelection.dtd | 2 +
chrome/locale/sv-SE/composer.dtd | 4 +-
chrome/locale/ta-LK/firstRun.properties | 14 +
chrome/locale/ta-LK/meta.properties | 6 +
chrome/locale/ta-LK/overlay.dtd | 32 +-
chrome/locale/ta-LK/sidebar.dtd | 37 +-
chrome/locale/ta-LK/subscriptionSelection.dtd | 12 +
chrome/locale/tr/firstRun.properties | 2 +-
chrome/locale/vi/composer.dtd | 2 +-
chrome/locale/vi/firstRun.properties | 7 +-
lib/antiadblockInit.js | 11 +-
lib/contentPolicy.js | 96 ++--
lib/elemHide.js | 31 +-
lib/elemHideHitRegistration.js | 6 +-
lib/filterClasses.js | 114 +++--
lib/filterListener.js | 8 -
lib/filterStorage.js | 30 +-
lib/io.js | 31 +-
lib/main.js | 11 -
lib/matcher.js | 67 +--
lib/notification.js | 5 -
lib/requestNotifier.js | 18 +-
lib/synchronizer.js | 5 -
lib/timeline.js | 155 ------
lib/utils.js | 7 +-
metadata.gecko | 12 +-
82 files changed, 1682 insertions(+), 711 deletions(-)
diff --git a/.hgtags b/.hgtags
index 82525c1..b358e13 100644
--- a/.hgtags
+++ b/.hgtags
@@ -60,3 +60,4 @@ dff84bf69895f51375f9733680d9c7cb3a8dd4e9 2.5.1
bd02ca5c067987daffced72133f56a06764a9672 2.6.1
7f2e2b6a16748d287e8b823492b0037973d6e013 2.6.2
303d48407220bd2c257b0cf87e78fadfd355048a 2.6.3
+b898d3f1f957a4e75b09fb44e7551b4e30ca7fd6 2.6.4
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..114f15c
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ {one line to give the program's name and a brief idea of what it does.}
+ Copyright (C) {year} {name of author}
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ {project} Copyright (C) {year} {fullname}
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/README.md b/README.md
index 3d609b8..54cf733 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
Adblock Plus for Firefox
========================
-Buildling
+Building
---------
### Requirements
diff --git a/chrome/content/ui/filters-filteractions.js b/chrome/content/ui/filters-filteractions.js
index deb2c07..340de35 100644
--- a/chrome/content/ui/filters-filteractions.js
+++ b/chrome/content/ui/filters-filteractions.js
@@ -382,7 +382,7 @@ var FilterActions =
if (event.metaKey)
modifiers |= SubscriptionActions._metaMask;
- if (event.charCode == " ".charCodeAt(0) && modifiers == 0 && !E("col-enabled").hidden)
+ if (event.keyCode == Ci.nsIDOMKeyEvent.DOM_VK_SPACE && modifiers == 0 && !E("col-enabled").hidden)
this.selectionToggleDisabled();
else if (event.keyCode == Ci.nsIDOMKeyEvent.DOM_VK_UP && modifiers == SubscriptionActions._accelMask)
{
diff --git a/chrome/content/ui/firstRun.html b/chrome/content/ui/firstRun.html
index c4f367b..d2cf6c6 100644
--- a/chrome/content/ui/firstRun.html
+++ b/chrome/content/ui/firstRun.html
@@ -59,9 +59,9 @@
<div id="share-general" class="share-buttons">
<a id="share-facebook" href="https://www.facebook.com/adblockplus" target="_blank" data-script="https://facebook.com/plugins/like.php?">
</a>
- <a id="share-twitter" href="https://twitter.com/adblockplus" target="_blank" data-script="https://platform.twitter.com/widgets.js">
+ <a id="share-twitter" href="https://twitter.com/adblockplus" target="_blank" data-script="https://platform.twitter.com/widgets/">
</a>
- <a id="share-gplus" href="https://www.google.com/+AdblockPlus" target="_blank" data-script="https://apis.google.com/js/plusone.js">
+ <a id="share-gplus" href="https://www.google.com/+AdblockPlus" target="_blank" data-script="https://apis.google.com/se/0/_/+1/fastbutton?">
</a>
</div>
diff --git a/chrome/content/ui/sendReport.js b/chrome/content/ui/sendReport.js
index a79c59c..651de56 100644
--- a/chrome/content/ui/sendReport.js
+++ b/chrome/content/ui/sendReport.js
@@ -733,6 +733,14 @@ let subscriptionUpdateDataSource =
type: null,
outdated: null,
needUpdate: null,
+
+ subscriptionFilter: function(s)
+ {
+ if (s instanceof DownloadableSubscription)
+ return subscriptionsDataSource.subscriptionFilter(s);
+ else
+ return false;
+ },
collectData: function(wnd, windowURI, callback)
{
@@ -744,7 +752,7 @@ let subscriptionUpdateDataSource =
this.outdated = [];
this.needUpdate = [];
- let subscriptions = FilterStorage.subscriptions.filter(issuesDataSource.subscriptionFilter);
+ let subscriptions = FilterStorage.subscriptions.filter(this.subscriptionFilter);
for (let i = 0; i < subscriptions.length; i++)
{
let lastSuccess = subscriptions[i].lastSuccess;
@@ -884,8 +892,12 @@ let issuesDataSource =
subscriptionFilter: function(s)
{
- if (s instanceof DownloadableSubscription)
+ if (s instanceof DownloadableSubscription &&
+ s.url != Prefs.subscriptions_exceptionsurl &&
+ s.url != Prefs.subscriptions_antiadblockurl)
+ {
return subscriptionsDataSource.subscriptionFilter(s);
+ }
else
return false;
},
diff --git a/chrome/content/ui/sendReport.xul b/chrome/content/ui/sendReport.xul
index 54e0726..f107fd2 100644
--- a/chrome/content/ui/sendReport.xul
+++ b/chrome/content/ui/sendReport.xul
@@ -213,7 +213,7 @@
<description>&emailComment.label;</description>
<hbox class="topLabel" align="baseline">
<label id="emailLabel" control="email" value="&email.label;"/>
- <textbox id="email" persist="value" flex="1" maxlength="200" oninput="updateEmail();"/>
+ <textbox id="email" type="email" persist="value" flex="1" maxlength="200" oninput="updateEmail();"/>
</hbox>
<checkbox id="anonymousCheckbox" label="&anonymous.label;" oncommand="updateEmail();"/>
<description id="anonymityWarning" visible="false">&anonymity.warning;</description>
diff --git a/chrome/locale/ar/composer.dtd b/chrome/locale/ar/composer.dtd
index 54ac458..56122c8 100644
--- a/chrome/locale/ar/composer.dtd
+++ b/chrome/locale/ar/composer.dtd
@@ -6,7 +6,7 @@
<!ENTITY pattern.label "إبحث عن نموذج">
<!ENTITY thirdParty.label "أطراف أ&خرى فقط">
<!ENTITY filter.label "&فلتر جديد :">
-<!ENTITY collapse.label "طوي المحجوب: (&س)">
+<!ENTITY collapse.label "طوي المحجوب:">
<!ENTITY match.warning "النموذج الذي أدخلته لم يعد موافقا للعنوان الذي يجب أن يحجب أو يسمح به ولن يأثر فيه">
<!ENTITY anchor.start.label "في ب&داية العنوان">
<!ENTITY matchCase.label "م&طابقة الحالة">
diff --git a/chrome/locale/bg/sendReport.dtd b/chrome/locale/bg/sendReport.dtd
index 6227bc9..0f5d8b5 100644
--- a/chrome/locale/bg/sendReport.dtd
+++ b/chrome/locale/bg/sendReport.dtd
@@ -1,12 +1,12 @@
<!ENTITY screenshot.undo.label "&Отмени">
<!ENTITY issues.disabledgroups.description "Следните абонаменти за филтри/групи филтри са изключени. Все пак биха могли да имат ефект върху тази страница:">
-<!ENTITY showData.label "Покажи докладваните данни">
+<!ENTITY showData.label "Покажи данните който са докладвани">
<!ENTITY typeSelector.falsePositive.label "Adblock Plus блокира твърде &много">
<!ENTITY issues.change.description "Вашата конфигурация е променена. Моля, презаредете страницата, за да тествате промените и да представите доклад, ако въпросът не бъде уреден от промените.">
<!ENTITY email.label "&Е-поща:">
-<!ENTITY issues.openPreferences.label "Отваряне на настройките на филтъра">
-<!ENTITY sendPage.confirmation "Докладът е записан. Ще го откриете на следния адрес:">
-<!ENTITY copyLink.label "&Копирай препратката на доклада">
+<!ENTITY issues.openPreferences.label "Отвори настройките за филтър">
+<!ENTITY sendPage.confirmation "Докладът ти е записан. Ще го откриете на следния адрес:">
+<!ENTITY copyLink.label "&Копирай препратка на доклада">
<!ENTITY issues.nofilters.description "Adblock Плюс не блокира нищо на текущата страница. Наблюдавания проблем най-вероятно
не е свързан с Adblock Плюс.">
<!ENTITY sendPage.knownIssue "Докладваният от Вас проблем вероятно вече е известен. За повече информация:">
@@ -16,20 +16,20 @@
<!ENTITY issues.disabled.enable.label "Разрешаване на Adblock Plus">
<!ENTITY update.fixed.description "Актуализациите на вашите абонаменти за филтри вероятно са решили въпроса който сте докладвали. Моля, презаредете страницата и опитайте отново, Докладвайте отново, ако проблемът все още го има.">
<!ENTITY anonymous.label "&Анонимно изпращане на информация">
-<!ENTITY reloadButton.label "Пре&зареди страницата">
+<!ENTITY reloadButton.label "&Презареди страницата">
<!ENTITY recentReports.clear.label "Премах&ни всички доклади">
<!ENTITY typeSelector.description "Този прозорец ще ви преведе през стъпките, необходими за подаване на доклад за Adblock
Плюс проблем. Първо, моля изберете вида на проблема, който сте срещнали на тази страница:">
<!ENTITY screenshot.remove.label "П&ремахване на чувствителните данни">
<!ENTITY issues.ownfilters.description "Някои от филтрите, приложени на тази страница са дефинирани от потребителя. Моля, деактивирайте филтрите, които може да причиняват проблема:">
-<!ENTITY update.inProgress.description "Adblock Plus трябва да актуализира вашите абонаменти за филтри и да се увери, че въпросът не е решен вече. Моля, изчакайте..">
+<!ENTITY update.inProgress.description "Adblock Plus трябва да актуализира вашия филтър абонамент за да сте сигурни, че проблемът не е бил разрешен. Моля, изчакайте...">
<!ENTITY sendPage.retry.label "Изпрати отново">
<!ENTITY data.label "&Докладвани данни:">
<!ENTITY recentReports.label "Вашите наскоро представените доклади">
<!ENTITY typeWarning.description "Посочили сте, че искате да съобщите за общ проблем с Adblock Plus, а не проблем с филтрите. Моля, обърнете внимание, че тези въпроси са най-докладвани във [link]форума на Adblock Plus[/link]. Трябва да използвате докладчика на проблеми за допълване на съществуваща дискусия, тъй като никой няма да забележи вашия доклад, докато не предоставите връзка към него. Автоматично генерирана връзка ще бъде предоставена след предоставянето на доклада.">
<!ENTITY issues.disabled.description "Adblock Plus е изключен - няма да блокира нищо в неговото текущо състояние.">
<!ENTITY attachExtensions.label "Прилагане на списък с активните раз&ширения към доклада в случай че добавката причинява проблема">
-<!ENTITY issues.nosubscriptions.add.label "Добавяне на абонамент за филтър">
+<!ENTITY issues.nosubscriptions.add.label "Добави абонамент за филтър">
<!ENTITY issues.disabledfilters.enable.label "Разрешаване на филтър">
<!ENTITY issues.override.label "Конфигурацията е &правилна, продължаване с доклада">
<!ENTITY issues.nosubscriptions.description "Изглежда не сте абонирани за някои от предварително направени списъци с филтри, които автоматично премахват нежеланото съдържание от страниците.">
@@ -43,7 +43,7 @@
<!ENTITY comment.label "&Коментар (по избор):">
<!ENTITY sendPage.errorMessage "Опитът за изпращане на доклада се провали с код на грешка "?1?". Моля, уверете се, че сте свързани с интернет и повторете. Ако проблемът продължи, моля потърсете помощ в [link]форума на Adblock Plus[/link].">
<!ENTITY showRecentReports.label "Покажи наскоро представените доклади">
-<!ENTITY commentPage.heading "Въвеждане на коментар">
+<!ENTITY commentPage.heading "Въведете коментар">
<!ENTITY update.start.label "Започни обновяването сега">
<!ENTITY issues.disabledfilters.description "Следните филтри са изключени, но въпреки това може да окажат влияние на тази страница:">
<!ENTITY screenshot.description "Същата страница може да изглежда различно за различни хора. Това може да ни помогне да разберем проблема, ако прикачите снимка на екрана към вашия доклад. Можете да премахнете частите, съдържащи чувствителна информация, както и зони, в които проблемът се забелязва. За да направите това натиснете съответния бутон и изберете частта от изображението с мишката.">
@@ -53,12 +53,12 @@
<!ENTITY typeSelector.falseNegative.label "Adblock Плюс не блоки&ра реклама">
<!ENTITY typeSelector.heading "Избор на неизправност">
<!ENTITY anonymity.warning "Ние няма да бъдем в състояние да се върнем при теб и вероятно ще свалим приоритета на на доклада най доло.">
-<!ENTITY wizard.title "Докладчик за неизправност">
-<!ENTITY issues.ownfilters.disable.label "Забраняване на филтър">
+<!ENTITY wizard.title "Докладване за неизправност">
+<!ENTITY issues.ownfilters.disable.label "Забрани филтър">
<!ENTITY commentPage.description "Полето по-долу ви позволява да въведете коментар да ни помогне да разберем проблема. Тази стъпка не е задължителна, но се препоръчва, ако проблемът не е очевиден. Можете също да прегледате данните от доклада, преди да е изпратен.">
<!ENTITY comment.lengthWarning "Дължината на коментара надвишава 1000 знака. Само първите 1000 знака ще бъдат изпратени.">
<!ENTITY typeSelector.falseNegative.description "Изберете тази настройка, ако се показва реклама въпреки, че Adblock Плюс е включен.">
-<!ENTITY sendPage.waitMessage "Моля, изчакайте докато Adblock Plus предаде вашия доклад.">
+<!ENTITY sendPage.waitMessage "Моля, изчакайте докато Adblock Plus изпрати вашият доклад.">
<!ENTITY dataCollector.heading "Добре дошли в докладчика за неизправност">
<!ENTITY screenshot.heading "Прикрепяне на екранна снимка">
<!ENTITY sendPage.heading "Изпращане на доклада">
diff --git a/chrome/locale/bs/filters.dtd b/chrome/locale/bs/filters.dtd
index 28075ac..b96cfc1 100644
--- a/chrome/locale/bs/filters.dtd
+++ b/chrome/locale/bs/filters.dtd
@@ -5,5 +5,6 @@
<!ENTITY addSubscriptionAdd.label "Dodaj">
<!ENTITY viewMenu.label "Prikaz">
<!ENTITY filter.copy.label "Kopiraj">
+<!ENTITY addSubscriptionCancel.label "Ponistiti">
<!ENTITY filter.paste.label "Zalijepi">
<!ENTITY subscription.lastDownload.unknown "N/A">
diff --git a/chrome/locale/ca/global.properties b/chrome/locale/ca/global.properties
index 01918e6..58d9afe 100644
--- a/chrome/locale/ca/global.properties
+++ b/chrome/locale/ca/global.properties
@@ -1,6 +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?
+notification_antiadblock_title=Amagar missatges apuntats?
type_label_script=script
filter_elemhide_nocriteria=Cap criteri especificat per reconeixer l'element a amagar
blockingGroup_title=Regles de blocatge d'anuncis
@@ -25,7 +25,7 @@ type_label_object=objecte
action2_tooltip=Clica per obrir les preferències, clica amb el botó del mig per activar/desactivar.
type_label_subdocument=marc
clearStats_warning=Això reiniciarà totes les estadístiques d'ús del filtre.Vols procedir?
-notification_antiadblock_message=Aquesta web ha sigut coneguda per mostrar missatges dirigits a usuaris de Adblock Plus. Vols que Adblock Plus amague els missatges dirigits?
+notification_antiadblock_message=Aquest lloc ha estat conegut per mostrar missatges dirigides als usuaris Adblock Plus. Voleu Adblock Plus per ocultar missatges apuntats?
blocked_count_addendum=(també a la llista blanca: ?1?, amagats: ?2?)
subscription_invalid_location=La ubicació de la llista de filtres no és una URL vàlida ni un nom de fitxer vàlid.
type_label_image=imatge
diff --git a/chrome/locale/ca/overlay.dtd b/chrome/locale/ca/overlay.dtd
index 53462d9..f9c6dd1 100644
--- a/chrome/locale/ca/overlay.dtd
+++ b/chrome/locale/ca/overlay.dtd
@@ -1,4 +1,4 @@
-<!ENTITY notification.button.yes "&Si">
+<!ENTITY notification.button.yes "&Sí">
<!ENTITY notification.button.no "&No">
<!ENTITY sync.label "&Sincronitza la configuració de l'AdBlock Plus">
<!ENTITY whitelist.site.label "Inhabilita l'Adblock Plus a ?1?">
diff --git a/chrome/locale/cs/sidebar.dtd b/chrome/locale/cs/sidebar.dtd
index 8707ce4..7c94d15 100644
--- a/chrome/locale/cs/sidebar.dtd
+++ b/chrome/locale/cs/sidebar.dtd
@@ -18,7 +18,7 @@
<!ENTITY context.block.label "Blokovat tento objekt">
<!ENTITY context.enablefilter.label "Opět povolit filtr ?1?">
<!ENTITY detach.label "Oddělit">
-<!ENTITY whitelisted.label "Adresa je na bílé listině">
+<!ENTITY whitelisted.label "je na bílé listině">
<!ENTITY context.disablefilteronsite.label "Zakázat tento filtr na ?1?">
<!ENTITY detached.title "Adblock Plus: Blokovatelné prvky (odděleno)">
<!ENTITY docDomain.firstParty "(vlastní)">
diff --git a/chrome/locale/cy/.incomplete b/chrome/locale/cy/.incomplete
deleted file mode 100644
index e69de29..0000000
diff --git a/chrome/locale/cy/composer.dtd b/chrome/locale/cy/composer.dtd
new file mode 100644
index 0000000..94bbd39
--- /dev/null
+++ b/chrome/locale/cy/composer.dtd
@@ -0,0 +1,33 @@
+<!ENTITY anchor.end.label "ar dd&iwedd y cyfeiriad">
+<!ENTITY domainRestriction.label "Cyfyngu i &barth:">
+<!ENTITY collapse.default.no.label "Defnyddio'r rhagosodiad (na)">
+<!ENTITY firstParty.label "&Mewnol yn unig">
+<!ENTITY preferences.label "&Dangos hidlyddion presennol...">
+<!ENTITY pattern.label "Chwilio am batrwm">
+<!ENTITY thirdParty.label "&Allanol yn unig">
+<!ENTITY filter.label "&Hidlydd newydd:">
+<!ENTITY collapse.label "Cuddio'r hyn sydd wedi'i rwystro:">
+<!ENTITY match.warning "Nid yw'r patrwm a roesoch bellach yn cyfateb i'r cyfeiriad i'w rwystro/wenrestru ac ni fydd yn cael unrhyw effaith arno.">
+<!ENTITY anchor.start.label "ar &ddechrau'r cyfeiriad">
+<!ENTITY matchCase.label "&Ystyried priflythrennau">
+<!ENTITY custom.pattern.label "&Addasedig:">
+<!ENTITY unselectAllTypes.label "Dewis dim">
+<!ENTITY type.whitelist.label "Rheol &eithrio">
+<!ENTITY regexp.warning "Caiff y patrwm a roesoch ei ddehongli fel ymadrodd arferol na ellir ei brosesu'n effeithlon gan Adblock Plus a gall arafu'ch porwr. Os nad oeddech am ddefnyddio ymadrodd arferol, rhowch seren (*) ar ddiwedd y patrwm.">
+<!ENTITY dialog.title "Ychwanegu rheol hidlydd Adblock Plus">
+<!ENTITY basic.label "Golwg sylfaenol">
+<!ENTITY type.filter.label "Hidlydd &rhwystro">
+<!ENTITY types.label "Gweithredu ar y mathau:">
+<!ENTITY shortpattern.warning "Mae'r patrwm a roeswch yn rhy fyr i gael ei optimeiddio a gall arafu'ch porwr. Argymhellir eich bod yn dewis llinyn hwy ar gyfer yr hidlydd i Adblock Plus gael brosesu'r hidlydd yn fwy effeithlon.">
+<!ENTITY collapse.yes.label "Ie">
+<!ENTITY anchors.label "Derbyn y patrwm dim ond:">
+<!ENTITY collapse.default.yes.label "Defnyddio'r rhagosodiad (ie)">
+<!ENTITY domainRestriction.help "Defnyddiwch hwn i nodi un neu fwy o barthau wedi'u gwahanu gan y symbol '|'. Bydd yr hidlydd ond yn gweithredu ar y parth(au) a ddewiswyd. Mae tild (~) cyn enw parth yn golygu na fydd yr hidlydd yn gweithredu ar y parth hwnnw.">
+<!ENTITY accept.label "Ychwanegu hidlydd">
+<!ENTITY options.label "Dewisiadau">
+<!ENTITY disabled.warning "Mae Adblock Plus wedi'i analluogi ar hyn o bryd. Gallwch ychwanegu hidlyddion o hyd, ond fyddan nhw ddim yn weithredol oni bai i chi [link] alluogi Adblock Plus [/link].">
+<!ENTITY anchor.start.flexible.label "ar dd&echrau enw'r parth">
+<!ENTITY collapse.no.label "Na">
+<!ENTITY selectAllTypes.label "Dewis y cyfan">
+<!ENTITY advanced.label "Golwg uwch">
+<!ENTITY pattern.explanation "Gall y patrwm fod yn unrhyw ran o'r cyfeiriad; mae sêr (*) yn gweithredu fel nodau chwilio. Bydd yr hidlydd yn gweithredu ar y cyfeiriadau sy'n cyd-fynd â'r patrwm a roddwyd.">
diff --git a/chrome/locale/cy/filters.dtd b/chrome/locale/cy/filters.dtd
index cc3e9eb..fd5a076 100644
--- a/chrome/locale/cy/filters.dtd
+++ b/chrome/locale/cy/filters.dtd
@@ -1,3 +1,72 @@
+<!ENTITY restore.custom.warning "Bydd eich holl hidlyddion addasedig yn cael eu disodli gan y cynnwys yn y ffeil a ddewiswyd. Hoffech chi barhau?">
+<!ENTITY slow.column "Hidlyddion ara&f">
+<!ENTITY enabled.column "&Galluogwyd">
+<!ENTITY subscription.lastDownload.checksumMismatch "Methwyd, prawfswm anghywir">
+<!ENTITY noFiltersInGroup.text "Mae'r grŵp hwn yn wag.">
+<!ENTITY subscription.actions.label "Gweithredu">
+<!ENTITY filter.selectAll.label "Dewis popeth">
+<!ENTITY backupButton.label "&Creu copi wrth gefn ac adfer">
+<!ENTITY restore.minVersion.warning "Rhybudd: Crëwyd y ffeil gyda fersiwn diweddarach o Adblock Plus. Dylech ddefnyddio fersiwn diweddarach o Adblock Plus cyn adfer o'r ffeil hon.">
+<!ENTITY restore.error "Ni ellir prosesu data'r ffeil, efallai nad ffeil copi wrth gefn Adblock Plus yw hon?">
+<!ENTITY sort.ascending.label "Trefnu &A > Y">
+<!ENTITY sort.label "&Trefnu yn ôl">
+<!ENTITY subscription.source.label "Rhestr hidlyddion">
+<!ENTITY hitcount.column "&Ymweliadau">
+<!ENTITY noFilters.text "Does gennych chi ddim hidlyddion addasedig eto.">
+<!ENTITY backup.custom.title "Hidlyddion addasedig yn unig">
+<!ENTITY subscription.external.label "Diweddarwyd gan ychwanegiad arall">
+<!ENTITY subscription.delete.label "Dileu">
+<!ENTITY noGroupSelected.text "Rhaid i chi ddewis grŵp hidlo cyn dangos ei hidlyddion.">
+<!ENTITY filter.cut.label "Torri">
+<!ENTITY restore.default.label "Adfer copi wrth gefn o ?1?">
<!ENTITY subscription.lastDownload.inProgress "Yn lawrlwytho...">
-<!ENTITY subscription.lastDownload.label "Lawrlwythiad dywethaf">
+<!ENTITY subscriptions.tab.label "Tanysgrifiadau i hidlyddion">
+<!ENTITY sort.descending.label "Trefnu &Y > A">
+<!ENTITY filters.remove.warning "Ydych chi wir am ddileu'r holl hidlyddion a ddewiswyd?">
+<!ENTITY filter.delete.label "Dileu">
+<!ENTITY addSubscriptionAdd.label "Ychwanegu">
+<!ENTITY viewMenu.label "Golwg">
<!ENTITY subscription.lastDownload.unknown "Ddim yn berthnasol">
+<!ENTITY addSubscriptionCancel.label "Yn ôl">
+<!ENTITY subscription.enabled.label "Wedi'i alluogi">
+<!ENTITY noSubscriptions.text "'Dych chi heb ychwanegu unrhyw danysgrifiadau hidlo eto. Ni fydd Adblock Plus yn rhwystro dim heb hidlyddion, felly defnyddiwch "Ychwanegu tanysgrifiad hidlo" i ychwanegu rhai.">
+<!ENTITY subscription.update.label "Diweddaru'r hidlyddion">
+<!ENTITY dialog.title "Dewisiadau hidlyddion Adblock Plus">
+<!ENTITY addFilter.label "&Ychwanegu hidlydd">
+<!ENTITY subscription.minVersion.warning "Mae angen fersiwn diweddarach o Adblock Plus ar gyfer y tanysgrifiad hwn. Dylech chi ddiweddaru Adblock Plus.">
+<!ENTITY subscription.lastDownload.invalidURL "Methwyd, cyfeiriad annilys">
+<!ENTITY backup.error "Bu gwall wrth ysgrifennu'r hidlyddion i'r ffeil. Gwnewch yn siŵr ei bod hi'n bosibl ysgrifennu i'r ffeil a bod dim rhaglen arall yn defnyddio'r ffeil.">
+<!ENTITY filter.moveUp.label "Symud i fyny">
+<!ENTITY addGroup.label "Ychwanegu &grŵp hidlo">
+<!ENTITY filter.edit.label "Golygu">
+<!ENTITY subscription.showHideFilters.label "Dangos/cuddio'r hidlyddion">
+<!ENTITY acceptableAds2.label "Caniatáu rhai &hysbysiadau sydd ddim yn ymwthiol">
+<!ENTITY addSubscriptionOther.label "Ychwanegu tanysgrifiad gwahanol">
+<!ENTITY close.label "Cau">
+<!ENTITY sort.none.label "&Heb drefn">
+<!ENTITY filter.actions.label "Gweithredoedd yr hidlydd">
+<!ENTITY filter.copy.label "Copïo">
+<!ENTITY filter.moveDown.label "Symud i lawr">
+<!ENTITY filter.resetHitCounts.label "Ailosod ystadegau ymweld">
+<!ENTITY readMore.label "Darllen mwy">
+<!ENTITY subscription.moveUp.label "Symud i fyny">
+<!ENTITY addSubscription.label "Ychwanegu tanysgrifiad i &hidlydd">
+<!ENTITY subscription.homepage.label "Hafan">
+<!ENTITY backup.complete.title "Pob hidlydd a thanysgrifiad">
+<!ENTITY restore.own.label "Adfer copi wrth gefn eich hun">
+<!ENTITY restore.complete.warning "Bydd eich holl ddewisiadau hidlo yn cael eu disodli gan y cynnwys yn y ffeil a ddewiswyd. Hoffech chi barhau?">
+<!ENTITY filters.tab.label "Hidlyddion addasedig">
+<!ENTITY backup.label "Creu copi wrth gefn newydd">
+<!ENTITY find.label "&Canfod">
+<!ENTITY subscription.moveDown.label "Symud i lawr">
+<!ENTITY subscription.lastDownload.connectionError "Methwyd, gwall lawrlwytho">
+<!ENTITY subscription.lastDownload.success "Llwyddiannus">
+<!ENTITY subscription.lastDownload.invalidData "Methwyd, rhestr hidlyddion annilys">
+<!ENTITY filter.paste.label "Gludo">
+<!ENTITY subscription.disabledFilters.enable "Galluogi'r hidlyddion a analluogwyd">
+<!ENTITY lasthit.column "Ymweliad &diwethaf">
+<!ENTITY subscription.editTitle.label "Golygu'r teitl">
+<!ENTITY subscription.disabledFilters.warning "Analluogwyd rhai o hidlyddion y tanysgrifiad hwn.">
+<!ENTITY filter.column "&Rheol hidlydd">
+<!ENTITY subscription.lastDownload.label "Lawrlwythiad dywethaf">
+<!ENTITY viewList.label "Gweld rhestr">
diff --git a/chrome/locale/cy/firstRun.properties b/chrome/locale/cy/firstRun.properties
new file mode 100644
index 0000000..90dfc89
--- /dev/null
+++ b/chrome/locale/cy/firstRun.properties
@@ -0,0 +1,20 @@
+firstRun_feature_tracking_description=Porwch yn breifat drwy analluogi tracio - cuddio'ch camau oddi wrth gwmniau hysbysebu fyddai'n tracio pob dim.
+firstRun_toggle_off=I FFWRDD
+firstRun_feature_tracking=Analluogi tracio
+firstRun_feature_malware=Rhwystro meddalwedd maleisus
+firstRun_title=Mae Adblock Plus wedi'i osod
+firstRun_toggle_on=YMLAEN
+firstRun_acceptableAdsExplanation=Hoffem annog gwefannau i ddefnyddio hysbysebion syml, anymwthiol. Dyna pam rydym wedi sefydlu <a>canllawiau llym</a> i adnabod hysbysebion derbyniol, ac fe'u dangosir yn ddiofyn. Os hoffech rwystro'r holl hysbysebion gallwch <a>annalluogi</a> hyn mewn eiliadau.
+firstRun_contributor_credits=Clodydd i'r Cyfranwyr
+firstRun_dataCorruptionWarning=Ydy'r dudalen hon yn ymddangos drwy'r amser? <a>Cliciwch yma!</a>
+firstRun_acceptableAdsHeadline=Caiff hysbysebion diflas eu rhwystro o hyn ymlaen
+firstRun_share=Dywedwch wrth eich ffrindiau
+firstRun_share_headline=<a>Rhowch help llaw</a> i ni wneud y we'n lle gwell
+firstRun_feature_social_description=Gallwch gael gwared ar fotymau cyfryngau cymdeithasol yn ddiofyn, fel y Facebook Like, sy'n ymddangos ar dudalennau'r we ac yn tracio'ch ymddygiad.
+firstRun_filterlistsReinitializedWarning=Mae'n ymddangos bod nam wedi achosi i bob hidlydd gael ei ddileu ac ni allwn adfer copi wrth gefn. Felly bu'n rhaid i ni ailosod eich hidlyddion a gosodiadau Hysbysebion Derbyniol. Gwiriwch eich rhestri hidlo a gosodiadau Hysbysebion Derbyniol yng <a> ngosodiadau Adblock Plus</a>.
+firstRun_feature_malware_description=Gwnewch bori'n fwy diogel drwy rwystro parthau sy'n arwain at feddalwedd maleisus.
+firstRun_features=Gall Adblock Plus wneud mwy na rhwystro hysbysebion
+firstRun_donate=rhoddi
+firstRun_donate_label=Cefnogwch ein prosiect
+firstRun_feature_social=Dileu botymau cyfryngau cymdeithasol
+firstRun_legacySafariWarning=Mae'n ymddangos eich bod yn defnyddio hen fersiwn o Safari nad yw Adblock Plus yn ei gefnogi. Efallai na fydd yn gweithio'n iawn neu'n ymharu ar brofiad y defnyddiwr ar rai wefannau. Rydym yn argymell naill ai diweddaru i Safari 6.1.1 neu'n uwch (ar OS X 10.8 Mountain Lion), neu Safari 7.0.1 neu'n uwch (ar OS X 10.9 Mavericks), neu ddefnyddio fersiwn diweddaraf Mozilla Firefox, Google Chrome neu Opera.
diff --git a/chrome/locale/cy/global.properties b/chrome/locale/cy/global.properties
index 25c6ab7..f4ff082 100644
--- a/chrome/locale/cy/global.properties
+++ b/chrome/locale/cy/global.properties
@@ -1,10 +1,41 @@
-disabled_tooltip=Mae Adblock Plws wedi cael ei anablu.
-blocked_count_tooltip=?1? allan o ?2?
-action3_tooltip=Cliciwch i alluogi/anablu Adblock Plws.
-no_blocking_suggestions=Dim eitemau blocadwy ar y tudalen gyfredol
-action0_tooltip=Cliciwch i ddod a'r dewislen cysywllt, clic canol i'w alluogi/anablu.
-whitelisted_page=Mae Adblock Plws wedi cael ei anablu ar y dudalen gyfredol
-action2_tooltip=Cliciwch i agor dewisiadau, clic canol i'w alluogi/anablu.
-action1_tooltip=Cliciwch i agor/cau eitemau blocadwy, clic canol i'w alluogi/anablu.
-whitelisted_tooltip=Mae Adblock Plws yn weithredol, ond mae hi wedi cael ei anablu ar y dudalen gyfredol.
-remove_subscription_warning=Ydych chi wir eisiau dileu'r tanysgrifiad hon?
+no_blocking_suggestions=Does dim eitemau y gellir rhwystro ar y dudalen hon
+action3_tooltip=Cliciwch i alluogi/analluogi Adblock Plus.
+notification_antiadblock_title=Cuddio negeseuon wedi eu targedu?
+type_label_script=sgript
+filter_elemhide_nocriteria=Does dim maen prawf wedi ei bennu i gydnabod yr elfen i'w chuddio
+blockingGroup_title=Rheolau rhwystro hysbysebion
+whitelisted_tooltip=Analluogwyd Adblock Plus ar y dudalen hon.
+type_label_stylesheet=taflen arddull
+blocked_count_tooltip=?1? o ?2?
+type_label_font=ffont
+type_label_popup=naidlen
+filter_regexp_tooltip=Mae'r hidlydd hwn naill ai'n ymadrodd arferol neu'n rhy fyr i gael ei optimeiddio. Gall gormod o'r hidlyddion hyn arafu'ch porwr.
+action0_tooltip=Cliciwch i fynd i'r naidlen. Bydd clic canol yn galluogi/analluogi.
+whitelisted_page=Mae Adblock Plus wedi ei analluogi ar gyfer y dudalen hon
+remove_group_warning=Ydych chi wir am ddileu'r grŵp hwn?
+action1_tooltip=Cliciwch i agor/cau yr eitemau y gellir rhwystro. Bydd clic canol yn galluogi/analluogi.
+type_label_xmlhttprequest=cais XML
+active_tooltip=Mae Adblock Plus wedi ei alluogi ac mae ?1? tanysgrifiad hidlo a ?2? hidlydd addasedig yn cael eu defnyddio.
+type_label_document=dogfen
+type_label_object_subrequest=is-gais gwrthrych
+whitelistGroup_title=Rheolau eithrio
+disabled_tooltip=Analluogwyd Adblock Plus.
+filter_elemhide_duplicate_id=Gellir pennu dim ond un ID o'r elfen i'w chuddio
+type_label_object=gwrthrych
+action2_tooltip=Cliciwch i agor dewisiadau. Bydd clic canol yn galluogi/analluogi.
+type_label_subdocument=fframyn
+clearStats_warning=Bydd hyn yn ailosod holl ystadegau ymweld yr hidlydd ac yn analluogi cyfrif ymweliadau'r hidlydd. Hoffech chi fwrw ymlaen?
+notification_antiadblock_message=Mae'r wefan hon yn hysbys am ddangos negeseuon wedi eu targedu i ddefnyddwyr Adblock Plus. Ydych chi am i Adblock Plus guddio negeseuon wedi eu targedu?
+blocked_count_addendum=(hefyd wenrestrwyd: ?1?, cuddiwyd: ?2?)
+subscription_invalid_location=Nid yw lleoliad y rhestr hidlyddion yn URL dilys na'n enw ffeil dilys.
+type_label_image=llun
+remove_subscription_warning=Ydych chi wir am ddileu'r tanysgrifiad hwn?
+type_label_other=arall
+mobile_menu_enable=ABP: Galluogi
+type_label_media=sain/fideo
+mobile_menu_disable_site=ABP: Analluogi ar ?1?
+elemhideGroup_title=Rheolau cuddio elfennau
+mobile_menu_enable_site=ABP: Galluogi ar ?1?
+type_label_elemhide=cudd
+newGroup_title=Grŵp hidlo newydd
+default_dialog_title=Adblock Plus
diff --git a/chrome/locale/cy/meta.properties b/chrome/locale/cy/meta.properties
index 539c5b9..b465de4 100644
--- a/chrome/locale/cy/meta.properties
+++ b/chrome/locale/cy/meta.properties
@@ -1 +1,6 @@
-description=Y gorffennol yw hysbysebion!
+description.short=Mae'n rhwystro hysbysebion ar YouTube a Facebook, yn ogystal â baneri a llawer mwy.\n\nMae Adblock Plus yn rhwystro pob hysbyseb ymwthiol, ac yn cefnogi gwefannau drwy beidio â rhwystro hysbysiadau anymwthiol (gellir ffurfweddu hyn).
+name=Adblock Plus
+description.long.addition1=Gydag Adblock 2.0 mae yna opsiwn yng ngosodiadau'r hidlyddion i ganiatáu hysbysebion anymwthiol. Y nod yw cefnogi gwefannau sy'n defnyddio ffyrdd anymwthiol i hysbysebu ac i annog mwy o wefannau i wneud yr un peth. <a href="http://adblockplus.org/en/acceptable-ads">Darllenwch fwy</a>
+translator=Wladimir Palant, Ciaran S
+description.long=Mae Adblock Plus yn eich galluogi i adennill rheolaeth dros y we a gweld y we fel y mynnwch. Cefnogir yr ychwanegiad gan dros 40 o danysgrifiadau i hidlyddion mewn dwsinau o ieithoedd sy'n ei ffurfweddu'n ddiofyn at wahanol ddibenion o gael gwared ar hysbysebu ar-lein i rwystro'r holl barthau hysbys sy'n arwain at feddalwedd maleisus. Mae Adblock Plus hefyd yn eich galluogi i addasu eich hidlyddion gyda chymorth nifer o nodweddion defnyddiol, gan gynnwys opsiwn cyd-destu [...]
+description=Mae hysbysebion yn perthyn i'r oes o'r blaen!
diff --git a/chrome/locale/cy/overlay.dtd b/chrome/locale/cy/overlay.dtd
new file mode 100644
index 0000000..6bfa309
--- /dev/null
+++ b/chrome/locale/cy/overlay.dtd
@@ -0,0 +1,31 @@
+<!ENTITY notification.button.yes "&Ie">
+<!ENTITY notification.button.no "&Na">
+<!ENTITY sync.label "&Cysoni gosodiadau Adblock Plus">
+<!ENTITY whitelist.site.label "Analluogi ar ?1?">
+<!ENTITY filters.label "&Dewisiadau hidlo">
+<!ENTITY disable.label "Analluogi ym mhobman">
+<!ENTITY objecttab.title "Rhwystro">
+<!ENTITY objecttab.tooltip "Cliciwch yma i rwystro hwn gydag Adblock Plus">
+<!ENTITY menuitem.label "Dewisiadau Ad&block Plus">
+<!ENTITY objecttabs.label "Dangos &tabiau ar Flash a Java">
+<!ENTITY sendReport.label "&Adrodd nam ar y dudalen hon">
+<!ENTITY whitelist.page.label "Analluogi ar y dudalen hon yn unig">
+<!ENTITY context.image.label "Adblock Plus: Rhwystro llun">
+<!ENTITY counthits.label "&Mesurydd yr hidlydd">
+<!ENTITY opensidebar.label "Dangos yr eitemau y gellir &rhwystro">
+<!ENTITY notification.button.close "&Cau">
+<!ENTITY contribute.label "Cyfrannu i Adblock Plus">
+<!ENTITY toolbarbutton.label "Adblock Plus">
+<!ENTITY context.frame.label "Adblock Plus: Rhwystro fframyn">
+<!ENTITY blocked.tooltip "Eitemau rwystrwyd ar y dudalen hon:">
+<!ENTITY hideplaceholders.label "Cuddio &dalfannau'r elfennau a rwystrwyd">
+<!ENTITY showinstatusbar.label "Dangos yn y bar &statws">
+<!ENTITY sidebar.title "Eitemau gellir eu rhwystro ar y dudalen hon">
+<!ENTITY options.label "&Dewisiadau">
+<!ENTITY context.object.label "Adblock Plus: Rhwystro gwrthrych">
+<!ENTITY context.removeWhitelist.label "Adblock Plus: Ail-alluogi ar y dudalen hon">
+<!ENTITY filters.tooltip "Hidlyddion mwyaf gweithgar:">
+<!ENTITY closesidebar.label "Cuddio'r eitemau y gellir &rhwystro">
+<!ENTITY showintoolbar.label "Dangos yn y &bar offer">
+<!ENTITY status.tooltip "Statws:">
+<!ENTITY context.media.label "Adblock Plus: Rhwystro sain/fideo">
diff --git a/chrome/locale/cy/sendReport.dtd b/chrome/locale/cy/sendReport.dtd
new file mode 100644
index 0000000..c1bc127
--- /dev/null
+++ b/chrome/locale/cy/sendReport.dtd
@@ -0,0 +1,65 @@
+<!ENTITY screenshot.undo.label "&Dadwneud">
+<!ENTITY issues.disabledgroups.description "Mae'r tanysgrifiadau hidlo/grwpiau hidlo canlynol wedi eu hanalluogi, ac eto gallant gael effaith ar y dudalen hon:">
+<!ENTITY showData.label "Dangos data'r adroddiad">
+<!ENTITY typeSelector.falsePositive.label "Mae Adblock Plus yn rhwystro &gormod">
+<!ENTITY issues.change.description "Newidwyd eich ffurfweddiad. Ail-lwythwch y dudalen i brofi'r newidiadau a chyflwyno adroddiad os na fydd y newidiadau'n datrys y nam.">
+<!ENTITY email.label "&Ebost:">
+<!ENTITY issues.openPreferences.label "Agor gosodiadau'r hidlydd">
+<!ENTITY sendPage.confirmation "Cadwyd eich adroddiad. Gallwch fynd ato drwy'r cyfeiriad canlynol:">
+<!ENTITY copyLink.label "&Copïo cyfeiriad yr adroddiad">
+<!ENTITY issues.nofilters.description "Dyw Adblock Plus ddim yn rhwystro unrhyw beth ar y dudalen gyfredol. Mae'n debyg nad yw'r nam rydych chi'n ei brofi'n ymwneud ag Adblock Plus.">
+<!ENTITY sendPage.knownIssue "Mae'n debygol bod y nam ag adroddoch yn hysbys. Mwy o wybodaeth:">
+<!ENTITY typeSelector.other.description "Dewiswch hwn os ydych yn amau bod nam gydag Adblock Plus ei hun yn hytrach na'i hidlyddion.">
+<!ENTITY issues.disabledgroups.enable.label "Galluogi'r tanysgrifiad hidlo/grŵp hidlo">
+<!ENTITY typeWarning.override.label "&Rwy'n deall ac rwyf am gyflwyno'r adroddiad beth bynnag">
+<!ENTITY issues.disabled.enable.label "Galluogi Adblock Plus">
+<!ENTITY update.fixed.description "Mae'n debygol bod y diweddariadau i'ch tanysgrifiadau hidlo wedi datrys y namau adroddoch chi. Ail-lwythwch y dudalen a rhoi cynnig arall arni. Cliciwch Adrodd eto os bydd y broblem yn parhau.">
+<!ENTITY anonymous.label "&Cyflwyniad dienw">
+<!ENTITY reloadButton.label "&Ail-lwytho'r dudalen">
+<!ENTITY recentReports.clear.label "&Dileu pob adroddiad">
+<!ENTITY typeSelector.description "Bydd y ffenestr hon yn eich tywys drwy'r camau sydd eu hangen er mwyn adrodd nam ar Adblock Plus. Yn gyntaf, dewiswch isod y math o nam rydych chi'n ei brofi:">
+<!ENTITY screenshot.remove.label "&Tynnu data sensitif">
+<!ENTITY issues.ownfilters.description "Mae rhai o'r hidlyddion ar waith ar y dudalen hon wedi eu diffinio â llaw. Analluogwch yr hidlyddion a allai fod wedi achosi'r nam:">
+<!ENTITY update.inProgress.description "Rhaid i Adblock Plus ddiweddaru'ch tanysgrifiadau hidlo i wneud yn siŵr nad yw'r nam wedi ei ddatrys eisoes. Arhoswch...">
+<!ENTITY sendPage.retry.label "Anfon eto">
+<!ENTITY data.label "A&drodd data:">
+<!ENTITY recentReports.label "Yr adroddiadau a gyflwynoch yn ddiweddar">
+<!ENTITY typeWarning.description "Rydych wedi nodi eich bod am adrodd nam cyffredinol gydag Adblock Plus yn hytrach na phroblem gyda'r hidlyddion. Noder ei bod yn well adrodd namau fel hyn yn [link] fforymau Adblock Plus[/link]. Dylech ond ddefnyddio'r teclyn adrodd namau i ategu i drafodaeth sydd eisoes yn bodoli, gan na fydd neb yn sylwi ar eich adroddiad oni bai eich bod yn rhoi'r ddolen iddynt. Rhoddir y ddolen i chi ar ôl cyflwyno'r adroddiad.">
+<!ENTITY issues.disabled.description "Mae Adblock Plus wedi ei analluogi, ni fydd yn rhwystro dim ar hyn o bryd.">
+<!ENTITY attachExtensions.label "Atodi rhestr o &ychwanegiadau gweithredol i'r adroddiad rhag ofn taw gwrthdaro rhwng ychwanegion sy'n achosi'r nam">
+<!ENTITY issues.nosubscriptions.add.label "Ychwanegu tanysgrifiad hidlo">
+<!ENTITY issues.disabledfilters.enable.label "Galluogi'r hidlydd">
+<!ENTITY issues.override.label "Mae'r &ffurfweddiad yn gywir, parhau â'r adroddiad">
+<!ENTITY issues.nosubscriptions.description "Mae'n ymddangos nad ydych wedi tanysgrifio i unrhyw un o'r hidlyddion rhagosodedig sy'n tynnu cynnwys annymunedig oddi ar wefannau'n ddiofyn.">
+<!ENTITY typeSelector.falsePositive.description "Dewiswch hwn os yw'r dudalen heb gynnwys pwysig, yn ymddangos yn anghywir neu'n methu gweithio'n gywir. Gallwch ddarganfod ai Adblock Plus sy'n achosi'r broblem drwy ei analluogi dros dro.">
+<!ENTITY typeSelector.other.label "&Nam arall">
+<!ENTITY emailComment.label "Rydym yn eich annog i roi cyfeiriad ebost dilys fel y gallwn gysylltu â chi os oes cwestiynau am eich adroddiad. Bydd hefyd yn ein galluogi i adnabod eich cyfraniadau a'u blaenoriaethu.">
+<!ENTITY issues.whitelist.remove.label "Ail-alluogi Adblock Plus ar y dudalen hon">
+<!ENTITY outdatedSubscriptions.description "Dyw'r tanysgrifiadau hidlo canlynol heb eu diweddaru ers o leiaf dwy wythnos. Diweddarwch y tanysgrifiadau hyn cyn adrodd namau, mae'n bosibl bod y nam wedi ei ddatrys eisoes.">
+<!ENTITY dataCollector.description "Arhoswch ychydig eiliadau tra bod Adblock Plus yn casglu'r data sydd ei angen.">
+<!ENTITY sendButton.label "An&fon yr adroddiad">
+<!ENTITY comment.label "&Sylw (dewisol):">
+<!ENTITY sendPage.errorMessage "Methwyd cais i anfon yr adroddiad gyda chôd gwall "?1?". Sicrhewch eich bod chi wedi cysylltu â'r we a rhowch gynnig arall arni. Os bydd y broblem yn parhau, gofynnwch am gymorth yn [link]fforwm Adblock Plus[/link].">
+<!ENTITY showRecentReports.label "Dangos adroddiadau a gyflwynwyd yn ddiweddar">
+<!ENTITY commentPage.heading "Ychwanegu sylw">
+<!ENTITY update.start.label "Dechrau diweddaru nawr">
+<!ENTITY issues.disabledfilters.description "Mae'r hidlyddion canlynol wedi eu hanalluogi ac eto gallant gael effaith ar y dudalen hon:">
+<!ENTITY screenshot.description "Gall yr un dudalen edrych yn wahanol i bobl wahanol. Gall atodi sgrîn-lun i'ch adroddiad fod o gymorth i ni ddeall y broblem. Gallwch dynnu adrannau sy'n cynnwys gwybodaeth sensitif yn ogystal â marcio'r rhannau lle mae'r broblem yn amlwg. I wneud hynny, cliciwch ar y botwm cyfatebol a dewiswch ddarn o'r llun gyda'ch llygoden.">
+<!ENTITY screenshot.attach.label "A&todi llun o'r dudalen i'r adroddiad">
+<!ENTITY issues.whitelist.description "Mae Adblock Plus wedi ei analluogi ar y dudalen rydych chi'n ei hadrodd. Ail-alluogwch Adblock Plus ac ail-lwythwch y dudalen cyn adrodd y nam i helpu ymchwilio i'r nam.">
+<!ENTITY typeSelector.falseNegative.label "Dyw Adblock Plus ddim yn rhwystro &hysbyseb">
+<!ENTITY typeSelector.heading "Dewis y math o nam">
+<!ENTITY anonymity.warning "Allwn ni ddim ymateb a byddwn yn debygol o beidio â blaenoriaethu'r adroddiad.">
+<!ENTITY wizard.title "Teclyn adrodd namau">
+<!ENTITY issues.ownfilters.disable.label "Analluogi'r hidlydd">
+<!ENTITY commentPage.description "Mae'r blwch testun isod yn eich galluogi i adael sylw i helpu ni i ddeall beth yw'r nam. Mae'r cam yn ddewisol ond argymhellir ei gymryd os nad yw'r broblem yn amlwg. Gallwch hefyd adolygu data'r adroddiad cyn ei anfon.">
+<!ENTITY comment.lengthWarning "Mae hyd eich sylw dros 1000 nod. Dim ond y 1000 nod cyntaf caiff ei anfon.">
+<!ENTITY typeSelector.falseNegative.description "Dewiswch hwn os yw hysbyseb yn cael ei harddangos er bod Adblock Plus wedi ei alluogi.">
+<!ENTITY sendPage.waitMessage "Arhoswch funud tra bod Adblock Plus yn cyflwyno eich adroddiad.">
+<!ENTITY dataCollector.heading "Croeso i'r teclyn adrodd namau">
+<!ENTITY screenshot.heading "Atodi sgrinlun">
+<!ENTITY sendPage.heading "An&fon yr adroddiad">
+<!ENTITY issues.subscriptionCount.description "Mae'n debyg eich bod chi wedi tanysgrifio i ormod o danysgrifiadau hidlo. 'Dyn ni ddim yn argymell hyn oherwydd ei bod hi'n cynyddu'r siawns y bydd namau. Hefyd, allwn ni ddim derbyn eich adroddiad o nam oherwydd nad yw'n glir pa danysgrifiad hidlo sydd ar fai. Dilëwch pob tanysgrifiad hidlo ond am y rhai angenrheidiol a phrofwch a yw'r nam yn dal i ddigwydd wedyn.">
+<!ENTITY screenshot.mark.label "&Marcio'r broblem">
+<!ENTITY privacyPolicy.label "Polisi preifatrwydd">
+<!ENTITY issues.description "Mae Adblock Plus wedi canfod namau gyda'ch ffurfweddiad a allai fod yn gyfrifol am y nam hwn neu a allai wneud ymchwilio i'r adroddiad yn anodd.">
diff --git a/chrome/locale/cy/sidebar.dtd b/chrome/locale/cy/sidebar.dtd
new file mode 100644
index 0000000..9bf2c22
--- /dev/null
+++ b/chrome/locale/cy/sidebar.dtd
@@ -0,0 +1,35 @@
+<!ENTITY context.flash.label "Fflachio ymylon yr eitem">
+<!ENTITY address.label "Cyfeiriad">
+<!ENTITY context.open.label "Agor mewn tab newydd">
+<!ENTITY type.label "Math">
+<!ENTITY tooltip.filterSource.label "Ffynhonnell yr hidlydd:">
+<!ENTITY noitems.label "Dim eitem y gellir ei rwystro">
+<!ENTITY filter.label "Hidlydd">
+<!ENTITY tooltip.size.label "Maint:">
+<!ENTITY reattach.label "Ailgysylltu">
+<!ENTITY search.label "&Chwilio:">
+<!ENTITY docDomain.thirdParty "(allanol)">
+<!ENTITY filterSource.label "Ffynhonnell yr hidlydd">
+<!ENTITY tooltip.docDomain.label "Ffynhonnell y ddogfen:">
+<!ENTITY context.copy.label "Copïo cyfeiriad yr eitem">
+<!ENTITY tooltip.type.label "Math:">
+<!ENTITY context.disablefilter.label "Analluogi'r hidlydd ?1?">
+<!ENTITY context.copyFilter.label "Copïo'r hidlydd">
+<!ENTITY context.block.label "Rhwystro'r eitem hon">
+<!ENTITY context.enablefilter.label "Ail-alluogi'r hidlydd ?1?">
+<!ENTITY detach.label "Datgysylltu">
+<!ENTITY whitelisted.label "Tudalen a wenrestrwyd">
+<!ENTITY context.disablefilteronsite.label "Analluogi'r hidlydd hwn ar ?1?">
+<!ENTITY detached.title "Adblock Plus: Eitemau gellir eu rhwystro (wedi'i ddatgysylltu)">
+<!ENTITY docDomain.firstParty "(mewnol)">
+<!ENTITY tooltip.type.whitelisted "(wedi'i wenrestru)">
+<!ENTITY tooltip.filter.label "Hidlydd ar waith:">
+<!ENTITY tooltip.filter.disabled "(analluogwyd)">
+<!ENTITY context.editfilter.label "Golygu'r hidlydd ar waith">
+<!ENTITY tooltip.type.blocked "(wedi'i rwystro)">
+<!ENTITY size.label "Maint">
+<!ENTITY context.whitelist.label "Ychwanegu eithriad i'r rheol ar gyfer yr eitem">
+<!ENTITY context.selectAll.label "Dewis y cyfan">
+<!ENTITY state.label "Cyflwr">
+<!ENTITY docDomain.label "Ffynhonnell y ddogfen">
+<!ENTITY tooltip.address.label "Cyfeiriad:">
diff --git a/chrome/locale/cy/subscriptionSelection.dtd b/chrome/locale/cy/subscriptionSelection.dtd
index ab0ecae..0938a8f 100644
--- a/chrome/locale/cy/subscriptionSelection.dtd
+++ b/chrome/locale/cy/subscriptionSelection.dtd
@@ -1 +1,12 @@
-<!ENTITY location.label "&Lleoliad y rhestr ffilteri:">
+<!ENTITY addMain.label "Ychwanegu'r &tanysgrifiad hidlo "?1?" hefyd">
+<!ENTITY list.download.failed "Methodd Adblock Plus ddod o hyd i'r rhestr o danysgrifiadau.">
+<!ENTITY list.download.retry "Ceisio eto">
+<!ENTITY title.label "Teitl y &tanysgrifiad:">
+<!ENTITY list.download.website "Ymweld â'r wefan">
+<!ENTITY supplementMessage "Dylid defnyddio'r tanysgrifiad hidlo hwn gyda'r tanysgrifiad hidlo "?1?" nad ydych yn ei ddefnyddio eto.">
+<!ENTITY viewList.label "Gweld yr hidlyddion">
+<!ENTITY visitHomepage.label "Ymweld â'r hafan">
+<!ENTITY addSubscription.label "Ychwanegu'r tanysgrifiad">
+<!ENTITY dialog.title "Ychwanegu tanysgrifiadau hidlo Adblock Plus">
+<!ENTITY location.label "&Lleoliad y rhestr hidlyddion:">
+<!ENTITY fromWeb.description "Cadarnhewch eich bod am ychwanegu'r tanysgrifiad hidlo hwn. Gallwch newid teitl neu leoliad y tanysgrifiad cyn ei ychwanegu.">
diff --git a/chrome/locale/de/composer.dtd b/chrome/locale/de/composer.dtd
index 7d377e2..26fd3ef 100644
--- a/chrome/locale/de/composer.dtd
+++ b/chrome/locale/de/composer.dtd
@@ -1,11 +1,11 @@
<!ENTITY anchor.end.label "am En&de der Adresse">
<!ENTITY domainRestriction.label "Auf Do&main beschränken:">
<!ENTITY collapse.default.no.label "Standardeinstellung (nein)">
-<!ENTITY firstParty.label "Nur für Elemente der Ursprungsseite">
-<!ENTITY preferences.label "Existierende Filter an&zeigen ...">
+<!ENTITY firstParty.label "Nur für Elemente der Urs&prungsseite">
+<!ENTITY preferences.label "Existierende Filter an&zeigen...">
<!ENTITY pattern.label "Muster suchen">
<!ENTITY thirdParty.label "Nur für Elemen&te von Drittseiten">
-<!ENTITY filter.label "Neue &Filter:">
+<!ENTITY filter.label "Neue&r Filter:">
<!ENTITY collapse.label "Platz frei&geben:">
<!ENTITY match.warning "Das Muster, das Sie eingegeben haben, passt nicht mehr zu der Adresse, für die der Filter erstellt werden soll. Es wird keinen Einfluss mehr auf diese Adresse haben.">
<!ENTITY anchor.start.label "am An&fang der Adresse">
diff --git a/chrome/locale/de/filters.dtd b/chrome/locale/de/filters.dtd
index 7c3e0f1..48e19ea 100644
--- a/chrome/locale/de/filters.dtd
+++ b/chrome/locale/de/filters.dtd
@@ -1,5 +1,5 @@
<!ENTITY restore.custom.warning "Alle Ihre eigenen Filter werden durch den Inhalt dieser Datei ersetzt. Wollen Sie fortfahren?">
-<!ENTITY slow.column "&Langsame Filter">
+<!ENTITY slow.column "&Langsam">
<!ENTITY enabled.column "A&ktiviert">
<!ENTITY subscription.lastDownload.checksumMismatch "Fehler, Prüfsumme ist falsch, möglicherweise ein Übertragungsfehler">
<!ENTITY noFiltersInGroup.text "Die gewählte Filtergruppe ist leer.">
diff --git a/chrome/locale/el/firstRun.properties b/chrome/locale/el/firstRun.properties
index f11883f..1ce196b 100644
--- a/chrome/locale/el/firstRun.properties
+++ b/chrome/locale/el/firstRun.properties
@@ -3,16 +3,17 @@ firstRun_toggle_off=Ανενεργό
firstRun_feature_tracking=Απενεργοποίηση της παρακολούθησης
firstRun_feature_malware=Φραγή κακόβουλου λογισμικού
firstRun_title=Το Adblock Plus έχει εγκατασταθεί
-firstRun_acceptableAdsExplanation=Θα θέλαμε να ενθαρρύνουμε τις ιστοσελίδες να χρησιμοποιούν ξεκάθαρες, διακριτικές διαφημίσεις. Γι' αυτό το λόγο έχουμε ορίσει <a>αυστηρές κατευθυντήριες γραμμές</a> για τον προσδιορισμό των αποδεκτών διαφημίσεων, οι οποίες εμφανίζονται στις προεπιλεγμένες ρυθμίσεις. Εάν εξακολουθείτε να θέλετε να αποκλείσετε όλες τις διαφημίσεις μπορείτε να <a>απενεργοποιήσετε</a> αυτήν την επιλογή σε λίγα δευτερόλεπτα.
firstRun_toggle_on=Ενεργό
+firstRun_acceptableAdsExplanation=Θα θέλαμε να ενθαρρύνουμε τις ιστοσελίδες να χρησιμοποιούν ξεκάθαρες, διακριτικές διαφημίσεις. Γι' αυτό το λόγο έχουμε ορίσει <a>αυστηρές κατευθυντήριες γραμμές</a> για τον προσδιορισμό των αποδεκτών διαφημίσεων, οι οποίες εμφανίζονται στις προεπιλεγμένες ρυθμίσεις. Εάν εξακολουθείτε να θέλετε να αποκλείσετε όλες τις διαφημίσεις μπορείτε να <a>απενεργοποιήσετε</a> αυτήν την επιλογή σε λίγα δευτερόλεπτα.
firstRun_contributor_credits=Μνεία συντελεστών
firstRun_dataCorruptionWarning=Αυτή η σελίδα συνεχίζει να εμφανίζεται; <a>Κάντε κλικ εδώ!</a>
firstRun_acceptableAdsHeadline=Οι ενοχλητικές διαφημίσεις τώρα θα αποκλειστούν
firstRun_share=Πείτε το στους φίλους σας
firstRun_share_headline=<a>Δώστε μας ένα χεράκι</a> στο να κάνουμε το διαδίκτυο ένα καλύτερο μέρος
-firstRun_features=Το Adblock Plus μπορεί να κάνει περισσότερα από το φιλτράρισμα διαφημίσεων
-firstRun_feature_malware_description=Κάνετε την περιήγηση σας πιο ασφαλή φράσσοντας γνωστές διευθύνσεις κακόβουλου λογισμικού.
firstRun_feature_social_description=Απαλλάξετε αυτομάτως την περιήγησή σας από κουμπιά των μέσων κοινωνικής δικτύωσης, όπως το Like του Facebook, που εμφανίζονται σε ιστοσελίδες και παρακολουθούν τη συμπεριφορά σας.
+firstRun_filterlistsReinitializedWarning=Φαίνεται πως ένα ζήτημα προκάλεσε την αφαίρεση όλων των φίλτρων και δεν μπορέσαμε να επαναφέρουμε ένα αντίγραφο ασφαλείας. Γι' αυτό έπρεπε να επαναφέρουμε τα αρχικά σας φίλτρα και τις ρυθμίσεις Αποδεκτών Διαφημίσεων. Παρακαλώ ελέγξτε τις λίστες φίλτρων σας και τις ρυθμίσεις Αποδεκτών Διαφημίσεων στις <a>επιλογές του Adblock Plus</a>.
+firstRun_feature_malware_description=Κάνετε την περιήγηση σας πιο ασφαλή φράσσοντας γνωστές διευθύνσεις κακόβουλου λογισμικού.
+firstRun_features=Το Adblock Plus μπορεί να κάνει περισσότερα από το φιλτράρισμα διαφημίσεων
firstRun_donate=δωρίστε
firstRun_donate_label=Υποστηρίξτε το έργο μας
firstRun_feature_social=Αφαίρεση κουμπιών μέσων κοινωνικής δικτύωσης
diff --git a/chrome/locale/en-GB/firstRun.properties b/chrome/locale/en-GB/firstRun.properties
index 1bf5c05..4c4670d 100644
--- a/chrome/locale/en-GB/firstRun.properties
+++ b/chrome/locale/en-GB/firstRun.properties
@@ -7,9 +7,9 @@ firstRun_toggle_on=ON
firstRun_acceptableAdsExplanation=We'd like to encourage websites to use straightforward, unobtrusive advertising. That's why we've established <a>strict guidelines</a> to identify 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_contributor_credits=Contributor Credits
firstRun_dataCorruptionWarning=Does this page keep showing up? <a>Click here!</a>
-firstRun_acceptableAdsHeadline=Annoying ads will now be blocked.
+firstRun_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_share_headline=Help us in making the web a better place
firstRun_feature_social_description=Automatically rid your browsing experience of social media buttons (such as the Facebook Like) which appear on web pages and track your behaviour.
firstRun_filterlistsReinitializedWarning=It seems that an issue caused all filters to be removed and we were unable to restore a backup.\nTherefore we had to reset your own filters and Acceptable Ads settings. Please check your filter lists and acceptable Ads settings in the Adblock Plus settings.
firstRun_feature_malware_description=Make your browsing more secure by blocking known malware domains.
diff --git a/chrome/locale/es-CL/meta.properties b/chrome/locale/es-CL/meta.properties
new file mode 100644
index 0000000..e8ea136
--- /dev/null
+++ b/chrome/locale/es-CL/meta.properties
@@ -0,0 +1,6 @@
+description.short=Bloquea la molestosa publicidad en videos de Youtube, la publicidad en Facebook, banners y mucho más.\nAdblock Plus bloque todo tipo de anuncios molestos, y ayuda a las páginas web al permitir la publocidad inofensiva por defecto (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=Wladimir Palant
+description.long=Adblock Plus le permite recuperar el control de Internet y ver la web como usted quiera. Esta extensión está apoyada por más de cuarenta suscripciones de filtros en docenas de idiomas que la configuran automáticamente para poder desde eliminar la publicidad online hasta bloquear todos los dominios de malware conocidos. Adblock Plus también le permite personalizar sus filtros con la ayuda de varias funciones útiles, como la opción del menú contextual para imágenes, la pes [...]
+description=Los anuncios fueron ayer!
diff --git a/chrome/locale/es-CL/overlay.dtd b/chrome/locale/es-CL/overlay.dtd
new file mode 100644
index 0000000..f39f84d
--- /dev/null
+++ b/chrome/locale/es-CL/overlay.dtd
@@ -0,0 +1,13 @@
+<!ENTITY sidebar.title "Elementos bloqueables en la página actual">
+<!ENTITY context.object.label "Adblock Plus: Bloquear objeto.">
+<!ENTITY context.media.label "Adblock Plus: Bloqueo de audio/vídeo">
+<!ENTITY context.frame.label "Adblock Plus: Bloquear marco">
+<!ENTITY filters.tooltip "Filtros más activos:">
+<!ENTITY menuitem.label "Preferencias de Adblock Plus">
+<!ENTITY sendReport.label "Informar de un problema en esta página">
+<!ENTITY toolbarbutton.label "Adblock Plus">
+<!ENTITY context.image.label "Adblock Plus: Bloquear Imagen">
+<!ENTITY filters.label "&Preferencias de filtros">
+<!ENTITY status.tooltip "Estado:">
+<!ENTITY blocked.tooltip "Elementos bloqueados en esta página:">
+<!ENTITY context.removeWhitelist.label "Adblock Plus: Re-activar publicidad en esta página">
diff --git a/chrome/locale/fa/composer.dtd b/chrome/locale/fa/composer.dtd
index dc68759..988fbe3 100644
--- a/chrome/locale/fa/composer.dtd
+++ b/chrome/locale/fa/composer.dtd
@@ -2,7 +2,7 @@
<!ENTITY domainRestriction.label "مح&دود به دامنه :">
<!ENTITY collapse.default.no.label "استفاده پیشفرض (خیر)">
<!ENTITY firstParty.label "فقط او&لین عضو">
-<!ENTITY preferences.label "نمایش پالایه های موجود...">
+<!ENTITY preferences.label "نمای&ش پالایه های موجود...">
<!ENTITY pattern.label "جستجو برای الگوی">
<!ENTITY thirdParty.label "فقط سو&مین عضو">
<!ENTITY filter.label "پالایه جدید:">
diff --git a/chrome/locale/hi-IN/firstRun.properties b/chrome/locale/hi-IN/firstRun.properties
index 5fafc92..70f763f 100644
--- a/chrome/locale/hi-IN/firstRun.properties
+++ b/chrome/locale/hi-IN/firstRun.properties
@@ -1,2 +1,4 @@
-firstRun_dataCorruptionWarning= क्या यह पृष्ट बार बार प्रस्तुत हो रहा है? <a>यहाँ क्लिक करें</a>
firstRun_acceptableAdsHeadline=कष्टकारी विज्ञापन अब हटा दिए जायेंगे
+firstRun_dataCorruptionWarning= क्या यह पृष्ट बार बार प्रस्तुत हो रहा है? <a>यहाँ क्लिक करें</a>
+firstRun_title=Adblock Plus स्थापित होगया हे.
+firstRun_acceptableAdsExplanation=हम वेबसाइटों को सीधा, विनीत विज्ञापन का उपयोग करने के लिए प्रोत्साहित करना चाहते हैं। यही कारण से हमने स्वीकार्य विज्ञापनों की पहचान करने के लिए <a>सख्त दिशा निर्देशों</a> की स्थापना की है, जो डिफ़ॉल्ट सेटिंग्स के अंतर्गत दिखाए गए हैं। यदि आप अभी भी हर विज्ञापन ब्लॉक करना चाहते हैं आप उन्हें कुछही सेकंड में <a>अक्षम</a> कर सकते हैं।
diff --git a/chrome/locale/id/composer.dtd b/chrome/locale/id/composer.dtd
index f060b1d..ae27fd0 100644
--- a/chrome/locale/id/composer.dtd
+++ b/chrome/locale/id/composer.dtd
@@ -1,19 +1,19 @@
<!ENTITY anchor.end.label "&pada akhir dari alamat">
<!ENTITY domainRestriction.label "Membatasi pada & domain:">
-<!ENTITY collapse.default.no.label "Gunakan default (tidak)">
-<!ENTITY firstParty.label "&Hanya untuk pihak pertama">
+<!ENTITY collapse.default.no.label "Gunakan aturan baku (tidak)">
+<!ENTITY firstParty.label "Hanya pihak &pertama">
<!ENTITY preferences.label "&Tampilkan filter yang ada...">
<!ENTITY pattern.label "Mencari pola">
<!ENTITY thirdParty.label "Hanya pihak ke&tiga">
-<!ENTITY filter.label "Tambahkan &filter:">
-<!ENTITY collapse.label "&tutup yang diblokir:">
+<!ENTITY filter.label "&Penyaring baru:">
+<!ENTITY collapse.label "&Ciutkan yang dicekal:">
<!ENTITY match.warning "Pola yang Anda masukkan tidak lagi cocok dengan masuk daftar alamat yang akan diblokir/daftar putih dan tidak akan berpengaruh sama sekali.">
<!ENTITY anchor.start.label "&pada awal alamat">
-<!ENTITY matchCase.label "&Sama persis">
+<!ENTITY matchCase.label "&Cocokkan kapitalisasi">
<!ENTITY custom.pattern.label "&Kustom:">
-<!ENTITY unselectAllTypes.label "Tidak memilih apapun">
+<!ENTITY unselectAllTypes.label "Jangan pilih apapun">
<!ENTITY type.whitelist.label "Aturan p&engabaian">
-<!ENTITY regexp.warning "Pola yang Anda masukkan akan dianggap sebagai regular expression yang tidak akan efisien untuk dapat diproses oleh Adblock Plus dan mungkin akan memperlambat pengalaman browsing Anda. Jika Anda tidak berniat untuk menggunakan regular expression, tambahkan tanda bintang (*) diakhir pola.">
+<!ENTITY regexp.warning "Pola yang Anda masukkan akan dianggap sebagai suatu regular expression yang tidak dapat diproses secara efisien oleh Adblock Plus dan mungkin akan memperlambat peramban Anda. Jika Anda tidak berniat untuk menggunakan regular expression, tambahkan tanda bintang (*) di akhir pola.">
<!ENTITY dialog.title "Tambah aturan filter Adblock Plus">
<!ENTITY basic.label "Tampilan dasar">
<!ENTITY type.filter.label "&Filter yang diblokir">
@@ -21,13 +21,13 @@
<!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 domain yang dipisahkan oleh sebuah garis bar(|). Filter hanya akan diterapkan pada domain yang dipilih. Sebuah tilde (~) sebelum nama domain menunjukkan bahwa filter tidak akan diterapkan pada domain tersebut.">
+<!ENTITY collapse.default.yes.label "Gunakan aturan baku (ya)">
+<!ENTITY domainRestriction.help "Gunakan opsi ini untuk menentukan satu atau lebih domain yang dipisahkan oleh sebuah garis batang (|). Penyaring hanya akan diterapkan pada domain yang dipilih. Sebuah tanda tilda (~) sebelum nama domain menunjukkan bahwa penyaring tidak akan diterapkan pada domain tersebut.">
<!ENTITY accept.label "Tambahkan filter">
<!ENTITY options.label "Pilihan">
<!ENTITY disabled.warning "Adblock Plus sedang dimatikan. Anda masih dapat menambahkan filter tetapi mereka tidak akan diterapkan kecuali Anda [link] mengaktifkan Adblock Plus [/link].">
<!ENTITY anchor.start.flexible.label "&pada awal nama domain">
<!ENTITY collapse.no.label "Tidak">
-<!ENTITY selectAllTypes.label "Pilih Semua">
+<!ENTITY selectAllTypes.label "Pilih semua">
<!ENTITY advanced.label "Tampilan lanjutan">
<!ENTITY pattern.explanation "Pola dapat menjadi bagian dari alamat; tanda bintang (*) bertindak sebagai wildcard. Filter hanya akan diterapkan ke alamat yang cocok dengan pola yang diberikan.">
diff --git a/chrome/locale/id/filters.dtd b/chrome/locale/id/filters.dtd
index dbdbc76..3a5de86 100644
--- a/chrome/locale/id/filters.dtd
+++ b/chrome/locale/id/filters.dtd
@@ -1,72 +1,74 @@
-<!ENTITY restore.custom.warning "Semua penyesuaian penyaring Anda akan digantikan oleh isi berkas yang dipilih. Apakah Anda ingin memproses?">
-<!ENTITY slow.column "Penyaring Slo&w">
-<!ENTITY enabled.column "Hidupka&n">
-<!ENTITY subscription.lastDownload.checksumMismatch "Gagal, checksum berbeda">
+<!ENTITY restore.custom.warning "Semua penyaring ubahsuaian Anda akan diganti dengan isi dari berkas terpilih. Apakah Anda ingin melanjutkan?">
+<!ENTITY slow.column "Penyaring yang &lambat">
+<!ENTITY enabled.column "&Diaktifkan">
+<!ENTITY subscription.lastDownload.checksumMismatch "Gagal, checksum tidak cocok">
<!ENTITY noFiltersInGroup.text "Kelompok yang dipilih kosong.">
<!ENTITY subscription.actions.label "Tindakan">
-<!ENTITY filter.selectAll.label "Pilih semua">
-<!ENTITY backupButton.label "&Cadangan dan Pengembalian">
-<!ENTITY restore.minVersion.warning "Peringatan: berkas telah dibuat dengan versi Adblock Plus yang lebih baru. Anda harus memperbarui ke versi Adblock Plus terbaru sebelum mengembalikan dari berkas ini.">
-<!ENTITY restore.error "Data berkas tidak bisa diproses, mungkin ini bukan berkas cadangan Adblock Plus?">
-<!ENTITY sort.ascending.label "Urutkan dari A > Z">
-<!ENTITY sort.label "&Urutkan dari">
+<!ENTITY filter.selectAll.label "Pilih Semua">
+<!ENTITY backupButton.label "&Cadangkan dan Pulihkan">
+<!ENTITY restore.minVersion.warning "Peringatan: berkas ini dibuat dengan Adblock Plus versi baru. Anda harus memutakhirkan Adblock Plus ke versi terbaru sebelum memulihkan dari berkas ini.">
+<!ENTITY restore.error "Data berkas tidak dapat diproses, mungkin ini bukan berkas cadangan Adblock Plus?">
+<!ENTITY sort.ascending.label "Urutan &A > Z">
+<!ENTITY sort.label "&Urutkan menurut">
<!ENTITY subscription.source.label "Daftar penyaring">
<!ENTITY hitcount.column "Sasaran">
-<!ENTITY noFilters.text "Anda belum memiliki pembuatan filter apapun.">
-<!ENTITY backup.custom.title "Hanya penyesuaian penyaring">
-<!ENTITY subscription.external.label "Diperbarui oleh ekstensi lain">
+<!ENTITY noFilters.text "Anda belum memiliki penyaring ubahsuaian.">
+<!ENTITY backup.custom.title "Penyaring ubahsuaian saja">
+<!ENTITY subscription.external.label "Telah dimutakhirkan oleh ekstensi lain">
<!ENTITY subscription.delete.label "Hapus">
-<!ENTITY noGroupSelected.text "Anda perlu memilih kelompok penyaring sebelum penyaring dapat ditampilkan.">
+<!ENTITY noGroupSelected.text "Anda perlu memilih sebuah kelompok penyaring sebelum dapat menampilkan isi penyaringnya.">
<!ENTITY filter.cut.label "Potong">
-<!ENTITY restore.default.label "Mengembalikan cadangan dari ?1?">
+<!ENTITY restore.default.label "Pulihkan cadangan ?1?">
<!ENTITY subscription.lastDownload.inProgress "Mengunduh…">
<!ENTITY subscriptions.tab.label "Penyaring langganan">
-<!ENTITY sort.descending.label "Urutkan dari Z > A">
-<!ENTITY filters.remove.warning "Apakah Anda sungguh ingin menghapus semua penyaring yang dipilih?">
+<!ENTITY sort.descending.label "Urutan &Z > A">
+<!ENTITY filters.remove.warning "Apakah Anda yakin ingin menghapus semua penyaring terpilih?">
<!ENTITY filter.delete.label "Hapus">
<!ENTITY addSubscriptionAdd.label "Tambahkan">
-<!ENTITY viewMenu.label "Lihat">
-<!ENTITY subscription.lastDownload.unknown "N/A">
+<!ENTITY viewMenu.label "Tampilkan">
+<!ENTITY subscription.lastDownload.unknown "(Tidak diketahui)">
<!ENTITY addSubscriptionCancel.label "Batal">
<!ENTITY subscription.enabled.label "Diaktifkan">
-<!ENTITY noSubscriptions.text "Anda belum menambahkan penyaring langganan apapun. Adblock Plus tidak akan memblok apapun tanpa penyaring, silahkan gunakan "Tambahkan penyaring langganan" untuk menambahkan.">
-<!ENTITY subscription.update.label "Perbarui penyaring">
+<!ENTITY noSubscriptions.text "Anda belum menambahkan penyaring langganan apapun. Adblock Plus
+ tidak akan mencekal apa-apa tanpa adanya penyaring, silakan gunakan
+ "Tambah penyaring langganan" untuk menambahkan beberapa penyaring.">
+<!ENTITY subscription.update.label "Mutakhirkan penyaring">
<!ENTITY dialog.title "Preferensi Penyaring Adblock Plus">
-<!ENTITY addFilter.label "Tambahkan penyaring">
-<!ENTITY subscription.minVersion.warning "Penyaring langganan memerlukan versi Adblock Plus yang lebih baru, Anda harus memperbarui ke versi Adblock Plus terbaru.">
-<!ENTITY subscription.lastDownload.invalidURL "Gagal, bukan alamat yang benar">
-<!ENTITY backup.error "Ada kesalahan penulisan penyaring ke berkas. Pastikan berkas tidak diproteksi atau sedang digunakan aplikasi lain.">
-<!ENTITY filter.moveUp.label "Ke atas">
-<!ENTITY addGroup.label "Tambahkan penyaring dan kelompok">
+<!ENTITY addFilter.label "Tambah &penyaring">
+<!ENTITY subscription.minVersion.warning "Penyaring langganan ini memerlukan versi Adblock Plus yang lebih baru, Anda harus memutakhirkan Adblock Plus ke versi terbaru.">
+<!ENTITY subscription.lastDownload.invalidURL "Gagal, alamat tidak sah">
+<!ENTITY backup.error "Terjadi galat penulisan penyaring ke berkas. Pastikan berkas tersebut tidak baca-saja dan tidak sedang digunakan aplikasi lain.">
+<!ENTITY filter.moveUp.label "Naikkan">
+<!ENTITY addGroup.label "Tambah &kelompok penyaring">
<!ENTITY filter.edit.label "Sunting">
<!ENTITY subscription.showHideFilters.label "Tampilkan/sembunyikan penyaring">
-<!ENTITY acceptableAds2.label "Ijinkan beberapa iklan yang bukan dan mengganggu">
-<!ENTITY addSubscriptionOther.label "Tambahkan skrip yang berbeda">
+<!ENTITY acceptableAds2.label "Izinkan beberapa iklan yang tidak men&colok">
+<!ENTITY addSubscriptionOther.label "Tambah langganan yang lainnya">
<!ENTITY close.label "Tutup">
<!ENTITY sort.none.label "&Belum diurutkan">
<!ENTITY filter.actions.label "Tindakan penyaring">
<!ENTITY filter.copy.label "Salin">
-<!ENTITY filter.moveDown.label "Ke bawah">
-<!ENTITY filter.resetHitCounts.label "Reset kembali statistik kunjungan">
+<!ENTITY filter.moveDown.label "Turunkan">
+<!ENTITY filter.resetHitCounts.label "Atur ulang statistik kunjungan">
<!ENTITY readMore.label "Baca lebih lanjut">
-<!ENTITY subscription.moveUp.label "Ke atas">
-<!ENTITY addSubscription.label "Tambahkan penyaring">
+<!ENTITY subscription.moveUp.label "Naikkan">
+<!ENTITY addSubscription.label "Tambah &penyaring langganan">
<!ENTITY subscription.homepage.label "Beranda">
<!ENTITY backup.complete.title "Semua penyaring dan langganan">
-<!ENTITY restore.own.label "Mengembalikan cadangan sendiri">
-<!ENTITY restore.complete.warning "Semua preferensi penyaring Anda akan digantikan oleh isi berkas yang dipilih. Apakah Anda ingin memproses?">
-<!ENTITY filters.tab.label "Penyesuaian penyaring">
-<!ENTITY backup.label "Membuat cadangan baru">
-<!ENTITY find.label "Cari">
-<!ENTITY subscription.moveDown.label "Ke bawah">
-<!ENTITY subscription.lastDownload.connectionError "Gagal, gagal mengunduh">
-<!ENTITY subscription.lastDownload.success "Sukses">
-<!ENTITY subscription.lastDownload.invalidData "Gagal, bukan daftar penyaring yang benar">
+<!ENTITY restore.own.label "Pulihkan cadangan sendiri">
+<!ENTITY restore.complete.warning "Semua preferensi penyaring Anda akan diganti dengan isi dari berkas terpilih. Apakah Anda ingin melanjutkan?">
+<!ENTITY filters.tab.label "Penyaring ubahsuaian">
+<!ENTITY backup.label "Buat cadangan baru">
+<!ENTITY find.label "&Temukan">
+<!ENTITY subscription.moveDown.label "Turunkan">
+<!ENTITY subscription.lastDownload.connectionError "Gagal, kesalahan pengunduhan">
+<!ENTITY subscription.lastDownload.success "Berhasil">
+<!ENTITY subscription.lastDownload.invalidData "Gagal, daftar penyaring tidak sah">
<!ENTITY filter.paste.label "Tempel">
<!ENTITY subscription.disabledFilters.enable "Aktifkan penyaring yang dinonaktifkan">
-<!ENTITY lasthit.column "Sasaran terakhir">
+<!ENTITY lasthit.column "Kunjungan &terkini">
<!ENTITY subscription.editTitle.label "Sunting judul">
-<!ENTITY subscription.disabledFilters.warning "Beberapa penyaring di layanan langganan ini dinonaktifkan.">
-<!ENTITY filter.column "Aturan penyaring">
-<!ENTITY subscription.lastDownload.label "Unduhan terakhir:">
+<!ENTITY subscription.disabledFilters.warning "Beberapa penyaring pada langganan ini dinonaktifkan.">
+<!ENTITY filter.column "&Aturan penyaring">
+<!ENTITY subscription.lastDownload.label "Terakhir diunduh:">
<!ENTITY viewList.label "Lihat daftar">
diff --git a/chrome/locale/id/firstRun.properties b/chrome/locale/id/firstRun.properties
index b32f3a9..590934d 100644
--- a/chrome/locale/id/firstRun.properties
+++ b/chrome/locale/id/firstRun.properties
@@ -1,20 +1,20 @@
-firstRun_feature_tracking_description=Jelajah secara rahasia dengan mematikan pelacakan - menyembunyikan jejak anda dari perusahaan iklan yang melacak setiam langkah anda.
-firstRun_toggle_off=Mati
-firstRun_feature_tracking=Matikan Pelacakan
-firstRun_feature_malware=Blokir malware
-firstRun_title=Adblock Plus terinstal
-firstRun_toggle_on=Nyala
-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_contributor_credits=Kredit Kontributor
+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=MATI
+firstRun_feature_tracking=Penonaktifan Pelacakan
+firstRun_feature_malware=Pencekalan malware
+firstRun_title=Adblock Plus telah dipasang
+firstRun_toggle_on=NYALA
+firstRun_acceptableAdsExplanation=Kami ingin mendorong situs web untuk menggunakan iklan yang tanpa basa-basi dan tidak mengganggu. Itulah sebabnya kami telah menetapkan <a>panduan ketat</a> untuk mengidentifikasi iklan mana saja yang diizinkan, yang akan ditampilkan dengan pengaturan baku. Jika Anda masih ingin mencekal semua iklan, Anda dapat <a>menonaktifkan</a> fitur ini dalam beberapa detik.
+firstRun_contributor_credits=Daftar Kontributor
firstRun_dataCorruptionWarning=Apakah halaman ini terus muncul? <a>Klik di sini!</a>
-firstRun_acceptableAdsHeadline=Iklan yang mengganggu telah akan diblokir sekarang
-firstRun_share=Bagikan dengan teman anda
-firstRun_share_headline=<a>Bantu kami</a> dalam membuat web menjadi lebih baik
-firstRun_feature_social_description=Secara otomatis menghapus tombol sosial media dari pengalaman penjelajahan anda, seperti tombol Like Facebook yang muncul pada halaman web dan melacak gerak-gerik anda.
-firstRun_filterlistsReinitializedWarning=Sepertinya ada sesuatu yang membuat semua filter terhapus dan kami tak dapat memulihkan cadangan. Kami telah memulai ulang filter dan pengaturan Iklan yang Diizinkan. Coba periksa daftar filter dan pengaturan Iklan yang Diizinkan di <a>pengaturan Adblock Plus</a>.
-firstRun_feature_malware_description=Buat penjelajahan anda lebih aman dengan memblokir domain yang dikenal sebagai malware.
-firstRun_features=Adblock Plus dapat melakukan lebih banyak daripada sekedar memblokir iklan
-firstRun_donate=sumbangkan
-firstRun_donate_label=Dukung proyek ini
-firstRun_feature_social=Hilangkan Tombol Sosial Media
-firstRun_legacySafariWarning=Anda menggunakan versi lama browser Safari yang tidak didukung oleh Adblock Plus. Mungkin Adblock Plus tidak dapat bekerja dengan baik atau bahkan dapat mengganggu pengalaman dan kenyamanan pengguna di beberapa situs. Kami sangat menyarankan untuk memperbarui Safari ke versi 6.1.1 atau lebih tinggi (pada OS X 10.8 Mountain Lion), atau vesi Safari 7.0.1 (pada OS X 10.9 Mavericks), atau menggunakan versi terbaru Mozilla Firefox, Google Chrome atau Opera.
+firstRun_acceptableAdsHeadline=Iklan yang mengganggu kini akan dicekal
+firstRun_share=Beritahu teman Anda
+firstRun_share_headline=<a>Bantulah kami</a> dalam membuat web menjadi tempat yang lebih baik
+firstRun_feature_social_description=Secara otomatis menyingkirkan tombol media sosial dari pengalaman penjelajahan Anda, seperti tombol Suka Facebook yang muncul pada halaman web dan melacak kebiasaan anda.
+firstRun_filterlistsReinitializedWarning=Nampaknya ada masalah yang menyebabkan semua penyaring terhapus dan kami tak dapat memulihkan cadangan. Maka dari itu, kami telah mengatur ulang penyaring dan pengaturan Iklan yang Diizinkan Anda. Silakan periksa daftar penyaring dan pengaturan Iklan yang Diizinkan Anda di <a>opsi Adblock Plus</a>.
+firstRun_feature_malware_description=Membuat penjelajahan Anda lebih aman dengan memcekal domain malware yang sudah diketahui.
+firstRun_features=Adblock Plus dapat melakukan lebih banyak hal daripada sekadar memcekal iklan
+firstRun_donate=sumbang
+firstRun_donate_label=Dukung proyek kami
+firstRun_feature_social=Penghilangan Tombol Sosial Media
+firstRun_legacySafariWarning=Anda menggunakan Safari versi lama yang tidak didukung oleh Adblock Plus. Adblock Plus mungkin saja tidak dapat berfungsi dengan baik atau mengurangi kenyamanan pengguna pada beberapa situs. Kami sangat menyarankan agar Anda memutakhirkannya ke Safari 6.1.1 atau yang lebih baru (pada OS X 10.8 Mountain Lion), atau Safari 7.0.1 atau yang lebih baru (pada OS X 10.9 Mavericks), atau menggunakan Mozilla Firefox, Google Chrome atau Opera versi terbaru.
diff --git a/chrome/locale/id/global.properties b/chrome/locale/id/global.properties
index 42fbf15..9856e5c 100644
--- a/chrome/locale/id/global.properties
+++ b/chrome/locale/id/global.properties
@@ -1,40 +1,40 @@
-no_blocking_suggestions=Tidak ada item yang dapat diblok di halaman ini
+no_blocking_suggestions=Tidak ada butir yang dapat dicekal pada halaman ini
action3_tooltip=Klik untuk mengaktifkan/menonaktifkan Adblock Plus.
-notification_antiadblock_title=Sembunyikan pesan yang dipilih?
-type_label_script=script
-filter_elemhide_nocriteria=Tidak ada kriteria yang ditentukan untuk mengenali unsur yang disembunyikan
-blockingGroup_title=Aturan pemblokiran iklan
+notification_antiadblock_title=Sembunyikan pesan yang ditargetkan?
+type_label_script=skrip
+filter_elemhide_nocriteria=Tidak ada kriteria yang telah ditentukan untuk mengenali elemen yang ingin disembunyikan
+blockingGroup_title=Aturan Pencekalan Iklan
whitelisted_tooltip=Adblock Plus dinonaktifkan pada halaman ini.
-type_label_stylesheet=stylesheet
+type_label_stylesheet=lembar gaya
blocked_count_tooltip=?1? dari ?2?
-type_label_font=font
-type_label_popup=Jendela pop-up
-filter_regexp_tooltip=Filter ini adalah regular expression atau terlalu pendek untuk dioptimalkan. Penggunaan filter yang terlalu banyak akan memperlambat browsing Anda.
-action0_tooltip=Klik untuk memunculkan menu, klik tengah untuk mengaktifkan/menonaktifkan.
+type_label_font=fon
+type_label_popup=jendela munculan
+filter_regexp_tooltip=Penyaring ini terlalu pendek untuk dioptimalkan atau merupakan suatu regular expression. Jika ada banyak penyaring semacam ini, peramban Anda mungkin akan melambat.
+action0_tooltip=Klik untuk memunculkan menu konteks, klik tengah untuk mengaktifkan/menonaktifkan.
whitelisted_page=Adblock Plus telah dinonaktifkan untuk halaman ini
-remove_group_warning=Anda benar-benar ingin menghapus kelompok ini?
-action1_tooltip=Klik untuk membuka/menutup item yang dapat diblok, klik tengah untuk mengaktifkan/menonaktifkan.
+remove_group_warning=Apakah Anda yakin ingin menghapus kelompok ini?
+action1_tooltip=Klik untuk membuka/menutup butir yang dapat dicekal, klik tengah untuk mengaktifkan/menonaktifkan.
type_label_xmlhttprequest=permintaan XML
-active_tooltip=Adblock Plus diaktifkan, ?1? filter subscription(s) dan ?2? custom filter(s) digunakan.
+active_tooltip=Adblock Plus diaktifkan, ?1? penyaring langganan dan ?2? penyaring ubahsuaian digunakan.
type_label_document=dokumen
-type_label_object_subrequest=objek subrequest
+type_label_object_subrequest=subpermintaan objek
whitelistGroup_title=Aturan pengecualian
disabled_tooltip=Adblock Plus dinonaktifkan.
-filter_elemhide_duplicate_id=Hanya satu ID dari unsur yang akan disembunyikan dapat ditentukan
-type_label_object=Obyek
+filter_elemhide_duplicate_id=Adblok Plus hanya dapat menerima sebanyak satu kali suatu ID dari elemen yang ingin disembunyikan
+type_label_object=objek
action2_tooltip=Klik untuk membuka preferensi, klik tengah untuk mengaktifkan/menonaktifkan.
type_label_subdocument=bingkai
-clearStats_warning=Ini akan menyetel ulang semua filter statistik kunjungan dan menonaktifkan filter penghitung kunjungan. Apakah Anda ingin melanjutkan?
-notification_antiadblock_message=Situs ini dikenal sebagai penunjuk pesan yang dipilih terhadap pengguna Adblock Plus. Apakah anda ingin Adblock Plus menyembunyikan pesan yang dipilih?
-blocked_count_addendum=(Dalam daftar putih:?1?, tersembunyi:?2?)
-subscription_invalid_location=Filter daftar lokasi bukanlah URL valid maupun nama file yang valid.
+clearStats_warning=Statistik kunjungan dari semua penyaring akan diatur ulang dan penghitung kunjungan penyaring akan dinonaktifkan. Apakah Anda ingin melanjutkan?
+notification_antiadblock_message=Situs ini telah diketahui sering menampilkan pesan yang ditargetkan untuk pengguna Adblock Plus. Apakah Anda ingin Adblick Plus untuk menyembunyikan pesan yang ditargetkan tersebut?
+blocked_count_addendum=(juga masuk dalam daftar putih: ?1?, dan disembunyikan: ?2?)
+subscription_invalid_location=Lokasi daftar penyaring bukan merupakan sebuah URL atau nama berkas yang sah.
type_label_image=gambar
-remove_subscription_warning=Apakah anda yakin ingin menghapus langganan ini?
-type_label_other=Lainnya
+remove_subscription_warning=Apakah Anda yakin ingin menghapus langganan ini?
+type_label_other=lainnya
mobile_menu_enable=ABP: Aktifkan
type_label_media=audio/video
-mobile_menu_disable_site=ABP: Menonaktifkan pada ?1?
-elemhideGroup_title=Aturan penyembunyian elemen
+mobile_menu_disable_site=ABP: Nonaktifkan pada ?1?
+elemhideGroup_title=Aturan Penyembunyian Elemen
mobile_menu_enable_site=ABP: Aktifkan pada ?1?
type_label_elemhide=tersembunyi
newGroup_title=Kelompok penyaring baru
diff --git a/chrome/locale/id/meta.properties b/chrome/locale/id/meta.properties
index cc5675a..c9f2f46 100644
--- a/chrome/locale/id/meta.properties
+++ b/chrome/locale/id/meta.properties
@@ -1,6 +1,6 @@
-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
+description.short=Mencekal iklan video yang menggangu di YouTube, iklan Facebook, banner, dan masih banyak lagi.\n\nAdblock Plus mencekal segala macam iklan yang menggangu, dan mendukung situs web dengan secara baku tidak meneckal iklan yang tidak mencolok (dapat dikonfigurasi).
name=Adblock Plus
-description.long.addition1=Dimulai dengan Adblock Plus 2.0 terdapat pilihan dalam Preferensi Filter untuk menerima beberapa iklan yg tidak menggangu. Tujuannya agar untuk mendukung situs web yang menggunakan iklan yang tidak menganggu dan mendorong lebih banyak website melakukan hal yang sama. <a href="http://adblockplus.org/en/acceptable-ads">Baca lebih lanjut</a>
-translator=Wladimir Palant, RudzLong
-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 kont [...]
+description.long.addition1=Sejak Adblock Plus 2.0, terdapat pilihan dalam Preferensi Penyaring untuk mengizinkan beberapa iklan yang tidak mencolok. Hal ini bertujuan untuk mendukung situs web yang menggunakan iklan yang tidak mencolok, serta mendorong lebih banyak situs web agar melakukan tindakan serupa. <a href="http://adblockplus.org/en/acceptable-ads">Baca selengkapnya</a>
+translator=Wladimir Palant, William Surya Permana, RudzLong
+description.long=Adblock Plus memungkinkan Anda untuk mendapatkan kendali atas internet dan melihat web sesuai yang Anda inginkan. Pengaya ini didukung oleh lebih dari empat puluh penyaring berlangganan dalam puluhan bahasa yang secara otomatis dikonfigurasi untuk berbagai keperluan, mulai dari menghilangkan iklan daring hingga mencekal domain malware yang sudah diketahui. Adblock Plus juga memungkinkan Anda untuk menyesuaikan penyaring Anda dengan bantuan berbagai fitur bermanfaat, sepe [...]
description=Iklan sudah menjadi masa lalu!
diff --git a/chrome/locale/id/overlay.dtd b/chrome/locale/id/overlay.dtd
index 3b26c07..bd559e3 100644
--- a/chrome/locale/id/overlay.dtd
+++ b/chrome/locale/id/overlay.dtd
@@ -1,31 +1,31 @@
-<!ENTITY notification.button.yes "&Iya">
+<!ENTITY notification.button.yes "&Ya">
<!ENTITY notification.button.no "&Tidak">
-<!ENTITY sync.label "Syn&c pengaturan Adblock Plus">
-<!ENTITY whitelist.site.label "Non aktifkan pada ?1?">
+<!ENTITY sync.label "&Sinkronkan pengaturan Adblock Plus">
+<!ENTITY whitelist.site.label "Nonaktifkan pada ?1?">
<!ENTITY filters.label "&Preferensi penyaring">
-<!ENTITY disable.label "Non aktifkan disemua tempat">
-<!ENTITY objecttab.title "Blokir">
-<!ENTITY objecttab.tooltip "Klik disini untuk memblokir objek ini dengan Adblock Plus">
+<!ENTITY disable.label "Nonaktifkan di semua tempat">
+<!ENTITY objecttab.title "Cekal">
+<!ENTITY objecttab.tooltip "Klik di sini untuk mencekal objek ini dengan Adblock Plus">
<!ENTITY menuitem.label "Preferensi Ad&block Plus">
-<!ENTITY objecttabs.label "&Tunjukkan tab pada Flash dan Java">
+<!ENTITY objecttabs.label "&Tampilkan tab pada Flash dan Java">
<!ENTITY sendReport.label "&Laporkan masalah pada halaman ini">
-<!ENTITY whitelist.page.label "Non aktifkan pada halaman ini saja">
-<!ENTITY context.image.label "Adblock Plus: Blokir gambar">
-<!ENTITY counthits.label "Menghitung filter &kunjungan">
-<!ENTITY opensidebar.label "Buka &item yang dapat diblok">
+<!ENTITY whitelist.page.label "Nonaktifkan pada halaman ini saja">
+<!ENTITY context.image.label "Adblock Plus: Cekal gambar">
+<!ENTITY counthits.label "Hitung &kunjungan penyaring">
+<!ENTITY opensidebar.label "Buka &butir yang dapat dicekal">
<!ENTITY notification.button.close "&Tutup">
<!ENTITY contribute.label "Kontribusi untuk Adblock Plus">
<!ENTITY toolbarbutton.label "Adblock Plus">
-<!ENTITY context.frame.label "Adblock Plus: Blokir bingkai">
-<!ENTITY blocked.tooltip "Blokir item pada halaman ini:">
-<!ENTITY hideplaceholders.label "Sembunyikan p&laceholders dari unsur pemblokiran">
-<!ENTITY showinstatusbar.label "Tunjukkan di &status bar">
-<!ENTITY sidebar.title "Item yang dapat diblok di halaman ini">
-<!ENTITY options.label "&Pilihan">
-<!ENTITY context.object.label "Adblock Plus: Blokir objek">
-<!ENTITY context.removeWhitelist.label "Adblock Plus: Mengaktifkan ulang pada halaman ini">
-<!ENTITY filters.tooltip "Filter paling aktif:">
-<!ENTITY closesidebar.label "Tutup &item yang dapat diblok">
-<!ENTITY showintoolbar.label "Tunjukkan di tool&bar">
+<!ENTITY context.frame.label "Adblock Plus: Cekal bingkai">
+<!ENTITY blocked.tooltip "Butir yang dicekal pada halaman ini:">
+<!ENTITY hideplaceholders.label "Sembunyikan &penanda elemen yang dicekal">
+<!ENTITY showinstatusbar.label "Tampilkan pada bilah &status">
+<!ENTITY sidebar.title "Butir yang dapat dicekal pada halaman ini">
+<!ENTITY options.label "&Opsi">
+<!ENTITY context.object.label "Adblock Plus: Cekal objek">
+<!ENTITY context.removeWhitelist.label "Adblock Plus: Aktifkan kembali pada halaman ini">
+<!ENTITY filters.tooltip "Penyaring teraktif:">
+<!ENTITY closesidebar.label "Tutup butir yang dapat dicekal">
+<!ENTITY showintoolbar.label "Tampilkan pada bilah &alat">
<!ENTITY status.tooltip "Status:">
-<!ENTITY context.media.label "Adblock Plus: Blokir audio/video">
+<!ENTITY context.media.label "Adblock Plus: Cekal audio/video">
diff --git a/chrome/locale/id/sendReport.dtd b/chrome/locale/id/sendReport.dtd
index 3597553..2e484ec 100644
--- a/chrome/locale/id/sendReport.dtd
+++ b/chrome/locale/id/sendReport.dtd
@@ -1,7 +1,7 @@
<!ENTITY screenshot.undo.label "&Batalkan">
<!ENTITY issues.disabledgroups.description "Filter langganan / kelompok filter ini dinonaktifkan, namun mungkin tetap akan memliki efek pada halaman ini:">
<!ENTITY showData.label "Tunjukkan data laporan">
-<!ENTITY typeSelector.falsePositive.label "Adblock Plus memblokir terlalu &banyak">
+<!ENTITY typeSelector.falsePositive.label "Adblock Plus memcekal terlalu &banyak">
<!ENTITY issues.change.description "Konfigurasi Anda telah diubah. Silahkan muat ulang halaman untuk menguji perubahan dan kirimkan laporan jika masalah belum terselesaikan oleh perubahan tersebut.">
<!ENTITY email.label "Email:">
<!ENTITY issues.openPreferences.label "Buka preferensi filter">
@@ -9,7 +9,8 @@
<!ENTITY copyLink.label "&Copy link laporan">
<!ENTITY issues.nofilters.description "Adblock Plus tidak memblokir apapun pada halaman ini. Masalah yang Anda alami tidak ada kaitannya dengan Adblock Plus.">
<!ENTITY sendPage.knownIssue "Masalah yang Anda laporkan mungkin sudah dikenal. Informasi selanjutnya:">
-<!ENTITY typeSelector.other.description "Pilih opsi ini jika Anda mencurigai masalah dengan Adblock Plus sendiri daripada filter nya.">
+<!ENTITY typeSelector.other.description "Pilih opsi ini jika Anda mencurigai adanya permasalahan dengan
+ Adblock Plus itu sendiri, dan bukan berasal dari penyaringnya.">
<!ENTITY issues.disabledgroups.enable.label "Aktifkan filter langganan / kelompok filter">
<!ENTITY typeWarning.override.label "Saya mengerti dan ingin mengirim laporan">
<!ENTITY issues.disabled.enable.label "Aktifkan Adblock Plus">
@@ -17,13 +18,15 @@
<!ENTITY anonymous.label "&Penyerahan anonim">
<!ENTITY reloadButton.label "&Muat ulang halaman">
<!ENTITY recentReports.clear.label "&Hapus semua laporan">
-<!ENTITY typeSelector.description "Jendela ini akan memandu Anda melalui langkah-langkah yang diperlukan untuk penyerahan laporan masalah ke Adblock plus. Pertama, silakan pilih jenis masalah yang Anda alami di halaman ini:">
+<!ENTITY typeSelector.description "Jendela ini akan memandu Anda melewati langkah-langkah yang diperlukan
+ untuk mengirimkan laporan permasalahan Adblock Plus. Pertama, silakan pilih
+ jenis permasalahan yang Anda alami di halaman ini:">
<!ENTITY screenshot.remove.label "&Hapus semua data sensitif">
<!ENTITY issues.ownfilters.description "Beberapa dari filter yang diterapkan pada halaman ini ditetapkan oleh pengguna. Silahkan nonaktifkan filter yang mungkin menyebabkan masalah:">
<!ENTITY update.inProgress.description "Adblock Plus perlu memperbaharui langganan filter Anda untuk memastikan bahwa masalah belum bisa diselesaikan. Harap tunggu...">
<!ENTITY sendPage.retry.label "Kirim kembali">
<!ENTITY data.label "Data laporan:">
-<!ENTITY recentReports.label "Anda baru saja mengirimkan laporan">
+<!ENTITY recentReports.label "Laporan Anda yang baru saja dikirim">
<!ENTITY typeWarning.description "Anda menyatakan bahwa Anda ingin melaporkan masalah umum dengan Adblock Plus daripada masalah filter. Silahkan catat bahwa masalah seperti ini lebih baik dilaporkan pada [link]Forum Adblock Plus[/link]. Anda hanya perlu menggunakan pelaporan masalah untuk melengkapi diskusi yang ada, karena tidak ada seorangpun yang melihat laporan Anda kecuali Anda memberi mereka link untuk masalah tersebut. Link otomatis akan diberikan setelah mengirimkan laporan.">
<!ENTITY issues.disabled.description "Adblock Plus dinonaktifkan, ini tidak akan memblokir apapun dalam keadaan ini.">
<!ENTITY attachExtensions.label "Lampirkan daftar ekstensi aktif pada laporan jika konflik pengaya adalah penyebab dari masalah tersebut">
@@ -31,33 +34,36 @@
<!ENTITY issues.disabledfilters.enable.label "Aktifkan filter">
<!ENTITY issues.override.label "&Konfigurasi benar, lanjutkan dengan laporkan">
<!ENTITY issues.nosubscriptions.description "Anda tidak berlangganan satupun dari filter bawaan yang secara otomatis menghapus konten yang tidak diinginkan pada situs web.">
-<!ENTITY typeSelector.falsePositive.description "Pilih opsi ini jika halaman kurang memiliki konten penting, salah menampilkan atau tidak berfungsi dengan benar. Anda dapat menentukan apakah Adblock Plus adalah penyebab masalah dengan menonaktifkannya untuk sementara.">
-<!ENTITY typeSelector.other.label "Masalah lainnya">
+<!ENTITY typeSelector.falsePositive.description "Pilih opsi ini jika halaman tersebut telah kehilangan konten penting, ditampilkan dengan
+ tidak tepat, atau tidak berfungsi sebagaimana mestinya. Anda dapat memastikan apakah
+ Adblock Plus yang menyebabkan permasalahan tersebut dengan menonaktifkannya untuk sementara.">
+<!ENTITY typeSelector.other.label "Permasalahan &lainnya">
<!ENTITY emailComment.label "Kami menganjurkan Anda untuk memasukkan alamat email yang valid sehingga kami dapat menghubungi Anda jika terdapat pertanyaan tentang laporan Anda. Ini juga akan memungkinkan kami untuk mengetahui kontribusi Anda dan meninggikan prioritas.">
<!ENTITY issues.whitelist.remove.label "Aktifkan kembali Adblock Plus pada halaman ini">
<!ENTITY outdatedSubscriptions.description "Filter langganan ini belum diperbaharui setidaknya dua minggu. Silahkan perbaharui langganan ini sebelum mengirimkan laporan masalah yang mungkin sudah terselesaikan sebelumnya.">
-<!ENTITY dataCollector.description "Silahkan tunggu beberapa saat ketika Adblock Plus sedang mengumpulkan data yang dibutuhkan.">
+<!ENTITY dataCollector.description "Silakan tunggu beberapa saat selagi Adblock Plus mengumpulkan data yang diperlukan.">
<!ENTITY sendButton.label "Kirim laporan">
<!ENTITY comment.label "&Komentar (pilihan):">
<!ENTITY sendPage.errorMessage "Upaya mengirimkan laporan gagal dengan kode kesalahan "?1?". Silahkan pastikan Anda terhubung ke Internet dan coba kembali. Jika masalah berlanjut, silahkan meminta bantuan pada [link]Forum Adblock Plus[/link].">
-<!ENTITY showRecentReports.label "Tampilkan laporan yang baru disampaikan">
+<!ENTITY showRecentReports.label "Tampilkan laporan yang baru dikirim">
<!ENTITY commentPage.heading "Masukkan Komentar">
<!ENTITY update.start.label "Mulai pembaharuan sekarang">
<!ENTITY issues.disabledfilters.description "Filter ini dinonaktifkan, namun mungkin masih mempunyai efek pada halaman ini:">
<!ENTITY screenshot.description "Halaman yang sama dapat terlihat berbeda untuk berbagai orang. Ini dapat membantu kami untuk memahami masalah jika Anda melampirkan sebuah screenshot pada laporan Anda. Anda dapat menghapus bagian yang mengandung informasi sensitif serta tandai daerah dimana masalah tersebut terjadi. Untuk melakukannya klik sesuai tombol dan pilih bagian dari gambar dengan mouse Anda.">
<!ENTITY screenshot.attach.label "Lampirkan gambar halaman untuk melaporkan">
<!ENTITY issues.whitelist.description "Adblock Plus sedang dinonaktifkan pada halaman yang Anda laporkan. Silahkan aktifkan dan muat ulang halaman sebelum mengirimkan laporan untuk membantu peyelidikan masalah ini.">
-<!ENTITY typeSelector.falseNegative.label "Adblock Plus tidak memblokir sebuah &iklan">
-<!ENTITY typeSelector.heading "Pilih jenis masalah">
+<!ENTITY typeSelector.falseNegative.label "Adblock Plus tidak mencekal sebuah &iklan">
+<!ENTITY typeSelector.heading "Pilih jenis permasalahan">
<!ENTITY anonymity.warning "Kami tidak dapat menghubungi Anda kembali dan akan menurunkan prioritas laporan ini.">
-<!ENTITY wizard.title "Pelaporan">
+<!ENTITY wizard.title "Pelapor permasalahan">
<!ENTITY issues.ownfilters.disable.label "Nonaktifkan filter">
<!ENTITY commentPage.description "Kotak teks di bawah ini memungkinkan Anda untuk memasukkan komentar untuk membantu kami memahami masalah.
Langkah ini adalah pilihan tetapi dianjurkan jika masalahnya tidak jelas. Anda juga dapat memeriksa data laporan sebelum dikirim.">
<!ENTITY comment.lengthWarning "Panjang komentar Anda melebihi 1000 karakter. Hanya 1000 karakter pertama yang akan dikirim.">
-<!ENTITY typeSelector.falseNegative.description "Pilih opsi ini jika iklan ditampilkan meskipun Adblock Plus telah diaktifkan.">
+<!ENTITY typeSelector.falseNegative.description "Pilih opsi ini jika suatu iklan tetap muncul meski Adblock Plus
+ telah diaktifkan.">
<!ENTITY sendPage.waitMessage "Silahkan tunggu sementara Adblock Plus mengirimkan laporan Anda.">
-<!ENTITY dataCollector.heading "Selamat datang di tempat pelaporan masalah">
+<!ENTITY dataCollector.heading "Selamat datang di pelapor permasalahan">
<!ENTITY screenshot.heading "Lampirkan screenshot">
<!ENTITY sendPage.heading "Kirim laporan">
<!ENTITY issues.subscriptionCount.description "Tampaknya Anda berlangganan filter langganan terlalu banyak. Pengaturan ini tidak dianjurkan karena akan membuat masalah semakin tinggi. Kami juga tidak dapat menerima laporan masalah karena tidak jelas filter langganan mana yang pembuat butuhkan untuk menindak lanjuti. Silahkan hapus semua selain yang benar-benar dibutuhkan dan uji apakah masalah masih terjadi.">
diff --git a/chrome/locale/id/sidebar.dtd b/chrome/locale/id/sidebar.dtd
index 3211f96..a778478 100644
--- a/chrome/locale/id/sidebar.dtd
+++ b/chrome/locale/id/sidebar.dtd
@@ -1,35 +1,35 @@
-<!ENTITY context.flash.label "Border item yang ber-flash">
+<!ENTITY context.flash.label "Kedipkan tepian butir">
<!ENTITY address.label "Alamat">
-<!ENTITY context.open.label "Buka di tab baru">
-<!ENTITY type.label "Ketik">
-<!ENTITY tooltip.filterSource.label "Sumber filter:">
-<!ENTITY noitems.label "Tidak ada item yang bisa diblok">
-<!ENTITY filter.label "Filter">
+<!ENTITY context.open.label "Buka di Tab Baru">
+<!ENTITY type.label "Jenis">
+<!ENTITY tooltip.filterSource.label "Sumber penyaring:">
+<!ENTITY noitems.label "Tidak ada butir yang dapat dicekal">
+<!ENTITY filter.label "Penyaring">
<!ENTITY tooltip.size.label "Ukuran:">
-<!ENTITY reattach.label "Sertakan kembali">
+<!ENTITY reattach.label "Sematkan">
<!ENTITY search.label "&Cari:">
<!ENTITY docDomain.thirdParty "(pihak ketiga)">
-<!ENTITY filterSource.label "Sumber filter">
+<!ENTITY filterSource.label "Sumber penyaring">
<!ENTITY tooltip.docDomain.label "Sumber dokumen:">
-<!ENTITY context.copy.label "Salin alamat item">
-<!ENTITY tooltip.type.label "Tipe:">
-<!ENTITY context.disablefilter.label "Nonaktifkan filter ?1?">
-<!ENTITY context.copyFilter.label "Salin filter">
-<!ENTITY context.block.label "Blokir item ini">
-<!ENTITY context.enablefilter.label "Hidupkan kembali filter ?1?">
-<!ENTITY detach.label "Lepas">
-<!ENTITY whitelisted.label "Halaman yang dibebaskan">
+<!ENTITY context.copy.label "Salin alamat butir">
+<!ENTITY tooltip.type.label "Jenis:">
+<!ENTITY context.disablefilter.label "Nonaktifkan penyaring ?1?">
+<!ENTITY context.copyFilter.label "Salin penyaring">
+<!ENTITY context.block.label "Cekal butir ini">
+<!ENTITY context.enablefilter.label "Aktifkan kembali penyaring ?1?">
+<!ENTITY detach.label "Lepaskan">
+<!ENTITY whitelisted.label "Halaman dalam daftar putih">
<!ENTITY context.disablefilteronsite.label "Nonaktifkan filter ini pada ?1?">
-<!ENTITY detached.title "Adblock Plus: Item yang bisa diblok (dilepaskan)">
+<!ENTITY detached.title "Adblock Plus: Butir yang dapat dicekal (dilepaskan)">
<!ENTITY docDomain.firstParty "(pihak pertama)">
-<!ENTITY tooltip.type.whitelisted "(dibebaskan)">
-<!ENTITY tooltip.filter.label "Efek filter:">
+<!ENTITY tooltip.type.whitelisted "(dalam daftar putih)">
+<!ENTITY tooltip.filter.label "Penyaring yang berlaku:">
<!ENTITY tooltip.filter.disabled "(dinonaktifkan)">
-<!ENTITY context.editfilter.label "Edit efek filter">
-<!ENTITY tooltip.type.blocked "(diblokir)">
+<!ENTITY context.editfilter.label "Sunting penyaring yang berlaku">
+<!ENTITY tooltip.type.blocked "(dicekal)">
<!ENTITY size.label "Ukuran">
-<!ENTITY context.whitelist.label "Tambahkan Aturan pengecualian untuk item">
+<!ENTITY context.whitelist.label "Tambah aturan pengecualian untuk butir ini">
<!ENTITY context.selectAll.label "Pilih semua">
-<!ENTITY state.label "Bagian">
+<!ENTITY state.label "Status">
<!ENTITY docDomain.label "Sumber dokumen">
<!ENTITY tooltip.address.label "Alamat:">
diff --git a/chrome/locale/id/subscriptionSelection.dtd b/chrome/locale/id/subscriptionSelection.dtd
index 4092dd2..f1e217c 100644
--- a/chrome/locale/id/subscriptionSelection.dtd
+++ b/chrome/locale/id/subscriptionSelection.dtd
@@ -1,12 +1,12 @@
-<!ENTITY addMain.label "Tambahkan filter &langganan "?1?" juga">
-<!ENTITY list.download.failed "Adblock Plus gagal untuk mengambil daftar langganan.">
+<!ENTITY addMain.label "Tambahkan juga penyaring &langganan "?1?"">
+<!ENTITY list.download.failed "Adblock Plus gagal mengambil daftar penyaring langganan.">
<!ENTITY list.download.retry "Coba lagi">
<!ENTITY title.label "&Judul langganan:">
-<!ENTITY list.download.website "Lihat situs">
-<!ENTITY supplementMessage "Filter langganan ini dimaksudkan untuk digunakan dengan filter langganan "?1?" yang Anda tidak menggunakannya lagi.">
-<!ENTITY viewList.label "Lihat filter">
-<!ENTITY visitHomepage.label "Kunjungi situs web">
-<!ENTITY addSubscription.label "Tambahkan langganan">
-<!ENTITY dialog.title "Tambahkan filter langganan Adblock Plus">
-<!ENTITY location.label "&Lokasi daftar filter:">
-<!ENTITY fromWeb.description "Silahkan konfirmasi bahwa Anda ingin menambahkan filter langganan. Anda dapat merubah judul langganan atau lokasi sebelum menambahkannya.">
+<!ENTITY list.download.website "Tampilkan situs web">
+<!ENTITY supplementMessage "Penyaring langganan ini dimaksudkan untuk digunakan bersamaan dengan penyaring langganan "?1?" yang tidak Anda gunakan saat ini.">
+<!ENTITY viewList.label "Tampilkan penyaring">
+<!ENTITY visitHomepage.label "Kunjungi beranda">
+<!ENTITY addSubscription.label "Tambah langganan">
+<!ENTITY dialog.title "Tambah penyaring langganan Adblock Plus">
+<!ENTITY location.label "&Lokasi daftar penyaring:">
+<!ENTITY fromWeb.description "Silakan konfirmasi bahwa Anda ingin menambahkan penyaring langganan ini. Anda dapat mengubah judul atau lokasi langganan sebelum menambahkannya.">
diff --git a/chrome/locale/ja/overlay.dtd b/chrome/locale/ja/overlay.dtd
index e0a03c9..b9eef7a 100644
--- a/chrome/locale/ja/overlay.dtd
+++ b/chrome/locale/ja/overlay.dtd
@@ -9,7 +9,7 @@
<!ENTITY menuitem.label "Adblock Plus 設定(&B)">
<!ENTITY objecttabs.label "Flash と Java でタブを表示(&T)">
<!ENTITY sendReport.label "このページでの不具合を報告(&R)">
-<!ENTITY whitelist.page.label "このページだけ無効">
+<!ENTITY whitelist.page.label "このページのみで無効">
<!ENTITY context.image.label "Adblock Plus: 画像をブロック">
<!ENTITY counthits.label "フィルタのヒット数を数える(&H)">
<!ENTITY opensidebar.label "ブロック可能項目一覧を開く(&B)">
diff --git a/chrome/locale/ja/sendReport.dtd b/chrome/locale/ja/sendReport.dtd
index 3bbbedd..d8f1957 100644
--- a/chrome/locale/ja/sendReport.dtd
+++ b/chrome/locale/ja/sendReport.dtd
@@ -38,7 +38,7 @@
<!ENTITY outdatedSubscriptions.description "購読している次のフィルタは２週間以上更新されていません。既に不具合は解決済みかもしれないので、先に手動更新してから不具合を報告してください。">
<!ENTITY dataCollector.description "Adblock Plus が必要なデータを集めています。しばらくお待ちください。">
<!ENTITY sendButton.label "不具合報告を送信(&N)">
-<!ENTITY comment.label "コメント(任意入力):(&C)">
+<!ENTITY comment.label "コメント (的確に記述すれば良い対応が期待できます) (&C):">
<!ENTITY sendPage.errorMessage "不具合報告の送信がエラーコード "?1?" で失敗しました。インターネットに接続されているか確認し再試行してください。問題が解決しない場合は [link]Adblock Plus フォーラム[/link] で助けを求めてください。">
<!ENTITY showRecentReports.label "最近送信した不具合報告を表示">
<!ENTITY commentPage.heading "コメントを入力">
@@ -52,7 +52,7 @@
<!ENTITY anonymity.warning "匿名で報告の際は報告者を個別に識別できないので優先度が下がります。">
<!ENTITY wizard.title "不具合報告">
<!ENTITY issues.ownfilters.disable.label "フィルタを無効化">
-<!ENTITY commentPage.description "症状、再現手順、原因を特定した根拠、不具合発生開始時期、正常動作との違い、不具合発生場所等のコメントは不具合の把握を早めます（送信前に内容確認あり）。">
+<!ENTITY commentPage.description "症状、再現手順、原因特定の根拠、発生開始時期、正常時との違い、画面上の位置等をコメントに記入">
<!ENTITY comment.lengthWarning "コメントが 1000 文字を超えているので、先頭から 1000 文字だけ送信します">
<!ENTITY typeSelector.falseNegative.description "Adblock Plus が有効でも広告が表示される場合はこの選択肢。">
<!ENTITY sendPage.waitMessage "Adblock Plus が不具合報告を送信する間、しばらくお待ちください">
diff --git a/chrome/locale/lv/firstRun.properties b/chrome/locale/lv/firstRun.properties
index 6c7153f..e901deb 100644
--- a/chrome/locale/lv/firstRun.properties
+++ b/chrome/locale/lv/firstRun.properties
@@ -3,16 +3,17 @@ firstRun_toggle_off=IZSLĒGTS
firstRun_feature_tracking=Atspējot izsekošanu
firstRun_feature_malware=Bloķēt ļaundabīgas programmas
firstRun_title=AdblockPlus ir uzstādīts
-firstRun_acceptableAdsExplanation=Mēs vēlētos veicināt vienkāršu, neuzbāzīgu reklāmu lietošanu vietnēs. Tāpēc esam izveidojuši <a>stingras vadlīnijas</a> pieņemamo reklāmu noteikšanai, kuras parādītas noklusējuma iestatījumos. Ja Jūs joprojām vēlaties bloķēt pilnīgi visas reklāmas, Jūs varat <a>atspējot</a> šo pēc dažām sekundēm.
firstRun_toggle_on=IESLĒGTS
+firstRun_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_contributor_credits=Ziedotāju saraksts
firstRun_dataCorruptionWarning=Vai šī lapa turpina attēloties? <a>Spied šeit!</a>
firstRun_acceptableAdsHeadline=Uzmācīgas reklāmas turpmāk tiks bloķētas
firstRun_share=Pastāsti saviem draugiem
firstRun_share_headline=<a>Palīdzi mums</a> padarīt tīklu par labāku vietu
-firstRun_features=AdblockPlus var izdarīt vairāk, ne tikai bloķēt reklāmas
-firstRun_feature_malware_description=Padarīt Jūsu pārlūkošanu drošāku, bloķējot zināmos ļaundabīgo programmu avotus.
firstRun_feature_social_description=Automātiski atbrīvot Jūsu pārlūkošanas procesu no tādām sociālo mediju pogām kā Facebook Live, kas parādās interneta lapās un izseko Jūsu darbību.
+firstRun_filterlistsReinitializedWarning=Diemžēl, traucējuma dēļ visi filtri bija novākti un neizdevās izmantot rezerves versiju. Tādēļ mēs atjaunojam jūsu filtrus un Acceptable Ads iestatījumus līdz sākumstāvoklim. Esiet tik laipni un izpētiet jūsu filtra sarakstus un Acceptable Ads iestātījumus izmantojot šo <a>Adblock Plus options</a>.
+firstRun_feature_malware_description=Padarīt Jūsu pārlūkošanu drošāku, bloķējot zināmos ļaundabīgo programmu avotus.
+firstRun_features=AdblockPlus var izdarīt vairāk, ne tikai bloķēt reklāmas
firstRun_donate=ziedot
firstRun_donate_label=Atbalstīt mūsu projektu
firstRun_feature_social=Noņemt sociālo mediju pogas
diff --git a/chrome/locale/mk/filters.dtd b/chrome/locale/mk/filters.dtd
index 0cc3ab0..4e21b82 100644
--- a/chrome/locale/mk/filters.dtd
+++ b/chrome/locale/mk/filters.dtd
@@ -55,7 +55,7 @@
<!ENTITY backup.complete.title "Сите филтри и претплати">
<!ENTITY restore.own.label "Врати своја резервна копија">
<!ENTITY restore.complete.warning "Сите филтерски нагодувања ќе се заменат со оние од копијата. Дали сакате да продолжите?">
-<!ENTITY filters.tab.label "Твои филтери">
+<!ENTITY filters.tab.label "Сопствени филтери">
<!ENTITY backup.label "Направи нова резервна копија">
<!ENTITY find.label "Пронајди">
<!ENTITY subscription.moveDown.label "Оди надолу">
diff --git a/chrome/locale/mk/sendReport.dtd b/chrome/locale/mk/sendReport.dtd
index f085d45..f1c7d3c 100644
--- a/chrome/locale/mk/sendReport.dtd
+++ b/chrome/locale/mk/sendReport.dtd
@@ -1 +1,16 @@
+<!ENTITY screenshot.undo.label "Врати">
+<!ENTITY issues.disabled.enable.label "Вклучи го Adblock Plus">
+<!ENTITY wizard.title "Репортер за грешки">
+<!ENTITY issues.ownfilters.disable.label "Исклучи филтер">
+<!ENTITY typeSelector.description "Овој прозорец ќе Ве води преку чекорите потребни за пријавување на проблем со Adblock Plus. Прво, одберете го видот на проблем кој го имате на оваа страна:">
+<!ENTITY typeSelector.falsePositive.label "Adblock Plus блокира премногу">
+<!ENTITY typeSelector.other.label "Друг проблем">
+<!ENTITY dataCollector.description "Ве молиме почекајте додека Adblock Plus не ги собере потребните податоци.">
+<!ENTITY issues.disabledfilters.enable.label "Вклучи филтер">
+<!ENTITY dataCollector.heading "Добредојдовте во репортерот за грешки">
<!ENTITY commentPage.heading "Вметни коментар">
+<!ENTITY update.start.label "Започни надградба">
+<!ENTITY reloadButton.label "Освежи страна">
+<!ENTITY screenshot.mark.label "Обележи проблем">
+<!ENTITY privacyPolicy.label "Политика за приватност">
+<!ENTITY typeSelector.heading "Одбери вид на проблем">
diff --git a/chrome/locale/ru/composer.dtd b/chrome/locale/ru/composer.dtd
index a7fc2c5..b855baf 100644
--- a/chrome/locale/ru/composer.dtd
+++ b/chrome/locale/ru/composer.dtd
@@ -17,7 +17,7 @@
<!ENTITY dialog.title "Составление фильтра для Adblock Plus">
<!ENTITY basic.label "Стандартный вид">
<!ENTITY type.filter.label "Правило &блокирования">
-<!ENTITY types.label "Применять к типам:">
+<!ENTITY types.label "Применять к типам элементов:">
<!ENTITY shortpattern.warning "Введенный шаблон слишком короткий и потому не будет оптимизирован. Большое количество таких шаблонов может отрицательно сказаться на быстродействии вашего браузера. Рекомендуется по возможности использовать более длинный шаблон.">
<!ENTITY collapse.yes.label "Да">
<!ENTITY anchors.label "Принимать шаблон только:">
diff --git a/chrome/locale/ru/global.properties b/chrome/locale/ru/global.properties
index c279c00..b354597 100644
--- a/chrome/locale/ru/global.properties
+++ b/chrome/locale/ru/global.properties
@@ -1,6 +1,6 @@
no_blocking_suggestions=На открытой странице нет элементов, которые можно было бы заблокировать
action3_tooltip=Щелкните здесь, чтобы включить или отключить Adblock Plus.
-notification_antiadblock_title=скрыть целевых сообщений?
+notification_antiadblock_title=Скрыть целевые сообщения?
type_label_script=Скрипт
filter_elemhide_nocriteria=Не указано никаких признаков, чтобы опознать элемент, который нужно скрыть
blockingGroup_title=Правила блокирования
@@ -10,10 +10,10 @@ blocked_count_tooltip=?1? из ?2?
type_label_font=Шрифт
type_label_popup=Всплывающее окно
filter_regexp_tooltip=Этот фильтр либо является регулярным выражением, либо слишком короткий для оптимизации. Большое количество таких фильтров может отрицательно сказаться на быстродействии вашего браузера.
-action0_tooltip=Щелкните здесь, чтобы открыть контекстное меню. Нажмите среднюю клавишу мышки, чтобы включить или отключить Adblock Plus.
+action0_tooltip=Щелкните здесь, чтобы открыть контекстное меню. Нажмите среднюю кнопку мыши, чтобы включить или отключить Adblock Plus.
whitelisted_page=Adblock Plus отключен на этой странице
remove_group_warning=Вы уверены, что хотите удалить эту группу?
-action1_tooltip=Щелкните здесь, чтобы открыть/закрыть список элементов. Нажмите среднюю клавишу мышки, чтобы включить или отключить Adblock Plus.
+action1_tooltip=Щелкните здесь, чтобы открыть/закрыть список элементов. Нажмите среднюю кнопку мыши, чтобы включить или отключить Adblock Plus.
type_label_xmlhttprequest=XML-запрос
active_tooltip=Adblock Plus включен, используется подписок: ?1?, собственных фильтров: ?2?.
type_label_document=Документ
@@ -22,10 +22,10 @@ whitelistGroup_title=Исключения
disabled_tooltip=Adblock Plus отключен.
filter_elemhide_duplicate_id=У элемента, который нужно скрыть, может быть только один идентификатор
type_label_object=Объект
-action2_tooltip=Щелкните здесь, чтобы открыть окно установок. Нажмите среднюю клавишу мышки, чтобы включить или отключить Adblock Plus.
+action2_tooltip=Щелкните здесь, чтобы открыть окно установок. Нажмите среднюю кнопку мыши, чтобы включить или отключить Adblock Plus.
type_label_subdocument=Фрейм
clearStats_warning=Статистика попаданий будет обнулена для всех фильтров и в дальнейшем больше не будет записываться. Продолжать?
-notification_antiadblock_message=Этот сайт, как известно, показывают целевые сообщения пользователям Adblock Plus. Хотите Adblock Plus, чтобы скрыть целевых сообщений?
+notification_antiadblock_message=Известно, что этот сайт показывает сообщения пользователям Adblock Plus. Хотите, чтобы Adblock Plus скрывал такие сообщения?
blocked_count_addendum=(также исключений: ?1?, спрятано: ?2?)
subscription_invalid_location=Не удалось распознать введенный адрес ни как адрес в интернете, ни как путь файлу.
type_label_image=Изображение
diff --git a/chrome/locale/ru/overlay.dtd b/chrome/locale/ru/overlay.dtd
index 6ff4851..e1acdb9 100644
--- a/chrome/locale/ru/overlay.dtd
+++ b/chrome/locale/ru/overlay.dtd
@@ -1,31 +1,31 @@
-<!ENTITY notification.button.yes "&да">
-<!ENTITY notification.button.no "&нет">
+<!ENTITY notification.button.yes "&Да">
+<!ENTITY notification.button.no "&Нет">
<!ENTITY sync.label "Син&хронизировать настройки Adblock Plus">
<!ENTITY whitelist.site.label "Отключить на ?1?">
<!ENTITY filters.label "Настройки &фильтров">
<!ENTITY disable.label "Отключить везде">
<!ENTITY objecttab.title "Блокировать">
<!ENTITY objecttab.tooltip "Нажмите здесь, чтобы Adblock Plus заблокировал этот объект">
-<!ENTITY menuitem.label "Установки &Adblock Plus">
+<!ENTITY menuitem.label "Настройки Ad&block Plus">
<!ENTITY objecttabs.label "Показывать &ярлык на Flash и Java">
<!ENTITY sendReport.label "&Сообщить о проблеме на этой странице">
<!ENTITY whitelist.page.label "Отключить только на этой странице">
<!ENTITY context.image.label "Adblock Plus: заблокировать изображение">
<!ENTITY counthits.label "С&читать срабатывания фильтров">
<!ENTITY opensidebar.label "Открыть с&писок элементов">
-<!ENTITY notification.button.close "&близко">
+<!ENTITY notification.button.close "&Закрыть">
<!ENTITY contribute.label "Помочь проекту Adblock Plus">
<!ENTITY toolbarbutton.label "Adblock Plus">
-<!ENTITY context.frame.label "Adblock Plus: заблокировать фрейм">
+<!ENTITY context.frame.label "Adblock Plus: Заблокировать фрейм">
<!ENTITY blocked.tooltip "Заблокированные элементы на этой странице:">
<!ENTITY hideplaceholders.label "Прятать &метки на месте заблокированных элементов">
<!ENTITY showinstatusbar.label "Показывать в &строке состояния">
-<!ENTITY sidebar.title "Элементы открытой страницы">
+<!ENTITY sidebar.title "Доступные для блокирования элементы на текущей странице">
<!ENTITY options.label "&Настройки">
-<!ENTITY context.object.label "Adblock Plus: заблокировать объект">
-<!ENTITY context.removeWhitelist.label "Adblock Plus: включить обратно на этой странице">
-<!ENTITY filters.tooltip "Наиболее часто примененные фильтры:">
+<!ENTITY context.object.label "Adblock Plus: Заблокировать объект">
+<!ENTITY context.removeWhitelist.label "Adblock Plus: Включить на этой странице">
+<!ENTITY filters.tooltip "Наиболее часто применяемые фильтры:">
<!ENTITY closesidebar.label "Закрыть с&писок элементов">
<!ENTITY showintoolbar.label "&Показывать в панели инструментов">
<!ENTITY status.tooltip "Статус:">
-<!ENTITY context.media.label "Adblock Plus: заблокировать аудио/видео">
+<!ENTITY context.media.label "Adblock Plus: Заблокировать аудио/видео">
diff --git a/chrome/locale/ru/sendReport.dtd b/chrome/locale/ru/sendReport.dtd
index 39b1b77..a777544 100644
--- a/chrome/locale/ru/sendReport.dtd
+++ b/chrome/locale/ru/sendReport.dtd
@@ -1,7 +1,7 @@
<!ENTITY screenshot.undo.label "&Отменить">
<!ENTITY issues.disabledgroups.description "Следующие подписки / группы фильтров отключены, но могли бы повлиять на эту страницу:">
<!ENTITY showData.label "Показать данные сообщения">
-<!ENTITY typeSelector.falsePositive.label "Adblock Plus блокирует слишко&м многое">
+<!ENTITY typeSelector.falsePositive.label "&Adblock Plus блокирует слишком многое">
<!ENTITY issues.change.description "Ваши настройки изменились. Пожалуйста, обновите страницу для проверки
внесенных изменений и отправьте сообщение, если проблема не разрешилась.">
<!ENTITY email.label "E-&mail:">
@@ -17,11 +17,12 @@
<!ENTITY typeWarning.override.label "Я &понял и, тем не менее, хочу отправить сообщение">
<!ENTITY issues.disabled.enable.label "Включить Adblock Plus">
<!ENTITY update.fixed.description "Обновление ваших подписок на фильтры скорее всего решило проблему, о которой
- вы хотели сообщить. Пожалуйста загрузите заново страницу и попробуйте еще раз.
- Если проблема осталось, то пошлите сообщение еще раз.">
+ вы хотели сообщить. Пожалуйста, загрузите страницу заново и попробуйте еще раз.
+ Если проблема сохраняется,
+отправьте отчет повторно.">
<!ENTITY anonymous.label "Отпр&авить анонимно">
<!ENTITY reloadButton.label "Об&новить страницу">
-<!ENTITY recentReports.clear.label "Уда&лить все сообщения">
+<!ENTITY recentReports.clear.label "&Удалить все отчеты">
<!ENTITY typeSelector.description "Мастер поможет вам отправить сообщение о проблеме с Adblock Plus.
Пожалуйста, укажите на этой странице тип проблемы, с которой вы столкнулись:">
<!ENTITY screenshot.remove.label "У&далить конфиденциальные данные">
@@ -31,7 +32,7 @@
что проблема еще не была решена. Подождите, пожалуйста...">
<!ENTITY sendPage.retry.label "Отправить еще раз">
<!ENTITY data.label "Да&нные сообщения:">
-<!ENTITY recentReports.label "Ваши недавно отправленные сообщения">
+<!ENTITY recentReports.label "Ваши недавно отправленные отчеты">
<!ENTITY typeWarning.description "Вы указали, что хотите сообщить о проблеме в Adblock Plus, а не в его фильтрах.
Пожалуйста, учтите, что о таких проблемах лучше сообщать на
[link]форуме Adblock Plus[/link]. Мастер отправки сообщения следует
@@ -53,7 +54,7 @@
<!ENTITY emailComment.label "Мы рекомендуем ввести e-mail адрес, по которому мы могли бы связаться в случает вопросов по вашему сообщению. Это также позволит нам узнавать Ваши взносы и обрабатывать их в предпочтительном порядке.">
<!ENTITY issues.whitelist.remove.label "Включить Adblock Plus на этой странице">
<!ENTITY outdatedSubscriptions.description "Следующие подписки на фильтры не обновлялись более двух недель. Пожалуйста,
- обновите эти подписки перед отправлением сообщения, поскольку проблема уже
+ обновите эти подписки перед отправкой отчета, поскольку проблема уже
может быть решена.">
<!ENTITY dataCollector.description "Пожалуйста, подождите несколько секунд, пока Adblock Plus собирает нужные данные.">
<!ENTITY sendButton.label "От&править сообщение">
@@ -61,7 +62,7 @@
<!ENTITY sendPage.errorMessage "Ошибка отправки сообщения: «?1?». Пожалуйста,
удостоверьтесь, что ваше соединение с сетью Интернет работает, и попробуйте еще раз.
Если проблема остается, обратитесь в [link]форум Adblock Plus[/link].">
-<!ENTITY showRecentReports.label "Показать недавно отправленные сообщения">
+<!ENTITY showRecentReports.label "Показать недавно отправленные отчеты">
<!ENTITY commentPage.heading "Комментарий">
<!ENTITY update.start.label "Обновить подписки">
<!ENTITY issues.disabledfilters.description "Следующие фильтры отключены, но могли бы повлиять на эту страницу:">
@@ -73,7 +74,7 @@
<!ENTITY issues.whitelist.description "Adblock Plus отключен на странице, о которой вы собираетесь сообщить. Пожалуйста,
включите Adblock Plus и обновите страницу, прежде чем посылать сообщение.
Это поможет рассмотрению вашего сообщения.">
-<!ENTITY typeSelector.falseNegative.label "Adblock Plus не блоки&рует рекламу">
+<!ENTITY typeSelector.falseNegative.label "&Adblock Plus не блокирует рекламу">
<!ENTITY typeSelector.heading "Выбор типа проблемы">
<!ENTITY anonymity.warning "Мы не сможем связаться с вами и, вероятно, уделим меньше внимания Вашему сообщению.">
<!ENTITY wizard.title "Сообщить о проблеме">
@@ -86,7 +87,7 @@
<!ENTITY typeSelector.falseNegative.description "Если несмотря на то, что Adblock Plus включен, на странице отображается реклама,
то следует выбрать этот вариант.">
<!ENTITY sendPage.waitMessage "Пожалуйста, подождите, пока Adblock Plus отправляет ваше сообщение.">
-<!ENTITY dataCollector.heading "Добро пожаловать в мастер отправки сообщения">
+<!ENTITY dataCollector.heading "Добро пожаловать в мастер отправки отчетов">
<!ENTITY screenshot.heading "Снимок экрана">
<!ENTITY sendPage.heading "Отправка сообщения">
<!ENTITY issues.subscriptionCount.description "Похоже, что вы подписаны на слишком большое количество списков фильтров. Это
@@ -95,6 +96,6 @@
фильтров нужно исправлять. Пожалуйста, удалите все списки фильтров кроме
действительно нужных. После этого проверьте, проявляется ли еще проблема.">
<!ENTITY screenshot.mark.label "&Пометить проблему">
-<!ENTITY privacyPolicy.label "Правила конфиденциальности">
+<!ENTITY privacyPolicy.label "Политика конфиденциальности">
<!ENTITY issues.description "Adblock Plus обнаружил проблемы в ваших настройках, которые, возможно, вызвали
- данную проблему или усложнят рассмотрение вашего сообщения.">
+ данную проблему или усложнят рассмотрение вашего отчета.">
diff --git a/chrome/locale/ru/sidebar.dtd b/chrome/locale/ru/sidebar.dtd
index 7786487..1cd820e 100644
--- a/chrome/locale/ru/sidebar.dtd
+++ b/chrome/locale/ru/sidebar.dtd
@@ -7,7 +7,7 @@
<!ENTITY filter.label "Фильтр">
<!ENTITY tooltip.size.label "Размер:">
<!ENTITY reattach.label "Присоединить">
-<!ENTITY search.label "П&оиск:">
+<!ENTITY search.label "&Поиск:">
<!ENTITY docDomain.thirdParty "(запрос с другого сайта)">
<!ENTITY filterSource.label "Список фильтров">
<!ENTITY tooltip.docDomain.label "Домен страницы:">
diff --git a/chrome/locale/ru/subscriptionSelection.dtd b/chrome/locale/ru/subscriptionSelection.dtd
index 080da8b..e418942 100644
--- a/chrome/locale/ru/subscriptionSelection.dtd
+++ b/chrome/locale/ru/subscriptionSelection.dtd
@@ -1,12 +1,12 @@
-<!ENTITY addMain.label "Доба&вить подписку на список фильтров «?1?»">
-<!ENTITY list.download.failed "При скачивании списка подписок произошла ошибка.">
-<!ENTITY list.download.retry "Попробовать еще раз">
-<!ENTITY title.label "На&звание подписки:">
+<!ENTITY addMain.label "&Добавить подписку на список фильтров «?1?»">
+<!ENTITY list.download.failed "При получении списка подписок произошла ошибка.">
+<!ENTITY list.download.retry "Повторить">
+<!ENTITY title.label "&Название подписки:">
<!ENTITY list.download.website "Открыть страницу с подписками">
<!ENTITY supplementMessage "Этот список фильтров должен использоваться в комбинации со списком фильтров «?1?», который вы не используете.">
<!ENTITY viewList.label "Просмотреть фильтры">
-<!ENTITY visitHomepage.label "Посетить домашнюю страницу списка">
+<!ENTITY visitHomepage.label "Посетить домашнюю страницу">
<!ENTITY addSubscription.label "Добавить подписку">
<!ENTITY dialog.title "Добавить подписку для Adblock Plus">
-<!ENTITY location.label "А&дрес списка фильтров:">
+<!ENTITY location.label "&Адрес списка фильтров:">
<!ENTITY fromWeb.description "Пожалуйста, подтвердите, что вы действительно хотите добавить подписку на этот список фильтров. Вы можете изменить название и адрес подписки перед добавлением.">
diff --git a/chrome/locale/sl/composer.dtd b/chrome/locale/sl/composer.dtd
index 4290a58..7ab55f4 100644
--- a/chrome/locale/sl/composer.dtd
+++ b/chrome/locale/sl/composer.dtd
@@ -11,7 +11,7 @@
<!ENTITY anchor.start.label "na &začetku naslova">
<!ENTITY matchCase.label "Razlikuj velike/male &črke">
<!ENTITY custom.pattern.label "Po &meri:">
-<!ENTITY unselectAllTypes.label "Nič ne izberi">
+<!ENTITY unselectAllTypes.label "Ne izberi ničesar">
<!ENTITY type.whitelist.label "Pravi&lo izjem">
<!ENTITY regexp.warning "Vneseni vzorec bo obravnavan kot regularni izraz. Številni regularni izrazi lahko upočasnijo vaše brskanje. Če ne nameravate uporabljati regularnih izrazov, dodajte simbol * na konec vzorca.">
<!ENTITY dialog.title "Dodaj pravilo filtra Adblock Plus">
@@ -30,4 +30,4 @@
<!ENTITY collapse.no.label "Ne">
<!ENTITY selectAllTypes.label "Izberi vse">
<!ENTITY advanced.label "Napredni pogled">
-<!ENTITY pattern.explanation "Vzorec je lahko kateri koli del naslova, simbol * velja kot poljuben znak. Filter bo le za naslove, ki ustrezajo vzorcu.">
+<!ENTITY pattern.explanation "Vzorec je lahko kateri koli del naslova; simbol * velja kot poljuben znak. Filter bo veljal le za naslove, ki ustrezajo vzorcu.">
diff --git a/chrome/locale/sq/firstRun.properties b/chrome/locale/sq/firstRun.properties
new file mode 100644
index 0000000..4c043ed
--- /dev/null
+++ b/chrome/locale/sq/firstRun.properties
@@ -0,0 +1,20 @@
+firstRun_feature_tracking_description=Shfleto privatisht duke caktivizuar gjurmimin - fshehur gjurmët tuaj nga kompanitë që duan te marrin çdo lëvizje tuaj.
+firstRun_toggle_off=Fikur
+firstRun_feature_tracking=Caktivizo Gjurmimin
+firstRun_feature_malware=Malware u Bllokua
+firstRun_title=Adblock Plus u instalua
+firstRun_toggle_on=Ndezur
+firstRun_acceptableAdsExplanation=Ne do të donim tju inkurajonim të përdorit faqet e internetit të drejtpërdrejtë,pa reklama. Kjo është arsyeja pse ne kemi krijuar <a> udhëzime strikte </a> për të identifikuar reklama pranueshme, të cilat janë paraqitur në default settings. Nëse ju ende i doni të bllokoni çdo reklame ju mund <a> çaktivizoni </a> në pak sekonda.
+firstRun_contributor_credits=Kredite kontribues
+firstRun_dataCorruptionWarning=Kjo Faqe del gjithmone? <a>Klikoni Ketu</a>
+firstRun_acceptableAdsHeadline=Te gjitha Reklamat do te bllokohen
+firstRun_share=Tregoji Shokve
+firstRun_share_headline=<a> Na jep një dore </a> per te bere internetin një vend më të mirë
+firstRun_feature_social_description=Automatikisht shpejtoj përvojën tuaj në shfletim të butonat sociale media, të tilla si Facebook Like, të cilat paraqiten në faqet e internetit dhe të pista sjelljen tuaj.
+firstRun_filterlistsReinitializedWarning=Duket se dicka ka shkaktuar heqjen e te gjitha filtrave dhe ne ishim ne gjendje ti benim nje backup.\nPrandaj ne kishim rivendosur filtrat tuaj ne Acceptable Ads settings.Ju lutem kontrolloni listen e filtrave tuaj dhe Acceptable Ads settings ne <a>Adblock Plus options</a>.
+firstRun_feature_malware_description=Bëni shfletimin tuaj më të sigurt duke bllokuar domains dhe njohur malware.
+firstRun_features=Adblock Plus mund te beje me shume sesa te bllokoje ads
+firstRun_donate=dhuro
+firstRun_donate_label=Mbeshtet Projektet Tona
+firstRun_feature_social=Hiq Butonat e Rrjeteve sociale
+firstRun_legacySafariWarning=Ju jeni duke përdorur një version të vjetër të Safari i cili nuk është i mbështetur nga Adblock Plus. Ajo mund të mos punojnë si duhet, ose të pengojë përdoruesit per nje përvojë me te mire në disa nga faqet e internetit. Ne rekomandojmë që të dyja përditësimit për Safari 6.1.1 ose më të lartë (në OS X 10.8 Mountain Lion), ose Safari 7.0.1 ose më e lartë (më OS X 10.9 Mavericks), ose për të përdorur versionin e fundit të Mozilla Firefox, Google Chrome ose Opera.
diff --git a/chrome/locale/sq/global.properties b/chrome/locale/sq/global.properties
index f9cff55..ed6b480 100644
--- a/chrome/locale/sq/global.properties
+++ b/chrome/locale/sq/global.properties
@@ -1,19 +1,41 @@
-disabled_tooltip=Adblock Plus është ç'aktiv.
-blocked_count_tooltip=?1?jasht nga ?2?
-action3_tooltip=Aktivizim/çaktivizo Adblock Plus.
no_blocking_suggestions=S'ka elemente bllokuese në këtë faqe
-type_label_object=objekti
+action3_tooltip=Aktivizim/çaktivizo Adblock Plus.
+notification_antiadblock_title=Fshih mesazhe në shënjestër?
+type_label_script=skripta
+filter_elemhide_nocriteria=Nuk ka kritere të përcaktuara për të njohur element të jetë fshehur
+blockingGroup_title=Rregullat Ad Blocking
+whitelisted_tooltip=Adblock Plus është aktiv por i pasivizuar në këtë faqe.
+type_label_stylesheet=stilet
+blocked_count_tooltip=?1?jasht nga ?2?
+type_label_font=shkronjat
type_label_popup=dritarja pop-up
+filter_regexp_tooltip=Ky filtër është ose një shprehje e rregullt ose shumë e shkurtër që të jetë i optimizuar. Shumë nga këto filtra mund të ngadalësojë shfletimit tuaj.
+action0_tooltip=Klikoni për të sjellë deri context menu, mesme-klikoni për të mundësuar/disable.
+whitelisted_page=Adblock Plus është caktivizuar për faqen e tanishme
+remove_group_warning=doni me verte ta hiqni kete grup?
+action1_tooltip=Kliko për të hapur / artikuj blockable, mesme-klikoni për të mundësuar / disable.
+type_label_xmlhttprequest=kerkimi për XML
+active_tooltip=Adblock Plus është aktivizuar, ?1? abonim filter (s) dhe ?2? filter custom (s) në përdorim.
+type_label_document=dokumenti
+type_label_object_subrequest=objekti subrequest
+whitelistGroup_title=Rregullat përjashtim
+disabled_tooltip=Adblock Plus është ç'aktiv.
+filter_elemhide_duplicate_id=Vetëm një ID e elementit të jetë fshehur mund të specifikohet
+type_label_object=objekti
+action2_tooltip=Kliko për të hapur preferencat, mesme-klikoni për të mundësuar / disable.
+type_label_subdocument=ndarja
+clearStats_warning=Kjo do të rivendos të gjitha filtrat dhe te caktivizoje filtrat hits. A doni për të vazhduar?
+notification_antiadblock_message=Kjo faqe ka qenë i njohur për të treguar mesazhe në shënjestër për përdoruesit Adblock Plus. A doni Adblock Plus për të fshehur mesazhet në shënjestër?
+blocked_count_addendum=(whitelisted gjithashtu: ?1?, fshehur: ?2?)
+subscription_invalid_location=Filtrat ne liste nuk kane asnjë URL të vlefshme dhe as një emër i vlefshëm file.
type_label_image=figura
+remove_subscription_warning=Doni me verte ra hiqni kete subscripion?
type_label_other=tjera
-type_label_font=shkronjat
mobile_menu_enable=ABP: Mbroj
-type_label_subdocument=ndarja
type_label_media=zë/video
-type_label_xmlhttprequest=kerkimi për XML
-type_label_script=skripta
+mobile_menu_disable_site=ABP: Caktivizo ?1?
+elemhideGroup_title=Rregullat e elementeve te fshehura
+mobile_menu_enable_site=ABP: Aktivizo ?1?
type_label_elemhide=fshehur
-type_label_document=dokumenti
-whitelisted_tooltip=Adblock Plus është aktiv por i pasivizuar në këtë faqe.
+newGroup_title=Grup Filtrash i ri
default_dialog_title=Adblock Plus
-type_label_stylesheet=stilet
diff --git a/chrome/locale/sq/overlay.dtd b/chrome/locale/sq/overlay.dtd
index eace1c6..ca2e2aa 100644
--- a/chrome/locale/sq/overlay.dtd
+++ b/chrome/locale/sq/overlay.dtd
@@ -1,14 +1,31 @@
+<!ENTITY notification.button.yes "&po">
+<!ENTITY notification.button.no "&Jo">
+<!ENTITY sync.label "Sync Adblock Plus settings">
+<!ENTITY whitelist.site.label "Çaktivizo në ?1?">
+<!ENTITY filters.label "&filtër preferencat">
+<!ENTITY disable.label "Caktivizo Kudo">
+<!ENTITY objecttab.title "Blloko">
+<!ENTITY objecttab.tooltip "Kliko ketu per te bllokuar kete objekt me Adblock Plus">
+<!ENTITY menuitem.label "Parapëlqimet e Ad&block Plus">
+<!ENTITY objecttabs.label "Trego &butonin ne Flash dhe Java">
+<!ENTITY sendReport.label "&Raporti çështje në këtë faqe">
+<!ENTITY whitelist.page.label "Çaktivizo vetëm në këtë faqe">
+<!ENTITY context.image.label "Adblock Plus: Figurat e bllokuara">
+<!ENTITY counthits.label "Llogarit filtrat&hits">
<!ENTITY opensidebar.label "Hap elementet &bllokuese">
+<!ENTITY notification.button.close "&Mbyll">
+<!ENTITY contribute.label "Kontribut te Adblock Plus">
+<!ENTITY toolbarbutton.label "Adblock Plus">
+<!ENTITY context.frame.label "Adblock Plus: Pjesët e bllokuara">
+<!ENTITY blocked.tooltip "Jane bllokuar te dhena ne kete faqe:">
+<!ENTITY hideplaceholders.label "Fshi p&laceholders te elementeve te bllokuar">
+<!ENTITY showinstatusbar.label "&Trego ne status bar">
+<!ENTITY sidebar.title "Artikuj Blockable në faqen aktuale">
<!ENTITY options.label "Mundësitë (&O)">
<!ENTITY context.object.label "Adblock Plus: Objektet e bllokuara">
<!ENTITY context.removeWhitelist.label "Adblock Plus: Rilejo në këtë faqe">
-<!ENTITY context.frame.label "Adblock Plus: Pjesët e bllokuara">
<!ENTITY filters.tooltip "Filtruesit më aktivë:">
-<!ENTITY menuitem.label "Parapëlqimet e Ad&block Plus">
<!ENTITY closesidebar.label "M&byll elementet bllokuese">
-<!ENTITY whitelist.page.label "Çaktivizo vetëm në këtë faqe">
-<!ENTITY whitelist.site.label "Çaktivizo në ?1?">
-<!ENTITY toolbarbutton.label "Adblock Plus">
-<!ENTITY context.image.label "Adblock Plus: Figurat e bllokuara">
+<!ENTITY showintoolbar.label "Trego ne tool&bar">
<!ENTITY status.tooltip "Gjendja:">
-<!ENTITY objecttab.title "Blloko">
+<!ENTITY context.media.label "Adblock Plus:Blloko audi/video">
diff --git a/chrome/locale/sq/sendReport.dtd b/chrome/locale/sq/sendReport.dtd
index 87a4a2a..a37acfa 100644
--- a/chrome/locale/sq/sendReport.dtd
+++ b/chrome/locale/sq/sendReport.dtd
@@ -13,11 +13,17 @@
<!ENTITY issues.disabledgroups.enable.label "Aktivizo abonim filtri/grup filtrash">
<!ENTITY typeWarning.override.label "Une kuptoj dhe de&shiroj te dergoj raportin gjithsesi">
<!ENTITY issues.disabled.enable.label "Aktivizo Adblock Plus">
+<!ENTITY update.fixed.description "Të rejat me abonimet tuaja filtër gjasa zgjidhur çështjen që ju
+raportonin. Ju lutemi të rifreskoni faqen dhe rigjykuar, goditi Raporto përsëri nëse
+Problemi mbetet.">
+<!ENTITY anonymous.label "& Publikime anonime">
<!ENTITY reloadButton.label "&Ringarko faqen">
<!ENTITY recentReports.clear.label "Hiq gjithe &raportimet">
<!ENTITY typeSelector.description "Kjo dritare do ju udhezoje neper gjithe hapat e nevojshem per dergimin e raportit te problemeve me Adblock Plus. Si fillim, ju lutem zgjidhni tipin e problemit qe ju vereni me kete faqe:">
<!ENTITY screenshot.remove.label "Hiqni te dhenat pe&rsonale">
<!ENTITY issues.ownfilters.description "Disa nga filtrat e aplikuar ne kete faqe jane te percaktuar nga perdoruesi. Ju lutem bllokoni filtrat te cilet mund te kene shkaktuar kete problem:">
+<!ENTITY update.inProgress.description "Adblock Plus do qe te rinovoj abonimet tuaja filtër për të siguruar që
+Çështja nuk është zgjidhur tashmë. Ju lutem prisni ...">
<!ENTITY sendPage.retry.label "Dergo perseri">
<!ENTITY data.label "&Permbajtja e raportit:">
<!ENTITY recentReports.label "Raportimet tuaja me te fundit">
@@ -28,9 +34,14 @@
<!ENTITY issues.disabledfilters.enable.label "Aktivizo filtrin">
<!ENTITY issues.override.label "Konfigurimi eshte i sakte, vazhdoni me raportimin (&c)">
<!ENTITY issues.nosubscriptions.description "Duket sikur ju nuk keni asnje abonim ne filtrat e gatshem te cilet heqin automatikisht permbajtjen e padeshiruar nga faqet web.">
+<!ENTITY typeSelector.falsePositive.description "Zgjidhni kete mundesi nese faqes i mungon permbajtja e rendesishme, shfaqet gabim ose nuk funksionon ne rregull. Ju mund te percaktoni nese problemi eshte Adblock Plus duke e fikur ate perkohesisht.">
<!ENTITY typeSelector.other.label "Problem &tjeter">
+<!ENTITY emailComment.label "Ne ju inkurajojmë që të vendosni një adresë te vlefshme email në mënyrë që ne mund të lidhen me ju nëse ka pyetje
+në lidhje me raportin tuaj. Ai gjithashtu do të na lejojë për të njohur kontributet tuaja dhe për të përcaktuar përparësitë e tyre më të larta.">
<!ENTITY issues.whitelist.remove.label "Ri-aktivizo Adblock Plus ne kete faqe">
-<!ENTITY typeSelector.falsePositive.description "Zgjidhni kete mundesi nese faqes i mungon permbajtja e rendesishme, shfaqet gabim ose nuk funksionon ne rregull. Ju mund te percaktoni nese problemi eshte Adblock Plus duke e fikur ate perkohesisht.">
+<!ENTITY outdatedSubscriptions.description "Adresat e mëposhtme filtër nuk janë përditësuar për të paktën dy
+javë. Ju lutemi të rinovuar këto abonimet para dorëzimit të raportit,
+Çështja mund të zgjidhet tashmë.">
<!ENTITY dataCollector.description "Ju lutem prisni disa momente deri sa Adblock Plus te mbledhe te gjitha te dhenat e nevojshme.">
<!ENTITY sendButton.label "Dergo raporti&n">
<!ENTITY comment.label "Koment (fakultative): (&C)">
@@ -44,6 +55,7 @@
<!ENTITY issues.whitelist.description "Adblock Plus eshte aktualisht jo-aktiv ne faqen ne te cilen ju po raportoni. Ju lutem ri-aktivizojeni ate dhe ringarkoni faqen perpara se te dergoni raportin i cili do te ndihmoje ne hetimin e metejshem te ketij problemi.">
<!ENTITY typeSelector.falseNegative.label "Adblock Plus nuk po bllokon nje reklame (&v)">
<!ENTITY typeSelector.heading "Lloji i problemit">
+<!ENTITY anonymity.warning "Ne nuk do të jetë në gjendje për të ardhur tek ju dhe do të ngjarë prioritet raporti më i ulët.">
<!ENTITY wizard.title "Raportuesi i problemeve">
<!ENTITY issues.ownfilters.disable.label "Blloko filtrin">
<!ENTITY commentPage.description "Fusha e meposhtme ju lejon qe te jepni nje koment qe te na ndihmoje ne ta kuptojme me mire problemin. Ky hap eshte fakultativ por i rekomanduar nese problemi nuk eshte lehtesisht i dallueshem. Ju mund te rishikoni gjithashtu te dhenat e raportimit perpara se te dergohet.">
diff --git a/chrome/locale/sq/subscriptionSelection.dtd b/chrome/locale/sq/subscriptionSelection.dtd
index c1bc7fe..c7dd1fd 100644
--- a/chrome/locale/sq/subscriptionSelection.dtd
+++ b/chrome/locale/sq/subscriptionSelection.dtd
@@ -1,7 +1,9 @@
+<!ENTITY addMain.label "Shto filtër dhe abonimin "?1?" si edhe">
<!ENTITY list.download.failed "Adblock Plus dështoj të lidhet me listën e abonimeve.">
<!ENTITY list.download.retry "Provo prap">
<!ENTITY title.label "&Titulli i abonimit:">
<!ENTITY list.download.website "Shiko faqen">
+<!ENTITY supplementMessage "Ky abonim filtri është menduar që të përdoret me abonim filtri "?1?" të cilat ju nuk jeni duke përdorur ende.">
<!ENTITY viewList.label "Shiko filtrat">
<!ENTITY visitHomepage.label "Vizito faqen kryesore">
<!ENTITY addSubscription.label "Shto abonim">
diff --git a/chrome/locale/sv-SE/composer.dtd b/chrome/locale/sv-SE/composer.dtd
index b16c505..eec35de 100644
--- a/chrome/locale/sv-SE/composer.dtd
+++ b/chrome/locale/sv-SE/composer.dtd
@@ -1,7 +1,7 @@
<!ENTITY anchor.end.label "I slutet av adressen">
<!ENTITY domainRestriction.label "Begränsa till domän:">
<!ENTITY collapse.default.no.label "Standard (nej)">
-<!ENTITY firstParty.label "Endast första part">
+<!ENTITY firstParty.label "Endast &första part">
<!ENTITY preferences.label "Visa existerande filter…">
<!ENTITY pattern.label "Sök efter mönster">
<!ENTITY thirdParty.label "Endast tredje part">
@@ -11,7 +11,7 @@
<!ENTITY anchor.start.label "I början av adressen">
<!ENTITY matchCase.label "S&kiftlägeskänslig">
<!ENTITY custom.pattern.label "Eget:">
-<!ENTITY unselectAllTypes.label "Välj ingen">
+<!ENTITY unselectAllTypes.label "Markera ingen">
<!ENTITY type.whitelist.label "Regel för &undantag">
<!ENTITY regexp.warning "Mönstret du angivit hanteras som ett reguljärt uttryck. Många reguljära uttryck kan göra din surfning långsam. Om du inte avsåg att använda reguljära uttryck, lägg till en asterisk (*) i slutet av mönstret.">
<!ENTITY dialog.title "Lägg till filterregel för Adblock Plus">
diff --git a/chrome/locale/ta-LK/firstRun.properties b/chrome/locale/ta-LK/firstRun.properties
new file mode 100644
index 0000000..7292ebd
--- /dev/null
+++ b/chrome/locale/ta-LK/firstRun.properties
@@ -0,0 +1,14 @@
+firstRun_toggle_off=அணைக்க
+firstRun_feature_tracking=அறிதலை முடக்கு
+firstRun_feature_social=சமூக ஊடகங்கள் பொத்தான்கள் நீக்கு
+firstRun_title=Adblock plus நிறுவப்பட்டது
+firstRun_toggle_on=தொடங்க
+firstRun_feature_malware=தீம்பொருள் தடுப்பது
+firstRun_contributor_credits=பங்களிப்பாளர் கிரெடிட்கள்
+firstRun_dataCorruptionWarning=இந்த பக்கம் இதை காட்டி கொண்டே இருக்கிறதா? <a>இங்கே கிளிக் செய்யவும்!</a>
+firstRun_acceptableAdsHeadline=எரிச்சலூட்டும் விளம்பரங்கள் இப்போது தடைசெய்யப்படும்
+firstRun_share=உங்கள் நண்பர்களுக்கு கூறுங்கள்
+firstRun_share_headline=ஓரு நல்ல வலை இடமாக மாற்ற <a>எங்களுக்கு கை கொடுங்கள்</a>
+firstRun_feature_malware_description=தெரிந்த தீம்பொருள் தளங்களை தடுப்பது மூலம் உங்கள் உலாவல் பாதுகாப்பானாதாக செய்யவும்.
+firstRun_donate=தானம் செய்ய
+firstRun_donate_label=நமது திட்டதுக்கு ஆதரவளிக்க
diff --git a/chrome/locale/ta-LK/meta.properties b/chrome/locale/ta-LK/meta.properties
new file mode 100644
index 0000000..c139424
--- /dev/null
+++ b/chrome/locale/ta-LK/meta.properties
@@ -0,0 +1,6 @@
+description.short=தடுப்புகள் ஓரளவுக்கு YouTube, Facebook விளம்பரங்கள், பதாகைகள், மேலும்.\n\nAdblock Plus: அனைத்து எரிச்சலூட்டும் விளம்பரங்களை தடுக்கும், ஆனால் வலைத்தளங்களை ஆதரிப்பதற்க்காக இயல்புநிலை (மாற்றி கொள்ளளாம்) விளம்பரங்களை தடுப்பது இல்லை.
+name=Adblock Plus
+description.long.addition1=Adblock Plus 2.0 இல் இருந்து Filter Preferences இல் ஒரு சில non-intrusive ads அனுமதிக்க விருப்பம் உள்ளது. இதன்படி இணையதளங்கள் நல்லபடி விளம்பரப்படுத்தும் முறைகளை ஊக்குவிக்கலாம். <a href="http://adblockplus.org/en/acceptable-ads">மேலும் படிக்க</a>
+translator=Wladimir Palant
+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 an [...]
+description=விளம்பரங்கள் நேற்று இருந்தவை!
diff --git a/chrome/locale/ta-LK/overlay.dtd b/chrome/locale/ta-LK/overlay.dtd
index 9ca1fdb..de4e6b7 100644
--- a/chrome/locale/ta-LK/overlay.dtd
+++ b/chrome/locale/ta-LK/overlay.dtd
@@ -1 +1,31 @@
-<!ENTITY objecttab.tooltip "Adblock plus கொண்டு இந்த பொருளை தடை செய்யவும்">
+<!ENTITY notification.button.yes "ஆம்">
+<!ENTITY notification.button.no "இல்லை">
+<!ENTITY sync.label "Sync & Adblock plus விருப்பங்கள்">
+<!ENTITY whitelist.site.label "? 1? செயலிழக்க">
+<!ENTITY filters.label "வடிகட்டி விருப்பங்கள்">
+<!ENTITY disable.label "செயலிழக்க">
+<!ENTITY objecttab.title "தடு">
+<!ENTITY objecttab.tooltip "Adblock plus கொண்டு இதை தடுக்க இங்கே கிளிக் செய்யவும்">
+<!ENTITY menuitem.label "Ad&block Plus விருப்பங்கள்">
+<!ENTITY objecttabs.label "ஃபிளாஷ் மற்றும் ஜாவா சிறு மடல் காண்பி">
+<!ENTITY sendReport.label "இந்தப் பக்கத்தில் இருக்கும் பிரச்சினைகளை தெரியப்படுத்த">
+<!ENTITY whitelist.page.label "இந்தப் பக்கத்தில் மட்டும் செயலிழக்க">
+<!ENTITY context.image.label "Adblock Plus: தடு புகைப்படம்">
+<!ENTITY counthits.label "எண்ணிக்கை வடிகட்டி & ஹிட்ஸ்">
+<!ENTITY opensidebar.label "தடுக்கப்பட்டவைகளை திறக்க">
+<!ENTITY notification.button.close "மூடு">
+<!ENTITY contribute.label "Adblock Plusகு பங்களிக்க">
+<!ENTITY toolbarbutton.label "Adblock Plus">
+<!ENTITY context.frame.label "Adblock Plus: தடு frame">
+<!ENTITY blocked.tooltip "இந்தப் பக்கத்தில் தடுக்கப்பட்டவை:">
+<!ENTITY hideplaceholders.label "தடுக்கப்பட்டவைகளின் பெட்டிகளை மறை">
+<!ENTITY showinstatusbar.label "ஸ்டேடஸ் பாரில் காண்பி">
+<!ENTITY sidebar.title "நடப்பு பக்கத்தில் தடுக்ககூடியவை">
+<!ENTITY options.label "& விருப்பங்கள்">
+<!ENTITY context.object.label "Adblock Plus: தடு பொருள்">
+<!ENTITY context.removeWhitelist.label "Adblock Plus: இந்தப் பக்கத்தில் மீண்டும் செயல்படுத்த">
+<!ENTITY filters.tooltip "மிகவும் நடப்பு வடிகட்டிகள்:">
+<!ENTITY closesidebar.label "தடுக்கப்பட்டவைகளை மூட">
+<!ENTITY showintoolbar.label "டூல் பாரில் காண்பி">
+<!ENTITY status.tooltip "நிலைமை:">
+<!ENTITY context.media.label "Adblock Plus: தடு ஆடியோ/வீடியோ">
diff --git a/chrome/locale/ta-LK/sidebar.dtd b/chrome/locale/ta-LK/sidebar.dtd
index e1200ff..dc94a22 100644
--- a/chrome/locale/ta-LK/sidebar.dtd
+++ b/chrome/locale/ta-LK/sidebar.dtd
@@ -1,20 +1,35 @@
+<!ENTITY context.flash.label "ஃப்ளாஷ் ஐட்டம்ஸ் விளிம்புகள்">
+<!ENTITY address.label "முகவரி">
+<!ENTITY context.open.label "புதிய பெட்டியில் திறக்க">
+<!ENTITY type.label "வகை">
+<!ENTITY tooltip.filterSource.label "வடிகட்டி மூலம்:">
+<!ENTITY noitems.label "தடுக்ககூடிய உருப்படிகள் இல்லை">
+<!ENTITY filter.label "வடிகட்டி">
<!ENTITY tooltip.size.label "அளவு:">
-<!ENTITY whitelisted.label "Whitelisted பக்கம்">
-<!ENTITY tooltip.filter.label "செயலில் வடிகட்டு:">
-<!ENTITY tooltip.type.blocked "(தடுக்கப்பட்டது)">
-<!ENTITY docDomain.firstParty "(முதல் நபர்)">
<!ENTITY reattach.label "மீண்டும் சேர்">
<!ENTITY search.label "& தேடல்:">
<!ENTITY docDomain.thirdParty "(மூன்றாம் நபர்)">
<!ENTITY filterSource.label "வடிகட்டி மூலம்">
-<!ENTITY address.label "முகவரி">
-<!ENTITY noitems.label "தடுக்ககூடிய உருப்படிகள் இல்லை">
-<!ENTITY size.label "அளவு">
-<!ENTITY type.label "வகை">
-<!ENTITY tooltip.type.label "வகை:">
<!ENTITY tooltip.docDomain.label "மூல ஆவணம்:">
+<!ENTITY context.copy.label "ஐட்டம்ஸ் முகவரியை நகல் எடு">
+<!ENTITY tooltip.type.label "வகை:">
+<!ENTITY context.disablefilter.label "வடிகட்டியை முடக்கு? 1?">
+<!ENTITY context.copyFilter.label "வடிகட்டியை நகல் எடு">
+<!ENTITY context.block.label "இதை தடு">
+<!ENTITY context.enablefilter.label "வடிகட்டி மீண்டும் செயல்படுத்த? 1?">
+<!ENTITY detach.label "நீக்கு">
+<!ENTITY whitelisted.label "Whitelisted பக்கம்">
+<!ENTITY context.disablefilteronsite.label "? 1?இல் வடிகட்டியை முடக்க">
+<!ENTITY detached.title "Adblock Plus: தடுக்கப்படகூடிய பொருள் (பிரிக்கப்பட்டது)">
+<!ENTITY docDomain.firstParty "(முதல் நபர்)">
+<!ENTITY tooltip.type.whitelisted "(அனுமதிக்க பட்டது)">
+<!ENTITY tooltip.filter.label "செயலில் வடிகட்டு:">
+<!ENTITY tooltip.filter.disabled "(முடக்கப்பட்டது)">
+<!ENTITY context.editfilter.label "வடிகட்டி செயலில் திருத்து">
+<!ENTITY tooltip.type.blocked "(தடுக்கப்பட்டது)">
+<!ENTITY size.label "அளவு">
+<!ENTITY context.whitelist.label "உருப்படிக்கான விதிவிலக்கு சேர்க்க">
+<!ENTITY context.selectAll.label "அனைத்தையும் தேர்ந்தெடு">
<!ENTITY state.label "நிலை">
<!ENTITY docDomain.label "மூல ஆவணம்">
-<!ENTITY filter.label "வடிகட்டி">
-<!ENTITY detach.label "நீக்கு">
<!ENTITY tooltip.address.label "முகவரி:">
diff --git a/chrome/locale/ta-LK/subscriptionSelection.dtd b/chrome/locale/ta-LK/subscriptionSelection.dtd
new file mode 100644
index 0000000..337e002
--- /dev/null
+++ b/chrome/locale/ta-LK/subscriptionSelection.dtd
@@ -0,0 +1,12 @@
+<!ENTITY addMain.label ""?1?" வடிகட்டி சந்தா உடனும் சேர்">
+<!ENTITY list.download.failed "Adblock Plus சந்தாக்கள் பட்டியலை மீட்க தவறியது.">
+<!ENTITY list.download.retry "மீண்டும் முயற்சி செய்">
+<!ENTITY title.label "சந்தா தலைப்பு:">
+<!ENTITY list.download.website "வலைத்தளத்தை பார்க்க">
+<!ENTITY supplementMessage "இந்த வடிகட்டி சந்தா நீங்கள் இன்னும் பயன்படுத்தாத ?1? உடன் பயன்படுத்த வேண்டியது">
+<!ENTITY viewList.label "வடிகட்டிகள் பார்க்க">
+<!ENTITY visitHomepage.label "முகப்பு பக்கம் செல்ல">
+<!ENTITY addSubscription.label "சந்தா சேர்க்க">
+<!ENTITY dialog.title "சேர் Adblock Plus சந்தா வடிகட்டி">
+<!ENTITY location.label "வடிகட்டி பட்டியல் பகுதி:">
+<!ENTITY fromWeb.description "நீங்கள் இந்த வடிகட்டியை சேர்க்க உறுதி செய்யவும். சேர்ப்பதற்கு முன் தலைப்பை மாற்றலாம்">
diff --git a/chrome/locale/tr/firstRun.properties b/chrome/locale/tr/firstRun.properties
index e7c76d5..49739c5 100644
--- a/chrome/locale/tr/firstRun.properties
+++ b/chrome/locale/tr/firstRun.properties
@@ -11,7 +11,7 @@ firstRun_acceptableAdsHeadline=Rahatsız edici reklamlar artık engellenecek
firstRun_share=Arkadaşlarınıza bahsedin
firstRun_share_headline=İnterneti daha iyi bir yer yapabilmek için <a>bize elinizi uzatın</a>
firstRun_feature_social_description=Sayfalarda çıkan ve davranışlarınızı takip eden Facebook'un "Beğen" düğmesi gibi sosyal medya düğmelerinden kurtulun.
-firstRun_filterlistsReinitializedWarning=Görünüşe göre bir sorun tüm filtrelerinizin kaldırılmasına neden olmuş ve bir yedeği geri yükleyemiyoruz. Bu yüzden filtrelerinizi ve Kabul Edilebilir Reklamlar ayarlarınızı sıfırlamamız gerekiyordu. Lütfen <a>Adblock Plus seçenekleri</a> bölümünde filtre listelerinizi ve Kabul Edilebilir Reklamlar ayarlarınızı denetleyin.
+firstRun_filterlistsReinitializedWarning=Görünüşe göre bir sorun tüm filtrelerinizin kaldırılmasına neden olmuş ve yedeği geri yükleyemiyoruz. Bu yüzden filtrelerinizi ve Kabul Edilebilir Reklamlar ayarlarınızı sıfırlamamız gerekiyordu. Lütfen <a>Adblock Plus seçenekleri</a> bölümünde filtre listelerinizi ve Kabul Edilebilir Reklamlar ayarlarınızı denetleyin.
firstRun_feature_malware_description=Bilinen kötü amaçlı yazılıma sahip alan adlarını engelleyerek gezintinizi daha güvenli hale getirin.
firstRun_features=Adblock Plus reklamları engellemekten daha fazlasını yapabilir
firstRun_donate=bağış yapın
diff --git a/chrome/locale/vi/composer.dtd b/chrome/locale/vi/composer.dtd
index 71d2903..02859d2 100644
--- a/chrome/locale/vi/composer.dtd
+++ b/chrome/locale/vi/composer.dtd
@@ -18,7 +18,7 @@
<!ENTITY basic.label "Hiển thị cơ bản">
<!ENTITY type.filter.label "Bộ lọc chặn">
<!ENTITY types.label "Áp dụng cho các kiểu:">
-<!ENTITY shortpattern.warning "Mẫu bạn gõ vào quá ngắn để tối ưu hóa, nhiều mẫu như vậy có thể làm chậm việc duyệt web của bạn. Lời khuyên là bạn hãy chọn một chuỗi dài hơn cho bộ lọc này.">
+<!ENTITY shortpattern.warning "Mẫu bạn gõ vào quá ngắn để tối ưu hóa, nhiều mẫu như vậy có thể làm chậm việc duyệt mạng của bạn. Lời khuyên là bạn hãy chọn một chuỗi dài hơn cho bộ lọc này.">
<!ENTITY collapse.yes.label "Có">
<!ENTITY anchors.label "Chỉ chấp nhận mẫu:">
<!ENTITY collapse.default.yes.label "Dùng mặc định (có)">
diff --git a/chrome/locale/vi/firstRun.properties b/chrome/locale/vi/firstRun.properties
index b01f55d..6fdafe1 100644
--- a/chrome/locale/vi/firstRun.properties
+++ b/chrome/locale/vi/firstRun.properties
@@ -3,16 +3,17 @@ firstRun_toggle_off=TẮT
firstRun_feature_tracking=Vô hiệu hóa theo dõi
firstRun_feature_malware=Chặn phần mềm độc hại
firstRun_title=Adblock Plus đã được cài đặt
-firstRun_acceptableAdsExplanation=Chúng tôi khuyến khích các trang mạng dùng những quảng cáo minh bạch, không phiền nhiễu. Đó là lí do tại sao chúng tôi gây dựng <a>hướng dẫn chặt chẽ</a> để xác định các quảng cáo được chấp nhận, hiện dưới mức thiết lập mặc định. Nếu bạn vẫn muốn chặn mọi quảng cáo, bạn có thể <a>vô hiệu</a> điều này trong một vài giây.
firstRun_toggle_on=BẬT
+firstRun_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_contributor_credits=Đóng góp các khoản tín dụng
firstRun_dataCorruptionWarning=Có phải trang này luôn hiển thị? <a>Bấm vào đây</a>
firstRun_acceptableAdsHeadline=Những quảng cáo phiền phức sẽ bị chặn
firstRun_share=Nói với bạn bè của bạn
firstRun_share_headline=<a>Giúp chúng tôi một tay</a> trong việc làm trang mạng trở nên tốt hơn
-firstRun_features=Adblock Plus không chỉ có thể 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_filterlistsReinitializedWarning=Có vẻ như là một vấn đề gây ra tất cả các bộ lọc phải được loại bỏ và chúng tôi không thể khôi phục lại một bản sao lưu. Vì vậy chúng tôi đã phải thiết lập lại các bộ lọc của bạn và thiết lập danh mục chấp nhận được. Hãy kiểm tra danh sách bộ lọc của bạn và các thiết lập danh mục được chấp nhận trong các <a>tùy chọn Adblock Plus</a>.
+firstRun_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_features=Adblock Plus không chỉ có thể chặn quảng cáo
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
diff --git a/lib/antiadblockInit.js b/lib/antiadblockInit.js
index d8b29ca..18567d4 100644
--- a/lib/antiadblockInit.js
+++ b/lib/antiadblockInit.js
@@ -46,10 +46,17 @@ exports.initAntiAdblockNotification = function initAntiAdblockNotification()
{
let urlFilters = [];
for (let filter of subscription.filters)
+ {
if (filter instanceof ActiveFilter)
+ {
for (let domain in filter.domains)
- if (domain && urlFilters.indexOf(domain) == -1)
- urlFilters.push(domain);
+ {
+ let urlFilter = "||" + domain + "^";
+ if (domain && filter.domains[domain] && urlFilters.indexOf(urlFilter) == -1)
+ urlFilters.push(urlFilter);
+ }
+ }
+ }
notification.urlFilters = urlFilters;
Notification.addNotification(notification);
Notification.addQuestionListener(notification.id, notificationListener);
diff --git a/lib/contentPolicy.js b/lib/contentPolicy.js
index a06e6de..905ae86 100644
--- a/lib/contentPolicy.js
+++ b/lib/contentPolicy.js
@@ -22,7 +22,6 @@
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
-let {TimeLine} = require("timeline");
let {Utils} = require("utils");
let {Prefs} = require("prefs");
let {FilterStorage} = require("filterStorage");
@@ -90,8 +89,6 @@ let Policy = exports.Policy =
*/
init: function()
{
- TimeLine.enter("Entered content policy initialization");
-
// type constant by type description and type description by type constant
let iface = Ci.nsIContentPolicy;
for (let typeName of contentTypes)
@@ -120,12 +117,8 @@ let Policy = exports.Policy =
for (let scheme of Prefs.whitelistschemes.toLowerCase().split(" "))
this.whitelistSchemes[scheme] = true;
- TimeLine.log("done initializing types");
-
// Generate class identifier used to collapse node and register corresponding
// stylesheet.
- TimeLine.log("registering global stylesheet");
-
let offset = "a".charCodeAt(0);
for (let i = 0; i < 20; i++)
collapsedClass += String.fromCharCode(offset + Math.random() * 26);
@@ -138,9 +131,6 @@ let Policy = exports.Policy =
{
Utils.styleService.unregisterSheet(collapseStyle, Ci.nsIStyleSheetService.USER_SHEET);
})
- TimeLine.log("done registering stylesheet");
-
- TimeLine.leave("Done initializing content policy");
},
/**
@@ -162,37 +152,18 @@ let Policy = exports.Policy =
let wndLocation = originWindow.location.href;
let docDomain = getHostname(wndLocation);
let match = null;
+ let [sitekey, sitekeyWnd] = getSitekey(wnd);
if (!match && Prefs.enabled)
{
let testWnd = wnd;
+ let testSitekey = sitekey;
+ let testSitekeyWnd = sitekeyWnd;
let parentWndLocation = getWindowLocation(testWnd);
while (true)
{
let testWndLocation = parentWndLocation;
parentWndLocation = (testWnd == testWnd.parent ? testWndLocation : getWindowLocation(testWnd.parent));
- match = Policy.isWhitelisted(testWndLocation, parentWndLocation);
-
- if (!(match instanceof WhitelistFilter))
- {
- let keydata = (testWnd.document && testWnd.document.documentElement ? testWnd.document.documentElement.getAttribute("data-adblockkey") : null);
- if (keydata && keydata.indexOf("_") >= 0)
- {
- let [key, signature] = keydata.split("_", 2);
- let keyMatch = defaultMatcher.matchesByKey(testWndLocation, key.replace(/=/g, ""), docDomain);
- if (keyMatch && Utils.crypto)
- {
- // Website specifies a key that we know but is the signature valid?
- let uri = Services.io.newURI(testWndLocation, null, null);
- let params = [
- uri.path.replace(/#.*/, ""), // REQUEST_URI
- uri.asciiHost, // HTTP_HOST
- Utils.httpProtocol.userAgent // HTTP_USER_AGENT
- ];
- if (Utils.verifySignature(key, signature, params.join("\0")))
- match = keyMatch;
- }
- }
- }
+ match = Policy.isWhitelisted(testWndLocation, parentWndLocation, testSitekey);
if (match instanceof WhitelistFilter)
{
@@ -203,8 +174,10 @@ let Policy = exports.Policy =
if (testWnd.parent == testWnd)
break;
- else
- testWnd = testWnd.parent;
+
+ if (testWnd == testSitekeyWnd)
+ [testSitekey, testSitekeyWnd] = getSitekey(testWnd.parent);
+ testWnd = testWnd.parent;
}
}
@@ -251,7 +224,7 @@ let Policy = exports.Policy =
if (exception)
{
FilterStorage.increaseHitCount(exception, wnd);
- RequestNotifier.addNodeData(node, topWnd, contentType, docDomain, thirdParty, locationText, exception);
+ RequestNotifier.addNodeData(node, topWnd, contentType, docDomain, false, locationText, exception);
return true;
}
}
@@ -260,7 +233,7 @@ let Policy = exports.Policy =
if (!match && Prefs.enabled)
{
- match = defaultMatcher.matchesAny(locationText, Policy.typeDescr[contentType] || "", docDomain, thirdParty);
+ match = defaultMatcher.matchesAny(locationText, Policy.typeDescr[contentType] || "", docDomain, thirdParty, sitekey);
if (match instanceof BlockingFilter && node.ownerDocument && !(contentType in Policy.nonVisual))
{
let prefCollapse = (match.collapse != null ? match.collapse : !Prefs.fastcollapse);
@@ -298,9 +271,10 @@ let Policy = exports.Policy =
* Checks whether a page is whitelisted.
* @param {String} url
* @param {String} [parentUrl] location of the parent page
+ * @param {String} [sitekey] public key provided on the page
* @return {Filter} filter that matched the URL or null if not whitelisted
*/
- isWhitelisted: function(url, parentUrl)
+ isWhitelisted: function(url, parentUrl, sitekey)
{
if (!url)
return null;
@@ -318,12 +292,12 @@ let Policy = exports.Policy =
if (index >= 0)
url = url.substring(0, index);
- let result = defaultMatcher.matchesAny(url, "DOCUMENT", getHostname(parentUrl), false);
+ let result = defaultMatcher.matchesAny(url, "DOCUMENT", getHostname(parentUrl), false, sitekey);
return (result instanceof WhitelistFilter ? result : null);
},
/**
- * Checks whether the page loaded in a window is whitelisted.
+ * Checks whether the page loaded in a window is whitelisted for indication in the UI.
* @param wnd {nsIDOMWindow}
* @return {Filter} matching exception rule or null if not whitelisted
*/
@@ -332,7 +306,6 @@ let Policy = exports.Policy =
return Policy.isWhitelisted(getWindowLocation(wnd));
},
-
/**
* Asynchronously re-checks filters for given nodes.
*/
@@ -691,6 +664,47 @@ function getHostname(/**String*/ url) /**String*/
}
/**
+ * Retrieves the sitekey of a window.
+ */
+function getSitekey(wnd)
+{
+ let sitekey = null;
+
+ while (true)
+ {
+ if (wnd.document && wnd.document.documentElement)
+ {
+ let keydata = wnd.document.documentElement.getAttribute("data-adblockkey");
+ if (keydata && keydata.indexOf("_") >= 0)
+ {
+ let [key, signature] = keydata.split("_", 2);
+ key = key.replace(/=/g, "");
+
+ // Website specifies a key but is the signature valid?
+ let uri = Services.io.newURI(getWindowLocation(wnd), null, null);
+ let host = uri.asciiHost;
+ if (uri.port > 0)
+ host += ":" + uri.port;
+ let params = [
+ uri.path.replace(/#.*/, ""), // REQUEST_URI
+ host, // HTTP_HOST
+ Utils.httpProtocol.userAgent // HTTP_USER_AGENT
+ ];
+ if (Utils.verifySignature(key, signature, params.join("\0")))
+ return [key, wnd];
+ }
+ }
+
+ if (wnd === wnd.parent)
+ break;
+
+ wnd = wnd.parent;
+ }
+
+ return [sitekey, wnd];
+}
+
+/**
* Retrieves the location of a window.
* @param wnd {nsIDOMWindow}
* @return {String} window location or null on failure
diff --git a/lib/elemHide.js b/lib/elemHide.js
index dddb58a..49d7a6a 100644
--- a/lib/elemHide.js
+++ b/lib/elemHide.js
@@ -27,7 +27,6 @@ let {Prefs} = require("prefs");
let {ElemHideException} = require("filterClasses");
let {FilterNotifier} = require("filterNotifier");
let {AboutHandler} = require("elemHideHitRegistration");
-let {TimeLine} = require("timeline");
/**
* Lookup table, filters by their associated key
@@ -82,7 +81,6 @@ let ElemHide = exports.ElemHide =
*/
init: function()
{
- TimeLine.enter("Entered ElemHide.init()");
Prefs.addListener(function(name)
{
if (name == "enabled")
@@ -93,14 +91,9 @@ let ElemHide = exports.ElemHide =
ElemHide.unapply();
});
- TimeLine.log("done adding prefs listener");
-
let styleFile = IO.resolveFilePath(Prefs.data_directory);
styleFile.append("elemhide.css");
styleURL = Services.io.newFileURI(styleFile).QueryInterface(Ci.nsIFileURL);
- TimeLine.log("done determining stylesheet URL");
-
- TimeLine.leave("ElemHide.init() done");
},
/**
@@ -184,7 +177,6 @@ let ElemHide = exports.ElemHide =
*/
getException: function(/**Filter*/ filter, /**String*/ docDomain) /**ElemHideException*/
{
- let selector = filter.selector;
if (!(filter.selector in exceptions))
return null;
@@ -220,8 +212,6 @@ let ElemHide = exports.ElemHide =
return;
}
- TimeLine.enter("Entered ElemHide.apply()");
-
if (!ElemHide.isDirty || !Prefs.enabled)
{
// Nothing changed, looks like we merely got enabled/disabled
@@ -236,21 +226,17 @@ let ElemHide = exports.ElemHide =
{
Cu.reportError(e);
}
- TimeLine.log("Applying existing stylesheet finished");
}
else if (!Prefs.enabled && ElemHide.applied)
{
ElemHide.unapply();
- TimeLine.log("ElemHide.unapply() finished");
}
- TimeLine.leave("ElemHide.apply() done (no file changes)");
return;
}
IO.writeToFile(styleURL.file, this._generateCSSContent(), function(e)
{
- TimeLine.enter("ElemHide.apply() write callback");
this._applying = false;
// _generateCSSContent is throwing NS_ERROR_NOT_AVAILABLE to indicate that
@@ -275,7 +261,6 @@ let ElemHide = exports.ElemHide =
ElemHide.isDirty = false;
ElemHide.unapply();
- TimeLine.log("ElemHide.unapply() finished");
if (!noFilters)
{
@@ -288,23 +273,18 @@ let ElemHide = exports.ElemHide =
{
Cu.reportError(e);
}
- TimeLine.log("Applying stylesheet finished");
}
FilterNotifier.triggerListeners("elemhideupdate");
}
- TimeLine.leave("ElemHide.apply() write callback done");
- }.bind(this), "ElemHideWrite");
+ }.bind(this));
this._applying = true;
-
- TimeLine.leave("ElemHide.apply() done", "ElemHideWrite");
},
_generateCSSContent: function()
{
// Grouping selectors by domains
- TimeLine.log("start grouping selectors");
let domains = Object.create(null);
let hasFilters = false;
for (let key in filterByKey)
@@ -323,7 +303,6 @@ let ElemHide = exports.ElemHide =
list[filter.selector] = key;
hasFilters = true;
}
- TimeLine.log("done grouping selectors");
if (!hasFilters)
throw Cr.NS_ERROR_NOT_AVAILABLE;
@@ -402,13 +381,7 @@ let ElemHide = exports.ElemHide =
for (let key in filterByKey)
{
let filter = filterByKey[key];
-
- // it is important to always access filter.domains
- // here, even if it isn't used, in order to
- // workaround WebKit bug 132872, also see #419
- let domains = filter.domains;
-
- if (specificOnly && (!domains || domains[""]))
+ if (specificOnly && (!filter.domains || filter.domains[""]))
continue;
if (filter.isActiveOnDomain(domain) && !this.getException(filter, domain))
diff --git a/lib/elemHideHitRegistration.js b/lib/elemHideHitRegistration.js
index a05f6df..791130b 100644
--- a/lib/elemHideHitRegistration.js
+++ b/lib/elemHideHitRegistration.js
@@ -126,7 +126,11 @@ HitRegistrationChannel.prototype = {
{
let {Policy} = require("contentPolicy");
let {ElemHide} = require("elemHide");
- let data = "<bindings xmlns='http://www.mozilla.org/xbl'><binding id='dummy'/></bindings>";
+
+ // This dummy binding below won't have any effect on the element. For
+ // elements that should be hidden however we don't return any binding at
+ // all, this makes Gecko stop constructing the node - it cannot be shown.
+ let data = "<bindings xmlns='http://www.mozilla.org/xbl'><binding id='dummy' bindToUntrustedContent='true'/></bindings>";
let filter = ElemHide.getFilterByKey(this.key);
if (filter)
{
diff --git a/lib/filterClasses.js b/lib/filterClasses.js
index 2df8781..3e067de 100644
--- a/lib/filterClasses.js
+++ b/lib/filterClasses.js
@@ -215,7 +215,7 @@ CommentFilter.prototype =
/**
* Abstract base class for filters that can get hits
* @param {String} text see Filter()
- * @param {String} domains (optional) Domains that the filter is restricted to separated by domainSeparator e.g. "foo.com|bar.com|~baz.com"
+ * @param {String} [domains] Domains that the filter is restricted to separated by domainSeparator e.g. "foo.com|bar.com|~baz.com"
* @constructor
* @augments Filter
*/
@@ -324,6 +324,12 @@ ActiveFilter.prototype =
*/
get domains()
{
+ // Despite this property being cached, the getter is called
+ // several times on Safari, due to WebKit bug 132872
+ let prop = Object.getOwnPropertyDescriptor(this, "domains");
+ if (prop)
+ return prop.value;
+
let domains = null;
if (this.domainSource)
@@ -381,10 +387,24 @@ ActiveFilter.prototype =
},
/**
+ * Array containing public keys of websites that this filter should apply to
+ * @type Array of String
+ */
+ sitekeys: null,
+
+ /**
* Checks whether this filter is active on a domain.
+ * @param {String} docDomain domain name of the document that loads the URL
+ * @param {String} [sitekey] public key provided by the document
+ * @return {Boolean} true in case of the filter being active
*/
- isActiveOnDomain: function(/**String*/ docDomain) /**Boolean*/
+ isActiveOnDomain: function(docDomain, sitekey)
{
+ // Sitekeys are case-sensitive so we shouldn't convert them to upper-case to avoid false
+ // positives here. Instead we need to change the way filter options are parsed.
+ if (this.sitekeys && (!sitekey || this.sitekeys.indexOf(sitekey.toUpperCase()) < 0))
+ return false;
+
// If no domains are set the rule matches everywhere
if (!this.domains)
return true;
@@ -451,16 +471,17 @@ ActiveFilter.prototype =
* Abstract base class for RegExp-based filters
* @param {String} text see Filter()
* @param {String} regexpSource filter part that the regular expression should be build from
- * @param {Number} contentType (optional) Content types the filter applies to, combination of values from RegExpFilter.typeMap
- * @param {Boolean} matchCase (optional) Defines whether the filter should distinguish between lower and upper case letters
- * @param {String} domains (optional) Domains that the filter is restricted to, e.g. "foo.com|bar.com|~baz.com"
- * @param {Boolean} thirdParty (optional) Defines whether the filter should apply to third-party or first-party content only
+ * @param {Number} [contentType] Content types the filter applies to, combination of values from RegExpFilter.typeMap
+ * @param {Boolean} [matchCase] Defines whether the filter should distinguish between lower and upper case letters
+ * @param {String} [domains] Domains that the filter is restricted to, e.g. "foo.com|bar.com|~baz.com"
+ * @param {Boolean} [thirdParty] Defines whether the filter should apply to third-party or first-party content only
+ * @param {String} [sitekeys] Public keys of websites that this filter should apply to
* @constructor
* @augments ActiveFilter
*/
-function RegExpFilter(text, regexpSource, contentType, matchCase, domains, thirdParty)
+function RegExpFilter(text, regexpSource, contentType, matchCase, domains, thirdParty, sitekeys)
{
- ActiveFilter.call(this, text, domains);
+ ActiveFilter.call(this, text, domains, sitekeys);
if (contentType != null)
this.contentType = contentType;
@@ -468,6 +489,8 @@ function RegExpFilter(text, regexpSource, contentType, matchCase, domains, third
this.matchCase = matchCase;
if (thirdParty != null)
this.thirdParty = thirdParty;
+ if (sitekeys != null)
+ this.sitekeySource = sitekeys;
if (regexpSource.length >= 2 && regexpSource[0] == "/" && regexpSource[regexpSource.length - 1] == "/")
{
@@ -514,6 +537,12 @@ RegExpFilter.prototype =
*/
get regexp()
{
+ // Despite this property being cached, the getter is called
+ // several times on Safari, due to WebKit bug 132872
+ let prop = Object.getOwnPropertyDescriptor(this, "regexp");
+ if (prop)
+ return prop.value;
+
// Remove multiple wildcards
let source = this.regexpSource
.replace(/\*+/g, "*") // remove multiple wildcards
@@ -549,19 +578,50 @@ RegExpFilter.prototype =
thirdParty: null,
/**
+ * String that the sitekey property should be generated from
+ * @type String
+ */
+ sitekeySource: null,
+
+ /**
+ * Array containing public keys of websites that this filter should apply to
+ * @type Array of String
+ */
+ get sitekeys()
+ {
+ // Despite this property being cached, the getter is called
+ // several times on Safari, due to WebKit bug 132872
+ let prop = Object.getOwnPropertyDescriptor(this, "sitekeys");
+ if (prop)
+ return prop.value;
+
+ let sitekeys = null;
+
+ if (this.sitekeySource)
+ {
+ sitekeys = this.sitekeySource.split("|");
+ this.sitekeySource = null;
+ }
+
+ Object.defineProperty(this, "sitekeys", {value: sitekeys, enumerable: true});
+ return this.sitekeys;
+ },
+
+ /**
* Tests whether the URL matches this filter
* @param {String} location URL to be tested
* @param {String} contentType content type identifier of the URL
* @param {String} docDomain domain name of the document that loads the URL
* @param {Boolean} thirdParty should be true if the URL is a third-party request
+ * @param {String} sitekey public key provided by the document
* @return {Boolean} true in case of a match
*/
- matches: function(location, contentType, docDomain, thirdParty)
+ matches: function(location, contentType, docDomain, thirdParty, sitekey)
{
if (this.regexp.test(location) &&
(RegExpFilter.typeMap[contentType] & this.contentType) != 0 &&
(this.thirdParty == null || this.thirdParty == thirdParty) &&
- this.isActiveOnDomain(docDomain))
+ this.isActiveOnDomain(docDomain, sitekey))
{
return true;
}
@@ -593,7 +653,7 @@ RegExpFilter.fromText = function(text)
let contentType = null;
let matchCase = null;
let domains = null;
- let siteKeys = null;
+ let sitekeys = null;
let thirdParty = null;
let collapse = null;
let options;
@@ -639,7 +699,7 @@ RegExpFilter.fromText = function(text)
else if (option == "~COLLAPSE")
collapse = false;
else if (option == "SITEKEY" && typeof value != "undefined")
- siteKeys = value.split(/\|/);
+ sitekeys = value;
else
return new InvalidFilter(origText, "Unknown option " + option.toLowerCase());
}
@@ -653,15 +713,13 @@ RegExpFilter.fromText = function(text)
contentType = RegExpFilter.prototype.contentType;
contentType &= ~RegExpFilter.typeMap.DOCUMENT;
}
- if (!blocking && siteKeys)
- contentType = RegExpFilter.typeMap.DOCUMENT;
try
{
if (blocking)
- return new BlockingFilter(origText, text, contentType, matchCase, domains, thirdParty, collapse);
+ return new BlockingFilter(origText, text, contentType, matchCase, domains, thirdParty, sitekeys, collapse);
else
- return new WhitelistFilter(origText, text, contentType, matchCase, domains, thirdParty, siteKeys);
+ return new WhitelistFilter(origText, text, contentType, matchCase, domains, thirdParty, sitekeys);
}
catch (e)
{
@@ -705,13 +763,14 @@ RegExpFilter.prototype.contentType &= ~(RegExpFilter.typeMap.ELEMHIDE | RegExpFi
* @param {Boolean} matchCase see RegExpFilter()
* @param {String} domains see RegExpFilter()
* @param {Boolean} thirdParty see RegExpFilter()
+ * @param {String} sitekeys see RegExpFilter()
* @param {Boolean} collapse defines whether the filter should collapse blocked content, can be null
* @constructor
* @augments RegExpFilter
*/
-function BlockingFilter(text, regexpSource, contentType, matchCase, domains, thirdParty, collapse)
+function BlockingFilter(text, regexpSource, contentType, matchCase, domains, thirdParty, sitekeys, collapse)
{
- RegExpFilter.call(this, text, regexpSource, contentType, matchCase, domains, thirdParty);
+ RegExpFilter.call(this, text, regexpSource, contentType, matchCase, domains, thirdParty, sitekeys);
this.collapse = collapse;
}
@@ -736,34 +795,25 @@ BlockingFilter.prototype =
* @param {Boolean} matchCase see RegExpFilter()
* @param {String} domains see RegExpFilter()
* @param {Boolean} thirdParty see RegExpFilter()
- * @param {String[]} siteKeys public keys of websites that this filter should apply to
+ * @param {String} sitekeys see RegExpFilter()
* @constructor
* @augments RegExpFilter
*/
-function WhitelistFilter(text, regexpSource, contentType, matchCase, domains, thirdParty, siteKeys)
+function WhitelistFilter(text, regexpSource, contentType, matchCase, domains, thirdParty, sitekeys)
{
- RegExpFilter.call(this, text, regexpSource, contentType, matchCase, domains, thirdParty);
-
- if (siteKeys != null)
- this.siteKeys = siteKeys;
+ RegExpFilter.call(this, text, regexpSource, contentType, matchCase, domains, thirdParty, sitekeys);
}
exports.WhitelistFilter = WhitelistFilter;
WhitelistFilter.prototype =
{
- __proto__: RegExpFilter.prototype,
-
- /**
- * List of public keys of websites that this filter should apply to
- * @type String[]
- */
- siteKeys: null
+ __proto__: RegExpFilter.prototype
}
/**
* Base class for element hiding filters
* @param {String} text see Filter()
- * @param {String} domains (optional) Host names or domains the filter should be restricted to
+ * @param {String} [domains] Host names or domains the filter should be restricted to
* @param {String} selector CSS selector for the HTML elements that should be hidden
* @constructor
* @augments ActiveFilter
diff --git a/lib/filterListener.js b/lib/filterListener.js
index 1687a26..8935aa1 100644
--- a/lib/filterListener.js
+++ b/lib/filterListener.js
@@ -22,7 +22,6 @@
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
-let {TimeLine} = require("timeline");
let {FilterStorage} = require("filterStorage");
let {FilterNotifier} = require("filterNotifier");
let {ElemHide} = require("elemHide");
@@ -103,8 +102,6 @@ let HistoryPurgeObserver =
*/
function init()
{
- TimeLine.enter("Entered filter listener initialization()");
-
FilterNotifier.addListener(function(action, item, newValue, oldValue)
{
let match = /^(\w+)\.(.*)/.exec(action);
@@ -122,16 +119,11 @@ function init()
flushElemHide = function() {}; // No global stylesheet in Chrome & Co.
FilterStorage.loadFromDisk();
- TimeLine.log("done initializing data structures");
-
Services.obs.addObserver(HistoryPurgeObserver, "browser:purge-session-history", true);
onShutdown.add(function()
{
Services.obs.removeObserver(HistoryPurgeObserver, "browser:purge-session-history");
});
- TimeLine.log("done adding observers");
-
- TimeLine.leave("Filter listener initialization done");
}
init();
diff --git a/lib/filterStorage.js b/lib/filterStorage.js
index 7028ec9..f660473 100644
--- a/lib/filterStorage.js
+++ b/lib/filterStorage.js
@@ -29,7 +29,6 @@ let {Filter, ActiveFilter} = require("filterClasses");
let {Subscription, SpecialSubscription, ExternalSubscription} = require("subscriptionClasses");
let {FilterNotifier} = require("filterNotifier");
let {Utils} = require("utils");
-let {TimeLine} = require("timeline");
/**
* Version number of the filter storage file format.
@@ -369,17 +368,13 @@ let FilterStorage = exports.FilterStorage =
if (this._loading)
return;
- TimeLine.enter("Entered FilterStorage.loadFromDisk()");
this._loading = true;
let readFile = function(sourceFile, backupIndex)
{
- TimeLine.enter("FilterStorage.loadFromDisk() -> readFile()");
-
let parser = new INIParser();
IO.readFromFile(sourceFile, parser, function(e)
{
- TimeLine.enter("FilterStorage.loadFromDisk() read callback");
if (!e && parser.subscriptions.length == 0)
{
// No filter subscriptions in the file, this isn't right.
@@ -407,14 +402,11 @@ let FilterStorage = exports.FilterStorage =
else
doneReading(parser);
});
- TimeLine.leave("FilterStorage.loadFromDisk() read callback done");
return;
}
}
doneReading(parser);
- }.bind(this), "FilterStorageRead");
-
- TimeLine.leave("FilterStorage.loadFromDisk() <- readFile()", "FilterStorageRead");
+ }.bind(this));
}.bind(this);
var doneReading = function(parser)
@@ -445,7 +437,6 @@ let FilterStorage = exports.FilterStorage =
this.addFilter(filter, null, undefined, true);
}
}
- TimeLine.log("Initializing data done, triggering observers")
this._loading = false;
FilterNotifier.triggerListeners("load");
@@ -453,7 +444,6 @@ let FilterStorage = exports.FilterStorage =
if (sourceFile != this.sourceFile)
this.saveToDisk();
- TimeLine.leave("FilterStorage.loadFromDisk() read callback done");
}.bind(this);
let explicitFile;
@@ -474,8 +464,6 @@ let FilterStorage = exports.FilterStorage =
this.firstRun = true;
this._loading = false;
FilterNotifier.triggerListeners("load");
-
- TimeLine.leave("FilterStorage.loadFromDisk() read callback done");
}
else
readFile(sourceFile, 0);
@@ -486,8 +474,6 @@ let FilterStorage = exports.FilterStorage =
else
callback(true);
}
-
- TimeLine.leave("FilterStorage.loadFromDisk() done");
},
_generateFilterData: function(subscriptions)
@@ -569,8 +555,6 @@ let FilterStorage = exports.FilterStorage =
return;
}
- TimeLine.enter("Entered FilterStorage.saveToDisk()");
-
// Make sure the file's parent directory exists
try {
targetFile.parent.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
@@ -578,10 +562,8 @@ let FilterStorage = exports.FilterStorage =
let writeFilters = function()
{
- TimeLine.enter("FilterStorage.saveToDisk() -> writeFilters()");
IO.writeToFile(targetFile, this._generateFilterData(subscriptions), function(e)
{
- TimeLine.enter("FilterStorage.saveToDisk() write callback");
if (!explicitFile)
this._saving = false;
@@ -595,9 +577,7 @@ let FilterStorage = exports.FilterStorage =
}
else
FilterNotifier.triggerListeners("save");
- TimeLine.leave("FilterStorage.saveToDisk() write callback done");
- }.bind(this), "FilterStorageWrite");
- TimeLine.leave("FilterStorage.saveToDisk() -> writeFilters()", "FilterStorageWrite");
+ }.bind(this));
}.bind(this);
let checkBackupRequired = function(callbackNotRequired, callbackRequired)
@@ -629,16 +609,13 @@ let FilterStorage = exports.FilterStorage =
let removeLastBackup = function(part1, part2)
{
- TimeLine.enter("FilterStorage.saveToDisk() -> removeLastBackup()");
let file = targetFile.clone();
file.leafName = part1 + "-backup" + Prefs.patternsbackups + part2;
IO.removeFile(file, (e) => renameBackup(part1, part2, Prefs.patternsbackups - 1));
- TimeLine.leave("FilterStorage.saveToDisk() <- removeLastBackup()");
}.bind(this);
let renameBackup = function(part1, part2, index)
{
- TimeLine.enter("FilterStorage.saveToDisk() -> renameBackup()");
if (index > 0)
{
let fromFile = targetFile.clone();
@@ -655,7 +632,6 @@ let FilterStorage = exports.FilterStorage =
IO.copyFile(targetFile, toFile, writeFilters);
}
- TimeLine.leave("FilterStorage.saveToDisk() <- renameBackup()");
}.bind(this);
// Do not persist external subscriptions
@@ -664,8 +640,6 @@ let FilterStorage = exports.FilterStorage =
this._saving = true;
checkBackupRequired(writeFilters, removeLastBackup);
-
- TimeLine.leave("FilterStorage.saveToDisk() done");
},
/**
diff --git a/lib/io.js b/lib/io.js
index 915b5c1..f054fb3 100644
--- a/lib/io.js
+++ b/lib/io.js
@@ -24,7 +24,6 @@ let {FileUtils} = Cu.import("resource://gre/modules/FileUtils.jsm", null);
let {OS} = Cu.import("resource://gre/modules/osfile.jsm", null);
let {Task} = Cu.import("resource://gre/modules/Task.jsm", null);
-let {TimeLine} = require("timeline");
let {Prefs} = require("prefs");
let {Utils} = require("utils");
@@ -70,7 +69,7 @@ let IO = exports.IO =
* each line read and with a null parameter once the read operation is done.
* The callback will be called when the operation is done.
*/
- readFromFile: function(/**nsIFile*/ file, /**Object*/ listener, /**Function*/ callback, /**String*/ timeLineID)
+ readFromFile: function(/**nsIFile*/ file, /**Object*/ listener, /**Function*/ callback)
{
try
{
@@ -81,11 +80,6 @@ let IO = exports.IO =
let onProgress = function(data)
{
- if (timeLineID)
- {
- TimeLine.asyncStart(timeLineID);
- }
-
let index = (processing ? -1 : Math.max(data.lastIndexOf("\n"), data.lastIndexOf("\r")));
if (index >= 0)
{
@@ -125,11 +119,6 @@ let IO = exports.IO =
}
else
buffer += data;
-
- if (timeLineID)
- {
- TimeLine.asyncEnd(timeLineID);
- }
};
let onSuccess = function()
@@ -141,21 +130,10 @@ let IO = exports.IO =
return;
}
- if (timeLineID)
- {
- TimeLine.asyncStart(timeLineID);
- }
-
if (buffer !== "")
listener.process(buffer);
listener.process(null);
- if (timeLineID)
- {
- TimeLine.asyncEnd(timeLineID);
- TimeLine.asyncDone(timeLineID);
- }
-
callback(null);
};
@@ -169,11 +147,6 @@ let IO = exports.IO =
}
callback(e);
-
- if (timeLineID)
- {
- TimeLine.asyncDone(timeLineID);
- }
};
let decoder = new TextDecoder();
@@ -226,7 +199,7 @@ let IO = exports.IO =
* Writes string data to a file in UTF-8 format asynchronously. The callback
* will be called when the write operation is done.
*/
- writeToFile: function(/**nsIFile*/ file, /**Iterator*/ data, /**Function*/ callback, /**String*/ timeLineID)
+ writeToFile: function(/**nsIFile*/ file, /**Iterator*/ data, /**Function*/ callback)
{
try
{
diff --git a/lib/main.js b/lib/main.js
index f18cc05..a065de0 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -22,24 +22,13 @@
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
-let {TimeLine} = require("timeline");
-
-TimeLine.enter("Adblock Plus startup");
registerPublicAPI();
-TimeLine.log("Done registering public API");
require("filterListener");
-TimeLine.log("Done loading filter listener");
require("contentPolicy");
-TimeLine.log("Done loading content policy");
require("synchronizer");
-TimeLine.log("Done loading subscription synchronizer");
require("notification");
-TimeLine.log("Done loading notification downloader");
require("sync");
-TimeLine.log("Done loading sync support");
require("ui");
-TimeLine.log("Done loading UI integration code");
-TimeLine.leave("Started up");
function registerPublicAPI()
{
diff --git a/lib/matcher.js b/lib/matcher.js
index 40289d0..b76a721 100644
--- a/lib/matcher.js
+++ b/lib/matcher.js
@@ -165,13 +165,13 @@ Matcher.prototype = {
/**
* Checks whether the entries for a particular keyword match a URL
*/
- _checkEntryMatch: function(keyword, location, contentType, docDomain, thirdParty)
+ _checkEntryMatch: function(keyword, location, contentType, docDomain, thirdParty, sitekey)
{
let list = this.filterByKeyword[keyword];
for (let i = 0; i < list.length; i++)
{
let filter = list[i];
- if (filter.matches(location, contentType, docDomain, thirdParty))
+ if (filter.matches(location, contentType, docDomain, thirdParty, sitekey))
return filter;
}
return null;
@@ -183,9 +183,10 @@ Matcher.prototype = {
* @param {String} contentType content type identifier of the URL
* @param {String} docDomain domain name of the document that loads the URL
* @param {Boolean} thirdParty should be true if the URL is a third-party request
+ * @param {String} sitekey public key provided by the document
* @return {RegExpFilter} matching filter or null
*/
- matchesAny: function(location, contentType, docDomain, thirdParty)
+ matchesAny: function(location, contentType, docDomain, thirdParty, sitekey)
{
let candidates = location.toLowerCase().match(/[a-z0-9%]{3,}/g);
if (candidates === null)
@@ -196,7 +197,7 @@ Matcher.prototype = {
let substr = candidates[i];
if (substr in this.filterByKeyword)
{
- let result = this._checkEntryMatch(substr, location, contentType, docDomain, thirdParty);
+ let result = this._checkEntryMatch(substr, location, contentType, docDomain, thirdParty, sitekey);
if (result)
return result;
}
@@ -215,7 +216,6 @@ function CombinedMatcher()
{
this.blacklist = new Matcher();
this.whitelist = new Matcher();
- this.keys = Object.create(null);
this.resultCache = Object.create(null);
}
exports.CombinedMatcher = CombinedMatcher;
@@ -241,12 +241,6 @@ CombinedMatcher.prototype =
whitelist: null,
/**
- * Exception rules that are limited by public keys, mapped by the corresponding keys.
- * @type Object
- */
- keys: null,
-
- /**
* Lookup table of previous matchesAny results
* @type Object
*/
@@ -265,7 +259,6 @@ CombinedMatcher.prototype =
{
this.blacklist.clear();
this.whitelist.clear();
- this.keys = Object.create(null);
this.resultCache = Object.create(null);
this.cacheEntries = 0;
},
@@ -276,15 +269,7 @@ CombinedMatcher.prototype =
add: function(filter)
{
if (filter instanceof WhitelistFilter)
- {
- if (filter.siteKeys)
- {
- for (let i = 0; i < filter.siteKeys.length; i++)
- this.keys[filter.siteKeys[i]] = filter.text;
- }
- else
- this.whitelist.add(filter);
- }
+ this.whitelist.add(filter);
else
this.blacklist.add(filter);
@@ -301,15 +286,7 @@ CombinedMatcher.prototype =
remove: function(filter)
{
if (filter instanceof WhitelistFilter)
- {
- if (filter.siteKeys)
- {
- for (let i = 0; i < filter.siteKeys.length; i++)
- delete this.keys[filter.siteKeys[i]];
- }
- else
- this.whitelist.remove(filter);
- }
+ this.whitelist.remove(filter);
else
this.blacklist.remove(filter);
@@ -370,7 +347,7 @@ CombinedMatcher.prototype =
* simultaneously. For parameters see Matcher.matchesAny().
* @see Matcher#matchesAny
*/
- matchesAnyInternal: function(location, contentType, docDomain, thirdParty)
+ matchesAnyInternal: function(location, contentType, docDomain, thirdParty, sitekey)
{
let candidates = location.toLowerCase().match(/[a-z0-9%]{3,}/g);
if (candidates === null)
@@ -383,12 +360,12 @@ CombinedMatcher.prototype =
let substr = candidates[i];
if (substr in this.whitelist.filterByKeyword)
{
- let result = this.whitelist._checkEntryMatch(substr, location, contentType, docDomain, thirdParty);
+ let result = this.whitelist._checkEntryMatch(substr, location, contentType, docDomain, thirdParty, sitekey);
if (result)
return result;
}
if (substr in this.blacklist.filterByKeyword && blacklistHit === null)
- blacklistHit = this.blacklist._checkEntryMatch(substr, location, contentType, docDomain, thirdParty);
+ blacklistHit = this.blacklist._checkEntryMatch(substr, location, contentType, docDomain, thirdParty, sitekey);
}
return blacklistHit;
},
@@ -396,13 +373,13 @@ CombinedMatcher.prototype =
/**
* @see Matcher#matchesAny
*/
- matchesAny: function(location, contentType, docDomain, thirdParty)
+ matchesAny: function(location, contentType, docDomain, thirdParty, sitekey)
{
- let key = location + " " + contentType + " " + docDomain + " " + thirdParty;
+ let key = location + " " + contentType + " " + docDomain + " " + thirdParty + " " + sitekey;
if (key in this.resultCache)
return this.resultCache[key];
- let result = this.matchesAnyInternal(location, contentType, docDomain, thirdParty);
+ let result = this.matchesAnyInternal(location, contentType, docDomain, thirdParty, sitekey);
if (this.cacheEntries >= CombinedMatcher.maxCacheEntries)
{
@@ -414,24 +391,6 @@ CombinedMatcher.prototype =
this.cacheEntries++;
return result;
- },
-
- /**
- * Looks up whether any filters match the given website key.
- */
- matchesByKey: function(/**String*/ location, /**String*/ key, /**String*/ docDomain)
- {
- key = key.toUpperCase();
- if (key in this.keys)
- {
- let filter = Filter.knownFilters[this.keys[key]];
- if (filter && filter.matches(location, "DOCUMENT", docDomain, false))
- return filter;
- else
- return null;
- }
- else
- return null;
}
}
diff --git a/lib/notification.js b/lib/notification.js
index 06e949e..b00d24c 100644
--- a/lib/notification.js
+++ b/lib/notification.js
@@ -21,7 +21,6 @@
Cu.import("resource://gre/modules/Services.jsm");
-let {TimeLine} = require("timeline");
let {Prefs} = require("prefs");
let {Downloader, Downloadable, MILLIS_IN_MINUTE, MILLIS_IN_HOUR, MILLIS_IN_DAY} = require("downloader");
let {Utils} = require("utils");
@@ -81,8 +80,6 @@ let Notification = exports.Notification =
*/
init: function()
{
- TimeLine.enter("Entered Notification.init()");
-
downloader = new Downloader(this._getDownloadables.bind(this), INITIAL_DELAY, CHECK_INTERVAL);
onShutdown.add(function()
{
@@ -92,8 +89,6 @@ let Notification = exports.Notification =
downloader.onExpirationChange = this._onExpirationChange.bind(this);
downloader.onDownloadSuccess = this._onDownloadSuccess.bind(this);
downloader.onDownloadError = this._onDownloadError.bind(this);
-
- TimeLine.leave("Notification.init() done");
},
/**
diff --git a/lib/requestNotifier.js b/lib/requestNotifier.js
index 2ee9ec3..b6e5700 100644
--- a/lib/requestNotifier.js
+++ b/lib/requestNotifier.js
@@ -27,6 +27,7 @@ let {BlockingFilter, WhitelistFilter, ElemHideBase, ElemHideFilter, ElemHideExce
let nodeData = new WeakMap();
let windowStats = new WeakMap();
let windowSelection = new WeakMap();
+let requestEntryMaxId = 0;
let setEntry, hasEntry, getEntry;
// Last issue(Bug 982561) preventing us from using WeakMap fixed for FF version 32
@@ -244,16 +245,19 @@ RequestNotifier.getDataForNode = function(node, noParent, type, location)
let data = getEntry(nodeData, node);
if (typeof data != "undefined")
{
+ let entry = null;
// Look for matching entry
for (let k in data)
{
- let entry = data[k];
- if ((typeof type == "undefined" || entry.type == type) &&
- (typeof location == "undefined" || entry.location == location))
+ if ((!entry || entry.id < data[k].id) &&
+ (typeof type == "undefined" || data[k].type == type) &&
+ (typeof location == "undefined" || data[k].location == location))
{
- return [node, entry];
+ entry = data[k];
}
}
+ if (entry)
+ return [node, entry];
}
// If we don't have any match on this node then maybe its parent will do
@@ -278,6 +282,7 @@ function RequestEntry(node, topWnd, contentType, docDomain, thirdParty, location
this.thirdParty = thirdParty;
this.location = location;
this.filter = filter;
+ this.id = ++requestEntryMaxId;
this.attachToNode(node);
@@ -319,6 +324,11 @@ function RequestEntry(node, topWnd, contentType, docDomain, thirdParty, location
RequestEntry.prototype =
{
/**
+ * id of request (used to determine last entry attached to a node)
+ * @type integer
+ */
+ id: 0,
+ /**
* Content type of the request (one of the nsIContentPolicy constants)
* @type Integer
*/
diff --git a/lib/synchronizer.js b/lib/synchronizer.js
index 619270c..4c822f0 100644
--- a/lib/synchronizer.js
+++ b/lib/synchronizer.js
@@ -22,7 +22,6 @@
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
-let {TimeLine} = require("timeline");
let {Downloader, Downloadable,
MILLIS_IN_SECOND, MILLIS_IN_MINUTE, MILLIS_IN_HOUR, MILLIS_IN_DAY} = require("downloader");
let {Filter, CommentFilter} = require("filterClasses");
@@ -54,8 +53,6 @@ let Synchronizer = exports.Synchronizer =
*/
init: function()
{
- TimeLine.enter("Entered Synchronizer.init()");
-
downloader = new Downloader(this._getDownloadables.bind(this), INITIAL_DELAY, CHECK_INTERVAL);
onShutdown.add(function()
{
@@ -66,8 +63,6 @@ let Synchronizer = exports.Synchronizer =
downloader.onDownloadStarted = this._onDownloadStarted.bind(this);
downloader.onDownloadSuccess = this._onDownloadSuccess.bind(this);
downloader.onDownloadError = this._onDownloadError.bind(this);
-
- TimeLine.leave("Synchronizer.init() done");
},
/**
diff --git a/lib/timeline.js b/lib/timeline.js
deleted file mode 100644
index fba2098..0000000
--- a/lib/timeline.js
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
- *
- * Adblock Plus is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * Adblock Plus is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @fileOverview Debugging module used for load time measurements.
- */
-
-let nestingCounter = 0;
-let firstTimeStamp = null;
-let lastTimeStamp = null;
-
-let asyncActions = Object.create(null);
-
-/**
- * Time logging module, used to measure startup time of Adblock Plus (development builds only).
- * @class
- */
-let TimeLine = exports.TimeLine = {
- /**
- * Logs an event to console together with the time it took to get there.
- */
- log: function(/**String*/ message, /**Boolean*/ _forceDisplay)
- {
- if (!_forceDisplay && nestingCounter <= 0)
- return;
-
- let now = Date.now();
- let diff = lastTimeStamp ? Math.round(now - lastTimeStamp) : "first event";
- lastTimeStamp = now;
-
- // Indent message depending on current nesting level
- for (let i = 0; i < nestingCounter; i++)
- message = "* " + message;
-
- // Pad message with spaces
- let padding = [];
- for (let i = message.toString().length; i < 80; i++)
- padding.push(" ");
- dump("[" + now + "] ABP timeline: " + message + padding.join("") + "\t (" + diff + ")\n");
- },
-
- /**
- * Called to indicate that application entered a block that needs to be timed.
- */
- enter: function(/**String*/ message)
- {
- if (nestingCounter <= 0)
- firstTimeStamp = Date.now();
-
- this.log(message, true);
- nestingCounter = (nestingCounter <= 0 ? 1 : nestingCounter + 1);
- },
-
- /**
- * Called when application exited a block that TimeLine.enter() was called for.
- * @param {String} message message to be logged
- * @param {String} [asyncAction] identifier of a pending async action
- */
- leave: function(message, asyncAction)
- {
- if (typeof asyncAction != "undefined")
- message += " (async action pending)";
-
- nestingCounter--;
- this.log(message, true);
-
- if (nestingCounter <= 0)
- {
- if (firstTimeStamp !== null)
- dump("ABP timeline: Total time elapsed: " + Math.round(Date.now() - firstTimeStamp) + "\n");
- firstTimeStamp = null;
- lastTimeStamp = null;
- }
-
- if (typeof asyncAction != "undefined")
- {
- if (asyncAction in asyncActions)
- dump("ABP timeline: Warning: Async action " + asyncAction + " already executing\n");
- asyncActions[asyncAction] = {start: Date.now(), total: 0};
- }
- },
-
- /**
- * Called when the application starts processing of an async action.
- */
- asyncStart: function(/**String*/ asyncAction)
- {
- if (asyncAction in asyncActions)
- {
- let action = asyncActions[asyncAction];
- if ("currentStart" in action)
- dump("ABP timeline: Warning: Processing reentered for async action " + asyncAction + "\n");
- action.currentStart = Date.now();
- }
- else
- dump("ABP timeline: Warning: Async action " + asyncAction + " is unknown\n");
- },
-
- /**
- * Called when the application finishes processing of an async action.
- */
- asyncEnd: function(/**String*/ asyncAction)
- {
- if (asyncAction in asyncActions)
- {
- let action = asyncActions[asyncAction];
- if ("currentStart" in action)
- {
- action.total += Date.now() - action.currentStart;
- delete action.currentStart;
- }
- else
- dump("ABP timeline: Warning: Processing not entered for async action " + asyncAction + "\n");
- }
- else
- dump("ABP timeline: Warning: Async action " + asyncAction + " is unknown\n");
- },
-
- /**
- * Called when an async action is done and its time can be logged.
- */
- asyncDone: function(/**String*/ asyncAction)
- {
- if (asyncAction in asyncActions)
- {
- let action = asyncActions[asyncAction];
- let now = Date.now();
- let diff = now - action.start;
- if ("currentStart" in action)
- dump("ABP timeline: Warning: Still processing for async action " + asyncAction + "\n");
-
- let message = "Async action " + asyncAction + " done";
- let padding = [];
- for (let i = message.toString().length; i < 80; i++)
- padding.push(" ");
- dump("[" + now + "] ABP timeline: " + message + padding.join("") + "\t (" + action.total + "/" + diff + ")\n");
- }
- else
- dump("ABP timeline: Warning: Async action " + asyncAction + " is unknown\n");
- }
-};
diff --git a/lib/utils.js b/lib/utils.js
index 20e613c..8ad584c 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -631,7 +631,12 @@ XPCOMUtils.defineLazyGetter(Utils, "crypto", function()
catch (e)
{
// It seems that on Mac OS X the full path name needs to be specified
- let file = Services.dirsvc.get("GreD", Ci.nsILocalFile);
+ let file;
+ // Gecko 35 added GreBinD key, see https://bugzilla.mozilla.org/show_bug.cgi?id=1077099
+ if (Services.dirsvc.has("GreBinD"))
+ file = Services.dirsvc.get("GreBinD", Ci.nsILocalFile);
+ else
+ file = Services.dirsvc.get("GreD", Ci.nsILocalFile);
file.append(ctypes.libraryName("nss3"));
nsslib = ctypes.open(file.path);
}
diff --git a/metadata.gecko b/metadata.gecko
index ebb94f8..8498f5f 100644
--- a/metadata.gecko
+++ b/metadata.gecko
@@ -1,7 +1,7 @@
[general]
id={d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}
basename=adblockplus
-version=2.6.4
+version=2.6.5
author=Wladimir Palant
options=chrome://adblockplus/content/ui/settings.xul
optionsType=2
@@ -29,11 +29,11 @@ zh-CN=https://adblockplus.org/zh_CN/
zh-TW=https://adblockplus.org/zh_TW/
[compat]
-firefox=22.0/34.0
-fennec2=22.0/34.0
-thunderbird=22.0/34.0
-seamonkey=2.19/2.31
-toolkit=22.0/34.0
+firefox=22.0/35.0
+fennec2=22.0/35.0
+thunderbird=22.0/35.0
+seamonkey=2.19/2.32
+toolkit=22.0/35.0
[preprocess]
chrome/content/ui/firstRun.html =
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git
More information about the Pkg-mozext-commits
mailing list