[tor-browser-build/master] Bug 28874: Bump mingw-w64 commit to fix WebGL crash
by boklm＠torproject.org 17 Jan '19
by boklm＠torproject.org 17 Jan '19
17 Jan '19
commit 87f892495a13e878922147429e4c2b7a423f0d8e
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Jan 11 08:19:14 2019 +0000
Bug 28874: Bump mingw-w64 commit to fix WebGL crash
---
projects/mingw-w64/config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config
index 19a7a82..d0268cb 100644
--- a/projects/mingw-w64/config
+++ b/projects/mingw-w64/config
@@ -1,7 +1,7 @@
# vim: filetype=yaml sw=2
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64
-git_hash: ee9fc3d0b8c8868280e38384edd968067b8e71fc
+git_hash: 2d4e517ad0c7a9f0bd7001c42e6c131b977c15d9
version: '[% c("abbrev") %]'
var:
container:
1
0
[tor-browser-build/master] Bug 29105: Unbreak obfs4 nightly builds
by boklm＠torproject.org 17 Jan '19
by boklm＠torproject.org 17 Jan '19
17 Jan '19
commit aabf423be17388db2c980be9f04239479bdb6bb4
Author: Georg Koppen <gk(a)torproject.org>
Date: Thu Jan 17 10:00:07 2019 +0000
Bug 29105: Unbreak obfs4 nightly builds
---
projects/obfs4/build | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/projects/obfs4/build b/projects/obfs4/build
index 2c3f933..4e42b23 100644
--- a/projects/obfs4/build
+++ b/projects/obfs4/build
@@ -21,9 +21,15 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
# versioning (see bug 28325).
rm -f go.mod go.sum
[% END -%]
-
-mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports"
-ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git"
+# Commit 70d0e90c861be34ce3c5425ef1366a0b2ceb3026 changed the canonical obfs4
+# upstream repo to gitlab.com/yawning/obfs4.git.
+[% IF c("var/nightly") %]
+ mkdir -p "$GOPATH/src/gitlab.com/yawning"
+ ln -sf "$PWD" "$GOPATH/src/gitlab.com/yawning/obfs4.git"
+[% ELSE %]
+ mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports"
+ ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git"
+[% END %]
cd obfs4proxy
go build -ldflags '-s'
cp -a obfs4proxy[% IF c("var/windows") %].exe[% END %] $PTDIR
1
0
17 Jan '19
commit 5631b327ab3654af5f2b329cf46fd67921004f41
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Thu Jan 10 21:59:07 2019 +0100
Bug 26148: Update binutils to 2.31.1
With older versions of binutils, the order in which .o files were
included in an .a archive did not affect the output when linking a
program or library, which is no longer the case with recent versions of
binutils. To avoid reproducibility issues we patch the libtool version
included in gcc to make the creation `libstdc++.a` reproducible.
---
keyring/binutils.gpg | Bin 1169 -> 3184 bytes
projects/binutils/build | 12 +-
projects/binutils/config | 11 +-
.../binutils/fix-windows-reproducibility.patch | 1034 --------------------
projects/binutils/peXXigen.patch | 29 -
projects/mingw-w64/build | 4 +
projects/mingw-w64/config | 1 +
projects/mingw-w64/libtool-sort.patch | 67 ++
8 files changed, 77 insertions(+), 1081 deletions(-)
diff --git a/keyring/binutils.gpg b/keyring/binutils.gpg
index 2de205d..d13540e 100644
Binary files a/keyring/binutils.gpg and b/keyring/binutils.gpg differ
diff --git a/projects/binutils/build b/projects/binutils/build
index 0d1c062..ee22a1c 100644
--- a/projects/binutils/build
+++ b/projects/binutils/build
@@ -16,18 +16,12 @@ distdir=/var/tmp/dist/binutils
ln -s /usr/lib/gcc/x86_64-linux-gnu/4.7/libstdc++_pic.a libstdc++.a
export LDFLAGS="-L$rootdir -lstdc++"
[% END %]
-tar xf [% project %]-[% c("version") %].tar.bz2
+tar xf [% project %]-[% c("version") %].tar.xz
cd [% project %]-[% c("version") %]
[% IF c('var/windows') -%]
- # XXX: This is needed due to bug 10102.
- sed 's/= extern_rt_rel_d;/= extern_rt_rel_d;\n memset (extern_rt_rel_d, 0, PE_IDATA5_SIZE);/' -i ld/pe-dll.c
- # Zeroing timestamps in PE headers reliably, see bug 12753.
- patch -p1 < ../peXXigen.patch
- # Needed for the hardening...
+ # Needed for the hardening... The upstream ticket is:
+ # https://sourceware.org/bugzilla/show_bug.cgi?id=17321
patch -p1 < ../enable-reloc-section-ld.patch
- # fix build reproducibility of Windows builds by reverting commit 13e570f80c.
- # See bug 16472.
- patch -p1 < ../fix-windows-reproducibility.patch
[% END -%]
[% IF c('var/windows-x86_64') -%]
patch -p1 < ../64bit-fixups.patch
diff --git a/projects/binutils/config b/projects/binutils/config
index 1f992a2..2367280 100644
--- a/projects/binutils/config
+++ b/projects/binutils/config
@@ -1,5 +1,5 @@
# vim: filetype=yaml sw=2
-version: 2.26.1
+version: 2.31.1
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
var:
configure_opt: '--disable-multilib --enable-gold --enable-deterministic-archives --enable-plugins'
@@ -10,12 +10,9 @@ targets:
windows:
var:
configure_opt: '--target=[% c("arch") %]-w64-mingw32 --disable-multilib --enable-deterministic-archives'
- arch_deps:
- # texinfo required for fix-windows-reproducibility.patch
- - texinfo
input_files:
- - URL: https://ftp.gnu.org/gnu/binutils/binutils-[% c("version") %].tar.bz2
+ - URL: https://ftp.gnu.org/gnu/binutils/binutils-[% c("version") %].tar.xz
sig_ext: sig
file_gpg_id: 1
gpg_keyring: binutils.gpg
@@ -24,7 +21,3 @@ input_files:
enable: '[% c("var/windows") %]'
- filename: 64bit-fixups.patch
enable: '[% c("var/windows-x86_64") %]'
- - filename: peXXigen.patch
- enable: '[% c("var/windows") %]'
- - filename: fix-windows-reproducibility.patch
- enable: '[% c("var/windows") %]'
diff --git a/projects/binutils/fix-windows-reproducibility.patch b/projects/binutils/fix-windows-reproducibility.patch
deleted file mode 100644
index 1fc5987..0000000
--- a/projects/binutils/fix-windows-reproducibility.patch
+++ /dev/null
@@ -1,1034 +0,0 @@
-From c6df45304e92aa2d7e9f2d8311ae5a0b1543daa8 Mon Sep 17 00:00:00 2001
-From: Nicolas Vigier <boklm(a)torproject.org>
-Date: Wed, 16 May 2018 11:07:52 +0200
-Subject: [PATCH] Revert "Fix LTO vs. COFF archives"
-
-This reverts commit 13e570f80cbfb299a8858ce6830e91a6cb40ab7b.
----
- bfd/aoutx.h | 2 -
- bfd/cofflink.c | 116 +++++++++++++++---
- bfd/ecoff.c | 164 +++++++++++++++++++++++--
- bfd/elflink.c | 53 ++++++--
- bfd/libbfd-in.h | 4 +-
- bfd/libbfd.h | 4 +-
- bfd/linker.c | 366 ++++++++++++++++++++++++++++++++++++++++----------------
- bfd/pdp11.c | 4 +-
- bfd/xcofflink.c | 4 +-
- 9 files changed, 560 insertions(+), 157 deletions(-)
-
-diff --git a/bfd/aoutx.h b/bfd/aoutx.h
-index 9385a98..6ca9c58 100644
---- a/bfd/aoutx.h
-+++ b/bfd/aoutx.h
-@@ -3405,8 +3405,6 @@ aout_link_check_ar_symbols (bfd *abfd,
- static bfd_boolean
- aout_link_check_archive_element (bfd *abfd,
- struct bfd_link_info *info,
-- struct bfd_link_hash_entry *h ATTRIBUTE_UNUSED,
-- const char *name ATTRIBUTE_UNUSED,
- bfd_boolean *pneeded)
- {
- bfd *oldbfd;
-diff --git a/bfd/cofflink.c b/bfd/cofflink.c
-index 2782795..3a82640 100644
---- a/bfd/cofflink.c
-+++ b/bfd/cofflink.c
-@@ -29,11 +29,9 @@
- #include "libcoff.h"
- #include "safe-ctype.h"
-
--static bfd_boolean coff_link_add_object_symbols (bfd *, struct bfd_link_info *);
--static bfd_boolean coff_link_check_archive_element
-- (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, const char *,
-- bfd_boolean *);
--static bfd_boolean coff_link_add_symbols (bfd *, struct bfd_link_info *);
-+static bfd_boolean coff_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info);
-+static bfd_boolean coff_link_check_archive_element (bfd *abfd, struct bfd_link_info *info, bfd_boolean *pneeded);
-+static bfd_boolean coff_link_add_symbols (bfd *abfd, struct bfd_link_info *info);
-
- /* Return TRUE if SYM is a weak, external symbol. */
- #define IS_WEAK_EXTERNAL(abfd, sym) \
-@@ -192,6 +190,74 @@ coff_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
- return TRUE;
- }
-
-+/* Look through the symbols to see if this object file should be
-+ included in the link. */
-+
-+static bfd_boolean
-+coff_link_check_ar_symbols (bfd *abfd,
-+ struct bfd_link_info *info,
-+ bfd_boolean *pneeded,
-+ bfd **subsbfd)
-+{
-+ bfd_size_type symesz;
-+ bfd_byte *esym;
-+ bfd_byte *esym_end;
-+
-+ *pneeded = FALSE;
-+
-+ symesz = bfd_coff_symesz (abfd);
-+ esym = (bfd_byte *) obj_coff_external_syms (abfd);
-+ esym_end = esym + obj_raw_syment_count (abfd) * symesz;
-+ while (esym < esym_end)
-+ {
-+ struct internal_syment sym;
-+ enum coff_symbol_classification classification;
-+
-+ bfd_coff_swap_sym_in (abfd, esym, &sym);
-+
-+ classification = bfd_coff_classify_symbol (abfd, &sym);
-+ if (classification == COFF_SYMBOL_GLOBAL
-+ || classification == COFF_SYMBOL_COMMON)
-+ {
-+ const char *name;
-+ char buf[SYMNMLEN + 1];
-+ struct bfd_link_hash_entry *h;
-+
-+ /* This symbol is externally visible, and is defined by this
-+ object file. */
-+ name = _bfd_coff_internal_syment_name (abfd, &sym, buf);
-+ if (name == NULL)
-+ return FALSE;
-+ h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE);
-+
-+ /* Auto import. */
-+ if (!h
-+ && info->pei386_auto_import
-+ && CONST_STRNEQ (name, "__imp_"))
-+ h = bfd_link_hash_lookup (info->hash, name + 6, FALSE, FALSE, TRUE);
-+
-+ /* We are only interested in symbols that are currently
-+ undefined. If a symbol is currently known to be common,
-+ COFF linkers do not bring in an object file which defines
-+ it. */
-+ if (h != (struct bfd_link_hash_entry *) NULL
-+ && h->type == bfd_link_hash_undefined)
-+ {
-+ if (!(*info->callbacks
-+ ->add_archive_element) (info, abfd, name, subsbfd))
-+ return FALSE;
-+ *pneeded = TRUE;
-+ return TRUE;
-+ }
-+ }
-+
-+ esym += (sym.n_numaux + 1) * symesz;
-+ }
-+
-+ /* We do not need this object file. */
-+ return TRUE;
-+}
-+
- /* Check a single archive element to see if we need to include it in
- the link. *PNEEDED is set according to whether this element is
- needed in the link or not. This is called via
-@@ -200,23 +266,41 @@ coff_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
- static bfd_boolean
- coff_link_check_archive_element (bfd *abfd,
- struct bfd_link_info *info,
-- struct bfd_link_hash_entry *h,
-- const char *name,
- bfd_boolean *pneeded)
- {
-- *pneeded = FALSE;
-+ bfd *oldbfd;
-+ bfd_boolean needed;
-
-- /* We are only interested in symbols that are currently undefined.
-- If a symbol is currently known to be common, COFF linkers do not
-- bring in an object file which defines it. */
-- if (h->type != bfd_link_hash_undefined)
-- return TRUE;
-+ if (!_bfd_coff_get_external_symbols (abfd))
-+ return FALSE;
-
-- if (!(*info->callbacks->add_archive_element) (info, abfd, name, &abfd))
-+ oldbfd = abfd;
-+ if (!coff_link_check_ar_symbols (abfd, info, pneeded, &abfd))
- return FALSE;
-- *pneeded = TRUE;
-
-- return coff_link_add_object_symbols (abfd, info);
-+ needed = *pneeded;
-+ if (needed)
-+ {
-+ /* Potentially, the add_archive_element hook may have set a
-+ substitute BFD for us. */
-+ if (abfd != oldbfd)
-+ {
-+ if (!info->keep_memory
-+ && !_bfd_coff_free_symbols (oldbfd))
-+ return FALSE;
-+ if (!_bfd_coff_get_external_symbols (abfd))
-+ return FALSE;
-+ }
-+ if (!coff_link_add_symbols (abfd, info))
-+ return FALSE;
-+ }
-+
-+ if (!info->keep_memory || !needed)
-+ {
-+ if (!_bfd_coff_free_symbols (abfd))
-+ return FALSE;
-+ }
-+ return TRUE;
- }
-
- /* Add all the symbols from an object file to the hash table. */
-diff --git a/bfd/ecoff.c b/bfd/ecoff.c
-index 01f51e6..2c915f0 100644
---- a/bfd/ecoff.c
-+++ b/bfd/ecoff.c
-@@ -3500,29 +3500,171 @@ ecoff_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
- return FALSE;
- }
-
-+/* Factored out from ecoff_link_check_archive_element. */
-+
-+static bfd_boolean
-+read_ext_syms_and_strs (HDRR **symhdr, bfd_size_type *external_ext_size,
-+ bfd_size_type *esize, void **external_ext, char **ssext, bfd *abfd,
-+ const struct ecoff_backend_data * const backend)
-+{
-+ if (! ecoff_slurp_symbolic_header (abfd))
-+ return FALSE;
-+
-+ /* If there are no symbols, we don't want it. */
-+ if (bfd_get_symcount (abfd) == 0)
-+ return TRUE;
-+
-+ *symhdr = &ecoff_data (abfd)->debug_info.symbolic_header;
-+
-+ *external_ext_size = backend->debug_swap.external_ext_size;
-+ *esize = (*symhdr)->iextMax * *external_ext_size;
-+ *external_ext = bfd_malloc (*esize);
-+ if (*external_ext == NULL && *esize != 0)
-+ return FALSE;
-+
-+ if (bfd_seek (abfd, (file_ptr) (*symhdr)->cbExtOffset, SEEK_SET) != 0
-+ || bfd_bread (*external_ext, *esize, abfd) != *esize)
-+ return FALSE;
-+
-+ *ssext = (char *) bfd_malloc ((bfd_size_type) (*symhdr)->issExtMax);
-+ if (*ssext == NULL && (*symhdr)->issExtMax != 0)
-+ return FALSE;
-+
-+ if (bfd_seek (abfd, (file_ptr) (*symhdr)->cbSsExtOffset, SEEK_SET) != 0
-+ || (bfd_bread (*ssext, (bfd_size_type) (*symhdr)->issExtMax, abfd)
-+ != (bfd_size_type) (*symhdr)->issExtMax))
-+ return FALSE;
-+ return TRUE;
-+}
-+
-+static bfd_boolean
-+reread_ext_syms_and_strs (HDRR **symhdr, bfd_size_type *external_ext_size,
-+ bfd_size_type *esize, void **external_ext, char **ssext, bfd *abfd,
-+ const struct ecoff_backend_data * const backend)
-+{
-+ if (*external_ext != NULL)
-+ free (*external_ext);
-+ *external_ext = NULL;
-+ if (*ssext != NULL)
-+ free (*ssext);
-+ *ssext = NULL;
-+ return read_ext_syms_and_strs (symhdr, external_ext_size, esize,
-+ external_ext, ssext, abfd, backend);
-+}
-+
- /* This is called if we used _bfd_generic_link_add_archive_symbols
- because we were not dealing with an ECOFF archive. */
-
- static bfd_boolean
- ecoff_link_check_archive_element (bfd *abfd,
- struct bfd_link_info *info,
-- struct bfd_link_hash_entry *h,
-- const char *name,
- bfd_boolean *pneeded)
- {
-+ const struct ecoff_backend_data * const backend = ecoff_backend (abfd);
-+ void (* const swap_ext_in) (bfd *, void *, EXTR *)
-+ = backend->debug_swap.swap_ext_in;
-+ HDRR *symhdr;
-+ bfd_size_type external_ext_size = 0;
-+ void * external_ext = NULL;
-+ bfd_size_type esize = 0;
-+ char *ssext = NULL;
-+ char *ext_ptr;
-+ char *ext_end;
-+
- *pneeded = FALSE;
-
-- /* Unlike the generic linker, we do not pull in elements because
-- of common symbols. */
-- if (h->type != bfd_link_hash_undefined)
-- return TRUE;
-+ /* Read in the external symbols and external strings. */
-+ if (!read_ext_syms_and_strs (&symhdr, &external_ext_size, &esize,
-+ &external_ext, &ssext, abfd, backend))
-+ goto error_return;
-
-- /* Include this element. */
-- if (!(*info->callbacks->add_archive_element) (info, abfd, name, &abfd))
-- return FALSE;
-- *pneeded = TRUE;
-+ /* If there are no symbols, we don't want it. */
-+ if (bfd_get_symcount (abfd) == 0)
-+ goto successful_return;
-
-- return ecoff_link_add_object_symbols (abfd, info);
-+ /* Look through the external symbols to see if they define some
-+ symbol that is currently undefined. */
-+ ext_ptr = (char *) external_ext;
-+ ext_end = ext_ptr + esize;
-+ for (; ext_ptr < ext_end; ext_ptr += external_ext_size)
-+ {
-+ EXTR esym;
-+ bfd_boolean def;
-+ const char *name;
-+ bfd *oldbfd;
-+ struct bfd_link_hash_entry *h;
-+
-+ (*swap_ext_in) (abfd, (void *) ext_ptr, &esym);
-+
-+ /* See if this symbol defines something. */
-+ if (esym.asym.st != stGlobal
-+ && esym.asym.st != stLabel
-+ && esym.asym.st != stProc)
-+ continue;
-+
-+ switch (esym.asym.sc)
-+ {
-+ case scText:
-+ case scData:
-+ case scBss:
-+ case scAbs:
-+ case scSData:
-+ case scSBss:
-+ case scRData:
-+ case scCommon:
-+ case scSCommon:
-+ case scInit:
-+ case scFini:
-+ case scRConst:
-+ def = TRUE;
-+ break;
-+ default:
-+ def = FALSE;
-+ break;
-+ }
-+
-+ if (! def)
-+ continue;
-+
-+ name = ssext + esym.asym.iss;
-+ h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE);
-+
-+ /* Unlike the generic linker, we do not pull in elements because
-+ of common symbols. */
-+ if (h == NULL
-+ || h->type != bfd_link_hash_undefined)
-+ continue;
-+
-+ /* Include this element. */
-+ oldbfd = abfd;
-+ if (!(*info->callbacks
-+ ->add_archive_element) (info, abfd, name, &abfd))
-+ goto error_return;
-+ /* Potentially, the add_archive_element hook may have set a
-+ substitute BFD for us. */
-+ if (abfd != oldbfd
-+ && !reread_ext_syms_and_strs (&symhdr, &external_ext_size, &esize,
-+ &external_ext, &ssext, abfd, backend))
-+ goto error_return;
-+ if (! ecoff_link_add_externals (abfd, info, external_ext, ssext))
-+ goto error_return;
-+
-+ *pneeded = TRUE;
-+ goto successful_return;
-+ }
-+
-+ successful_return:
-+ if (external_ext != NULL)
-+ free (external_ext);
-+ if (ssext != NULL)
-+ free (ssext);
-+ return TRUE;
-+ error_return:
-+ if (external_ext != NULL)
-+ free (external_ext);
-+ if (ssext != NULL)
-+ free (ssext);
-+ return FALSE;
- }
-
- /* Add the symbols from an archive file to the global hash table.
-diff --git a/bfd/elflink.c b/bfd/elflink.c
-index 94ab762..164df6b 100644
---- a/bfd/elflink.c
-+++ b/bfd/elflink.c
-@@ -2933,6 +2933,13 @@ elf_link_is_defined_archive_symbol (bfd * abfd, carsym * symdef)
- if (! bfd_check_format (abfd, bfd_object))
- return FALSE;
-
-+ /* If we have already included the element containing this symbol in the
-+ link then we do not need to include it again. Just claim that any symbol
-+ it contains is not a definition, so that our caller will not decide to
-+ (re)include this element. */
-+ if (abfd->archive_pass)
-+ return FALSE;
-+
- /* Select the appropriate symbol table. */
- if ((abfd->flags & DYNAMIC) == 0 || elf_dynsymtab (abfd) == 0)
- hdr = &elf_tdata (abfd)->symtab_hdr;
-@@ -4929,8 +4936,20 @@ _bfd_elf_archive_symbol_lookup (bfd *abfd,
- }
-
- /* Add symbols from an ELF archive file to the linker hash table. We
-- don't use _bfd_generic_link_add_archive_symbols because we need to
-- handle versioned symbols.
-+ don't use _bfd_generic_link_add_archive_symbols because of a
-+ problem which arises on UnixWare. The UnixWare libc.so is an
-+ archive which includes an entry libc.so.1 which defines a bunch of
-+ symbols. The libc.so archive also includes a number of other
-+ object files, which also define symbols, some of which are the same
-+ as those defined in libc.so.1. Correct linking requires that we
-+ consider each object file in turn, and include it if it defines any
-+ symbols we need. _bfd_generic_link_add_archive_symbols does not do
-+ this; it looks through the list of undefined symbols, and includes
-+ any object file which defines them. When this algorithm is used on
-+ UnixWare, it winds up pulling in libc.so.1 early and defining a
-+ bunch of symbols. This means that some of the other objects in the
-+ archive are not included in the link, which is incorrect since they
-+ precede libc.so.1 in the archive.
-
- Fortunately, ELF archive handling is simpler than that done by
- _bfd_generic_link_add_archive_symbols, which has to allow for a.out
-@@ -4945,7 +4964,8 @@ static bfd_boolean
- elf_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info)
- {
- symindex c;
-- unsigned char *included = NULL;
-+ bfd_boolean *defined = NULL;
-+ bfd_boolean *included = NULL;
- carsym *symdefs;
- bfd_boolean loop;
- bfd_size_type amt;
-@@ -4969,10 +4989,11 @@ elf_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info)
- if (c == 0)
- return TRUE;
- amt = c;
-- amt *= sizeof (*included);
-- included = (unsigned char *) bfd_zmalloc (amt);
-- if (included == NULL)
-- return FALSE;
-+ amt *= sizeof (bfd_boolean);
-+ defined = (bfd_boolean *) bfd_zmalloc (amt);
-+ included = (bfd_boolean *) bfd_zmalloc (amt);
-+ if (defined == NULL || included == NULL)
-+ goto error_return;
-
- symdefs = bfd_ardata (abfd)->symdefs;
- bed = get_elf_backend_data (abfd);
-@@ -4997,7 +5018,7 @@ elf_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info)
- struct bfd_link_hash_entry *undefs_tail;
- symindex mark;
-
-- if (included[i])
-+ if (defined[i] || included[i])
- continue;
- if (symdef->file_offset == last)
- {
-@@ -5032,8 +5053,7 @@ elf_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info)
- else if (h->root.type != bfd_link_hash_undefined)
- {
- if (h->root.type != bfd_link_hash_undefweak)
-- /* Symbol must be defined. Don't check it again. */
-- included[i] = TRUE;
-+ defined[i] = TRUE;
- continue;
- }
-
-@@ -5045,6 +5065,16 @@ elf_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info)
- if (! bfd_check_format (element, bfd_object))
- goto error_return;
-
-+ /* Doublecheck that we have not included this object
-+ already--it should be impossible, but there may be
-+ something wrong with the archive. */
-+ if (element->archive_pass != 0)
-+ {
-+ bfd_set_error (bfd_error_bad_value);
-+ goto error_return;
-+ }
-+ element->archive_pass = 1;
-+
- undefs_tail = info->hash->undefs_tail;
-
- if (!(*info->callbacks
-@@ -5082,11 +5112,14 @@ elf_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info)
- }
- while (loop);
-
-+ free (defined);
- free (included);
-
- return TRUE;
-
- error_return:
-+ if (defined != NULL)
-+ free (defined);
- if (included != NULL)
- free (included);
- return FALSE;
-diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h
-index 50a46ac..90c6018 100644
---- a/bfd/libbfd-in.h
-+++ b/bfd/libbfd-in.h
-@@ -596,9 +596,7 @@ extern bfd_boolean _bfd_generic_link_add_symbols_collect
- /* Generic archive add symbol routine. */
- extern bfd_boolean _bfd_generic_link_add_archive_symbols
- (bfd *, struct bfd_link_info *,
-- bfd_boolean (*) (bfd *, struct bfd_link_info *,
-- struct bfd_link_hash_entry *, const char *,
-- bfd_boolean *));
-+ bfd_boolean (*) (bfd *, struct bfd_link_info *, bfd_boolean *));
-
- /* Forward declaration to avoid prototype errors. */
- typedef struct bfd_link_hash_entry _bfd_link_hash_entry;
-diff --git a/bfd/libbfd.h b/bfd/libbfd.h
-index 6c48f82..ffb6ea4 100644
---- a/bfd/libbfd.h
-+++ b/bfd/libbfd.h
-@@ -601,9 +601,7 @@ extern bfd_boolean _bfd_generic_link_add_symbols_collect
- /* Generic archive add symbol routine. */
- extern bfd_boolean _bfd_generic_link_add_archive_symbols
- (bfd *, struct bfd_link_info *,
-- bfd_boolean (*) (bfd *, struct bfd_link_info *,
-- struct bfd_link_hash_entry *, const char *,
-- bfd_boolean *));
-+ bfd_boolean (*) (bfd *, struct bfd_link_info *, bfd_boolean *));
-
- /* Forward declaration to avoid prototype errors. */
- typedef struct bfd_link_hash_entry _bfd_link_hash_entry;
-diff --git a/bfd/linker.c b/bfd/linker.c
-index abdf5b0..4cff1e7 100644
---- a/bfd/linker.c
-+++ b/bfd/linker.c
-@@ -229,16 +229,28 @@ SUBSUBSECTION
- @findex _bfd_generic_link_add_archive_symbols
- In most cases the work of looking through the symbols in the
- archive should be done by the
-- <<_bfd_generic_link_add_archive_symbols>> function.
-+ <<_bfd_generic_link_add_archive_symbols>> function. This
-+ function builds a hash table from the archive symbol table and
-+ looks through the list of undefined symbols to see which
-+ elements should be included.
- <<_bfd_generic_link_add_archive_symbols>> is passed a function
- to call to make the final decision about adding an archive
- element to the link and to do the actual work of adding the
-- symbols to the linker hash table. If the element is to
-+ symbols to the linker hash table.
-+
-+ The function passed to
-+ <<_bfd_generic_link_add_archive_symbols>> must read the
-+ symbols of the archive element and decide whether the archive
-+ element should be included in the link. If the element is to
- be included, the <<add_archive_element>> linker callback
- routine must be called with the element as an argument, and
- the element's symbols must be added to the linker hash table
- just as though the element had itself been passed to the
-- <<_bfd_link_add_symbols>> function.
-+ <<_bfd_link_add_symbols>> function. The <<add_archive_element>>
-+ callback has the option to indicate that it would like to
-+ replace the element archive with a substitute BFD, in which
-+ case it is the symbols of that substitute BFD that must be
-+ added to the linker hash table instead.
-
- When the a.out <<_bfd_link_add_symbols>> function receives an
- archive, it calls <<_bfd_generic_link_add_archive_symbols>>
-@@ -407,14 +419,11 @@ static bfd_boolean generic_link_add_object_symbols
- static bfd_boolean generic_link_add_symbols
- (bfd *, struct bfd_link_info *, bfd_boolean);
- static bfd_boolean generic_link_check_archive_element_no_collect
-- (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, const char *,
-- bfd_boolean *);
-+ (bfd *, struct bfd_link_info *, bfd_boolean *);
- static bfd_boolean generic_link_check_archive_element_collect
-- (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, const char *,
-- bfd_boolean *);
-+ (bfd *, struct bfd_link_info *, bfd_boolean *);
- static bfd_boolean generic_link_check_archive_element
-- (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, const char *,
-- bfd_boolean *, bfd_boolean);
-+ (bfd *, struct bfd_link_info *, bfd_boolean *, bfd_boolean);
- static bfd_boolean generic_link_add_symbol_list
- (bfd *, struct bfd_link_info *, bfd_size_type count, asymbol **,
- bfd_boolean);
-@@ -908,32 +917,138 @@ generic_link_add_object_symbols (bfd *abfd,
- return generic_link_add_symbol_list (abfd, info, symcount, outsyms, collect);
- }
-
-+/* We build a hash table of all symbols defined in an archive. */
-+
-+/* An archive symbol may be defined by multiple archive elements.
-+ This linked list is used to hold the elements. */
-+
-+struct archive_list
-+{
-+ struct archive_list *next;
-+ unsigned int indx;
-+};
-+
-+/* An entry in an archive hash table. */
-+
-+struct archive_hash_entry
-+{
-+ struct bfd_hash_entry root;
-+ /* Where the symbol is defined. */
-+ struct archive_list *defs;
-+};
-+
-+/* An archive hash table itself. */
-+
-+struct archive_hash_table
-+{
-+ struct bfd_hash_table table;
-+};
-+
-+/* Create a new entry for an archive hash table. */
-+
-+static struct bfd_hash_entry *
-+archive_hash_newfunc (struct bfd_hash_entry *entry,
-+ struct bfd_hash_table *table,
-+ const char *string)
-+{
-+ struct archive_hash_entry *ret = (struct archive_hash_entry *) entry;
-+
-+ /* Allocate the structure if it has not already been allocated by a
-+ subclass. */
-+ if (ret == NULL)
-+ ret = (struct archive_hash_entry *)
-+ bfd_hash_allocate (table, sizeof (struct archive_hash_entry));
-+ if (ret == NULL)
-+ return NULL;
-+
-+ /* Call the allocation method of the superclass. */
-+ ret = ((struct archive_hash_entry *)
-+ bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string));
-+
-+ if (ret)
-+ {
-+ /* Initialize the local fields. */
-+ ret->defs = NULL;
-+ }
-+
-+ return &ret->root;
-+}
-+
-+/* Initialize an archive hash table. */
-+
-+static bfd_boolean
-+archive_hash_table_init
-+ (struct archive_hash_table *table,
-+ struct bfd_hash_entry *(*newfunc) (struct bfd_hash_entry *,
-+ struct bfd_hash_table *,
-+ const char *),
-+ unsigned int entsize)
-+{
-+ return bfd_hash_table_init (&table->table, newfunc, entsize);
-+}
-+
-+/* Look up an entry in an archive hash table. */
-+
-+#define archive_hash_lookup(t, string, create, copy) \
-+ ((struct archive_hash_entry *) \
-+ bfd_hash_lookup (&(t)->table, (string), (create), (copy)))
-+
-+/* Allocate space in an archive hash table. */
-+
-+#define archive_hash_allocate(t, size) bfd_hash_allocate (&(t)->table, (size))
-+
-+/* Free an archive hash table. */
-+
-+#define archive_hash_table_free(t) bfd_hash_table_free (&(t)->table)
-+
- /* Generic function to add symbols from an archive file to the global
- hash file. This function presumes that the archive symbol table
- has already been read in (this is normally done by the
-- bfd_check_format entry point). It looks through the archive symbol
-- table for symbols that are undefined or common in the linker global
-- symbol hash table. When one is found, the CHECKFN argument is used
-- to see if an object file should be included. This allows targets
-- to customize common symbol behaviour. CHECKFN should set *PNEEDED
-- to TRUE if the object file should be included, and must also call
-- the bfd_link_info add_archive_element callback function and handle
-- adding the symbols to the global hash table. CHECKFN must notice
-- if the callback indicates a substitute BFD, and arrange to add
-- those symbols instead if it does so. CHECKFN should only return
-- FALSE if some sort of error occurs. */
-+ bfd_check_format entry point). It looks through the undefined and
-+ common symbols and searches the archive symbol table for them. If
-+ it finds an entry, it includes the associated object file in the
-+ link.
-+
-+ The old linker looked through the archive symbol table for
-+ undefined symbols. We do it the other way around, looking through
-+ undefined symbols for symbols defined in the archive. The
-+ advantage of the newer scheme is that we only have to look through
-+ the list of undefined symbols once, whereas the old method had to
-+ re-search the symbol table each time a new object file was added.
-+
-+ The CHECKFN argument is used to see if an object file should be
-+ included. CHECKFN should set *PNEEDED to TRUE if the object file
-+ should be included, and must also call the bfd_link_info
-+ add_archive_element callback function and handle adding the symbols
-+ to the global hash table. CHECKFN must notice if the callback
-+ indicates a substitute BFD, and arrange to add those symbols instead
-+ if it does so. CHECKFN should only return FALSE if some sort of
-+ error occurs.
-+
-+ For some formats, such as a.out, it is possible to look through an
-+ object file but not actually include it in the link. The
-+ archive_pass field in a BFD is used to avoid checking the symbols
-+ of an object files too many times. When an object is included in
-+ the link, archive_pass is set to -1. If an object is scanned but
-+ not included, archive_pass is set to the pass number. The pass
-+ number is incremented each time a new object file is included. The
-+ pass number is used because when a new object file is included it
-+ may create new undefined symbols which cause a previously examined
-+ object file to be included. */
-
- bfd_boolean
- _bfd_generic_link_add_archive_symbols
- (bfd *abfd,
- struct bfd_link_info *info,
-- bfd_boolean (*checkfn) (bfd *, struct bfd_link_info *,
-- struct bfd_link_hash_entry *, const char *,
-- bfd_boolean *))
-+ bfd_boolean (*checkfn) (bfd *, struct bfd_link_info *, bfd_boolean *))
- {
-- bfd_boolean loop;
-- bfd_size_type amt;
-- unsigned char *included;
-+ carsym *arsyms;
-+ carsym *arsym_end;
-+ register carsym *arsym;
-+ int pass;
-+ struct archive_hash_table arsym_hash;
-+ unsigned int indx;
-+ struct bfd_link_hash_entry **pundef;
-
- if (! bfd_has_map (abfd))
- {
-@@ -944,103 +1059,148 @@ _bfd_generic_link_add_archive_symbols
- return FALSE;
- }
-
-- amt = bfd_ardata (abfd)->symdef_count;
-- if (amt == 0)
-- return TRUE;
-- amt *= sizeof (*included);
-- included = (unsigned char *) bfd_zmalloc (amt);
-- if (included == NULL)
-+ arsyms = bfd_ardata (abfd)->symdefs;
-+ arsym_end = arsyms + bfd_ardata (abfd)->symdef_count;
-+
-+ /* In order to quickly determine whether an symbol is defined in
-+ this archive, we build a hash table of the symbols. */
-+ if (! archive_hash_table_init (&arsym_hash, archive_hash_newfunc,
-+ sizeof (struct archive_hash_entry)))
- return FALSE;
-+ for (arsym = arsyms, indx = 0; arsym < arsym_end; arsym++, indx++)
-+ {
-+ struct archive_hash_entry *arh;
-+ struct archive_list *l, **pp;
-
-- do
-+ arh = archive_hash_lookup (&arsym_hash, arsym->name, TRUE, FALSE);
-+ if (arh == NULL)
-+ goto error_return;
-+ l = ((struct archive_list *)
-+ archive_hash_allocate (&arsym_hash, sizeof (struct archive_list)));
-+ if (l == NULL)
-+ goto error_return;
-+ l->indx = indx;
-+ for (pp = &arh->defs; *pp != NULL; pp = &(*pp)->next)
-+ ;
-+ *pp = l;
-+ l->next = NULL;
-+ }
-+
-+ /* The archive_pass field in the archive itself is used to
-+ initialize PASS, sine we may search the same archive multiple
-+ times. */
-+ pass = abfd->archive_pass + 1;
-+
-+ /* New undefined symbols are added to the end of the list, so we
-+ only need to look through it once. */
-+ pundef = &info->hash->undefs;
-+ while (*pundef != NULL)
- {
-- carsym *arsyms;
-- carsym *arsym_end;
-- carsym *arsym;
-- unsigned int indx;
-- file_ptr last_ar_offset = -1;
-- bfd_boolean needed = FALSE;
-- bfd *element = NULL;
--
-- loop = FALSE;
-- arsyms = bfd_ardata (abfd)->symdefs;
-- arsym_end = arsyms + bfd_ardata (abfd)->symdef_count;
-- for (arsym = arsyms, indx = 0; arsym < arsym_end; arsym++, indx++)
-+ struct bfd_link_hash_entry *h;
-+ struct archive_hash_entry *arh;
-+ struct archive_list *l;
-+
-+ h = *pundef;
-+
-+ /* When a symbol is defined, it is not necessarily removed from
-+ the list. */
-+ if (h->type != bfd_link_hash_undefined
-+ && h->type != bfd_link_hash_common)
- {
-- struct bfd_link_hash_entry *h;
-- struct bfd_link_hash_entry *undefs_tail;
-+ /* Remove this entry from the list, for general cleanliness
-+ and because we are going to look through the list again
-+ if we search any more libraries. We can't remove the
-+ entry if it is the tail, because that would lose any
-+ entries we add to the list later on (it would also cause
-+ us to lose track of whether the symbol has been
-+ referenced). */
-+ if (*pundef != info->hash->undefs_tail)
-+ *pundef = (*pundef)->u.undef.next;
-+ else
-+ pundef = &(*pundef)->u.undef.next;
-+ continue;
-+ }
-
-- if (included[indx])
-- continue;
-- if (needed && arsym->file_offset == last_ar_offset)
-+ /* Look for this symbol in the archive symbol map. */
-+ arh = archive_hash_lookup (&arsym_hash, h->root.string, FALSE, FALSE);
-+ if (arh == NULL)
-+ {
-+ /* If we haven't found the exact symbol we're looking for,
-+ let's look for its import thunk */
-+ if (info->pei386_auto_import)
-+ {
-+ bfd_size_type amt = strlen (h->root.string) + 10;
-+ char *buf = (char *) bfd_malloc (amt);
-+ if (buf == NULL)
-+ return FALSE;
-+
-+ sprintf (buf, "__imp_%s", h->root.string);
-+ arh = archive_hash_lookup (&arsym_hash, buf, FALSE, FALSE);
-+ free(buf);
-+ }
-+ if (arh == NULL)
- {
-- included[indx] = 1;
-+ pundef = &(*pundef)->u.undef.next;
- continue;
- }
-+ }
-+ /* Look at all the objects which define this symbol. */
-+ for (l = arh->defs; l != NULL; l = l->next)
-+ {
-+ bfd *element;
-+ bfd_boolean needed;
-+
-+ /* If the symbol has gotten defined along the way, quit. */
-+ if (h->type != bfd_link_hash_undefined
-+ && h->type != bfd_link_hash_common)
-+ break;
-
-- h = bfd_link_hash_lookup (info->hash, arsym->name,
-- FALSE, FALSE, TRUE);
-+ element = bfd_get_elt_at_index (abfd, l->indx);
-+ if (element == NULL)
-+ goto error_return;
-
-- if (h == NULL
-- && info->pei386_auto_import
-- && CONST_STRNEQ (arsym->name, "__imp_"))
-- h = bfd_link_hash_lookup (info->hash, arsym->name + 6,
-- FALSE, FALSE, TRUE);
-- if (h == NULL)
-+ /* If we've already included this element, or if we've
-+ already checked it on this pass, continue. */
-+ if (element->archive_pass == -1
-+ || element->archive_pass == pass)
- continue;
-
-- if (h->type != bfd_link_hash_undefined
-- && h->type != bfd_link_hash_common)
-+ /* If we can't figure this element out, just ignore it. */
-+ if (! bfd_check_format (element, bfd_object))
- {
-- if (h->type != bfd_link_hash_undefweak)
-- /* Symbol must be defined. Don't check it again. */
-- included[indx] = 1;
-+ element->archive_pass = -1;
- continue;
- }
-
-- if (last_ar_offset != arsym->file_offset)
-- {
-- last_ar_offset = arsym->file_offset;
-- element = _bfd_get_elt_at_filepos (abfd, last_ar_offset);
-- if (element == NULL
-- || !bfd_check_format (element, bfd_object))
-- goto error_return;
-- }
--
-- undefs_tail = info->hash->undefs_tail;
--
- /* CHECKFN will see if this element should be included, and
- go ahead and include it if appropriate. */
-- if (! (*checkfn) (element, info, h, arsym->name, &needed))
-+ if (! (*checkfn) (element, info, &needed))
- goto error_return;
-
-- if (needed)
-+ if (! needed)
-+ element->archive_pass = pass;
-+ else
- {
-- unsigned int mark;
-+ element->archive_pass = -1;
-
-- /* Look backward to mark all symbols from this object file
-- which we have already seen in this pass. */
-- mark = indx;
-- do
-- {
-- included[mark] = 1;
-- if (mark == 0)
-- break;
-- --mark;
-- }
-- while (arsyms[mark].file_offset == last_ar_offset);
--
-- if (undefs_tail != info->hash->undefs_tail)
-- loop = TRUE;
-+ /* Increment the pass count to show that we may need to
-+ recheck object files which were already checked. */
-+ ++pass;
- }
- }
-- } while (loop);
-
-- free (included);
-+ pundef = &(*pundef)->u.undef.next;
-+ }
-+
-+ archive_hash_table_free (&arsym_hash);
-+
-+ /* Save PASS in case we are called again. */
-+ abfd->archive_pass = pass;
-+
- return TRUE;
-
- error_return:
-- free (included);
-+ archive_hash_table_free (&arsym_hash);
- return FALSE;
- }
-
-@@ -1050,14 +1210,12 @@ _bfd_generic_link_add_archive_symbols
- for finding them. */
-
- static bfd_boolean
--generic_link_check_archive_element_no_collect (bfd *abfd,
-+generic_link_check_archive_element_no_collect (
-+ bfd *abfd,
- struct bfd_link_info *info,
-- struct bfd_link_hash_entry *h,
-- const char *name,
- bfd_boolean *pneeded)
- {
-- return generic_link_check_archive_element (abfd, info, h, name, pneeded,
-- FALSE);
-+ return generic_link_check_archive_element (abfd, info, pneeded, FALSE);
- }
-
- /* See if we should include an archive element. This version is used
-@@ -1067,12 +1225,9 @@ generic_link_check_archive_element_no_collect (bfd *abfd,
- static bfd_boolean
- generic_link_check_archive_element_collect (bfd *abfd,
- struct bfd_link_info *info,
-- struct bfd_link_hash_entry *h,
-- const char *name,
- bfd_boolean *pneeded)
- {
-- return generic_link_check_archive_element (abfd, info, h, name, pneeded,
-- TRUE);
-+ return generic_link_check_archive_element (abfd, info, pneeded, TRUE);
- }
-
- /* See if we should include an archive element. Optionally collect
-@@ -1081,8 +1236,6 @@ generic_link_check_archive_element_collect (bfd *abfd,
- static bfd_boolean
- generic_link_check_archive_element (bfd *abfd,
- struct bfd_link_info *info,
-- struct bfd_link_hash_entry *h,
-- const char *name ATTRIBUTE_UNUSED,
- bfd_boolean *pneeded,
- bfd_boolean collect)
- {
-@@ -1098,6 +1251,7 @@ generic_link_check_archive_element (bfd *abfd,
- for (; pp < ppend; pp++)
- {
- asymbol *p;
-+ struct bfd_link_hash_entry *h;
-
- p = *pp;
-
-diff --git a/bfd/pdp11.c b/bfd/pdp11.c
-index 593c5ca..5111a51 100644
---- a/bfd/pdp11.c
-+++ b/bfd/pdp11.c
-@@ -251,7 +251,7 @@ HOWTO( 1, 0, 1, 16, TRUE, 0, complain_overflow_signed,0,"DISP16", TRU
- #define TABLE_SIZE(TABLE) (sizeof(TABLE)/sizeof(TABLE[0]))
-
-
--static bfd_boolean aout_link_check_archive_element (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, const char *, bfd_boolean *);
-+static bfd_boolean aout_link_check_archive_element (bfd *, struct bfd_link_info *, bfd_boolean *);
- static bfd_boolean aout_link_add_object_symbols (bfd *, struct bfd_link_info *);
- static bfd_boolean aout_link_add_symbols (bfd *, struct bfd_link_info *);
- static bfd_boolean aout_link_write_symbols (struct aout_final_link_info *, bfd *);
-@@ -2682,8 +2682,6 @@ aout_link_check_ar_symbols (bfd *abfd,
- static bfd_boolean
- aout_link_check_archive_element (bfd *abfd,
- struct bfd_link_info *info,
-- struct bfd_link_hash_entry *h ATTRIBUTE_UNUSED,
-- const char *name ATTRIBUTE_UNUSED,
- bfd_boolean *pneeded)
- {
- bfd *oldbfd;
-diff --git a/bfd/xcofflink.c b/bfd/xcofflink.c
-index 9522974..dcfd58f 100644
---- a/bfd/xcofflink.c
-+++ b/bfd/xcofflink.c
-@@ -2384,8 +2384,6 @@ xcoff_link_check_ar_symbols (bfd *abfd,
- static bfd_boolean
- xcoff_link_check_archive_element (bfd *abfd,
- struct bfd_link_info *info,
-- struct bfd_link_hash_entry *h ATTRIBUTE_UNUSED,
-- const char *name ATTRIBUTE_UNUSED,
- bfd_boolean *pneeded)
- {
- bfd_boolean keep_syms_p;
-@@ -2465,7 +2463,7 @@ _bfd_xcoff_bfd_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
- bfd_boolean needed;
-
- if (! xcoff_link_check_archive_element (member, info,
-- NULL, NULL, &needed))
-+ &needed))
- return FALSE;
- if (needed)
- member->archive_pass = -1;
diff --git a/projects/binutils/peXXigen.patch b/projects/binutils/peXXigen.patch
deleted file mode 100644
index c2a689a..0000000
--- a/projects/binutils/peXXigen.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From f8e8f1daf12e30d3197b25d6bd10c03d1f932e20 Mon Sep 17 00:00:00 2001
-From: Nick Clifton <nickc(a)redhat.com>
-Date: Tue, 27 Sep 2016 12:08:19 +0100
-Subject: [PATCH] Ensure that the timestamp in PE/COFF headers is always
- initialised.
-
- PR ld/20634
- * peXXigen.c (_bfd_XXi_only_swap_filehdr_out): Put 0 in the
- timestamp field if real time values are not being stored.
----
- bfd/peXXigen.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c
-index c92c1ea..d713d96 100644
---- a/bfd/peXXigen.c
-+++ b/bfd/peXXigen.c
-@@ -879,6 +879,8 @@ _bfd_XXi_only_swap_filehdr_out (bfd * abfd, void * in, void * out)
- /* Only use a real timestamp if the option was chosen. */
- if ((pe_data (abfd)->insert_timestamp))
- H_PUT_32 (abfd, time (0), filehdr_out->f_timdat);
-+ else
-+ H_PUT_32 (abfd, 0, filehdr_out->f_timdat);
-
- PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr,
- filehdr_out->f_symptr);
---
-2.1.4
-
diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build
index b2117c5..4be660d 100644
--- a/projects/mingw-w64/build
+++ b/projects/mingw-w64/build
@@ -22,6 +22,10 @@ cd /var/tmp/build
mkdir gcc
cd gcc
tar xJf $rootdir/gcc-[% c("var/gcc_version") %].tar.xz
+# https://gcc.gnu.org/ml/gcc-patches/2018-06/msg01115.html
+# From gcc commit 494c17dc2bf45b8155fb9a14178ab48f01bc12a8
+# libtool: Sort output of 'find' to enable deterministic builds.
+patch -p1 -d gcc-[% c("var/gcc_version") %] < $rootdir/libtool-sort.patch
# We don't want to link against msvcrt.dll due to bug 9084 and want to use
# pthreads, too, as this is needed for ESR60, at least due to bug 1406542.
[% c("arch") %]-w64-mingw32-g++ -dumpspecs > $distdir/msvcr100.spec
diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config
index b9185f3..19a7a82 100644
--- a/projects/mingw-w64/config
+++ b/projects/mingw-w64/config
@@ -34,3 +34,4 @@ input_files:
sha256sum: 850bf21eafdfe5cd5f6827148184c08c4a0852a37ccf36ce69855334d2c914d4
- name: binutils
project: binutils
+ - filename: libtool-sort.patch
diff --git a/projects/mingw-w64/libtool-sort.patch b/projects/mingw-w64/libtool-sort.patch
new file mode 100644
index 0000000..7c7fa85
--- /dev/null
+++ b/projects/mingw-w64/libtool-sort.patch
@@ -0,0 +1,67 @@
+From 494c17dc2bf45b8155fb9a14178ab48f01bc12a8 Mon Sep 17 00:00:00 2001
+From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Thu, 5 Jul 2018 19:13:45 +0000
+Subject: [PATCH 1/1] * libtool.m4: Sort output of 'find' to enable
+ deterministic builds. * ltmain.sh: Likewise.
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@262451 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ ChangeLog | 5 +++++
+ libtool.m4 | 8 ++++----
+ ltmain.sh | 4 ++--
+ 3 files changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/libtool.m4 b/libtool.m4
+index 24d13f3..940faaa 100644
+--- a/libtool.m4
++++ b/libtool.m4
+@@ -6005,20 +6005,20 @@ if test "$_lt_caught_CXX_error" != yes; then
+ _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
++ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+ _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
++ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+ $RANLIB $oldlib'
+ _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ ;;
+ *) # Version 6 and above use weak symbols
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+diff --git a/ltmain.sh b/ltmain.sh
+index 9503ec8..79f9ba8 100644
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -2917,7 +2917,7 @@ func_extract_archives ()
+ darwin_file=
+ darwin_files=
+ for darwin_file in $darwin_filelist; do
+- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
++ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
+ $LIPO -create -output "$darwin_file" $darwin_files
+ done # $darwin_filelist
+ $RM -rf unfat-$$
+@@ -2932,7 +2932,7 @@ func_extract_archives ()
+ func_extract_an_archive "$my_xdir" "$my_xabs"
+ ;;
+ esac
+- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
++ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
+ done
+
+ func_extract_archives_result="$my_oldobjs"
+--
+2.9.3
+
1
0
16 Jan '19
commit 358b3b15be6c35810b166625c9331d6ef5071bee
Author: Georg Koppen <gk(a)torproject.org>
Date: Mon Jan 14 08:22:40 2019 +0000
Bug 29081: Harden libwinpthread
---
projects/mingw-w64/build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build
index 1e25290..b2117c5 100644
--- a/projects/mingw-w64/build
+++ b/projects/mingw-w64/build
@@ -43,8 +43,8 @@ make install
mkdir -p /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread
cd /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread
/var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-libraries/winpthreads/configure \
- LDFLAGS="-Wl,--no-insert-timestamp" \
- --host=[% c("arch") %]-w64-mingw32 --prefix=$distdir/[% c("arch") %]-w64-mingw32
+ LDFLAGS="-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp" \
+ --host=[% c("arch") %]-w64-mingw32 --prefix=$distdir/[% c("arch") %]-w64-mingw32
make -j[% c("buildconf/num_procs") %]
make install
1
0
[torbutton/master] Bug 28894: Remove Torbutton parts of fix for #20244
by gk＠torproject.org 15 Jan '19
by gk＠torproject.org 15 Jan '19
15 Jan '19
commit 129149cf02c4888f6997fe3396909c8ba2c5edcb
Author: Georg Koppen <gk(a)torproject.org>
Date: Mon Jan 14 18:07:29 2019 +0000
Bug 28894: Remove Torbutton parts of fix for #20244
---
src/chrome.manifest | 1 -
src/chrome/content/privacy-prefs-overlay.xul | 13 -------------
src/chrome/locale/af/torbutton.dtd | 2 --
src/chrome/locale/ak/torbutton.dtd | 2 --
src/chrome/locale/am/torbutton.dtd | 2 --
src/chrome/locale/ar/torbutton.dtd | 6 ------
src/chrome/locale/arn/torbutton.dtd | 2 --
src/chrome/locale/ast/torbutton.dtd | 2 --
src/chrome/locale/az/torbutton.dtd | 2 --
src/chrome/locale/be/torbutton.dtd | 2 --
src/chrome/locale/bg/torbutton.dtd | 2 --
src/chrome/locale/bn-BD/torbutton.dtd | 6 ------
src/chrome/locale/bn-IN/torbutton.dtd | 2 --
src/chrome/locale/bn/torbutton.dtd | 2 --
src/chrome/locale/bo/torbutton.dtd | 2 --
src/chrome/locale/br/torbutton.dtd | 2 --
src/chrome/locale/bs/torbutton.dtd | 2 --
src/chrome/locale/ca/torbutton.dtd | 6 ------
src/chrome/locale/cs/torbutton.dtd | 6 ------
src/chrome/locale/csb/torbutton.dtd | 2 --
src/chrome/locale/cy/torbutton.dtd | 2 --
src/chrome/locale/da/torbutton.dtd | 6 ------
src/chrome/locale/de/torbutton.dtd | 6 ------
src/chrome/locale/dz/torbutton.dtd | 2 --
src/chrome/locale/el/torbutton.dtd | 6 ------
src/chrome/locale/en-US/torbutton.dtd | 6 ------
src/chrome/locale/eo/torbutton.dtd | 2 --
src/chrome/locale/es-AR/torbutton.dtd | 6 ------
src/chrome/locale/es/torbutton.dtd | 6 ------
src/chrome/locale/et/torbutton.dtd | 2 --
src/chrome/locale/eu/torbutton.dtd | 6 ------
src/chrome/locale/fa/torbutton.dtd | 6 ------
src/chrome/locale/fi/torbutton.dtd | 2 --
src/chrome/locale/fil/torbutton.dtd | 2 --
src/chrome/locale/fo/torbutton.dtd | 2 --
src/chrome/locale/fr/torbutton.dtd | 6 ------
src/chrome/locale/fur/torbutton.dtd | 2 --
src/chrome/locale/fy/torbutton.dtd | 2 --
src/chrome/locale/ga/torbutton.dtd | 6 ------
src/chrome/locale/gl/torbutton.dtd | 2 --
src/chrome/locale/gu/torbutton.dtd | 2 --
src/chrome/locale/gun/torbutton.dtd | 2 --
src/chrome/locale/ha/torbutton.dtd | 2 --
src/chrome/locale/he/torbutton.dtd | 6 ------
src/chrome/locale/hi/torbutton.dtd | 2 --
src/chrome/locale/hr/torbutton.dtd | 2 --
src/chrome/locale/ht/torbutton.dtd | 2 --
src/chrome/locale/hu/torbutton.dtd | 6 ------
src/chrome/locale/hy/torbutton.dtd | 2 --
src/chrome/locale/id/torbutton.dtd | 6 ------
src/chrome/locale/is/torbutton.dtd | 6 ------
src/chrome/locale/it/torbutton.dtd | 6 ------
src/chrome/locale/ja/torbutton.dtd | 6 ------
src/chrome/locale/jv/torbutton.dtd | 2 --
src/chrome/locale/ka/torbutton.dtd | 6 ------
src/chrome/locale/km/torbutton.dtd | 2 --
src/chrome/locale/kn/torbutton.dtd | 2 --
src/chrome/locale/ko/torbutton.dtd | 6 ------
src/chrome/locale/ku/torbutton.dtd | 2 --
src/chrome/locale/kw/torbutton.dtd | 2 --
src/chrome/locale/ky/torbutton.dtd | 2 --
src/chrome/locale/lb/torbutton.dtd | 2 --
src/chrome/locale/ln/torbutton.dtd | 2 --
src/chrome/locale/lo/torbutton.dtd | 2 --
src/chrome/locale/lt/torbutton.dtd | 2 --
src/chrome/locale/lv/torbutton.dtd | 2 --
src/chrome/locale/mg/torbutton.dtd | 2 --
src/chrome/locale/mi/torbutton.dtd | 2 --
src/chrome/locale/mk/torbutton.dtd | 2 --
src/chrome/locale/ml/torbutton.dtd | 2 --
src/chrome/locale/mn/torbutton.dtd | 2 --
src/chrome/locale/mr/torbutton.dtd | 2 --
src/chrome/locale/ms/torbutton.dtd | 2 --
src/chrome/locale/mt/torbutton.dtd | 2 --
src/chrome/locale/my/torbutton.dtd | 2 --
src/chrome/locale/nah/torbutton.dtd | 2 --
src/chrome/locale/nap/torbutton.dtd | 2 --
src/chrome/locale/nb/torbutton.dtd | 6 ------
src/chrome/locale/ne/torbutton.dtd | 2 --
src/chrome/locale/nl/torbutton.dtd | 6 ------
src/chrome/locale/nn/torbutton.dtd | 2 --
src/chrome/locale/nso/torbutton.dtd | 2 --
src/chrome/locale/oc/torbutton.dtd | 2 --
src/chrome/locale/or/torbutton.dtd | 2 --
src/chrome/locale/pa/torbutton.dtd | 2 --
src/chrome/locale/pap/torbutton.dtd | 2 --
src/chrome/locale/pl/torbutton.dtd | 6 ------
src/chrome/locale/pms/torbutton.dtd | 2 --
src/chrome/locale/ps/torbutton.dtd | 2 --
src/chrome/locale/pt-BR/torbutton.dtd | 6 ------
src/chrome/locale/pt/torbutton.dtd | 6 ------
src/chrome/locale/ro/torbutton.dtd | 2 --
src/chrome/locale/ru/torbutton.dtd | 6 ------
src/chrome/locale/sco/torbutton.dtd | 2 --
src/chrome/locale/sk/torbutton.dtd | 2 --
src/chrome/locale/sl/torbutton.dtd | 2 --
src/chrome/locale/so/torbutton.dtd | 2 --
src/chrome/locale/son/torbutton.dtd | 2 --
src/chrome/locale/sq/torbutton.dtd | 2 --
src/chrome/locale/sr/torbutton.dtd | 2 --
src/chrome/locale/st/torbutton.dtd | 2 --
src/chrome/locale/su/torbutton.dtd | 2 --
src/chrome/locale/sv/torbutton.dtd | 6 ------
src/chrome/locale/sw/torbutton.dtd | 2 --
src/chrome/locale/ta/torbutton.dtd | 2 --
src/chrome/locale/te/torbutton.dtd | 2 --
src/chrome/locale/tg/torbutton.dtd | 2 --
src/chrome/locale/th/torbutton.dtd | 2 --
src/chrome/locale/ti/torbutton.dtd | 2 --
src/chrome/locale/tk/torbutton.dtd | 2 --
src/chrome/locale/tr/torbutton.dtd | 6 ------
src/chrome/locale/uk/torbutton.dtd | 2 --
src/chrome/locale/ur/torbutton.dtd | 2 --
src/chrome/locale/ve/torbutton.dtd | 2 --
src/chrome/locale/vi/torbutton.dtd | 6 ------
src/chrome/locale/wa/torbutton.dtd | 2 --
src/chrome/locale/wo/torbutton.dtd | 2 --
src/chrome/locale/zh-CN/torbutton.dtd | 6 ------
src/chrome/locale/zh-HK/torbutton.dtd | 2 --
src/chrome/locale/zh-TW/torbutton.dtd | 6 ------
src/chrome/locale/zu/torbutton.dtd | 2 --
src/jar.mn | 1 -
122 files changed, 385 deletions(-)
diff --git a/src/chrome.manifest b/src/chrome.manifest
index 33199ccf..87467217 100644
--- a/src/chrome.manifest
+++ b/src/chrome.manifest
@@ -16,7 +16,6 @@ overlay chrome://browser/content/aboutDialog.xul chrome://torbutton/content/abou
# UI customization
overlay chrome://browser/content/browser.xul chrome://torbutton/content/menu-items-overlay.xul
overlay chrome://browser/content/browser.xul chrome://torbutton/content/menu-overlay.xul
-overlay about:preferences chrome://torbutton/content/privacy-prefs-overlay.xul
overlay chrome://browser/content/browser.xul chrome://torbutton/content/tor-circuit-display.xul
# Strings for the about:tbupdate page
diff --git a/src/chrome/content/privacy-prefs-overlay.xul b/src/chrome/content/privacy-prefs-overlay.xul
deleted file mode 100644
index 952f9b63..00000000
--- a/src/chrome/content/privacy-prefs-overlay.xul
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE page SYSTEM "chrome://torbutton/locale/torbutton.dtd">
-
-<overlay id="privacy-prefs-overlay"
- xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- <checkbox id="thirdpartyIsolateCB"
- label="&torbutton.prefs.restrict_thirdparty;"
- accesskey="&torbutton.prefs.restrict_thirdparty.accesskey;"/>
- <checkbox id="resistFingerprintingCB"
- label="&torbutton.prefs.resist_fingerprinting;"
- accesskey="&torbutton.prefs.resist_fingerprinting.accesskey;"/>
-</overlay>
diff --git a/src/chrome/locale/af/torbutton.dtd b/src/chrome/locale/af/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/af/torbutton.dtd
+++ b/src/chrome/locale/af/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ak/torbutton.dtd b/src/chrome/locale/ak/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/ak/torbutton.dtd
+++ b/src/chrome/locale/ak/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/am/torbutton.dtd b/src/chrome/locale/am/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/am/torbutton.dtd
+++ b/src/chrome/locale/am/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd
index 9bf013ff..baa7e5ff 100644
--- a/src/chrome/locale/ar/torbutton.dtd
+++ b/src/chrome/locale/ar/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "أزÙ٠اÙÙÙ ÙÙ٠استÙ
ر Ù٠اÙØÙ
اÙØ©">
<!ENTITY torbutton.cookiedialog.saveAllCookies "اØÙ
Ù
ÙÙات تعرÙ٠اÙارتؚاط اÙجدÙدة">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ùا تØÙ
Ù
ÙÙات تعرÙ٠اÙارتؚاط اÙجدÙدة">
-<!ENTITY torbutton.prefs.restrict_thirdparty "تÙÙÙد اÙÙCookies اÙخاصة ؚاÙطر٠اÙثاÙØ« Ù ØšÙاÙات اÙتتؚع اÙأخرÙ.">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "Ù">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "اتر٠Ùذا اÙÙ
رؚع Ù
؀؎را ÙÙ
Ùع إساءة استخداÙ
اÙعدÙد Ù
٠خصا؊ص اÙÙ
تصÙØ Ù٠تعÙؚ٠أثÙاء تصÙØÙ ÙÙÙØš. اÙخصا؊ص اÙÙ
عدÙÙØ© ت؎Ù
Ù Ù
سارات اÙÙا؊ÙØ§ØªØ ÙÙÙÙات اÙØšØ«Ø ÙخؚÙ؊ة اÙÙ
تصÙØØ ÙاÙÙعÙØ§ØªØ ÙØ£ÙÙÙÙات اÙÙ
ÙاÙØ¹Ø ÙترÙÙسات استÙثا٠HTTPØ ÙاÙاتصا٠اÙÙ
سؚ٠ؚاÙرÙØ§ØšØ·Ø Ø§ÙتخزÙ٠اÙÙ
ØÙÙØ ÙÙ
سارات اÙÙØ³Ø§ØŠØ·Ø ÙØ·Ùؚات OCSPØ ÙSharedWorkersØ ÙؚطاÙات جÙسات TLS.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "غÙÙر اÙتÙاصÙ٠اÙت٠تÙ
Ùز٠ع٠Ù
ستخدÙ
Ù Ù
تصÙØ ØªÙر اÙآخرÙÙ">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "غ">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "اتر٠Ùذا اÙÙ
رؚع Ù
؀؎را ÙتخÙ٠ع٠Ù
ÙاÙع اÙÙØš اÙأ؎Ùاء اÙت٠تÙ
Ùز٠ع٠غÙرÙØ Ù
ث٠أداء ØاسÙØšÙØ ÙتخطÙØ· ÙÙØØ© اÙÙ
ÙاتÙØØ ÙاÙÙØºØ©Ø ÙÙ
Ùا٠تÙصÙØš اÙÙ
ÙØÙØ§ØªØ ÙÙا؊Ù
Ø© اÙÙ
ÙØÙات اÙÙ
ÙØµØšØ©Ø ÙØاÙØ© اÙØŽØšÙØ©Ø Ùاتجا٠اÙ؎ا؎ة ÙØجÙ
ÙØ§Ø ÙÙ
ستÙÙات اÙتÙرÙØš ÙÙÙ Ù
ÙÙØ¹Ø ÙØ£ÙÙاع اÙÙ
ÙÙات اÙÙ
دعÙÙ
Ø©Ø ÙØ£ÙÙا٠اÙÙ؞اÙ
Ø ÙØ¥Ù
ÙاÙات WebGL.">
<!ENTITY torbutton.prefs.sec_caption "Ù
ستÙ٠اÙØ£Ù
اÙ">
<!ENTITY torbutton.prefs.sec_caption_tooltip "ÙتÙØ Ù٠؎رÙØ· تÙ
رÙر Ù
ستÙ٠اÙØ£Ù
ا٠تعطÙ٠ؚعض Ù
Ù Ù
Ù
Ùزات Ù
تصÙØ٠تجعÙ٠أÙثر عرضة ÙÙاختراÙ.">
<!ENTITY torbutton.prefs.sec_standard_label "عادÙ">
diff --git a/src/chrome/locale/arn/torbutton.dtd b/src/chrome/locale/arn/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/arn/torbutton.dtd
+++ b/src/chrome/locale/arn/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ast/torbutton.dtd b/src/chrome/locale/ast/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/ast/torbutton.dtd
+++ b/src/chrome/locale/ast/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/az/torbutton.dtd b/src/chrome/locale/az/torbutton.dtd
index 85999d7a..5a5f20ca 100644
--- a/src/chrome/locale/az/torbutton.dtd
+++ b/src/chrome/locale/az/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/be/torbutton.dtd b/src/chrome/locale/be/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/be/torbutton.dtd
+++ b/src/chrome/locale/be/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/bg/torbutton.dtd b/src/chrome/locale/bg/torbutton.dtd
index d95c6d58..289efda2 100644
--- a/src/chrome/locale/bg/torbutton.dtd
+++ b/src/chrome/locale/bg/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/bn-BD/torbutton.dtd b/src/chrome/locale/bn-BD/torbutton.dtd
index 201f3111..95ce45e1 100644
--- a/src/chrome/locale/bn-BD/torbutton.dtd
+++ b/src/chrome/locale/bn-BD/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "àŠžàŠ®àŠžà§àŠ€ àŠàŠ¿àŠšà§àŠ€à§ àŠžà§àŠ°àŠà§àŠ·àŠ¿àŠ€ àŠžàŠ°àŠŸàŠš">
<!ENTITY torbutton.cookiedialog.saveAllCookies "àŠšàŠ€à§àŠš àŠà§àŠàŠ¿ àŠžàŠàŠ°àŠà§àŠ·àŠ£ àŠàŠ°à§àŠš">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "àŠšàŠ€à§àŠš àŠà§àŠàŠ¿ àŠ°àŠà§àŠ·àŠŸ àŠàŠ°àŠ¬à§àŠš àŠšàŠŸ">
-<!ENTITY torbutton.prefs.restrict_thirdparty "àŠ€à§àŠ€à§àŠ¯àŠŒ àŠªàŠà§àŠ·à§àŠ° àŠà§àŠàŠ¿àŠ àŠàŠ¬àŠ àŠ
àŠšà§àŠ¯àŠŸàŠšà§àŠ¯ àŠà§àŠ°à§àŠ¯àŠŸàŠàŠ¿àŠ àŠ¡à§àŠàŠŸ àŠšàŠ¿àŠ¯àŠŒàŠšà§àŠ€à§àŠ°àŠ£ àŠàŠ°à§àŠš">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "àŠàŠªàŠšàŠ¿ àŠ¬à§àŠ°àŠŸàŠàŠ àŠàŠ°à§ àŠ¬à§àŠ°àŠŸàŠàŠ àŠ¹àŠ¿àŠžàŠŸàŠ¬à§ àŠ¬àŠ¿àŠàŠ¿àŠšà§àŠš àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ° àŠ¬à§àŠ¶àŠ¿àŠ·à§àŠà§àŠ¯àŠà§àŠ²àŠ¿ àŠ
àŠªàŠ¬à§àŠ¯àŠ¬àŠ¹àŠŸàŠ° àŠàŠ°àŠŸ àŠ¥à§àŠà§ àŠ¬àŠ¿àŠ°àŠ€ àŠ¥àŠŸàŠàŠŸàŠ° àŠàŠšà§àŠ¯ àŠàŠ àŠ¬àŠà§àŠžàŠàŠ¿ àŠà§àŠ àŠàŠ°à§àŠšà¥€ àŠªàŠ°àŠ¿àŠ¬àŠ°à§àŠ€àŠ¿àŠ€ àŠ¬à§àŠ¶àŠ¿àŠ·à§àŠà§àŠ¯àŠà§àŠ²àŠ¿àŠ° àŠ®àŠ§à§àŠ¯à§ àŠ°àŠ¯àŠŒà§àŠà§ àŠ¬à§àŠ²àŠ¬ àŠàŠàŠàŠ°àŠàŠ², àŠ¬à§àŠ°àŠ¡àŠàŠŸàŠžà§àŠ àŠà§àŠ¯àŠŸàŠšà§àŠ², àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ° àŠà§àŠ¯àŠŸàŠ¶, àŠà§àŠàŠ¿àŠ, àŠ«à§àŠ¯àŠŸàŠàŠ¿àŠàŠš, àŠàŠàŠàŠàŠ¿àŠàŠ¿àŠªàŠ¿ àŠ
àŠ¹àŠ¿àŠàŠ¥ àŠ¹à§àŠ¡àŠŸàŠ°, àŠ²àŠ¿àŠàŠ àŠªà§àŠ°àŠ¿àŠàŠšà§àŠàŠž, àŠžà§àŠ¥àŠŸàŠšà§àŠ¯àŠŒ àŠžà§àŠà§àŠ°à§àŠ, àŠ®àŠ¿àŠ¡àŠ¿àŠ¯àŠŒàŠŸàŠžà§àŠ°à§àŠž àŠàŠàŠàŠ°àŠàŠ², àŠàŠžàŠ¿àŠàŠžàŠªàŠ¿ àŠ
àŠšà§àŠ°à§àŠ§, àŠ¶à§àŠ¯àŠŒàŠŸàŠ° àŠàŠ¯àŠŒàŠŸàŠ°à§àŠàŠŸàŠ°à§àŠž, àŠàŠ¬àŠ àŠàŠ¿àŠàŠ²àŠàŠž àŠžà§àŠ¶àŠš àŠàŠ¿àŠà
Š¿àŠà¥€">
-<!ENTITY torbutton.prefs.resist_fingerprinting "àŠ
àŠšà§àŠ¯àŠŸàŠšà§àŠ¯ àŠàŠ° àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ° àŠ¬à§àŠ¯àŠ¬àŠ¹àŠŸàŠ°àŠàŠŸàŠ°à§àŠŠà§àŠ° àŠ¥à§àŠà§ àŠàŠªàŠšàŠ¿ àŠªàŠŸàŠ°à§àŠ¥àŠà§àŠ¯ àŠ¬àŠ¿àŠ¬àŠ°àŠ£ àŠªàŠ°àŠ¿àŠ¬àŠ°à§àŠ€àŠš àŠàŠ°à§àŠš">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "àŠàŠªàŠšàŠŸàŠ° àŠàŠ®à§àŠªàŠ¿àŠàŠàŠŸàŠ°à§àŠ° àŠªàŠŸàŠ°àŠ«àŠ°àŠ®à§àŠ¯àŠŸàŠšà§àŠž, àŠà§àŠ¬à§àŠ°à§àŠ¡ àŠ²à§àŠàŠàŠ, àŠ²à§àŠà§àŠ², àŠàŠšàŠžà§àŠàŠ² àŠàŠ°àŠŸ àŠªà§àŠ²àŠŸàŠàŠàŠšàŠà§àŠ²àŠ¿àŠ° àŠ
àŠ¬àŠžà§àŠ¥àŠŸàŠš, àŠàŠšàŠžà§àŠàŠ² àŠàŠ°àŠŸ àŠªà§àŠ²àŠŸàŠàŠàŠšàŠà§àŠ²àŠ¿àŠ° àŠ€àŠŸàŠ²àŠ¿àŠàŠŸ, àŠàŠªàŠšàŠŸàŠ° àŠšà§àŠàŠàŠ¯àŠŒàŠŸàŠ°à§àŠ àŠžà§àŠ¥àŠ¿àŠ€àŠ¿, àŠžà§àŠà§àŠ°à§àŠš àŠ
àŠàŠ¿àŠàŠ®àŠš, àŠžà§àŠà§àŠ°àŠ¿àŠšà§àŠ° àŠàŠàŠŸàŠ°, àŠžàŠŸàŠàŠ-àŠàŠ° àŠžàŠŸàŠ¥à§ àŠàŠªàŠšàŠŸàŠ° àŠàŠ®à§àŠªàŠ¿àŠàŠàŠŸàŠ°à§àŠ° àŠàŠ®àŠš àŠàŠ¿àŠà§ àŠàŠ¿àŠšàŠ¿àŠž àŠ²à§àŠàŠ¿àŠ¯àŠŒà§ àŠ°àŠŸàŠàŠ€à§ àŠàŠ àŠ¬àŠà§àŠžàŠàŠ¿ àŠà§àŠ àŠàŠ°à§àŠš àŠ¯àŠŸ àŠžàŠŸàŠàŠàŠàŠ¿ àŠàŠªàŠšàŠŸàŠ° àŠàŠŸàŠà§ àŠ
àŠšàŠšà§àŠ¯ àŠ¹àŠ€à§ àŠªàŠŸàŠ°à§à¥€ àŠšàŠ¿àŠ°à§àŠŠàŠ¿àŠ·à§àŠ àŠà§àŠ® àŠžà§àŠ€àŠ°, àŠžàŠ®àŠ°à§àŠ¥àŠ¿àŠ€ àŠ«àŠŸàŠàŠ²à§àŠ° àŠ§àŠ°àŠš, àŠžàŠ¿àŠžà§àŠà§àŠ® àŠ°àŠ àŠàŠ¬àŠ WebGL àŠà§àŠ·àŠ®àŠ€à
ŠŸàŠà§àŠ²àŠ¿à¥€">
<!ENTITY torbutton.prefs.sec_caption "àŠšàŠ¿àŠ°àŠŸàŠªàŠ€à§àŠ€àŠŸàŠ° àŠ®àŠŸàŠ€à§àŠ°àŠŸ">
<!ENTITY torbutton.prefs.sec_caption_tooltip "àŠžàŠ¿àŠàŠ¿àŠàŠ°àŠ¿àŠàŠ¿ àŠžà§àŠ²àŠŸàŠàŠ¡àŠŸàŠ° àŠàŠªàŠšàŠŸàŠà§ àŠšàŠ¿àŠ°à§àŠŠàŠ¿àŠ·à§àŠ àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ°à§àŠ° àŠ¬à§àŠ¶àŠ¿àŠ·à§àŠà§àŠ¯àŠà§àŠ²àŠ¿ àŠ
àŠà§àŠ·àŠ® àŠàŠ°àŠ€à§ àŠŠà§àŠ¯àŠŒ àŠ¯àŠŸ àŠàŠªàŠšàŠŸàŠ° àŠ¬à§àŠ°àŠŸàŠàŠàŠŸàŠ°àŠà§ àŠ¹à§àŠ¯àŠŸàŠàŠ¿àŠàŠ¯àŠŒà§àŠ° àŠªà§àŠ°àŠà§àŠ·à§àŠàŠŸàŠà§àŠ²àŠ¿àŠà§ àŠàŠ°àŠ àŠŠà§àŠ°à§àŠ¬àŠ² àŠàŠ°à§ àŠ€à§àŠ²àŠ€à§ àŠªàŠŸàŠ°à§à¥€">
<!ENTITY torbutton.prefs.sec_standard_label "àŠ®àŠŸàŠš">
diff --git a/src/chrome/locale/bn-IN/torbutton.dtd b/src/chrome/locale/bn-IN/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/bn-IN/torbutton.dtd
+++ b/src/chrome/locale/bn-IN/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/bn/torbutton.dtd b/src/chrome/locale/bn/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/bn/torbutton.dtd
+++ b/src/chrome/locale/bn/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/bo/torbutton.dtd b/src/chrome/locale/bo/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/bo/torbutton.dtd
+++ b/src/chrome/locale/bo/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/br/torbutton.dtd b/src/chrome/locale/br/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/br/torbutton.dtd
+++ b/src/chrome/locale/br/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/bs/torbutton.dtd b/src/chrome/locale/bs/torbutton.dtd
index 09339341..59167eb2 100644
--- a/src/chrome/locale/bs/torbutton.dtd
+++ b/src/chrome/locale/bs/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ca/torbutton.dtd b/src/chrome/locale/ca/torbutton.dtd
index 8bd89b77..0041973e 100644
--- a/src/chrome/locale/ca/torbutton.dtd
+++ b/src/chrome/locale/ca/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Suprimir totes amb protecció">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protegir noves galetes">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "No protegir noves galetes">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restringir galetes de tercers i dades de seguiment">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Marca la casella de selecció per prevenir caracterÃstiques d'abús i seguiments al consultar un web. Les caracterÃstiques modificables son les URL blob, canals de difusió, memòria cau del navegador, galetes, favicons, capçaleres HTTP Auth, enllaços de preconexió, emmagatzemament local, URL mediaSource, sol·licitud OCSP, SharedWorkers i tiquets TLS.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Canviar detalls que distingeixen d'altres usuaris del navegador Tor">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Mantingueu aquesta casella marcada per a ocultar informació sensible sobre vosté a les pà gines web, tal com les capacitats de l'ordinador, la distribució del teclat, la localització dels connectors instal·lats, la llista de connectors, el seu estat de xarxa, la orientació de la pantalla, el seu tamany, el zoom especÃfic per a cada lloc, els tipus de fitxer acceptats, els colors de sistema i les capacitats WebGL.">
<!ENTITY torbutton.prefs.sec_caption "Nivell de seguretat">
<!ENTITY torbutton.prefs.sec_caption_tooltip "El control lliscant de seguretat permet deshabilitar caracterÃstiques del navegador que poden permetre vulnerabilitats en atemptats de furoners.">
<!ENTITY torbutton.prefs.sec_standard_label "Està ndard">
diff --git a/src/chrome/locale/cs/torbutton.dtd b/src/chrome/locale/cs/torbutton.dtd
index 825fa309..239dbc2f 100644
--- a/src/chrome/locale/cs/torbutton.dtd
+++ b/src/chrome/locale/cs/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Odstranit vÅ¡echny nechránÄné">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Chránit nové cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "PÅestat chránit nové cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Omezit cookies tÅetÃch stran a dalÅ¡Ã sledovacà data">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "O">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Ponechte toto pole zaÅ¡krtnuté pro ochranu pÅed zneuÅŸitÃm nÄkterÃœch funkcà prohlÃÅŸeÄe k sledovánà vaÅ¡eho prohlÃÅŸenà webu. ZneuÅŸitelné funkce zahrnujà blob URL adresy, vysÃlacà kanály, mezipamÄÅ¥ prohlÃÅŸeÄe, cookies, favicony, autorizaÄnà hlaviÄky HTTP, pÅednaÄÃtánà odkazů, localStorage, URL adresy mediaSource, OCSP dotazy, SharedWorkers a tickety TLS relacÃ.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "ZmÄnit podrobnosti, které vás odliÅ¡ujà od ostatnÃch uÅŸivatelů prohlÃÅŸeÄe Tor.">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Ponechte toto pole zaÅ¡krtnuté, abyste pÅed webovÃœmi stránkami skryli unikátnà informace, které vás mohou identifikovat, napÅÃklad vÃœkon vaÅ¡eho poÄÃtaÄe, rozloÅŸenà klávesnice, jazyk, umÃstÄnà nainstalovanÃœch zásuvnÃœch modulů a jejich seznam, stav vaÅ¡Ã sÃtÄ, otoÄenà obrazovky, velikost obrazovky, úrovnÄ pÅiblÃÅŸenà pro jednotlivé stránky, podporované typy souborů, systémové barvy a podporované funkce WebGL.">
<!ENTITY torbutton.prefs.sec_caption "ÃroveÅ zabezpeÄenÃ">
<!ENTITY torbutton.prefs.sec_caption_tooltip "ÃrovnÄ zabezpeÄenà vám umoÅŸÅujà vypnout nÄkteré funkce, kvůli kterÃœm můşe bÃœt váš prohlÃÅŸeÄ vÃce náchylnÃœ k hackerskÃœm útokům.">
<!ENTITY torbutton.prefs.sec_standard_label "StandardnÃ">
diff --git a/src/chrome/locale/csb/torbutton.dtd b/src/chrome/locale/csb/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/csb/torbutton.dtd
+++ b/src/chrome/locale/csb/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/cy/torbutton.dtd b/src/chrome/locale/cy/torbutton.dtd
index e3a35007..84b229b1 100644
--- a/src/chrome/locale/cy/torbutton.dtd
+++ b/src/chrome/locale/cy/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd
index f0be1e85..e32001d1 100644
--- a/src/chrome/locale/da/torbutton.dtd
+++ b/src/chrome/locale/da/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Fjern alle pånÊr beskyttede">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Beskyt nye cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Beskyt ikke nye cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "BegrÊns tredjeparts-cookies og andre registreringsdata">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "B">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Lad denne boks vÊre tilvalgt for at forhindre diverse browserfunktionalitet i at blive misbrugt til at spore dig efterhånden som du sÞger på webbet.. Modificerede funktionaliteter inkluderer blob-URL'er, broadcast-kanaler, browserens mellemlager, cookies, favicon'er, HTTP Auth-headere, link preconnects, localStorage, mediaSource-URL'er, OCSP-anmodninger, SharedWorkers og TLS session tickets.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Tilpas detaljer som adskiller dig fra andre Tor Browser-brugere">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Lad denne boks vÊre valgt til for at skjule ting fra websteder som er unikke for dig, inklusiv din computerydelse, tastaturlayout, sprog, placeringen af installerede plugins, listen af installerede plugins, din netvÊrksstatus, skÊrmorientering, skÊrmstÞrrelse, stedspecifikke zoomniveauer, understÞttede filtyper, systemfarver og WebGL-formåenheder.">
<!ENTITY torbutton.prefs.sec_caption "Sikkerhedsniveau">
<!ENTITY torbutton.prefs.sec_caption_tooltip "Sikkerhedsskyderen giver dig mulighed for at deaktivere bestemte browserfunktionaliteter som kan gÞre din browser sårbar overfor forsÞg på hacking.">
<!ENTITY torbutton.prefs.sec_standard_label "Standard">
diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd
index ccc834b3..d155a4ef 100644
--- a/src/chrome/locale/de/torbutton.dtd
+++ b/src/chrome/locale/de/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Alle auÃer den geschÃŒtzten Cookies entfernen">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Neue Cookies schÃŒtzen">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Neue Cookies nicht schÃŒtzen">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Cookies von Drittanbietern und andere Ãberwachungsdaten einschrÀnken">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "E">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Lasse dieses Feld ausgewÀhlt, um zu verhindern, dass verschiedene Browserfunktionen ausgenutzt werden, um dein Surfverhalten nachzuverfolgen. Die verÀnderten Funktionen betreffen: BLOB-URLs, Rundruf-KanÀle, den Browser-Puffer, Cookies, Favicons, HTTP-Authentifizierungs-Kopfdaten, VerknÌpfungs-Vorverbindungen, den lokalen Speicher, URLs von Medienquellen, OCSP-Anfragen, gemeinsame JavaScript-Instanzen und Tickets von TLS-Sitzungen.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Details Àndern, die dich von anderen Tor-Browser-Benutzern unterscheiden">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Lasse dieses Feld ausgewÀhlt, um bestimmte einzigartige Informationen deines Systems vor Webportalen zu verbergen, wie die Rechnerleistung, Tastaturbelegung, das Sprachprofil, den Installationsort von Erweiterungen, die Liste der installierten Erweiterungen, deinen Netzwerkstatus, die Bildschirmausrichtung, BildschirmgröÃe, seitenspezifische VergröÃerungseinstellungen, unterstÃŒtzte Dateitypen, Farbschemata und WebGL-FÀhigkeiten.">
<!ENTITY torbutton.prefs.sec_caption "Sicherheitsstufe">
<!ENTITY torbutton.prefs.sec_caption_tooltip "Mit dem Sicherheitsschieberegler kannst du bestimmte Browserfunktionen, die deinen Browser fÌr mögliche Attacken anfÀlliger machen, deaktivieren.">
<!ENTITY torbutton.prefs.sec_standard_label "Standard
diff --git a/src/chrome/locale/dz/torbutton.dtd b/src/chrome/locale/dz/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/dz/torbutton.dtd
+++ b/src/chrome/locale/dz/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/el/torbutton.dtd b/src/chrome/locale/el/torbutton.dtd
index 96c81d34..c2fe7b3d 100644
--- a/src/chrome/locale/el/torbutton.dtd
+++ b/src/chrome/locale/el/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "ÎÏαίÏεÏη ÏλÏÎœ εκÏÏÏ ÏÏÎœ ÏÏοÏÏαÏεÏ
ÎŒÎÎœÏÎœ">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Î ÏοÏÏαÏία ÎœÎÏÎœ Cookie">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Îα Îη γίΜεÏαι Î ÏοÏÏαÏία ÎÎÏÎœ Cookie">
-<!ENTITY torbutton.prefs.restrict_thirdparty "ΠεÏιοÏιÏÎŒÎ¿Ï ÏÏÎœ cookies ÏÏίÏÏÎœ και αλλÏÎœ ΎεΎοΌεΜÏÎœ ÏαÏακολοÏ
ΞηÏηÏ">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "ÎÏιλÎΟÏε αÏ
ÏÏ Ïο κοÏ
Ïάκι για Μα αÏοÏÏγεÏε ΎιάÏοÏÎµÏ Ï
ÏηÏεÏÎ¯ÎµÏ browser Μα εÏιÏεΞοÏÎœ για Μα ÏÎ±Ï ÎµÎœÏοÏίÏοÏ
Îœ καÏά ÏηΜ ÏεÏιήγηÏή ÏÎ±Ï ÏÏο ΎιαΎίκÏÏ
ο. ΀ÏοÏοÏοιηΌÎÎœÎµÏ Ï
ÏηÏεÏÎ¯ÎµÏ ÏεÏιλαΌβάΜοÏ
Îœ blob URLs, καΜάλια ÏÏοβολήÏ, ΌΜήΌη cache, cookies, ÏÏ
ÎœÏοΌεÏÏÎµÎ¹Ï Î¹ÏÏοÏελίΎÏÎœ, ÏελιΎοΎείκÏÎµÏ ÏαÏ
ÏοÏοίηÏÎ·Ï HTTP, ÏÏοÏÏ
ΜΎÎÏÎµÎ¹Ï ÏÏ
ΜΎÎÏÎŒÏÎœ, ÏοÏική αÏοΞήκεÏ
Ïη, URLs ÏηγÏÎœ ÎŒÎÏÏÎœ, αιÏήΌαÏα OCSP, SharedWorkers και ειÏιÏήÏια λειÏοÏ
ÏÎ³Î¯Î±Ï TLS.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "ÎλλάΟÏε ÏÎ¹Ï Î»ÎµÏÏοΌÎÏÎµÎ¹ÎµÏ ÏοÏ
ÏÎ±Ï ÎŽÎ¹Î±ÎºÏίΜοÏ
Îœ αÏÏ Î¬Î»Î»Î¿Ï
Ï ÏÏήÏÏÎµÏ ÏοÏ
Tor Browser ">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "ÎιαÏηÏήÏÏε αÏ
ÏÏ Ïο κοÏ
Ïί εÏιλεγΌÎΜο για Μα κÏÏÏεÏε αÏÏ ÏοÏ
Ï Î¹ÏÏοÏÏÏοÏ
Ï ÏÏάγΌαÏα ÏοÏ
Ξα ÎŒÏοÏοÏÏαΜ Μα είΜαι ΌοΜαΎικά για εÏάÏ, ÏÏ
ÎŒÏεÏιλαΌβαΜοΌÎÎœÏÎœ ÏÎ·Ï Î±ÏÏΎοÏÎ·Ï ÏοÏ
Ï
ÏολογιÏÏή, ÏÎ·Ï ÎŽÎ¹Î¬ÏÎ±ÎŸÎ·Ï ÏοÏ
ÏληκÏÏολογίοÏ
, ÏÎ·Ï Î³Î»ÏÏÏαÏ, ÏÎ·Ï ÏοÏοΞεÏÎ¯Î±Ï ÏÏÎœ εγκαÏεÏÏηΌÎÎœÏÎœ ÏÏοÏΞÎÏÏÎœ, ÏÎ·Ï ÎºÎ±ÏάÏÏαÏÎ·Ï ÏοÏ
ΎικÏÏοÏ
, ÏοÏ
ÏÏοÏαΜαÏολιÏÎŒÎ¿Ï ÏÎ·Ï Î¿ÎžÏΜηÏ, ÏοÏ
ΌεγÎΞοÏ
Ï ÏÎ·Ï Î¿ÎžÏΜηÏ, ÏÏÎœ εÏιÏÎÎŽÏÎœ zoom αΜά site, ÏÏÎœ Ï
ÏοÏÏηÏιζÏΌεΜÏÎœ ÏÏÏÏÎœ αÏÏείÏÎœ, ÏÏÎœ ÏÏÏΌάÏÏÎœ ÏοÏ
ÏÏ
ÏÏήΌαÏÎ¿Ï ÎºÎ±Î¹ ÏÏÎœ ÎŽÏ
ΜαÏοÏήÏÏÎœ WebGL.">
<!ENTITY torbutton.prefs.sec_caption "ÎÏίÏεΎο αÏÏάλειαÏ">
<!ENTITY torbutton.prefs.sec_caption_tooltip "΀ο Slider ÎÏÏÎ¬Î»ÎµÎ¹Î±Ï ÏÎ±Ï Î±ÏήΜει Μα αÏεΜεÏγοÏοιήÏεÏε οÏιÏÎŒÎΜα ÏαÏακÏηÏιÏÏικά ÏοÏ
ÏÏ
λλοΌεÏÏηÏή ÏοÏ
ÎŒÏοÏεί Μα ÏοΜ κάΜοÏ
Îœ Ïιο εÏ
άλÏÏο Ïε ÏÏοÏÏÎ¬ÎžÎµÎ¹ÎµÏ hacking.">
<!ENTITY torbutton.prefs.sec_standard_label "ÎαÏικά">
diff --git a/src/chrome/locale/en-US/torbutton.dtd b/src/chrome/locale/en-US/torbutton.dtd
index a0ef5f98..1a299af9 100644
--- a/src/chrome/locale/en-US/torbutton.dtd
+++ b/src/chrome/locale/en-US/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
<!ENTITY torbutton.prefs.sec_caption "Security Level">
<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
<!ENTITY torbutton.prefs.sec_standard_label "Standard">
diff --git a/src/chrome/locale/eo/torbutton.dtd b/src/chrome/locale/eo/torbutton.dtd
index e10afbb9..8dd75e5c 100644
--- a/src/chrome/locale/eo/torbutton.dtd
+++ b/src/chrome/locale/eo/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/es-AR/torbutton.dtd b/src/chrome/locale/es-AR/torbutton.dtd
index 24af2fb8..d58dfb56 100644
--- a/src/chrome/locale/es-AR/torbutton.dtd
+++ b/src/chrome/locale/es-AR/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Eliminar todas salvo las protegidas ">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger nuevas Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "No proteger nuevas Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restringir cookies de terceros y otros datos de rastreo">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Mantené esta casilla chequeada para prevenir varias caracterÃsticas del navegador de ser abusadas para rastrearte a medida que navegás la web. CaracterÃsticas modificadas incluyen URLs tipo blob, canales de difusión, el caché del navegador, cookies, iconos favoritos, encabezados HTTP Auth, vÃnculos de preconexión, URLs localStorage o mediaSource, llamadas OCSP, SharedWorkers, y tiquets de sesión TLS.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Variar los detalles que te distinguen de otros usuarios del Navegador Tor">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "H">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Mantené ésta casilla chequeada para ocultar de los sitios web cosas que pudieran ser únicas acerca tuyo, incluyendo el rendimiento de tu computadora, distribución de teclado, configuración regional, localización de complementos instalados, lista de complementos instalados, estado de red, orientación de la pantalla, tamaño de la misma, niveles de zoom especÃficos por sitio, tipos de archivo soportados, colores del sistema y capacidades WebGL.">
<!ENTITY torbutton.prefs.sec_caption "Nivel de seguridad">
<!ENTITY torbutton.prefs.sec_caption_tooltip "La regla deslizante de Seguridad te deja deshabilitar ciertas caracterÃsticas del navegador que pueden hacerlo más vulnerable a intentos de apropiación.">
<!ENTITY torbutton.prefs.sec_standard_label "Estándar">
diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd
index 465fea87..2a95e0b7 100644
--- a/src/chrome/locale/es/torbutton.dtd
+++ b/src/chrome/locale/es/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Eliminar todas excepto las protegidas">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger las nuevas cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "No proteger las nuevas cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restringir cookies de terceros y otros datos de seguimiento">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Mantén marcada esta casilla para evitar que diversas caracterÃsticas del navegador se puedan usar para rastrear tu navegación por la web. Las caracterÃsticas modificadas incluyen URLs blob (a objetos binarios internos), BroadcastChannel (comunicación interna dentro del mismo origen), caché del navegador, cookies, favicons, cabeceras Auth de HTTP (autentificación básica), preconexiones de enlaces, objetos localStorage (almacenamiento local para aplicaciones web), URLs de objetos MediaSource (audiovisuales), peticiones OCSP (estado de certificados), SharedWorkers (subprocesos compartidos), y tickets de sesión TLS.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Cambiar los detalles que te distinguen de otros usuarios del Navegador Tor">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "H">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Mantenga esta casilla marcada para ocultar cosas a los sitios web que podrÃan ser únicas acerca de usted, incluyendo el rendimiento de su equipo, plano de teclado, localización, lista y ubicacion de complementos instalados, estado de su red, orientación de pantalla, tamaño de pantalla, niveles de zoom especÃfico del sitio, tipos de fichero soportados, colores del sistema, y capacidades WebGL. ">
<!ENTITY torbutton.prefs.sec_caption "Nivel de seguridad">
<!ENTITY torbutton.prefs.sec_caption_tooltip "El control deslizante del nivel de seguridad te permite deshabilitar ciertas caracterÃsticas del navegador que pueden hacerlo más vulnerable a tentativas de hackeo.">
<!ENTITY torbutton.prefs.sec_standard_label "Estándar">
diff --git a/src/chrome/locale/et/torbutton.dtd b/src/chrome/locale/et/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/et/torbutton.dtd
+++ b/src/chrome/locale/et/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd
index f1b9409b..ca42906b 100644
--- a/src/chrome/locale/eu/torbutton.dtd
+++ b/src/chrome/locale/eu/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Denak kendu babestutakoak izan ezik">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Cookie berriak babestu">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ez babestu cookie berririk">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Hirugarrenen cookie-ak eta beste jarraipen datuak murriztu">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Zu beste Tor Browser erabiltzaileengandik nabarmentzen zaituzten xehetasunak aldatu">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
<!ENTITY torbutton.prefs.sec_caption "Segurtasun maila">
<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
<!ENTITY torbutton.prefs.sec_standard_label "Estandarra">
diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd
index 6c6d1120..49385ee1 100644
--- a/src/chrome/locale/fa/torbutton.dtd
+++ b/src/chrome/locale/fa/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Øذ٠تÙ
اÙ
Ú©ÙÙÚÚ©âÙØ§Û ØÙا؞ت Ù؎دÙ">
<!ENTITY torbutton.cookiedialog.saveAllCookies "ØÙا؞ت از Ú©ÙÙÚÚ©âÙØ§Û Ø¬Ø¯Ùد">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "عدÙ
ØÙا؞ت از Ú©ÙÙÚÚ©âÙØ§Û Ø¬Ø¯Ùد">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Ù
ØدÙدâÙرد٠ÙÙÙÙâÙا٠طر٠سÙÙ
٠دادÙâÙا٠ٟÙگرد٠دÙگر">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "اÛ٠جعؚ٠را Ùگ٠دارÛد تا از استÙاد٠از ÙÛÚÚ¯ÛâÙØ§Û Ù
ختÙÙ Ù
رÙرگر ØšØ±Ø§Û Ø±Ø¯ÛØ§ØšÛ ØŽÙ
ا در ÙÙگاÙ
Ù
رÙر ÙØš جÙÙÚ¯ÛØ±Û ØŽÙد. ÙÛÚÚ¯Û ÙØ§Û Ø§ØµÙØ§Ø ØŽØ¯Ù ØŽØ§Ù
Ù: آدرسâÙØ§Û Ø¢ÙÙدÙ, broadcast channels, Ú©ØŽ Ù
رÙرگر, Ú©ÙÚ©ÛâÙا, ÙاÙÛÚ©Ù, HTTP Auth headers, ÙŸÛÙÙدÙاpreconnects, ØاÙØžÙ Ù
ØÙÛ, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "تغÙÙرداد٠جز؊Ùات٠ÙÙ ØŽÙ
ارا از Ùارؚرا٠دÙگر تÙر تÙ
ÙزÙ
ÙâÙÙد">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "اÛÙ Ø¬Ø¹ØšÙ ØšØ±Ø§Û ÙŸÙÙا٠کرد٠ÚÛزÙاÛÛ Ø§Ø² ÙØš ساÛتâÙاÛÛ Ú©Ù Ù
ÛâتÙاÙد Ù
ÙØصر ØšÙ ØŽÙ
ا ØšØ§ØŽØ¯Ø Ø§Ø² جÙ
Ù٠کاراÛÛ Ø±Ø§ÛاÙÙØ Ø·Ø±Ø ØšÙØ¯Û ØµÙØÙ Ú©ÙÛØ¯Ø Ù
کاÙØ Ù
Ø٠اÙزÙÙÙâÙØ§Û Ùصؚ ؎دÙØ ÙÛست اÙزÙÙÙâÙØ§Û Ùصؚ ؎دÙØ ÙضعÛت ØŽØšÚ©Ù ØŽÙ
Ø§Ø Ø¬Ùت صÙØÙ ÙÙ
اÛØŽØ Ø§Ùداز٠صÙØÙØ Ø³Ø·ÙØ Ø²ÙÙ
Ø®Ø§ØµØ Ø§ÙÙاع ÙاÛ٠ٟ؎تÛؚاÙÛ ØŽØ¯ÙØ Ø±ÙÚ¯ سÛستÙ
Ù ÙاؚÙÛتâÙØ§Û WebGL Ùگ٠دارÛد.">
<!ENTITY torbutton.prefs.sec_caption "Ø³Ø·Ø Ø§Ù
ÙÛت">
<!ENTITY torbutton.prefs.sec_caption_tooltip "ÙÙار ÙغزÙد٠اÙ
ÙÛØªÛ ØšÙ ØŽÙ
ا اجاز٠Ù
ÛâدÙد Ú©Ù Ù
؎خصÙâÙØ§Û Ø®Ø§Øµ Ù
رÙرگر را غÛرÙعا٠کÙÛد Ú©Ù Ù
Ù
ک٠است Ù
رÙرگر ØŽÙ
ا را در ؚراؚر تÙا؎âÙØ§Û ÙÚ© آسÛØšâٟذÛر سازد.">
<!ENTITY torbutton.prefs.sec_standard_label "استاÙدارد">
diff --git a/src/chrome/locale/fi/torbutton.dtd b/src/chrome/locale/fi/torbutton.dtd
index 40475aeb..136cca34 100644
--- a/src/chrome/locale/fi/torbutton.dtd
+++ b/src/chrome/locale/fi/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Poista kaikki paitsi suojatut">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Suojaa uudet evÀsteet">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ÃlÀ suojaa uusia evÀsteitÀ">
-<!ENTITY torbutton.prefs.restrict_thirdparty "EstÀ kolmannen osapuolen evÀsteet ja muut seurantatiedot">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Muuta lisÀtietoja, jotka erottavat sinut muista Tor Browser -kÀyttÀjistÀ">
diff --git a/src/chrome/locale/fil/torbutton.dtd b/src/chrome/locale/fil/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/fil/torbutton.dtd
+++ b/src/chrome/locale/fil/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/fo/torbutton.dtd b/src/chrome/locale/fo/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/fo/torbutton.dtd
+++ b/src/chrome/locale/fo/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd
index 65b9e7d2..294c2f9f 100644
--- a/src/chrome/locale/fr/torbutton.dtd
+++ b/src/chrome/locale/fr/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Enlever tous les fichiers témoins non protégés">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protéger les nouveaux fichiers témoins">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne pas protéger les nouveaux fichiers témoins">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Limiter les fichiers témoins tiers et les autres données de suivi à la trace">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "L">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Gardez cette case cochée pour empêcher que diverses fonctions du navigateur soient utilisées pour vous suivre à la trace quand vous surfez sur le Web. Les fonctions modifiées incluent les URL de grands objets binaires, les canaux de diffusion, le cache du navigateur, les fichiers fichiers témoins, les favoricÎnes, les en-têtes Auth HTTP, les préconnexions de liens, localStorage, les URL de sources de médias, les requêtes OCSP, les travailleurs Web SharedWorker, et les billets de session TLS.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Modifier les détails qui vous distingue dâautres utilisateurs du Navigateur Tor">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Gardez cette case cochée pour cacher aux sites Web certaines choses qui pourraient être uniques à votre sujet, incluant les performances de votre ordinateur, lâagencement du clavier, les paramÚtres de langue, lâemplacement des greffons installés, la liste des greffons installés, lâétat de votre réseau, lâorientation de lâécran, la taille de lâécran, les niveaux de zoom particuliers aux sites, les types de fichiers pris en charge, les couleurs systÚme et les capacités WebGL.">
<!ENTITY torbutton.prefs.sec_caption "Niveau de sécurité">
<!ENTITY torbutton.prefs.sec_caption_tooltip "Le curseur de sécurité vous permet de désactiver certaines fonctions du navigateur qui pourraient le rendre plus vulnérable aux tentatives de piratage.">
<!ENTITY torbutton.prefs.sec_standard_label "Normal">
diff --git a/src/chrome/locale/fur/torbutton.dtd b/src/chrome/locale/fur/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/fur/torbutton.dtd
+++ b/src/chrome/locale/fur/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/fy/torbutton.dtd b/src/chrome/locale/fy/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/fy/torbutton.dtd
+++ b/src/chrome/locale/fy/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ga/torbutton.dtd b/src/chrome/locale/ga/torbutton.dtd
index 26c3f555..8738ae94 100644
--- a/src/chrome/locale/ga/torbutton.dtd
+++ b/src/chrome/locale/ga/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Scrios iad nach bhfuil caomhnaithe">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Caomhnaigh Fianáin Nua">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ná Caomhnaigh Fianáin Nua">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Cuir srian le fianáin trÃú páirtà agus le sonraà lorgaireachta eile">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Coinnigh tic sa bhosca seo chun cosc a chur ar ghnéithe éagsúla sa bhrabhsálaà a mbaintear mÃ-úsáid astu chun do ghnÃomhaÃocht ar an nGréasán a lorg. I measc na ngnéithe seo: blob-URLanna, cainéil chraolta, taisce an bhrabhsálaÃ, fianáin, deilbhÃnà suÃmh, ceanntásca HTTP Auth, réamhcheangal nascanna, stóras áitiúil, URLanna mediaSource, iarratais OCSP, Oibrithe Roinnte, agus ticéid seisiún TLS. ">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Athraigh na mionsonraà a dhéanann idirdhealú ó úsáideoirà Tor eile">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "H">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Coinnigh tic sa bhosca seo chun sonraà a bhaineann leatsa go pearsanta a chur i bhfolach ó shuÃmh Ghréasáin, mar shampla luas do rÃomhaire, leagan amach do mhéarchláir, an logchaighdeán, an áit ina bhfuil forlÃontáin suiteáilte, na forlÃontáin shuiteáilte féin, stádas do lÃonra, treoshuÃomh an scáileáin, méid an scáileáin, leibhéil zúmála ar shuÃmh ar leith, cineálacha comhaid a dtacaÃonn do bhrabhsálaà leo, dathanna an chórais, agus acmhainnà WebGL.">
<!ENTITY torbutton.prefs.sec_caption "Leibhéal Slándála">
<!ENTITY torbutton.prefs.sec_caption_tooltip "Ligeann an Sleamhnán Slándála duit gnéithe áirithe sa bhrabhsálaà a dhÃchumasú nuair is féidir le bradaà iad a úsáid chun ionsaà a dhéanamh ort.">
<!ENTITY torbutton.prefs.sec_standard_label "Gnáthshlándáil">
diff --git a/src/chrome/locale/gl/torbutton.dtd b/src/chrome/locale/gl/torbutton.dtd
index a01b1b08..fae2b37a 100644
--- a/src/chrome/locale/gl/torbutton.dtd
+++ b/src/chrome/locale/gl/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/gu/torbutton.dtd b/src/chrome/locale/gu/torbutton.dtd
index c2285164..32adbee7 100644
--- a/src/chrome/locale/gu/torbutton.dtd
+++ b/src/chrome/locale/gu/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/gun/torbutton.dtd b/src/chrome/locale/gun/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/gun/torbutton.dtd
+++ b/src/chrome/locale/gun/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ha/torbutton.dtd b/src/chrome/locale/ha/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/ha/torbutton.dtd
+++ b/src/chrome/locale/ha/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/he/torbutton.dtd b/src/chrome/locale/he/torbutton.dtd
index 5595b01f..c5373e36 100644
--- a/src/chrome/locale/he/torbutton.dtd
+++ b/src/chrome/locale/he/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "×סך ××× ×××× ×××× ××">
<!ENTITY torbutton.cookiedialog.saveAllCookies "××× ×¢× ×¢××××ת ××ש×ת">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "×× ×ª×× ×¢× ×¢××××ת ××ש×ת">
-<!ENTITY torbutton.prefs.restrict_thirdparty "×××× ×¢××××ת ××Š× ×©×××©× ×× ×ª×× × ××¢×§× ××ך××">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "×ש×ך ת××× ×× ×ס××× ×ª ××× ××× ××¢ ×ת××× ×ת ××€××€× ×ס××××ת ××××ת ×× ×׊××ת ××× ××תך ×××ª× ××¢××× ×××ש ×ךשת. ת××× ×ת ש××©×ª× × ×××××ת ×ת×××ת ××ש, עך××Š× ×©×××ך, ××××× ×××€××€×, ×¢××××ת, ׊××××ת ×××¢××€××, ××תך×ת ××××ת HTTP, ק×× ××××ך×× ×©× ×§×ש×ך××, ××ס×× ×ק×××, ×ת×××ת ××ס×× ××××, ×קש×ת OCSP, ×¢××××× ×ש×ת׀×× ××ך××ס×× ×©× ×©×× TLS.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "×©× × ×€×š××× ×××××××× ××× × ×××× ×תך ×שת××©× ××€××€× Tor">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "×ש×ך ת××× ×× ×ס××× ×ª ××× ××סת×ך ××ך×× ××תך×× ×©×××××× ××××ת ××××××× ×××××, ×××× ××׊××¢× ××××©× ×©××, ××¢×š× ×ק××ת, ××××ך, ××ק×× ××תקע×× ×××ª×§× ××, ךש××ת ××תקע×× ××××ª×§× ××, ×××Š× ×ךשת ש××, ××××× ×ת ×ס×, ×××× ×ס×, ך×ת ת׊××× ××× ×תך, ס××× ×§×××¥ × ×ª××××, ׊××¢× ×עך×ת ××××××ת WebGL.">
<!ENTITY torbutton.prefs.sec_caption "ך×ת ×××××">
<!ENTITY torbutton.prefs.sec_caption_tooltip "××××× ×××××× × ××ª× ×× ××ש××ת ת××× ×ת ××€××€× ×ס××××ת ×שך ×¢××××ת ×עש×ת ×ת ×××€××€× ×©×× ××תך ×€×××¢ ×× ×¡××× ×ת ×€×׊××.">
<!ENTITY torbutton.prefs.sec_standard_label "×ª×§× ×">
diff --git a/src/chrome/locale/hi/torbutton.dtd b/src/chrome/locale/hi/torbutton.dtd
index 924a6e25..710b298e 100644
--- a/src/chrome/locale/hi/torbutton.dtd
+++ b/src/chrome/locale/hi/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/hr/torbutton.dtd b/src/chrome/locale/hr/torbutton.dtd
index 2cea64cc..67d9f181 100644
--- a/src/chrome/locale/hr/torbutton.dtd
+++ b/src/chrome/locale/hr/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ht/torbutton.dtd b/src/chrome/locale/ht/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/ht/torbutton.dtd
+++ b/src/chrome/locale/ht/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/hu/torbutton.dtd b/src/chrome/locale/hu/torbutton.dtd
index ecab5ecf..19dd1d72 100644
--- a/src/chrome/locale/hu/torbutton.dtd
+++ b/src/chrome/locale/hu/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "A védett kivételével az összes törlése">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Védje az új sÌtiket">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne védje az új sÌtiket">
-<!ENTITY torbutton.prefs.restrict_thirdparty "A harmadik féltÅl származó sÃŒtik és nyomkövetési adatok korlátozása">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Hagyja ezt a gombot bejelölve, hogy megakadályozza, hogy kÃŒlönbözÅ böngészÅ lehetÅségek eltérÃtésre kerÃŒlhessenek a webes nyomon követhetÅsége érdekében. A módosÃtott szolgáltatások többek között, blob URL, broadcast csatornák, böngészÅ cache, sÃŒtik, favikonok, HTTP Auth fejlécek, link elÅcsatlakozások, localStorage, mediaSource URL-ek, OCSP kérések, SharedWorkers-ek, és TLS session ticketek.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Változtassa meg a részleteket, amik megkÌlönböztetik a többi Tor Browser felhasználótól">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Hagyja ezt a gombot bejelölve, hogy elrejtsen dolgokat weboldalak elÅl, amik egyedivé tehetik, mint elem állapot, számÃtógép teljesÃtmény, billentyűzet kiosztás, hely, a telepÃtett pluginek helye, a telepÃtett pluginek listája, hálózati állapota, képernyÅ irányÃtottsága, oldal specifikus nagyÃtás szintek, támogatott fájltÃpusok, rendszerszÃnek, és WebGL képességek,">
<!ENTITY torbutton.prefs.sec_caption "Biztonsági szint">
<!ENTITY torbutton.prefs.sec_caption_tooltip "A Biztonsági Csúszóka lehetÅvé tesz, hogy kikapcsoljon olyan böngészÅ funkcionalitásokat, amik sebezhetÅvé teszik a törési kÃsérletekben.">
<!ENTITY torbutton.prefs.sec_standard_label "Normál">
diff --git a/src/chrome/locale/hy/torbutton.dtd b/src/chrome/locale/hy/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/hy/torbutton.dtd
+++ b/src/chrome/locale/hy/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/id/torbutton.dtd b/src/chrome/locale/id/torbutton.dtd
index b3a1c136..c12cfb6b 100644
--- a/src/chrome/locale/id/torbutton.dtd
+++ b/src/chrome/locale/id/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Jaga kotak ini tetap tercentang untuk mencegah berbagai fitur browser dari penyalahgunaan untuk melacak anda saat sedang menelusuri web. Fitur modifikasi termasuk URL blob, saluran siaran, cache browser, cookies, favicon, kepala HTTP Auth, link preconnect, localStorage, URL mediaSource, permintaan OCSP, SharedWorkets, dan sesi tiket TLS.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Ubah rincian yang membedakan Anda dari pengguna peramban Tor lain.">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Biarkan kotak ini tetap dicentang untuk menyembunyikan hal-hal yang unik tentang Anda dari situs web, termasuk kinerja komputer Anda, susunan keyboard, bahasa, lokasi pengaya terpasang, daftar dari pengaya terpasang, status jaringan, orientasi layar, ukuran layar, tingkat pembesaran situs-spesifik, tipe berkas yang didukung, warna sistem, dan kemampuan WebGL.">
<!ENTITY torbutton.prefs.sec_caption "Tingkat Keamanan">
<!ENTITY torbutton.prefs.sec_caption_tooltip "Penggeser keamanan memungkinkan anda untuk menonaktifkan fitur browser yang dapat membuat browser anda menjadi lebih rentant dari upaya peretasan.">
<!ENTITY torbutton.prefs.sec_standard_label "Standar">
diff --git a/src/chrome/locale/is/torbutton.dtd b/src/chrome/locale/is/torbutton.dtd
index 4477085c..a03a7329 100644
--- a/src/chrome/locale/is/torbutton.dtd
+++ b/src/chrome/locale/is/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "FjarlÊgja allar aðrar en verndaðar">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Vernda nÜjar vefkökur">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ekki vernda nÜjar vefkökur">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Takmarka vefkökur frá ßriðja aðila og önnur ferligögn">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Hafðu merkt à ßennan reit til að koma à veg fyrir að Ümsir eiginleikar vafrans séu misnotaðir à að fylgjast með ßér á meðan ßú flakkar um vefinn. Breyttir eiginleikar eru til dÊmis innri slóðir (blob URLs), útsendar rásir, skyndiminni vafrans, vefkökur, veftákn (favicon), HTTP-auðkenningarhausar, fortengi tengla, localStorage, mediaSource-slóðir, OCSP-beiðnir, SharedWorkers og TLS setumiðar.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Breyta atriðum sem gera ßig ólÃkan öðrum notendum Tor-vafrans">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Hafðu merkt à ßennan reit til að fela fyrir vefsvÊðum atriði sem gÊtu verið einstök hjá ßér, ßar með talin atriði eins og upplÜsingar um afköst tölvunnar, lyklaborðsuppsetningu, staðfÊrslu, staðsetningu uppsettra viðbóta, lista yfir uppsettar viðbÊtur, stöðu netkerfis, stÊrð og stefnu skjás, sértÊkan aðdrátt fyrir vefsvÊði, studdar skráategundir, kerfisliti og getu varðandi WebGL.">
<!ENTITY torbutton.prefs.sec_caption "Ãryggisstig">
<!ENTITY torbutton.prefs.sec_caption_tooltip "Ãryggisstillingasleðinn getur gert óvirka Ãœmsa ßá eiginleika vafrans sem gÊtu gert vafrann viðkvÊmari fyrir árásum hakkara.">
<!ENTITY torbutton.prefs.sec_standard_label "Staðlað">
diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd
index b1cc844c..a45be803 100644
--- a/src/chrome/locale/it/torbutton.dtd
+++ b/src/chrome/locale/it/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Rimuovi tutti tranne quelli protetti">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Proteggi i nuovi cookie">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Non proteggere i nuovi cookie">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Limita i cookie di terze parti e altri dati di tracciamento">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Lascia questo box selezionato per evitare che diverse funzionalità del browser possano essere utilizzate per tracciare la tua navigazione. Le funzionalità modificate includono URL blob, canali di trasmissione, la cache del browser, cookie, favicon, intestazioni di Auth HTTP, link a cui ti sei precedentemente connesso, localStorage, URL mediaSource, richieste OCSP, SharedWorkers e ticket di sessioni TLS.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Cambia i dettagli che ti distinguono dagli altri utenti di Tor Browser">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Lascia questa casella selezionata per nascondere ai siti web alcuni elementi che potrebbero essere unicamente riconducibili a te, incluse le prestazioni del computer, la disposizione della tastiera, la lingua, il percorso dei plugin installati, l'elenco dei plugin installati, lo stato di rete, l'orientamento dello schermo, le dimensioni dello schermo, i livelli di zoom per ogni sito, i tipi di file supportati, i colori di sistema e le funzionalità WebGL.">
<!ENTITY torbutton.prefs.sec_caption "Livello di Sicurezza">
<!ENTITY torbutton.prefs.sec_caption_tooltip "Il Security Slider ti permette di disabilitare determinate funzionalità del browser che potrebbero renderlo più vulnerabile a tentativi di attacco.">
<!ENTITY torbutton.prefs.sec_standard_label "Standard">
diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd
index 65368394..fcd714ff 100644
--- a/src/chrome/locale/ja/torbutton.dtd
+++ b/src/chrome/locale/ja/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "ä¿è·ãããŠãããã®ä»¥å€åé€">
<!ENTITY torbutton.cookiedialog.saveAllCookies "æ°ããCookieãä¿è·">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "æ°ããCookieãä¿è·ããªã">
-<!ENTITY torbutton.prefs.restrict_thirdparty "ãµãŒãããŒãã£ãŒã®Cookieããã®ä»ã®ãã©ããã³ã°ããŒã¿ãå¶é">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "ãã®ããã¯ã¹ããã§ãã¯ãããŸãŸã«ããããšã§ãæ§ã
ãªãã©ãŠã¶ãŒã®æ©èœãæªçšãããŠã§ãã®é²èŠ§äžã«è¿œè·¡ãããããšãé²ãã圱é¿ãåããæ©èœïŒblob URLããããŒããã£ã¹ãã»ãã£ã³ãã«ããã©ãŠã¶ãŒã»ãã£ãã·ã¥ãã¯ãããŒãfaviconãHTTPèªèšŒããããŒãlink preconnectsãããŒã«ã«ã¹ãã¬ãŒãžãmediaSource URLãOCSPãªã¯ãšã¹ããå
±æã¯ãŒã«ãŒãTLSã»ãã·ã§ã³ã»ãã±ãããªã©ã">
-<!ENTITY torbutton.prefs.resist_fingerprinting "ããªããšã»ãã®Torãã©ãŠã¶ã®ãŠãŒã¶ãŒãåºå¥ãã詳现ãå€æŽ">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "ãã®ããã¯ã¹ããã§ãã¯ãããŸãŸã«ãããšãããªããèå¥ã§ãããæ
å ±ããŠã§ããµã€ãããé ããŸããããã«ã¯ãã³ã³ãã¥ãŒã¿ã®æ§èœãããŒããŒãã®é
åããã±ãŒã«ãã€ã³ã¹ããŒã«ããããã©ã°ã€ã³ã®äœçœ®ãã€ã³ã¹ããŒã«ããããã©ã°ã€ã³ã®ãªã¹ããããªãã®ãããã¯ãŒã¯ã®ç¶æ
ãç»é¢ã®åããç»é¢ã®è§£å床ããµã€ãããšã®ãºãŒã èšå®ã察å¿ããŠãããã¡ã€ã«åœ¢åŒãã·ã¹ãã ã®è²èšå®ãWebGLæ©èœãå«ãŸããŸãã">
<!ENTITY torbutton.prefs.sec_caption "ã»ãã¥ãªãã£ã¬ãã«">
<!ENTITY torbutton.prefs.sec_caption_tooltip "ã»ãã¥ãªãã£ã»ã¹ã©ã€ããŒã䜿ã£ãŠãããªãã®ãã©ãŠã¶ãŒããããã³ã°ã®è©Šã¿ã«å¯ŸããŠããè匱ã«ããå¯èœæ§ã®ãããã©ãŠã¶ãŒã®æ©èœãç¡å¹ã«ã§ããŸãã">
<!ENTITY torbutton.prefs.sec_standard_label "æšæº">
diff --git a/src/chrome/locale/jv/torbutton.dtd b/src/chrome/locale/jv/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/jv/torbutton.dtd
+++ b/src/chrome/locale/jv/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ka/torbutton.dtd b/src/chrome/locale/ka/torbutton.dtd
index 1c5635af..47b49321 100644
--- a/src/chrome/locale/ka/torbutton.dtd
+++ b/src/chrome/locale/ka/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "á§ááááá¡ áááªááááá áááªá£ááááá¡ ááá áá">
<!ENTITY torbutton.cookiedialog.saveAllCookies "áá®ááá á€á£ááá£ášáááá¡ áááªáá">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "áá®ááá á€á£ááá£ášáááá¡ áááªááá¡ ášáá©áá ááá">
-<!ENTITY torbutton.prefs.restrict_thirdparty "ááá¡ááá áá®áá áá¡ á€á£ááá£ášáááá¡á áá á¡á®áá ááááááá§á£á ááááá¡ ášáááŠá£ááá">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "á">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "ááá¢áááá áá¡ á£á¯á á ááááášáá£áá, áá áá£ááá áá¡ áªááááá£áá ášáá¡áá«áááááááááá¡ áááá , áá¥ááááá á£ááááá ááá áááááááááá¡ áá¡áá ááááááá, ááááááá ááááá¡ ááááá®á£ááááá¡áá¡. ášááªááááá ášáá¡áá«ááááááááá ááááªááá¡ Blob-ááá£áááá¡, áááááªáááá¡ áá á®ááá¡, áá áá£ááá áá¡ ááášá¡, á€á£ááá£ášááá¡, á¡ááá¢áá¡ á®áá¢á£áááá¡, HTTP-áááá¡áá áááá¡, ááá£ááá¡ á¬áááá¡á¬áá ášááá áááááá¡, áááááááá áá á¡ááªááá¡, á€ááááá¡ á¬á§áá áá¡ URL-ááá¡, OCSP-áááá®áááááá¡, SharedWorker-ááá¡á á
á TLS-á¡áááá¡áá¡ áááááªá®ááááá¡.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "áªááááá£áá á¬áá ááááááááá¡ ášááªááá, á áááááá᪠áááááá¡á®áááááá Tor-áá áá£ááá áá¡ á¡á®áá áááá®ááá ááááááá¡ááá">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "áª">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "ááá¢áááá áá¡ á£á¯á á ááááášáá£áá, áá¡ááá áááááªáááááá¡ ááá¡áá€áá áá, á ááááá¡ á¡áášá£ááááááááª, á¡ááá¢ááá¡ ášááá«ááááá áá¥áááá á¡á®ááááá¡ááá ááááá á©ááá, ááá ášáá áá¡áá áááááá£á¢áá áá¡ á¬áá áááááá, ááááááá¢á£á áá¡ ááááááááá, áááá¡ ááá áááá¢á ááá, ááá§ááááá£áá áááá£ááááá¡ á©áááááááááá áá áááá ááááááááááá áááá, á¥á¡áááá¡ ááááááá áááá, ááá áááá¡ ááááááá áááá áá áááááá, á¡ááá¢áá¡ ášáááááá¡áá¡ áááááá, á€ááááá¡ áá®áá áá
ááá ááá á¡áá®áááá, á¡áá¡á¢áááá¡ á€áá ááá, WebGL-ášáá¡áá«ááááááááá.">
<!ENTITY torbutton.prefs.sec_caption "á£á¡áá€á áá®ááááá¡ áááá">
<!ENTITY torbutton.prefs.sec_caption_tooltip "á£á¡áá€á áá®ááááá¡ áá¡áá á©ááá á ááá, á¡áášá£áááááá¡ ááá«áááá ááááášáá áá áá£ááá áá¡ ášáá¡áá«áááááááááá¡ ááá¬ááá, á£ááááá ááá ášááŠá¬áááá¡ ááªááááááááá¡ááá á£ááá áááááá¡ááªáááá.">
<!ENTITY torbutton.prefs.sec_standard_label "á©ááá£áááá ááá">
diff --git a/src/chrome/locale/km/torbutton.dtd b/src/chrome/locale/km/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/km/torbutton.dtd
+++ b/src/chrome/locale/km/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/kn/torbutton.dtd b/src/chrome/locale/kn/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/kn/torbutton.dtd
+++ b/src/chrome/locale/kn/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd
index b23701b2..ab359411 100644
--- a/src/chrome/locale/ko/torbutton.dtd
+++ b/src/chrome/locale/ko/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "볎ížë ê² ë¹Œê³ ëªšë ì§ì°êž°">
<!ENTITY torbutton.cookiedialog.saveAllCookies "ìë¡ìŽ ì¿ í€ ë³Žíž">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ìë¡ìŽ ì¿ í€ë¥Œ 볎ížíì§ ìì">
-<!ENTITY torbutton.prefs.restrict_thirdparty "ì 3ì ì¿ í€ì ë€ë¥ž ì¶ì ë°ìŽí° ì í">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "ì¹ì íì í ë ë€ìí ëžëŒì°ì êž°ë¥ìŽ ì¬ì©ì륌 ì¶ì íë ê²ì ë§êž° ìíŽìŽ ìì륌 ì ííììì€. ìì ë êž°ë¥ìë blob URL, ëžë¡ë ìºì€íž ì±ë, ëžëŒì°ì ìºì, ì¿ í€, íë¹ìœ, HTTP Auth í€ë, ë§í¬ ì¬ì ì°ê²°, localStorage, mediaSource URL, OCSP ìì², SharedWorkers ë° TLS ìžì
í°ìŒìŽ í¬íšë©ëë€.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "ë€ë¥ž Tor browser ì¬ì©ìë¡ë¶í° 구ë³ëë ìžë¶ ì¬í ë³ê²œ">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "ìŽ ìì륌 ì²Ží¬ íŽë ìŒë¡ìš ì¹ì¬ìŽížê° ë¹ì ì ìë³ í ì ìë ìì륌 ìšêžž ì ììµëë€. ê·žê²ìë 컎íší° ì±ë¥, í€ë³Žë ë ìŽìì, ë¡ìŒìŒ, íë¬ê·žìžìŽ ì€ì¹ë ì¥ì, ì€ì¹ë íë¬ê·žìžì 목ë¡, ë€ížìí¬ ìí, íë©Ž ë°©í¥, íë©Ž í¬êž°, ì¬ìŽíž ë³ íë / ì¶ì ìì€, ì§ìëë íìŒ íì, ìì€í
ì, WebGL êž°ë¥ ë±ìŽ ììµëë€.">
<!ENTITY torbutton.prefs.sec_caption "볎ì ë±êž">
<!ENTITY torbutton.prefs.sec_caption_tooltip "볎ì ì¬ëŒìŽë륌 ì¬ì©íë©Ž í¹ì ëžëŒì°ì êž°ë¥ìŽ ë¹íì±í ëìŽ ëžëŒì°ì ê° íŽí¹ ìëì ì·šìœíŽì§ ì ììµëë€.">
<!ENTITY torbutton.prefs.sec_standard_label "íì€">
diff --git a/src/chrome/locale/ku/torbutton.dtd b/src/chrome/locale/ku/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/ku/torbutton.dtd
+++ b/src/chrome/locale/ku/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/kw/torbutton.dtd b/src/chrome/locale/kw/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/kw/torbutton.dtd
+++ b/src/chrome/locale/kw/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ky/torbutton.dtd b/src/chrome/locale/ky/torbutton.dtd
index 815e56de..8be58090 100644
--- a/src/chrome/locale/ky/torbutton.dtd
+++ b/src/chrome/locale/ky/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/lb/torbutton.dtd b/src/chrome/locale/lb/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/lb/torbutton.dtd
+++ b/src/chrome/locale/lb/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ln/torbutton.dtd b/src/chrome/locale/ln/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/ln/torbutton.dtd
+++ b/src/chrome/locale/ln/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/lo/torbutton.dtd b/src/chrome/locale/lo/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/lo/torbutton.dtd
+++ b/src/chrome/locale/lo/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/lt/torbutton.dtd b/src/chrome/locale/lt/torbutton.dtd
index 247820d7..85e41b2d 100644
--- a/src/chrome/locale/lt/torbutton.dtd
+++ b/src/chrome/locale/lt/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/lv/torbutton.dtd b/src/chrome/locale/lv/torbutton.dtd
index aed81db8..ea5e250b 100644
--- a/src/chrome/locale/lv/torbutton.dtd
+++ b/src/chrome/locale/lv/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "NoÅemt visas, izÅemot aizsargÄtÄs">
<!ENTITY torbutton.cookiedialog.saveAllCookies "AizsargÄt jaunÄs sÄ«kdatnes">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "NeaizsargÄt jaunÄs sÄ«kdatnes">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Ierobeşot trešo personu sīkdatnes un citus izsekošanas datus">
-<!ENTITY torbutton.prefs.resist_fingerprinting "MainÄ«t informÄciju, kura dara JÅ«s atÅ¡Ä·irÄ«gus no citiem PÄrlÅ«ka Tor lietotÄjiem">
diff --git a/src/chrome/locale/mg/torbutton.dtd b/src/chrome/locale/mg/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/mg/torbutton.dtd
+++ b/src/chrome/locale/mg/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/mi/torbutton.dtd b/src/chrome/locale/mi/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/mi/torbutton.dtd
+++ b/src/chrome/locale/mi/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/mk/torbutton.dtd b/src/chrome/locale/mk/torbutton.dtd
index ba2b2cb8..28cfc0b8 100644
--- a/src/chrome/locale/mk/torbutton.dtd
+++ b/src/chrome/locale/mk/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ml/torbutton.dtd b/src/chrome/locale/ml/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/ml/torbutton.dtd
+++ b/src/chrome/locale/ml/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/mn/torbutton.dtd b/src/chrome/locale/mn/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/mn/torbutton.dtd
+++ b/src/chrome/locale/mn/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/mr/torbutton.dtd b/src/chrome/locale/mr/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/mr/torbutton.dtd
+++ b/src/chrome/locale/mr/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ms/torbutton.dtd b/src/chrome/locale/ms/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/ms/torbutton.dtd
+++ b/src/chrome/locale/ms/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/mt/torbutton.dtd b/src/chrome/locale/mt/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/mt/torbutton.dtd
+++ b/src/chrome/locale/mt/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/my/torbutton.dtd b/src/chrome/locale/my/torbutton.dtd
index 5bd7e2fd..b628fd23 100644
--- a/src/chrome/locale/my/torbutton.dtd
+++ b/src/chrome/locale/my/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "á¡á¬ážáá¯á¶ážááᯠáááºáá¯ááºáá«á ááá¯á·áá±á¬áº á¡áá¬á¡ááœáẠáá¯ááºáá¬ážáááº">
<!ENTITY torbutton.cookiedialog.saveAllCookies "ááœááºáá®ážáá
áºáá»á¬ážááᯠáá¬ááœááºáááº">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ááœááºáá®ážáá
áºáá»á¬ážááᯠáá¬ááœááºááŒááºáž áááŒá¯áááº">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/nah/torbutton.dtd b/src/chrome/locale/nah/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/nah/torbutton.dtd
+++ b/src/chrome/locale/nah/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/nap/torbutton.dtd b/src/chrome/locale/nap/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/nap/torbutton.dtd
+++ b/src/chrome/locale/nap/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/nb/torbutton.dtd b/src/chrome/locale/nb/torbutton.dtd
index 1b58f104..67e2fc2b 100644
--- a/src/chrome/locale/nb/torbutton.dtd
+++ b/src/chrome/locale/nb/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Fjern alle bortsett fra beskyttede">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Beskytt nye informasjonskapsler">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ikke beskytt nye informasjonskapsler">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Begrens tredjeparts informasjonskapsler og andre sporingsdata.">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Hold denne boksen avhuket for å forebygge at ulike nettleserfunksjoner blir misbrukt til å spore deg når du surfer på nettet. Modifiserte funksjoner inkluderer blob-nettadresser, kringkastinskanaler, nettleserens mellomlager, informasjonskapsler, favicon, HTTP-autentiserings overskrifter, link preconnects, localstorage , Mediasource-nettadresser, OCSP-forespÞrsler, SharedWorkers og TLS Þktbilletter.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Endre detaljer som skiller deg fra andre brukere av Tor-nettleseren.">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "La denne avkryssingsboksen vÊre utkrysset for å skjule ting som kan vÊre unikt med deg fra nettsteder, inkludert datamaskinens ytelse, tastaturoppsett , lokale, plasseringen av- og listen over installerte programtillegg, nettverksstatus, skjermretning , skjermstÞrrelse , sidespesifikke forstÞrrelsesnivåer , filtyper som stÞttes, systemfarger og WebGL-evner.">
<!ENTITY torbutton.prefs.sec_caption "Sikkerhetsnivå">
<!ENTITY torbutton.prefs.sec_caption_tooltip "Sikkerhetsglidebryteren lar deg skru av forskjellige nettleserfunksjoner som kan eksponere deg for risiko.">
<!ENTITY torbutton.prefs.sec_standard_label "Forvalg">
diff --git a/src/chrome/locale/ne/torbutton.dtd b/src/chrome/locale/ne/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/ne/torbutton.dtd
+++ b/src/chrome/locale/ne/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd
index 27e0003d..d31b4153 100644
--- a/src/chrome/locale/nl/torbutton.dtd
+++ b/src/chrome/locale/nl/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Alle cookies, met uitzondering van de beveiligde, verwijderen">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Beveilig nieuwe cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Beveilig nieuwe cookies niet">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Beperk cookies en andere tracking-gegevens van derden">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Vink dit vakje aan om te voorkomen dat functies van je browser worden misbruikt om je te volgen op het internet. Gemodificeerde functies zijn o.a. URL's, uitzendingskanalen, de browsercache, cookies, favicons, HTTP Auth headers, koppeling-voorverbindingen, lokale opslag, mediabron-URL's, OCSP-verzoeken, Gedeelde-werkers en TLS-sessietickets.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Verander details die je onderscheiden van andere Tor Browser gebruikers">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Houd deze box aangevinkt om dingen te verbergen voor website die uniek kunnen zijn voor u, inclusief uw computer prestaties, toetsenbord layout, locatie, de locatie van geïnstalleerde plugins, de lijst van geïnstalleerde plugins, uw netwerk status, scherm oriëntatie, scherm grootte, site-specifieke zoom levels, ondersteunde bestands types, systeem kleuren, en WebGL mogelijkheden.">
<!ENTITY torbutton.prefs.sec_caption "Beveiligingsniveau">
<!ENTITY torbutton.prefs.sec_caption_tooltip "De beveiligingsschuifbalk laat je toe sommige functies uit te schakelen die je browser mogelijk blootstellen aan beveiligingsrisico's.">
<!ENTITY torbutton.prefs.sec_standard_label "Standaard">
diff --git a/src/chrome/locale/nn/torbutton.dtd b/src/chrome/locale/nn/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/nn/torbutton.dtd
+++ b/src/chrome/locale/nn/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/nso/torbutton.dtd b/src/chrome/locale/nso/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/nso/torbutton.dtd
+++ b/src/chrome/locale/nso/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/oc/torbutton.dtd b/src/chrome/locale/oc/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/oc/torbutton.dtd
+++ b/src/chrome/locale/oc/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/or/torbutton.dtd b/src/chrome/locale/or/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/or/torbutton.dtd
+++ b/src/chrome/locale/or/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/pa/torbutton.dtd b/src/chrome/locale/pa/torbutton.dtd
index f198b7cf..c7185f22 100644
--- a/src/chrome/locale/pa/torbutton.dtd
+++ b/src/chrome/locale/pa/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/pap/torbutton.dtd b/src/chrome/locale/pap/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/pap/torbutton.dtd
+++ b/src/chrome/locale/pap/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd
index 7b60431c..ba43142b 100644
--- a/src/chrome/locale/pl/torbutton.dtd
+++ b/src/chrome/locale/pl/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "UsuŠwszystkie oprócz chronionych">
<!ENTITY torbutton.cookiedialog.saveAllCookies "ChroÅ nowe ciasteczka">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Nie chroÅ nowych ciasteczek">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Ograniczaj ciasteczka firm trzecich i inne dane sÅuÅŒÄ
ce do Åledzenia">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Zachowaj to pole zaznaczone, aby zapobiec naduÅŒyciom róŌnych funkcji przeglÄ
darki, które ÅledzÄ
ciÄ podczas przeglÄ
dania sieci. Zmodyfikowane funkcje obejmujÄ
adresy Blob URL, kanaÅy rozgÅoszeniowe, pamiÄÄ podrÄcznÄ
przeglÄ
darki, pliki cookie, ikony ulubionych, nagÅówki HTTP Auth, wstÄpne poÅÄ
czenia, localStorage, adresy mediaSource URL, ÅŒÄ
dania OCSP, SharedWorkers oraz bilety sesji TLS.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "ZmieÅ szczegóÅy odróŌniajÄ
ce CiÄ od innych uÅŒytkowników PrzeglÄ
darki Tora">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Zachowaj to pole zaznaczone, aby ukryÄ przed stronami internetowymi elementy, które mogÄ
byÄ u ciebie unikalne, wliczajÄ
c w to wydajnoÅÄ komputera, ukÅad klawiatury, lokalizacjÄ, poÅoÅŒenie zainstalowanych wtyczek, listÄ zainstalowanych wtyczek, stan sieci, orientacjÄ ekranu, rozmiar ekranu, okreÅlone poziomy powiÄkszenia, obsÅugiwane typy plików, kolory systemu oraz moÅŒliwoÅci WebGL.">
<!ENTITY torbutton.prefs.sec_caption "Poziom bezpieczeÅstwa">
<!ENTITY torbutton.prefs.sec_caption_tooltip "Suwak poziomu bezpieczeÅstwa pozwala na wyÅÄ
czenie pewnych funkcji przeglÄ
darki, które mogÄ
uczyniÄ ten program bardziej naraÅŒonym na próby ataku hakerskiego.">
<!ENTITY torbutton.prefs.sec_standard_label "Standardowy">
diff --git a/src/chrome/locale/pms/torbutton.dtd b/src/chrome/locale/pms/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/pms/torbutton.dtd
+++ b/src/chrome/locale/pms/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ps/torbutton.dtd b/src/chrome/locale/ps/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/ps/torbutton.dtd
+++ b/src/chrome/locale/ps/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd
index 594b4a62..5ca71899 100644
--- a/src/chrome/locale/pt-BR/torbutton.dtd
+++ b/src/chrome/locale/pt-BR/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remover Todos Exceto os Protegidos">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger Novos Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Não Proteger Novos Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restringir os cookies de terceiros e outros dados de rastreamento">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Deixe esta opção sempre marcada para impedir que funcionalidades de navegação sejam usadas para rastreá-la(o) durante a sua navegação. Funcionalidades alteradas incluem janelas pop-up, canais de transmissão, o cache de memória, cookies, favicons, ">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Alterar os detalhes que distinguem você de outros usuários do Navegador Tor">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Manter esta opção ativa para ocultar de websites as suas informações que podem ser individuais: performance do computador, modelo de teclado, local, a localização e a lista dos plugins instalados, o status da sua conexão, a orientação de tela, o tamanho da tela, os nÃveis de zoom de certos sites, os tipos de arquivos que possuem suporte, o sistema de cores, e os recursos WebGL.">
<!ENTITY torbutton.prefs.sec_caption "NÃvel de Segurança">
<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider possibilita que você desabilite certas funcionalidades de navegação que podem torná-la mais vulnerável a tentativas de ataque.">
<!ENTITY torbutton.prefs.sec_standard_label "Padrão">
diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd
index 582164da..efff3d9b 100644
--- a/src/chrome/locale/pt/torbutton.dtd
+++ b/src/chrome/locale/pt/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remover Tudo Exceto Protegidos">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger Novos Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Não Proteger Novos Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restringir os cookies de terceiros e outros dados de rastreamento">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Alterar os detalhes que o diferencia dos outros utilizadores do Navegador Tor">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
<!ENTITY torbutton.prefs.sec_caption "NÃvel de Segurança">
<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
<!ENTITY torbutton.prefs.sec_low "Baixo (predefinição)">
diff --git a/src/chrome/locale/ro/torbutton.dtd b/src/chrome/locale/ro/torbutton.dtd
index a367d00d..8bbcaf85 100644
--- a/src/chrome/locale/ro/torbutton.dtd
+++ b/src/chrome/locale/ro/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Indeparteaza tot, mai putin protejat">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protejeaza Cookie-urile noi">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Nu proteja Cookie-urile noi">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd
index 26dd7455..3acf77f4 100644
--- a/src/chrome/locale/ru/torbutton.dtd
+++ b/src/chrome/locale/ru/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "УЎалОÑÑ Ð²Ñе, кÑПЌе заÑОÑÑММÑÑ
">
<!ENTITY torbutton.cookiedialog.saveAllCookies "ÐаÑОÑаÑÑ ÐœÐŸÐ²Ñе кÑкО-ÑайлÑ">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ðе заÑОÑаÑÑ ÐœÐŸÐ²Ñе кÑкО-ÑайлÑ">
-<!ENTITY torbutton.prefs.restrict_thirdparty "ÐлПкОÑПваÑÑ ÑÑПÑПММОе кÑкО-ÑÐ°Ð¹Ð»Ñ Ðž ÐŽÑÑгОе ЎаММÑе ÑлежеМОÑ">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "ÐÑÑавÑÑе ÑлажПк МапÑПÑОв ÑÑПй ÑÑМкÑОО ПÑЌеÑеММÑÐŒ, ÑÑÐŸÐ±Ñ Ð·Ð°ÑОÑОÑÑ ÐŒÐœÐŸÐ³ÐžÐµ ÑÑМкÑОО ПбПзÑеваÑÐµÐ»Ñ ÐŸÑ ÑлеЌеМÑПв ПÑÑÐ»ÐµÐ¶ÐžÐ²Ð°ÐœÐžÑ Ð²Ð°ÑОÑ
ЎейÑÑвОй вП вÑÐµÐŒÑ ÑеÑÑОМга в ÑеÑО. ÐПЎОÑОÑОÑПваММÑе кПЌпПМеМÑÑ Ð²ÐºÐ»ÑÑаÑÑ Ð² ÑÐµÐ±Ñ ÑÑÑлкО Ма блПбÑ, ÑÑаМÑлОÑÑеЌÑе каМалÑ, кÑÑ Ð±ÑаÑзеÑа, ÑÐ°Ð¹Ð»Ñ ÐºÑкО, зМаÑкО, загПлПвкО аÑÑеМÑОÑОкаÑОО HTTP, ÑÑÑлкО пÑеЎпÑПÑЌПÑÑа, лПкалÑМПе Ñ
ÑаМОлОÑе, ÑÑÑлкО Ма ЌеЎОакПМÑеМÑ, запÑПÑÑ OCSP, SharedWorkers О ПбÑÑÐ²Ð»ÐµÐœÐžÑ ÑеÑÑОО TLS.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "ÐзЌеМОÑÑ ÑвеЎеМОÑ, ПÑлОÑаÑÑОе Ð²Ð°Ñ ÐŸÑ ÐŽÑÑгОÑ
пПлÑзПваÑелей Tor Browser">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "ÐÑÑавÑÑе ÑлажПк МапÑПÑОв ÑÑПй ÑÑМкÑОО ПÑЌеÑеММÑÐŒ, ÑÑÐŸÐ±Ñ ÑкÑÑÑÑ ÐŸÑ Ð²ÐµÐ±-ÑзлПв веÑО , кПÑПÑÑе ЌПгÑÑ Ð±ÑÑÑ ÑМОкалÑÐœÑЌО ÐŽÐ»Ñ Ð²Ð°Ñ, вклÑÑÐ°Ñ Ð¿ÑПОзвПЎОÑелÑМПÑÑÑ ÐºÐŸÐŒÐ¿ÑÑÑеÑа, ÑаÑÐºÐ»Ð°ÐŽÐºÑ ÐºÐ»Ð°Ð²ÐžÐ°ÑÑÑÑ, ÑзÑк, ÑаÑпПлПжеМОе О ÑпОÑПк ÑÑÑаМПвлеММÑÑ
плагОМПв, ÑПÑÑПÑМОе ÑеÑО, ПÑОеМÑаÑÐžÑ Ðž ÑÐ°Ð·ÐŒÐµÑ ÑкÑаМа , зМаÑÐµÐœÐžÑ ÐŒÐ°ÑÑÑабОÑÐŸÐ²Ð°ÐœÐžÑ ÐŽÐ»Ñ ÐºÐŸÐœÐºÑеÑÐœÑÑ
ÑзлПв, пПЎЎеÑжОваеЌÑе ÑÐžÐ¿Ñ ÑайлПв, ÑОÑÑеЌМÑе ÑвеÑа О вПзЌПжМПÑÑО WebGL.">
<!ENTITY torbutton.prefs.sec_caption "УÑÐŸÐ²ÐµÐœÑ Ð±ÐµÐ·ÐŸÐ¿Ð°ÑМПÑÑО">
<!ENTITY torbutton.prefs.sec_caption_tooltip "ÐПлзÑМПк безПпаÑМПÑÑО пПзвПлÑÐµÑ Ð²Ð°ÐŒ запÑеÑОÑÑ ÐœÐµÐºÐŸÑПÑÑе ПÑПбеММПÑÑО ПбПзÑеваÑелÑ, кПÑПÑÑе ЌПгÑÑ ÑЎелаÑÑ Ð²Ð°Ñ Ð±ÑаÑÐ·ÐµÑ Ð±ÐŸÐ»ÐµÐµ ÑÑзвОЌÑÐŒ к пПпÑÑкаЌ взлПЌа.">
<!ENTITY torbutton.prefs.sec_standard_label "СÑаМЎаÑÑÐœÑе">
diff --git a/src/chrome/locale/sco/torbutton.dtd b/src/chrome/locale/sco/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/sco/torbutton.dtd
+++ b/src/chrome/locale/sco/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/sk/torbutton.dtd b/src/chrome/locale/sk/torbutton.dtd
index 44788251..25dc5886 100644
--- a/src/chrome/locale/sk/torbutton.dtd
+++ b/src/chrome/locale/sk/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/sl/torbutton.dtd b/src/chrome/locale/sl/torbutton.dtd
index 40828c9c..475724e3 100644
--- a/src/chrome/locale/sl/torbutton.dtd
+++ b/src/chrome/locale/sl/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ne zaÅ¡Äiti novih piÅ¡kotkov">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/so/torbutton.dtd b/src/chrome/locale/so/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/so/torbutton.dtd
+++ b/src/chrome/locale/so/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/son/torbutton.dtd b/src/chrome/locale/son/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/son/torbutton.dtd
+++ b/src/chrome/locale/son/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/sq/torbutton.dtd b/src/chrome/locale/sq/torbutton.dtd
index 8daad7b9..0f77148b 100644
--- a/src/chrome/locale/sq/torbutton.dtd
+++ b/src/chrome/locale/sq/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/sr/torbutton.dtd b/src/chrome/locale/sr/torbutton.dtd
index 200e9114..a945b001 100644
--- a/src/chrome/locale/sr/torbutton.dtd
+++ b/src/chrome/locale/sr/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "УклПМО Ñве ПÑОЌ заÑÑОÑеМОÑ
">
<!ENTITY torbutton.cookiedialog.saveAllCookies "ÐаÑÑОÑО МПве кПлаÑОÑе">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ðе ÑÑОÑО МПве кПлаÑОÑе">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Ogranici cookies i druge podatke o pracenju">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Promenite detalje koji vas razlikuju od drugih korisnika Tor pretrazivaca.">
diff --git a/src/chrome/locale/st/torbutton.dtd b/src/chrome/locale/st/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/st/torbutton.dtd
+++ b/src/chrome/locale/st/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/su/torbutton.dtd b/src/chrome/locale/su/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/su/torbutton.dtd
+++ b/src/chrome/locale/su/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd
index 067b45b3..d05c163e 100644
--- a/src/chrome/locale/sv/torbutton.dtd
+++ b/src/chrome/locale/sv/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Ta bort alla icke-skyddade">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Skydda nya Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Skydda inte nya Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "BegrÀnsa tredjeparts-cookies och annan tracking data">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "BehÃ¥ll det hÀr alternativet valt för att förhindra olika webblÀsarfunktioner frÃ¥n att missbrukas för att spÃ¥ra dig nÀr du surfar pÃ¥ nÀtet. Ãndrade funktioner inkluderar blob-URLer, broadcastkanaler, webblÀsar-cache, cookies, favicons, HTTP-Auth-huvuden, lÀnk-föranslutningar, localStorage, mediaSource URLer, OCSP-förfrÃ¥gningar, SharedWorkers och TLS-sessionstickets.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Ãndra detailjer som utmÀrker dig ifrÃ¥n andra Tor Browser anvÀndare">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Låt den hÀr kryssrutan vara ikryssad för att dölja saker från webbplatser som kan vara unika för just dig, såsom datorprestanda, tangentbordslayout, språkinstÀllningar, plats för installerade plugin, lista över installerade plugin, nÀtverksstatus, skÀrmorientering, skÀrmstorlek, platsspecifika zoomnivåer, filtypsstöd, systemfÀrger, och WebGL-stöd.">
<!ENTITY torbutton.prefs.sec_caption "SÀkerhetsnivå">
<!ENTITY torbutton.prefs.sec_caption_tooltip "SÀkerhetsreglaget låter dig stÀnga av vissa webblÀsarfunktioner som kan göra din webblÀsare mer sårbar mot intrångsförsök.">
<!ENTITY torbutton.prefs.sec_standard_label "Standard">
diff --git a/src/chrome/locale/sw/torbutton.dtd b/src/chrome/locale/sw/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/sw/torbutton.dtd
+++ b/src/chrome/locale/sw/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ta/torbutton.dtd b/src/chrome/locale/ta/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/ta/torbutton.dtd
+++ b/src/chrome/locale/ta/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/te/torbutton.dtd b/src/chrome/locale/te/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/te/torbutton.dtd
+++ b/src/chrome/locale/te/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/tg/torbutton.dtd b/src/chrome/locale/tg/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/tg/torbutton.dtd
+++ b/src/chrome/locale/tg/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/th/torbutton.dtd b/src/chrome/locale/th/torbutton.dtd
index 70d1df2d..4f4b87fd 100644
--- a/src/chrome/locale/th/torbutton.dtd
+++ b/src/chrome/locale/th/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ti/torbutton.dtd b/src/chrome/locale/ti/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/ti/torbutton.dtd
+++ b/src/chrome/locale/ti/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/tk/torbutton.dtd b/src/chrome/locale/tk/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/tk/torbutton.dtd
+++ b/src/chrome/locale/tk/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd
index 358a958a..24b3dfff 100644
--- a/src/chrome/locale/tr/torbutton.dtd
+++ b/src/chrome/locale/tr/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Korunanlar DıÅında TÃŒmÃŒnÃŒ Sil">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Yeni Ãerezler Korunsun">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Yeni Ãerezler Korunmasın">
-<!ENTITY torbutton.prefs.restrict_thirdparty "ÃçÌncÃŒ taraf çerezleri ve diÄer izleme bilgileri engellensin">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Bu seçeneÄi iÅaretleyerek, çeÅitli web tarayıcıların, web sitelerinde yaptıÄınız iÅlemleri izlemesini engelleyebilirsiniz. DeÄiÅtirilen özellikler içinde blob Ä°nternet adresleri, yayın kanalları, web tarayıcı ön belleÄi, çerezler, favicon dosyaları, HTTP Auth baÅlık bilgileri, ön baÄlantı bilgileri, localStorage, mediaSource adresleri, OCSP istekleri, SharedWorkers ve TLS oturumu bulunur.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "DiÄer Tor Browser kullanıcılarından sizi ayıran ayrıntılar deÄiÅtirilsin">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Bilgisayarınızın baÅarımı, tuÅ takımı dÃŒzeni, yerel dil ayarları, kurulmuÅ eklentilerin konumu, kurulmuÅ eklentilerin listesi, aÄınızın durumu, ekran yönlendirmesi, ekran boyutu, siteye baÄlı özel yakınlaÅtırma seviyeleri, desteklenen dosya tÃŒrleri, sistem renkleri ve WebGL yetenekleri gibi size özel olan ve kimliÄinizin belirlenmesinde kullanılabilecek bilgileri gizlemek için bu kutuyu iÅaretlenmiÅ olarak tutun.">
<!ENTITY torbutton.prefs.sec_caption "GÃŒvenlik DÃŒzeyi">
<!ENTITY torbutton.prefs.sec_caption_tooltip "GÃŒvenlik ayarı ile belirli web tarayıcı özeliklerini kapatabilirsiniz. Ancak bu durumda web tarayıcınız saldırılara karÅı daha korumasız olur.">
<!ENTITY torbutton.prefs.sec_standard_label "Standart">
diff --git a/src/chrome/locale/uk/torbutton.dtd b/src/chrome/locale/uk/torbutton.dtd
index d5511783..742060f9 100644
--- a/src/chrome/locale/uk/torbutton.dtd
+++ b/src/chrome/locale/uk/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "ÐОЎалОÑО УÑÑ, ÐкÑÑÐŒ ÐаÑ
ОÑеМОÑ
">
<!ENTITY torbutton.cookiedialog.saveAllCookies "ÐаÑ
ОÑаÑО ÐÐŸÐ²Ñ ÐÑкО">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ðе ÐаÑ
ОÑаÑО ÐÐŸÐ²Ñ ÐÑкО">
-<!ENTITY torbutton.prefs.restrict_thirdparty "ÐлПкÑваÑО ÑÑПÑÐŸÐœÐœÑ ÐºÑкО Ñа ÑÐœÑÑ ÐŽÐ°ÐœÑ Ð²ÑÐŽÑÑежеММÑ">
-<!ENTITY torbutton.prefs.resist_fingerprinting "ÐÐŒÑМОÑО вÑЎПЌПÑÑÑ, ÑП вÑÐŽÑÑзМÑÑÑÑ Ð²Ð°Ñ Ð²ÑÐŽ ÑÐœÑОÑ
кПÑОÑÑÑваÑÑв пеÑеглÑЎаÑа Tor">
diff --git a/src/chrome/locale/ur/torbutton.dtd b/src/chrome/locale/ur/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/ur/torbutton.dtd
+++ b/src/chrome/locale/ur/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ve/torbutton.dtd b/src/chrome/locale/ve/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/ve/torbutton.dtd
+++ b/src/chrome/locale/ve/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd
index 77f447b9..9f1c50e3 100644
--- a/src/chrome/locale/vi/torbutton.dtd
+++ b/src/chrome/locale/vi/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Bảo Äảm há»p nà y Äược Äánh dấu Äá» ngÄn những tÃnh nÄng khác nhau của trình duyá»t khÃŽng bá» là m dụng Äá» theo dõi bạn khi bạn duyá»t web. Những tÃnh nÄng Äược sá»a Äá»i bao gá»m những blob URL, những ÄÆ°á»ng dẫn Äược kết ná»i trÆ°á»c, nÆ¡i lÆ°u trữ ná»i bá», URL nguá»n trung gian, những yêu cầu OCSP, SharedWorkers, và vé của phiên TLS.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "LuÃŽn Äánh dấu há»p nà y ÄỠẩn các dấu hiá»u có thá» là Äặc trÆ°ng duy nhất vá» bạn, bao gá»m khả nÄng là m viá»c của máy tÃnh của bạn, cách sắp xếp của bà n phÃm, nÆ¡i á», vá» trà của các trình thêm và o (plugins) Äược cà i Äặt, danh sách của các trình thêm và o Äược cà i Äặt, trạng thái mạng của bạn, Äá»nh hÆ°á»ng mà n hình, kÃch thÆ°á»c mà n hình, các mức Äá» phóng to-thu nhá» Äá»i vá»i các trang cụ thá», các dạng tá»p tin Äược há» trợ, các mà u há» thá»ng, và các nÄng lá»±c WebGL.">
<!ENTITY torbutton.prefs.sec_caption "Mức Äá» Bảo máºt">
<!ENTITY torbutton.prefs.sec_caption_tooltip "Những NgÆ°á»i Äiá»u chá»nh an ninh Äá» cho bạn vÃŽ hiá»u má»t và i tÃnh nÄng của trình duyá»t mà có thá» là m trình duyá»t của bạn dá»
bá» tá»n thÆ°Æ¡ng Äá»i vá»i những cá» gắng tấn cÃŽng.">
<!ENTITY torbutton.prefs.sec_standard_label "Chuẩn">
diff --git a/src/chrome/locale/wa/torbutton.dtd b/src/chrome/locale/wa/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/wa/torbutton.dtd
+++ b/src/chrome/locale/wa/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/wo/torbutton.dtd b/src/chrome/locale/wo/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/wo/torbutton.dtd
+++ b/src/chrome/locale/wo/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd
index e9ea7dbe..5cdea120 100644
--- a/src/chrome/locale/zh-CN/torbutton.dtd
+++ b/src/chrome/locale/zh-CN/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "å
šéšç§»é€ä»
ä¿çåä¿æ€ç Cookie">
<!ENTITY torbutton.cookiedialog.saveAllCookies "ä¿æ€æ°ç Cookie">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "äžä¿æ€æ°ç Cookie">
-<!ENTITY torbutton.prefs.restrict_thirdparty "éå¶ç¬¬äžæ¹ cookie åå
¶ä»æ°æ®è·èžªçšåº">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "该é项çšäºé²æ¢æ»¥çšæµè§åšåèœè·èžªçšæ·ãä¿®æ¹çåèœå
æ¬ïŒblob çœåïŒå¹¿æééïŒæµè§åšçŒåïŒcookieïŒæ¶è倹åŸæ ïŒHTTP éªè¯æ 倎ïŒé¢è¿æ¥ïŒlocalStorageïŒmediaSource çœåïŒOCSP 请æ±ïŒSharedWorker å TLS äŒè¯ç¥šè¯ã">
-<!ENTITY torbutton.prefs.resist_fingerprinting "ä¿®æ¹ Tor æµè§åšäžå¯åºåäœ äžå
¶ä» Tor çšæ·çç»èä¿¡æ¯">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "åŸéæ€é项以é¿å
çœç«è·åæšçæµè§åšæ纹信æ¯ïŒå
æ¬æšç计ç®æºæ§èœãé®çåžå±ãç³»ç»è¯èšãå®è£
æ件çäœçœ®ãå·²å®è£
æ件åè¡šãæšççœç»ç¶æãå±å¹æ¹åãå±å¹å°ºå¯žãç¹å®çœç«çŒ©æŸçº§å«ãæ¯æçæ件类åãç³»ç»é¢è²ãWebGL åèœã">
<!ENTITY torbutton.prefs.sec_caption "å®å
šç级">
<!ENTITY torbutton.prefs.sec_caption_tooltip "å®å
šæ»åå¯çŠçšæäºæµè§åšåèœïŒé¿å
å è¿äºåèœå¯ŒèŽçæŒæŽèåå°æ»å»ã">
<!ENTITY torbutton.prefs.sec_standard_label "æ åå®å
šæ§">
diff --git a/src/chrome/locale/zh-HK/torbutton.dtd b/src/chrome/locale/zh-HK/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/zh-HK/torbutton.dtd
+++ b/src/chrome/locale/zh-HK/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/zh-TW/torbutton.dtd b/src/chrome/locale/zh-TW/torbutton.dtd
index 8fe54733..e3824e9c 100644
--- a/src/chrome/locale/zh-TW/torbutton.dtd
+++ b/src/chrome/locale/zh-TW/torbutton.dtd
@@ -25,12 +25,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "å
šéšåªé€ïŒäœåä¿è·">
<!ENTITY torbutton.cookiedialog.saveAllCookies "ä¿è·æ°ç Cookie">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "äžä¿è·æ°ç Cookie">
-<!ENTITY torbutton.prefs.restrict_thirdparty "éå¶ç¬¬äžæ¹ cookie åå
¶ä»è¿œè¹€è³æ">
-<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "ä¿æåçšæ€é
ç®ä»¥é¿å
ç¶æšåšç芜網é æïŒç芜åšçæäºåèœè¢«ç¶²ç«èšèšè
å©çšäŸè¿œè¹€æšçç寊身仜ãäŸåŠïŒblob URLsã廣æé »éãç芜åšæ«åè³æãcookiesãfaviconsãHTTPèªèæšé ãlink preconnectsãlocalStorageãvmediaSource URLsãOCSP requestsãSharedWorkersãTLS session ticketsçã">
-<!ENTITY torbutton.prefs.resist_fingerprinting "è®æŽå¯ä»¥åå¥æšèå
¶ä»æŽè¥è·¯ç±ç芜åšäœ¿çšè
ç詳现è³èš">
-<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "åŸéžååæ€åèœå¯ä»¥é¿å
äžé¢éäºè³èšè¢«æé 蚪ç網ç«ååŸïŒéäºè³èšéœå¯ä»¥è¢«çšäŸèå¥æšçç寊身仜ïŒé»è
Šç³»çµ±æèœãéµç€äœå±ãèªç³»èšå®ãå€æå
件çå®è£äœçœ®ãå·²å®è£ä¹å€æå
件ã網路çæ
ãè¢å¹ç倧å°è解æ床ãæ¯æŽçæªæ¡æ ŒåŒã系統è²åœ©èšå®ãWebGL ä¹ç¹ªåéç®èœåã">
<!ENTITY torbutton.prefs.sec_caption "å®å
šççŽ">
<!ENTITY torbutton.prefs.sec_caption_tooltip "æ€å®å
šæ§èª¿æŽæ»æ£æééæäºç芜åšçåèœïŒå°èŽæšçç芜åšæŽå®¹æéåé§å®¢æ»æã">
<!ENTITY torbutton.prefs.sec_standard_label "æšæº">
diff --git a/src/chrome/locale/zu/torbutton.dtd b/src/chrome/locale/zu/torbutton.dtd
index d8d88e49..baffea1d 100644
--- a/src/chrome/locale/zu/torbutton.dtd
+++ b/src/chrome/locale/zu/torbutton.dtd
@@ -18,5 +18,3 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/jar.mn b/src/jar.mn
index 142a5773..89c0386d 100644
--- a/src/jar.mn
+++ b/src/jar.mn
@@ -27,7 +27,6 @@ torbutton.jar:
# UI customization
% overlay chrome://browser/content/browser.xul chrome://torbutton/content/menu-items-overlay.xul
% overlay chrome://browser/content/browser.xul chrome://torbutton/content/menu-overlay.xul
-% overlay about:preferences chrome://torbutton/content/privacy-prefs-overlay.xul
% overlay chrome://browser/content/browser.xul chrome://torbutton/content/tor-circuit-display.xul
# Strings for the about:tbupdate page
1
0
[tor-browser/tor-browser-60.4.0esr-8.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 14 Jan '19
by gk＠torproject.org 14 Jan '19
14 Jan '19
commit 198e007fff1d7f1367a8917cc074a8a0f17548f6
Author: Georg Koppen <gk(a)torproject.org>
Date: Wed Jan 9 07:18:40 2019 +0000
fixup! TB4: Tor Browser's Firefox preference overrides.
This fixes bug 29028.
---
browser/app/profile/000-tor-browser.js | 3 ---
1 file changed, 3 deletions(-)
diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
index e19dd0dd59ae..2b238dd87c1b 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -154,9 +154,6 @@ pref("dom.vr.enabled", false); // Bug 21607: Disable WebVR for now
// Disable randomised Firefox HTTP cache decay user test groups (Bug: 13575)
pref("security.webauth.webauthn", false); // Bug 26614: Disable Web Authentication API for now
pref("browser.cache.frecency_experiment", -1);
-// Until https://bugzilla.mozilla.org/show_bug.cgi?id=1446472 is solved fall
-// back to old canvas behavior.
-pref("privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts", false);
// Third party stuff
pref("privacy.firstparty.isolate", true); // Always enforce first party isolation
1
0
[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 1474659 Part 1 - Add support to EnumSet for more than 32 values. r?sfink
by gk＠torproject.org 10 Jan '19
by gk＠torproject.org 10 Jan '19
10 Jan '19
commit f1381907e4a9a586e38c322dcb8f1bd02315d691
Author: Matt Howell <mhowell(a)mozilla.com>
Date: Tue Jan 8 09:00:20 2019 +0000
Bug 1474659 Part 1 - Add support to EnumSet for more than 32 values. r?sfink
The next patch in this series extends an enum that's used in an EnumSet to 34
values, so we need to extend EnumSet beyond a hardcoded uint32_t storage type.
---
mfbt/EnumSet.h | 55 +++++++++++----------
mfbt/tests/TestEnumSet.cpp | 121 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 151 insertions(+), 25 deletions(-)
diff --git a/mfbt/EnumSet.h b/mfbt/EnumSet.h
index d8c8a2af8b25..2e17a8f55186 100644
--- a/mfbt/EnumSet.h
+++ b/mfbt/EnumSet.h
@@ -13,21 +13,26 @@
#include "mozilla/Attributes.h"
#include <initializer_list>
+#include <limits>
#include <stdint.h>
namespace mozilla {
/**
- * EnumSet<T> is a set of values defined by an enumeration. It is implemented
- * using a 32 bit mask for each value so it will only work for enums with an int
- * representation less than 32. It works both for enum and enum class types.
+ * EnumSet represents a set of multiple values of an enum (or enum class).
+ * Template parameter T should be the enum you want to represent.
+ * EnumSet is implemented using a bitmask of all possible values of the enum T,
+ * and the default type for the bitmask value is uint32_t, so if your enum has
+ * more than 32 possible values, you should also supply a backing integer type
+ * as template parameter U which has at least as many bits as the number of
+ * possible values of enum T.
*/
-template<typename T>
+template<typename T, typename U = uint32_t>
class EnumSet
{
public:
- typedef uint32_t serializedType;
+ typedef U serializedType;
EnumSet()
: mBitField(0)
@@ -84,9 +89,9 @@ public:
/**
* Add an element
*/
- EnumSet<T> operator+(T aEnum) const
+ EnumSet<T,U> operator+(T aEnum) const
{
- EnumSet<T> result(*this);
+ EnumSet<T,U> result(*this);
result += aEnum;
return result;
}
@@ -94,7 +99,7 @@ public:
/**
* Union
*/
- void operator+=(const EnumSet<T> aEnumSet)
+ void operator+=(const EnumSet<T,U> aEnumSet)
{
incVersion();
mBitField |= aEnumSet.mBitField;
@@ -103,9 +108,9 @@ public:
/**
* Union
*/
- EnumSet<T> operator+(const EnumSet<T> aEnumSet) const
+ EnumSet<T,U> operator+(const EnumSet<T,U> aEnumSet) const
{
- EnumSet<T> result(*this);
+ EnumSet<T,U> result(*this);
result += aEnumSet;
return result;
}
@@ -122,9 +127,9 @@ public:
/**
* Remove an element
*/
- EnumSet<T> operator-(T aEnum) const
+ EnumSet<T,U> operator-(T aEnum) const
{
- EnumSet<T> result(*this);
+ EnumSet<T,U> result(*this);
result -= aEnum;
return result;
}
@@ -132,7 +137,7 @@ public:
/**
* Remove a set of elements
*/
- void operator-=(const EnumSet<T> aEnumSet)
+ void operator-=(const EnumSet<T,U> aEnumSet)
{
incVersion();
mBitField &= ~(aEnumSet.mBitField);
@@ -141,9 +146,9 @@ public:
/**
* Remove a set of elements
*/
- EnumSet<T> operator-(const EnumSet<T> aEnumSet) const
+ EnumSet<T,U> operator-(const EnumSet<T,U> aEnumSet) const
{
- EnumSet<T> result(*this);
+ EnumSet<T,U> result(*this);
result -= aEnumSet;
return result;
}
@@ -160,7 +165,7 @@ public:
/**
* Intersection
*/
- void operator&=(const EnumSet<T> aEnumSet)
+ void operator&=(const EnumSet<T,U> aEnumSet)
{
incVersion();
mBitField &= aEnumSet.mBitField;
@@ -169,9 +174,9 @@ public:
/**
* Intersection
*/
- EnumSet<T> operator&(const EnumSet<T> aEnumSet) const
+ EnumSet<T,U> operator&(const EnumSet<T,U> aEnumSet) const
{
- EnumSet<T> result(*this);
+ EnumSet<T,U> result(*this);
result &= aEnumSet;
return result;
}
@@ -179,7 +184,7 @@ public:
/**
* Equality
*/
- bool operator==(const EnumSet<T> aEnumSet) const
+ bool operator==(const EnumSet<T,U> aEnumSet) const
{
return mBitField == aEnumSet.mBitField;
}
@@ -198,7 +203,7 @@ public:
uint8_t size() const
{
uint8_t count = 0;
- for (uint32_t bitField = mBitField; bitField; bitField >>= 1) {
+ for (serializedType bitField = mBitField; bitField; bitField >>= 1) {
if (bitField & 1) {
count++;
}
@@ -224,7 +229,7 @@ public:
class ConstIterator
{
- const EnumSet<T>* mSet;
+ const EnumSet<T,U>* mSet;
uint32_t mPos;
#ifdef DEBUG
uint64_t mVersion;
@@ -236,7 +241,7 @@ public:
}
public:
- ConstIterator(const EnumSet<T>& aSet, uint32_t aPos)
+ ConstIterator(const EnumSet<T,U>& aSet, uint32_t aPos)
: mSet(&aSet), mPos(aPos)
{
#ifdef DEBUG
@@ -308,11 +313,11 @@ public:
}
private:
- static uint32_t bitFor(T aEnum)
+ static serializedType bitFor(T aEnum)
{
uint32_t bitNumber = (uint32_t)aEnum;
MOZ_ASSERT(bitNumber < kMaxBits);
- return 1U << bitNumber;
+ return (serializedType)1 << bitNumber;
}
void incVersion() {
@@ -321,7 +326,7 @@ private:
#endif
}
- static const size_t kMaxBits = 32;
+ static const size_t kMaxBits = std::numeric_limits<serializedType>::digits;
serializedType mBitField;
#ifdef DEBUG
diff --git a/mfbt/tests/TestEnumSet.cpp b/mfbt/tests/TestEnumSet.cpp
index 801295fd67dc..903b74c5b834 100644
--- a/mfbt/tests/TestEnumSet.cpp
+++ b/mfbt/tests/TestEnumSet.cpp
@@ -33,6 +33,65 @@ enum SeaBird
AUK
};
+enum DeepSeaFish
+{
+ FLATFISH,
+ HAGFISH,
+ EELPOUT,
+ GREENEYE_EEL,
+ STRINGRAY,
+ LUMPFISH,
+ BATFISH,
+ RATTAIL,
+ BROTULA,
+ BRISTLEMOUTH,
+ ANGLERFISH,
+ FANGTOOTH,
+ VIPERFISH,
+ BLACK_SWALLOWER,
+ TELESCOPEFISH,
+ HAMMERJAW,
+ DAGGERTOOTH,
+ BARRACUDINA,
+ SCABBARDFISH,
+ BOBTAIL_SNIPE_EEL,
+ UNICORN_CRESTFISH,
+ PELICAN_EEL,
+ FLABBY_WHALEFISH,
+ LANTERNFISH,
+ OPAH,
+ LANCEFISH,
+ BARRELEYE,
+ RIDGEHEAD,
+ SABRETOOTH,
+ STOPLIGHT_LOOSEJAW,
+ HATCHETFISH,
+ DOLPHINFISH,
+ POMFRET,
+ BARRACUDA,
+ SNAGGLETOOTH,
+ BLACKSMELT,
+ TAPIRFISH,
+ GRENADIER,
+ SLICKHEAD,
+ OREODORY,
+ SPIDERFISH,
+};
+
+enum Mollusc
+{
+ SNAIL,
+ SLUG,
+ CLAM,
+ OYSTER,
+ SCALLOP,
+ GEODUCK,
+ MUSSEL,
+ SQUID,
+ OCTOPUS,
+ CUTTLEFISH
+};
+
class EnumSetSuite
{
public:
@@ -62,6 +121,8 @@ public:
testDuplicates();
testIteration();
testInitializerListConstuctor();
+ testLargeEnum();
+ testSmallEnum();
}
private:
@@ -273,6 +334,66 @@ private:
MOZ_RELEASE_ASSERT(someBirds.contains(BOOBY));
}
+ void testLargeEnum()
+ {
+ typedef EnumSet<DeepSeaFish, uint64_t> FishSet;
+ FishSet fishes {};
+ MOZ_RELEASE_ASSERT(fishes.size() == 0);
+ MOZ_RELEASE_ASSERT(fishes.isEmpty());
+
+ fishes += ANGLERFISH;
+ fishes += SPIDERFISH;
+ fishes += GRENADIER;
+ fishes += FLATFISH;
+
+ MOZ_RELEASE_ASSERT(fishes.size() == 4);
+ MOZ_RELEASE_ASSERT(fishes.contains(ANGLERFISH));
+ MOZ_RELEASE_ASSERT(fishes.contains(SPIDERFISH));
+ MOZ_RELEASE_ASSERT(fishes.contains(GRENADIER));
+ MOZ_RELEASE_ASSERT(fishes.contains(FLATFISH));
+
+ Vector<DeepSeaFish> vec;
+ for (auto fish : fishes) {
+ MOZ_RELEASE_ASSERT(vec.append(fish));
+ }
+
+ MOZ_RELEASE_ASSERT(vec.length() == 4);
+ MOZ_RELEASE_ASSERT(vec[0] == FLATFISH);
+ MOZ_RELEASE_ASSERT(vec[1] == ANGLERFISH);
+ MOZ_RELEASE_ASSERT(vec[2] == GRENADIER);
+ MOZ_RELEASE_ASSERT(vec[3] == SPIDERFISH);
+ }
+
+ void testSmallEnum()
+ {
+ typedef EnumSet<Mollusc, uint16_t> MolluscSet;
+ MolluscSet molluscs {};
+ MOZ_RELEASE_ASSERT(molluscs.size() == 0);
+ MOZ_RELEASE_ASSERT(molluscs.isEmpty());
+
+ molluscs += OYSTER;
+ molluscs += SQUID;
+ molluscs += SNAIL;
+ molluscs += CUTTLEFISH;
+
+ MOZ_RELEASE_ASSERT(molluscs.size() == 4);
+ MOZ_RELEASE_ASSERT(molluscs.contains(OYSTER));
+ MOZ_RELEASE_ASSERT(molluscs.contains(SQUID));
+ MOZ_RELEASE_ASSERT(molluscs.contains(SNAIL));
+ MOZ_RELEASE_ASSERT(molluscs.contains(CUTTLEFISH));
+
+ Vector<Mollusc> vec;
+ for (auto mollusc : molluscs) {
+ MOZ_RELEASE_ASSERT(vec.append(mollusc));
+ }
+
+ MOZ_RELEASE_ASSERT(vec.length() == 4);
+ MOZ_RELEASE_ASSERT(vec[0] == SNAIL);
+ MOZ_RELEASE_ASSERT(vec[1] == OYSTER);
+ MOZ_RELEASE_ASSERT(vec[2] == SQUID);
+ MOZ_RELEASE_ASSERT(vec[3] == CUTTLEFISH);
+ }
+
EnumSet<SeaBird> mAlcidae;
EnumSet<SeaBird> mDiomedeidae;
EnumSet<SeaBird> mPetrelProcellariidae;
1
0
[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 1474659 Part 2 - Add dedicated AllocKinds just for ArrayBufferObjects. r?sfink
by gk＠torproject.org 10 Jan '19
by gk＠torproject.org 10 Jan '19
10 Jan '19
commit 4aa3f9efbdfa62123ed657ce27231ff27d36d9d2
Author: Matt Howell <mhowell(a)mozilla.com>
Date: Tue Jan 8 09:01:25 2019 +0000
Bug 1474659 Part 2 - Add dedicated AllocKinds just for ArrayBufferObjects. r?sfink
The reason for doing this is to get ArrayBufferObjects allocated into their own arenas.
The specific enum values were chosen to avoid breaking assumptions about where certain
values fall in the list, such as OBJECT_FIRST == FUNCTION.
---
js/src/gc/AllocKind.h | 4 ++++
js/src/gc/GC.cpp | 12 ++++++++++++
js/src/gc/GCRuntime.h | 2 +-
js/src/gc/ObjectKind-inl.h | 4 ++++
js/src/vm/ArrayBufferObject.cpp | 17 ++++++++++++++++-
5 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/js/src/gc/AllocKind.h b/js/src/gc/AllocKind.h
index c4f52bc5bf41..a9cee3a34fb4 100644
--- a/js/src/gc/AllocKind.h
+++ b/js/src/gc/AllocKind.h
@@ -43,12 +43,16 @@ namespace gc {
D(OBJECT0_BACKGROUND, Object, JSObject, JSObject_Slots0, true, true) \
D(OBJECT2, Object, JSObject, JSObject_Slots2, false, false) \
D(OBJECT2_BACKGROUND, Object, JSObject, JSObject_Slots2, true, true) \
+ D(ARRAYBUFFER4, Object, JSObject, JSObject_Slots4, true, true) \
D(OBJECT4, Object, JSObject, JSObject_Slots4, false, false) \
D(OBJECT4_BACKGROUND, Object, JSObject, JSObject_Slots4, true, true) \
+ D(ARRAYBUFFER8, Object, JSObject, JSObject_Slots8, true, true) \
D(OBJECT8, Object, JSObject, JSObject_Slots8, false, false) \
D(OBJECT8_BACKGROUND, Object, JSObject, JSObject_Slots8, true, true) \
+ D(ARRAYBUFFER12, Object, JSObject, JSObject_Slots12, true, true) \
D(OBJECT12, Object, JSObject, JSObject_Slots12, false, false) \
D(OBJECT12_BACKGROUND, Object, JSObject, JSObject_Slots12, true, true) \
+ D(ARRAYBUFFER16, Object, JSObject, JSObject_Slots16, true, true) \
D(OBJECT16, Object, JSObject, JSObject_Slots16, false, false) \
D(OBJECT16_BACKGROUND, Object, JSObject, JSObject_Slots16, true, true)
diff --git a/js/src/gc/GC.cpp b/js/src/gc/GC.cpp
index 8eeeb9ce72ff..27504c5e8fc6 100644
--- a/js/src/gc/GC.cpp
+++ b/js/src/gc/GC.cpp
@@ -467,9 +467,13 @@ static const FinalizePhase BackgroundFinalizePhases[] = {
AllocKind::FUNCTION_EXTENDED,
AllocKind::OBJECT0_BACKGROUND,
AllocKind::OBJECT2_BACKGROUND,
+ AllocKind::ARRAYBUFFER4,
AllocKind::OBJECT4_BACKGROUND,
+ AllocKind::ARRAYBUFFER8,
AllocKind::OBJECT8_BACKGROUND,
+ AllocKind::ARRAYBUFFER12,
AllocKind::OBJECT12_BACKGROUND,
+ AllocKind::ARRAYBUFFER16,
AllocKind::OBJECT16_BACKGROUND
}
},
@@ -2093,12 +2097,16 @@ static const AllocKind AllocKindsToRelocate[] = {
AllocKind::OBJECT0_BACKGROUND,
AllocKind::OBJECT2,
AllocKind::OBJECT2_BACKGROUND,
+ AllocKind::ARRAYBUFFER4,
AllocKind::OBJECT4,
AllocKind::OBJECT4_BACKGROUND,
+ AllocKind::ARRAYBUFFER8,
AllocKind::OBJECT8,
AllocKind::OBJECT8_BACKGROUND,
+ AllocKind::ARRAYBUFFER12,
AllocKind::OBJECT12,
AllocKind::OBJECT12_BACKGROUND,
+ AllocKind::ARRAYBUFFER16,
AllocKind::OBJECT16,
AllocKind::OBJECT16_BACKGROUND,
AllocKind::SCRIPT,
@@ -2812,12 +2820,16 @@ static const AllocKinds UpdatePhaseObjects {
AllocKind::OBJECT0_BACKGROUND,
AllocKind::OBJECT2,
AllocKind::OBJECT2_BACKGROUND,
+ AllocKind::ARRAYBUFFER4,
AllocKind::OBJECT4,
AllocKind::OBJECT4_BACKGROUND,
+ AllocKind::ARRAYBUFFER8,
AllocKind::OBJECT8,
AllocKind::OBJECT8_BACKGROUND,
+ AllocKind::ARRAYBUFFER12,
AllocKind::OBJECT12,
AllocKind::OBJECT12_BACKGROUND,
+ AllocKind::ARRAYBUFFER16,
AllocKind::OBJECT16,
AllocKind::OBJECT16_BACKGROUND
};
diff --git a/js/src/gc/GCRuntime.h b/js/src/gc/GCRuntime.h
index d6ca9ddc94fc..639481fbda54 100644
--- a/js/src/gc/GCRuntime.h
+++ b/js/src/gc/GCRuntime.h
@@ -186,7 +186,7 @@ class ChainedIter
typedef HashMap<Value*, const char*, DefaultHasher<Value*>, SystemAllocPolicy> RootedValueMap;
-using AllocKinds = mozilla::EnumSet<AllocKind>;
+using AllocKinds = mozilla::EnumSet<AllocKind, uint64_t>;
// A singly linked list of zones.
class ZoneList
diff --git a/js/src/gc/ObjectKind-inl.h b/js/src/gc/ObjectKind-inl.h
index d2cde1da08dc..106fbc012132 100644
--- a/js/src/gc/ObjectKind-inl.h
+++ b/js/src/gc/ObjectKind-inl.h
@@ -124,15 +124,19 @@ GetGCKindSlots(AllocKind thingKind)
case AllocKind::OBJECT2:
case AllocKind::OBJECT2_BACKGROUND:
return 2;
+ case AllocKind::ARRAYBUFFER4:
case AllocKind::OBJECT4:
case AllocKind::OBJECT4_BACKGROUND:
return 4;
+ case AllocKind::ARRAYBUFFER8:
case AllocKind::OBJECT8:
case AllocKind::OBJECT8_BACKGROUND:
return 8;
+ case AllocKind::ARRAYBUFFER12:
case AllocKind::OBJECT12:
case AllocKind::OBJECT12_BACKGROUND:
return 12;
+ case AllocKind::ARRAYBUFFER16:
case AllocKind::OBJECT16:
case AllocKind::OBJECT16_BACKGROUND:
return 16;
diff --git a/js/src/vm/ArrayBufferObject.cpp b/js/src/vm/ArrayBufferObject.cpp
index 0a342a6850c7..ef63b046ea12 100644
--- a/js/src/vm/ArrayBufferObject.cpp
+++ b/js/src/vm/ArrayBufferObject.cpp
@@ -1160,6 +1160,21 @@ ArrayBufferObject::setFlags(uint32_t flags)
setSlot(FLAGS_SLOT, Int32Value(flags));
}
+static inline AllocKind
+GetArrayBufferGCObjectKind(size_t numSlots)
+{
+ if (numSlots <= 4) {
+ return AllocKind::ARRAYBUFFER4;
+ }
+ if (numSlots <= 8) {
+ return AllocKind::ARRAYBUFFER8;
+ }
+ if (numSlots <= 12) {
+ return AllocKind::ARRAYBUFFER12;
+ }
+ return AllocKind::ARRAYBUFFER16;
+}
+
ArrayBufferObject*
ArrayBufferObject::create(JSContext* cx, uint32_t nbytes, BufferContents contents,
OwnsState ownsState /* = OwnsData */,
@@ -1220,7 +1235,7 @@ ArrayBufferObject::create(JSContext* cx, uint32_t nbytes, BufferContents content
}
MOZ_ASSERT(!(class_.flags & JSCLASS_HAS_PRIVATE));
- gc::AllocKind allocKind = GetGCObjectKind(nslots);
+ gc::AllocKind allocKind = GetArrayBufferGCObjectKind(nslots);
AutoSetNewObjectMetadata metadata(cx);
Rooted<ArrayBufferObject*> obj(cx,
1
0