tbb-commits
Threads by month
- ----- 2025 -----
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
January 2018
- 2 participants
- 44 discussions

[tor-browser-build/master] Bug 18691: switch Windows builds from precise to jessie
by gk@torproject.org 17 Jan '18
by gk@torproject.org 17 Jan '18
17 Jan '18
commit d6eb63ecc91d3227fce195af5e003c9928958e9f
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Wed Jan 10 13:22:31 2018 +0100
Bug 18691: switch Windows builds from precise to jessie
---
projects/argparse/build | 4 +-
projects/argparse/config | 3 +-
projects/binutils/build | 2 +
projects/binutils/config | 2 +
projects/binutils/fix-warning-bfd.patch | 186 ++++++++++++++++++++++++++++++++
projects/fteproxy/build | 2 +-
projects/fteproxy/config | 3 +-
projects/libfte/build | 4 +-
projects/libfte/config | 2 +-
projects/obfsproxy/build | 4 +-
projects/obfsproxy/config | 3 +-
projects/parsley/build | 4 +-
projects/parsley/config | 3 +-
projects/pycrypto/build | 2 +-
projects/pycrypto/config | 2 +-
projects/pyptlib/build | 2 +-
projects/pyptlib/config | 3 +-
projects/pyyaml/build | 4 +-
projects/pyyaml/config | 3 +-
projects/twisted/build | 4 +-
projects/twisted/config | 2 +-
projects/txsocksx/build | 4 +-
projects/txsocksx/config | 3 +-
projects/winpython/build | 4 +-
projects/winpython/config | 4 +-
projects/zope.interface/build | 4 +-
projects/zope.interface/config | 2 +-
rbm.conf | 32 +-----
28 files changed, 234 insertions(+), 63 deletions(-)
diff --git a/projects/argparse/build b/projects/argparse/build
index 29e4221..3d5b424 100644
--- a/projects/argparse/build
+++ b/projects/argparse/build
@@ -13,8 +13,8 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
[% IF c("var/windows") -%]
pydir="$distdir/python"
mkdir -p $pydir/Lib/site-packages
- export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages"
- $PYTHON setup.py install --prefix=$(winepath -w $pydir)
+ export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages"
+ $PYTHON setup.py install --prefix=$(wine winepath -w $pydir)
[% ELSE -%]
python2 setup.py build --build-lib build
cp -a build/argparse.py $PTDIR/
diff --git a/projects/argparse/config b/projects/argparse/config
index c4d9dec..730a4f1 100644
--- a/projects/argparse/config
+++ b/projects/argparse/config
@@ -15,7 +15,8 @@ targets:
windows-i686:
var:
compiler: winpython
- post_pkginst: '[% c("var/install_wine_ppa") %]'
+ arch_deps:
+ - wine
input_files:
- project: container-image
diff --git a/projects/binutils/build b/projects/binutils/build
index aa0d752..ee6db1a 100644
--- a/projects/binutils/build
+++ b/projects/binutils/build
@@ -25,6 +25,8 @@ cd [% project %]-[% c("version") %]
patch -p1 < ../peXXigen.patch
# Needed for the hardening...
patch -p1 < ../enable-reloc-section-ld.patch
+ # fix "right-hand operand of comma expression has no effect" warning
+ patch -p1 < ../fix-warning-bfd.patch
[% END -%]
[% IF c('var/windows-x86_64') -%]
patch -p1 < ../64bit-fixups.patch
diff --git a/projects/binutils/config b/projects/binutils/config
index 25417c0..5c35588 100644
--- a/projects/binutils/config
+++ b/projects/binutils/config
@@ -19,6 +19,8 @@ input_files:
- project: container-image
- filename: enable-reloc-section-ld.patch
enable: '[% c("var/windows") %]'
+ - filename: fix-warning-bfd.patch
+ enable: '[% c("var/windows") %]'
- filename: 64bit-fixups.patch
enable: '[% c("var/windows-x86_64") %]'
- filename: peXXigen.patch
diff --git a/projects/binutils/fix-warning-bfd.patch b/projects/binutils/fix-warning-bfd.patch
new file mode 100644
index 0000000..fa04405
--- /dev/null
+++ b/projects/binutils/fix-warning-bfd.patch
@@ -0,0 +1,186 @@
+From 27b829ee701e29804216b3803fbaeb629be27491 Mon Sep 17 00:00:00 2001
+From: Nick Clifton <nickc(a)redhat.com>
+Date: Wed, 29 Jan 2014 13:46:39 +0000
+Subject: [PATCH] Following up on Tom's suggestion I am checking in a patch to
+ replace the various bfd_xxx_set macros with static inline functions, so that
+ we can avoid compile time warnings about comma expressions with unused
+ values.
+
+ * bfd-in.h (bfd_set_section_vma): Delete.
+ (bfd_set_section_alignment): Delete.
+ (bfd_set_section_userdata): Delete.
+ (bfd_set_cacheable): Delete.
+ * bfd.c (bfd_set_cacheable): New static inline function.
+ * section.c (bfd_set_section_userdata): Likewise.
+ (bfd_set_section_vma): Likewise.
+ (bfd_set_section_alignment): Likewise.
+ * bfd-in2.h: Regenerate.
+---
+ bfd/bfd-in.h | 5 -----
+ bfd/bfd-in2.h | 41 +++++++++++++++++++++++++++++++++++------
+ bfd/bfd.c | 8 ++++++++
+ bfd/section.c | 26 ++++++++++++++++++++++++++
+ 5 files changed, 81 insertions(+), 11 deletions(-)
+
+diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
+index 3afd71b..c7c5a7d 100644
+--- a/bfd/bfd-in.h
++++ b/bfd/bfd-in.h
+@@ -292,9 +292,6 @@ typedef struct bfd_section *sec_ptr;
+
+ #define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0)
+
+-#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE)
+-#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE)
+-#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE)
+ /* Find the address one past the end of SEC. */
+ #define bfd_get_section_limit(bfd, sec) \
+ (((bfd)->direction != write_direction && (sec)->rawsize != 0 \
+@@ -517,8 +514,6 @@ extern void warn_deprecated (const char *, const char *, int, const char *);
+
+ #define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char)
+
+-#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = bool), TRUE)
+-
+ extern bfd_boolean bfd_cache_close
+ (bfd *abfd);
+ /* NB: This declaration should match the autogenerated one in libbfd.h. */
+diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
+index 71996db..b5aeb40 100644
+--- a/bfd/bfd-in2.h
++++ b/bfd/bfd-in2.h
+@@ -299,9 +299,6 @@ typedef struct bfd_section *sec_ptr;
+
+ #define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0)
+
+-#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE)
+-#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE)
+-#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE)
+ /* Find the address one past the end of SEC. */
+ #define bfd_get_section_limit(bfd, sec) \
+ (((bfd)->direction != write_direction && (sec)->rawsize != 0 \
+@@ -524,8 +521,6 @@ extern void warn_deprecated (const char *, const char *, int, const char *);
+
+ #define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char)
+
+-#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = bool), TRUE)
+-
+ extern bfd_boolean bfd_cache_close
+ (bfd *abfd);
+ /* NB: This declaration should match the autogenerated one in libbfd.h. */
+@@ -1029,7 +1024,7 @@ bfd *bfd_openr (const char *filename, const char *target);
+
+ bfd *bfd_fdopenr (const char *filename, const char *target, int fd);
+
+-bfd *bfd_openstreamr (const char *, const char *, void *);
++bfd *bfd_openstreamr (const char * filename, const char * target, void * stream);
+
+ bfd *bfd_openr_iovec (const char *filename, const char *target,
+ void *(*open_func) (struct bfd *nbfd,
+@@ -1596,6 +1591,32 @@ struct relax_table {
+ int size;
+ };
+
++/* Note: the following are provided as inline functions rather than macros
++ because not all callers use the return value. A macro implementation
++ would use a comma expression, eg: "((ptr)->foo = val, TRUE)" and some
++ compilers will complain about comma expressions that have no effect. */
++static inline bfd_boolean
++bfd_set_section_userdata (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, void * val)
++{
++ ptr->userdata = val;
++ return TRUE;
++}
++
++static inline bfd_boolean
++bfd_set_section_vma (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, bfd_vma val)
++{
++ ptr->vma = ptr->lma = val;
++ ptr->user_set_vma = TRUE;
++ return TRUE;
++}
++
++static inline bfd_boolean
++bfd_set_section_alignment (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, unsigned int val)
++{
++ ptr->alignment_power = val;
++ return TRUE;
++}
++
+ /* These sections are global, and are managed by BFD. The application
+ and target back end are not permitted to change the values in
+ these sections. */
+@@ -6415,6 +6436,14 @@ struct bfd
+ unsigned int selective_search : 1;
+ };
+
++/* See note beside bfd_set_section_userdata. */
++static inline bfd_boolean
++bfd_set_cacheable (bfd * abfd, bfd_boolean val)
++{
++ abfd->cacheable = val;
++ return TRUE;
++}
++
+ typedef enum bfd_error
+ {
+ bfd_error_no_error = 0,
+diff --git a/bfd/bfd.c b/bfd/bfd.c
+index 8d0580c..2d174f3 100644
+--- a/bfd/bfd.c
++++ b/bfd/bfd.c
+@@ -311,6 +311,14 @@ CODE_FRAGMENT
+ . unsigned int selective_search : 1;
+ .};
+ .
++.{* See note beside bfd_set_section_userdata. *}
++.static inline bfd_boolean
++.bfd_set_cacheable (bfd * abfd, bfd_boolean val)
++.{
++. abfd->cacheable = val;
++. return TRUE;
++.}
++.
+ */
+
+ #include "sysdep.h"
+diff --git a/bfd/section.c b/bfd/section.c
+index fb19d8c..a661228 100644
+--- a/bfd/section.c
++++ b/bfd/section.c
+@@ -542,6 +542,32 @@ CODE_FRAGMENT
+ . int size;
+ .};
+ .
++.{* Note: the following are provided as inline functions rather than macros
++. because not all callers use the return value. A macro implementation
++. would use a comma expression, eg: "((ptr)->foo = val, TRUE)" and some
++. compilers will complain about comma expressions that have no effect. *}
++.static inline bfd_boolean
++.bfd_set_section_userdata (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, void * val)
++.{
++. ptr->userdata = val;
++. return TRUE;
++.}
++.
++.static inline bfd_boolean
++.bfd_set_section_vma (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, bfd_vma val)
++.{
++. ptr->vma = ptr->lma = val;
++. ptr->user_set_vma = TRUE;
++. return TRUE;
++.}
++.
++.static inline bfd_boolean
++.bfd_set_section_alignment (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, unsigned int val)
++.{
++. ptr->alignment_power = val;
++. return TRUE;
++.}
++.
+ .{* These sections are global, and are managed by BFD. The application
+ . and target back end are not permitted to change the values in
+ . these sections. *}
+--
+2.1.4
+
diff --git a/projects/fteproxy/build b/projects/fteproxy/build
index 0d9baf1..310c9a5 100644
--- a/projects/fteproxy/build
+++ b/projects/fteproxy/build
@@ -12,7 +12,7 @@ tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz
cd /var/tmp/build/[% project %]-[% c('version') %]
[% IF c("var/windows") -%]
pydir="$distdir/python"
- export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages"
+ export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages"
$PYTHON setup_tbb.py py2exe
py2exe_zip_timestomp dist/fteproxy.zip
cp -an dist/{*.pyd,*.exe,*.zip} $PTDIR/
diff --git a/projects/fteproxy/config b/projects/fteproxy/config
index 6a13e0d..d58095e 100644
--- a/projects/fteproxy/config
+++ b/projects/fteproxy/config
@@ -18,7 +18,8 @@ targets:
windows-i686:
var:
compiler: winpython
- post_pkginst: '[% c("var/install_wine_ppa") %]'
+ arch_deps:
+ - wine
input_files:
- project: container-image
diff --git a/projects/libfte/build b/projects/libfte/build
index 62c8fce..9493f30 100644
--- a/projects/libfte/build
+++ b/projects/libfte/build
@@ -16,12 +16,12 @@ tar -C $distdir -xf $rootdir/[% c('input_files_by_name/obfsproxy') %]
pydir=$distdir/python
export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]"
export LD_PRELOAD=
- export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages"
+ export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages"
# FTE only needs libgmp-10.dll and no libgmpxx anymore.
cp -a /var/tmp/dist/gmp/bin/libgmp-10.dll .
cp -a /var/tmp/dist/gmp/bin/libgmp-10.dll $distdir/TorBrowser/Tor/
WINDOWS_BUILD=1 CROSS_COMPILE=1 make
- $PYTHON setup.py install --prefix=$(winepath -w "$pydir")
+ $PYTHON setup.py install --prefix=$(wine winepath -w "$pydir")
$PYTHON setup.py install
[% ELSE -%]
export PYTHON=python2
diff --git a/projects/libfte/config b/projects/libfte/config
index 4c34116..3b33cf6 100644
--- a/projects/libfte/config
+++ b/projects/libfte/config
@@ -17,8 +17,8 @@ targets:
windows-i686:
var:
compiler: winpython
- post_pkginst: '[% c("var/install_wine_ppa") %]'
arch_deps:
+ - wine
- faketime
input_files:
diff --git a/projects/obfsproxy/build b/projects/obfsproxy/build
index 9d64aa9..2c87e95 100644
--- a/projects/obfsproxy/build
+++ b/projects/obfsproxy/build
@@ -21,9 +21,9 @@ tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz
cd /var/tmp/build/[% project %]-[% c('version') %]
[% IF c("var/windows") -%]
pydir="$distdir/python"
- export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages"
+ export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages"
$PYTHON setup_py2exe.py py2exe
- $PYTHON setup.py install --prefix=$(winepath -w $pydir)
+ $PYTHON setup.py install --prefix=$(wine winepath -w $pydir)
py2exe_zip_timestomp py2exe_bundle/dist/obfsproxy.zip
cp -an py2exe_bundle/dist/{*.pyd,*.exe,*.zip} $PTDIR/
# http://bugs.winehq.org/show_bug.cgi?id=3591
diff --git a/projects/obfsproxy/config b/projects/obfsproxy/config
index 9134de1..9286c61 100644
--- a/projects/obfsproxy/config
+++ b/projects/obfsproxy/config
@@ -20,7 +20,8 @@ targets:
windows-i686:
var:
compiler: winpython
- post_pkginst: '[% c("var/install_wine_ppa") %]'
+ arch_deps:
+ - wine
input_files:
- project: container-image
diff --git a/projects/parsley/build b/projects/parsley/build
index 1d52f9a..7b6e632 100644
--- a/projects/parsley/build
+++ b/projects/parsley/build
@@ -13,8 +13,8 @@ cd /var/tmp/build/Parsley-[% c('version') %]
[% IF c("var/windows") -%]
pydir="$distdir/python"
mkdir -p $pydir/Lib/site-packages
- export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages"
- $PYTHON setup.py install --prefix=$(winepath -w $pydir)
+ export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages"
+ $PYTHON setup.py install --prefix=$(wine winepath -w $pydir)
[% ELSE -%]
PYTHON=python2
$PYTHON setup.py build --build-lib build
diff --git a/projects/parsley/config b/projects/parsley/config
index b788899..f305822 100644
--- a/projects/parsley/config
+++ b/projects/parsley/config
@@ -15,7 +15,8 @@ targets:
windows-i686:
var:
compiler: winpython
- post_pkginst: '[% c("var/install_wine_ppa") %]'
+ arch_deps:
+ - wine
input_files:
- project: container-image
diff --git a/projects/pycrypto/build b/projects/pycrypto/build
index 51ec5ce..084939f 100644
--- a/projects/pycrypto/build
+++ b/projects/pycrypto/build
@@ -27,7 +27,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
ac_cv_func_malloc_0_nonnull=yes sh configure --host=i686-w64-mingw32
export LD_PRELOAD=
$PYTHON setup.py build_ext -c mingw32
- $PYTHON setup.py install --prefix=$(winepath -w $pydir)
+ $PYTHON setup.py install --prefix=$(wine winepath -w $pydir)
[% ELSE -%]
export PYTHON=python2
./configure --build=i686-linux-gnu [% c("var/configure_opt") %]
diff --git a/projects/pycrypto/config b/projects/pycrypto/config
index ca314c8..c55844b 100644
--- a/projects/pycrypto/config
+++ b/projects/pycrypto/config
@@ -15,9 +15,9 @@ targets:
windows-i686:
var:
compiler: winpython
- post_pkginst: '[% c("var/install_wine_ppa") %]'
arch_deps:
- faketime
+ - wine
input_files:
- project: container-image
diff --git a/projects/pyptlib/build b/projects/pyptlib/build
index de70c5b..fa6d78d 100644
--- a/projects/pyptlib/build
+++ b/projects/pyptlib/build
@@ -14,7 +14,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
[% IF c("var/windows") -%]
pydir="$distdir/python"
mkdir -p "$pydir"
- $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(winepath -w $pydir)
+ $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(wine winepath -w $pydir)
[% ELSE -%]
export PYTHON=python2
$PYTHON setup.py build --build-lib build
diff --git a/projects/pyptlib/config b/projects/pyptlib/config
index 7ae1d68..36a6037 100644
--- a/projects/pyptlib/config
+++ b/projects/pyptlib/config
@@ -19,7 +19,8 @@ targets:
windows-i686:
var:
compiler: winpython
- post_pkginst: '[% c("var/install_wine_ppa") %]'
+ arch_deps:
+ - wine
input_files:
- project: container-image
diff --git a/projects/pyyaml/build b/projects/pyyaml/build
index d3d60d7..72dc553 100644
--- a/projects/pyyaml/build
+++ b/projects/pyyaml/build
@@ -13,8 +13,8 @@ cd /var/tmp/build/PyYAML-[% c('version') %]
[% IF c("var/windows") -%]
pydir="$distdir/python"
mkdir -p $pydir/Lib/site-packages
- export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages"
- $PYTHON setup.py install --prefix=$(winepath -w $pydir)
+ export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages"
+ $PYTHON setup.py install --prefix=$(wine winepath -w $pydir)
[% ELSE -%]
export PYTHON=python2
$PYTHON setup.py build --build-lib build
diff --git a/projects/pyyaml/config b/projects/pyyaml/config
index 8d43bf6..f2b928e 100644
--- a/projects/pyyaml/config
+++ b/projects/pyyaml/config
@@ -15,7 +15,8 @@ targets:
windows-i686:
var:
compiler: winpython
- post_pkginst: '[% c("var/install_wine_ppa") %]'
+ arch_deps:
+ - wine
input_files:
- project: container-image
diff --git a/projects/twisted/build b/projects/twisted/build
index 0d9154f..077143c 100644
--- a/projects/twisted/build
+++ b/projects/twisted/build
@@ -24,8 +24,8 @@ cd /var/tmp/build/Twisted-[% c('version') %]
# the -c option, so we set the compiler in a configuration file.
echo $'[build_ext]\ncompiler=mingw32' > setup.cfg
mkdir -p $pydir/Lib/site-packages
- export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages"
- LD_PRELOAD= $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(winepath -w $pydir)
+ export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages"
+ LD_PRELOAD= $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(wine winepath -w $pydir)
[% ELSE -%]
export PYTHON=python2
$PYTHON setup.py build --build-lib build
diff --git a/projects/twisted/config b/projects/twisted/config
index 2f35166..4dbbb26 100644
--- a/projects/twisted/config
+++ b/projects/twisted/config
@@ -15,10 +15,10 @@ targets:
windows-i686:
var:
compiler: winpython
- post_pkginst: '[% c("var/install_wine_ppa") %]'
arch_deps:
- p7zip-full
- faketime
+ - wine
input_files:
- project: container-image
diff --git a/projects/txsocksx/build b/projects/txsocksx/build
index 31d7b18..3491d11 100644
--- a/projects/txsocksx/build
+++ b/projects/txsocksx/build
@@ -18,8 +18,8 @@ mkdir vcversioner-1.14.1.1-py2.7.egg
[% IF c("var/windows") -%]
pydir="$distdir/python"
mkdir -p $pydir/Lib/site-packages
- export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages"
- $PYTHON setup.py install_lib --install-dir=$(winepath -w "$pydir/Lib/site-packages")
+ export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages"
+ $PYTHON setup.py install_lib --install-dir=$(wine winepath -w "$pydir/Lib/site-packages")
[% ELSE -%]
export PYTHON=python2
$PYTHON setup.py build --build-lib build
diff --git a/projects/txsocksx/config b/projects/txsocksx/config
index 18fc4a8..061af53 100644
--- a/projects/txsocksx/config
+++ b/projects/txsocksx/config
@@ -17,7 +17,8 @@ targets:
windows-i686:
var:
compiler: winpython
- post_pkginst: '[% c("var/install_wine_ppa") %]'
+ arch_deps:
+ - wine
input_files:
- project: container-image
diff --git a/projects/winpython/build b/projects/winpython/build
index 5f53b9c..db78a0f 100644
--- a/projects/winpython/build
+++ b/projects/winpython/build
@@ -5,8 +5,8 @@ set -e
distdir="/var/tmp/dist/[% project %]"
mkdir -p $distdir
WINEROOT=$HOME/.wine/drive_c
-wineboot -i
-msiexec /qn /i python-[% c("version") %].msi TARGETDIR=$distdir
+wine wineboot -i
+wine msiexec /qn /i python-[% c("version") %].msi TARGETDIR=$distdir
sed -i 's/self.dll_libraries = get_msvcr()/pass#self.dll_libraries = get_msvcr()/g' $distdir/Lib/distutils/cygwinccompiler.py
tar xf setuptools-*.tar.gz
rm setuptools-*.tar.gz
diff --git a/projects/winpython/config b/projects/winpython/config
index dcd21f6..9f884c0 100644
--- a/projects/winpython/config
+++ b/projects/winpython/config
@@ -4,10 +4,10 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
var:
compiler: mingw-w64
- post_pkginst: '[% c("var/install_wine_ppa") %]'
arch_deps:
- p7zip-full
- faketime
+ - wine
container:
use_container: 1
setup: |
@@ -17,7 +17,7 @@ var:
export HOME=/var/tmp/home
mkdir -p $HOME
WINEROOT=$HOME/.wine/drive_c
- wineboot -i
+ wine wineboot -i
cp -a /var/tmp/dist/winpython/wineroot/windows/* $WINEROOT/windows/
export PYTHON="wine /var/tmp/dist/winpython/python.exe"
diff --git a/projects/zope.interface/build b/projects/zope.interface/build
index 29406fb..b126989 100644
--- a/projects/zope.interface/build
+++ b/projects/zope.interface/build
@@ -15,10 +15,10 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
find -type f -print0 | xargs -0 [% c("var/touch") %]
pydir="$distdir/python"
mkdir -p $pydir/Lib/site-packages
- export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages"
+ export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages"
export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]"
LD_PRELOAD= $PYTHON setup.py build_ext -c mingw32
- $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(winepath -w $pydir)
+ $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(wine winepath -w $pydir)
# Must create this file in order for py2exe to find the package.
touch $pydir/Lib/site-packages/zope/__init__.py
[% ELSE -%]
diff --git a/projects/zope.interface/config b/projects/zope.interface/config
index 4ae3cff..ffba3df 100644
--- a/projects/zope.interface/config
+++ b/projects/zope.interface/config
@@ -15,9 +15,9 @@ targets:
windows-i686:
var:
compiler: winpython
- post_pkginst: '[% c("var/install_wine_ppa") %]'
arch_deps:
- faketime
+ - wine
input_files:
- project: container-image
diff --git a/rbm.conf b/rbm.conf
index 95b7447..4b4162c 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -194,6 +194,7 @@ targets:
osname: windows-x86_64
container:
arch: amd64
+ faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1
windows-i686:
arch: i686
var:
@@ -201,6 +202,7 @@ targets:
osname: windows-i686
container:
arch: i386
+ faketime_path: /usr/lib/i386-linux-gnu/faketime/libfaketime.so.1
setarch: |
if test -z "$RBM_SETARCH"
then
@@ -212,7 +214,7 @@ targets:
var:
windows: 1
container:
- suite: precise
+ suite: jessie
configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"'
CFLAGS: '[% c("var/flag_mwindows") %] -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security'
LDFLAGS: '[% c("var/flag_mwindows") %] -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs'
@@ -226,34 +228,6 @@ targets:
- libtool
- zip
- unzip
- faketime_path: /usr/lib/faketime/libfaketime.so.1
- install_wine_ppa: |
- # Install a Wine new enough to have a fix for
- # http://bugs.winehq.org/show_bug.cgi?id=29764; otherwise Python run under
- # Wine constantly crashes in _PyVerify_fd, which is called by such common
- # operations as io.open and os.fstat (anything involving a file descriptor
- # number). Ubuntu's main repository only has wine1.4, and the issue was fixed
- # in 1.5.29.
- echo 'deb http://ppa.launchpad.net/ubuntu-wine/ppa/ubuntu precise main' >> /etc/apt/sources.list
- # This key is from https://launchpad.net/~ubuntu-wine/+archive/ppa and
- # http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0x5A9A06AEF9CB8D….
- apt-key add - << EOF
- -----BEGIN PGP PUBLIC KEY BLOCK-----
- Version: GnuPG v1
-
- mI0ESXVzlQEEAN1BxiR961SiFrJ7tacrAImCmDdxs4OSifgpBAp8q0fe0iLcSeAo
- WdS7H+7Y4T+/2t3XEw7+3cD831WBu8c/Pv0ldx5TyDyOQmEtUBlMqy33WdKVxsci
- rnag8ShrNM9PtG/vAQU/JtfQl68dXfD3BsCtrXVrjqcO2AxNYBSvd9hpABEBAAG0
- IkxhdW5jaHBhZCBQUEEgZm9yIFVidW50dSBXaW5lIFRlYW2ItgQTAQIAIAUCSXVz
- lQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEFqaBq75y42wflcD/jLMihWM
- zRCO60S/a7SqD0QNqV/nAYEOsma/Y2C/uhQ44j0np+iOB6+PDRbyJ8GVgIjpaIbt
- l4sReXcf7bS9Dhhn5Gbe/n6VQr7xoMr1Io0PrXdmWpmsOfCuebWU4bV1w+YBvHFF
- qTu5QF2Y0Fj9bRxQdQ1M2HcnXOiLq82hKlb+
- =Z9DY
- -----END PGP PUBLIC KEY BLOCK-----
- EOF
- apt-get update
- apt-get --no-install-recommends -y install wine
torbrowser-osx-x86_64:
- osx-x86_64
1
0

[tor-browser-build/master] Bug 24756: Add noisebridge01 obfs4 bridge configuration
by gk@torproject.org 17 Jan '18
by gk@torproject.org 17 Jan '18
17 Jan '18
commit ccf20f2ccb106dbe1fa44b1e569bba9ce3682ddf
Author: Patrick O'Doherty <p(a)trickod.com>
Date: Sun Jan 14 12:41:40 2018 -0800
Bug 24756: Add noisebridge01 obfs4 bridge configuration
---
projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js
index 258586f..a3f5326 100644
--- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js
+++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js
@@ -39,6 +39,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.23", "obfs4 37.218.240.34:4003
pref("extensions.torlauncher.default_bridge.obfs4.24", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0");
pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0");
pref("extensions.torlauncher.default_bridge.obfs4.26", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.27", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0");
pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com");
pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");
1
0

[tor-browser-build/master] Bug 24912: Don't build the macOS sandbox in the stable series
by gk@torproject.org 17 Jan '18
by gk@torproject.org 17 Jan '18
17 Jan '18
commit 62f2dced863d2dfcd5076c101bda0f4c9c10d508
Author: Georg Koppen <gk(a)torproject.org>
Date: Tue Jan 16 15:09:41 2018 +0000
Bug 24912: Don't build the macOS sandbox in the stable series
---
projects/tor-browser/build | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index bfa250a..59fbda5 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -106,13 +106,14 @@ tar -C $TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %] -xf [% c('input_files_b
rm -Rf Bundle-Data/mac
mv $SKELETON_TMP Bundle-Data/mac
-
# Install a "tor" shim that sets the working directory. See #10030.
mv $TBDIR/$TORBINPATH/tor $TBDIR/$TORBINPATH/tor.real
cp Bundle-Data/mac-tor.sh $TBDIR/$TORCONFIGPATH/tor
- SANDBOX_FOLDER="$TB_STAGE_DIR/Sandboxed Tor Browser"
- mv Bundle-Data/mac-sandbox "$SANDBOX_FOLDER"
+ [% IF ! c("var/release") -%]
+ SANDBOX_FOLDER="$TB_STAGE_DIR/Sandboxed Tor Browser"
+ mv Bundle-Data/mac-sandbox "$SANDBOX_FOLDER"
+ [% END -%]
tar -C Bundle-Data/mac-applications.dmg -c . | tar -C $TB_STAGE_DIR -x
[% END %]
1
0

[tor-browser-build/master] Bug 24912: Don't build snowflake on the stable series yet
by gk@torproject.org 16 Jan '18
by gk@torproject.org 16 Jan '18
16 Jan '18
commit ba6ac61ef5a80eaf53dcc4f4b9622d2b9e12a9bb
Author: Georg Koppen <gk(a)torproject.org>
Date: Tue Jan 16 12:06:04 2018 +0000
Bug 24912: Don't build snowflake on the stable series yet
---
projects/tor-browser/build | 11 +++++++++--
rbm.conf | 10 ++++++----
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index e87ef11..bfa250a 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -123,7 +123,12 @@ tar -C Bundle-Data/[% bundledata_osname %] -c . | tar -C $TBDIR[% IF ! c("var/os
cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> $TBDIR/$TORCONFIGPATH/torrc-defaults
[% IF c("var/linux") -%]
- cat Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH
+ [% IF ! c("var/snowflake") %]
+ grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \
+ >> $TBDIR/$EXTOVERRIDESPATH
+ [% ELSE %]
+ cat Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH
+ [% END %]
[% END -%]
[% IF c("var/windows") -%]
# We don't have snowflake available on Windows yet
@@ -134,7 +139,9 @@ cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> $TB
[% END -%]
[% IF c("var/osx") -%]
# FTE is temporarily removed due to bug 18495.
- grep -Ev 'default_bridge\.fte' Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH
+ grep -Ev 'default_bridge\.fte' Bundle-Data/PTConfigs/bridge_prefs.js \
+ [% IF ! c("var/snowflake") %]| grep -v 'default_bridge\.snowflake' [% END %] \
+ >> $TBDIR/$EXTOVERRIDESPATH
[% END -%]
cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> $TBDIR/$MEEKPROFILEPATH/user.js
diff --git a/rbm.conf b/rbm.conf
index ed2319d..95b7447 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -162,8 +162,9 @@ targets:
var:
linux: 1
compiler: gcc
- # We only build snowflake on linux and osx for now
- snowflake: 1
+ # We only build snowflake for linux and osx on the alpha and nightly
+ # channels for now.
+ snowflake: '[% c("var/alpha") || c("var/nightly") %]'
fteproxy: 1
container:
suite: wheezy
@@ -269,8 +270,9 @@ targets:
FLAGS: "-target x86_64-apple-darwin10 -mlinker-version=136 -B $cctoolsdir -isysroot $sysrootdir"
LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie"
locale_ja: ja-JP-mac
- # We only build snowflake on linux and osx for now
- snowflake: 1
+ # We only build snowflake for linux and osx on the alpha and nightly
+ # channels for now.
+ snowflake: '[% c("var/alpha") || c("var/nightly") %]'
deps:
- build-essential
- python
1
0

[tor-browser-build/master] Bug 24912: Disable selfrando on stable series
by gk@torproject.org 16 Jan '18
by gk@torproject.org 16 Jan '18
16 Jan '18
commit a1347df3ca9d094b53c2aee516a7c96111422d12
Author: Georg Koppen <gk(a)torproject.org>
Date: Tue Jan 16 13:15:54 2018 +0000
Bug 24912: Disable selfrando on stable series
---
projects/binutils/build | 2 +-
projects/firefox/build | 2 +-
projects/firefox/config | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/projects/binutils/build b/projects/binutils/build
index 6d8e0b2..aa0d752 100644
--- a/projects/binutils/build
+++ b/projects/binutils/build
@@ -29,7 +29,7 @@ cd [% project %]-[% c("version") %]
[% IF c('var/windows-x86_64') -%]
patch -p1 < ../64bit-fixups.patch
[% END -%]
-[% IF c("var/linux") -%]
+[% IF c("var/linux") && ! c("var/release") -%]
# We need to work around a gold linker bug in 2.24 to get selfrando working,
# see bug 20683.
patch -p1 < $rootdir/binutils-224-gold.patch
diff --git a/projects/firefox/build b/projects/firefox/build
index ed559b0..81d4d1c 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -27,7 +27,7 @@ mkdir -p /var/tmp/build
export PATH="/var/tmp/dist/binutils/bin:$PATH"
[% END -%]
-[% IF c("var/linux") -%]
+[% IF c("var/linux") && ! c("var/release") -%]
tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/selfrando') %]
# Selfrando wrapper
export PATH="/var/tmp/dist/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH"
diff --git a/projects/firefox/config b/projects/firefox/config
index 182b6b5..59a4418 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -82,7 +82,7 @@ input_files:
enable: '[% c("var/linux") %]'
- project: selfrando
name: selfrando
- enable: '[% c("var/linux") %]'
+ enable: '[% c("var/linux") && ! c("var/release") %]'
- filename: fix-info-plist.py
enable: '[% c("var/osx") %]'
- URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll
1
0

16 Jan '18
commit dc51005d4944d6be9ca1c06331c3f9ee1cee51fc
Author: Georg Koppen <gk(a)torproject.org>
Date: Tue Jan 16 12:45:00 2018 +0000
Bug 24912: No Win64 stable bundles yet
---
projects/release/config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/projects/release/config b/projects/release/config
index e53ea43..f0d95c7 100644
--- a/projects/release/config
+++ b/projects/release/config
@@ -29,7 +29,7 @@ targets:
torbrowser-windows-i686: 1
torbrowser-windows-x86_64:
var:
- torbrowser-windows-x86_64: 1
+ torbrowser-windows-x86_64: '[% c("var/alpha") || c("var/nightly") %]'
torbrowser-osx-x86_64:
var:
torbrowser-osx-x86_64: 1
1
0

[tor-browser-build/master] Bug 24912: No sandboxed-tor-browser in the stable series yet
by gk@torproject.org 16 Jan '18
by gk@torproject.org 16 Jan '18
16 Jan '18
commit 563ebc0ab77bbc7b0e792fa29317de9dab278c9d
Author: Georg Koppen <gk(a)torproject.org>
Date: Tue Jan 16 13:04:42 2018 +0000
Bug 24912: No sandboxed-tor-browser in the stable series yet
---
projects/release/build | 4 +++-
projects/release/config | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/projects/release/build b/projects/release/build
index 985ffa3..3940504 100644
--- a/projects/release/build
+++ b/projects/release/build
@@ -20,7 +20,9 @@ mkdir -p "$destdir"
[% END -%]
[% IF c("var/torbrowser-linux-x86_64") -%]
mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/
- mv [% c('input_files_by_name/sandbox-linux-x86_64') %] "$destdir"/sandbox-[% pc('sandbox', 'version') %]-linux64.zip
+ [% IF ! c("var/release") %]
+ mv [% c('input_files_by_name/sandbox-linux-x86_64') %] "$destdir"/sandbox-[% pc('sandbox', 'version') %]-linux64.zip
+ [% END %]
[% END -%]
cd "$destdir"
cat > .htaccess <<EOF
diff --git a/projects/release/config b/projects/release/config
index f0d95c7..61c6175 100644
--- a/projects/release/config
+++ b/projects/release/config
@@ -85,7 +85,7 @@ input_files:
- name: sandbox-linux-x86_64
project: sandbox
- enable: '[% c("var/torbrowser-linux-x86_64") %]'
+ enable: '[% c("var/torbrowser-linux-x86_64") && ! c("var/release") %]'
target:
- '[% c("var/build_target") %]'
- torbrowser-linux-x86_64
1
0

[tor-browser-build/master] Reset timestamp when no_build_id is selected
by boklm@torproject.org 16 Jan '18
by boklm@torproject.org 16 Jan '18
16 Jan '18
commit eb12aafc5b75bbf00cfd74b02fc57009aa03b021
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Tue Jan 16 12:54:41 2018 +0100
Reset timestamp when no_build_id is selected
The defaut timestamp value will use the commit time of the selected
commit for the project, which will require cloning the git repository if
it is not present. When we use the no_build_id target to display a script,
we usually don't care about such details, so we set timestamp to 0 to
avoid unnecessary cloning.
---
rbm.conf | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/rbm.conf b/rbm.conf
index 8b9309d..ed2319d 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -288,6 +288,12 @@ targets:
# a build template or other option but don't want to spend time to
# compute the various build ids
no_build_id:
+ # The defaut timestamp value will use the commit time of the
+ # selected commit for the project, which will require cloning the
+ # git repository if it is not present. When we use the no_build_id
+ # target to display a script, we usually don't care about such
+ # details, so we set timestamp to 0 to avoid unnecessary cloning.
+ timestamp: 0
var:
build_id: 1
1
0
commit 93d378ed4c55e0e27011eff957988a53d47ecd38
Author: Georg Koppen <gk(a)torproject.org>
Date: Wed Jan 10 09:24:49 2018 +0000
Update translations
---
src/chrome/locale/da/aboutDialog.dtd | 19 ++++++++++
src/chrome/locale/da/aboutTBUpdate.dtd | 6 ++++
src/chrome/locale/da/aboutTor.dtd | 60 +++++++++++++++----------------
src/chrome/locale/da/aboutTor.properties | 19 ++++++----
src/chrome/locale/da/brand.dtd | 11 ++++--
src/chrome/locale/da/brand.properties | 13 +++----
src/chrome/locale/da/torbutton.dtd | 34 ++++++++++++++++--
src/chrome/locale/da/torbutton.properties | 44 +++++++++++++++++------
src/chrome/locale/de/torbutton.dtd | 29 +++++++--------
src/chrome/locale/es/torbutton.dtd | 28 +++++++--------
src/chrome/locale/fa/torbutton.dtd | 2 +-
src/chrome/locale/fr/torbutton.dtd | 28 +++++++--------
src/chrome/locale/it/torbutton.dtd | 36 +++++++++----------
src/chrome/locale/nl/torbutton.dtd | 28 +++++++--------
src/chrome/locale/pt-BR/torbutton.dtd | 20 +++++------
src/chrome/locale/ru/aboutTor.properties | 10 +++---
src/chrome/locale/ru/torbutton.dtd | 28 +++++++--------
src/chrome/locale/sv/aboutTBUpdate.dtd | 2 +-
src/chrome/locale/sv/aboutTor.properties | 6 ++--
src/chrome/locale/sv/brand.properties | 6 ++--
src/chrome/locale/sv/torbutton.dtd | 24 ++++++-------
src/chrome/locale/sv/torbutton.properties | 2 +-
src/chrome/locale/tr/torbutton.dtd | 28 +++++++--------
src/chrome/locale/zh-CN/torbutton.dtd | 2 +-
24 files changed, 287 insertions(+), 198 deletions(-)
diff --git a/src/chrome/locale/da/aboutDialog.dtd b/src/chrome/locale/da/aboutDialog.dtd
new file mode 100644
index 0000000..ae4278e
--- /dev/null
+++ b/src/chrome/locale/da/aboutDialog.dtd
@@ -0,0 +1,19 @@
+<!ENTITY project.start "&brandShortName; er udviklet af">
+<!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to https://www.torproject.org -->
+<!ENTITY project.tpoLink "&vendorShortName;">
+<!ENTITY project.end "En nonprofit-arbejder for at beskytte dit privatliv og din frihed online.">
+
+<!ENTITY help.start "Vil du hjælpe? ">
+<!-- LOCALIZATION NOTE (help.donate): This is a link title that links to https://www.torproject.org/donate/donate.html.en -->
+<!ENTITY help.donateLink "Doner">
+<!ENTITY help.or " eller ">
+<!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links to https://www.torproject.org/getinvolved/volunteer.html.en -->
+<!ENTITY help.getInvolvedLink "vær med">
+<!ENTITY help.end "!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/docs/trademark-faq.html.en -->
+<!ENTITY bottomLinks.questions "Spørgsmål?">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/getinvolved/relays -->
+<!ENTITY bottomLinks.grow "Hjælp Tor Network med at vokse!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to about:license -->
+<!ENTITY bottomLinks.license "Licens Information">
+<!ENTITY tor.TrademarkStatement ""Tor" og "løg-logoet" er registrerede varemærker tilhørende The Tor Project, Inc.">
diff --git a/src/chrome/locale/da/aboutTBUpdate.dtd b/src/chrome/locale/da/aboutTBUpdate.dtd
new file mode 100644
index 0000000..f0c6c5a
--- /dev/null
+++ b/src/chrome/locale/da/aboutTBUpdate.dtd
@@ -0,0 +1,6 @@
+<!ENTITY aboutTBUpdate.title "Tor Browser opdatering">
+<!ENTITY aboutTBUpdate.updated "Tor Browseren er blevet opdateret.">
+<!ENTITY aboutTBUpdate.linkPrefix "For den mest aktuelle information om denne udgivelse,">
+<!ENTITY aboutTBUpdate.linkLabel "Besøg vores webside">
+<!ENTITY aboutTBUpdate.linkSuffix ".">
+<!ENTITY aboutTBUpdate.changeLogHeading "Ændringslog:">
diff --git a/src/chrome/locale/da/aboutTor.dtd b/src/chrome/locale/da/aboutTor.dtd
index 9f14022..23f3f23 100644
--- a/src/chrome/locale/da/aboutTor.dtd
+++ b/src/chrome/locale/da/aboutTor.dtd
@@ -1,47 +1,45 @@
<!--
- - Copyright (c) 2014, The Tor Project, Inc.
+ - Copyright (c) 2015, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
-<!ENTITY aboutTor.title "About Tor">
+<!ENTITY aboutTor.title "Om Tor">
-<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
-<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
-<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
+<!ENTITY aboutTor.outOfDateTorOn.label "ADVARSEL: denne browser er forældet.">
+<!ENTITY aboutTor.outOfDateTorOff.label "Denne browser er desuden forældet.">
+<!ENTITY aboutTor.outOfDate2.label "Klik på løget og vælg så Søg efter Tor Browser opdateringer.">
-<!ENTITY aboutTor.check.label "Test Tor Network Settings">
+<!ENTITY aboutTor.check.label "Test Tor netværksindstillinger.">
-<!ENTITY aboutTor.success.label "Congratulations!">
-<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
-<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
-<!ENTITY aboutTor.failure.label "Something Went Wrong!">
-<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
-<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
-<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org">
-<!ENTITY aboutTor.failure3suffix.label ".">
+<!ENTITY aboutTor.success.label "Velkommen til Tor Browser">
+<!ENTITY aboutTor.success2.label "Forbundet til Tor-netværket.">
+<!ENTITY aboutTor.success3.label "Du kan nu frit bruge internettet anonymt">
+<!ENTITY aboutTor.failure.label "Noget gik galt!">
+<!ENTITY aboutTor.failure2.label "Tor virker ikke i denne browser.">
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
-<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
+<!ENTITY aboutTor.search.label "Søg">
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com">
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
-<!ENTITY aboutTor.torInfo3.label "Exit Node:">
-<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
-<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
-<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »">
+<!ENTITY aboutTor.torInfo1.label "Yderligere information:">
+<!ENTITY aboutTor.torInfo2.label "Land og IP-adresse:">
+<!ENTITY aboutTor.torInfo3.label "Udgangsknudepunkt:">
+<!ENTITY aboutTor.torInfo4.label "Denne server logger ikke nogle informationer om besøgende.">
+<!ENTITY aboutTor.whatnextQuestion.label "Hvad er næste skridt?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor er IKKE al den sikkerhed du har brug for for at browse anonymt. Du bliver muligvis også nødt til at ændre browsing vaner for at sikre, at din identitet forbliver sikker">
+<!ENTITY aboutTor.whatnext.label "Tips for at forblive anonym">
<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning">
-<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
-<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
-<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »">
+<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser brugermanual">
+<!ENTITY aboutTor.helpInfo1.label "Du kan hjælpe!">
+<!ENTITY aboutTor.helpInfo2.label "Der er mange måder hvorpå du kan hjælpe for at gøre Tor-netværket hurtigere og stærkere:">
+<!ENTITY aboutTor.helpInfo3.label "Kør et Tor-relæknudepunkt »">
<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en">
-<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »">
+<!ENTITY aboutTor.helpInfo4.label "Tilbyd din hjælp »">
<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en">
-<!ENTITY aboutTor.helpInfo5.label "Make a Donation »">
+<!ENTITY aboutTor.helpInfo5.label "Foretag en donation »">
<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en">
-<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
-<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »">
+<!ENTITY aboutTor.footer.label "Tor-projektet er et US 501(c)(3) nonprofit-projekt dedikeret til forskning, udvikling og uddannelse af online anonymitet og privatliv.">
+<!ENTITY aboutTor.learnMore.label "Lær mere om Tor-projektet »">
<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en">
diff --git a/src/chrome/locale/da/aboutTor.properties b/src/chrome/locale/da/aboutTor.properties
index 02088f0..3f1e238 100644
--- a/src/chrome/locale/da/aboutTor.properties
+++ b/src/chrome/locale/da/aboutTor.properties
@@ -2,14 +2,19 @@
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+aboutTor.searchDDG.privacy=Søg <a href="%1$S">sikkert</a> med <a href="%2$S">DuckDuckGo</a>.
# The following string is a link which replaces %1$S above.
aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
# The following string is a link which replaces %2$S above.
aboutTor.searchDDG.search.link=https://duckduckgo.com/
+
+aboutTor.donationBanner.donate=Donér nu!
+
+aboutTor.donationBanner.slogan=Tor: Styrker digital oprør
+aboutTor.donationBanner.mozilla=Giv i dag og Mozilla vil matche din gave!
+
+aboutTor.donationBanner.tagline1=Beskytter journalister, whistleblowers og aktivister siden 2006
+aboutTor.donationBanner.tagline2=Sammenarbejder for frihed verden over
+aboutTor.donationBanner.tagline3=Frihed online
+aboutTor.donationBanner.tagline4=Fremmer ytringsfrihed verden over
+aboutTor.donationBanner.tagline5=Beskytter privatlivet af millioner hver dag
diff --git a/src/chrome/locale/da/brand.dtd b/src/chrome/locale/da/brand.dtd
index 59f665e..38d686c 100644
--- a/src/chrome/locale/da/brand.dtd
+++ b/src/chrome/locale/da/brand.dtd
@@ -2,7 +2,14 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<!ENTITY brandShorterName "Tor Browser">
<!ENTITY brandShortName "Tor Browser">
<!ENTITY brandFullName "Tor Browser">
-<!ENTITY vendorShortName "Tor Project">
-<!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY vendorShortName "Tor-projektet">
+<!ENTITY trademarkInfo.part1 "Firefox og Firefox logoer er varemærker tilhørende Mozilla Foundation.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Klik for at indlæse installerede systemplugins">
+<!ENTITY plugins.installed.enable "Aktivér plugins">
+<!ENTITY plugins.installed.disable "Deaktivér plugins">
+<!ENTITY plugins.installed.disable.tip "Klik for at undgå indlæsning af systemplugins">
diff --git a/src/chrome/locale/da/brand.properties b/src/chrome/locale/da/brand.properties
index f63def3..dec4fbd 100644
--- a/src/chrome/locale/da/brand.properties
+++ b/src/chrome/locale/da/brand.properties
@@ -2,14 +2,15 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+brandShorterName=Tor Browser
brandShortName=Tor Browser
brandFullName=Tor Browser
-vendorShortName=Tor Project
+vendorShortName=Tor-projekt
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+homePageSingleStartMain=Firefox Start, en hurtig startside med indbygget søgning
+homePageImport=Importer din startside fra %S
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+homePageMigrationPageTitle=Valg af startside
+homePageMigrationDescription=Vælg den ønskede startside:
-syncBrandShortName=Sync
+syncBrandShortName=Synkroniser
diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd
index 78f4a8e..ac93e67 100644
--- a/src/chrome/locale/da/torbutton.dtd
+++ b/src/chrome/locale/da/torbutton.dtd
@@ -1,12 +1,19 @@
<!ENTITY torbutton.context_menu.new_identity "Ny identitet">
<!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.networksettings "Open Network Settings…">
-<!ENTITY torbutton.context_menu.downloadUpdate "Hent bundt-opdatering Tor Browser Bundle ...">
+<!ENTITY torbutton.context_menu.new_circuit "Nyt Tor-kredsløb for dette sted">
+<!ENTITY torbutton.context_menu.new_circuit_key "C">
+<!ENTITY torbutton.context_menu.preferences "Sikkerhedsindstillinger…">
+<!ENTITY torbutton.context_menu.preferences.key "S">
+<!ENTITY torbutton.context_menu.networksettings "Tor netværksindstillinger...">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
+<!ENTITY torbutton.context_menu.downloadUpdate "Søg efter Tor Browser opdateringer...">
<!ENTITY torbutton.context_menu.downloadUpdate.key "O">
-<!ENTITY torbutton.context_menu.cookieProtections "Cookie-beskyttelser">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie-beskyttelser...">
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "Klik for at starte Torbutton">
+<!ENTITY torbutton.prefs.security_settings "Tor Browser sikkerhedsindstillinger">
<!ENTITY torbutton.prefs.restore_defaults "Gendan Standarder">
+<!ENTITY torbutton.prefs.custom_warning "Dine tilpassede browserpræferencer har resulterede i usædvanlige sikkerhedsindstillinger. Pga. sikkerheds- og privatlivsårsagen, anbefaler vi at du vælger en af standardsikkerhedsniveauerne.">
<!ENTITY torbutton.cookiedialog.title "Håndtér Cookie-beskyttelser">
<!ENTITY torbutton.cookiedialog.lockCol "Beskyttet">
<!ENTITY torbutton.cookiedialog.domainCol "Vært">
@@ -19,4 +26,25 @@
<!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 zoom-niveauer, understøttede filtyper, systemfarver og WebGL-formåenheder.">
+<!ENTITY torbutton.prefs.sec_caption "Sikkerheds Niveau">
+<!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">
+<!ENTITY torbutton.prefs.sec_standard_description "Alle Tor Browser- og webstedsfunktionaliteter er aktiveret.">
+<!ENTITY torbutton.prefs.sec_safer_label "Mere sikker">
+<!ENTITY torbutton.prefs.sec_safer_description "Deaktiverer webstedsfunktionaliteter som ofte er farlige, hvilket kan gøre at nogle steder mister deres funktionalitet.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "Ved den mere sikker indstilling:">
+<!ENTITY torbutton.prefs.sec_safest_label "Mest sikker">
+<!ENTITY torbutton.prefs.sec_safest_description "Tillader kun webstedsfunktionaliteter som kræves til statiske steder og grundlæggende tjenester. Ændringerne påvirker billeder, medier og scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "Ved den sikreste indstilling:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Lær mere">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript er deaktiveret på ikke-HTTPS steder.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript er som standard deaktiveret på alle steder.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Nogle skrifttyper og matematiksymboler er deaktiverede.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Nogle skrifttyper, ikoner, matematiksymboler og billeder er deaktiveret.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Lyd og video (HTML5-medier) er klik-for-at-afspille.">
+<!ENTITY torbutton.circuit_display.title "Tor-kredsløb for dette websted">
diff --git a/src/chrome/locale/da/torbutton.properties b/src/chrome/locale/da/torbutton.properties
index 49846ab..d7de66f 100644
--- a/src/chrome/locale/da/torbutton.properties
+++ b/src/chrome/locale/da/torbutton.properties
@@ -1,27 +1,51 @@
+torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.ip_unknown = Ukendt IP-adresse
+torbutton.circuit_display.onion_site = Løg side
+torbutton.circuit_display.this_browser = Denne browser
+torbutton.circuit_display.relay = relæ
+torbutton.circuit_display.tor_bridge = Bro
+torbutton.circuit_display.unknown_country = Ukendt land
+torbutton.content_sizer.margin_tooltip = Tor Browser tilføjer denne margin for at gøre dit vindues højde og bredde mindre genkendeligt, hvilket reducerer muligheden for at andre spore dig online.
torbutton.panel.tooltip.disabled = Klik for at aktivere Tor
torbutton.panel.tooltip.enabled = Klik for at deaktivere Tor
torbutton.panel.label.disabled = Tor Deaktiveret
torbutton.panel.label.enabled = Tor Aktiveret
extensions.torbutton(a)torproject.org.description = Torbutton tilbyder en knap, der konfigurerer Tor-indstillinger, samt hurtigt og nemt fjerner private data browsing-data.
-torbutton.popup.external.title = Indlæs eksternt indhold?
-torbutton.popup.external.app = Et ekstern program kræves for at håndtere:\n\n
-torbutton.popup.external.note = \n\nBEMÆRK: Eksterne programmer er IKKE Tor-sikre som standard og kan demaskere dig!\n
-torbutton.popup.external.suggest = \nHvis der ikke stoles på denne fil, så bør du enten gemme den til visning når du er koblet af nettet eller i en VM, eller overveje at anvende en transparent Tor-proxy som Tails LiveCD eller torsocks.\n
-torbutton.popup.launch = Start program
-torbutton.popup.cancel = Annullér
-torbutton.popup.dontask = Start altid programmer fremover
+torbutton.popup.external.title = Download en ekstern filtype?
+torbutton.popup.external.app = Tor Browseren kan ikke vis denne file. Du skal derfor åbne den med et andet program.\n\n
+torbutton.popup.external.note = Nogle filtyper kan lede programmer til at forbinde til internettet uden at bruge Tor.\n\n
+torbutton.popup.external.suggest = For at være sikker bør du kun åbne downloade filer mens du er offline, eller bruge en Tor Live CD såsom Tails.\n
+torbutton.popup.launch = Download fil
+torbutton.popup.cancel = Annuller
+torbutton.popup.dontask = Download automatisk filer fremover
torbutton.popup.prompted_language = For at yde større privatliv, så kan Torbutton forespørge den engelsk sprogversion af websiderne. Dette kan betyde at websider som du foretrækker at læse på dit modersmål vises på engelsk i stedet for.\n\nVil du gerne forespørge engelske websider for øget privatliv?
torbutton.popup.no_newnym = Torbutton kan ikke med sikkerhed give dig en ny identitet. Den har ikke adgang til kontrolporten for Tor.\n\nKører du Tor Browser-bundet?
torbutton.title.prompt_torbrowser = Vigtig Torbutton-information
-torbutton.popup.prompt_torbrowser = Torbutton fungerer anderledes end før: du kan ikke længere slå den fra.\n\nDu foretog denne ændring, da det ikke er sikkert at anvende Torbutton i en browser, der også anvendes til non-Tor-browsing. Der var for mange fejl deri, som vi ikke kunne rette på andre måder.\n\nHvis du ønsker at anvende Firefox på normal vis, så bør du afinstallere Torbutton og hente Tor Browser Bundle. Indstillingerne for privatliv i Tor Browser overgår også de normale i Firefox, selv når Firefox anvende med Torbutton.\n\nFor at fjerne Torbutton, så gå til Funktioner->Tilføjelser->Udvidelser og klik dernæst Fjern-knappen ved siden af Torbutton.
+torbutton.popup.prompt_torbrowser = Torbutton fungerer anderledes end før: du kan ikke længere slå den fra.\n\nDu foretog denne ændring, da det ikke er sikkert at anvende Torbutton i en browser, der også anvendes til non-Tor-browsing. Der var for mange fejl deri, som vi ikke kunne rette på andre måder.\n\nHvis du ønsker at anvende Firefox på normal vis, så bør du afinstallere Torbutton og downloade Tor Browser Bundle. Indstillingerne for privatliv i Tor Browser overgår også de normale i Firefox, selv når Firefox anvende med Torbutton.\n\nFor at fjerne Torbutton, så gå til Funktioner->Tilføjelser->Udvidelser og klik dernæst Fjern-knappen ved siden af Torbutton.
torbutton.popup.short_torbrowser = Vigtig Torbutton-information!\n\nTorbutton er nu altid slået til.\n\nKlik på Torbutton for mere information.
torbutton.popup.confirm_plugins = Udvidelsesmoduler såsom Flash kan skade sikkerheden for dit privatliv og din anonymitet.\n\nDe kan også omgå Tor, så din nuværende placering og IP-adresse afsløres.\n\nEr du sikker på at du vil aktivere udvidelsesmoduler?\n\n
torbutton.popup.never_ask_again = Spørg mig aldrig igen
+torbutton.popup.confirm_newnym = Tor Browseren vil lukke alle vinduer og tabs. Alle webside-sessions vil gå tabs.\nGenstart Tor Browseren nu for at nulstille din identitet?\n
+
+torbutton.slider_notification = Nu har det grønne løg menuen en sikkerheds skyder som lader dig tilpasse dit sikkerhedsniveau. Tjek det ud!
+torbutton.slider_notification_button = Åben sikkerhedsindstillinger
+
+torbutton.maximize_warning = Hvis du maksimere Tor Browseren tillader du andre at fastslå din skærmstørrelse, hvilket kan blive brugt til at spore dig. Vi anbefaler at du anvender Tor Browserens standard skærmstørrelse.
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Dette websted (%S) forsøgte at tilgå billededata på et lærred (canvas). Da billededata for lærreder kan anvendes til at afdække information om din maskine, så blev der sendt tomme billeddata denne gang.
+canvas.siteprompt=Dette websted (%S) forsøgte at uddrage HTML5 canvas-billeddata, hvilket kan bruges til unikt at identificere din computer.\n\nSkal Tor Browseren tillade dette websted at uddrage HTML5 canvas-billeddata?
+canvas.notNow=Ikke nu
+canvas.notNowAccessKey=N
canvas.allow=Tillad i fremtiden
canvas.allowAccessKey=T
-canvas.never=Aldrig for dette sted
+canvas.never=Aldrig for dette sted (anbefalet)
canvas.neverAccessKey=L
+
+# Profile/startup error messages. Strings are kept here for ease of translation.
+# LOCALIZATION NOTE: %S is the application name.
+profileProblemTitle=%S Profil Problem
+profileReadOnly=Du kan ikke køre %S fra et skrivebeskyttet filsystem. Kopier venligst %S til et andet sted før du prøver at bruge det.
+profileReadOnlyMac=Du kan ikke køre %S fra et skrivebeskyttet filsystem. Kopier venligst %S til skrivebordet eller en programmappe før du prøver at bruge det.
+profileAccessDenied= %S har ikke rettigheder til at bruge profilen. Skift venligst rettigheder og prøv igen.
+profileMigrationFailed=Overførsel af din eksisterende %S profil fejlede.\nNye indstillinger vil blive brugt.
diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd
index cf5cdc2..a9e3850 100644
--- a/src/chrome/locale/de/torbutton.dtd
+++ b/src/chrome/locale/de/torbutton.dtd
@@ -33,18 +33,19 @@
<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Lassen Sie dieses Feld ausgewählt um bestimmte einzigartige Informationen Ihres Systems vor Webportalen zu verbergen, wie die Rechnerleistung, Tastaturbelegung, das Sprachprofil, den Installationsort von Erweiterungen, die Liste der installierten Erweiterungen, Ihren 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 können Sie bestimmte Browserfunktionen, die Ihren Browser für mögliche Attacken anfälliger machen, deaktivieren.">
-<!ENTITY torbutton.prefs.sec_standard_label "Standard">
-<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
-<!ENTITY torbutton.prefs.sec_safer_label "Safer">
-<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
-<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
-<!ENTITY torbutton.prefs.sec_safest_label "Safest">
-<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
-<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
-<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
-<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
-<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
-<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standart
+">
+<!ENTITY torbutton.prefs.sec_standard_description "Alle Tor Browser und Webseiten Funktionen sind aktiviert.">
+<!ENTITY torbutton.prefs.sec_safer_label "Sicherer">
+<!ENTITY torbutton.prefs.sec_safer_description " Deaktiviert Webseiten Funktionen, die oft gefährlich sind. Sorgt dafür, dass manche Seiten nicht mehr so gut funktionieren">
+<!ENTITY torbutton.prefs.sec_safer_list_label "In der sicheren Einstellung:">
+<!ENTITY torbutton.prefs.sec_safest_label "Am sichersten">
+<!ENTITY torbutton.prefs.sec_safest_description "Erlaubt nur Webseiten-Funktionen, die für statische Seiten und Basisdienste benötigt werden. Diese Änderungen betreffen Bilder, Medien und Skripte.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "In der sichersten Einstellung:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Erfahren Sie mehr">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript ist auf Nicht-HTTTPS-Sites deaktiviert.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript ist standardmäßig auf allen Seiten deaktiviert.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Einige Schriftarten und mathematische Symbole sind deaktiviert.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Einige Schriftarten, Symbole, mathematische Symbole und Bilder sind deaktiviert.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio und Video (HTML5-Medien) müssen zur Wiedergabe angeklickt werden.">
<!ENTITY torbutton.circuit_display.title "Tor-Kanal für diese Seite">
diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd
index 1a0f9fd..7a4fd41 100644
--- a/src/chrome/locale/es/torbutton.dtd
+++ b/src/chrome/locale/es/torbutton.dtd
@@ -33,18 +33,18 @@
<!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 le permite deshabilitar ciertas características del navegador que pueden hacerlo más vulnerable a tentativas de hackeo.">
-<!ENTITY torbutton.prefs.sec_standard_label "Standard">
-<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
-<!ENTITY torbutton.prefs.sec_safer_label "Safer">
-<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
-<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
-<!ENTITY torbutton.prefs.sec_safest_label "Safest">
-<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
-<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
-<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
-<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
-<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
-<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
+<!ENTITY torbutton.prefs.sec_standard_label "Estándar">
+<!ENTITY torbutton.prefs.sec_standard_description "Están habilitadas todas las características de Navegador Tor y sitio web.">
+<!ENTITY torbutton.prefs.sec_safer_label "Más segura">
+<!ENTITY torbutton.prefs.sec_safer_description "Deshabilita características de sitio web que a menudo son peligrosas, lo que causa que algunos sitios pierdan funcionalidad.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "En la configuración 'más segura':">
+<!ENTITY torbutton.prefs.sec_safest_label "La más segura">
+<!ENTITY torbutton.prefs.sec_safest_description "Sólo permite las características de sitio web requeridas para sitios estáticos y servicios básicos. Estos cambios afectan a imágenes, medios, y scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "En la configuración 'la más segura':">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Conocer más">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript está deshabilitado en sitios no-HTTPS.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript está deshabilitado por defecto en todos los sitios.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Algunas fuentes y símbolos matemáticos están deshabilitados.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Algunas fuentes, iconos, símbolos matemáticos, e imágenes están deshabilitados.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio y vídeo (medios HTML5) están dipuestos para reproducir-al-pulsar.">
<!ENTITY torbutton.circuit_display.title "Circuito Tor para este sitio">
diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd
index 5f0a627..3ce8df6 100644
--- a/src/chrome/locale/fa/torbutton.dtd
+++ b/src/chrome/locale/fa/torbutton.dtd
@@ -41,7 +41,7 @@
<!ENTITY torbutton.prefs.sec_safest_label "Safest">
<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
-<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_learn_more_label "اطلاعات بیشتر">
<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd
index def0ef7..76d1bfe 100644
--- a/src/chrome/locale/fr/torbutton.dtd
+++ b/src/chrome/locale/fr/torbutton.dtd
@@ -33,18 +33,18 @@
<!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 bouton de sécurité coulissant vous permet de désactiver certaines fonctions du navigateur qui le rendent plus vulnérable aux tentatives de piratage.">
-<!ENTITY torbutton.prefs.sec_standard_label "Standard">
-<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
-<!ENTITY torbutton.prefs.sec_safer_label "Safer">
-<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
-<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
-<!ENTITY torbutton.prefs.sec_safest_label "Safest">
-<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
-<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
-<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
-<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
-<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
-<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
+<!ENTITY torbutton.prefs.sec_standard_label "Normal">
+<!ENTITY torbutton.prefs.sec_standard_description "Tous les fonctions du navigateur Tor et de site Web sont activées.">
+<!ENTITY torbutton.prefs.sec_safer_label "Plus sûr">
+<!ENTITY torbutton.prefs.sec_safer_description "Désactive les fonctions de site Web qui sont souvent dangereuses, ce qui pourrait causer le non-fonctionnement de certains sites Web.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "Au paramètre plus sûr :">
+<!ENTITY torbutton.prefs.sec_safest_label "Le plus sûr">
+<!ENTITY torbutton.prefs.sec_safest_description "Ne permettre que les fonctions de site Web qui sont exigées pour les sites fixes et les services de base. Ces changements affectent les images, les médias et les scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "Au paramètre le plus sûr :">
+<!ENTITY torbutton.prefs.sec_learn_more_label "En apprendre davantage">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript est désactivé sur les sites non HTTPS.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript est désactivé par défaut sur tous les sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Certaines polices et certains symboles mathématiques sont désactivés.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Certaines polices, icônes, images et certains symboles mathématiques sont désactivés.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Le son et la vidéo (médias HTML5) sont « cliquer pour lire ».">
<!ENTITY torbutton.circuit_display.title "Circuit Tor pour ce site">
diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd
index 3af2996..7276923 100644
--- a/src/chrome/locale/it/torbutton.dtd
+++ b/src/chrome/locale/it/torbutton.dtd
@@ -4,15 +4,15 @@
<!ENTITY torbutton.context_menu.new_circuit_key "C">
<!ENTITY torbutton.context_menu.preferences "Impostazioni di sicurezza...">
<!ENTITY torbutton.context_menu.preferences.key "S">
-<!ENTITY torbutton.context_menu.networksettings "Impostazioni di rete di Tor...">
+<!ENTITY torbutton.context_menu.networksettings "Impostazioni della rete Tor...">
<!ENTITY torbutton.context_menu.networksettings.key "N">
-<!ENTITY torbutton.context_menu.downloadUpdate "Controllo per aggiornamento Tor Browser...">
+<!ENTITY torbutton.context_menu.downloadUpdate "Controllando gli aggiornamenti di Tor Browser...">
<!ENTITY torbutton.context_menu.downloadUpdate.key "A">
<!ENTITY torbutton.context_menu.cookieProtections "Protezioni dei Cookie...">
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "Fai clic per inizializzare Torbutton">
<!ENTITY torbutton.prefs.security_settings "Impostazioni di Sicurezza Tor Browser">
-<!ENTITY torbutton.prefs.restore_defaults "Ripristina Default">
+<!ENTITY torbutton.prefs.restore_defaults "Ripristina impostazioni iniziali">
<!ENTITY torbutton.prefs.custom_warning "Le tue impostazioni del browser sembrano avere preferenze di sicurezza insolite. Per motivi di sicurezza e privacy, ti consigliamo di scegliere uno dei livelli di sicurezza predefiniti.">
<!ENTITY torbutton.cookiedialog.title "Gestisci protezione Cookies">
<!ENTITY torbutton.cookiedialog.lockCol "Protetto">
@@ -27,24 +27,24 @@
<!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 "Mantieni 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 connesso, localStorage, URL mediaSource, richieste OCSP, SharedWorkers, a ticket di sessioni TLS.">
+<!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 connesso, localStorage, URL mediaSource, richieste OCSP, SharedWorkers, a 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 "Tieni questa casella selezionata per nascondere ai siti web alcune cose che potrebbero essere uniche per 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.resist_fingerprinting_tooltip "Lascia questa casella selezionata per nascondere ai siti web alcune cose che potrebbero essere uniche per 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">
-<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
-<!ENTITY torbutton.prefs.sec_safer_label "Safer">
-<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
-<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
-<!ENTITY torbutton.prefs.sec_safest_label "Safest">
-<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
-<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
-<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
-<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
-<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
-<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
+<!ENTITY torbutton.prefs.sec_standard_description "Tutte le funzionalità di Tor Browser e dei siti sono attive.">
+<!ENTITY torbutton.prefs.sec_safer_label "Sicuro">
+<!ENTITY torbutton.prefs.sec_safer_description "Disattiva le caratteristiche dei siti spesso pericolose, causando la perdita di funzionalità di alcuni siti.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "Nell'impostazione sicura:">
+<!ENTITY torbutton.prefs.sec_safest_label "Molto sicuro">
+<!ENTITY torbutton.prefs.sec_safest_description "Permette solo le funzionalità necessarie per siti statici e servizi di base. Queste modifiche influiscono su immagini, media e script.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "Nell'impostazione molto sicura:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Per saperne di più">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript è disattivato nei siti non-HTTPS.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript è disattivato in tutti i siti in modo predefinito.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Alcuni caratteri e simboli matematici sono disattivati.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Alcuni caratteri, icone, simboli matematici e immagini sono disattivati.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio e video (media HTML5) sono click-to-play.">
<!ENTITY torbutton.circuit_display.title "Circuito Tor per questo sito">
diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd
index 333e5f1..dcb3d1e 100644
--- a/src/chrome/locale/nl/torbutton.dtd
+++ b/src/chrome/locale/nl/torbutton.dtd
@@ -33,18 +33,18 @@
<!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 "Standard">
-<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
-<!ENTITY torbutton.prefs.sec_safer_label "Safer">
-<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
-<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
-<!ENTITY torbutton.prefs.sec_safest_label "Safest">
-<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
-<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
-<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
-<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
-<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
-<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standaard">
+<!ENTITY torbutton.prefs.sec_standard_description "Alle Tor Browser- en website functies zijn ingeschakeld.">
+<!ENTITY torbutton.prefs.sec_safer_label "Veiliger">
+<!ENTITY torbutton.prefs.sec_safer_description "Uitgeschakelde website functies die zijn meestal gevaarlijk, waardoor sommige sites functionaliteit vaak verliezen.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "Op de veiliger instelling:">
+<!ENTITY torbutton.prefs.sec_safest_label "Veiligste">
+<!ENTITY torbutton.prefs.sec_safest_description "Alleen website-functies toestaan die vereist zijn voor statische sites en basis diensten. Deze wijzigingen zijn van invloed op afbeeldingen, media en scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "Op de veiligste instelling:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Leer Meer">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript zijn uitgeschakeld op non-HTTP sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "Javascript zijn standaard uitgeschakeld op alle sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Sommige lettertypen en wiskundige symbolen zijn uitgeschakeld.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Sommige lettertypen, pictogrammen, wiskundige symbolen en afbeeldingen zijn uitgeschakeld.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio en video (HTML5-media) zijn klik-bij-afspelen.">
<!ENTITY torbutton.circuit_display.title "Tor-circuit voor deze website">
diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd
index 4c37179..174df63 100644
--- a/src/chrome/locale/pt-BR/torbutton.dtd
+++ b/src/chrome/locale/pt-BR/torbutton.dtd
@@ -33,18 +33,18 @@
<!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 "Standard">
-<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
-<!ENTITY torbutton.prefs.sec_safer_label "Safer">
-<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_standard_label "Padrão">
+<!ENTITY torbutton.prefs.sec_standard_description "Todos os recursos do Navegador Tor e do website estão ativos.">
+<!ENTITY torbutton.prefs.sec_safer_label "Mais seguro">
+<!ENTITY torbutton.prefs.sec_safer_description "Desativar recursos geralmente inseguros de websites, o que pode fazer com que alguns sites percam a funcionalidade.">
<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
<!ENTITY torbutton.prefs.sec_safest_label "Safest">
-<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_description "Apenas permitir os recursos dos websites necessários para sites estáticos e serviços básicos. Essas mudanças afetam imagens, mídias e scripts.">
<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
-<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
-<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
-<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Aprenda mais">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript está desativado em todos os sites sem HTTPS.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript está desativado por padrão em todos os sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Algumas fontes e símbolos matemáticos estão desativados.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Algumas fontes, ícones, símbolos matemáticas e imagens estão desativadas.">
<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
<!ENTITY torbutton.circuit_display.title "Circuito Tor para este site">
diff --git a/src/chrome/locale/ru/aboutTor.properties b/src/chrome/locale/ru/aboutTor.properties
index 527d579..d9ea5d4 100644
--- a/src/chrome/locale/ru/aboutTor.properties
+++ b/src/chrome/locale/ru/aboutTor.properties
@@ -8,13 +8,13 @@ aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
# The following string is a link which replaces %2$S above.
aboutTor.searchDDG.search.link=https://duckduckgo.com/
-aboutTor.donationBanner.donate=Пожертвовать!
+aboutTor.donationBanner.donate=Пожертвовать сейчас!
-aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance
-aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift!
+aboutTor.donationBanner.slogan=Tor: усиливая цифровое сопротивление
+aboutTor.donationBanner.mozilla=Пожертвуйте сегодня и Mozilla удвоит Ваш взнос.
aboutTor.donationBanner.tagline1=Защита журналистов, информаторов и активистов с 2006 года
aboutTor.donationBanner.tagline2=Свобода сети во всём мире
aboutTor.donationBanner.tagline3=Свобода в сети
-aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide
-aboutTor.donationBanner.tagline5=Защита конфиденциальности миллионов каждый день
+aboutTor.donationBanner.tagline4=Содействие развитию безграничного самовыражения во Всемирной Сети.
+aboutTor.donationBanner.tagline5=Защищая Конфиденциальность миллионов каждый день
diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd
index 3c0b9a6..50063ce 100644
--- a/src/chrome/locale/ru/torbutton.dtd
+++ b/src/chrome/locale/ru/torbutton.dtd
@@ -33,18 +33,18 @@
<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Оставьте флажок напротив этой функции отмеченным, чтобы скрыть от веб-узлов вещи , которые могут быть уникальными для вас, включая производительность компьютера, раскладку клавиатуры, язык, расположение и список установленных плагинов, состояние сети, ориентацию и размер экрана , значения масштабирования для конкретных узлов, поддерживаемые типы файлов, системные цвета и возможности WebGL.">
<!ENTITY torbutton.prefs.sec_caption "Уровень безопасности">
<!ENTITY torbutton.prefs.sec_caption_tooltip "Ползунок безопасности позволяет вам запретить некоторые особенности обозревателя, которые могут сделать ваш браузер более уязвимым к попыткам взлома.">
-<!ENTITY torbutton.prefs.sec_standard_label "Standard">
-<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
-<!ENTITY torbutton.prefs.sec_safer_label "Safer">
-<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
-<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
-<!ENTITY torbutton.prefs.sec_safest_label "Safest">
-<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
-<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
-<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
-<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
-<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
-<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
+<!ENTITY torbutton.prefs.sec_standard_label "Стандартные">
+<!ENTITY torbutton.prefs.sec_standard_description "Все функции Tor Browser и веб-сайтов включены.">
+<!ENTITY torbutton.prefs.sec_safer_label "Более безопасные">
+<!ENTITY torbutton.prefs.sec_safer_description "Отключены функции веб-сайтов, которые часто бывают опасны, что может привести к потере функциональности некоторыми сайтами.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "При более безопасных настройках:">
+<!ENTITY torbutton.prefs.sec_safest_label "Наиболее безопасные">
+<!ENTITY torbutton.prefs.sec_safest_description "Разрешены только функции веб-сайтов, требующиеся для статических сайтов и основных сервисов. Эти изменения влияют на изображения, медиа и скрипты.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "При самых безопасных настройках:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Подробнее">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only " JavaScript отключён на всех не HTTPS сайтах. ">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript отключен по умолчанию на всех сайтах.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Некоторые шрифты и математические символы отключены.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Некоторые шрифты, значки, математические символы и изображения отключены.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Аудио и видео (HTML5 медиа) проигрываются только после клика.">
<!ENTITY torbutton.circuit_display.title "Цепочка Tor для этого сайта">
diff --git a/src/chrome/locale/sv/aboutTBUpdate.dtd b/src/chrome/locale/sv/aboutTBUpdate.dtd
index a57f256..da02c49 100644
--- a/src/chrome/locale/sv/aboutTBUpdate.dtd
+++ b/src/chrome/locale/sv/aboutTBUpdate.dtd
@@ -1,4 +1,4 @@
-<!ENTITY aboutTBUpdate.title "Tor-webbläsaruppdatering">
+<!ENTITY aboutTBUpdate.title "Tor Browser-uppdatering">
<!ENTITY aboutTBUpdate.updated "Tor-webbläsaren har uppdaterats.">
<!ENTITY aboutTBUpdate.linkPrefix "För den senaste information om den här versionen,">
<!ENTITY aboutTBUpdate.linkLabel "besök vår hemsida">
diff --git a/src/chrome/locale/sv/aboutTor.properties b/src/chrome/locale/sv/aboutTor.properties
index 016ea20..d871467 100644
--- a/src/chrome/locale/sv/aboutTor.properties
+++ b/src/chrome/locale/sv/aboutTor.properties
@@ -10,11 +10,11 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/
aboutTor.donationBanner.donate=Donera nu!
-aboutTor.donationBanner.slogan=Tor: Kraftfull digital resistans
+aboutTor.donationBanner.slogan=Tor: Möjliggör digitalt motstånd
aboutTor.donationBanner.mozilla=Ge idag och Mozilla kommer att matcha din gåva!
aboutTor.donationBanner.tagline1=Skyddar journalister, whistleblowers och aktivister sedan 2006
aboutTor.donationBanner.tagline2=Nätverksfrihet över hela världen
-aboutTor.donationBanner.tagline3=Frihet på nåtet
-aboutTor.donationBanner.tagline4=Främja yttrandefriheten över hela världen
+aboutTor.donationBanner.tagline3=Frihet på nätet
+aboutTor.donationBanner.tagline4=Främjer yttrandefriheten över hela världen
aboutTor.donationBanner.tagline5=Skydda integriteten av miljoner varje dag
diff --git a/src/chrome/locale/sv/brand.properties b/src/chrome/locale/sv/brand.properties
index 555e01e..7c215e5 100644
--- a/src/chrome/locale/sv/brand.properties
+++ b/src/chrome/locale/sv/brand.properties
@@ -2,9 +2,9 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-brandShorterName=Tor Browser
-brandShortName=Tor Browser
-brandFullName=Tor Browser
+brandShorterName=Tor webbläsaren
+brandShortName=Tor webbläsaren
+brandFullName=Tor webbläsaren
vendorShortName=Tor-projektet
homePageSingleStartMain=Firefox Start, en snabb hemsida med inbyggd sökfunktion
diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd
index 7936823..f407136 100644
--- a/src/chrome/locale/sv/torbutton.dtd
+++ b/src/chrome/locale/sv/torbutton.dtd
@@ -10,24 +10,24 @@
<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
<!ENTITY torbutton.context_menu.cookieProtections "Skydd mot Cookies...">
<!ENTITY torbutton.context_menu.cookieProtections.key "S">
-<!ENTITY torbutton.button.tooltip "Klicka för att installera Torbutton">
+<!ENTITY torbutton.button.tooltip "Klicka för att initialisera Torbutton">
<!ENTITY torbutton.prefs.security_settings "Tor-webbläsares säkerhetsinställningar">
<!ENTITY torbutton.prefs.restore_defaults "Återställ standard">
<!ENTITY torbutton.prefs.custom_warning "Dina anpassade webbläsarinställningar har resulterat i ovanliga säkerhetsinställningar. Av säkerhets- och integritetsskäl rekommenderar vi att du använder en av de fördefinierade säkerhetsnivåerna.">
-<!ENTITY torbutton.cookiedialog.title "Hantera skyddade kakor">
+<!ENTITY torbutton.cookiedialog.title "Hantera Cookies skydd">
<!ENTITY torbutton.cookiedialog.lockCol "Skyddad">
<!ENTITY torbutton.cookiedialog.domainCol "Värd">
<!ENTITY torbutton.cookiedialog.nameCol "Namn">
<!ENTITY torbutton.cookiedialog.pathCol "Sökväg">
-<!ENTITY torbutton.cookiedialog.protectCookie "Skydda kaka">
-<!ENTITY torbutton.cookiedialog.removeCookie "Ta bort kaka">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "Skydda inte kaka">
+<!ENTITY torbutton.cookiedialog.protectCookie "Skydda Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Ta bort Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Oskydda Cookie">
<!ENTITY torbutton.cookiedialog.removeAllBut "Ta bort alla icke-skyddade">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "Skydda nya kakor">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Skydda inte nya kakor">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Begränsa tredjepartskakor och annan tracking data">
+<!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 blog-URLer, broadcastkanaler, webbläsar-cache, kakor, favicons, HTTP-Auth-huvuden, länk-föranslutningar, localStorage, mediaSource URLer, OCSP-förfrågningar, SharedWorkers och TLS-sessionstickets.">
+<!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.">
@@ -35,13 +35,13 @@
<!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">
<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
-<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_label "Säkrare">
<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
-<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_label "Säkrast">
<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
-<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Läs mer">
<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties
index 2f6a913..2656cc1 100644
--- a/src/chrome/locale/sv/torbutton.properties
+++ b/src/chrome/locale/sv/torbutton.properties
@@ -11,7 +11,7 @@ torbutton.panel.tooltip.enabled = Klicka för att inaktivera Tor
torbutton.panel.label.disabled = Tor inaktiv
torbutton.panel.label.enabled = Tor aktiv
extensions.torbutton(a)torproject.org.description = Torbutton ger en knapp för att konfigurera Tor inställningar och snabbt och enkelt rensa privat surfdata.
-torbutton.popup.external.title = Hämta hem en extern filtyp?
+torbutton.popup.external.title = Ladda ned en extern filtyp?
torbutton.popup.external.app = Tor Browser kan inte visa filen. Du behöver öppna den i ett annat program.\n\n
torbutton.popup.external.note = Vissa typer av filer kan få program att ansluta till internet utan att använda Tor.\n\n
torbutton.popup.external.suggest = Det är säkrast att öppna filer du har hämtat hem bara när du är offline, eller så kan du använda en Tor Live CD som till exempel Tails.\n
diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd
index ebcaa67..a696ebe 100644
--- a/src/chrome/locale/tr/torbutton.dtd
+++ b/src/chrome/locale/tr/torbutton.dtd
@@ -33,18 +33,18 @@
<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Bilgisayarınızın başarımı, tuş takımı düzeni, yerel dil ayarları, yüklenmiş eklentilerin konumu, yüklenmiş 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 "Standard">
-<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
-<!ENTITY torbutton.prefs.sec_safer_label "Safer">
-<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
-<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
-<!ENTITY torbutton.prefs.sec_safest_label "Safest">
-<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
-<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
-<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
-<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
-<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
-<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standart">
+<!ENTITY torbutton.prefs.sec_standard_description "Tüm Tor Browser ve web sitesi özellikleri kullanılabilir.">
+<!ENTITY torbutton.prefs.sec_safer_label "Daha güvenli">
+<!ENTITY torbutton.prefs.sec_safer_description "Sıklıkla tehlikeli olan web sitesi özellikleri devre dışı bırakılır ve bazı sitelerin işlevlerinde kayıplar olabilir. ">
+<!ENTITY torbutton.prefs.sec_safer_list_label "Daha güvenli ayarlarda:">
+<!ENTITY torbutton.prefs.sec_safest_label "En güvenli">
+<!ENTITY torbutton.prefs.sec_safest_description "Yalnız durağan siteler ve temel hizmetler için gerekli web sitesi özelliklerine izin verilir. Bu değişiklikler görselleri, ortamları ve betikleri etkiler.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "En güvenli ayarlarda:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Ayrıntılı bilgi">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript, HTTPS kullanmayan sitelerde devre dışı bırakılır.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript varsayılan olarak tüm sitelerde devre dışı bırakılır.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Bazı yazı türleri ve matematik simgeleri devre dışı bırakılır.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Bazı yazı türleri, simgeler, matematik simgeleri ve görseller devre dışı bırakılır.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Ses ve görüntüler (HTML5 ortamı) tıklayarak çalıştırılabilir.">
<!ENTITY torbutton.circuit_display.title "Bu site için Tor devresi">
diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd
index 236e2d4..6bfd4ea 100644
--- a/src/chrome/locale/zh-CN/torbutton.dtd
+++ b/src/chrome/locale/zh-CN/torbutton.dtd
@@ -41,7 +41,7 @@
<!ENTITY torbutton.prefs.sec_safest_label "Safest">
<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
-<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_learn_more_label "更多详情">
<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
1
0

[torbutton/master] Bug 21245: Add da translation to Torbutton and keep track of it
by gk@torproject.org 10 Jan '18
by gk@torproject.org 10 Jan '18
10 Jan '18
commit 1818e2be84b53d2592e8c4ee3b6a9a2de97ab1ba
Author: Georg Koppen <gk(a)torproject.org>
Date: Wed Jan 10 09:23:52 2018 +0000
Bug 21245: Add da translation to Torbutton and keep track of it
---
trans_tools/import-translations.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh
index 9153692..83c2b6a 100755
--- a/trans_tools/import-translations.sh
+++ b/trans_tools/import-translations.sh
@@ -9,7 +9,7 @@ BUNDLE_LOCALES="ar de es fa fr it ko nl pl pt-BR ru tr vi zh-CN"
# so Basque XPIs can be build independently. We can do
# this for other languages too, if anyone requests this
# and translations are available.
-BUNDLE_LOCALES="$BUNDLE_LOCALES eu ja sv"
+BUNDLE_LOCALES="$BUNDLE_LOCALES eu ja sv da"
LOCALE_DIR=../src/chrome/locale
1
0